switch identities to manage pages

[friendica.git] / include / queue.php

diff --git a/include/queue.php b/include/queue.php
index fae93e328b2cec9e6e1386cedb0fa30e0addf4d4..d4fc7dbd6277d0aa0cebd7fe198fa5a2efdc0d54 100644 (file)
--- a/include/queue.php
+++ b/include/queue.php
@@ -1,5 +1,5 @@
 <?php
-
+require_once("boot.php");
 
 function update_queue_time($id) {
        logger('queue: requeue item ' . $id);
@@ -16,14 +16,19 @@ function remove_queue_item($id) {
        );
 }
 
-       require_once("boot.php");
-
-       $a = new App;
+function queue_run($argv, $argc){
+  global $a, $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);
+  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");
@@ -51,7 +56,7 @@ function remove_queue_item($id) {
        $r = q("SELECT `id` FROM `queue` WHERE `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ");
 
        if(! count($r)){
-               killme(); return;
+               return;
        }
        // delivery loop
 
@@ -118,7 +123,11 @@ function remove_queue_item($id) {
                }
        }
                
-       killme();
+       return;
 
-       // NOTREACHED
+}
 
+if (array_search(__file__,get_included_files())===0){
+  queue_run($argv,$argc);
+  killme();
+}