Fix SQL date format bug in dfrn

[friendica.git] / include / delivery.php

diff --git a/include/delivery.php b/include/delivery.php
index 45ca68cf37b42484e72965495fbbec4cb822fe4e..faa1cad6745d45667f4a3e393006f92f6a06772d 100644 (file)
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -4,15 +4,15 @@ use \Friendica\Core\Config;
 
 require_once('include/queue_fn.php');
 require_once('include/html2plain.php');
-require_once("include/Scrape.php");
+require_once('include/Scrape.php');
 require_once('include/diaspora.php');
-require_once("include/ostatus.php");
-require_once("include/dfrn.php");
+require_once('include/ostatus.php');
+require_once('include/dfrn.php');
 
 function delivery_run(&$argv, &$argc){
        global $a;
 
-       require_once("include/datetime.php");
+       require_once('include/datetime.php');
        require_once('include/items.php');
        require_once('include/bbcode.php');
        require_once('include/email.php');
@@ -30,30 +30,6 @@ function delivery_run(&$argv, &$argc){
 
                $contact_id = intval($argv[$x]);
 
-               /// @todo When switching completely to the worker we won't need this anymore
-               // Some other process may have delivered this item already.
-
-               $r = q("SELECT * FROM `deliverq` WHERE `cmd` = '%s' AND `item` = %d AND `contact` = %d LIMIT 1",
-                       dbesc($cmd),
-                       dbesc($item_id),
-                       dbesc($contact_id)
-               );
-               if (!dbm::is_result($r)) {
-                       continue;
-               }
-
-               if ($a->maxload_reached()) {
-                       return;
-               }
-
-               // It's ours to deliver. Remove it from the queue.
-
-               q("DELETE FROM `deliverq` WHERE `cmd` = '%s' AND `item` = %d AND `contact` = %d",
-                       dbesc($cmd),
-                       dbesc($item_id),
-                       dbesc($contact_id)
-               );
-
                if (!$item_id || !$contact_id) {
                        continue;
                }
@@ -379,7 +355,7 @@ function delivery_run(&$argv, &$argc){
 
                                logger('notifier: dfrn_delivery to '.$contact["url"].' with guid '.$target_item["guid"].' returns '.$deliver_status);
 
-                               if ($deliver_status == (-1)) {
+                               if ($deliver_status < 0) {
                                        logger('notifier: delivery failed: queuing message');
                                        add_to_queue($contact['id'],NETWORK_DFRN,$atom);