From 5b2474238eb0d257db14b0668ef25eab92e53fea Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 19 May 2016 19:42:45 -0700 Subject: first phase of daemon refactoring --- Zotlabs/Daemon/Deliver.php | 82 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 Zotlabs/Daemon/Deliver.php (limited to 'Zotlabs/Daemon/Deliver.php') diff --git a/Zotlabs/Daemon/Deliver.php b/Zotlabs/Daemon/Deliver.php new file mode 100644 index 000000000..56f0fed78 --- /dev/null +++ b/Zotlabs/Daemon/Deliver.php @@ -0,0 +1,82 @@ + json_encode(array('success' => true, 'pickup' => array(array('notify' => $notify,'message' => $mm))))); + zot_import($msg,z_root()); + } + } + else { + $msg = array('body' => json_encode(array('success' => true, 'pickup' => array(array('notify' => $notify,'message' => $m))))); + $dresult = zot_import($msg,z_root()); + } + + remove_queue_item($r[0]['outq_hash']); + + if($dresult && is_array($dresult)) { + foreach($dresult as $xx) { + if(is_array($xx) && array_key_exists('message_id',$xx)) { + if(delivery_report_is_storable($xx)) { + q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_result, dreport_time, dreport_xchan ) values ( '%s', '%s','%s','%s','%s','%s' ) ", + dbesc($xx['message_id']), + dbesc($xx['location']), + dbesc($xx['recipient']), + dbesc($xx['status']), + dbesc(datetime_convert($xx['date'])), + dbesc($xx['sender']) + ); + } + } + } + } + + q("delete from dreport where dreport_queue = '%s'", + dbesc($argv[$x]) + ); + } + } + + // otherwise it's a remote delivery - call queue_deliver() with the $immediate flag + + queue_deliver($r[0],true); + + } + } + } +} -- cgit v1.2.3