From cd16f3f8e4a2539f374d0b1f8066a358c1634d55 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 28 May 2021 14:00:36 -0400
Subject: [PATCH 01/43] Bump version for 1.36.2

---
 distros/redhat/zoneminder.spec | 5 ++++-
 version                        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index d8ce4a742..0432a3a2c 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -31,7 +31,7 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.36.1
+Version: 1.36.2
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
@@ -425,6 +425,9 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
 %dir %attr(755,nginx,nginx) %{_localstatedir}/log/zoneminder
 
 %changelog
+* Fri May 28 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.2-1
+- 1.36.2 release
+
 * Fri May 21 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.1-1
 - 1.36.1 release
 - add rtspserver submodule
diff --git a/version b/version
index f107550c2..c6a567b8e 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.36.1
+1.36.2

From 1219bd8d1e5e691b2328885a206a565d2f0f6b6b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 30 May 2021 10:54:23 -0400
Subject: [PATCH 02/43] the filename is incorrect so the tmpfiles.d
 configuration is not being included

---
 distros/ubuntu2004/{zoneminder.tmpfiles => zoneminder.tmpfile} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename distros/ubuntu2004/{zoneminder.tmpfiles => zoneminder.tmpfile} (100%)

diff --git a/distros/ubuntu2004/zoneminder.tmpfiles b/distros/ubuntu2004/zoneminder.tmpfile
similarity index 100%
rename from distros/ubuntu2004/zoneminder.tmpfiles
rename to distros/ubuntu2004/zoneminder.tmpfile

From cd36bd9bf512815e3e167d2974ac3f74ea4d3646 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 29 May 2021 15:05:19 -0400
Subject: [PATCH 03/43] Merge pull request #3266 from
 Carbenium/fill-out-of-bounds

Image: Remove std::vector out-of-bounds access when filling polygons
---
 cmake/compiler/gcc/settings.cmake | 1 +
 src/zm_image.cpp                  | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/cmake/compiler/gcc/settings.cmake b/cmake/compiler/gcc/settings.cmake
index ce84dcc1a..2eb3baaed 100644
--- a/cmake/compiler/gcc/settings.cmake
+++ b/cmake/compiler/gcc/settings.cmake
@@ -19,6 +19,7 @@ endif()
 if(ASAN)
   target_compile_options(zm-compile-option-interface
     INTERFACE
+      -D_GLIBCXX_SANITIZE_VECTOR=1
       -fno-omit-frame-pointer
       -fsanitize=address
       -fsanitize-recover=address
diff --git a/src/zm_image.cpp b/src/zm_image.cpp
index 1acb49e03..60b1dcc02 100644
--- a/src/zm_image.cpp
+++ b/src/zm_image.cpp
@@ -2513,10 +2513,16 @@ void Image::Fill(Rgb colour, int density, const Polygon &polygon) {
         ++it;
       }
     }
+
+    // Not enough edges to perform the fill operation.
+    // Continue to next line.
+    if (active_edges.size() < 2) {
+      continue;
+    }
     std::sort(active_edges.begin(), active_edges.end(), PolygonFill::Edge::CompareX);
 
     if (!(scan_line % density)) {
-      for (auto it = active_edges.begin(); it != active_edges.end(); ++it) {
+      for (auto it = active_edges.begin(); it < active_edges.end() - 1; ++it) {
         int32 lo_x = static_cast<int32>(it->min_x);
         int32 hi_x = static_cast<int32>(std::next(it)->min_x);
         if (colours == ZM_COLOUR_GRAY8) {

From f723b39cf6584271d871e8a8c3fd93313b048e40 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 30 May 2021 18:31:26 -0400
Subject: [PATCH 04/43] Apply height css to limit height of logout modal and
 apply overflow:auto to add a scrollbar if needed so that we don't have to
 scroll to logout.

---
 web/skins/classic/css/base/skin.css | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/web/skins/classic/css/base/skin.css b/web/skins/classic/css/base/skin.css
index 0920ac2c3..a3ef3b2ce 100644
--- a/web/skins/classic/css/base/skin.css
+++ b/web/skins/classic/css/base/skin.css
@@ -736,3 +736,13 @@ a.flip {
 #objdetectModal .modal-content {
     width: fit-content;
 }
+
+#modalLogout .modal-dialog {
+  height: 100%;
+}
+#modalLogout .modal-content {
+  height: 90%;
+}
+#modalLogout .modal-body {
+  overflow:auto;
+}

From 5bdbb25efb760a059b6e89fb7643bbcb58eb4130 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 30 May 2021 18:31:57 -0400
Subject: [PATCH 05/43] Don't print out buffer since it isn't zero terminated

---
 src/zm_rtsp_server_fifo_source.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_rtsp_server_fifo_source.cpp b/src/zm_rtsp_server_fifo_source.cpp
index d83096717..025a15b66 100644
--- a/src/zm_rtsp_server_fifo_source.cpp
+++ b/src/zm_rtsp_server_fifo_source.cpp
@@ -209,7 +209,7 @@ int ZoneMinderFifoSource::getNextFrame() {
       Debug(4, "ZM Packet %s header_size %d packet size %u pts %s %" PRId64, header, header_size, data_size, pts_ptr, pts);
       delete[] header;
     } else {
-      Debug(1, "ZM header not found in %d of buffer:%s.", m_buffer.size(), m_buffer.head());
+      Debug(1, "ZM header not found in %u of buffer.", m_buffer.size());
       m_buffer.clear();
       return 0;
     }

From 0e598f67c9a6b8df3a447992183fd317b96244e2 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 30 May 2021 18:49:09 -0400
Subject: [PATCH 06/43] Bump version to 1.36.3 for release

---
 distros/redhat/zoneminder.spec | 5 ++++-
 version                        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index 0432a3a2c..64a4dd9f5 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -31,7 +31,7 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.36.2
+Version: 1.36.3
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
@@ -425,6 +425,9 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
 %dir %attr(755,nginx,nginx) %{_localstatedir}/log/zoneminder
 
 %changelog
+* Sun May 30 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.3-1
+- 1.36.3 release
+
 * Fri May 28 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.2-1
 - 1.36.2 release
 
diff --git a/version b/version
index c6a567b8e..663224e46 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.36.2
+1.36.3

From 9f6eec792c12fe9d431ddb307270f9e4bcf9d6b1 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Jun 2021 13:01:09 -0400
Subject: [PATCH 07/43] Fix Crud fork

---
 web/api/app/Plugin/Crud | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/api/app/Plugin/Crud b/web/api/app/Plugin/Crud
index 0bd63fb46..14292374c 160000
--- a/web/api/app/Plugin/Crud
+++ b/web/api/app/Plugin/Crud
@@ -1 +1 @@
-Subproject commit 0bd63fb464957080ead342db58ca9e01532cf1ef
+Subproject commit 14292374ccf1328f2d5db20897bd06f99ba4d938

From be5c6371bb68548711bfc440cad8f9a945493713 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Jun 2021 12:50:50 -0400
Subject: [PATCH 08/43] zmstats.pl: add use warnings.  Fix log deletion only
 ever deleting 100 when it should delete more in a loop.  Add deleting more
 than 100 sessions. Fix loop not terminating on Ctrl-C

---
 scripts/zmstats.pl.in | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/scripts/zmstats.pl.in b/scripts/zmstats.pl.in
index 3c86aada6..a03f68ada 100644
--- a/scripts/zmstats.pl.in
+++ b/scripts/zmstats.pl.in
@@ -1,5 +1,6 @@
 #!@PERL_EXECUTABLE@ -wT
 use strict;
+use warnings;
 use bytes;
 
 # ==========================================================================
@@ -79,14 +80,18 @@ while (!$zm_terminate) {
       }
       my $rows;
       do {
-        my $rows = zmDbDo('DELETE FROM `Logs` WHERE `TimeKey` < unix_timestamp(now() - interval '.$Config{ZM_LOG_DATABASE_LIMIT}.') LIMIT 100');
-        Debug("Deleted $rows log table entries by time") if defined $rows;
-      } while ($rows);
+        $rows = zmDbDo('DELETE FROM `Logs` WHERE `TimeKey` < unix_timestamp(now() - interval '.$Config{ZM_LOG_DATABASE_LIMIT}.') LIMIT 100');
+        Debug("Deleted $rows log table entries by time") if $rows;
+      } while ($rows and ($rows == 100) and !$zm_terminate);
     }
   } # end if ZM_LOG_DATABASE_LIMIT
 
-	# Delete any sessions that are more ethan a week old. Limiting to 100 because mysql sucks
-	zmDbDo('DELETE FROM Sessions WHERE access < ? LIMIT 100', time - (60*60*24*7));
+  my $rows;
+  do {
+    # Delete any sessions that are more than a week old. Limiting to 100 because mysql sucks
+    $rows = zmDbDo('DELETE FROM Sessions WHERE access < ? LIMIT 100', time - (60*60*24*7));
+    Debug("Deleted $rows sessions") if $rows;
+  } while ($rows and ($rows == 100) and !$zm_terminate);
 
   sleep($Config{ZM_STATS_UPDATE_INTERVAL});
 } # end while (!$zm_terminate)

From f85efc17b4f63a49cedf60ae776d9d737c7229b3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 25 May 2021 11:20:52 -0400
Subject: [PATCH 09/43] Add samesite when setting cookie for skin and css

---
 web/index.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/web/index.php b/web/index.php
index 5026bb016..ce3d68647 100644
--- a/web/index.php
+++ b/web/index.php
@@ -139,6 +139,14 @@ $skinBase[] = $skin;
 
 zm_session_start();
 
