Code standards in api_get_user

[friendica.git] / include / queue_fn.php

diff --git a/include/queue_fn.php b/include/queue_fn.php
index 81bcf0f2b3d86ad22b8e20cacaf06cb028a91118..c4ab229aee3cd10444b1de60431c807721381224 100644 (file)
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -1,5 +1,8 @@
 <?php
 
+use Friendica\Core\Config;
+use Friendica\Database\DBM;
+
 function update_queue_time($id) {
        logger('queue: requeue item ' . $id);
        q("UPDATE `queue` SET `last` = '%s' WHERE `id` = %d",
@@ -10,9 +13,7 @@ function update_queue_time($id) {
 
 function remove_queue_item($id) {
        logger('queue: remove queue item ' . $id);
-       q("DELETE FROM `queue` WHERE `id` = %d",
-               intval($id)
-       );
+       dba::delete('queue', array('id' => $id));
 }
 
 /**
@@ -23,42 +24,50 @@ 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);
 
-       return (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;
 }
 
 
 function add_to_queue($cid,$network,$msg,$batch = false) {
 
-       $max_queue = get_config('system','max_contact_queue');
-       if($max_queue < 1)
+       $max_queue = Config::get('system','max_contact_queue');
+       if ($max_queue < 1) {
                $max_queue = 500;
+       }
 
-       $batch_queue = get_config('system','max_batch_queue');
-       if($batch_queue < 1)
+       $batch_queue = Config::get('system','max_batch_queue');
+       if ($batch_queue < 1) {
                $batch_queue = 1000;
+       }
 
        $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 (dbm::is_result($r)) {
-               if($batch &&  ($r[0]['total'] > $batch_queue)) {
+       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;
-               }
-               elseif((! $batch) && ($r[0]['total'] > $max_queue)) {
+               } elseif ((! $batch) && ($r[0]['total'] > $max_queue)) {
                        logger('add_to_queue: too many queued items for contact ' . $cid . ' - discarding message');
                        return;
                }