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

Fixed http refresh problems in cycle view. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1407 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2005-05-16 10:09:09 +00:00
parent f089f28bd4
commit 27d9da11f9
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web/zm_html_view_console.php
View File

@ -134,7 +134,6 @@ function confirmDelete()
if ( ZM_WEB_REFRESH_METHOD == "javascript" ) 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) ?> ); window.setTimeout( "window.location.replace('<?= $PHP_SELF ?>')", <?= (ZM_WEB_REFRESH_MAIN*1000) ?> );
<?php <?php
} }

5
web/zm_html_view_cycle.php
View File

@ -70,10 +70,9 @@ $width_scale = ($montage_width*SCALE_SCALE)/$monitor['Width'];
$height_scale = ($montage_height*SCALE_SCALE)/$monitor['Height']; $height_scale = ($montage_height*SCALE_SCALE)/$monitor['Height'];
$scale = (int)(($width_scale<$height_scale)?$width_scale:$height_scale); $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_CYCLE."; URL=$PHP_SELF?view=cycle&group=$group&mid=$next_mid&mode=$mode" );
header("Refresh: ".ZM_WEB_REFRESH_IMAGE."; URL=$PHP_SELF?view=cycle&group=$group&mid=$mid&mode=still" );
} }
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past