fix: canonicalise Monitors.ObjectDetection to lowercase

The column's values are all lowercase - 'none', 'quadra', 'uvicorn',
'openvino', 'mx_accl' - and the column default is 'none', but the monitor
edit UI offered the off setting keyed as 'None'. Since 1.37.69 the column is
a plain VARCHAR rather than an enum, so that spelling was stored verbatim and
zmc logged "Unsupported value for ObjectDetection: None" for every affected
monitor on load. The console's javascript compared against 'none' and so
listed those monitors as actively object detecting, and monitor.js's
ObjectDetection_onChange fell through to its unknown-value branch, leaving
the model and threshold fields showing for a monitor with detection off.

Fix the stored value rather than teaching every reader to accept both
spellings: write 'none' from the UI, the Monitor.php defaults, the console
ajax fallback and Monitor.pm, and add zm_update-1.39.19.sql to lower existing
rows. The UPDATE is unconditional because the default collation is
case-insensitive, so a `WHERE ObjectDetection != LOWER(ObjectDetection)`
guard would never match; it is idempotent as written.

Also correct the console's fps column, which tested ObjectDetection against
'None' where every other test used 'none', and treat a NULL column as 'none'
in Monitor::Load instead of constructing a std::string from a null pointer.

Bump version.txt and the redhat spec Version to 1.39.19.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01GuPNKrTGdfFT4t6G2BJbug

Author: connortechnology

db/zm_update-1.39.19.sql

@@ -0,0 +1,17 @@
+--
+-- Canonicalise Monitors.ObjectDetection to lowercase.
+--
+-- The column's values are all lowercase ('none', 'quadra', 'uvicorn',
+-- 'openvino', ...) but the monitor edit UI offered the off setting as 'None'
+-- with a capital N, and the column has been a plain VARCHAR since 1.37.69, so
+-- that spelling was stored verbatim. zmc only recognised 'none' and logged
+-- "Unsupported value for ObjectDetection: None" for every such monitor on
+-- load, the console's javascript reported it as actively object detecting,
+-- and the monitor edit page left the model/threshold fields showing.
+--
+-- Unconditional LOWER() rather than a WHERE clause: the default collation is
+-- case-insensitive, so `WHERE ObjectDetection != LOWER(ObjectDetection)`
+-- would never match. This is idempotent as written.
+--
+
+UPDATE `Monitors` SET `ObjectDetection` = LOWER(`ObjectDetection`);

distros/redhat/zoneminder.spec

@@ -21,7 +21,7 @@
 %global zmtargetdistro %{?rhel:el%{rhel}}%{!?rhel:fc%{fedora}}
 
 Name: zoneminder
-Version: 1.39.18
+Version: 1.39.19
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons

scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm

@@ -195,7 +195,7 @@ $fields{model} = undef;
     Analysing => q`'Always'`,
     AnalysisSource => q`'Primary'`,
     AnalysisImage => q`'FullColour'`,
-    ObjectDetection => q`'None'`,
+    ObjectDetection => q`'none'`,
     ObjectDetectionModel => q`''`,
     ObjectDetectionObjectThreshold => 0.4,
     ObjectDetectionNMSThreshold => 0.25,

src/zm_monitor.cpp

@@ -417,7 +417,7 @@ void Monitor::Load(MYSQL_ROW dbrow, bool load_zones = true, Purpose p = QUERY) {
   col++;
   analysis_image_opacity = dbrow[col] ? atoi(dbrow[col]) : 128;
   col++;
-  std::string od = dbrow[col]; col++;
+  std::string od = dbrow[col] ? dbrow[col] : "none"; col++;
   if (od == "none") {
     objectdetection = OBJECT_DETECTION_NONE;
   } else if (od == "mx_accl") {

version.txt

@@ -1 +1 @@
-1.39.18
+1.39.19

web/ajax/console.php

@@ -420,7 +420,7 @@ function queryRequest() {
       $row['CaptureBandwidth'] = '';
     }
     $row['Analysing'] = isset($monitor['Analysing']) ? $monitor['Analysing'] : 'None';
-    $row['ObjectDetection'] = isset($monitor['ObjectDetection']) ? $monitor['ObjectDetection'] : 'None';
+    $row['ObjectDetection'] = isset($monitor['ObjectDetection']) ? $monitor['ObjectDetection'] : 'none';
     $row['Recording'] = isset($monitor['Recording']) ? $monitor['Recording'] : 'None';
     // console.js treats this as both an enable flag AND the text to display:
     //   if (row.ONVIF_Event_Listener) html += "Use ONVIF '" + row.ONVIF_Event_Listener + "'"

web/includes/Monitor.php

@@ -244,7 +244,7 @@ public static function getStreamChannelOptions() {
     'AnalysisSource' => 'Primary',
     'AnalysisImage' => 'FullColour',
     'AnalysisImageOpacity' => array('type'=>'integer','default'=>128),
-    'ObjectDetection' => 'None',
+    'ObjectDetection' => 'none',
     'ObjectDetectionModel' => '',
     'ObjectDetectionObjectThreshold' => '0.4',
     'ObjectDetectionNMSThreshold' => '0.25',

web/skins/classic/views/js/console.js

@@ -284,7 +284,7 @@ function processRows(rows) {
       if (row.CaptureFPS) {
         fps_string = row.CaptureFPS;
       }
-      if (row.AnalysisFPS && (row.Analysing != 'None' || row.ObjectDetection != 'None')) {
+      if (row.AnalysisFPS && (row.Analysing != 'None' || row.ObjectDetection != 'none')) {
         fps_string += '/' + row.AnalysisFPS;
       }
       if (fps_string) fps_string += ' fps';

web/skins/classic/views/monitor.php

@@ -1099,7 +1099,7 @@ class="nav-link<?php echo ($tab == $name ? ' active' : '') . ' ' . (($name == 'z
             <li class="ObjectDetection">
               <label><?php echo translate('Object Detection')?></label>
 <?php
-        $od_options = ['None'=>'None', 'uvicorn'=>'Remote API'];
+        $od_options = ['none'=>'None', 'uvicorn'=>'Remote API'];
         if (defined('HAVE_UNTETHER'))
           $od_options['speedai'] = 'Untether SpeedAI';
         if (defined('ZM_HAVE_QUADRA') and ZM_HAVE_QUADRA)