SOURCES: zoneminder-konqueror.patch - don't use java applet; konqu...

[arekm]

Author: arekm                        Date: Fri Dec  7 21:18:19 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- don't use java applet; konqueror can handle iframe based streaming

---- Files affected:
SOURCES:
   zoneminder-konqueror.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/zoneminder-konqueror.patch
diff -u SOURCES/zoneminder-konqueror.patch:1.1 SOURCES/zoneminder-konqueror.patch:1.2
--- SOURCES/zoneminder-konqueror.patch:1.1	Fri Dec  7 21:20:42 2007
+++ SOURCES/zoneminder-konqueror.patch	Fri Dec  7 22:18:14 2007
@@ -1,7 +1,23 @@
 diff -urN ZoneMinder-1.22.3.org/web/zm_funcs.php ZoneMinder-1.22.3/web/zm_funcs.php
 --- ZoneMinder-1.22.3.org/web/zm_funcs.php	2006-11-09 11:51:10.000000000 +0100
-+++ ZoneMinder-1.22.3/web/zm_funcs.php	2007-12-07 21:13:56.142334769 +0100
-@@ -659,6 +659,11 @@
++++ ZoneMinder-1.22.3/web/zm_funcs.php	2007-12-07 22:11:55.516973882 +0100
+@@ -296,9 +296,15 @@
+ 
+ function outputImageStream( $src, $width, $height, $name="" )
+ {
++	if (canStreamIframe()) {
++?>
++<iframe src="<?= $src ?>" alt="<?= $name ?>" border="0" width="<?= $width ?>" height="<?= $height ?>">
++<?php
++	} else {
+ ?>
+ <img src="<?= $src ?>" alt="<?= $name ?>" border="0" width="<?= $width ?>" height="<?= $height ?>">
+ <?php
++	}
+ }
+ 
+ function outputControlStream( $src, $width, $height, $monitor, $scale, $target )
+@@ -659,6 +665,11 @@
  		$version = $log_version[1];
  		$browser = 'safari';
  	}
@@ -13,3 +29,33 @@
  	elseif (ereg( 'Opera ([0-9].[0-9]{1,2})',$_SERVER['HTTP_USER_AGENT'],$log_version))
  	{
  		$version = $log_version[1];
+@@ -683,6 +694,13 @@
+ 	return( $browser == "mozilla" );
+ }
+ 
++function isKonqueror()
++{
++	getBrowser( $browser, $version );
++
++	return( $browser == "konqueror" );
++}
++
+ function isInternetExplorer()
+ {
+ 	getBrowser( $browser, $version );
+@@ -700,9 +718,14 @@
+ 	return ( preg_match( '/Win/', $_SERVER['HTTP_USER_AGENT'] ) );
+ }
+ 
++function canStreamIframe()
++{
++	return (isKonqueror());
++}
++
+ function canStreamNative()
+ {
+-	return( ZM_CAN_STREAM == "yes" || ( ZM_CAN_STREAM == "auto" && isNetscape() ) );
++	return( ZM_CAN_STREAM == "yes" || ( ZM_CAN_STREAM == "auto" && isNetscape() ) || ( ZM_CAN_STREAM == "auto" && isKonqueror() ) );
+ }
+ 
+ function canStreamApplet()
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/zoneminder-konqueror.patch?r1=1.1&r2=1.2&f=u