updated poormancron plugin

1 files changed, 16 insertions, 19 deletions

diff --git a/addon/poormancron/poormancron.php b/addon/poormancron/poormancron.php
index 98231727d..c31d2772c 100644
--- a/addon/poormancron/poormancron.php
+++ b/addon/poormancron/poormancron.php
@@ -7,18 +7,15 @@
  */
 
 function poormancron_install() {
-
-	register_hook('profile_sidebar', 'addon/poormancron/poormancron.php', 'poormancron_hook');
-    register_hook('proc_run', 'addon/poormancron/poormancron.php','poormancron_procrun');
-
+	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('profile_sidebar', 'addon/poormancron/poormancron.php', 'poormancron_hook');
-    unregister_hook('proc_run', 'addon/poormancron/poormancron.php','poormancron_procrun');
-    logger("removed poormancron");
+	unregister_hook('page_end', 'addon/poormancron/poormancron.php', 'poormancron_hook');
+	unregister_hook('proc_run', 'addon/poormancron/poormancron.php','poormancron_procrun');
+	logger("removed poormancron");
 }
 
 
@@ -30,22 +27,22 @@ function poormancron_hook($a,&$b) {
     // 300 secs, 5 mins
     if (!$lastupdate || ($now-$lastupdate)>300) {
         set_config('poormancron','lastupdate', $now);
-		$b .= "<img src='".$a->get_baseurl()."/queue_wrapper.php' width='1px' height='1px' style='display:none'>";        
-        $b .= "<img src='".$a->get_baseurl()."/poller_wrapper.php' width='1px' height='1px' style='display:none'>";
-
+        $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+        proc_run($php_path,"include/poller.php");
     }
-    
 }
 
-
-function poormancron_procrun($a, $args) {
-	$argv = array_shift($args);
+function poormancron_procrun($a, $argv) {
+	logger("poormancron procrun ".implode(", ",$argv));
+	array_shift($argv);
 	$argc = count($argv);
-	function killme(){
-		// pass
-	}
-	require_once($argv[0]);	
+	logger("poormancron procrun require_once ".basename($argv[0]));
+	require_once(basename($argv[0]));
+	$funcname=str_replace(".php", "", basename($argv[0]))."_run";
+  
+	$funcname($argv, $argc);
 }
 
 
+
 ?>