Merge branch 'fabrixxm-master'

Conflicts:
	boot.php

addon/poormancron/poormancron.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Poor Man Cron. Execute updates on pageviews
+ *
+ * Addon Name: poormancron
+ *
+ */
+
+function poormancron_install() {
+	register_hook('page_end', 'addon/poormancron/poormancron.php', 'poormancron_hook');
+	register_hook('proc_run', 'addon/poormancron/poormancron.php','poormancron_procrun');
+	logger("installed poormancron");
+}
+
+function poormancron_uninstall() {
+	unregister_hook('page_end', 'addon/poormancron/poormancron.php', 'poormancron_hook');
+	unregister_hook('proc_run', 'addon/poormancron/poormancron.php','poormancron_procrun');
+	logger("removed poormancron");
+}
+
+
+
+function poormancron_hook($a,&$b) {
+    $now = time();
+    $lastupdate = get_config('poormancron', 'lastupdate');
+
+    // 300 secs, 5 mins
+    if (!$lastupdate || ($now-$lastupdate)>300) {
+        set_config('poormancron','lastupdate', $now);
+        $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+        proc_run($php_path,"include/poller.php");
+    }
+}
+
+function poormancron_procrun($a, $argv) {
+	logger("poormancron procrun ".implode(", ",$argv));
+	array_shift($argv);
+	$argc = count($argv);
+	logger("poormancron procrun require_once ".basename($argv[0]));
+	require_once(basename($argv[0]));
+	$funcname=str_replace(".php", "", basename($argv[0]))."_run";
+  
+	$funcname($argv, $argc);
+}
+
+
+
+?>

boot.php

@@ -1655,7 +1655,6 @@ function attribute_contains($attr,$s) {
 
 if(! function_exists('logger')) {
 function logger($msg,$level = 0) {
-
 	$debugging = get_config('system','debugging');
 	$loglevel  = intval(get_config('system','loglevel'));
 	$logfile   = get_config('system','logfile');
@@ -2225,7 +2224,31 @@ function prepare_body($item) {
 	$s = smilies(bbcode($item['body']));
 
 	return $s;
+}}
 
+/**
+ * 
+ * Wrap calls to proc_close(proc_open()) and call hook
+ * so plugins can take part in process :)
+ * 
+ * args:
+ * $cmd program to run
+ *  next args are passed as $cmd command line
+ * 
+ * e.g.: proc_run("ls","-la","/tmp");
+ * 
+ * $cmd and string args are surrounded with ""
+ */
 
+if(! function_exists('run_proc')) {
+function proc_run($cmd){
+	$args = func_get_args();
+	call_hooks("proc_run", $args);
+	
+	foreach ($args as &$arg){
+		if(is_string($arg)) $arg='"'.$arg.'"';
+	}
+	$cmdline = implode($args," ");
+	proc_close(proc_open($cmdline." &",array(),$foo));
+}}
 
-}}

include/directory.php

@@ -1,17 +1,22 @@
 <?php
+require_once("boot.php");
 
-	require_once("boot.php");
+function directory_run($argv, $argc){
-
+  global $a, $db;
-	$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);
+  };
 
 	if($argc != 2)
-		exit;
+		return;
 
 	load_config('system');
 
@@ -20,9 +25,14 @@
 	$dir = get_config('system','directory_submit_url');
 
 	if(! strlen($dir))
-		exit;
+		return;
 
 	fetch_url($dir . '?url=' . bin2hex($argv[1]));
 
-	exit;
+	return;
+}
 
+if (array_search(__file__,get_included_files())===0){
+  directory_run($argv,$argc);
+  killme();
+}

include/notifier.php

@@ -1,14 +1,19 @@
 <?php
+require_once("boot.php");
 
-	require_once("boot.php");
+function notifier_run($argv, $argc){
-
+  global $a, $db;
-	$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");
 	require_once("datetime.php");
@@ -16,7 +21,7 @@
 	require_once('include/bbcode.php');
 
 	if($argc < 3)
-		exit;
+		return;
 
 	$a->set_baseurl(get_config('system','url'));
 
@@ -29,8 +34,9 @@
 		case 'mail':
 		default:
 			$item_id = intval($argv[2]);
-			if(! $item_id)
+			if(! $item_id){
-				killme();
+				return;
+			}
 			break;
 	}
 
@@ -42,22 +48,24 @@
 		$message = q("SELECT * FROM `mail` WHERE `id` = %d LIMIT 1",
 				intval($item_id)
 		);
