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

code style and whitespace changes

pull/3038/head
Isaac Connor 2017-03-17 09:59:23 -04:00
parent b041e299fc
commit 8834109812
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/skins/classic/views/montagereview.php
View File

@ -94,23 +94,19 @@
// - Add auth tokens to zms call for those using authorization // - Add auth tokens to zms call for those using authorization
// //
if ( !canView( 'Events' ) ) if ( !canView( 'Events' ) ) {
{
$view = "error"; $view = "error";
return; return;
} }
require_once( 'includes/Monitor.php' ); require_once( 'includes/Monitor.php' );
if ( !empty($_REQUEST['group']) ) if ( !empty($_REQUEST['group']) ) {
{
$group = $_REQUEST['group']; $group = $_REQUEST['group'];
$row = dbFetchOne( 'select * from Groups where Id = ?', NULL, array($_REQUEST['group']) ); $row = dbFetchOne( 'select * from Groups where Id = ?', NULL, array($_REQUEST['group']) );
$monitorsSql = "select * from Monitors where Function != 'None' and find_in_set( Id, '".$row['MonitorIds']."' ) "; $monitorsSql = "select * from Monitors where Function != 'None' and find_in_set( Id, '".$row['MonitorIds']."' ) ";
} } else {
else $monitorsSql = "select * from Monitors ";
{
$monitorsSql = "select * from Monitors ";
$group = ""; $group = "";
} }
@ -151,7 +147,7 @@ if ( !empty($user['MonitorIds']) )
$eventsSql .= $monFilterSql; $eventsSql .= $monFilterSql;
$monitorsSQL .= $monFilterSql; $monitorsSQL .= $monFilterSql;
$frameSql .= ' AND e.MonitorId IN ('.$user['MonitorIds'].')'; $frameSql .= ' AND E.MonitorId IN ('.$user['MonitorIds'].')';
} }
// Parse input parameters -- note for future, validate/clean up better in case we don't get called from self. // Parse input parameters -- note for future, validate/clean up better in case we don't get called from self.