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

Fixed montage name bug. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@892 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2004-02-21 21:46:16 +00:00
parent fcbab2e1b9
commit 50377b8a37
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/zm_html_view_events.php
View File

@ -81,7 +81,7 @@ $sort_order = $sort_asc?"asc":"desc";
if ( !$sort_asc ) $sort_asc = 0; if ( !$sort_asc ) $sort_asc = 0;
$count_sql = "select count(E.Id) as EventCount from Monitors as M inner join Events as E on (M.Id = E.MonitorId) where"; $count_sql = "select count(E.Id) as EventCount from Monitors as M inner join Events as E on (M.Id = E.MonitorId) where";
$events_sql = "select E.Id,M.Id as MonitorId,M.Name As MonitorName,E.Name,E.StartTime,E.Length,E.Frames,E.AlarmFrames,E.TotScore,E.AvgScore,E.MaxScore,E.Archived,E.LearnState from Monitors as M inner join Events as E on (M.Id = E.MonitorId) where"; $events_sql = "select E.Id,E.MonitorId,M.Name As MonitorName,E.Name,E.StartTime,E.Length,E.Frames,E.AlarmFrames,E.TotScore,E.AvgScore,E.MaxScore,E.Archived,E.LearnState from Monitors as M inner join Events as E on (M.Id = E.MonitorId) where";
if ( $user['MonitorIds'] ) if ( $user['MonitorIds'] )
{ {
$count_sql .= " M.Id in (".join( ",", preg_split( '/["\'\s]*,["\'\s]*/', $user['MonitorIds'] ) ).")"; $count_sql .= " M.Id in (".join( ",", preg_split( '/["\'\s]*,["\'\s]*/', $user['MonitorIds'] ) ).")";
@ -127,9 +127,8 @@ for ( $i = 1; $i <= $trms; $i++ )
$value = $$value_name; $value = $$value_name;
switch ( $$attr_name ) switch ( $$attr_name )
{ {
case 'MonitorId':
case 'MonitorName': case 'MonitorName':
$filter_sql .= $$attr_name; $filter_sql .= 'M.'.preg_replace( '/^Monitor/', '', $$attr_name );
break; break;
case 'DateTime': case 'DateTime':
$value = strftime( "%Y-%m-%d %H:%M:%S", strtotime( $$value_name ) ); $value = strftime( "%Y-%m-%d %H:%M:%S", strtotime( $$value_name ) );
@ -147,6 +146,7 @@ for ( $i = 1; $i <= $trms; $i++ )
$value = "weekday( '".strftime( "%Y-%m-%d %H:%M:%S", strtotime( $$value_name ) )."' )"; $value = "weekday( '".strftime( "%Y-%m-%d %H:%M:%S", strtotime( $$value_name ) )."' )";
$filter_sql .= "weekday( E.StartTime )"; $filter_sql .= "weekday( E.StartTime )";
break; break;
case 'MonitorId':
case 'Length': case 'Length':
case 'Frames': case 'Frames':
case 'AlarmFrames': case 'AlarmFrames':