From d5f0fe02599e31b2100b13cc9e9f958e6f94a0b8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 26 May 2022 16:36:50 -0400
Subject: [PATCH] remove data-on-click from alarmForce and cancel buttons as we
 check for canedit in watch.js.  Update status fields to include the id to
 match montage so that monitorstream can access them.

---
 web/skins/classic/views/watch.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/web/skins/classic/views/watch.php b/web/skins/classic/views/watch.php
index 23720389b..c2c9deacd 100644
--- a/web/skins/classic/views/watch.php
+++ b/web/skins/classic/views/watch.php
@@ -66,8 +66,8 @@ xhtmlHeaders(__FILE__, $monitor->Name().' - '.translate('Feed'));
         <button type="button" id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
         <button type="button" id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
         <button type="button" id="settingsBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Settings') ?>" disabled><i class="fa fa-sliders"></i></button>
-        <button type="button" id="enableAlmBtn" class="btn btn-normal" data-on-click="cmdAlarm" data-toggle="tooltip" data-placement="top" title="<?php echo translate('DisableAlarms') ?>" disabled><i class="fa fa-bell"></i></button>
-        <button type="button" id="forceAlmBtn" class="btn btn-danger" data-on-click="cmdForce" data-toggle="tooltip" data-placement="top" title="<?php echo translate('ForceAlarm') ?>" disabled><i class="fa fa-exclamation-circle"></i></button>
+        <button type="button" id="enableAlmBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('DisableAlarms') ?>" disabled><i class="fa fa-bell"></i></button>
+        <button type="button" id="forceAlmBtn" class="btn btn-danger" data-toggle="tooltip" data-placement="top" title="<?php echo translate('ForceAlarm') ?>" disabled><i class="fa fa-exclamation-circle"></i></button>
       </div>
 
       <div>
@@ -90,18 +90,18 @@ if ( $streamMode == 'jpeg' ) {
   echo 'title="Click to zoom, shift click to pan, ctrl click to zoom out"';
 }
 ?>
-><?php echo getStreamHTML($monitor, array('scale'=>$scale, 'connkey'=>$monitor->connkey(), 'mode'=>'single')); ?></div>
+><?php echo getStreamHTML($monitor, array('scale'=>$scale, 'mode'=>'single')); ?></div>
 
 
 <?php if ( $monitor->Type() != 'WebSite' ) { ?>
       <div id="monitorStatus">
         <div id="monitorState">
           <?php echo translate('State') ?>:
-          <span id="stateValue"></span> -
-          <span title="<?php echo translate('Viewing FPS')?>"><span id="fpsValue"></span> fps</span>
-          <span title="<?php echo translate('Capturing FPS')?>"><span id="capturefpsValue"></span> fps</span>
+          <span id="stateValue<?php echo $monitor->Id() ?>"></span> -
+          <span title="<?php echo translate('Viewing FPS')?>"><span id="viewingFPSValue<?php echo $monitor->Id() ?>"></span> fps</span>
+          <span title="<?php echo translate('Capturing FPS')?>"><span id="captureFPSValue<?php echo $monitor->Id() ?>"></span> fps</span>
           <?php if ( $monitor->Function() == 'Modect' or $monitor->Function() == 'Mocord' ) { ?>
-          <span title="<?php echo translate('Analysis FPS')?>"><span id="analysisfpsValue"></span> fps</span>
+          <span title="<?php echo translate('Analysis FPS')?>"><span id="analysisFPSValue<?php echo $monitor->Id() ?>"></span> fps</span>
           <?php } ?>
         </div>
       </div>
@@ -148,11 +148,11 @@ if ( $streamMode == 'jpeg' ) {
 ?>
       </div>
       <div id="replayStatus"<?php echo $streamMode=="single" ? ' class="hidden"' : '' ?>>
-        <span id="mode"><?php echo translate('Mode') ?>: <span id="modeValue"></span></span>
-        <span id="rate"><?php echo translate('Rate') ?>: <span id="rateValue"></span>x</span>
-        <span id="delay"><?php echo translate('Delay') ?>: <span id="delayValue"></span>s</span>
-        <span id="level"><?php echo translate('Buffer') ?>: <span id="levelValue"></span>%</span>
-        <span id="zoom"><?php echo translate('Zoom') ?>: <span id="zoomValue"></span>x</span>
+        <span id="mode<?php echo $monitor->Id() ?>"><?php echo translate('Mode') ?>: <span id="modeValue<?php echo $monitor->Id() ?>"></span></span>
+        <span id="rate<?php echo $monitor->Id() ?>"><?php echo translate('Rate') ?>: <span id="rateValue<?php echo $monitor->Id() ?>"></span>x</span>
+        <span id="delay<?php echo $monitor->Id() ?>"><?php echo translate('Delay') ?>: <span id="delayValue<?php echo $monitor->Id() ?>"></span>s</span>
+        <span id="level<?php echo $monitor->Id() ?>"><?php echo translate('Buffer') ?>: <span id="levelValue<?php echo $monitor->Id() ?>"></span>%</span>
+        <span id="zoom<?php echo $monitor->Id() ?>"><?php echo translate('Zoom') ?>: <span id="zoomValue<?php echo $monitor->Id() ?>"></span>x</span>
       </div>
 <?php } // end if $monitor->Type() != 'WebSite' ?>
 <?php