X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fqueue_fn.php;fp=include%2Fqueue_fn.php;h=df9ab6b4cbc950f048040486f68f926a27017d5f;hb=63610c7b73fcaf862adbf880d4968dd2b1678d9b;hp=a253aa2fb2282c4a0360f8e7fc58c9e128c84fde;hpb=c1a15befc55af63ab95318c160aa4e9c5bbf6517;p=friendica.git

diff --git a/include/queue_fn.php b/include/queue_fn.php
index a253aa2fb2..df9ab6b4cb 100644
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -15,6 +15,13 @@ function remove_queue_item($id) {
 	);
 }
 
+/**
+ * @brief Checks if the communication with a given contact had problems recently
+ *
+ * @param int $cid Contact id
+ *
+ * @return bool The communication with this contact has currently problems
+ */
 function was_recently_delayed($cid) {
 
 	$r = q("SELECT `id` FROM `queue` WHERE `cid` = %d 
@@ -24,7 +31,9 @@ function was_recently_delayed($cid) {
 	if(dbm::is_result($r))
 		return true;
 
-	$r = q("select `term-date` from contact where id = %d and `term-date` != '' and `term-date` != '0000-00-00 00:00:00' limit 1",
+	// 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",
 		intval($cid)
 	);
 
@@ -46,7 +55,7 @@ function add_to_queue($cid,$network,$msg,$batch = false) {
 		WHERE `queue`.`cid` = %d AND `contact`.`self` = 0 ",
 		intval($cid)
 	);
-	if($r && count($r)) {
+	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;