-		if(! count($message))
+		if(! count($message)){
-			killme();
+			return;
+		}
 		$uid = $message[0]['uid'];
 		$recipients[] = $message[0]['contact-id'];
 		$item = $message[0];
 
 	}
 	else {
-		// find ancestors
 
+		// find ancestors
 		$r = q("SELECT `parent`, `uid`, `edited` FROM `item` WHERE `id` = %d LIMIT 1",
 			intval($item_id)
 		);
-		if(! count($r))
+		if(! count($r)){
-			killme();
+			return;
-
+		}
+  
 		$parent_id = $r[0]['parent'];
 		$uid = $r[0]['uid'];
 		$updated = $r[0]['edited'];
@@ -66,8 +74,9 @@
 			intval($parent_id)
 		);
 
-		if(! count($items))
+		if(! count($items)){
-			killme();
+			return;
+		}
 	}
 
 	$r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, `user`.`page-flags` 
@@ -78,9 +87,9 @@
 
 	if(count($r))
 		$owner = $r[0];
-	else
+	else {
-		killme();
+		return;
-
+	}
 	$hub = get_config('system','huburl');
 
 	// If this is a public conversation, notify the feed hub
@@ -150,8 +159,9 @@
 
 		$r = q("SELECT * FROM `contact` WHERE `id` IN ( $conversant_str ) AND `blocked` = 0 AND `pending` = 0");
 
-		if( ! count($r))
+		if( ! count($r)){
-			killme();
+			return;
+		}
 
 		$contacts = $r;
 	}
@@ -248,9 +258,9 @@
 	$r = q("SELECT * FROM `contact` WHERE `id` IN ( %s ) AND `blocked` = 0 ",
 		dbesc($recip_str)
 	);
-	if(! count($r))
+	if(! count($r)){
-		killme();
+		return;
-
+	}
 	// delivery loop
 
 	require_once('include/salmon.php');
@@ -360,5 +370,11 @@
 		}
 	}
 
-	killme();
+	return;
+}
 
+if (array_search(__file__,get_included_files())===0){
+  echo "run!";
+  notifier_run($argv,$argc);
+  killme();
+}

include/poller.php

@@ -1,14 +1,19 @@
 <?php
+require_once("boot.php");
 
+function poller_run($argv, $argc){
+  global $a, $db;
 
-	require_once('boot.php');
+  if(is_null($a)){
-
+    $a = new App;
-	$a = new App;
+  }
-
+  
-	@include('.htconfig.php');
+  if(is_null($db)){
-	require_once('dba.php');
+    @include(".htconfig.php");
-	$db = new dba($db_host, $db_user, $db_pass, $db_data);
+    require_once("dba.php");
-		unset($db_host, $db_user, $db_pass, $db_data);
+    $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');
@@ -19,11 +24,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 +52,9 @@
 		$sql_extra 
 		AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()");
 
-	if(! count($contacts))
+	if(! count($contacts)){
-		killme();
+		return;
+	}
 
 	foreach($contacts as $contact) {
 
@@ -265,7 +272,10 @@
 		// loop - next contact
 	}  
 		
-	killme();
+	return;
-
+}
-
 
+if (array_search(__file__,get_included_files())===0){
+  poller_run($argv,$argc);
+  killme();
+}

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");
+function queue_run($argv, $argc){
+  global $a, $db;
 
-	$a = new App;
+  if(is_null($a)){
-
+    $a = new App;
-	@include(".htconfig.php");
+  }
-	require_once("dba.php");
+  
-	$db = new dba($db_host, $db_user, $db_pass, $db_data);
+  if(is_null($db)){
-		unset($db_host, $db_user, $db_pass, $db_data);
+    @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");
@@ -50,9 +55,9 @@ function remove_queue_item($id) {
 		
 	$r = q("SELECT `id` FROM `queue` WHERE `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE ");
 
-	if(! count($r))
+	if(! count($r)){
-		killme();
+		return;
-
+	}
 	// delivery loop
 
 	require_once('include/salmon.php');
@@ -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();
+}

mod/dfrn_confirm.php

@@ -438,8 +438,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 
 				$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 
-			    proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"activity\" \"$i\" &",
+			    //proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"activity\" \"$i\" &", array(),$foo));
-        		array(),$foo));
+			    proc_run($php_path,"include/notifier.php","activity","$i");
 
 			}
 

mod/dfrn_notify.php

