aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfabrixxm <fabrix.xm@gmail.com>2011-08-18 13:06:17 +0200
committerfabrixxm <fabrix.xm@gmail.com>2011-08-18 13:06:17 +0200
commit6686d1441f9400709898f7a4be2fe8687613a194 (patch)
tree7242e53bcf1085d5a385e9df5ae318dff098c896
parentf561a82647701065d96724fd348c295aab155368 (diff)
downloadvolse-hubzilla-6686d1441f9400709898f7a4be2fe8687613a194.tar.gz
volse-hubzilla-6686d1441f9400709898f7a4be2fe8687613a194.tar.bz2
volse-hubzilla-6686d1441f9400709898f7a4be2fe8687613a194.zip
Issue 120: poormancron plugin uses php cli if available
-rw-r--r--addon/poormancron/poormancron.php16
1 files changed, 16 insertions, 0 deletions
diff --git a/addon/poormancron/poormancron.php b/addon/poormancron/poormancron.php
index e09182f99..bbe023cd7 100644
--- a/addon/poormancron/poormancron.php
+++ b/addon/poormancron/poormancron.php
@@ -7,6 +7,21 @@
*/
function poormancron_install() {
+ // check for command line php
+ $a = get_app();
+ $ex = Array();
+ $ex[0] = ((x($a->config,'php_path')) && (strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
+ $ex[1] = dirname(dirname(dirname(__file__)))."/testargs.php";
+ $ex[2] = "test";
+ $out = exec(implode(" ", $ex));
+ if ($out==="test") {
+ set_config('poormancron','usecli',1);
+ logger("poormancron will use cli php");
+ } else {
+ set_config('poormancron','usecli',0);
+ logger("poormancron will NOT use cli php");
+ }
+
register_hook('page_end', 'addon/poormancron/poormancron.php', 'poormancron_hook');
register_hook('proc_run', 'addon/poormancron/poormancron.php','poormancron_procrun');
logger("installed poormancron");
@@ -32,6 +47,7 @@ function poormancron_hook(&$a,&$b) {
}
function poormancron_procrun(&$a, &$arr) {
+ if (get_config('poormancron','usecli')==1) return;
$argv = $arr['args'];
$arr['run_cmd'] = false;
logger("poormancron procrun ".implode(", ",$argv));