Merge branch 'master' of git://github.com/friendika/friendika

[friendica.git] / include / queue.php

diff --git a/include/queue.php b/include/queue.php
index b7fb478b4e3aab2329c52a6d7148c5487b0431d0..fb65d5c25bcbaf88e91815a98c2f9a11259a0473 100644 (file)
--- a/include/queue.php
+++ b/include/queue.php
@@ -1,29 +1,20 @@
 <?php
+require_once("boot.php");
+require_once('include/queue_fn.php');
 
+function queue_run($argv, $argc){
+  global $a, $db;
 
-function update_queue_item($id) {
-       logger('queue: requeue item ' . $id);
-       q("UPDATE `queue` SET `last` = '%s' WHERE `id` = %d LIMIT 1",
-               dbesc(datetime_convert()),
-               intval($id)
-       );
-}
-
-function remove_queue_item($id) {
-       logger('queue: remove queue item ' . $id);
-       q("DELETE FROM `queue` WHERE `id` = %d LIMIT 1",
-               intval($id)
-       );
-}
-
-       require_once("boot.php");
-
-       $a = new App;
-
-       @include(".htconfig.php");
-       require_once("dba.php");
-       $db = new dba($db_host, $db_user, $db_pass, $db_data);
-               unset($db_host, $db_user, $db_pass, $db_data);
+  if(is_null($a)){
+    $a = new App;
+  }
+  
+  if(is_null($db)){
+    @include(".htconfig.php");
+    require_once("dba.php");
+    $db = new dba($db_host, $db_user, $db_pass, $db_data);
+    unset($db_host, $db_user, $db_pass, $db_data);
+  };
 
 
        require_once("session.php");
@@ -31,8 +22,16 @@ function remove_queue_item($id) {
        require_once('include/items.php');
        require_once('include/bbcode.php');
 
+       load_config('config');
+       load_config('system');
+
        $a->set_baseurl(get_config('system','url'));
 
+       load_hooks();
+
+       $deadguys = array();
+
+       logger('queue: start');
 
        $r = q("SELECT `queue`.*, `contact`.`name`, `contact`.`uid` FROM `queue` 
                LEFT JOIN `contact` ON `queue`.`cid` = `contact`.`id` 
@@ -45,29 +44,44 @@ function remove_queue_item($id) {
                q("DELETE FROM `queue` WHERE `created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
        }
                
-       $r = q("SELECT `id` FROM `queue` WHERE 1 ");
+       $r = q("SELECT `id` FROM `queue` WHERE `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ");
+
+       if(! count($r)){
+               return;
+       }
+
+       call_hooks('queue_predeliver', $a, $r);
 
-       if(! count($r))
-               killme();
 
        // delivery loop
 
        require_once('include/salmon.php');
 
        foreach($r as $q_item) {
-               $qi = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
+
+               // queue_predeliver hooks may have changed the queue db details, 
+               // so check again if this entry still needs processing
+
+               $qi = q("SELECT * FROM `queue` WHERE `id` = %d AND `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ",
                        intval($q_item['id'])
                );
                if(! count($qi))
                        continue;
 
+
                $c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
-                       intval($q_item['cid'])
+                       intval($qi[0]['cid'])
                );
                if(! count($c)) {
                        remove_queue_item($q_item['id']);
                        continue;
                }
+               if(in_array($c[0]['notify'],$deadguys)) {
+                               logger('queue: skipping known dead url: ' . $c[0]['notify']);
+                               update_queue_time($q_item['id']);
+                               continue;
+               }
+
                $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
                        intval($c[0]['uid'])
                );
@@ -83,17 +97,19 @@ function remove_queue_item($id) {
                $deliver_status = 0;
 
                switch($contact['network']) {
-                       case 'dfrn':
+                       case NETWORK_DFRN:
                                logger('queue: dfrndelivery: item ' . $q_item['id'] . ' for ' . $contact['name']);
                                $deliver_status = dfrn_deliver($owner,$contact,$data);
 
-                               if($deliver_status == (-1))
+                               if($deliver_status == (-1)) {
                                        update_queue_time($q_item['id']);
-                               else
+                                       $deadguys[] = $contact['notify'];
+                               }
+                               else {
                                        remove_queue_item($q_item['id']);
-
+                               }
                                break;
-                       default:
+                       case NETWORK_OSTATUS:
                                if($contact['notify']) {
                                        logger('queue: slapdelivery: item ' . $q_item['id'] . ' for ' . $contact['name']);
                                        $deliver_status = slapper($owner,$contact['notify'],$data);
@@ -104,10 +120,25 @@ function remove_queue_item($id) {
                                                remove_queue_item($q_item['id']);
                                }
                                break;
+                       default:
+                               $params = array('owner' => $owner, 'contact' => $contact, 'queue' => $q_item, 'result' => false);
+                               call_hooks('queue_deliver', $a, $params);
+               
+                               if($params['result'])
+                                               remove_queue_item($q_item['id']);
+                               else
+                                               update_queue_time($q_item['id']);
+       
+                               break;
+
                }
        }
                
-       killme();
+       return;
 
-       // NOTREACHED
+}
 
+if (array_search(__file__,get_included_files())===0){
+  queue_run($argv,$argc);
+  killme();
+}