From bab609426d4a24aa12695e48856c70d7bee78398 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 17 Apr 2020 09:46:10 -0400
Subject: [PATCH] spacing in views/event.php
---
web/skins/classic/views/event.php | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php
index eb4f2ad1a..6ed41b319 100644
--- a/web/skins/classic/views/event.php
+++ b/web/skins/classic/views/event.php
@@ -24,7 +24,7 @@ if ( !canView('Events') ) {
}
$eid = validInt($_REQUEST['eid']);
-$fid = !empty($_REQUEST['fid'])?validInt($_REQUEST['fid']):1;
+$fid = !empty($_REQUEST['fid']) ? validInt($_REQUEST['fid']) : 1;
$Event = new ZM\Event($eid);
if ( $user['MonitorIds'] ) {
@@ -79,7 +79,7 @@ $replayModes = array(
'gapless' => translate('ReplayGapless'),
);
-if ( isset( $_REQUEST['streamMode'] ) )
+if ( isset($_REQUEST['streamMode']) )
$streamMode = validHtmlStr($_REQUEST['streamMode']);
else
$streamMode = 'video';
@@ -104,7 +104,16 @@ if ( $Monitor->VideoWriter() == '2' ) {
$Zoom = $Event->Height()/$Event->Width();
}
-// These are here to figure out the next/prev event
+// These are here to figure out the next/prev event, however if there is no filter, then default to one that specifies the Monitor
+if ( !isset($_REQUEST['filter']) ) {
+ $_REQUEST['filter'] = array(
+ 'Query'=>array(
+ 'terms'=>array(
+ array('attr'=>'MonitorId', 'op'=>'=', 'val'=>$Event->MonitorId())
+ )
+ )
+ );
+}
parseSort();
parseFilter($_REQUEST['filter']);
$filterQuery = $_REQUEST['filter']['query'];