Merge branch 'release-1.36'

distros/redhat/zoneminder.spec

@@ -31,7 +31,7 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.37.0
+Version: 1.36.1
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
@@ -425,9 +425,6 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
 %dir %attr(755,nginx,nginx) %{_localstatedir}/log/zoneminder
 
 %changelog
-* Sat May 22 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.37.1-1
-- 1.37.x master branch develpment build. NOT FOR PRODUCTION.
-
 * Fri May 21 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.1-1
 - 1.36.1 release
 - add rtspserver submodule

version

@@ -1 +1 @@
-1.37.0
+1.36.1

web/api/app/Plugin/Crud

@@ -1 +1 @@
-Subproject commit 0bd63fb464957080ead342db58ca9e01532cf1ef
+Subproject commit 14292374ccf1328f2d5db20897bd06f99ba4d938

web/includes/actions/donate.php

@@ -30,6 +30,7 @@ if ( $action == 'donate' && isset($_REQUEST['option']) ) {
   switch ( $option ) {
     case 'go' :
       // Ignore this, the caller will open the page itself, use a return to shortut the view=none
+      $redirect = 'https://zoneminder.com/donate';
       return;
     case 'hour' :
       $nextReminder += 60*60;

web/skins/classic/includes/export_functions.php

@@ -34,7 +34,7 @@ function exportHeader($title) {
   }
 ?>
     </style>
-    <script src="<?php echo ($title == translate('Images').' Master' ? '' : '../') ?>jquery.js"></script>
+    <script src="<?php echo ($title == translate('Images').' Master' ? '' : '../') ?>jquery.min.js"></script>
     <!--<script type="text/javascript" src="<?php echo ($title == translate('Images').' Master' ? '' : '../') ?>video.js"></script>-->
     <script>
 
@@ -929,8 +929,8 @@ function exportEvents(
     } # end foreach event_exportFile
   } # end foreach event
 
-  if ( !symlink(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/js/jquery.js', $export_dir.'/jquery.js') )
+  if ( !symlink(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/js/jquery.min.js', $export_dir.'/jquery.min.js') )
-    ZM\Error('Failed linking jquery.js');
+    ZM\Error('Failed linking jquery.min.js');
   //if ( !symlink(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/js/video.js', $export_dir.'/video.js') )
     //Error("Failed linking video.js");
 

web/skins/classic/views/export.php

@@ -188,32 +188,32 @@ while ( $event_row = dbFetchNext($results) ) {
     <div class="col-md-3">
       <div class="form-group">
         <label for="exportDetail"><?php echo translate('ExportDetails') ?>
-          <input type="checkbox" name="exportDetail" value="1"<?php if ( !empty($_REQUEST['exportDetail']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/>
+          <input type="checkbox" name="exportDetail" value="1"<?php if ( !empty($_REQUEST['exportDetail']) ) { ?> checked="checked"<?php } ?> data-on-click="configureExportButton"/>
         </label>
       </div>
       <div class="form-group">
         <label for="exportFrames"><?php echo translate('ExportFrames') ?>
-          <input type="checkbox" name="exportFrames" value="1"<?php if ( !empty($_REQUEST['exportFrames']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/>
+          <input type="checkbox" name="exportFrames" value="1"<?php if ( !empty($_REQUEST['exportFrames']) ) { ?> checked="checked"<?php } ?> data-on-click="configureExportButton"/>
         </label>
       </div>
     </div>
     <div class="col-md-3">
       <div class="form-group">
         <label for="exportImages"><?php echo translate('ExportImageFiles') ?>
-          <input type="checkbox" name="exportImages" value="1"<?php if ( !empty($_REQUEST['exportImages']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/>
+          <input type="checkbox" name="exportImages" value="1"<?php if ( !empty($_REQUEST['exportImages']) ) { ?> checked="checked"<?php } ?> data-on-click="configureExportButton"/>
 
         </label>
        </div>
        <div class="form-group">
          <label for="exportVideo"><?php echo translate('ExportVideoFiles') ?>
-         <input type="checkbox" name="exportVideo" value="1"<?php if ( !empty($_REQUEST['exportVideo']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/>
+         <input type="checkbox" name="exportVideo" value="1"<?php if ( !empty($_REQUEST['exportVideo']) ) { ?> checked="checked"<?php } ?> data-on-click="configureExportButton"/>
          </label>
        </div>
     </div>
     <div class="col-md-3">
       <div class="form-group">
         <label for="exportMisc"><?php echo translate('ExportMiscFiles') ?>
-        <input type="checkbox" name="exportMisc" value="1"<?php if ( !empty($_REQUEST['exportMisc']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/>
+        <input type="checkbox" name="exportMisc" value="1"<?php if ( !empty($_REQUEST['exportMisc']) ) { ?> checked="checked"<?php } ?> data-on-click="configureExportButton"/>
         </label>
       </div>
     </div>
@@ -224,7 +224,7 @@ while ( $event_row = dbFetchNext($results) ) {
             array('tar'=>translate('ExportFormatTar'), 'zip' => translate('ExportFormatZip')),
             (isset($_REQUEST['exportFormat'])?$_REQUEST['exportFormat']:'zip'), # default to zip
             array(),
-            array('data-on-click-this'=>'configureExportButton')
+            array('data-on-click'=>'configureExportButton')
           ); ?>
         </label>
       </div>
@@ -234,7 +234,7 @@ while ( $event_row = dbFetchNext($results) ) {
             array('1'=>translate('Yes'), '0' => translate('No')),
             (isset($_REQUEST['exportCompress'])?$_REQUEST['exportCompress']:'0'), # default to no
             array(),
-            array('data-on-click-this'=>'configureExportButton')
+            array('data-on-click'=>'configureExportButton')
           ); ?>
         </label>
       </div>

web/skins/classic/views/js/export.js

@@ -1,11 +1,15 @@
 var exportTimer = null;
 
-function configureExportButton(element) {
+function configureExportButton() {
-  var form = element.form;
+  var form = $j('#contentForm')[0];
+  if (!form) {
+    console.error("Form contentForm not found by jquery.");
+    return;
+  }
 
   var eventCount = 0;
   document.querySelectorAll('input[name="eids[]"]').forEach(function(el) {
-    if ( el.checked ) {
+    if (el.checked) {
       eventCount ++;
     }
   });
@@ -93,7 +97,7 @@ function getEventDetailModal(eid) {
 }
 
 function initPage() {
-  configureExportButton(this);
+  configureExportButton();
   if ( exportReady ) {
     setTimeout(startDownload, 1500, exportFile);
   }