ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1858 from connortechnology/fix_1849 

fixes escaping
pull/1562/merge
Andrew Bauer 2017-04-18 19:54:28 -05:00 committed by GitHub
parent c4164cda07 f2920c37e0
commit f3e22689ac
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/includes/functions.php
View File

@ -832,12 +832,13 @@ function packageControl( $command ) {
function daemonControl( $command, $daemon=false, $args=false ) {
$string = ZM_PATH_BIN."/zmdc.pl $command";
if ( $daemon ) {
$string .= escapeshellarg(" $daemon");
$string .= ' ' . $daemon;
if ( $args ) {
$string .= escapeshellarg(" $args");
$string .= ' ' . $args;
}
}
$string .= " 2>/dev/null >&- <&- >/dev/null";
$string = escapeshellcmd( $string );
$string .= ' 2>/dev/null >&- <&- >/dev/null';
exec( $string );
}
@ -944,10 +945,11 @@ function zmaStatus( $monitor ) {
function daemonCheck( $daemon=false, $args=false ) {
$string = ZM_PATH_BIN."/zmdc.pl check";
if ( $daemon ) {
$string .= escapeshellarg(" $daemon");
$string .= ' ' . $daemon;
if ( $args )
$string .= escapeshellarg(" $args");
$string .= ' '. $args;
}
$string = escapeshellcmd( $string );
$result = exec( $string );
return( preg_match( '/running/', $result ) );
}