Merge branch 'master' of github.com:ZoneMinder/zoneminder

src/zm_db.cpp

@@ -255,7 +255,7 @@ void zmDbQueue::process() {
         Logger *log = Logger::fetch();
         Logger::Level db_level = log->databaseLevel();
         log->databaseLevel(Logger::NOLOG);
-        Warning("db queue size has grown larger than 10 entries");
+        Warning("db queue size has grown larger %zu than 10 entries", mQueue.size());
         log->databaseLevel(db_level);
       }
       std::string sql = mQueue.front();

src/zm_event.cpp

@@ -479,7 +479,7 @@ void Event::AddFrame(Image *image,
       Debug(1, "Writing snapshot");
       WriteFrameImage(image, timestamp, snapshot_file.c_str());
     } else {
-      Debug(1, "Not Writing snapshot");
+      Debug(1, "Not Writing snapshot because score %d > max %d", score, max_score);
     }
 
     // We are writing an Alarm frame
@@ -491,7 +491,7 @@ void Event::AddFrame(Image *image,
         Debug(1, "Writing alarm image");
         WriteFrameImage(image, timestamp, alarm_file.c_str());
       } else {
-        Debug(1, "Not Writing alarm image");
+        Debug(3, "Not Writing alarm image because alarm frame already written");
       }
 
       if (alarm_image and (save_jpegs & 2)) {

src/zm_videostore.cpp

@@ -619,7 +619,8 @@ VideoStore::~VideoStore() {
 
     Debug(1, "Writing trailer");
     /* Write the trailer before close */
-    if (int rc = av_write_trailer(oc)) {
+    int rc;
+    if ((rc = av_write_trailer(oc)) < 0) {
       Error("Error writing trailer %s", av_err2str(rc));
     } else {
       Debug(3, "Success Writing trailer");
@@ -629,7 +630,7 @@ VideoStore::~VideoStore() {
     if (!(out_format->flags & AVFMT_NOFILE)) {
       /* Close the out file. */
       Debug(4, "Closing");
-      if (int rc = avio_close(oc->pb)) {
+      if ((rc = avio_close(oc->pb)) < 0) {
         Error("Error closing avio %s", av_err2str(rc));
       }
     } else {

web/ajax/events.php

@@ -239,15 +239,17 @@ function queryRequest($filter, $search, $advsearch, $sort, $offset, $order, $lim
     } # end if search
 
     $sql = 'SELECT ' .$col_str. ' FROM `Events` AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE '.$search_filter->sql().' ORDER BY ' .$sort. ' ' .$order;
-    ZM\Debug('Calling the following sql query: ' .$sql);
     $filtered_rows = dbFetchAll($sql);
-    ZM\Debug('Have ' . count($filtered_rows) . ' events matching search filter.');
+    ZM\Debug('Have ' . count($filtered_rows) . ' events matching search filter: '.$sql);
   } else {
     $filtered_rows = $unfiltered_rows;
   } # end if search_filter->terms() > 1
 
+  if ($limit) 
+    $filtered_rows = array_slice($filtered_rows, $offset, $limit);
+
   $returned_rows = array();
-  foreach ( array_slice($filtered_rows, $offset, $limit) as $row ) {
+  foreach ($filtered_rows as $row) {
     $event = new ZM\Event($row);
 
     $scale = intval(5*100*ZM_WEB_LIST_THUMB_WIDTH / $event->Width());

web/skins/classic/includes/functions.php

@@ -916,7 +916,7 @@ function xhtmlFooter() {
 ?>
   <script src="<?php echo cache_bust('skins/'.$skin.'/js/jquery.min.js'); ?>"></script>
   <script src="skins/<?php echo $skin; ?>/js/jquery-ui-1.12.1/jquery-ui.min.js"></script>
-  <script src="<?php echo cache_bust('skins/'.$skin.'/js/bootstrap.min.js'); ?>"></script>
+  <script src="skins/<?php echo $skin; ?>/js/bootstrap-4.5.0.min.js"></script>
 <?php echo output_script_if_exists(array(
   'js/tableExport.min.js',
   'js/bootstrap-table.min.js',

web/skins/classic/views/js/event.js

@@ -34,7 +34,7 @@ function streamReq(data) {
   data.view = 'request';
   data.request = 'stream';
 
-  $j.getJSON(thisUrl, data)
+  $j.getJSON(monitorUrl, data)
       .done(getCmdResponse)
       .fail(logAjaxFail);
 }
@@ -300,7 +300,7 @@ function getCmdResponse(respObj, respText) {
 
   if (streamStatus.auth) {
     // Try to reload the image stream.
-    var streamImg = $j('#evtStream');
+    var streamImg = document.getElementById('evtStream');
     if (streamImg) {
       streamImg.src = streamImg.src.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
     }