ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix value of auto in width dropdown. Allow a 0 value for scale.

pull/2926/head
Isaac Connor 2020-02-25 11:14:12 -05:00
parent 8ef70f9080
commit 010b230804
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/skins/classic/views/cycle.php
View File

@ -40,7 +40,7 @@ if ( empty($_REQUEST['mode']) ) {
} }
$widths = array( $widths = array(
'' => translate('auto'), 'auto' => translate('auto'),
'100%' => '100%', '100%' => '100%',
'160px' => '160px', '160px' => '160px',
'320px' => '320px', '320px' => '320px',
@ -62,13 +62,11 @@ session_start();
if ( isset($_REQUEST['scale']) ) { if ( isset($_REQUEST['scale']) ) {
$options['scale'] = validInt($_REQUEST['scale']); $options['scale'] = validInt($_REQUEST['scale']);
ZM\Logger::Debug('Setting scale from request to '.$options['scale']);
} else if ( isset($_COOKIE['zmCycleScale']) ) { } else if ( isset($_COOKIE['zmCycleScale']) ) {
$options['scale'] = $_COOKIE['zmCycleScale']; $options['scale'] = $_COOKIE['zmCycleScale'];
ZM\Logger::Debug('Setting scale from cookie to '.$options['scale']);
} }
if ( !(isset($options['scale']) and $options['scale']) ) if ( !isset($options['scale']) )
$options['scale'] = 100; $options['scale'] = 100;
if ( isset($_COOKIE['zmCycleWidth']) and $_COOKIE['zmCycleWidth'] ) { if ( isset($_COOKIE['zmCycleWidth']) and $_COOKIE['zmCycleWidth'] ) {