Merge pull request #2901 from tobiasd/20161110-helptxt

[friendica.git] / include / queue_fn.php

diff --git a/include/queue_fn.php b/include/queue_fn.php
index 613571c84792bb5a751dac1ded3455de9bc2a3be..5214131b2bf0ed1e119b98379857838d6cf8ea20 100644 (file)
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -2,7 +2,7 @@
 
 function update_queue_time($id) {
        logger('queue: requeue item ' . $id);
-       q("UPDATE `queue` SET `last` = '%s' WHERE `id` = %d LIMIT 1",
+       q("UPDATE `queue` SET `last` = '%s' WHERE `id` = %d",
                dbesc(datetime_convert()),
                intval($id)
        );
@@ -10,7 +10,7 @@ function update_queue_time($id) {
 
 function remove_queue_item($id) {
        logger('queue: remove queue item ' . $id);
-       q("DELETE FROM `queue` WHERE `id` = %d LIMIT 1",
+       q("DELETE FROM `queue` WHERE `id` = %d",
                intval($id)
        );
 }
@@ -21,7 +21,16 @@ function was_recently_delayed($cid) {
                and last > UTC_TIMESTAMP() - interval 15 minute limit 1",
                intval($cid)
        );
+       if(count($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)
+       );
+       if(count($r))
+               return true;
+
+       return false;
 }
 
 
@@ -35,7 +44,7 @@ function add_to_queue($cid,$network,$msg,$batch = false) {
        if($batch_queue < 1)
                $batch_queue = 1000;
 
-       $r = q("SELECT COUNT(*) AS `total` FROM `queue` left join `contact` ON `queue`.`cid` = `contact`.`id` 
+       $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)
        );