From fdf4d83e02bb047e2fc76142286fc5dfac7a59dc Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 23 May 2024 13:45:32 -0400
Subject: [PATCH 1/3] Use else for micro-optimisation

---
 web/skins/classic/includes/functions.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index c3c0b0e56..2cecee978 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -992,8 +992,7 @@ function xhtmlFooter() {
   if ( $basename == 'montage' ) {
     echo output_script_if_exists(array('assets/gridstack/dist/gridstack-all.js'));
     echo output_script_if_exists(array('assets/jquery.panzoom/dist/jquery.panzoom.js'));
-  }
-  if ( $basename == 'watch' || $basename == 'event') {
+  } else if ( $basename == 'watch' || $basename == 'event') {
     echo output_script_if_exists(array('assets/jquery.panzoom/dist/jquery.panzoom.js'));
   }
 

From 4fcc4338807d93ace753ecc6f2ab661127add892 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 23 May 2024 13:45:49 -0400
Subject: [PATCH 2/3] Only change src if it exists. Fixes non-zms players

---
 web/skins/classic/views/js/montage.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js
index 2c43331d2..6b0bf3b83 100644
--- a/web/skins/classic/views/js/montage.js
+++ b/web/skins/classic/views/js/montage.js
@@ -560,10 +560,11 @@ function handleClick(evt) {
 function startMonitors() {
   for (let i = 0, length = monitorData.length; i < length; i++) {
     const obj = document.getElementById('liveStream'+monitors[i].id);
-    const url = new URL(obj.src);
-
-    url.searchParams.set('scale', parseInt(obj.clientWidth / monitors[i].width * 100));
-    obj.src = url;
+    if (obj.src) {
+      const url = new URL(obj.src);
+      url.searchParams.set('scale', parseInt(obj.clientWidth / monitors[i].width * 100));
+      obj.src = url;
+    }
 
     // Start the fps and status updates. give a random delay so that we don't assault the server
     const delay = Math.round( (Math.random()+0.5)*statusRefreshTimeout );

From 4e1396e539fd0593b77b890c02bb96d41318cfd0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 23 May 2024 13:46:19 -0400
Subject: [PATCH 3/3] Foot html footer back where it should be and move
 PRESET_LAYOUT_NAMES to montage.js.php

---
 web/skins/classic/views/js/montage.js.php | 3 +++
 web/skins/classic/views/montage.php       | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/skins/classic/views/js/montage.js.php b/web/skins/classic/views/js/montage.js.php
index 6859e0ae6..41404133f 100644
--- a/web/skins/classic/views/js/montage.js.php
+++ b/web/skins/classic/views/js/montage.js.php
@@ -13,6 +13,9 @@ const canStreamNative = <?php echo canStreamNative()?'true':'false' ?>;
 var monitorData = new Array();
 
 <?php
+global $presetLayoutsNames;
+echo 'const ZM_PRESET_LAYOUT_NAMES = '.json_encode($presetLayoutsNames).';'.PHP_EOL;
+
 global $monitors;
 foreach ( $monitors as $monitor ) {
 ?>
diff --git a/web/skins/classic/views/montage.php b/web/skins/classic/views/montage.php
index 389c7d8fd..fc99d6403 100644
--- a/web/skins/classic/views/montage.php
+++ b/web/skins/classic/views/montage.php
@@ -341,9 +341,6 @@ foreach ($monitors as $monitor) {
   <script src="<?php echo cache_bust('js/hls.js') ?>"></script>
 <?php } ?>
   <script src="<?php echo cache_bust('js/MonitorStream.js') ?>"></script>
-<?php xhtmlFooter() ?>
-
-<?php echo '<script nonce="'.$cspNonce.'"> const ZM_PRESET_LAYOUT_NAMES = '.json_encode($presetLayoutsNames).' </script>'.PHP_EOL;?>
 
 <!-- In May 2024, IgorA100 globally changed grid layout -->
 <div id="messageModal" class="modal fade" tabindex="-1">
@@ -364,3 +361,4 @@ foreach ($monitors as $monitor) {
     </div>
   </div>
 </div>
+<?php xhtmlFooter() ?>