Browse Source

poormancron - proc_run executing twice, once as function; once as commandline

pull/1/head
Friendika 10 years ago
parent
commit
96bcaf4331
  1. 4
      addon/poormancron/poormancron.php
  2. 9
      boot.php

4
addon/poormancron/poormancron.php

@ -31,7 +31,9 @@ function poormancron_hook(&$a,&$b) {
}
}
function poormancron_procrun(&$a, $argv) {
function poormancron_procrun(&$a, &$arr) {
$argv = $arr['args'];
$arr['run_cmd'] = false;
logger("poormancron procrun ".implode(", ",$argv));
array_shift($argv);
$argc = count($argv);

9
boot.php

@ -7,7 +7,7 @@ require_once('include/text.php');
require_once("include/pgettext.php");
define ( 'FRIENDIKA_VERSION', '2.2.1074' );
define ( 'FRIENDIKA_VERSION', '2.2.1075' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1079 );
@ -1033,11 +1033,14 @@ function proc_run($cmd){
$a = get_app();
$args = func_get_args();
call_hooks("proc_run", $args);
$arr = array('args' => $args, 'run_cmd' => true);
call_hooks("proc_run", $arr);
if(! $arr['run_cmd'])
return;
if(count($args) && $args[0] === 'php')
$args[0] = ((x($a->config,'php_path')) && (strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
foreach ($args as $arg){
$arg = escapeshellarg($arg);
}

Loading…
Cancel
Save