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

remaining conversions

This commit is contained in:
Isaac Connor 2014-03-22 14:16:56 -04:00
parent bfb52ab9aa
commit 957d6f123f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/skins/flat/views/console.php
View File

@ -73,7 +73,7 @@ $status = $running?$SLANG['Running']:$SLANG['Stopped'];
$group = NULL; $group = NULL;
if ( ! empty($_COOKIE['zmGroup']) ) { if ( ! empty($_COOKIE['zmGroup']) ) {
if ( $group = dbFetchOne( 'SELECT * FROM Groups WHERE Id = ?', NULL, ARRAY($_COOKIE['zmGroup']) ) ) if ( $group = dbFetchOne( 'SELECT * FROM Groups WHERE Id = ?', NULL, array($_COOKIE['zmGroup']) ) )
$groupIds = array_flip(explode( ',', $group['MonitorIds'] )); $groupIds = array_flip(explode( ',', $group['MonitorIds'] ));
} }

4
web/skins/flat/views/watch.php
View File

@ -24,8 +24,8 @@ if ( !canView( 'Stream' ) )
return; return;
} }
$sql = "select C.*, M.* from Monitors as M left join Controls as C on (M.ControlId = C.Id ) where M.Id = '".dbEscape($_REQUEST['mid'])."'"; $sql = 'SELECT C.*, M.* FROM Monitors AS M LEFT JOIN Controls AS C ON (M.ControlId = C.Id ) WHERE M.Id = ?';
$monitor = dbFetchOne( $sql ); $monitor = dbFetchOne( $sql, NULL, array($_REQUEST['mid']) );
if ( isset($_REQUEST['showControls']) ) if ( isset($_REQUEST['showControls']) )
$showControls = validInt($_REQUEST['showControls']); $showControls = validInt($_REQUEST['showControls']);