diff --git a/web/skins/classic/views/cycle.php b/web/skins/classic/views/cycle.php index be5bf154c..b05319510 100644 --- a/web/skins/classic/views/cycle.php +++ b/web/skins/classic/views/cycle.php @@ -44,12 +44,12 @@ foreach( $displayMonitors as &$row ) { if ( isset($_REQUEST['mid']) && $row['Id'] == $_REQUEST['mid'] ) $monIdx = count($monitors); - $row['ScaledWidth'] = reScale( $row['Width'], $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE ); - $row['ScaledHeight'] = reScale( $row['Height'], $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE ); - $row['PopupScale'] = reScale( SCALE_BASE, $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE ); + $row['ScaledWidth'] = reScale($row['Width'], $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE); + $row['ScaledHeight'] = reScale($row['Height'], $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE); + $row['PopupScale'] = reScale(SCALE_BASE, $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE); $row['connKey'] = generateConnKey(); - $monitors[] = new Monitor( $row ); + $monitors[] = new Monitor($row); } # end foreach Monitor if ( $monitors ) { @@ -63,14 +63,14 @@ if ( $monitors ) { } noCacheHeaders(); -xhtmlHeaders(__FILE__, translate('CycleWatch') ); +xhtmlHeaders(__FILE__, translate('CycleWatch')); ?>
- +
- + @@ -84,7 +84,7 @@ xhtmlHeaders(__FILE__, translate('CycleWatch') );
$scale, 'mode'=>$mode ) ); + echo getStreamHTML($monitor, array('scale'=>$scale, 'mode'=>$mode)); } else { echo "There are no monitors to view."; } diff --git a/web/skins/classic/views/js/cycle.js b/web/skins/classic/views/js/cycle.js index 63b4eb761..34f3bde1c 100644 --- a/web/skins/classic/views/js/cycle.js +++ b/web/skins/classic/views/js/cycle.js @@ -1,9 +1,9 @@ function nextCycleView() { - window.location.replace( '?view=cycle&mid='+nextMid+'&mode='+mode, cycleRefreshTimeout ); + window.location.replace('?view=cycle&mid='+nextMid+'&mode='+mode, cycleRefreshTimeout); } function initCycle() { - nextCycleView.periodical( cycleRefreshTimeout ); + nextCycleView.periodical(cycleRefreshTimeout); } -window.addEvent( 'domready', initCycle ); +window.addEvent('domready', initCycle); diff --git a/web/skins/classic/views/watch.php b/web/skins/classic/views/watch.php index 47cbc5b99..72c266d29 100644 --- a/web/skins/classic/views/watch.php +++ b/web/skins/classic/views/watch.php @@ -37,7 +37,6 @@ if ( ! visibleMonitor($mid) ) { return; } - $monitor = new Monitor($mid); #Whether to show the controls button @@ -68,7 +67,7 @@ xhtmlHeaders( __FILE__, $monitor->Name().' - '.translate('Feed') );
Name() ?>
Type() == 'Local' ) { +if ( canView('Control') && $monitor->Type() == 'Local' ) { ?>
Id(), 'zmSettings'.$monitor->Id(), 'settings', translate('Settings'), true, 'id="settingsLink"' ) ?>