X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fqueue.php;h=d312b50f5a99fe778feee4563f4252098ca813cc;hb=d6b446d63ffe589429394b5937b67ec666bbe219;hp=837ae31d77dffbc4f0582f55447033cb750e2a52;hpb=60ef474d4607fa48a4b5c4d54cbad2b8e2fe9fef;p=friendica.git

diff --git a/include/queue.php b/include/queue.php
index 837ae31d77..d312b50f5a 100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -1,29 +1,20 @@
 <?php
+require_once("boot.php");
+require_once('include/queue_fn.php');
 
+function queue_run($argv, $argc){
+	global $a, $db;
 
-function update_queue_time($id) {
-	logger('queue: requeue item ' . $id);
-	q("UPDATE `queue` SET `last` = '%s' WHERE `id` = %d LIMIT 1",
-		dbesc(datetime_convert()),
-		intval($id)
-	);
-}
-
-function remove_queue_item($id) {
-	logger('queue: remove queue item ' . $id);
-	q("DELETE FROM `queue` WHERE `id` = %d LIMIT 1",
-		intval($id)
-	);
-}
-
-	require_once("boot.php");
-
-	$a = new App;
-
-	@include(".htconfig.php");
-	require_once("dba.php");
-	$db = new dba($db_host, $db_user, $db_pass, $db_data);
+	if(is_null($a)){
+		$a = new App;
+	}
+  
+	if(is_null($db)){
+		@include(".htconfig.php");
+		require_once("dba.php");
+		$db = new dba($db_host, $db_user, $db_pass, $db_data);
 		unset($db_host, $db_user, $db_pass, $db_data);
+	};
 
 
 	require_once("session.php");
@@ -31,10 +22,34 @@ function remove_queue_item($id) {
 	require_once('include/items.php');
 	require_once('include/bbcode.php');
 
+	load_config('config');
+	load_config('system');
+
 	$a->set_baseurl(get_config('system','url'));
 
+	load_hooks();
+
+	if($argc > 1)
+		$queue_id = intval($argv[1]);
+	else
+		$queue_id = 0;
+
+	$deadguys = array();
+
 	logger('queue: start');
 
+	$interval = ((get_config('system','delivery_interval') === false) ? 2 : intval(get_config('system','delivery_interval')));
+
+	$r = q("select * from deliverq where 1");
+	if(count($r)) {
+		foreach($r as $rr) {
+			logger('queue: deliverq');
+			proc_run('php','include/delivery.php',$rr['cmd'],$rr['item'],$rr['contact']);
+			if($interval)
+				@time_sleep_until(microtime(true) + (float) $interval);
+		}
+	}
+
 	$r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue` 
 		LEFT JOIN `contact` ON `queue`.`cid` = `contact`.`id` 
 		WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
@@ -46,22 +61,45 @@ function remove_queue_item($id) {
 		q("DELETE FROM `queue` WHERE `created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
 	}
 		
-	$r = q("SELECT `id` FROM `queue` WHERE `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ");
+	if($queue_id)
+		$r = q("SELECT `id` FROM `queue` WHERE `id` = %d LIMIT 1",
+			intval($queue_id)
+		);
+	else
+		$r = q("SELECT `id` FROM `queue` WHERE `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ");
+
+	if(! count($r)){
+		return;
+	}
+
+	if(! $queue_id)
+		call_hooks('queue_predeliver', $a, $r);
 
-	if(! count($r))
-		killme();
 
 	// delivery loop
 
 	require_once('include/salmon.php');
+	require_once('include/diaspora.php');
 
 	foreach($r as $q_item) {
-		$qi = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
-			intval($q_item['id'])
-		);
+
+		// queue_predeliver hooks may have changed the queue db details, 
+		// so check again if this entry still needs processing
+
+		if($queue_id) {
+			$qi = q("select * from queue where `id` = %d limit 1",
+				intval($queue_id)
+			);
+		}
+		else {
+			$qi = q("SELECT * FROM `queue` WHERE `id` = %d AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ",
+				intval($q_item['id'])
+			);
+		}
 		if(! count($qi))
 			continue;
 
+
 		$c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
 			intval($qi[0]['cid'])
 		);
@@ -69,7 +107,14 @@ function remove_queue_item($id) {
 			remove_queue_item($q_item['id']);
 			continue;
 		}
-		$u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+		if(in_array($c[0]['notify'],$deadguys)) {
+				logger('queue: skipping known dead url: ' . $c[0]['notify']);
+				update_queue_time($q_item['id']);
+				continue;
+		}
+
+		$u = q("SELECT `user`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey` 
+			FROM `user` WHERE `uid` = %d LIMIT 1",
 			intval($c[0]['uid'])
 		);
 		if(! count($u)) {
@@ -78,23 +123,26 @@ function remove_queue_item($id) {
 		}
 
 		$data      = $qi[0]['content'];
+		$public    = $qi[0]['batch'];
 		$contact   = $c[0];
 		$owner     = $u[0];
 
 		$deliver_status = 0;
 
 		switch($contact['network']) {
-			case 'dfrn':
+			case NETWORK_DFRN:
 				logger('queue: dfrndelivery: item ' . $q_item['id'] . ' for ' . $contact['name']);
 				$deliver_status = dfrn_deliver($owner,$contact,$data);
 
-				if($deliver_status == (-1))
+				if($deliver_status == (-1)) {
 					update_queue_time($q_item['id']);
-				else
+					$deadguys[] = $contact['notify'];
+				}
+				else {
 					remove_queue_item($q_item['id']);
-
+				}
 				break;
-			default:
+			case NETWORK_OSTATUS:
 				if($contact['notify']) {
 					logger('queue: slapdelivery: item ' . $q_item['id'] . ' for ' . $contact['name']);
 					$deliver_status = slapper($owner,$contact['notify'],$data);
@@ -105,10 +153,37 @@ function remove_queue_item($id) {
 						remove_queue_item($q_item['id']);
 				}
 				break;
+			case NETWORK_DIASPORA:
+				if($contact['notify']) {
+					logger('queue: diaspora_delivery: item ' . $q_item['id'] . ' for ' . $contact['name']);
+					$deliver_status = diaspora_transmit($owner,$contact,$data,$public);
+
+					if($deliver_status == (-1))
+						update_queue_time($q_item['id']);
+					else
+						remove_queue_item($q_item['id']);
+				}
+				break;
+
+			default:
+				$params = array('owner' => $owner, 'contact' => $contact, 'queue' => $q_item, 'result' => false);
+				call_hooks('queue_deliver', $a, $params);
+		
+				if($params['result'])
+						remove_queue_item($q_item['id']);
+				else
+						update_queue_time($q_item['id']);
+	
+				break;
+
 		}
 	}
 		
-	killme();
+	return;
 
-	// NOTREACHED
+}
 
+if (array_search(__file__,get_included_files())===0){
+  queue_run($argv,$argc);
+  killme();
+}