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

Merge branch 'master' into storageareas

This commit is contained in:
Isaac Connor 2016-04-04 16:13:17 -04:00
parent faa75bbe39 02eb36040a
commit bc9760ce79
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/includes/functions.php
View File

@ -963,7 +963,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'] ) ) { if ( (!ZM_SERVER) or ( ZM_SERVER==$monitor['ServerId'] ) ) {
$row = NULL; $row = NULL;
if ( $monitor['Type'] == "Local" ) if ( $monitor['Type'] == "Local" )
{ {
$row = dbFetchOne( "select count(if(Function!='None',1,NULL)) as ActiveCount from Monitors where Device = ?", NULL, array($monitor['Device']) ); $row = dbFetchOne( "select count(if(Function!='None',1,NULL)) as ActiveCount from Monitors where Device = ?", NULL, array($monitor['Device']) );
@ -993,7 +993,7 @@ function zmcControl( $monitor, $mode=false )
function zmaControl( $monitor, $mode=false ) function zmaControl( $monitor, $mode=false )
{ {
if ( (!ZM_SERVER) or ( ZM_SERVER==$monitor['ServerId']) ) { 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) );