X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fqueue.php;h=865d6903a2ad266a3002712f0556beb3408239a5;hb=217a8ce6ee8fd163d81c71044d9497646296862f;hp=cf5ed9a8156c28cd3e9a33fa8e449789f30c343a;hpb=f4652d6e5026abe7d7b352d2307622bd567aa433;p=friendica.git

diff --git a/include/queue.php b/include/queue.php
index cf5ed9a815..865d6903a2 100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -2,15 +2,15 @@
 
 use Friendica\Core\Config;
 
-require_once('include/queue_fn.php');
-require_once('include/dfrn.php');
-require_once("include/datetime.php");
-require_once('include/items.php');
-require_once('include/bbcode.php');
-require_once('include/socgraph.php');
-require_once('include/cache.php');
-
-function queue_run(&$argv, &$argc){
+require_once 'include/queue_fn.php';
+require_once 'include/dfrn.php';
+require_once 'include/datetime.php';
+require_once 'include/items.php';
+require_once 'include/bbcode.php';
+require_once 'include/socgraph.php';
+require_once 'include/cache.php';
+
+function queue_run(&$argv, &$argc) {
 	global $a;
 
 	if ($argc > 1) {
@@ -41,17 +41,18 @@ function queue_run(&$argv, &$argc){
 			q("DELETE FROM `queue` WHERE `created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
 		}
 
-		// For the first 12 hours we'll try to deliver every 15 minutes
-		// After that, we'll only attempt delivery once per hour.
-
-		$r = q("SELECT `id` FROM `queue` WHERE ((`created` > UTC_TIMESTAMP() - INTERVAL 12 HOUR && `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE) OR (`last` < UTC_TIMESTAMP() - INTERVAL 1 HOUR)) ORDER BY `cid`, `created`");
+		/*
+		 * For the first 12 hours we'll try to deliver every 15 minutes
+		 * After that, we'll only attempt delivery once per hour.
+		 */
+		$r = q("SELECT `id` FROM `queue` WHERE ((`created` > UTC_TIMESTAMP() - INTERVAL 12 HOUR AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE) OR (`last` < UTC_TIMESTAMP() - INTERVAL 1 HOUR)) ORDER BY `cid`, `created`");
 
 		call_hooks('queue_predeliver', $a, $r);
 
 		if (dbm::is_result($r)) {
 			foreach ($r as $q_item) {
 				logger('Call queue for id '.$q_item['id']);
-				proc_run(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "include/queue.php", $q_item['id']);
+				proc_run(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "include/queue.php", (int)$q_item['id']);
 			}
 		}
 		return;
@@ -60,8 +61,8 @@ function queue_run(&$argv, &$argc){
 
 	// delivering
 
-	require_once('include/salmon.php');
-	require_once('include/diaspora.php');
+	require_once 'include/salmon.php';
+	require_once 'include/diaspora.php';
 
 	$r = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
 		intval($queue_id));
@@ -83,7 +84,7 @@ function queue_run(&$argv, &$argc){
 
 	$dead = Cache::get($cachekey_deadguy.$c[0]['notify']);
 
-	if (!is_null($dead) AND $dead) {
+	if (!is_null($dead) && $dead) {
 		logger('queue: skipping known dead url: '.$c[0]['notify']);
 		update_queue_time($q_item['id']);
 		return;
@@ -101,7 +102,7 @@ function queue_run(&$argv, &$argc){
 			Cache::set($cachekey_server.$server, $vital, CACHE_QUARTER_HOUR);
 		}
 
-		if (!is_null($vital) AND !$vital) {
+		if (!is_null($vital) && !$vital) {
 			logger('queue: skipping dead server: '.$server);
 			update_queue_time($q_item['id']);
 			return;