diff --git a/web/skins/classic/views/events.php b/web/skins/classic/views/events.php index fc692169b..8f997f414 100644 --- a/web/skins/classic/views/events.php +++ b/web/skins/classic/views/events.php @@ -28,9 +28,9 @@ require_once('includes/Event.php'); $countSql = 'SELECT count(E.Id) AS EventCount FROM Monitors AS M INNER JOIN Events AS E ON (M.Id = E.MonitorId) WHERE'; $eventsSql = 'SELECT E.*,M.Name AS MonitorName,M.DefaultScale FROM Monitors AS M INNER JOIN Events AS E on (M.Id = E.MonitorId) WHERE'; if ( $user['MonitorIds'] ) { - $user_monitor_ids = ' M.Id in ('.$user['MonitorIds'].')'; - $countSql .= $user_monitor_ids; - $eventsSql .= $user_monitor_ids; + $user_monitor_ids = ' M.Id in ('.$user['MonitorIds'].')'; + $countSql .= $user_monitor_ids; + $eventsSql .= $user_monitor_ids; } else { $countSql .= ' 1'; $eventsSql .= ' 1'; @@ -194,22 +194,21 @@ while ( $event_row = dbFetchNext($results) ) { '.validHtmlStr($event->Name()).($event->Archived()?'*':'') ?> MonitorId(), 'zmMonitor'.$event->Monitorid(), 'monitor', $event->MonitorName(), canEdit( 'Monitors' ) ) ?> Id(), 'zmEventDetail', 'eventdetail', validHtmlStr($event->Cause()), canEdit( 'Events' ), 'title="'.htmlspecialchars($event->Notes()).'"' ) ?> - Notes()) { - # if notes include detection objects, then link it to objdetect.jpg - if (strpos($event->Notes(),"detected:")!== false){ - # make a link - echo makePopupLink( '?view=image&eid='.$event->Id().'&fid=objdetect', 'zmImage', - array('image', reScale($event->Width(), $scale), reScale($event->Height(), $scale)), - "
".$event->Notes()."
"); - } - elseif ($event->Notes() != 'Forced Web: ') { - echo "
".$event->Notes()."
"; - } - } - ?> - + Notes()) { +# if notes include detection objects, then link it to objdetect.jpg + if (strpos($event->Notes(),'detected:')!== false){ +# make a link + echo makePopupLink( '?view=image&eid='.$event->Id().'&fid=objdetect', 'zmImage', + array('image', reScale($event->Width(), $scale), reScale($event->Height(), $scale)), + "
".$event->Notes()."
"); + } + elseif ($event->Notes() != 'Forced Web: ') { + echo "
".$event->Notes()."
"; + } + } +?> StartTime())) . ( $event->EndTime() ? ' until ' . strftime(STRF_FMT_DATETIME_SHORTER, strtotime($event->EndTime()) ) : '' ) ?>