X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fqueue_fn.php;h=8840668112300dbb4d96d62ebd63e7047e15a815;hb=0cd9db9cb7f4c96f597e37590a536eaae123238d;hp=a68aa8918fb4ac9fc37e9a3f0949131f3f7f8259;hpb=fc3c1601b1d8de58aff2457f6e116ea226c69ced;p=friendica.git

diff --git a/include/queue_fn.php b/include/queue_fn.php
index a68aa8918f..8840668112 100644
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -23,12 +23,11 @@ function remove_queue_item($id) {
  * @return bool The communication with this contact has currently problems
  */
 function was_recently_delayed($cid) {
-
 	$was_delayed = false;
 
 	// Are there queue entries that were recently added?
 	$r = q("SELECT `id` FROM `queue` WHERE `cid` = %d
-		AND `last` > UTC_TIMESTAMP() - interval 15 minute LIMIT 1",
+		AND `last` > UTC_TIMESTAMP() - INTERVAL 15 MINUTE LIMIT 1",
 		intval($cid)
 	);
 
@@ -50,23 +49,24 @@ function was_recently_delayed($cid) {
 function add_to_queue($cid,$network,$msg,$batch = false) {
 
 	$max_queue = get_config('system','max_contact_queue');
-	if($max_queue < 1)
+	if ($max_queue < 1) {
 		$max_queue = 500;
+	}
 
 	$batch_queue = get_config('system','max_batch_queue');
-	if($batch_queue < 1)
+	if ($batch_queue < 1) {
 		$batch_queue = 1000;
+	}
 
 	$r = q("SELECT COUNT(*) AS `total` FROM `queue` INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id` 
 		WHERE `queue`.`cid` = %d AND `contact`.`self` = 0 ",
 		intval($cid)
 	);
-	if($r && count($r)) {
-		if($batch &&  ($r[0]['total'] > $batch_queue)) {
+	if (dbm::is_result($r)) {
+		if ($batch &&  ($r[0]['total'] > $batch_queue)) {
 			logger('add_to_queue: too many queued items for batch server ' . $cid . ' - discarding message');
 			return;
-		}
-		elseif((! $batch) && ($r[0]['total'] > $max_queue)) {
+		} elseif ((! $batch) && ($r[0]['total'] > $max_queue)) {
 			logger('add_to_queue: too many queued items for contact ' . $cid . ' - discarding message');
 			return;
 		}