Merge remote-tracking branch 'upstream/master' into ai_server

Author: connortechnology

.eslintrc.js

@@ -24,6 +24,7 @@ module.exports = {
     "camelcase": "off",
     "comma-dangle": "off",
     "guard-for-in": "off",
+    "operator-linebreak": "off",
     "max-len": "off",
     "new-cap": ["error", {
       capIsNewExceptions: ["Error", "Warning", "Debug", "Polygon_calcArea", "Play", "Stop", "Panzoom"],

db/zm_create.sql.in

@@ -483,7 +483,7 @@ CREATE TABLE `MonitorPresets` (
   `ControlDevice` varchar(255) default NULL,
   `ControlAddress` varchar(255) default NULL,
   `DefaultRate` smallint(5) unsigned NOT NULL default '100',
-  `DefaultScale` smallint(5) unsigned NOT NULL default '100',
+  `DefaultScale` CHAR(6) NOT NULL default '0',
   PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
@@ -615,7 +615,7 @@ CREATE TABLE `Monitors` (
   `ReturnDelay` smallint(5) unsigned,
   `ModectDuringPTZ` tinyint(3) unsigned NOT NULL default '0',
   `DefaultRate` smallint(5) unsigned NOT NULL default '100',
-  `DefaultScale` smallint(5) unsigned NOT NULL default '100',
+  `DefaultScale` CHAR(6) NOT NULL default '0',
   `DefaultCodec` enum('auto','MP4','MJPEG') NOT NULL default 'auto',
   `SignalCheckPoints` INT UNSIGNED NOT NULL default '0',
   `SignalCheckColour` varchar(32) NOT NULL default '#0000BE',

db/zm_update-1.37.72.sql

@@ -0,0 +1 @@
+ALTER TABLE Monitors MODIFY DefaultScale CHAR(6) NOT NULL default '0';

distros/fedora

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

distros/opensuse/redalert.wav

@@ -1 +1 @@
-1.37.71
+1.37.72

distros/opensuse/redalert.wav

@@ -349,6 +349,7 @@ public static function getRTSP2WebStreamOptions() {
     'MQTT_Enabled'   => array('type'=>'boolean','default'=>0),
     'MQTT_Subscriptions'  =>  '',
     'StartupDelay' => 0,
+    'initial_scale' => array('default'=>100, 'do_not_update'=>1),
   );
   private $status_fields = array(
     'Status'  =>  null,
@@ -549,7 +550,7 @@ public function Monitor_Status() {
   }
 
   public function getStreamSrc($args, $querySep='&') {
-    $streamSrc = $this->Server()->UrlToZMS(ZM_MIN_STREAMING_PORT ? ZM_MIN_STREAMING_PORT+(int)($this->{'Id'}/5) : null);
+    $streamSrc = $this->Server()->UrlToZMS(ZM_MIN_STREAMING_PORT ? ZM_MIN_STREAMING_PORT+(int)($this->{'Id'}/5)+1 : null);
 
     $args['monitor'] = $this->{'Id'};
 
@@ -879,6 +880,7 @@ function Groups($new='') {
     }
     return $this->Groups;
   }
+
   function connKey($new='') {
     if ($new)
       $this->connKey = $new;

distros/redhat/zoneminder.spec

@@ -362,10 +362,16 @@ function getEventDefaultVideoPath($event) {
 
 function deletePath( $path ) {
   ZM\Debug('Deleting '.$path);
-  if (is_dir($path)) {
-    system(escapeshellcmd('rm -rf '.$path));
+  if (is_link($path)) {
+    if (!unlink($path)) ZM\Debug("Failed to unlink $path");
+  } else if (is_dir($path)) {
+    if (false === ($output = system('rm -rf "'.escapeshellcmd($path).'"'))) {
+      ZM\Warning('Failed doing rm -rf "'.escapeshellcmd($path).'"');
+    }
   } else if (file_exists($path)) {
-    unlink($path);
+    if (!unlink($path)) ZM\Debug("Failed to delete $path");
+  } else {
+    ZM\Warning("Path $path does not exist in deletePath()");
   }
 }