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/poller.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'include/poller.php')

diff --git a/include/poller.php b/include/poller.php
index 024b9fbcd..a4bc60767 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -19,11 +19,12 @@
 	$a->set_baseurl(get_config('system','url'));
 
 	logger('poller: start');
-
+	
 	// run queue delivery process in the background
 
 	$php_path = ((x($a->config,'php_path') && strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-	proc_close(proc_open("\"$php_path\" \"include/queue.php\" &", array(), $foo));
+	//proc_close(proc_open("\"$php_path\" \"include/queue.php\" &", array(), $foo));
+	proc_run($php_path,"include/queue.php");
 
 
 	$hub_update = false;
@@ -46,8 +47,9 @@
 		$sql_extra 
 		AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()");
 
-	if(! count($contacts))
-		killme();
+	if(! count($contacts)){
+		killme(); return;
+	}
 
 	foreach($contacts as $contact) {
 
-- 
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/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


From a598f17e6d95d8a82df2994d61bfab74271dfe58 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 30 Jan 2011 18:25:41 -0800
Subject: wrong ref in ssl policy

---
 include/poller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/poller.php')

diff --git a/include/poller.php b/include/poller.php
index 1003b2f08..0dbc6f583 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -76,7 +76,7 @@ function poller_run($argv, $argc){
 				$contact['priority'] = (($interval !== false) ? intval($interval) : 3);
 				$hub_update = false;
 
-				if(datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day"))
+				if((datetime_convert('UTC','UTC', 'now') > datetime_convert('UTC','UTC', $t . " + 1 day")) || $force)
 						$hub_update = true;
 			}
 
-- 
cgit v1.2.3


From 3eefe8b50003c858d4930c03cc06d2679a14347c Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 30 Jan 2011 19:38:03 -0800
Subject: more ssl_policy cleanup, allow manual feed update per contact when
 hub is whacked, log feed parse errors

---
 include/poller.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'include/poller.php')

diff --git a/include/poller.php b/include/poller.php
index 0dbc6f583..4567a5cfc 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -58,6 +58,9 @@ function poller_run($argv, $argc){
 
 	foreach($contacts as $contact) {
 
+			if($manual_id)
+				$contact['last-update'] = '0000-00-00 00:00:00';
+
 		if($contact['priority'] || $contact['subhub']) {
 
 			$hub_update = true;
-- 
cgit v1.2.3