+$cookie_options = array(
+  'expires'=>time()+3600*24*30*12*10,
+);
+if ( version_compare(phpversion(), '7.3.0', '>=') ) {
+  # samesite was introduced in 7.3.0
+  $cookie_options['samesite'] = 'Strict';
+}
+
 if (
   !isset($_SESSION['skin']) ||
   isset($_REQUEST['skin']) ||
@@ -146,7 +154,7 @@ if (
   ($_COOKIE['zmSkin'] != $skin)
 ) {
   $_SESSION['skin'] = $skin;
-  setcookie('zmSkin', $skin, time()+3600*24*30*12*10);
+  setcookie('zmSkin', $skin, $cookie_options);
 }
 
 if (
@@ -156,7 +164,7 @@ if (
   ($_COOKIE['zmCSS'] != $css)
 ) {
   $_SESSION['css'] = $css;
-  setcookie('zmCSS', $css, time()+3600*24*30*12*10);
+  setcookie('zmCSS', $css, $cookie_options);
 }
 
 # Running is global but only do the daemonCheck if it is actually needed

From 74b48c9f21bba4f05c8d8c4070707612bc7cb90e Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 2 Jun 2021 14:59:13 -0400
Subject: [PATCH 10/43] Fix samsite support for php <= 7.2

---
 web/index.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/web/index.php b/web/index.php
index ce3d68647..d003fadb6 100644
--- a/web/index.php
+++ b/web/index.php
@@ -141,11 +141,8 @@ zm_session_start();
 
 $cookie_options = array(
   'expires'=>time()+3600*24*30*12*10,
+  'samesite' => 'Strict',
 );
-if ( version_compare(phpversion(), '7.3.0', '>=') ) {
-  # samesite was introduced in 7.3.0
-  $cookie_options['samesite'] = 'Strict';
-}
 
 if (
   !isset($_SESSION['skin']) ||
@@ -154,7 +151,11 @@ if (
   ($_COOKIE['zmSkin'] != $skin)
 ) {
   $_SESSION['skin'] = $skin;
-  setcookie('zmSkin', $skin, $cookie_options);
+	if (version_compare(phpversion(), '7.3.0', '>=')) {
+	setcookie('zmSkin', $skin, $cookie_options);
+	} else {
+	setcookie('zmSkin', $skin, $cookie_options['expires'], '/; samesite=strict');
+	}
 }
 
 if (
@@ -164,7 +165,11 @@ if (
   ($_COOKIE['zmCSS'] != $css)
 ) {
   $_SESSION['css'] = $css;
-  setcookie('zmCSS', $css, $cookie_options);
+	if (version_compare(phpversion(), '7.3.0', '>=')) {
+    setcookie('zmCSS', $css, $cookie_options);
+	} else {
+	  setcookie('zmCSS', $css, $cookie_options['expires'], '/; samesite=strict');
+	}
 }
 
 # Running is global but only do the daemonCheck if it is actually needed

From 959107f318b8221ba67383351f3fd75bd8c31d29 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 2 Jun 2021 18:34:26 -0400
Subject: [PATCH 11/43] Default to UTC when no timezone set so that
 montagereview continues working.  Fixes #3274

---
 web/skins/classic/views/js/montagereview.js.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/web/skins/classic/views/js/montagereview.js.php b/web/skins/classic/views/js/montagereview.js.php
index 291bb99e8..5d43364e7 100644
--- a/web/skins/classic/views/js/montagereview.js.php
+++ b/web/skins/classic/views/js/montagereview.js.php
@@ -1,6 +1,12 @@
 
 var server_utc_offset = <?php
-$TimeZone = new DateTimeZone( ini_get('date.timezone') );
+$tz = ini_get('date.timezone');
+if (!$tz) {
+  $tz = 'UTC';
+  Warning('Timezone has not been set. Either select it in Options->System->Timezone or in php.ini');
+}
+
+$TimeZone = new DateTimeZone($tz);
 $now = new DateTime('now', $TimeZone);
 $offset = $TimeZone->getOffset($now);
 echo $offset.'; // '.floor($offset / 3600).' hours ';

From 4f3552a3e9f9efd9c5055d20ea483c13fbd5feff Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 2 Jun 2021 18:35:08 -0400
Subject: [PATCH 12/43] fix missing namespace on warning

---
 web/skins/classic/views/js/montagereview.js.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/classic/views/js/montagereview.js.php b/web/skins/classic/views/js/montagereview.js.php
index 5d43364e7..d82f103ed 100644
--- a/web/skins/classic/views/js/montagereview.js.php
+++ b/web/skins/classic/views/js/montagereview.js.php
@@ -3,7 +3,7 @@ var server_utc_offset = <?php
 $tz = ini_get('date.timezone');
 if (!$tz) {
   $tz = 'UTC';
-  Warning('Timezone has not been set. Either select it in Options->System->Timezone or in php.ini');
+  ZM\Warning('Timezone has not been set. Either select it in Options->System->Timezone or in php.ini');
 }
 
 $TimeZone = new DateTimeZone($tz);

From a5341beaa50299148c3498a98f051625963c350c Mon Sep 17 00:00:00 2001
From: Xulunix <git@xulunix.de>
Date: Thu, 3 Jun 2021 02:26:24 +0200
Subject: [PATCH 13/43]  Fixed bug in onvifprobe

The arguments for "/usr/bin/zmonvif-probe.pl" was always `probe 1.1,1.2 1` with the last argument always being `1` instead of the network interface name selected in the menu.
This change fixes this issue by using the selected interface name instead of the boolean return value of the `isset()` function.
---
 web/skins/classic/views/onvifprobe.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/classic/views/onvifprobe.php b/web/skins/classic/views/onvifprobe.php
index 70ad8ead9..754bb50ef 100644
--- a/web/skins/classic/views/onvifprobe.php
+++ b/web/skins/classic/views/onvifprobe.php
@@ -50,7 +50,7 @@ function execONVIF($cmd) {
 
 function probeCameras($localIp) {
   $cameras = array();
-  $lines = @execONVIF('probe 1.1,1.2'.(isset($_REQUEST['interface']) ? ' '.isset($_REQUEST['interface']) : '' ));
+  $lines = @execONVIF('probe 1.1,1.2'.(isset($_REQUEST['interface']) ? ' '.$_REQUEST['interface'] : '' ));
   if ( $lines ) {
     foreach ( $lines as $line ) {
       $line = rtrim($line);

From 13da1aca1438839d414eb09f70b39a66bcc630ac Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Jun 2021 13:37:40 -0400
Subject: [PATCH 14/43] Remove 25x and options.  Browsers do not support them. 
 Add 16x which is the max. Fixes #3284

---
 web/skins/classic/includes/config.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/web/skins/classic/includes/config.php b/web/skins/classic/includes/config.php
index 663fa7fb6..9bed867ed 100644
--- a/web/skins/classic/includes/config.php
+++ b/web/skins/classic/includes/config.php
@@ -19,8 +19,7 @@
 //
 
 $rates = array(
-  -5000 => '-50x',
-  -2500 => '-25x',
+  -1600 => '-16x',
   -1000 => '-10x',
   -500  => '-5x',
   -200  => '-2x',
@@ -34,8 +33,7 @@ $rates = array(
   200   => '2x',
   500   => '5x',
   1000  => '10x',
-  2500  => '25x',
-  5000  => '50x'
+  1600  => '16x', // Max that Chrome will support
 );
 
 $scales = array(

From eda96d24e093509f665b40b0f02df4e14cf52237 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 31 May 2021 16:02:42 -0400
Subject: [PATCH 15/43] fix crash when in alert state with no event

---
 src/zm_monitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 795cd3e94..fb728ef3d 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2231,7 +2231,7 @@ bool Monitor::Analyse() {
           }
         } else if ( state == ALERT ) {
           // Alert means this frame has no motion, but we were alarmed and are still recording.
-          if ( noteSetMap.size() > 0 )
+          if ((noteSetMap.size() > 0) and event)
             event->updateNotes(noteSetMap);
         } else if ( state == TAPE ) {
           // bulk frame code moved to event.

From a676f7c407893903692b1abc2d25d024cc98c424 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 31 May 2021 15:59:36 -0400
Subject: [PATCH 16/43] SHould reset state as well as shared_data->state

---
 src/zm_monitor.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index fb728ef3d..60474c541 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1009,7 +1009,7 @@ bool Monitor::connect() {
     shared_data->signal = false;
     shared_data->capture_fps = 0.0;
     shared_data->analysis_fps = 0.0;
-    shared_data->state = IDLE;
+    shared_data->state = state = IDLE;
     shared_data->last_write_index = image_buffer_count;
     shared_data->last_read_index = image_buffer_count;
     shared_data->last_write_time = 0;
@@ -2206,8 +2206,8 @@ bool Monitor::Analyse() {
                   snap->analysis_image = new Image(*(snap->image));
                 snap->analysis_image->Overlay(*(zone.AlarmImage()));
               }
-            } // end if zone is alarmed
-          } // end foreach zone
+            }  // end if zone is alarmed
+          }  // end foreach zone
           if (event) {
             if (noteSetMap.size() > 0)
               event->updateNotes(noteSetMap);
@@ -2253,7 +2253,7 @@ bool Monitor::Analyse() {
     shared_data->last_frame_score = score;
   } else {
     Debug(3, "trigger == off");
-    if ( event ) {
+    if (event) {
       Info("%s: %03d - Closing event %" PRIu64 ", trigger off", name.c_str(), analysis_image_count, event->Id());
       closeEvent();
     }
@@ -2277,7 +2277,7 @@ bool Monitor::Analyse() {
     // Only do these if it's a video packet.
     shared_data->last_read_index = snap->image_index;
     analysis_image_count++;
-    if ( function == MODECT or function == MOCORD )
+    if (function == MODECT or function == MOCORD)
       UpdateAnalysisFPS();
   }
   packetqueue.unlock(packet_lock);

From 61de5eaae5b508fe61e26a772194d11cbc191f89 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 4 Jun 2021 15:03:08 -0400
Subject: [PATCH 17/43] More debugging around clearQueue. return early if
 deleting

---
 src/zm_packetqueue.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/zm_packetqueue.cpp b/src/zm_packetqueue.cpp
index f73ade20d..394713267 100644
--- a/src/zm_packetqueue.cpp
+++ b/src/zm_packetqueue.cpp
@@ -174,6 +174,8 @@ void PacketQueue::clearPackets(const std::shared_ptr<ZMPacket> &add_packet) {
   //
   // So start at the beginning, counting video packets until the next keyframe.  
   // Then if deleting those packets doesn't break 1 and 2, then go ahead and delete them.
+  if (deleting) return;
+
   if (keep_keyframes and ! (
         add_packet->packet.stream_index == video_stream_id
         and
@@ -327,10 +329,19 @@ void PacketQueue::clear() {
     // Someone might have this packet, but not for very long and since we have locked the queue they won't be able to get another one
     ZMLockedPacket *lp = new ZMLockedPacket(packet);
     lp->lock();
+      Debug(1,
+            "Deleting a packet with stream index:%d image_index:%d with keyframe:%d, video frames in queue:%d max: %d, queuesize:%zu",
+            packet->packet.stream_index,
+            packet->image_index,
+            packet->keyframe,
+            packet_counts[video_stream_id],
+            pre_event_video_packet_count,
+            pktQueue.size());
     pktQueue.pop_front();
     delete lp;
     //delete packet;
   }
+  Debug(1, "Packetqueue is clear, deleting iterators");
 
   for (
       std::list<packetqueue_iterator *>::iterator iterators_it = iterators.begin();
@@ -345,6 +356,7 @@ void PacketQueue::clear() {
   packet_counts = nullptr;
   max_stream_id = -1;
 
+  Debug(1, "Packetqueue is clear, notifying");
   condition.notify_all();
 }
 

From a903ab5d0993f517d22db70554236b8ba0e3ce60 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 3 Jun 2021 18:21:46 -0400
Subject: [PATCH 18/43] Introduce get_packet_and_increase_it just so we can
 lose an extra grab lock and function calls, etc.  In queuePacket, if the
 queue is full, WAIT instead of failing to queue.

---
 src/zm_packetqueue.cpp | 63 ++++++++++++++++++++++++++++++++++++++----
 src/zm_packetqueue.h   |  1 +
 2 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/src/zm_packetqueue.cpp b/src/zm_packetqueue.cpp
index 394713267..9662e4958 100644
--- a/src/zm_packetqueue.cpp
+++ b/src/zm_packetqueue.cpp
@@ -131,9 +131,13 @@ bool PacketQueue::queuePacket(std::shared_ptr<ZMPacket> add_packet) {
           } // end while
         }
       }  // end if too many video packets
-      if ((max_video_packet_count > 0) and (packet_counts[video_stream_id] > max_video_packet_count)) {
-        Error("Unable to free up older packets.  Not queueing this video packet.");
-        return false;
+      if (max_video_packet_count > 0) {
+        while (packet_counts[video_stream_id] > max_video_packet_count) {
+          Error("Unable to free up older packets.  Waiting.");
+          condition.wait(lck);
+          if (deleting or zm_terminate)
+            return false;
+        }
       }
     }  // end if this packet is a video packet
 
@@ -385,7 +389,7 @@ ZMLockedPacket *PacketQueue::get_packet(packetqueue_iterator *it) {
     std::unique_lock<std::mutex> lck(mutex);
     Debug(4, "Have Lock in get_packet");
     while (!lp) {
-      while (*it == pktQueue.end() and !(deleting or zm_terminate)) {
+      while ((*it == pktQueue.end()) and !(deleting or zm_terminate)) {
         Debug(2, "waiting.  Queue size %zu it == end? %d", pktQueue.size(), (*it == pktQueue.end()));
         condition.wait(lck);
       }
@@ -418,6 +422,53 @@ ZMLockedPacket *PacketQueue::get_packet(packetqueue_iterator *it) {
   return lp;
 }  // end ZMLockedPacket *PacketQueue::get_packet(it)
 
+// Returns a packet. Packet will be locked
+ZMLockedPacket *PacketQueue::get_packet_and_increment_it(packetqueue_iterator *it) {
+  if (deleting or zm_terminate)
+    return nullptr;
+
+  Debug(4, "Locking in get_packet using it %p queue end? %d",
+        std::addressof(*it), (*it == pktQueue.end()));
+
+  ZMLockedPacket *lp = nullptr;
+  { // scope for lock
+    std::unique_lock<std::mutex> lck(mutex);
+    Debug(4, "Have Lock in get_packet");
+    while (!lp) {
+      while ((*it == pktQueue.end()) and !(deleting or zm_terminate)) {
+        Debug(2, "waiting.  Queue size %zu it == end? %d", pktQueue.size(), (*it == pktQueue.end()));
+        condition.wait(lck);
+      }
+      if (deleting or zm_terminate) break;
+
+      std::shared_ptr<ZMPacket> p = *(*it);
+      if (!p) {
+        Error("Null p?!");
+        return nullptr;
+      }
+      Debug(3, "get_packet using it %p locking index %d",
+          std::addressof(*it), p->image_index);
+
+      lp = new ZMLockedPacket(p);
+      if (lp->trylock()) {
+        Debug(2, "Locked packet %d, unlocking packetqueue mutex, incrementing it", p->image_index);
+        ++(*it);
+        return lp;
+      }
+      delete lp;
+      lp = nullptr;
+      Debug(2, "waiting.  Queue size %zu it == end? %d", pktQueue.size(), (*it == pktQueue.end()));
+      condition.wait(lck);
+    }  // end while !lp
+  }  // end scope for lock
+
+  if (!lp) {
+    Debug(1, "terminated, leaving");
+    condition.notify_all();
+  }
+  return lp;
+}  // end ZMLockedPacket *PacketQueue::get_packet_and_increment_it(it)
+
 void PacketQueue::unlock(ZMLockedPacket *lp) {
   delete lp;
   condition.notify_all();
@@ -425,7 +476,7 @@ void PacketQueue::unlock(ZMLockedPacket *lp) {
 
 bool PacketQueue::increment_it(packetqueue_iterator *it) {
   Debug(2, "Incrementing %p, queue size %zu, end? %d", it, pktQueue.size(), ((*it) == pktQueue.end()));
-  if ((*it) == pktQueue.end() or deleting) {
+  if (((*it) == pktQueue.end()) or deleting) {
     return false;
   }
   std::unique_lock<std::mutex> lck(mutex);
@@ -441,7 +492,7 @@ bool PacketQueue::increment_it(packetqueue_iterator *it) {
 // Increment it only considering packets for a given stream
 bool PacketQueue::increment_it(packetqueue_iterator *it, int stream_id) {
   Debug(2, "Incrementing %p, queue size %zu, end? %d", it, pktQueue.size(), (*it == pktQueue.end()));
-  if ( *it == pktQueue.end() ) {
+  if (*it == pktQueue.end()) {
     return false;
   }
 
diff --git a/src/zm_packetqueue.h b/src/zm_packetqueue.h
index a2f57dcfe..7e2f367fc 100644
--- a/src/zm_packetqueue.h
+++ b/src/zm_packetqueue.h
@@ -70,6 +70,7 @@ class PacketQueue {
     bool increment_it(packetqueue_iterator *it);
     bool increment_it(packetqueue_iterator *it, int stream_id);
     ZMLockedPacket *get_packet(packetqueue_iterator *);
+    ZMLockedPacket *get_packet_and_increment_it(packetqueue_iterator *);
     packetqueue_iterator *get_video_it(bool wait);
     packetqueue_iterator *get_stream_it(int stream_id);
     void free_it(packetqueue_iterator *);

From 85b35cf82c6a3fb03aaea59363d407b775304583 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 3 Jun 2021 18:22:12 -0400
Subject: [PATCH 19/43] Use new get_packet_and_increment_it in decoder.  Adjust
 some debugging levels

---
 src/zm_monitor.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 60474c541..2f3f33f79 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2591,10 +2591,9 @@ int Monitor::Capture() {
 } // end Monitor::Capture
 
 bool Monitor::Decode() {
-  ZMLockedPacket *packet_lock = packetqueue.get_packet(decoder_it);
+  ZMLockedPacket *packet_lock = packetqueue.get_packet_and_increment_it(decoder_it);
   if (!packet_lock) return false;
   std::shared_ptr<ZMPacket> packet = packet_lock->packet_;
-  packetqueue.increment_it(decoder_it);
   if (packet->codec_type != AVMEDIA_TYPE_VIDEO) {
     Debug(4, "Not video");
     packetqueue.unlock(packet_lock);
@@ -2644,13 +2643,16 @@ bool Monitor::Decode() {
             delete packet->image;
             packet->image = nullptr;
           }
+          Debug(1, "Done assigning about to unref");
           av_frame_unref(dest_frame);
+          Debug(1, "Done assigning onde to unref");
         }  // end if have convert_context
       }  // end if need transfer to image
     } else {
       Debug(1, "No packet.size(%d) or packet->in_frame(%p). Not decoding", packet->packet.size, packet->in_frame);
     }
   }  // end if need_decoding
+
   Image* capture_image = nullptr;
   unsigned int index = image_count % image_buffer_count;
 
@@ -2690,7 +2692,7 @@ bool Monitor::Decode() {
     }
 
     if (orientation != ROTATE_0) {
-      Debug(2, "Doing rotation");
+      Debug(3, "Doing rotation");
       switch (orientation) {
         case ROTATE_0 :
           // No action required
@@ -2713,7 +2715,7 @@ bool Monitor::Decode() {
     }
 
     if (config.timestamp_on_capture) {
-      Debug(3, "Timestampprivacy");
+      Debug(3, "Timestamping");
       TimestampImage(packet->image, packet->timestamp);
     }
 
@@ -2721,7 +2723,7 @@ bool Monitor::Decode() {
     shared_timestamps[index] = packet->timestamp;
   }  // end if have image
   packet->decoded = true;
-  shared_data->signal = ( capture_image and signal_check_points ) ? CheckSignal(capture_image) : true;
+  shared_data->signal = (capture_image and signal_check_points) ? CheckSignal(capture_image) : true;
   shared_data->last_write_index = index;
   shared_data->last_write_time = packet->timestamp.tv_sec;
   packetqueue.unlock(packet_lock);

From 25bce3b8cab1242e6fac590bb4e9a4d3bbd8bc56 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Jun 2021 12:51:29 -0400
Subject: [PATCH 20/43] Adjust debug logging

---
 src/zm_monitor.cpp |  2 --
 src/zm_packet.cpp  | 18 +++++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 2f3f33f79..8118be19f 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2643,9 +2643,7 @@ bool Monitor::Decode() {
             delete packet->image;
             packet->image = nullptr;
           }
-          Debug(1, "Done assigning about to unref");
           av_frame_unref(dest_frame);
-          Debug(1, "Done assigning onde to unref");
         }  // end if have convert_context
       }  // end if need transfer to image
     } else {
diff --git a/src/zm_packet.cpp b/src/zm_packet.cpp
index b50ce275f..57bbaebc5 100644
--- a/src/zm_packet.cpp
+++ b/src/zm_packet.cpp
@@ -132,8 +132,8 @@ int ZMPacket::decode(AVCodecContext *ctx) {
 #if HAVE_LIBAVUTIL_HWCONTEXT_H
 #if LIBAVCODEC_VERSION_CHECK(57, 89, 0, 89, 0)
 
-    if ( fix_deprecated_pix_fmt(ctx->sw_pix_fmt) != fix_deprecated_pix_fmt(static_cast<AVPixelFormat>(in_frame->format)) ) {
-      Debug(1, "Have different format ctx->pix_fmt %s ?= ctx->sw_pix_fmt %s in_frame->format %s.",
+    if (fix_deprecated_pix_fmt(ctx->sw_pix_fmt) != fix_deprecated_pix_fmt(static_cast<AVPixelFormat>(in_frame->format))) {
+      Debug(3, "Have different format ctx->pix_fmt %s ?= ctx->sw_pix_fmt %s in_frame->format %s.",
           av_get_pix_fmt_name(ctx->pix_fmt),
           av_get_pix_fmt_name(ctx->sw_pix_fmt),
           av_get_pix_fmt_name(static_cast<AVPixelFormat>(in_frame->format))
@@ -180,7 +180,7 @@ int ZMPacket::decode(AVCodecContext *ctx) {
       /* retrieve data from GPU to CPU */
       zm_dump_video_frame(in_frame, "Before hwtransfer");
       ret = av_hwframe_transfer_data(new_frame, in_frame, 0);
-      if ( ret < 0 ) {
+      if (ret < 0) {
         Error("Unable to transfer frame: %s, continuing",
             av_make_error_string(ret).c_str());
         av_frame_free(&in_frame);
@@ -188,7 +188,7 @@ int ZMPacket::decode(AVCodecContext *ctx) {
         return 0;
       }
       ret = av_frame_copy_props(new_frame, in_frame);
-      if ( ret < 0 ) {
+      if (ret < 0) {
         Error("Unable to copy props: %s, continuing",
             av_make_error_string(ret).c_str());
       }
@@ -205,7 +205,7 @@ int ZMPacket::decode(AVCodecContext *ctx) {
     } else
 #endif
 #endif
-      Debug(2, "Same pix format %s so not hwtransferring. sw_pix_fmt is %s",
+      Debug(3, "Same pix format %s so not hwtransferring. sw_pix_fmt is %s",
           av_get_pix_fmt_name(ctx->pix_fmt),
           av_get_pix_fmt_name(ctx->sw_pix_fmt)
           );
@@ -219,12 +219,12 @@ int ZMPacket::decode(AVCodecContext *ctx) {
 } // end ZMPacket::decode
 
 Image *ZMPacket::get_image(Image *i) {
-  if ( !in_frame ) {
+  if (!in_frame) {
     Error("Can't get image without frame.. maybe need to decode first");
     return nullptr;
   }
-  if ( !image ) {
-    if ( !i ) {
+  if (!image) {
+    if (!i) {
       Error("Need a pre-allocated image buffer");
       return nullptr;
     } 
@@ -240,7 +240,7 @@ Image *ZMPacket::set_image(Image *i) {
 }
 
 AVPacket *ZMPacket::set_packet(AVPacket *p) {
-  if ( zm_av_packet_ref(&packet, p) < 0 ) {
+  if (zm_av_packet_ref(&packet, p) < 0) {
     Error("error refing packet");
   }
   //ZM_DUMP_PACKET(packet, "zmpacket:");

From 1a6dc18a09d9545e57520e058ad9fbd82baca5be Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 28 May 2021 11:38:48 -0400
Subject: [PATCH 21/43] simplify test for being decoded.  timestamping needs to
 be done as well

---
 src/zm_monitor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 8118be19f..c1fadd6e1 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1855,7 +1855,7 @@ bool Monitor::Analyse() {
 
         /* try to stay behind the decoder. */
         if (decoding_enabled) {
-          while ((!snap->image or deinterlacing_value) and !snap->decoded and !zm_terminate and !analysis_thread->Stopped()) {
+          while (!snap->decoded and !zm_terminate and !analysis_thread->Stopped()) {
             // Need to wait for the decoder thread.
             Debug(1, "Waiting for decode");
             packet_lock->wait();

From 9dd960beaccf2ab49d6bc9eafc46d4fc98f8febd Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 28 May 2021 13:54:20 -0400
Subject: [PATCH 22/43] Actually close the camera in localcamera::Close

---
 src/zm_local_camera.cpp | 6 ++++++
 src/zm_local_camera.h   | 3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/zm_local_camera.cpp b/src/zm_local_camera.cpp
index 3ff3608c0..0679a5c5e 100644
--- a/src/zm_local_camera.cpp
+++ b/src/zm_local_camera.cpp
@@ -705,6 +705,12 @@ LocalCamera::~LocalCamera() {
     
 } // end LocalCamera::~LocalCamera
 
+int LocalCamera::Close() {
+  if (device_prime && capture)
+    Terminate();
+  return 0;
+};
+
 void LocalCamera::Initialise() {
   Debug(3, "Opening video device %s", device.c_str());
   //if ( (vid_fd = open( device.c_str(), O_RDWR|O_NONBLOCK, 0 )) < 0 )
diff --git a/src/zm_local_camera.h b/src/zm_local_camera.h
index 6c64e39d6..7bbb285ac 100644
--- a/src/zm_local_camera.h
+++ b/src/zm_local_camera.h
@@ -153,8 +153,7 @@ public:
   int PreCapture() override;
   int Capture(std::shared_ptr<ZMPacket> &p) override;
   int PostCapture() override;
-  int Close() override { return 0; };
-
+  int Close() override;
   static bool GetCurrentSettings(const char *device, char *output, int version, bool verbose);
 };
 

From 16295598dc97af5789a22fef301e7a9de054fb38 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Jun 2021 15:53:35 -0400
Subject: [PATCH 23/43] spacing

---
 web/ajax/modals/eventrename.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/ajax/modals/eventrename.php b/web/ajax/modals/eventrename.php
index c877d57b4..f556a09b0 100644
--- a/web/ajax/modals/eventrename.php
+++ b/web/ajax/modals/eventrename.php
@@ -1,10 +1,9 @@
 <?php
-if ( !canEdit('Events') ) return;
+if (!canEdit('Events')) return;
 
 $eid = isset($_REQUEST['eid']) ? $_REQUEST['eid'] : '';
 $eid = validInt($eid);
 $Event = new ZM\Event($eid);
-
 ?>
 <div class="modal" id="eventRenameModal" tabindex="-1">
   <div class="modal-dialog">

From 131e57a99e6507cd62fa32afdf5d4fcddf9e8d88 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Jun 2021 15:54:14 -0400
Subject: [PATCH 24/43] StartTimeShort should be StartDateTimeShort.  Leave
 StartTimeShort for backwards compatibility.  Add Storage, DiskSpace in
 status=>event

---
 web/ajax/status.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/web/ajax/status.php b/web/ajax/status.php
index 9d14dd24d..96f83595c 100644
--- a/web/ajax/status.php
+++ b/web/ajax/status.php
@@ -108,7 +108,9 @@ $statusData = array(
       'Cause' => true,
       'Notes' => true,
       'StartDateTime' => true,
+      # Left for backwards compatability. Remove in 1.37
       'StartTimeShort' => array( 'sql' => 'date_format( StartDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
+      'StartDateTimeShort' => array( 'sql' => 'date_format( StartDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
       'EndDateTime' => true,
       'Width' => true,
       'Height' => true,
@@ -131,8 +133,12 @@ $statusData = array(
       'MonitorName' => array('sql' => '(SELECT Monitors.Name FROM Monitors WHERE Monitors.Id = Events.MonitorId)'),
       'Name' => true,
       'Cause' => true,
+      'DiskSpace' => true,
+      'Storage' => array('sql' => '(SELECT Storage.Name FROM Storage WHERE Storage.Id=Events.StorageId)'),
       'StartDateTime' => true,
+      # Left for backwards compatability. Remove in 1.37
       'StartTimeShort' => array( 'sql' => 'date_format( StartDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
+      'StartDateTimeShort' => array( 'sql' => 'date_format( StartDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
       'EndDateTime' => true,
       'Width' => true,
       'Height' => true,

From 2288d329286e0df6dc476a69cf29e579c5759454 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Jun 2021 15:58:17 -0400
Subject: [PATCH 25/43] Use getStat instead of other jquery code to update the
 event data.  Don't refresh before rename ajax finishes. Deprecate the n/a
 handling in getStat. Not sure why it's needed.  Sync update eventData with
 what is returned by ajax status call. Fixes #3265

---
 web/skins/classic/views/js/event.js     | 34 ++++++-------------------
 web/skins/classic/views/js/event.js.php | 13 +++++-----
 2 files changed, 15 insertions(+), 32 deletions(-)

diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js
index 0a73dd9d4..e2d3c9ce3 100644
--- a/web/skins/classic/views/js/event.js
+++ b/web/skins/classic/views/js/event.js
@@ -424,7 +424,6 @@ function streamFastRev(action) {
   if (vid) { //There is no reverse play with mp4.  Set the speed to 0 and manually set the time back.
     revSpeed = -1*(rates[rates.indexOf(revSpeed*-100)-1]/100);
     if (rates.indexOf(revSpeed*-100) == 0) {
-      console.log("paused?");
       setButtonState('fastRevBtn', 'unavail');
     }
     clearInterval(intervalRewind);
@@ -583,28 +582,9 @@ function getEventResponse(respObj, respText) {
   }
 
   eventData = respObj.event;
+  getStat();
   currEventId = eventData.Id;
 
-  $j('#dataEventId').text( eventData.Id );
-  $j('#dataEventName').text( eventData.Name );
-  $j('#dataMonitorId').text('<a href="?video=monitor&mid='+eventData.MonitorId+'">'+eventData.MonitorId+'</a>');
-  $j('#dataMonitorName').text('<a href="?video=monitor&mid='+eventData.MonitorId+'">'+eventData.MonitorName+'</a>');
-  $j('#dataCause').text( eventData.Cause );
-  if ( eventData.Notes ) {
-    $j('#dataCause').prop( 'title', eventData.Notes );
-  } else {
-    $j('#dataCause').prop( 'title', causeString );
-  }
-  $j('#dataStartTime').text( eventData.StartDateTime );
-  $j('#dataDuration').text( eventData.Length );
-  $j('#dataFrames').text( eventData.Frames );
-  $j('#dataAlarmFrames').text( eventData.AlarmFrames );
-  $j('dataTotalScore').text( eventData.TotScore );
-  $j('dataAvgScore').text( eventData.AvgScore );
-  $j('dataMaxScore').text( eventData.MaxScore );
-  $j('dataDiskSpace').text( eventData.DiskSpace );
-  $j('dataStorage').text( eventData.Storage );
-
   // Refresh the status of the archive buttons
   archiveBtn.prop('disabled', !(!eventData.Archived && canEdit.Events));
   unarchiveBtn.prop('disabled', !(eventData.Archived && canEdit.Events));
@@ -612,7 +592,6 @@ function getEventResponse(respObj, respText) {
   history.replaceState(null, null, '?view=event&eid=' + eventData.Id + filterQuery + sortQuery); //if popup removed, check if this allows forward
   if ( vid && CurEventDefVideoPath ) {
     vid.src({type: 'video/mp4', src: CurEventDefVideoPath}); //Currently mp4 is all we use
-    console.log('getEventResponse');
     initialAlarmCues(eventData.Id);//ajax and render, new event
     addVideoTimingTrack(vid, LabelFormat, eventData.MonitorName, eventData.Length, eventData.StartDateTime);
     CurEventDefVideoPath = null;
@@ -640,7 +619,6 @@ function getNearEventsResponse(respObj, respText) {
   if (checkStreamForErrors('getNearEventsResponse', respObj)) {
     return;
   }
-  console.log(respObj);
   prevEventId = respObj.nearevents.PrevEventId;
   nextEventId = respObj.nearevents.NextEventId;
   prevEventStartTime = Date.parse(respObj.nearevents.PrevEventStartTime);
@@ -709,6 +687,7 @@ function getActResponse(respObj, respText) {
   if (respObj.refreshEvent) {
     eventQuery(eventData.Id);
   }
+  $j('#eventRenameModal').modal('hide');
 }
 
 function actQuery(action, parms) {
@@ -726,8 +705,6 @@ function actQuery(action, parms) {
 function renameEvent() {
   var newName = $j('input').val();
   actQuery('rename', {eventName: newName});
-  //FIXME: update the value of the event name rather than reload the whole page
-  window.location.reload(true);
 }
 
 function exportEvent() {
@@ -826,7 +803,8 @@ function getStat() {
     var th = $j('<th>').addClass('text-right').text(eventDataStrings[key]);
     var tdString;
 
-    switch ( ( eventData[key] && eventData[key].length ) ? key : 'n/a') {
+    //switch ( ( eventData[key] && eventData[key].length ) ? key : 'n/a') {
+    switch (key) {
       case 'Frames':
         tdString = '<a href="?view=frames&amp;eid=' + eventData.Id + '">' + eventData[key] + '</a>';
         break;
@@ -839,6 +817,10 @@ function getStat() {
       case 'n/a':
         tdString = 'n/a';
         break;
+      case 'Archived':
+      case 'Emailed':
+        tdString = eventData[key] ? yesStr : noStr;
+        break;
       default:
         tdString = eventData[key];
     }
diff --git a/web/skins/classic/views/js/event.js.php b/web/skins/classic/views/js/event.js.php
index a07f4a3b2..cdd4e9041 100644
--- a/web/skins/classic/views/js/event.js.php
+++ b/web/skins/classic/views/js/event.js.php
@@ -49,7 +49,7 @@ var eventData = {
     Height: '<?php echo $Event->Height() ?>',
     Length: '<?php echo $Event->Length() ?>',
     StartDateTime: '<?php echo $Event->StartDateTime() ?>',
-    StartDateTimeFmt: '<?php echo strftime(STRF_FMT_DATETIME_SHORT, strtotime($Event->StartDateTime())) ?>',
+    StartDateTimeShort: '<?php echo strftime(STRF_FMT_DATETIME_SHORT, strtotime($Event->StartDateTime())) ?>',
     EndDateTime: '<?php echo $Event->EndDateTime() ?>',
     Frames: '<?php echo $Event->Frames() ?>',
     AlarmFrames: '<?php echo $Event->AlarmFrames() ?>',
@@ -58,20 +58,21 @@ var eventData = {
     MaxScore: '<?php echo $Event->MaxScore() ?>',
     DiskSpace: '<?php echo human_filesize($Event->DiskSpace(null)) ?>',
     Storage: '<?php echo validHtmlStr($Event->Storage()->Name()).( $Event->SecondaryStorageId() ? ', '.validHtmlStr($Event->SecondaryStorage()->Name()) : '' ) ?>',
-    ArchivedStr: '<?php echo $Event->Archived ? translate('Yes') : translate('No') ?>',
-    EmailedStr: '<?php echo $Event->Emailed ? translate('Yes') : translate('No') ?>',
     Archived: <?php echo $Event->Archived?'true':'false' ?>,
     Emailed: <?php echo $Event->Emailed?'true':'false' ?>
 <?php } ?>
 };
 
+var yesStr = '<?php echo translate('Yes') ?>';
+var noStr = '<?php echo translate('No') ?>';
+
 var eventDataStrings = {
     Id: '<?php echo translate('EventId') ?>',
     Name: '<?php echo translate('EventName') ?>',
     MonitorId: '<?php echo translate('AttrMonitorId') ?>',
     MonitorName: '<?php echo translate('AttrMonitorName') ?>',
     Cause: '<?php echo translate('Cause') ?>',
-    StartDateTimeFmt: '<?php echo translate('AttrStartTime') ?>',
+    StartDateTimeShort: '<?php echo translate('AttrStartTime') ?>',
     Length: '<?php echo translate('Duration') ?>',
     Frames: '<?php echo translate('AttrFrames') ?>',
     AlarmFrames: '<?php echo translate('AttrAlarmFrames') ?>',
@@ -80,8 +81,8 @@ var eventDataStrings = {
     MaxScore: '<?php echo translate('AttrMaxScore') ?>',
     DiskSpace: '<?php echo translate('DiskSpace') ?>',
     Storage: '<?php echo translate('Storage') ?>',
-    ArchivedStr: '<?php echo translate('Archived') ?>',
-    EmailedStr: '<?php echo translate('Emailed') ?>'
+    Archived: '<?php echo translate('Archived') ?>',
+    Emailed: '<?php echo translate('Emailed') ?>'
 };
 
 var monitorUrl = '<?php echo $Event->Storage()->Server()->UrlToIndex(); ?>';

From b6343383989f29bc0c7ff6778742cacae1e3f265 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 8 Jun 2021 16:00:20 -0400
Subject: [PATCH 26/43] Bump version for 1.36.4

---
 distros/redhat/zoneminder.spec | 5 ++++-
 version                        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index 64a4dd9f5..0d3537e88 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -31,7 +31,7 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.36.3
+Version: 1.36.4
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
@@ -425,6 +425,9 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
 %dir %attr(755,nginx,nginx) %{_localstatedir}/log/zoneminder
 
 %changelog
+* Tue Jun 08 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.4-1
+- 1.36.4 release
+
 * Sun May 30 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.3-1
 - 1.36.3 release
 
diff --git a/version b/version
index 663224e46..08a6a38d6 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.36.3
+1.36.4

From 3141ec32fe0658259cfcfa9b64860e8433029e18 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sat, 12 Jun 2021 11:57:10 -0400
Subject: [PATCH 27/43] Add a limit of 1000 when pulling sessions. Sessions
 table can contain hundreds of thousands of lines all relatively useless.
 Modals need to pop up fast.

---
 web/ajax/modals/logout.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/web/ajax/modals/logout.php b/web/ajax/modals/logout.php
index a0648a70c..e9066795d 100644
--- a/web/ajax/modals/logout.php
+++ b/web/ajax/modals/logout.php
@@ -43,8 +43,8 @@ global $CLANG;
   <tbody>
 <?php
 require_once('includes/User.php');
-$result = dbQuery('SELECT * FROM Sessions ORDER BY access DESC');
-if ( ! $result ) return;
+$result = dbQuery('SELECT * FROM Sessions ORDER BY access DESC LIMIT 1000');
+if (!$result) return;
 
 $current_session = $_SESSION;
 zm_session_start();
@@ -52,25 +52,24 @@ zm_session_start();
 $user_cache = array();
 while ( $row = $result->fetch(PDO::FETCH_ASSOC) ) {
   $_SESSION = array();
-  if ( ! session_decode($row['data']) ) {
-    ZM\Warning('Failed to decode ' . $row['data']);
+  if (!session_decode($row['data'])) {
+    ZM\Warning('Failed to decode '.$row['data']);
     continue;
   }
-  ZM\Debug(print_r($_SESSION, true));
-  if ( isset($_SESSION['last_time']) )  {
+  if (isset($_SESSION['last_time']))  {
     # This is a dead session
     continue;
   }
-  if ( !isset($_SESSION['username']) ) {
+  if (!isset($_SESSION['username'])) {
     # Not logged in
     continue;
   }
-  if ( isset($user_cache[$_SESSION['username']]) ) {
+  if (isset($user_cache[$_SESSION['username']])) {
     $user = $user_cache[$_SESSION['username']];
   } else {
     $user = ZM\User::find_one(array('Username'=>$_SESSION['username']));
-    if ( ! $user ) {
-      ZM\Debug('User not found for ' . $_SESSION['username']);
+    if (!$user) {
+      ZM\Debug('User not found for '.$_SESSION['username']);
       continue;
     }
     $user_cache[$_SESSION['username']] = $user;

From bb67c27d3b65d61814410c6144752db6a14a0686 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sat, 12 Jun 2021 12:21:44 -0400
Subject: [PATCH 28/43] It is okay to call daemonControl with function==None
 for command == stop.  All others give a warning. Fixes monitors on other
 servers not stopping when set to None.

---
 web/api/app/Model/Monitor.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/web/api/app/Model/Monitor.php b/web/api/app/Model/Monitor.php
index cc4ef1375..de9a7685a 100644
--- a/web/api/app/Model/Monitor.php
+++ b/web/api/app/Model/Monitor.php
@@ -143,28 +143,28 @@ class Monitor extends AppModel {
   );
 
   public function daemonControl($monitor, $command, $daemon=null) {
-    if ( $monitor['Function'] == 'None' ) {
-      ZM\Debug('Calling daemonControl when Function == None');
+    if ($monitor['Function'] == 'None' and $command != 'stop') {
+      ZM\Warning("Calling daemonControl with command $command when Function == None");
       return;
     }
-    if ( defined('ZM_SERVER_ID') and ($monitor['ServerId']!=ZM_SERVER_ID) ) {
+    if (defined('ZM_SERVER_ID') and ($monitor['ServerId']!=ZM_SERVER_ID)) {
       ZM\Error('Calling daemonControl for Monitor assigned to different server. Our server id '.ZM_SERVER_ID.' != '.$monitor['ServerId']);
       return;
     }
 
     $daemons = array();
-    if ( ! $daemon ) {
+    if (!$daemon) {
       array_push($daemons, 'zmc');
     } else {
       array_push($daemons, $daemon);
     }
 
     $status_text = '';
-    foreach ( $daemons as $daemon ) {
+    foreach ($daemons as $daemon) {
       $args = '';
-      if ( $daemon == 'zmc' and $monitor['Type'] == 'Local' ) {
+      if ($daemon == 'zmc' and $monitor['Type'] == 'Local') {
         $args = '-d ' . $monitor['Device'];
-      } else if ( $daemon == 'zmcontrol.pl' ) {
+      } else if ($daemon == 'zmcontrol.pl') {
         $args = '--id '.$monitor['Id'];
       } else {
         $args = '-m ' . $monitor['Id'];

From db0f9911aea841d081bc8cf72ef69e5b72ba9276 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 14 Jun 2021 09:52:10 -0400
Subject: [PATCH 29/43] merge fixes from #3295.  Fixes #3295.

---
 .../lib/ZoneMinder/Control/onvif.pm           | 83 ++++++++++++-------
 1 file changed, 55 insertions(+), 28 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm
index 12a78144c..c8cf84712 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm
@@ -1,6 +1,6 @@
 # ==========================================================================
 #
-# ZoneMinder ONVIF Control Protocol Module, $Date: 2021-02-25 22:07:00 +0000 (Thu, 25 Feb 2021) $, $Revision: 0001 $
+# ZoneMinder ONVIF Control Protocol Module
 # Based on the Netcat onvif script by Andrew Bauer (knnniggett@users.sourceforge.net)
 #
 # This program is free software; you can redistribute it and/or
@@ -182,6 +182,7 @@ sub sendCmd {
   $req->header('connection' => 'Close');
   $req->content($msg);
 
+
   my $res = $self->{ua}->request($req);
 
   if ( $res->is_success ) {
@@ -235,22 +236,39 @@ sub getCamParams {
 sub autoStop {
   my $self = shift;
   my $autostop = shift;
+  my $iszoom = shift;
 
   if ( $autostop ) {
     Debug('Auto Stop');
     my $cmd = $controlUri;
-    my $msg_body = '
-	    <s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-            	<Stop xmlns="http://www.onvif.org/ver20/ptz/wsdl">
-                	<ProfileToken>'.$profileToken.'</ProfileToken>
-                	<PanTilt>
-                	    true
-                	</PanTilt>
-                	<Zoom>
-                	    false
-                	</Zoom>
-                </Stop>
-            </s:Body>';
+    my $msg_body;
+    if( $iszoom) {
+	    $msg_body = '
+		    <s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+			<Stop xmlns="http://www.onvif.org/ver20/ptz/wsdl">
+				<ProfileToken>'.$profileToken.'</ProfileToken>
+				<PanTilt>
+				    false
+				</PanTilt>
+				<Zoom>
+				    true
+				</Zoom>
+			</Stop>
+		    </s:Body>';
+    } else {
+	    $msg_body = '
+		    <s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+			<Stop xmlns="http://www.onvif.org/ver20/ptz/wsdl">
+				<ProfileToken>'.$profileToken.'</ProfileToken>
+				<PanTilt>
+				    true
+				</PanTilt>
+				<Zoom>
+				    false
+				</Zoom>
+			</Stop>
+		    </s:Body>';
+    }
 
     my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
     usleep($autostop);
@@ -340,9 +358,9 @@ sub moveCamera {
   my $type = shift;
   my $x = shift;
   my $y = shift;
-  my $msg_move_body = "";
+  my $msg_move_body = '';
 
-  if ( $type == "move" ){
+  if ( $type eq 'move' ) {
   	$msg_move_body = '
   	    <s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   	        <ContinuousMove xmlns="http://www.onvif.org/ver20/ptz/wsdl">
@@ -356,7 +374,7 @@ sub moveCamera {
             </ContinuousMove>
         </s:Body>';
 
-  } elsif ( $type == "zoom" ) {
+  } elsif ( $type eq 'zoom' ) {
   	$msg_move_body = '
 		<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 			<ContinuousMove xmlns="http://www.onvif.org/ver20/ptz/wsdl">
@@ -371,7 +389,6 @@ sub moveCamera {
   }
 
   return $msg_move_body;
-
 }
 
 #Up Arrow
@@ -382,7 +399,7 @@ sub moveConUp {
   my $msg_body = moveCamera("move", "0","0.5");
   my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
   $self->sendCmd($cmd, $msg_body, $content_type);
-  $self->autoStop($self->{Monitor}->{AutoStopTimeout});
+  $self->autoStop($self->{Monitor}->{AutoStopTimeout},0);
 }
 
 
@@ -394,7 +411,7 @@ sub moveConDown {
   my $msg_body = moveCamera("move","0","-0.5");
   my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
   $self->sendCmd($cmd, $msg_body, $content_type);
-  $self->autoStop($self->{Monitor}->{AutoStopTimeout});
+  $self->autoStop($self->{Monitor}->{AutoStopTimeout},0);
 }
 
 #Left Arrow
@@ -405,7 +422,7 @@ sub moveConLeft {
   my $msg_body = moveCamera("move","-0.49","0");
   my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
   $self->sendCmd($cmd, $msg_body, $content_type);
-  $self->autoStop($self->{Monitor}->{AutoStopTimeout});
+  $self->autoStop($self->{Monitor}->{AutoStopTimeout},0);
 }
 
 #Right Arrow
@@ -416,7 +433,7 @@ sub moveConRight {
   my $msg_body = moveCamera("move","0.49","0");
   my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
   $self->sendCmd($cmd, $msg_body, $content_type);
-  $self->autoStop($self->{Monitor}->{AutoStopTimeout});
+  $self->autoStop($self->{Monitor}->{AutoStopTimeout},0);
 }
 
 #Zoom In
@@ -427,7 +444,7 @@ sub zoomConTele {
   my $msg_body = moveCamera("zoom","0.49","0");
   my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
   $self->sendCmd($cmd, $msg_body, $content_type);
-  $self->autoStop($self->{Monitor}->{AutoStopTimeout});
+  $self->autoStop($self->{Monitor}->{AutoStopTimeout},1);
 }
 
 #Zoom Out
@@ -438,9 +455,19 @@ sub zoomConWide {
   my $msg_body = moveCamera("zoom","-0.49","0");
   my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
   $self->sendCmd($cmd, $msg_body, $content_type);
-  $self->autoStop($self->{Monitor}->{AutoStopTimeout});
+  $self->autoStop($self->{Monitor}->{AutoStopTimeout},1);
 }
 
+sub zoomStop {
+  Debug('Zoom Stop');
+  my $self = shift;
+  my $cmd = $controlUri;
+  $self->autoStop($self->{Monitor}->{AutoStopTimeout},1);
+  Error('Zoom Stop not implemented');
+}
+
+
+
 #Diagonally Up Right Arrow
 #This camera does not have builtin diagonal commands so we emulate them
 sub moveConUpRight {
@@ -450,7 +477,7 @@ sub moveConUpRight {
   my $msg_body = moveCamera("move","0.5","0.5");
   my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
   $self->sendCmd($cmd, $msg_body, $content_type);
-  $self->autoStop($self->{Monitor}->{AutoStopTimeout});
+  $self->autoStop($self->{Monitor}->{AutoStopTimeout},0);
 }
 
 #Diagonally Down Right Arrow
@@ -462,7 +489,7 @@ sub moveConDownRight {
   my $msg_body = moveCamera("move","0.5","-0.5");
   my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
   $self->sendCmd($cmd, $msg_body, $content_type);
-  $self->autoStop($self->{Monitor}->{AutoStopTimeout});
+  $self->autoStop($self->{Monitor}->{AutoStopTimeout},0);
 }
 
 #Diagonally Up Left Arrow
@@ -474,7 +501,7 @@ sub moveConUpLeft {
   my $msg_body = moveCamera("move","-0.5","0.5");
   my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
   $self->sendCmd($cmd, $msg_body, $content_type);
-  $self->autoStop($self->{Monitor}->{AutoStopTimeout});
+  $self->autoStop($self->{Monitor}->{AutoStopTimeout},0);
 }
 
 #Diagonally Down Left Arrow
@@ -486,7 +513,7 @@ sub moveConDownLeft {
   my $msg_body = moveCamera("move","-0.5","-0.5");
   my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
   $self->sendCmd($cmd, $msg_body, $content_type);
-  $self->autoStop($self->{Monitor}->{AutoStopTimeout});
+  $self->autoStop($self->{Monitor}->{AutoStopTimeout},0);
 }
 
 #Stop
@@ -499,7 +526,7 @@ sub moveStop {
 		<Stop xmlns="http://www.onvif.org/ver20/ptz/wsdl">
 			<ProfileToken>'.$profileToken.'</ProfileToken>
 				<PanTilt>true</PanTilt>
-				<Zoom>false</Zoom>
+				<Zoom>true</Zoom>
 		</Stop>
 	</s:Body>';
   my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';

From f6c29b51ef20340078bb95e73ac547465882a67f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 14 Jun 2021 11:58:06 -0400
Subject: [PATCH 30/43] Fix EndTime case handling.

---
 scripts/ZoneMinder/lib/ZoneMinder/Filter.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
index 5711437f2..5c2bf6f43 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
@@ -199,10 +199,10 @@ sub Sql {
             $self->{Sql} .= 'E.EndDateTime';
           } elsif ( $term->{attr} eq 'EndDate' ) {
             $self->{Sql} .= 'to_days( E.EndDateTime )';
-          } elsif ( $term->{attr} eq 'EndDateTime' ) {
+          } elsif ( $term->{attr} eq 'EndTime' ) {
             $self->{Sql} .= 'extract( hour_second from E.EndDateTime )';
           } elsif ( $term->{attr} eq 'EndWeekday' ) {
-            $self->{Sql} .= "weekday( E.EndDateTime )";
+            $self->{Sql} .= 'weekday( E.EndDateTime )';
           } elsif ( $term->{attr} eq 'ExistsInFileSystem' ) {
             push @{$self->{PostSQLConditions}}, $term;
             $self->{Sql} .= 'TRUE /* ExistsInFileSystem */';

From 0ca10fe7cd429df86d18a3f373ff486ab6bd6248 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 15 Jun 2021 10:33:42 -0400
Subject: [PATCH 31/43] Add special handling of sorting by EndTime because it
 can be NULL. Fixes #3298

---
 web/ajax/events.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/web/ajax/events.php b/web/ajax/events.php
index 8a8e3a4f1..562cce9c2 100644
--- a/web/ajax/events.php
+++ b/web/ajax/events.php
@@ -38,10 +38,20 @@ $search = isset($_REQUEST['search']) ? $_REQUEST['search'] : '';
 // Bootstrap table sends json_ecoded array, which we must decode
 $advsearch = isset($_REQUEST['advsearch']) ? json_decode($_REQUEST['advsearch'], JSON_OBJECT_AS_ARRAY) : array();
 
+// Order specifies the sort direction, either asc or desc
+$order = (isset($_REQUEST['order']) and (strtolower($_REQUEST['order']) == 'asc')) ? 'ASC' : 'DESC';
+
 // Sort specifies the name of the column to sort on
 $sort = 'StartDateTime';
-if ( isset($_REQUEST['sort']) ) {
+if (isset($_REQUEST['sort'])) {
   $sort = $_REQUEST['sort'];
+  if ($sort == 'EndDateTime') {
+    if ($order == 'ASC') {
+      $sort = 'EndDateTime IS NULL, EndDateTime';
+    } else {
+      $sort = 'EndDateTime IS NOT NULL, EndDateTime';
+    }
+  }
 }
 
 // Offset specifies the starting row to return, used for pagination
@@ -54,8 +64,6 @@ if ( isset($_REQUEST['offset']) ) {
   }
 }
 
-// Order specifies the sort direction, either asc or desc
-$order = (isset($_REQUEST['order']) and (strtolower($_REQUEST['order']) == 'asc')) ? 'ASC' : 'DESC';
 
 // Limit specifies the number of rows to return
 // Set the default to 0 for events view, to prevent an issue with ALL pagination

From a423f2620eb19f4605c84af7b57e1571fc6c2e0e Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Fri, 18 Jun 2021 12:12:01 -0500
Subject: [PATCH 32/43] Allow cakephp cache engine to be set during build

---
 CMakeLists.txt                      |  6 ++++++
 distros/redhat/zoneminder.spec      | 12 +++++-------
 web/api/app/Config/bootstrap.php.in |  2 +-
 web/api/app/Plugin/Crud             |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 700c80a20..920a0e43f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,8 +189,14 @@ set(ZM_MANPAGE_DEST_PREFIX "share/man" CACHE PATH
   "Relative path used to install ZoneMinder's Man pages into a
     non-standard folder. Most Linux users will not need to change this.
     BSD users may need to set this.")
+set(ZM_CAKEPHP_CACHE "Apc" CACHE STRING
+  "Set the CakePHP cache engine, default: Apc")
 
 # Reassign some variables if a target distro has been specified
+if(ZM_TARGET_DISTRO MATCHES "^fc")
+  set(ZM_CAKEPHP_CACHE "Memcached")
+endif()
+
 if((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))
   set(ZM_RUNDIR "/var/run/zoneminder")
   set(ZM_SOCKDIR "/var/lib/zoneminder/sock")
diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index 0d3537e88..dde459933 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -17,11 +17,6 @@
 # This will tell zoneminder's cmake process we are building against a known distro
 %global zmtargetdistro %{?rhel:el%{rhel}}%{!?rhel:fc%{fedora}}
 
-# Fedora needs apcu backwards compatibility module
-%if 0%{?fedora}
-%global with_apcu_bc 1
-%endif
-
 # Newer php's keep json functions in a subpackage
 %if 0%{?fedora} || 0%{?rhel} >= 8
 %global with_php_json 1
@@ -116,8 +111,8 @@ Requires: php-mysqli
 Requires: php-common
 Requires: php-gd
 %{?with_php_json:Requires: php-json}
-Requires: php-pecl-apcu
-%{?with_apcu_bc:Requires: php-pecl-apcu-bc}
+%{?fedora:Requires: php-pecl-memcached}
+%{?rhel:Requires: php-pecl-apcu}
 Requires: cambozola
 Requires: net-tools
 Requires: psmisc
@@ -425,6 +420,9 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
 %dir %attr(755,nginx,nginx) %{_localstatedir}/log/zoneminder
 
 %changelog
+* Fri Jun 18 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.4-2
+- apcu-bc deprecated on fedora, use memcached instead
+
 * Tue Jun 08 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.4-1
 - 1.36.4 release
 
diff --git a/web/api/app/Config/bootstrap.php.in b/web/api/app/Config/bootstrap.php.in
index 894b3ec00..9751abd60 100644
--- a/web/api/app/Config/bootstrap.php.in
+++ b/web/api/app/Config/bootstrap.php.in
@@ -23,7 +23,7 @@
  */
 
 // Setup a 'default' cache configuration for use in the application.
-Cache::config('default', array('engine' => 'Apc'));
+Cache::config('default', array('engine' => '@ZM_CAKEPHP_CACHE@'));
 
 /**
  * The settings below can be used to set additional paths to models, views and controllers.
diff --git a/web/api/app/Plugin/Crud b/web/api/app/Plugin/Crud
index 14292374c..0bd63fb46 160000
--- a/web/api/app/Plugin/Crud
+++ b/web/api/app/Plugin/Crud
@@ -1 +1 @@
-Subproject commit 14292374ccf1328f2d5db20897bd06f99ba4d938
+Subproject commit 0bd63fb464957080ead342db58ca9e01532cf1ef

From 172a0555ed9ce6672982785e9568a4296b6cda01 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Fri, 18 Jun 2021 15:25:17 -0500
Subject: [PATCH 33/43] only refer to cmake3 when building on el7

---
 distros/redhat/zoneminder.spec | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index dde459933..dd730cf77 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -22,6 +22,16 @@
 %global with_php_json 1
 %endif
 
+# el7 uses cmake3 package and macros
+%if 0%{?rhel} == 7
+%global cmake %{cmake3}
+%global cmake_build %{cmake3_build}
+%global cmake_install %{cmake3_install}
+%global cmake_pkg_name cmake3
+%else
+%global cmake_pkg_name cmake
+%endif
+
 # The default for everything but el7 these days
 %global _hardened_build 1
 
@@ -51,7 +61,7 @@ BuildRequires: systemd-devel
 BuildRequires: mariadb-devel
 BuildRequires: perl-podlators
 BuildRequires: polkit-devel
-BuildRequires: cmake3
+BuildRequires: %{cmake_pkg_name}
 BuildRequires: gnutls-devel
 BuildRequires: bzip2-devel
 BuildRequires: pcre-devel 
@@ -211,16 +221,16 @@ mv -f RtspServer-%{rtspserver_commit} ./dep/RtspServer
 # See https://fedoraproject.org/wiki/LTOByDefault
 %define _lto_cflags %{nil}
 
-%cmake3 \
+%cmake \
         -DZM_WEB_USER="%{zmuid_final}" \
         -DZM_WEB_GROUP="%{zmgid_final}" \
         -DZM_TARGET_DISTRO="%{zmtargetdistro}" \
         .
 
-%cmake3_build
+%cmake_build
 
 %install
-%cmake3_install
+%cmake_install
 
 desktop-file-install					\
 	--dir %{buildroot}%{_datadir}/applications	\

From b95cf72dc8d9689c22c6d63d349b98b7757da59a Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Fri, 18 Jun 2021 15:27:24 -0500
Subject: [PATCH 34/43] comment to rpm changelog regarding cmake

---
 distros/redhat/zoneminder.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index dd730cf77..426684e0f 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -432,6 +432,7 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
 %changelog
 * Fri Jun 18 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.4-2
 - apcu-bc deprecated on fedora, use memcached instead
+- only refer to cmake3 when building on el7
 
 * Tue Jun 08 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.4-1
 - 1.36.4 release

From 610fdd31294362261272e12587e474b9e3e49600 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 31 May 2021 12:52:24 -0400
Subject: [PATCH 35/43] Remove the code to do adaptive skipping.  We should
 never sleep when doing Analysis unless an error occurred.

---
 src/zm_analysis_thread.cpp | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/src/zm_analysis_thread.cpp b/src/zm_analysis_thread.cpp
index 74d677316..1836cf6b1 100644
--- a/src/zm_analysis_thread.cpp
+++ b/src/zm_analysis_thread.cpp
@@ -22,28 +22,8 @@ void AnalysisThread::Start() {
 }
 
 void AnalysisThread::Run() {
-  Microseconds analysis_rate = Microseconds(monitor_->GetAnalysisRate());
-  Seconds analysis_update_delay = Seconds(monitor_->GetAnalysisUpdateDelay());
-  Debug(2, "AnalysisThread::Run() has an update delay of %" PRId64 "s",
-        static_cast<int64>(analysis_update_delay.count()));
-
-  monitor_->UpdateAdaptiveSkip();
-
-  TimePoint last_analysis_update_time = std::chrono::steady_clock::now();
-  TimePoint cur_time;
-
   while (!(terminate_ or zm_terminate)) {
     // Some periodic updates are required for variable capturing framerate
-    if (analysis_update_delay != Seconds::zero()) {
-      cur_time = std::chrono::steady_clock::now();
-      Debug(2, "Updating adaptive skip");
-      if ((cur_time - last_analysis_update_time) > analysis_update_delay) {
-        analysis_rate = Microseconds(monitor_->GetAnalysisRate());
-        monitor_->UpdateAdaptiveSkip();
-        last_analysis_update_time = cur_time;
-      }
-    }
-
     Debug(2, "Analyzing");
     if (!monitor_->Analyse()) {
       if (!(terminate_ or zm_terminate)) {
@@ -51,11 +31,6 @@ void AnalysisThread::Run() {
         Debug(2, "Sleeping for %" PRId64 "us", int64(sleep_for.count()));
         std::this_thread::sleep_for(sleep_for);
       }
-    } else if (analysis_rate != Microseconds::zero()) {
-      Debug(2, "Sleeping for %" PRId64 " us", int64(analysis_rate.count()));
-      std::this_thread::sleep_for(analysis_rate);
-    } else {
-      Debug(2, "Not sleeping");
     }
   }
 }

From ef92f1ea162bd888d636cdc82465a20518c683a1 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 22 Jun 2021 14:34:01 -0400
Subject: [PATCH 36/43] Bump version to 1.36.5

---
 distros/redhat/zoneminder.spec | 5 ++++-
 version                        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index 426684e0f..8f9d28764 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -36,7 +36,7 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.36.4
+Version: 1.36.5
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
@@ -430,6 +430,9 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
 %dir %attr(755,nginx,nginx) %{_localstatedir}/log/zoneminder
 
 %changelog
+* Tue Jun 22 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.5-1
+- 1.36.5 release
+
 * Fri Jun 18 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.4-2
 - apcu-bc deprecated on fedora, use memcached instead
 - only refer to cmake3 when building on el7
diff --git a/version b/version
index 08a6a38d6..f2fb3d7b0 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.36.4
+1.36.5

From cb3dd78c61518ca0ab20c05246b6133c7c379423 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 23 Jun 2021 10:27:23 -0400
Subject: [PATCH 37/43] Fix Archive FTP .zip filename not including monitor
 name. Fixes #3304

---
 scripts/zmfilter.pl.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index 60d6293b4..a086ed1aa 100644
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -527,7 +527,7 @@ sub uploadArchFile {
     return(0);
   }
 
-  my $archFile = $Event->{MonitorName}.'-'.$Event->{Id};
+  my $archFile = $Event->Monitor()->Name().'-'.$Event->{Id};
   my $archImagePath = $Event->Path()
     .'/'
     .(

From 271c59c24f3d47bb553bfc5b65e1b538096a0b0a Mon Sep 17 00:00:00 2001
From: Kendric Evans <kendric.evans@gmail.com>
Date: Fri, 2 Jul 2021 16:11:34 -0600
Subject: [PATCH 38/43] Updating the size of the Longitude field To address
 https://github.com/ZoneMinder/zoneminder/issues/3311

---
 db/zm_create.sql.in      | 2 +-
 db/zm_update-1.35.29.sql | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 db/zm_update-1.35.29.sql

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 123c4a716..6233862cc 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -536,7 +536,7 @@ CREATE TABLE `Monitors` (
   `ZoneCount` TINYINT NOT NULL DEFAULT 0,
   `Refresh` int(10) unsigned default NULL,
   `Latitude`  DECIMAL(10,8),
-  `Longitude`  DECIMAL(10,8),
+  `Longitude`  DECIMAL(11,8),
   `RTSPServer`  BOOLEAN NOT NULL DEFAULT FALSE,
   `RTSPStreamName`  varchar(255) NOT NULL default '',
   `Importance`  enum('Not','Less','Normal'),
diff --git a/db/zm_update-1.35.29.sql b/db/zm_update-1.35.29.sql
new file mode 100644
index 000000000..e75e59610
--- /dev/null
+++ b/db/zm_update-1.35.29.sql
@@ -0,0 +1 @@
+ALTER TABLE `Monitors` MODIFY `Longitude`  DECIMAL(11,8);

From 95263d148d679e294fcde011df0ce49b7fe5ce29 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 5 Jul 2021 10:35:26 -0400
Subject: [PATCH 39/43] Rename zm_update-1.35.29.sql zm_update-1.36.6.sql so
 that it gets picked up.

---
 db/{zm_update-1.35.29.sql => zm_update-1.36.6.sql} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename db/{zm_update-1.35.29.sql => zm_update-1.36.6.sql} (100%)

diff --git a/db/zm_update-1.35.29.sql b/db/zm_update-1.36.6.sql
similarity index 100%
rename from db/zm_update-1.35.29.sql
rename to db/zm_update-1.36.6.sql

From 0b76892ddfbcedf2436e8f59db59754585c577dc Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sun, 27 Jun 2021 23:08:09 -0400
Subject: [PATCH 40/43] Merge pull request #3307 from
 pliablepixels/optimize-event-api

API: allow option to not load the frames DB table
---
 web/api/app/Controller/EventsController.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web/api/app/Controller/EventsController.php b/web/api/app/Controller/EventsController.php
index d18409387..c2daece16 100644
--- a/web/api/app/Controller/EventsController.php
+++ b/web/api/app/Controller/EventsController.php
@@ -143,6 +143,10 @@ class EventsController extends AppController {
       $mon_options = '';
     }
 
+    $noFrames = $this->request->query('noframes');
+    if ($noFrames=='true')
+        $this->Event->unbindModel(array('hasMany' => array('Frame')));
+
     $options = array('conditions' => array(array('Event.' . $this->Event->primaryKey => $id), $mon_options));
     $event = $this->Event->find('first', $options);
 

From c06cda6a655c86abadf116af586c1178c662646a Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 8 Jul 2021 10:06:33 -0400
Subject: [PATCH 41/43] Handle the case when the monitor doesn't exist more
 gracefully and not crash. Fixes #3316

---
 src/zm_stream.cpp | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/zm_stream.cpp b/src/zm_stream.cpp
index ce7a4460b..4b7ddc05e 100644
--- a/src/zm_stream.cpp
+++ b/src/zm_stream.cpp
@@ -253,14 +253,27 @@ Image *StreamBase::prepareImage(Image *image) {
 }  // end Image *StreamBase::prepareImage(Image *image)
 
 bool StreamBase::sendTextFrame(const char *frame_text) {
+  int width = 640;
+  int height = 480;
+  int colours = ZM_COLOUR_RGB32;
+  int subpixelorder = ZM_SUBPIX_ORDER_RGBA;
+  int labelsize = 2;
+
+  if (monitor) {
+    width = monitor->Width();
+    height = monitor->Height();
+    colours = monitor->Colours();
+    subpixelorder = monitor->SubpixelOrder();
+    labelsize = monitor->LabelSize();
+  }
   Debug(2, "Sending %dx%d * %d text frame '%s'",
-      monitor->Width(), monitor->Height(), scale, frame_text);
+      width, height, scale, frame_text);
 
-  Image image(monitor->Width(), monitor->Height(), monitor->Colours(), monitor->SubpixelOrder());
+  Image image(width, height, colours, subpixelorder);
   image.Clear();
-  image.Annotate(frame_text, image.centreCoord(frame_text, monitor->LabelSize()), monitor->LabelSize());
+  image.Annotate(frame_text, image.centreCoord(frame_text, labelsize), labelsize);
 
-  if ( scale != 100 ) {
+  if (scale != 100) {
     image.Scale(scale);
   }
 #if HAVE_LIBAVCODEC
@@ -281,7 +294,7 @@ bool StreamBase::sendTextFrame(const char *frame_text) {
 
     fputs("--" BOUNDARY "\r\nContent-Type: image/jpeg\r\n", stdout);
     fprintf(stdout, "Content-Length: %d\r\n\r\n", n_bytes);
-    if ( fwrite(buffer, n_bytes, 1, stdout) != 1 ) {
+    if (fwrite(buffer, n_bytes, 1, stdout) != 1) {
       Error("Unable to send stream text frame: %s", strerror(errno));
       return false;
     }

From 3e59ad9cb4683a40d511809725989d0809a636f7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 8 Jul 2021 11:03:56 -0400
Subject: [PATCH 42/43] Test for existence of file before adding it to zip. 
 Apparently our glob can return the snapshot.jpg string even if it doesn't
 exist. This is a workaround to Archive::Zip not testing for failure and
 crashing. Fixes #3313

---
 scripts/zmfilter.pl.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index a086ed1aa..1f2906b4b 100644
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -548,6 +548,10 @@ sub uploadArchFile {
 
     my $status = &AZ_OK;
     foreach my $imageFile ( @archImageFiles ) {
+      if (! -e $imageFile) {
+        Debug("Not adding $imageFile because it doesn't exist");
+        next;
+      }
       Debug("Adding $imageFile");
       my $member = $zip->addFile($imageFile);
       if ( !$member ) {

From ea83e8c3b1a5b80fc6970ad6f51e4e68141b3406 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 9 Aug 2021 10:23:02 -0400
Subject: [PATCH 43/43] Add libjwt-dev as a build dependency. libjwt-gnutls-dev
 doesn't exist in bionic anymore.

---
 distros/ubuntu2004/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distros/ubuntu2004/control b/distros/ubuntu2004/control
index 01c3a8472..f0bb40131 100644
--- a/distros/ubuntu2004/control
+++ b/distros/ubuntu2004/control
@@ -32,7 +32,7 @@ Build-Depends: debhelper (>= 12), sphinx-doc, python3-sphinx, dh-linktree, dh-ap
               ,libcrypt-eksblowfish-perl
               ,libdata-entropy-perl
               ,libvncserver-dev
-              ,libjwt-gnutls-dev
+              ,libjwt-gnutls-dev|libjwt-dev
 Standards-Version: 4.5.0
 Homepage: https://www.zoneminder.com/