X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fqueue_fn.php;h=9dcefdd244b59288c9177a401735d186480a680b;hb=a391ab9a9937b71a07ec26ab57ba70c13857b294;hp=3030acc28db92699b55f7fc566c6b81f1283da77;hpb=a905522eb58612dfc9e4479998de2bd6477b3868;p=friendica.git diff --git a/include/queue_fn.php b/include/queue_fn.php index 3030acc28d..9dcefdd244 100644 --- 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; }