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

put back the AS E

pull/3038/head
Isaac Connor 2017-05-18 14:39:58 -04:00
parent 4763ace165
commit 84a224d712
1 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/skins/classic/views/timeline.php
View File

@ -130,7 +130,7 @@ $chart = array(
);
$monitors = array();
$monitorsSql = "select * from Monitors order by Sequence asc";
$monitorsSql = 'SELECT * FROM Monitors ORDER BY Sequence ASC';
//srand( 97981 );
foreach( dbFetchAll( $monitorsSql ) as $row ) {
//if ( empty($row['WebColour']) )
@ -140,8 +140,8 @@ foreach( dbFetchAll( $monitorsSql ) as $row ) {
$monitors[$row['Id']] = $row;
}
$rangeSql = 'SELECT min(StartTime) AS MinTime, max(EndTime) AS MaxTime FROM Events WHERE NOT isnull(StartTime) AND NOT isnull(EndTime)';
$eventsSql = 'SELECT * FROM Events WHERE NOT isnull(StartTime)';
$rangeSql = 'SELECT min(StartTime) AS MinTime, max(EndTime) AS MaxTime FROM Events AS E WHERE NOT isnull(StartTime) AND NOT isnull(EndTime)';
$eventsSql = 'SELECT * FROM Events AS E WHERE NOT isnull(StartTime)';
if ( !empty($user['MonitorIds']) ) {
$monFilterSql = ' AND MonitorId IN ('.$user['MonitorIds'].')';