@@ -304,9 +304,9 @@ function dfrn_notify_post(&$a) {
 
 					$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 
-					proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"comment-import\" \"$posted_id\" &", 
+					//proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"comment-import\" \"$posted_id\" &", array(),$foo));
-						array(),$foo));
+					proc_run($php_path,"include/notifier.php","comment-import","$posted_id");
-
+					
 					if((! $is_like) && ($importer['notify-flags'] & NOTIFY_COMMENT) && (! $importer['self'])) {
 						require_once('bbcode.php');
 						$from = stripslashes($datarray['author-name']);

mod/follow.php

@@ -208,8 +208,8 @@ function follow_post(&$a) {
 	// pull feed and consume it, which should subscribe to the hub.
 
 	$php_path = ((x($a->config,'php_path') && strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-	proc_close(proc_open("\"$php_path\" \"include/poller.php\" \"$contact_id\" &", array(), $foo));
+	//proc_close(proc_open("\"$php_path\" \"include/poller.php\" \"$contact_id\" &", array(), $foo));
-
+	proc_run($php_path,"include/poller.php","$contact_id");
 
 	// create a follow slap
 

mod/item.php

@@ -421,8 +421,7 @@ function item_post(&$a) {
 
 	logger('mod_item: notifier invoked: ' . "\"$php_path\" \"include/notifier.php\" \"$notify_type\" \"$post_id\" &");
 
-	proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"$notify_type\" \"$post_id\" &",
+  proc_run($php_path, "include/notifier.php", $notify_type, "$post_id");
-		array(),$foo));
 
 	$datarray['id'] = $post_id;
 
@@ -520,8 +519,8 @@ function item_content(&$a) {
 			
 			// send the notification upstream/downstream as the case may be
 
-			proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" &",
+			//proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" &", array(), $foo));
-				array(), $foo));
+			proc_run($php_path,"include/notifier.php","drop","$drop_id");
 
 			goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
 			return; //NOTREACHED

mod/like.php

@@ -102,8 +102,8 @@ function like_content(&$a) {
 		);
 
 		$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-		proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"like\" \"$post_id\" &",
+		//proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"like\" \"$post_id\" &", array(),$foo));
-			array(),$foo));
+		proc_run($php_path,"include/notifier.php","like","$post_id");
 		return;
 	}
 
@@ -176,8 +176,8 @@ EOT;
 
 	$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 
-	proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"like\" \"$post_id\" &",
+	//proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"like\" \"$post_id\" &", array(),$foo));
-		array(),$foo));
+	proc_run($php_path,"include/notifier.php","like","$post_id");
 
 	return; // NOTREACHED
 }

mod/message.php

@@ -72,8 +72,8 @@ function message_post(&$a) {
 	$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 	
 	if($post_id) {
-		proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" &",
+		//proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"mail\" \"$post_id\" &", array(),$foo));
-			array(),$foo));
+		proc_run($php_path,"include/notifier.php","mail","$post_id");
 		notice( t('Message sent.') . EOL );
 	}
 	else {

mod/photos.php

@@ -187,9 +187,8 @@ foreach($_FILES AS $key => $val) {
 					// send the notification upstream/downstream as the case may be
 
 					if($rr['visible'])
-						proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" & ",
+						//proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" & ",array(),$foo));
-							array(),$foo));
+						proc_run($php_path,"include/notifier.php","drop","$drop_id");
-
 				}
 			}
 		}
@@ -236,8 +235,8 @@ foreach($_FILES AS $key => $val) {
 				$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 
 				if($i[0]['visible'])
-					proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" & ",
+					//proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"drop\" \"$drop_id\" & ", 	array(),$foo));
-						array(),$foo));
+					proc_run($php_path,"include/notifier.php","drop","$drop_id");
 			}
 		}
 
@@ -462,8 +461,8 @@ foreach($_FILES AS $key => $val) {
 
 					$item_id = item_store($arr);
 					$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-					proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"tag\" \"$item_id\" & ",
+					//proc_close(proc_open("\"$php_path\" \"include/notifier.php\" \"tag\" \"$item_id\" & ",array(),$foo));
-						array(),$foo));
+					proc_run($php_path,"include/notifier.php","tag","$item_id");
 				}
 
 			}

mod/profile_photo.php

@@ -90,8 +90,8 @@ function profile_photo_post(&$a) {
 				$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 				$url = $_SESSION['my_url'];
 				if($url && strlen(get_config('system','directory_submit_url')))
-					proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",
+					//proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",array(),$foo));
-						array(),$foo));
+					proc_run($php_path,"include/directory.php","$url");
 			}
 			else
 				notice( t('Unable to process image') . EOL);

mod/profiles.php

@@ -203,8 +203,8 @@ function profiles_post(&$a) {
 			$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 			$url = $_SESSION['my_url'];
 			if($url && strlen(get_config('system','directory_submit_url')))
-				proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",
+				//proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &", array(),$foo));
-					array(),$foo));
+				proc_run($php_path,"include/directory.php","$url");
 		}
 	}
 }

mod/settings.php

@@ -182,8 +182,8 @@ function settings_post(&$a) {
 		$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 		$url = $_SESSION['my_url'];
 		if($url && strlen(get_config('system','directory_submit_url')))
-			proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",
+			//proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",array(),$foo));
-				array(),$foo));
+			proc_run($php_path,"include/directory.php","$url");
 	}
 
 	$_SESSION['theme'] = $theme;