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/poller.php | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

(limited to 'include/poller.php')

diff --git a/include/poller.php b/include/poller.php
index a4bc60767..1003b2f08 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -1,14 +1,19 @@
 <?php
-
-
-	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);
+require_once("boot.php");
+
+function poller_run($argv, $argc){
+  global $a, $db;
+
+  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');
 	require_once('datetime.php');
@@ -48,7 +53,7 @@
 		AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()");
 
 	if(! count($contacts)){
-		killme(); return;
+		return;
 	}
 
 	foreach($contacts as $contact) {
@@ -267,7 +272,10 @@
 		// loop - next contact
 	}  
 		
-	killme();
-
-
+	return;
+}
 
+if (array_search(__file__,get_included_files())===0){
+  poller_run($argv,$argc);
+  killme();
+}
-- 
cgit v1.2.3