From a2cec8899ad191b47d116f4ea124be6bd5b05472 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Thu, 19 May 2016 22:26:37 -0700
Subject: daemon conversion continued...

---
 include/deliver.php | 87 -----------------------------------------------------
 1 file changed, 87 deletions(-)
 delete mode 100644 include/deliver.php

(limited to 'include/deliver.php')

diff --git a/include/deliver.php b/include/deliver.php
deleted file mode 100644
index 12f28d6a9..000000000
--- a/include/deliver.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php /** @file */
-
-require_once('include/cli_startup.php');
-require_once('include/zot.php');
-require_once('include/queue_fn.php');
-
-
-function deliver_run($argc,$argv) {
-
-	cli_startup();
-
-	$a = get_app();
-
-	if($argc < 2)
-		return;
-
-	logger('deliver: invoked: ' . print_r($argv,true), LOGGER_DATA);
-
-	for($x = 1; $x < $argc; $x ++) {
-
-		$dresult = null;
-		$r = q("select * from outq where outq_hash = '%s' limit 1",
-			dbesc($argv[$x])
-		);
-		if($r) {
-
-			$notify = json_decode($r[0]['outq_notify'],true);
-
-			// Messages without an outq_msg will need to go via the web, even if it's a
-			// local delivery. This includes conversation requests and refresh packets.
-
-			if(($r[0]['outq_posturl'] === z_root() . '/post') && ($r[0]['outq_msg'])) {
-				logger('deliver: local delivery', LOGGER_DEBUG);
-
-				// local delivery
-				// we should probably batch these and save a few delivery processes
-
-				if($r[0]['outq_msg']) {
-					$m = json_decode($r[0]['outq_msg'],true);
-					if(array_key_exists('message_list',$m)) {
-						foreach($m['message_list'] as $mm) {
-							$msg = array('body' => 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);
-
-		}
-	}
-}
-
-if (array_search(__file__,get_included_files())===0){
-  deliver_run($argc,$argv);
-  killme();
-}
-- 
cgit v1.2.3