From 693d3eab6e090ba9181c43cd87c3d25f1d36ea00 Mon Sep 17 00:00:00 2001 From: stan Date: Mon, 23 Sep 2002 16:09:47 +0000 Subject: [PATCH] Corrected monitor window to default to max_events view. git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@41 e3e1d417-86f3-4887-817a-d78f3d33393f --- web/zm.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/web/zm.php b/web/zm.php index 8d0b67998..1172a421d 100644 --- a/web/zm.php +++ b/web/zm.php @@ -311,7 +311,7 @@ function newWindow(Url,Name,Width,Height) { high medium low ) -Watch Monitors +Watch All @@ -352,8 +352,8 @@ function newWindow(Url,Name,Width,Height) { $zone_count += $monitor[ZoneCount]; ?> - - + + @@ -432,6 +432,11 @@ elseif ( $view == "monitor" ) if ( !$result ) die( mysql_error() ); $monitor = mysql_fetch_assoc( $result ); + + if ( !$max_events && !$period && !$archived ) + { + $max_events = MAX_EVENTS; + } ?> @@ -445,7 +450,6 @@ window.focus(); -

">/dev/video ()

xx