ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into feature-h264-videostorage

This commit is contained in:
Isaac Connor 2016-04-04 10:14:15 -04:00
parent abcf48b65c 9276eea491
commit c8fa0a9b4f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/includes/functions.php
View File

@ -985,6 +985,7 @@ function daemonControl( $command, $daemon=false, $args=false )
function zmcControl( $monitor, $mode=false ) function zmcControl( $monitor, $mode=false )
{ {
if ( (!ZM_SERVER) or ( ZM_SERVER==$monitor[ServerId}) ) {
$row = NULL; $row = NULL;
if ( $monitor['Type'] == "Local" ) if ( $monitor['Type'] == "Local" )
{ {
@ -1010,10 +1011,12 @@ function zmcControl( $monitor, $mode=false )
} }
daemonControl( "start", "zmc", $zmcArgs ); daemonControl( "start", "zmc", $zmcArgs );
} }
}
} }
function zmaControl( $monitor, $mode=false ) function zmaControl( $monitor, $mode=false )
{ {
if ( (!ZM_SERVER) or ( ZM_SERVER==$monitor[ServerId}) ) {
if ( !is_array( $monitor ) ) if ( !is_array( $monitor ) )
{ {
$monitor = dbFetchOne( "select C.*, M.* from Monitors as M left join Controls as C on (M.ControlId = C.Id ) where M.Id=?", NULL, array($monitor) ); $monitor = dbFetchOne( "select C.*, M.* from Monitors as M left join Controls as C on (M.ControlId = C.Id ) where M.Id=?", NULL, array($monitor) );
@ -1058,6 +1061,7 @@ function zmaControl( $monitor, $mode=false )
daemonControl( "reload", "zma", "-m ".$monitor['Id'] ); daemonControl( "reload", "zma", "-m ".$monitor['Id'] );
} }
} }
}
} }
function initDaemonStatus() function initDaemonStatus()