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

Bug 360 - No longer necessary to delete cookies to set new format. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2047 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2006-11-09 11:48:24 +00:00
parent 9b20b7c881
commit c95952fd41
1 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
web/zm.php
View File

@ -59,6 +59,24 @@ else
} }
define( "ZM_BASE_URL", $protocol.'://'.$_SERVER['HTTP_HOST'] ); define( "ZM_BASE_URL", $protocol.'://'.$_SERVER['HTTP_HOST'] );
if ( $_GET['format'] )
{
$format = $_GET['format'];
$cookies = true;
}
if ( $_GET['cookies'] )
{
$cookies = $_GET['cookies'];
}
if ( $_GET['devwidth'] )
{
$device['width'] = $_GET['devwidth'];
}
if ( $_GET['devheight'] )
{
$device['height'] = $_GET['devheight'];
}
if ( empty($format) ) if ( empty($format) )
{ {
$wurfl_file = "./wurfl_class.php"; $wurfl_file = "./wurfl_class.php";
@ -79,13 +97,14 @@ if ( empty($format) )
$device['width'] = $wurfl->getDeviceCapability( 'resolution_width' ); $device['width'] = $wurfl->getDeviceCapability( 'resolution_width' );
$device['height'] = $wurfl->getDeviceCapability( 'resolution_height' ); $device['height'] = $wurfl->getDeviceCapability( 'resolution_height' );
} }
elseif ( $wurfl->getDeviceCapability( 'wml_1_3' ) ) // Deprecated
{ //elseif ( $wurfl->getDeviceCapability( 'wml_1_3' ) )
$format = "wml"; //{
$cookies = false; //$format = "wml";
$device['width'] = $wurfl->getDeviceCapability( 'resolution_width' ); //$cookies = false;
$device['height'] = $wurfl->getDeviceCapability( 'resolution_height' ); //$device['width'] = $wurfl->getDeviceCapability( 'resolution_width' );
} //$device['height'] = $wurfl->getDeviceCapability( 'resolution_height' );
//}
} }
else else
{ {
@ -98,7 +117,6 @@ if ( empty($format) )
// This is an example of using fixed device strings to just match your phone etc // This is an example of using fixed device strings to just match your phone etc
$devices = array( $devices = array(
array( 'name'=>"Motorola V600", 'ua_match'=>"MOT-V600", 'format'=>"xhtml", 'cookies'=>false, 'width'=>176, 'height'=>220 ), array( 'name'=>"Motorola V600", 'ua_match'=>"MOT-V600", 'format'=>"xhtml", 'cookies'=>false, 'width'=>176, 'height'=>220 ),
array( 'name'=>"Motorola V600", 'ua_match'=>"MOT-A820", 'format'=>"xhtml", 'cookies'=>false, 'width'=>176, 'height'=>220 )
); );
foreach ( $devices as $device ) foreach ( $devices as $device )
@ -158,7 +176,7 @@ else
session_start(); session_start();
if ( !$_SESSION['format'] ) if ( !$_SESSION['format'] || $_GET['format'] )
{ {
$_SESSION['format'] = $format; $_SESSION['format'] = $format;
$_SESSION['cookies'] = $cookies; $_SESSION['cookies'] = $cookies;
@ -169,14 +187,6 @@ if ( !$_SESSION['format'] )
setcookie( "cookies", $cookies ); setcookie( "cookies", $cookies );
} }
} }
elseif ( $_REQUEST['format'] )
{
$_SESSION['format'] = $format;
if ( $cookies )
{
setcookie( "format", $format );
}
}
require_once( "zm_$format.php" ); require_once( "zm_$format.php" );