Merge pull request #3254 from Quix0r/rewrites/coding-convention-split2

[friendica.git] / include / queue_fn.php

diff --git a/include/queue_fn.php b/include/queue_fn.php
index df9ab6b4cbc950f048040486f68f926a27017d5f..9dcefdd244b59288c9177a401735d186480a680b 100644 (file)
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -23,21 +23,26 @@ function remove_queue_item($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 
-               and last > UTC_TIMESTAMP() - interval 15 minute limit 1",
-               intval($cid)
-       );
-       if(dbm::is_result($r))
-               return true;
+       $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)
        );
 
-       return (dbm::is_result($r));
+       $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 $was_delayed;
 }
 
 
@@ -55,7 +60,7 @@ function add_to_queue($cid,$network,$msg,$batch = false) {
                WHERE `queue`.`cid` = %d AND `contact`.`self` = 0 ",
                intval($cid)
        );
-       if(dbm::is_result($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;