diff --git a/web/zmconfig.php.z b/web/zmconfig.php.z
index a79375818..e7c74ccc3 100644
--- a/web/zmconfig.php.z
+++ b/web/zmconfig.php.z
@@ -140,7 +140,7 @@ switch ( $bandwidth )
// Javascript window sizes
$jws = array(
'console' => array( 'w'=>720, 'h'=>400 ),
- 'cycle' => array( 'w'=>36, 'h'=>72 ),
+ 'cycle' => array( 'w'=>46, 'h'=>80 ),
'monitor' => array( 'w'=>360, 'h'=>450 ),
'watch' => array( 'w'=>72, 'h'=>315 ),
'device' => array( 'w'=>196, 'h'=>164 ),
diff --git a/web/zmfuncs.php b/web/zmfuncs.php
index 0fff9cbdd..cf9808869 100644
--- a/web/zmfuncs.php
+++ b/web/zmfuncs.php
@@ -74,7 +74,7 @@ function isNetscape()
function canStream()
{
- return( ZM_CAN_STREAM || isNetscape() || (ZM_OPT_CAMBOZOLA && file_exists( ZM_PATH_CAMBOZOLA )) );
+ return( ZM_CAN_STREAM || isNetscape() || (ZM_OPT_CAMBOZOLA && file_exists( ZM_PATH_WEB.'/'.ZM_PATH_CAMBOZOLA )) );
}
function fixDevices()
diff --git a/web/zmhtml.php b/web/zmhtml.php
index d4cb9d32e..22d9479d7 100644
--- a/web/zmhtml.php
+++ b/web/zmhtml.php
@@ -276,6 +276,14 @@ function confirmStatus( new_status )
}
case "cycle" :
{
+ if ( !$mode )
+ {
+ if ( canStream() )
+ $mode = "stream";
+ else
+ $mode = "still";
+ }
+
$result = mysql_query( "select * from Monitors where Function != 'None' order by Id" );
$monitors = array();
$mon_idx = 0;
@@ -293,7 +301,7 @@ function confirmStatus( new_status )
chdir( ZM_DIR_IMAGES );
$status = exec( escapeshellcmd( ZMU_PATH." -m $monitor[Id] -i" ) );
- header("Refresh: ".REFRESH_CYCLE."; URL='$PHP_SELF?view=cycle&mid=$next_mid'" );
+ header("Refresh: ".REFRESH_CYCLE."; URL='$PHP_SELF?view=cycle&mid=$next_mid&mode=$mode'" );
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past
header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); // always modified
header("Cache-Control: no-store, no-cache, must-revalidate"); // HTTP/1.1
@@ -309,11 +317,50 @@ function newWindow(Url,Name,Width,Height)
{
var Name = window.open(Url,Name,"resizable,scrollbars,width="+Width+",height="+Height);
}
+function closeWindow()
+{
+ top.window.close();
+}
-
-
+