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

whitespace changes

pull/1185/head
Isaac Connor 2016-09-26 20:09:09 -04:00
parent 079aa827c5
commit 0580ef0c88
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
web/skins/classic/views/watch.php
View File

@ -20,16 +20,15 @@
require_once('includes/Monitor.php'); require_once('includes/Monitor.php');
if ( !canView( 'Stream' ) ) if ( !canView( 'Stream' ) ) {
{ $view = 'error';
$view = "error";
return; return;
} }
// This is for input sanitation // This is for input sanitation
$mid = intval( $_REQUEST['mid'] ); $mid = intval( $_REQUEST['mid'] );
if ( ! visibleMonitor( $mid ) ) { if ( ! visibleMonitor( $mid ) ) {
$view = "error"; $view = 'error';
return; return;
} }
@ -59,7 +58,7 @@ xhtmlHeaders( __FILE__, $monitor->Name()." - ".translate('Feed') );
<div id="closeControl"><a href="#" onclick="closeWindow(); return( false );"><?php echo translate('Close') ?></a></div> <div id="closeControl"><a href="#" onclick="closeWindow(); return( false );"><?php echo translate('Close') ?></a></div>
<div id="menuControls"> <div id="menuControls">
<?php <?php
if ( canView( 'Control' ) && $monitor->Type() == "Local" ) if ( canView( 'Control' ) && $monitor->Type() == 'Local' )
{ {
?> ?>
<div id="settingsControl"><?php echo makePopupLink( '?view=settings&amp;mid='.$monitor->Id(), 'zmSettings'.$monitor->Id(), 'settings', translate('Settings'), true, 'id="settingsLink"' ) ?></div> <div id="settingsControl"><?php echo makePopupLink( '?view=settings&amp;mid='.$monitor->Id(), 'zmSettings'.$monitor->Id(), 'settings', translate('Settings'), true, 'id="settingsLink"' ) ?></div>
@ -69,19 +68,13 @@ if ( canView( 'Control' ) && $monitor->Type() == "Local" )
<div id="scaleControl"><?php echo translate('Scale') ?>: <?php echo buildSelect( "scale", $scales, "changeScale( this );" ); ?></div> <div id="scaleControl"><?php echo translate('Scale') ?>: <?php echo buildSelect( "scale", $scales, "changeScale( this );" ); ?></div>
</div> </div>
</div> </div>
<div id="imageFeed"> <div id="imageFeed"><?php echo getStreamHTML( $monitor, $scale ); ?></div>
<?php echo getStreamHTML( $monitor, $scale ); ?>
</div>
<div id="monitorStatus"> <div id="monitorStatus">
<?php <?php if ( canEdit( 'Monitors' ) ) { ?>
if ( canEdit( 'Monitors' ) )
{
?>
<div id="enableDisableAlarms"><a id="enableAlarmsLink" href="#" onclick="cmdEnableAlarms(); return( false );" class="hidden"><?php echo translate('EnableAlarms') ?></a><a id="disableAlarmsLink" href="#" onclick="cmdDisableAlarms(); return( false );" class="hidden"><?php echo translate('DisableAlarms') ?></a></div> <div id="enableDisableAlarms"><a id="enableAlarmsLink" href="#" onclick="cmdEnableAlarms(); return( false );" class="hidden"><?php echo translate('EnableAlarms') ?></a><a id="disableAlarmsLink" href="#" onclick="cmdDisableAlarms(); return( false );" class="hidden"><?php echo translate('DisableAlarms') ?></a></div>
<?php <?php
} }
if ( canEdit( 'Monitors' ) ) if ( canEdit( 'Monitors' ) ) {
{
?> ?>
<div id="forceCancelAlarm"> <div id="forceCancelAlarm">
<a id="forceAlarmLink" href="#" onclick="cmdForceAlarm();"><?php echo translate('ForceAlarm') ?></a> <a id="forceAlarmLink" href="#" onclick="cmdForceAlarm();"><?php echo translate('ForceAlarm') ?></a>