From 2020ea23b106c159a705c26e6c79156aafde75ba Mon Sep 17 00:00:00 2001
From: fabrixxm <fabrix.xm@gmail.com>
Date: Mon, 24 Jan 2011 22:01:56 +0100
Subject: Mods to script runned via CLI to permits to run also included

---
 include/queue.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'include/queue.php')

diff --git a/include/queue.php b/include/queue.php
index 96ddfa81b..fae93e328 100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -50,9 +50,9 @@ function remove_queue_item($id) {
 		
 	$r = q("SELECT `id` FROM `queue` WHERE `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ");
 
-	if(! count($r))
-		killme();
-
+	if(! count($r)){
+		killme(); return;
+	}
 	// delivery loop
 
 	require_once('include/salmon.php');
-- 
cgit v1.2.3


From ef33ca67501559fba72281f0d1f32fc6ef43704d Mon Sep 17 00:00:00 2001
From: Fabio Comuni <fabrix.xm@gmail.com>
Date: Fri, 28 Jan 2011 14:04:18 +0100
Subject: modded scripts to be runned in cli so they can be included and
 executed in main program

---
 include/queue.php | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'include/queue.php')

diff --git a/include/queue.php b/include/queue.php
index fae93e328..d4fc7dbd6 100644
--- 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();
+}
-- 
cgit v1.2.3