Merge remote-tracking branch 'upstream/develop' into 1705-some-more-dba

[friendica.git] / include / queue_fn.php

diff --git a/include/queue_fn.php b/include/queue_fn.php
index 81bcf0f2b3d86ad22b8e20cacaf06cb028a91118..9dcefdd244b59288c9177a401735d186480a680b 100644 (file)
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -23,19 +23,26 @@ 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() - INTVAL 15 MINUTE LIMIT 1",
+               AND `last` > UTC_TIMESTAMP() - INTERVAL 15 MINUTE LIMIT 1",
                intval($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",
-               intval($cid)
-       );
+       $was_delayed = dbm::is_result($r);
+
+       // We set "term-date" to a current date if the communication has problems.
+       // If the communication works again we reset this value.
+       if ($was_delayed) {
+               $r = q("SELECT `term-date` FROM `contact` WHERE `id` = %d AND `term-date` <= '1000-01-01' LIMIT 1",
+                       intval($cid)
+               );
+               $was_delayed = !dbm::is_result($r);
+       }
 
-       return (dbm::is_result($r));
+       return $was_delayed;
 }