From e061f3b34a6e230850120c99bdecdafe7be4ac4b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 24 Nov 2021 14:28:15 -0500
Subject: [PATCH 1/4] typo

---
 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 d808ddba0..d9f932d75 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1873,7 +1873,7 @@ bool Monitor::Analyse() {
             if (snap->image) {
               // decoder may not have been able to provide an image
               if (!ref_image.Buffer()) {
-                Debug(1, "Assigning instead of Dectecting");
+                Debug(1, "Assigning instead of Detecting");
                 ref_image.Assign(*(snap->image));
               } else {
                 Debug(1, "Detecting motion on image %d, image %p", snap->image_index, snap->image);

From e8bb095730a7ba7430ffe27703926c9cd71a7a43 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 24 Nov 2021 14:28:31 -0500
Subject: [PATCH 2/4] include monitor dimensions when logging about zone
 mismatch

---
 src/zm_zone.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/zm_zone.cpp b/src/zm_zone.cpp
index f0c09ec78..4fc1bf61b 100644
--- a/src/zm_zone.cpp
+++ b/src/zm_zone.cpp
@@ -878,16 +878,23 @@ std::vector<Zone> Zone::Load(Monitor *monitor) {
       continue;
     }
 
-    if (polygon.Extent().Lo().x_ < 0 || polygon.Extent().Hi().x_ > static_cast<int32>(monitor->Width())
-        || polygon.Extent().Lo().y_ < 0 || polygon.Extent().Hi().y_ > static_cast<int32>(monitor->Height())) {
-      Error("Zone %d/%s for monitor %s extends outside of image dimensions, (%d,%d), (%d,%d), fixing",
+    if (polygon.Extent().Lo().x_ < 0
+        ||
+        polygon.Extent().Hi().x_ > static_cast<int32>(monitor->Width())
+        ||
+        polygon.Extent().Lo().y_ < 0
+        ||
+        polygon.Extent().Hi().y_ > static_cast<int32>(monitor->Height())) {
+      Error("Zone %d/%s for monitor %s extends outside of image dimensions, (%d,%d), (%d,%d) != (%d,%d), fixing",
             Id,
             Name,
             monitor->Name(),
             polygon.Extent().Lo().x_,
             polygon.Extent().Lo().y_,
             polygon.Extent().Hi().x_,
-            polygon.Extent().Hi().y_);
+            polygon.Extent().Hi().y_,
+            monitor->Width(),
+            monitor->Height());
 
       polygon.Clip(Box(
           {0, 0},

From af5436d009732c4a2656eb32bbe3b6d3d12036a7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 26 Nov 2021 10:31:54 -0500
Subject: [PATCH 3/4] Handle bug where a value of '' will prevent special case
 handling.  Allow '' to mean NULL when specifying Storage Area

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

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
index 3a3308938..0db46ff0d 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
@@ -230,8 +230,8 @@ sub Sql {
           # PostCondition, so no further SQL
         } else {
           ( my $stripped_value = $value ) =~ s/^["\']+?(.+)["\']+?$/$1/;
-          foreach my $temp_value ( split( /["'\s]*?,["'\s]*?/, $stripped_value ) ) {
-
+          # Empty value will result in () from split
+          foreach my $temp_value ( $stripped_value ? split( /["'\s]*?,["'\s]*?/, $stripped_value ) : $stripped_value ) {
             if ( $term->{attr} eq 'AlarmedZoneId' ) {
               $value = '(SELECT * FROM Stats WHERE EventId=E.Id AND Score > 0 AND ZoneId='.$value.')';
             } elsif ( $term->{attr} =~ /^MonitorName/ ) {
@@ -250,7 +250,8 @@ sub Sql {
                 $$self{Server} = new ZoneMinder::Server($temp_value);
               }
             } elsif ( $term->{attr} eq 'StorageId' ) {
-              $value = "'$temp_value'";
+              # Empty means NULL, otherwise must be an integer
+              $value = $temp_value ne '' ? int($temp_value) : 'NULL';
               $$self{Storage} = new ZoneMinder::Storage($temp_value);
             } elsif ( $term->{attr} eq 'Name'
               || $term->{attr} eq 'Cause'

From a1bf8f7f5bf2b271ab7d1e598f572206a5bd54de Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 26 Nov 2021 10:35:15 -0500
Subject: [PATCH 4/4] Fix NULL and add special 0 case for Storage area
 specification in filter

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

diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php
index b425f7896..b441db349 100644
--- a/web/skins/classic/views/filter.php
+++ b/web/skins/classic/views/filter.php
@@ -152,7 +152,7 @@ $booleanValues = array(
 
 $focusWindow = true;
 
-$storageareas = array('' => 'All') + ZM\ZM_Object::Objects_Indexed_By_Id('ZM\Storage');
+$storageareas = array('' => array('Name'=>'NULL Unspecified'), '0' => array('Name'=>'Zero')) + ZM\ZM_Object::Objects_Indexed_By_Id('ZM\Storage');
 
 $weekdays = array();
 for ( $i = 0; $i < 7; $i++ ) {