lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: command not found with escapeshellarg !

Browse Source
This commit is contained in:
Regis Houssin 2017-09-29 14:52:05 +02:00
parent abc86d72f6
commit 9490e13c21
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/core/class/antivir.class.php
View File

@ -63,9 +63,9 @@ class AntiVir
if (preg_match('/\.virus$/i', $file)) if (preg_match('/\.virus$/i', $file))
{ {
$this->errors='File has an extension saying file is a virus'; $this->errors='File has an extension saying file is a virus';
return -97; return -97;
} }
$fullcommand=$this->getCliCommand($file); $fullcommand=$this->getCliCommand($file);
//$fullcommand='"c:\Program Files (x86)\ClamWin\bin\clamscan.exe" --database="C:\Program Files (x86)\ClamWin\lib" "c:\temp\aaa.txt"'; //$fullcommand='"c:\Program Files (x86)\ClamWin\bin\clamscan.exe" --database="C:\Program Files (x86)\ClamWin\lib" "c:\temp\aaa.txt"';
$fullcommand.=' 2>&1'; // This is to get error output $fullcommand.=' 2>&1'; // This is to get error output
@ -160,7 +160,8 @@ class AntiVir
if (! preg_match('/%file/',$conf->global->MAIN_ANTIVIRUS_PARAM)) if (! preg_match('/%file/',$conf->global->MAIN_ANTIVIRUS_PARAM))
$param=$param." ".escapeshellarg(trim($file)); $param=$param." ".escapeshellarg(trim($file));
if (preg_match("/\s/",$command)) $command=escapeshellarg($command); // Use quotes on command. Using escapeshellcmd fails. //if (preg_match("/\s/",$command)) $command=escapeshellarg($command); // Use quotes on command. Using escapeshellcmd fails.
if (preg_match("/\s/",$command)) $command=escapeshellcmd($command); // Use quotes on command. Using escapeshellarg fails.
$ret=$command.' '.$param; $ret=$command.' '.$param;
//$ret=$command.' '.$param.' 2>&1'; //$ret=$command.' '.$param.' 2>&1';