hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 06:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge with 3.7

Browse Source
This commit is contained in:
Romain Neutron
2012-10-04 12:49:01 +02:00
parent 832867a2b2 ec450c46f4
commit ba25b8cc7c
48 changed files with 353 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/classes/task/abstract.class.php
View File

@@ -900,4 +900,18 @@ abstract class task_abstract
return $this;
}
/**
* Escape a shell command.
*
* As this function is buggy under windows, this method check the
* environment
*
* @param string $command
* @return string
*/
protected static function escapeShellCmd($command)
{
return defined('PHP_WINDOWS_VERSION_BUILD') ? escapeshellarg($command) : escapeshellcmd($command);
}
}

8
lib/classes/task/period/cindexer.class.php
View File

@@ -473,18 +473,18 @@ class task_period_cindexer extends task_abstract
$pipes = array();
$logcmd = $cmd;
$logcmd = self::escapeShellCmd($cmd);
foreach ($args_nopwd as $arg) {
$logcmd .= ' ' . escapeshellarg($arg);
}
$this->log(sprintf('cmd=\'%s\'', escapeshellcmd($logcmd)));
$this->log(sprintf('cmd=\'%s\'', self::escapeShellCmd($logcmd)));
$execmd = $cmd;
$execmd = self::escapeShellCmd($cmd);
foreach ($args as $arg) {
$execmd .= ' ' . escapeshellarg($arg);
}
$process = proc_open(escapeshellcmd($execmd), $descriptors, $pipes, $this->binpath, null, array('bypass_shell' => true));
$process = proc_open($execmd, $descriptors, $pipes, $this->binpath, null, array('bypass_shell' => true));
$pid = NULL;
if (is_resource($process)) {