From 27d9da11f941139480a634d080ed9d48882c635b Mon Sep 17 00:00:00 2001
From: stan <stan@e3e1d417-86f3-4887-817a-d78f3d33393f>
Date: Mon, 16 May 2005 10:09:09 +0000
Subject: [PATCH] Fixed http refresh problems in cycle view.

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1407 e3e1d417-86f3-4887-817a-d78f3d33393f
---
 web/zm_html_view_console.php | 1 -
 web/zm_html_view_cycle.php   | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/web/zm_html_view_console.php b/web/zm_html_view_console.php
index 222b0958d..dfc44cf5b 100644
--- a/web/zm_html_view_console.php
+++ b/web/zm_html_view_console.php
@@ -134,7 +134,6 @@ function confirmDelete()
 if ( ZM_WEB_REFRESH_METHOD == "javascript" )
 {
 ?>
-//window.setTimeout( "window.location.replace('<?= $PHP_SELF ?>?view=<?= $view ?>')", <?= (ZM_WEB_REFRESH_MAIN*1000) ?> );
 window.setTimeout( "window.location.replace('<?= $PHP_SELF ?>')", <?= (ZM_WEB_REFRESH_MAIN*1000) ?> );
 <?php
 }
diff --git a/web/zm_html_view_cycle.php b/web/zm_html_view_cycle.php
index 82c5dd6b1..c37907969 100644
--- a/web/zm_html_view_cycle.php
+++ b/web/zm_html_view_cycle.php
@@ -70,10 +70,9 @@ $width_scale = ($montage_width*SCALE_SCALE)/$monitor['Width'];
 $height_scale = ($montage_height*SCALE_SCALE)/$monitor['Height'];
 $scale = (int)(($width_scale<$height_scale)?$width_scale:$height_scale);
     
-if ( $mode != "stream" )
+if ( ZM_WEB_REFRESH_METHOD == "http" )
 {
-	if ( ZM_WEB_REFRESH_METHOD == "http" )
-		header("Refresh: ".ZM_WEB_REFRESH_IMAGE."; URL=$PHP_SELF?view=cycle&group=$group&mid=$mid&mode=still" );
+	header("Refresh: ".ZM_WEB_REFRESH_CYCLE."; URL=$PHP_SELF?view=cycle&group=$group&mid=$next_mid&mode=$mode" );
 }
 
 header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");    // Date in the past