Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites...

[friendica.git] / include / queue_fn.php

diff --git a/include/queue_fn.php b/include/queue_fn.php
index e43912431c762fff263432701f0c02f914457df8..df9ab6b4cbc950f048040486f68f926a27017d5f 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,27 +10,34 @@ 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)
        );
 }
 
+/**
+ * @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 
                and last > UTC_TIMESTAMP() - interval 15 minute limit 1",
                intval($cid)
        );
-       if(count($r))
+       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)
        );
-       if(count($r))
-               return true;
 
-       return false;
+       return (dbm::is_result($r));
 }
 
 
@@ -44,11 +51,11 @@ 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)
        );
-       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;