From 84c812725e5322c87a0428fec83704580098e52d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 14 Jan 2019 14:00:45 -0500
Subject: [PATCH 001/214] spacing, improve debug.  WHen looking for starting
 keyframe in packetqueue, use <= instead of <.

---
 src/zm_ffmpeg_camera.cpp |  2 +-
 src/zm_packetqueue.cpp   | 17 +++++++++++------
 src/zm_stream.cpp        |  6 +++---
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index ef61afc09..390f347de 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -721,7 +721,7 @@ int FfmpegCamera::CaptureAndRecord( Image &image, timeval recording, char* event
     //Video recording
     if ( keyframe && recording.tv_sec ) {
 
-      uint32_t last_event_id = monitor->GetLastEventId() ;
+      uint32_t last_event_id = monitor->GetLastEventId();
       uint32_t video_writer_event_id = monitor->GetVideoWriterEventId();
 
       if ( last_event_id != video_writer_event_id ) {
diff --git a/src/zm_packetqueue.cpp b/src/zm_packetqueue.cpp
index 850e482fb..44bc35c0b 100644
--- a/src/zm_packetqueue.cpp
+++ b/src/zm_packetqueue.cpp
@@ -144,7 +144,7 @@ void zm_packetqueue::clear_unwanted_packets( timeval *recording_started, int mVi
   // Step 2 - pop packets until we get to the packet in step 2
   std::list<ZMPacket *>::reverse_iterator it;
 
-  Debug(3, "Looking for keyframe after start recording stream id (%d)", mVideoStreamId );
+  Debug(3, "Looking for keyframe after start recording stream id (%d)", mVideoStreamId);
   for ( it = pktQueue.rbegin(); it != pktQueue.rend(); ++ it ) {
     ZMPacket *zm_packet = *it;
     AVPacket *av_packet = &(zm_packet->packet);
@@ -153,9 +153,12 @@ void zm_packetqueue::clear_unwanted_packets( timeval *recording_started, int mVi
         && 
         ( av_packet->stream_index == mVideoStreamId )
         && 
-        timercmp( &(zm_packet->timestamp), recording_started, < )
+        timercmp( &(zm_packet->timestamp), recording_started, <= )
        ) {
-    Debug(3, "Found keyframe before start with stream index (%d) with keyframe (%d)", av_packet->stream_index, ( av_packet->flags & AV_PKT_FLAG_KEY ) );
+    Debug(3, "Found keyframe before start with stream index %d at %d.%d",
+        av_packet->stream_index,
+        zm_packet->timestamp.tv_sec,
+        zm_packet->timestamp.tv_usec );
       break;
     }
   }
@@ -174,7 +177,7 @@ void zm_packetqueue::clear_unwanted_packets( timeval *recording_started, int mVi
 
   unsigned int deleted_frames = 0;
   ZMPacket *packet = NULL;
-  while ( distance( it, pktQueue.rend() ) > 1 ) {
+  while ( distance(it, pktQueue.rend()) > 1 ) {
   //while ( pktQueue.rend() != it ) {
     packet = pktQueue.front();
     pktQueue.pop_front();
@@ -185,8 +188,10 @@ void zm_packetqueue::clear_unwanted_packets( timeval *recording_started, int mVi
   zm_packet = pktQueue.front();
   av_packet = &(zm_packet->packet);
   if ( ( ! ( av_packet->flags & AV_PKT_FLAG_KEY ) ) || ( av_packet->stream_index != mVideoStreamId ) ) {
-    Error( "Done looking for keyframe.  Deleted %d frames. Remaining frames in queue: %d stream of head packet is (%d), keyframe (%d), distance(%d), packets(%d)", deleted_frames, pktQueue.size(), av_packet->stream_index, ( av_packet->flags & AV_PKT_FLAG_KEY ), distance( it, pktQueue.rend() ), pktQueue.size() );
+    Error( "Done looking for keyframe.  Deleted %d frames. Remaining frames in queue: %d stream of head packet is (%d), keyframe (%d), distance(%d), packets(%d)",
+        deleted_frames, pktQueue.size(), av_packet->stream_index, ( av_packet->flags & AV_PKT_FLAG_KEY ), distance( it, pktQueue.rend() ), pktQueue.size() );
   } else {
-    Debug(1, "Done looking for keyframe.  Deleted %d frames. Remaining frames in queue: %d stream of head packet is (%d), keyframe (%d), distance(%d), packets(%d)", deleted_frames, pktQueue.size(), av_packet->stream_index, ( av_packet->flags & AV_PKT_FLAG_KEY ), distance( it, pktQueue.rend() ), pktQueue.size() );
+    Debug(1, "Done looking for keyframe.  Deleted %d frames. Remaining frames in queue: %d stream of head packet is (%d), keyframe (%d), distance(%d), packets(%d)",
+        deleted_frames, pktQueue.size(), av_packet->stream_index, ( av_packet->flags & AV_PKT_FLAG_KEY ), distance( it, pktQueue.rend() ), pktQueue.size() );
   }
 }
diff --git a/src/zm_stream.cpp b/src/zm_stream.cpp
index 8602fa88a..357d23ed7 100644
--- a/src/zm_stream.cpp
+++ b/src/zm_stream.cpp
@@ -54,7 +54,7 @@ bool StreamBase::loadMonitor(int monitor_id) {
 
 bool StreamBase::checkInitialised() {
   if ( !monitor ) {
-    Fatal( "Cannot stream, not initialised" );
+    Fatal("Cannot stream, not initialised");
     return false;
   }
   return true;
@@ -67,10 +67,10 @@ void StreamBase::updateFrameRate(double fps) {
   Debug(3, "FPS:%.2f, MaxFPS:%.2f, BaseFPS:%.2f, EffectiveFPS:%.2f, FrameMod:%d, replay_rate(%d)",
       fps, maxfps, base_fps, effective_fps, frame_mod, replay_rate);
   // Min frame repeat?
-  while( effective_fps > maxfps ) {
+  while ( effective_fps > maxfps ) {
     effective_fps /= 2.0;
     frame_mod *= 2;
-    Debug(3, "EffectiveFPS:%.2f, FrameMod:%d", effective_fps, frame_mod);
+    Debug(3, "Changing fps to be < max %.2f EffectiveFPS:%.2f, FrameMod:%d", maxfps, effective_fps, frame_mod);
   }
 }
 

From 6608cb4e35159e552415b86d7b562ea2ddf92438 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 15 Jan 2019 11:25:22 -0500
Subject: [PATCH 002/214] use frame delta to determine how much to sleep

---
 src/zm_eventstream.cpp | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/zm_eventstream.cpp b/src/zm_eventstream.cpp
index 91d3dfeb4..f390a8c03 100644
--- a/src/zm_eventstream.cpp
+++ b/src/zm_eventstream.cpp
@@ -145,7 +145,7 @@ bool EventStream::loadEventData(uint64_t event_id) {
   event_data->storage_id = dbrow[1] ? atoi( dbrow[1] ) : 0;
   event_data->frame_count = dbrow[2] == NULL ? 0 : atoi(dbrow[2]);
   event_data->start_time = atoi(dbrow[3]);
-  event_data->duration = atof(dbrow[4]);
+  event_data->duration = dbrow[4] ? atof(dbrow[4]) : 0.0;
   strncpy( event_data->video_file, dbrow[5], sizeof(event_data->video_file)-1 );
   std::string scheme_str = std::string(dbrow[6]);
   if ( scheme_str == "Deep" ) {
@@ -762,7 +762,7 @@ Debug(1, "Loading image");
   }
   last_frame_sent = TV_2_FLOAT(now);
   return true;
-}
+} // sendFrame(int delta_us)
 
 void EventStream::runStream() {
   openComms();
@@ -780,11 +780,12 @@ void EventStream::runStream() {
 
   Debug(3, "frame rate is: (%f)", (double)event_data->frame_count/event_data->duration);
   updateFrameRate((double)event_data->frame_count/event_data->duration);
+    gettimeofday(&start, NULL);
 
   while( !zm_terminate ) {
     gettimeofday(&now, NULL);
 
-    unsigned int delta_us = 0;
+    int delta_us = 0;
     send_frame = false;
 
     // commands may set send_frame to true
@@ -850,6 +851,7 @@ Debug(3,"cur_frame_id (%d-1) mod frame_mod(%d)",curr_frame_id, frame_mod);
         Debug(3,"delta %u = base_fps(%f)/effective fps(%f)", delta_us, base_fps, effective_fps);
         // but must not exceed maxfps
         delta_us = max(delta_us, 1000000 / maxfps);
+        Debug(3,"delta %u = base_fps(%f)/effective fps(%f)", delta_us, base_fps, effective_fps);
         send_frame = true;
       }
     } else if ( step != 0 ) {
@@ -870,18 +872,34 @@ Debug(3,"cur_frame_id (%d-1) mod frame_mod(%d)",curr_frame_id, frame_mod);
       if ( !sendFrame(delta_us) )
         zm_terminate = true;
 
+
     curr_stream_time = frame_data->timestamp;
 
     if ( !paused ) {
       curr_frame_id += (replay_rate>0) ? 1 : -1;
+
+
+
       if ( (mode == MODE_SINGLE) && ((unsigned int)curr_frame_id == event_data->frame_count) ) {
         Debug(2, "Have mode==MODE_SINGLE and at end of event, looping back to start");
         curr_frame_id = 1;
       }
+      frame_data = &event_data->frames[curr_frame_id-1];
+
+      uint64_t now_usec = (now.tv_sec * 1000000 + now.tv_usec);
+      uint64_t start_usec = (start.tv_sec * 1000000 + start.tv_usec);
+      uint64_t frame_delta = frame_data->delta*1000000;
+
+      delta_us = frame_delta - (now_usec - start_usec);
+      Debug(2, "New delta_us now %" PRIu64 " - start %" PRIu64 " = %d - frame %" PRIu64 " = %d",
+          now_usec, start_usec, now_usec-start_usec, frame_delta,
+          delta_us);
+
       if ( send_frame && type != STREAM_MPEG ) {
-        Debug( 3, "dUs: %d", delta_us );
-        if ( delta_us )
+        if ( delta_us > 0 ) {
+          Debug( 3, "dUs: %d", delta_us );
           usleep( delta_us );
+        }
       }
     } else {
       usleep( (unsigned long)((1000000 * ZM_RATE_BASE)/((base_fps?base_fps:1)*abs(replay_rate*2))) );

From 8c53f778b696914e854607cb1da8567d620aa527 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 15 Jan 2019 11:32:44 -0500
Subject: [PATCH 003/214] Start and stop events not just on keyframe.  This
 means we must always queue packets

---
 src/zm_ffmpeg_camera.cpp | 54 ++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index 390f347de..940fa3fd2 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -718,15 +718,15 @@ int FfmpegCamera::CaptureAndRecord( Image &image, timeval recording, char* event
     bytes += packet.size;
     dumpPacket(mFormatContext->streams[packet.stream_index], &packet, "Captured");
 
-    //Video recording
-    if ( keyframe && recording.tv_sec ) {
+    // Video recording
+    if ( recording.tv_sec ) {
 
       uint32_t last_event_id = monitor->GetLastEventId();
       uint32_t video_writer_event_id = monitor->GetVideoWriterEventId();
 
       if ( last_event_id != video_writer_event_id ) {
         Debug(2, "Have change of event.  last_event(%d), our current (%d)",
-			last_event_id, video_writer_event_id);
+            last_event_id, video_writer_event_id);
 
         if ( videoStore ) {
           Info("Re-starting video storage module");
@@ -800,7 +800,8 @@ int FfmpegCamera::CaptureAndRecord( Image &image, timeval recording, char* event
 
             packet_count += 1;
             //Write the packet to our video store
-            Debug(2, "Writing queued packet stream: %d  KEY %d, remaining (%d)", avp->stream_index, avp->flags & AV_PKT_FLAG_KEY, packetqueue.size() );
+            Debug(2, "Writing queued packet stream: %d  KEY %d, remaining (%d)",
+                avp->stream_index, avp->flags & AV_PKT_FLAG_KEY, packetqueue.size() );
             if ( avp->stream_index == mVideoStreamId ) {
               ret = videoStore->writeVideoFramePacket( avp );
               have_video_keyframe = true;
@@ -822,36 +823,35 @@ int FfmpegCamera::CaptureAndRecord( Image &image, timeval recording, char* event
     } else {
       // Not recording
       
-      if ( videoStore && keyframe ) {
-        Info("Deleting videoStore instance");
+      if ( videoStore ) {
+        Debug(1,"Deleting videoStore instance");
         delete videoStore;
         videoStore = NULL;
         have_video_keyframe = false;
         monitor->SetVideoWriterEventId(0);
       }
-      if ( ! videoStore ) {
-        // Buffer video packets, since we are not recording.
-        // All audio packets are keyframes, so only if it's a video keyframe
-        if ( packet.stream_index == mVideoStreamId ) {
-          if ( keyframe ) {
-            packetqueue.clearQueue(monitor->GetPreEventCount(), mVideoStreamId);
-            packetqueue.queuePacket(&packet);
-          } else if ( packetqueue.size() ) {
-            Debug(3, "queue has %d", packetqueue.size());
-            // it's a keyframe or we already have something in the queue
-            packetqueue.queuePacket(&packet);
-          } 
-        } else if ( packet.stream_index == mAudioStreamId ) {
-        // The following lines should ensure that the queue always begins with a video keyframe
-  //Debug(2, "Have audio packet, reocrd_audio is (%d) and packetqueue.size is (%d)", record_audio, packetqueue.size() );
-          if ( record_audio && packetqueue.size() ) { 
-            // if it's audio, and we are doing audio, and there is already something in the queue
-            packetqueue.queuePacket(&packet);
-          }
-        }
-      }
     } // end if recording or not
 
+    // Buffer video packets, we need to always have from the last keyframe buffered
+    // All audio packets are keyframes, so only if it's a video keyframe
+    if ( packet.stream_index == mVideoStreamId ) {
+      if ( keyframe ) {
+        packetqueue.clearQueue(monitor->GetPreEventCount(), mVideoStreamId);
+        packetqueue.queuePacket(&packet);
+      } else if ( packetqueue.size() ) {
+        Debug(3, "queue has %d", packetqueue.size());
+        // it's a keyframe or we already have something in the queue
+        packetqueue.queuePacket(&packet);
+      } 
+    } else if ( packet.stream_index == mAudioStreamId ) {
+      // The following lines should ensure that the queue always begins with a video keyframe
+      //Debug(2, "Have audio packet, reocrd_audio is (%d) and packetqueue.size is (%d)", record_audio, packetqueue.size() );
+      if ( record_audio && packetqueue.size() ) { 
+        // if it's audio, and we are doing audio, and there is already something in the queue
+        packetqueue.queuePacket(&packet);
+      }
+    }
+
     if ( packet.stream_index == mVideoStreamId ) {
       // only do decode if we have had a keyframe, should save a few cycles.
       if ( have_video_keyframe || keyframe ) {

From d068d019fba6112532fd5d154dbde819b53a1cce Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 15 Jan 2019 11:34:17 -0500
Subject: [PATCH 004/214] turn section_length into seconds instead of frames

---
 src/zm_monitor.cpp | 35 ++++++++---------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index ef6a35367..284ec3d11 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1347,8 +1347,6 @@ bool Monitor::Analyse() {
     auto_resume_time = 0;
   }
 
-  static int last_section_mod = 0;
-
   if ( Enabled() ) {
     bool signal = shared_data->signal;
     bool signal_change = (signal != last_signal);
@@ -1384,7 +1382,6 @@ bool Monitor::Analyse() {
           if ( event && !signal ) {
             Info( "%s: %03d - Closing event %" PRIu64 ", signal loss", name, image_count, event->Id() );
             closeEvent();
-            last_section_mod = 0;
           }
           if ( !event ) {
             if ( cause.length() )
@@ -1455,29 +1452,14 @@ bool Monitor::Analyse() {
           if ( event ) {
             Debug(3, "Have signal and recording with open event at (%d.%d)", timestamp->tv_sec, timestamp->tv_usec);
 
-            if ( section_length && ( timestamp->tv_sec >= section_length ) ) {
-              // TODO: Wouldn't this be clearer if we just did something like if now - event->start > section_length ?
-              int section_mod = timestamp->tv_sec % section_length;
-              Debug(3,
-                  "Section length (%d) Last Section Mod(%d), new section mod(%d)",
-                  section_length, last_section_mod, section_mod
+            if ( section_length && ( ( timestamp->tv_sec - video_store_data->recording.tv_sec ) >= section_length ) ) {
+              Info( "%s: %03d - Closing event %" PRIu64 ", section end forced %d - %d = %d >= %d",
+                  name, image_count, event->Id(),
+                  timestamp->tv_sec, video_store_data->recording.tv_sec, 
+                  timestamp->tv_sec - video_store_data->recording.tv_sec,
+                  section_length
                   );
-              if ( section_mod < last_section_mod ) {
-                //if ( state == IDLE || state == TAPE || event_close_mode == CLOSE_TIME ) {
-                  //if ( state == TAPE ) {
-                    //shared_data->state = state = IDLE;
-                    //Info( "%s: %03d - Closing event %d, section end", name, image_count, event->Id() )
-                  //} else {
-                    Info( "%s: %03d - Closing event %" PRIu64 ", section end forced ", name, image_count, event->Id() );
-                  //}
-                  closeEvent();
-                  last_section_mod = 0;
-                //} else {
-                  //Debug( 2, "Time to close event, but state (%d) is not IDLE or TAPE and event_close_mode is not CLOSE_TIME (%d)", state, event_close_mode );
-                //}
-              } else {
-                last_section_mod = section_mod;
-              }
+              closeEvent();
             } // end if section_length
           } // end if event
 
@@ -1737,11 +1719,10 @@ Error("Creating new event when one exists");
       }
     } else {
       if ( event ) {
-        Info( "%s: %03d - Closing event %" PRIu64 ", trigger off", name, image_count, event->Id() );
+        Info("%s: %03d - Closing event %" PRIu64 ", trigger off", name, image_count, event->Id());
         closeEvent();
       }
       shared_data->state = state = IDLE;
-      last_section_mod = 0;
       trigger_data->trigger_state = TRIGGER_CANCEL;
     } // end if ( trigger_data->trigger_state != TRIGGER_OFF )
 

From 5f6bcec4ca42baf69f0402d312f99a858e8b843d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 15 Jan 2019 11:35:37 -0500
Subject: [PATCH 005/214] Use start_pts instead of start_dts when calculating
 output pkt.dts.  Because start_dts is often lower than start_pts, we can get
 into a situation where we calculate a dts that is > pts.

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

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 6d728cf3c..e28ce6b59 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -815,34 +815,38 @@ int VideoStore::writeVideoFramePacket(AVPacket *ipkt) {
   }
   // Just because the in stream wraps, doesn't mean the out needs to.  Really, if we are limiting ourselves to 10min segments I can't imagine every wrapping in the out.  So need to handle in wrap, without causing out wrap.
   if ( ipkt->dts != AV_NOPTS_VALUE ) {
+#if 0
     if ( (!video_first_dts) && ( ipkt->dts >= 0 ) ) {
       // This is the first packet.
       opkt.dts = 0;
       Debug(1, "Starting video first_dts will become (%" PRId64 ")", ipkt->dts);
       video_first_dts = ipkt->dts;
     } else {
+#endif
       opkt.dts = av_rescale_q(
-          ipkt->dts - video_first_dts,
+          ipkt->dts - video_first_pts,
           video_in_stream->time_base,
           video_out_stream->time_base
           );
-      Debug(3, "opkt.dts = %" PRId64 " from ipkt.dts(%" PRId64 ") - first_dts(%" PRId64 ")",
-          opkt.dts, ipkt->dts, video_first_dts);
+      Debug(3, "opkt.dts = %" PRId64 " from ipkt.dts(%" PRId64 ") - first_pts(%" PRId64 ")",
+          opkt.dts, ipkt->dts, video_first_pts);
       video_last_dts = ipkt->dts;
+#if 0
     }
-  } else {
-    Debug(3, "opkt.dts = undef");
-    opkt.dts = AV_NOPTS_VALUE;
-  }
-
-  if ( opkt.dts > opkt.pts ) {
-    Debug(1,
+#endif
+    if ( opkt.dts > opkt.pts ) {
+      Debug(1,
           "opkt.dts(%" PRId64 ") must be <= opkt.pts(%" PRId64 "). Decompression must happen "
           "before presentation.",
           opkt.dts, opkt.pts);
-    opkt.dts = opkt.pts;
+      opkt.dts = opkt.pts;
+    }
+  } else {
+    Debug(3, "opkt.dts = undef");
+    opkt.dts = 0;
   }
 
+
   opkt.flags = ipkt->flags;
   opkt.pos = -1;
   opkt.data = ipkt->data;

From 92066aaf4f4ab6b62448e766233842d65e74fc74 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 15 Jan 2019 16:33:27 -0500
Subject: [PATCH 006/214] add stream start timeval

---
 src/zm_stream.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/zm_stream.h b/src/zm_stream.h
index f9364bbef..92fb591b8 100644
--- a/src/zm_stream.h
+++ b/src/zm_stream.h
@@ -85,6 +85,7 @@ protected:
   int step;
 
   struct timeval now;
+  struct timeval start;     // clock time when started the event
   struct timeval last_comm_update;
 
   double base_fps;

From 345e2fef0fed3ea0c981adb96e743f8b7b119c19 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 15 Jan 2019 16:44:58 -0500
Subject: [PATCH 007/214] start only used in eventstream

---
 src/zm_eventstream.h | 2 +-
 src/zm_stream.h      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/zm_eventstream.h b/src/zm_eventstream.h
index 0c9ee0db3..792473c4a 100644
--- a/src/zm_eventstream.h
+++ b/src/zm_eventstream.h
@@ -78,6 +78,7 @@ class EventStream : public StreamBase {
     int curr_frame_id;
     double curr_stream_time;
     bool  send_frame;
+    struct timeval start;     // clock time when started the event
 
     EventData *event_data;
     FFmpeg_Input  *ffmpeg_input;
@@ -108,7 +109,6 @@ class EventStream : public StreamBase {
       input_codec = 0;
 
       ffmpeg_input = NULL;
-
     }
     void setStreamStart( uint64_t init_event_id, unsigned int init_frame_id );
     void setStreamStart( int monitor_id, time_t event_time );
diff --git a/src/zm_stream.h b/src/zm_stream.h
index 92fb591b8..f9364bbef 100644
--- a/src/zm_stream.h
+++ b/src/zm_stream.h
@@ -85,7 +85,6 @@ protected:
   int step;
 
   struct timeval now;
-  struct timeval start;     // clock time when started the event
   struct timeval last_comm_update;
 
   double base_fps;

From a39b92154cc62ea66af7c6160bc4ceb39efaeb89 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 17 Jan 2019 08:49:48 -0500
Subject: [PATCH 008/214] wip

---
 src/zm_ffmpeg_camera.cpp | 3 ++-
 src/zm_videostore.cpp    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index 13cbde10d..0cfa53b82 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -362,6 +362,7 @@ int FfmpegCamera::OpenFfmpeg() {
   } else {
     Warning("Unknown method (%s)", method.c_str() );
   }
+//#av_dict_set(&opts, "timeout", "10000000", 0); // in microseconds.
 
   if ( ret < 0 ) {
     Warning("Could not set rtsp_transport method '%s'\n", method.c_str());
@@ -1039,7 +1040,7 @@ int FfmpegCamera::CaptureAndRecord( Image &image, timeval recording, char* event
 
 int FfmpegCamera::FfmpegInterruptCallback(void *ctx) {
   //FfmpegCamera* camera = reinterpret_cast<FfmpegCamera*>(ctx);
-
+  Debug(4, "FfmpegInterruptCallback");
   return zm_terminate;
 }
 
diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 8af95e616..79b084912 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -100,6 +100,7 @@ VideoStore::VideoStore(
   }
   // Since we are not re-encoding, all we have to do is copy the parameters
   video_out_ctx = video_out_stream->codec;
+  video_out_ctx->time_base = video_in_ctx->time_base;
 
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
   // Copy params from instream to ctx

From 7026ebaface44bd9d496a6aefbd6527be427b2b6 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 22 Jan 2019 16:45:38 -0500
Subject: [PATCH 009/214] Make ajax/stream wait longer for zms.  On pi can take
 up to 3 seconds. Also for php < 5.6, we need to fake 64bit unpack support

---
 web/ajax/stream.php | 47 +++++++++++++++++++--------------------------
 1 file changed, 20 insertions(+), 27 deletions(-)

diff --git a/web/ajax/stream.php b/web/ajax/stream.php
index 356227529..e8e7aca7f 100644
--- a/web/ajax/stream.php
+++ b/web/ajax/stream.php
@@ -26,7 +26,7 @@ if ( sem_acquire($semaphore,1) !== false ) {
     Warning("sock file $localSocketFile already exists?!  Is someone else talking to zms?");
     // They could be.  We can maybe have concurrent requests from a browser.  
   }
-  if ( ! socket_bind( $socket, $localSocketFile ) ) {
+  if ( !socket_bind( $socket, $localSocketFile ) ) {
     ajaxError("socket_bind( $localSocketFile ) failed: ".socket_strerror(socket_last_error()) );
   }
 
@@ -52,12 +52,14 @@ if ( sem_acquire($semaphore,1) !== false ) {
     $msg = pack( 'lcN', MSG_CMD, $_REQUEST['command'], $_REQUEST['offset'] );
     break;
   default :
+    Logger::Debug("Sending command " . $_REQUEST['command']);
     $msg = pack( 'lc', MSG_CMD, $_REQUEST['command'] );
     break;
   }
 
   $remSockFile = ZM_PATH_SOCKS.'/zms-'.sprintf('%06d',$_REQUEST['connkey']).'s.sock';
-  $max_socket_tries = 10;
+  // Pi can take up to 3 seconds for zms to start up.
+  $max_socket_tries = 1000;
   // FIXME This should not exceed web_ajax_timeout
   while ( !file_exists($remSockFile) && $max_socket_tries-- ) { //sometimes we are too fast for our own good, if it hasn't been setup yet give it a second. 
     // WHY? We will just send another one... 
@@ -92,39 +94,31 @@ if ( sem_acquire($semaphore,1) !== false ) {
   } else if ( $numSockets == 0 ) {
     Error( "Timed out waiting for msg $remSockFile"  );
     socket_Set_nonblock($socket);
-    #ajaxError( "Timed out waiting for msg $remSockFile"  );
+    #ajaxError("Timed out waiting for msg $remSockFile");
   } else if ( $numSockets > 0 ) {
     if ( count($rSockets) != 1 ) {
-      Error( 'Bogus return from select, '.count($rSockets).' sockets available' );
-      ajaxError( 'Bogus return from select, '.count($rSockets).' sockets available' );
+      Error('Bogus return from select, '.count($rSockets).' sockets available');
+      ajaxError('Bogus return from select, '.count($rSockets).' sockets available');
     }
   }
 
   switch( $nbytes = @socket_recvfrom( $socket, $msg, MSG_DATA_SIZE, 0, $remSockFile ) ) {
   case -1 :
-  {
-    ajaxError( "socket_recvfrom( $remSockFile ) failed: ".socket_strerror(socket_last_error()) );
+    ajaxError("socket_recvfrom( $remSockFile ) failed: ".socket_strerror(socket_last_error()));
     break;
-  }
   case 0 :
-  {
-    ajaxError( 'No data to read from socket' );
+    ajaxError('No data to read from socket');
     break;
-  }
   default :
-  {
     if ( $nbytes != MSG_DATA_SIZE )
-      ajaxError( "Got unexpected message size, got $nbytes, expected ".MSG_DATA_SIZE );
+      ajaxError("Got unexpected message size, got $nbytes, expected ".MSG_DATA_SIZE);
     break;
   }
-  }
 
-
-  $data = unpack( 'ltype', $msg );
+  $data = unpack('ltype', $msg);
   switch ( $data['type'] ) {
   case MSG_DATA_WATCH :
-  {
-    $data =  unpack( "ltype/imonitor/istate/dfps/ilevel/irate/ddelay/izoom/Cdelayed/Cpaused/Cenabled/Cforced", $msg );
+    $data = unpack('ltype/imonitor/istate/dfps/ilevel/irate/ddelay/izoom/Cdelayed/Cpaused/Cenabled/Cforced', $msg);
     Logger::Debug("FPS: " . $data['fps'] );
     $data['fps'] = round( $data['fps'], 2 );
     Logger::Debug("FPS: " . $data['fps'] );
@@ -140,11 +134,13 @@ if ( sem_acquire($semaphore,1) !== false ) {
     }
     ajaxResponse( array( 'status'=>$data ) );
     break;
-  }
   case MSG_DATA_EVENT :
-  {
-    $data =  unpack( "ltype/Pevent/iprogress/irate/izoom/Cpaused", $msg );
-    //$data['progress'] = sprintf( "%.2f", $data['progress'] );
+    if ( version_compare( phpversion(), '5.6.0', '>') ) {
+      $data = unpack('ltype/ieventlow/ieventhigh/iprogress/irate/izoom/Cpaused', $msg);
+      $data['event'] = $data['eventhigh'] << 32 | $data['eventlow'];
+    } else {
+      $data = unpack('ltype/Qevent/iprogress/irate/izoom/Cpaused', $msg);
+    }
     $data['rate'] /= RATE_BASE;
     $data['zoom'] = round( $data['zoom']/SCALE_BASE, 1 );
     if ( ZM_OPT_USE_AUTH && ZM_AUTH_RELAY == 'hashed' ) {
@@ -154,13 +150,10 @@ if ( sem_acquire($semaphore,1) !== false ) {
         $data['auth'] = generateAuthHash(ZM_AUTH_HASH_IPS);
       } 
     }
-    ajaxResponse( array( 'status'=>$data ) );
+    ajaxResponse(array('status'=>$data));
     break;
-  }
   default :
-  {
-    ajaxError( "Unexpected received message type '$type'" );
-  }
+    ajaxError("Unexpected received message type '$type'");
   }
   sem_release($semaphore);
 } else {

From 2563951c1fbc0e67c34ba8499951cd6c2e97f896 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 13 Feb 2019 11:32:34 -0500
Subject: [PATCH 010/214] comment out the signal blocking. I still can't figure
 out why we would want it

---
 src/zmc.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/zmc.cpp b/src/zmc.cpp
index 9270c75cd..88a9807b2 100644
--- a/src/zmc.cpp
+++ b/src/zmc.cpp
@@ -276,7 +276,7 @@ int main(int argc, char *argv[]) {
     struct timeval now;
     struct DeltaTimeval delta_time;
     while ( !zm_terminate ) {
-      sigprocmask(SIG_BLOCK, &block_set, 0);
+      //sigprocmask(SIG_BLOCK, &block_set, 0);
       for ( int i = 0; i < n_monitors; i++ ) {
         long min_delay = MAXINT;
 
@@ -333,7 +333,7 @@ int main(int argc, char *argv[]) {
         }  // end if next_delay <= min_delay || next_delays[i] <= 0 )
 
       }  // end foreach n_monitors
-      sigprocmask(SIG_UNBLOCK, &block_set, 0);
+      //sigprocmask(SIG_UNBLOCK, &block_set, 0);
       if ( zm_reload ) {
         for ( int i = 0; i < n_monitors; i++ ) {
           monitors[i]->Reload();

From 31a11a69922e883f204340c0beb4a78fc23a7c84 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 13 Feb 2019 11:34:47 -0500
Subject: [PATCH 011/214] init log earlier in zms

---
 src/zms.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/zms.cpp b/src/zms.cpp
index a5fef0134..cf3265fd0 100644
--- a/src/zms.cpp
+++ b/src/zms.cpp
@@ -85,6 +85,9 @@ int main( int argc, const char *argv[] ) {
   }
   
   zmLoadConfig();
+  char log_id_string[32] = "zms";
+  logInit( log_id_string );
+  Debug(1,"rate %d", rate);
 
   const char *query = getenv("QUERY_STRING");
   if ( query ) {
@@ -95,7 +98,7 @@ int main( int argc, const char *argv[] ) {
     char *q_ptr = temp_query;
     char *parms[16]; // Shouldn't be more than this
     int parm_no = 0;
-    while( (parm_no < 16) && (parms[parm_no] = strtok(q_ptr, "&")) ) {
+    while ( (parm_no < 16) && (parms[parm_no] = strtok(q_ptr, "&")) ) {
       parm_no++;
       q_ptr = NULL;
     }
@@ -130,6 +133,7 @@ int main( int argc, const char *argv[] ) {
         scale = atoi( value );
       } else if ( !strcmp( name, "rate" ) ) {
         rate = atoi( value );
+        Debug(2,"Setting rate to %d from %s", rate, value);
       } else if ( !strcmp( name, "maxfps" ) ) {
         maxfps = atof( value );
       } else if ( !strcmp( name, "bitrate" ) ) {
@@ -177,9 +181,10 @@ int main( int argc, const char *argv[] ) {
         }
       }
     } // end foreach parm
+  } else {
+    Fatal("No query string.");
   } // end if query
 
-  char log_id_string[32] = "zms";
   if ( monitor_id ) {
     snprintf(log_id_string, sizeof(log_id_string), "zms_m%d", monitor_id);
   } else {

From 9477ebad5d5f2a7839af1e35b2dc0f34abaedc49 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 22 Feb 2019 09:35:42 -0500
Subject: [PATCH 012/214] update to php namespace

---
 web/includes/session.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/includes/session.php b/web/includes/session.php
index 8f9c90e66..7da3ee4fb 100644
--- a/web/includes/session.php
+++ b/web/includes/session.php
@@ -8,7 +8,7 @@ function zm_session_start() {
   $currentCookieParams = session_get_cookie_params(); 
   $currentCookieParams['lifetime'] = ZM_COOKIE_LIFETIME;
 
-  Logger::Debug('Setting cookie parameters to lifetime('.$currentCookieParams['lifetime'].') path('.$currentCookieParams['path'].') domain ('.$currentCookieParams['domain'].') secure('.$currentCookieParams['secure'].') httpOnly(1)');
+  ZM\Logger::Debug('Setting cookie parameters to lifetime('.$currentCookieParams['lifetime'].') path('.$currentCookieParams['path'].') domain ('.$currentCookieParams['domain'].') secure('.$currentCookieParams['secure'].') httpOnly(1)');
   session_set_cookie_params( 
     $currentCookieParams['lifetime'],
     $currentCookieParams['path'],

From 46c6735311c3bc1bff503fa2eea6d91d74ce6488 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 24 Feb 2019 10:02:49 -0500
Subject: [PATCH 013/214] Missing namespace on filter.  Fixes #2541

---
 web/includes/actions/filter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/includes/actions/filter.php b/web/includes/actions/filter.php
index a89938697..6b3019ee5 100644
--- a/web/includes/actions/filter.php
+++ b/web/includes/actions/filter.php
@@ -81,7 +81,7 @@ if ( isset($_REQUEST['object']) and ( $_REQUEST['object'] == 'filter' ) ) {
       } else {
         dbQuery('INSERT INTO Filters SET'.$sql);
         $_REQUEST['Id'] = dbInsertId();
-        $filter = new Filter($_REQUEST['Id']);
+        $filter = new ZM\Filter($_REQUEST['Id']);
       }
       if ( !empty($_REQUEST['filter']['Background']) )
         $filter->control('start');

From dd590aa729ceea396f18352761e0e9caca0247ac Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 24 Feb 2019 10:05:45 -0500
Subject: [PATCH 014/214] remove warning when QUERY_STRING is not set

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

diff --git a/web/skins/classic/views/login.php b/web/skins/classic/views/login.php
index c75c9b602..42a4090fc 100644
--- a/web/skins/classic/views/login.php
+++ b/web/skins/classic/views/login.php
@@ -7,7 +7,7 @@ xhtmlHeaders(__FILE__, translate('Login') );
 		<form class="center-block" name="loginForm" id="loginForm" method="post" action="?">
 			<input type="hidden" name="action" value="login"/>
 			<input type="hidden" name="view" value="login"/>
-			<input type="hidden" name="postLoginQuery" value="<?php echo htmlspecialchars($_SERVER['QUERY_STRING']) ?>">
+			<input type="hidden" name="postLoginQuery" value="<?php echo isset($_SERVER['QUERY_STRING']) ? htmlspecialchars($_SERVER['QUERY_STRING']) : ''?>">
 
 			<div id="loginError" class="hidden alarm" role="alert">
 				<span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>

From 3b06f3015a0900097f786aa893c0106db29b36ca Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 24 Feb 2019 10:07:42 -0500
Subject: [PATCH 015/214] redirect to console of successfullogin takes us to
 login

---
 web/skins/classic/views/js/postlogin.js.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/web/skins/classic/views/js/postlogin.js.php b/web/skins/classic/views/js/postlogin.js.php
index c7ae30165..6fa681fad 100644
--- a/web/skins/classic/views/js/postlogin.js.php
+++ b/web/skins/classic/views/js/postlogin.js.php
@@ -18,7 +18,12 @@
       }
 			?>";
 
+    if ( querySuffix == '?view=login' ) {
+      // If we didn't redirect elsewhere, then don't show login page, go to console
+      querySuffix = '?view=console';
+    }
     var newUrl = querySuffix;
+
 console.log("Redirecting to" + newUrl + ' ' + thisUrl);
 		window.location.replace(newUrl);
 	}

From cbd8ee80f80b7b007959ba86d45f0f7f36da8e89 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 24 Feb 2019 12:40:40 -0500
Subject: [PATCH 016/214] add namespace for Monitor

---
 web/skins/classic/views/zones.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/views/zones.php b/web/skins/classic/views/zones.php
index 7a176acc7..136c0a81c 100644
--- a/web/skins/classic/views/zones.php
+++ b/web/skins/classic/views/zones.php
@@ -18,13 +18,13 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canView( 'Monitors' ) ) {
+if ( !canView('Monitors') ) {
   $view = 'error';
   return;
 }
 
 $mid = validInt($_REQUEST['mid']);
-$monitor = new Monitor( $mid );
+$monitor = new ZM\Monitor( $mid );
 # Width() and Height() are already rotated
 $minX = 0;
 $maxX = $monitor->Width()-1;

From 2187dea2aafd36bd4150149dae0fcca9e52f7529 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 25 Feb 2019 15:11:08 -0500
Subject: [PATCH 017/214] add namespace to Warnings

---
 web/includes/functions.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 29247e377..9674deb91 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -356,7 +356,7 @@ function getWebSiteUrl( $id, $src, $width, $height, $title='' ) {
         if (array_key_exists('X-Frame-Options', $header)) {
             $header = $header['X-Frame-Options'];
             if ( stripos($header, 'sameorigin') === 0 )
-                Warning("Web site $src has X-Frame-Options set to sameorigin. An X-Frame-Options browser plugin is required to display this site.");
+                ZM\Warning("Web site $src has X-Frame-Options set to sameorigin. An X-Frame-Options browser plugin is required to display this site.");
         }
     }
     return '<object id="'.$id.'" data="'.$src.'" alt="'.$title.'" width="'.$width.'" height="'.$height.'"></object>';
@@ -807,7 +807,7 @@ function canStreamNative() {
 
 function canStreamApplet() {
   if ( (ZM_OPT_CAMBOZOLA && !file_exists( ZM_PATH_WEB.'/'.ZM_PATH_CAMBOZOLA )) ) {
-    Warning ( 'ZM_OPT_CAMBOZOLA is enabled, but the system cannot find '.ZM_PATH_WEB.'/'.ZM_PATH_CAMBOZOLA );
+    ZM\Warning('ZM_OPT_CAMBOZOLA is enabled, but the system cannot find '.ZM_PATH_WEB.'/'.ZM_PATH_CAMBOZOLA);
   }
 
   return( (ZM_OPT_CAMBOZOLA && file_exists( ZM_PATH_WEB.'/'.ZM_PATH_CAMBOZOLA )) );
@@ -1307,7 +1307,7 @@ function parseFilter(&$filter, $saveToSession=false, $querySep='&amp;') {
             $filter['sql'] .= " IS NOT $value";
             break;
           default:
-            Warning("Invalid operator in filter: " . $terms[$i]['op'] );
+            ZM\Warning("Invalid operator in filter: " . $terms[$i]['op'] );
         }
 
         $filter['query'] .= $querySep.urlencode("filter[Query][terms][$i][op]").'='.urlencode($terms[$i]['op']);

From 627e9f74cf38bc4859cc92e9663d6dbd52240e4b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 25 Feb 2019 15:24:25 -0500
Subject: [PATCH 018/214] fix spacing

---
 web/skins/classic/views/zones.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/web/skins/classic/views/zones.php b/web/skins/classic/views/zones.php
index 136c0a81c..2d29e13d9 100644
--- a/web/skins/classic/views/zones.php
+++ b/web/skins/classic/views/zones.php
@@ -24,7 +24,7 @@ if ( !canView('Monitors') ) {
 }
 
 $mid = validInt($_REQUEST['mid']);
-$monitor = new ZM\Monitor( $mid );
+$monitor = new ZM\Monitor($mid);
 # Width() and Height() are already rotated
 $minX = 0;
 $maxX = $monitor->Width()-1;
@@ -32,18 +32,18 @@ $minY = 0;
 $maxY = $monitor->Height()-1;
 
 $zones = array();
-foreach( dbFetchAll( 'SELECT * FROM Zones WHERE MonitorId=? ORDER BY Area DESC', NULL, array($mid) ) as $row ) {
-  $row['Points'] = coordsToPoints( $row['Coords'] );
+foreach( dbFetchAll('SELECT * FROM Zones WHERE MonitorId=? ORDER BY Area DESC', NULL, array($mid)) as $row ) {
+  $row['Points'] = coordsToPoints($row['Coords']);
 
-  limitPoints( $row['Points'], $minX, $minY, $maxX, $maxY );
-  $row['Coords'] = pointsToCoords( $row['Points'] );
-  $row['AreaCoords'] = preg_replace( '/\s+/', ',', $row['Coords'] );
+  limitPoints($row['Points'], $minX, $minY, $maxX, $maxY);
+  $row['Coords'] = pointsToCoords($row['Points']);
+  $row['AreaCoords'] = preg_replace('/\s+/', ',', $row['Coords']);
   $zones[] = $row;
 }
 
 $connkey = generateConnKey();
 
-xhtmlHeaders(__FILE__, translate('Zones') );
+xhtmlHeaders(__FILE__, translate('Zones'));
 ?>
 <body>
   <div id="page">

From 705468dfc4a568d6bf32f45e8e801e6228802ac9 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 26 Feb 2019 10:08:07 -0500
Subject: [PATCH 019/214] if we don't have a connkey, comms will not be open so
 don't touch the sock file or call checkCommandQueue

---
 src/zm_eventstream.cpp | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/zm_eventstream.cpp b/src/zm_eventstream.cpp
index 52b825d86..e14c1fb81 100644
--- a/src/zm_eventstream.cpp
+++ b/src/zm_eventstream.cpp
@@ -761,15 +761,17 @@ void EventStream::runStream() {
     unsigned int delta_us = 0;
     send_frame = false;
 
-    // commands may set send_frame to true
-    while ( checkCommandQueue() && !zm_terminate ) {
-      // The idea is to loop here processing all commands before proceeding.
-    }
+    if ( connkey ) {
+      // commands may set send_frame to true
+      while ( checkCommandQueue() && !zm_terminate ) {
+        // The idea is to loop here processing all commands before proceeding.
+      }
 
-    // Update modified time of the socket .lock file so that we can tell which ones are stale.
-    if ( now.tv_sec - last_comm_update.tv_sec > 3600 ) {
-      touch(sock_path_lock);
-      last_comm_update = now;
+      // Update modified time of the socket .lock file so that we can tell which ones are stale.
+      if ( now.tv_sec - last_comm_update.tv_sec > 3600 ) {
+        touch(sock_path_lock);
+        last_comm_update = now;
+      }
     }
 
     if ( step != 0 )

From 53c0fae68870ef5685d162071dcaf70bd7b0564a Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 26 Feb 2019 10:22:58 -0500
Subject: [PATCH 020/214] Merge fix from storageareas for archive/delete in
 events list

---
 web/includes/actions/events.php      |  8 ++++----
 web/skins/classic/views/events.php   |  4 ++--
 web/skins/classic/views/js/events.js | 18 +++++++++---------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/web/includes/actions/events.php b/web/includes/actions/events.php
index d7e4c18d8..08782a8a2 100644
--- a/web/includes/actions/events.php
+++ b/web/includes/actions/events.php
@@ -18,7 +18,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !isset($_REQUEST['markEids']) ) {
+if ( !isset($_REQUEST['eids']) ) {
   ZM\Warning('Events actions require eids');
   return;
 }
@@ -31,21 +31,21 @@ if ( !canEdit('Events') ) {
 
 if ( $action == 'archive' ) {
   $dbConn->beginTransaction();
-  foreach( getAffectedIds('markEid') as $markEid ) {
+  foreach( getAffectedIds('eids') as $markEid ) {
     dbQuery('UPDATE Events SET Archived=? WHERE Id=?', array(1, $markEid));
   }
   $dbConn->commit();
   $refreshParent = true;
 } else if ( $action == 'unarchive' ) {
   $dbConn->beginTransaction();
-  foreach( getAffectedIds('markEid') as $markEid ) {
+  foreach( getAffectedIds('eids') as $markEid ) {
     dbQuery('UPDATE Events SET Archived=? WHERE Id=?', array(0, $markEid));
   }
   $dbConn->commit();
   $refreshParent = true;
 } else if ( $action == 'delete' ) {
   $dbConn->beginTransaction();
-  foreach ( getAffectedIds('markEid') as $markEid ) {
+  foreach ( getAffectedIds('eids') as $markEid ) {
     deleteEvent($markEid);
   }
   $dbConn->commit();
diff --git a/web/skins/classic/views/events.php b/web/skins/classic/views/events.php
index 16b017326..703e67153 100644
--- a/web/skins/classic/views/events.php
+++ b/web/skins/classic/views/events.php
@@ -183,7 +183,7 @@ while ( $event_row = dbFetchNext($results) ) {
 <?php
     }
 ?>
-              <th class="colMark"><input type="checkbox" name="toggleCheck" value="1" data-checkbox-name="markEids" data-on-click-this="updateFormCheckboxesByName"/></th>
+              <th class="colMark"><input type="checkbox" name="toggleCheck" value="1" data-checkbox-name="eids[]" data-on-click-this="updateFormCheckboxesByName"/></th>
             </tr>
 <?php
   }
@@ -248,7 +248,7 @@ while ( $event_row = dbFetchNext($results) ) {
       echo '</td>';
   } // end if ZM_WEB_LIST_THUMBS
 ?>
-              <td class="colMark"><input type="checkbox" name="markEids[]" value="<?php echo $event->Id() ?>"/></td>
+              <td class="colMark"><input type="checkbox" name="eids[]" value="<?php echo $event->Id() ?>"/></td>
             </tr>
 <?php
 }
diff --git a/web/skins/classic/views/js/events.js b/web/skins/classic/views/js/events.js
index 831490f78..ffb2e923f 100644
--- a/web/skins/classic/views/js/events.js
+++ b/web/skins/classic/views/js/events.js
@@ -23,7 +23,7 @@ function configureButton(event) {
   var checked = element.checked;
   if ( !checked ) {
     for (var i = 0, len=form.elements.length; i < len; i++) {
-      if ( form.elements[i].name.indexOf('markEids') == 0) {
+      if ( form.elements[i].name.indexOf('eids') == 0) {
         if ( form.elements[i].checked ) {
           checked = true;
           break;
@@ -53,7 +53,7 @@ function deleteEvents( element ) {
   var count = 0;
   // This is slightly more efficient than a jquery selector because we stop after finding one.
   for (var i = 0; i < form.elements.length; i++) {
-    if (form.elements[i].name.indexOf('markEids') == 0) {
+    if (form.elements[i].name.indexOf('eids') == 0) {
       if ( form.elements[i].checked ) {
         count++;
         break;
@@ -61,7 +61,7 @@ function deleteEvents( element ) {
     }
   }
   if ( count > 0 ) {
-    if ( confirm( confirmDeleteEventsString ) ) {
+    if ( confirm(confirmDeleteEventsString) ) {
       form.elements['action'].value = 'delete';
       form.submit();
     }
@@ -76,20 +76,20 @@ function editEvents( element ) {
   var form = element.form;
   var eids = new Array();
   for (var i = 0, len=form.elements.length; i < len; i++) {
-    if (form.elements[i].name.indexOf('markEids') == 0) {
+    if (form.elements[i].name.indexOf('eids') == 0) {
       if ( form.elements[i].checked ) {
         eids[eids.length] = 'eids[]='+form.elements[i].value;
       }
     }
   }
-  createPopup( '?view=eventdetail&'+eids.join( '&' ), 'zmEventDetail', 'eventdetail' );
+  createPopup('?view=eventdetail&'+eids.join('&'), 'zmEventDetail', 'eventdetail');
 }
 
 function downloadVideo( element ) {
   var form = element.form;
   var eids = new Array();
   for (var i = 0, len=form.elements.length; i < len; i++) {
-    if (form.elements[i].name.indexOf('markEids') == 0 ) {
+    if (form.elements[i].name.indexOf('eids') == 0 ) {
       if ( form.elements[i].checked ) {
         eids[eids.length] = 'eids[]='+form.elements[i].value;
       }
@@ -102,7 +102,7 @@ function exportEvents( element ) {
   var form = element.form;
   var eids = new Array();
   for (var i = 0, len=form.elements.length; i < len; i++) {
-    if (form.elements[i].name.indexOf('markEids') == 0 ) {
+    if (form.elements[i].name.indexOf('eids') == 0 ) {
       if ( form.elements[i].checked ) {
         eids[eids.length] = 'eids[]='+form.elements[i].value;
       }
@@ -115,7 +115,7 @@ function viewEvents( element ) {
   var form = element.form;
   var events = new Array();
   for (var i = 0, len=form.elements.length; i < len; i++) {
-    if ( form.elements[i].name.indexOf('markEids') == 0 ) {
+    if ( form.elements[i].name.indexOf('eids') == 0 ) {
       if ( form.elements[i].checked ) {
         events[events.length] = form.elements[i].value;
       }
@@ -166,7 +166,7 @@ function initPage() {
     this.addEventListener('mouseover', thumbnail_onmouseover, false);
     this.addEventListener('mouseout', thumbnail_onmouseout, false);
   });
-  $j('input[name=markEids\\[\\]]').each(function() {
+  $j('input[name=eids\\[\\]]').each(function() {
     this.addEventListener('click', configureButton, false);
   });
   document.getElementById("refreshLink").addEventListener("click", function onRefreshClick(evt) {

From 92dc7878de907331068e54462b337dc6eb04bdee Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Tue, 26 Feb 2019 11:28:56 -0500
Subject: [PATCH 021/214] Fix 2340 (#2368)

* include includes/functions.php so that we have access to all it's contents

* add a beforeDelete function which deletes the files.  Add other needed functions like Path() LinkPath() etc.

* add require_once for Storage and functions because we use them in Event

* Now that ZM has namespaces use the ZM Event class to do the heavy lifting of delete

* Don't need functions in AppController anymore
---
 web/api/app/Model/Event.php | 34 ++++++++++++++++++++--------------
 web/includes/Event.php      |  2 ++
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/web/api/app/Model/Event.php b/web/api/app/Model/Event.php
index 14dbd377e..4e0ec96b9 100644
--- a/web/api/app/Model/Event.php
+++ b/web/api/app/Model/Event.php
@@ -1,4 +1,6 @@
 <?php
+require_once __DIR__ .'/../../../includes/Event.php';
+
 App::uses('AppModel', 'Model');
 /**
  * Event Model
@@ -100,20 +102,20 @@ class Event extends AppModel {
     ),
   );
 
-  public function Relative_Path($event) {
-    $event_path = '';
-
-    if ( $event['Scheme'] == 'Deep' ) {
-      $event_path = $event['MonitorId'] .'/'.strftime('%y/%m/%d/%H/%M/%S', strtotime($event['StartTime']));
-    } else if ( $event['Scheme'] == 'Medium' ) {
-      $event_path = $event['MonitorId'] .'/'.strftime('%Y-%m-%d', strtotime($event['StartTime'])) . '/'.$event['Id'];
-    } else {
-      $event_path = $event['MonitorId'] .'/'.$event['Id'];
-    }
-
-    return $event_path;
+  public function Relative_Path() {
+    $Event = new ZM\Event($this->data);
+    return $Event->Relative_Path();
   } // end function Relative_Path()
 
+   public function Path() {
+    $Event = new ZM\Event($this->data);
+    return $Event->Path();
+  }
+
+  public function Link_Path() {
+    $Event = new ZM\Event($this->data);
+    return $Event->Link_Path();
+  }
 
   public function fileExists($event) {
     //$data = $this->findById($id);
@@ -121,10 +123,10 @@ class Event extends AppModel {
     $storage = $this->Storage->findById($event['StorageId']);
 
     if ( $event['DefaultVideo'] ) {
-      if ( file_exists($storage['Storage']['Path'].'/'.$this->Relative_Path($event).'/'.$event['DefaultVideo']) ) {
+      if ( file_exists($storage['Storage']['Path'].'/'.$this->Relative_Path().'/'.$event['DefaultVideo']) ) {
         return 1;
       } else {
-        Logger::Debug("FIle does not exist at " . $storage['Storage']['Path'].'/'.$this->Relative_Path($event).'/'.$event['DefaultVideo'] );
+        Logger::Debug("FIle does not exist at " . $storage['Storage']['Path'].'/'.$this->Relative_Path().'/'.$event['DefaultVideo'] );
       }
     } else {
 Logger::Debug("No DefaultVideo in Event" . $this->Event);
@@ -136,4 +138,8 @@ Logger::Debug("No DefaultVideo in Event" . $this->Event);
     $storage = $this->Storage->findById($event['StorageId']);
     return filesize($storage['Storage']['Path'].'/'.$this->Relative_Path($event).'/'.$event['DefaultVideo']);
   }
+  public function beforeDelete($cascade=true) {
+    $Event = new ZM\Event($this->data);
+    return $Event->delete();
+  } // end function afterDelete
 }
diff --git a/web/includes/Event.php b/web/includes/Event.php
index 51995ac19..227dc6842 100644
--- a/web/includes/Event.php
+++ b/web/includes/Event.php
@@ -1,5 +1,7 @@
 <?php
 namespace ZM;
+require_once('Storage.php');
+require_once('functions.php');
 
 $event_cache = array();
 

From a38fcf5297e627cb7a28637d250088c96e25b803 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 26 Feb 2019 11:41:02 -0500
Subject: [PATCH 022/214] Add debug and use alternate way of figuring out how
 long to sleep to maintain fps

---
 src/zm_eventstream.cpp | 36 +++++++++++++++++++++++++++++++++---
 src/zm_eventstream.h   |  1 +
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/zm_eventstream.cpp b/src/zm_eventstream.cpp
index 4cf8ae8e1..5007204d7 100644
--- a/src/zm_eventstream.cpp
+++ b/src/zm_eventstream.cpp
@@ -336,6 +336,7 @@ void EventStream::processCommand(const CmdMsg *msg) {
             replay_rate = 50 * ZM_RATE_BASE;
             break;
           default :
+            Debug(1,"Defaulting replay_rate to 2*ZM_RATE_BASE because it is %d", replay_rate);
             replay_rate = 2 * ZM_RATE_BASE;
             break;
         }
@@ -490,6 +491,7 @@ void EventStream::processCommand(const CmdMsg *msg) {
   DataMsg status_msg;
   status_msg.msg_type = MSG_DATA_EVENT;
   memcpy(&status_msg.msg_data, &status_data, sizeof(status_data));
+  Debug(1,"Size of msg %d", sizeof(status_data));
   if ( sendto(sd, &status_msg, sizeof(status_msg), MSG_DONTWAIT, (sockaddr *)&rem_addr, sizeof(rem_addr)) < 0 ) {
     //if ( errno != EAGAIN )
     {
@@ -502,7 +504,7 @@ void EventStream::processCommand(const CmdMsg *msg) {
     exit(0);
 
   updateFrameRate((double)event_data->frame_count/event_data->duration);
-}
+} // void EventStream::processCommand(const CmdMsg *msg)
 
 void EventStream::checkEventLoaded() {
   static char sql[ZM_SQL_SML_BUFSIZ];
@@ -513,6 +515,7 @@ void EventStream::checkEventLoaded() {
     snprintf(sql, sizeof(sql), "SELECT Id FROM Events WHERE MonitorId = %ld AND Id > %" PRIu64 " ORDER BY Id ASC LIMIT 1", event_data->monitor_id, event_data->event_id);
   } else {
     // No event change required
+    //Debug(3, "No event change required");
     return;
   }
 
@@ -769,13 +772,16 @@ void EventStream::runStream() {
     unsigned int delta_us = 0;
     send_frame = false;
 
+    //Debug(3,"Before checking command queue");
     // commands may set send_frame to true
     while ( checkCommandQueue() && !zm_terminate ) {
       // The idea is to loop here processing all commands before proceeding.
     }
+    ////Debug(3,"After checking command queue");
 
     // Update modified time of the socket .lock file so that we can tell which ones are stale.
     if ( now.tv_sec - last_comm_update.tv_sec > 3600 ) {
+    //Debug(3,"Touching sock path");
       touch(sock_path_lock);
       last_comm_update = now;
     }
@@ -793,6 +799,7 @@ void EventStream::runStream() {
     //Info( "cfid:%d", curr_frame_id );
     //Info( "fdt:%d", frame_data->timestamp );
     if ( !paused ) {
+      Debug(3,"Not paused");
       bool in_event = true;
       double time_to_event = 0;
       if ( replay_rate > 0 ) {
@@ -815,6 +822,7 @@ void EventStream::runStream() {
         }
         //else
         //{
+        Debug(2,"Sleeping because paused");
           usleep(STREAM_PAUSE_WAIT);
           //curr_stream_time += (replay_rate>0?1:-1) * ((1.0L * replay_rate * STREAM_PAUSE_WAIT)/(ZM_RATE_BASE * 1000000));
           curr_stream_time += (1.0L * replay_rate * STREAM_PAUSE_WAIT)/(ZM_RATE_BASE * 1000000);
@@ -834,6 +842,7 @@ void EventStream::runStream() {
         send_frame = true;
       }
     } else if ( step != 0 ) {
+      Debug(2,"Paused with step");
       // We are paused and are just stepping forward or backward one frame
       step = 0;
       send_frame = true;
@@ -844,12 +853,18 @@ void EventStream::runStream() {
         // Send keepalive
         Debug(2, "Sending keepalive frame");
         send_frame = true;
+      //} else {
+        //Debug(2, "Not Sending keepalive frame");
       }
     } // end if streaming stepping or doing nothing
 
-    if ( send_frame )
+    if ( send_frame ) {
+      //Debug(3,"sending frame");
       if ( !sendFrame(delta_us) )
         zm_terminate = true;
+    //} else {
+      //Debug(3,"Not sending frame");
+    }
 
     curr_stream_time = frame_data->timestamp;
 
@@ -861,11 +876,26 @@ void EventStream::runStream() {
       }
       if ( send_frame && type != STREAM_MPEG ) {
         Debug(3, "dUs: %d", delta_us);
-        if ( delta_us )
+        if ( delta_us ) {
           usleep(delta_us);
+          Debug(3, "Done sleeping: %d usec", delta_us);
+        }
       }
     } else {
+      delta_us = ((1000000 * ZM_RATE_BASE)/((base_fps?base_fps:1)*(replay_rate?abs(replay_rate*2):2)));
+
+      Debug(2,"Sleeping %d because 1000000 * ZM_RATE_BASE(%d) / ( base_fps (%f), replay_rate(%d)",
+          (unsigned long)((1000000 * ZM_RATE_BASE)/((base_fps?base_fps:1)*abs(replay_rate*2))),
+          ZM_RATE_BASE,
+          (base_fps?base_fps:1),
+          (replay_rate?abs(replay_rate*2):200)
+          );
+      if ( delta_us > 0 and delta_us < 100000 ) {
       usleep((unsigned long)((1000000 * ZM_RATE_BASE)/((base_fps?base_fps:1)*abs(replay_rate*2))));
+      } else {
+        //Error("Not sleeping!");
+        usleep(100000);
+      }
     }
   } // end while ! zm_terminate
 #if HAVE_LIBAVCODEC
diff --git a/src/zm_eventstream.h b/src/zm_eventstream.h
index a6ca99aee..dc1b60dea 100644
--- a/src/zm_eventstream.h
+++ b/src/zm_eventstream.h
@@ -95,6 +95,7 @@ class EventStream : public StreamBase {
   public:
     EventStream() {
       mode = DEFAULT_MODE;
+    replay_rate = DEFAULT_RATE;
 
       forceEventChange = false;
 

From df3e11d83c39029ec3d1f23f5b963cb9cf339362 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 26 Feb 2019 17:01:45 -0500
Subject: [PATCH 023/214] Fix authentication in api because we no longer store
 the user object in the session

---
 web/api/app/Controller/AppController.php  |  1 -
 web/api/app/Controller/HostController.php |  7 +++----
 web/api/app/Model/Event.php               |  4 ++--
 web/includes/auth.php                     | 13 +++++++------
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/web/api/app/Controller/AppController.php b/web/api/app/Controller/AppController.php
index 9dd27e945..51575f055 100644
--- a/web/api/app/Controller/AppController.php
+++ b/web/api/app/Controller/AppController.php
@@ -67,7 +67,6 @@ class AppController extends Controller {
 
     # For use throughout the app. If not logged in, this will be null.
     global $user;
-    $user = $this->Session->read('user');
     
     if ( ZM_OPT_USE_AUTH ) {
       require_once __DIR__ .'/../../../includes/auth.php';
diff --git a/web/api/app/Controller/HostController.php b/web/api/app/Controller/HostController.php
index 74ea854a4..e06ca2293 100644
--- a/web/api/app/Controller/HostController.php
+++ b/web/api/app/Controller/HostController.php
@@ -48,8 +48,7 @@ class HostController extends AppController {
 
   // clears out session
   function logout() {
-    global $user;
-    $this->Session->Write('user', null);
+    userLogout();
 
     $this->set(array(
       'result' => 'ok',
@@ -67,7 +66,7 @@ class HostController extends AppController {
     if ( $isZmAuth ) {
     // In future, we may want to completely move to AUTH_HASH_LOGINS and return &auth= for all cases
       require_once __DIR__ .'/../../../includes/auth.php'; # in the event we directly call getCredentials.json
-      $this->Session->read('user'); # this is needed for command line/curl to recognize a session
+
       $zmAuthRelay = $this->Config->find('first',array('conditions' => array('Config.' . $this->Config->primaryKey => 'ZM_AUTH_RELAY')))['Config']['Value'];
       if ( $zmAuthRelay == 'hashed' ) {
         $zmAuthHashIps = $this->Config->find('first',array('conditions' => array('Config.' . $this->Config->primaryKey => 'ZM_AUTH_HASH_IPS')))['Config']['Value'];
@@ -75,7 +74,7 @@ class HostController extends AppController {
         $credentials = 'auth='.generateAuthHash($zmAuthHashIps,true);
       } else {
         // user will need to append the store password here
-        $credentials = 'user='.$this->Session->read('user.Username').'&pass=';
+        $credentials = 'user='.$this->Session->read('Username').'&pass=';
         $appendPassword = 1;
       }
     }
diff --git a/web/api/app/Model/Event.php b/web/api/app/Model/Event.php
index 4e0ec96b9..ecd08a1e6 100644
--- a/web/api/app/Model/Event.php
+++ b/web/api/app/Model/Event.php
@@ -126,10 +126,10 @@ class Event extends AppModel {
       if ( file_exists($storage['Storage']['Path'].'/'.$this->Relative_Path().'/'.$event['DefaultVideo']) ) {
         return 1;
       } else {
-        Logger::Debug("FIle does not exist at " . $storage['Storage']['Path'].'/'.$this->Relative_Path().'/'.$event['DefaultVideo'] );
+        ZM\Logger::Debug("FIle does not exist at " . $storage['Storage']['Path'].'/'.$this->Relative_Path().'/'.$event['DefaultVideo'] );
       }
     } else {
-Logger::Debug("No DefaultVideo in Event" . $this->Event);
+      ZM\Logger::Debug("No DefaultVideo in Event" . $this->Event);
       return 0;
     }
   } // end function fileExists($event)
diff --git a/web/includes/auth.php b/web/includes/auth.php
index c16a1e7b8..c1f6fb6a8 100644
--- a/web/includes/auth.php
+++ b/web/includes/auth.php
@@ -205,19 +205,20 @@ function canEdit($area, $mid=false) {
   return ( $user[$area] == 'Edit' && ( !$mid || visibleMonitor($mid) ));
 }
 
+global $user;
 if ( ZM_OPT_USE_AUTH ) {
-  if ( isset($_SESSION['username']) ) {
-    # Need to refresh permissions and validate that the user still exists
-    $sql = 'SELECT * FROM Users WHERE Enabled=1 AND Username=?';
-    $user = dbFetchOne($sql, NULL, array($_SESSION['username']));
-  }
-
   $close_session = 0;
   if ( !is_session_started() ) {
     session_start();
     $close_session = 1;
   }
 
+  if ( isset($_SESSION['username']) ) {
+    # Need to refresh permissions and validate that the user still exists
+    $sql = 'SELECT * FROM Users WHERE Enabled=1 AND Username=?';
+    $user = dbFetchOne($sql, NULL, array($_SESSION['username']));
+  }
+
   if ( ZM_AUTH_RELAY == 'plain' ) {
     // Need to save this in session
     $_SESSION['password'] = $password;

From 4c35f2910c97c7f88afbd9dd27ec53a363addb1c Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 26 Feb 2019 18:09:18 -0500
Subject: [PATCH 024/214] fix ZM namespace

---
 web/api/app/Controller/HostController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/api/app/Controller/HostController.php b/web/api/app/Controller/HostController.php
index e06ca2293..05b2ed3fa 100644
--- a/web/api/app/Controller/HostController.php
+++ b/web/api/app/Controller/HostController.php
@@ -117,7 +117,7 @@ class HostController extends AppController {
 
     if ( $mid ) {
       // Get disk usage for $mid
-      Logger::Debug("Executing du -s0 $zm_dir_events/$mid | awk '{print $1}'");
+      ZM\Logger::Debug("Executing du -s0 $zm_dir_events/$mid | awk '{print $1}'");
       $usage = shell_exec("du -s0 $zm_dir_events/$mid | awk '{print $1}'");
     } else {
       $monitors = $this->Monitor->find('all', array(

From 053289c4a0e6552d5770588a8b78ea9ab4597057 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 27 Feb 2019 09:27:50 -0500
Subject: [PATCH 025/214] rename eventserver to eventnotification

---
 db/zm_create.sql.in     |  1 +
 db/zm_update-1.33.3.sql | 12 ++++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 db/zm_update-1.33.3.sql

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index c4a592897..ea0b42288 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -572,6 +572,7 @@ CREATE TABLE `Servers` (
   `zmstats`  BOOLEAN NOT NULL DEFAULT FALSE,
   `zmaudit`  BOOLEAN NOT NULL DEFAULT FALSE,
   `zmtrigger`  BOOLEAN NOT NULL DEFAULT FALSE,
+  `zmeventnotification`  BOOLEAN NOT NULL DEFAULT FALSE,
   PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
diff --git a/db/zm_update-1.33.3.sql b/db/zm_update-1.33.3.sql
new file mode 100644
index 000000000..5488f809d
--- /dev/null
+++ b/db/zm_update-1.33.3.sql
@@ -0,0 +1,12 @@
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+      AND table_name = 'Servers'
+      AND column_name = 'zmeventnotification'
+    ) > 0,
+    "SELECT 'Column zmeventnotification already exists in Servers'",
+    "ALTER TABLE Servers ADD `zmeventnotification` BOOLEAN NOT NULL DEFAULT FALSE AFTER `zmtrigger`"
+    ));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;

From 849442502c04a90e089f7922d71c9cd168f16eb6 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 27 Feb 2019 09:28:15 -0500
Subject: [PATCH 026/214] add support for server based zmeventnotification

---
 scripts/zmpkg.pl.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/zmpkg.pl.in b/scripts/zmpkg.pl.in
index 167943952..eaa772045 100644
--- a/scripts/zmpkg.pl.in
+++ b/scripts/zmpkg.pl.in
@@ -277,7 +277,11 @@ if ( $command =~ /^(?:start|restart)$/ ) {
       runCommand('zmdc.pl start zmtelemetry.pl');
     }
     if ($Config{ZM_OPT_USE_EVENTNOTIFICATION} ) {
+      if ( $Server and exists $$Server{'zmeventnotification'} and ! $$Server{'zmeventnotification'} ) {
+        Debug("Not running zmnotification.pl because it is turned off for this server.");
+      } else {
         runCommand('zmdc.pl start zmeventnotification.pl');
+      }
     }
     if ( $Server and exists $$Server{'zmstats'} and ! $$Server{'zmstats'} ) {
       Debug("Not running zmstats.pl because it is turned off for this server.");

From c0ae7820bb88a0f1596214317663a3cbc9cb16ca Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 27 Feb 2019 09:28:36 -0500
Subject: [PATCH 027/214] add zmeventnotification to Server object

---
 web/includes/Server.php | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/web/includes/Server.php b/web/includes/Server.php
index 96d07e9c1..535ea44ed 100644
--- a/web/includes/Server.php
+++ b/web/includes/Server.php
@@ -7,17 +7,18 @@ $server_cache = array();
 
 class Server {
   private $defaults = array(
-    'Id'          => null,
-    'Name'        => '',
-    'Protocol'    => '',
-    'Hostname'    => '',
-    'Port'        => null,
-    'PathToIndex' => null,
-    'PathToZMS'   => ZM_PATH_ZMS,
-    'PathToApi'   => '/zm/api',
-    'zmaudit'     => 1,
-    'zmstats'     => 1,
-    'zmtrigger'   => 0,
+    'Id'                   => null,
+    'Name'                 => '',
+    'Protocol'             => '',
+    'Hostname'             => '',
+    'Port'                 => null,
+    'PathToIndex'          => null,
+    'PathToZMS'            => ZM_PATH_ZMS,
+    'PathToApi'            => '/zm/api',
+    'zmaudit'              => 1,
+    'zmstats'              => 1,
+    'zmtrigger'            => 0,
+    'zmeventnotification'  => 0,
   );
 
   public function __construct($IdOrRow = NULL) {

From a7ca75758b892affaa80edbd501e5616e06ee6b7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 27 Feb 2019 09:29:00 -0500
Subject: [PATCH 028/214] add Event Notification label

---
 web/lang/en_gb.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index 721a86253..8c65872c6 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -661,6 +661,7 @@ $SLANG = array(
     'RunState'              => 'Run State',
     'RunStats'              => 'Run Stats Process',
     'RunTrigger'            => 'Run Trigger Process',
+    'RunEventNotification'  => 'Run Event Notification Process',
     'SaveAs'                => 'Save as',
     'SaveFilter'            => 'Save Filter',
     'SaveJPEGs'             => 'Save JPEGs',

From 804c384b4c033c724fff4e75224617f3613ec841 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 27 Feb 2019 09:29:11 -0500
Subject: [PATCH 029/214] add Event Notification support to server

---
 web/skins/classic/views/options.php | 2 ++
 web/skins/classic/views/server.php  | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php
index 3078029d5..6de1ab6d1 100644
--- a/web/skins/classic/views/options.php
+++ b/web/skins/classic/views/options.php
@@ -224,6 +224,7 @@ foreach ( array_map('basename', glob('skins/'.$current_skin.'/css/*',GLOB_ONLYDI
               <th class="colStats"><?php echo translate('RunStats') ?></th>
               <th class="colAudit"><?php echo translate('RunAudit') ?></th>
               <th class="colTrigger"><?php echo translate('RunTrigger') ?></th>
+              <th class="colEventNotification"><?php echo translate('RunEventNotification') ?></th>
               <th class="colMark"><?php echo translate('Mark') ?></th>
 			</tr>
           </thead>
@@ -255,6 +256,7 @@ foreach ( array_map('basename', glob('skins/'.$current_skin.'/css/*',GLOB_ONLYDI
               <td class="colStats"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', $Server->zmstats() ? 'yes' : 'no', $canEdit) ?></td>
               <td class="colAudit"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', $Server->zmaudit() ? 'yes' : 'no', $canEdit) ?></td>
               <td class="colTrigger"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', $Server->zmtrigger() ? 'yes' : 'no', $canEdit) ?></td>
+              <td class="colEventNotification"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', $Server->zmeventserver() ? 'yes' : 'no', $canEdit) ?></td>
 
               <td class="colMark"><input type="checkbox" name="markIds[]" value="<?php echo $Server->Id() ?>" data-on-click-this="configureDeleteButton"<?php if ( !$canEdit ) { ?> disabled="disabled"<?php } ?>/></td>
 			</tr>
diff --git a/web/skins/classic/views/server.php b/web/skins/classic/views/server.php
index 67e15d71a..cd6767f4d 100644
--- a/web/skins/classic/views/server.php
+++ b/web/skins/classic/views/server.php
@@ -94,6 +94,13 @@ xhtmlHeaders(__FILE__, translate('Server').' - '.$Server->Name());
                 <input type="radio" name="newServer[zmtrigger]" value="0"<?php echo $Server->zmtrigger() ? '' : ' checked="checked"' ?>/> No
               </td>
             </tr>
+            <tr>
+              <th scope="row"><?php echo translate('RunEventNotification') ?></th>
+              <td>
+                <input type="radio" name="newServer[zmeventnotification]" value="1"<?php echo $Server->zmeventnotification() ? ' checked="checked"' : '' ?>/> Yes
+                <input type="radio" name="newServer[zmeventnotification]" value="0"<?php echo $Server->zmeventnotification() ? '' : ' checked="checked"' ?>/> No
+              </td>
+            </tr>
           </tbody>
         </table>
         <div id="contentButtons">

From 92ded81e2626c088e9d2707bb68042e59c963f62 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 27 Feb 2019 09:29:27 -0500
Subject: [PATCH 030/214] bump version

---
 version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version b/version
index 80c8c0bd3..c7f962f33 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.33.2
+1.33.3

From 6e4444099b64277783e10162da17cfe079b9d9a4 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 27 Feb 2019 09:57:50 -0500
Subject: [PATCH 031/214] Only populate session with user info on successful
 login.  Use parameters in sql when loading users in getAuthUser.  Fixes #2542

---
 web/includes/auth.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/web/includes/auth.php b/web/includes/auth.php
index c1f6fb6a8..5ce960388 100644
--- a/web/includes/auth.php
+++ b/web/includes/auth.php
@@ -82,11 +82,6 @@ function userLogin($username='', $password='', $passwordHashed=false) {
     session_start();
     $close_session = 1;
   }
-  $_SESSION['username'] = $username;
-  if ( ZM_AUTH_RELAY == 'plain' ) {
-    // Need to save this in session
-    $_SESSION['password'] = $password;
-  }
   $_SESSION['remoteAddr'] = $_SERVER['REMOTE_ADDR']; // To help prevent session hijacking
   if ( $dbUser = dbFetchOne($sql, NULL, $sql_values) ) {
     ZM\Info("Login successful for user \"$username\"");
@@ -95,6 +90,11 @@ function userLogin($username='', $password='', $passwordHashed=false) {
     if ( ZM_AUTH_TYPE == 'builtin' ) {
       $_SESSION['passwordHash'] = $user['Password'];
     }
+    $_SESSION['username'] = $user['Username'];
+    if ( ZM_AUTH_RELAY == 'plain' ) {
+      // Need to save this in session, can't use the value in User because it is hashed
+      $_SESSION['password'] = $_REQUEST['password'];
+    }
     zm_session_regenerate_id();
   } else {
     ZM\Warning("Login denied for user \"$username\"");
@@ -124,17 +124,19 @@ function getAuthUser($auth) {
       }
     }
 
+    $values = array();
     if ( isset($_SESSION['username']) ) {
       # Most of the time we will be logged in already and the session will have our username, so we can significantly speed up our hash testing by only looking at our user.
       # Only really important if you have a lot of users.
-      $sql = "SELECT * FROM Users WHERE Enabled = 1 AND Username='".$_SESSION['username']."'";
+      $sql = 'SELECT * FROM Users WHERE Enabled = 1 AND Username=?';
+      array_push($values, $_SESSION['username']);
     } else {
       $sql = 'SELECT * FROM Users WHERE Enabled = 1';
     }
 
-    foreach ( dbFetchAll($sql) as $user ) {
+    foreach ( dbFetchAll($sql, NULL, $values) as $user ) {
       $now = time();
-      for ( $i = 0; $i < ZM_AUTH_HASH_TTL; $i++, $now -= (3600) ) { // Try for last two hours
+      for ( $i = 0; $i < ZM_AUTH_HASH_TTL; $i++, $now -= ZM_AUTH_HASH_TTL * 1800 ) { // Try for last two hours
         $time = localtime($now);
         $authKey = ZM_AUTH_HASH_SECRET.$user['Username'].$user['Password'].$remoteAddr.$time[2].$time[3].$time[4].$time[5];
         $authHash = md5($authKey);

From a1f1c19c0f146b21456742c2593b7bae6f940fb7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 27 Feb 2019 11:07:52 -0500
Subject: [PATCH 032/214] fix missing ZM namepsace

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

diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index 6b1187a5f..201bebe21 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -376,7 +376,7 @@ if ($reload == 'reload') ob_start();
     return '<span class="'.$class.'" title="'.$title.'">'.$S->Name() . ': ' . $S->disk_usage_percent().'%' . '</span>'; };
   #$func =  function($S){ return '<span title="">'.$S->Name() . ': ' . $S->disk_usage_percent().'%' . '</span>'; };
   if ( count($storage_areas) >= 4 ) 
-    $storage_areas = Storage::find( array('ServerId'=>null) );
+    $storage_areas = ZM\Storage::find( array('ServerId'=>null) );
   if ( count($storage_areas) < 4 )
     echo implode( ', ', array_map ( $func, $storage_areas ) );
   echo ' ' . ZM_PATH_MAP .': '. getDiskPercent(ZM_PATH_MAP).'%';

From 20fe502ca4b9ca8471d75bfe723781bef958f28a Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 27 Feb 2019 12:02:40 -0500
Subject: [PATCH 033/214] Add ZM to ErrorHandler. Spacing and quotes

---
 web/includes/logger.php | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/web/includes/logger.php b/web/includes/logger.php
index 1e37f708e..3aa8f891b 100644
--- a/web/includes/logger.php
+++ b/web/includes/logger.php
@@ -16,9 +16,9 @@ class Logger {
 
   private $initialised = false;
 
-  private $id = "web";
-  private $idRoot = "web";
-  private $idArgs = "";
+  private $id = 'web';
+  private $idRoot = 'web';
+  private $idArgs = '';
   private $useErrorLog = true;
 
   private $level = self::INFO;
@@ -32,17 +32,17 @@ class Logger {
   private $hasTerm = false;
 
   private $logPath = ZM_PATH_LOGS;
-  private $logFile = "";
+  private $logFile = '';
   private $logFd = NULL;
 
   public static $codes = array(
-    self::DEBUG => "DBG",
-    self::INFO => "INF",
-    self::WARNING => "WAR",
-    self::ERROR => "ERR",
-    self::FATAL => "FAT",
-    self::PANIC => "PNC",
-    self::NOLOG => "OFF",
+    self::DEBUG => 'DBG',
+    self::INFO => 'INF',
+    self::WARNING => 'WAR',
+    self::ERROR => 'ERR',
+    self::FATAL => 'FAT',
+    self::PANIC => 'PNC',
+    self::NOLOG => 'OFF',
   );
   private static $syslogPriorities = array(
     self::DEBUG   => LOG_DEBUG,
@@ -63,7 +63,7 @@ class Logger {
 
   private function __construct() {
     $this->hasTerm = (php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR']));
-    $this->logFile = $this->logPath."/".$this->id.".log";
+    $this->logFile = $this->logPath.'/'.$this->id.'.log';
   }
 
   public function __destruct() {
@@ -78,12 +78,12 @@ class Logger {
     //$this->useErrorLog = $options['useErrorLog'];
     if ( isset($options['logPath']) ) {
       $this->logPath = $options['logPath'];
-      $tempLogFile = $this->logPath."/".$this->id.".log";
+      $tempLogFile = $this->logPath.'/'.$this->id.'.log';
     }
     if ( isset($options['logFile']) )
       $tempLogFile = $options['logFile'];
     else
-      $tempLogFile = $this->logPath."/".$this->id.".log";
+      $tempLogFile = $this->logPath.'/'.$this->id.'.log';
     if ( !is_null($logFile = $this->getTargettedEnv('LOG_FILE')) )
       $tempLogFile = $logFile;
 
@@ -177,10 +177,10 @@ class Logger {
   }
 
   private function getTargettedEnv( $name ) {
-    $envName = $name."_".$this->id;
+    $envName = $name.'_'.$this->id;
     $value = getenv( $envName );
     if ( $value === false && $this->id != $this->idRoot )
-      $value = getenv( $name."_".$this->idRoot );
+      $value = getenv( $name.'_'.$this->idRoot );
     if ( $value === false )
       $value = getenv( $name );
     return( $value !== false ? $value : NULL );
@@ -269,7 +269,7 @@ class Logger {
         if ( $this->databaseLevel > self::NOLOG ) {
           if ( (include_once 'database.php') === FALSE ) {
             $this->databaseLevel = self::NOLOG;
-            Warning( "Unable to write log entries to DB, database.php not found" );
+            Warning( 'Unable to write log entries to DB, database.php not found' );
           }
         }
       }
@@ -424,7 +424,7 @@ class Logger {
 function logInit( $options=array() ) {
   $logger = Logger::fetch();
   $logger->initialise( $options );
-  set_error_handler( 'ErrorHandler' );
+  set_error_handler( 'ZM\ErrorHandler' );
 }
 
 function logToDatabase( $level=NULL ) {
@@ -487,7 +487,7 @@ function Panic( $string ) {
 function ErrorHandler( $error, $string, $file, $line ) {
   if ( ! (error_reporting() & $error) ) {
     // This error code is not included in error_reporting
-    return( false );
+    return false;
   }
 
   switch ( $error ) {
@@ -507,7 +507,7 @@ function ErrorHandler( $error, $string, $file, $line ) {
     Panic( "Unknown error type: [$error] $string" );
     break;
   }
-  return( true );
+  return true;
 }
 
 ?>

From 2d75ab50af3521df1f0ed3fff5890bbea5021477 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 28 Feb 2019 16:12:34 -0500
Subject: [PATCH 034/214] Implement deleting from Logs based on line count
 instead of interval

---
 web/skins/classic/includes/functions.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index 201bebe21..37209b7d0 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -267,8 +267,19 @@ function getNavBarHTML($reload = null) {
 <?php
   if ( ZM\logToDatabase() > ZM\Logger::NOLOG ) { 
     if ( ! ZM_RUN_AUDIT ) {
-    # zmaudit can clean the logs, but if we aren't running it, then we should clecan them regularly
-     dbQuery('DELETE FROM Logs WHERE TimeKey < unix_timestamp( NOW() - interval '.ZM_LOG_DATABASE_LIMIT.') LIMIT 100');
+     # zmaudit can clean the logs, but if we aren't running it, then we should clean them regularly
+      if ( preg_match('/^\d+$/', ZM_LOG_DATABASE_LIMIT) ) {
+        # Number of lines, instead of an interval
+        $rows = dbFetchOne('SELECT Count(*) AS Rows FROM Logs', 'Rows' );
+        if ( $rows > ZM_LOG_DATABASE_LIMIT ) {
+          dbQuery('DELETE low_priority FROM Logs ORDER BY TimeKey ASC LIMIT ?', array($rows - ZM_LOG_DATABASE_LIMIT));
+        }
+      } else if ( preg_match('/^\d\s*(hour|minute|day|week|month|year)$/', ZM_LOG_DATABASE_LIMIT, $matches) ) {
+      ZM\Logger::Debug("have interval ".$matches[1]);
+        dbQuery('DELETE FROM Logs WHERE TimeKey < unix_timestamp( NOW() - interval '.ZM_LOG_DATABASE_LIMIT.') LIMIT 100');
+      } else {
+        ZM\Error('Potentially invalid value for ZM_LOG_DATABASE_LIMIT: ' . ZM_LOG_DATABASE_LIMIT);
+      }
     }
     echo makePopupLink( '?view=log', 'zmLog', 'log', '<span class="'.logState().'">'.translate('Log').'</span>' );
   }

From 1828ea2d6ffc25d3a398b7fefd4db5e0a27fe8bf Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@www4.internal.point-one.com>
Date: Fri, 1 Mar 2019 10:26:55 -0500
Subject: [PATCH 035/214] small cleanup of zmstats

---
 scripts/zmstats.pl.in | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/scripts/zmstats.pl.in b/scripts/zmstats.pl.in
index 410459158..ba6d8302a 100644
--- a/scripts/zmstats.pl.in
+++ b/scripts/zmstats.pl.in
@@ -18,9 +18,7 @@ use constant START_DELAY => 30; # To give everything else time to start
 
 @EXTRA_PERL_LIB@
 use ZoneMinder;
-use POSIX;
 use DBI;
-use autouse 'Data::Dumper'=>qw(Dumper);
 
 $| = 1;
 
@@ -31,15 +29,15 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 logInit();
 logSetSignal();
 
-Info("Stats Daemon starting in ".START_DELAY." seconds");
+Info('Stats Daemon starting in '.START_DELAY.' seconds');
 sleep(START_DELAY);
 
 my $dbh = zmDbConnect();
 
 while( 1 ) {
   while ( ! ( $dbh and $dbh->ping() ) ) {
-    Info("Reconnecting to db");
-    if ( ! ( $dbh = zmDbConnect() ) ) {
+    Info('Reconnecting to db');
+    if ( !($dbh = zmDbConnect()) ) {
       #What we do here is not that important, so just skip this interval
       sleep($Config{ZM_STATS_UPDATE_INTERVAL});
     }
@@ -53,7 +51,7 @@ while( 1 ) {
   sleep($Config{ZM_STATS_UPDATE_INTERVAL});
 } # end while (1)
 
-Info("Stats Daemon exiting");
+Info('Stats Daemon exiting');
 exit();
 1;
 __END__

From 016fda22ce865df9fc36d56dc1b0256daa5e68b7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@www4.internal.point-one.com>
Date: Fri, 1 Mar 2019 12:31:41 -0500
Subject: [PATCH 036/214] reduce duplicated db code from Config.  Use fully
 namespace'd variables so we can use require instead of use

---
 .../ZoneMinder/lib/ZoneMinder/Config.pm.in    | 93 ++++++++-----------
 .../lib/ZoneMinder/ConfigData.pm.in           |  2 +-
 scripts/ZoneMinder/lib/ZoneMinder/Database.pm | 23 ++---
 scripts/ZoneMinder/lib/ZoneMinder/Logger.pm   | 30 +++---
 4 files changed, 65 insertions(+), 83 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
index 3fdeb722c..10e4b4733 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
@@ -30,6 +30,7 @@ use warnings;
 
 require Exporter;
 require ZoneMinder::Base;
+
 use ZoneMinder::ConfigData qw(:all);
 
 our @ISA = qw(Exporter ZoneMinder::Base);
@@ -57,20 +58,22 @@ our %EXPORT_TAGS = (
 push( @{$EXPORT_TAGS{config}}, @EXPORT_CONFIG );
 push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
 
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+our @EXPORT_OK = @{ $EXPORT_TAGS{all} };
 
 our @EXPORT = qw();
 
 our $VERSION = $ZoneMinder::Base::VERSION;
 
-use constant ZM_PID => "@ZM_PID@"; # Path to the ZoneMinder run pid file
-use constant ZM_CONFIG => "@ZM_CONFIG@"; # Path to the ZoneMinder config file
-use constant ZM_CONFIG_SUBDIR => "@ZM_CONFIG_SUBDIR@"; # Path to the ZoneMinder config subfolder
+use constant ZM_PID => '@ZM_PID@'; # Path to the ZoneMinder run pid file
+use constant ZM_CONFIG => '@ZM_CONFIG@'; # Path to the ZoneMinder config file
+use constant ZM_CONFIG_SUBDIR => '@ZM_CONFIG_SUBDIR@'; # Path to the ZoneMinder config subfolder
 
 use Carp;
+require ZoneMinder::Database;
 
 # Load the config from the database into the symbol table
 BEGIN {
+require ZoneMinder::Database;
 
   # Process name, value pairs from the main config file first
   my $config_file = ZM_CONFIG;
@@ -78,52 +81,25 @@ BEGIN {
 
   # Search for user created config files. If one or more are found then
   # update the Config hash with those values
-  if ( -d ZM_CONFIG_SUBDIR ) {
+  if ( ZM_CONFIG_SUBDIR and -d ZM_CONFIG_SUBDIR ) {
     if ( -R ZM_CONFIG_SUBDIR ) {
-      foreach my $filename ( glob ZM_CONFIG_SUBDIR."/*.conf" ) {
+      foreach my $filename ( glob ZM_CONFIG_SUBDIR.'/*.conf' ) {
         process_configfile($filename);
       }
     } else {
-      print( STDERR "WARNING: ZoneMinder configuration subfolder found but is not readable. Check folder permissions on ".ZM_CONFIG_SUBDIR.".\n" );
+      print( STDERR 'WARNING: ZoneMinder configuration subfolder found but is not readable. Check folder permissions on '.ZM_CONFIG_SUBDIR.".\n" );
     }
   }
 
-  use DBI;
-  my $socket;
-  my ( $host, $portOrSocket ) = ( $Config{ZM_DB_HOST} =~ /^([^:]+)(?::(.+))?$/ );
-
-  if ( defined($portOrSocket) ) {
-    if ( $portOrSocket =~ /^\// ) {
-      $socket = ';mysql_socket='.$portOrSocket;
-    } else {
-      $socket = ';host='.$host.';port='.$portOrSocket;
-    }
-  } else {
-    $socket = ';host='.$Config{ZM_DB_HOST}; 
-  }
-  my $sslOptions = '';
-  if ( $Config{ZM_DB_SSL_CA_CERT} ) {
-    $sslOptions = ';'.join(';',
-        "mysql_ssl=1",
-        "mysql_ssl_ca_file=".$Config{ZM_DB_SSL_CA_CERT},
-        "mysql_ssl_client_key=".$Config{ZM_DB_SSL_CLIENT_KEY},
-        "mysql_ssl_client_cert=".$Config{ZM_DB_SSL_CLIENT_CERT}
-        );
-  }
-  my $dbh = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}
-      .$socket.$sslOptions
-      , $Config{ZM_DB_USER}
-      , $Config{ZM_DB_PASS}
-      ) or croak( "Can't connect to db" );
+	my $dbh = ZoneMinder::Database::zmDbConnect();
   my $sql = 'SELECT Name,Value FROM Config';
-  my $sth = $dbh->prepare_cached( $sql ) or croak( "Can't prepare '$sql': ".$dbh->errstr() );
-  my $res = $sth->execute() or croak( "Can't execute: ".$sth->errstr() );
+  my $sth = $dbh->prepare_cached($sql) or croak("Can't prepare '$sql': ".$dbh->errstr());
+  my $res = $sth->execute() or croak("Can't execute: ".$sth->errstr());
   while( my $config = $sth->fetchrow_hashref() ) {
     $Config{$config->{Name}} = $config->{Value};
   }
   $sth->finish();
-#$dbh->disconnect();
-  #
+  
   if ( ! $Config{ZM_SERVER_ID} ) {
     $Config{ZM_SERVER_ID} = undef;
     $sth = $dbh->prepare_cached( 'SELECT * FROM Servers WHERE Name=?' );
@@ -143,25 +119,30 @@ BEGIN {
   sub process_configfile {
     my $config_file = shift;
 
-    if ( -R $config_file ) {
-      open( my $CONFIG, '<', $config_file )
-        or croak( "Can't open config file '$config_file': $!" );
-      foreach my $str ( <$CONFIG> ) {
-        next if ( $str =~ /^\s*$/ );
-        next if ( $str =~ /^\s*#/ );
-        my ( $name, $value ) = $str =~ /^\s*([^=\s]+)\s*=\s*[\'"]*(.*?)[\'"]*\s*$/;
-        if ( ! $name ) {
-          print( STDERR "Warning, bad line in $config_file: $str\n" );
-          next;
-        } # end if
-        $name =~ tr/a-z/A-Z/;
-        $Config{$name} = $value;
-      }
-      close( $CONFIG );
-    } else {
-      print( STDERR "WARNING: ZoneMinder configuration file found but is not readable. Check file permissions on $config_file\n" );
+    if ( ! -R $config_file ) {
+      print(STDERR "WARNING: ZoneMinder configuration file found but is not readable. Check file permissions on $config_file\n");
+      return;
     }
-  }
+    open( my $CONFIG, '<', $config_file )
+      or croak("Can't open config file '$config_file': $!");
+    foreach my $str ( <$CONFIG> ) {
+		  next if ( $str =~ /^\s*$/ );
+      next if ( $str =~ /^\s*#/ );
+      my ( $name, $value ) = $str =~ /^\s*([^=\s]+)\s*=\s*[\'"]*(.*?)[\'"]*\s*$/;
+      if ( !$name ) {
+        print(STDERR "Warning, bad line in $config_file: $str\n");
+        next;
+      } # end if
+      $name =~ tr/a-z/A-Z/;
+      #if ( !$ZoneMinder::ConfigData::options_hash{$name} ) {
+				#print(STDERR "Warning, unknown config option name $name in $config_file\n");
+#} else {
+				#print(STDERR "Warning, known config option name $name in $config_file\n");
+			#}
+			$Config{$name} = $value;
+    } # end foreach config line
+    close($CONFIG);
+  } # end sub process_configfile
 
 } # end BEGIN
 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index cd53d6754..c6ec697f1 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -3952,7 +3952,7 @@ our %options_hash = map { ( $_->{name}, $_ ) } @options;
 # This function should never need to be called explicitly, except if
 # this module is 'require'd rather than 'use'd. See zmconfgen.pl.
 sub initialiseConfig {
-  return if ( $configInitialised );
+  return if $configInitialised;
 
 # Do some initial data munging to finish the data structures
 # Create option ids
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
index 173c0033c..5c6617510 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
@@ -65,7 +65,8 @@ our $VERSION = $ZoneMinder::Base::VERSION;
 # ==========================================================================
 
 use ZoneMinder::Logger qw(:all);
-use ZoneMinder::Config qw(:all);
+
+require ZoneMinder::Config;
 
 our $dbh = undef;
 
@@ -87,25 +88,25 @@ sub zmDbConnect {
         $socket = ';host='.$host.';port='.$portOrSocket;
       }
     } else {
-      $socket = ';host='.$Config{ZM_DB_HOST}; 
+      $socket = ';host='.$ZoneMinder::Config::Config{ZM_DB_HOST}; 
     }
 
     my $sslOptions = '';
-    if ( $Config{ZM_DB_SSL_CA_CERT} ) {
-      $sslOptions = join(';','',
+    if ( $ZoneMinder::Config::Config{ZM_DB_SSL_CA_CERT} ) {
+      $sslOptions = join(';', '',
           'mysql_ssl=1',
-          'mysql_ssl_ca_file='.$Config{ZM_DB_SSL_CA_CERT},
-          'mysql_ssl_client_key='.$Config{ZM_DB_SSL_CLIENT_KEY},
-          'mysql_ssl_client_cert='.$Config{ZM_DB_SSL_CLIENT_CERT}
+          'mysql_ssl_ca_file='.$ZoneMinder::Config::Config{ZM_DB_SSL_CA_CERT},
+          'mysql_ssl_client_key='.$ZoneMinder::Config::Config{ZM_DB_SSL_CLIENT_KEY},
+          'mysql_ssl_client_cert='.$ZoneMinder::Config::Config{ZM_DB_SSL_CLIENT_CERT}
           );
     }
 
     eval {
       $dbh = DBI->connect(
-        'DBI:mysql:database='.$Config{ZM_DB_NAME}
+        'DBI:mysql:database='.$ZoneMinder::Config::Config{ZM_DB_NAME}
         .$socket . $sslOptions . ($options?join(';', '', map { $_.'='.$$options{$_} } keys %{$options} ) : '')
-        , $Config{ZM_DB_USER}
-        , $Config{ZM_DB_PASS}
+        , $ZoneMinder::Config::Config{ZM_DB_USER}
+        , $ZoneMinder::Config::Config{ZM_DB_PASS}
         );
     };
     if ( !$dbh or $@ ) {
@@ -124,7 +125,7 @@ sub zmDbConnect {
 } # end sub zmDbConnect
 
 sub zmDbDisconnect {
-  if ( defined( $dbh ) ) {
+  if ( defined($dbh) ) {
     $dbh->disconnect() or Error('Error disconnecting db? ' . $dbh->errstr());
     $dbh = undef;
   }
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
index 8d18ade09..117f2a1ab 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
@@ -87,7 +87,7 @@ our $VERSION = $ZoneMinder::Base::VERSION;
 #
 # ==========================================================================
 
-use ZoneMinder::Config qw(:all);
+require ZoneMinder::Config;
 
 use DBI;
 use Carp;
@@ -156,7 +156,7 @@ sub new {
   $this->{autoFlush} = 1;
 
   ( $this->{fileName} = $0 ) =~ s|^.*/||;
-  $this->{logPath} = $Config{ZM_PATH_LOGS};
+  $this->{logPath} = $ZoneMinder::Config::Config{ZM_PATH_LOGS};
   $this->{logFile} = $this->{logPath}.'/'.$this->{id}.'.log';
   ($this->{logFile}) = $this->{logFile} =~ /^([\w\.\/]+)$/;
 
@@ -169,7 +169,7 @@ sub new {
 sub BEGIN {
 # Fake the config variables that are used in case they are not defined yet
 # Only really necessary to support upgrade from previous version
-  if ( !eval('defined($Config{ZM_LOG_DEBUG})') ) {
+  if ( !eval('defined($ZoneMinder::Config::Config{ZM_LOG_DEBUG})') ) {
     no strict 'subs';
     no strict 'refs';
     my %dbgConfig = (
@@ -221,17 +221,17 @@ sub initialise( @ ) {
   if ( defined($options{databaseLevel}) ) {
     $tempDatabaseLevel = $options{databaseLevel};
   } else {
-    $tempDatabaseLevel = $Config{ZM_LOG_LEVEL_DATABASE};
+    $tempDatabaseLevel = $ZoneMinder::Config::Config{ZM_LOG_LEVEL_DATABASE};
   }
   if ( defined($options{fileLevel}) ) {
     $tempFileLevel = $options{fileLevel};
   } else {
-    $tempFileLevel = $Config{ZM_LOG_LEVEL_FILE};
+    $tempFileLevel = $ZoneMinder::Config::Config{ZM_LOG_LEVEL_FILE};
   }
   if ( defined($options{syslogLevel}) ) {
     $tempSyslogLevel = $options{syslogLevel};
   } else {
-    $tempSyslogLevel = $Config{ZM_LOG_LEVEL_SYSLOG};
+    $tempSyslogLevel = $ZoneMinder::Config::Config{ZM_LOG_LEVEL_SYSLOG};
   }
 
   if ( defined($ENV{LOG_PRINT}) ) {
@@ -245,19 +245,19 @@ sub initialise( @ ) {
   $tempFileLevel = $level if defined($level = $this->getTargettedEnv('LOG_LEVEL_FILE'));
   $tempSyslogLevel = $level if defined($level = $this->getTargettedEnv('LOG_LEVEL_SYSLOG'));
 
-  if ( $Config{ZM_LOG_DEBUG} ) {
+  if ( $ZoneMinder::Config::Config{ZM_LOG_DEBUG} ) {
     # Splitting on an empty string doesn't return an empty string, it returns an empty array
-    foreach my $target ( $Config{ZM_LOG_DEBUG_TARGET} ? split(/\|/, $Config{ZM_LOG_DEBUG_TARGET}) : '' ) {
+    foreach my $target ( $ZoneMinder::Config::Config{ZM_LOG_DEBUG_TARGET} ? split(/\|/, $ZoneMinder::Config::Config{ZM_LOG_DEBUG_TARGET}) : '' ) {
       if ( $target eq $this->{id}
           || $target eq '_'.$this->{id}
           || $target eq $this->{idRoot}
           || $target eq '_'.$this->{idRoot}
           || $target eq ''
          ) {
-        if ( $Config{ZM_LOG_DEBUG_LEVEL} > NOLOG ) {
-          $tempLevel = $this->limit( $Config{ZM_LOG_DEBUG_LEVEL} );
-          if ( $Config{ZM_LOG_DEBUG_FILE} ne '' ) {
-            $tempLogFile = $Config{ZM_LOG_DEBUG_FILE};
+        if ( $ZoneMinder::Config::Config{ZM_LOG_DEBUG_LEVEL} > NOLOG ) {
+          $tempLevel = $this->limit( $ZoneMinder::Config::Config{ZM_LOG_DEBUG_LEVEL} );
+          if ( $ZoneMinder::Config::Config{ZM_LOG_DEBUG_FILE} ne '' ) {
+            $tempLogFile = $ZoneMinder::Config::Config{ZM_LOG_DEBUG_FILE};
             $tempFileLevel = $tempLevel;
           }
         }
@@ -501,8 +501,8 @@ sub openFile {
   if ( open($LOGFILE, '>>', $this->{logFile}) ) {
     $LOGFILE->autoflush() if $this->{autoFlush};
 
-    my $webUid = (getpwnam($Config{ZM_WEB_USER}))[2];
-    my $webGid = (getgrnam($Config{ZM_WEB_GROUP}))[2];
+    my $webUid = (getpwnam($ZoneMinder::Config::Config{ZM_WEB_USER}))[2];
+    my $webGid = (getgrnam($ZoneMinder::Config::Config{ZM_WEB_GROUP}))[2];
     if ( $> == 0 ) {
       chown( $webUid, $webGid, $this->{logFile} )
         or Fatal("Can't change permissions on log file $$this{logFile}: $!");
@@ -577,7 +577,7 @@ sub logPrint {
       my $res = $this->{sth}->execute(
         $seconds+($microseconds/1000000.0),
            $this->{id},
-           ($Config{ZM_SERVER_ID} ? $Config{ZM_SERVER_ID} : undef),
+           ($ZoneMinder::Config::Config{ZM_SERVER_ID} ? $ZoneMinder::Config::Config{ZM_SERVER_ID} : undef),
            $$,
            $level,
            $codes{$level},

From 675b4975b0fd9fadf1e83ae3e32340efb0aa1efc Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 1 Mar 2019 13:37:34 -0500
Subject: [PATCH 037/214] Fix control presets

---
 web/includes/actions/control.php                 | 5 +++--
 web/skins/classic/includes/control_functions.php | 6 +++---
 web/skins/classic/views/controlpreset.php        | 8 ++++----
 web/skins/classic/views/js/watch.js              | 1 -
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/web/includes/actions/control.php b/web/includes/actions/control.php
index 36f6b14fb..5dff5a5d2 100644
--- a/web/includes/actions/control.php
+++ b/web/includes/actions/control.php
@@ -28,13 +28,14 @@ if ( ! canView('Control', $_REQUEST['mid']) ) {
   return;
 }
 
-require_once('control_functions.php');
-require_once('Monitor.php');
+require_once('includes/control_functions.php');
+require_once('includes/Monitor.php');
 $mid = validInt($_REQUEST['mid']);
 if ( $action == 'control' ) {
   $monitor = new ZM\Monitor($mid);
 
   $ctrlCommand = buildControlCommand($monitor);
   sendControlCommand($monitor->Id(), $ctrlCommand);
+  $view = 'none';
 }
 ?>
diff --git a/web/skins/classic/includes/control_functions.php b/web/skins/classic/includes/control_functions.php
index 41d4053c5..b2a42a1d4 100644
--- a/web/skins/classic/includes/control_functions.php
+++ b/web/skins/classic/includes/control_functions.php
@@ -252,7 +252,7 @@ function controlPresets( $monitor, $cmds ) {
   global $SLANG;
 
   // MAX_PRESETS IS PER LINE
-  define( "MAX_PRESETS", "12" );
+  define( 'MAX_PRESETS', '12' );
 
   $sql = 'SELECT * FROM ControlPresets WHERE MonitorId = ?';
   $labels = array();
@@ -282,12 +282,12 @@ function controlPresets( $monitor, $cmds ) {
 <?php
   if ( $monitor->HasHomePreset() ) {
 ?>
-    <button type="button" class="ptzTextBtn" value="<?php echo translate('Home') ?>" onclick="controlCmd('<?php echo $cmds['PresetHome'] ?>');"/>
+    <button type="button" class="ptzTextBtn" value="Home" onclick="controlCmd('<?php echo $cmds['PresetHome'] ?>');"><?php echo translate('Home') ?></button>
 <?php
   }
   if ( canEdit('Monitors') && $monitor->CanSetPresets() ) {
 ?>
-    <button type="button" class="ptzTextBtn popup-link" value="<?php echo translate('Set') ?>" data-url="?view=controlpreset&amp;mid=<?php echo $monitor->Id() ?>" data-window-name="zmPreset" data-window-tag="preset"/>
+    <button type="button" class="ptzTextBtn popup-link" value="Set" data-url="?view=controlpreset&amp;mid=<?php echo $monitor->Id() ?>" data-window-name="zmPreset" data-window-tag="preset"><?php echo translate('Set') ?></button>
 <?php
   }
 ?>
diff --git a/web/skins/classic/views/controlpreset.php b/web/skins/classic/views/controlpreset.php
index 1862d071c..9b5af9618 100644
--- a/web/skins/classic/views/controlpreset.php
+++ b/web/skins/classic/views/controlpreset.php
@@ -49,7 +49,7 @@ xhtmlHeaders(__FILE__, translate('SetPreset') );
     </div>
     <div id="content">
       <form name="contentForm" id="contentForm" method="post" action="?">
-        <input type="hidden" name="view" value="none"/>
+        <input type="hidden" name="view" value="control"/>
         <input type="hidden" name="mid" value="<?php echo $monitor['Id'] ?>"/>
         <input type="hidden" name="action" value="control"/>
         <input type="hidden" name="control" value="presetSet"/>
@@ -57,11 +57,11 @@ xhtmlHeaders(__FILE__, translate('SetPreset') );
         <p><?php echo buildSelect('preset', $presets, 'updateLabel()' ) ?></p>
         <p>
           <label for="newLabel"><?php echo translate('NewLabel') ?></label>
-          <input type="text" name="newLabel" id="newLabel" value="" size="16"/>
+          <input type="text" name="newLabel" id="newLabel" value=""/>
         </p>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo translate('Save') ?>"/>
-          <input type="button" value="<?php echo translate('Cancel') ?>" data-on-click="closeWindow"/>
+          <button type="submit" value="Save"><?php echo translate('Save') ?></button>
+          <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index 554b24b00..a0594825b 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -142,7 +142,6 @@ function getStreamCmdFailure(xhr) {
 }
 function getStreamCmdResponse(respObj, respText) {
   watchdogOk("stream");
-  console.log('stream');
   if ( streamCmdTimer ) {
     streamCmdTimer = clearTimeout(streamCmdTimer);
   }

From 520bd4e7a71e179ee1aeafb7aca01ffef8486dfc Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 1 Mar 2019 14:42:05 -0500
Subject: [PATCH 038/214] Add ZM namespace to Logger

---
 web/ajax/log.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/ajax/log.php b/web/ajax/log.php
index e8caff6bd..2fd220578 100644
--- a/web/ajax/log.php
+++ b/web/ajax/log.php
@@ -19,7 +19,7 @@ switch ( $_REQUEST['task'] ) {
       else
         $line = NULL;
 
-      $levels = array_flip(Logger::$codes);
+      $levels = array_flip(ZM\Logger::$codes);
       if ( !isset($levels[$_POST['level']]) )
         ZM\Panic("Unexpected logger level '".$_POST['level']."'");
       $level = $levels[$_POST['level']];
@@ -322,7 +322,7 @@ switch ( $_REQUEST['task'] ) {
         $classLevel = ZM\Logger::FATAL;
       elseif ( $classLevel > ZM\Logger::DEBUG )
         $classLevel = ZM\Logger::DEBUG;
-      $logClass = 'log-'.strtolower(Logger::$codes[$classLevel]);
+      $logClass = 'log-'.strtolower(ZM\Logger::$codes[$classLevel]);
       fprintf( $exportFP, "        <tr class=\"%s\"><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>\n", $logClass, $log['DateTime'], $log['Component'], $log['Server'], $log['Pid'], $log['Code'], $log['Message'], $log['File'], $log['Line'] );
     }
     fwrite( $exportFP, 

From 7703661cb15f6d35defbf6069203aeb21dd4a7df Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 1 Mar 2019 17:25:17 -0500
Subject: [PATCH 039/214] Don't use streaming port in UrlToIndex because
 xmlHttpRequest won't send cookies to a different port

---
 web/includes/Monitor.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index 229d4b3db..848bef12b 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -634,7 +634,8 @@ private $control_fields = array(
   } // end function Source
 
   public function UrlToIndex() {
-    return $this->Server()->UrlToIndex(ZM_MIN_STREAMING_PORT ? (ZM_MIN_STREAMING_PORT+$this->Id()) : null);
+    return $this->Server()->UrlToIndex();
+    //ZM_MIN_STREAMING_PORT ? (ZM_MIN_STREAMING_PORT+$this->Id()) : null);
   }
 
 } // end class Monitor

From 78513e22fd7589517a36b7b53cf10a0e06254074 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 1 Mar 2019 17:27:08 -0500
Subject: [PATCH 040/214] When doing an OPTIONS just do CORS and exit.  if
 xmlHttpRequest don't do a redirect login.  Do a failed auth header and quit

---
 web/index.php | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/web/index.php b/web/index.php
index a2d50ae00..7a5abb79b 100644
--- a/web/index.php
+++ b/web/index.php
@@ -38,7 +38,7 @@ if ( version_compare(phpversion(), '4.1.0', '<') ) {
 if ( false ) {
   ob_start();
   phpinfo(INFO_VARIABLES);
-  $fp = fopen('/tmp/env.html', 'w');
+  $fp = fopen('/tmp/env.html', 'w+');
   fwrite($fp, ob_get_contents());
   fclose($fp);
   ob_end_clean();
@@ -70,8 +70,15 @@ define('ZM_BASE_PROTOCOL', $protocol);
 // Use relative URL's instead
 define('ZM_BASE_URL', '');
 
-// Verify the system, php, and mysql timezones all match
 require_once('includes/functions.php');
+if ( $_SERVER['REQUEST_METHOD'] == 'OPTIONS' ) {
+  Logger::Debug("OPTIONS Method, only doing CORS");
+  # Add Cross domain access headers
+  CORSHeaders();
+  return;
+}
+
+// Verify the system, php, and mysql timezones all match
 check_timezone();
 
 if ( isset($_GET['skin']) ) {
@@ -187,7 +194,7 @@ isset($view) || $view = NULL;
 isset($request) || $request = NULL;
 isset($action) || $action = NULL;
 
-Logger::Debug("View: $view Request: $request Action: $action");
+Logger::Debug("View: $view Request: $request Action: $action User: " . ( isset($user) ? $user['Username'] : 'none' ));
 if (
   ZM_ENABLE_CSRF_MAGIC &&
   ( $action != 'login' ) &&
@@ -214,6 +221,12 @@ if ( $action ) {
 
 # If I put this here, it protects all views and popups, but it has to go after actions.php because actions.php does the actual logging in.
 if ( ZM_OPT_USE_AUTH and !isset($user) and ($view != 'login') ) {
+  /* AJAX check  */
+  if ( !empty($_SERVER['HTTP_X_REQUESTED_WITH'])
+    && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest' ) {
+    header('HTTP/1.1 401 Unauthorized');
+    exit;
+  }
   Logger::Debug('Redirecting to login');
   $view = 'none';
   $redirect = ZM_BASE_URL.$_SERVER['PHP_SELF'].'?view=login';

From ff8c5c5db89f7e399b93fcbf972f65842bd9c77b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 1 Mar 2019 17:28:00 -0500
Subject: [PATCH 041/214] remove debug

---
 web/skins/classic/includes/functions.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index 37209b7d0..662856eb7 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -275,7 +275,6 @@ function getNavBarHTML($reload = null) {
           dbQuery('DELETE low_priority FROM Logs ORDER BY TimeKey ASC LIMIT ?', array($rows - ZM_LOG_DATABASE_LIMIT));
         }
       } else if ( preg_match('/^\d\s*(hour|minute|day|week|month|year)$/', ZM_LOG_DATABASE_LIMIT, $matches) ) {
-      ZM\Logger::Debug("have interval ".$matches[1]);
         dbQuery('DELETE FROM Logs WHERE TimeKey < unix_timestamp( NOW() - interval '.ZM_LOG_DATABASE_LIMIT.') LIMIT 100');
       } else {
         ZM\Error('Potentially invalid value for ZM_LOG_DATABASE_LIMIT: ' . ZM_LOG_DATABASE_LIMIT);

From 903f5af1ef5628b9fbe34a595d92744f9a771c48 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 4 Mar 2019 13:35:36 -0500
Subject: [PATCH 042/214] invalid parameters should be a debug not a warning

---
 src/zms.cpp | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/src/zms.cpp b/src/zms.cpp
index 634e07030..a45cdf904 100644
--- a/src/zms.cpp
+++ b/src/zms.cpp
@@ -152,30 +152,16 @@ int main( int argc, const char *argv[] ) {
         connkey = atoi(value);
       } else if ( !strcmp( name, "buffer" ) ) {
         playback_buffer = atoi(value);
-      } else if ( config.opt_use_auth ) {
-        if ( strcmp( config.auth_relay, "none" ) == 0 ) {
-          if ( !strcmp( name, "user" ) ) {
-            username = value;
-          }
-        } else {
-          //if ( strcmp( config.auth_relay, "hashed" ) == 0 )
-          {
-            if ( !strcmp( name, "auth" ) ) {
-              strncpy( auth, value, sizeof(auth)-1 );
-            }
-          }
-          //else if ( strcmp( config.auth_relay, "plain" ) == 0 )
-          {
-            if ( !strcmp( name, "user" ) ) {
-              username = UriDecode( value );
-            }
-            if ( !strcmp( name, "pass" ) ) {
-              password = UriDecode( value );
-              Debug( 1, "Have %s for password", password.c_str() );
-            }
-          }
-        }
-      }
+      } else if ( !strcmp( name, "auth" ) ) {
+        strncpy( auth, value, sizeof(auth)-1 );
+      } else if ( !strcmp( name, "user" ) ) {
+        username = UriDecode( value );
+      } else if ( !strcmp( name, "pass" ) ) {
+        password = UriDecode(value);
+        Debug(1, "Have %s for password", password.c_str());
+      } else {
+        Debug(1, "Unknown parameter passed to zms %s=%s", name, value);
+      } // end if possible parameter names
     } // end foreach parm
   } // end if query
 
@@ -323,5 +309,5 @@ int main( int argc, const char *argv[] ) {
   logTerm();
   zmDbClose();
 
-  return( 0 );
+  return(0);
 }

From 96e29c0299bd94eb2edc5cce75903bbe9cdf8bb3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 4 Mar 2019 13:35:40 -0500
Subject: [PATCH 043/214] fix up remaining issues with cycle updates

---
 web/includes/functions.php              |  10 +-
 web/lang/en_gb.php                      |   4 +
 web/skins/classic/views/cycle.php       | 111 +++++++++++++++++++----
 web/skins/classic/views/js/cycle.js     | 116 +++++++++++++++++++++++-
 web/skins/classic/views/js/cycle.js.php |  22 ++++-
 web/skins/classic/views/js/montage.js   |  27 +++---
 web/skins/classic/views/montage.php     |  40 ++++----
 7 files changed, 272 insertions(+), 58 deletions(-)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 9674deb91..4417c74ed 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -288,7 +288,7 @@ function getImageStreamHTML( $id, $src, $width, $height, $title='' ) {
   if ( canStreamIframe() ) {
       return '<iframe id="'.$id.'" src="'.$src.'" alt="'. validHtmlStr($title) .'" '.($width? ' width="'. validInt($width).'"' : '').($height?' height="'.validInt($height).'"' : '' ).'/>';
   } else {
-      return '<img id="'.$id.'" src="'.$src.'" alt="'. validHtmlStr($title) .'" style="'.($width? ' width:'.$width.';' : '' ).($height ? ' height:'. $height.';' : '' ).'"/>';
+      return '<img id="'.$id.'" src="'.$src.'" alt="'. validHtmlStr($title) .'" style="'.($width? 'width:'.$width.';' : '' ).($height ? ' height:'. $height.';' : '' ).'"/>';
   }
 }
 
@@ -2239,15 +2239,15 @@ function getStreamHTML( $monitor, $options = array() ) {
 
   if ( isset($options['scale']) and $options['scale'] and ( $options['scale'] != 100 ) ) {
     //Warning("Scale to " . $options['scale'] );
-    $options['width'] = reScale( $monitor->Width(), $options['scale'] ) . 'px';
-    $options['height'] = reScale( $monitor->Height(), $options['scale'] ) . 'px';
+    $options['width'] = reScale($monitor->Width(), $options['scale']).'px';
+    $options['height'] = reScale($monitor->Height(), $options['scale']).'px';
   } else {
     # scale is empty or 100
     # There may be a fixed width applied though, in which case we need to leave the height empty
     if ( ! ( isset($options['width']) and $options['width'] ) ) {
-      $options['width'] = $monitor->Width() . 'px';
+      $options['width'] = $monitor->Width().'px';
       if ( ! ( isset($options['height']) and $options['height'] ) ) {
-        $options['height'] = $monitor->Height() . 'px';
+        $options['height'] = $monitor->Height().'px';
       }
     } else if ( ! isset($options['height']) ) {
       $options['height'] = '';
diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index 8c65872c6..05bca82d0 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -537,6 +537,7 @@ $SLANG = array(
     'NewState'              => 'New State',
     'NewUser'               => 'New User',
     'Next'                  => 'Next',
+    'NextMonitor'           => 'Next Monitor',
     'NoDetectedCameras'     => 'No Detected Cameras',
     'NoDetectedProfiles'    => 'No Detected Profiles',
     'NoFramesRecorded'      => 'There are no frames recorded for this event',
@@ -589,12 +590,14 @@ $SLANG = array(
     'PathToApi'             => 'Path To Api',
     'Paths'                 => 'Paths',
     'Pause'                 => 'Pause',
+    'PauseCycle'            => 'Pause Cycle',
     'PhoneBW'               => 'Phone&nbsp;B/W',
     'Phone'                 => 'Phone',
     'PixelDiff'             => 'Pixel Diff',
     'Pixels'                => 'pixels',
     'PlayAll'               => 'Play All',
     'Play'                  => 'Play',
+    'PlayCycle'             => 'Play Cycle',
     'Plugins'               => 'Plugins',
     'PleaseWait'            => 'Please Wait',
     'Point'                 => 'Point',
@@ -604,6 +607,7 @@ $SLANG = array(
     'Preset'                => 'Preset',
     'Presets'               => 'Presets',
     'Prev'                  => 'Prev',
+    'PreviousMonitor'       => 'Previous Monitor',
     'Privacy'               => 'Privacy',
     'PrivacyAbout'          => 'About',
     'PrivacyAboutText'      => 'Since 2002, ZoneMinder has been the premier free and open-source Video Management System (VMS) solution for Linux platforms. ZoneMinder is supported by the community and is managed by those who choose to volunteer their spare time to the project. The best way to improve ZoneMinder is to get involved.',
diff --git a/web/skins/classic/views/cycle.php b/web/skins/classic/views/cycle.php
index 1e83e2c5b..a36390b52 100644
--- a/web/skins/classic/views/cycle.php
+++ b/web/skins/classic/views/cycle.php
@@ -23,46 +23,101 @@ if ( !canView('Stream') ) {
   return;
 }
 
-if ( empty($_REQUEST['mode']) ) {
-  if ( canStream() )
-    $mode = 'stream';
-  else
-    $mode = 'still';
-} else {
-  $mode = validHtmlStr($_REQUEST['mode']);
-}
 ob_start();
 include('_monitor_filters.php');
 $filterbar = ob_get_contents();
 ob_end_clean();
 
+$options = array();
+
+if ( empty($_REQUEST['mode']) ) {
+  if ( canStream() )
+    $options['mode'] = 'stream';
+  else
+    $options['mode'] = 'still';
+} else {
+  $options['mode'] = validHtmlStr($_REQUEST['mode']);
+}
+
+$widths = array(
+  ''  => translate('auto'),
+  '100%'  => '100%',
+  '160px' => '160px',
+  '320px' => '320px',
+  '352px' => '352px',
+  '640px' => '640px',
+  '1280px' => '1280px',
+  '1920px'  =>  '1920px'
+);
+
+$heights = array(
+  'auto'  => translate('auto'),
+  '240px' => '240px',
+  '480px' => '480px',
+  '720px' => '720px',
+  '1080px'  =>  '1080px',
+);
+
+session_start();
+
+if ( isset($_REQUEST['scale']) ) {
+  $options['scale'] = validInt($_REQUEST['scale']);
+  ZM\Logger::Debug('Setting scale from request to '.$options['scale']);
+} else if ( isset($_COOKIE['zmCycleScale']) ) {
+  $options['scale'] = $_COOKIE['zmCycleScale'];
+  ZM\Logger::Debug('Setting scale from cookie to '.$options['scale']);
+}
+
+if ( !(isset($options['scale']) and $options['scale']) )
+  $options['scale'] = 100;
+
+if ( isset($_COOKIE['zmCycleWidth']) and $_COOKIE['zmCycleWidth'] ) {
+  $_SESSION['zmCycleWidth'] = $options['width'] = $_COOKIE['zmCycleWidth'];
+#} elseif ( isset($_SESSION['zmCycleWidth']) and $_SESSION['zmCycleWidth'] ) {
+  #$options['width'] = $_SESSION['zmCycleWidth'];
+} else
+  $options['width'] = '';
+
+if ( isset($_COOKIE['zmCycleHeight']) and $_COOKIE['zmCycleHeight'] )
+  $_SESSION['zmCycleHeight'] = $options['height'] = $_COOKIE['zmCycleHeight'];
+#else if ( isset($_SESSION['zmCycleHeight']) and $_SESSION['zmCycleHeight'] )
+  #$options['height'] = $_SESSION['zmCycleHeight'];
+else
+  $options['height'] = '';
+
+session_write_close();
+
 $monIdx = 0;
 $monitors = array();
 $monitor = NULL;
 foreach( $displayMonitors as &$row ) {
   if ( $row['Function'] == 'None' )
     continue;
-  if ( isset($_REQUEST['mid']) && $row['Id'] == $_REQUEST['mid'] )
+  if ( isset($_REQUEST['mid']) && ($row['Id'] == $_REQUEST['mid']) )
     $monIdx = count($monitors);
 
   $row['ScaledWidth'] = reScale($row['Width'], $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE);
   $row['ScaledHeight'] = reScale($row['Height'], $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE);
   $row['PopupScale'] = reScale(SCALE_BASE, $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE);
+   if ( !isset($widths[$row['Width'].'px']) ) {
+    $widths[$row['Width'].'px'] = $row['Width'].'px';
+  }
+  if ( ! isset($heights[$row['Height'].'px']) ) {
+    $heights[$row['Height'].'px'] = $row['Height'].'px';
+  }
 
   $row['connKey'] = generateConnKey();
   $monitors[] = new ZM\Monitor($row);
+  unset($row);
 } # end foreach Monitor
 
 if ( $monitors ) {
   $monitor = $monitors[$monIdx];
   $nextMid = $monIdx==(count($monitors)-1)?$monitors[0]->Id():$monitors[$monIdx+1]->Id();
-  $montageWidth = $monitor->ScaledWidth();
-  $montageHeight = $monitor->ScaledHeight();
-  $widthScale = ($montageWidth*SCALE_BASE)/$monitor->Width();
-  $heightScale = ($montageHeight*SCALE_BASE)/$monitor->Height();
-  $scale = (int)(($widthScale<$heightScale)?$widthScale:$heightScale);
 }
 
+ZM\Logger::Debug(print_r($options,true));
+
 noCacheHeaders();
 xhtmlHeaders(__FILE__, translate('CycleWatch'));
 ?>
@@ -71,7 +126,7 @@ xhtmlHeaders(__FILE__, translate('CycleWatch'));
     <?php echo $navbar = getNavBarHTML(); ?>
     <div id="header">
       <div id="headerButtons">
-<?php if ( $mode == 'stream' ) { ?>
+<?php if ( $options['mode'] == 'stream' ) { ?>
         <a href="?view=<?php echo $view ?>&amp;mode=still&amp;mid=<?php echo $monitor ? $monitor->Id() : '' ?>"><?php echo translate('Stills') ?></a>
 <?php } else { ?>
         <a href="?view=<?php echo $view ?>&amp;mode=stream&amp;mid=<?php echo $monitor ? $monitor->Id() : '' ?>"><?php echo translate('Stream') ?></a>
@@ -83,17 +138,39 @@ xhtmlHeaders(__FILE__, translate('CycleWatch'));
           <?php echo $filterbar ?>
         </form>
       </div>
+      <div id="sizeControl">
+        <span id="widthControl">
+          <label><?php echo translate('Width') ?>:</label>
+          <?php echo htmlSelect('width', $widths, $options['width'], array('data-on-change-this'=>'changeSize') ); ?>
+        </span>
+        <span id="heightControl">
+          <label><?php echo translate('Height') ?>:</label>
+          <?php echo htmlSelect('height', $heights, $options['height'], array('data-on-change-this'=>'changeSize') ); ?>
+        </span>
+        <span id="scaleControl">
+          <label><?php echo translate('Scale') ?>:</label>
+          <?php echo htmlSelect('scale', $scales, $options['scale'], array('data-on-change-this'=>'changeScale') ); ?>
+        </span>
+      </div>
     </div>
     <div id="content">
       <div id="imageFeed">
       <?php 
         if ( $monitor ) {
-          echo getStreamHTML($monitor, array('scale'=>$scale, 'mode'=>$mode, 'width'=>'100%'));
+          echo getStreamHTML($monitor, $options);
         } else {
-          echo "There are no monitors to view.";
+          echo 'There are no monitors to view.';
         }
       ?>
       </div>
+
+      <div class="buttons">
+        <button type="button" value="&lt;" id="prevBtn" title="<?php echo translate('PreviousMonitor') ?>" class="active" data-on-click-true="cyclePrev">&lt;&lt;</button>
+        <button type="button" value="||" id="pauseBtn" title="<?php echo translate('PauseCycle') ?>" class="active" data-on-click-true="cyclePause">||</button>
+        <button type="button" value="|&gt;" id="playBtn" title="<?php echo translate('PlayCycle') ?>" class="inactive" disabled="disabled" data-on-click-true="streamCmdPlay">|&gt;</button>
+        <button type="button" value="&gt;" id="nextBtn" title="<?php echo translate('NextMonitor') ?>" class="active" data-on-click-true="cycleNext">&gt;&gt;</button>
+      </div>
+
     </div>
   </div>
 <?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/js/cycle.js b/web/skins/classic/views/js/cycle.js
index 2fbeef918..88292db2d 100644
--- a/web/skins/classic/views/js/cycle.js
+++ b/web/skins/classic/views/js/cycle.js
@@ -1,9 +1,121 @@
+var periodical_id;
+
 function nextCycleView() {
   window.location.replace('?view=cycle&mid='+nextMid+'&mode='+mode, cycleRefreshTimeout);
 }
 
-function initCycle() {
-  nextCycleView.periodical(cycleRefreshTimeout);
+function cyclePause() {
+  $clear(periodical_id);
+  $('pauseBtn').disabled = true;
+  $('playBtn').disabled = false;
+}
+function cycleStart() {
+  periodical_id = nextCycleView.periodical(cycleRefreshTimeout);
+  $('pauseBtn').disabled = false;
+  $('playBtn').disabled = true;
+}
+function cycleNext() {
+  monIdx ++;
+  if ( monIdx >= monitorData.length )
+    monIdx = 0;
+  if ( !monitorData[monIdx] )
+    console.log("No monitorData for " + monIdx);
+
+  window.location.replace('?view=cycle&mid='+monitorData[monIdx].id+'&mode='+mode, cycleRefreshTimeout);
+}
+function cyclePrev() {
+  if ( monIdx )
+    monIdx -= 1;
+  else
+    monIdx = monitorData.length-1;
+
+  window.location.replace('?view=cycle&mid='+monitorData[monIdx].id+'&mode='+mode, cycleRefreshTimeout);
 }
 
+function initCycle() {
+  periodical_id = nextCycleView.periodical(cycleRefreshTimeout);
+}
+
+function changeSize() {
+  var width = $('width').get('value');
+  var height = $('height').get('value');
+
+  // Scale the frame
+  monitor_frame = $j('#imageFeed');
+  if ( !monitor_frame ) {
+    console.log("Error finding frame");
+    return;
+  }
+  if ( width ) {
+    monitor_frame.css('width', width);
+  }
+  if ( height ) {
+    monitor_frame.css('height', height);
+  }
+
+  /* Stream could be an applet so can't use moo tools */
+  var streamImg = $('liveStream'+monitorData[monIdx].id);
+  if ( streamImg ) {
+    if ( streamImg.nodeName == 'IMG' ) {
+      var src = streamImg.src;
+      streamImg.src = '';
+      console.log(parseInt(width));
+      src = src.replace(/width=[\.\d]+/i, 'width='+parseInt(width));
+      src = src.replace(/height=[\.\d]+/i, 'height='+parseInt(height));
+      src = src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));
+      streamImg.src = src;
+    }
+    streamImg.style.width = width ? width : null;
+    streamImg.style.height = height ? height : null;
+  } else {
+    console.log("Did not find liveStream"+monitorData[monIdx].id);
+  }
+  $('scale').set('value', '');
+  Cookie.write('zmCycleScale', '', { duration: 10*365 });
+  Cookie.write('zmCycleWidth', width, { duration: 10*365 });
+  Cookie.write('zmCycleHeight', height, { duration: 10*365 });
+} // end function changeSize()
+
+function changeScale() {
+  var scale = $('scale').get('value');
+  $('width').set('value', 'auto');
+  $('height').set('value', 'auto');
+  Cookie.write('zmCycleScale', scale, { duration: 10*365 });
+  Cookie.write('zmCycleWidth', 'auto', { duration: 10*365 });
+  Cookie.write('zmCycleHeight', 'auto', { duration: 10*365 });
+  var newWidth = ( monitorData[monIdx].width * scale ) / SCALE_BASE;
+  var newHeight = ( monitorData[monIdx].height * scale ) / SCALE_BASE;
+
+  // Scale the frame
+  monitor_frame = $j('#imageFeed');
+  if ( !monitor_frame ) {
+    console.log("Error finding frame");
+    return;
+  }
+  if ( newWidth ) {
+    monitor_frame.css('width', newWidth+'px');
+  }
+  if ( newHeight ) {
+    monitor_frame.css('height', newHeight+'px');
+  }
+  /*Stream could be an applet so can't use moo tools*/
+  var streamImg = $j('#liveStream'+monitorData[monIdx].id)[0];
+  if ( streamImg ) {
+    if ( streamImg.nodeName == 'IMG' ) {
+      var src = streamImg.src;
+      streamImg.src = '';
+
+      //src = src.replace(/rand=\d+/i,'rand='+Math.floor((Math.random() * 1000000) ));
+      src = src.replace(/scale=[\.\d]+/i, 'scale='+scale);
+      src = src.replace(/width=[\.\d]+/i, 'width='+newWidth);
+      src = src.replace(/height=[\.\d]+/i, 'height='+newHeight);
+      streamImg.src = src;
+    }
+    streamImg.style.width = newWidth + 'px';
+    streamImg.style.height = newHeight + 'px';
+  } else {
+    console.log("Did not find liveStream"+monitorData[monIdx].id);
+  }
+} // end function changeScale()
+
 window.addEventListener('DOMContentLoaded', initCycle);
diff --git a/web/skins/classic/views/js/cycle.js.php b/web/skins/classic/views/js/cycle.js.php
index 90949c600..316296410 100644
--- a/web/skins/classic/views/js/cycle.js.php
+++ b/web/skins/classic/views/js/cycle.js.php
@@ -1,4 +1,24 @@
+var monIdx = '<?php echo $monIdx; ?>';
 var nextMid = "<?php echo isset($nextMid)?$nextMid:'' ?>";
-var mode = "<?php echo $mode ?>";
+var mode = "<?php echo $options['mode'] ?>";
 
 var cycleRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_CYCLE ?>;
+var monitorData = new Array();
+<?php
+foreach ( $monitors as $monitor ) {
+?>
+monitorData[monitorData.length] = {
+  'id': <?php echo $monitor->Id() ?>,
+  'connKey': <?php echo $monitor->connKey() ?>,
+  'width': <?php echo $monitor->Width() ?>,
+  'height':<?php echo $monitor->Height() ?>,
+  'url': '<?php echo $monitor->UrlToIndex() ?>',
+  'onclick': function(){createPopup( '?view=watch&mid=<?php echo $monitor->Id() ?>', 'zmWatch<?php echo $monitor->Id() ?>', 'watch', <?php echo reScale( $monitor->Width(), $monitor->PopupScale() ); ?>, <?php echo reScale( $monitor->Height(), $monitor->PopupScale() ); ?> );},
+  'type': '<?php echo $monitor->Type() ?>',
+  'refresh': '<?php echo $monitor->Refresh() ?>'
+};
+<?php
+} // end foreach monitor
+?>
+
+var SCALE_BASE = <?php echo SCALE_BASE ?>;
diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js
index 5d7db1553..d188d4732 100644
--- a/web/skins/classic/views/js/montage.js
+++ b/web/skins/classic/views/js/montage.js
@@ -140,6 +140,7 @@ function Monitor( monitorData ) {
         console.log( 'No stream to reload?' );
       }
     } // end if Ok or not
+
     var streamCmdTimeout = statusRefreshTimeout;
     // The idea here is if we are alarmed, do updates faster.  However, there is a timeout in the php side which isn't getting modified, so this may cause a problem. Also the server may only be able to update so fast.
     //if ( this.alarmState == STATE_ALARM || this.alarmState == STATE_ALERT ) {
@@ -262,10 +263,10 @@ function changeSize() {
       continue;
     }
     if ( width ) {
-      monitor_frame.css('width', width+'px');
+      monitor_frame.css('width', width);
     }
     if ( height ) {
-      monitor_frame.css('height', height+'px');
+      monitor_frame.css('height', height);
     }
     /*Stream could be an applet so can't use moo tools*/
     var streamImg = $( 'liveStream'+monitor.id );
@@ -278,14 +279,14 @@ function changeSize() {
         src = src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));
         streamImg.src = src;
       }
-      streamImg.style.width = width? width + "px" : null;
-      streamImg.style.height = height ? height + "px" : null;
+      streamImg.style.width = width ? width : null;
+      streamImg.style.height = height ? height : null;
       //streamImg.style.height = '';
     }
     var zonesSVG = $('zones'+monitor.id);
     if ( zonesSVG ) {
-      zonesSVG.style.width = width ? width + "px" : '100%';
-      zonesSVG.style.height = height + "px";
+      zonesSVG.style.width = width ? width : '100%';
+      zonesSVG.style.height = height;
     }
   }
   $('scale').set('value', '' );
@@ -297,12 +298,12 @@ function changeSize() {
 
 function changeScale() {
   var scale = $('scale').get('value');
-  $('width').set('value', '');
-  $('height').set('value', '');
-  Cookie.write( 'zmMontageScale', scale, {duration: 10*365} );
-  Cookie.write( 'zmMontageWidth', '', {duration: 10*365} );
-  Cookie.write( 'zmMontageHeight', '', {duration: 10*365} );
-  if ( ! scale ) {
+  $('width').set('value', 'auto');
+  $('height').set('value', 'auto');
+  Cookie.write('zmMontageScale', scale, { duration: 10*365 });
+  Cookie.write('zmMontageWidth', '', { duration: 10*365 });
+  Cookie.write('zmMontageHeight', '', { duration: 10*365 });
+  if ( !scale ) {
     selectLayout('#zmMontageLayout');
     return;
   }
@@ -318,7 +319,7 @@ function changeScale() {
       continue;
     }
     if ( width ) {
-      monitor_frame.css('width', width+'px');
+      monitor_frame.css('width', width);
     }
     if ( height ) {
       monitor_frame.css('height', height+'px');
diff --git a/web/skins/classic/views/montage.php b/web/skins/classic/views/montage.php
index 474333060..7df2a63b3 100644
--- a/web/skins/classic/views/montage.php
+++ b/web/skins/classic/views/montage.php
@@ -33,27 +33,27 @@ if ( isset($_REQUEST['showZones']) ) {
   }
 }
 $widths = array( 
-  ''  => 'auto',
-  160 => 160,
-  320 => 320,
-  352 => 352,
-  640 => 640,
-  1280 => 1280 );
+  'auto'  => 'auto',
+  '160px' => '160px',
+  '320px' => '320px',
+  '352px' => '352px',
+  '640px' => '640px',
+  '1280px' => '1280px' );
 
 $heights = array( 
-  ''  => 'auto',
-  240 => 240,
-  480 => 480,
+  'auto'  => 'auto',
+  '240px' => '240px',
+  '480px' => '480px',
+  '720px' => '720px',
+  '1080px' => '1080px',
 );
 
 $scale = '100';   # actual
 
 if ( isset( $_REQUEST['scale'] ) ) {
   $scale = validInt($_REQUEST['scale']);
-  ZM\Logger::Debug("Setting scale from request to $scale");
 } else if ( isset($_COOKIE['zmMontageScale']) ) {
   $scale = $_COOKIE['zmMontageScale'];
-  ZM\Logger::Debug("Setting scale from cookie to $scale");
 }
 
 if ( ! $scale ) 
@@ -121,10 +121,10 @@ foreach( $displayMonitors as &$row ) {
     $showControl = true;
   $row['connKey'] = generateConnKey();
   if ( ! isset($widths[$row['Width']]) ) {
-    $widths[$row['Width']] = $row['Width'];
+    $widths[$row['Width'].'px'] = $row['Width'].'px';
   }
   if ( ! isset($heights[$row['Height']]) ) {
-    $heights[$row['Height']] = $row['Height'];
+    $heights[$row['Height'].'px'] = $row['Height'].'px';
   }
   $monitors[] = new ZM\Monitor($row);
 } # end foreach Monitor
@@ -195,7 +195,7 @@ if ( $showZones ) {
 foreach ( $monitors as $monitor ) {
   $connkey = $monitor->connKey(); // Minor hack
 ?>
-        <div id="monitorFrame<?php echo $monitor->Id() ?>" class="monitorFrame" title="<?php echo $monitor->Id() . ' ' .$monitor->Name() ?>" style="<?php echo $options['width'] ? 'width:'.$options['width'].'px;':''?>">
+        <div id="monitorFrame<?php echo $monitor->Id() ?>" class="monitorFrame" title="<?php echo $monitor->Id() . ' ' .$monitor->Name() ?>" style="<?php echo $options['width'] ? 'width:'.$options['width'].';':''?>">
           <div id="monitor<?php echo $monitor->Id() ?>" class="monitor idle">
             <div
               id="imageFeed<?php echo $monitor->Id() ?>"
@@ -225,8 +225,8 @@ foreach ( $monitors as $monitor ) {
     echo getWebSiteUrl(
       'liveStream'.$monitor->Id(),
       $monitor->Path(),
-      reScale($monitor->Width(), $scale),
-      reScale($monitor->Height(), $scale),
+      (isset($options['width']) ? $options['width'] : reScale($monitor->Width(), $scale).'px' ),
+      ( isset($options['height']) ? $options['height'] : reScale($monitor->Height(), $scale).'px' ),
       $monitor->Name()
     );
   } else {
@@ -239,17 +239,17 @@ foreach ( $monitors as $monitor ) {
       $width = $options['width'];
       if ( !$options['height'] ) {
         $scale = (int)( 100 * $options['width'] / $monitor->Width() );
-        $height = reScale($monitor->Height(), $scale);
+        $height = reScale($monitor->Height(), $scale).'px';
       }
     } else if ( $options['height'] ) {
       $height = $options['height'];
       if ( !$options['width'] ) {
         $scale = (int)( 100 * $options['height'] / $monitor->Height() );
-        $width = reScale($monitor->Width(), $scale);
+        $width = reScale($monitor->Width(), $scale).'px';
       }
     } else if ( $scale ) {
-      $width = reScale($monitor->Width(), $scale);
-      $height = reScale($monitor->Height(), $scale);
+      $width = reScale($monitor->Width(), $scale).'px';
+      $height = reScale($monitor->Height(), $scale).'px';
     } 
 
     $zones = array();

From 7cee8356bd8c00d212c4499beef958ed954d8594 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 4 Mar 2019 13:43:03 -0500
Subject: [PATCH 044/214] Fix setting frame width when changing from fixed
 width to scaled

---
 web/skins/classic/views/js/montage.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js
index d188d4732..50ea692b5 100644
--- a/web/skins/classic/views/js/montage.js
+++ b/web/skins/classic/views/js/montage.js
@@ -318,12 +318,13 @@ function changeScale() {
       console.log("Error finding frame for " + monitor.id );
       continue;
     }
-    if ( width ) {
-      monitor_frame.css('width', width);
-    }
-    if ( height ) {
-      monitor_frame.css('height', height+'px');
+    if ( newWidth ) {
+      monitor_frame.css('width', newWidth);
     }
+    // We don't set the frame height because it has the status bar as well
+    //if ( height ) {
+      ////monitor_frame.css('height', height+'px');
+    //}
     /*Stream could be an applet so can't use moo tools*/
     var streamImg = $j('#liveStream'+monitor.id )[0];
     if ( streamImg ) {

From 0bf001be3c226c7f646a3254bc7e49e34f83322b Mon Sep 17 00:00:00 2001
From: rpdrewes <drewes@interstice.com>
Date: Tue, 5 Mar 2019 06:59:36 -0800
Subject: [PATCH 045/214] Fix for file and curl camera sources (#2545)

---
 src/zm_curl_camera.cpp | 2 +-
 src/zm_file_camera.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/zm_curl_camera.cpp b/src/zm_curl_camera.cpp
index bd9d4fcd6..1f3a6a54b 100644
--- a/src/zm_curl_camera.cpp
+++ b/src/zm_curl_camera.cpp
@@ -298,7 +298,7 @@ int cURLCamera::Capture( Image &image ) {
   if(!frameComplete)
     return -1;
 
-  return 0;
+  return 1;
 }
 
 int cURLCamera::PostCapture() {
diff --git a/src/zm_file_camera.cpp b/src/zm_file_camera.cpp
index 941e30bda..1bc861b23 100644
--- a/src/zm_file_camera.cpp
+++ b/src/zm_file_camera.cpp
@@ -84,7 +84,7 @@ int FileCamera::PreCapture() {
 }
 
 int FileCamera::Capture( Image &image ) {
-  return( image.ReadJpeg( path, colours, subpixelorder )?0:-1 );
+  return( image.ReadJpeg( path, colours, subpixelorder )?1:-1 );
 }
 
 int FileCamera::PostCapture() {

From f446e73ff77974735d9e5b71f621c6ad7ca498d5 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 5 Mar 2019 10:55:27 -0500
Subject: [PATCH 046/214] Typo: AnalysisUpdateDelete to AnalysisUpdateDelay

---
 web/includes/Monitor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index 848bef12b..e794cb4de 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -63,7 +63,7 @@ private $defaults = array(
   'SectionLength'       =>  600,
   'FrameSkip'           =>  0,
   'AnalysisFPSLimit'  =>  null,
-  'AnalysisUpdateDelete'  =>  0,
+  'AnalysisUpdateDelay'  =>  0,
   'MaxFPS' => null,
   'AlarmMaxFPS' => null,
   'FPSReportIneterval'  =>  100,

From 8b29c5f54cc73d31d3b6208294a068a4c3a6395d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 5 Mar 2019 10:58:23 -0500
Subject: [PATCH 047/214] Fix typo: Ineterval to Interval

---
 web/includes/Monitor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index e794cb4de..5fa0bfd5e 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -66,7 +66,7 @@ private $defaults = array(
   'AnalysisUpdateDelay'  =>  0,
   'MaxFPS' => null,
   'AlarmMaxFPS' => null,
-  'FPSReportIneterval'  =>  100,
+  'FPSReportInterval'  =>  100,
   'RefBlencPerc'        =>  6,
   'AlarmRefBlendPerc'   =>  6,
   'Controllable'        =>  0,

From 49a1954f96c77b92401ae8cbd029469fced55ff4 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 5 Mar 2019 11:01:39 -0500
Subject: [PATCH 048/214] fix typo and remove deprecated DefaultView

---
 web/includes/Monitor.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index 5fa0bfd5e..f3babb17a 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -67,7 +67,7 @@ private $defaults = array(
   'MaxFPS' => null,
   'AlarmMaxFPS' => null,
   'FPSReportInterval'  =>  100,
-  'RefBlencPerc'        =>  6,
+  'RefBlendPerc'        =>  6,
   'AlarmRefBlendPerc'   =>  6,
   'Controllable'        =>  0,
   'ControlId' =>  null,
@@ -78,7 +78,6 @@ private $defaults = array(
   'TrackDelay'      =>  null,
   'ReturnLocation'  =>  -1,
   'ReturnDelay'     =>  null,
-  'DefaultView' =>  'Events',
   'DefaultRate' =>  100,
   'DefaultScale'  =>  100,
   'SignalCheckPoints' =>  0,

From 76ee31bf68180cf6bf39a5aeaf0e645bee8086aa Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 5 Mar 2019 11:01:58 -0500
Subject: [PATCH 049/214] fix eslint missing {}

---
 web/skins/classic/views/js/cycle.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/web/skins/classic/views/js/cycle.js b/web/skins/classic/views/js/cycle.js
index 88292db2d..9422890c8 100644
--- a/web/skins/classic/views/js/cycle.js
+++ b/web/skins/classic/views/js/cycle.js
@@ -16,10 +16,12 @@ function cycleStart() {
 }
 function cycleNext() {
   monIdx ++;
-  if ( monIdx >= monitorData.length )
+  if ( monIdx >= monitorData.length ) {
     monIdx = 0;
-  if ( !monitorData[monIdx] )
+  }
+  if ( !monitorData[monIdx] ) {
     console.log("No monitorData for " + monIdx);
+  }
 
   window.location.replace('?view=cycle&mid='+monitorData[monIdx].id+'&mode='+mode, cycleRefreshTimeout);
 }
@@ -71,9 +73,9 @@ function changeSize() {
     console.log("Did not find liveStream"+monitorData[monIdx].id);
   }
   $('scale').set('value', '');
-  Cookie.write('zmCycleScale', '', { duration: 10*365 });
-  Cookie.write('zmCycleWidth', width, { duration: 10*365 });
-  Cookie.write('zmCycleHeight', height, { duration: 10*365 });
+  Cookie.write('zmCycleScale', '', {duration: 10*365});
+  Cookie.write('zmCycleWidth', width, {duration: 10*365});
+  Cookie.write('zmCycleHeight', height, {duration: 10*365});
 } // end function changeSize()
 
 function changeScale() {

From 8053f61a0854f72a0f556e36aeafb6637fe0b55b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 5 Mar 2019 11:02:09 -0500
Subject: [PATCH 050/214] fix eslint missing {}

---
 web/skins/classic/views/js/montage.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js
index 50ea692b5..781adbd31 100644
--- a/web/skins/classic/views/js/montage.js
+++ b/web/skins/classic/views/js/montage.js
@@ -300,9 +300,9 @@ function changeScale() {
   var scale = $('scale').get('value');
   $('width').set('value', 'auto');
   $('height').set('value', 'auto');
-  Cookie.write('zmMontageScale', scale, { duration: 10*365 });
-  Cookie.write('zmMontageWidth', '', { duration: 10*365 });
-  Cookie.write('zmMontageHeight', '', { duration: 10*365 });
+  Cookie.write('zmMontageScale', scale, {duration: 10*365});
+  Cookie.write('zmMontageWidth', '', {duration: 10*365});
+  Cookie.write('zmMontageHeight', '', {duration: 10*365});
   if ( !scale ) {
     selectLayout('#zmMontageLayout');
     return;
@@ -323,7 +323,7 @@ function changeScale() {
     }
     // We don't set the frame height because it has the status bar as well
     //if ( height ) {
-      ////monitor_frame.css('height', height+'px');
+    ////monitor_frame.css('height', height+'px');
     //}
     /*Stream could be an applet so can't use moo tools*/
     var streamImg = $j('#liveStream'+monitor.id )[0];

From 7779edb485283d33260e37a03d8aefa0c1101465 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 5 Mar 2019 11:02:37 -0500
Subject: [PATCH 051/214] Fix saving multiple monitors at once by moving the
 relevant code to includes/actions/monitors.php

---
 web/includes/actions/monitor.php  | 27 ----------------
 web/includes/actions/monitors.php | 52 +++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 27 deletions(-)
 create mode 100644 web/includes/actions/monitors.php

diff --git a/web/includes/actions/monitor.php b/web/includes/actions/monitor.php
index 815100e4e..3fd76020c 100644
--- a/web/includes/actions/monitor.php
+++ b/web/includes/actions/monitor.php
@@ -18,33 +18,6 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-// I think this is saving a Monitor from ajax...
-
-if ( isset($_REQUEST['object']) and $_REQUEST['object'] == 'Monitor' ) {
-  if ( $action == 'save' ) {
-    foreach ( $_REQUEST['mids'] as $mid ) {
-      $mid = ValidInt($mid);
-      if ( ! canEdit('Monitors', $mid) ) {
-        ZM\Warning("Cannot edit monitor $mid");
-        continue;
-      }
-      $Monitor = new ZM\Monitor($mid);
-      if ( $Monitor->Type() != 'WebSite' ) {
-        $Monitor->zmaControl('stop');
-        $Monitor->zmcControl('stop');
-      }
-      $Monitor->save($_REQUEST['newMonitor']);
-      if ( $Monitor->Function() != 'None' && $Monitor->Type() != 'WebSite' ) {
-        $Monitor->zmcControl('start');
-        if ( $Monitor->Enabled() ) {
-          $Monitor->zmaControl('start');
-        }
-      }
-    } // end foreach mid
-    $refreshParent = true;
-  } // end if action == save
-} // end if object is Monitor
-
 // Monitor edit actions, monitor id derived, require edit permissions for that monitor
 if ( ! canEdit('Monitors') ) {
   ZM\Warning("Monitor actions require Monitors Permissions");
diff --git a/web/includes/actions/monitors.php b/web/includes/actions/monitors.php
new file mode 100644
index 000000000..8f56b0e3d
--- /dev/null
+++ b/web/includes/actions/monitors.php
@@ -0,0 +1,52 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+// Monitor edit actions, monitor id derived, require edit permissions for that monitor
+if ( ! canEdit('Monitors') ) {
+  ZM\Warning("Monitor actions require Monitors Permissions");
+  return;
+}
+
+if ( $action == 'save' ) {
+  foreach ( $_REQUEST['mids'] as $mid ) {
+    $mid = ValidInt($mid);
+    if ( ! canEdit('Monitors', $mid) ) {
+      ZM\Warning("Cannot edit monitor $mid");
+      continue;
+    }
+    $Monitor = new ZM\Monitor($mid);
+    if ( $Monitor->Type() != 'WebSite' ) {
+      $Monitor->zmaControl('stop');
+      $Monitor->zmcControl('stop');
+    }
+    $Monitor->save($_REQUEST['newMonitor']);
+    if ( $Monitor->Function() != 'None' && $Monitor->Type() != 'WebSite' ) {
+      $Monitor->zmcControl('start');
+      if ( $Monitor->Enabled() ) {
+        $Monitor->zmaControl('start');
+      }
+    }
+  } // end foreach mid
+  $refreshParent = true;
+  $view = 'none';
+} else {
+  ZM\Warning("Unknown action $action in Monitor");
+} // end if action == Delete
+?>

From 36b00d09e313eab1cacb5565d3f0833837ccdcdc Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 5 Mar 2019 11:02:58 -0500
Subject: [PATCH 052/214] fix destination view on the monitors view

---
 web/skins/classic/views/monitors.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/skins/classic/views/monitors.php b/web/skins/classic/views/monitors.php
index 3cf2f5edc..fe1130dfe 100644
--- a/web/skins/classic/views/monitors.php
+++ b/web/skins/classic/views/monitors.php
@@ -49,7 +49,7 @@ xhtmlHeaders(__FILE__, translate('Function'));
 The following monitors will have these settings update when you click Save:<br/><br/>
       <?php echo implode('<br/>', array_map(function($m){return $m->Id().' ' .$m->Name();}, $monitors)); ?>
       <form name="contentForm" id="contentForm" method="post" action="?" onsubmit="$j('#contentButtons').hide();return true;">
-        <input type="hidden" name="view" value="none"/>
+        <input type="hidden" name="view" value="monitors"/>
         <input type="hidden" name="action" value="save"/>
         <input type="hidden" name="object" value="Monitor"/>
 <?php
@@ -57,7 +57,7 @@ The following monitors will have these settings update when you click Save:<br/>
     "\n",
     array_map(function($m){
       return '<input type="hidden" name="mids[]" value="'.$m->Id().'"/>';
-      }, $monitors)
+    }, $monitors)
   );
   if ( count($ServersById) > 0 ) { ?>
         <p class="Server"><label><?php echo translate('Server')?></label>
@@ -73,7 +73,7 @@ The following monitors will have these settings update when you click Save:<br/>
 <?php
   }
 ?>
-        <p><label><?php echo translate('Function') ?></label>
+        <p class="Function"><label><?php echo translate('Function') ?></label>
 <?php
   $options = array();
   foreach ( getEnumValues('Monitors', 'Function') as $opt ) {

From b1838de701e736fa10201259c5a857e5013cc837 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 5 Mar 2019 11:35:16 -0500
Subject: [PATCH 053/214] test turning off frag_custom

---
 src/zm_videostore.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 96ccf6ea7..e85becf76 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -345,7 +345,8 @@ bool VideoStore::open() {
 
   AVDictionary *opts = NULL;
   // av_dict_set(&opts, "movflags", "frag_custom+dash+delay_moov", 0);
-  av_dict_set(&opts, "movflags", "frag_keyframe+empty_moov", 0);
+  // Shiboleth reports that this may break seeking in mp4 before it downloads
+  //av_dict_set(&opts, "movflags", "frag_keyframe+empty_moov", 0);
   // av_dict_set(&opts, "movflags",
   // "frag_keyframe+empty_moov+default_base_moof", 0);
   if ((ret = avformat_write_header(oc, &opts)) < 0) {

From e59eb510e3ba5c282d2c2d2e0eafb4a5246b3f12 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 5 Mar 2019 13:10:04 -0500
Subject: [PATCH 054/214] update and fix the donate popup

---
 web/includes/actions/donate.php      | 36 +++++++++++++++-------------
 web/skins/classic/js/classic.js      |  2 +-
 web/skins/classic/views/donate.php   | 31 ++++++++++++------------
 web/skins/classic/views/js/donate.js | 10 --------
 4 files changed, 36 insertions(+), 43 deletions(-)

diff --git a/web/includes/actions/donate.php b/web/includes/actions/donate.php
index 156491ede..cfd60c8f0 100644
--- a/web/includes/actions/donate.php
+++ b/web/includes/actions/donate.php
@@ -27,28 +27,32 @@ if ( $action == 'donate' && isset($_REQUEST['option']) ) {
   $option = $_REQUEST['option'];
   switch( $option ) {
     case 'go' :
-        // Ignore this, the caller will open the page itself
-        break;
+      // Ignore this, the caller will open the page itself
+      break;
     case 'hour' :
     case 'day' :
     case 'week' :
     case 'month' :
-        $nextReminder = time();
-        if ( $option == 'hour' ) {
-          $nextReminder += 60*60;
-        } elseif ( $option == 'day' ) {
-          $nextReminder += 24*60*60;
-        } elseif ( $option == 'week' ) {
-          $nextReminder += 7*24*60*60;
-        } elseif ( $option == 'month' ) {
-          $nextReminder += 30*24*60*60;
-        }
-        dbQuery("UPDATE Config SET Value = '".$nextReminder."' WHERE Name = 'ZM_DYN_DONATE_REMINDER_TIME'");
-        break;
+      $nextReminder = time();
+      if ( $option == 'hour' ) {
+        $nextReminder += 60*60;
+      } elseif ( $option == 'day' ) {
+        $nextReminder += 24*60*60;
+      } elseif ( $option == 'week' ) {
+        $nextReminder += 7*24*60*60;
+      } elseif ( $option == 'month' ) {
+        $nextReminder += 30*24*60*60;
+      }
+      dbQuery("UPDATE Config SET Value = '".$nextReminder."' WHERE Name = 'ZM_DYN_DONATE_REMINDER_TIME'");
+      break;
     case 'never' :
     case 'already' :
-        dbQuery("UPDATE Config SET Value = '0' WHERE Name = 'ZM_DYN_SHOW_DONATE_REMINDER'");
-        break;
+      dbQuery("UPDATE Config SET Value = '0' WHERE Name = 'ZM_DYN_SHOW_DONATE_REMINDER'");
+      break;
+    default :
+      Warning("Unknown value for option in donate: $option");
+      break;
   } // end switch option
+  $view = 'none';
 }
 ?>
diff --git a/web/skins/classic/js/classic.js b/web/skins/classic/js/classic.js
index 8d0d59728..0e62ecbf0 100644
--- a/web/skins/classic/js/classic.js
+++ b/web/skins/classic/js/classic.js
@@ -33,7 +33,7 @@ var popupSizes = {
   'cycle':        {'addWidth': 32, 'minWidth': 384, 'addHeight': 62},
   'device':       {'width': 260, 'height': 150},
   'devices':      {'width': 400, 'height': 240},
-  'donate':       {'width': 500, 'height': 280},
+  'donate':       {'width': 500, 'height': 480},
   'download':     {'width': 350, 'height': 215},
   'event':        {'addWidth': 108, 'minWidth': 496, 'addHeight': 230, 'minHeight': 540},
   'eventdetail':  {'width': 600, 'height': 420},
diff --git a/web/skins/classic/views/donate.php b/web/skins/classic/views/donate.php
index b18e2b010..456fc1e47 100644
--- a/web/skins/classic/views/donate.php
+++ b/web/skins/classic/views/donate.php
@@ -18,25 +18,24 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canEdit( 'System' ) )
-{
-    $view = "error";
-    return;
+if ( !canEdit('System') ) {
+  $view = 'error';
+  return;
 }
 
 $options = array( 
-    "go"      => translate('DonateYes'),
-    "hour"    => translate('DonateRemindHour'),
-    "day"     => translate('DonateRemindDay'),
-    "week"    => translate('DonateRemindWeek'),
-    "month"   => translate('DonateRemindMonth'),
-    "never"   => translate('DonateRemindNever'),
-    "already" => translate('DonateAlready'),
+  "go"      => translate('DonateYes'),
+  "hour"    => translate('DonateRemindHour'),
+  "day"     => translate('DonateRemindDay'),
+  "week"    => translate('DonateRemindWeek'),
+  "month"   => translate('DonateRemindMonth'),
+  "never"   => translate('DonateRemindNever'),
+  "already" => translate('DonateAlready'),
 );
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, translate('Donate') );
+xhtmlHeaders(__FILE__, translate('Donate'));
 ?>
 <body>
   <div id="page">
@@ -46,17 +45,17 @@ xhtmlHeaders(__FILE__, translate('Donate') );
     </div>
     <div id="content">
       <form name="contentForm" id="contentForm" method="post" action="?">
-        <input type="hidden" name="view" value="none"/>
+        <input type="hidden" name="view" value="donate"/>
         <input type="hidden" name="action" value="donate"/>
         <p>
           <?php echo translate('DonateEnticement') ?>
         </p>
         <p>
-          <?php echo buildSelect( "option", $options ); ?>
+          <?php echo buildSelect('option', $options); ?>
         </p>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo translate('Apply') ?>" data-on-click-this="submitForm">
-          <input type="button" value="<?php echo translate('Close') ?>" data-on-click="closeWindow">
+          <button type="submit"><?php echo translate('Apply') ?></button>
+          <button type="button" data-on-click="closeWindow"><?php echo translate('Close') ?></button>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/js/donate.js b/web/skins/classic/views/js/donate.js
index 6ff1ae75b..0cfb42fae 100644
--- a/web/skins/classic/views/js/donate.js
+++ b/web/skins/classic/views/js/donate.js
@@ -1,13 +1,3 @@
-function submitForm( element ) {
-  var form = element.form;
-  if ( form.option.selectedIndex == 0 ) {
-    form.view.value = currentView;
-  } else {
-    form.view.value = 'none';
-  }
-  form.submit();
-}
-
 if ( action == "donate" && option == "go" ) {
   zmWindow();
 }

From 0022dbfb765a5b862253bbc92dab008b0e5a72c9 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Tue, 5 Mar 2019 14:31:39 -0500
Subject: [PATCH 055/214] add a newline to improve readability

---
 web/includes/csrf/csrf-magic.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/web/includes/csrf/csrf-magic.php b/web/includes/csrf/csrf-magic.php
index 584432ef7..01122fed7 100644
--- a/web/includes/csrf/csrf-magic.php
+++ b/web/includes/csrf/csrf-magic.php
@@ -157,7 +157,8 @@ function csrf_ob_handler($buffer, $flags) {
     $input = "<input type='hidden' name='$name' value=\"$tokens\"$endslash>";
     $buffer = preg_replace('#(<form[^>]*method\s*=\s*["\']post["\'][^>]*>)#i', '$1' . $input, $buffer);
     if ($GLOBALS['csrf']['frame-breaker']) {
-        $buffer = str_ireplace('</head>', '<script nonce="'.$cspNonce.'">if (top != self) {top.location.href = self.location.href;}</script></head>', $buffer);
+        $buffer = str_ireplace('</head>', '<script nonce="'.$cspNonce.'">if (top != self) {top.location.href = self.location.href;}</script>
+</head>', $buffer);
     }
     if ($js = $GLOBALS['csrf']['rewrite-js']) {
         $buffer = str_ireplace(
@@ -165,7 +166,8 @@ function csrf_ob_handler($buffer, $flags) {
             '<script nonce="'.$cspNonce.'">'.
                 'var csrfMagicToken = "'.$tokens.'";'.
                 'var csrfMagicName = "'.$name.'";</script>'.
-            '<script src="'.$js.'"></script></head>',
+            '<script src="'.$js.'"></script>
+						</head>',
             $buffer
         );
         $script = '<script nonce="'.$cspNonce.'">CsrfMagic.end();</script>';

From 7b7a58b2f1f7b35636a8e0876e48bedc8df760e4 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Tue, 5 Mar 2019 14:33:03 -0500
Subject: [PATCH 056/214] remove old xhtml-isms

---
 web/skins/classic/includes/functions.php | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index 201bebe21..b7ae819de 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -149,26 +149,18 @@ echo output_link_if_exists( array(
   if ( $skinJsPhpFile ) {
 ?>
   <script nonce="<?php echo $cspNonce; ?>">
-  //<![CDATA[
-  <!--
 <?php
     require_once( $skinJsPhpFile );
 ?>
-  //-->
-  //]]>
   </script>
 <?php
   }
   if ( $viewJsPhpFile ) {
 ?>
   <script nonce="<?php echo $cspNonce; ?>">
-  //<![CDATA[
-  <!--
 <?php
     require_once( $viewJsPhpFile );
 ?>
-  //-->
-  //]]>
   </script>
 <?php
   }
@@ -186,12 +178,12 @@ echo output_link_if_exists( array(
   if ($basename == 'watch' or $basename == 'log' ) {
   // This is used in the log popup for the export function. Not sure if it's used anywhere else
 ?>
-<script type="text/javascript" src="js/overlay.js"></script>
+<script src="js/overlay.js"></script>
 <?php } ?>
 <?php
   if ( $viewJsFile ) {
 ?>
-  <script type="text/javascript" src="<?php echo cache_bust($viewJsFile) ?>"></script>
+  <script src="<?php echo cache_bust($viewJsFile) ?>"></script>
 <?php
   }
 ?>

From 5a66969fd1e2a23d3349ba237be94722c72c1980 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Tue, 5 Mar 2019 14:34:34 -0500
Subject: [PATCH 057/214] change buttons from inputs to buttons. Add submit to
 montagereview.  get rid of onclick handlers

---
 web/skins/classic/views/filter.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php
index 9f95d8c58..2b9d495cd 100644
--- a/web/skins/classic/views/filter.php
+++ b/web/skins/classic/views/filter.php
@@ -293,8 +293,8 @@ for ( $i=0; $i < count($terms); $i++ ) {
 ?>
               <td><?php if ( count($terms) > 2 ) { echo htmlSelect("filter[Query][terms][$i][cbr]", $cbracketTypes, $term['cbr']); } else { ?>&nbsp;<?php } ?></td>
               <td>
-                <input type="button" data-on-click-this="addTerm" value="+"/>
-                <input type="button" data-on-click-this="delTerm" value="-" <?php echo count($terms) == 1 ? 'disabled' : '' ?>/>
+                <button type="button" data-on-click-this="addTerm">+</button>
+                <button type="button" data-on-click-this="delTerm" <?php echo count($terms) == 1 ? 'disabled' : '' ?>>-</button>
               </td>
             </tr>
 <?php
@@ -392,8 +392,8 @@ if ( ZM_OPT_MESSAGE ) {
               <input type="checkbox" name="filter[AutoDelete]" value="1"<?php if ( $filter->AutoDelete() ) { ?> checked="checked"<?php } ?> data-on-click-this="updateButtons"/>
             </p>
             <p><label><?php echo translate('FilterMoveEvents') ?></label>
-              <input type="checkbox" name="filter[AutoMove]" value="1"<?php if ( $filter->AutoMove() ) { ?> checked="checked"<?php } ?> onclick="updateButtons(this);if(this.checked){$j(this.form.elements['filter[AutoMoveTo]']).css('display','inline');}else{this.form.elements['filter[AutoMoveTo]'].hide();};"/>
-              <?php echo htmlSelect('filter[AutoMoveTo]', $storageareas, $filter->AutoMoveTo(), $filter->AutoMove() ? null : array('style'=>'display:none;' )); ?>
+              <input type="checkbox" name="filter[AutoMove]" value="1"<?php if ( $filter->AutoMove() ) { ?> checked="checked"<?php } ?> data-on-click-this="click_automove"/>
+              <?php echo htmlSelect('filter[AutoMoveTo]', $storageareas, $filter->AutoMoveTo(), $filter->AutoMove() ? null : array('style'=>'display:none;')); ?>
             </p>
             <p>
               <label for="background"><?php echo translate('BackgroundFilter') ?></label>
@@ -406,7 +406,8 @@ if ( ZM_OPT_MESSAGE ) {
         </div>
         <hr/>
         <div id="contentButtons">
-          <button type="submit" data-on-click-this="submitToEvents"><?php echo translate('ListMatches') ?></button>
+          <button type="button" data-on-click-this="submitToEvents"><?php echo translate('ListMatches') ?></button>
+          <button type="button" data-on-click-this="submitToMontageReview"><?php echo translate('ViewMatchesInMontageReview') ?></button>
           <button type="button" name="executeButton" id="executeButton" data-on-click-this="executeFilter"><?php echo translate('Execute') ?></button>
 <?php 
 if ( canEdit('Events') ) {

From f0f2b6a17ce282b404950870f32c1459945a05d9 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Tue, 5 Mar 2019 14:35:02 -0500
Subject: [PATCH 058/214] implement click_automove and submitToMontrageReview
 for onclick handlers

---
 web/skins/classic/views/js/filter.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/web/skins/classic/views/js/filter.js b/web/skins/classic/views/js/filter.js
index 3c2b561d6..bd9095763 100644
--- a/web/skins/classic/views/js/filter.js
+++ b/web/skins/classic/views/js/filter.js
@@ -63,6 +63,15 @@ function updateButtons(element) {
   }
 }
 
+function click_automove(element) {
+	updateButtons(this);
+	if ( this.checked ) {
+		$j(this.form.elements['filter[AutoMoveTo]']).css('display','inline');
+	} else {
+		this.form.elements['filter[AutoMoveTo]'].hide();
+	}
+}
+
 function checkValue( element ) {
   var rows = $j(element).closest('tbody').children();
   parseRows(rows);
@@ -83,6 +92,11 @@ function submitToEvents( element ) {
   form.action = thisUrl + '?view=events';
   history.replaceState(null, null, '?view=filter&' + $j(form).serialize());
 }
+function submitToMontageReview( element ) {
+  var form = element.form;
+  form.action = thisUrl + '?view=montagereview';
+  history.replaceState(null, null, '?view=filter&' + $j(form).serialize());
+}
 
 function executeFilter( element ) {
   var form = element.form;

From abfb5642c8c39decb2090445ba7c19a039d72fa3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 6 Mar 2019 09:46:28 -0500
Subject: [PATCH 059/214] cleanup and document updateFrameRate

---
 src/zm_stream.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/zm_stream.cpp b/src/zm_stream.cpp
index bff550a77..335091946 100644
--- a/src/zm_stream.cpp
+++ b/src/zm_stream.cpp
@@ -70,14 +70,16 @@ void StreamBase::updateFrameRate(double fps) {
   }
   base_fps = fps;
   effective_fps = (base_fps*abs(replay_rate))/ZM_RATE_BASE;
-  Debug(3, "FPS:%.2f, MXFPS:%.2f, BFPS:%.2f, EFPS:%.2f, FM:%d", fps, maxfps, base_fps, effective_fps, frame_mod);
+  Debug(3, "FPS:%.2f, MXFPS:%.2f, BFPS:%.2f, EFPS:%.2f, FM:%d",
+      fps, maxfps, base_fps, effective_fps, frame_mod);
   // Min frame repeat?
-  while( effective_fps > maxfps ) {
+  // We want to keep the frame skip easy... problem is ... if effective = 31 and max = 30 then we end up with 15.5 fps.  
+  while ( effective_fps > maxfps ) {
     effective_fps /= 2.0;
     frame_mod *= 2;
     Debug(3, "EffectiveFPS:%.2f, FrameMod:%d", effective_fps, frame_mod);
   }
-}
+} // void StreamBase::updateFrameRate(double fps)
 
 bool StreamBase::checkCommandQueue() {
   if ( sd >= 0 ) {

From 9b713a489d2696a7578272823d7b53a2ed1ed3a2 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 6 Mar 2019 14:50:36 -0500
Subject: [PATCH 060/214] fix sleep time by using a comparison between the
 frame display time and the distance between now and when we started playing.
 handle infinite fps

---
 src/zm_eventstream.cpp  | 48 +++++++++++++++++++++++++----------------
 src/zm_ffmpeg_input.cpp | 40 ++++++++++++++++++----------------
 src/zm_stream.cpp       |  2 +-
 src/zm_videostore.cpp   |  9 --------
 4 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/src/zm_eventstream.cpp b/src/zm_eventstream.cpp
index 03996e49c..d46c9b385 100644
--- a/src/zm_eventstream.cpp
+++ b/src/zm_eventstream.cpp
@@ -228,7 +228,7 @@ bool EventStream::loadEventData(uint64_t event_id) {
     //timestamp = atof(dbrow[1]);
     double delta = atof(dbrow[2]);
     int id_diff = id - last_id;
-    double frame_delta = id_diff ? (delta-last_delta)/id_diff : (delta - last_delta);
+    double frame_delta = id_diff ? (delta-last_delta)/id_diff : (delta-last_delta);
     // Fill in data between bulk frames
     if ( id_diff > 1 ) {
       for ( int i = last_id+1; i < id; i++ ) {
@@ -262,8 +262,8 @@ bool EventStream::loadEventData(uint64_t event_id) {
         );
   }
   if ( mysql_errno( &dbconn ) ) {
-    Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
-    exit( mysql_errno( &dbconn ) );
+    Error("Can't fetch row: %s", mysql_error(&dbconn));
+    exit(mysql_errno(&dbconn));
   }
 
   mysql_free_result(result);
@@ -676,10 +676,6 @@ Debug(1, "Loading image");
         // Get the frame from the mp4 input
         Debug(1,"Getting frame from ffmpeg");
         AVFrame *frame;
-        if ( curr_frame_id == 1 ) {
-          // Special case, first frame, we want to send the initial keyframe.
-          frame = ffmpeg_input->get_frame( ffmpeg_input->get_video_stream_id(), 0 );
-        }
         FrameData *frame_data = &event_data->frames[curr_frame_id-1];
         frame = ffmpeg_input->get_frame( ffmpeg_input->get_video_stream_id(), frame_data->offset );
         if ( frame ) {
@@ -790,7 +786,9 @@ void EventStream::runStream() {
 
   Debug(3, "frame rate is: (%f)", (double)event_data->frame_count/event_data->duration);
   updateFrameRate((double)event_data->frame_count/event_data->duration);
-    gettimeofday(&start, NULL);
+  gettimeofday(&start, NULL);
+  uint64_t start_usec = start.tv_sec * 1000000 + start.tv_usec;
+  uint64_t last_frame_offset = 0;
 
   while ( !zm_terminate ) {
     gettimeofday(&now, NULL);
@@ -868,7 +866,7 @@ Debug(3,"cur_frame_id (%d-1) mod frame_mod(%d)",curr_frame_id, frame_mod);
         Debug(3,"delta %u = base_fps(%f)/effective fps(%f)", delta_us, base_fps, effective_fps);
         // but must not exceed maxfps
         delta_us = max(delta_us, 1000000 / maxfps);
-        Debug(3,"delta %u = base_fps(%f)/effective fps(%f)", delta_us, base_fps, effective_fps);
+        Debug(3,"delta %u = base_fps(%f)/effective fps(%f) from 30fps", delta_us, base_fps, effective_fps);
         send_frame = true;
       }
     } else if ( step != 0 ) {
@@ -896,13 +894,11 @@ Debug(3,"cur_frame_id (%d-1) mod frame_mod(%d)",curr_frame_id, frame_mod);
       //Debug(3,"Not sending frame");
     }
 
-
     curr_stream_time = frame_data->timestamp;
 
     if ( !paused ) {
-      curr_frame_id += (replay_rate>0) ? 1 : -1;
-
-
+      // +/- 1? What if we are skipping frames?
+      curr_frame_id += (replay_rate>0) ? frame_mod : -1*frame_mod;
 
       if ( (mode == MODE_SINGLE) && ((unsigned int)curr_frame_id == event_data->frame_count) ) {
         Debug(2, "Have mode==MODE_SINGLE and at end of event, looping back to start");
@@ -910,14 +906,28 @@ Debug(3,"cur_frame_id (%d-1) mod frame_mod(%d)",curr_frame_id, frame_mod);
       }
       frame_data = &event_data->frames[curr_frame_id-1];
 
+      // sending the frame may have taken some time, so reload now
+      gettimeofday(&now, NULL);
       uint64_t now_usec = (now.tv_sec * 1000000 + now.tv_usec);
-      uint64_t start_usec = (start.tv_sec * 1000000 + start.tv_usec);
-      uint64_t frame_delta = frame_data->delta*1000000;
+      // frame_data->delta is the time since last frame as a float in seconds
+      // but what if we are skipping frames? We need the distance from the last frame sent
+      // Also, what about reverse? needs to be absolute value
 
-      delta_us = frame_delta - (now_usec - start_usec);
-      Debug(2, "New delta_us now %" PRIu64 " - start %" PRIu64 " = %d - frame %" PRIu64 " = %d",
-          now_usec, start_usec, now_usec-start_usec, frame_delta,
-          delta_us);
+      // There are two ways to go about this, not sure which is correct.
+      // you can calculate the relationship between now and the start
+      // or calc the relationship from the last frame.  I think from the start is better as it self-corrects
+
+      if ( last_frame_offset ) {
+        // We assume that we are going forward and the next frame is in the future.
+        delta_us = frame_data->offset * 1000000 - (now_usec-start_usec);
+       // - (now_usec - start_usec);
+        Debug(2, "New delta_us now %" PRIu64 " - start %" PRIu64 " = %d offset %" PRId64 " - elapsed = %dusec",
+            now_usec, start_usec, now_usec-start_usec, frame_data->offset * 1000000, delta_us);
+      } else {
+        Debug(2, "No last frame_offset, no sleep");
+        delta_us = 0;
+      }
+      last_frame_offset = frame_data->offset * 1000000;
 
       if ( send_frame && type != STREAM_MPEG ) {
         if ( delta_us > 0 ) {
diff --git a/src/zm_ffmpeg_input.cpp b/src/zm_ffmpeg_input.cpp
index 9f0336bbf..d9c7c2fd3 100644
--- a/src/zm_ffmpeg_input.cpp
+++ b/src/zm_ffmpeg_input.cpp
@@ -110,7 +110,7 @@ AVFrame *FFmpeg_Input::get_frame( int stream_id ) {
   char errbuf[AV_ERROR_MAX_STRING_SIZE];
 
   while ( !frameComplete ) {
-    int ret = av_read_frame( input_format_context, &packet );
+    int ret = av_read_frame(input_format_context, &packet);
     if ( ret < 0 ) {
       av_strerror(ret, errbuf, AV_ERROR_MAX_STRING_SIZE);
       if (
@@ -135,9 +135,10 @@ AVFrame *FFmpeg_Input::get_frame( int stream_id ) {
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
       ret = avcodec_send_packet(context, &packet);
       if ( ret < 0 ) {
-        av_strerror( ret, errbuf, AV_ERROR_MAX_STRING_SIZE );
-        Error( "Unable to send packet at frame %d: %s, continuing", streams[packet.stream_index].frame_count, errbuf );
-        zm_av_packet_unref( &packet );
+        av_strerror(ret, errbuf, AV_ERROR_MAX_STRING_SIZE);
+        Error("Unable to send packet at frame %d: %s, continuing",
+            streams[packet.stream_index].frame_count, errbuf);
+        zm_av_packet_unref(&packet);
         continue;
       }
 
@@ -159,12 +160,12 @@ AVFrame *FFmpeg_Input::get_frame( int stream_id ) {
       }
     } else {
 #endif
-  if ( frame ) {
-    av_frame_free(&frame);
-    frame = zm_av_frame_alloc();
-  } else {
-    frame = zm_av_frame_alloc();
-  }
+      if ( frame ) {
+        av_frame_free(&frame);
+        frame = zm_av_frame_alloc();
+      } else {
+        frame = zm_av_frame_alloc();
+      }
       //Debug(1,"Getting frame %d", streams[packet.stream_index].frame_count);
       ret = avcodec_receive_frame(context, frame);
       if ( ret < 0 ) {
@@ -181,12 +182,12 @@ AVFrame *FFmpeg_Input::get_frame( int stream_id ) {
 
     frameComplete = 1;
 # else
-  if ( frame ) {
-    av_frame_free(&frame);
-    frame = zm_av_frame_alloc();
-  } else {
-    frame = zm_av_frame_alloc();
-  }
+    if ( frame ) {
+      av_frame_free(&frame);
+      frame = zm_av_frame_alloc();
+    } else {
+      frame = zm_av_frame_alloc();
+    }
     ret = zm_avcodec_decode_video(context, frame, &frameComplete, &packet);
     if ( ret < 0 ) {
       av_strerror(ret, errbuf, AV_ERROR_MAX_STRING_SIZE);
@@ -198,7 +199,7 @@ AVFrame *FFmpeg_Input::get_frame( int stream_id ) {
 #endif
   } // end if it's the right stream
 
-    zm_av_packet_unref( &packet );
+    zm_av_packet_unref(&packet);
 
   } // end while ! frameComplete
   return frame;
@@ -220,7 +221,7 @@ AVFrame *FFmpeg_Input::get_frame( int stream_id, double at ) {
       return frame;
     }
     if ( frame->pts < seek_target  ) {
-      Debug(2, "Frame pts %" PRId64 " pkt_pts %" PRId64 " duration %" PRId64, frame->pts, frame->pkt_pts, frame->pkt_duration);
+      Debug(2, "Frame pts %" PRId64 " duration %" PRId64, frame->pts, frame->pkt_duration);
       while ( frame && (frame->pts < seek_target) ) {
         if ( ! get_frame(stream_id) ) 
           return frame;
@@ -237,9 +238,10 @@ AVFrame *FFmpeg_Input::get_frame( int stream_id, double at ) {
     }
 
   } else {
+    // No previous frame... are we asking for first frame?
     // Must go for a keyframe
     if ( ( ret = av_seek_frame(input_format_context, stream_id, seek_target, 
-            AVSEEK_FLAG_FRAME
+            AVSEEK_FLAG_BACKWARD | AVSEEK_FLAG_FRAME
             ) < 0 ) ) {
       Error("Unable to seek in stream");
       return NULL;
diff --git a/src/zm_stream.cpp b/src/zm_stream.cpp
index b34773ea5..20d4f1632 100644
--- a/src/zm_stream.cpp
+++ b/src/zm_stream.cpp
@@ -62,7 +62,7 @@ bool StreamBase::checkInitialised() {
 
 void StreamBase::updateFrameRate(double fps) {
   frame_mod = 1;
-  if ( (fps < 0) || !fps ) {
+  if ( (fps < 0) || !fps || isinf(fps) ) {
     Debug(1, "Zero or negative fps %f in updateFrameRate. Setting frame_mod=1 and effective_fps=0.0", fps);
     effective_fps = 0.0;
     base_fps = 0.0;
diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 30a482f75..849c9575f 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -979,13 +979,6 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
     // decoded data
     Debug(2, "Converting %d to %d samples", in_frame->nb_samples, out_frame->nb_samples);
   #if defined(HAVE_LIBSWRESAMPLE)
-#if 0
-    ret = swr_convert(resample_ctx,
-                       out_frame->data, frame_size,
-                       (const uint8_t**)in_frame->data,
-                       in_frame->nb_samples
-                      );
-#else
     ret = swr_convert_frame(resample_ctx, out_frame, in_frame);
     av_frame_unref(in_frame);
     if ( ret < 0 ) {
@@ -993,7 +986,6 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
             av_make_error_string(ret).c_str());
       return 0;
     }
-#endif
     if ((ret = av_audio_fifo_realloc(fifo, av_audio_fifo_size(fifo) + out_frame->nb_samples)) < 0) {
       Error("Could not reallocate FIFO");
       return 0;
@@ -1031,7 +1023,6 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
       return 0;
     }
 
-  #if defined(HAVE_LIBAVRESAMPLE)
     int samples_available = avresample_available(resample_ctx);
     if ( samples_available < frame_size ) {
       Debug(1, "Not enough samples yet (%d)", samples_available);

From d737e81e216671e03d2cea18d7d30f2b265c605f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 6 Mar 2019 14:57:05 -0500
Subject: [PATCH 061/214] bump version for DefaultCodec in monitors

---
 db/zm_update-1.33.4.sql | 12 ++++++++++++
 version                 |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 db/zm_update-1.33.4.sql

diff --git a/db/zm_update-1.33.4.sql b/db/zm_update-1.33.4.sql
new file mode 100644
index 000000000..cffa35aa5
--- /dev/null
+++ b/db/zm_update-1.33.4.sql
@@ -0,0 +1,12 @@
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+      AND table_name = 'Monitors'
+      AND column_name = 'DefaultCodec'
+    ) > 0,
+    "SELECT 'Column DefaultCodec already exists in Monitors'",
+    "ALTER TABLE Monitors ADD `DefaultCodec` enum('auto','H264','H265','MJPEG') NOT NULL default 'auto', AFTER `DefaultScale`"
+    ));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/version b/version
index c7f962f33..9f406e0c8 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.33.3
+1.33.4

From e6220e9d07cac046b39fd00c17125f1eb1075cde Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <github@matthew.noorenberghe.com>
Date: Sun, 10 Mar 2019 20:56:08 -0700
Subject: [PATCH 062/214] Fix eslint issues in cycle.js

---
 web/skins/classic/views/js/cycle.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/web/skins/classic/views/js/cycle.js b/web/skins/classic/views/js/cycle.js
index 9422890c8..4e6de5320 100644
--- a/web/skins/classic/views/js/cycle.js
+++ b/web/skins/classic/views/js/cycle.js
@@ -26,10 +26,11 @@ function cycleNext() {
   window.location.replace('?view=cycle&mid='+monitorData[monIdx].id+'&mode='+mode, cycleRefreshTimeout);
 }
 function cyclePrev() {
-  if ( monIdx )
+  if (monIdx) {
     monIdx -= 1;
-  else
-    monIdx = monitorData.length-1;
+  } else {
+    monIdx = monitorData.length - 1;
+  }
 
   window.location.replace('?view=cycle&mid='+monitorData[monIdx].id+'&mode='+mode, cycleRefreshTimeout);
 }
@@ -82,9 +83,9 @@ function changeScale() {
   var scale = $('scale').get('value');
   $('width').set('value', 'auto');
   $('height').set('value', 'auto');
-  Cookie.write('zmCycleScale', scale, { duration: 10*365 });
-  Cookie.write('zmCycleWidth', 'auto', { duration: 10*365 });
-  Cookie.write('zmCycleHeight', 'auto', { duration: 10*365 });
+  Cookie.write('zmCycleScale', scale, {duration: 10*365});
+  Cookie.write('zmCycleWidth', 'auto', {duration: 10*365});
+  Cookie.write('zmCycleHeight', 'auto', {duration: 10*365});
   var newWidth = ( monitorData[monIdx].width * scale ) / SCALE_BASE;
   var newHeight = ( monitorData[monIdx].height * scale ) / SCALE_BASE;
 

From ac547e0d5d1da2d9935af59ce23681567a367c3b Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <github@matthew.noorenberghe.com>
Date: Sun, 10 Mar 2019 20:52:28 -0700
Subject: [PATCH 063/214] Don't scroll to the top of the page when force/cancel
 alarm is clicked

---
 web/skins/classic/views/js/watch.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index a0594825b..a30a05fee 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -448,10 +448,16 @@ function cmdEnableAlarms() {
 
 function cmdForceAlarm() {
   alarmCmdReq.send(alarmCmdParms+"&command=forceAlarm");
+  if (window.event) {
+    window.event.preventDefault();
+  }
 }
 
 function cmdCancelForcedAlarm() {
   alarmCmdReq.send(alarmCmdParms+"&command=cancelForcedAlarm");
+  if (window.event) {
+    window.event.preventDefault();
+  }
   return false;
 }
 

From 056b96f7fcb1a4747e015a9b6193636c0c8f5c5f Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <github@matthew.noorenberghe.com>
Date: Sun, 10 Feb 2019 21:27:57 -0800
Subject: [PATCH 064/214] API: Monitor and Event 'index' SQLi. Fixes #2099

---
 .../Controller/Component/FilterComponent.php  | 84 +++++++++++++++++--
 web/api/app/Controller/EventsController.php   |  5 +-
 web/api/app/Controller/MonitorsController.php |  7 +-
 3 files changed, 86 insertions(+), 10 deletions(-)

diff --git a/web/api/app/Controller/Component/FilterComponent.php b/web/api/app/Controller/Component/FilterComponent.php
index 326c1ce45..798452793 100644
--- a/web/api/app/Controller/Component/FilterComponent.php
+++ b/web/api/app/Controller/Component/FilterComponent.php
@@ -1,14 +1,88 @@
 <?php
 App::uses('Component', 'Controller');
+
 class FilterComponent extends Component {
 
+	/**
+	 * Valid MySQL operands that can be used from namedParams with two operands
+	 * where the right-hand side (RHS) is a literal.
+	 * These came from https://dev.mysql.com/doc/refman/8.0/en/non-typed-operators.html
+	 */
+	public $twoOperandSQLOperands = array(
+					      'AND',
+					      '&&',
+					      '=',
+					      //':=',
+					      //'BETWEEN ... AND ...',
+					      //'BINARY',
+					      '&',
+					      '~',
+					      //'|',
+					      '^',
+					      //'CASE',
+					      'DIV',
+					      '/',
+					      '=',
+					      '<=>',
+					      '>',
+					      '>=',
+					      'IS',
+					      'IS NOT',
+					      //'IS NOT NULL',
+					      //'IS NULL',
+					      //'->',
+					      //'->>',
+					      '<<',
+					      '<',
+					      '<=',
+					      'LIKE',
+					      '-',
+					      '%',
+					      'MOD',
+					      //'NOT',
+					      //'!',
+					      //'NOT BETWEEN ... AND ...',
+					      '!=',
+					      '<>',
+					      'NOT LIKE',
+					      'NOT REGEXP',
+					      // `or` operators aren't safe as they can
+					      // be used to skip an existing condition
+					      // enforcing access to only certain
+					      // monitors/events.
+					      //'||',
+					      //'OR',
+					      '+',
+					      'REGEXP',
+					      '>>',
+					      'RLIKE',
+					      'SOUNDS LIKE',
+					      //'*',
+					      '-',
+					      //'XOR',
+					      );
+
 	// Build a CakePHP find() condition based on the named parameters
 	// that are passed in
 	public function buildFilter($namedParams) {
-		if ($namedParams) { 
-			$conditions = array();
-
+		$conditions = array();
+		if ($namedParams) {
 			foreach ($namedParams as $attribute => $value) {
+				// We need to sanitize $attribute to avoid SQL injection.
+				$lhs = trim($attribute);
+				$matches = NULL;
+				if (preg_match('/^(?P<field>[a-z0-9]+)(?P<operator>.+)?$/i', $lhs, $matches) !== 1) {
+					throw new Exception('Invalid argument before `:`: ' . $lhs);
+				}
+				$operator = trim($matches['operator']);
+
+				// Only allow operators on our allow list. No operator
+				// specified defaults to `=` by cakePHP.
+				if ($operator != '' && !in_array($operator, $this->twoOperandSQLOperands)) {
+					throw new Exception('Invalid operator: ' . $operator);
+				}
+
+				$lhs = '`' . $matches['field'] . '` ' . $operator;
 				// If the named param contains an array, we want to turn it into an IN condition
 				// Otherwise, we add it right into the $conditions array
 				if (is_array($value)) {
@@ -18,10 +92,10 @@ class FilterComponent extends Component {
 						array_push($array, $term);
 					}
 
-					$query = array($attribute => $array);
+					$query = array($lhs => $array);
 					array_push($conditions, $query);
 				} else {
-					$conditions[$attribute] = $value;
+					$conditions[$lhs] = $value;
 				}
 			}
 
diff --git a/web/api/app/Controller/EventsController.php b/web/api/app/Controller/EventsController.php
index cf8ca8f37..4f706bec8 100644
--- a/web/api/app/Controller/EventsController.php
+++ b/web/api/app/Controller/EventsController.php
@@ -44,9 +44,8 @@ class EventsController extends AppController {
     }
 
     if ( $this->request->params['named'] ) {
-      //$this->FilterComponent = $this->Components->load('Filter');
-      //$conditions = $this->FilterComponent->buildFilter($this->request->params['named']);
-      $conditions = $this->request->params['named'];
+      $this->FilterComponent = $this->Components->load('Filter');
+      $conditions = $this->FilterComponent->buildFilter($this->request->params['named']);
     } else {
       $conditions = array();
     }
diff --git a/web/api/app/Controller/MonitorsController.php b/web/api/app/Controller/MonitorsController.php
index 185a06c84..fd0d1e94a 100644
--- a/web/api/app/Controller/MonitorsController.php
+++ b/web/api/app/Controller/MonitorsController.php
@@ -40,8 +40,7 @@ class MonitorsController extends AppController {
 
     if ( $this->request->params['named'] ) {
       $this->FilterComponent = $this->Components->load('Filter');
-      //$conditions = $this->FilterComponent->buildFilter($this->request->params['named']);
-      $conditions = $this->request->params['named'];
+      $conditions = $this->FilterComponent->buildFilter($this->request->params['named']);
     } else {
       $conditions = array();
     }
@@ -315,6 +314,10 @@ class MonitorsController extends AppController {
       throw new NotFoundException(__('Invalid monitor'));
     }
 
+    if (preg_match('/^[a-z]+$/i', $daemon) !== 1) {
+      throw new BadRequestException(__('Invalid command'));
+    }
+
     $monitor = $this->Monitor->find('first', array(
       'fields' => array('Id', 'Type', 'Device'),
       'conditions' => array('Id' => $id)

From abb6ef1688b145670d351b14370e6f52aec8483e Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <github@matthew.noorenberghe.com>
Date: Sun, 10 Feb 2019 21:34:49 -0800
Subject: [PATCH 065/214] API: Escape 'named' params for SQLi in two more Event
 endpoints.

Fixes #2099
---
 web/api/app/Controller/EventsController.php | 54 ++++++++++++++++-----
 1 file changed, 42 insertions(+), 12 deletions(-)

diff --git a/web/api/app/Controller/EventsController.php b/web/api/app/Controller/EventsController.php
index 4f706bec8..959ccc596 100644
--- a/web/api/app/Controller/EventsController.php
+++ b/web/api/app/Controller/EventsController.php
@@ -233,18 +233,34 @@ class EventsController extends AppController {
 
   public function search() {
     $this->Event->recursive = -1;
+    // Unmodified conditions to pass to find()
+    $find_conditions = array();
+    // Conditions to be filtered by buildFilter
     $conditions = array();
 
     foreach ($this->params['named'] as $param_name => $value) {
-      // Transform params into mysql
-      if ( preg_match('/interval/i', $value, $matches) ) {
-        $condition = array("$param_name >= (date_sub(now(), $value))");
+      // Transform params into conditions
+      if ( preg_match('/^\s?interval\s?/i', $value) ) {
+        if (preg_match('/^[a-z0-9]+$/i', $param_name) !== 1) {
+          throw new Exception('Invalid field name: ' . $param_name);
+        }
+        $matches = NULL;
+        $value = preg_replace('/^\s?interval\s?/i', '', $value);
+        if (preg_match('/^(?P<expr>[ -.:0-9\']+)\s+(?P<unit>[_a-z]+)$/i', trim($value), $matches) !== 1) {
+          throw new Exception('Invalid interval: ' . $value);
+        }
+        $expr = trim($matches['expr']);
+        $unit = trim($matches['unit']);
+        array_push($find_conditions, "$param_name >= DATE_SUB(NOW(), INTERVAL $expr $unit)");
       } else {
-        $condition = array($param_name => $value);
+        $conditions[$param_name] = $value;
       }
-      array_push($conditions, $condition);
     }
 
+    $this->FilterComponent = $this->Components->load('Filter');
+    $conditions = $this->FilterComponent->buildFilter($conditions);
+    array_push($conditions, $find_conditions);
+
     $results = $this->Event->find('all', array(
       'conditions' => $conditions
     ));
@@ -260,18 +276,32 @@ class EventsController extends AppController {
   // consoleEvents/1 hour/AlarmFrames >=: 1/AlarmFrames <=: 20.json
 
   public function consoleEvents($interval = null) {
+    $matches = NULL;
+    // https://dev.mysql.com/doc/refman/5.5/en/expressions.html#temporal-intervals
+    // Examples: `'1-1' YEAR_MONTH`, `'-1 10' DAY_HOUR`, `'1.999999' SECOND_MICROSECOND`
+    if (preg_match('/^(?P<expr>[ -.:0-9\']+)\s+(?P<unit>[_a-z]+)$/i', trim($interval), $matches) !== 1) {
+      throw new Exception('Invalid interval: ' . $interval);
+    }
+    $expr = trim($matches['expr']);
+    $unit = trim($matches['unit']);
+
     $this->Event->recursive = -1;
     $results = array();
+    $this->FilterComponent = $this->Components->load('Filter');
+    $conditions = $this->FilterComponent->buildFilter($conditions);
+    array_push($conditions, array("StartTime >= DATE_SUB(NOW(), INTERVAL $expr $unit)"));
 
-    $moreconditions = '';
-    foreach ($this->request->params['named'] as $name => $param) {
-      $moreconditions = $moreconditions . ' AND '.$name.$param;
-    }  
-
-    $query = $this->Event->query("SELECT MonitorId, COUNT(*) AS Count FROM Events WHERE (StartTime >= (DATE_SUB(NOW(), interval $interval)) $moreconditions) GROUP BY MonitorId;");
+    $query = $this->Event->find('all', array(
+                                             'fields' => array(
+                                                               'MonitorId',
+                                                               'COUNT(*) AS Count',
+                                                               ),
+                                             'conditions' => $conditions,
+                                             'group' => 'MonitorId',
+    ));
 
     foreach ($query as $result) {
-      $results[$result['Events']['MonitorId']] = $result[0]['Count'];
+      $results[$result['Event']['MonitorId']] = $result[0]['Count'];
     }
 
     $this->set(array(

From 3c31dd63cedf2365639600979b3fb5fe010c6a68 Mon Sep 17 00:00:00 2001
From: Matthew Noorenberghe <github@matthew.noorenberghe.com>
Date: Sun, 10 Mar 2019 20:40:32 -0700
Subject: [PATCH 066/214] Use zm_session_start() for API auth. Fixes #2547

---
 web/includes/auth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/includes/auth.php b/web/includes/auth.php
index 5ce960388..6b061f7fc 100644
--- a/web/includes/auth.php
+++ b/web/includes/auth.php
@@ -211,7 +211,7 @@ global $user;
 if ( ZM_OPT_USE_AUTH ) {
   $close_session = 0;
   if ( !is_session_started() ) {
-    session_start();
+    zm_session_start();
     $close_session = 1;
   }
 

From 6ee689f4bfa57e04002c64ff145af13b0bf11fe4 Mon Sep 17 00:00:00 2001
From: Chris <cnighswonger@users.noreply.github.com>
Date: Tue, 12 Mar 2019 11:09:57 -0400
Subject: [PATCH 067/214] Dahua control improvements (#2552)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Adding a presetHome method

The Dahua protocol does not appear to support a preset Home feature. We could
allow the user to assign a preset slot as the "home" slot. Dahua does appear
to support naming presets which may lend itself to this sort of thing. At
this point, we'll just send the camera back to center and zoom wide. (0°,0°,0)

* Adjusting naming of private methods and adding POD

* Adding relative focus methods

This patch also adds the return value of the get request used to
send the command to the camera.

Furthermore, it fixes a small bug in the authentication of requests
sent to the camera after the connection is opened. I really have no
idea why the problem occurred and it appeared to have no practical
effect on the execution of the command. It showed up when I enabled
debug, so this attempts to fix it or at least quiet it.

* Adding POD for the new relative focus methods

Also doing a bit of cleanup on POD in general.

* Adding some documentation to demystify control motion types

This was not clear to me at the outset, and I could not locate existing
documentation which explained the prioritization and exclusion aspects.

Maybe it will help someone else.

* Renaming private methods and adding more POD

This patch renames private methods by prefixing an underscore to
them. This at least helps visually distinguish them as private
when reading through the code.

It also adds more documentation on public methods.

* Grouping all relative motion methods together

This makes for easier reading.

* Adding in a reset method from Issue #2414

This method was supplied by kobold81 who got it from
bobylapointe69300 who posted it in the following forum post:

https://forums.zoneminder.com/viewtopic.php?f=9&t=27000&p=104601&hilit=dahua#p104601

This patch also includes some POD cleanup.

* Adding continuous movement methods and fixing reset

This patch adds the continuous movement methods provided in the patch
for Issue #2414. Note that these are not truly continuous as they
result in movement for less than a ms. Adapting the code to support
truly continuous movement would invovle some considerable work.

This patch also correct the reset method and adds a reboot method.
The two are different creatures with different effects.

POD added as well.

* Removing redundant get request code

Two slightly different versions of code are currently used to post
the get request to the camera in order to execute commands. This
patch modifies the open method in order to allow its re-use and
removes redundant code.

Note: This is the first installment on changes towards improving
the way the HTTP transactions are handled.

* Making authenication failures fatal

Authentication failures result in camera commands not being executed.
They may as well be fatal and return the general reason to the user
directly.

* Work on persistent sessions

I think this will have to wait since it appears that the camera expects
some sort of keepalive/heartbeat signal to keep the session open.

* Restoring accidentally deleted code
---
 .../lib/ZoneMinder/Control/Dahua.pm           | 396 +++++++++++++++---
 1 file changed, 329 insertions(+), 67 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Dahua.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Dahua.pm
index 6cb55d3a6..10a37e102 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Dahua.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Dahua.pm
@@ -39,6 +39,8 @@ sub AUTOLOAD
     my $class = ref($self) || croak( "$self not object" );
     my $name = $AUTOLOAD;
     $name =~ s/.*://;
+    ## This seems odd... if the method existed would we even be here?
+    ## https://perldoc.perl.org/perlsub.html#Autoloading
     if ( exists($self->{$name}) )
     {
         return( $self->{$name} );
@@ -46,9 +48,17 @@ sub AUTOLOAD
     Fatal( "Can't access $name member of object of class $class" );
 }
 
+# FIXME: Do we really have to open a new connection every time?
+
+#Digest usernbme="bdmin", reblm="Login to 4K05DB3PAJE98BE", nonae="1720242756",
+#uri="/agi-bin/ptz.agi?bation=getStbtus&ahbnnel=1", response="10dd925b26ebd559353734635b859b8b",
+#opbque="1a99677524b4ae63bbe3a132b2e9b38e3b163ebd", qop=buth, na=00000001, anonae="ab1bb5d43aa5d542"
+
 sub open
 {
+    #Debug("&open invoked by: " . (caller(1))[3]);
     my $self = shift;
+    my $cgi = shift || '/cgi-bin/configManager.cgi?action=getConfig&name=Ptz';
     $self->loadMonitor();
 
     # The Dahua camera firmware API supports the concept of having multiple
@@ -73,60 +83,55 @@ sub open
     }
 
     use LWP::UserAgent;
-    $self->{ua} = LWP::UserAgent->new;
+    $self->{ua} = LWP::UserAgent->new(keep_alive => 1);
     $self->{ua}->agent("ZoneMinder Control Agent/".$ZoneMinder::Base::ZM_VERSION);
     $self->{state} = 'closed';
 #   credentials:  ("ip:port" (no prefix!), realm (string), username (string), password (string)
-    Debug("sendCmd credentials control address:'".$ADDRESS
-           ."'  realm:'" . $REALM
-           . "'  username:'" . $USERNAME
-           . "'  password:'".$PASSWORD
-           ."'"
-    ); 
     $self->{ua}->credentials($ADDRESS, $REALM, $USERNAME, $PASSWORD);
 
     # Detect REALM
-    my $get_config_url = $PROTOCOL . $ADDRESS . "/cgi-bin/configManager.cgi?action=getConfig&name=Ptz";
-    my $req = HTTP::Request->new(GET=>$get_config_url);
+    my $url = $PROTOCOL . $ADDRESS . $cgi;
+    my $req = HTTP::Request->new(GET=>$url);
     my $res = $self->{ua}->request($req);
 
     if ($res->is_success) {
         $self->{state} = 'open';
-        return;
+        return 1;
     }
 
     if ( $res->status_line() eq '401 Unauthorized' ) {
         my $headers = $res->headers();
-        foreach my $k (keys %$headers) {
-            Debug("Initial Header $k => $$headers{$k}");
-        }
-
         if ($$headers{'www-authenticate'}) {
             my ($auth, $tokens) = $$headers{'www-authenticate'} =~ /^(\w+)\s+(.*)$/;
+            Debug("Tokens: " . $tokens);
+            ## FIXME: This is necessary because the Dahua spec does not match reality
             if ($tokens =~ /\w+="([^"]+)"/i) {
                 if ($REALM ne $1) {
                     $REALM = $1;
                     Debug("Changing REALM to '" . $REALM . "'");
                     $self->{ua}->credentials($ADDRESS, $REALM, $USERNAME, $PASSWORD);
-                    my $req = HTTP::Request->new(GET=>$get_config_url);
+                    my $req = HTTP::Request->new(GET=>$url);
                     $res = $self->{ua}->request($req);
+
                     if ($res->is_success()) {
                         $self->{state} = 'open';
-                        return;
+                        Debug('Authentication succeeded...');
+                        return 1;
                     }
                     Debug('Authentication still failed after updating REALM' . $res->status_line);
                     $headers = $res->headers();
                     foreach my $k ( keys %$headers ) {
                         Debug("Initial Header $k => $$headers{$k}");
                     }  # end foreach
-                } else {
-                    Error('Authentication failed, not a REALM problem');
+                } else {        ## NOTE: Each of these else conditions is fatal as the command will not be
+                                ##       executed. No use going further.
+                    Fatal('Authentication failed: Check username and password.');
                 }
             } else {
-                Error('Failed to match realm in tokens');
+                Fatal('Authentication failed: Incorrect realm.');
             } # end if
         } else {
-            Error('No WWW-Authenticate Header');
+            Fatal('Authentication failed: No www-authenticate header returned.');
         } # end if headers
     } # end if $res->status_line() eq '401 Unauthorized'
 }
@@ -146,45 +151,40 @@ sub printMsg
     Debug( $msg."[".$msg_len."]" );
 }
 
-sub sendGetRequest {
+sub _sendGetRequest {
     my $self = shift;
     my $url_path = shift;
 
-    my $result = undef;
+    # Attempt to reuse the connection
+
+    # FIXME: I think we need some sort of keepalive/heartbeat sent to the camera
+    #        in order to keep the session alive. As it is, it appears that the
+    #        ua's authentication times out or some such.
+    #
+    # This might be of some use:
+    #   {"method":"global.keepAlive","params":{"timeout":300,"active":false},"id":1518,"session":"dae233a51c0693519395209b271411b6"}[!http]
+    #   The web browser interface POSTs commands as JSON using js
 
     my $url = $PROTOCOL . $ADDRESS . $url_path;
-    my $req = HTTP::Request->new(GET=>$url);
-
+    my $req = HTTP::Request->new(GET => $url);
     my $res = $self->{ua}->request($req);
 
     if ($res->is_success) {
-        $result = !undef;
+        return 1;
     } else {
-        if ($res->status_line() eq '401 Unauthorized') {
-            Debug("Error check failed, trying again: USERNAME: $USERNAME realm: $REALM password: " . $PASSWORD);
-            Debug("Content was " . $res->content() );
-            my $res = $self->{ua}->request($req);
-            if ($res->is_success) {
-                $result = !undef;
-            } else {
-                Error("Content was " . $res->content() );
-            }
-        }
-        if ( ! $result ) {
-            Error("Error check failed: '".$res->status_line());
-        }
+        return($self->open($url_path)); # if we have to, open a new connection
     }
-    return($result);
 }
 
-sub sendPtzCommand
+sub _sendPtzCommand
 {
     my $self = shift;
     my $action = shift;
     my $command_code = shift;
-    my $arg1 = shift;
-    my $arg2 = shift;
-    my $arg3 = shift;
+    my $arg1 = shift || 0;
+    my $arg2 = shift || 0;
+    my $arg3 = shift || 0;
+    my $arg4 = shift || 0;
 
     my $channel = $self->{dahua_channel_number};
 
@@ -194,10 +194,12 @@ sub sendPtzCommand
     $url_path .= "code=" . $command_code . "&";
     $url_path .= "arg1=" . $arg1 . "&";
     $url_path .= "arg2=" . $arg2 . "&";
-    $url_path .= "arg3=" . $arg3;
-    $self->sendGetRequest($url_path);
+    $url_path .= "arg3=" . $arg3 . "&";
+    $url_path .= "arg4=" . $arg4;
+    return $self->_sendGetRequest($url_path);
 }
-sub sendMomentaryPtzCommand
+
+sub _sendMomentaryPtzCommand
 {
     my $self = shift;
     my $command_code = shift;
@@ -206,92 +208,195 @@ sub sendMomentaryPtzCommand
     my $arg3 = shift;
     my $duration_ms = shift;
 
-    $self->sendPtzCommand("start", $command_code, $arg1, $arg2, $arg3);
+    $self->_sendPtzCommand("start", $command_code, $arg1, $arg2, $arg3);
     my $duration_ns = $duration_ms * 1000;
     usleep($duration_ns);
-    $self->sendPtzCommand("stop", $command_code, $arg1, $arg2, $arg3);
+    $self->_sendPtzCommand("stop", $command_code, $arg1, $arg2, $arg3);
+}
+
+sub _sendAbsolutePositionCommand
+{
+    my $self = shift;
+    my $arg1 = shift;
+    my $arg2 = shift;
+    my $arg3 = shift;
+    my $arg4 = shift;
+
+    $self->_sendPtzCommand("start", "PositionABS", $arg1, $arg2, $arg3, $arg4);
+}
+
+sub moveConLeft
+{
+    my $self = shift;
+    Debug("Move Up Left");
+    $self->_sendMomentaryPtzCommand("Left", 0, 1, 0, 0);
+}
+
+sub moveConRight
+{
+    my $self = shift;
+    Debug( "Move Right" );
+    $self->_sendMomentaryPtzCommand("Right", 0, 1, 0, 0);
+}
+
+sub moveConUp
+{
+    my $self = shift;
+    Debug( "Move Up" );
+    $self->_sendMomentaryPtzCommand("Up", 0, 1, 0, 0);
+}
+
+sub moveConDown
+{
+    my $self = shift;
+    Debug( "Move Down" );
+    $self->_sendMomentaryPtzCommand("Down", 0, 1, 0, 0);
+}
+
+sub moveConUpRight
+{
+    my $self = shift;
+    Debug( "Move Diagonally Up Right" );
+    $self->_sendMomentaryPtzCommand("RightUp", 1, 1, 0, 0); 
+}
+
+sub moveConDownRight
+{
+    my $self = shift;
+    Debug( "Move Diagonally Down Right" );
+    $self->_sendMomentaryPtzCommand("RightDown", 1, 1, 0, 0); 
+}
+
+sub moveConUpLeft
+{
+    my $self = shift;
+    Debug( "Move Diagonally Up Left" );
+    $self->_sendMomentaryPtzCommand("LeftUp", 1, 1, 0, 0); 
+}
+
+sub moveConDownLeft
+{
+    my $self = shift;
+    Debug( "Move Diagonally Up Right" );
+    $self->_sendMomentaryPtzCommand("LeftDown", 1, 1, 0, 0); 
+}
+
+sub zoomConTele
+{
+    my $self = shift;
+    Debug( "Zoom Tele" );
+    $self->_sendMomentaryPtzCommand("ZoomTele", 0, 1, 0, 0);
+}
+
+sub zoomConWide
+{
+    my $self = shift;
+    Debug( "Zoom Wide" );
+    $self->_sendMomentaryPtzCommand("ZoomWide", 0, 1, 0, 0);
 }
 
 sub moveRelUpLeft
 {
     my $self = shift;
     Debug("Move Up Left");
-    $self->sendMomentaryPtzCommand("LeftUp", 4, 4, 0, 500);
+    $self->_sendMomentaryPtzCommand("LeftUp", 4, 4, 0, 500);
 }
 
 sub moveRelUp
 {
     my $self = shift;
     Debug("Move Up");
-    $self->sendMomentaryPtzCommand("Up", 0, 4, 0, 500);
+    $self->_sendMomentaryPtzCommand("Up", 0, 4, 0, 500);
 }
 
 sub moveRelUpRight
 {
     my $self = shift;
     Debug("Move Up Right");
-    $self->sendMomentaryPtzCommand("RightUp", 0, 4, 0, 500);
+    $self->_sendMomentaryPtzCommand("RightUp", 0, 4, 0, 500);
 }
 
 sub moveRelLeft
 {
     my $self = shift;
     Debug("Move Left");
-    $self->sendMomentaryPtzCommand("Left", 0, 4, 0, 500);
+    $self->_sendMomentaryPtzCommand("Left", 0, 4, 0, 500);
 }
 
 sub moveRelRight
 {
     my $self = shift;
     Debug("Move Right");
-    $self->sendMomentaryPtzCommand("Right", 0, 4, 0, 500);
+    $self->_sendMomentaryPtzCommand("Right", 0, 4, 0, 500);
 }
 
 sub moveRelDownLeft
 {
     my $self = shift;
     Debug("Move Down Left");
-    $self->sendMomentaryPtzCommand("LeftDown", 4, 4, 0, 500);
+    $self->_sendMomentaryPtzCommand("LeftDown", 4, 4, 0, 500);
 }
 
 sub moveRelDown
 {
     my $self = shift;
     Debug("Move Down");
-    $self->sendMomentaryPtzCommand("Down", 0, 4, 0, 500);
+    $self->_sendMomentaryPtzCommand("Down", 0, 4, 0, 500);
 }
 
 sub moveRelDownRight
 {
     my $self = shift;
     Debug("Move Down Right");
-    $self->sendMomentaryPtzCommand("RightDown", 4, 4, 0, 500);
+    $self->_sendMomentaryPtzCommand("RightDown", 4, 4, 0, 500);
 }
 
 sub zoomRelTele
 {
     my $self = shift;
     Debug("Zoom Relative Tele");
-    $self->sendMomentaryPtzCommand("ZoomTele", 0, 0, 0, 500);
+    $self->_sendMomentaryPtzCommand("ZoomTele", 0, 0, 0, 500);
 }
 
 sub zoomRelWide
 {
     my $self = shift;
     Debug("Zoom Relative Wide");
-    $self->sendMomentaryPtzCommand("ZoomWide", 0, 0, 0, 500);
+    $self->_sendMomentaryPtzCommand("ZoomWide", 0, 0, 0, 500);
 }
 
+sub focusRelNear
+{
+    my $self = shift;
+
+    my $response = $self->_sendPtzCommand("start", "FocusNear", 0, 1, 0, 0);
+    Debug("focusRelNear response: " . $response);
+}
+
+sub focusRelFar
+{
+    my $self = shift;
+
+    my $response = $self->_sendPtzCommand("start", "FocusFar", 0, 1, 0, 0);
+    Debug("focusRelFar response: " . $response);
+}
+
+sub moveStop
+{
+    my $self = shift;
+    Debug( "Move Stop" );
+    # The command does not matter here, just the stop...
+    $self->_sendPtzCommand("stop", "Up", 0, 0, 1, 0);
+}
 
 sub presetClear
 {
     my $self = shift;
     my $params = shift;
     my $preset_id = $self->getParam($params, 'preset');
-    $self->sendPtzCommand("start", "ClearPreset", 0, $preset_id, 0);
+    $self->_sendPtzCommand("start", "ClearPreset", 0, $preset_id, 0);
 }
 
-
 sub presetSet
 {
     my $self = shift;
@@ -308,8 +413,8 @@ sub presetSet
     my $control_preset_row = $sth->fetchrow_hashref();
     my $new_label_name = $control_preset_row->{'Label'};
 
-    $self->sendPtzCommand("start", "SetPreset", 0, $preset_id, 0);
-    $self->sendPtzCommand("start", "SetPresetName", $preset_id, $new_label_name, 0);
+    $self->_sendPtzCommand("start", "SetPreset", 0, $preset_id, 0);
+    $self->_sendPtzCommand("start", "SetPresetName", $preset_id, $new_label_name, 0);
 }
 
 sub presetGoto
@@ -318,12 +423,39 @@ sub presetGoto
     my $params = shift;
     my $preset_id = $self->getParam($params, 'preset');
 
-    $self->sendPtzCommand("start", "GotoPreset", 0, $preset_id, 0);
+    $self->_sendPtzCommand("start", "GotoPreset", 0, $preset_id, 0);
+}
+
+sub presetHome
+{
+    my $self = shift;
+
+    $self->_sendAbsolutePositionCommand( 0, 0, 0, 1 );
+}
+
+sub reset
+{
+    my $self = shift;
+    Debug( "Camera Reset" );
+    $self->_sendPtzCommand("Reset", 0, 0, 0, 0);
+}
+
+sub reboot
+{
+    my $self = shift;
+    Debug( "Camera Reboot" );
+    my $cmd = "cgi-bin/magicBox.cgi?action=reboot";
+    $self->_sendGetRequest($cmd);
 }
 
 1;
+
 __END__
 
+=pod
+
+=encoding utf8
+
 =head1 NAME
 
 ZoneMinder::Control::Dahua - Perl module for Dahua cameras
@@ -337,10 +469,6 @@ place this in /usr/share/perl5/ZoneMinder/Control
 
 This module is an implementation of the Dahua IP camera HTTP control API.
 
-=head2 EXPORT
-
-None by default.
-
 =head1 COPYRIGHT AND LICENSE
 
 Copyright (C) 2018 ZoneMinder LLC
@@ -359,4 +487,138 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
+=head1 Private Methods
+
+    Methods intended for use internally but documented here for future developers.
+
+=head2 _sendAbsolutePositionCommand( $arg1, $arg2, $arg3, $arg4 )
+
+    Where:
+
+        $arg1 = Horizontal angle 0° to 360°
+        $arg2 = Vertical angle 0° to -90°
+        $arg3 = Zoom multiplier
+        $arg4 = Speed 1 to 8
+
+    This is an private method used to send an absolute position command to the
+    camera.
+
+=head1 Public Methods
+
+    Methods made available to control.pl via ZoneMinder::Control
+
+=head2 Notes:
+
+=over 1
+
+    Which methods are invoked depends on which types of movement are selected in 
+    the camera control type. For example: if the 'Can Move Continuous' option is
+    checked, then methods including 'Con' in their names are invoked. Likewise if
+    the 'Can Move Relative" option is checked, then methods including 'Rel' in
+    their names are invoked.
+
+
+    At present, these types of movement are prioritized and exclusive. This applies
+    to all types of movement, not just PTZ, but focus, iris, etc. as well. The options
+    are tested in the following order:
+
+    1.  Continuous
+
+    2.  Relative
+
+    3.  Absolute
+
+    These types are exclusive meaning that the first one that matches is the one
+    ZoneMinder will use to control with. It would be nice to allow the user to
+    select the type used given that some cameras support all three types of
+    movement.
+
+=back
+
+=head2 new
+
+    This method instantiates a new control object based upon this control module
+    and sets the 'id' attribute to the value passed in.
+
+=head2 open
+
+    This method opens an HTTP connection to the camera. It handles authentication,
+    etc. Upon success it sets the 'state' attribute to 'open.'
+
+=head2 close
+
+    This method effectively closes the HTTP connection to the camera. It sets the
+    'state' attribute to 'close.'
+
+=head2 printMsg
+
+    This method appears to be used for debugging.
+
+=head2 moveCon<direction>
+
+    This set of methods invoke continuous movement in the direction indicated by
+    the <direction> portion of their name. They accept no arguments and move the
+    camera at a speed of 1 for 0ms. The speed index of 1 is the lowest of the
+    accepted range of 1-8.
+
+    NOTE:
+
+    This is not true continuous movmement as currently implemented.
+
+=head2 focusCon<range>
+
+    This set of methods invoke continuous focus in the range direction indicated
+    by the <range> portion of their name. They accept no arguments.
+
+    NOTE:
+
+    This is not true continuous movmement as currently implemented.
+
+=head2 moveRel<direction>
+
+    This set of methods invoke relatvie movement in the direction indicated by
+    the <direction> portion of their name. They accept no arguments and move the
+    camera at a speed of 4 for 500ms. The speed index of 4 is half-way between
+    the accepted range of 1-8.
+
+=head2 focusRel<range>
+
+    This set of methods invoke realtive focus in the range direction indicated by
+    the <range> portion of their name. They accept no arguments.
+
+    NOTE:
+
+    This only just does work. The Dahua API specifies "multiples" as the input.
+    We pass in a 1 for that as it does not seem to matter what number (0-8) is
+    provided, the camera focus behaves the same.
+
+=head2 moveStop
+
+    This method attempts to stop the camera. The problem is that if continuous
+    motion is occurring in multiple directions, this will only stop the motion
+    in the 'Up' direction. Dahua does not support an "all-stop" command.
+
+=head2 presetHome
+
+    This method "homes" the camera to a preset position. It accepts no arguments.
+    When either continuous or relative movement is enabled, pressing the center
+    button on the movement controls invokes this method.
+
+    NOTE:
+
+    The Dahua protocol does not appear to support a preset Home feature. We could
+    allow the user to assign a preset slot as the "home" slot. Dahua does appear
+    to support naming presets which may lend itself to this sort of thing. At
+    this point, we'll just send the camera back to center and zoom wide. (0°,0°,0)
+
+=head2 reset
+
+    This method will reset the PTZ controls to their "default." It is not clear
+    what that is.
+
+=head2 reboot
+
+    This method performs a reboot of the camera. This will take the camera offline
+    for the time it takes to reboot.
+
 =cut

From 84172306908f5fa3275a5fe4b29bd7dabf26a42f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 18 Mar 2019 10:55:08 -0400
Subject: [PATCH 068/214] debug where the comms sock is

---
 src/zm_stream.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_stream.cpp b/src/zm_stream.cpp
index 20d4f1632..797946046 100644
--- a/src/zm_stream.cpp
+++ b/src/zm_stream.cpp
@@ -357,7 +357,7 @@ void StreamBase::openComms() {
 
     gettimeofday(&last_comm_update, NULL);
   } // end if connKey > 0
-  Debug(3, "comms open");
+  Debug(3, "comms open at %s", loc_sock_path);
 } // end void StreamBase::openComms()
 
 void StreamBase::closeComms() {

From dde911d16a9b3c4cf5c62263881592a1f1f6953a Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 18 Mar 2019 10:55:21 -0400
Subject: [PATCH 069/214] add more debug about command queue

---
 src/zm_eventstream.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/zm_eventstream.cpp b/src/zm_eventstream.cpp
index d46c9b385..e69185858 100644
--- a/src/zm_eventstream.cpp
+++ b/src/zm_eventstream.cpp
@@ -800,13 +800,17 @@ void EventStream::runStream() {
       // commands may set send_frame to true
       while ( checkCommandQueue() && !zm_terminate ) {
         // The idea is to loop here processing all commands before proceeding.
+      Debug(1, "Have command queue");
       }
+      Debug(1, "Done command queue");
 
       // Update modified time of the socket .lock file so that we can tell which ones are stale.
       if ( now.tv_sec - last_comm_update.tv_sec > 3600 ) {
         touch(sock_path_lock);
         last_comm_update = now;
       }
+    } else {
+      Debug(1, "Not checking command queue");
     }
 
     if ( step != 0 )

From 9482207f5c7b4f9fd65e8bf1f8296bb6d2a27f2b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 18 Mar 2019 11:24:28 -0400
Subject: [PATCH 070/214] revert namespace stuff in index.php

---
 web/index.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/web/index.php b/web/index.php
index 7a5abb79b..99e77d285 100644
--- a/web/index.php
+++ b/web/index.php
@@ -17,7 +17,6 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 // 
-namespace ZM;
 
 error_reporting(E_ALL);
 
@@ -194,7 +193,7 @@ isset($view) || $view = NULL;
 isset($request) || $request = NULL;
 isset($action) || $action = NULL;
 
-Logger::Debug("View: $view Request: $request Action: $action User: " . ( isset($user) ? $user['Username'] : 'none' ));
+ZM\Logger::Debug("View: $view Request: $request Action: $action User: " . ( isset($user) ? $user['Username'] : 'none' ));
 if (
   ZM_ENABLE_CSRF_MAGIC &&
   ( $action != 'login' ) &&
@@ -205,17 +204,17 @@ if (
   ( $view != 'archive' )
 ) {
   require_once( 'includes/csrf/csrf-magic.php' );
-  #Logger::Debug("Calling csrf_check with the following values: \$request = \"$request\", \$view = \"$view\", \$action = \"$action\"");
+  #ZM\Logger::Debug("Calling csrf_check with the following values: \$request = \"$request\", \$view = \"$view\", \$action = \"$action\"");
   csrf_check();
 }
 
 # Need to include actions because it does auth
 if ( $action ) {
   if ( file_exists('includes/actions/'.$view.'.php') ) {
-    Logger::Debug("Including includes/actions/$view.php");
+    ZM\Logger::Debug("Including includes/actions/$view.php");
     require_once('includes/actions/'.$view.'.php');
   } else {
-    Warning("No includes/actions/$view.php for action $action");
+    ZM\Warning("No includes/actions/$view.php for action $action");
   }
 }
 
@@ -227,7 +226,7 @@ if ( ZM_OPT_USE_AUTH and !isset($user) and ($view != 'login') ) {
     header('HTTP/1.1 401 Unauthorized');
     exit;
   }
-  Logger::Debug('Redirecting to login');
+  ZM\Logger::Debug('Redirecting to login');
   $view = 'none';
   $redirect = ZM_BASE_URL.$_SERVER['PHP_SELF'].'?view=login';
   $request = null;
@@ -239,7 +238,7 @@ if ( ZM_OPT_USE_AUTH and !isset($user) and ($view != 'login') ) {
 CSPHeaders($view, $cspNonce);
 
 if ( $redirect ) {
-  Logger::Debug("Redirecting to $redirect");
+  ZM\Logger::Debug("Redirecting to $redirect");
   header('Location: '.$redirect);
   return;
 }
@@ -247,7 +246,7 @@ if ( $redirect ) {
 if ( $request ) {
   foreach ( getSkinIncludes('ajax/'.$request.'.php', true, true) as $includeFile ) {
     if ( !file_exists($includeFile) )
-      Fatal("Request '$request' does not exist");
+      ZM\Fatal("Request '$request' does not exist");
     require_once $includeFile;
   }
   return;
@@ -256,7 +255,7 @@ if ( $request ) {
 if ( $includeFiles = getSkinIncludes('views/'.$view.'.php', true, true) ) {
   foreach ( $includeFiles as $includeFile ) {
     if ( !file_exists($includeFile) )
-      Fatal("View '$view' does not exist");
+      ZM\Fatal("View '$view' does not exist");
     require_once $includeFile;
   }
   // If the view overrides $view to 'error', and the user is not logged in, then the

From b794c2ca203bd11bf804ea0b5ac49aaa6000cf03 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 18 Mar 2019 12:01:51 -0400
Subject: [PATCH 071/214] fix crash by checking username without checking if it
 is NULL

---
 src/zm_user.cpp | 12 ++++++++----
 src/zmu.cpp     | 46 ++++++++++++++++++++--------------------------
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/src/zm_user.cpp b/src/zm_user.cpp
index da0c66416..46ee2cdf1 100644
--- a/src/zm_user.cpp
+++ b/src/zm_user.cpp
@@ -248,15 +248,19 @@ User *zmLoadAuthUser( const char *auth, bool use_remote_addr ) {
 
 //Function to check Username length
 bool checkUser ( const char *username) {
-  if ( strlen(username) > 32) {
+  if ( ! username )
     return false;
-  }
+  if ( strlen(username) > 32 )
+    return false;
+
   return true;
 }
 //Function to check password length
 bool checkPass (const char *password) {
-  if ( strlen(password) > 64) {
+  if ( !password )
     return false;
-  }
+  if ( strlen(password) > 64 )
+    return false;
+
   return true;
 }
diff --git a/src/zmu.cpp b/src/zmu.cpp
index a8ee61273..2b5d95c40 100644
--- a/src/zmu.cpp
+++ b/src/zmu.cpp
@@ -394,7 +394,7 @@ int main(int argc, char *argv[]) {
         //fprintf( stderr, "?? getopt returned character code 0%o ??\n", c );
         break;
     }
-  }
+  } // end getopt loop
 
   if ( optind < argc ) {
     fprintf(stderr, "Extraneous options, ");
@@ -425,44 +425,38 @@ int main(int argc, char *argv[]) {
 
   if ( config.opt_use_auth ) {
     if ( strcmp(config.auth_relay, "none") == 0 ) {
-      if ( !checkUser(username)) {
-        fprintf(stderr, "Error, username greater than allowed 32 characters\n");
-        exit_zmu(-1);
-      }
       if ( !username ) {
         fprintf(stderr, "Error, username must be supplied\n");
         exit_zmu(-1);
       }
 
-      if ( username ) {
-        user = zmLoadUser(username);
-      }
-    } else {
-      if ( !(username && password) && !auth ) {
-        fprintf(stderr, "Error, username and password or auth string must be supplied\n");
-        exit_zmu(-1);
-      }
       if ( !checkUser(username)) {
         fprintf(stderr, "Error, username greater than allowed 32 characters\n");
         exit_zmu(-1);
       }
-      if ( !checkPass(password)) {
-        fprintf(stderr, "Error, password greater than allowed 64 characters\n");
+
+      user = zmLoadUser(username);
+    } else {
+       
+      if ( !(username && password) && !auth ) {
+        fprintf(stderr, "Error, username and password or auth string must be supplied\n");
         exit_zmu(-1);
       }
-      //if ( strcmp( config.auth_relay, "hashed" ) == 0 )
-      {
-        if ( auth ) {
-          user = zmLoadAuthUser(auth, false);
-        }
+      if ( auth ) {
+        user = zmLoadAuthUser(auth, false);
       }
-      //else if ( strcmp( config.auth_relay, "plain" ) == 0 )
-      {
-        if ( username && password ) {
-          user = zmLoadUser(username, password);
+      if ( username && password ) {
+        if ( !checkUser(username)) {
+          fprintf(stderr, "Error, username greater than allowed 32 characters\n");
+          exit_zmu(-1);
         }
-      }
-    }
+        if ( !checkPass(password)) {
+          fprintf(stderr, "Error, password greater than allowed 64 characters\n");
+          exit_zmu(-1);
+        }
+        user = zmLoadUser(username, password);
+      } // end if username && password
+    } // end if relay or not
     if ( !user ) {
       fprintf(stderr, "Error, unable to authenticate user\n");
       return exit_zmu(-1);

From d86b1ea49c895e4c4778988c7487a37369efefc6 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 18 Mar 2019 13:48:55 -0400
Subject: [PATCH 072/214] Implement a date filter to zmaudit so that it only
 looks in directories by date.

---
 scripts/zmaudit.pl.in | 73 +++++++++++++++++++++++--------------------
 scripts/zmdc.pl.in    |  5 +--
 2 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in
index 10917a729..67d1d23ce 100644
--- a/scripts/zmaudit.pl.in
+++ b/scripts/zmaudit.pl.in
@@ -62,6 +62,7 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 my $report = 0;
 my $interactive = 0;
 my $continuous = 0;
+my $date = undef;
 my $level = 1;
 my $monitor_id = 0;
 my $version;
@@ -73,6 +74,7 @@ logInit();
 
 GetOptions(
     continuous     =>\$continuous,
+    'date=s'       =>\$date,
     force          =>\$force,
     interactive    =>\$interactive,
     level          =>\$level,
@@ -110,24 +112,24 @@ if ( -e ZM_AUDIT_PID ) {
   }
 } # end if ZM_AUDIT_PID exists
 
-if ( open( my $PID, '>', ZM_AUDIT_PID ) ) {
-  print( $PID $$ );
-  close( $PID );
+if ( open(my $PID, '>', ZM_AUDIT_PID) ) {
+  print($PID $$);
+  close($PID);
 } else {
-  Error( "Can't open pid file at " . ZM_PID );
+  Error("Can't open pid file at " . ZM_PID);
 }
 
 sub HupHandler {
-  Info("Received HUP, reloading");
+  Info('Received HUP, reloading');
   &ZoneMinder::Logger::logHupHandler();
 }
 sub TermHandler {
-  Info("Received TERM, exiting");
+  Info('Received TERM, exiting');
   Term();
 }
 sub Term {
   unlink ZM_AUDIT_PID;
-  exit( 0 );
+  exit(0);
 }
 $SIG{HUP} = \&HupHandler;
 $SIG{TERM} = \&TermHandler;
@@ -154,7 +156,7 @@ MAIN: while( $loop ) {
     # if we are running continuously, then just skip to the next
     # interval, otherwise we are a one off run, so wait a second and
     # retry until someone kills us.
-    sleep( $Config{ZM_AUDIT_CHECK_INTERVAL} );
+    sleep($Config{ZM_AUDIT_CHECK_INTERVAL});
   } else {
     sleep 1;
   } # end if
@@ -182,53 +184,53 @@ MAIN: while( $loop ) {
       Error("No Storage Area found with Id $storage_id");
       Term();
     }
-    Info("Auditing Storage Area $Storage_Areas[0]{Id} $Storage_Areas[0]{Name} at $Storage_Areas[0]{Path}");
+    Info("Auditing Storage Area $Storage_Areas[0]{Id} $Storage_Areas[0]{Name} at $Storage_Areas[0]{Path}".( $date ? " limited to $date" : ''));
   } elsif ( $server_id ) {
     @Storage_Areas = ZoneMinder::Storage->find( ServerId => $server_id );
     if ( ! @Storage_Areas ) {
-      Error("No Storage Area found with ServerId =" . $server_id);
+      Error('No Storage Area found with ServerId =' . $server_id);
       Term();
     }
     foreach my $Storage ( @Storage_Areas ) {
-      Info('Auditing ' . $Storage->Name() . ' at ' . $Storage->Path() . ' on ' . $Storage->Server()->Name() );
+      Info('Auditing ' . $Storage->Name() . ' at ' . $Storage->Path() . ' on ' . $Storage->Server()->Name().( $date ? " limited to $date" : ''));
     }
   } else {
     @Storage_Areas = ZoneMinder::Storage->find();
-    Info("Auditing All Storage Areas");
+    Info('Auditing All Storage Areas'.( $date ? " limited to $date" : ''));
   }
 
   my %Monitors;
   my $db_monitors;
   my $monitorSelectSql = $monitor_id ? 'SELECT * FROM Monitors WHERE Id=?' : 'SELECT * FROM Monitors ORDER BY Id';
-  my $monitorSelectSth = $dbh->prepare_cached( $monitorSelectSql )
-    or Fatal( "Can't prepare '$monitorSelectSql': ".$dbh->errstr() );
+  my $monitorSelectSth = $dbh->prepare_cached($monitorSelectSql)
+    or Fatal("Can't prepare '$monitorSelectSql': ".$dbh->errstr());
 
   my $eventSelectSql = 'SELECT Id, (unix_timestamp() - unix_timestamp(StartTime)) AS Age
     FROM Events WHERE MonitorId = ?'.(@Storage_Areas ? ' AND StorageId IN ('.join(',',map { '?'} @Storage_Areas).')' : '' ). ' ORDER BY Id';
-  my $eventSelectSth = $dbh->prepare_cached( $eventSelectSql )
-    or Fatal( "Can't prepare '$eventSelectSql': ".$dbh->errstr() );
+  my $eventSelectSth = $dbh->prepare_cached($eventSelectSql)
+    or Fatal("Can't prepare '$eventSelectSql': ".$dbh->errstr());
 
   $cleaned = 0;
   my $res = $monitorSelectSth->execute( $monitor_id ? $monitor_id : () )
-    or Fatal( "Can't execute: $monitorSelectSql ".$monitorSelectSth->errstr() );
+    or Fatal("Can't execute: $monitorSelectSql ".$monitorSelectSth->errstr());
   while( my $monitor = $monitorSelectSth->fetchrow_hashref() ) {
     $Monitors{$$monitor{Id}} = $monitor;
 
     my $db_events = $db_monitors->{$monitor->{Id}} = {};
     my $res = $eventSelectSth->execute( $monitor->{Id}, map { $$_{Id} } @Storage_Areas )
-      or Fatal( "Can't execute: ".$eventSelectSth->errstr() );
+      or Fatal("Can't execute: ".$eventSelectSth->errstr());
     while ( my $event = $eventSelectSth->fetchrow_hashref() ) {
       $db_events->{$event->{Id}} = $event->{Age};
     }
-    Debug( 'Got '.int(keys(%$db_events))." events for monitor $monitor->{Id}" );
+    Debug('Got '.int(keys(%$db_events))." events for monitor $monitor->{Id}");
   } # end while monitors
 
   my $fs_monitors;
 
   foreach my $Storage ( @Storage_Areas ) {
-    Debug('Checking events in ' . $Storage->Path() );
+    Debug('Checking events in ' . $Storage->Path());
     if ( ! chdir( $Storage->Path() ) ) {
-      Error( 'Unable to change dir to ' . $Storage->Path() );
+      Error('Unable to change dir to ' . $Storage->Path());
       next;
     } # end if
 
@@ -243,7 +245,7 @@ MAIN: while( $loop ) {
         next;
       }
 
-      Debug( "Found filesystem monitor '$monitor'" );
+      Debug("Found filesystem monitor '$monitor'");
       $fs_monitors->{$monitor} = {} if ! $fs_monitors->{$monitor};
       my $fs_events = $fs_monitors->{$monitor};
 
@@ -251,10 +253,11 @@ MAIN: while( $loop ) {
       ( my $monitor_dir ) = ( $monitor =~ /^(.*)$/ );
 
       {
-        my @day_dirs = glob("$monitor_dir/[0-9][0-9]/[0-9][0-9]/[0-9][0-9]");
+        my ( $y, $m, $d ) = $date =~ /^(\d\d\d\d)\-(\d\d)\-(\d\d)$/;
+        my @day_dirs = glob($date ? "$monitor_dir/$y/$m/$d" : "$monitor_dir/[0-9][0-9]/[0-9][0-9]/[0-9][0-9]");
         Debug(qq`Checking for Deep Events under $$Storage{Path} using glob("$monitor_dir/[0-9][0-9]/[0-9][0-9]/[0-9][0-9]") returned `. scalar @day_dirs . ' events');
         foreach my $day_dir ( @day_dirs ) {
-          Debug( "Checking day dir $day_dir" );
+          Debug("Checking day dir $day_dir");
           ( $day_dir ) = ( $day_dir =~ /^(.*)$/ ); # De-taint
           if ( !chdir($day_dir) ) {
             Error("Can't chdir to '$$Storage{Path}/$day_dir': $!");
@@ -267,7 +270,7 @@ MAIN: while( $loop ) {
           my %event_ids_by_path;
 
           my @event_links = sort { $b <=> $a } grep { -l $_ } readdir( DIR );
-          Debug("Have " . @event_links . ' event links');
+          Debug('Have ' . @event_links . ' event links');
           closedir(DIR);
 
           my $count = 0;
@@ -383,11 +386,12 @@ MAIN: while( $loop ) {
 
       Debug("Checking for Medium Scheme Events under $$Storage{Path}/$monitor_dir");
       {
-        my @event_dirs = glob("$monitor_dir/[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/*");
-        Debug(qq`glob("$monitor_dir/[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/*") returned ` . scalar @event_dirs . ' entries.' );
+        my $glob = $date ? "$monitor_dir/$date/*":"$monitor_dir/[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/*";
+        my @event_dirs = glob($glob);
+        Debug(qq`glob($glob) returned ` . scalar @event_dirs . ' entries.' );
         foreach my $event_dir ( @event_dirs ) {
           if ( ! -d $event_dir ) {
-            Debug( "$event_dir is not a dir. Skipping" );
+            Debug("$event_dir is not a dir. Skipping");
             next;
           }
           my ( $date, $event_id ) = $event_dir =~ /^$monitor_dir\/(\d{4}\-\d{2}\-\d{2})\/(\d+)$/;
@@ -410,11 +414,11 @@ MAIN: while( $loop ) {
       if ( ! $$Storage{Scheme} ) {
         Error("Storage Scheme not set on $$Storage{Name}");
         if ( ! chdir( $monitor_dir ) ) {
-          Error( "Can't chdir directory '$$Storage{Path}/$monitor_dir': $!" );
+          Error("Can't chdir directory '$$Storage{Path}/$monitor_dir': $!");
           next;
         }
         if ( ! opendir( DIR, "." ) ) {
-          Error( "Can't open directory '$$Storage{Path}/$monitor_dir': $!" );
+          Error("Can't open directory '$$Storage{Path}/$monitor_dir': $!");
           next;
         }
         my @temp_events = sort { $b <=> $a } grep { -d $_ && $_ =~ /^\d+$/ } readdir( DIR );
@@ -429,7 +433,7 @@ MAIN: while( $loop ) {
         } # end foreach event
         chdir( $Storage->Path() );
       } # if USE_DEEP_STORAGE
-      Debug( 'Got '.int(keys(%$fs_events))." filesystem events for monitor $monitor_dir" );
+      Debug('Got '.int(keys(%$fs_events))." filesystem events for monitor $monitor_dir");
 
       delete_empty_subdirs($$Storage{Path}.'/'.$monitor_dir);
     } # end foreach monitor
@@ -463,7 +467,7 @@ MAIN: while( $loop ) {
             my $age = $Event->age();
 
             if ( $age > $Config{ZM_AUDIT_MIN_AGE} ) {
-              aud_print( "Filesystem event $fs_event_id at $$Event{Path} does not exist in database and is $age seconds old" );
+              aud_print("Filesystem event $fs_event_id at $$Event{Path} does not exist in database and is $age seconds old");
               if ( confirm() ) {
                 $Event->delete_files();
                 $cleaned = 1;
@@ -473,7 +477,7 @@ MAIN: while( $loop ) {
           } # end if ! in db events
         } # end foreach fs event
       } else {
-        aud_print( "Filesystem monitor '$monitor_id' in $$Storage{Path} does not exist in database" );
+        aud_print("Filesystem monitor '$monitor_id' in $$Storage{Path} does not exist in database");
 
         if ( confirm() ) {
           my $command = "rm -rf $monitor_id";
@@ -488,7 +492,7 @@ MAIN: while( $loop ) {
       next if ( !-l $link );
       next if ( -e $link );
 
-      aud_print( "Filesystem monitor link '$link' does not point to valid monitor directory" );
+      aud_print("Filesystem monitor link '$link' does not point to valid monitor directory");
       if ( confirm() ) {
         ( $link ) = ( $link =~ /^(.*)$/ ); # De-taint
         my $command = qq`rm "$link"`;
@@ -1049,6 +1053,7 @@ yet.
 =head1 OPTIONS
 
  -c, --continuous           - Run continuously
+ -d, --date                 - Limit search for events on given date. Use YYYY-MM-DD format
  -f, --force                - Run even if pid file exists
  -i, --interactive          - Ask before applying any changes
  -m, --monitor_id           - Only consider the given monitor
diff --git a/scripts/zmdc.pl.in b/scripts/zmdc.pl.in
index 67bbc294b..61b9b1b82 100644
--- a/scripts/zmdc.pl.in
+++ b/scripts/zmdc.pl.in
@@ -93,8 +93,9 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 my @daemons = (
     'zmc',
     'zma',
-    'zmfilter.pl',
     'zmaudit.pl',
+    'zmcontrol.pl',
+    'zmfilter.pl',
     'zmtrigger.pl',
     'zmx10.pl',
     'zmwatch.pl',
@@ -105,7 +106,7 @@ my @daemons = (
     );
 
 if ( $Config{ZM_OPT_USE_EVENTNOTIFICATION} ) {
-	push @daemons,'zmeventnotification.pl';
+	push @daemons, 'zmeventnotification.pl';
 }
 
 my $command = shift @ARGV;

From e486b035f09bd3bce46aacd64546162f1204d44a Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 18 Mar 2019 13:50:00 -0400
Subject: [PATCH 073/214] Revert "Implement a date filter to zmaudit so that it
 only looks in directories by date."

This reverts commit d86b1ea49c895e4c4778988c7487a37369efefc6.
---
 scripts/zmaudit.pl.in | 73 ++++++++++++++++++++-----------------------
 scripts/zmdc.pl.in    |  5 ++-
 2 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in
index 67d1d23ce..10917a729 100644
--- a/scripts/zmaudit.pl.in
+++ b/scripts/zmaudit.pl.in
@@ -62,7 +62,6 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 my $report = 0;
 my $interactive = 0;
 my $continuous = 0;
-my $date = undef;
 my $level = 1;
 my $monitor_id = 0;
 my $version;
@@ -74,7 +73,6 @@ logInit();
 
 GetOptions(
     continuous     =>\$continuous,
-    'date=s'       =>\$date,
     force          =>\$force,
     interactive    =>\$interactive,
     level          =>\$level,
@@ -112,24 +110,24 @@ if ( -e ZM_AUDIT_PID ) {
   }
 } # end if ZM_AUDIT_PID exists
 
-if ( open(my $PID, '>', ZM_AUDIT_PID) ) {
-  print($PID $$);
-  close($PID);
+if ( open( my $PID, '>', ZM_AUDIT_PID ) ) {
+  print( $PID $$ );
+  close( $PID );
 } else {
-  Error("Can't open pid file at " . ZM_PID);
+  Error( "Can't open pid file at " . ZM_PID );
 }
 
 sub HupHandler {
-  Info('Received HUP, reloading');
+  Info("Received HUP, reloading");
   &ZoneMinder::Logger::logHupHandler();
 }
 sub TermHandler {
-  Info('Received TERM, exiting');
+  Info("Received TERM, exiting");
   Term();
 }
 sub Term {
   unlink ZM_AUDIT_PID;
-  exit(0);
+  exit( 0 );
 }
 $SIG{HUP} = \&HupHandler;
 $SIG{TERM} = \&TermHandler;
@@ -156,7 +154,7 @@ MAIN: while( $loop ) {
     # if we are running continuously, then just skip to the next
     # interval, otherwise we are a one off run, so wait a second and
     # retry until someone kills us.
-    sleep($Config{ZM_AUDIT_CHECK_INTERVAL});
+    sleep( $Config{ZM_AUDIT_CHECK_INTERVAL} );
   } else {
     sleep 1;
   } # end if
@@ -184,53 +182,53 @@ MAIN: while( $loop ) {
       Error("No Storage Area found with Id $storage_id");
       Term();
     }
-    Info("Auditing Storage Area $Storage_Areas[0]{Id} $Storage_Areas[0]{Name} at $Storage_Areas[0]{Path}".( $date ? " limited to $date" : ''));
+    Info("Auditing Storage Area $Storage_Areas[0]{Id} $Storage_Areas[0]{Name} at $Storage_Areas[0]{Path}");
   } elsif ( $server_id ) {
     @Storage_Areas = ZoneMinder::Storage->find( ServerId => $server_id );
     if ( ! @Storage_Areas ) {
-      Error('No Storage Area found with ServerId =' . $server_id);
+      Error("No Storage Area found with ServerId =" . $server_id);
       Term();
     }
     foreach my $Storage ( @Storage_Areas ) {
-      Info('Auditing ' . $Storage->Name() . ' at ' . $Storage->Path() . ' on ' . $Storage->Server()->Name().( $date ? " limited to $date" : ''));
+      Info('Auditing ' . $Storage->Name() . ' at ' . $Storage->Path() . ' on ' . $Storage->Server()->Name() );
     }
   } else {
     @Storage_Areas = ZoneMinder::Storage->find();
-    Info('Auditing All Storage Areas'.( $date ? " limited to $date" : ''));
+    Info("Auditing All Storage Areas");
   }
 
   my %Monitors;
   my $db_monitors;
   my $monitorSelectSql = $monitor_id ? 'SELECT * FROM Monitors WHERE Id=?' : 'SELECT * FROM Monitors ORDER BY Id';
-  my $monitorSelectSth = $dbh->prepare_cached($monitorSelectSql)
-    or Fatal("Can't prepare '$monitorSelectSql': ".$dbh->errstr());
+  my $monitorSelectSth = $dbh->prepare_cached( $monitorSelectSql )
+    or Fatal( "Can't prepare '$monitorSelectSql': ".$dbh->errstr() );
 
   my $eventSelectSql = 'SELECT Id, (unix_timestamp() - unix_timestamp(StartTime)) AS Age
     FROM Events WHERE MonitorId = ?'.(@Storage_Areas ? ' AND StorageId IN ('.join(',',map { '?'} @Storage_Areas).')' : '' ). ' ORDER BY Id';
-  my $eventSelectSth = $dbh->prepare_cached($eventSelectSql)
-    or Fatal("Can't prepare '$eventSelectSql': ".$dbh->errstr());
+  my $eventSelectSth = $dbh->prepare_cached( $eventSelectSql )
+    or Fatal( "Can't prepare '$eventSelectSql': ".$dbh->errstr() );
 
   $cleaned = 0;
   my $res = $monitorSelectSth->execute( $monitor_id ? $monitor_id : () )
-    or Fatal("Can't execute: $monitorSelectSql ".$monitorSelectSth->errstr());
+    or Fatal( "Can't execute: $monitorSelectSql ".$monitorSelectSth->errstr() );
   while( my $monitor = $monitorSelectSth->fetchrow_hashref() ) {
     $Monitors{$$monitor{Id}} = $monitor;
 
     my $db_events = $db_monitors->{$monitor->{Id}} = {};
     my $res = $eventSelectSth->execute( $monitor->{Id}, map { $$_{Id} } @Storage_Areas )
-      or Fatal("Can't execute: ".$eventSelectSth->errstr());
+      or Fatal( "Can't execute: ".$eventSelectSth->errstr() );
     while ( my $event = $eventSelectSth->fetchrow_hashref() ) {
       $db_events->{$event->{Id}} = $event->{Age};
     }
-    Debug('Got '.int(keys(%$db_events))." events for monitor $monitor->{Id}");
+    Debug( 'Got '.int(keys(%$db_events))." events for monitor $monitor->{Id}" );
   } # end while monitors
 
   my $fs_monitors;
 
   foreach my $Storage ( @Storage_Areas ) {
-    Debug('Checking events in ' . $Storage->Path());
+    Debug('Checking events in ' . $Storage->Path() );
     if ( ! chdir( $Storage->Path() ) ) {
-      Error('Unable to change dir to ' . $Storage->Path());
+      Error( 'Unable to change dir to ' . $Storage->Path() );
       next;
     } # end if
 
@@ -245,7 +243,7 @@ MAIN: while( $loop ) {
         next;
       }
 
-      Debug("Found filesystem monitor '$monitor'");
+      Debug( "Found filesystem monitor '$monitor'" );
       $fs_monitors->{$monitor} = {} if ! $fs_monitors->{$monitor};
       my $fs_events = $fs_monitors->{$monitor};
 
@@ -253,11 +251,10 @@ MAIN: while( $loop ) {
       ( my $monitor_dir ) = ( $monitor =~ /^(.*)$/ );
 
       {
-        my ( $y, $m, $d ) = $date =~ /^(\d\d\d\d)\-(\d\d)\-(\d\d)$/;
-        my @day_dirs = glob($date ? "$monitor_dir/$y/$m/$d" : "$monitor_dir/[0-9][0-9]/[0-9][0-9]/[0-9][0-9]");
+        my @day_dirs = glob("$monitor_dir/[0-9][0-9]/[0-9][0-9]/[0-9][0-9]");
         Debug(qq`Checking for Deep Events under $$Storage{Path} using glob("$monitor_dir/[0-9][0-9]/[0-9][0-9]/[0-9][0-9]") returned `. scalar @day_dirs . ' events');
         foreach my $day_dir ( @day_dirs ) {
-          Debug("Checking day dir $day_dir");
+          Debug( "Checking day dir $day_dir" );
           ( $day_dir ) = ( $day_dir =~ /^(.*)$/ ); # De-taint
           if ( !chdir($day_dir) ) {
             Error("Can't chdir to '$$Storage{Path}/$day_dir': $!");
@@ -270,7 +267,7 @@ MAIN: while( $loop ) {
           my %event_ids_by_path;
 
           my @event_links = sort { $b <=> $a } grep { -l $_ } readdir( DIR );
-          Debug('Have ' . @event_links . ' event links');
+          Debug("Have " . @event_links . ' event links');
           closedir(DIR);
 
           my $count = 0;
@@ -386,12 +383,11 @@ MAIN: while( $loop ) {
 
       Debug("Checking for Medium Scheme Events under $$Storage{Path}/$monitor_dir");
       {
-        my $glob = $date ? "$monitor_dir/$date/*":"$monitor_dir/[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/*";
-        my @event_dirs = glob($glob);
-        Debug(qq`glob($glob) returned ` . scalar @event_dirs . ' entries.' );
+        my @event_dirs = glob("$monitor_dir/[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/*");
+        Debug(qq`glob("$monitor_dir/[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/*") returned ` . scalar @event_dirs . ' entries.' );
         foreach my $event_dir ( @event_dirs ) {
           if ( ! -d $event_dir ) {
-            Debug("$event_dir is not a dir. Skipping");
+            Debug( "$event_dir is not a dir. Skipping" );
             next;
           }
           my ( $date, $event_id ) = $event_dir =~ /^$monitor_dir\/(\d{4}\-\d{2}\-\d{2})\/(\d+)$/;
@@ -414,11 +410,11 @@ MAIN: while( $loop ) {
       if ( ! $$Storage{Scheme} ) {
         Error("Storage Scheme not set on $$Storage{Name}");
         if ( ! chdir( $monitor_dir ) ) {
-          Error("Can't chdir directory '$$Storage{Path}/$monitor_dir': $!");
+          Error( "Can't chdir directory '$$Storage{Path}/$monitor_dir': $!" );
           next;
         }
         if ( ! opendir( DIR, "." ) ) {
-          Error("Can't open directory '$$Storage{Path}/$monitor_dir': $!");
+          Error( "Can't open directory '$$Storage{Path}/$monitor_dir': $!" );
           next;
         }
         my @temp_events = sort { $b <=> $a } grep { -d $_ && $_ =~ /^\d+$/ } readdir( DIR );
@@ -433,7 +429,7 @@ MAIN: while( $loop ) {
         } # end foreach event
         chdir( $Storage->Path() );
       } # if USE_DEEP_STORAGE
-      Debug('Got '.int(keys(%$fs_events))." filesystem events for monitor $monitor_dir");
+      Debug( 'Got '.int(keys(%$fs_events))." filesystem events for monitor $monitor_dir" );
 
       delete_empty_subdirs($$Storage{Path}.'/'.$monitor_dir);
     } # end foreach monitor
@@ -467,7 +463,7 @@ MAIN: while( $loop ) {
             my $age = $Event->age();
 
             if ( $age > $Config{ZM_AUDIT_MIN_AGE} ) {
-              aud_print("Filesystem event $fs_event_id at $$Event{Path} does not exist in database and is $age seconds old");
+              aud_print( "Filesystem event $fs_event_id at $$Event{Path} does not exist in database and is $age seconds old" );
               if ( confirm() ) {
                 $Event->delete_files();
                 $cleaned = 1;
@@ -477,7 +473,7 @@ MAIN: while( $loop ) {
           } # end if ! in db events
         } # end foreach fs event
       } else {
-        aud_print("Filesystem monitor '$monitor_id' in $$Storage{Path} does not exist in database");
+        aud_print( "Filesystem monitor '$monitor_id' in $$Storage{Path} does not exist in database" );
 
         if ( confirm() ) {
           my $command = "rm -rf $monitor_id";
@@ -492,7 +488,7 @@ MAIN: while( $loop ) {
       next if ( !-l $link );
       next if ( -e $link );
 
-      aud_print("Filesystem monitor link '$link' does not point to valid monitor directory");
+      aud_print( "Filesystem monitor link '$link' does not point to valid monitor directory" );
       if ( confirm() ) {
         ( $link ) = ( $link =~ /^(.*)$/ ); # De-taint
         my $command = qq`rm "$link"`;
@@ -1053,7 +1049,6 @@ yet.
 =head1 OPTIONS
 
  -c, --continuous           - Run continuously
- -d, --date                 - Limit search for events on given date. Use YYYY-MM-DD format
  -f, --force                - Run even if pid file exists
  -i, --interactive          - Ask before applying any changes
  -m, --monitor_id           - Only consider the given monitor
diff --git a/scripts/zmdc.pl.in b/scripts/zmdc.pl.in
index 61b9b1b82..67bbc294b 100644
--- a/scripts/zmdc.pl.in
+++ b/scripts/zmdc.pl.in
@@ -93,9 +93,8 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 my @daemons = (
     'zmc',
     'zma',
-    'zmaudit.pl',
-    'zmcontrol.pl',
     'zmfilter.pl',
+    'zmaudit.pl',
     'zmtrigger.pl',
     'zmx10.pl',
     'zmwatch.pl',
@@ -106,7 +105,7 @@ my @daemons = (
     );
 
 if ( $Config{ZM_OPT_USE_EVENTNOTIFICATION} ) {
-	push @daemons, 'zmeventnotification.pl';
+	push @daemons,'zmeventnotification.pl';
 }
 
 my $command = shift @ARGV;

From 63982a62824ac97d5b2a6f520e75446a5f3f36ea Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 18 Mar 2019 14:42:05 -0400
Subject: [PATCH 074/214] Disable PRIVACY enable

---
 scripts/zmupdate.pl.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/zmupdate.pl.in b/scripts/zmupdate.pl.in
index 8517e0277..bb9dddac4 100644
--- a/scripts/zmupdate.pl.in
+++ b/scripts/zmupdate.pl.in
@@ -923,10 +923,10 @@ if ( $version ) {
     die( "Can't find upgrade from version '$version'" );
   }
   # Re-enable the privacy popup after each upgrade
-  my $sql = "update Config set Value = 1 where Name = 'ZM_SHOW_PRIVACY'";
-  my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-  my $res = $sth->execute( ) or die( "Can't execute: ".$sth->errstr() );
-  $sth->finish();
+  #my $sql = "update Config set Value = 1 where Name = 'ZM_SHOW_PRIVACY'";
+  #my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
+  #my $res = $sth->execute( ) or die( "Can't execute: ".$sth->errstr() );
+  #$sth->finish();
   print( "\nDatabase upgrade to version ".ZM_VERSION." successful.\n\n" );
 }
 zmDbDisconnect();

From ad5f6a87294d2fb2b1bc7e5cdbe322dd98951b38 Mon Sep 17 00:00:00 2001
From: Chris <cnighswonger@users.noreply.github.com>
Date: Mon, 18 Mar 2019 14:49:05 -0400
Subject: [PATCH 075/214] Camera reboot function (#2554)

* Adding a button for camera reboot function

This series of commits will add a camera reboot function to the
control interface if supported by the camera configuration.

* Adding reboot function option to contorl configuration

This patch adds a reboot option to the camera control configuration
view.

* Adding Reboot field to Controls table

This patch adds a Reboot field to the Controls table to support
a camera reboot control option.

* Correcting button value to match reset

* Updating language files

I'm not sure of the proper procedure to trigger updating of
non-english language files so I'm updating them all with English
hoping that that will draw attention to the changes and others
will translate accordingly.

* Add missing forward slash
---
 db/zm_create.sql.in                                | 1 +
 scripts/ZoneMinder/lib/ZoneMinder/Control/Dahua.pm | 2 +-
 web/lang/ba_ba.php                                 | 1 +
 web/lang/big5_big5.php                             | 1 +
 web/lang/cn_zh.php                                 | 1 +
 web/lang/cs_cz.php                                 | 1 +
 web/lang/de_de.php                                 | 1 +
 web/lang/dk_dk.php                                 | 1 +
 web/lang/en_gb.php                                 | 1 +
 web/lang/es_ar.php                                 | 1 +
 web/lang/es_es.php                                 | 1 +
 web/lang/et_ee.php                                 | 1 +
 web/lang/fr_fr.php                                 | 1 +
 web/lang/he_il.php                                 | 1 +
 web/lang/hu_hu.php                                 | 1 +
 web/lang/it_it.php                                 | 1 +
 web/lang/ja_jp.php                                 | 1 +
 web/lang/nl_nl.php                                 | 1 +
 web/lang/pl_pl.php                                 | 1 +
 web/lang/pt_br.php                                 | 1 +
 web/lang/ro_ro.php                                 | 1 +
 web/lang/ru_ru.php                                 | 1 +
 web/lang/se_se.php                                 | 1 +
 web/skins/classic/includes/control_functions.php   | 6 ++++++
 web/skins/classic/views/controlcap.php             | 2 ++
 25 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index ea0b42288..4063348fc 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -68,6 +68,7 @@ CREATE TABLE `Controls` (
   `CanWake` tinyint(3) unsigned NOT NULL default '0',
   `CanSleep` tinyint(3) unsigned NOT NULL default '0',
   `CanReset` tinyint(3) unsigned NOT NULL default '0',
+  `CanReboot` tinyint(3) unsigned NOT NULL default '0',
   `CanZoom` tinyint(3) unsigned NOT NULL default '0',
   `CanAutoZoom` tinyint(3) unsigned NOT NULL default '0',
   `CanZoomAbs` tinyint(3) unsigned NOT NULL default '0',
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Dahua.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Dahua.pm
index 10a37e102..e274aaaf7 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Dahua.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Dahua.pm
@@ -444,7 +444,7 @@ sub reboot
 {
     my $self = shift;
     Debug( "Camera Reboot" );
-    my $cmd = "cgi-bin/magicBox.cgi?action=reboot";
+    my $cmd = "/cgi-bin/magicBox.cgi?action=reboot";
     $self->_sendGetRequest($cmd);
 }
 
diff --git a/web/lang/ba_ba.php b/web/lang/ba_ba.php
index e60e69066..02ad8e5f3 100644
--- a/web/lang/ba_ba.php
+++ b/web/lang/ba_ba.php
@@ -216,6 +216,7 @@ $SLANG = array(
     'CanMoveRel'            => 'Podržava Relativno kretanje',
     'CanPan'                => 'Podržava Pomak' ,
     'CanReset'              => 'PodržavaReset',
+	'CanReboot'             => 'Can Reboot',
     'CanSetPresets'         => 'Podržava presetove',
     'CanSleep'              => 'Podržava Sleep',
     'CanTilt'               => 'Podržava nagib',
diff --git a/web/lang/big5_big5.php b/web/lang/big5_big5.php
index 63ffb2c1d..518cbe57c 100644
--- a/web/lang/big5_big5.php
+++ b/web/lang/big5_big5.php
@@ -209,6 +209,7 @@ $SLANG = array(
     'CanMoveRel'           => 'Can Move Relative',
     'CanPan'               => 'Can Pan' ,
     'CanReset'             => 'Can Reset',
+	'CanReboot'             => 'Can Reboot',
     'CanSetPresets'        => 'Can Set Presets',
     'CanSleep'             => 'Can Sleep',
     'CanTilt'              => 'Can Tilt',
diff --git a/web/lang/cn_zh.php b/web/lang/cn_zh.php
index 177f44377..8e2bfa8f9 100644
--- a/web/lang/cn_zh.php
+++ b/web/lang/cn_zh.php
@@ -205,6 +205,7 @@ $SLANG = array(
     'CanMoveRel'            => '可以相对移动',
     'CanPan'                => '可以平移' ,
     'CanReset'              => '可以复位',
+	'CanReboot'             => 'Can Reboot',
     'CanSetPresets'         => '可以进行预设',
     'CanSleep'              => '可以休眠',
     'CanTilt'               => '可以倾斜',
diff --git a/web/lang/cs_cz.php b/web/lang/cs_cz.php
index a7939dbff..8e76b20ba 100644
--- a/web/lang/cs_cz.php
+++ b/web/lang/cs_cz.php
@@ -205,6 +205,7 @@ $SLANG = array(
     'CanMoveRel'           => 'Umí relativní pohyb',
     'CanPan'               => 'Umí otáčení',
     'CanReset'             => 'Umí reset',
+	'CanReboot'             => 'Can Reboot',
     'CanSetPresets'        => 'Umí navolit předvolby',
     'CanSleep'             => 'Může spát',
     'CanTilt'              => 'Umí náklon',
diff --git a/web/lang/de_de.php b/web/lang/de_de.php
index fb7af310d..37ea4d81c 100644
--- a/web/lang/de_de.php
+++ b/web/lang/de_de.php
@@ -207,6 +207,7 @@ $SLANG = array(
     'CanMoveRel'           => 'Kann relative Bewegung',
     'CanPan'               => 'Kann Pan' ,
     'CanReset'             => 'Kann Reset',
+	'CanReboot'             => 'Can Reboot',
     'CanSetPresets'        => 'Kann Voreinstellungen setzen',
     'CanSleep'             => 'Kann Sleep',
     'CanTilt'              => 'Kann Neigung',
diff --git a/web/lang/dk_dk.php b/web/lang/dk_dk.php
index 88ee943dc..26533a7fb 100644
--- a/web/lang/dk_dk.php
+++ b/web/lang/dk_dk.php
@@ -206,6 +206,7 @@ $SLANG = array(
     'CanMoveRel'            => 'Can Move Relative',
     'CanPan'                => 'Can Pan' ,
     'CanReset'              => 'Can Reset',
+	'CanReboot'             => 'Can Reboot',
     'CanSetPresets'         => 'Can Set Presets',
     'CanSleep'              => 'Can Sleep',
     'CanTilt'               => 'Can Tilt',
diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index 05bca82d0..560a8ad82 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -216,6 +216,7 @@ $SLANG = array(
     'CanMoveRel'            => 'Can Move Relative',
     'CanPan'                => 'Can Pan' ,
     'CanReset'              => 'Can Reset',
+	'CanReboot'             => 'Can Reboot',
     'CanSetPresets'         => 'Can Set Presets',
     'CanSleep'              => 'Can Sleep',
     'CanTilt'               => 'Can Tilt',
diff --git a/web/lang/es_ar.php b/web/lang/es_ar.php
index e9c84af93..114002620 100644
--- a/web/lang/es_ar.php
+++ b/web/lang/es_ar.php
@@ -156,6 +156,7 @@ $SLANG = array(
     'CanMoveRel'           => 'Can Move Relative',
     'CanPan'               => 'Can Pan' ,
     'CanReset'             => 'Can Reset',
+	'CanReboot'             => 'Can Reboot',
     'CanSetPresets'        => 'Can Set Presets',
     'CanSleep'             => 'Can Sleep',
     'CanTilt'              => 'Can Tilt',
diff --git a/web/lang/es_es.php b/web/lang/es_es.php
index 7b64fdd57..767b58d97 100644
--- a/web/lang/es_es.php
+++ b/web/lang/es_es.php
@@ -205,6 +205,7 @@ $SLANG = array(
     'CanMoveRel'            => 'Puede moverse de forma relativa',
     'CanPan'                => 'Puede desplazarse' ,
     'CanReset'              => 'Puede restablecerse',
+	'CanReboot'             => 'Can Reboot',
     'CanSetPresets'         => 'Puede fefinir programaciones',
     'CanSleep'              => 'Puede dormirse',
     'CanTilt'               => 'Puede inclinarse',
diff --git a/web/lang/et_ee.php b/web/lang/et_ee.php
index 3a2f68ad9..19d6e777b 100644
--- a/web/lang/et_ee.php
+++ b/web/lang/et_ee.php
@@ -212,6 +212,7 @@ $SLANG = array(
     'CanMoveRel'            => 'Can Move Relative',
     'CanPan'                => 'Can Pan' ,
     'CanReset'              => 'Can Reset',
+	'CanReboot'             => 'Can Reboot',
     'CanSetPresets'         => 'Can Set Presets',
     'CanSleep'              => 'Can Sleep',
     'CanTilt'               => 'Can Tilt',
diff --git a/web/lang/fr_fr.php b/web/lang/fr_fr.php
index 46590f4aa..03ffc70ba 100644
--- a/web/lang/fr_fr.php
+++ b/web/lang/fr_fr.php
@@ -211,6 +211,7 @@ $SLANG = array(
     'CanMoveRel'           => 'Relatif',
     'CanPan'               => 'Panoramique' ,
     'CanReset'             => 'RàZ',
+	'CanReboot'             => 'Can Reboot',
     'CanSetPresets'        => 'Stockage prépos.',
     'CanSleep'             => 'Veille',
     'CanTilt'              => 'Inclinaison',
diff --git a/web/lang/he_il.php b/web/lang/he_il.php
index 67b7b87bd..26e8bcea6 100644
--- a/web/lang/he_il.php
+++ b/web/lang/he_il.php
@@ -205,6 +205,7 @@ $SLANG = array(
     'CanMoveRel'           => 'àôùø úæåæä éçñéú',
     'CanPan'               => 'Can Pan' ,
     'CanReset'             => 'àôùø àúçåì',
+	'CanReboot'             => 'Can Reboot',
     'CanSetPresets'        => 'Can Set Presets',
     'CanSleep'             => 'àôùø îöá ùéðä',
     'CanTilt'              => 'àôùø æòæåò',
diff --git a/web/lang/hu_hu.php b/web/lang/hu_hu.php
index 7c1336a87..15cf72aab 100644
--- a/web/lang/hu_hu.php
+++ b/web/lang/hu_hu.php
@@ -248,6 +248,7 @@ $SLANG = array(
     'CanMoveRel'           => 'Relatíven tud mozogni',
     'CanPan'               => 'Tud jobb-bal mozgást' ,
     'CanReset'             => 'Tud alaphelyzetbe jönni',
+	'CanReboot'             => 'Can Reboot',
     'CanSetPresets'        => 'Tud menteni profilokat',
     'CanSleep'             => 'Tud phihenő üzemmódot',
     'CanTilt'              => 'Tud fel-le mozgást',
diff --git a/web/lang/it_it.php b/web/lang/it_it.php
index 8890650e8..9049b3c2f 100644
--- a/web/lang/it_it.php
+++ b/web/lang/it_it.php
@@ -210,6 +210,7 @@ $SLANG = array(
     'CanMoveRel'           => 'Puo\' Mov. Relativo',
     'CanPan'               => 'Puo\' Pan' ,
     'CanReset'             => 'Puo\' Reset',
+	'CanReboot'             => 'Can Reboot',
     'CanSetPresets'        => 'Puo\' impostare preset',
     'CanSleep'             => 'Puo\' andare in sleep',
     'CanTilt'              => 'Puo\' Tilt',
diff --git a/web/lang/ja_jp.php b/web/lang/ja_jp.php
index 4d1854550..b34c9f3f0 100644
--- a/web/lang/ja_jp.php
+++ b/web/lang/ja_jp.php
@@ -206,6 +206,7 @@ $SLANG = array(
     'CanMoveRel'           => 'Can Move Relative',
     'CanPan'               => 'Can Pan' ,
     'CanReset'             => 'Can Reset',
+	'CanReboot'             => 'Can Reboot',
     'CanSetPresets'        => 'Can Set Presets',
     'CanSleep'             => 'Can Sleep',
     'CanTilt'              => 'Can Tilt',
diff --git a/web/lang/nl_nl.php b/web/lang/nl_nl.php
index a50fdd082..a2003b1c3 100644
--- a/web/lang/nl_nl.php
+++ b/web/lang/nl_nl.php
@@ -206,6 +206,7 @@ $SLANG = array(
     'CanMoveRel'           => 'Can Move Relatief',
     'CanPan'               => 'Can Pan' ,
     'CanReset'             => 'Can Reset',
+	'CanReboot'             => 'Can Reboot',
     'CanSetPresets'        => 'Can Set Presets',
     'CanSleep'             => 'Can Sleep',
     'CanTilt'              => 'Can Tilt',
diff --git a/web/lang/pl_pl.php b/web/lang/pl_pl.php
index 48c34b1a3..d41242317 100644
--- a/web/lang/pl_pl.php
+++ b/web/lang/pl_pl.php
@@ -220,6 +220,7 @@ $SLANG = array(
     'CanMoveRel'           => 'Can Move Relative',
     'CanPan'               => 'Can Pan' ,
     'CanReset'             => 'Can Reset',
+	'CanReboot'             => 'Can Reboot',
     'CanSetPresets'        => 'Can Set Presets',
     'CanSleep'             => 'Can Sleep',
     'CanTilt'              => 'Can Tilt',
diff --git a/web/lang/pt_br.php b/web/lang/pt_br.php
index ec4807765..3d5a2cf83 100644
--- a/web/lang/pt_br.php
+++ b/web/lang/pt_br.php
@@ -145,6 +145,7 @@ $SLANG = array(
     'CanMoveRel'           => 'Can Move Relative',
     'CanPan'               => 'Can Pan' ,
     'CanReset'             => 'Can Reset',
+	'CanReboot'             => 'Can Reboot',
     'CanSetPresets'        => 'Can Set Presets',
     'CanSleep'             => 'Can Sleep',
     'CanTilt'              => 'Can Tilt',
diff --git a/web/lang/ro_ro.php b/web/lang/ro_ro.php
index 5526be753..97e07b836 100644
--- a/web/lang/ro_ro.php
+++ b/web/lang/ro_ro.php
@@ -176,6 +176,7 @@ $SLANG = array(
     'CanMoveRel'           => 'Mi&#351;care relativ&#259;',
     'CanPan'               => 'Rotativ' ,
     'CanReset'             => 'Can Reset',
+	'CanReboot'             => 'Can Reboot',
     'CanSetPresets'        => 'Can Set Presets',
     'CanSleep'             => 'Can Sleep',
     'CanTilt'              => 'Se poate &#238;nclina',
diff --git a/web/lang/ru_ru.php b/web/lang/ru_ru.php
index 0416f3358..11110745e 100644
--- a/web/lang/ru_ru.php
+++ b/web/lang/ru_ru.php
@@ -206,6 +206,7 @@ $SLANG = array(
     'CanMoveRel'           => 'Относительное перемещение',
     'CanPan'               => 'Панорама' ,
     'CanReset'             => 'Сброс',
+	'CanReboot'             => 'Can Reboot',
     'CanSetPresets'        => 'Создание предустановок',
     'CanSleep'             => 'Сон',
     'CanTilt'              => 'Наклон',
diff --git a/web/lang/se_se.php b/web/lang/se_se.php
index 995e88156..4245ae974 100644
--- a/web/lang/se_se.php
+++ b/web/lang/se_se.php
@@ -206,6 +206,7 @@ $SLANG = array(
     'CanMoveRel'           => 'Har relativ förflyttning',
     'CanPan'               => 'Har panorering',
     'CanReset'             => 'Har återställning',
+	'CanReboot'             => 'Can Reboot',
     'CanSetPresets'        => 'Har förinställningar',
     'CanSleep'             => 'Kan vila',
     'CanTilt'              => 'Kan tilta',
diff --git a/web/skins/classic/includes/control_functions.php b/web/skins/classic/includes/control_functions.php
index b2a42a1d4..2c3fbd73a 100644
--- a/web/skins/classic/includes/control_functions.php
+++ b/web/skins/classic/includes/control_functions.php
@@ -24,6 +24,7 @@ function getControlCommands( $monitor ) {
   $cmds['Wake'] = 'wake';
   $cmds['Sleep'] = 'sleep';
   $cmds['Reset'] = 'reset';
+  $cmds['Reboot'] = 'reboot';
 
   $cmds['PresetSet'] = 'presetSet';
   $cmds['PresetGoto'] = 'presetGoto';
@@ -319,6 +320,11 @@ function controlPower( $monitor, $cmds ) {
   if ( $monitor->CanReset() ) {
 ?>
     <button type="button" class="ptzTextBtn" value="Reset" onclick="controlCmd('<?php echo $cmds['Reset'] ?>')"><?php echo translate('Reset') ?></button>
+<?php
+  }
+  if ( $monitor->CanReboot() ) {
+?>
+    <button type="button" class="ptzTextBtn" value="Reboot" onclick="controlCmd('<?php echo $cmds['Reboot'] ?>')"><?php echo translate('Reboot') ?></button>
 <?php
   }
 ?>
diff --git a/web/skins/classic/views/controlcap.php b/web/skins/classic/views/controlcap.php
index 546c27a93..bc48d05e4 100644
--- a/web/skins/classic/views/controlcap.php
+++ b/web/skins/classic/views/controlcap.php
@@ -59,6 +59,7 @@ else
             'CanWake' => "",
             'CanSleep' => "",
             'CanReset' => "",
+            'CanReboot' => "",
             'CanMove' => "",
             'CanMoveDiag' => "",
             'CanMoveMap' => "",
@@ -352,6 +353,7 @@ switch ( $tab )
             <tr><th scope="row"><?php echo translate('CanWake') ?></th><td><input type="checkbox" name="newControl[CanWake]" value="1"<?php if ( !empty($newControl['CanWake']) ) { ?> checked="checked"<?php } ?>/></td></tr>
             <tr><th scope="row"><?php echo translate('CanSleep') ?></th><td><input type="checkbox" name="newControl[CanSleep]" value="1"<?php if ( !empty($newControl['CanSleep']) ) { ?> checked="checked"<?php } ?>/></td></tr>
             <tr><th scope="row"><?php echo translate('CanReset') ?></th><td><input type="checkbox" name="newControl[CanReset]" value="1"<?php if ( !empty($newControl['CanReset']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th scope="row"><?php echo translate('CanReboot') ?></th><td><input type="checkbox" name="newControl[CanReboot]" value="1"<?php if ( !empty($newControl['CanReboot']) ) { ?> checked="checked"<?php } ?>/></td></tr>
 <?php
         break;
     }

From 18f1881ffdc7dd1246bb1d320486f0cc188f529a Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 18 Mar 2019 17:13:19 -0400
Subject: [PATCH 076/214] spacing

---
 scripts/zmaudit.pl.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in
index 45035ca23..851921db2 100644
--- a/scripts/zmaudit.pl.in
+++ b/scripts/zmaudit.pl.in
@@ -1005,17 +1005,17 @@ sub delete_empty_directories {
     Error("delete_empty_directories: Can't open directory '/$_[0]': $!" );
     return;
   }
-  my @contents = map { ( $_ eq '.' or $_ eq '..' ) ? () : $_ } readdir( $DIR );
+  my @contents = map { ( $_ eq '.' or $_ eq '..' ) ? () : $_ } readdir($DIR);
   #Debug("delete_empty_directories $_[0] has " . @contents .' entries:' . ( @contents <= 2 ? join(',',@contents) : '' ));
   my @dirs = map { -d $_[0].'/'.$_ ? $_ : () } @contents;
   if ( @dirs ) {
-    Debug("Have " . @dirs . " dirs in $_[0]");
+    Debug('Have ' . @dirs . " dirs in $_[0]");
     foreach ( @dirs ) {
-      delete_empty_directories( $_[0].'/'.$_ );
+      delete_empty_directories($_[0].'/'.$_);
     }
 #Reload, since we may now be empty
     rewinddir $DIR;
-    @contents = map { ($_ eq '.' or $_ eq '..') ? () : $_ } readdir( $DIR );
+    @contents = map { ($_ eq '.' or $_ eq '..') ? () : $_ } readdir($DIR);
   }
   closedir($DIR);
   if ( ! @contents ) {

From 1d3af44d0277dfcdfe27f42587262f5df35f1313 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 19 Mar 2019 09:13:56 -0400
Subject: [PATCH 077/214] Fix namespace Warning

---
 web/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/index.php b/web/index.php
index 956ce8122..3ee1836ca 100644
--- a/web/index.php
+++ b/web/index.php
@@ -158,7 +158,7 @@ CORSHeaders();
 
 // Check for valid content dirs
 if ( !is_writable(ZM_DIR_EVENTS) ) {
-  Warning("Cannot write to event folder ".ZM_DIR_EVENTS.". Check that it exists and is owned by the web account user.");
+  ZM\Warning("Cannot write to event folder ".ZM_DIR_EVENTS.". Check that it exists and is owned by the web account user.");
 }
 
 # Globals

From 2c1c9fe6cd347ceecabcc1e41a533fab5e618675 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 19 Mar 2019 09:23:35 -0400
Subject: [PATCH 078/214] fix missing ZM namespaces

---
 web/index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/index.php b/web/index.php
index 99e77d285..0f91180e3 100644
--- a/web/index.php
+++ b/web/index.php
@@ -71,7 +71,7 @@ define('ZM_BASE_URL', '');
 
 require_once('includes/functions.php');
 if ( $_SERVER['REQUEST_METHOD'] == 'OPTIONS' ) {
-  Logger::Debug("OPTIONS Method, only doing CORS");
+  ZM\Logger::Debug("OPTIONS Method, only doing CORS");
   # Add Cross domain access headers
   CORSHeaders();
   return;
@@ -158,7 +158,7 @@ CORSHeaders();
 
 // Check for valid content dirs
 if ( !is_writable(ZM_DIR_EVENTS) ) {
-  Warning("Cannot write to event folder ".ZM_DIR_EVENTS.". Check that it exists and is owned by the web account user.");
+  ZM\Warning("Cannot write to event folder ".ZM_DIR_EVENTS.". Check that it exists and is owned by the web account user.");
 }
 
 # Globals
@@ -180,7 +180,7 @@ if ( isset($_REQUEST['request']) )
 require_once('includes/auth.php');
 
 foreach ( getSkinIncludes('skin.php') as $includeFile ) {
-  #Logger::Debug("including $includeFile");
+  #ZM\Logger::Debug("including $includeFile");
   require_once $includeFile;
 }
 

From 72b87a7c004494be7d6858583eec446fef6e0a9b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 19 Mar 2019 09:36:58 -0400
Subject: [PATCH 079/214] Add code to be a bit more careful about not deleting
 all events when an incomplete event object is used.

---
 web/includes/Event.php | 46 ++++++++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/web/includes/Event.php b/web/includes/Event.php
index 227dc6842..944e55248 100644
--- a/web/includes/Event.php
+++ b/web/includes/Event.php
@@ -122,7 +122,12 @@ class Event {
 
   public function Path() {
     $Storage = $this->Storage();
-    return $Storage->Path().'/'.$this->Relative_Path();
+    if ( $Storage->Path() and $this->Relative_Path() ) {
+      return $Storage->Path().'/'.$this->Relative_Path();
+    } else {
+      Error("Event Path not complete. Storage: " . $Storage->Path() . " relative: " . $this->Relative_Path());
+      return '';
+    }
   }
 
   public function Relative_Path() {
@@ -148,17 +153,19 @@ class Event {
   }
 
   public function delete() {
-    # This wouldn't work with foreign keys
-    dbQuery( 'DELETE FROM Events WHERE Id = ?', array($this->{'Id'}) );
+    if ( ! $this->{'Id'} ) {
+      Error('Event delete on event with empty Id');
+      return;
+    }
     if ( !ZM_OPT_FAST_DELETE ) {
-      dbQuery( 'DELETE FROM Stats WHERE EventId = ?', array($this->{'Id'}) );
-      dbQuery( 'DELETE FROM Frames WHERE EventId = ?', array($this->{'Id'}) );
+      dbQuery('DELETE FROM Stats WHERE EventId = ?', array($this->{'Id'}));
+      dbQuery('DELETE FROM Frames WHERE EventId = ?', array($this->{'Id'}));
       if ( $this->{'Scheme'} == 'Deep' ) {
 
 # Assumption: All events have a start time
-        $start_date = date_parse( $this->{'StartTime'} );
+        $start_date = date_parse($this->{'StartTime'});
         if ( ! $start_date ) {
-          Error('Unable to parse start time for event ' . $this->{'Id'} . ' not deleting files.' );
+          Error('Unable to parse start time for event ' . $this->{'Id'} . ' not deleting files.');
           return;
         }
         $start_date['year'] = $start_date['year'] % 100;
@@ -166,37 +173,42 @@ class Event {
 # So this is because ZM creates a link under the day pointing to the time that the event happened. 
         $link_path = $this->Link_Path();
         if ( ! $link_path ) {
-          Error('Unable to determine link path for event ' . $this->{'Id'} . ' not deleting files.' );
+          Error('Unable to determine link path for event ' . $this->{'Id'} . ' not deleting files.');
           return;
         }
         
         $Storage = $this->Storage();
         $eventlink_path = $Storage->Path().'/'.$link_path;
 
-        if ( $id_files = glob( $eventlink_path ) ) {
+        if ( $id_files = glob($eventlink_path) ) {
           if ( ! $eventPath = readlink($id_files[0]) ) {
             Error("Unable to read link at $id_files[0]");
             return;
           }
 # I know we are using arrays here, but really there can only ever be 1 in the array
           $eventPath = preg_replace( '/\.'.$this->{'Id'}.'$/', $eventPath, $id_files[0] );
-          deletePath( $eventPath );
-          deletePath( $id_files[0] );
-          $pathParts = explode(  '/', $eventPath );
+          deletePath($eventPath);
+          deletePath($id_files[0]);
+          $pathParts = explode('/', $eventPath);
           for ( $i = count($pathParts)-1; $i >= 2; $i-- ) {
-            $deletePath = join( '/', array_slice( $pathParts, 0, $i ) );
-            if ( !glob( $deletePath."/*" ) ) {
-              deletePath( $deletePath );
+            $deletePath = join('/', array_slice($pathParts, 0, $i));
+            if ( !glob($deletePath.'/*') ) {
+              deletePath($deletePath);
             }
           }
         } else {
-          Warning( "Found no event files under $eventlink_path" );
+          Warning("Found no event files under $eventlink_path");
         } # end if found files
       } else {
         $eventPath = $this->Path();
-        deletePath( $eventPath );
+        if ( ! $eventPath ) {
+          Error("No event Path in Event delete. Not deleting");
+          return;
+        }
+        deletePath($eventPath);
       } # USE_DEEP_STORAGE OR NOT
     } # ! ZM_OPT_FAST_DELETE
+    dbQuery('DELETE FROM Events WHERE Id = ?', array($this->{'Id'}));
   } # end Event->delete
 
   public function getStreamSrc( $args=array(), $querySep='&' ) {

From 428f7e8e8fa9a94789fa849325d58a2719422ad3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 19 Mar 2019 10:24:30 -0400
Subject: [PATCH 080/214] create setup_onclick and disable_onclick in the
 monitor object.  Use it to setup and disable the click event when
 editing/cancelling layout editing

---
 web/skins/classic/views/js/montage.js | 33 ++++++++++++++++++++++-----
 web/skins/classic/views/montage.php   |  5 +---
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js
index 781adbd31..0ad9a5355 100644
--- a/web/skins/classic/views/js/montage.js
+++ b/web/skins/classic/views/js/montage.js
@@ -8,7 +8,6 @@ function Monitor( monitorData ) {
   this.alarmState = STATE_IDLE;
   this.lastAlarmState = STATE_IDLE;
   this.streamCmdParms = 'view=request&request=stream&connkey='+this.connKey;
-  this.onclick = monitorData.onclick;
   if ( auth_hash ) {
     this.streamCmdParms += '&auth='+auth_hash;
   }
@@ -23,6 +22,27 @@ function Monitor( monitorData ) {
     }
   };
 
+  this.onclick = function() {
+      var el = this;
+      var url = '?view=watch&mid='+this.id;
+      var name = 'zmWatch'+this.id;
+      var tag = 'watch';
+      var width = el.getAttribute("data-window-width");
+      var height = el.getAttribute("data-window-height");
+      evt.preventDefault();
+      createPopup(url, name, tag, width, height);
+  };
+
+  this.setup_onclick = function() {
+    document.querySelectorAll('#imageFeed'+this.id).forEach(function(el) {
+      el.addEventListener('click', this.onclick);
+    });
+  }
+  this.disable_onclick = function() {
+    document.querySelectorAll('#imageFeed'+this.id).forEach(function(el) {
+      el.removeEventListener('click',this.onclick);
+    });
+  }
 
   this.setStateClass = function( element, stateClass ) {
     if ( !element.hasClass( stateClass ) ) {
@@ -359,8 +379,7 @@ function edit_layout(button) {
 
   for ( var i = 0; i < monitors.length; i++ ) {
     var monitor = monitors[i];
-    monitor_feed = $j('#imageFeed'+monitor.id)[0];
-    monitor_feed.onclick='';
+    monitor.disable_onclick();
   };
 
   $j('#monitors .monitorFrame').draggable({
@@ -372,7 +391,7 @@ function edit_layout(button) {
 } // end function edit_layout
 
 function save_layout(button) {
-  var form=button.form;
+  var form = button.form;
   // In fixed positioning, order doesn't matter.  In floating positioning, it does.
   var Positions = {};
   for ( var i = 0; i < monitors.length; i++ ) {
@@ -390,7 +409,7 @@ function save_layout(button) {
       float: monitor_frame.css('float'),
     };
   } // end foreach monitor
-  form.Positions.value = JSON.stringify( Positions );
+  form.Positions.value = JSON.stringify(Positions);
   form.submit();
 }
 function cancel_layout(button) {
@@ -399,7 +418,7 @@ function cancel_layout(button) {
   for ( var i = 0; i < monitors.length; i++ ) {
     var monitor = monitors[i];
     monitor_feed = $j('#imageFeed'+monitor.id);
-    monitor_feed.click( monitor.onclick );
+    monitor_feed.click(monitor.onclick);
   };
   selectLayout('#zmMontageLayout');
 }
@@ -431,6 +450,7 @@ function initPage() {
     if ( monitors[i].type == 'WebSite' && interval > 0 ) {
       setInterval(reloadWebSite, interval*1000, i);
     }
+    monitors[i].setup_onclick();
   }
   selectLayout('#zmMontageLayout');
 
@@ -444,6 +464,7 @@ function initPage() {
       var delay = Math.round( (Math.random()+0.75)*statusRefreshTimeout );
       console.log("Delay for monitor " + monitorData[i].id + " is " + delay );
       monitors[i].streamCmdQuery.delay( delay, monitors[i] );
+
     //monitors[i].zm_startup(delay);
     }
   }
diff --git a/web/skins/classic/views/montage.php b/web/skins/classic/views/montage.php
index 7df2a63b3..e589d2206 100644
--- a/web/skins/classic/views/montage.php
+++ b/web/skins/classic/views/montage.php
@@ -199,10 +199,7 @@ foreach ( $monitors as $monitor ) {
           <div id="monitor<?php echo $monitor->Id() ?>" class="monitor idle">
             <div
               id="imageFeed<?php echo $monitor->Id() ?>"
-              class="imageFeed popup-link"
-              data-url="?view=watch&amp;mid=<?php echo $monitor->Id() ?>"
-              data-name="zmWatch<?php echo $monitor->Id() ?>"
-              data-tag="watch"
+              class="imageFeed"
               data-width="<?php echo reScale( $monitor->Width(), $monitor->PopupScale() ); ?>"
               data-height="<?php echo reScale( $monitor->Height(), $monitor->PopupScale() ); ?>">
             <?php

From 927071bb4d76d19d181ff156ad329f543d8c6d57 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 19 Mar 2019 11:08:14 -0400
Subject: [PATCH 081/214] Fix db update adding DefaultCodec

---
 db/zm_update-1.33.4.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/zm_update-1.33.4.sql b/db/zm_update-1.33.4.sql
index cffa35aa5..69fb27ff6 100644
--- a/db/zm_update-1.33.4.sql
+++ b/db/zm_update-1.33.4.sql
@@ -5,7 +5,7 @@ SET @s = (SELECT IF(
       AND column_name = 'DefaultCodec'
     ) > 0,
     "SELECT 'Column DefaultCodec already exists in Monitors'",
-    "ALTER TABLE Monitors ADD `DefaultCodec` enum('auto','H264','H265','MJPEG') NOT NULL default 'auto', AFTER `DefaultScale`"
+    "ALTER TABLE Monitors ADD `DefaultCodec` enum('auto','H264','H265','MJPEG') NOT NULL default 'auto' AFTER `DefaultScale`"
     ));
 
 PREPARE stmt FROM @s;

From 418276ff1c3e316fd844f02776a537b4fdb79b0f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 19 Mar 2019 12:02:42 -0400
Subject: [PATCH 082/214] cleanup/debug

---
 web/ajax/stream.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/ajax/stream.php b/web/ajax/stream.php
index a100beb4d..8589ce5ff 100644
--- a/web/ajax/stream.php
+++ b/web/ajax/stream.php
@@ -10,8 +10,7 @@ if ( !($_REQUEST['connkey'] && $_REQUEST['command']) ) {
   ajaxError("Unexpected received message type '$type'");
 }
 
-if (!mkdir(ZM_PATH_SOCKS) ) {
-}
+#mkdir(ZM_PATH_SOCKS);
 
 # The file that we point ftok to has to exist, and only exist if zms is running, so we are pointing it at the .sock
 $key = ftok(ZM_PATH_SOCKS.'/zms-'.sprintf('%06d',$_REQUEST['connkey']).'s.sock', 'Z');
@@ -121,7 +120,7 @@ if ( sem_acquire($semaphore,1) !== false ) {
     $data = unpack('ltype/imonitor/istate/dfps/ilevel/irate/ddelay/izoom/Cdelayed/Cpaused/Cenabled/Cforced', $msg);
     ZM\Logger::Debug('FPS: ' . $data['fps']);
     $data['fps'] = round( $data['fps'], 2 );
-    ZM\Logger::Debug("FPS: " . $data['fps'] );
+    ZM\Logger::Debug('FPS: ' . $data['fps'] );
     $data['rate'] /= RATE_BASE;
     $data['delay'] = round( $data['delay'], 2 );
     $data['zoom'] = round( $data['zoom']/SCALE_BASE, 1 );
@@ -135,7 +134,8 @@ if ( sem_acquire($semaphore,1) !== false ) {
     ajaxResponse( array( 'status'=>$data ) );
     break;
   case MSG_DATA_EVENT :
-    if ( version_compare( phpversion(), '5.6.0', '>') ) {
+    if ( version_compare( phpversion(), '5.6.0', '<') ) {
+      ZM\Logger::Debug('Using old unpack methods to handle 64bit event id');
       $data = unpack('ltype/ieventlow/ieventhigh/iprogress/irate/izoom/Cpaused', $msg);
       $data['event'] = $data['eventhigh'] << 32 | $data['eventlow'];
     } else {

From 6b6e787e4e461133c865560ba6ef398d08269b63 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 19 Mar 2019 12:05:45 -0400
Subject: [PATCH 083/214] fix ajax stream code

---
 web/ajax/stream.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/ajax/stream.php b/web/ajax/stream.php
index 8589ce5ff..d9ada4430 100644
--- a/web/ajax/stream.php
+++ b/web/ajax/stream.php
@@ -51,7 +51,7 @@ if ( sem_acquire($semaphore,1) !== false ) {
     $msg = pack( 'lcN', MSG_CMD, $_REQUEST['command'], $_REQUEST['offset'] );
     break;
   default :
-    Logger::Debug("Sending command " . $_REQUEST['command']);
+    ZM\Logger::Debug('Sending command ' . $_REQUEST['command']);
     $msg = pack( 'lc', MSG_CMD, $_REQUEST['command'] );
     break;
   }
@@ -64,7 +64,7 @@ if ( sem_acquire($semaphore,1) !== false ) {
     // WHY? We will just send another one... 
     // ANSWER: Because otherwise we get a log of errors logged
 
-    //Logger::Debug("$remSockFile does not exist, waiting, current " . (time() - $start_time) . ' seconds' );
+    //ZM\Logger::Debug("$remSockFile does not exist, waiting, current " . (time() - $start_time) . ' seconds' );
     usleep(1000);
   }
 
@@ -92,7 +92,7 @@ if ( sem_acquire($semaphore,1) !== false ) {
     ajaxError( "Socket closed $remSockFile"  );
   } else if ( $numSockets == 0 ) {
     ZM\Error( "Timed out waiting for msg $remSockFile"  );
-    socket_Set_nonblock($socket);
+    socket_set_nonblock($socket);
     #ajaxError("Timed out waiting for msg $remSockFile");
   } else if ( $numSockets > 0 ) {
     if ( count($rSockets) != 1 ) {

From 71cd024fda7476583b7e5e1dfe078d1a5def1b2f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 19 Mar 2019 12:16:31 -0400
Subject: [PATCH 084/214] spacing updates.  Use MP4 instead of H264/H265 in
 viewing codec dropdown

---
 db/zm_create.sql.in                 |  2 +-
 db/zm_update-1.33.4.sql             |  2 +-
 web/skins/classic/views/event.php   | 43 ++++++++++++++---------------
 web/skins/classic/views/monitor.php |  3 +-
 4 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 3366a0b35..53a6a13af 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -499,7 +499,7 @@ CREATE TABLE `Monitors` (
   `ReturnDelay` smallint(5) unsigned,
   `DefaultRate` smallint(5) unsigned NOT NULL default '100',
   `DefaultScale` smallint(5) unsigned NOT NULL default '100',
-  `DefaultCodec` enum('auto','H264','H265','MJPEG') NOT NULL default 'auto',
+  `DefaultCodec` enum('auto','MP4','MJPEG') NOT NULL default 'auto',
   `SignalCheckPoints` INT UNSIGNED NOT NULL default '0',
   `SignalCheckColour` varchar(32) NOT NULL default '#0000BE',
   `WebColour` varchar(32) NOT NULL default 'red',
diff --git a/db/zm_update-1.33.4.sql b/db/zm_update-1.33.4.sql
index 69fb27ff6..d9b498bc8 100644
--- a/db/zm_update-1.33.4.sql
+++ b/db/zm_update-1.33.4.sql
@@ -5,7 +5,7 @@ SET @s = (SELECT IF(
       AND column_name = 'DefaultCodec'
     ) > 0,
     "SELECT 'Column DefaultCodec already exists in Monitors'",
-    "ALTER TABLE Monitors ADD `DefaultCodec` enum('auto','H264','H265','MJPEG') NOT NULL default 'auto' AFTER `DefaultScale`"
+    "ALTER TABLE Monitors ADD `DefaultCodec` enum('auto','MP4','MJPEG') NOT NULL default 'auto' AFTER `DefaultScale`"
     ));
 
 PREPARE stmt FROM @s;
diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php
index f02b099a6..a64069ab3 100644
--- a/web/skins/classic/views/event.php
+++ b/web/skins/classic/views/event.php
@@ -23,20 +23,20 @@ if ( !canView('Events') ) {
   return;
 }
 
-$eid = validInt( $_REQUEST['eid'] );
+$eid = validInt($_REQUEST['eid']);
 $fid = !empty($_REQUEST['fid'])?validInt($_REQUEST['fid']):1;
 
-$Event = new ZM\Event( $eid );
+$Event = new ZM\Event($eid);
 if ( $user['MonitorIds'] ) {
-  $monitor_ids = explode( ',', $user['MonitorIds'] );
-  if ( count($monitor_ids) and ! in_array( $Event->MonitorId(), $monitor_ids ) ) {
+  $monitor_ids = explode(',', $user['MonitorIds']);
+  if ( count($monitor_ids) and ! in_array($Event->MonitorId(), $monitor_ids) ) {
     $view = 'error';
     return;
   }
 }
 $Monitor = $Event->Monitor();
 
-if (isset($_REQUEST['rate'])) {
+if ( isset($_REQUEST['rate']) ) {
   $rate = validInt($_REQUEST['rate']);
 } else if ( isset($_COOKIE['zmEventRate']) ) {
   $rate = $_COOKIE['zmEventRate'];
@@ -44,40 +44,39 @@ if (isset($_REQUEST['rate'])) {
   $rate = reScale(RATE_BASE, $Monitor->DefaultRate(), ZM_WEB_DEFAULT_RATE);
 }
 
-if (isset($_REQUEST['scale'])) {
+if ( isset($_REQUEST['scale']) ) {
   $scale = validInt($_REQUEST['scale']);
-} else if ( isset( $_COOKIE['zmEventScaleAuto'] ) ) {
+} else if ( isset($_COOKIE['zmEventScaleAuto']) ) {
   // If we're using scale to fit use it on all monitors
   $scale = 'auto';
-} else if ( isset( $_COOKIE['zmEventScale'.$Event->MonitorId()] ) ) {
+} else if ( isset($_COOKIE['zmEventScale'.$Event->MonitorId()]) ) {
   $scale = $_COOKIE['zmEventScale'.$Event->MonitorId()];
 } else {
   $scale = reScale(SCALE_BASE, $Monitor->DefaultScale(), ZM_WEB_DEFAULT_SCALE);
 }
 
 $codec = 'auto';
-if (isset($_REQUEST['codec'])) {
+if ( isset($_REQUEST['codec']) ) {
   $codec = $_REQUEST['codec'];
   session_start();
   $_SESSION['zmEventCodec'.$Event->MonitorId()] = $codec;
   session_write_close();
-} else if ( isset( $_SESSION['zmEventCodec'.$Event->MonitorId()] ) ) {
+} else if ( isset($_SESSION['zmEventCodec'.$Event->MonitorId()]) ) {
   $codec = $_SESSION['zmEventCodec'.$Event->MonitorId()];
 } else {
   $codec = $Monitor->DefaultCodec();
 }
 $codecs = array(
   'auto'  => translate('Auto'),
-  'H264'  => translate('H264'),
-  'H265'  => translate('H265'),
+  'MP4'   => translate('MP4'),
   'MJPEG' => translate('MJPEG'),
 );
 
 $replayModes = array(
-    'none'    => translate('None'),
-    'single'  => translate('ReplaySingle'),
-    'all'     => translate('ReplayAll'),
-    'gapless' => translate('ReplayGapless'),
+  'none'    => translate('None'),
+  'single'  => translate('ReplaySingle'),
+  'all'     => translate('ReplayAll'),
+  'gapless' => translate('ReplayGapless'),
 );
 
 if ( isset( $_REQUEST['streamMode'] ) )
@@ -106,7 +105,7 @@ if ( $Monitor->VideoWriter() == '2' ) {
 }
 
 parseSort();
-parseFilter( $_REQUEST['filter'] );
+parseFilter($_REQUEST['filter']);
 $filterQuery = $_REQUEST['filter']['query'];
 
 $connkey = generateConnKey();
@@ -115,7 +114,7 @@ $focusWindow = true;
 
 $popup = (isset($_REQUEST['popup']) && ($_REQUEST['popup'] == 1));
 
-xhtmlHeaders(__FILE__, translate('Event') );
+xhtmlHeaders(__FILE__, translate('Event'));
 ?>
 <body>
   <div id="page">
@@ -168,15 +167,15 @@ if ( canEdit('Events') ) {
   } // end if Event->DefaultVideo
 ?>
         <div id="exportEvent"><button type="button" data-on-click="exportEvent"><?php echo translate('Export') ?></button></div>
-        <div id="replayControl"><label for="replayMode"><?php echo translate('Replay') ?></label><?php echo buildSelect( "replayMode", $replayModes, "changeReplayMode();" ); ?></div>
-        <div id="scaleControl"><label for="scale"><?php echo translate('Scale') ?></label><?php echo buildSelect( "scale", $scales, "changeScale();" ); ?></div>
-        <div id="codecControl"><label for="codec"><?php echo translate('Codec') ?></label><?php echo htmlSelect('codec', $codecs, $codec, array('onchange'=>'changeCodec(this);') ); ?></div>
+        <div id="replayControl"><label for="replayMode"><?php echo translate('Replay') ?></label><?php echo buildSelect('replayMode', $replayModes, 'changeReplayMode();'); ?></div>
+        <div id="scaleControl"><label for="scale"><?php echo translate('Scale') ?></label><?php echo buildSelect('scale', $scales, 'changeScale();'); ?></div>
+        <div id="codecControl"><label for="codec"><?php echo translate('Codec') ?></label><?php echo htmlSelect('codec', $codecs, $codec, array('onchange'=>'changeCodec(this);')); ?></div>
       </div>
      </div>
     <div id="content">
       <div id="eventVideo" class="">
 <?php
-if ( ($codec == 'H264' || $codec == 'H265' || $codec == 'auto' ) && $Event->DefaultVideo() ) {
+if ( ($codec == 'MP4' || $codec == 'auto' ) && $Event->DefaultVideo() ) {
 ?>
         <div id="videoFeed">
           <video id="videoobj" class="video-js vjs-default-skin" style="transform: matrix(1, 0, 0, 1, 0, 0)" width="<?php echo reScale( $Event->Width(), $scale ) ?>" height="<?php echo reScale( $Event->Height(), $scale ) ?>" data-setup='{ "controls": true, "autoplay": true, "preload": "auto", "plugins": { "zoomrotate": { "zoom": "<?php echo $Zoom ?>"}}}'>
diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index c6cb7463e..9adeb0283 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -454,8 +454,7 @@ $savejpegopts = array(
 
 $codecs = array(
   'auto'  => translate('Auto'),
-  'H264'  => translate('H264'),
-  'H265'  => translate('H265'),
+  'MP4'  => translate('MP4'),
   'MJPEG' => translate('MJPEG'),
 );
 

From 0623afb0ae3adad551836c7996eb7e98eb657f9d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 19 Mar 2019 12:19:58 -0400
Subject: [PATCH 085/214] add language entry for Monitor DefaultCodec

---
 web/lang/en_gb.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index b39d696ee..bb5e59a88 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -272,6 +272,7 @@ $SLANG = array(
     'Debug'                 => 'Debug',
     'DefaultRate'           => 'Default Rate',
     'DefaultScale'          => 'Default Scale',
+    'DefaultCodec'          => 'Default Method For Live View',
     'DefaultView'           => 'Default View',
     'Deinterlacing'         => 'Deinterlacing',
     'RTSPDescribe'         => 'Use RTSP Response Media URL',

From a437c407a7c75b8b7272d9c2b15bd8734c4133e5 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 19 Mar 2019 13:17:26 -0400
Subject: [PATCH 086/214] fix video_out_ctx init so that ffmpeg doesn't
 complain

---
 src/zm_videostore.cpp | 133 +++++++++++++++++++++++++-----------------
 1 file changed, 80 insertions(+), 53 deletions(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 849c9575f..f414eea26 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -93,7 +93,6 @@ VideoStore::VideoStore(
   oc->metadata = pmetadata;
   out_format = oc->oformat;
 
-
   video_out_stream = avformat_new_stream(oc, NULL);
   if ( !video_out_stream ) {
     Error("Unable to create video out stream");
@@ -101,39 +100,8 @@ VideoStore::VideoStore(
   } else {
     Debug(2, "Success creating video out stream");
   }
-  // Since we are not re-encoding, all we have to do is copy the parameters
-  video_out_ctx = video_out_stream->codec;
-  video_out_ctx->time_base = video_in_ctx->time_base;
 
-#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-  // Copy params from instream to ctx
-  ret = avcodec_parameters_to_context(video_out_ctx, video_in_stream->codecpar);
-  if ( ret < 0 ) {
-    Error("Could not initialize video_out_ctx parameters");
-    return;
-  } else {
-    zm_dump_codec(video_out_ctx);
-  }
-
-  if ( !video_out_ctx->codec_tag ) {
-    video_out_ctx->codec_tag =
-        av_codec_get_tag(oc->oformat->codec_tag, video_in_ctx->codec_id);
-    Debug(2, "No codec_tag, setting to %d", video_out_ctx->codec_tag);
-  }
-
-  // Now copy them to the out stream
-  ret = avcodec_parameters_from_context(video_out_stream->codecpar,
-                                        video_out_ctx);
-  if ( ret < 0 ) {
-    Error("Could not initialize stream parameters");
-    return;
-  } else {
-    Debug(2, "Success setting parameters");
-  }
-  zm_dump_codecpar(video_in_stream->codecpar);
-  zm_dump_codecpar(video_out_stream->codecpar);
-
-  AVCodec *video_out_codec = avcodec_find_encoder(video_out_ctx->codec_id);
+  AVCodec *video_out_codec = avcodec_find_encoder(video_in_ctx->codec_id);
   if ( !video_out_codec ) {
 #if (LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 11, 0) && (LIBAVFORMAT_VERSION_MICRO >= 100))
     Fatal("Could not find encoder for '%s'", avcodec_get_name(video_out_ctx->codec_id));
@@ -142,20 +110,18 @@ VideoStore::VideoStore(
 #endif
   }
 
-  AVDictionary *opts = 0;
-  if ( (ret = avcodec_open2(video_out_ctx, video_out_codec, &opts)) < 0 ) {
-    Warning("Can't open video codec (%s) %s",
-        video_out_codec->name,
-        av_make_error_string(ret).c_str()
-        );
-    video_out_codec = NULL;
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+  video_out_stream->codec = avcodec_alloc_context3(video_out_codec);
+  // Since we are not re-encoding, all we have to do is copy the parameters
+  video_out_ctx = video_out_stream->codec;
+  // Copy params from instream to ctx
+  ret = avcodec_parameters_to_context(video_out_ctx, video_in_stream->codecpar);
+  if ( ret < 0 ) {
+    Error("Could not initialize video_out_ctx parameters");
+    return;
+  } else {
+    zm_dump_codec(video_out_ctx);
   }
-
-  AVDictionaryEntry *e = NULL;
-  while ( (e = av_dict_get(opts, "", e, AV_DICT_IGNORE_SUFFIX)) != NULL ) {
-    Warning("Encoder Option %s not recognized by ffmpeg codec", e->key);
-  }
-
 #else
   ret = avcodec_copy_context(video_out_ctx, video_in_ctx);
   if ( ret < 0 ) {
@@ -164,6 +130,57 @@ VideoStore::VideoStore(
   } else {
     Debug(3, "Success copying ctx");
   }
+#endif
+
+  // Just copy them from the in, no reason to choose different
+  video_out_ctx->time_base = video_in_ctx->time_base;
+  if ( ! (video_out_ctx->time_base.num && video_out_ctx->time_base.den) ) {
+    Debug(2,"No timebase found in video in context, defaulting to Q");
+	  video_out_ctx->time_base = AV_TIME_BASE_Q;
+  }
+
+  //video_out_ctx->pix_fmt = codec_data[i].pix_fmt;
+  video_out_ctx->level = 32;
+
+  // Don't have an input stream, so need to tell it what we are sending it, or are transcoding
+  video_out_ctx->width = monitor->Width();
+  video_out_ctx->height = monitor->Height();
+  video_out_ctx->codec_type = AVMEDIA_TYPE_VIDEO;
+
+  video_out_ctx->codec_id = AV_CODEC_ID_H264;
+  video_out_ctx->bit_rate = 400*1024;
+  //video_out_ctx->thread_count = 0;
+  //// Fix deprecated formats
+  switch ( video_out_ctx->pix_fmt ) {
+    case AV_PIX_FMT_YUVJ422P  :
+      video_out_ctx->pix_fmt = AV_PIX_FMT_YUV422P;
+      break;
+    case AV_PIX_FMT_YUVJ444P   :
+      video_out_ctx->pix_fmt = AV_PIX_FMT_YUV444P;
+      break;
+    case AV_PIX_FMT_YUVJ440P :
+      video_out_ctx->pix_fmt = AV_PIX_FMT_YUV440P;
+      break;
+    case AV_PIX_FMT_NONE :
+    case AV_PIX_FMT_YUVJ420P :
+    default:
+      video_out_ctx->pix_fmt = AV_PIX_FMT_YUV420P;
+      break;
+  }
+
+  if ( video_out_ctx->codec_id == AV_CODEC_ID_H264 ) {
+    video_out_ctx->max_b_frames = 1;
+    if ( video_out_ctx->priv_data ) {
+      av_opt_set(video_out_ctx->priv_data, "crf", "1", AV_OPT_SEARCH_CHILDREN);
+      //av_opt_set(video_out_ctx->priv_data, "preset", "ultrafast", 0);
+    } else {
+      Debug(2, "Not setting priv_data");
+    }
+  } else {
+    Error("Unknown codec id");
+  }
+
+
   if ( !video_out_ctx->codec_tag ) {
     Debug(2, "No codec_tag");
     if ( 
@@ -177,14 +194,7 @@ VideoStore::VideoStore(
       video_out_ctx->codec_tag = video_in_ctx->codec_tag;
     }
   }
-#endif
 
-  // Just copy them from the in, no reason to choose different
-  video_out_ctx->time_base = video_in_ctx->time_base;
-  if ( ! (video_out_ctx->time_base.num && video_out_ctx->time_base.den) ) {
-    Debug(2,"No timebase found in video in context, defaulting to Q");
-	  video_out_ctx->time_base = AV_TIME_BASE_Q;
-  }
   video_out_stream->time_base = video_in_stream->time_base;
   if ( video_in_stream->avg_frame_rate.num ) {
     Debug(3,"Copying avg_frame_rate (%d/%d)",
@@ -201,6 +211,8 @@ VideoStore::VideoStore(
     video_out_stream->r_frame_rate = video_in_stream->r_frame_rate;
   }
 
+  zm_dump_codecpar(video_in_stream->codecpar);
+  zm_dump_codecpar(video_out_stream->codecpar);
   Debug(3,
         "Time bases: VIDEO in stream (%d/%d) in codec: (%d/%d) out "
         "stream: (%d/%d) out codec (%d/%d)",
@@ -217,6 +229,21 @@ VideoStore::VideoStore(
 #endif
   }
 
+
+  AVDictionary *opts = 0;
+  if ( (ret = avcodec_open2(video_out_ctx, video_out_codec, &opts)) < 0 ) {
+    Warning("Can't open video codec (%s) %s",
+        video_out_codec->name,
+        av_make_error_string(ret).c_str()
+        );
+    video_out_codec = NULL;
+  }
+
+  AVDictionaryEntry *e = NULL;
+  while ( (e = av_dict_get(opts, "", e, AV_DICT_IGNORE_SUFFIX)) != NULL ) {
+    Warning("Encoder Option %s not recognized by ffmpeg codec", e->key);
+  }
+
   Monitor::Orientation orientation = monitor->getOrientation();
   if ( orientation ) {
     if ( orientation == Monitor::ROTATE_0 ) {

From 12fe7fd2aa9dfd2e4e089d7a83bb407686627c72 Mon Sep 17 00:00:00 2001
From: aktarus82 <11706557+aktarus82@users.noreply.github.com>
Date: Tue, 19 Mar 2019 21:18:10 +0100
Subject: [PATCH 087/214] first commit

---
 docs/test.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docs/test.txt

diff --git a/docs/test.txt b/docs/test.txt
new file mode 100644
index 000000000..7e957cbee
--- /dev/null
+++ b/docs/test.txt
@@ -0,0 +1 @@
+my test

From 7b878a4c64d094ba716f855b91f070e2c3584b82 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 19 Mar 2019 17:15:32 -0400
Subject: [PATCH 088/214] Sync up quotes and space differences frmo
 zma_to_thread

---
 scripts/ZoneMinder/lib/ZoneMinder/Logger.pm | 10 +++++-----
 scripts/zmpkg.pl.in                         | 18 ++++++++----------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
index 117f2a1ab..18bbc35c5 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
@@ -1,6 +1,6 @@
-# ==========================================================================
+############################################################################
 #
-# ZoneMinder Logger Module, $Date$, $Revision$
+# ZoneMinder Logger Module
 # Copyright (C) 2001-2008  Philip Coombes
 #
 # This program is free software; you can redistribute it and/or
@@ -17,7 +17,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# ==========================================================================
+############################################################################
 #
 # This module contains the debug definitions and functions used by the rest
 # of the ZoneMinder scripts
@@ -81,11 +81,11 @@ our @EXPORT = qw();
 
 our $VERSION = $ZoneMinder::Base::VERSION;
 
-# ==========================================================================
+############################################################################
 #
 # Logger Facilities
 #
-# ==========================================================================
+############################################################################
 
 require ZoneMinder::Config;
 
diff --git a/scripts/zmpkg.pl.in b/scripts/zmpkg.pl.in
index eaa772045..5463c6153 100644
--- a/scripts/zmpkg.pl.in
+++ b/scripts/zmpkg.pl.in
@@ -84,9 +84,7 @@ if ( !$command ) {
 }
 
 # PP - Sane state check
-Debug("StartisActiveSSantiyCheck");
 isActiveSanityCheck();
-Debug("Done isActiveSSantiyCheck");
 
 # Move to the right place
 chdir($Config{ZM_PATH_WEB})
@@ -224,9 +222,9 @@ if ( $command =~ /^(?:start|restart)$/ ) {
           if ( $Config{ZM_OPT_CONTROL} ) {
             if ( $monitor->{Controllable} && $monitor->{TrackMotion} ) {
               if ( $monitor->{Function} eq 'Modect' || $monitor->{Function} eq 'Mocord' ) {
-                runCommand( "zmdc.pl start zmtrack.pl -m $monitor->{Id}" );
+                runCommand("zmdc.pl start zmtrack.pl -m $monitor->{Id}");
               } else {
-                Warning(' Monitor is set to track motion, but does not have motion detection enabled.');
+                Warning('Monitor is set to track motion, but does not have motion detection enabled.');
               } # end if Has motion enabled
             } # end if track motion
           } # end if ZM_OPT_CONTROL
@@ -253,15 +251,15 @@ if ( $command =~ /^(?:start|restart)$/ ) {
     }
 
     if ( $Config{ZM_RUN_AUDIT} ) {
-      if ( $Server and exists $$Server{'zmaudit'} and ! $$Server{'zmaudit'} ) {
-        Debug("Not running zmaudit.pl because it is turned off for this server.");
+      if ( $Server and exists $$Server{zmaudit} and ! $$Server{zmaudit} ) {
+        Debug('Not running zmaudit.pl because it is turned off for this server.');
       } else {
         runCommand('zmdc.pl start zmaudit.pl -c');
       }
     }
     if ( $Config{ZM_OPT_TRIGGERS} ) {
-      if ( $Server and exists $$Server{'zmtrigger'} and ! $$Server{'zmtrigger'} ) {
-        Debug("Not running zmtrigger.pl because it is turned off for this server.");
+      if ( $Server and exists $$Server{zmtrigger} and ! $$Server{zmtrigger} ) {
+        Debug('Not running zmtrigger.pl because it is turned off for this server.');
       } else {
         runCommand('zmdc.pl start zmtrigger.pl');
       }
@@ -283,8 +281,8 @@ if ( $command =~ /^(?:start|restart)$/ ) {
         runCommand('zmdc.pl start zmeventnotification.pl');
       }
     }
-    if ( $Server and exists $$Server{'zmstats'} and ! $$Server{'zmstats'} ) {
-      Debug("Not running zmstats.pl because it is turned off for this server.");
+    if ( $Server and exists $$Server{zmstats} and ! $$Server{zmstats} ) {
+      Debug('Not running zmstats.pl because it is turned off for this server.');
     } else {
       runCommand('zmdc.pl start zmstats.pl');
     }

From a634d8b7744acb83310b4dddad1b16d8652bca2c Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 19 Mar 2019 17:26:20 -0400
Subject: [PATCH 089/214] use id instead of this->data when loading Event to
 delete in API

---
 web/api/app/Model/Event.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/web/api/app/Model/Event.php b/web/api/app/Model/Event.php
index ecd08a1e6..51e24052e 100644
--- a/web/api/app/Model/Event.php
+++ b/web/api/app/Model/Event.php
@@ -138,8 +138,11 @@ class Event extends AppModel {
     $storage = $this->Storage->findById($event['StorageId']);
     return filesize($storage['Storage']['Path'].'/'.$this->Relative_Path($event).'/'.$event['DefaultVideo']);
   }
+
   public function beforeDelete($cascade=true) {
-    $Event = new ZM\Event($this->data);
-    return $Event->delete();
+    $Event = new ZM\Event($this->id);
+    $Event->delete();
+    // Event->delete() will do it all, so cake doesn't have to do anything.
+    return false;
   } // end function afterDelete
 }

From 3931baa2b67eed71f28c5357d8f5a378c29d77be Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Wed, 20 Mar 2019 10:21:43 -0400
Subject: [PATCH 090/214] fix build on old ffmpeg

---
 src/zm_videostore.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index f414eea26..27b4d81fb 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -211,8 +211,10 @@ VideoStore::VideoStore(
     video_out_stream->r_frame_rate = video_in_stream->r_frame_rate;
   }
 
+#if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
   zm_dump_codecpar(video_in_stream->codecpar);
   zm_dump_codecpar(video_out_stream->codecpar);
+#endif
   Debug(3,
         "Time bases: VIDEO in stream (%d/%d) in codec: (%d/%d) out "
         "stream: (%d/%d) out codec (%d/%d)",

From 52e66adc9998134ca01e229b50e140c66a4104d3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 20 Mar 2019 14:25:12 -0400
Subject: [PATCH 091/214] Fix namespace

---
 web/skins/classic/views/download.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/web/skins/classic/views/download.php b/web/skins/classic/views/download.php
index 0b8d02fc2..d8b4b2aff 100644
--- a/web/skins/classic/views/download.php
+++ b/web/skins/classic/views/download.php
@@ -24,7 +24,7 @@ if ( !canView('Events') ) {
 }
 
 $total_size = 0;
-if (isset($_SESSION['montageReviewFilter']) and !isset($_REQUEST['eids']) ) {
+if ( isset($_SESSION['montageReviewFilter']) and !isset($_REQUEST['eids']) ) {
   # Handles montageReview filter
   $eventsSql = 'SELECT E.Id,E.DiskSpace FROM Events as E WHERE 1';
   $eventsSql .= $_SESSION['montageReviewFilter']['sql'];
@@ -36,7 +36,7 @@ if (isset($_SESSION['montageReviewFilter']) and !isset($_REQUEST['eids']) ) {
   }
   $_REQUEST['eids'] = $eids;
   if ( ! count($eids) ) {
-    Error("No events found for download using $eventsSql");
+    ZM\Error("No events found for download using $eventsSql");
   } 
   #session_start();
   #unset($_SESSION['montageReviewFilter']);
@@ -46,17 +46,17 @@ if (isset($_SESSION['montageReviewFilter']) and !isset($_REQUEST['eids']) ) {
 }
 
 $exportFormat = '';
-if (isset($_REQUEST['exportFormat'])) {
-  if (!in_array($_REQUEST['exportFormat'], array('zip', 'tar'))) {
-    Error('Invalid exportFormat');
+if ( isset($_REQUEST['exportFormat']) ) {
+  if ( !in_array($_REQUEST['exportFormat'], array('zip', 'tar')) ) {
+    ZM\Error('Invalid exportFormat');
     return;
   }
   $exportFormat = $_REQUEST['exportFormat'];
 }
 
-if (!empty($_REQUEST['eid'])) {
-  $Event = new Event( $_REQUEST['eid'] );
-  if (!$Event->Id) {
+if ( !empty($_REQUEST['eid']) ) {
+  $Event = new ZM\Event( $_REQUEST['eid'] );
+  if ( !$Event->Id ) {
     Error('Invalid event id');
     return;
   }
@@ -65,7 +65,7 @@ if (!empty($_REQUEST['eid'])) {
 $focusWindow = true;
 $connkey = isset($_REQUEST['connkey']) ? $_REQUEST['connkey'] : generateConnKey();
 
-xhtmlHeaders(__FILE__, translate('Download') );
+xhtmlHeaders(__FILE__, translate('Download'));
 ?>
 <body>
   <div id="page">
@@ -83,13 +83,13 @@ if ( !empty($_REQUEST['eid']) ) {
 ?>
         <input type="hidden" name="id" value="<?php echo validInt($_REQUEST['eid']) ?>"/>
     <?php
-    $Event = new Event($_REQUEST['eid']);
+    $Event = new ZM\Event($_REQUEST['eid']);
     echo 'Downloading event ' . $Event->Id . '. Resulting file should be approximately ' . human_filesize( $Event->DiskSpace() );
 } else if ( !empty($_REQUEST['eids']) ) {
     $total_size = 0;
     foreach ( $_REQUEST['eids'] as $eid ) {
       if ( ! validInt($eid) ) {
-        Warning("Invalid event id in eids[] $eid");
+        ZM\Warning("Invalid event id in eids[] $eid");
         continue;
       }
       $Event = new Event($eid);

From 84a200395edfa3e246b9fec7d060549f244ad8d6 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 20 Mar 2019 14:25:34 -0400
Subject: [PATCH 092/214] spacing and turn off errors because ajax should only
 return json

---
 web/ajax/event.php | 261 +++++++++++++++++++++------------------------
 1 file changed, 123 insertions(+), 138 deletions(-)

diff --git a/web/ajax/event.php b/web/ajax/event.php
index d0e229267..1e78e740f 100644
--- a/web/ajax/event.php
+++ b/web/ajax/event.php
@@ -1,4 +1,5 @@
 <?php
+error_reporting(0);
 
 if ( empty($_REQUEST['id']) && empty($_REQUEST['eids']) ) {
   ajaxError('No event id(s) supplied');
@@ -6,160 +7,144 @@ if ( empty($_REQUEST['id']) && empty($_REQUEST['eids']) ) {
 
 if ( canView('Events') ) {
   switch ( $_REQUEST['action'] ) {
-    case 'video' :
-      {
-        if ( empty($_REQUEST['videoFormat']) ) {
-          ajaxError('Video Generation Failure, no format given');
-        } elseif ( empty($_REQUEST['rate']) ) {
-          ajaxError('Video Generation Failure, no rate given');
-        } elseif ( empty($_REQUEST['scale']) ) {
-          ajaxError('Video Generation Failure, no scale given');
-        } else {
-          $sql = 'SELECT E.*,M.Name AS MonitorName,M.DefaultRate,M.DefaultScale FROM Events AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE E.Id = ?'.monitorLimitSql();
-          if ( !($event = dbFetchOne($sql, NULL, array( $_REQUEST['id']))) ) {
-            ajaxError('Video Generation Failure, Unable to load event');
-          } else {
-            if ( $videoFile = createVideo($event, $_REQUEST['videoFormat'], $_REQUEST['rate'], $_REQUEST['scale'], !empty($_REQUEST['overwrite'])) )
-              ajaxResponse(array('response'=>$videoFile));
-            else
-              ajaxError('Video Generation Failed');
-          }
-        }
-        $ok = true;
-        break;
+  case 'video' :
+    if ( empty($_REQUEST['videoFormat']) ) {
+      ajaxError('Video Generation Failure, no format given');
+    } elseif ( empty($_REQUEST['rate']) ) {
+      ajaxError('Video Generation Failure, no rate given');
+    } elseif ( empty($_REQUEST['scale']) ) {
+      ajaxError('Video Generation Failure, no scale given');
+    } else {
+      $sql = 'SELECT E.*,M.Name AS MonitorName,M.DefaultRate,M.DefaultScale FROM Events AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE E.Id = ?'.monitorLimitSql();
+      if ( !($event = dbFetchOne($sql, NULL, array( $_REQUEST['id']))) ) {
+        ajaxError('Video Generation Failure, Unable to load event');
+      } else {
+        if ( $videoFile = createVideo($event, $_REQUEST['videoFormat'], $_REQUEST['rate'], $_REQUEST['scale'], !empty($_REQUEST['overwrite'])) )
+          ajaxResponse(array('response'=>$videoFile));
+        else
+          ajaxError('Video Generation Failed');
       }
-    case 'deleteVideo' :
-      {
-        unlink( $videoFiles[$_REQUEST['id']] );
-        unset( $videoFiles[$_REQUEST['id']] );
-        ajaxResponse();
-        break;
-      }
-    case 'export' :
-      {
-        require_once(ZM_SKIN_PATH.'/includes/export_functions.php');
+    }
+    $ok = true;
+    break;
+  case 'deleteVideo' :
+    unlink( $videoFiles[$_REQUEST['id']] );
+    unset( $videoFiles[$_REQUEST['id']] );
+    ajaxResponse();
+    break;
+  case 'export' :
+    require_once(ZM_SKIN_PATH.'/includes/export_functions.php');
 
-        # We use session vars in here, so we need to restart the session
-        # because we stopped it in index.php to improve concurrency.
-        session_start();
+    # We use session vars in here, so we need to restart the session
+    # because we stopped it in index.php to improve concurrency.
+    zm_session_start();
 
-        if ( !empty($_REQUEST['exportDetail']) )
-          $exportDetail = $_SESSION['export']['detail'] = $_REQUEST['exportDetail'];
-        else
-          $exportDetail = false;
+    if ( !empty($_REQUEST['exportDetail']) )
+      $exportDetail = $_SESSION['export']['detail'] = $_REQUEST['exportDetail'];
+    else
+      $exportDetail = false;
 
-        if ( !empty($_REQUEST['exportFrames']) )
-          $exportFrames = $_SESSION['export']['frames'] = $_REQUEST['exportFrames'];
-        else
-          $exportFrames = false;
+    if ( !empty($_REQUEST['exportFrames']) )
+      $exportFrames = $_SESSION['export']['frames'] = $_REQUEST['exportFrames'];
+    else
+      $exportFrames = false;
 
-        if ( !empty($_REQUEST['exportImages']) )
-          $exportImages = $_SESSION['export']['images'] = $_REQUEST['exportImages'];
-        else
-          $exportImages = false;
+    if ( !empty($_REQUEST['exportImages']) )
+      $exportImages = $_SESSION['export']['images'] = $_REQUEST['exportImages'];
+    else
+      $exportImages = false;
 
-        if ( !empty($_REQUEST['exportVideo']) )
-          $exportVideo = $_SESSION['export']['video'] = $_REQUEST['exportVideo'];
-        else
-          $exportVideo = false;
+    if ( !empty($_REQUEST['exportVideo']) )
+      $exportVideo = $_SESSION['export']['video'] = $_REQUEST['exportVideo'];
+    else
+      $exportVideo = false;
 
-        if ( !empty($_REQUEST['exportMisc']) )
-          $exportMisc = $_SESSION['export']['misc'] = $_REQUEST['exportMisc'];
-        else
-          $exportMisc = false;
+    if ( !empty($_REQUEST['exportMisc']) )
+      $exportMisc = $_SESSION['export']['misc'] = $_REQUEST['exportMisc'];
+    else
+      $exportMisc = false;
 
-        if ( !empty($_REQUEST['exportFormat']) )
-          $exportFormat = $_SESSION['export']['format'] = $_REQUEST['exportFormat'];
-        else
-          $exportFormat = '';
+    if ( !empty($_REQUEST['exportFormat']) )
+      $exportFormat = $_SESSION['export']['format'] = $_REQUEST['exportFormat'];
+    else
+      $exportFormat = '';
 
-        if ( !empty($_REQUEST['exportCompress']) )
-          $exportCompress = $_SESSION['export']['compress'] = $_REQUEST['exportCompress'];
-        else
-          $exportCompress = false;
+    if ( !empty($_REQUEST['exportCompress']) )
+      $exportCompress = $_SESSION['export']['compress'] = $_REQUEST['exportCompress'];
+    else
+      $exportCompress = false;
 
-        session_write_close();
+    session_write_close();
 
-        $exportIds = !empty($_REQUEST['eids'])?$_REQUEST['eids']:$_REQUEST['id'];
-        if ( $exportFile = exportEvents(
-          $exportIds,
-          (isset($_REQUEST['connkey'])?$_REQUEST['connkey']:''),
-          $exportDetail,
-          $exportFrames,
-          $exportImages,
-          $exportVideo,
-          $exportMisc,
-          $exportFormat,
-          $exportCompress
-        ) )
-          ajaxResponse(array('exportFile'=>$exportFile));
-        else
-          ajaxError('Export Failed');
-        break;
-      }
-    case 'download' :
-      {
-        require_once(ZM_SKIN_PATH.'/includes/export_functions.php');
-        $exportVideo = 1;
-        $exportFormat = $_REQUEST['exportFormat'];
-        $exportStructure = 'flat';
-        $exportIds = !empty($_REQUEST['eids'])?$_REQUEST['eids']:$_REQUEST['id'];
-        if ( $exportFile = exportEvents(
-          $exportIds,
-          (isset($_REQUEST['connkey'])?$_REQUEST['connkey']:''),
-          false,false, false,
-          $exportVideo, false, $exportFormat, $exportStructure ) )
-          ajaxResponse(array('exportFile'=>$exportFile));
-        else
-          ajaxError('Export Failed');
-        break;
-      }
+    $exportIds = !empty($_REQUEST['eids']) ? $_REQUEST['eids'] : $_REQUEST['id'];
+    if ( $exportFile = exportEvents(
+      $exportIds,
+      (isset($_REQUEST['connkey'])?$_REQUEST['connkey']:''),
+      $exportDetail,
+      $exportFrames,
+      $exportImages,
+      $exportVideo,
+      $exportMisc,
+      $exportFormat,
+      $exportCompress
+    ) )
+    ajaxResponse(array('exportFile'=>$exportFile));
+    else
+      ajaxError('Export Failed');
+    break;
+  case 'download' :
+    require_once(ZM_SKIN_PATH.'/includes/export_functions.php');
+    $exportVideo = 1;
+    $exportFormat = $_REQUEST['exportFormat'];
+    $exportStructure = 'flat';
+    $exportIds = !empty($_REQUEST['eids'])?$_REQUEST['eids']:$_REQUEST['id'];
+    if ( $exportFile = exportEvents(
+      $exportIds,
+      (isset($_REQUEST['connkey'])?$_REQUEST['connkey']:''),
+      false,false, false,
+      $exportVideo, false, $exportFormat, $exportStructure ) )
+      ajaxResponse(array('exportFile'=>$exportFile));
+    else
+      ajaxError('Export Failed');
+    break;
   }
 } // end if canView('Events')
 
 if ( canEdit('Events') ) {
   switch ( $_REQUEST['action'] ) {
-    case 'rename' :
-      {
-        if ( !empty($_REQUEST['eventName']) )
-          dbQuery('UPDATE Events SET Name = ? WHERE Id = ?', array($_REQUEST['eventName'], $_REQUEST['id']));
-        else
-          ajaxError('No new event name supplied');
-        ajaxResponse(array('refreshEvent'=>true, 'refreshParent'=>true));
-        break;
-      }
-    case 'eventdetail' :
-      {
-        dbQuery(
-          'UPDATE Events SET Cause = ?, Notes = ? WHERE Id = ?',
-          array($_REQUEST['newEvent']['Cause'], $_REQUEST['newEvent']['Notes'], $_REQUEST['id'])
-        );
-        ajaxResponse(array('refreshEvent'=>true, 'refreshParent'=>true));
-        break;
-      }
-    case 'archive' :
-    case 'unarchive' :
-      {
-        $archiveVal = ($_REQUEST['action'] == 'archive')?1:0;
-        dbQuery(
-          'UPDATE Events SET Archived = ? WHERE Id = ?',
-          array($archiveVal, $_REQUEST['id'])
-        );
-        ajaxResponse(array('refreshEvent'=>true, 'refreshParent'=>false));
-        break;
-      }
-    case 'delete' :
-      {
-        $Event = new Event($_REQUEST['id']);
-        if ( ! $Event->Id() ) {
-          ajaxResponse(array('refreshEvent'=>false, 'refreshParent'=>true, 'message'=> 'Event not found.'));
-        } else {
-          $Event->delete();
-          ajaxResponse(array('refreshEvent'=>false, 'refreshParent'=>true));
-        }
-        break;
-      }
-  }
+  case 'rename' :
+    if ( !empty($_REQUEST['eventName']) )
+      dbQuery('UPDATE Events SET Name = ? WHERE Id = ?', array($_REQUEST['eventName'], $_REQUEST['id']));
+    else
+      ajaxError('No new event name supplied');
+    ajaxResponse(array('refreshEvent'=>true, 'refreshParent'=>true));
+    break;
+  case 'eventdetail' :
+    dbQuery(
+      'UPDATE Events SET Cause = ?, Notes = ? WHERE Id = ?',
+      array($_REQUEST['newEvent']['Cause'], $_REQUEST['newEvent']['Notes'], $_REQUEST['id'])
+    );
+    ajaxResponse(array('refreshEvent'=>true, 'refreshParent'=>true));
+    break;
+  case 'archive' :
+  case 'unarchive' :
+    $archiveVal = ($_REQUEST['action'] == 'archive')?1:0;
+    dbQuery(
+      'UPDATE Events SET Archived = ? WHERE Id = ?',
+      array($archiveVal, $_REQUEST['id'])
+    );
+    ajaxResponse(array('refreshEvent'=>true, 'refreshParent'=>false));
+    break;
+  case 'delete' :
+    $Event = new Event($_REQUEST['id']);
+    if ( ! $Event->Id() ) {
+      ajaxResponse(array('refreshEvent'=>false, 'refreshParent'=>true, 'message'=> 'Event not found.'));
+    } else {
+      $Event->delete();
+      ajaxResponse(array('refreshEvent'=>false, 'refreshParent'=>true));
+    }
+    break;
+  } // end switch action
 } // end if canEdit('Events')
 
 ajaxError('Unrecognised action or insufficient permissions');

From c3324ada180c49048f4f076e87243463ebef5abe Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 20 Mar 2019 14:26:03 -0400
Subject: [PATCH 093/214] Put back mkdir ZM_PATH_SOCKS

---
 web/ajax/stream.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/ajax/stream.php b/web/ajax/stream.php
index d9ada4430..8d5348ca8 100644
--- a/web/ajax/stream.php
+++ b/web/ajax/stream.php
@@ -10,7 +10,7 @@ if ( !($_REQUEST['connkey'] && $_REQUEST['command']) ) {
   ajaxError("Unexpected received message type '$type'");
 }
 
-#mkdir(ZM_PATH_SOCKS);
+mkdir(ZM_PATH_SOCKS);
 
 # The file that we point ftok to has to exist, and only exist if zms is running, so we are pointing it at the .sock
 $key = ftok(ZM_PATH_SOCKS.'/zms-'.sprintf('%06d',$_REQUEST['connkey']).'s.sock', 'Z');

From b988ce0573d8bd3f7664872d87780113b3ce287b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 20 Mar 2019 14:26:35 -0400
Subject: [PATCH 094/214] more parentheses to make logic more clear

---
 web/api/app/Controller/ZonesController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/api/app/Controller/ZonesController.php b/web/api/app/Controller/ZonesController.php
index 4d6564443..5b8c3f1a3 100644
--- a/web/api/app/Controller/ZonesController.php
+++ b/web/api/app/Controller/ZonesController.php
@@ -18,7 +18,7 @@ class ZonesController extends AppController {
     parent::beforeFilter();
 
     global $user;
-    $canView = (!$user) || $user['Monitors'] != 'None';
+    $canView = (!$user) || ($user['Monitors'] != 'None');
     if ( !$canView ) {
       throw new UnauthorizedException(__('Insufficient Privileges'));
       return;

From 6efeab5f8d3da1072159cf5bb983f64c308768a7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 20 Mar 2019 14:26:48 -0400
Subject: [PATCH 095/214] improve readability of parseFilter

---
 web/includes/functions.php | 84 +++++++++++++++++++++++---------------
 1 file changed, 50 insertions(+), 34 deletions(-)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index b2c431013..7c710bbb7 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -1108,20 +1108,23 @@ function parseFilter(&$filter, $saveToSession=false, $querySep='&amp;') {
   $terms = isset($filter['Query']) ? $filter['Query']['terms'] : NULL;
   if ( isset($terms) && count($terms) ) {
     for ( $i = 0; $i < count($terms); $i++ ) {
-      if ( isset($terms[$i]['cnj']) && array_key_exists($terms[$i]['cnj'], $validQueryConjunctionTypes) ) {
-        $filter['query'] .= $querySep.urlencode("filter[Query][terms][$i][cnj]").'='.urlencode($terms[$i]['cnj']);
-        $filter['sql'] .= ' '.$terms[$i]['cnj'].' ';
-        $filter['fields'] .= "<input type=\"hidden\" name=\"filter[Query][terms][$i][cnj]\" value=\"".htmlspecialchars($terms[$i]['cnj'])."\"/>\n";
+
+      $term = $terms[$i];
+
+      if ( isset($term['cnj']) && array_key_exists($term['cnj'], $validQueryConjunctionTypes) ) {
+        $filter['query'] .= $querySep.urlencode("filter[Query][terms][$i][cnj]").'='.urlencode($term['cnj']);
+        $filter['sql'] .= ' '.$term['cnj'].' ';
+        $filter['fields'] .= "<input type=\"hidden\" name=\"filter[Query][terms][$i][cnj]\" value=\"".htmlspecialchars($term['cnj'])."\"/>\n";
       }
-      if ( isset($terms[$i]['obr']) && (string)(int)$terms[$i]['obr'] == $terms[$i]['obr'] ) {
-        $filter['query'] .= $querySep.urlencode("filter[Query][terms][$i][obr]").'='.urlencode($terms[$i]['obr']);
-        $filter['sql'] .= ' '.str_repeat('(', $terms[$i]['obr']).' ';
-        $filter['fields'] .= "<input type=\"hidden\" name=\"filter[Query][terms][$i][obr]\" value=\"".htmlspecialchars($terms[$i]['obr'])."\"/>\n";
+      if ( isset($term['obr']) && (string)(int)$term['obr'] == $term['obr'] ) {
+        $filter['query'] .= $querySep.urlencode("filter[Query][terms][$i][obr]").'='.urlencode($term['obr']);
+        $filter['sql'] .= ' '.str_repeat('(', $term['obr']).' ';
+        $filter['fields'] .= "<input type=\"hidden\" name=\"filter[Query][terms][$i][obr]\" value=\"".htmlspecialchars($term['obr'])."\"/>\n";
       }
-      if ( isset($terms[$i]['attr']) ) {
-        $filter['query'] .= $querySep.urlencode("filter[Query][terms][$i][attr]").'='.urlencode($terms[$i]['attr']);
-        $filter['fields'] .= "<input type=\"hidden\" name=\"filter[Query][terms][$i][attr]\" value=\"".htmlspecialchars($terms[$i]['attr'])."\"/>\n";
-        switch ( $terms[$i]['attr'] ) {
+      if ( isset($term['attr']) ) {
+        $filter['query'] .= $querySep.urlencode("filter[Query][terms][$i][attr]").'='.urlencode($term['attr']);
+        $filter['fields'] .= "<input type=\"hidden\" name=\"filter[Query][terms][$i][attr]\" value=\"".htmlspecialchars($term['attr'])."\"/>\n";
+        switch ( $term['attr'] ) {
           case 'MonitorName':
             $filter['sql'] .= 'M.Name';
             break;
@@ -1189,7 +1192,7 @@ function parseFilter(&$filter, $saveToSession=false, $querySep='&amp;') {
           case 'Notes':
           case 'StateId':
           case 'Archived':
-            $filter['sql'] .= 'E.'.$terms[$i]['attr'];
+            $filter['sql'] .= 'E.'.$term['attr'];
             break;
           case 'DiskPercent':
             // Need to specify a storage area, so need to look through other terms looking for a storage area, else we default to ZM_EVENTS_PATH
@@ -1209,7 +1212,7 @@ function parseFilter(&$filter, $saveToSession=false, $querySep='&amp;') {
             // Need to specify a storage area, so need to look through other terms looking for a storage area, else we default to ZM_EVENTS_PATH
             if ( ! $StorageArea ) {
               for ( $j = $i; $j < count($terms); $j++ ) {
-                if ( isset($terms[$i]['attr']) and $terms[$i]['attr'] == 'StorageId' and isset($terms[$j]['val']) ) {
+                if ( isset($terms[$j]['attr']) and $terms[$j]['attr'] == 'StorageId' and isset($terms[$j]['val']) ) {
                   $StorageArea = ZM\Storage::find_one(array('Id'=>$terms[$j]['val']));
                 }
               } // end foreach remaining term
@@ -1221,8 +1224,8 @@ function parseFilter(&$filter, $saveToSession=false, $querySep='&amp;') {
             break;
         }
         $valueList = array();
-        foreach ( preg_split( '/["\'\s]*?,["\'\s]*?/', preg_replace( '/^["\']+?(.+)["\']+?$/', '$1', $terms[$i]['val'] ) ) as $value ) {
-          switch ( $terms[$i]['attr'] ) {
+        foreach ( preg_split( '/["\'\s]*?,["\'\s]*?/', preg_replace( '/^["\']+?(.+)["\']+?$/', '$1', $term['val'] ) ) as $value ) {
+          switch ( $term['attr'] ) {
             case 'MonitorName':
             case 'Name':
             case 'Cause':
@@ -1270,16 +1273,16 @@ function parseFilter(&$filter, $saveToSession=false, $querySep='&amp;') {
               break;
           }
           $valueList[] = $value;
-        }
+        } // end foreach value
 
-        switch ( $terms[$i]['op'] ) {
+        switch ( $term['op'] ) {
           case '=' :
           case '!=' :
           case '>=' :
           case '>' :
           case '<' :
           case '<=' :
-            $filter['sql'] .= ' '.$terms[$i]['op'].' '. $value;
+            $filter['sql'] .= ' '.$term['op'].' '. $value;
             break;
           case '=~' :
             $filter['sql'] .= ' regexp '.$value;
@@ -1307,28 +1310,41 @@ function parseFilter(&$filter, $saveToSession=false, $querySep='&amp;') {
             $filter['sql'] .= " IS NOT $value";
             break;
           default:
-            ZM\Warning("Invalid operator in filter: " . $terms[$i]['op'] );
-        }
+            ZM\Warning("Invalid operator in filter: " . $term['op'] );
+        } // end switch op
 
-        $filter['query'] .= $querySep.urlencode("filter[Query][terms][$i][op]").'='.urlencode($terms[$i]['op']);
-        $filter['fields'] .= "<input type=\"hidden\" name=\"filter[Query][terms][$i][op]\" value=\"".htmlspecialchars($terms[$i]['op'])."\"/>\n";
-	if ( isset($terms[$i]['val']) ) {
-		$filter['query'] .= $querySep.urlencode("filter[Query][terms][$i][val]").'='.urlencode($terms[$i]['val']);
-		$filter['fields'] .= "<input type=\"hidden\" name=\"filter[Query][terms][$i][val]\" value=\"".htmlspecialchars($terms[$i]['val'])."\"/>\n";
-	}
-      } // end foreach term
-      if ( isset($terms[$i]['cbr']) && (string)(int)$terms[$i]['cbr'] == $terms[$i]['cbr'] ) {
-        $filter['query'] .= $querySep.urlencode("filter[Query][terms][$i][cbr]").'='.urlencode($terms[$i]['cbr']);
-        $filter['sql'] .= ' '.str_repeat( ')', $terms[$i]['cbr'] ).' ';
-        $filter['fields'] .= "<input type=\"hidden\" name=\"filter[Query][terms][$i][cbr]\" value=\"".htmlspecialchars($terms[$i]['cbr'])."\"/>\n";
+        $filter['query'] .= $querySep.urlencode("filter[Query][terms][$i][op]").'='.urlencode($term['op']);
+        $filter['fields'] .= "<input type=\"hidden\" name=\"filter[Query][terms][$i][op]\" value=\"".htmlspecialchars($term['op'])."\"/>\n";
+        if ( isset($term['val']) ) {
+          $filter['query'] .= $querySep.urlencode("filter[Query][terms][$i][val]").'='.urlencode($term['val']);
+          $filter['fields'] .= "<input type=\"hidden\" name=\"filter[Query][terms][$i][val]\" value=\"".htmlspecialchars($term['val'])."\"/>\n";
+        }
+      } // end if ( isset($term['attr']) )
+      if ( isset($term['cbr']) && (string)(int)$term['cbr'] == $term['cbr'] ) {
+        $filter['query'] .= $querySep.urlencode("filter[Query][terms][$i][cbr]").'='.urlencode($term['cbr']);
+        $filter['sql'] .= ' '.str_repeat( ')', $term['cbr'] ).' ';
+        $filter['fields'] .= "<input type=\"hidden\" name=\"filter[Query][terms][$i][cbr]\" value=\"".htmlspecialchars($term['cbr'])."\"/>\n";
       }
-    }
+    } // end foreach term
     if ( $filter['sql'] )
       $filter['sql'] = ' and ( '.$filter['sql'].' )';
     if ( $saveToSession ) {
       $_SESSION['filter'] = $filter;
     }
-  }
+  } else {
+    ZM\Warning("No terms in filter");
+  } // end if terms
+
+  #if ( 0 ) {
+    #// ICON I feel like these should be here, but not yet
+  #if ( isset($filter['Query']['sort_field']) ) {
+    #$filter['sql'] .= ' ORDER BY ' . $filter['Query']['sort_field'] . (
+      #( $filter['Query']['sort_asc'] ? ' ASC' : ' DESC' ) );
+  #}
+  #if ( $filter['Query']['limit'] ) {
+    #$filter['sql'] .= ' LIMIT ' . validInt($filter['Query']['limit']);
+  #}
+  #}
 }
 
 // Please note that the filter is passed in by copy, so you need to use the return value from this function.

From 09b42f8b554573fd061ac8f960a4f74f889d8d88 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 20 Mar 2019 14:27:10 -0400
Subject: [PATCH 096/214] remove nonce from js because it is the exported html
 not part of the zm web ui

---
 .../classic/includes/export_functions.php     | 58 ++++++++++---------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/web/skins/classic/includes/export_functions.php b/web/skins/classic/includes/export_functions.php
index 64b3b37e0..02d0d86dd 100644
--- a/web/skins/classic/includes/export_functions.php
+++ b/web/skins/classic/includes/export_functions.php
@@ -69,7 +69,7 @@ html ul.tabs li.active, html ul.tabs li.active a:hover  {
     </style>
     <script src="<?php echo ($title == translate('Images').' Master' ? '' : '../') ?>jquery.js"></script>
     <!--<script type="text/javascript" src="<?php echo ($title == translate('Images').' Master' ? '' : '../') ?>video.js"></script>-->
-    <script nonce="<?php echo $cspNonce;?>">
+    <script>
 
     /*==========[tab code]==========*/
     $(document).ready(function() {
@@ -285,7 +285,7 @@ function exportEventImages($event, $exportDetail, $exportFrames, $myfilelist) {
 </div>
 <div align="center"><div class="display_holder"><input id="imageslider_display_id" class="value_display" type="text" value="0" onfocus="blur(this);"/></div></div>
 
-<script nonce="<?php echo $cspNonce;?>">
+<script>
 
 /***********************************************
 * Flexi Slideshow- © Dynamic Drive (www.dynamicdrive.com)
@@ -621,7 +621,7 @@ function exportEventImagesMaster($eids) {
   // TODO: Should use find to make this 1 db query
 	foreach ($eids as $eid) {
 		//get monitor id and event id
-		$event = new Event($eid);
+		$event = new ZM\Event($eid);
 		$eventMonitorId[$eid] = $event->MonitorId();
 		$eventPath[$eid] = $event->Relative_Path();
 	}
@@ -654,7 +654,7 @@ function exportEventImagesMaster($eids) {
         <h2> All </h2>
 <?php
 	foreach($eids as $eid) {
-    $Event = new Event($eid);
+    $Event = new ZM\Event($eid);
 		eventlist_html($Event);
 	} # end foreach event id
 ?>
@@ -664,7 +664,7 @@ function exportEventImagesMaster($eids) {
 		echo "<div class=\"tab_content\" id=\"tab$monitor_id\">";
 		echo '<h2>Monitor: ' . $monitorNames[$monitor_id] . ' </h2>';
 		foreach ( $eids as $eid ) {
-			$Event = new Event($eid);
+			$Event = new ZM\Event($eid);
 			if ( $Event->MonitorId() == $monitor_id ) {
 				eventlist_html($Event);
 			} # end if its the right monitor
@@ -681,7 +681,7 @@ function exportEventImagesMaster($eids) {
   </tr>
 </table>
 
-<script nonce="<?php echo $cspNonce;?>">
+<script>
 function switchevent(src) { 
   $('#myframe').attr('src',src);
   $('#myframe').show();
@@ -776,7 +776,7 @@ function exportFileList($event, $exportDetail, $exportFrames, $exportImages, $ex
   if ( $exportDetail ) {
     $file = 'zmEventDetail.html';
     if ( !($fp = fopen($eventPath.'/'.$file, 'w')) ) {
-      Fatal("Can't open event detail export file '$file'");
+      ZM\Fatal("Can't open event detail export file '$file'");
     }
     fwrite($fp, exportEventDetail($event, $exportFrames, $exportImages));
     fclose($fp);
@@ -785,7 +785,7 @@ function exportFileList($event, $exportDetail, $exportFrames, $exportImages, $ex
   if ( $exportFrames ) {
     $file = 'zmEventFrames.html';
     if ( !($fp = fopen($eventPath.'/'.$file, 'w')) ) {
-      Fatal("Can't open event frames export file '$file'");
+      ZM\Fatal("Can't open event frames export file '$file'");
     }
     fwrite($fp, exportEventFrames($event, $exportDetail, $exportImages));
     fclose($fp);
@@ -808,7 +808,7 @@ function exportFileList($event, $exportDetail, $exportFrames, $exportImages, $ex
     if ( !empty($myfilelist) ) {
       $file = $event->Id().'/zmEventImages.html';
       if ( !($fp = fopen($file, 'w')) )
-        Fatal("Can't open event images export file '$file'");
+        ZM\Fatal("Can't open event images export file '$file'");
       fwrite($fp, exportEventImages($event, $exportDetail, $exportFrames, $myfilelist));
       fclose($fp);
       $exportFileList[$file] = $event->Id().'/'.$file;
@@ -850,17 +850,22 @@ function exportEvents(
 ) {
 
   if ( !canView('Events') ) {
-    Error("You do not have permission to view events.");
+    ZM\Error("You do not have permission to view events.");
     return false;
   } else if ( empty($eids) ) {
-    Error("Attempt to export an empty list of events.");
+    ZM\Error("Attempt to export an empty list of events.");
+    return false;
+  }
+
+  if ( !($exportFormat == 'tar' or $exportFormat == 'zip') ) {
+    ZM\Error("None or invalid exportFormat specified $exportFormat.");
     return false;
   }
 
   # Ensure that we are going to be able to do this.
   if ( ! file_exists(ZM_DIR_EXPORTS) ) {
     if ( ! mkdir(ZM_DIR_EXPORTS) ) {
-      Fatal("Can't create exports dir at '".ZM_DIR_EXPORTS."'");
+      ZM\Fatal("Can't create exports dir at '".ZM_DIR_EXPORTS."'");
     }
   }
   $export_dir = ZM_DIR_EXPORTS.'/zmExport_'.$connkey;
@@ -868,13 +873,13 @@ function exportEvents(
   # Ensure that we are going to be able to do this.
   if ( ! file_exists($export_dir) ) {
     if ( ! mkdir($export_dir) ) {
-      Fatal("Can't create exports dir at '$export_dir'");
+      ZM\Fatal("Can't create exports dir at '$export_dir'");
     } else {
-      Logger::Debug("Successfully created dir '$export_dir'");
+      ZM\Logger::Debug("Successfully created dir '$export_dir'");
     }
   }
   if ( !chdir($export_dir) )
-    Fatal("Can't chdir to $export_dir");
+    ZM\Fatal("Can't chdir to $export_dir");
 
   $export_root = 'zmExport';
   $export_listFile = 'zmFileList.txt';
@@ -884,17 +889,19 @@ function exportEvents(
   if ( !is_array($eids) ) {
     $eids = array($eids);
   }
+  ZM\Logger::Debug("Eids: " . print_r($eids,true));
   foreach ( $eids as $eid ) {
-    $event = new Event($eid);
+    $event = new ZM\Event($eid);
     $event_dir = $export_dir.'/'.$event->Id();
     if ( !mkdir($event_dir) )
-      Error("Can't mkdir $event_dir");
+      ZM\Error("Can't mkdir $event_dir");
     $event_exportFileList = exportFileList($event, $exportDetail, $exportFrames, $exportImages, $exportVideo, $exportMisc);
+    ZM\Logger::Debug("File list for event $eid " . print_r($event_exportFileList, true));
     $exportFileList = array_merge($exportFileList,$event_exportFileList);
     foreach ( $event_exportFileList as $file ) {
      if ( preg_match('/\.html$/', $file ) )
         continue;
-      Logger::Debug('cp -as '.$event->Path().'/../'.$file.' '.$export_dir.'/'.$file);
+      ZM\Logger::Debug('cp -as '.$event->Path().'/../'.$file.' '.$export_dir.'/'.$file);
       exec('cp -as '.$event->Path().'/../'.$file.' '.$export_dir.'/'.$file);
     }
   }
@@ -902,7 +909,7 @@ function exportEvents(
   // create an master image 
   if ( $exportImages ) {
     if ( !symlink(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/js/jquery.js', $export_dir.'/jquery.js') )
-      Error("Failed linking jquery.js");
+      ZM\Error("Failed linking jquery.js");
     //if ( !symlink(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/js/video.js', $export_dir.'/video.js') )
       //Error("Failed linking video.js");
 
@@ -914,13 +921,13 @@ function exportEvents(
       fclose($fp);
       $exportFileList[] = $html_eventMaster_file;
     } else {
-      Error("Can't open event images export file '$html_eventMaster_path'");
+      ZM\Error("Can't open event images export file '$html_eventMaster_path'");
     }
   }
 
   $listFile = $export_dir.'/'.$export_listFile;
   if ( !($fp = fopen($listFile, 'w')) ) {
-    Fatal("Can't open event export list file '$listFile'");
+    ZM\Fatal("Can't open event export list file '$listFile'");
   }
   foreach ( $exportFileList as $exportFile ) {
     $exportFile = 'zmExport'.$connkey.'/'.$exportFile;
@@ -949,19 +956,16 @@ function exportEvents(
     $command = 'zip ';
     $command .= ($exportStructure == 'flat' ? ' -j ' : ' -r ' ).escapeshellarg($archive);
     $command .= $exportCompressed ? ' -9' : ' -0';
-  } else {
-    Error("No exportFormat specified.");
-    return false;
   } // if $exportFormat
 
   @unlink($archive);
   $command .= ' zmExport_' . $connkey.'/';
-  Logger::Debug("Command is $command");
+  ZM\Logger::Debug("Command is $command");
   exec($command, $output, $status);
   if ( $status ) {
-    Error("Command '$command' returned with status $status");
+    ZM\Error("Command '$command' returned with status $status");
     if ( isset($output[0]) )
-      Error("First line of output is '".$output[0]."'");
+      ZM\Error("First line of output is '".$output[0]."'");
     return false;
   }
 

From ad059f985e969206391cddff2ce54b9403acb2d7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 20 Mar 2019 14:27:23 -0400
Subject: [PATCH 097/214] spacing

---
 web/skins/classic/includes/functions.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index 662856eb7..a401d512e 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -233,11 +233,11 @@ function getNavBarHTML($reload = null) {
   if (!$sortQuery) {
     parseSort();
   }
-  if (!$filterQuery) {
-    parseFilter( $_REQUEST['filter'] );
+  if ( (!$filterQuery) and isset($_REQUEST['filter']) ) {
+    parseFilter($_REQUEST['filter']);
     $filterQuery = $_REQUEST['filter']['query'];
   }
-  if ($reload === null) {
+  if ( $reload === null ) {
     ob_start();
     if ( $running == null )
       $running = daemonCheck();
@@ -270,7 +270,7 @@ function getNavBarHTML($reload = null) {
      # zmaudit can clean the logs, but if we aren't running it, then we should clean them regularly
       if ( preg_match('/^\d+$/', ZM_LOG_DATABASE_LIMIT) ) {
         # Number of lines, instead of an interval
-        $rows = dbFetchOne('SELECT Count(*) AS Rows FROM Logs', 'Rows' );
+        $rows = dbFetchOne('SELECT Count(*) AS Rows FROM Logs', 'Rows');
         if ( $rows > ZM_LOG_DATABASE_LIMIT ) {
           dbQuery('DELETE low_priority FROM Logs ORDER BY TimeKey ASC LIMIT ?', array($rows - ZM_LOG_DATABASE_LIMIT));
         }

From ae7391689b72450c26b35ecc4516e91b4f37d8b3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 20 Mar 2019 14:28:19 -0400
Subject: [PATCH 098/214] Add some code doc

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

diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php
index a64069ab3..f771e7ff0 100644
--- a/web/skins/classic/views/event.php
+++ b/web/skins/classic/views/event.php
@@ -104,6 +104,7 @@ if ( $Monitor->VideoWriter() == '2' ) {
     $Zoom = $Event->Height()/$Event->Width();
 }
 
+// These are here to figure out the next/prev event
 parseSort();
 parseFilter($_REQUEST['filter']);
 $filterQuery = $_REQUEST['filter']['query'];

From a5366d522d83c9c89e7b6316d76c9cba1d5e2dec Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 20 Mar 2019 14:29:05 -0400
Subject: [PATCH 099/214] Fixup exporting

---
 web/skins/classic/views/export.php       | 134 +++++++++++++----------
 web/skins/classic/views/js/download.js   |   2 +-
 web/skins/classic/views/js/export.js     |  66 +++++++----
 web/skins/classic/views/js/export.js.php |   2 +
 web/skins/classic/views/js/filter.js     |   2 +-
 5 files changed, 121 insertions(+), 85 deletions(-)

diff --git a/web/skins/classic/views/export.php b/web/skins/classic/views/export.php
index 3d657319b..38c81d8f6 100644
--- a/web/skins/classic/views/export.php
+++ b/web/skins/classic/views/export.php
@@ -66,7 +66,7 @@ xhtmlHeaders(__FILE__, translate('Export'));
       <h2><?php echo translate('ExportOptions') ?></h2>
     </div>
     <div id="content">
-      <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
+      <form name="contentForm" id="contentForm" method="post" action="?view=export">
         <input type="hidden" name="connkey" value="<?php echo $connkey; ?>"/>
 <?php
 
@@ -75,6 +75,7 @@ $eventsValues = array();
 $filterQuery = '';
 $sortColumn = '';
 $sortOrder = '';
+$limitQuery = '';
 
 if ( $user['MonitorIds'] ) {
   $user_monitor_ids = ' M.Id in ('.$user['MonitorIds'].')';
@@ -84,11 +85,11 @@ if ( $user['MonitorIds'] ) {
 }
 
 if ( isset($_REQUEST['eid']) and $_REQUEST['eid'] ) {
-  Logger::Debug('Loading events by single eid');
+  ZM\Logger::Debug('Loading events by single eid');
   $eventsSql .= ' AND E.Id=?';
   $eventsValues[] = $_REQUEST['eid'];
 } elseif ( isset($_REQUEST['eids']) and count($_REQUEST['eids']) > 0 ) {
-  Logger::Debug('Loading events by eids');
+  ZM\Logger::Debug('Loading events by eids');
   $eventsSql .= ' AND E.Id IN ('.implode(',', array_map(function(){return '?';}, $_REQUEST['eids'])). ')';
   $eventsValues += $_REQUEST['eids'];
 } else if ( isset($_REQUEST['filter']) ) {
@@ -100,6 +101,8 @@ if ( isset($_REQUEST['eid']) and $_REQUEST['eid'] ) {
     $eventsSql .= $_REQUEST['filter']['sql'];
   }
   $eventsSql .= " ORDER BY $sortColumn $sortOrder";
+  if ( isset($_REQUEST['filter']['Query']['limit']) ) 
+    $eventsSql .= ' LIMIT '.validInt($_REQUEST['filter']['Query']['limit']);
 } # end if filter
 
 $results = dbQuery($eventsSql, $eventsValues);
@@ -134,7 +137,7 @@ $disk_space_total = 0;
 <?php
 $event_count = 0;
 while ( $event_row = dbFetchNext($results) ) {
-  $event = new Event($event_row);
+  $event = new ZM\Event($event_row);
   $scale = max( reScale( SCALE_BASE, $event->DefaultScale(), ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
   echo '<input type="hidden" name="eids[]" value="'.validInt($event->Id())."\"/>\n";
 ?>
@@ -172,65 +175,76 @@ while ( $event_row = dbFetchNext($results) ) {
 				</tfoot>
       </table>
 
-        <table id="contentTable" class="minor">
-          <tbody>
-            <tr>
-              <th scope="row"><?php echo translate('ExportDetails') ?></th>
-              <td><input type="checkbox" name="exportDetail" value="1"<?php if ( !empty($_REQUEST['exportDetail']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('ExportFrames') ?></th>
-              <td><input type="checkbox" name="exportFrames" value="1"<?php if ( !empty($_REQUEST['exportFrames']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('ExportImageFiles') ?></th>
-              <td><input type="checkbox" name="exportImages" value="1"<?php if ( !empty($_REQUEST['exportImages']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('ExportVideoFiles') ?></th>
-              <td><input type="checkbox" name="exportVideo" value="1"<?php if ( !empty($_REQUEST['exportVideo']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('ExportMiscFiles') ?></th>
-              <td><input type="checkbox" name="exportMisc" value="1"<?php if ( !empty($_REQUEST['exportMisc']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('ExportFormat') ?></th>
-              <td>
-                <input type="radio" id="exportFormatTar" name="exportFormat" value="tar"<?php if ( isset($_REQUEST['exportFormat']) && $_REQUEST['exportFormat'] == "tar" ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/><label for="exportFormatTar"><?php echo translate('ExportFormatTar') ?></label>
-                <input type="radio" id="exportFormatZip" name="exportFormat" value="zip"<?php if ( isset($_REQUEST['exportFormat']) && $_REQUEST['exportFormat'] == "zip" ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/><label for="exportFormatZip"><?php echo translate('ExportFormatZip') ?></label>
-              </td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('ExportCompress') ?></th>
-              <td>
-                <input type="radio" id="exportCompress1" name="exportCompress" value="1"<?php echo ( isset($_REQUEST['exportCompress']) && $_REQUEST['exportCompress'] ) ? ' checked="checked"' : '' ?> onclick="configureExportButton(this)"/>
-                <label for="exportCompress1"><?php echo translate('Yes') ?></label>
-                <input type="radio" id="exportCompress0" name="exportCompress" value="0"<?php echo ( isset($_REQUEST['exportCompress']) && $_REQUEST['exportCompress'] ) ? '' : ' checked="checked"' ?> onclick="configureExportButton(this)"/>
-                <label for="exportCompress0"><?php echo translate('No') ?></label>
-              </td>
-            </tr>
-          </tbody>
-        </table>
-        <button type="button" id="exportButton" name="exportButton" value="Export" disabled="disabled"><?php echo translate('Export') ?></button>
-      </form>
-    </div>
+      <table id="contentTable" class="minor">
+        <tbody>
+          <tr>
+            <th scope="row"><?php echo translate('ExportDetails') ?></th>
+            <td><input type="checkbox" name="exportDetail" value="1"<?php if ( !empty($_REQUEST['exportDetail']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/></td>
+          </tr>
+          <tr>
+            <th scope="row"><?php echo translate('ExportFrames') ?></th>
+            <td><input type="checkbox" name="exportFrames" value="1"<?php if ( !empty($_REQUEST['exportFrames']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/></td>
+          </tr>
+          <tr>
+            <th scope="row"><?php echo translate('ExportImageFiles') ?></th>
+            <td><input type="checkbox" name="exportImages" value="1"<?php if ( !empty($_REQUEST['exportImages']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/></td>
+          </tr>
+          <tr>
+            <th scope="row"><?php echo translate('ExportVideoFiles') ?></th>
+            <td><input type="checkbox" name="exportVideo" value="1"<?php if ( !empty($_REQUEST['exportVideo']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/></td>
+          </tr>
+          <tr>
+            <th scope="row"><?php echo translate('ExportMiscFiles') ?></th>
+            <td><input type="checkbox" name="exportMisc" value="1"<?php if ( !empty($_REQUEST['exportMisc']) ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/></td>
+          </tr>
+          <tr>
+            <th scope="row"><?php echo translate('ExportFormat') ?></th>
+            <td>
+              <input type="radio" id="exportFormatTar" name="exportFormat" value="tar"<?php if ( isset($_REQUEST['exportFormat']) && $_REQUEST['exportFormat'] == "tar" ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/><label for="exportFormatTar"><?php echo translate('ExportFormatTar') ?></label>
+              <input type="radio" id="exportFormatZip" name="exportFormat" value="zip"<?php if ( isset($_REQUEST['exportFormat']) && $_REQUEST['exportFormat'] == "zip" ) { ?> checked="checked"<?php } ?> data-on-click-this="configureExportButton"/><label for="exportFormatZip"><?php echo translate('ExportFormatZip') ?></label>
+            </td>
+          </tr>
+          <tr>
+            <th scope="row"><?php echo translate('ExportCompress') ?></th>
+            <td>
+              <input type="radio" id="exportCompress1" name="exportCompress" value="1"<?php echo ( isset($_REQUEST['exportCompress']) && $_REQUEST['exportCompress'] ) ? ' checked="checked"' : '' ?> data-on-click-this="configureExportButton"/>
+              <label for="exportCompress1"><?php echo translate('Yes') ?></label>
+              <input type="radio" id="exportCompress0" name="exportCompress" value="0"<?php echo ( isset($_REQUEST['exportCompress']) && $_REQUEST['exportCompress'] ) ? '' : ' checked="checked"' ?> data-on-click-this="configureExportButton"/>
+              <label for="exportCompress0"><?php echo translate('No') ?></label>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+      <button type="button" id="exportButton" name="exportButton" value="Export" disabled="disabled" data-on-click="exportEvent"><?php echo translate('Export') ?></button>
+<?php
+?>
+      <h2 id="exportProgress" class="
 <?php
     if ( isset($_REQUEST['generated']) ) {
-?>
-      <h2 id="exportProgress" class="<?php echo $_REQUEST['generated']?'infoText':'errorText' ?>"><span id="exportProgressText"><?php echo $_REQUEST['generated']?translate('ExportSucceeded'):translate('ExportFailed') ?></span><span id="exportProgressTicker"></span></h2>
-<?php
+      if ( $_REQUEST['generated'] )
+        echo 'infoText';
+      else 
+        echo 'errorText';
     } else {
-?>
-      <h2 id="exportProgress" class="hidden warnText"><span id="exportProgressText"><?php echo translate('Exporting') ?></span><span id="exportProgressTicker"></span></h2>
-<?php
+      echo 'hidden warnText';
     }
-    if ( !empty($_REQUEST['generated']) ) {
-?>
-      <button type="button" onclick="startDownload('<?php echo validHtmlStr($_REQUEST['exportFile']) ?>');"><?php echo translate('Download') ?></button>
-<?php
-    }
-?>
+?>">
+        <span id="exportProgressText">
+          <?php 
+            if ( isset($_REQUEST['generated']) ) {
+              if ( $_REQUEST['generated'] )
+                echo translate('ExportSucceeded');
+              else 
+                echo translate('ExportFailed');
+            }
+        ?></span>
+        <span id="exportProgressTicker"></span>
+      </h2>
+      <button type="button" data-on-click-this="startDownload" <?php echo empty($_REQUEST['generated'])? ' class="hidden"' : '' ?>><?php echo translate('Download') ?></button>
+      <input type="hidden" name="exportFile" value="<?php echo isset($_REQUEST['exportFile']) ? validHtmlStr($_REQUEST['exportFile']) : '' ?>"/>
+      <input type="hidden" name="generated" value="<?php echo isset($_REQUEST['generated']) ? validHtmlStr($_REQUEST['generated']) : '' ?>"/>
+    </form>
   </div>
-</body>
+    </div>
+  </body>
 </html>
diff --git a/web/skins/classic/views/js/download.js b/web/skins/classic/views/js/download.js
index 0c25431c0..b680ef279 100644
--- a/web/skins/classic/views/js/download.js
+++ b/web/skins/classic/views/js/download.js
@@ -3,7 +3,7 @@ function configureExportButton( element ) {
 
   var checkCount = 0;
   var radioCount = 0;
-  for ( var i = 0; i < form.elements.length; i++ ) {
+  for ( var i = 0, len=form.elements.length; i < len; i++ ) {
     if ( form.elements[i].type == "checkbox" && form.elements[i].checked )
       checkCount++;
     else if ( form.elements[i].type == "radio" && form.elements[i].checked )
diff --git a/web/skins/classic/views/js/export.js b/web/skins/classic/views/js/export.js
index 92b1d9536..9dcd7bfeb 100644
--- a/web/skins/classic/views/js/export.js
+++ b/web/skins/classic/views/js/export.js
@@ -1,3 +1,5 @@
+var exportTimer = null;
+
 function configureExportButton( element ) {
   var form = element.form;
 
@@ -13,39 +15,59 @@ function configureExportButton( element ) {
   form.elements['exportButton'].disabled = (checkCount == 0 || radioCount == 0);
 }
 
-function startDownload(exportFile) {
-  window.location.replace(exportFile);
+function startDownload(file) {
+  console.log("Starting download of " + file);
+  window.location.replace(file);
 }
 
-var exportTimer = null;
-
 function exportProgress() {
-  var tickerText = $('exportProgressTicker').get('text');
-  if ( tickerText.length < 1 || tickerText.length > 4 ) {
-    $('exportProgressTicker').set( 'text', '.' );
-  } else {
-    $('exportProgressTicker').appendText( '.' );
+  if ( exportTimer ) {
+    var tickerText = $('exportProgressTicker').get('text');
+    if ( tickerText.length < 1 || tickerText.length > 4 ) {
+      $('exportProgressTicker').set('text', '.');
+    } else {
+      $('exportProgressTicker').appendText('.');
+    }
   }
 }
 
-function exportResponse( respObj, respText ) {
-  console.log(respObj);
-  console.log(respText);
+function exportResponse(respObj, respText) {
+  //console.log(respText);
 
-  var form = $j('#contentForm')[0];
+  $clear(exportTimer);
+  if ( respObj.result != 'Ok' ) {
+    $('exportProgressTicker').set('text', respObj.message);
+  } else {
+    $('exportProgressTicker').set('text', exportSucceededString);
+    console.log(respObj.exportFile);
+    console.log(encodeURIComponent(respObj.exportFile));
+
+    startDownload.pass(decodeURIComponent(respObj.exportFile)).delay( 1500 );
+  }
+  return;
+
+  if ( 0 ) {
   var eids = new Array();
   for (var i = 0, len=form.elements.length; i < len; i++) {
     if ( form.elements[i].name == 'eids[]' ) {
       eids[eids.length] = 'eids[]='+form.elements[i].value;
     }
   }
-  window.location.replace( thisUrl+'?view='+currentView+'&'+eids.join('&')+'&exportFile='+respObj.exportFile+'&generated='+((respObj.result=='Ok')?1:0) );
+  }
+  form.submit();
+
+  //window.location.replace( thisUrl+'?view='+currentView+'&'+eids.join('&')+'&exportFile='+respObj.exportFile+'&generated='+((respObj.result=='Ok')?1:0) );
 }
 
-function exportEvent( form ) {
-  var parms = 'view=request&request=event&action=export';
-  parms += '&'+$(form).toQueryString();
-  var query = new Request.JSON( {url: thisUrl, method: 'post', data: parms, onSuccess: exportResponse} );
+function exportEvent( ) {
+  var parms = 'view=event&request=event&action=export';
+  parms += '&'+$('contentForm').toQueryString();
+  var query = new Request.JSON( {
+    url: thisUrl,
+    method: 'post',
+    data: parms,
+    onSuccess: exportResponse
+  } );
   query.send();
   $('exportProgress').removeClass( 'hidden' );
   $('exportProgress').setProperty( 'class', 'warnText' );
@@ -57,11 +79,9 @@ function exportEvent( form ) {
 function initPage() {
   configureExportButton( $('exportButton') );
   if ( exportReady ) {
-    startDownload.pass( exportFile ).delay( 1500 );
+    startDownload.pass(exportFile).delay( 1500 );
   }
-  document.getElementById('exportButton').addEventListener('click', function onClick() {
-    exportEvent(this.form);
-  });
+  document.getElementById('exportButton').addEventListener('click', exportEvent);
 }
 
-window.addEventListener( 'DOMContentLoaded', initPage );
+window.addEventListener('DOMContentLoaded', initPage);
diff --git a/web/skins/classic/views/js/export.js.php b/web/skins/classic/views/js/export.js.php
index 963b29bf0..6594e5572 100644
--- a/web/skins/classic/views/js/export.js.php
+++ b/web/skins/classic/views/js/export.js.php
@@ -1,3 +1,5 @@
 var exportReady = <?php echo !empty($_REQUEST['generated'])?'true':'false' ?>;
 var exportFile = '<?php echo !empty($_REQUEST['exportFile'])?validJsStr($_REQUEST['exportFile']):'' ?>';
 var exportProgressString = '<?php echo addslashes(translate('Exporting')) ?>';
+var exportSucceededString = '<?php echo addslashes(translate('ExportSucceeded')) ?>';
+var exportFailedString = '<?php echo addslashes(translate('ExportFailed')) ?>';
diff --git a/web/skins/classic/views/js/filter.js b/web/skins/classic/views/js/filter.js
index efc677b04..e4f403b1b 100644
--- a/web/skins/classic/views/js/filter.js
+++ b/web/skins/classic/views/js/filter.js
@@ -86,7 +86,7 @@ function submitToEvents( element ) {
 
 function submitToExport(element) {
   var form = element.form;
-  window.location.assign('?view=export&filter='+$j(form).serialize());
+  window.location.assign('?view=export&'+$j(form).serialize());
   //createPopup('?view=export&filter_id='+form.elements['Id'].value, 'zmExport', 'export' );
 }
 

From d4353af8af61ffe95f420f92309550f35afc5665 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 20 Mar 2019 14:51:39 -0400
Subject: [PATCH 100/214] Fix eslint errors

---
 web/skins/classic/views/js/download.js |  7 ++---
 web/skins/classic/views/js/event.js    |  2 +-
 web/skins/classic/views/js/events.js   | 11 -------
 web/skins/classic/views/js/montage.js  | 43 ++++++++++++++------------
 web/skins/classic/views/js/zone.js     | 11 +++++--
 5 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/web/skins/classic/views/js/download.js b/web/skins/classic/views/js/download.js
index b680ef279..6dafdd23f 100644
--- a/web/skins/classic/views/js/download.js
+++ b/web/skins/classic/views/js/download.js
@@ -1,16 +1,13 @@
 function configureExportButton( element ) {
   var form = element.form;
 
-  var checkCount = 0;
   var radioCount = 0;
   for ( var i = 0, len=form.elements.length; i < len; i++ ) {
-    if ( form.elements[i].type == "checkbox" && form.elements[i].checked )
-      checkCount++;
-    else if ( form.elements[i].type == "radio" && form.elements[i].checked )
+    if ( form.elements[i].type == "radio" && form.elements[i].checked ) {
       radioCount++;
+    }
   }
   form.elements['exportButton'].disabled = (radioCount == 0);
-      //checkCount == 0 ||
 }
 
 function startDownload( exportFile ) {
diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js
index 9dd378d57..79893336f 100644
--- a/web/skins/classic/views/js/event.js
+++ b/web/skins/classic/views/js/event.js
@@ -144,7 +144,7 @@ function setButtonState( element, butClass ) {
 }
 
 function changeCodec(element) {
-    location.replace(thisUrl + '?view=event&eid=' + eventData.Id + filterQuery + sortQuery+'&codec='+element.value);
+  location.replace(thisUrl + '?view=event&eid=' + eventData.Id + filterQuery + sortQuery+'&codec='+element.value);
 }
 
 function changeScale() {
diff --git a/web/skins/classic/views/js/events.js b/web/skins/classic/views/js/events.js
index 8a3fa9354..3ef9eae5f 100644
--- a/web/skins/classic/views/js/events.js
+++ b/web/skins/classic/views/js/events.js
@@ -100,17 +100,6 @@ function downloadVideo( element ) {
 
 function exportEvents( element ) {
   var form = element.form;
-  if ( 0 ) {
-  var eids = new Array();
-  for (var i = 0, len=form.elements.length; i < len; i++) {
-    if (form.elements[i].name.indexOf('eids') == 0 ) {
-      if ( form.elements[i].checked ) {
-        eids[eids.length] = 'eids[]='+form.elements[i].value;
-      }
-    }
-  }
-  createPopup( '?view=export&'+eids.join( '&' ), 'zmExport', 'export' );
-  }
   form.attr('action', '?view=export');
   form[0].elements['view'].value='export';
   form.submit();
diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js
index 5d4d960ac..1378cbfb7 100644
--- a/web/skins/classic/views/js/montage.js
+++ b/web/skins/classic/views/js/montage.js
@@ -26,35 +26,38 @@ function Monitor(monitorData) {
   };
 
   this.onclick = function() {
-      var el = this;
-      var url = '?view=watch&mid='+this.id;
-      var name = 'zmWatch'+this.id;
-      var tag = 'watch';
-      var width = el.getAttribute("data-window-width");
-      var height = el.getAttribute("data-window-height");
-      evt.preventDefault();
-      createPopup(url, name, tag, width, height);
+    var el = this;
+    var url = '?view=watch&mid='+this.id;
+    var name = 'zmWatch'+this.id;
+    var tag = 'watch';
+    var width = el.getAttribute("data-window-width");
+    var height = el.getAttribute("data-window-height");
+    evt.preventDefault();
+    createPopup(url, name, tag, width, height);
   };
 
   this.setup_onclick = function() {
     document.querySelectorAll('#imageFeed'+this.id).forEach(function(el) {
       el.addEventListener('click', this.onclick);
     });
-  }
+  };
   this.disable_onclick = function() {
     document.querySelectorAll('#imageFeed'+this.id).forEach(function(el) {
-      el.removeEventListener('click',this.onclick);
+      el.removeEventListener('click', this.onclick);
     });
-  }
+  };
 
   this.setStateClass = function(element, stateClass) {
     if ( !element.hasClass( stateClass ) ) {
-      if ( stateClass != 'alarm' )
+      if ( stateClass != 'alarm' ) {
         element.removeClass('alarm');
-      if ( stateClass != 'alert' )
+      }
+      if ( stateClass != 'alert' ) {
         element.removeClass('alert');
-      if ( stateClass != 'idle' )
+      }
+      if ( stateClass != 'idle' ) {
         element.removeClass('idle');
+      }
       element.addClass(stateClass);
     }
   };
@@ -240,9 +243,9 @@ function selectLayout(element) {
   if ( ! layout ) {
     return;
   }
-  Cookie.write('zmMontageLayout', layout_id, { duration: 10*365 });
+  Cookie.write('zmMontageLayout', layout_id, {duration: 10*365});
   if ( layouts[layout_id].Name != 'Freeform' ) { // 'montage_freeform.css' ) {
-    Cookie.write( 'zmMontageScale', '', { duration: 10*365 } );
+    Cookie.write( 'zmMontageScale', '', {duration: 10*365} );
     $('scale').set('value', '');
     $('width').set('value', '');
     for ( var i = 0, length = monitors.length; i < length; i++ ) {
@@ -311,9 +314,9 @@ function changeSize() {
     }
   }
   $('scale').set('value', '');
-  Cookie.write('zmMontageScale', '', { duration: 10*365 });
-  Cookie.write('zmMontageWidth', width, { duration: 10*365 });
-  Cookie.write('zmMontageHeight', height, { duration: 10*365 });
+  Cookie.write('zmMontageScale', '', {duration: 10*365});
+  Cookie.write('zmMontageWidth', width, {duration: 10*365});
+  Cookie.write('zmMontageHeight', height, {duration: 10*365});
   selectLayout('#zmMontageLayout');
 } // end function changeSize()
 
@@ -395,7 +398,7 @@ function save_layout(button) {
   var form = button.form;
   // In fixed positioning, order doesn't matter.  In floating positioning, it does.
   var Positions = {};
-  for ( var i = 0, length = monitors.length; i < lenth; i++ ) {
+  for ( var i = 0, length = monitors.length; i < length; i++ ) {
     var monitor = monitors[i];
     monitor_frame = $j('#monitorFrame'+monitor.id);
 
diff --git a/web/skins/classic/views/js/zone.js b/web/skins/classic/views/js/zone.js
index b1787359f..cf80e8f03 100644
--- a/web/skins/classic/views/js/zone.js
+++ b/web/skins/classic/views/js/zone.js
@@ -430,10 +430,17 @@ function drawZonePoints() {
     cell.inject( row );
 
     cell = new Element( 'td' );
-    new Element( 'button', { 'type': 'button', 'events': { 'click': addPoint.pass( i ) } } ).set( 'text', '+' ).inject( cell );
+    new Element( 'button', {
+      'type': 'button',
+      'events': {'click': addPoint.pass(i)}
+    }).set( 'text', '+' ).inject( cell );
     if ( zone['Points'].length > 3 ) {
       cell.appendText(' ');
-      new Element( 'button', { 'id': 'delete'+i, 'type': 'button', 'events': { 'click': delPoint.pass( i ) } } ).set( 'text', '-' ).inject( cell );
+      new Element( 'button', {
+        'id': 'delete'+i,
+        'type': 'button',
+        'events': {'click': delPoint.pass(i)}
+      } ).set( 'text', '-' ).inject( cell );
     }
     cell.inject( row );
 

From 10a972f2a0ee2736ccaea3c3e6b343eab96c4870 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 20 Mar 2019 14:51:59 -0400
Subject: [PATCH 101/214] fixes to download video

---
 web/skins/classic/views/download.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/skins/classic/views/download.php b/web/skins/classic/views/download.php
index d8b4b2aff..49dc11833 100644
--- a/web/skins/classic/views/download.php
+++ b/web/skins/classic/views/download.php
@@ -31,7 +31,7 @@ if ( isset($_SESSION['montageReviewFilter']) and !isset($_REQUEST['eids']) ) {
   $results = dbQuery($eventsSql);
   $eids = [];
   while ( $event_row = dbFetchNext( $results ) ) {
-    array_push($eids, 'eids[]='.$event_row['Id']);
+    array_push($eids, $event_row['Id']);
     $total_size += $event_row['DiskSpace'];
   }
   $_REQUEST['eids'] = $eids;
@@ -55,7 +55,7 @@ if ( isset($_REQUEST['exportFormat']) ) {
 }
 
 if ( !empty($_REQUEST['eid']) ) {
-  $Event = new ZM\Event( $_REQUEST['eid'] );
+  $Event = new ZM\Event($_REQUEST['eid']);
   if ( !$Event->Id ) {
     Error('Invalid event id');
     return;
@@ -92,7 +92,7 @@ if ( !empty($_REQUEST['eid']) ) {
         ZM\Warning("Invalid event id in eids[] $eid");
         continue;
       }
-      $Event = new Event($eid);
+      $Event = new ZM\Event($eid);
       $total_size += $Event->DiskSpace();
 ?>
         <input type="hidden" name="eids[]" value="<?php echo validInt($eid) ?>"/>
@@ -104,7 +104,7 @@ if ( !empty($_REQUEST['eid']) ) {
     echo '<div class="warning">There are no events found.  Resulting download will be empty.</div>';
 }
 ?>
-        <table id="contentTable" class="minor" cellspacing="0">
+        <table id="contentTable" class="minor">
           <tbody>
             <tr>
               <td><input type="hidden" name="exportVideo" value="1"/></td>

From f5dfa0d7403aa10bbfbb5f3feaa2df056d16c060 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 20 Mar 2019 15:03:20 -0400
Subject: [PATCH 102/214] Spacing and fix clone monitor by setting the Id to 0
 instead of nextId, so that when we go to save it, we use an insert instead of
 an update

---
 web/skins/classic/views/monitor.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index 9adeb0283..c0bb8a8d1 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -21,36 +21,36 @@
 require_once('includes/Server.php');
 require_once('includes/Storage.php');
 
-if ( !canView( 'Monitors' ) ) {
+if ( !canView('Monitors') ) {
   $view = 'error';
   return;
 }
 
 $Server = null;
-if ( defined( 'ZM_SERVER_ID' ) ) {
-  $Server = dbFetchOne( 'SELECT * FROM Servers WHERE Id=?', NULL, array( ZM_SERVER_ID ) );
+if ( defined('ZM_SERVER_ID') ) {
+  $Server = dbFetchOne('SELECT * FROM Servers WHERE Id=?', NULL, array(ZM_SERVER_ID));
 }
-if ( ! $Server ) {
-  $Server = array( 'Id' => '' );
+if ( !$Server ) {
+  $Server = array('Id' => '');
 }
 
 $monitor = null;
 if ( ! empty($_REQUEST['mid']) ) {
   $monitor = new ZM\Monitor( $_REQUEST['mid'] );
   if ( $monitor and ZM_OPT_X10 )
-    $x10Monitor = dbFetchOne( 'SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($_REQUEST['mid']) );
+    $x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($_REQUEST['mid']));
 } 
 if ( ! $monitor ) {
 
-  $nextId = getTableAutoInc( 'Monitors' );
-  if ( isset( $_REQUEST['dupId'] ) ) {
-    $monitor = new ZM\Monitor( $_REQUEST['dupId'] );
+  $nextId = getTableAutoInc('Monitors');
+  if ( isset($_REQUEST['dupId']) ) {
+    $monitor = new ZM\Monitor($_REQUEST['dupId']);
     $monitor->GroupIds(); // have to load before we change the Id
     if ( ZM_OPT_X10 )
-      $x10Monitor = dbFetchOne( 'SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($_REQUEST['dupId']) );
+      $x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($_REQUEST['dupId']));
     $clonedName = $monitor->Name();
-    $monitor->Name( translate('Monitor').'-'.$nextId );
-    $monitor->Id( $nextId );
+    $monitor->Name(translate('Monitor').'-'.$nextId);
+    $monitor->Id(0);
   } else {
     $monitor = new ZM\Monitor();
     $monitor->set( array(

From 05976b32273f88f469a048914204dd9e64919ef2 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 20 Mar 2019 16:06:31 -0400
Subject: [PATCH 103/214] Add pts to zm_dump_frame

---
 src/zm_ffmpeg.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/zm_ffmpeg.cpp b/src/zm_ffmpeg.cpp
index 602c06e7f..b22ca6df5 100644
--- a/src/zm_ffmpeg.cpp
+++ b/src/zm_ffmpeg.cpp
@@ -279,7 +279,7 @@ static void zm_log_fps(double d, const char *postfix) {
 }
 
 void zm_dump_frame(const AVFrame *frame,const char *text) {
-  Debug(1, "%s: format %d %s sample_rate %" PRIu32 " nb_samples %d channels %d layout %d",
+  Debug(1, "%s: format %d %s sample_rate %" PRIu32 " nb_samples %d channels %d layout %d pts %" PRId64,
       text,
       frame->format,
       av_get_sample_fmt_name((AVSampleFormat)frame->format),
@@ -290,7 +290,8 @@ void zm_dump_frame(const AVFrame *frame,const char *text) {
 #else
 0,
 #endif
-      frame->channel_layout
+      frame->channel_layout,
+      frame->pts
       );
 }
 

From fcb9f76561ace8d8d3a6c14de1d06f1b2be42f2b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 20 Mar 2019 16:06:55 -0400
Subject: [PATCH 104/214] Fix out_frame->pts being nothing because we freed
 in_frame

---
 src/zm_videostore.cpp | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 27b4d81fb..73afef5d5 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -462,20 +462,9 @@ VideoStore::~VideoStore() {
         if ( !got_packet ) {
           break;
         }
-#endif
-        Debug(2, "writing flushed packet pts(%d) dts(%d) duration(%d)",
-            pkt.pts, pkt.dts, pkt.duration);
-
-#if 0
-        if ( pkt.duration > 0 )
-          pkt.duration =
-            av_rescale_q(pkt.duration, audio_out_ctx->time_base,
-                audio_out_stream->time_base);
-
-        Debug(2, "writing flushed packet pts(%d) dts(%d) duration(%d)", pkt.pts,
-            pkt.dts, pkt.duration);
 #endif
         pkt.stream_index = audio_out_stream->index;
+        dumpPacket(audio_out_stream, &pkt, "writing flushed packet");
         av_interleaved_write_frame(oc, &pkt);
         zm_av_packet_unref(&pkt);
       } // while have buffered frames
@@ -1006,9 +995,10 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
 
     // Resample the in into the audioSampleBuffer until we proceed the whole
     // decoded data
-    Debug(2, "Converting %d to %d samples", in_frame->nb_samples, out_frame->nb_samples);
   #if defined(HAVE_LIBSWRESAMPLE)
+    Debug(2, "Converting %d to %d samples using swresample", in_frame->nb_samples, out_frame->nb_samples);
     ret = swr_convert_frame(resample_ctx, out_frame, in_frame);
+    out_frame->pts = in_frame->pts;
     av_frame_unref(in_frame);
     if ( ret < 0 ) {
       Error("Could not resample frame (error '%s')",
@@ -1040,7 +1030,6 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
     }
     out_frame->nb_samples = frame_size;
     /// FIXME this is not the correct pts
-    out_frame->pts = in_frame->pts;
   #else
     #if defined(HAVE_LIBAVRESAMPLE)
     (ret = avresample_convert(resample_ctx, NULL, 0, 0, in_frame->data,
@@ -1115,6 +1104,9 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
     opkt.size = ipkt->size;
   }
 
+  opkt.pos = -1;
+  opkt.stream_index = audio_out_stream->index;
+
   if ( out_frame ) {
     opkt.duration = out_frame->nb_samples;
   } else if ( ipkt->duration != AV_NOPTS_VALUE ) {
@@ -1125,7 +1117,7 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
   } else {
     // calculate it?
   }
-  dumpPacket(audio_out_stream, &opkt);
+  dumpPacket(audio_out_stream, &opkt, "raw opkt");
 // PTS is difficult, because of the buffering of the audio packets in the
 // resampler.  So we have to do it once we actually have a packet...
 // audio_last_pts is the pts of ipkt, audio_next_pts is the last pts of the
@@ -1193,9 +1185,8 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
     opkt.dts = opkt.pts;
   }
 
+  dumpPacket(audio_out_stream, &opkt, "finished opkt");
   // pkt.pos:  byte position in stream, -1 if unknown
-  opkt.pos = -1;
-  opkt.stream_index = audio_out_stream->index;
   //audio_next_dts = opkt.dts + opkt.duration;
   //audio_next_pts = opkt.pts + opkt.duration;
 

From b97801a1742b71ced608dd0f443a14b9f7ac2e71 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 20 Mar 2019 16:22:47 -0400
Subject: [PATCH 105/214] Don't specify database name when turning off DEEP
 storage

---
 db/zm_update-1.28.99.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/zm_update-1.28.99.sql b/db/zm_update-1.28.99.sql
index 5b342a811..ccbc9c059 100644
--- a/db/zm_update-1.28.99.sql
+++ b/db/zm_update-1.28.99.sql
@@ -322,7 +322,7 @@ WHERE NOT EXISTS (
 --
 -- Hide USE_DEEP_STORAGE from user to prevent accidental event loss
 --
-UPDATE `zm`.`Config` SET `Category`='hidden' WHERE `Name`='ZM_USE_DEEP_STORAGE';
+UPDATE Config SET Category='hidden' WHERE Name='ZM_USE_DEEP_STORAGE';
 
 --
 -- Add Id column to State

From a30c4d9551863065a0c9c15601a5647341efef0f Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Thu, 21 Mar 2019 10:41:59 -0400
Subject: [PATCH 106/214] rework ffmpeg_input to not use pkt_duration which
 doesn't exist in avconv

---
 src/zm_ffmpeg_input.cpp | 47 +++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/zm_ffmpeg_input.cpp b/src/zm_ffmpeg_input.cpp
index d9c7c2fd3..139e6d862 100644
--- a/src/zm_ffmpeg_input.cpp
+++ b/src/zm_ffmpeg_input.cpp
@@ -214,39 +214,44 @@ AVFrame *FFmpeg_Input::get_frame( int stream_id, double at ) {
   seek_target = av_rescale_q(seek_target, AV_TIME_BASE_Q, input_format_context->streams[stream_id]->time_base);
   Debug(1, "Getting frame from stream %d at %" PRId64, stream_id, seek_target);
 
-  if ( frame ) {
-    if ( (frame->pts + frame->pkt_duration) > seek_target ) {
-      // The current frame is still the valid picture.
-      Debug(2,"Returning previous frame which is still good");
-      return frame;
-    }
-    if ( frame->pts < seek_target  ) {
-      Debug(2, "Frame pts %" PRId64 " duration %" PRId64, frame->pts, frame->pkt_duration);
-      while ( frame && (frame->pts < seek_target) ) {
-        if ( ! get_frame(stream_id) ) 
-          return frame;
-      }
-      return frame;
-    }
-  }
-
   int ret;
-  if ( frame ) {
-    if ( ( ret = av_seek_frame(input_format_context, stream_id, seek_target, AVSEEK_FLAG_ANY) < 0 ) ) {
+
+  if ( !frame ) {
+    // Don't have a frame yet, so get a keyframe before the timestamp
+    if ( ( ret = av_seek_frame(
+            input_format_context, stream_id, seek_target, AVSEEK_FLAG_FRAME
+            ) < 0 ) ) {
       Error("Unable to seek in stream");
       return NULL;
     }
+    // Have to grab a frame to update our current frame to know where we are
+    get_frame(stream_id);
+  } // end if ! frame
 
-  } else {
-    // No previous frame... are we asking for first frame?
-    // Must go for a keyframe
+  if ( frame->pts > seek_target ) {
+    zm_dump_frame(frame, "frame->pts > seek_target, seek backwards");
+  // our frame must be beyond our seek target. so go backwards to before it
     if ( ( ret = av_seek_frame(input_format_context, stream_id, seek_target, 
             AVSEEK_FLAG_BACKWARD | AVSEEK_FLAG_FRAME
             ) < 0 ) ) {
       Error("Unable to seek in stream");
       return NULL;
     }
+    // Have to grab a frame to update our current frame to know where we are
+    get_frame(stream_id);
+    zm_dump_frame(frame, "frame->pts > seek_target, got");
+  } // end if frame->pts > seek_target
+
+  // Seeking seems to typically seek to a keyframe, so then we have to decode until we get the frame we want.
+  if ( frame->pts <= seek_target  ) {
+    zm_dump_frame(frame, "pts <= seek_target");
+    while ( frame && (frame->pts < seek_target) ) {
+      if ( ! get_frame(stream_id) ) 
+        return frame;
+    }
+    return frame;
   }
+
   return get_frame(stream_id);
 
 } // end AVFrame *FFmpeg_Input::get_frame( int stream_id, struct timeval at)

From c159dd8d10ee7f523d8b79942007825112d7d9ed Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 21 Mar 2019 14:13:56 -0400
Subject: [PATCH 107/214] cleanup and fix code that assumed H264

---
 src/zm_videostore.cpp | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 73afef5d5..eb2ae8eaf 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -93,13 +93,6 @@ VideoStore::VideoStore(
   oc->metadata = pmetadata;
   out_format = oc->oformat;
 
-  video_out_stream = avformat_new_stream(oc, NULL);
-  if ( !video_out_stream ) {
-    Error("Unable to create video out stream");
-    return;
-  } else {
-    Debug(2, "Success creating video out stream");
-  }
 
   AVCodec *video_out_codec = avcodec_find_encoder(video_in_ctx->codec_id);
   if ( !video_out_codec ) {
@@ -110,10 +103,19 @@ VideoStore::VideoStore(
 #endif
   }
 
+  video_out_stream = avformat_new_stream(oc, video_out_codec);
+  if ( !video_out_stream ) {
+    Error("Unable to create video out stream");
+    return;
+  } else {
+    Debug(2, "Success creating video out stream");
+  }
+
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-  video_out_stream->codec = avcodec_alloc_context3(video_out_codec);
+  //video_out_stream->codec = avcodec_alloc_context3(video_out_codec);
   // Since we are not re-encoding, all we have to do is copy the parameters
   video_out_ctx = video_out_stream->codec;
+  //video_out_ctx = avcodec_alloc_context3(video_out_codec);
   // Copy params from instream to ctx
   ret = avcodec_parameters_to_context(video_out_ctx, video_in_stream->codecpar);
   if ( ret < 0 ) {
@@ -139,16 +141,9 @@ VideoStore::VideoStore(
 	  video_out_ctx->time_base = AV_TIME_BASE_Q;
   }
 
-  //video_out_ctx->pix_fmt = codec_data[i].pix_fmt;
-  video_out_ctx->level = 32;
+  zm_dump_codec(video_out_ctx);
 
-  // Don't have an input stream, so need to tell it what we are sending it, or are transcoding
-  video_out_ctx->width = monitor->Width();
-  video_out_ctx->height = monitor->Height();
-  video_out_ctx->codec_type = AVMEDIA_TYPE_VIDEO;
-
-  video_out_ctx->codec_id = AV_CODEC_ID_H264;
-  video_out_ctx->bit_rate = 400*1024;
+  //video_out_ctx->bit_rate = 400*1024;
   //video_out_ctx->thread_count = 0;
   //// Fix deprecated formats
   switch ( video_out_ctx->pix_fmt ) {
@@ -176,11 +171,8 @@ VideoStore::VideoStore(
     } else {
       Debug(2, "Not setting priv_data");
     }
-  } else {
-    Error("Unknown codec id");
   }
 
-
   if ( !video_out_ctx->codec_tag ) {
     Debug(2, "No codec_tag");
     if ( 
@@ -210,6 +202,13 @@ VideoStore::VideoStore(
         );
     video_out_stream->r_frame_rate = video_in_stream->r_frame_rate;
   }
+  ret = avcodec_parameters_from_context(video_out_stream->codecpar, video_out_ctx);
+  if ( ret < 0 ) {
+    Error("Could not initialize video_out_ctx parameters");
+    return;
+  } else {
+    zm_dump_codec(video_out_ctx);
+  }
 
 #if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
   zm_dump_codecpar(video_in_stream->codecpar);

From f434042c52a9d5b1a7700df94036ca9bd1a4699f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 21 Mar 2019 14:14:15 -0400
Subject: [PATCH 108/214] fix spacing

---
 web/includes/Monitor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index d61152e52..ff0e32ff0 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -307,7 +307,7 @@ private $control_fields = array(
       $args['rand'] = time();
     }
 
-    $streamSrc .= '?'.http_build_query($args,'', $querySep);
+    $streamSrc .= '?'.http_build_query($args, '', $querySep);
 
     return $streamSrc;
   } // end function getStreamSrc

From 7f7acc18eef76f6d76f30fda8b8dc80df452308e Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 21 Mar 2019 14:14:30 -0400
Subject: [PATCH 109/214] spacing and code doc

---
 web/includes/functions.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 7c710bbb7..42ba78bc1 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -283,7 +283,7 @@ function outputImageStream( $id, $src, $width, $height, $title='' ) {
   echo getImageStreamHTML( $id, $src, $width, $height, $title );
 }
 
-
+// width and height MUST be valid and include the px
 function getImageStreamHTML( $id, $src, $width, $height, $title='' ) {
   if ( canStreamIframe() ) {
       return '<iframe id="'.$id.'" src="'.$src.'" alt="'. validHtmlStr($title) .'" '.($width? ' width="'. validInt($width).'"' : '').($height?' height="'.validInt($height).'"' : '' ).'/>';
@@ -2251,10 +2251,9 @@ function validHtmlStr( $input ) {
   return( htmlspecialchars( $input, ENT_QUOTES ) );
 }
 
-function getStreamHTML( $monitor, $options = array() ) {
+function getStreamHTML($monitor, $options = array()) {
 
-  if ( isset($options['scale']) and $options['scale'] and ( $options['scale'] != 100 ) ) {
-    //Warning("Scale to " . $options['scale'] );
+  if ( isset($options['scale']) and $options['scale'] and ($options['scale'] != 100) ) {
     $options['width'] = reScale($monitor->Width(), $options['scale']).'px';
     $options['height'] = reScale($monitor->Height(), $options['scale']).'px';
   } else {
@@ -2287,10 +2286,10 @@ function getStreamHTML( $monitor, $options = array() ) {
   //FIXME, the width and height of the image need to be scaled.
   } else if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT ) {
     $streamSrc = $monitor->getStreamSrc( array(
-      'mode'=>'mpeg',
-      'scale'=>(isset($options['scale'])?$options['scale']:100),
-      'bitrate'=>ZM_WEB_VIDEO_BITRATE,
-      'maxfps'=>ZM_WEB_VIDEO_MAXFPS,
+      'mode'   => 'mpeg',
+      'scale'  => (isset($options['scale'])?$options['scale']:100),
+      'bitrate'=> ZM_WEB_VIDEO_BITRATE,
+      'maxfps' => ZM_WEB_VIDEO_MAXFPS,
       'format' => ZM_MPEG_LIVE_FORMAT
     ) );
     return getVideoStreamHTML( 'liveStream'.$monitor->Id(), $streamSrc, $options['width'], $options['height'], ZM_MPEG_LIVE_FORMAT, $monitor->Name() );
@@ -2311,7 +2310,7 @@ function getStreamHTML( $monitor, $options = array() ) {
       ZM\Info( 'The system has fallen back to single jpeg mode for streaming. Consider enabling Cambozola or upgrading the client browser.' );
     }
     $options['mode'] = 'single';
-    $streamSrc = $monitor->getStreamSrc( $options );
+    $streamSrc = $monitor->getStreamSrc($options);
     return getImageStill( 'liveStream'.$monitor->Id(), $streamSrc, $options['width'], $options['height'], $monitor->Name());
   }
 } // end function getStreamHTML

From 65fab1b032cda200e3718a01852af2befb48ecdd Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 21 Mar 2019 14:14:45 -0400
Subject: [PATCH 110/214] add px to width and height of event img

---
 web/skins/classic/views/event.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php
index f771e7ff0..7feed10df 100644
--- a/web/skins/classic/views/event.php
+++ b/web/skins/classic/views/event.php
@@ -192,13 +192,13 @@ if ( ($codec == 'MP4' || $codec == 'auto' ) && $Event->DefaultVideo() ) {
 <?php
 if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT ) {
   $streamSrc = $Event->getStreamSrc(array('mode'=>'mpeg', 'scale'=>$scale, 'rate'=>$rate, 'bitrate'=>ZM_WEB_VIDEO_BITRATE, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'format'=>ZM_MPEG_REPLAY_FORMAT, 'replay'=>$replayMode));
-  outputVideoStream( "evtStream", $streamSrc, reScale( $Event->Width(), $scale ), reScale( $Event->Height(), $scale ), ZM_MPEG_LIVE_FORMAT );
+  outputVideoStream('evtStream', $streamSrc, reScale( $Event->Width(), $scale ).'px', reScale( $Event->Height(), $scale ).'px', ZM_MPEG_LIVE_FORMAT );
 } else {
-  $streamSrc = $Event->getStreamSrc( array( 'mode'=>'jpeg', 'frame'=>$fid, 'scale'=>$scale, 'rate'=>$rate, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'replay'=>$replayMode) );
+  $streamSrc = $Event->getStreamSrc(array('mode'=>'jpeg', 'frame'=>$fid, 'scale'=>$scale, 'rate'=>$rate, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'replay'=>$replayMode));
   if ( canStreamNative() ) {
-    outputImageStream( 'evtStream', $streamSrc, reScale( $Event->Width(), $scale ), reScale( $Event->Height(), $scale ), validHtmlStr($Event->Name()) );
+    outputImageStream('evtStream', $streamSrc, reScale($Event->Width(), $scale).'px', reScale($Event->Height(), $scale).'px', validHtmlStr($Event->Name()));
   } else {
-    outputHelperStream( 'evtStream', $streamSrc, reScale( $Event->Width(), $scale ), reScale( $Event->Height(), $scale ) );
+    outputHelperStream('evtStream', $streamSrc, reScale($Event->Width(), $scale).'px', reScale($Event->Height(), $scale).'px' );
   }
 } // end if stream method
 ?>

From 16467595d4c7ec8aae40be7bfbac0bbd97badcf3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 21 Mar 2019 17:00:51 -0400
Subject: [PATCH 111/214] Fix clicking in montage

---
 web/skins/classic/views/js/montage.js | 32 +++++++++++++++------------
 web/skins/classic/views/montage.php   |  1 +
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js
index 1378cbfb7..8b5bf12e2 100644
--- a/web/skins/classic/views/js/montage.js
+++ b/web/skins/classic/views/js/montage.js
@@ -25,26 +25,28 @@ function Monitor(monitorData) {
     }
   };
 
-  this.onclick = function() {
-    var el = this;
-    var url = '?view=watch&mid='+this.id;
-    var name = 'zmWatch'+this.id;
+  this.eventHandler = function( event ) {
+    console.log(event);
+  }
+
+  this.onclick = function(evt) {
+    var el = evt.currentTarget;
     var tag = 'watch';
-    var width = el.getAttribute("data-window-width");
-    var height = el.getAttribute("data-window-height");
+    var id = el.getAttribute("data-monitor-id");
+    var width = el.getAttribute("data-width");
+    var height = el.getAttribute("data-height");
+    var url = '?view=watch&mid='+id;
+    var name = 'zmWatch'+id;
     evt.preventDefault();
     createPopup(url, name, tag, width, height);
   };
 
   this.setup_onclick = function() {
-    document.querySelectorAll('#imageFeed'+this.id).forEach(function(el) {
-      el.addEventListener('click', this.onclick);
-    });
+    var el = document.getElementById('imageFeed'+this.id);
+    if ( el ) el.addEventListener('click', this.onclick, false);
   };
   this.disable_onclick = function() {
-    document.querySelectorAll('#imageFeed'+this.id).forEach(function(el) {
-      el.removeEventListener('click', this.onclick);
-    });
+    document.getElementById('imageFeed'+this.id).removeEventListener('click', this.onclick );
   };
 
   this.setStateClass = function(element, stateClass) {
@@ -422,8 +424,10 @@ function cancel_layout(button) {
   $j('#EditLayout').show();
   for ( var i = 0, length = monitors.length; i < length; i++ ) {
     var monitor = monitors[i];
-    monitor_feed = $j('#imageFeed'+monitor.id);
-    monitor_feed.click(monitor.onclick);
+    monitor.setup_onclick();
+
+    //monitor_feed = $j('#imageFeed'+monitor.id);
+    //monitor_feed.click(monitor.onclick);
   };
   selectLayout('#zmMontageLayout');
 }
diff --git a/web/skins/classic/views/montage.php b/web/skins/classic/views/montage.php
index 0ca720e80..6527a6e8f 100644
--- a/web/skins/classic/views/montage.php
+++ b/web/skins/classic/views/montage.php
@@ -200,6 +200,7 @@ foreach ( $monitors as $monitor ) {
             <div
               id="imageFeed<?php echo $monitor->Id() ?>"
               class="imageFeed"
+              data-monitor-id="<?php echo $monitor->Id() ?>"
               data-width="<?php echo reScale( $monitor->Width(), $monitor->PopupScale() ); ?>"
               data-height="<?php echo reScale( $monitor->Height(), $monitor->PopupScale() ); ?>">
             <?php

From 5615cafc1994ae93fab7e57d58cec0ef0fb2df01 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 21 Mar 2019 17:50:17 -0400
Subject: [PATCH 112/214] fix compile on old ffmpeg

---
 src/zm_videostore.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index eb2ae8eaf..4abf5998a 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -202,6 +202,7 @@ VideoStore::VideoStore(
         );
     video_out_stream->r_frame_rate = video_in_stream->r_frame_rate;
   }
+#if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
   ret = avcodec_parameters_from_context(video_out_stream->codecpar, video_out_ctx);
   if ( ret < 0 ) {
     Error("Could not initialize video_out_ctx parameters");
@@ -210,7 +211,6 @@ VideoStore::VideoStore(
     zm_dump_codec(video_out_ctx);
   }
 
-#if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
   zm_dump_codecpar(video_in_stream->codecpar);
   zm_dump_codecpar(video_out_stream->codecpar);
 #endif

From 6d4d353209e2e7fe8f31c20833a0b7305645d943 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 22 Mar 2019 17:27:58 -0400
Subject: [PATCH 113/214] fix namespace on MontageLayout

---
 web/includes/actions/montage.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/includes/actions/montage.php b/web/includes/actions/montage.php
index 7ab105d0c..207c9a0f0 100644
--- a/web/includes/actions/montage.php
+++ b/web/includes/actions/montage.php
@@ -29,10 +29,10 @@ if ( isset($_REQUEST['object']) ) {
     if ( $action == 'Save' ) {
       $Layout = null;
       if ( $_REQUEST['Name'] != '' ) {
-        $Layout = new MontageLayout();
+        $Layout = new ZM\MontageLayout();
         $Layout->Name($_REQUEST['Name']);
       } else {
-        $Layout = new MontageLayout($_REQUEST['zmMontageLayout']);
+        $Layout = new ZM\MontageLayout($_REQUEST['zmMontageLayout']);
       }
       $Layout->Positions($_REQUEST['Positions']);
       $Layout->save();

From 8f28ba0be3e61dc063273d02640cd2e819eeb00c Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 22 Mar 2019 17:28:12 -0400
Subject: [PATCH 114/214] beter debug and less often when no terms in
 parseFilter

---
 web/includes/functions.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 42ba78bc1..6b9231019 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -1106,6 +1106,13 @@ function parseFilter(&$filter, $saveToSession=false, $querySep='&amp;') {
   $StorageArea = NULL;
 
   $terms = isset($filter['Query']) ? $filter['Query']['terms'] : NULL;
+  if ( ! isset($terms) ) {
+        $backTrace = debug_backtrace();
+        $file = $backTrace[1]['file'];
+        $line = $backTrace[1]['line'];
+        ZM\Warning("No terms in filter from $file:$line");
+        ZM\Warning(print_r($filter,true));
+  }
   if ( isset($terms) && count($terms) ) {
     for ( $i = 0; $i < count($terms); $i++ ) {
 
@@ -1331,8 +1338,6 @@ function parseFilter(&$filter, $saveToSession=false, $querySep='&amp;') {
     if ( $saveToSession ) {
       $_SESSION['filter'] = $filter;
     }
-  } else {
-    ZM\Warning("No terms in filter");
   } // end if terms
 
   #if ( 0 ) {

From f311fcc9e0193dcde80b522a8eca2e68d1ca4046 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 22 Mar 2019 17:28:23 -0400
Subject: [PATCH 115/214] change to a button

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

diff --git a/web/skins/classic/views/group.php b/web/skins/classic/views/group.php
index 3f7629a75..aa8ec4b56 100644
--- a/web/skins/classic/views/group.php
+++ b/web/skins/classic/views/group.php
@@ -121,7 +121,7 @@ echo htmlSelect('newGroup[ParentId]', $options, $newGroup->ParentId(), array('on
           <button type="submit" name="action" value="Save"<?php $newGroup->Id() ? '' : ' disabled="disabled"'?>>
           <?php echo translate('Save') ?>
           </button>
-          <input type="button" value="<?php echo translate('Cancel') ?>" data-on-click="closeWindow"/>
+          <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
         </div>
       </form>
     </div>

From 01056fc0f483eb5742fb94c29f89b5f09c9583fa Mon Sep 17 00:00:00 2001
From: santos995 <santos995@mail.ru>
Date: Sun, 24 Mar 2019 04:14:06 +0300
Subject: [PATCH 116/214] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=B4=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B=D1=85?=
 =?UTF-8?q?=20=D1=81=D0=BB=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/lang/ru_ru.php | 81 +++++++++++++++++++++++-----------------------
 1 file changed, 41 insertions(+), 40 deletions(-)

diff --git a/web/lang/ru_ru.php b/web/lang/ru_ru.php
index 11110745e..9a12d3478 100644
--- a/web/lang/ru_ru.php
+++ b/web/lang/ru_ru.php
@@ -20,6 +20,7 @@
 
 // ZoneMinder Russian Translation by Borodin A.S.
 // ZoneMinder Russian Translation updated by IDDQDesnik, 2017
+// ZoneMinder Russian Translation updated by santos995, 2019
 
 // Notes for Translators
 // 0. Get some credit, put your name in the line above (optional)
@@ -110,11 +111,11 @@ $SLANG = array(
     'AttrCause'            => 'Причина',
     'AttrDiskBlocks'       => 'Диск, блоки',
     'AttrDiskPercent'      => 'Диск, проценты',
-    'AttrDiskSpace'        => 'Disk Space',             // Added - 2018-08-30
+    'AttrDiskSpace'        => 'Дисковое пространство',             // Edited - 2019-03-24
     'AttrDuration'         => 'Длительность',
-    'AttrEndDate'          => 'End Date',               // Added - 2018-08-30
-    'AttrEndDateTime'      => 'End Date/Time',          // Added - 2018-08-30
-    'AttrEndTime'          => 'End Time',               // Added - 2018-08-30
+    'AttrEndDate'          => 'Дата окончания',               // Added - 2018-08-30
+    'AttrEndDateTime'      => 'Дата/время окончания',          // Added - 2018-08-30
+    'AttrEndTime'          => 'Время окончания',               // Edited - 2019-03-24
     'AttrEndWeekday'       => 'End Weekday',            // Added - 2018-08-30
     'AttrFilterServer'     => 'Server Filter is Running On', // Added - 2018-08-30
     'AttrFrames'           => 'Кол-во кадров',
@@ -125,9 +126,9 @@ $SLANG = array(
     'AttrMonitorServer'    => 'Server Monitor is Running On', // Added - 2018-08-30
     'AttrName'             => 'Имя',
     'AttrNotes'            => 'Примечание',
-    'AttrStartDate'        => 'Start Date',             // Added - 2018-08-30
-    'AttrStartDateTime'    => 'Start Date/Time',        // Added - 2018-08-30
-    'AttrStartTime'        => 'Start Time',             // Added - 2018-08-30
+    'AttrStartDate'        => 'Дата начала',             // Added - 2018-08-30
+    'AttrStartDateTime'    => 'Дата/Время начала',        // Added - 2018-08-30
+    'AttrStartTime'        => 'Время начала',             // Added - 2018-08-30
     'AttrStartWeekday'     => 'Start Weekday',          // Added - 2018-08-30
     'AttrStateId'          => 'Run State',              // Added - 2018-08-30
     'AttrStorageArea'      => 'Storage Area',           // Added - 2018-08-30
@@ -170,7 +171,7 @@ $SLANG = array(
     'BadStreamReplayBuffer'=> 'Буфер потока повторного воспроизведения должен быть целочисленным и большим либо равным нулю',
     'BadWarmupCount'       => 'Кол-во кадров разогрева должно быть целочисленным и большим либо равным нулю',
     'BadWebColour'         => 'Цвет отметки должен быть правильным Web-цветом',
-    'BadWebSitePath'       => 'Please enter a complete website url, including the http:// or https:// prefix.', // Added - 2018-08-30
+    'BadWebSitePath'       => 'Пожалуйста, введите полной название сайта url, включая http:// или https:// префикс.', // Added - 2018-08-30
     'BadWidth'             => 'Неправильная ширина',
     'Bandwidth'            => 'канал',
     'BandwidthHead'        => 'канал', // This is the end of the bandwidth status on the top of the console, different in many language due to phrasing;
@@ -178,9 +179,9 @@ $SLANG = array(
     'BlobSizes'            => 'Размер объектов',
     'Blobs'                => 'Кол-во объектов',
     'Brightness'           => 'Яркость',
-    'Buffer'               => 'Buffer',                 // Added - 2015-04-18
+    'Buffer'               => 'Бефер',                 // Edited - 2019-03-24
     'Buffers'              => 'Буферы',
-    'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
+    'CSSDescription'       => 'Изменить стандартный CSS для данного компьютера', // Edited - 2019-03-24
     'CanAutoFocus'         => 'Автофокус',
     'CanAutoGain'          => 'Автоусиление',
     'CanAutoIris'          => 'Автодиафрагма',
@@ -206,7 +207,7 @@ $SLANG = array(
     'CanMoveRel'           => 'Относительное перемещение',
     'CanPan'               => 'Панорама' ,
     'CanReset'             => 'Сброс',
-	'CanReboot'             => 'Can Reboot',
+	'CanReboot'             => 'Перезагрузка',  // Added - 2019-03-24
     'CanSetPresets'        => 'Создание предустановок',
     'CanSleep'             => 'Сон',
     'CanTilt'              => 'Наклон',
@@ -225,7 +226,7 @@ $SLANG = array(
     'CaptureHeight'        => 'Размер по Y',
     'CaptureMethod'        => 'Метод захвата',         // Added - 2009-02-08
     'CapturePalette'       => 'Режим захвата',
-    'CaptureResolution'    => 'Capture Resolution',     // Added - 2015-04-18
+    'CaptureResolution'    => 'Разрешение',     // Edited - 2019-03-24
     'CaptureWidth'         => 'Размер по X',
     'Cause'                => 'Причина',
     'CheckMethod'          => 'Метод проверки тревоги',
@@ -298,7 +299,7 @@ $SLANG = array(
     'DonateRemindWeek'     => 'Нет, не сейчас, напомнить через неделю', 
     'DonateYes'            => 'Да, я хотел бы сделать пожертвование', 
     'Download'             => 'Скачать',
-    'DownloadVideo'        => 'Download Video',         // Added - 2018-08-30
+    'DownloadVideo'        => 'Скачать видео',         // Added - 2019-24-03
     'DuplicateMonitorName' => 'Duplicate Monitor Name', // Added - 2009-03-31
     'Duration'             => 'Длительность',
     'Edit'                 => 'Редактирование',
@@ -319,7 +320,7 @@ $SLANG = array(
     'Events'               => 'События',
     'Exclude'              => 'Исключить',
     'Execute'              => 'Выполнить',
-    'Exif'                 => 'Embed EXIF data into image', // Added - 2018-08-30
+    'Exif'                 => 'Включить EXIF информацию в изображение', // Added - 2019-03-24
     'Export'               => 'Экспорт',
     'ExportDetails'        => 'Экспортировать описание события',
     'ExportFailed'         => 'Ошибка экспорта',
@@ -428,11 +429,11 @@ $SLANG = array(
     'Local'                => 'Локальный',
     'Log'                  => 'Лог',                    // Added - 2011-06-16;
     'LoggedInAs'           => 'Пользователь',
-    'Logging'              => 'Logging',                // Added - 2011-06-16
+    'Logging'              => 'Логгирование',                // Added - 2019-03-24
     'LoggingIn'            => 'Вход в систему',
     'Login'                => 'Войти',
     'Logout'               => 'Выйти',
-    'Logs'                 => 'Logs',                   // Added - 2011-06-17
+    'Logs'                 => 'Логи',                   // Added - 2019-03-24
     'Low'                  => 'узкий',
     'LowBW'                => 'Узкий канал',
     'Main'                 => 'Основные',
@@ -510,7 +511,7 @@ $SLANG = array(
     'MonitorProbeIntro'    => 'В этом списке показаны найденные аналоговые и сетевые камеры, как уже заведенные, так и доступные для выбора.<br/><br/>Выберите нужную из списка ниже.<br/><br/>Обратите внимание, что не все камеры могут быть найдены, и что выбор камеры может переписать настройки определенные для этого монитора.<br/><br/>', // Added - 2009-03-31
     'Monitors'             => 'Мониторы',
     'Montage'              => 'Монтаж', 
-    'MontageReview'        => 'Montage Review',         // Added - 2018-08-30
+    'MontageReview'        => 'Обзор монтажа',         // Added - 2019-03-24
     'Month'                => 'Месяц',
     'More'                 => 'Еще',                   // Added - 2011-06-16
     'MotionFrameSkip'      => 'Кол-во пропуск. кадров движения',
@@ -536,10 +537,10 @@ $SLANG = array(
     'NewUser'              => 'Новый пользователь',
     'Next'                 => 'След.',
     'No'                   => 'Нет',
-    'NoDetectedCameras'    => 'No Detected Cameras',    // Added - 2009-03-31
-    'NoDetectedProfiles'   => 'No Detected Profiles',   // Added - 2018-08-30
+    'NoDetectedCameras'    => 'Нет камер',    // Added - 2019-03-24
+    'NoDetectedProfiles'   => 'Нет профилей',   // Added - 2019-03-24
     'NoFramesRecorded'     => 'Это событие не содержит кадров',
-    'NoGroup'              => 'No Group',
+    'NoGroup'              => 'Нет группы',   // Added - 2019-03-24
     'NoSavedFilters'       => 'нет сохраненных фильтров',
     'NoStatisticsRecorded' => 'Статистика по этому событию/кадру не записана',
     'None'                 => 'отсутствует',
@@ -567,7 +568,7 @@ $SLANG = array(
     'Open'                 => 'Открыть',
     'OptionHelp'           => 'Справка',
     'OptionRestartWarning' => 'Эти изменения подействуют только после перезапуска программы.',
-    'OptionalEncoderParam' => 'Optional Encoder Parameters', // Added - 2018-08-30
+    'OptionalEncoderParam' => 'Необязательные параметры кодировщика', // Added - 2019-03-24
     'Options'              => 'Опции',
     'OrEnterNewName'       => 'или введите новое имя',
     'Order'                => 'Сортировка',
@@ -592,7 +593,7 @@ $SLANG = array(
     'Play'                 => 'Играть',
     'PlayAll'              => 'Воспр. все',
     'PleaseWait'           => 'Пожалуйста подождите',
-    'Plugins'              => 'Plugins',
+    'Plugins'              => 'Плагины',   // Edited - 2019-03-24
     'Point'                => 'Точка',
     'PostEventImageBuffer' => 'Буфер после события',
     'PreEventImageBuffer'  => 'Буфер до события',
@@ -627,7 +628,7 @@ $SLANG = array(
     'ReplayAll'            => 'Все события',
     'ReplayGapless'        => 'События подряд',
     'ReplaySingle'         => 'Одно событие',
-    'ReportEventAudit'     => 'Audit Events Report',    // Added - 2018-08-30
+    'ReportEventAudit'     => 'Отчёт о событяих аудита',    // Edited - 2019-03-24
     'Reset'                => 'Сбросить',
     'ResetEventCounts'     => 'Обнулить счетчик событий',
     'Restart'              => 'Перезапустить',
@@ -639,14 +640,14 @@ $SLANG = array(
     'Rewind'               => 'Назад',
     'RotateLeft'           => 'Повернуть влево',
     'RotateRight'          => 'Повернуть вправо',
-    'RunLocalUpdate'       => 'Please run zmupdate.pl to update', // Added - 2011-05-25
+    'RunLocalUpdate'       => 'Запустите zmupdate.pl для обновления', // Edited - 2019-03-24
     'RunMode'              => 'Режим работы',
     'RunState'             => 'Состояние',
     'Running'              => 'Выполняется',
     'Save'                 => 'Сохранить',
     'SaveAs'               => 'Сохранить как',
     'SaveFilter'           => 'Сохранить фильтр',
-    'SaveJPEGs'            => 'Save JPEGs',             // Added - 2018-08-30
+    'SaveJPEGs'            => 'Сохранить JPEG-и',             // Edited - 2019-03-24
     'Scale'                => 'Масштаб',
     'Score'                => 'Оценка',
     'Secs'                 => 'Сек.',
@@ -654,31 +655,31 @@ $SLANG = array(
     'Select'               => 'Выбор',
     'SelectFormat'         => 'Выберите формат',          // Added - 2011-06-17
     'SelectLog'            => 'Выберите лог',             // Added - 2011-06-17
-    'SelectMonitors'       => 'Select Monitors',
+    'SelectMonitors'       => 'Выбрать Мониторы',   //  Edited - 2019-03-24
     'SelfIntersecting'     => 'Polygon edges must not intersect',
-    'Set'                  => 'Set',
+    'Set'                  => 'Установка',  // Edited - 2019-03-24
     'SetNewBandwidth'      => 'Установка новой ширина канала',
-    'SetPreset'            => 'Set Preset',
+    'SetPreset'            => 'Установка пресета',  // Edited - 2019-03-24
     'Settings'             => 'Настройки',
     'ShowFilterWindow'     => 'Показать окно фильтра',
     'ShowTimeline'         => 'Показать график',
     'SignalCheckColour'    => 'Цвет проверки сигнала',
     'SignalCheckPoints'    => 'Signal Check Points',    // Added - 2018-08-30
-    'Size'                 => 'Size',
-    'SkinDescription'      => 'Change the default skin for this computer', // Added - 2011-01-30
+    'Size'                 => 'Размер',  // Edited - 2019-03-24
+    'SkinDescription'      => 'Смена стандартного скина для данного компьютера', // Edited - 2019-03-24
     'Sleep'                => 'Sleep',
     'SortAsc'              => 'По возр.',
     'SortBy'               => 'Сортировать',
     'SortDesc'             => 'По убыв.',
     'Source'               => 'Источник',
-    'SourceColours'        => 'Source Colours',         // Added - 2009-02-08
+    'SourceColours'        => 'Цвета источника',         // Edited - 2019-03-24
     'SourcePath'           => 'Путь к источнику',            // Added - 2009-02-08
     'SourceType'           => 'Тип источника',
-    'Speed'                => 'Speed',
-    'SpeedHigh'            => 'High Speed',
-    'SpeedLow'             => 'Low Speed',
-    'SpeedMedium'          => 'Medium Speed',
-    'SpeedTurbo'           => 'Turbo Speed',
+    'Speed'                => 'Скорость',  //Edited - 2019-03-24
+    'SpeedHigh'            => 'Высокая скорость',  //Edited - 2019-03-24
+    'SpeedLow'             => 'Низкая скорость',  //Edited - 2019-03-24
+    'SpeedMedium'          => 'Средняя скорость',
+    'SpeedTurbo'           => 'Максимальная скорость', // Edited - 2019-03-24
     'Start'                => 'Запустить',
     'State'                => 'Состояние',
     'Stats'                => 'Статистика',
@@ -758,17 +759,17 @@ $SLANG = array(
     'VersionRemindNever'   => 'Не говорить о новых версиях',
     'VersionRemindWeek'    => 'Напомнить через неделю',
     'Video'                => 'Видео',
-    'VideoFormat'          => 'Video Format',
+    'VideoFormat'          => 'Формат видео', // Edited - 2019-03-24
     'VideoGenFailed'       => 'Ошибка генерации видео!',
     'VideoGenFiles'        => 'Existing Video Files',
-    'VideoGenNoFiles'      => 'No Video Files Found',
+    'VideoGenNoFiles'      => 'Видео не найдено',  // Edited - 2019-03-24
     'VideoGenParms'        => 'Параметры генерации видео',
-    'VideoGenSucceeded'    => 'Video Generation Succeeded!',
+    'VideoGenSucceeded'    => 'Видео сгенерировано!', // Edited - 2019-03-24
     'VideoSize'            => 'Размер изображения',
     'VideoWriter'          => 'Video Writer',           // Added - 2018-08-30
     'View'                 => 'Просмотр',
     'ViewAll'              => 'Просм. все',
-    'ViewEvent'            => 'View Event',
+    'ViewEvent'            => 'Просм. событие',  // Edited - 2019-03-24
     'ViewPaged'            => 'Просм. постранично',
     'Wake'                 => 'Wake',
     'WarmupFrames'         => 'Кадры разогрева',

From bd5c9b5b20309bef5f1e5bfc19cddeaec198b8af Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 24 Mar 2019 09:58:50 -0400
Subject: [PATCH 117/214] add Control to ZM namespace

---
 web/includes/Control.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/web/includes/Control.php b/web/includes/Control.php
index 5d8647995..4a8952b27 100644
--- a/web/includes/Control.php
+++ b/web/includes/Control.php
@@ -1,6 +1,7 @@
 <?php
-require_once( 'database.php' );
-require_once( 'Server.php' );
+namespace ZM;
+
+require_once('database.php');
 
 class Control {
 

From 677b9cfbed4e67767231a90d253ab1de96756c8c Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 24 Mar 2019 09:59:04 -0400
Subject: [PATCH 118/214] Make controlcap popup wider

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

diff --git a/web/skins/classic/js/classic.js b/web/skins/classic/js/classic.js
index 0e62ecbf0..b3b72d967 100644
--- a/web/skins/classic/js/classic.js
+++ b/web/skins/classic/js/classic.js
@@ -29,7 +29,7 @@ var popupSizes = {
   'console':      {'width': 750, 'height': 312},
   'control':      {'width': 380, 'height': 480},
   'controlcaps':  {'width': 780, 'height': 320},
-  'controlcap':   {'width': 400, 'height': 400},
+  'controlcap':   {'width': 600, 'height': 400},
   'cycle':        {'addWidth': 32, 'minWidth': 384, 'addHeight': 62},
   'device':       {'width': 260, 'height': 150},
   'devices':      {'width': 400, 'height': 240},

From 42196ed5aa749726dd1389485565a1a41cafd77d Mon Sep 17 00:00:00 2001
From: santos995 <santos995@mail.ru>
Date: Mon, 25 Mar 2019 10:20:27 +0300
Subject: [PATCH 119/214] Update translation ru 2

---
 web/lang/ru_ru.php | 104 ++++++++++++++++++++++-----------------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/web/lang/ru_ru.php b/web/lang/ru_ru.php
index 9a12d3478..f08ab3e02 100644
--- a/web/lang/ru_ru.php
+++ b/web/lang/ru_ru.php
@@ -113,22 +113,22 @@ $SLANG = array(
     'AttrDiskPercent'      => 'Диск, проценты',
     'AttrDiskSpace'        => 'Дисковое пространство',             // Edited - 2019-03-24
     'AttrDuration'         => 'Длительность',
-    'AttrEndDate'          => 'Дата окончания',               // Added - 2018-08-30
-    'AttrEndDateTime'      => 'Дата/время окончания',          // Added - 2018-08-30
+    'AttrEndDate'          => 'Дата окончания',               // Edited - 2019-03-24
+    'AttrEndDateTime'      => 'Дата/время окончания',          // Edited - 2019-03-24
     'AttrEndTime'          => 'Время окончания',               // Edited - 2019-03-24
     'AttrEndWeekday'       => 'End Weekday',            // Added - 2018-08-30
-    'AttrFilterServer'     => 'Server Filter is Running On', // Added - 2018-08-30
+    'AttrFilterServer'     => 'Фильтр для серверов запущен', // Edited - 2019-03-24
     'AttrFrames'           => 'Кол-во кадров',
     'AttrId'               => 'ИД',
     'AttrMaxScore'         => 'Макс. оценка',
     'AttrMonitorId'        => 'ИД Монитора',
     'AttrMonitorName'      => 'Название Монитора',
-    'AttrMonitorServer'    => 'Server Monitor is Running On', // Added - 2018-08-30
+    'AttrMonitorServer'    => 'Монитор серверов запущен', // Edited - 2019-03-24
     'AttrName'             => 'Имя',
     'AttrNotes'            => 'Примечание',
-    'AttrStartDate'        => 'Дата начала',             // Added - 2018-08-30
-    'AttrStartDateTime'    => 'Дата/Время начала',        // Added - 2018-08-30
-    'AttrStartTime'        => 'Время начала',             // Added - 2018-08-30
+    'AttrStartDate'        => 'Дата начала',             // Edited - 2019-03-24
+    'AttrStartDateTime'    => 'Дата/Время начала',        // Edited - 2019-03-24
+    'AttrStartTime'        => 'Время начала',             // Edited - 2019-03-24
     'AttrStartWeekday'     => 'Start Weekday',          // Added - 2018-08-30
     'AttrStateId'          => 'Run State',              // Added - 2018-08-30
     'AttrStorageArea'      => 'Storage Area',           // Added - 2018-08-30
@@ -171,7 +171,7 @@ $SLANG = array(
     'BadStreamReplayBuffer'=> 'Буфер потока повторного воспроизведения должен быть целочисленным и большим либо равным нулю',
     'BadWarmupCount'       => 'Кол-во кадров разогрева должно быть целочисленным и большим либо равным нулю',
     'BadWebColour'         => 'Цвет отметки должен быть правильным Web-цветом',
-    'BadWebSitePath'       => 'Пожалуйста, введите полной название сайта url, включая http:// или https:// префикс.', // Added - 2018-08-30
+    'BadWebSitePath'       => 'Пожалуйста, введите полной название сайта url, включая http:// или https:// префикс.', // Edited - 2019-03-24
     'BadWidth'             => 'Неправильная ширина',
     'Bandwidth'            => 'канал',
     'BandwidthHead'        => 'канал', // This is the end of the bandwidth status on the top of the console, different in many language due to phrasing;
@@ -179,7 +179,7 @@ $SLANG = array(
     'BlobSizes'            => 'Размер объектов',
     'Blobs'                => 'Кол-во объектов',
     'Brightness'           => 'Яркость',
-    'Buffer'               => 'Бефер',                 // Edited - 2019-03-24
+    'Buffer'               => 'Буфер',                 // Edited - 2019-03-24
     'Buffers'              => 'Буферы',
     'CSSDescription'       => 'Изменить стандартный CSS для данного компьютера', // Edited - 2019-03-24
     'CanAutoFocus'         => 'Автофокус',
@@ -207,7 +207,7 @@ $SLANG = array(
     'CanMoveRel'           => 'Относительное перемещение',
     'CanPan'               => 'Панорама' ,
     'CanReset'             => 'Сброс',
-	'CanReboot'             => 'Перезагрузка',  // Added - 2019-03-24
+    'CanReboot'            => 'Перезагрузка',  // Added - 2019-03-24
     'CanSetPresets'        => 'Создание предустановок',
     'CanSleep'             => 'Сон',
     'CanTilt'              => 'Наклон',
@@ -232,11 +232,11 @@ $SLANG = array(
     'CheckMethod'          => 'Метод проверки тревоги',
     'ChooseDetectedCamera' => 'Выберите камеру', // Added - 2009-03-31
     'ChooseFilter'         => 'Выбрать фильтр',
-    'ChooseLogFormat'      => 'Choose a log format',    // Added - 2011-06-17
+    'ChooseLogFormat'      => 'Выбрать формат лога',    // Edited - 2019-03-25
     'ChooseLogSelection'   => 'Choose a log selection', // Added - 2011-06-17
     'ChoosePreset'         => 'Выберите предустановку',
     'Clear'                => 'Очистить',                  // Added - 2011-06-16
-    'CloneMonitor'         => 'Clone',                  // Added - 2018-08-30
+    'CloneMonitor'         => 'Клонировать',                  // Edited - 2019-03-25
     'Close'                => 'Закрыть',
     'Colour'               => 'Цвет',
     'Command'              => 'Command',
@@ -250,7 +250,7 @@ $SLANG = array(
     'ConjOr'               => 'или',
     'Console'              => 'Сервер',
     'ContactAdmin'         => 'Пожалуйста обратитесь к вашему администратору.',
-    'Continue'             => 'Continue',
+    'Continue'             => 'Продолжить', // Added - 2019-03-25
     'Contrast'             => 'Контраст',
     'Control'              => 'Управление',
     'ControlAddress'       => 'Адрес устройства',
@@ -264,12 +264,12 @@ $SLANG = array(
     'CycleWatch'           => 'Циклический просмотр',
     'DateTime'             => 'Дата/Время',              // Added - 2011-06-16
     'Day'                  => 'День',
-    'Debug'                => 'Debug',
+    'Debug'                => 'Отладка', // Added - 2019-03-25
     'DefaultRate'          => 'Скорость по умолчанию',
     'DefaultScale'         => 'Масштаб по умолчанию',
     'DefaultView'          => 'Вид по умолчанию',
     'Deinterlacing'        => 'Устранение чересстрочности',          // Added - 2015-04-18
-    'Delay'                => 'Delay',                  // Added - 2015-04-18
+    'Delay'                => 'Задержка',                  // Edited - 2019-03-25
     'Delete'               => 'Удалить',
     'DeleteAndNext'        => 'Удалить &amp; след.',
     'DeleteAndPrev'        => 'Удалить &amp; пред.',
@@ -277,18 +277,18 @@ $SLANG = array(
     'Description'          => 'Описание',
     'DetectedCameras'      => 'Найденные камеры',       // Added - 2009-03-31
     'DetectedProfiles'     => 'Найденные профили',      // Added - 2015-04-18
-    'Device'               => 'Device',                 // Added - 2009-02-08
+    'Device'               => 'Устройство',                 // Edited - 2019-03-25
     'DeviceChannel'        => 'Канал',
     'DeviceFormat'         => 'Формат',
     'DeviceNumber'         => 'Номер устройства',
     'DevicePath'           => 'Путь к устройству',
-    'Devices'              => 'Devices',
+    'Devices'              => 'Устройства', // Edited - 2019-03-25
     'Dimensions'           => 'Размеры',
     'DisableAlarms'        => 'Запретить тревогу',
     'Disk'                 => 'Диск', 
     'Display'              => 'Display',                // Added - 2011-01-30
     'Displaying'           => 'Отображено',             // Added - 2011-06-16
-    'DoNativeMotionDetection'=> 'Do Native Motion Detection',
+    'DoNativeMotionDetection'=> 'Использовать встроенное обнаружение движения', // Edited - 2019-03-25
     'Donate'               => 'Поддержите проект', 
     'DonateAlready'        => 'Нет, я уже сделал пожертвование', 
     'DonateEnticement'     => 'Вы какое-то время используете ZoneMinder и, надеемся, находите его полезным дополнением к вашей домашней или рабочей безопасности. Хотя ZoneMinder есть и будет оставаться свободным и бесплатным, он требует денег на разработку и поддержку. Если Вы хотите поддержать его будущее развитие и новые функции, пожалуйста сделайте пожертвование. Это, конечно, необязательно, но очень высоко ценится. Вы можете пожертвовать любую сумму.<br><br>Если Вы хотите сделать пожертвование, то выберите соответствующий вариант ниже или перейдите по адресу https://www.bountysource.com/teams/zoneminder в вашем браузере.<br><br>Спасибо за использование ZoneMinder, и не забывайте посетить форум на ZoneMinder.com для поддержки и пожеланий как сделать ZoneMinder еще лучше.', 
@@ -299,11 +299,11 @@ $SLANG = array(
     'DonateRemindWeek'     => 'Нет, не сейчас, напомнить через неделю', 
     'DonateYes'            => 'Да, я хотел бы сделать пожертвование', 
     'Download'             => 'Скачать',
-    'DownloadVideo'        => 'Скачать видео',         // Added - 2019-24-03
-    'DuplicateMonitorName' => 'Duplicate Monitor Name', // Added - 2009-03-31
+    'DownloadVideo'        => 'Скачать видео',         // Added - 2019-03-24
+    'DuplicateMonitorName' => 'Скопировать имя монитора', // Added - 2019-03-25
     'Duration'             => 'Длительность',
     'Edit'                 => 'Редактирование',
-    'EditLayout'           => 'Edit Layout',            // Added - 2018-08-30
+    'EditLayout'           => 'Редактирование шаблона',            // Added - 2019-03-25
     'Email'                => 'Email',
     'EnableAlarms'         => 'Разрешить тревогу',
     'Enabled'              => 'Включен',
@@ -314,8 +314,8 @@ $SLANG = array(
     'Etc'                  => 'и т.д.',
     'Event'                => 'Событие',
     'EventFilter'          => 'Фильтр событий',
-    'EventId'              => 'Event Id',
-    'EventName'            => 'Event Name',
+    'EventId'              => 'Id события', // Added - 2019-03-25
+    'EventName'            => 'Имя события', // Added - 2019-03-25
     'EventPrefix'          => 'Префикс события',
     'Events'               => 'События',
     'Exclude'              => 'Исключить',
@@ -352,14 +352,14 @@ $SLANG = array(
     'FilterMessageEvents'  => 'Message details of all matches',
     'FilterMoveEvents'     => 'Move all matches',       // Added - 2018-08-30
     'FilterPx'             => 'Пкс фильтра',
-    'FilterUnset'          => 'You must specify a filter width and height',
-    'FilterUpdateDiskSpace'=> 'Update used disk space', // Added - 2018-08-30
-    'FilterUploadEvents'   => 'Upload all matches',
-    'FilterVideoEvents'    => 'Create video for all matches',
+    'FilterUnset'          => 'Вы должны указать ширину и высоту фильтра', // Added - 2019-03-25
+    'FilterUpdateDiskSpace'=> 'Обновить используемое дисковое пространство', // Edited - 2019-03-25
+    'FilterUploadEvents'   => 'Загрузить все совпадения', // Added - 2019-03-25
+    'FilterVideoEvents'    => 'Создать видео для всех совпадений', // Added - 2019-03-25
     'Filters'              => 'Фильтры',
     'First'                => 'Первый',
-    'FlippedHori'          => 'Flipped Horizontally',
-    'FlippedVert'          => 'Flipped Vertically',
+    'FlippedHori'          => 'Перевернутый горизонтально', // Added - 2019-03-25
+    'FlippedVert'          => 'Перевернутый вертикально', // Added - 2019-03-25
     'FnMocord'             => 'Mocord',            // Added 2013.08.16.
     'FnModect'             => 'Modect',            // Added 2013.08.16.
     'FnMonitor'            => 'Monitor',            // Added 2013.08.16.
@@ -378,7 +378,7 @@ $SLANG = array(
     'Function'             => 'Функция',
     'Gain'                 => 'Gain',
     'General'              => 'Основные',
-    'GenerateDownload'     => 'Generate Download',      // Added - 2018-08-30
+    'GenerateDownload'     => 'Сгенерировать загрузку',      // Edited - 2019-03-25
     'GenerateVideo'        => 'Генерировать видео',
     'GeneratingVideo'      => 'Генерируется видео',
     'GoToZoneMinder'       => 'Перейти на ZoneMinder.com',
@@ -399,7 +399,7 @@ $SLANG = array(
     'High'                 => 'широкий',
     'HighBW'               => 'Широкий канал',
     'Home'                 => 'Домой',
-    'Hostname'             => 'Hostname',               // Added - 2018-08-30
+    'Hostname'             => 'Имя хоста',               // Edited - 2019-03-25
     'Hour'                 => 'Час',
     'Hue'                  => 'Оттенок',
     'Id'                   => 'ИД',
@@ -407,13 +407,13 @@ $SLANG = array(
     'Ignore'               => 'Игнорировать',
     'Image'                => 'Изображение',
     'ImageBufferSize'      => 'Буфер изображений',
-    'Images'               => 'Images',
+    'Images'               => 'Изображения', // Added - 2019-03-25
     'In'                   => 'In',
     'Include'              => 'Включить',
     'Inverted'             => 'Инвертировать',
     'Iris'                 => 'Наклон',
     'KeyString'            => 'Key String',
-    'Label'                => 'Label',
+    'Label'                => 'Имя', // Added - 2019-03-25
     'Language'             => 'Язык',
     'Last'                 => 'Последний',
     'Layout'               => 'Раскладка',                 // Added - 2009-02-08
@@ -424,7 +424,7 @@ $SLANG = array(
     'Line'                 => 'Строка',                   // Added - 2011-06-16
     'LinkedMonitors'       => 'Привязанные мониторы',
     'List'                 => 'Список',
-    'ListMatches'          => 'List Matches',           // Added - 2018-08-30
+    'ListMatches'          => 'Список совпадений',           // Edited - 2019-03-25
     'Load'                 => 'Нагрузка', 
     'Local'                => 'Локальный',
     'Log'                  => 'Лог',                    // Added - 2011-06-16;
@@ -441,7 +441,7 @@ $SLANG = array(
     'Manual'               => 'Manual',
     'Mark'                 => 'Метка',
     'Max'                  => 'Макс.',
-    'MaxBandwidth'         => 'Max Bandwidth',
+    'MaxBandwidth'         => 'Макс. пропускная способность', // Added - 2019-03-25
     'MaxBrScore'           => 'Макс.<br/>оценка',
     'MaxFocusRange'        => 'Макс. диап. фокуса',
     'MaxFocusSpeed'        => 'Макс. скор. фокуса',
@@ -531,7 +531,7 @@ $SLANG = array(
     'Network'              => 'Сеть',
     'New'                  => 'Нов.',
     'NewGroup'             => 'Новая группа',
-    'NewLabel'             => 'New Label',
+    'NewLabel'             => 'Новое имя', // Added - 2019-03-25
     'NewPassword'          => 'Новый пароль',
     'NewState'             => 'Новое состояние',
     'NewUser'              => 'Новый пользователь',
@@ -548,8 +548,8 @@ $SLANG = array(
     'Normal'               => 'Нормальная',
     'Notes'                => 'Примечание',
     'NumPresets'           => 'Кол-во предустановок',
-    'Off'                  => 'Off',
-    'On'                   => 'On',
+    'Off'                  => 'Выкл.', // Added - 2019-03-25
+    'On'                   => 'Вкл.', // Added - 2019-03-25
     'OnvifCredentialsIntro'=> 'Пожалуйста укажите имя пользователя и пароль для выбранной камеры.<br/><br/>Если пользователь для камеры не был создан, тогда будет создан новый с указанными данными.<br/><br/>', // Added - 2015-04-18
     'OnvifProbe'           => 'ONVIF',                  // Added - 2015-04-18
     'OnvifProbeIntro'      => 'В этом списке показаны найденные ONVIF камеры, как уже заведенные, так и доступные для выбора.<br/><br/>Выберите нужную из списка ниже.<br/><br/>Обратите внимание, что не все камеры могут быть найдены, и что выбор камеры может переписать настройки определенные для этого монитора.<br/><br/>', // Added - 2015-04-18
@@ -606,13 +606,13 @@ $SLANG = array(
     'ProfileProbeIntro'    => 'В этом списке показаны существующие профили потока выбранной камеры.<br/><br/>Выберите нужный из списка ниже.<br/><br/>Обратите внимание, что ZoneMinder не может добавить дополнительный профиль, и что выбор профиля может переписать настройки определенные для этого монитора.<br/><br/>', // Added - 2015-04-18
     'Progress'             => 'Прогресс',               // Added - 2015-04-18
     'Protocol'             => 'Протокол',
-    'RTSPDescribe'         => 'Use RTSP Response Media URL', // Added - 2018-08-30
-    'RTSPTransport'        => 'RTSP Transport Protocol', // Added - 2018-08-30
+    'RTSPDescribe'         => 'Использовать RTSP URL для ответа', // Edited - 2019-03-25
+    'RTSPTransport'        => 'Транспортный протокол RTSP', // Edited - 2019-03-25
     'Rate'                 => 'Скорость',
     'Real'                 => 'Реальная',
     'RecaptchaWarning'     => 'Your reCaptcha secret key is invalid. Please correct it, or reCaptcha will not work', // Added - 2018-08-30
     'Record'               => 'Record',
-    'RecordAudio'          => 'Whether to store the audio stream when saving an event.', // Added - 2018-08-30
+    'RecordAudio'          => 'Сохранять ли аудиопоток при сохранении события.', // Edited - 2019-03-25
     'RefImageBlendPct'     => 'Смешение опорного кадра, %',
     'Refresh'              => 'Обновить',
     'Remote'               => 'Удаленный',
@@ -628,7 +628,7 @@ $SLANG = array(
     'ReplayAll'            => 'Все события',
     'ReplayGapless'        => 'События подряд',
     'ReplaySingle'         => 'Одно событие',
-    'ReportEventAudit'     => 'Отчёт о событяих аудита',    // Edited - 2019-03-24
+    'ReportEventAudit'     => 'Отчёт о событиях аудита',    // Edited - 2019-03-24
     'Reset'                => 'Сбросить',
     'ResetEventCounts'     => 'Обнулить счетчик событий',
     'Restart'              => 'Перезапустить',
@@ -684,17 +684,17 @@ $SLANG = array(
     'State'                => 'Состояние',
     'Stats'                => 'Статистика',
     'Status'               => 'Статус',
-    'StatusConnected'      => 'Capturing',              // Added - 2018-08-30
-    'StatusNotRunning'     => 'Not Running',            // Added - 2018-08-30
-    'StatusRunning'        => 'Not Capturing',          // Added - 2018-08-30
-    'StatusUnknown'        => 'Unknown',                // Added - 2018-08-30
+    'StatusConnected'      => 'Записывается',              // Edited - 2019-03-25
+    'StatusNotRunning'     => 'Не запущен',            // Edited - 2019-03-25
+    'StatusRunning'        => 'Не записывается',          // Edited - 2019-03-25
+    'StatusUnknown'        => 'Неизвестно',                // Edited - 2019-03-25
     'Step'                 => 'Шаг',
     'StepBack'             => 'Кадр назад',
     'StepForward'          => 'Кадр вперед',
-    'StepLarge'            => 'Large Step',
-    'StepMedium'           => 'Medium Step',
-    'StepNone'             => 'No Step',
-    'StepSmall'            => 'Small Step',
+    'StepLarge'            => 'Большой шаг', // Added - 2019-03-25
+    'StepMedium'           => 'Средний шаг', // Added - 2019-03-25
+    'StepNone'             => 'Без шагов', // Added - 2019-03-25
+    'StepSmall'            => 'Малый шаг', // Added - 2019-03-25
     'Stills'               => 'Стоп-кадры',
     'Stop'                 => 'Остановить',
     'Stopped'              => 'Остановлен',
@@ -776,7 +776,7 @@ $SLANG = array(
     'Watch'                => 'Watch',
     'Web'                  => 'Интерфейс',
     'WebColour'            => 'Цвет отметки',
-    'WebSiteUrl'           => 'Website URL',            // Added - 2018-08-30
+    'WebSiteUrl'           => 'URL сайта',            // Edited - 2019-03-25
     'Week'                 => 'Неделя',
     'White'                => 'Бал. белого',
     'WhiteBalance'         => 'White Balance',
@@ -799,7 +799,7 @@ $SLANG = array(
     'ZoneMinMaxBlobs'      => 'Мин/Макс кол-во объектов',
     'ZoneMinMaxFiltArea'   => 'Мин/Макс разм. фильтр. зоны ',
     'ZoneMinMaxPixelThres' => 'Мин/Макс порог изм. пикс. (0-255)',
-    'ZoneMinderLog'        => 'ZoneMinder Log',         // Added - 2011-06-17
+    'ZoneMinderLog'        => 'Лог ZoneMinder',         // Edited - 2019-03-25
     'ZoneOverloadFrames'   => 'Кол-во игнор. кадров перегрузки',
     'Zones'                => 'Зоны',
     'Zoom'                 => 'Увеличение',

From accf826ae95e890635b2da48a74828a83283fb9a Mon Sep 17 00:00:00 2001
From: santos995 <santos995@mail.ru>
Date: Mon, 25 Mar 2019 11:44:01 +0300
Subject: [PATCH 120/214] New translations

---
 web/lang/ru_ru.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/lang/ru_ru.php b/web/lang/ru_ru.php
index f08ab3e02..6664e4d97 100644
--- a/web/lang/ru_ru.php
+++ b/web/lang/ru_ru.php
@@ -77,11 +77,11 @@ $SLANG = array(
     '32BitColour'          => '32 битный цвет',          // Added - 2011-06-15
     '8BitGrey'             => '256 оттенков серого',
     'Action'               => 'Действие', 
-    'Actual'               => 'Actual',                 // Added - 2018-08-30
+    'Actual'               => 'Актуальный',                 // Edited - 2019-03-25
     'AddNewControl'        => 'Добавить новый',
     'AddNewMonitor'        => 'Добавить монитор',
-    'AddNewServer'         => 'Add New Server',         // Added - 2018-08-30
-    'AddNewStorage'        => 'Add New Storage',        // Added - 2018-08-30
+    'AddNewServer'         => 'Добавить новый сервер',         // Edited - 2019-03-25
+    'AddNewStorage'        => 'Добавить новое хранилище',        // Edited - 2019-03-25
     'AddNewUser'           => 'Добавить пользователя',
     'AddNewZone'           => 'Добавить зону',
     'Alarm'                => 'Тревога',

From 8d07a4a08f79ff67a9e73f5dbbfd2452de7e2b91 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 25 Mar 2019 11:58:04 -0400
Subject: [PATCH 121/214] Log useful error messages when can't mkdir the
 monitor events dir or the symlink to it.  symlink is a warning because the
 symlink is just a user aid

---
 web/includes/actions/monitor.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/web/includes/actions/monitor.php b/web/includes/actions/monitor.php
index 3fd76020c..cfb89a892 100644
--- a/web/includes/actions/monitor.php
+++ b/web/includes/actions/monitor.php
@@ -86,10 +86,15 @@ if ( $action == 'monitor' ) {
           unlink($OldStorage->Path().'/'.$saferOldName);
 
         $NewStorage = new ZM\Storage($_REQUEST['newMonitor']['StorageId']);
-        if ( ! file_exists($NewStorage->Path().'/'.$mid) )
-          mkdir($NewStorage->Path().'/'.$mid, 0755);
+        if ( !file_exists($NewStorage->Path().'/'.$mid) ) {
+          if ( !mkdir($NewStorage->Path().'/'.$mid, 0755) ) {
+            Error('Unable to mkdir ' . $NewStorage->Path().'/'.$mid);
+          }
+        }
         $saferNewName = basename($_REQUEST['newMonitor']['Name']);
-        symlink($mid, $NewStorage->Path().'/'.$saferNewName);
+        if ( !symlink($NewStorage->Path().'/'.$mid, $NewStorage->Path().'/'.$saferNewName) ) {
+          Warning('Unable to symlink ' . $NewStorage->Path().'/'.$mid . ' to ' . $NewStorage->Path().'/'.$saferNewName);
+        }
       }
       if ( isset($changes['Width']) || isset($changes['Height']) ) {
         $newW = $_REQUEST['newMonitor']['Width'];

From 7e62ccca3c2a8a4dc6d6d90e77f1cc2708ec89b2 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 25 Mar 2019 12:08:56 -0400
Subject: [PATCH 122/214] Handle div by zero when TotalMem is not known for
 Server

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

diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php
index 6de1ab6d1..3d630242a 100644
--- a/web/skins/classic/views/options.php
+++ b/web/skins/classic/views/options.php
@@ -247,7 +247,7 @@ foreach ( array_map('basename', glob('skins/'.$current_skin.'/css/*',GLOB_ONLYDI
               <td class="colCpuLoad <?php if ( $Server->CpuLoad() > 5 ) { echo 'danger'; } ?>">
                   <?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server',$Server->CpuLoad(), $canEdit) ?>
               </td>
-              <td class="colMemory <?php if ( $Server->FreeMem()/$Server->TotalMem() < .1 ) { echo 'danger'; } ?>">
+              <td class="colMemory <?php if ( (!$Server->TotalMem()) or ($Server->FreeMem()/$Server->TotalMem() < .1) ) { echo 'danger'; } ?>">
                   <?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', human_filesize($Server->FreeMem()) . ' / ' . human_filesize($Server->TotalMem()), $canEdit) ?>
               </td>
               <td class="colSwap <?php if ( (!$Server->TotalSwap()) or ($Server->FreeSwap()/$Server->TotalSwap() < .1) ) { echo 'danger'; } ?>">

From 4eafc52955a67ed4892e090c5ebf7b5946a2b9cb Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 25 Mar 2019 12:18:01 -0400
Subject: [PATCH 123/214] spacing

---
 web/includes/Event.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/web/includes/Event.php b/web/includes/Event.php
index 944e55248..627133659 100644
--- a/web/includes/Event.php
+++ b/web/includes/Event.php
@@ -427,31 +427,31 @@ class Event {
 
     $captPath = $eventPath.'/'.$captImage;
     if ( ! file_exists($captPath) ) {
-      Error( "Capture file does not exist at $captPath" );
+      Error("Capture file does not exist at $captPath");
     }
     
     //echo "CI:$captImage, CP:$captPath, TCP:$captPath<br>";
 
-    $analImage = sprintf( '%0'.ZM_EVENT_IMAGE_DIGITS.'d-analyse.jpg', $frame['FrameId'] );
+    $analImage = sprintf('%0'.ZM_EVENT_IMAGE_DIGITS.'d-analyse.jpg', $frame['FrameId']);
     $analPath = $eventPath.'/'.$analImage;
 
     //echo "AI:$analImage, AP:$analPath, TAP:$analPath<br>";
 
     $alarmFrame = $frame['Type']=='Alarm';
 
-    $hasAnalImage = $alarmFrame && file_exists( $analPath ) && filesize( $analPath );
+    $hasAnalImage = $alarmFrame && file_exists($analPath) && filesize($analPath);
     $isAnalImage = $hasAnalImage && !$captureOnly;
 
-    if ( !ZM_WEB_SCALE_THUMBS || $scale >= SCALE_BASE || !function_exists( 'imagecreatefromjpeg' ) ) {
-      $imagePath = $thumbPath = $isAnalImage?$analPath:$captPath;
+    if ( !ZM_WEB_SCALE_THUMBS || $scale >= SCALE_BASE || !function_exists('imagecreatefromjpeg') ) {
+      $imagePath = $thumbPath = $isAnalImage ? $analPath : $captPath;
       $imageFile = $imagePath;
       $thumbFile = $thumbPath;
     } else {
       if ( version_compare( phpversion(), '4.3.10', '>=') )
-        $fraction = sprintf( '%.3F', $scale/SCALE_BASE );
+        $fraction = sprintf('%.3F', $scale/SCALE_BASE);
       else
-        $fraction = sprintf( '%.3f', $scale/SCALE_BASE );
-      $scale = (int)round( $scale );
+        $fraction = sprintf('%.3f', $scale/SCALE_BASE);
+      $scale = (int)round($scale);
 
       $thumbCaptPath = preg_replace( '/\.jpg$/', "-$scale.jpg", $captPath );
       $thumbAnalPath = preg_replace( '/\.jpg$/', "-$scale.jpg", $analPath );

From 7565e171b4032ec21467c109eabbf340c83b4333 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 25 Mar 2019 12:18:15 -0400
Subject: [PATCH 124/214] spacing

---
 web/skins/classic/views/frame.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/skins/classic/views/frame.php b/web/skins/classic/views/frame.php
index 55ba1fe8a..7aca36bc9 100644
--- a/web/skins/classic/views/frame.php
+++ b/web/skins/classic/views/frame.php
@@ -37,7 +37,7 @@ if ( !empty($fid) ) {
   if ( !($frame = dbFetchOne( $sql, NULL, array($eid, $fid) )) )
     $frame = array( 'FrameId'=>$fid, 'Type'=>'Normal', 'Score'=>0 );
 } else {
-  $frame = dbFetchOne( 'SELECT * FROM Frames WHERE EventId = ? AND Score = ?', NULL, array( $eid, $Event->MaxScore() ) );
+  $frame = dbFetchOne('SELECT * FROM Frames WHERE EventId = ? AND Score = ?', NULL, array($eid, $Event->MaxScore()));
 }
 $Frame = new ZM\Frame($frame);
 
@@ -48,7 +48,7 @@ $prevFid = $Frame->FrameId()-1;
 $nextFid = $Frame->FrameId()+1;
 $lastFid = $maxFid;
 
-$alarmFrame = $Frame->Type()=='Alarm';
+$alarmFrame = $Frame->Type() == 'Alarm';
 
 if ( isset( $_REQUEST['scale'] ) ) {
   $scale = validNum($_REQUEST['scale']);
@@ -59,7 +59,7 @@ if ( isset( $_REQUEST['scale'] ) ) {
 } else {
   $scale = max( reScale( SCALE_BASE, $Monitor->DefaultScale(), ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
 }
-$scale = $scale ?: "auto";
+$scale = $scale ?: 'auto';
 
 $imageData = $Event->getImageSrc( $frame, $scale, 0 );
 if ( ! $imageData ) {
@@ -76,12 +76,12 @@ if (isset($_REQUEST['show']) && in_array($_REQUEST['show'], array('capt', 'anal'
 
 $imagePath = $imageData['thumbPath'];
 $eventPath = $imageData['eventPath'];
-$dImagePath = sprintf( '%s/%0'.ZM_EVENT_IMAGE_DIGITS.'d-diag-d.jpg', $eventPath, $Frame->FrameId() );
-$rImagePath = sprintf( '%s/%0'.ZM_EVENT_IMAGE_DIGITS.'d-diag-r.jpg', $eventPath, $Frame->FrameId() );
+$dImagePath = sprintf('%s/%0'.ZM_EVENT_IMAGE_DIGITS.'d-diag-d.jpg', $eventPath, $Frame->FrameId());
+$rImagePath = sprintf('%s/%0'.ZM_EVENT_IMAGE_DIGITS.'d-diag-r.jpg', $eventPath, $Frame->FrameId());
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, translate('Frame').' - '.$Event->Id()." - ".$Frame->FrameId() );
+xhtmlHeaders(__FILE__, translate('Frame').' - '.$Event->Id().' - '.$Frame->FrameId());
 ?>
 <body>
   <div id="page">

From 052a2ef1fd48d1b280d48dc7a0aa3d45b2473838 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 25 Mar 2019 12:20:21 -0400
Subject: [PATCH 125/214] fix eventserver => eventnotification

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

diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php
index 3d630242a..f7440d92e 100644
--- a/web/skins/classic/views/options.php
+++ b/web/skins/classic/views/options.php
@@ -256,7 +256,7 @@ foreach ( array_map('basename', glob('skins/'.$current_skin.'/css/*',GLOB_ONLYDI
               <td class="colStats"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', $Server->zmstats() ? 'yes' : 'no', $canEdit) ?></td>
               <td class="colAudit"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', $Server->zmaudit() ? 'yes' : 'no', $canEdit) ?></td>
               <td class="colTrigger"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', $Server->zmtrigger() ? 'yes' : 'no', $canEdit) ?></td>
-              <td class="colEventNotification"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', $Server->zmeventserver() ? 'yes' : 'no', $canEdit) ?></td>
+              <td class="colEventNotification"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', $Server->zmeventnotification() ? 'yes' : 'no', $canEdit) ?></td>
 
               <td class="colMark"><input type="checkbox" name="markIds[]" value="<?php echo $Server->Id() ?>" data-on-click-this="configureDeleteButton"<?php if ( !$canEdit ) { ?> disabled="disabled"<?php } ?>/></td>
 			</tr>

From acb9070b04132a4a22fd5d28aa46fb5ee01c3eea Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 25 Mar 2019 12:33:30 -0400
Subject: [PATCH 126/214] Add a warning when an event exceeds section length

---
 src/zm_monitor.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index cf012d277..c211dd7db 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1533,7 +1533,7 @@ bool Monitor::Analyse() {
               }
             } // end if false or config.overlap_timed_events
           } // end if ! event
-        }
+        } // end if ( (!signal_change && signal) && (function == RECORD || function == MOCORD) ) {
         if ( score ) {
           if ( state == IDLE || state == TAPE || state == PREALARM ) {
             if ( (!pre_event_count) || (Event::PreAlarmCount() >= alarm_frame_count) ) {
@@ -1700,6 +1700,19 @@ Error("Creating new event when one exists");
             }
             if ( event && noteSetMap.size() > 0 )
               event->updateNotes( noteSetMap );
+
+            if ( section_length
+                && ( ( timestamp->tv_sec - video_store_data->recording.tv_sec ) >= section_length )
+                && ! (image_count % fps_report_interval)
+                ) {
+              Warning( "%s: %03d - event %" PRIu64 ", has exceeded desired section length. %d - %d = %d >= %d",
+                  name, image_count, event->Id(),
+                  timestamp->tv_sec, video_store_data->recording.tv_sec,
+                  timestamp->tv_sec - video_store_data->recording.tv_sec,
+                  section_length
+                  );
+            }
+
           } else if ( state == ALERT ) {
             event->AddFrame( snap_image, *timestamp );
             if ( noteSetMap.size() > 0 )

From c7e09e03d3c9ea7ad514b84309929b9ad335c311 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 25 Mar 2019 16:24:46 -0400
Subject: [PATCH 127/214] add cache busting to base.js

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

diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index a401d512e..67457d5e7 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -178,7 +178,7 @@ echo output_link_if_exists( array(
 <?php
 } else {
 ?>
-  <script src="skins/classic/js/base.js"></script>
+  <script src="<?php echo cache_bust('skins/classic/js/base.js') ?>"></script>
 <?php } ?>
   <script src="<?php echo cache_bust($skinJsFile) ?>"></script>
   <script src="js/logger.js"></script>

From ee4b452e420446133dac49fbc49e5932297c3d32 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 25 Mar 2019 16:25:09 -0400
Subject: [PATCH 128/214] Update monitor edit to not use inline js

---
 web/skins/classic/views/js/monitor.js | 18 ++++++++
 web/skins/classic/views/monitor.php   | 65 ++++++++++++++++++++++-----
 2 files changed, 71 insertions(+), 12 deletions(-)

diff --git a/web/skins/classic/views/js/monitor.js b/web/skins/classic/views/js/monitor.js
index ea85c7fb0..2ac4515a7 100644
--- a/web/skins/classic/views/js/monitor.js
+++ b/web/skins/classic/views/js/monitor.js
@@ -46,6 +46,24 @@ function initPage() {
   //var protocolSelector = $('contentForm').elements['newMonitor[Protocol]'];
   //if ( $(protocolSelector).getTag() == 'select' )
   //updateMethods( $(protocolSelector) );
+  document.querySelectorAll('input[name="newMonitor[SignalCheckColour]"]').forEach(function(el) {
+    el.oninput = function(event) {
+      $j('#SignalCheckSwatch').css('background-color', event.target.value);
+    };
+  });
+  document.querySelectorAll('input[name="newMonitor[WebColour]"]').forEach(function(el) {
+    el.oninput = function(event) {
+      $j('#WebSwatch').css('background-color', event.target.value);
+    };
+  });
+  $j('#contentForm').submit(function(event){
+    if ( validateForm(this) ) {
+      $j('#contentButtons').hide();
+      return true;
+    } else {
+      return false;
+    };
+  });
 }
 
 window.addEventListener( 'DOMContentLoaded', initPage );
diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index c0bb8a8d1..a0d6c7e91 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -523,7 +523,7 @@ foreach ( $tabs as $name=>$value ) {
   ?>
     </ul>
     <div class="clear"></div>
-    <form name="contentForm" id="contentForm" method="post" action="?" onsubmit="if(validateForm(this)){$j('#contentButtons').hide();return true;}else{return false;};">
+    <form name="contentForm" id="contentForm" method="post" action="?">
       <input type="hidden" name="view" value="<?php echo $view ?>"/>
       <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
       <input type="hidden" name="action" value="monitor"/>
@@ -1006,15 +1006,56 @@ if ( $monitor->Type() == 'Local' ) {
   case 'misc' :
     {
 ?>
-        <tr><td><?php echo translate('EventPrefix') ?></td><td><input type="text" name="newMonitor[EventPrefix]" value="<?php echo validHtmlStr($monitor->EventPrefix()) ?>" size="24"/></td></tr>
-        <tr><td><?php echo translate('Sectionlength') ?></td><td><input type="text" name="newMonitor[SectionLength]" value="<?php echo validHtmlStr($monitor->SectionLength()) ?>" size="6"/></td></tr>
-        <tr><td><?php echo translate('FrameSkip') ?></td><td><input type="text" name="newMonitor[FrameSkip]" value="<?php echo validHtmlStr($monitor->FrameSkip()) ?>" size="6"/></td></tr>
-        <tr><td><?php echo translate('MotionFrameSkip') ?></td><td><input type="text" name="newMonitor[MotionFrameSkip]" value="<?php echo validHtmlStr($monitor->MotionFrameSkip()) ?>" size="6"/></td></tr>
-        <tr><td><?php echo translate('AnalysisUpdateDelay') ?></td><td><input type="text" name="newMonitor[AnalysisUpdateDelay]" value="<?php echo validHtmlStr($monitor->AnalysisUpdateDelay()) ?>" size="6"/></td></tr>
-        <tr><td><?php echo translate('FPSReportInterval') ?></td><td><input type="text" name="newMonitor[FPSReportInterval]" value="<?php echo validHtmlStr($monitor->FPSReportInterval()) ?>" size="6"/></td></tr>
-        <tr><td><?php echo translate('DefaultRate') ?></td><td><?php echo htmlSelect( "newMonitor[DefaultRate]", $rates, $monitor->DefaultRate() ); ?></td></tr>
-        <tr><td><?php echo translate('DefaultScale') ?></td><td><?php echo htmlSelect( "newMonitor[DefaultScale]", $scales, $monitor->DefaultScale() ); ?></td></tr>
-        <tr><td><?php echo translate('DefaultCodec') ?></td><td><?php echo htmlSelect( "newMonitor[DefaultCodec]", $codecs, $monitor->DefaultCodec() ); ?></td></tr>
+        <tr>
+          <td><?php echo translate('EventPrefix') ?></td>
+          <td><input type="text" name="newMonitor[EventPrefix]" value="<?php echo validHtmlStr($monitor->EventPrefix()) ?>"/></td>
+        </tr>
+        <tr>
+          <td><?php echo translate('Sectionlength') ?></td>
+          <td>
+            <input type="number" name="newMonitor[SectionLength]" value="<?php echo validHtmlStr($monitor->SectionLength()) ?>"/>
+            <?php echo translate('seconds')?>
+          </td>
+        </tr>
+        <tr>
+          <td><?php echo translate('FrameSkip') ?></td>
+          <td>
+            <input type="number" name="newMonitor[FrameSkip]" value="<?php echo validHtmlStr($monitor->FrameSkip()) ?>"/>
+            <?php echo translate('frames')?>
+          </td>
+        </tr>
+        <tr>
+          <td><?php echo translate('MotionFrameSkip') ?></td>
+          <td>
+            <input type="number" name="newMonitor[MotionFrameSkip]" value="<?php echo validHtmlStr($monitor->MotionFrameSkip()) ?>"/>
+            <?php echo translate('frames')?>
+          </td>
+        </tr>
+        <tr>
+          <td><?php echo translate('AnalysisUpdateDelay') ?></td>
+          <td>
+            <input type="number" name="newMonitor[AnalysisUpdateDelay]" value="<?php echo validHtmlStr($monitor->AnalysisUpdateDelay()) ?>"/>
+            <?php echo translate('seconds')?>
+          </td></tr>
+        <tr>
+          <td><?php echo translate('FPSReportInterval') ?></td>
+          <td>
+            <input type="number" name="newMonitor[FPSReportInterval]" value="<?php echo validHtmlStr($monitor->FPSReportInterval()) ?>"/>
+            <?php echo translate('frames')?>
+          </td>
+        </tr>
+        <tr>
+          <td><?php echo translate('DefaultRate') ?></td>
+          <td><?php echo htmlSelect('newMonitor[DefaultRate]', $rates, $monitor->DefaultRate()); ?></td>
+        </tr>
+        <tr>
+          <td><?php echo translate('DefaultScale') ?></td>
+          <td><?php echo htmlSelect('newMonitor[DefaultScale]', $scales, $monitor->DefaultScale()); ?></td>
+        </tr>
+        <tr>
+          <td><?php echo translate('DefaultCodec') ?></td>
+          <td><?php echo htmlSelect('newMonitor[DefaultCodec]', $codecs, $monitor->DefaultCodec()); ?></td>
+        </tr>
         <tr>
           <td><?php echo translate('SignalCheckPoints') ?></td>
           <td>
@@ -1024,14 +1065,14 @@ if ( $monitor->Type() == 'Local' ) {
         <tr>
           <td><?php echo translate('SignalCheckColour') ?></td>
           <td>
-            <input type="text" name="newMonitor[SignalCheckColour]" value="<?php echo validHtmlStr($monitor->SignalCheckColour()) ?>" size="10" onchange="$('SignalCheckSwatch').setStyle('backgroundColor', this.value)"/>
+            <input type="text" name="newMonitor[SignalCheckColour]" value="<?php echo validHtmlStr($monitor->SignalCheckColour()) ?>"/>
             <span id="SignalCheckSwatch" class="swatch" style="background-color: <?php echo validHtmlStr($monitor->SignalCheckColour()); ?>;">&nbsp;&nbsp;&nbsp;&nbsp;</span>
           </td>
         </tr>
         <tr>
           <td><?php echo translate('WebColour') ?></td>
           <td>
-            <input type="text" name="newMonitor[WebColour]" value="<?php echo validHtmlStr($monitor->WebColour()) ?>" size="10" onchange="$('WebSwatch').setStyle( 'backgroundColor', this.value )"/>
+            <input type="text" name="newMonitor[WebColour]" value="<?php echo validHtmlStr($monitor->WebColour()) ?>" onchange="$('WebSwatch').setStyle( 'backgroundColor', this.value )"/>
             <span id="WebSwatch" class="swatch" style="background-color: <?php echo validHtmlStr($monitor->WebColour()) ?>;">&nbsp;&nbsp;&nbsp;&nbsp;</span>
           </td>
         </tr>

From e6547953b060f9ba6e6543dea4a9dfe79c88f754 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Thu, 28 Mar 2019 09:24:32 -0400
Subject: [PATCH 129/214] fix segfault using old ffmpeg

---
 src/zm_videostore.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 4abf5998a..5ae3404b7 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -114,8 +114,7 @@ VideoStore::VideoStore(
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
   //video_out_stream->codec = avcodec_alloc_context3(video_out_codec);
   // Since we are not re-encoding, all we have to do is copy the parameters
-  video_out_ctx = video_out_stream->codec;
-  //video_out_ctx = avcodec_alloc_context3(video_out_codec);
+  video_out_ctx = avcodec_alloc_context3(video_out_codec);
   // Copy params from instream to ctx
   ret = avcodec_parameters_to_context(video_out_ctx, video_in_stream->codecpar);
   if ( ret < 0 ) {
@@ -125,6 +124,7 @@ VideoStore::VideoStore(
     zm_dump_codec(video_out_ctx);
   }
 #else
+  video_out_ctx = video_out_stream->codec;
   ret = avcodec_copy_context(video_out_ctx, video_in_ctx);
   if ( ret < 0 ) {
     Fatal("Unable to copy in video ctx to out video ctx %s",

From 9a70dff1439dde2897c37c9b5ce7cb63c926e25b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 28 Mar 2019 09:43:17 -0400
Subject: [PATCH 130/214] to single quotes, include monitor Id when logging the
 closing of an event

---
 scripts/zmaudit.pl.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in
index 851921db2..41c8b0e75 100644
--- a/scripts/zmaudit.pl.in
+++ b/scripts/zmaudit.pl.in
@@ -766,7 +766,7 @@ FROM Frames WHERE EventId=?';
   $res = $selectUnclosedEventsSth->execute()
     or Fatal( "Can't execute: ".$selectUnclosedEventsSth->errstr() );
   while( my $event = $selectUnclosedEventsSth->fetchrow_hashref() ) {
-    aud_print( "Found open event '$event->{Id}' at $$event{StartTime}" );
+    aud_print( "Found open event '$event->{Id}' on Monitor $event->{MonitorId} at $$event{StartTime}" );
     if ( confirm( 'close', 'closing' ) ) {
       if ( ! ( $res = $selectFrameDataSth->execute($event->{Id}) ) ) {
         Error( "Can't execute: $selectFrameDataSql:".$selectFrameDataSth->errstr() );
@@ -792,13 +792,13 @@ FROM Frames WHERE EventId=?';
            $frame->{MaxScore},
            RECOVER_TEXT,
            $event->{Id}
-          ) or Error( "Can't execute: ".$updateUnclosedEventsSth->errstr() );
+          ) or Error( 'Can\'t execute: '.$updateUnclosedEventsSth->errstr() );
       } else {
         Error('SHOULD DELETE');
       } # end if has frame data
     }
   } # end while unclosed event
-  Debug("Done closing open events.");
+  Debug('Done closing open events.');
 
 # Now delete any old image files
   if ( my @old_files = grep { -M > $max_image_age } <$image_path/*.{jpg,gif,wbmp}> ) {

From 49e3f0a68eda1a005d30a3a9ee2e756c05011412 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 28 Mar 2019 09:43:31 -0400
Subject: [PATCH 131/214] eslint fixes

---
 web/includes/csrf/csrf-magic.js       | 310 +++++++++++++-------------
 web/skins/classic/views/js/export.js  |  10 +-
 web/skins/classic/views/js/montage.js |   2 +-
 3 files changed, 162 insertions(+), 160 deletions(-)

diff --git a/web/includes/csrf/csrf-magic.js b/web/includes/csrf/csrf-magic.js
index 0989c1065..06ed62076 100644
--- a/web/includes/csrf/csrf-magic.js
+++ b/web/includes/csrf/csrf-magic.js
@@ -9,183 +9,185 @@
 // The wrapper must be set BEFORE onreadystatechange is written to, since
 // a bug in ActiveXObject prevents us from properly testing for it.
 CsrfMagic = function(real) {
-    // try to make it ourselves, if you didn't pass it
-    if (!real) try { real = new XMLHttpRequest; } catch (e) {;}
-    if (!real) try { real = new ActiveXObject('Msxml2.XMLHTTP'); } catch (e) {;}
-    if (!real) try { real = new ActiveXObject('Microsoft.XMLHTTP'); } catch (e) {;}
-    if (!real) try { real = new ActiveXObject('Msxml2.XMLHTTP.4.0'); } catch (e) {;}
-    this.csrf = real;
-    // properties
-    var csrfMagic = this;
-    real.onreadystatechange = function() {
-        csrfMagic._updateProps();
-        return csrfMagic.onreadystatechange ? csrfMagic.onreadystatechange() : null;
-    };
+  // try to make it ourselves, if you didn't pass it
+  if (!real) try {real = new XMLHttpRequest;} catch (e) {;}
+  if (!real) try {real = new ActiveXObject('Msxml2.XMLHTTP');} catch (e) {;}
+  if (!real) try {real = new ActiveXObject('Microsoft.XMLHTTP');} catch (e) {;}
+  if (!real) try {real = new ActiveXObject('Msxml2.XMLHTTP.4.0');} catch (e) {;}
+  this.csrf = real;
+  // properties
+  var csrfMagic = this;
+  real.onreadystatechange = function() {
     csrfMagic._updateProps();
-}
+    return csrfMagic.onreadystatechange ? csrfMagic.onreadystatechange() : null;
+  };
+  csrfMagic._updateProps();
+};
 
 CsrfMagic.prototype = {
 
-    open: function(method, url, async, username, password) {
-        if (method == 'POST') this.csrf_isPost = true;
-        // deal with Opera bug, thanks jQuery
-        if (username) return this.csrf_open(method, url, async, username, password);
-        else return this.csrf_open(method, url, async);
-    },
-    csrf_open: function(method, url, async, username, password) {
-        if (username) return this.csrf.open(method, url, async, username, password);
-        else return this.csrf.open(method, url, async);
-    },
+  open: function(method, url, async, username, password) {
+    if (method == 'POST') this.csrf_isPost = true;
+    // deal with Opera bug, thanks jQuery
+    if (username) return this.csrf_open(method, url, async, username, password);
+    else return this.csrf_open(method, url, async);
+  },
+  csrf_open: function(method, url, async, username, password) {
+    if (username) return this.csrf.open(method, url, async, username, password);
+    else return this.csrf.open(method, url, async);
+  },
 
-    send: function(data) {
-        if (!this.csrf_isPost) return this.csrf_send(data);
-        prepend = csrfMagicName + '=' + csrfMagicToken + '&';
+  send: function(data) {
+    if (!this.csrf_isPost) return this.csrf_send(data);
+    prepend = csrfMagicName + '=' + csrfMagicToken + '&';
     //    XXX: Removed to eliminate 'Refused to set unsafe header "Content-length" ' errors in modern browsers
     //    if (this.csrf_purportedLength === undefined) {
     //        this.csrf_setRequestHeader("Content-length", this.csrf_purportedLength + prepend.length);
     //        delete this.csrf_purportedLength;
     //    }
-        delete this.csrf_isPost;
-        return this.csrf_send(prepend + data);
-    },
-    csrf_send: function(data) {
-        return this.csrf.send(data);
-    },
+    delete this.csrf_isPost;
+    return this.csrf_send(prepend + data);
+  },
+  csrf_send: function(data) {
+    return this.csrf.send(data);
+  },
 
-    setRequestHeader: function(header, value) {
-        // We have to auto-set this at the end, since we don't know how long the
-        // nonce is when added to the data.
-        if (this.csrf_isPost && header == "Content-length") {
-            this.csrf_purportedLength = value;
-            return;
-        }
-        return this.csrf_setRequestHeader(header, value);
-    },
-    csrf_setRequestHeader: function(header, value) {
-        return this.csrf.setRequestHeader(header, value);
-    },
+  setRequestHeader: function(header, value) {
+    // We have to auto-set this at the end, since we don't know how long the
+    // nonce is when added to the data.
+    if (this.csrf_isPost && header == "Content-length") {
+      this.csrf_purportedLength = value;
+      return;
+    }
+    return this.csrf_setRequestHeader(header, value);
+  },
+  csrf_setRequestHeader: function(header, value) {
+    return this.csrf.setRequestHeader(header, value);
+  },
 
-    abort: function() {
-        return this.csrf.abort();
-    },
-    getAllResponseHeaders: function() {
-        return this.csrf.getAllResponseHeaders();
-    },
-    getResponseHeader: function(header) {
-        return this.csrf.getResponseHeader(header);
-    } // ,
-}
+  abort: function() {
+    return this.csrf.abort();
+  },
+  getAllResponseHeaders: function() {
+    return this.csrf.getAllResponseHeaders();
+  },
+  getResponseHeader: function(header) {
+    return this.csrf.getResponseHeader(header);
+  } // ,
+};
 
 // proprietary
 CsrfMagic.prototype._updateProps = function() {
-    this.readyState = this.csrf.readyState;
-    if (this.readyState == 4) {
-        this.responseText = this.csrf.responseText;
-        this.responseXML  = this.csrf.responseXML;
-        this.status       = this.csrf.status;
-        this.statusText   = this.csrf.statusText;
-    }
-}
+  this.readyState = this.csrf.readyState;
+  if (this.readyState == 4) {
+    this.responseText = this.csrf.responseText;
+    this.responseXML  = this.csrf.responseXML;
+    this.status       = this.csrf.status;
+    this.statusText   = this.csrf.statusText;
+  }
+};
+
 CsrfMagic.process = function(base) {
-    if(typeof base == 'object') {
-        base[csrfMagicName] = csrfMagicToken;
-        return base;
-    }
-    var prepend = csrfMagicName + '=' + csrfMagicToken;
-    if (base) return prepend + '&' + base;
-    return prepend;
-}
+  if ( typeof base == 'object' ) {
+    base[csrfMagicName] = csrfMagicToken;
+    return base;
+  }
+  var prepend = csrfMagicName + '=' + csrfMagicToken;
+  if ( base ) return prepend + '&' + base;
+  return prepend;
+};
+
 // callback function for when everything on the page has loaded
 CsrfMagic.end = function() {
-    // This rewrites forms AGAIN, so in case buffering didn't work this
-    // certainly will.
-    forms = document.getElementsByTagName('form');
-    for (var i = 0; i < forms.length; i++) {
-        form = forms[i];
-        if (form.method.toUpperCase() !== 'POST') continue;
-        if (form.elements[csrfMagicName]) continue;
-        var input = document.createElement('input');
-        input.setAttribute('name',  csrfMagicName);
-        input.setAttribute('value', csrfMagicToken);
-        input.setAttribute('type',  'hidden');
-        form.appendChild(input);
-    }
-}
+  // This rewrites forms AGAIN, so in case buffering didn't work this
+  // certainly will.
+  forms = document.getElementsByTagName('form');
+  for (var i = 0; i < forms.length; i++) {
+    form = forms[i];
+    if (form.method.toUpperCase() !== 'POST') continue;
+    if (form.elements[csrfMagicName]) continue;
+    var input = document.createElement('input');
+    input.setAttribute('name', csrfMagicName);
+    input.setAttribute('value', csrfMagicToken);
+    input.setAttribute('type', 'hidden');
+    form.appendChild(input);
+  }
+};
 
 // Sets things up for Mozilla/Opera/nice browsers
 // We very specifically match against Internet Explorer, since they haven't
 // implemented prototypes correctly yet.
-if (window.XMLHttpRequest && window.XMLHttpRequest.prototype && '\v' != 'v') {
-    var x = XMLHttpRequest.prototype;
-    var c = CsrfMagic.prototype;
+if ( window.XMLHttpRequest && window.XMLHttpRequest.prototype && '\v' != 'v' ) {
+  var x = XMLHttpRequest.prototype;
+  var c = CsrfMagic.prototype;
 
-    // Save the original functions
-    x.csrf_open = x.open;
-    x.csrf_send = x.send;
-    x.csrf_setRequestHeader = x.setRequestHeader;
+  // Save the original functions
+  x.csrf_open = x.open;
+  x.csrf_send = x.send;
+  x.csrf_setRequestHeader = x.setRequestHeader;
 
-    // Notice that CsrfMagic is itself an instantiatable object, but only
-    // open, send and setRequestHeader are necessary as decorators.
-    x.open = c.open;
-    x.send = c.send;
-    x.setRequestHeader = c.setRequestHeader;
+  // Notice that CsrfMagic is itself an instantiatable object, but only
+  // open, send and setRequestHeader are necessary as decorators.
+  x.open = c.open;
+  x.send = c.send;
+  x.setRequestHeader = c.setRequestHeader;
 } else {
-    // The only way we can do this is by modifying a library you have been
-    // using. We support YUI, script.aculo.us, prototype, MooTools,
-    // jQuery, Ext and Dojo.
-    if (window.jQuery) {
-        // jQuery didn't implement a new XMLHttpRequest function, so we have
-        // to do this the hard way.
-        jQuery.csrf_ajax = jQuery.ajax;
-        jQuery.ajax = function( s ) {
-            if (s.type && s.type.toUpperCase() == 'POST') {
-                s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s));
-                if ( s.data && s.processData && typeof s.data != "string" ) {
-                    s.data = jQuery.param(s.data);
-                }
-                s.data = CsrfMagic.process(s.data);
-            }
-            return jQuery.csrf_ajax( s );
+  // The only way we can do this is by modifying a library you have been
+  // using. We support YUI, script.aculo.us, prototype, MooTools,
+  // jQuery, Ext and Dojo.
+  if ( window.jQuery ) {
+    // jQuery didn't implement a new XMLHttpRequest function, so we have
+    // to do this the hard way.
+    jQuery.csrf_ajax = jQuery.ajax;
+    jQuery.ajax = function( s ) {
+      if (s.type && s.type.toUpperCase() == 'POST') {
+        s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s));
+        if ( s.data && s.processData && typeof s.data != "string" ) {
+          s.data = jQuery.param(s.data);
         }
-    }
-    if (window.Prototype) {
-        // This works for script.aculo.us too
-        Ajax.csrf_getTransport = Ajax.getTransport;
-        Ajax.getTransport = function() {
-            return new CsrfMagic(Ajax.csrf_getTransport());
-        }
-    }
-    if (window.MooTools) {
-        Browser.csrf_Request = Browser.Request;
-        Browser.Request = function () {
-            return new CsrfMagic(Browser.csrf_Request());
-        }
-    }
-    if (window.YAHOO) {
-        // old YUI API
-        YAHOO.util.Connect.csrf_createXhrObject = YAHOO.util.Connect.createXhrObject;
-        YAHOO.util.Connect.createXhrObject = function (transaction) {
-            obj = YAHOO.util.Connect.csrf_createXhrObject(transaction);
-            obj.conn = new CsrfMagic(obj.conn);
-            return obj;
-        }
-    }
-    if (window.Ext) {
-        // Ext can use other js libraries as loaders, so it has to come last
-        // Ext's implementation is pretty identical to Yahoo's, but we duplicate
-        // it for comprehensiveness's sake.
-        Ext.lib.Ajax.csrf_createXhrObject = Ext.lib.Ajax.createXhrObject;
-        Ext.lib.Ajax.createXhrObject = function (transaction) {
-            obj = Ext.lib.Ajax.csrf_createXhrObject(transaction);
-            obj.conn = new CsrfMagic(obj.conn);
-            return obj;
-        }
-    }
-    if (window.dojo) {
-        // NOTE: this doesn't work with latest dojo
-        dojo.csrf__xhrObj = dojo._xhrObj;
-        dojo._xhrObj = function () {
-            return new CsrfMagic(dojo.csrf__xhrObj());
-        }
-    }
-}
+        s.data = CsrfMagic.process(s.data);
+      }
+      return jQuery.csrf_ajax(s);
+    };
+  }
+  if ( window.Prototype ) {
+    // This works for script.aculo.us too
+    Ajax.csrf_getTransport = Ajax.getTransport;
+    Ajax.getTransport = function() {
+      return new CsrfMagic(Ajax.csrf_getTransport());
+    };
+  }
+  if ( window.MooTools ) {
+    Browser.csrf_Request = Browser.Request;
+    Browser.Request = function() {
+      return new CsrfMagic(Browser.csrf_Request());
+    };
+  }
+  if ( window.YAHOO ) {
+    // old YUI API
+    YAHOO.util.Connect.csrf_createXhrObject = YAHOO.util.Connect.createXhrObject;
+    YAHOO.util.Connect.createXhrObject = function(transaction) {
+      obj = YAHOO.util.Connect.csrf_createXhrObject(transaction);
+      obj.conn = new CsrfMagic(obj.conn);
+      return obj;
+    };
+  }
+  if ( window.Ext ) {
+    // Ext can use other js libraries as loaders, so it has to come last
+    // Ext's implementation is pretty identical to Yahoo's, but we duplicate
+    // it for comprehensiveness's sake.
+    Ext.lib.Ajax.csrf_createXhrObject = Ext.lib.Ajax.createXhrObject;
+    Ext.lib.Ajax.createXhrObject = function(transaction) {
+      obj = Ext.lib.Ajax.csrf_createXhrObject(transaction);
+      obj.conn = new CsrfMagic(obj.conn);
+      return obj;
+    };
+  }
+  if ( window.dojo ) {
+    // NOTE: this doesn't work with latest dojo
+    dojo.csrf__xhrObj = dojo._xhrObj;
+    dojo._xhrObj = function() {
+      return new CsrfMagic(dojo.csrf__xhrObj());
+    };
+  }
+};
diff --git a/web/skins/classic/views/js/export.js b/web/skins/classic/views/js/export.js
index 9dcd7bfeb..74e7d029b 100644
--- a/web/skins/classic/views/js/export.js
+++ b/web/skins/classic/views/js/export.js
@@ -47,13 +47,13 @@ function exportResponse(respObj, respText) {
   return;
 
   if ( 0 ) {
-  var eids = new Array();
-  for (var i = 0, len=form.elements.length; i < len; i++) {
-    if ( form.elements[i].name == 'eids[]' ) {
-      eids[eids.length] = 'eids[]='+form.elements[i].value;
+    var eids = new Array();
+    for (var i = 0, len=form.elements.length; i < len; i++) {
+      if ( form.elements[i].name == 'eids[]' ) {
+        eids[eids.length] = 'eids[]='+form.elements[i].value;
+      }
     }
   }
-  }
   form.submit();
 
   //window.location.replace( thisUrl+'?view='+currentView+'&'+eids.join('&')+'&exportFile='+respObj.exportFile+'&generated='+((respObj.result=='Ok')?1:0) );
diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js
index 8b5bf12e2..23d2f32ec 100644
--- a/web/skins/classic/views/js/montage.js
+++ b/web/skins/classic/views/js/montage.js
@@ -27,7 +27,7 @@ function Monitor(monitorData) {
 
   this.eventHandler = function( event ) {
     console.log(event);
-  }
+  };
 
   this.onclick = function(evt) {
     var el = evt.currentTarget;

From d579faa2913510e4a250d55cdea44606bed26fc0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 28 Mar 2019 15:13:53 -0400
Subject: [PATCH 132/214] attr in modern ZM should be StartWeekday.  Continue
 to support legacy filters

---
 scripts/ZoneMinder/lib/ZoneMinder/Filter.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
index ccace879a..a057f55d9 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
@@ -177,7 +177,7 @@ sub Sql {
             $self->{Sql} .= 'to_days( E.StartTime )';
           } elsif ( $term->{attr} eq 'Time' or $term->{attr} eq 'StartTime' ) {
             $self->{Sql} .= 'extract( hour_second from E.StartTime )';
-          } elsif ( $term->{attr} eq 'Weekday' ) {
+          } elsif ( $term->{attr} eq 'Weekday' or $term->{attr} eq 'StartWeekday' ) {
             $self->{Sql} .= 'weekday( E.StartTime )';
 
 # EndTIme options

From 8556e13504fd808cdd6974b9bbc27b205b1345bf Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Sat, 30 Mar 2019 08:16:46 -0500
Subject: [PATCH 133/214] Update zoneminder.spec

---
 distros/redhat/zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index 8f30d6fee..7112fd4c0 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -23,7 +23,7 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.33.0
+Version: 1.33.4
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
@@ -409,6 +409,9 @@ EOF
 %dir %attr(755,nginx,nginx) %{_localstatedir}/spool/zoneminder-upload
 
 %changelog
+* Sat Mar 30 2018 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.33.4-1
+- Bump tp 1.33.4 Development
+
 * Tue Dec 11 2018 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.33.0-1
 - Bump tp 1.33.0 Development
 

From e3caf38a72359911e46c448e0d7a45920c8b8337 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Sat, 30 Mar 2019 08:20:18 -0500
Subject: [PATCH 134/214] Update zoneminder.spec

---
 distros/redhat/zoneminder.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index 7112fd4c0..3678c2da0 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -409,7 +409,7 @@ EOF
 %dir %attr(755,nginx,nginx) %{_localstatedir}/spool/zoneminder-upload
 
 %changelog
-* Sat Mar 30 2018 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.33.4-1
+* Sat Mar 30 2019 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.33.4-1
 - Bump tp 1.33.4 Development
 
 * Tue Dec 11 2018 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.33.0-1

From 4e5ed682322d2b5bb24a3c7e9bd5c7f25946d912 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@hotmail.com>
Date: Sat, 30 Mar 2019 08:36:45 -0500
Subject: [PATCH 135/214] update redhat install guide

---
 docs/installationguide/redhat.rst | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/installationguide/redhat.rst b/docs/installationguide/redhat.rst
index 71b4f5278..5b5067058 100644
--- a/docs/installationguide/redhat.rst
+++ b/docs/installationguide/redhat.rst
@@ -158,7 +158,7 @@ The list of available Mock config files are available here:
     ls /etc/mock/*rpmfusion_free.cfg
 
 
-You choose the config file based on the desired distro (e.g. el6, el7, f20, f21) and basearch (e.g. x86, x86_64, arhmhfp). Notice that, when specifying the Mock config as a commandline parameter, you should leave off the ".cfg" filename extension.
+You choose the config file based on the desired distro (e.g. el7, f29, f30) and basearch (e.g. x86, x86_64, arhmhfp). Notice that, when specifying the Mock config as a commandline parameter, you should leave off the ".cfg" filename extension.
 
 Installation
 ************
@@ -188,8 +188,8 @@ Now clone the ZoneMinder git repository from your home folder:
 ::
 
     cd
-    git clone https://github.com/ZoneMinder/ZoneMinder
-    cd ZoneMinder
+    git clone https://github.com/ZoneMinder/zoneminder
+    cd zoneminder
 
 This will create a sub-folder called ZoneMinder, which will contain the latest development source code.
 
@@ -197,27 +197,27 @@ If you have previsouly cloned the ZoneMinder git repo and wish to update it to t
 
 ::
 
-    cd ~/ZoneMinder
+    cd ~/zoneminder
     git pull origin master
     
 Get the crud submodule tarball:
 
 ::
 
-    spectool -f -g -R -s 1 ~/ZoneMinder/distros/redhat/zoneminder.spec
+    spectool -f -g -R -s 1 ~/zoneminder/distros/redhat/zoneminder.spec
 
 At this point, you can make changes to the source code. Depending on what you want to do with those changes, you generally want to create a new branch first:
 
 ::
 
-    cd ~/ZoneMinder
+    cd ~/zoneminder
     git checkout -b mynewbranch
 
 Again, depending on what you want to do with those changes, you may want to commit your changes:
 
 ::
 
-    cd ~/ZoneMinder
+    cd ~/zoneminder
     git add .
     git commit
 
@@ -225,28 +225,28 @@ Once you have made your changes, it is time to turn your work into a new tarball
 
 ::
 
-    less ~/ZoneMinder/distros/redhat/zoneminder.spec
+    less ~/zoneminder/distros/redhat/zoneminder.spec
     
 Scroll down until you see the Version field. Note the value, which will be in the format x.xx.x. Now create the tarball with the following command:
 
 ::
 
-    cd ~/ZoneMinder
-    git archive --prefix=ZoneMinder-1.31.1/ -o ~/rpmbuild/SOURCES/zoneminder-1.31.1.tar.gz HEAD
+    cd ~/zoneminder
+    git archive --prefix=zoneminder-1.33.4/ -o ~/rpmbuild/SOURCES/zoneminder-1.33.4.tar.gz HEAD
 
-Replace "1.31.1" with the Version shown in the rpm specfile.
+Replace "1.33.4" with the Version shown in the rpm specfile.
 
 From the root of the local ZoneMinder git repo, execute the following:
 
 ::
 
-    cd ~/ZoneMinder
+    cd ~/zoneminder
     rpmbuild -bs --nodeps distros/redhat/zoneminder.spec
 
 This step will create a source rpm and it will tell you where it was saved. For example:
 
 ::
 
-    Wrote: /home/abauer/rpmbuild/SRPMS/zoneminder-1.31.1-1.fc26.src.rpm
+    Wrote: /home/abauer/rpmbuild/SRPMS/zoneminder-1.33.4-1.fc26.src.rpm
     
 Now follow the previous instructions `Build from SRPM`_ which describe how to build that source rpm into an rpm.

From 1d3617c1cf93dd2f3b33933963d9dbc76a8eb0ae Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Sat, 30 Mar 2019 08:43:46 -0500
Subject: [PATCH 136/214] Rem reference to AUTHORS since it no longer exists

---
 distros/redhat/zoneminder.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index 3678c2da0..980508cec 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -317,7 +317,7 @@ EOF
 
 %files common
 %license COPYING
-%doc AUTHORS README.md distros/redhat/readme/README distros/redhat/readme/README.httpd distros/redhat/readme/README.nginx distros/redhat/readme/README.https
+%doc README.md distros/redhat/readme/README distros/redhat/readme/README.httpd distros/redhat/readme/README.nginx distros/redhat/readme/README.https
 
 # We want these two folders to have "normal" read permission
 # compared to the folder contents

From 593f1571e32f39c568ac5ff482bbe860333db3db Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Sat, 30 Mar 2019 08:57:04 -0500
Subject: [PATCH 137/214] add zmrecover.pl to rpm specfile

---
 distros/redhat/zoneminder.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index 980508cec..1f0352fc4 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -352,6 +352,7 @@ EOF
 %{_bindir}/zmx10.pl
 %{_bindir}/zmonvif-probe.pl
 %{_bindir}/zmstats.pl
+%{_bindir}/zmrecover.pl
 
 %{perl_vendorlib}/ZoneMinder*
 %{perl_vendorlib}/ONVIF*

From e97751558fef6bf176de3bc72f40107095d80252 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@hotmail.com>
Date: Sat, 30 Mar 2019 10:41:04 -0500
Subject: [PATCH 138/214] eslint fix

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

diff --git a/web/skins/classic/views/js/monitor.js b/web/skins/classic/views/js/monitor.js
index 2ac4515a7..e0ca4f1d4 100644
--- a/web/skins/classic/views/js/monitor.js
+++ b/web/skins/classic/views/js/monitor.js
@@ -56,7 +56,7 @@ function initPage() {
       $j('#WebSwatch').css('background-color', event.target.value);
     };
   });
-  $j('#contentForm').submit(function(event){
+  $j('#contentForm').submit(function(event) {
     if ( validateForm(this) ) {
       $j('#contentButtons').hide();
       return true;

From fa9803d819ff1aca9ae916af8564d06b06b6c050 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 1 Apr 2019 10:11:56 -0400
Subject: [PATCH 139/214] Can't use this->data to avoid another db hit.  Must
 load by id

---
 web/api/app/Controller/EventsController.php |  2 +-
 web/api/app/Model/Event.php                 | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/web/api/app/Controller/EventsController.php b/web/api/app/Controller/EventsController.php
index 959ccc596..91a2de75c 100644
--- a/web/api/app/Controller/EventsController.php
+++ b/web/api/app/Controller/EventsController.php
@@ -142,7 +142,7 @@ class EventsController extends AppController {
       'event' => $event,
       '_serialize' => array('event')
     ));
-  }
+  } // end function view
 
 
   /**
diff --git a/web/api/app/Model/Event.php b/web/api/app/Model/Event.php
index 51e24052e..de83473f1 100644
--- a/web/api/app/Model/Event.php
+++ b/web/api/app/Model/Event.php
@@ -103,17 +103,17 @@ class Event extends AppModel {
   );
 
   public function Relative_Path() {
-    $Event = new ZM\Event($this->data);
+    $Event = new ZM\Event($this->id);
     return $Event->Relative_Path();
   } // end function Relative_Path()
 
-   public function Path() {
-    $Event = new ZM\Event($this->data);
+  public function Path() {
+    $Event = new ZM\Event($this->id);
     return $Event->Path();
   }
 
   public function Link_Path() {
-    $Event = new ZM\Event($this->data);
+    $Event = new ZM\Event($this->id);
     return $Event->Link_Path();
   }
 
@@ -123,20 +123,19 @@ class Event extends AppModel {
     $storage = $this->Storage->findById($event['StorageId']);
 
     if ( $event['DefaultVideo'] ) {
-      if ( file_exists($storage['Storage']['Path'].'/'.$this->Relative_Path().'/'.$event['DefaultVideo']) ) {
+      if ( file_exists($this->Path().'/'.$event['DefaultVideo']) ) {
         return 1;
       } else {
-        ZM\Logger::Debug("FIle does not exist at " . $storage['Storage']['Path'].'/'.$this->Relative_Path().'/'.$event['DefaultVideo'] );
+        ZM\Logger::Debug('File does not exist at ' . $this->Path().'/'.$event['DefaultVideo'] );
       }
     } else {
-      ZM\Logger::Debug("No DefaultVideo in Event" . $this->Event);
+      ZM\Logger::Debug('No DefaultVideo in Event' . $this->Event);
       return 0;
     }
   } // end function fileExists($event)
 
   public function fileSize($event) {
-    $storage = $this->Storage->findById($event['StorageId']);
-    return filesize($storage['Storage']['Path'].'/'.$this->Relative_Path($event).'/'.$event['DefaultVideo']);
+    return filesize($this->Path().'/'.$event['DefaultVideo']);
   }
 
   public function beforeDelete($cascade=true) {

From ed5a448a1df292aedb3bba3d94caaebcc074cefb Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 1 Apr 2019 11:13:14 -0400
Subject: [PATCH 140/214] Correct pts on audio frame before sending it to the
 encoder so that when we flush the encoder the resulting packets have the
 right pts.

---
 src/zm_videostore.cpp | 42 +++++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 5ae3404b7..d54e5c51f 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -435,11 +435,13 @@ VideoStore::~VideoStore() {
       pkt.data = NULL;
       pkt.size = 0;
       av_init_packet(&pkt);
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+      // Put encoder into flushing mode
+      avcodec_send_frame(audio_out_ctx, NULL);
+#endif
 
       while (1) {
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-        // Put encoder into flushing mode
-        avcodec_send_frame(audio_out_ctx, NULL);
         ret = avcodec_receive_packet(audio_out_ctx, &pkt);
         if ( ret < 0 ) {
           if ( AVERROR_EOF != ret ) {
@@ -450,8 +452,7 @@ VideoStore::~VideoStore() {
         }
 #else
         int got_packet = 0;
-        ret =
-          avcodec_encode_audio2(audio_out_ctx, &pkt, NULL, &got_packet);
+        ret = avcodec_encode_audio2(audio_out_ctx, &pkt, NULL, &got_packet);
         if ( ret < 0 ) {
           Error("Error encoding audio while flushing (%d) (%s)", ret,
               av_err2str(ret));
@@ -1056,8 +1057,27 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
   #endif
     zm_dump_frame(out_frame, "Out frame after resample");
 
-    av_init_packet(&opkt);
+    // out_frame pts is in the input pkt pts... needs to be adjusted before sending to the encoder
+    if ( ipkt->pts != AV_NOPTS_VALUE ) {
+      if ( !audio_first_pts ) {
+        out_frame->pts = 0;
+        audio_first_pts = ipkt->pts;
+        Debug(1, "No audio_first_pts");
+      } else {
+        out_frame->pts = av_rescale_q(
+            out_frame->pts - audio_first_pts,
+            audio_in_stream->time_base,
+            audio_out_stream->time_base);
+        Debug(2, "audio out_frame.pts = %d from ipkt->pts(%d) - first_pts(%d)",
+            out_frame->pts, ipkt->pts, audio_first_pts);
+      }
+    } else {
+      Debug(2, "out_frame.pts = undef");
+      out_frame->pts = AV_NOPTS_VALUE;
+    }
+    zm_dump_frame(out_frame, "Out frame after resample and pts adjustment");
 
+    av_init_packet(&opkt);
   #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
     if ( (ret = avcodec_send_frame(audio_out_ctx, out_frame)) < 0 ) {
       Error("Could not send frame (error '%s')",
@@ -1098,7 +1118,6 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
 #endif
   } else {
     av_init_packet(&opkt);
-    Debug(5, "after init packet");
     opkt.data = ipkt->data;
     opkt.size = ipkt->size;
   }
@@ -1123,7 +1142,6 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
 // out
 
 // Scale the PTS of the outgoing packet to be the correct time base
-#if 1
   if ( ipkt->pts != AV_NOPTS_VALUE ) {
     if ( !audio_first_pts ) {
       opkt.pts = 0;
@@ -1142,12 +1160,7 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
     Debug(2, "opkt.pts = undef");
     opkt.pts = AV_NOPTS_VALUE;
   }
-#else
-  opkt.pts = audio_next_pts;
-  opkt.dts = audio_next_dts;
-#endif
 
-#if 1
   if ( ipkt->dts != AV_NOPTS_VALUE ) {
     // So if the in has no dts assigned... still need an out dts... so we use cur_dts?
 
@@ -1174,8 +1187,6 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
   } else {
     opkt.dts = AV_NOPTS_VALUE;
   }
-#endif
-  // audio_last_dts = ipkt->dts;
   if ( opkt.dts > opkt.pts ) {
     Debug(1,
           "opkt.dts(%" PRId64 ") must be <= opkt.pts(%" PRId64 ")."
@@ -1185,9 +1196,6 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
   }
 
   dumpPacket(audio_out_stream, &opkt, "finished opkt");
-  // pkt.pos:  byte position in stream, -1 if unknown
-  //audio_next_dts = opkt.dts + opkt.duration;
-  //audio_next_pts = opkt.pts + opkt.duration;
 
   ret = av_interleaved_write_frame(oc, &opkt);
   if ( ret != 0 ) {

From 15fb546e15f833d9dbfc795ff29b593ec4568fa6 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 1 Apr 2019 11:13:35 -0400
Subject: [PATCH 141/214] spacing

---
 web/includes/Event.php | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/web/includes/Event.php b/web/includes/Event.php
index 627133659..ba4f04e8c 100644
--- a/web/includes/Event.php
+++ b/web/includes/Event.php
@@ -43,9 +43,9 @@ class Event {
     $row = NULL;
     if ( $IdOrRow ) {
       if ( is_integer($IdOrRow) or is_numeric($IdOrRow) ) {
-        $row = dbFetchOne('SELECT *,unix_timestamp(StartTime) as Time FROM Events WHERE Id=?', NULL, array($IdOrRow));
+        $row = dbFetchOne('SELECT *,unix_timestamp(StartTime) AS Time FROM Events WHERE Id=?', NULL, array($IdOrRow));
         if ( ! $row ) {
-          Error('Unable to load Event record for Id=' . $IdOrRow );
+          Error('Unable to load Event record for Id=' . $IdOrRow);
         }
       } elseif ( is_array($IdOrRow) ) {
         $row = $IdOrRow;
@@ -53,8 +53,7 @@ class Event {
         $backTrace = debug_backtrace();
         $file = $backTrace[1]['file'];
         $line = $backTrace[1]['line'];
-        Error("Unknown argument passed to Event Constructor from $file:$line)");
-        Error("Unknown argument passed to Event Constructor ($IdOrRow)");
+        Error("Unknown argument passed to Event Constructor from $file:$line) Id was $IdOrRow");
         return;
       }
 
@@ -95,11 +94,11 @@ class Event {
     return new Monitor();
   }
 
-  public function __call( $fn, array $args){
-  if ( count( $args )  ) {
+  public function __call($fn, array $args){
+  if ( count($args) ) {
       $this->{$fn} = $args[0];
     }
-    if ( array_key_exists( $fn, $this ) ) {
+    if ( array_key_exists($fn, $this) ) {
       return $this->{$fn};
         
       $backTrace = debug_backtrace();
@@ -109,7 +108,7 @@ class Event {
       $file = $backTrace[1]['file'];
       $line = $backTrace[1]['line'];
       Warning("Unknown function call Event->$fn from $file:$line");
-      Warning(print_r( $this, true ));
+      Warning(print_r($this, true));
     }
   }
 
@@ -125,7 +124,7 @@ class Event {
     if ( $Storage->Path() and $this->Relative_Path() ) {
       return $Storage->Path().'/'.$this->Relative_Path();
     } else {
-      Error("Event Path not complete. Storage: " . $Storage->Path() . " relative: " . $this->Relative_Path());
+      Error('Event Path not complete. Storage: '.$Storage->Path().' relative: '.$this->Relative_Path());
       return '';
     }
   }
@@ -134,11 +133,11 @@ class Event {
     $event_path = '';
 
     if ( $this->{'Scheme'} == 'Deep' ) {
-      $event_path = $this->{'MonitorId'} .'/'.strftime( '%y/%m/%d/%H/%M/%S', $this->Time()) ;
+      $event_path = $this->{'MonitorId'}.'/'.strftime('%y/%m/%d/%H/%M/%S', $this->Time());
     } else if ( $this->{'Scheme'} == 'Medium' ) {
-      $event_path = $this->{'MonitorId'} .'/'.strftime( '%Y-%m-%d', $this->Time() ) . '/'.$this->{'Id'};
+      $event_path = $this->{'MonitorId'}.'/'.strftime('%Y-%m-%d', $this->Time()).'/'.$this->{'Id'};
     } else {
-      $event_path = $this->{'MonitorId'} .'/'.$this->{'Id'};
+      $event_path = $this->{'MonitorId'}.'/'.$this->{'Id'};
     }
 
     return $event_path;
@@ -146,7 +145,7 @@ class Event {
 
   public function Link_Path() {
     if ( $this->{'Scheme'} == 'Deep' ) {
-      return $this->{'MonitorId'} .'/'.strftime( '%y/%m/%d/.', $this->Time()).$this->{'Id'};
+      return $this->{'MonitorId'}.'/'.strftime('%y/%m/%d/.', $this->Time()).$this->{'Id'};
     }
     Error('Calling Link_Path when not using deep storage');
     return '';
@@ -173,7 +172,7 @@ class Event {
 # So this is because ZM creates a link under the day pointing to the time that the event happened. 
         $link_path = $this->Link_Path();
         if ( ! $link_path ) {
-          Error('Unable to determine link path for event ' . $this->{'Id'} . ' not deleting files.');
+          Error('Unable to determine link path for event '.$this->{'Id'}.' not deleting files.');
           return;
         }
         
@@ -186,7 +185,7 @@ class Event {
             return;
           }
 # I know we are using arrays here, but really there can only ever be 1 in the array
-          $eventPath = preg_replace( '/\.'.$this->{'Id'}.'$/', $eventPath, $id_files[0] );
+          $eventPath = preg_replace('/\.'.$this->{'Id'}.'$/', $eventPath, $id_files[0]);
           deletePath($eventPath);
           deletePath($id_files[0]);
           $pathParts = explode('/', $eventPath);
@@ -202,7 +201,7 @@ class Event {
       } else {
         $eventPath = $this->Path();
         if ( ! $eventPath ) {
-          Error("No event Path in Event delete. Not deleting");
+          Error('No event Path in Event delete. Not deleting');
           return;
         }
         deletePath($eventPath);
@@ -581,8 +580,8 @@ class Event {
     if ( file_exists( $this->Path().'/'.$this->DefaultVideo() ) ) {
       return true;
     }
-      $Storage= $this->Storage();
-      $Server = $Storage->ServerId() ? $Storage->Server() : $this->Monitor()->Server();
+    $Storage= $this->Storage();
+    $Server = $Storage->ServerId() ? $Storage->Server() : $this->Monitor()->Server();
     if ( $Server->Id() != ZM_SERVER_ID ) {
 
       $url = $Server->UrlToApi() . '/events/'.$this->{'Id'}.'.json';
@@ -649,14 +648,14 @@ class Event {
             'content' => ''
             )
           );
-      $context  = stream_context_create($options);
+      $context = stream_context_create($options);
       try {
         $result = file_get_contents($url, false, $context);
-        if ($result === FALSE) { /* Handle error */
+        if ( $result === FALSE ) { /* Handle error */
           Error("Error restarting zmc using $url");
         }
         $event_data = json_decode($result,true);
-        Logger::Debug(print_r($event_data['event']['Event'],1));
+        Logger::Debug(print_r($event_data['event']['Event'], 1));
         return $event_data['event']['Event']['fileSize'];
       } catch ( Exception $e ) {
         Error("Except $e thrown trying to get event data");

From c9985107ee45fac584a4be0e1414396a50e4c75e Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Mon, 1 Apr 2019 13:38:13 -0400
Subject: [PATCH 142/214] Add a deinit function to handle
 avformat_network_deinit

---
 src/zm_ffmpeg.cpp | 8 +++++++-
 src/zm_ffmpeg.h   | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/zm_ffmpeg.cpp b/src/zm_ffmpeg.cpp
index b22ca6df5..5efbdb07a 100644
--- a/src/zm_ffmpeg.cpp
+++ b/src/zm_ffmpeg.cpp
@@ -65,8 +65,9 @@ void log_libav_callback( void *ptr, int level, const char *fmt, va_list vargs )
   }
 }
 
+static bool bInit = false;
+
 void FFMPEGInit() {
-  static bool bInit = false;
 
   if ( !bInit ) {
     if ( logDebugging() )
@@ -86,6 +87,11 @@ void FFMPEGInit() {
   }
 }
 
+void FFMPEGDeInit() {
+  avformat_network_deinit();
+  bInit = false;
+}
+
 #if HAVE_LIBAVUTIL
 enum _AVPIXELFORMAT GetFFMPEGPixelFormat(unsigned int p_colours, unsigned p_subpixelorder) {
   enum _AVPIXELFORMAT pf;
diff --git a/src/zm_ffmpeg.h b/src/zm_ffmpeg.h
index 383de6af3..a4d984dec 100644
--- a/src/zm_ffmpeg.h
+++ b/src/zm_ffmpeg.h
@@ -199,6 +199,7 @@ extern "C" {
 
 /* A single function to initialize ffmpeg, to avoid multiple initializations */		
 void FFMPEGInit();
+void FFMPEGDeInit();
 
 #if HAVE_LIBAVUTIL
 enum _AVPIXELFORMAT GetFFMPEGPixelFormat(unsigned int p_colours, unsigned p_subpixelorder);

From a6998cbc9ebe4fff07484c0b60033446a708d8b4 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Mon, 1 Apr 2019 13:39:11 -0400
Subject: [PATCH 143/214] Use FFMPEGDeInit instead of avformat_network_deinit

---
 src/zm_ffmpeg_camera.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index 5da4c0dc4..18ef7da12 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -168,7 +168,7 @@ FfmpegCamera::~FfmpegCamera() {
   if ( capture ) {
     Terminate();
   }
-  avformat_network_deinit();
+  FFMPEGDeInit();
 }
 
 void FfmpegCamera::Initialise() {
@@ -1034,7 +1034,7 @@ int FfmpegCamera::CaptureAndRecord( Image &image, timeval recording, char* event
 
 int FfmpegCamera::FfmpegInterruptCallback(void *ctx) {
   //FfmpegCamera* camera = reinterpret_cast<FfmpegCamera*>(ctx);
-  Debug(4, "FfmpegInterruptCallback");
+  //Debug(4, "FfmpegInterruptCallback");
   return zm_terminate;
 }
 

From cb33318c4ac53ee472a07d2847731da640cab64d Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Mon, 1 Apr 2019 14:02:39 -0400
Subject: [PATCH 144/214] fix invalid memory access due to incorrect
 opening/closing/copying of contexts

---
 src/zm_videostore.cpp | 59 +++++++++++++++++++++++++++----------------
 src/zm_videostore.h   | 17 ++++++++-----
 2 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 5ae3404b7..4e0ee2eee 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -81,7 +81,7 @@ VideoStore::VideoStore(
           filename, format);
       return;
     } else {
-      Debug(4, "Success alocateing out ctx");
+      Debug(4, "Success allocating out ctx");
     }
   }  // end if ! oc
 
@@ -94,7 +94,7 @@ VideoStore::VideoStore(
   out_format = oc->oformat;
 
 
-  AVCodec *video_out_codec = avcodec_find_encoder(video_in_ctx->codec_id);
+  video_out_codec = avcodec_find_encoder(video_in_ctx->codec_id);
   if ( !video_out_codec ) {
 #if (LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 11, 0) && (LIBAVFORMAT_VERSION_MICRO >= 100))
     Fatal("Could not find encoder for '%s'", avcodec_get_name(video_out_ctx->codec_id));
@@ -112,9 +112,8 @@ VideoStore::VideoStore(
   }
 
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-  //video_out_stream->codec = avcodec_alloc_context3(video_out_codec);
-  // Since we are not re-encoding, all we have to do is copy the parameters
   video_out_ctx = avcodec_alloc_context3(video_out_codec);
+  // Since we are not re-encoding, all we have to do is copy the parameters
   // Copy params from instream to ctx
   ret = avcodec_parameters_to_context(video_out_ctx, video_in_stream->codecpar);
   if ( ret < 0 ) {
@@ -230,7 +229,6 @@ VideoStore::VideoStore(
 #endif
   }
 
-
   AVDictionary *opts = 0;
   if ( (ret = avcodec_open2(video_out_ctx, video_out_codec, &opts)) < 0 ) {
     Warning("Can't open video codec (%s) %s",
@@ -278,16 +276,14 @@ VideoStore::VideoStore(
 
   if ( audio_in_stream ) {
     Debug(3, "Have audio stream");
-#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-    audio_in_ctx = avcodec_alloc_context3(NULL);
-    ret = avcodec_parameters_to_context(audio_in_ctx,
-                                        audio_in_stream->codecpar);
-    audio_in_ctx->time_base = audio_in_stream->time_base;
-#else
-    audio_in_ctx = audio_in_stream->codec;
-#endif
 
-    if ( audio_in_ctx->codec_id != AV_CODEC_ID_AAC ) {
+    if (
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+        audio_in_stream->codecpar->codec_id
+#else
+        audio_in_stream->codec->codec_id
+#endif
+        != AV_CODEC_ID_AAC ) {
       static char error_buffer[256];
       avcodec_string(error_buffer, sizeof(error_buffer), audio_in_ctx, 0);
       Debug(2, "Got something other than AAC (%s)", error_buffer);
@@ -298,6 +294,15 @@ VideoStore::VideoStore(
     } else {
       Debug(2, "Got AAC");
 
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+      audio_in_ctx = avcodec_alloc_context3(NULL);
+      ret = avcodec_parameters_to_context(audio_in_ctx,
+          audio_in_stream->codecpar);
+      audio_in_ctx->time_base = audio_in_stream->time_base;
+#else
+      audio_in_ctx = audio_in_stream->codec;
+#endif
+
       audio_out_stream =
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
           avformat_new_stream(oc, (const AVCodec *)(audio_in_ctx->codec));
@@ -506,30 +511,39 @@ VideoStore::~VideoStore() {
 #endif
     video_in_ctx = NULL;
 
+    if ( video_out_codec ) {
+      avcodec_close(video_out_ctx);
+      Debug(4, "Success closing video_out_ctx");
+      video_out_codec = NULL;
+    } // end if video_out_codec
     avcodec_close(video_out_ctx);
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-    //avcodec_free_context(&video_out_ctx);
+    avcodec_free_context(&video_out_ctx);
 #endif
     video_out_ctx = NULL;
-    Debug(4, "Success freeing video_out_ctx");
   } // end if video_out_stream
 
   if ( audio_out_stream ) {
     if ( audio_in_codec ) {
       avcodec_close(audio_in_ctx);
+      Debug(4, "Success closing audio_in_ctx");
       audio_in_codec = NULL;
     } // end if audio_in_codec
 
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
     // We allocate and copy in newer ffmpeg, so need to free it
     avcodec_free_context(&audio_in_ctx);
+    Debug(4, "Success freeing audio_in_ctx");
 #endif
     audio_in_ctx = NULL;
 
-    avcodec_close(audio_out_ctx);
+    if ( audio_out_ctx ) {
+      avcodec_close(audio_out_ctx);
+      Debug(4, "Success closing audio_out_ctx");
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-    avcodec_free_context(&audio_out_ctx);
+      avcodec_free_context(&audio_out_ctx);
 #endif
+    }
     audio_out_ctx = NULL;
 #if defined(HAVE_LIBAVRESAMPLE) || defined(HAVE_LIBSWRESAMPLE)
     if ( resample_ctx ) {
@@ -579,8 +593,11 @@ bool VideoStore::setup_resampler() {
   audio_in_codec =
       avcodec_find_decoder(audio_in_stream->codecpar->codec_id);
 #else
-  audio_in_codec = avcodec_find_decoder(audio_in_ctx->codec_id);
+// codec is already open in ffmpeg_camera
+  audio_in_codec = avcodec_find_decoder(audio_in_stream->codec->codec_id);
 #endif
+  audio_in_ctx = avcodec_alloc_context3(audio_in_codec);
+
   if ( (ret = avcodec_open2(audio_in_ctx, audio_in_codec, NULL)) < 0 ) {
     Error("Can't open in codec!");
     return false;
@@ -592,6 +609,7 @@ bool VideoStore::setup_resampler() {
     return false;
   }
 
+  audio_out_stream = avformat_new_stream(oc, audio_out_codec);
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
   // audio_out_ctx = audio_out_stream->codec;
   audio_out_ctx = avcodec_alloc_context3(audio_out_codec);
@@ -600,10 +618,7 @@ bool VideoStore::setup_resampler() {
     audio_out_stream = NULL;
     return false;
   }
-
-  audio_out_stream = avformat_new_stream(oc, audio_out_codec);
 #else 
-  audio_out_stream = avformat_new_stream(oc, NULL);
   audio_out_ctx = audio_out_stream->codec;
 #endif
   // Some formats (i.e. WAV) do not produce the proper channel layout
diff --git a/src/zm_videostore.h b/src/zm_videostore.h
index 08cf01a42..1fe3fe81b 100644
--- a/src/zm_videostore.h
+++ b/src/zm_videostore.h
@@ -20,14 +20,16 @@ extern "C"  {
 class VideoStore {
 private:
 
-	AVOutputFormat *out_format;
-	AVFormatContext *oc;
-	AVStream *video_out_stream;
-	AVStream *audio_out_stream;
-  AVCodecContext *video_out_ctx;
+  AVOutputFormat *out_format;
+  AVFormatContext *oc;
 
-	AVStream *video_in_stream;
-	AVStream *audio_in_stream;
+  AVCodec *video_out_codec;
+  AVCodecContext *video_out_ctx;
+  AVStream *video_out_stream;
+
+  AVStream *video_in_stream;
+
+  AVStream *audio_in_stream;
 
   // Move this into the object so that we aren't constantly allocating/deallocating it on the stack
   AVPacket opkt;
@@ -41,6 +43,7 @@ private:
   int ret;
 
   // The following are used when encoding the audio stream to AAC
+  AVStream *audio_out_stream;
   AVCodec *audio_out_codec;
   AVCodecContext *audio_out_ctx;
 #ifdef HAVE_LIBSWRESAMPLE

From 110e5075f442e13160700126658095af2e2f4f49 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 1 Apr 2019 17:21:01 -0400
Subject: [PATCH 145/214] fix namespace fixes #3566

---
 web/api/app/Controller/MonitorsController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/api/app/Controller/MonitorsController.php b/web/api/app/Controller/MonitorsController.php
index 21ccf59ef..f83aecf97 100644
--- a/web/api/app/Controller/MonitorsController.php
+++ b/web/api/app/Controller/MonitorsController.php
@@ -182,7 +182,7 @@ class MonitorsController extends AppController {
         )
       ) {
         if ( !defined('ZM_SERVER_ID')) {
-          Logger::Debug("Not defined ZM_SERVER_ID");
+          ZM\Logger::Debug("Not defined ZM_SERVER_ID");
         }
         $this->daemonControl($this->Monitor->id, 'start');
       }
@@ -387,7 +387,7 @@ class MonitorsController extends AppController {
       }
 
       $shellcmd = escapeshellcmd("$zm_path_bin/zmdc.pl $command $daemon $args");
-      Logger::Debug("Command $shellcmd");
+      ZM\Logger::Debug("Command $shellcmd");
       $status = exec($shellcmd);
       $status_text .= $status."\n";
     }

From 2bb15c4f9033452b81dd4a74b7a6f45ccf4ecf26 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Mon, 1 Apr 2019 17:26:24 -0400
Subject: [PATCH 146/214] daemonize zmcontrol (#2563)

---
 scripts/zmcontrol.pl.in | 12 +++++++-----
 scripts/zmdc.pl.in      |  1 +
 scripts/zmpkg.pl.in     | 19 +++++++++++--------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/scripts/zmcontrol.pl.in b/scripts/zmcontrol.pl.in
index 7d7053335..b0388bcf3 100644
--- a/scripts/zmcontrol.pl.in
+++ b/scripts/zmcontrol.pl.in
@@ -63,8 +63,8 @@ GetOptions(
   'autostop'      =>\$options{autostop},
 ) or pod2usage(-exitstatus => -1);
 
-if ( !$id || !$options{command} ) {
-  print( STDERR "Please give a valid monitor id and command\n" );
+if ( !$id ) {
+  print( STDERR "Please give a valid monitor id\n" );
   pod2usage(-exitstatus => -1);
 }
 
@@ -201,8 +201,10 @@ if ( !$server_up ) {
 #print( "Writing commands\n" );
 CLIENT->autoflush();
 
-my $message = jsonEncode(\%options);
-print(CLIENT $message);
+if ( $options{command} ) {
+  my $message = jsonEncode(\%options);
+  print(CLIENT $message);
+}
 shutdown(CLIENT, 1);
 
 exit(0);
@@ -216,7 +218,7 @@ zmcontrol.pl - ZoneMinder control script
 
 =head1 SYNOPSIS
 
- zmcontrol.pl --id {monitor_id} --command={command} [various options]
+ zmcontrol.pl --id {monitor_id} [--command={command}] [various options]
 
 =head1 DESCRIPTION
 
diff --git a/scripts/zmdc.pl.in b/scripts/zmdc.pl.in
index 67bbc294b..744164f3d 100644
--- a/scripts/zmdc.pl.in
+++ b/scripts/zmdc.pl.in
@@ -101,6 +101,7 @@ my @daemons = (
     'zmupdate.pl',
     'zmstats.pl',
     'zmtrack.pl',
+    'zmcontrol.pl',
     'zmtelemetry.pl'
     );
 
diff --git a/scripts/zmpkg.pl.in b/scripts/zmpkg.pl.in
index 5463c6153..3f6e18fa1 100644
--- a/scripts/zmpkg.pl.in
+++ b/scripts/zmpkg.pl.in
@@ -220,14 +220,17 @@ if ( $command =~ /^(?:start|restart)$/ ) {
             runCommand("zmdc.pl start zma -m $monitor->{Id}");
           }
           if ( $Config{ZM_OPT_CONTROL} ) {
-            if ( $monitor->{Controllable} && $monitor->{TrackMotion} ) {
-              if ( $monitor->{Function} eq 'Modect' || $monitor->{Function} eq 'Mocord' ) {
-                runCommand("zmdc.pl start zmtrack.pl -m $monitor->{Id}");
-              } else {
-                Warning('Monitor is set to track motion, but does not have motion detection enabled.');
-              } # end if Has motion enabled
-            } # end if track motion
-          } # end if ZM_OPT_CONTROL
+            if ( $monitor->{Controllable} ) {
+              runCommand("zmdc.pl start zmcontrol.pl --id $monitor->{Id}");
+              if ( $monitor->{TrackMotion} ) {
+                if ( $monitor->{Function} eq 'Modect' || $monitor->{Function} eq 'Mocord' ) {
+                  runCommand("zmdc.pl start zmtrack.pl -m $monitor->{Id}");
+                } else {
+                  Warning('Monitor is set to track motion, but does not have motion detection enabled.');
+                } # end if Has motion enabled
+              } # end if track motion
+            } # end if controllable
+          } # end if ZM_OPT_CONTROL        
         } # end if function is not none or Website
       } # end foreach monitor
       $sth->finish();

From d5402e9cba0b0340b467fb485b99bfc77fefb78e Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Mon, 1 Apr 2019 22:09:47 -0400
Subject: [PATCH 147/214] Correct Storaage Server name in list

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

diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php
index 6de1ab6d1..f262dc4ad 100644
--- a/web/skins/classic/views/options.php
+++ b/web/skins/classic/views/options.php
@@ -297,7 +297,7 @@ foreach ( array_map('basename', glob('skins/'.$current_skin.'/css/*',GLOB_ONLYDI
               <td class="colType"><?php echo makePopupLink('?view=storage&amp;id='.$Storage->Id(), 'zmStorage', 'storage', validHtmlStr($Storage->Type()), $canEdit ) ?></td>
               <td class="colScheme"><?php echo makePopupLink('?view=storage&amp;id='.$Storage->Id(), 'zmStorage', 'storage', validHtmlStr($Storage->Scheme()), $canEdit ) ?></td>
               <td class="colServer"><?php
-              echo makePopupLink('?view=storage&amp;id='.$Storage->Id(), 'zmStorage', 'storage', validHtmlStr($Storage->Name()), $canEdit ) ?></td>
+              echo makePopupLink('?view=storage&amp;id='.$Storage->Id(), 'zmStorage', 'storage', validHtmlStr($Storage->Server()->Name()), $canEdit ) ?></td>
               <td class="colDiskSpace"><?php echo human_filesize($Storage->disk_used_space()) . ' of ' . human_filesize($Storage->disk_total_space()) ?></td>
               <td class="colMark"><input type="checkbox" name="markIds[]" value="<?php echo $Storage->Id() ?>" data-on-click-this="configureDeleteButton"<?php if ( !$canEdit ) { ?> disabled="disabled"<?php } ?>/></td>
             </tr>

From 3ab1c9983a7c91db0890e93fa496b3c7127c413f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 2 Apr 2019 09:05:52 -0400
Subject: [PATCH 148/214] Update Controls INSERTS to match new column count. 
 Add a db update script to update the Controls table with the new CanReboot
 column

---
 db/zm_create.sql.in     | 80 ++++++++++++++++++++---------------------
 db/zm_update-1.33.5.sql | 12 +++++++
 version                 |  2 +-
 3 files changed, 53 insertions(+), 41 deletions(-)
 create mode 100644 db/zm_update-1.33.5.sql

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 53a6a13af..1eaca832b 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -752,46 +752,46 @@ insert into Filters values (NULL,'Update DiskSpace','{"terms":[{"attr":"DiskSpac
 --
 -- Add in some sample control protocol definitions
 --
-INSERT INTO Controls VALUES (NULL,'Pelco-D','Local','PelcoD',1,1,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
-INSERT INTO Controls VALUES (NULL,'Pelco-P','Local','PelcoP',1,1,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
-INSERT INTO Controls VALUES (NULL,'Sony VISCA','Local','Visca',1,1,0,1,0,0,0,1,0,16384,10,4000,1,1,6,1,1,1,0,1,0,1536,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,3,1,1,1,1,0,1,1,0,1,-15578,15578,100,10000,1,1,50,1,254,1,-7789,7789,100,5000,1,1,50,1,254,0,0);
-INSERT INTO Controls VALUES (NULL,'Axis API v2','Remote','AxisV2',0,0,0,1,0,0,1,0,0,9999,10,2500,0,NULL,NULL,1,1,0,1,0,0,9999,10,2500,0,NULL,NULL,1,1,0,1,0,0,9999,10,2500,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,12,1,1,1,1,1,0,1,0,1,-360,360,1,90,0,NULL,NULL,0,NULL,1,-360,360,1,90,0,NULL,NULL,0,NULL,0,0);
-INSERT INTO Controls VALUES (NULL,'Panasonic IP','Remote','PanasonicIP',0,0,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,8,1,1,1,0,1,0,0,1,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
-INSERT INTO Controls VALUES (NULL,'Neu-Fusion NCS370','Remote','Ncs370',0,0,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,24,1,0,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
-INSERT INTO Controls VALUES (NULL,'AirLink SkyIPCam 7xx','Remote','SkyIPCam7xx',0,0,1,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,8,1,1,1,0,1,0,1,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
-INSERT INTO Controls VALUES (NULL,'Pelco-D','Ffmpeg','PelcoD',1,1,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
-INSERT INTO Controls VALUES (NULL,'Pelco-P','Ffmpeg','PelcoP',1,1,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
-INSERT INTO Controls VALUES (NULL,'Foscam FI8620','Ffmpeg','FI8620_Y2k',0,0,0,1,0,0,0,1,1,10,1,10,1,1,63,1,1,0,0,1,1,63,1,63,1,1,63,1,1,0,0,1,0,0,0,0,1,0,255,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,255,1,8,0,1,1,1,0,0,0,1,1,1,360,1,360,1,1,63,0,0,1,1,90,1,90,1,1,63,0,0,0,0);
-INSERT INTO Controls VALUES (NULL,'Foscam FI8608W','Ffmpeg','FI8608W_Y2k',1,0,1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,255,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,255,1,8,0,1,1,1,0,0,0,1,1,0,0,0,0,1,1,128,0,0,1,0,0,0,0,1,1,128,0,0,0,0);
-INSERT INTO Controls VALUES (NULL,'Foscam FI8908W','Remote','FI8908W',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO Controls VALUES (NULL,'Foscam FI9821W','Ffmpeg','FI9821W_Y2k',1,0,1,1,0,0,0,1,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,100,1,1,0,0,1,0,100,0,100,1,0,100,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,100,0,100,1,0,100,1,16,0,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,1,0,4,0,0,0,0);
-INSERT INTO Controls VALUES (NULL,'Loftek Sentinel','Remote','LoftekSentinel',0,0,1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,255,16,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,6,1,1,0,0,0,1,10,0,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO Controls VALUES (NULL,'Toshiba IK-WB11A','Remote','Toshiba_IK_WB11A',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,10,0,1,1,0,1,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO Controls VALUES (NULL,'WanscamPT','Remote','Wanscam',1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,16,0,0,0,0,0,1,16,1,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO Controls VALUES (NULL,'3S Domo N5071', 'Remote', '3S', 0, 0, 1, 1, 0, 1, 1, 0, 0, 9999, 0, 9999, 0, 0, 0, 1, 1, 1, 1, 0, 0, 9999, 20, 9999, 0, 0, 0, 1, 1, 1, 1, 0, 0, 9999, 1, 9999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 64, 1, 0, 1, 1, 0, 0, 0, 0, 1, -180, 180, 40, 100, 1, 40, 100, 0, 0, 1, -180, 180, 40, 100, 1, 40, 100, 0, 0, 0, 0);
-INSERT INTO Controls VALUES (NULL,'ONVIF Camera','Ffmpeg','onvif',0,0,1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,255,16,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,6,1,1,0,0,0,1,10,0,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Foscam 9831W','Ffmpeg','FI9831W',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,16,1,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Foscam FI8918W','Ffmpeg','FI8918W',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,8,0,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,1,0,4,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'SunEyes SP-P1802SWPTZ','Libvlc','SPP1802SWPTZ',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,8,0,1,1,0,0,0,0,1,1,0,0,0,0,1,0,64,0,0,1,0,0,0,0,1,0,64,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Wanscam HW0025','Libvlc','WanscamHW0025', 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 16, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 350, 0, 0, 1, 0, 10, 0, 0, 1, 0, 0, 0, 0, 1, 0, 10, 0, 0, 0, 0);
-INSERT INTO `Controls` VALUES (NULL,'IPCC 7210W','Remote','IPCC7210W', 1, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 16, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-INSERT INTO `Controls` VALUES (NULL,'Vivotek ePTZ','Remote','Vivotek_ePTZ',0,0,1,1,0,0,0,1,0,0,0,0,1,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,1,0,0,0,0,1,0,5,0,0,1,0,0,0,0,1,0,5,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Netcat ONVIF','Ffmpeg','Netcat',0,0,1,1,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,100,5,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,100,5,5,0,0,0,1,255,1,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Keekoon','Remote','Keekoon', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 6, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-INSERT INTO `Controls` VALUES (NULL,'HikVision','Local','',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,20,1,1,1,1,0,0,0,1,1,0,0,0,0,1,1,100,0,0,1,0,0,0,0,1,1,100,1,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Maginon Supra IPC','cURL','MaginonIPC',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,4,0,1,1,1,0,0,1,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Floureon 1080P','Ffmpeg','Floureon',0,0,0,1,0,0,0,1,1,18,1,1,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,20,0,1,1,1,0,0,0,1,1,0,0,0,0,1,1,8,0,0,1,0,0,0,0,1,1,8,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Reolink RLC-423','Ffmpeg','Reolink',0,0,1,1,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,64,1,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Reolink RLC-411','Ffmpeg','Reolink',0,0,1,1,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Reolink RLC-420','Ffmpeg','Reolink',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'D-LINK DCS-3415','Remote','DCS3415',0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'IOS Camera','Ffmpeg','IPCAMIOS',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,1,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Dericam P2','Ffmpeg','DericamP2',0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,10,0,1,1,1,0,0,0,1,1,0,0,0,0,1,1,45,0,0,1,0,0,0,0,1,1,45,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Trendnet','Remote','Trendnet',1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'PSIA','Remote','PSIA',0,0,0,1,0,0,1,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,20,0,1,1,1,0,0,1,0,1,0,0,0,0,1,-100,100,0,0,1,0,0,0,0,1,-100,100,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Dahua','Remote','Dahua',0,0,0,1,0,0,1,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,20,0,1,1,1,0,0,1,0,1,0,0,0,0,1,1,8,0,0,1,0,0,0,0,1,1,8,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'FOSCAMR2C','Libvlc','FOSCAMR2C',1,1,1,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,12,0,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,4,0,NULL,1,NULL,NULL,NULL,NULL,1,0,4,0,NULL,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Amcrest HTTP API','Ffmpeg','Amcrest_HTTP',0,0,1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,5,0,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,5);
+INSERT INTO Controls VALUES (NULL,'Pelco-D','Local','PelcoD',1,1,0,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
+INSERT INTO Controls VALUES (NULL,'Pelco-P','Local','PelcoP',1,1,0,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
+INSERT INTO Controls VALUES (NULL,'Sony VISCA','Local','Visca',1,1,0,0,1,0,0,0,1,0,16384,10,4000,1,1,6,1,1,1,0,1,0,1536,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,3,1,1,1,1,0,1,1,0,1,-15578,15578,100,10000,1,1,50,1,254,1,-7789,7789,100,5000,1,1,50,1,254,0,0);
+INSERT INTO Controls VALUES (NULL,'Axis API v2','Remote','AxisV2',0,0,0,0,1,0,0,1,0,0,9999,10,2500,0,NULL,NULL,1,1,0,1,0,0,9999,10,2500,0,NULL,NULL,1,1,0,1,0,0,9999,10,2500,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,12,1,1,1,1,1,0,1,0,1,-360,360,1,90,0,NULL,NULL,0,NULL,1,-360,360,1,90,0,NULL,NULL,0,NULL,0,0);
+INSERT INTO Controls VALUES (NULL,'Panasonic IP','Remote','PanasonicIP',0,0,0,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,8,1,1,1,0,1,0,0,1,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
+INSERT INTO Controls VALUES (NULL,'Neu-Fusion NCS370','Remote','Ncs370',0,0,0,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,24,1,0,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
+INSERT INTO Controls VALUES (NULL,'AirLink SkyIPCam 7xx','Remote','SkyIPCam7xx',0,0,1,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,8,1,1,1,0,1,0,1,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
+INSERT INTO Controls VALUES (NULL,'Pelco-D','Ffmpeg','PelcoD',1,1,0,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
+INSERT INTO Controls VALUES (NULL,'Pelco-P','Ffmpeg','PelcoP',1,1,0,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
+INSERT INTO Controls VALUES (NULL,'Foscam FI8620','Ffmpeg','FI8620_Y2k',0,0,0,0,1,0,0,0,1,1,10,1,10,1,1,63,1,1,0,0,1,1,63,1,63,1,1,63,1,1,0,0,1,0,0,0,0,1,0,255,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,255,1,8,0,1,1,1,0,0,0,1,1,1,360,1,360,1,1,63,0,0,1,1,90,1,90,1,1,63,0,0,0,0);
+INSERT INTO Controls VALUES (NULL,'Foscam FI8608W','Ffmpeg','FI8608W_Y2k',1,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,255,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,255,1,8,0,1,1,1,0,0,0,1,1,0,0,0,0,1,1,128,0,0,1,0,0,0,0,1,1,128,0,0,0,0);
+INSERT INTO Controls VALUES (NULL,'Foscam FI8908W','Remote','FI8908W',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO Controls VALUES (NULL,'Foscam FI9821W','Ffmpeg','FI9821W_Y2k',1,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,100,1,1,0,0,1,0,100,0,100,1,0,100,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,100,0,100,1,0,100,1,16,0,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,1,0,4,0,0,0,0);
+INSERT INTO Controls VALUES (NULL,'Loftek Sentinel','Remote','LoftekSentinel',0,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,255,16,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,6,1,1,0,0,0,1,10,0,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO Controls VALUES (NULL,'Toshiba IK-WB11A','Remote','Toshiba_IK_WB11A',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,10,0,1,1,0,1,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO Controls VALUES (NULL,'WanscamPT','Remote','Wanscam',1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,16,0,0,0,0,0,1,16,1,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO Controls VALUES (NULL,'3S Domo N5071', 'Remote', '3S', 0, 0, 1, 0,1, 0, 1, 1, 0, 0, 9999, 0, 9999, 0, 0, 0, 1, 1, 1, 1, 0, 0, 9999, 20, 9999, 0, 0, 0, 1, 1, 1, 1, 0, 0, 9999, 1, 9999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 64, 1, 0, 1, 1, 0, 0, 0, 0, 1, -180, 180, 40, 100, 1, 40, 100, 0, 0, 1, -180, 180, 40, 100, 1, 40, 100, 0, 0, 0, 0);
+INSERT INTO Controls VALUES (NULL,'ONVIF Camera','Ffmpeg','onvif',0,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,255,16,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,6,1,1,0,0,0,1,10,0,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Foscam 9831W','Ffmpeg','FI9831W',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,16,1,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Foscam FI8918W','Ffmpeg','FI8918W',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,8,0,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,1,0,4,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'SunEyes SP-P1802SWPTZ','Libvlc','SPP1802SWPTZ',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,8,0,1,1,0,0,0,0,1,1,0,0,0,0,1,0,64,0,0,1,0,0,0,0,1,0,64,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Wanscam HW0025','Libvlc','WanscamHW0025', 1, 1, 1, 0,1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 16, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 350, 0, 0, 1, 0, 10, 0, 0, 1, 0, 0, 0, 0, 1, 0, 10, 0, 0, 0, 0);
+INSERT INTO `Controls` VALUES (NULL,'IPCC 7210W','Remote','IPCC7210W', 1, 1, 1, 0,1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 16, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+INSERT INTO `Controls` VALUES (NULL,'Vivotek ePTZ','Remote','Vivotek_ePTZ',0,0,1,0,1,0,0,0,1,0,0,0,0,1,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,1,0,0,0,0,1,0,5,0,0,1,0,0,0,0,1,0,5,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Netcat ONVIF','Ffmpeg','Netcat',0,0,1,0,1,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,100,5,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,100,5,5,0,0,0,1,255,1,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Keekoon','Remote','Keekoon', 0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 6, 0, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+INSERT INTO `Controls` VALUES (NULL,'HikVision','Local','',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,20,1,1,1,1,0,0,0,1,1,0,0,0,0,1,1,100,0,0,1,0,0,0,0,1,1,100,1,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Maginon Supra IPC','cURL','MaginonIPC',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,4,0,1,1,1,0,0,1,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Floureon 1080P','Ffmpeg','Floureon',0,0,0,0,1,0,0,0,1,1,18,1,1,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,20,0,1,1,1,0,0,0,1,1,0,0,0,0,1,1,8,0,0,1,0,0,0,0,1,1,8,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Reolink RLC-423','Ffmpeg','Reolink',0,0,1,0,1,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,64,1,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Reolink RLC-411','Ffmpeg','Reolink',0,0,1,0,1,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Reolink RLC-420','Ffmpeg','Reolink',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'D-LINK DCS-3415','Remote','DCS3415',0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'IOS Camera','Ffmpeg','IPCAMIOS',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,1,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Dericam P2','Ffmpeg','DericamP2',0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,10,0,1,1,1,0,0,0,1,1,0,0,0,0,1,1,45,0,0,1,0,0,0,0,1,1,45,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Trendnet','Remote','Trendnet',1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'PSIA','Remote','PSIA',0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,20,0,1,1,1,0,0,1,0,1,0,0,0,0,1,-100,100,0,0,1,0,0,0,0,1,-100,100,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Dahua','Remote','Dahua',0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,20,0,1,1,1,0,0,1,0,1,0,0,0,0,1,1,8,0,0,1,0,0,0,0,1,1,8,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'FOSCAMR2C','Libvlc','FOSCAMR2C',1,1,1,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,12,0,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,4,0,NULL,1,NULL,NULL,NULL,NULL,1,0,4,0,NULL,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Amcrest HTTP API','Ffmpeg','Amcrest_HTTP',0,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,5,0,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,5);
 
 --
 -- Add some monitor preset values
diff --git a/db/zm_update-1.33.5.sql b/db/zm_update-1.33.5.sql
new file mode 100644
index 000000000..39400b5d8
--- /dev/null
+++ b/db/zm_update-1.33.5.sql
@@ -0,0 +1,12 @@
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+      AND table_name = 'Controls'
+      AND column_name = 'CanReboot'
+    ) > 0,
+    "SELECT 'Column CanReboot already exists in Controls'",
+    "ALTER TABLE Controls ADD `CanReboot` tinyint(3) unsigned NOT NULL default '0' AFTER `CanReset`"
+    ));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/version b/version
index 9f406e0c8..ad5831d4d 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.33.4
+1.33.5

From 8a90176a2c89809f0379a889860666f404d05e3f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 2 Apr 2019 09:25:50 -0400
Subject: [PATCH 149/214] Add CanReboot to Controls

---
 web/includes/Control.php | 1 +
 web/includes/Monitor.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/web/includes/Control.php b/web/includes/Control.php
index 4a8952b27..72e6c49a9 100644
--- a/web/includes/Control.php
+++ b/web/includes/Control.php
@@ -14,6 +14,7 @@ private $defaults = array(
     'CanMoveCon' => 0,
     'CanPan' => 0,
     'CanReset' => 0,
+    'CanReboot' =>  0,
     'CanSleep' => 0,
     'CanWake' => 0,
     'MinPanRange' => NULL,
diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index ff0e32ff0..83a2f8559 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -113,6 +113,7 @@ private $control_fields = array(
   'CanWake' => '0',
   'CanSleep' => '0',
   'CanReset' => '0',
+  'CanReboot' =>  '0',
   'CanZoom' => '0',
   'CanAutoZoom' => '0',
   'CanZoomAbs' => '0',

From cd28559c03b766ac4abbb116fec24d2312c8e778 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 2 Apr 2019 14:08:46 -0400
Subject: [PATCH 150/214] when encoding audio, pts and dts have to come from
 the encoder.

---
 src/zm_videostore.cpp | 189 ++++++++++++++++++++----------------------
 1 file changed, 90 insertions(+), 99 deletions(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index d54e5c51f..8413354fb 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -684,6 +684,14 @@ bool VideoStore::setup_resampler() {
   }
 #endif
 
+  Debug(3,
+        "Time bases: AUDIO in stream (%d/%d) in codec: (%d/%d) out "
+        "stream: (%d/%d) out codec (%d/%d)",
+        audio_in_stream->time_base.num, audio_in_stream->time_base.den,
+        audio_in_ctx->time_base.num, audio_in_ctx->time_base.den,
+        audio_out_stream->time_base.num, audio_out_stream->time_base.den,
+        audio_out_ctx->time_base.num, audio_out_ctx->time_base.den);
+
   Debug(1,
         "Audio in bit_rate (%d) sample_rate(%d) channels(%d) fmt(%d) "
         "layout(%d) frame_size(%d)",
@@ -867,7 +875,8 @@ int VideoStore::writeVideoFramePacket(AVPacket *ipkt) {
           video_out_stream->time_base
           );
     }
-    Debug(3, "opkt.pts = %" PRId64 " from ipkt->pts(%" PRId64 ") - first_pts(%" PRId64 ")", opkt.pts, ipkt->pts, video_first_pts);
+    Debug(3, "opkt.pts = %" PRId64 " from ipkt->pts(%" PRId64 ") - first_pts(%" PRId64 ")",
+        opkt.pts, ipkt->pts, video_first_pts);
     video_last_pts = ipkt->pts;
   } else {
     Debug(3, "opkt.pts = undef");
@@ -888,7 +897,7 @@ int VideoStore::writeVideoFramePacket(AVPacket *ipkt) {
           video_in_stream->time_base,
           video_out_stream->time_base
           );
-      Debug(3, "opkt.dts = %" PRId64 " from ipkt.dts(%" PRId64 ") - first_pts(%" PRId64 ")",
+      Debug(3, "opkt.dts = %" PRId64 " from ipkt->dts(%" PRId64 ") - first_pts(%" PRId64 ")",
           opkt.dts, ipkt->dts, video_first_pts);
       video_last_dts = ipkt->dts;
 #if 0
@@ -947,7 +956,6 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
   }
 
   if ( audio_out_codec ) {
-    Debug(3, "Have audio codec");
 #if defined(HAVE_LIBSWRESAMPLE) || defined(HAVE_LIBAVRESAMPLE)
 
   #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
@@ -960,22 +968,8 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
       Error("avcodec_receive_frame fail %s", av_make_error_string(ret).c_str());
       return 0;
     }
-    Debug(2,
-          "In Frame: samples(%d), format(%d), sample_rate(%d), "
-          "channels(%d) channel layout(%d) pts(%" PRId64 ")",
-          in_frame->nb_samples,
-          in_frame->format,
-          in_frame->sample_rate,
-          in_frame->channels,
-          in_frame->channel_layout,
-          in_frame->pts);
+
   #else
-    /**
-     * Decode the audio frame stored in the packet.
-     * The in audio stream decoder is used to do this.
-     * If we are at the end of the file, pass an empty packet to the decoder
-     * to flush it.
-     */
     int data_present;
     if ( (ret = avcodec_decode_audio4(
             audio_in_ctx, in_frame, &data_present, ipkt)) < 0 ) {
@@ -991,14 +985,27 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
       return 0;
     }
   #endif
+    zm_dump_frame(in_frame, "In frame from decode");
     int frame_size = in_frame->nb_samples;
 
     // Resample the in into the audioSampleBuffer until we proceed the whole
-    // decoded data
+    // decoded data. Note: pts does not survive resampling or converting
   #if defined(HAVE_LIBSWRESAMPLE)
     Debug(2, "Converting %d to %d samples using swresample", in_frame->nb_samples, out_frame->nb_samples);
     ret = swr_convert_frame(resample_ctx, out_frame, in_frame);
+    zm_dump_frame(out_frame, "Out frame after convert");
+
     out_frame->pts = in_frame->pts;
+    // out_frame pts is in the input pkt pts... needs to be adjusted before sending to the encoder
+    if ( out_frame->pts != AV_NOPTS_VALUE ) {
+      if ( !audio_first_pts ) {
+        audio_first_pts = out_frame->pts;
+        Debug(1, "No audio_first_pts setting to %" PRId64, audio_first_pts);
+        out_frame->pts = 0;
+      } else {
+        out_frame->pts = out_frame->pts - audio_first_pts;
+      }
+    }
     av_frame_unref(in_frame);
     if ( ret < 0 ) {
       Error("Could not resample frame (error '%s')",
@@ -1057,26 +1064,6 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
   #endif
     zm_dump_frame(out_frame, "Out frame after resample");
 
-    // out_frame pts is in the input pkt pts... needs to be adjusted before sending to the encoder
-    if ( ipkt->pts != AV_NOPTS_VALUE ) {
-      if ( !audio_first_pts ) {
-        out_frame->pts = 0;
-        audio_first_pts = ipkt->pts;
-        Debug(1, "No audio_first_pts");
-      } else {
-        out_frame->pts = av_rescale_q(
-            out_frame->pts - audio_first_pts,
-            audio_in_stream->time_base,
-            audio_out_stream->time_base);
-        Debug(2, "audio out_frame.pts = %d from ipkt->pts(%d) - first_pts(%d)",
-            out_frame->pts, ipkt->pts, audio_first_pts);
-      }
-    } else {
-      Debug(2, "out_frame.pts = undef");
-      out_frame->pts = AV_NOPTS_VALUE;
-    }
-    zm_dump_frame(out_frame, "Out frame after resample and pts adjustment");
-
     av_init_packet(&opkt);
   #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
     if ( (ret = avcodec_send_frame(audio_out_ctx, out_frame)) < 0 ) {
@@ -1116,77 +1103,81 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
 #else
     Error("Have audio codec but no resampler?!");
 #endif
+  //if ( out_frame ) {
+    //opkt.duration = out_frame->nb_samples;
+    opkt.duration = av_rescale_q(opkt.duration, 
+          audio_in_stream->time_base,
+          audio_out_stream->time_base);
+    opkt.pts = av_rescale_q(opkt.pts, 
+          audio_in_stream->time_base,
+          audio_out_stream->time_base);
+    opkt.dts = av_rescale_q(opkt.dts, 
+          audio_in_stream->time_base,
+          audio_out_stream->time_base);
   } else {
     av_init_packet(&opkt);
     opkt.data = ipkt->data;
     opkt.size = ipkt->size;
+
+    if ( ipkt->duration != AV_NOPTS_VALUE ) {
+      opkt.duration = av_rescale_q(
+          ipkt->duration,
+          audio_in_stream->time_base,
+          audio_out_stream->time_base);
+    }
+    // Scale the PTS of the outgoing packet to be the correct time base
+    if ( ipkt->pts != AV_NOPTS_VALUE ) {
+      if ( !audio_first_pts ) {
+        opkt.pts = 0;
+        audio_first_pts = ipkt->pts;
+        Debug(1, "No audio_first_pts");
+      } else {
+        opkt.pts = av_rescale_q(
+            ipkt->pts - audio_first_pts,
+            audio_in_stream->time_base,
+            audio_out_stream->time_base);
+        Debug(2, "audio opkt.pts = %" PRId64 " from ipkt->pts(%" PRId64 ") - first_pts(%" PRId64 ")",
+            opkt.pts, ipkt->pts, audio_first_pts);
+      }
+      audio_last_pts = ipkt->pts;
+    } else {
+      Debug(2, "opkt.pts = undef");
+      opkt.pts = AV_NOPTS_VALUE;
+    }
+
+    if ( ipkt->dts != AV_NOPTS_VALUE ) {
+      // So if the in has no dts assigned... still need an out dts... so we use cur_dts?
+
+#if 0
+      if ( audio_last_dts >= audio_in_stream->cur_dts ) {
+        Debug(1, "Resetting audio_last_dts from (%d) to cur_dts (%d)", audio_last_dts, audio_in_stream->cur_dts);
+        opkt.dts = audio_next_dts + av_rescale_q( audio_in_stream->cur_dts,  AV_TIME_BASE_Q, audio_out_stream->time_base);
+      } else {
+        opkt.dts = audio_next_dts + av_rescale_q( audio_in_stream->cur_dts - audio_last_dts, AV_TIME_BASE_Q, audio_out_stream->time_base);
+      }
+#endif
+      if ( !audio_first_dts ) {
+        opkt.dts = 0;
+        audio_first_dts = ipkt->dts;
+      } else {
+        opkt.dts = av_rescale_q(
+            ipkt->dts - audio_first_dts,
+            audio_in_stream->time_base,
+            audio_out_stream->time_base);
+        Debug(2, "opkt.dts = %" PRId64 " from ipkt.dts(%" PRId64 ") - first_dts(%" PRId64 ")",
+            opkt.dts, ipkt->dts, audio_first_dts);
+      }
+      audio_last_dts = ipkt->dts;
+    } else {
+      opkt.dts = AV_NOPTS_VALUE;
+    }
   }
 
   opkt.pos = -1;
   opkt.stream_index = audio_out_stream->index;
 
-  if ( out_frame ) {
-    opkt.duration = out_frame->nb_samples;
-  } else if ( ipkt->duration != AV_NOPTS_VALUE ) {
-    opkt.duration = av_rescale_q(
-        ipkt->duration,
-        audio_in_stream->time_base,
-        audio_out_stream->time_base);
-  } else {
-    // calculate it?
-  }
   dumpPacket(audio_out_stream, &opkt, "raw opkt");
-// PTS is difficult, because of the buffering of the audio packets in the
-// resampler.  So we have to do it once we actually have a packet...
-// audio_last_pts is the pts of ipkt, audio_next_pts is the last pts of the
-// out
 
-// Scale the PTS of the outgoing packet to be the correct time base
-  if ( ipkt->pts != AV_NOPTS_VALUE ) {
-    if ( !audio_first_pts ) {
-      opkt.pts = 0;
-      audio_first_pts = ipkt->pts;
-      Debug(1, "No audio_first_pts");
-    } else {
-      opkt.pts = av_rescale_q(
-          ipkt->pts - audio_first_pts,
-          audio_in_stream->time_base,
-          audio_out_stream->time_base);
-      Debug(2, "audio opkt.pts = %d from ipkt->pts(%d) - first_pts(%d)",
-          opkt.pts, ipkt->pts, audio_first_pts);
-    }
-    audio_last_pts = ipkt->pts;
-  } else {
-    Debug(2, "opkt.pts = undef");
-    opkt.pts = AV_NOPTS_VALUE;
-  }
-
-  if ( ipkt->dts != AV_NOPTS_VALUE ) {
-    // So if the in has no dts assigned... still need an out dts... so we use cur_dts?
-
-#if 0
-    if ( audio_last_dts >= audio_in_stream->cur_dts ) {
-      Debug(1, "Resetting audio_last_dts from (%d) to cur_dts (%d)", audio_last_dts, audio_in_stream->cur_dts);
-      opkt.dts = audio_next_dts + av_rescale_q( audio_in_stream->cur_dts,  AV_TIME_BASE_Q, audio_out_stream->time_base);
-    } else {
-      opkt.dts = audio_next_dts + av_rescale_q( audio_in_stream->cur_dts - audio_last_dts, AV_TIME_BASE_Q, audio_out_stream->time_base);
-    }
-#endif
-    if ( !audio_first_dts ) {
-      opkt.dts = 0;
-      audio_first_dts = ipkt->dts;
-    } else {
-      opkt.dts = av_rescale_q(
-          ipkt->dts - audio_first_dts,
-          audio_in_stream->time_base,
-          audio_out_stream->time_base);
-      Debug(2, "opkt.dts = %" PRId64 " from ipkt.dts(%" PRId64 ") - first_dts(%" PRId64 ")",
-         opkt.dts, ipkt->dts, audio_first_dts);
-    }
-    audio_last_dts = ipkt->dts;
-  } else {
-    opkt.dts = AV_NOPTS_VALUE;
-  }
   if ( opkt.dts > opkt.pts ) {
     Debug(1,
           "opkt.dts(%" PRId64 ") must be <= opkt.pts(%" PRId64 ")."

From 036560e3e926b1a1bfc18de796c47ddf8402cdc0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 2 Apr 2019 14:23:49 -0400
Subject: [PATCH 151/214] Allow packets with pts=AV_NOPTS_VALUE

---
 src/zm_ffmpeg_camera.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index 5da4c0dc4..8cf714717 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -740,7 +740,7 @@ int FfmpegCamera::CaptureAndRecord( Image &image, timeval recording, char* event
       return -1;
     }
 
-    if ( packet.pts < -100000 ) {
+    if ( (packet.pts != AV_NOPTS_VALUE) && (packet.pts < -100000) ) {
       // Ignore packets that have crazy negative pts.  They aren't supposed to happen.
       Warning("Ignore packet because pts %" PRId64 " is massively negative. Error count is %d", packet.pts, error_count);
       dumpPacket(mFormatContext->streams[packet.stream_index], &packet,"Ignored packet");

From 9e96c29620fa5a5711971e092d212ae42d30c254 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 2 Apr 2019 15:24:47 -0400
Subject: [PATCH 152/214] Log a failed csrf check

---
 web/includes/csrf/csrf-magic.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web/includes/csrf/csrf-magic.php b/web/includes/csrf/csrf-magic.php
index 584432ef7..ac2ab073b 100644
--- a/web/includes/csrf/csrf-magic.php
+++ b/web/includes/csrf/csrf-magic.php
@@ -209,6 +209,7 @@ break;
 }
         $ok = true;
     } while (false);
+
     if ($fatal && !$ok) {
         $callback = $GLOBALS['csrf']['callback'];
         if (trim($tokens, 'A..Za..z0..9:;,') !== '') $tokens = 'hidden';
@@ -293,6 +294,7 @@ function csrf_callback($tokens) {
       // Don't make it too easy for users to inflict a CSRF attack on themselves.
       echo "<p><strong>Only try again if you weren't sent to this page by someone as this is potentially a sign of an attack.</strong></p>";
       echo "<form method='post' action=''>$data<input type='submit' value='Try again' /></form>";
+      ZM\Logger::Debug("Failed csrf check");
     }
     echo "<p>Debug: $tokens</p></body></html>
 ";

From 8f3d1f865347c9db6f2b61e23ae304935ff58e81 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 2 Apr 2019 15:25:14 -0400
Subject: [PATCH 153/214] fix a missing = and use csrf_get_tokens instead of
 csrf_get_secret which is the wrong function

---
 web/includes/Filter.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/web/includes/Filter.php b/web/includes/Filter.php
index fb5c74d01..8da602539 100644
--- a/web/includes/Filter.php
+++ b/web/includes/Filter.php
@@ -214,11 +214,13 @@ public $defaults = array(
             $url = '?user='.$_SESSION['username'];
           }
         }
-        $url .= '&view=filter&action=control&command='.$command.'&Id='.$this->Id().'&ServerId'.$Server->Id();
+        $url .= '&view=filter&action=control&command='.$command.'&Id='.$this->Id().'&ServerId='.$Server->Id();
         Logger::Debug("sending command to $url");
         $data = array();
-        if ( defined('ZM_ENABLE_CSRF_MAGIC') )
-          $data['__csrf_magic'] = csrf_get_secret();
+        if ( defined('ZM_ENABLE_CSRF_MAGIC') ) {
+          require_once( 'includes/csrf/csrf-magic.php' );
+          $data['__csrf_magic'] = csrf_get_tokens();
+        }
 
         // use key 'http' even if you send the request to https://...
         $options = array(

From f78e95f5d4dde01fa0fb1c83400fcde8e08b07ba Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Wed, 3 Apr 2019 13:21:52 -0400
Subject: [PATCH 154/214] add is_video_context and is_audio_context and use
 them in zm_revceive_frame to add audio decoding support

---
 src/zm_ffmpeg.cpp | 36 ++++++++++++++++++++++++++++++------
 src/zm_ffmpeg.h   |  7 +++++--
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/zm_ffmpeg.cpp b/src/zm_ffmpeg.cpp
index 5efbdb07a..011def0ee 100644
--- a/src/zm_ffmpeg.cpp
+++ b/src/zm_ffmpeg.cpp
@@ -285,7 +285,8 @@ static void zm_log_fps(double d, const char *postfix) {
 }
 
 void zm_dump_frame(const AVFrame *frame,const char *text) {
-  Debug(1, "%s: format %d %s sample_rate %" PRIu32 " nb_samples %d channels %d layout %d pts %" PRId64,
+  Debug(1, "%s: format %d %s sample_rate %" PRIu32 " nb_samples %d channels %d layout %d pts %" PRId64 
+      " duration %" PRId64,
       text,
       frame->format,
       av_get_sample_fmt_name((AVSampleFormat)frame->format),
@@ -297,7 +298,8 @@ void zm_dump_frame(const AVFrame *frame,const char *text) {
 0,
 #endif
       frame->channel_layout,
-      frame->pts
+      frame->pts,
+      frame->pkt_duration
       );
 }
 
@@ -450,6 +452,14 @@ bool is_video_stream( AVStream * stream ) {
   return false;
 }
 
+bool is_video_context( AVCodecContext *codec_context ) {
+  return
+  #if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
+      ( codec_context->codec_type == AVMEDIA_TYPE_VIDEO );
+  #else
+      ( codec_context->codec_type == CODEC_TYPE_VIDEO );
+  #endif
+}
 
 bool is_audio_stream( AVStream * stream ) {
   #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
@@ -466,6 +476,15 @@ bool is_audio_stream( AVStream * stream ) {
   return false;
 }
 
+bool is_audio_context( AVCodecContext *codec_context ) {
+  return
+  #if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
+      ( codec_context->codec_type == AVMEDIA_TYPE_AUDIO );
+  #else
+      ( codec_context->codec_type == CODEC_TYPE_AUDIO );
+  #endif
+}
+
 int zm_receive_frame( AVCodecContext *context, AVFrame *frame, AVPacket &packet ) {
   int ret;
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
@@ -500,15 +519,20 @@ int zm_receive_frame( AVCodecContext *context, AVFrame *frame, AVPacket &packet
 # else
   int frameComplete = 0;
   while ( !frameComplete ) {
-    if ( (ret = zm_avcodec_decode_video( context, frame, &frameComplete, &packet )) < 0 ) {
-      Error( "Unable to decode frame at frame: %s, continuing",
-          av_make_error_string(ret).c_str() );
+    if ( is_video_context(context) ) {
+      ret = zm_avcodec_decode_video(context, frame, &frameComplete, &packet);
+    } else {
+      ret = avcodec_decode_audio4(context, frame, &frameComplete, &packet);
+    }
+    if ( ret < 0 ) {
+      Error("Unable to decode frame: %s", av_make_error_string(ret).c_str());
       return 0;
     }
-  }
+  } // end while !frameComplete
 #endif
   return 1;
 } // end int zm_receive_frame( AVCodecContext *context, AVFrame *frame, AVPacket &packet )
+
 void dumpPacket(AVStream *stream, AVPacket *pkt, const char *text) {
   char b[10240];
 
diff --git a/src/zm_ffmpeg.h b/src/zm_ffmpeg.h
index a4d984dec..37a239509 100644
--- a/src/zm_ffmpeg.h
+++ b/src/zm_ffmpeg.h
@@ -326,8 +326,11 @@ void zm_dump_frame(const AVFrame *frame, const char *text="Frame");
 
 int check_sample_fmt(AVCodec *codec, enum AVSampleFormat sample_fmt);
 
-bool is_video_stream( AVStream * stream );
-bool is_audio_stream( AVStream * stream );
+bool is_video_stream(AVStream *);
+bool is_audio_stream(AVStream *);
+bool is_video_context(AVCodec *);
+bool is_audio_context(AVCodec *);
+
 int zm_receive_frame( AVCodecContext *context, AVFrame *frame, AVPacket &packet );
 void dumpPacket(AVStream *, AVPacket *,const char *text="");
 #endif // ZM_FFMPEG_H

From aece64049f7f91038f4a647fd849c630a82c2138 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Wed, 3 Apr 2019 13:23:00 -0400
Subject: [PATCH 155/214] We cannot avcodec_open2 a context that has been
 duped.  This code currently works without crashes and leaks on ffmpeg 2.8

---
 src/zm_videostore.cpp | 457 ++++++++++++++++++++++--------------------
 src/zm_videostore.h   |   1 +
 2 files changed, 237 insertions(+), 221 deletions(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 7d3c4b256..0d0c88765 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -103,6 +103,7 @@ VideoStore::VideoStore(
 #endif
   }
 
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
   video_out_stream = avformat_new_stream(oc, video_out_codec);
   if ( !video_out_stream ) {
     Error("Unable to create video out stream");
@@ -111,7 +112,7 @@ VideoStore::VideoStore(
     Debug(2, "Success creating video out stream");
   }
 
-#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+  // by allocating our own copy, we don't run into the problems when we free the streams
   video_out_ctx = avcodec_alloc_context3(video_out_codec);
   // Since we are not re-encoding, all we have to do is copy the parameters
   // Copy params from instream to ctx
@@ -123,8 +124,21 @@ VideoStore::VideoStore(
     zm_dump_codec(video_out_ctx);
   }
 #else
+  video_out_stream = avformat_new_stream(oc, NULL);
+  if ( !video_out_stream ) {
+    Error("Unable to create video out stream");
+    return;
+  } else {
+    Debug(2, "Success creating video out stream");
+  }
   video_out_ctx = video_out_stream->codec;
+  // This will wipe out the codec defaults
   ret = avcodec_copy_context(video_out_ctx, video_in_ctx);
+  //video_out_ctx->width = video_in_ctx->width;
+  //video_out_ctx->height = video_in_ctx->height;
+  //video_out_ctx->pix_fmt = video_in_ctx->pix_fmt;
+  //video_out_ctx->max_b_frames = video_in_ctx->max_b_frames;
+  //video_out_ctx->has_b_frames = video_in_ctx->has_b_frames;
   if ( ret < 0 ) {
     Fatal("Unable to copy in video ctx to out video ctx %s",
           av_make_error_string(ret).c_str());
@@ -142,8 +156,7 @@ VideoStore::VideoStore(
 
   zm_dump_codec(video_out_ctx);
 
-  //video_out_ctx->bit_rate = 400*1024;
-  //video_out_ctx->thread_count = 0;
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
   //// Fix deprecated formats
   switch ( video_out_ctx->pix_fmt ) {
     case AV_PIX_FMT_YUVJ422P  :
@@ -162,15 +175,6 @@ VideoStore::VideoStore(
       break;
   }
 
-  if ( video_out_ctx->codec_id == AV_CODEC_ID_H264 ) {
-    video_out_ctx->max_b_frames = 1;
-    if ( video_out_ctx->priv_data ) {
-      av_opt_set(video_out_ctx->priv_data, "crf", "1", AV_OPT_SEARCH_CHILDREN);
-      //av_opt_set(video_out_ctx->priv_data, "preset", "ultrafast", 0);
-    } else {
-      Debug(2, "Not setting priv_data");
-    }
-  }
 
   if ( !video_out_ctx->codec_tag ) {
     Debug(2, "No codec_tag");
@@ -185,6 +189,7 @@ VideoStore::VideoStore(
       video_out_ctx->codec_tag = video_in_ctx->codec_tag;
     }
   }
+#endif
 
   video_out_stream->time_base = video_in_stream->time_base;
   if ( video_in_stream->avg_frame_rate.num ) {
@@ -195,13 +200,26 @@ VideoStore::VideoStore(
     video_out_stream->avg_frame_rate = video_in_stream->avg_frame_rate;
   }
   if ( video_in_stream->r_frame_rate.num ) {
-    Debug(3,"Copying r_frame_rate (%d/%d)",
+    Debug(3,"Copying r_frame_rate (%d/%d) to out (%d/%d)",
         video_in_stream->r_frame_rate.num, 
-        video_in_stream->r_frame_rate.den 
+        video_in_stream->r_frame_rate.den ,
+        video_out_stream->r_frame_rate.num, 
+        video_out_stream->r_frame_rate.den 
         );
     video_out_stream->r_frame_rate = video_in_stream->r_frame_rate;
   }
 #if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
+  if ( video_out_ctx->codec_id == AV_CODEC_ID_H264 ) {
+    //video_out_ctx->level = 32;I//
+    video_out_ctx->bit_rate = 400*1024;
+    video_out_ctx->max_b_frames = 1;
+    if ( video_out_ctx->priv_data ) {
+      av_opt_set(video_out_ctx->priv_data, "crf", "1", AV_OPT_SEARCH_CHILDREN);
+      av_opt_set(video_out_ctx->priv_data, "preset", "ultrafast", 0);
+    } else {
+      Debug(2, "Not setting priv_data");
+    }
+  }
   ret = avcodec_parameters_from_context(video_out_stream->codecpar, video_out_ctx);
   if ( ret < 0 ) {
     Error("Could not initialize video_out_ctx parameters");
@@ -229,6 +247,7 @@ VideoStore::VideoStore(
 #endif
   }
 
+#if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
   AVDictionary *opts = 0;
   if ( (ret = avcodec_open2(video_out_ctx, video_out_codec, &opts)) < 0 ) {
     Warning("Can't open video codec (%s) %s",
@@ -242,6 +261,7 @@ VideoStore::VideoStore(
   while ( (e = av_dict_get(opts, "", e, AV_DICT_IGNORE_SUFFIX)) != NULL ) {
     Warning("Encoder Option %s not recognized by ffmpeg codec", e->key);
   }
+#endif
 
   Monitor::Orientation orientation = monitor->getOrientation();
   if ( orientation ) {
@@ -273,6 +293,15 @@ VideoStore::VideoStore(
   fifo = NULL;
 #endif
 #endif
+  video_first_pts = 0;
+  video_first_dts = 0;
+  video_last_pts = 0;
+  video_last_dts = 0;
+
+  audio_first_pts = 0;
+  audio_first_dts = 0;
+  audio_next_pts = 0;
+  audio_next_dts = 0;
 
   if ( audio_in_stream ) {
     Debug(3, "Have audio stream");
@@ -284,9 +313,27 @@ VideoStore::VideoStore(
         audio_in_stream->codec->codec_id
 #endif
         != AV_CODEC_ID_AAC ) {
-      static char error_buffer[256];
-      avcodec_string(error_buffer, sizeof(error_buffer), audio_in_ctx, 0);
-      Debug(2, "Got something other than AAC (%s)", error_buffer);
+
+      audio_out_codec = avcodec_find_encoder(AV_CODEC_ID_AAC);
+      if ( !audio_out_codec ) {
+        Error("Could not find codec for AAC");
+        return;
+      }
+
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+      audio_out_stream = avformat_new_stream(oc, NULL);
+      audio_out_stream->time_base = audio_in_stream->time_base;
+      audio_out_ctx = avcodec_alloc_context3(audio_out_codec);
+      if ( !audio_out_ctx ) {
+        Error("could not allocate codec ctx for AAC");
+        audio_out_stream = NULL;
+        return;
+      }
+#else 
+      audio_out_stream = avformat_new_stream(oc, audio_out_codec);
+      audio_out_ctx = audio_out_stream->codec;
+#endif
+      audio_out_stream->time_base = audio_in_stream->time_base;
 
       if ( !setup_resampler() ) {
         return;
@@ -294,90 +341,66 @@ VideoStore::VideoStore(
     } else {
       Debug(2, "Got AAC");
 
-#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-      audio_in_ctx = avcodec_alloc_context3(NULL);
-      ret = avcodec_parameters_to_context(audio_in_ctx,
-          audio_in_stream->codecpar);
-      audio_in_ctx->time_base = audio_in_stream->time_base;
-#else
-      audio_in_ctx = audio_in_stream->codec;
-#endif
-
-      audio_out_stream =
-#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-          avformat_new_stream(oc, (const AVCodec *)(audio_in_ctx->codec));
-#else
-          avformat_new_stream(oc, (AVCodec *)audio_in_ctx->codec);
-#endif
+      audio_out_stream = avformat_new_stream(oc, NULL);
       if ( !audio_out_stream ) {
-        Error("Unable to create audio out stream");
-        audio_out_stream = NULL;
-      } else {
-#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-        audio_out_ctx = avcodec_alloc_context3(audio_out_codec);
-        // Copy params from instream to ctx
-        ret = avcodec_parameters_to_context(
-            audio_out_ctx, audio_in_stream->codecpar);
-        if ( ret < 0 ) {
-          Error("Unable to copy audio params to ctx %s",
-                av_make_error_string(ret).c_str());
-        }
-        ret = avcodec_parameters_from_context(
-            audio_out_stream->codecpar, audio_out_ctx);
-        if ( ret < 0 ) {
-          Error("Unable to copy audio params to stream %s",
-                av_make_error_string(ret).c_str());
-        }
+        Error("Could not allocate new stream");
+        return;
+      }
+      audio_out_stream->time_base = audio_in_stream->time_base;
 
-        if ( !audio_out_ctx->codec_tag ) {
-          audio_out_ctx->codec_tag = av_codec_get_tag(
-              oc->oformat->codec_tag, audio_in_ctx->codec_id);
-          Debug(2, "Setting audio codec tag to %d",
-                audio_out_ctx->codec_tag);
-        }
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+      // Just use the ctx to copy the parameters over
+      audio_out_ctx = avcodec_alloc_context3(NULL);
+      if ( !audio_out_ctx ) {
+        Error("Could not allocate new output_context");
+        return;
+      }
+
+      // We don't actually care what the time_base is..
+      audio_out_ctx->time_base = audio_in_stream->time_base;
+
+      // Copy params from instream to ctx
+      ret = avcodec_parameters_to_context(
+          audio_out_ctx, audio_in_stream->codecpar);
+      if ( ret < 0 ) {
+        Error("Unable to copy audio params to ctx %s",
+              av_make_error_string(ret).c_str());
+      }
+      ret = avcodec_parameters_from_context(
+          audio_out_stream->codecpar, audio_out_ctx);
+      if ( ret < 0 ) {
+        Error("Unable to copy audio params to stream %s",
+              av_make_error_string(ret).c_str());
+      }
+      avcodec_free_context(&audio_out_ctx);
 #else
-        audio_out_ctx = audio_out_stream->codec;
-        ret = avcodec_copy_context(audio_out_ctx, audio_in_ctx);
-        audio_out_ctx->codec_tag = 0;
+      audio_out_ctx = audio_out_stream->codec;
+      ret = avcodec_copy_context(audio_out_ctx, audio_in_stream->codec);
+      if ( ret < 0 ) {
+        Error("Unable to copy audio ctx %s",
+              av_make_error_string(ret).c_str());
+        audio_out_stream = NULL;
+        return;
+      } // end if
+      audio_out_ctx->codec_tag = 0;
 #endif
-        if ( ret < 0 ) {
-          Error("Unable to copy audio ctx %s",
-                av_make_error_string(ret).c_str());
-          audio_out_stream = NULL;
-        } else {
-          if ( audio_out_ctx->channels > 1 ) {
-            Warning("Audio isn't mono, changing it.");
-            audio_out_ctx->channels = 1;
-          } else {
-            Debug(3, "Audio is mono");
-          }
-        }
-      } // end if audio_out_stream
+
+      if ( audio_out_ctx->channels > 1 ) {
+        Warning("Audio isn't mono, changing it.");
+        audio_out_ctx->channels = 1;
+      } else {
+        Debug(3, "Audio is mono");
+      }
     } // end if is AAC
 
-    if ( audio_out_stream ) {
-      if ( oc->oformat->flags & AVFMT_GLOBALHEADER ) {
+    if ( oc->oformat->flags & AVFMT_GLOBALHEADER ) {
 #if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
-        audio_out_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+      audio_out_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
 #else
-        audio_out_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
+      audio_out_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
 #endif
-      }
     }
   }  // end if audio_in_stream
-
-  video_first_pts = 0;
-  video_first_dts = 0;
-  video_last_pts = 0;
-  video_last_dts = 0;
-
-  audio_first_pts = 0;
-  audio_first_dts = 0;
-  audio_last_pts = 0;
-  audio_last_dts = 0;
-  audio_next_pts = 0;
-  audio_next_dts = 0;
-
 }  // VideoStore::VideoStore
 
 bool VideoStore::open() {
@@ -500,6 +523,7 @@ VideoStore::~VideoStore() {
     }
   } // end if ( oc->pb )
 
+#if 0
   // I wonder if we should be closing the file first.
   // I also wonder if we really need to be doing all the ctx
   // allocation/de-allocation constantly, or whether we can just re-use it.
@@ -508,7 +532,7 @@ VideoStore::~VideoStore() {
   if ( video_out_stream ) {
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
     // We allocate and copy in newer ffmpeg, so need to free it
-    //avcodec_free_context(&video_in_ctx);
+    avcodec_free_context(&video_in_ctx);
 #endif
     video_in_ctx = NULL;
 
@@ -517,14 +541,15 @@ VideoStore::~VideoStore() {
       Debug(4, "Success closing video_out_ctx");
       video_out_codec = NULL;
     } // end if video_out_codec
-    avcodec_close(video_out_ctx);
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-    avcodec_free_context(&video_out_ctx);
 #endif
+    avcodec_free_context(&video_out_ctx);
     video_out_ctx = NULL;
   } // end if video_out_stream
+#endif
 
   if ( audio_out_stream ) {
+#if 0
     if ( audio_in_codec ) {
       avcodec_close(audio_in_ctx);
       Debug(4, "Success closing audio_in_ctx");
@@ -533,33 +558,35 @@ VideoStore::~VideoStore() {
 
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
     // We allocate and copy in newer ffmpeg, so need to free it
+#endif
     avcodec_free_context(&audio_in_ctx);
     Debug(4, "Success freeing audio_in_ctx");
-#endif
     audio_in_ctx = NULL;
 
     if ( audio_out_ctx ) {
       avcodec_close(audio_out_ctx);
       Debug(4, "Success closing audio_out_ctx");
-#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
       avcodec_free_context(&audio_out_ctx);
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
 #endif
     }
     audio_out_ctx = NULL;
+#endif
+
 #if defined(HAVE_LIBAVRESAMPLE) || defined(HAVE_LIBSWRESAMPLE)
     if ( resample_ctx ) {
-#if defined(HAVE_LIBSWRESAMPLE)
+  #if defined(HAVE_LIBSWRESAMPLE)
       if ( fifo ) {
         av_audio_fifo_free(fifo);
         fifo = NULL;
       }
       swr_free(&resample_ctx);
-#else
-#if defined(HAVE_LIBAVRESAMPLE)
+  #else
+    #if defined(HAVE_LIBAVRESAMPLE)
       avresample_close(resample_ctx);
       avresample_free(&resample_ctx);
-#endif
-#endif
+    #endif
+  #endif
     }
     if ( in_frame ) {
       av_frame_free(&in_frame);
@@ -576,7 +603,7 @@ VideoStore::~VideoStore() {
 #endif
   } // end if audio_out_stream
 
-  /* free the stream */
+  /* free the streams */
   avformat_free_context(oc);
 } // VideoStore::~VideoStore()
 
@@ -593,35 +620,35 @@ bool VideoStore::setup_resampler() {
   // decoder, can't reuse the one from the camera.
   audio_in_codec =
       avcodec_find_decoder(audio_in_stream->codecpar->codec_id);
+  audio_in_ctx = avcodec_alloc_context3(audio_in_codec);
 #else
 // codec is already open in ffmpeg_camera
-  audio_in_codec = avcodec_find_decoder(audio_in_stream->codec->codec_id);
+  audio_in_ctx = audio_in_stream->codec;
+  audio_in_codec = (AVCodec *)audio_in_ctx->codec;
+  //audio_in_codec = avcodec_find_decoder(audio_in_stream->codec->codec_id);
 #endif
-  audio_in_ctx = avcodec_alloc_context3(audio_in_codec);
 
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+#else
+#if 0
+  ret = avcodec_copy_context(audio_in_ctx, audio_in_stream->codec);
+  if ( ret < 0 ) {
+    Fatal("Unable to copy in video ctx to out video ctx %s",
+          av_make_error_string(ret).c_str());
+  } else {
+    Debug(3, "Success copying ctx");
+  }
+#endif
+#endif
+
+  // if the codec is already open, nothing is done.
   if ( (ret = avcodec_open2(audio_in_ctx, audio_in_codec, NULL)) < 0 ) {
     Error("Can't open in codec!");
     return false;
   }
 
-  audio_out_codec = avcodec_find_encoder(AV_CODEC_ID_AAC);
-  if ( !audio_out_codec ) {
-    Error("Could not find codec for AAC");
-    return false;
-  }
+  Debug(2, "Got something other than AAC (%s)", audio_in_codec->name);
 
-  audio_out_stream = avformat_new_stream(oc, audio_out_codec);
-#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-  // audio_out_ctx = audio_out_stream->codec;
-  audio_out_ctx = avcodec_alloc_context3(audio_out_codec);
-  if ( !audio_out_ctx ) {
-    Error("could not allocate codec ctx for AAC");
-    audio_out_stream = NULL;
-    return false;
-  }
-#else 
-  audio_out_ctx = audio_out_stream->codec;
-#endif
   // Some formats (i.e. WAV) do not produce the proper channel layout
   if ( audio_in_ctx->channel_layout == 0 ) {
     Debug(2, "Setting input channel layout to mono");
@@ -930,7 +957,6 @@ int VideoStore::writeVideoFramePacket(AVPacket *ipkt) {
     opkt.dts = 0;
   }
 
-
   opkt.flags = ipkt->flags;
   opkt.pos = -1;
   opkt.data = ipkt->data;
@@ -969,46 +995,21 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
     return 0;  // FIXME -ve return codes do not free packet in ffmpeg_camera at
                // the moment
   }
+  dumpPacket(audio_in_stream, ipkt, "input packet");
 
   if ( audio_out_codec ) {
-#if defined(HAVE_LIBSWRESAMPLE) || defined(HAVE_LIBAVRESAMPLE)
-
-  #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-    if ( (ret = avcodec_send_packet(audio_in_ctx, ipkt)) < 0 ) {
-      Error("avcodec_send_packet fail %s", av_make_error_string(ret).c_str());
+    Debug(2, "Have output codec");
+    if ( ! zm_receive_frame(audio_in_ctx, in_frame, *ipkt) ) {
       return 0;
     }
 
-    if ( (ret = avcodec_receive_frame(audio_in_ctx, in_frame)) < 0 ) {
-      Error("avcodec_receive_frame fail %s", av_make_error_string(ret).c_str());
-      return 0;
-    }
-
-  #else
-    int data_present;
-    if ( (ret = avcodec_decode_audio4(
-            audio_in_ctx, in_frame, &data_present, ipkt)) < 0 ) {
-      Error("Could not decode frame (error '%s')",
-            av_make_error_string(ret).c_str());
-      dumpPacket(video_in_stream, ipkt);
-      // I'm not sure if we should be freeing the frame.
-      av_frame_free(&in_frame);
-      return 0;
-    }
-    if ( !data_present ) {
-      Debug(2, "Not ready to transcode a frame yet.");
-      return 0;
-    }
-  #endif
     zm_dump_frame(in_frame, "In frame from decode");
-    int frame_size = in_frame->nb_samples;
 
-    // Resample the in into the audioSampleBuffer until we proceed the whole
-    // decoded data. Note: pts does not survive resampling or converting
-  #if defined(HAVE_LIBSWRESAMPLE)
-    Debug(2, "Converting %d to %d samples using swresample", in_frame->nb_samples, out_frame->nb_samples);
-    ret = swr_convert_frame(resample_ctx, out_frame, in_frame);
-    zm_dump_frame(out_frame, "Out frame after convert");
+    if ( ! resample_audio() ) {
+      av_frame_unref(in_frame);
+      return 0;
+    }
+    zm_dump_frame(out_frame, "Out frame after resample");
 
     out_frame->pts = in_frame->pts;
     // out_frame pts is in the input pkt pts... needs to be adjusted before sending to the encoder
@@ -1020,64 +1021,12 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
       } else {
         out_frame->pts = out_frame->pts - audio_first_pts;
       }
+      //
+    } else {
+      // sending AV_NOPTS_VALUE doesn't really work but we seem to get it in ffmpeg 2.8
+      out_frame->pts = audio_next_pts;
     }
-    av_frame_unref(in_frame);
-    if ( ret < 0 ) {
-      Error("Could not resample frame (error '%s')",
-            av_make_error_string(ret).c_str());
-      return 0;
-    }
-    if ((ret = av_audio_fifo_realloc(fifo, av_audio_fifo_size(fifo) + out_frame->nb_samples)) < 0) {
-      Error("Could not reallocate FIFO");
-      return 0;
-    }
-    /** Store the new samples in the FIFO buffer. */
-    ret = av_audio_fifo_write(fifo, (void **)out_frame->data, out_frame->nb_samples);
-    if ( ret < frame_size ) {
-        Error("Could not write data to FIFO on %d written", ret);
-        return 0;
-    }
-
-    // Reset frame_size to output_frame_size
-    frame_size = audio_out_ctx->frame_size;
-
-    // AAC requires 1024 samples per encode.  Our input tends to be 160, so need to buffer them.
-    if ( frame_size > av_audio_fifo_size(fifo) ) {
-      return 0;
-    }
-
-    if ( av_audio_fifo_read(fifo, (void **)out_frame->data, frame_size) < frame_size ) {
-      Error("Could not read data from FIFO");
-      return 0;
-    }
-    out_frame->nb_samples = frame_size;
-    /// FIXME this is not the correct pts
-  #else
-    #if defined(HAVE_LIBAVRESAMPLE)
-    (ret = avresample_convert(resample_ctx, NULL, 0, 0, in_frame->data,
-                              0, in_frame->nb_samples))
-    av_frame_unref(in_frame);
-    if ( ret < 0 ) {
-      Error("Could not resample frame (error '%s')",
-            av_make_error_string(ret).c_str());
-      return 0;
-    }
-
-    int samples_available = avresample_available(resample_ctx);
-    if ( samples_available < frame_size ) {
-      Debug(1, "Not enough samples yet (%d)", samples_available);
-      return 0;
-    }
-
-    // Read a frame audio data from the resample fifo
-    if ( avresample_read(resample_ctx, out_frame->data, frame_size) !=
-        frame_size) {
-      Warning("Error reading resampled audio.");
-      return 0;
-    }
-    #endif
-  #endif
-    zm_dump_frame(out_frame, "Out frame after resample");
+    audio_next_pts = out_frame->pts + out_frame->nb_samples;
 
     av_init_packet(&opkt);
   #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
@@ -1102,6 +1051,7 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
       return 0;
     }
   #else
+    int data_present;
     if ( (ret = avcodec_encode_audio2(
             audio_out_ctx, &opkt, out_frame, &data_present)) < 0 ) {
       Error("Could not encode frame (error '%s')",
@@ -1115,11 +1065,6 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
       return 0;
     }
   #endif
-#else
-    Error("Have audio codec but no resampler?!");
-#endif
-  //if ( out_frame ) {
-    //opkt.duration = out_frame->nb_samples;
     opkt.duration = av_rescale_q(opkt.duration, 
           audio_in_stream->time_base,
           audio_out_stream->time_base);
@@ -1129,12 +1074,15 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
     opkt.dts = av_rescale_q(opkt.dts, 
           audio_in_stream->time_base,
           audio_out_stream->time_base);
+    dumpPacket(audio_out_stream, &opkt, "raw opkt");
+
   } else {
+    Debug(2,"copying");
     av_init_packet(&opkt);
     opkt.data = ipkt->data;
     opkt.size = ipkt->size;
 
-    if ( ipkt->duration != AV_NOPTS_VALUE ) {
+    if ( ipkt->duration && (ipkt->duration != AV_NOPTS_VALUE) ) {
       opkt.duration = av_rescale_q(
           ipkt->duration,
           audio_in_stream->time_base,
@@ -1154,7 +1102,6 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
         Debug(2, "audio opkt.pts = %" PRId64 " from ipkt->pts(%" PRId64 ") - first_pts(%" PRId64 ")",
             opkt.pts, ipkt->pts, audio_first_pts);
       }
-      audio_last_pts = ipkt->pts;
     } else {
       Debug(2, "opkt.pts = undef");
       opkt.pts = AV_NOPTS_VALUE;
@@ -1186,13 +1133,11 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
     } else {
       opkt.dts = AV_NOPTS_VALUE;
     }
-  }
+  } // end if encoding or copying
 
   opkt.pos = -1;
   opkt.stream_index = audio_out_stream->index;
 
-  dumpPacket(audio_out_stream, &opkt, "raw opkt");
-
   if ( opkt.dts > opkt.pts ) {
     Debug(1,
           "opkt.dts(%" PRId64 ") must be <= opkt.pts(%" PRId64 ")."
@@ -1213,3 +1158,73 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
   zm_av_packet_unref(&opkt);
   return 0;
 } // end int VideoStore::writeAudioFramePacket(AVPacket *ipkt)
+
+int VideoStore::resample_audio() {
+  // Resample the in into the audioSampleBuffer until we process the whole
+  // decoded data. Note: pts does not survive resampling or converting
+#if defined(HAVE_LIBSWRESAMPLE) || defined(HAVE_LIBAVRESAMPLE)
+#if defined(HAVE_LIBSWRESAMPLE)
+  Debug(2, "Converting %d to %d samples using swresample",
+      in_frame->nb_samples, out_frame->nb_samples);
+  ret = swr_convert_frame(resample_ctx, out_frame, in_frame);
+  zm_dump_frame(out_frame, "Out frame after convert");
+
+  if ( ret < 0 ) {
+    Error("Could not resample frame (error '%s')",
+        av_make_error_string(ret).c_str());
+    return 0;
+  }
+  if ((ret = av_audio_fifo_realloc(fifo, av_audio_fifo_size(fifo) + out_frame->nb_samples)) < 0) {
+    Error("Could not reallocate FIFO");
+    return 0;
+  }
+  /** Store the new samples in the FIFO buffer. */
+  ret = av_audio_fifo_write(fifo, (void **)out_frame->data, out_frame->nb_samples);
+  if ( ret < in_frame->nb_samples ) {
+    Error("Could not write data to FIFO on %d written", ret);
+    return 0;
+  }
+
+  // Reset frame_size to output_frame_size
+  int frame_size = audio_out_ctx->frame_size;
+
+  // AAC requires 1024 samples per encode.  Our input tends to be 160, so need to buffer them.
+  if ( frame_size > av_audio_fifo_size(fifo) ) {
+    return 0;
+  }
+
+  if ( av_audio_fifo_read(fifo, (void **)out_frame->data, frame_size) < frame_size ) {
+    Error("Could not read data from FIFO");
+    return 0;
+  }
+  out_frame->nb_samples = frame_size;
+#else
+#if defined(HAVE_LIBAVRESAMPLE)
+  (ret = avresample_convert(resample_ctx, NULL, 0, 0, in_frame->data,
+                            0, in_frame->nb_samples))
+  if ( ret < 0 ) {
+    Error("Could not resample frame (error '%s')",
+        av_make_error_string(ret).c_str());
+    return 0;
+  }
+
+  int samples_available = avresample_available(resample_ctx);
+  if ( samples_available < frame_size ) {
+    Debug(1, "Not enough samples yet (%d)", samples_available);
+    return 0;
+  }
+
+  // Read a frame audio data from the resample fifo
+  if ( avresample_read(resample_ctx, out_frame->data, frame_size) !=
+      frame_size) {
+    Warning("Error reading resampled audio.");
+    return 0;
+  }
+#endif
+#endif
+#else
+    Error("Have audio codec but no resampler?!");
+    return 0;
+#endif
+  return 1;
+} // end int VideoStore::resample_audio
diff --git a/src/zm_videostore.h b/src/zm_videostore.h
index 1fe3fe81b..8e7308e69 100644
--- a/src/zm_videostore.h
+++ b/src/zm_videostore.h
@@ -77,6 +77,7 @@ private:
   int64_t audio_next_dts;
 
   bool setup_resampler();
+  int resample_audio();
 
 public:
 	VideoStore(

From b6f35db4defaa0c2a934bc15787567d6d8c254db Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 3 Apr 2019 14:25:18 -0400
Subject: [PATCH 156/214] put back codec closing in destructure, testing with
 bionic

---
 src/zm_videostore.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 0d0c88765..d2804de90 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -104,7 +104,7 @@ VideoStore::VideoStore(
   }
 
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-  video_out_stream = avformat_new_stream(oc, video_out_codec);
+  video_out_stream = avformat_new_stream(oc, NULL);
   if ( !video_out_stream ) {
     Error("Unable to create video out stream");
     return;
@@ -523,7 +523,6 @@ VideoStore::~VideoStore() {
     }
   } // end if ( oc->pb )
 
-#if 0
   // I wonder if we should be closing the file first.
   // I also wonder if we really need to be doing all the ctx
   // allocation/de-allocation constantly, or whether we can just re-use it.
@@ -532,7 +531,7 @@ VideoStore::~VideoStore() {
   if ( video_out_stream ) {
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
     // We allocate and copy in newer ffmpeg, so need to free it
-    avcodec_free_context(&video_in_ctx);
+    //avcodec_free_context(&video_in_ctx);
 #endif
     video_in_ctx = NULL;
 
@@ -542,14 +541,12 @@ VideoStore::~VideoStore() {
       video_out_codec = NULL;
     } // end if video_out_codec
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-#endif
     avcodec_free_context(&video_out_ctx);
+#endif
     video_out_ctx = NULL;
   } // end if video_out_stream
-#endif
 
   if ( audio_out_stream ) {
-#if 0
     if ( audio_in_codec ) {
       avcodec_close(audio_in_ctx);
       Debug(4, "Success closing audio_in_ctx");
@@ -558,20 +555,19 @@ VideoStore::~VideoStore() {
 
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
     // We allocate and copy in newer ffmpeg, so need to free it
-#endif
     avcodec_free_context(&audio_in_ctx);
+#endif
     Debug(4, "Success freeing audio_in_ctx");
     audio_in_ctx = NULL;
 
     if ( audio_out_ctx ) {
       avcodec_close(audio_out_ctx);
       Debug(4, "Success closing audio_out_ctx");
-      avcodec_free_context(&audio_out_ctx);
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+      avcodec_free_context(&audio_out_ctx);
 #endif
     }
     audio_out_ctx = NULL;
-#endif
 
 #if defined(HAVE_LIBAVRESAMPLE) || defined(HAVE_LIBSWRESAMPLE)
     if ( resample_ctx ) {
@@ -621,6 +617,14 @@ bool VideoStore::setup_resampler() {
   audio_in_codec =
       avcodec_find_decoder(audio_in_stream->codecpar->codec_id);
   audio_in_ctx = avcodec_alloc_context3(audio_in_codec);
+  // Copy params from instream to ctx
+  ret = avcodec_parameters_to_context(
+      audio_in_ctx, audio_in_stream->codecpar);
+  if ( ret < 0 ) {
+    Error("Unable to copy audio params to ctx %s",
+        av_make_error_string(ret).c_str());
+  }
+
 #else
 // codec is already open in ffmpeg_camera
   audio_in_ctx = audio_in_stream->codec;
@@ -643,7 +647,7 @@ bool VideoStore::setup_resampler() {
 
   // if the codec is already open, nothing is done.
   if ( (ret = avcodec_open2(audio_in_ctx, audio_in_codec, NULL)) < 0 ) {
-    Error("Can't open in codec!");
+    Error("Can't open audio in codec!");
     return false;
   }
 

From b53e4aa803f45c1f33af5d9045d09c4770e711de Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 3 Apr 2019 14:51:10 -0400
Subject: [PATCH 157/214] fix segfault

---
 src/zm_videostore.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index d2804de90..993136e27 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -350,7 +350,7 @@ VideoStore::VideoStore(
 
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
       // Just use the ctx to copy the parameters over
-      audio_out_ctx = avcodec_alloc_context3(NULL);
+      audio_out_ctx = avcodec_alloc_context3(audio_out_codec);
       if ( !audio_out_ctx ) {
         Error("Could not allocate new output_context");
         return;
@@ -372,7 +372,6 @@ VideoStore::VideoStore(
         Error("Unable to copy audio params to stream %s",
               av_make_error_string(ret).c_str());
       }
-      avcodec_free_context(&audio_out_ctx);
 #else
       audio_out_ctx = audio_out_stream->codec;
       ret = avcodec_copy_context(audio_out_ctx, audio_in_stream->codec);

From 2e7fd7c9a24907a0b7f0ef8fb63969176f63ca75 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Wed, 3 Apr 2019 14:55:29 -0400
Subject: [PATCH 158/214] handle really old ffmpeg not having pkt_duration

---
 src/zm_ffmpeg.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/zm_ffmpeg.cpp b/src/zm_ffmpeg.cpp
index 011def0ee..22d680260 100644
--- a/src/zm_ffmpeg.cpp
+++ b/src/zm_ffmpeg.cpp
@@ -285,8 +285,9 @@ static void zm_log_fps(double d, const char *postfix) {
 }
 
 void zm_dump_frame(const AVFrame *frame,const char *text) {
-  Debug(1, "%s: format %d %s sample_rate %" PRIu32 " nb_samples %d channels %d layout %d pts %" PRId64 
-      " duration %" PRId64,
+  Debug(1, "%s: format %d %s sample_rate %" PRIu32 " nb_samples %d channels %d"
+      " duration %" PRId64
+      " layout %d pts %" PRId64,
       text,
       frame->format,
       av_get_sample_fmt_name((AVSampleFormat)frame->format),
@@ -294,12 +295,12 @@ void zm_dump_frame(const AVFrame *frame,const char *text) {
       frame->nb_samples,
 #if LIBAVCODEC_VERSION_CHECK(56, 8, 0, 60, 100)
       frame->channels,
+      frame->pkt_duration,
 #else
-0,
+0, 0,
 #endif
       frame->channel_layout,
-      frame->pts,
-      frame->pkt_duration
+      frame->pts
       );
 }
 

From bd9b5afe46db7e9f9c590891bfb0417a21f446b1 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Wed, 3 Apr 2019 14:56:14 -0400
Subject: [PATCH 159/214] old ffmpeg doesn't have av_frame_unref and it doesn't
 seem to be needed

---
 src/zm_videostore.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 0d0c88765..0586532fa 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -1006,7 +1006,7 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
     zm_dump_frame(in_frame, "In frame from decode");
 
     if ( ! resample_audio() ) {
-      av_frame_unref(in_frame);
+      //av_frame_unref(in_frame);
       return 0;
     }
     zm_dump_frame(out_frame, "Out frame after resample");

From 94479fc850afe605e0c5e8b7a9f040914932f875 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Wed, 3 Apr 2019 16:03:21 -0400
Subject: [PATCH 160/214] copy pkt flags as well.  When pts is NOPTS_VALUE set
 it to zero

---
 src/zm_videostore.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index f6e38ee2c..0f51358f1 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -871,7 +871,7 @@ int VideoStore::writeVideoFramePacket(AVPacket *ipkt) {
   dumpPacket(video_in_stream, ipkt, "input packet");
 
   int64_t duration;
-  if ( ipkt->duration ) {
+  if ( ipkt->duration && ( ipkt->duration != AV_NOPTS_VALUE ) ) {
     duration = av_rescale_q(
         ipkt->duration,
         video_in_stream->time_base,
@@ -925,7 +925,8 @@ int VideoStore::writeVideoFramePacket(AVPacket *ipkt) {
     video_last_pts = ipkt->pts;
   } else {
     Debug(3, "opkt.pts = undef");
-    opkt.pts = AV_NOPTS_VALUE;
+    opkt.pts = 0;
+    //AV_NOPTS_VALUE;
   }
   // Just because the in stream wraps, doesn't mean the out needs to.  Really, if we are limiting ourselves to 10min segments I can't imagine every wrapping in the out.  So need to handle in wrap, without causing out wrap.
   if ( ipkt->dts != AV_NOPTS_VALUE ) {
@@ -1140,6 +1141,7 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
 
   opkt.pos = -1;
   opkt.stream_index = audio_out_stream->index;
+  opkt.flags = ipkt->flags;
 
   if ( opkt.dts > opkt.pts ) {
     Debug(1,

From 12631abd46d664e9cf4389ec001cb34bf2de06a9 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Wed, 3 Apr 2019 16:51:27 -0400
Subject: [PATCH 161/214] when copying a packet (for old ffmpeg) copy pts, dts
 and duration too

---
 src/zm_ffmpeg.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/zm_ffmpeg.cpp b/src/zm_ffmpeg.cpp
index 22d680260..578e12e6b 100644
--- a/src/zm_ffmpeg.cpp
+++ b/src/zm_ffmpeg.cpp
@@ -434,6 +434,9 @@ unsigned int zm_av_packet_ref( AVPacket *dst, AVPacket *src ) {
   av_new_packet(dst,src->size);
   memcpy(dst->data, src->data, src->size);
   dst->flags = src->flags;
+  dst->pts = src->pts;
+  dst->dts = src->dts;
+  dst->duration = src->duration;
   return 0;
 }
 #endif

From 8d3fa807e2ad2ee2abdd9dabf5795eeb912d1278 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Wed, 3 Apr 2019 16:51:41 -0400
Subject: [PATCH 162/214] compilation fixes for old ffmpeg

---
 src/zm_videostore.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 0f51358f1..8b307ed7e 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -665,10 +665,7 @@ bool VideoStore::setup_resampler() {
   audio_out_ctx->channels = audio_in_ctx->channels;
   audio_out_ctx->channel_layout = audio_in_ctx->channel_layout;
   audio_out_ctx->sample_fmt = audio_in_ctx->sample_fmt;
-#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-#else
-  audio_out_ctx->refcounted_frames = 1;
-#endif
+#if LIBAVCODEC_VERSION_CHECK(56, 8, 0, 60, 100)
   if ( !audio_out_ctx->channel_layout ) {
     Debug(3, "Correcting channel layout from (%d) to (%d)",
         audio_out_ctx->channel_layout,
@@ -676,7 +673,7 @@ bool VideoStore::setup_resampler() {
         );
       audio_out_ctx->channel_layout = av_get_default_channel_layout(audio_out_ctx->channels);
   }
-
+#endif
   if ( audio_out_codec->supported_samplerates ) {
     int found = 0;
     for ( unsigned int i = 0; audio_out_codec->supported_samplerates[i]; i++ ) {
@@ -832,7 +829,9 @@ bool VideoStore::setup_resampler() {
 
   out_frame->nb_samples = audio_out_ctx->frame_size;
   out_frame->format = audio_out_ctx->sample_fmt;
+#if LIBAVCODEC_VERSION_CHECK(56, 8, 0, 60, 100)
   out_frame->channels = audio_out_ctx->channels;
+#endif
   out_frame->channel_layout = audio_out_ctx->channel_layout;
   out_frame->sample_rate = audio_out_ctx->sample_rate;
 
@@ -1205,14 +1204,16 @@ int VideoStore::resample_audio() {
   out_frame->nb_samples = frame_size;
 #else
 #if defined(HAVE_LIBAVRESAMPLE)
-  (ret = avresample_convert(resample_ctx, NULL, 0, 0, in_frame->data,
-                            0, in_frame->nb_samples))
+  ret = avresample_convert(resample_ctx, NULL, 0, 0, in_frame->data,
+                            0, in_frame->nb_samples);
   if ( ret < 0 ) {
     Error("Could not resample frame (error '%s')",
         av_make_error_string(ret).c_str());
     return 0;
   }
 
+  int frame_size = audio_out_ctx->frame_size;
+
   int samples_available = avresample_available(resample_ctx);
   if ( samples_available < frame_size ) {
     Debug(1, "Not enough samples yet (%d)", samples_available);

From 8de7d576a590556f9272e3477f537c30543d315b Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Thu, 4 Apr 2019 09:35:37 -0400
Subject: [PATCH 163/214] spacing and use Error instead of fprintf(stderr) so
 that things get logged.

---
 src/zmu.cpp | 202 +++++++++++++++++++++++++---------------------------
 1 file changed, 99 insertions(+), 103 deletions(-)

diff --git a/src/zmu.cpp b/src/zmu.cpp
index a8ee61273..479bbd973 100644
--- a/src/zmu.cpp
+++ b/src/zmu.cpp
@@ -426,11 +426,11 @@ int main(int argc, char *argv[]) {
   if ( config.opt_use_auth ) {
     if ( strcmp(config.auth_relay, "none") == 0 ) {
       if ( !checkUser(username)) {
-        fprintf(stderr, "Error, username greater than allowed 32 characters\n");
+        Error("Username greater than allowed 32 characters");
         exit_zmu(-1);
       }
       if ( !username ) {
-        fprintf(stderr, "Error, username must be supplied\n");
+        Error("Username must be supplied");
         exit_zmu(-1);
       }
 
@@ -439,36 +439,32 @@ int main(int argc, char *argv[]) {
       }
     } else {
       if ( !(username && password) && !auth ) {
-        fprintf(stderr, "Error, username and password or auth string must be supplied\n");
+        Error("Username and password or auth string must be supplied");
         exit_zmu(-1);
       }
       if ( !checkUser(username)) {
-        fprintf(stderr, "Error, username greater than allowed 32 characters\n");
+        Error("Username greater than allowed 32 characters");
         exit_zmu(-1);
       }
       if ( !checkPass(password)) {
-        fprintf(stderr, "Error, password greater than allowed 64 characters\n");
+        Error("Password greater than allowed 64 characters");
         exit_zmu(-1);
       }
-      //if ( strcmp( config.auth_relay, "hashed" ) == 0 )
-      {
-        if ( auth ) {
-          user = zmLoadAuthUser(auth, false);
-        }
+
+      if ( auth ) {
+        user = zmLoadAuthUser(auth, false);
       }
-      //else if ( strcmp( config.auth_relay, "plain" ) == 0 )
-      {
-        if ( username && password ) {
-          user = zmLoadUser(username, password);
-        }
+      if ( username && password ) {
+        user = zmLoadUser(username, password);
       }
-    }
+    } // auth relay == none or not
+
     if ( !user ) {
-      fprintf(stderr, "Error, unable to authenticate user\n");
-      return exit_zmu(-1);
+      Error("Unable to authenticate user");
+      exit_zmu(-1);
     }
 		if ( !ValidateAccess(user, mon_id, function) ) {
-			fprintf(stderr, "Error, insufficient privileges for requested action\n");
+			Error("Insufficient privileges for requested action");
 			exit_zmu(-1);
 		}
   } // end if auth
@@ -503,201 +499,201 @@ int main(int argc, char *argv[]) {
         if ( verbose ) {
           char timestamp_str[64] = "None";
           if ( timestamp.tv_sec )
-            strftime( timestamp_str, sizeof(timestamp_str), "%Y-%m-%d %H:%M:%S", localtime( &timestamp.tv_sec ) );
+            strftime(timestamp_str, sizeof(timestamp_str), "%Y-%m-%d %H:%M:%S", localtime(&timestamp.tv_sec));
           if ( image_idx == -1 )
-            printf( "Time of last image capture: %s.%02ld\n", timestamp_str, timestamp.tv_usec/10000 );
+            printf("Time of last image capture: %s.%02ld\n", timestamp_str, timestamp.tv_usec/10000);
           else
-            printf( "Time of image %d capture: %s.%02ld\n", image_idx, timestamp_str, timestamp.tv_usec/10000 );
+            printf("Time of image %d capture: %s.%02ld\n", image_idx, timestamp_str, timestamp.tv_usec/10000);
         } else {
-          if ( have_output ) printf( "%c", separator );
-          printf( "%ld.%02ld", timestamp.tv_sec, timestamp.tv_usec/10000 );
+          if ( have_output ) printf("%c", separator);
+          printf("%ld.%02ld", timestamp.tv_sec, timestamp.tv_usec/10000);
           have_output = true;
         }
       }
       if ( function & ZMU_READ_IDX ) {
         if ( verbose )
-          printf( "Last read index: %d\n", monitor->GetLastReadIndex() );
+          printf("Last read index: %d\n", monitor->GetLastReadIndex());
         else {
-          if ( have_output ) printf( "%c", separator );
-          printf( "%d", monitor->GetLastReadIndex() );
+          if ( have_output ) printf("%c", separator);
+          printf("%d", monitor->GetLastReadIndex());
           have_output = true;
         }
       }
       if ( function & ZMU_WRITE_IDX ) {
-        if ( verbose )
-          printf( "Last write index: %d\n", monitor->GetLastWriteIndex() );
-        else {
-          if ( have_output ) printf( "%c", separator );
-          printf( "%d", monitor->GetLastWriteIndex() );
+        if ( verbose ) {
+          printf("Last write index: %d\n", monitor->GetLastWriteIndex());
+        } else {
+          if ( have_output ) printf("%c", separator);
+          printf("%d", monitor->GetLastWriteIndex());
           have_output = true;
         }
       }
       if ( function & ZMU_EVENT ) {
-        if ( verbose )
-          printf( "Last event id: %" PRIu64 "\n", monitor->GetLastEventId() );
-        else {
-          if ( have_output ) printf( "%c", separator );
-          printf( "%" PRIu64, monitor->GetLastEventId() );
+        if ( verbose ) {
+          printf("Last event id: %" PRIu64 "\n", monitor->GetLastEventId());
+        } else {
+          if ( have_output ) printf("%c", separator);
+          printf("%" PRIu64, monitor->GetLastEventId());
           have_output = true;
         }
       }
       if ( function & ZMU_FPS ) {
         if ( verbose )
-          printf( "Current capture rate: %.2f frames per second\n", monitor->GetFPS() );
+          printf("Current capture rate: %.2f frames per second\n", monitor->GetFPS());
         else {
-          if ( have_output ) printf( "%c", separator );
-          printf( "%.2f", monitor->GetFPS() );
+          if ( have_output ) printf("%c", separator);
+          printf("%.2f", monitor->GetFPS());
           have_output = true;
         }
       }
       if ( function & ZMU_IMAGE ) {
         if ( verbose ) {
           if ( image_idx == -1 )
-            printf( "Dumping last image captured to Monitor%d.jpg", monitor->Id() );
+            printf("Dumping last image captured to Monitor%d.jpg", monitor->Id());
           else
-            printf( "Dumping buffer image %d to Monitor%d.jpg", image_idx, monitor->Id() );
+            printf("Dumping buffer image %d to Monitor%d.jpg", image_idx, monitor->Id());
           if ( scale != -1 )
-            printf( ", scaling by %d%%", scale );
-          printf( "\n" );
+            printf(", scaling by %d%%", scale);
+          printf("\n");
         }
-        monitor->GetImage( image_idx, scale>0?scale:100 );
+        monitor->GetImage(image_idx, scale>0?scale:100);
       }
       if ( function & ZMU_ZONES ) {
         if ( verbose )
-          printf( "Dumping zone image to Zones%d.jpg\n", monitor->Id() );
-        monitor->DumpZoneImage( zoneString );
+          printf("Dumping zone image to Zones%d.jpg\n", monitor->Id());
+        monitor->DumpZoneImage(zoneString);
       }
       if ( function & ZMU_ALARM ) {
         if ( verbose )
-          printf( "Forcing alarm on\n" );
-        monitor->ForceAlarmOn( config.forced_alarm_score, "Forced Web" );
+          printf("Forcing alarm on\n");
+        monitor->ForceAlarmOn(config.forced_alarm_score, "Forced Web");
         while ( monitor->GetState() != Monitor::ALARM ) {
           // Wait for monitor to notice.
           usleep(1000);
         }
-        printf( "Alarmed event id: %" PRIu64 "\n", monitor->GetLastEventId() );
+        printf("Alarmed event id: %" PRIu64 "\n", monitor->GetLastEventId());
       }
       if ( function & ZMU_NOALARM ) {
         if ( verbose )
-          printf( "Forcing alarm off\n" );
+          printf("Forcing alarm off\n");
         monitor->ForceAlarmOff();
       }
       if ( function & ZMU_CANCEL ) {
         if ( verbose )
-          printf( "Cancelling forced alarm on/off\n" );
+          printf("Cancelling forced alarm on/off\n");
         monitor->CancelForced();
       }
       if ( function & ZMU_RELOAD ) {
         if ( verbose )
-          printf( "Reloading monitor settings\n" );
+          printf("Reloading monitor settings\n");
         monitor->actionReload();
       }
       if ( function & ZMU_ENABLE ) {
         if ( verbose )
-          printf( "Enabling event generation\n" );
+          printf("Enabling event generation\n");
         monitor->actionEnable();
       }
       if ( function & ZMU_DISABLE ) {
         if ( verbose )
-          printf( "Disabling event generation\n" );
+          printf("Disabling event generation\n");
         monitor->actionDisable();
       }
       if ( function & ZMU_SUSPEND ) {
         if ( verbose )
-          printf( "Suspending event generation\n" );
+          printf("Suspending event generation\n");
         monitor->actionSuspend();
       }
       if ( function & ZMU_RESUME ) {
         if ( verbose )
-          printf( "Resuming event generation\n" );
+          printf("Resuming event generation\n");
         monitor->actionResume();
       }
       if ( function & ZMU_QUERY ) {
         char monString[16382] = "";
-        monitor->DumpSettings( monString, verbose );
-        printf( "%s\n", monString );
+        monitor->DumpSettings(monString, verbose);
+        printf("%s\n", monString);
       }
       if ( function & ZMU_BRIGHTNESS ) {
         if ( verbose ) {
           if ( brightness >= 0 )
-            printf( "New brightness: %d\n", monitor->actionBrightness( brightness ) );
+            printf("New brightness: %d\n", monitor->actionBrightness(brightness));
           else
-            printf( "Current brightness: %d\n", monitor->actionBrightness() );
+            printf("Current brightness: %d\n", monitor->actionBrightness());
         } else {
-          if ( have_output ) printf( "%c", separator );
+          if ( have_output ) printf("%c", separator);
           if ( brightness >= 0 )
-            printf( "%d", monitor->actionBrightness( brightness ) );
+            printf("%d", monitor->actionBrightness(brightness));
           else
-            printf( "%d", monitor->actionBrightness() );
+            printf("%d", monitor->actionBrightness());
           have_output = true;
         }
       }
       if ( function & ZMU_CONTRAST ) {
         if ( verbose ) {
           if ( contrast >= 0 )
-            printf( "New brightness: %d\n", monitor->actionContrast( contrast ) );
+            printf("New brightness: %d\n", monitor->actionContrast(contrast));
           else
-            printf( "Current contrast: %d\n", monitor->actionContrast() );
+            printf("Current contrast: %d\n", monitor->actionContrast());
         } else {
-          if ( have_output ) printf( "%c", separator );
+          if ( have_output ) printf("%c", separator);
           if ( contrast >= 0 )
-            printf( "%d", monitor->actionContrast( contrast ) );
+            printf("%d", monitor->actionContrast(contrast));
           else
-            printf( "%d", monitor->actionContrast() );
+            printf("%d", monitor->actionContrast());
           have_output = true;
         }
       }
       if ( function & ZMU_HUE ) {
         if ( verbose ) {
           if ( hue >= 0 )
-            printf( "New hue: %d\n", monitor->actionHue( hue ) );
+            printf("New hue: %d\n", monitor->actionHue(hue));
           else
-            printf( "Current hue: %d\n", monitor->actionHue() );
+            printf("Current hue: %d\n", monitor->actionHue());
         } else {
-          if ( have_output ) printf( "%c", separator );
+          if ( have_output ) printf("%c", separator);
           if ( hue >= 0 )
-            printf( "%d", monitor->actionHue( hue ) );
+            printf("%d", monitor->actionHue(hue));
           else
-            printf( "%d", monitor->actionHue() );
+            printf("%d", monitor->actionHue());
           have_output = true;
         }
       }
       if ( function & ZMU_COLOUR ) {
         if ( verbose ) {
           if ( colour >= 0 )
-            printf( "New colour: %d\n", monitor->actionColour( colour ) );
+            printf("New colour: %d\n", monitor->actionColour(colour));
           else
-            printf( "Current colour: %d\n", monitor->actionColour() );
+            printf("Current colour: %d\n", monitor->actionColour());
         } else {
-          if ( have_output ) printf( "%c", separator );
+          if ( have_output ) printf("%c", separator);
           if ( colour >= 0 )
-            printf( "%d", monitor->actionColour( colour ) );
+            printf("%d", monitor->actionColour(colour));
           else
-            printf( "%d", monitor->actionColour() );
+            printf("%d", monitor->actionColour());
           have_output = true;
         }
       }
       if ( have_output ) {
-        printf( "\n" );
+        printf("\n");
       }
       if ( !function ) {
         Usage();
       }
       delete monitor;
     } else {
-      fprintf(stderr, "Error, invalid monitor id %d\n", mon_id);
+      Error("Invalid monitor id %d", mon_id);
       exit_zmu(-1);
     }
   } else {
     if ( function & ZMU_QUERY ) {
 #if ZM_HAS_V4L
 			char vidString[0x10000] = "";
-			bool ok = LocalCamera::GetCurrentSettings( device, vidString, v4lVersion, verbose );
-			printf( "%s", vidString );
-			exit_zmu( ok?0:-1 );
+			bool ok = LocalCamera::GetCurrentSettings(device, vidString, v4lVersion, verbose);
+			printf("%s", vidString);
+			exit_zmu(ok ? 0 : -1);
 #else // ZM_HAS_V4L
-			fprintf( stderr, "Error, video4linux is required for device querying\n" );
-      exit_zmu( -1 );
+			Error("Video4linux is required for device querying");
+      exit_zmu(-1);
 #endif // ZM_HAS_V4L
     }
 
@@ -708,25 +704,25 @@ int main(int argc, char *argv[]) {
       }
       sql += " order by Id asc";
 
-      if ( mysql_query( &dbconn, sql.c_str() ) ) {
-        Error( "Can't run query: %s", mysql_error( &dbconn ) );
-        exit_zmu( mysql_errno( &dbconn ) );
+      if ( mysql_query(&dbconn, sql.c_str()) ) {
+        Error("Can't run query: %s", mysql_error(&dbconn));
+        exit_zmu(mysql_errno(&dbconn));
       }
 
-      MYSQL_RES *result = mysql_store_result( &dbconn );
+      MYSQL_RES *result = mysql_store_result(&dbconn);
       if ( !result ) {
-        Error( "Can't use query result: %s", mysql_error( &dbconn ) );
-        exit_zmu( mysql_errno( &dbconn ) );
+        Error("Can't use query result: %s", mysql_error(&dbconn));
+        exit_zmu(mysql_errno(&dbconn));
       }
-      Debug( 1, "Got %d monitors", mysql_num_rows( result ) );
+      Debug(1, "Got %d monitors", mysql_num_rows(result));
 
-      printf( "%4s%5s%6s%9s%14s%6s%6s%8s%8s\n", "Id", "Func", "State", "TrgState", "LastImgTim", "RdIdx", "WrIdx", "LastEvt", "FrmRate" );
-      for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ ) {
+      printf("%4s%5s%6s%9s%14s%6s%6s%8s%8s\n", "Id", "Func", "State", "TrgState", "LastImgTim", "RdIdx", "WrIdx", "LastEvt", "FrmRate");
+      for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row(result); i++ ) {
         int mon_id = atoi(dbrow[0]);
         int function = atoi(dbrow[1]);
-        if ( !user || user->canAccess( mon_id ) ) {
+        if ( !user || user->canAccess(mon_id) ) {
           if ( function > 1 ) {
-            Monitor *monitor = Monitor::Load( mon_id, false, Monitor::QUERY );
+            Monitor *monitor = Monitor::Load(mon_id, false, Monitor::QUERY);
             if ( monitor && monitor->connect() ) {
               struct timeval tv = monitor->GetTimestamp();
               printf( "%4d%5d%6d%9d%11ld.%02ld%6d%6d%8" PRIu64 "%8.2f\n",
@@ -744,7 +740,7 @@ int main(int argc, char *argv[]) {
             }
           } else {
             struct timeval tv = { 0, 0 };
-            printf( "%4d%5d%6d%9d%11ld.%02ld%6d%6d%8d%8.2f\n",
+            printf("%4d%5d%6d%9d%11ld.%02ld%6d%6d%8d%8.2f\n",
               mon_id,
               function,
               0,
@@ -755,11 +751,11 @@ int main(int argc, char *argv[]) {
               0,
               0.0
             );
-          }
-        }
-      }
-      mysql_free_result( result );
-    }
+          } // end if function filter
+        } // endif !user || canAccess(mon_id)
+      } // end foreach row
+      mysql_free_result(result);
+    } // end if function && ZMU_LIST
   }
   delete user;
 

From 79de2b65cde72927932f5c4152ec7fae0acb3bb5 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 4 Apr 2019 12:18:46 -0400
Subject: [PATCH 164/214] If we are saving jpegs we don't save a snapshot
 image, and since we may delay writing frame info to the db, we have to
 default to frame 0 instead of snapshot

---
 web/views/image.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/web/views/image.php b/web/views/image.php
index 672baf3f5..5959982d8 100644
--- a/web/views/image.php
+++ b/web/views/image.php
@@ -87,8 +87,9 @@ if ( empty($_REQUEST['path']) ) {
       $Frame->Id('objdetect');
     } else if ( $_REQUEST['fid'] == 'alarm' ) {
       # look for first alarmed frame
-      $Frame = ZM\Frame::find_one(array('EventId'=>$_REQUEST['eid'], 'Type'=>'Alarm'),
-                               array('order'=>'FrameId ASC'));
+      $Frame = ZM\Frame::find_one(
+        array('EventId'=>$_REQUEST['eid'], 'Type'=>'Alarm'),
+        array('order'=>'FrameId ASC'));
       if ( !$Frame ) { # no alarms, get first one I find
         $Frame = ZM\Frame::find_one(array('EventId'=>$_REQUEST['eid']));
         if ( !$Frame ) { 
@@ -101,7 +102,7 @@ if ( empty($_REQUEST['path']) ) {
       $Monitor = $Event->Monitor();
       if ( $Monitor->SaveJPEGs() & 1 ) {
         # If we store Frames as jpgs, then we don't store an alarmed snapshot
-        $path = $Event->Path().'/'.sprintf('%0'.ZM_EVENT_IMAGE_DIGITS.'d',$Frame->FrameId()).'-'.$show.'.jpg';
+        $path = $Event->Path().'/'.sprintf('%0'.ZM_EVENT_IMAGE_DIGITS.'d', $Frame->FrameId()).'-'.$show.'.jpg';
       } else {
         $path = $Event->Path().'/alarm.jpg';
       }
@@ -113,12 +114,16 @@ if ( empty($_REQUEST['path']) ) {
         ZM\Warning('No frame found for event ' . $_REQUEST['eid']);
         $Frame = new ZM\Frame();
         $Frame->Delta(1);
-        $Frame->FrameId('snapshot');
+        if ( $Monitor->SaveJPEGs() & 1 ) {
+          $Frame->FrameId(0);
+        } else {
+          $Frame->FrameId('snapshot');
+        }
       }
       $Monitor = $Event->Monitor();
       if ( $Monitor->SaveJPEGs() & 1 ) {
         # If we store Frames as jpgs, then we don't store a snapshot
-        $path = $Event->Path().'/'.sprintf('%0'.ZM_EVENT_IMAGE_DIGITS.'d',$Frame->FrameId()).'-'.$show.'.jpg';
+        $path = $Event->Path().'/'.sprintf('%0'.ZM_EVENT_IMAGE_DIGITS.'d', $Frame->FrameId()).'-'.$show.'.jpg';
       } else {
         $path = $Event->Path().'/snapshot.jpg';
       }

From 271937f005e3dc84662a5668d7b946972d285cd3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 4 Apr 2019 12:28:08 -0400
Subject: [PATCH 165/214] store the snapshot_file and alarm_file strings in the
 boject during construction so that we don't have to do it everytime we write
 out an image

---
 src/zm_event.cpp | 9 +++------
 src/zm_event.h   | 2 ++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index 876a031d4..c44f8ee93 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -193,6 +193,9 @@ Event::Event(
 
   video_name[0] = 0;
 
+  snprintf(snapshot_file, sizeof(snapshot_file), "%s/snapshot.jpg", path);
+  snprintf(alarm_file, sizeof(alarm_file), "%s/alarm.jpg", path);
+
   /* Save as video */
 
   if ( monitor->GetOptVideoWriter() != 0 ) {
@@ -464,8 +467,6 @@ void Event::AddFramesInternal( int n_frames, int start_frame, Image **images, st
       // neccessarily be of the motion.  But some events are less than 10 frames, 
       // so I am changing this to 1, but we should overwrite it later with a better snapshot.
       if ( frames == 1 ) {
-        char snapshot_file[PATH_MAX];
-        snprintf(snapshot_file, sizeof(snapshot_file), "%s/snapshot.jpg", path);
         WriteFrameImage(images[i], *(timestamps[i]), snapshot_file);
       }
     }
@@ -549,15 +550,11 @@ void Event::AddFrame(Image *image, struct timeval timestamp, int score, Image *a
   } else {
     //If this is the first frame, we should add a thumbnail to the event directory
     if ( frames == 1 || score > (int)max_score ) {
-      char snapshot_file[PATH_MAX];
-      snprintf(snapshot_file, sizeof(snapshot_file), "%s/snapshot.jpg", path);
       WriteFrameImage(image, timestamp, snapshot_file);
     }
     // The first frame with a score will be the frame that alarmed the event
     if (!alarm_frame_written && score > 0) {
       alarm_frame_written = true;
-      char alarm_file[PATH_MAX];
-      snprintf(alarm_file, sizeof(alarm_file), "%s/alarm.jpg", path);
       WriteFrameImage(image, timestamp, alarm_file);
     }
   }
diff --git a/src/zm_event.h b/src/zm_event.h
index 1d31addcc..2035b6af6 100644
--- a/src/zm_event.h
+++ b/src/zm_event.h
@@ -90,6 +90,8 @@ class Event {
     unsigned int  tot_score;
     unsigned int  max_score;
     char      path[PATH_MAX];
+    char snapshot_file[PATH_MAX];
+    char alarm_file[PATH_MAX];
     VideoWriter* videowriter;
     FILE* timecodes_fd;
     char video_name[PATH_MAX];

From f6d5038586f524bb3331f5e2ebb4b2ca69084692 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 4 Apr 2019 12:37:25 -0400
Subject: [PATCH 166/214] we only use event_file if we are writing out a jpg,
 so only generate the event_file string if we are writing out jpgs

---
 src/zm_event.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index c44f8ee93..3fda77e11 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -456,9 +456,9 @@ void Event::AddFramesInternal( int n_frames, int start_frame, Image **images, st
 
     frames++;
 
-    static char event_file[PATH_MAX];
-    snprintf(event_file, sizeof(event_file), staticConfig.capture_file_format, path, frames);
     if ( monitor->GetOptSaveJPEGs() & 1 ) {
+      static char event_file[PATH_MAX];
+      snprintf(event_file, sizeof(event_file), staticConfig.capture_file_format, path, frames);
       Debug(1, "Writing pre-capture frame %d", frames);
       WriteFrameImage(images[i], *(timestamps[i]), event_file);
     } else {
@@ -539,27 +539,25 @@ void Event::AddFrame(Image *image, struct timeval timestamp, int score, Image *a
 
   frames++;
 
-  static char event_file[PATH_MAX];
-  snprintf(event_file, sizeof(event_file), staticConfig.capture_file_format, path, frames);
-
   if ( monitor->GetOptSaveJPEGs() & 1 ) {
+    static char event_file[PATH_MAX];
+    snprintf(event_file, sizeof(event_file), staticConfig.capture_file_format, path, frames);
     Debug(1, "Writing capture frame %d to %s", frames, event_file);
     if ( ! WriteFrameImage(image, timestamp, event_file) ) {
       Error("Failed to write frame image");
     }
   } else {
     //If this is the first frame, we should add a thumbnail to the event directory
-    if ( frames == 1 || score > (int)max_score ) {
+    if ( (frames == 1) || (score > (int)max_score) ) {
       WriteFrameImage(image, timestamp, snapshot_file);
     }
     // The first frame with a score will be the frame that alarmed the event
-    if (!alarm_frame_written && score > 0) {
+    if ( (!alarm_frame_written) && (score > 0) ) {
       alarm_frame_written = true;
       WriteFrameImage(image, timestamp, alarm_file);
     }
   }
   if ( videowriter != NULL ) {
-Debug(3, "Writing video");
     WriteFrameVideo(image, timestamp, videowriter);
   }
 
@@ -625,7 +623,7 @@ Debug(3, "Writing video");
         }
       }
     }
-  }
+  } // end if frame_type == ALARM
 
   /* This makes viewing the diagnostic images impossible because it keeps deleting them
   if ( config.record_diag_images ) {

From bc6249309699fb865f191e16acd9beb68be748a5 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 4 Apr 2019 12:55:35 -0400
Subject: [PATCH 167/214] Increase sql buffer space because we are using path
 strings that are PATH_MAX size.

---
 src/zm_event.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index 3fda77e11..7b8b446d4 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -254,7 +254,7 @@ Event::~Event() {
     WriteDbFrames();
 
   // Should not be static because we might be multi-threaded
-  char sql[ZM_SQL_MED_BUFSIZ];
+  char sql[ZM_SQL_LGE_BUFSIZ];
   snprintf(sql, sizeof(sql), 
       "UPDATE Events SET Name='%s %" PRIu64 "', EndTime = from_unixtime( %ld ), Length = %s%ld.%02ld, Frames = %d, AlarmFrames = %d, TotScore = %d, AvgScore = %d, MaxScore = %d, DefaultVideo = '%s' WHERE Id = %" PRIu64,
       monitor->EventPrefix(), id, end_time.tv_sec,
@@ -616,6 +616,7 @@ void Event::AddFrame(Image *image, struct timeval timestamp, int score, Image *a
 
     if ( alarm_image ) {
       if ( monitor->GetOptSaveJPEGs() & 2 ) {
+        static char event_file[PATH_MAX];
         snprintf(event_file, sizeof(event_file), staticConfig.analyse_file_format, path, frames);
         Debug(1, "Writing analysis frame %d", frames);
         if ( ! WriteFrameImage(alarm_image, timestamp, event_file, true) ) {

From 7955a1c9b2d85c39e8ca831f009d9a3978e89fc1 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 4 Apr 2019 12:56:00 -0400
Subject: [PATCH 168/214] fix version check to get rid of deprecated
 av_register_all

---
 src/zm_ffmpeg.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_ffmpeg.cpp b/src/zm_ffmpeg.cpp
index 578e12e6b..c5bc1b471 100644
--- a/src/zm_ffmpeg.cpp
+++ b/src/zm_ffmpeg.cpp
@@ -78,7 +78,7 @@ void FFMPEGInit() {
         av_log_set_callback(log_libav_callback); 
     else
         Info("Not enabling ffmpeg logs, as LOG_FFMPEG is disabled in options");
-#if LIBAVCODEC_VERSION_CHECK(58, 18, 0, 64, 0)
+#if LIBAVFORMAT_VERSION_CHECK(58, 9, 0, 64, 0)
 #else
     av_register_all();
 #endif

From d97dd6cdd97438de87c97cbfd69599ef99ad3dde Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 4 Apr 2019 14:11:56 -0400
Subject: [PATCH 169/214] Should close videostore before closing input
 codecs/streams.

---
 src/zm_ffmpeg_camera.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index 04b4588d9..c07c9312e 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -675,6 +675,11 @@ int FfmpegCamera::Close() {
   }
 #endif
 
+  if ( videoStore ) {
+    delete videoStore;
+    videoStore = NULL;
+  }
+
   if ( mVideoCodecContext ) {
     avcodec_close(mVideoCodecContext);
     Debug(1,"After codec close");
@@ -700,10 +705,6 @@ int FfmpegCamera::Close() {
     mFormatContext = NULL;
   }
 
-  if ( videoStore ) {
-    delete videoStore;
-    videoStore = NULL;
-  }
   if ( packetqueue ) {
     delete packetqueue;
     packetqueue = NULL;

From 9ae6acf532f4bc471adc61a4ed417a15ddd34fde Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Thu, 4 Apr 2019 17:20:21 -0400
Subject: [PATCH 170/214] Fix for opening audio_in_codec

---
 src/zm_ffmpeg.cpp        |  1 +
 src/zm_ffmpeg_camera.cpp | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/zm_ffmpeg.cpp b/src/zm_ffmpeg.cpp
index c5bc1b471..63c0c9aa3 100644
--- a/src/zm_ffmpeg.cpp
+++ b/src/zm_ffmpeg.cpp
@@ -437,6 +437,7 @@ unsigned int zm_av_packet_ref( AVPacket *dst, AVPacket *src ) {
   dst->pts = src->pts;
   dst->dts = src->dts;
   dst->duration = src->duration;
+  dst->stream_index = src->stream_index;
   return 0;
 }
 #endif
diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index 04b4588d9..ae04e0bc9 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -565,15 +565,23 @@ int FfmpegCamera::OpenFfmpeg() {
     Debug(1, "HWACCEL not in use");
   }
   if ( mAudioStreamId >= 0 ) {
+    if ( (mAudioCodec = avcodec_find_decoder(
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-    mAudioCodecContext = avcodec_alloc_context3( NULL );
-    avcodec_parameters_to_context( mAudioCodecContext, mFormatContext->streams[mAudioStreamId]->codecpar );
+            mFormatContext->streams[mAudioStreamId]->codecpar->codec_id
 #else
-    mAudioCodecContext = mFormatContext->streams[mAudioStreamId]->codec;
+            mFormatContext->streams[mAudioStreamId]->codec->codec_id
 #endif
-    if ( (mAudioCodec = avcodec_find_decoder(mAudioCodecContext->codec_id)) == NULL ) {
+            )) == NULL ) {
       Debug(1, "Can't find codec for audio stream from %s", mPath.c_str());
     } else {
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+      mAudioCodecContext = avcodec_alloc_context3(mAudioCodec);
+      avcodec_parameters_to_context( mAudioCodecContext, mFormatContext->streams[mAudioStreamId]->codecpar );
+#else
+      mAudioCodecContext = mFormatContext->streams[mAudioStreamId]->codec;
+     // = avcodec_alloc_context3(mAudioCodec);
+#endif
+
       Debug(1, "Audio Found decoder");
       zm_dump_stream_format(mFormatContext, mAudioStreamId, 0, 0);
       // Open the codec
@@ -584,7 +592,7 @@ int FfmpegCamera::OpenFfmpeg() {
       Debug ( 1, "Calling avcodec_open2" );
       if ( avcodec_open2(mAudioCodecContext, mAudioCodec, 0) < 0 ) {
 #endif
-        Error( "Unable to open codec for video stream from %s", mPath.c_str() );
+        Error( "Unable to open codec for audio stream from %s", mPath.c_str() );
         return -1;
       }
       Debug(2, "Opened audio codec");

From aaef151815a1909dfba7153aaf7fa7cbf0a72193 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 5 Apr 2019 13:18:06 -0400
Subject: [PATCH 171/214] ZM_VERSION is a constant not a scalar variable

---
 scripts/ZoneMinder/lib/ZoneMinder/Control/Dahua.pm    | 2 +-
 scripts/ZoneMinder/lib/ZoneMinder/Control/PSIA.pm     | 2 +-
 scripts/ZoneMinder/lib/ZoneMinder/Control/Trendnet.pm | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Dahua.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Dahua.pm
index e274aaaf7..e55a6da1c 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Dahua.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Dahua.pm
@@ -84,7 +84,7 @@ sub open
 
     use LWP::UserAgent;
     $self->{ua} = LWP::UserAgent->new(keep_alive => 1);
-    $self->{ua}->agent("ZoneMinder Control Agent/".$ZoneMinder::Base::ZM_VERSION);
+    $self->{ua}->agent("ZoneMinder Control Agent/".ZoneMinder::Base::ZM_VERSION);
     $self->{state} = 'closed';
 #   credentials:  ("ip:port" (no prefix!), realm (string), username (string), password (string)
     $self->{ua}->credentials($ADDRESS, $REALM, $USERNAME, $PASSWORD);
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/PSIA.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/PSIA.pm
index fe067fe1f..438c5cff5 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/PSIA.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/PSIA.pm
@@ -40,7 +40,7 @@ sub open
 
     use LWP::UserAgent;
     $self->{ua} = LWP::UserAgent->new;
-    $self->{ua}->agent( "ZoneMinder Control Agent/".$ZoneMinder::Base::ZM_VERSION );
+    $self->{ua}->agent( "ZoneMinder Control Agent/".ZoneMinder::Base::ZM_VERSION );
     $self->{state} = 'closed';
     Debug( "sendCmd credentials control address:'".$ADDRESS
             ."'  realm:'" . $REALM
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Trendnet.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Trendnet.pm
index 4ee710297..c57fc5c62 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Trendnet.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Trendnet.pm
@@ -45,7 +45,7 @@ sub open {
 
   use LWP::UserAgent;
   $self->{ua} = LWP::UserAgent->new;
-  $self->{ua}->agent('ZoneMinder Control Agent/'.$ZoneMinder::Base::ZM_VERSION);
+  $self->{ua}->agent('ZoneMinder Control Agent/'.ZoneMinder::Base::ZM_VERSION);
   $self->{state} = 'closed';
   #   credentials:  ("ip:port" (no prefix!), realm (string), username (string), password (string)
   Debug ( "sendCmd credentials control address:'".$ADDRESS

From e1873b1693b4b15b6df184f729538c69515f6975 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 5 Apr 2019 15:17:13 -0400
Subject: [PATCH 172/214] debug response content

---
 scripts/ZoneMinder/lib/ZoneMinder/Control/Trendnet.pm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Trendnet.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Trendnet.pm
index c57fc5c62..4afba372c 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Trendnet.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Trendnet.pm
@@ -120,6 +120,7 @@ sub sendCmd {
 
   Debug('sendCmd command: ' . $url);
   if ( $res->is_success ) {
+    Debug($res->content);
     return !undef;
   }
   Error("Error check failed: '".$res->status_line()."' cmd:'".$cmd."'");
@@ -155,6 +156,7 @@ sub sendCmdPost {
   Debug("sendCmdPost credentials control to: $PROTOCOL$ADDRESS$url realm:'" . $REALM . "'  username:'" . $USERNAME . "' password:'".$PASSWORD."'");
 
   if ( $res->is_success ) {
+    Debug($res->content);
     return !undef;
   }
   Error("sendCmdPost Error check failed: '".$res->status_line()."' cmd:");

From aa83239069431ad387c43fa659a4204709832dd8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 5 Apr 2019 15:18:03 -0400
Subject: [PATCH 173/214] rework zmcontrol.pl.  If command is given and server
 is not up, use zmdc.pl to start it. Give up after 10 seconds.

---
 scripts/zmcontrol.pl.in | 185 ++++++++++++++++++++--------------------
 1 file changed, 91 insertions(+), 94 deletions(-)

diff --git a/scripts/zmcontrol.pl.in b/scripts/zmcontrol.pl.in
index b0388bcf3..f83bc82d4 100644
--- a/scripts/zmcontrol.pl.in
+++ b/scripts/zmcontrol.pl.in
@@ -30,7 +30,7 @@ use autouse 'Pod::Usage'=>qw(pod2usage);
 use POSIX qw/strftime EPIPE/;
 use Socket;
 #use Data::Dumper;
-use Module::Load::Conditional qw{can_load};;
+use Module::Load::Conditional qw{can_load};
 
 use constant MAX_CONNECT_DELAY => 15;
 use constant MAX_COMMAND_WAIT => 1800;
@@ -43,7 +43,7 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
 logInit();
 
-my $arg_string = join( " ", @ARGV );
+my $arg_string = join(' ', @ARGV);
 
 my $id;
 my %options;
@@ -64,22 +64,46 @@ GetOptions(
 ) or pod2usage(-exitstatus => -1);
 
 if ( !$id ) {
-  print( STDERR "Please give a valid monitor id\n" );
+  print(STDERR "Please give a valid monitor id\n");
   pod2usage(-exitstatus => -1);
 }
 
 ( $id ) = $id =~ /^(\w+)$/;
 
-Debug("zmcontrol: arg string: $arg_string");
 
 my $sock_file = $Config{ZM_PATH_SOCKS}.'/zmcontrol-'.$id.'.sock';
+Debug("zmcontrol: arg string: $arg_string sock file $sock_file");
 
-socket(CLIENT, PF_UNIX, SOCK_STREAM, 0)
-  or Fatal("Can't open socket: $!");
+socket(CLIENT, PF_UNIX, SOCK_STREAM, 0) or Fatal("Can't open socket: $!");
 
 my $saddr = sockaddr_un($sock_file);
-my $server_up = connect(CLIENT, $saddr);
-if ( !$server_up ) {
+
+if ( $options{command} ) {
+  # Have a command, so we are the client, connect to the server and send it.
+
+  my $tries = 10;
+  my $server_up;
+  while ( $tries and ! ( $server_up = connect(CLIENT, $saddr) ) ) {
+    Debug("Failed to connect to $server_up at $sock_file");
+    runCommand("zmdc.pl start zmcontrol.pl --id=$id");
+    sleep 1;
+    $tries -= 1;
+  }
+  if ( $server_up ) {
+    # The server is there, connect to it
+    #print( "Writing commands\n" );
+    CLIENT->autoflush();
+
+    if ( $options{command} ) {
+      my $message = jsonEncode(\%options);
+      print(CLIENT $message);
+    }
+    shutdown(CLIENT, 1);
+  } else {
+    Error("Unable to connect to zmcontrol server at $sock_file");
+  }
+} else {
+
   # The server isn't there
   my $monitor = zmDbGetMonitorAndControl($id);
   if ( !$monitor ) {
@@ -113,99 +137,72 @@ if ( !$server_up ) {
     Fatal("Can't load ZoneMinder::Control::$protocol\n$Module::Load::Conditional::ERROR");
   }
 
-  if ( my $cpid = fork() ) {
-    logReinit();
+  Info("Control server $id/$protocol starting at "
+    .strftime('%y/%m/%d %H:%M:%S', localtime())
+  );
 
-    # Parent process just sleep and fall through
-    socket(CLIENT, PF_UNIX, SOCK_STREAM, 0)
-      or die("Can't open socket: $!");
-    my $attempts = 0;
-    while ( !connect(CLIENT, $saddr) ) {
-      $attempts++;
-      Fatal("Can't connect: $! after $attempts attempts to $sock_file") if $attempts > MAX_CONNECT_DELAY;
-      sleep(1);
-    }
-  } elsif ( defined($cpid) ) {
-    close(STDOUT);
-    close(STDERR);
+  $0 = $0." --id=$id";
 
-    setpgrp();
+  my $control = "ZoneMinder::Control::$protocol"->new($id);
+  my $control_key = $control->getKey();
+  $control->loadMonitor();
 
-    logReinit();
+  $control->open();
 
-    Info("Control server $id/$protocol starting at "
-      .strftime('%y/%m/%d %H:%M:%S', localtime())
-    );
-
-    $0 = $0." --id $id";
-
-    my $control = "ZoneMinder::Control::$protocol"->new($id);
-    my $control_key = $control->getKey();
-    $control->loadMonitor();
-
-    $control->open();
-
-    socket(SERVER, PF_UNIX, SOCK_STREAM, 0)
-      or Fatal("Can't open socket: $!");
-    unlink($sock_file);
-    bind(SERVER, $saddr) or Fatal("Can't bind: $!");
-    listen(SERVER, SOMAXCONN) or Fatal("Can't listen: $!");
-
-    my $rin = '';
-    vec( $rin, fileno(SERVER), 1 ) = 1;
-    my $win = $rin;
-    my $ein = $win;
-    my $timeout = MAX_COMMAND_WAIT;
-    while( 1 ) {
-      my $nfound = select(my $rout = $rin, undef, undef, $timeout);
-      if ( $nfound > 0 ) {
-        if ( vec( $rout, fileno(SERVER), 1 ) ) {
-          my $paddr = accept(CLIENT, SERVER);
-          my $message = <CLIENT>;
-
-          next if !$message;
-
-          my $params = jsonDecode($message);
-          #Debug( Dumper( $params ) );
-
-          my $command = $params->{command};
-          close( CLIENT );
-          if ( $command eq 'quit' ) {
-            last;
-          }
-          $control->$command($params);
-        } else {
-          Fatal('Bogus descriptor');
-        }
-      } elsif ( $nfound < 0 ) {
-        if ( $! == EPIPE ) {
-          Error("Can't select: $!");
-        } else {
-          Fatal("Can't select: $!");
-        }
-      } else {
-        #print( "Select timed out\n" );
-        last;
-      }
-    } # end while forever
-    Info("Control server $id/$protocol exiting");
-    unlink($sock_file);
-    $control->close();
-    exit(0);
-  } else {
-    Fatal("Can't fork: $!");
+  # If we have a command when starting up, then do it.
+  if ( $options{command} ) {
+    my $command = $options{command};
+    $control->$command(\%options);
   }
+
+  socket(SERVER, PF_UNIX, SOCK_STREAM, 0) or Fatal("Can't open socket: $!");
+  unlink($sock_file);
+  bind(SERVER, $saddr) or Fatal("Can't bind: $!");
+  listen(SERVER, SOMAXCONN) or Fatal("Can't listen: $!");
+
+  my $rin = '';
+  vec( $rin, fileno(SERVER), 1 ) = 1;
+  my $win = $rin;
+  my $ein = $win;
+  my $timeout = MAX_COMMAND_WAIT;
+  while( 1 ) {
+    my $nfound = select(my $rout = $rin, undef, undef, $timeout);
+    if ( $nfound > 0 ) {
+      if ( vec( $rout, fileno(SERVER), 1 ) ) {
+        my $paddr = accept(CLIENT, SERVER);
+        my $message = <CLIENT>;
+
+        next if !$message;
+
+        my $params = jsonDecode($message);
+        #Debug( Dumper( $params ) );
+
+        my $command = $params->{command};
+        close( CLIENT );
+        if ( $command eq 'quit' ) {
+          last;
+        }
+        $control->$command($params);
+      } else {
+        Fatal('Bogus descriptor');
+      }
+    } elsif ( $nfound < 0 ) {
+      if ( $! == EPIPE ) {
+        Error("Can't select: $!");
+      } else {
+        Fatal("Can't select: $!");
+      }
+    } else {
+      #print( "Select timed out\n" );
+      last;
+    }
+  } # end while forever
+  Info("Control server $id/$protocol exiting");
+  unlink($sock_file);
+  $control->close();
+  exit(0);
 } # end if !server up
 
-# The server is there, connect to it
-#print( "Writing commands\n" );
-CLIENT->autoflush();
-
-if ( $options{command} ) {
-  my $message = jsonEncode(\%options);
-  print(CLIENT $message);
-}
-shutdown(CLIENT, 1);
 
 exit(0);
 

From 381f526d66874703b877a315e108a6d4c82cb4a8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 5 Apr 2019 15:18:20 -0400
Subject: [PATCH 174/214] spacing

---
 web/includes/control_functions.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/web/includes/control_functions.php b/web/includes/control_functions.php
index bea235668..77240df49 100644
--- a/web/includes/control_functions.php
+++ b/web/includes/control_functions.php
@@ -735,29 +735,29 @@ function buildControlCommand( $monitor ) {
   return( $ctrlCommand );
 }
 
-function sendControlCommand($mid,$command) {
+function sendControlCommand($mid, $command) {
   // Either connects to running zmcontrol.pl or runs zmcontrol.pl to send the command.
-  $socket = socket_create( AF_UNIX, SOCK_STREAM, 0 );
+  $socket = socket_create(AF_UNIX, SOCK_STREAM, 0);
   if ( $socket < 0 ) {
-    Fatal( 'socket_create() failed: '.socket_strerror($socket) );
+    Fatal('socket_create() failed: '.socket_strerror($socket));
   }
   $sockFile = ZM_PATH_SOCKS.'/zmcontrol-'.$mid.'.sock';
-  if ( @socket_connect( $socket, $sockFile ) ) {
+  if ( @socket_connect($socket, $sockFile) ) {
     $options = array();
-    foreach ( explode( ' ', $command ) as $option ) {
-      if ( preg_match( '/--([^=]+)(?:=(.+))?/', $option, $matches ) ) {
+    foreach ( explode(' ', $command) as $option ) {
+      if ( preg_match('/--([^=]+)(?:=(.+))?/', $option, $matches) ) {
         $options[$matches[1]] = $matches[2]?$matches[2]:1;
       }
     }
-    $optionString = jsonEncode( $options );
-    if ( !socket_write( $socket, $optionString ) ) {
-      Fatal( "Can't write to control socket: ".socket_strerror(socket_last_error($socket)) );
+    $optionString = jsonEncode($options);
+    if ( !socket_write($socket, $optionString) ) {
+      Fatal("Can't write to control socket: ".socket_strerror(socket_last_error($socket)));
     }
-    socket_close( $socket );
+    socket_close($socket);
   } else if ( $command != 'quit' ) {
     $command .= ' --id='.$mid;
 
     // Can't connect so use script
-    $ctrlOutput = exec( escapeshellcmd( $command ) );
+    $ctrlOutput = exec(escapeshellcmd($command));
   }
-} // end function sendControlCommand( $mid, $command )
+} // end function sendControlCommand($mid, $command)

From f719dd9acc4b042be9b56999be179fabbe166b83 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 7 Apr 2019 10:29:02 -0400
Subject: [PATCH 175/214] always commit buffered db_frames when we have a new
 max score image or alarm cause image

---
 src/zm_event.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index 7b8b446d4..330f421eb 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -538,6 +538,7 @@ void Event::AddFrame(Image *image, struct timeval timestamp, int score, Image *a
   }
 
   frames++;
+  bool write_to_db = false;
 
   if ( monitor->GetOptSaveJPEGs() & 1 ) {
     static char event_file[PATH_MAX];
@@ -549,10 +550,12 @@ void Event::AddFrame(Image *image, struct timeval timestamp, int score, Image *a
   } else {
     //If this is the first frame, we should add a thumbnail to the event directory
     if ( (frames == 1) || (score > (int)max_score) ) {
+      write_to_db = true; // web ui might show this as thumbnail, so db needs to know about it.
       WriteFrameImage(image, timestamp, snapshot_file);
     }
     // The first frame with a score will be the frame that alarmed the event
     if ( (!alarm_frame_written) && (score > 0) ) {
+      write_to_db = true; // OD processing will need it, so the db needs to know about it
       alarm_frame_written = true;
       WriteFrameImage(image, timestamp, alarm_file);
     }
@@ -574,7 +577,7 @@ void Event::AddFrame(Image *image, struct timeval timestamp, int score, Image *a
     static char sql[ZM_SQL_MED_BUFSIZ];
 
     frame_data.push(new Frame(id, frames, frame_type, timestamp, delta_time, score));
-    if ( frame_data.size() > 20 ) {
+    if ( write_to_db || ( frame_data.size() > 20 ) ) {
       WriteDbFrames();
       Debug(1, "Adding 20 frames to DB");
       last_db_frame = frames;

From d776f63bd85bc8a56f29115dcaafb2815072d260 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 7 Apr 2019 17:23:39 -0400
Subject: [PATCH 176/214] Change MonitorIds from TinyText to TEXT. Fixes #2569

---
 db/zm_create.sql.in     | 2 +-
 db/zm_update-1.33.6.sql | 1 +
 version                 | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 db/zm_update-1.33.6.sql

diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 1eaca832b..c197d09ab 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -639,7 +639,7 @@ CREATE TABLE `Users` (
   `Devices` enum('None','View','Edit') NOT NULL default 'None',
   `System` enum('None','View','Edit') NOT NULL default 'None',
   `MaxBandwidth` varchar(16),
-  `MonitorIds` tinytext,
+  `MonitorIds` text,
   PRIMARY KEY (`Id`),
   UNIQUE KEY `UC_Username` (`Username`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
diff --git a/db/zm_update-1.33.6.sql b/db/zm_update-1.33.6.sql
new file mode 100644
index 000000000..159f80ac6
--- /dev/null
+++ b/db/zm_update-1.33.6.sql
@@ -0,0 +1 @@
+ALTER TABLE Users MODIFY MonitorIds text;
diff --git a/version b/version
index ad5831d4d..170749774 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.33.5
+1.33.6

From 4b2fe5c3c7fb50d590e354afe7642e301d024c5e Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Sun, 7 Apr 2019 18:21:52 -0500
Subject: [PATCH 177/214] Update zoneminder.spec

---
 distros/redhat/zoneminder.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index 1f0352fc4..440b05acc 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -23,7 +23,7 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.33.4
+Version: 1.33.6
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
@@ -410,11 +410,14 @@ EOF
 %dir %attr(755,nginx,nginx) %{_localstatedir}/spool/zoneminder-upload
 
 %changelog
+* Sun Apr 07 2019 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.33.6-1
+- Bump to 1.33.6 Development
+
 * Sat Mar 30 2019 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.33.4-1
-- Bump tp 1.33.4 Development
+- Bump to 1.33.4 Development
 
 * Tue Dec 11 2018 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.33.0-1
-- Bump tp 1.33.0 Development
+- Bump to 1.33.0 Development
 
 * Sat Dec 08 2018 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.32.3-1
 - 1.32.3 Release

From 3c57d79669ecd33086c0c886f5381488e0cd47fc Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 8 Apr 2019 10:04:26 -0400
Subject: [PATCH 178/214] Go back to using video_first_dts

---
 src/zm_videostore.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 8b307ed7e..51e4805ef 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -93,7 +93,6 @@ VideoStore::VideoStore(
   oc->metadata = pmetadata;
   out_format = oc->oformat;
 
-
   video_out_codec = avcodec_find_encoder(video_in_ctx->codec_id);
   if ( !video_out_codec ) {
 #if (LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 11, 0) && (LIBAVFORMAT_VERSION_MICRO >= 100))
@@ -870,7 +869,7 @@ int VideoStore::writeVideoFramePacket(AVPacket *ipkt) {
   dumpPacket(video_in_stream, ipkt, "input packet");
 
   int64_t duration;
-  if ( ipkt->duration && ( ipkt->duration != AV_NOPTS_VALUE ) ) {
+  if ( ipkt->duration != AV_NOPTS_VALUE ) {
     duration = av_rescale_q(
         ipkt->duration,
         video_in_stream->time_base,
@@ -929,8 +928,9 @@ int VideoStore::writeVideoFramePacket(AVPacket *ipkt) {
   }
   // Just because the in stream wraps, doesn't mean the out needs to.  Really, if we are limiting ourselves to 10min segments I can't imagine every wrapping in the out.  So need to handle in wrap, without causing out wrap.
   if ( ipkt->dts != AV_NOPTS_VALUE ) {
-#if 0
-    if ( (!video_first_dts) && ( ipkt->dts >= 0 ) ) {
+#if 1
+    if ( (!video_first_dts) ) {
+     // && ( ipkt->dts >= 0 ) ) {
       // This is the first packet.
       opkt.dts = 0;
       Debug(1, "Starting video first_dts will become (%" PRId64 ")", ipkt->dts);
@@ -938,14 +938,14 @@ int VideoStore::writeVideoFramePacket(AVPacket *ipkt) {
     } else {
 #endif
       opkt.dts = av_rescale_q(
-          ipkt->dts - video_first_pts,
+          ipkt->dts - video_first_dts,
           video_in_stream->time_base,
           video_out_stream->time_base
           );
       Debug(3, "opkt.dts = %" PRId64 " from ipkt->dts(%" PRId64 ") - first_pts(%" PRId64 ")",
-          opkt.dts, ipkt->dts, video_first_pts);
+          opkt.dts, ipkt->dts, video_first_dts);
       video_last_dts = ipkt->dts;
-#if 0
+#if 1
     }
 #endif
     if ( opkt.dts > opkt.pts ) {

From e81c216b4a8d64670f68affc9d6bd12689e23fac Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 8 Apr 2019 13:51:13 -0400
Subject: [PATCH 179/214] add more fields in dump_codec.

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

diff --git a/src/zm_ffmpeg.cpp b/src/zm_ffmpeg.cpp
index 63c0c9aa3..d49210cbf 100644
--- a/src/zm_ffmpeg.cpp
+++ b/src/zm_ffmpeg.cpp
@@ -320,7 +320,8 @@ void zm_dump_codecpar ( const AVCodecParameters *par ) {
 #endif
 
 void zm_dump_codec(const AVCodecContext *codec) {
-  Debug(1, "Dumping codec_context codec_type(%d) codec_id(%d) width(%d) height(%d)  timebase(%d/%d) format(%s)",
+  Debug(1, "Dumping codec_context codec_type(%d) codec_id(%d) width(%d) height(%d)  timebase(%d/%d) format(%s)\n"
+      "gop_size %d max_b_frames %d me_cmp %d me_range %d qmin %d qmax %d",
     codec->codec_type,
     codec->codec_id,
     codec->width,
@@ -328,11 +329,17 @@ void zm_dump_codec(const AVCodecContext *codec) {
     codec->time_base.num,
     codec->time_base.den,
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-    (codec->pix_fmt == AV_PIX_FMT_NONE ? "none" : av_get_pix_fmt_name(codec->pix_fmt))
+    (codec->pix_fmt == AV_PIX_FMT_NONE ? "none" : av_get_pix_fmt_name(codec->pix_fmt)),
 #else
-    "unsupported on avconv"
+    "unsupported on avconv",
 #endif
-); 
+    codec->gop_size,
+    codec->max_b_frames,
+    codec->me_cmp,
+    codec->me_range,
+    codec->qmin,
+    codec->qmax
+    );
 }
 
 /* "user interface" functions */
@@ -356,9 +363,9 @@ void zm_dump_stream_format(AVFormatContext *ic, int i, int index, int is_output)
     Debug(1, "ids [0x%x]", st->id);
   if (lang)
     Debug(1, "language (%s)", lang->value);
-  Debug(1, "frames:%d, frame_size:%d stream timebase: %d/%d codec timebase: %d/%d",
-      st->codec_info_nb_frames, codec->frame_size, st->time_base.num, st->time_base.den,
-      st->codec->time_base.num, st->codec->time_base.den
+  Debug(1, "frames:%d, frame_size:%d stream timebase: %d/%d",
+      st->codec_info_nb_frames, codec->frame_size,
+      st->time_base.num, st->time_base.den
       );
   avcodec_string(buf, sizeof(buf), st->codec, is_output);
   Debug(1, "codec: %s", buf);
@@ -377,17 +384,14 @@ void zm_dump_stream_format(AVFormatContext *ic, int i, int index, int is_output)
         display_aspect_ratio.num, display_aspect_ratio.den);
   }
 
-  if ( st->codec->codec_type == AVMEDIA_TYPE_VIDEO ) {
+  if ( codec->codec_type == AVMEDIA_TYPE_VIDEO ) {
     int fps = st->avg_frame_rate.den && st->avg_frame_rate.num;
     int tbn = st->time_base.den && st->time_base.num;
-    int tbc = st->codec->time_base.den && st->codec->time_base.num;
 
     if (fps)
       zm_log_fps(av_q2d(st->avg_frame_rate), "fps");
     if (tbn)
       zm_log_fps(1 / av_q2d(st->time_base), "stream tb numerator");
-    if (tbc)
-      zm_log_fps(1 / av_q2d(st->codec->time_base), "codec time base:");
   }
 
   if (st->disposition & AV_DISPOSITION_DEFAULT)

From accaeadb188aaabd9ea07ea4bf2c705f33a59ae8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 8 Apr 2019 13:51:41 -0400
Subject: [PATCH 180/214] code cleanup.  dump_codecs

---
 src/zm_ffmpeg_camera.cpp | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index da25b5f62..152f426f2 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -535,31 +535,23 @@ int FfmpegCamera::OpenFfmpeg() {
     zm_dump_stream_format(mFormatContext, mVideoStreamId, 0, 0);
     // Open the codec
 #if !LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 8, 0)
-    Debug(1, "Calling avcodec_open");
-    if ( avcodec_open(mVideoCodecContext, mVideoCodec) < 0 )
+    ret = avcodec_open(mVideoCodecContext, mVideoCodec);
 #else
-      Debug(1, "Calling avcodec_open2");
-    if ( avcodec_open2(mVideoCodecContext, mVideoCodec, &opts) < 0 )
+    ret = avcodec_open2(mVideoCodecContext, mVideoCodec, &opts);
 #endif
-    {
-      AVDictionaryEntry *e = NULL;
-      while ( (e = av_dict_get(opts, "", e, AV_DICT_IGNORE_SUFFIX)) != NULL ) {
-        Warning( "Option %s not recognized by ffmpeg", e->key);
-      }
-      Error( "Unable to open codec for video stream from %s", mPath.c_str() );
+    AVDictionaryEntry *e = NULL;
+    while ( (e = av_dict_get(opts, "", e, AV_DICT_IGNORE_SUFFIX)) != NULL ) {
+      Warning( "Option %s not recognized by ffmpeg", e->key);
+    }
+    if ( ret < 0 ) {
+      Error("Unable to open codec for video stream from %s", mPath.c_str());
       av_dict_free(&opts);
       return -1;
-    } else {
-
-      AVDictionaryEntry *e = NULL;
-      if ( (e = av_dict_get(opts, "", e, AV_DICT_IGNORE_SUFFIX)) != NULL ) {
-        Warning( "Option %s not recognized by ffmpeg", e->key);
-      }
-      av_dict_free(&opts);
     }
+    zm_dump_codec(mVideoCodecContext);
   }
 
-  if (mVideoCodecContext->hwaccel != NULL) {
+  if ( mVideoCodecContext->hwaccel != NULL ) {
     Debug(1, "HWACCEL in use");
   } else {
     Debug(1, "HWACCEL not in use");
@@ -595,7 +587,7 @@ int FfmpegCamera::OpenFfmpeg() {
         Error( "Unable to open codec for audio stream from %s", mPath.c_str() );
         return -1;
       }
-      Debug(2, "Opened audio codec");
+      zm_dump_codec(mAudioCodecContext);
     } // end if find decoder
   } // end if have audio_context
 

From 7f2440177b2f9f5752809a140e4dc3b91c6228ba Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 8 Apr 2019 13:51:55 -0400
Subject: [PATCH 181/214] remove duplicate dump_codec

---
 src/zm_videostore.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 51e4805ef..997b27cd2 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -119,8 +119,6 @@ VideoStore::VideoStore(
   if ( ret < 0 ) {
     Error("Could not initialize video_out_ctx parameters");
     return;
-  } else {
-    zm_dump_codec(video_out_ctx);
   }
 #else
   video_out_stream = avformat_new_stream(oc, NULL);

From 1b98f3529f7b60dd55e5e6860ac21bf503a9edf3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Mon, 8 Apr 2019 14:18:59 -0400
Subject: [PATCH 182/214] allow non-increasing dts in muxer

---
 src/zm_videostore.cpp | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 51e4805ef..da245b14c 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -92,6 +92,7 @@ VideoStore::VideoStore(
 
   oc->metadata = pmetadata;
   out_format = oc->oformat;
+	out_format->flags |= AVFMT_TS_NONSTRICT; // allow non increasing dts
 
   video_out_codec = avcodec_find_encoder(video_in_ctx->codec_id);
   if ( !video_out_codec ) {
@@ -926,17 +927,18 @@ int VideoStore::writeVideoFramePacket(AVPacket *ipkt) {
     opkt.pts = 0;
     //AV_NOPTS_VALUE;
   }
-  // Just because the in stream wraps, doesn't mean the out needs to.  Really, if we are limiting ourselves to 10min segments I can't imagine every wrapping in the out.  So need to handle in wrap, without causing out wrap.
+  // Just because the in stream wraps, doesn't mean the out needs to.
+	// Really, if we are limiting ourselves to 10min segments I can't imagine every wrapping in the out.
+	// So need to handle in wrap, without causing out wrap.
+
   if ( ipkt->dts != AV_NOPTS_VALUE ) {
-#if 1
-    if ( (!video_first_dts) ) {
+    if ( !video_first_dts ) {
      // && ( ipkt->dts >= 0 ) ) {
       // This is the first packet.
       opkt.dts = 0;
       Debug(1, "Starting video first_dts will become (%" PRId64 ")", ipkt->dts);
       video_first_dts = ipkt->dts;
     } else {
-#endif
       opkt.dts = av_rescale_q(
           ipkt->dts - video_first_dts,
           video_in_stream->time_base,
@@ -944,10 +946,7 @@ int VideoStore::writeVideoFramePacket(AVPacket *ipkt) {
           );
       Debug(3, "opkt.dts = %" PRId64 " from ipkt->dts(%" PRId64 ") - first_pts(%" PRId64 ")",
           opkt.dts, ipkt->dts, video_first_dts);
-      video_last_dts = ipkt->dts;
-#if 1
     }
-#endif
     if ( opkt.dts > opkt.pts ) {
       Debug(1,
           "opkt.dts(%" PRId64 ") must be <= opkt.pts(%" PRId64 "). Decompression must happen "
@@ -960,6 +959,17 @@ int VideoStore::writeVideoFramePacket(AVPacket *ipkt) {
     opkt.dts = 0;
   }
 
+# if 0
+	if ( opkt.dts <= video_out_stream->cur_dts ) {
+		Warning("Fixing non-monotonic dts/pts dts %" PRId64 " pts %" PRId64 " stream %" PRId64,
+				opkt.dts, opkt.pts, video_out_stream->cur_dts);
+		opkt.dts = video_out_stream->cur_dts + 1;
+		if ( opkt.dts > opkt.pts ) {
+			opkt.pts = opkt.dts;
+		}
+	}
+#endif
+
   opkt.flags = ipkt->flags;
   opkt.pos = -1;
   opkt.data = ipkt->data;

From 3abf263e7a9bf206644d3576afbdcb73c416139f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 8 Apr 2019 16:57:41 -0400
Subject: [PATCH 183/214] fixup half-merged changes to filter to view in
 montagereview

---
 scripts/ZoneMinder/lib/ZoneMinder/Control.pm | 2 +-
 web/api/app/Plugin/Crud                      | 2 +-
 web/lang/en_gb.php                           | 1 +
 web/skins/classic/views/filter.php           | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control.pm
index efd17abcd..bbc06a884 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control.pm
@@ -67,7 +67,7 @@ sub AUTOLOAD {
   if ( exists($self->{$name}) ) {
     return $self->{$name};
   }
-  Error("Can't access $name member of object of class $class");
+  Error("Can't access $name $AUTOLOAD member of object of class $class");
 }
 
 sub getKey {
diff --git a/web/api/app/Plugin/Crud b/web/api/app/Plugin/Crud
index c3976f147..0bd63fb46 160000
--- a/web/api/app/Plugin/Crud
+++ b/web/api/app/Plugin/Crud
@@ -1 +1 @@
-Subproject commit c3976f1478c681b0bbc132ec3a3e82c3984eeed5
+Subproject commit 0bd63fb464957080ead342db58ca9e01532cf1ef
diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index bb5e59a88..4eb493630 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -782,6 +782,7 @@ $SLANG = array(
     'VersionRemindNever'    => 'Don\'t remind about new versions',
     'VersionRemindWeek'     => 'Remind again in 1 week',
     'Version'               => 'Version',
+    'ViewMatches'           => 'View Matches',
     'VideoFormat'           => 'Video Format',
     'VideoGenFailed'        => 'Video Generation Failed!',
     'VideoGenFiles'         => 'Existing Video Files',
diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php
index 20218cb07..da965b4e9 100644
--- a/web/skins/classic/views/filter.php
+++ b/web/skins/classic/views/filter.php
@@ -406,8 +406,8 @@ if ( ZM_OPT_MESSAGE ) {
         </div>
         <hr/>
         <div id="contentButtons">
-          <button type="button" data-on-click-this="submitToEvents"><?php echo translate('ListMatches') ?></button>
-          <button type="button" data-on-click-this="submitToMontageReview"><?php echo translate('ViewMatchesInMontageReview') ?></button>
+          <button type="submit" data-on-click-this="submitToEvents"><?php echo translate('ListMatches') ?></button>
+          <!--<button type="submit" data-on-click-this="submitToMontageReview"><?php echo translate('ViewMatches') ?></button>-->
           <button type="button" data-on-click-this="submitToExport"><?php echo translate('ExportMatches') ?></button>
           <button type="button" name="executeButton" id="executeButton" data-on-click-this="executeFilter"><?php echo translate('Execute') ?></button>
 <?php 

From 8af96e3c00c32aa99f795f8ec770e8feb3836284 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Mon, 8 Apr 2019 18:40:52 -0500
Subject: [PATCH 184/214] fix eslint errors

---
 web/api/app/Plugin/Crud              |  2 +-
 web/skins/classic/views/js/filter.js | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/web/api/app/Plugin/Crud b/web/api/app/Plugin/Crud
index c3976f147..0bd63fb46 160000
--- a/web/api/app/Plugin/Crud
+++ b/web/api/app/Plugin/Crud
@@ -1 +1 @@
-Subproject commit c3976f1478c681b0bbc132ec3a3e82c3984eeed5
+Subproject commit 0bd63fb464957080ead342db58ca9e01532cf1ef
diff --git a/web/skins/classic/views/js/filter.js b/web/skins/classic/views/js/filter.js
index 7de029ff6..29e4dfe82 100644
--- a/web/skins/classic/views/js/filter.js
+++ b/web/skins/classic/views/js/filter.js
@@ -64,12 +64,12 @@ function updateButtons(element) {
 }
 
 function click_automove(element) {
-	updateButtons(this);
-	if ( this.checked ) {
-		$j(this.form.elements['filter[AutoMoveTo]']).css('display','inline');
-	} else {
-		this.form.elements['filter[AutoMoveTo]'].hide();
-	}
+  updateButtons(this);
+  if ( this.checked ) {
+    $j(this.form.elements['filter[AutoMoveTo]']).css('display', 'inline');
+   } else {
+      this.form.elements['filter[AutoMoveTo]'].hide();
+   }
 }
 
 function checkValue( element ) {

From 50dd63c21dfbc05f347784ce2d8728a928632234 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Mon, 8 Apr 2019 19:58:18 -0500
Subject: [PATCH 185/214] fix eslint

---
 web/skins/classic/views/js/filter.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/skins/classic/views/js/filter.js b/web/skins/classic/views/js/filter.js
index 29e4dfe82..8b6968668 100644
--- a/web/skins/classic/views/js/filter.js
+++ b/web/skins/classic/views/js/filter.js
@@ -67,9 +67,9 @@ function click_automove(element) {
   updateButtons(this);
   if ( this.checked ) {
     $j(this.form.elements['filter[AutoMoveTo]']).css('display', 'inline');
-   } else {
-      this.form.elements['filter[AutoMoveTo]'].hide();
-   }
+  } else {
+    this.form.elements['filter[AutoMoveTo]'].hide();
+  }
 }
 
 function checkValue( element ) {

From 37b7c32465ea85a1005d3eb120edf6fc7cfdaa80 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 9 Apr 2019 09:45:28 -0400
Subject: [PATCH 186/214] fix errors when no filter specified

---
 web/skins/classic/views/montagereview.php | 49 ++++++++++++-----------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/web/skins/classic/views/montagereview.php b/web/skins/classic/views/montagereview.php
index 61cf95b21..1d05d597e 100644
--- a/web/skins/classic/views/montagereview.php
+++ b/web/skins/classic/views/montagereview.php
@@ -59,34 +59,35 @@ include('_monitor_filters.php');
 $filter_bar = ob_get_contents();
 ob_end_clean();
 
+$filter = array();
 if ( isset($_REQUEST['filter']) ) {
   $filter = $_REQUEST['filter'];
 } else {
 
-	if (isset($_REQUEST['minTime']) && isset($_REQUEST['maxTime']) && count($displayMonitors) != 0) {
-		$filter = array(
-				'Query' => array(
-					'terms' => array(
-						array('attr' => 'StartDateTime', 'op' => '>=', 'val' => $_REQUEST['minTime'], 'obr' => '1'),
-						array('attr' => 'StartDateTime', 'op' => '<=', 'val' => $_REQUEST['maxTime'], 'cnj' => 'and', 'cbr' => '1'),
-					)
-				),
-			);
-		if ( count($selected_monitor_ids) ) {
-			$filter['Query']['terms'][] = (array('attr' => 'MonitorId', 'op' => 'IN', 'val' => implode(',',$selected_monitor_ids), 'cnj' => 'and'));
-		} else if ( ( $group_id != 0 || isset($_SESSION['ServerFilter']) || isset($_SESSION['StorageFilter']) || isset($_SESSION['StatusFilter']) ) ) {
-	# this should be redundant
-			for ($i=0; $i < count($displayMonitors); $i++) {
-				if ($i == '0') {
-					$filter['Query']['terms'][] = array('attr' => 'MonitorId', 'op' => '=', 'val' => $displayMonitors[$i]['Id'], 'cnj' => 'and', 'obr' => '1');
-				} else if ($i == (count($displayMonitors)-1)) {
-					$filter['Query']['terms'][] = array('attr' => 'MonitorId', 'op' => '=', 'val' => $displayMonitors[$i]['Id'], 'cnj' => 'or', 'cbr' => '1');
-				} else {
-					$filter['Query']['terms'][] = array('attr' => 'MonitorId', 'op' => '=', 'val' => $displayMonitors[$i]['Id'], 'cnj' => 'or');
-				}
-			}
-		}
-} # end if REQUEST[Filter]
+  if (isset($_REQUEST['minTime']) && isset($_REQUEST['maxTime']) && count($displayMonitors) != 0) {
+    $filter = array(
+      'Query' => array(
+        'terms' => array(
+          array('attr' => 'StartDateTime', 'op' => '>=', 'val' => $_REQUEST['minTime'], 'obr' => '1'),
+          array('attr' => 'StartDateTime', 'op' => '<=', 'val' => $_REQUEST['maxTime'], 'cnj' => 'and', 'cbr' => '1'),
+        )
+      ),
+    );
+    if ( count($selected_monitor_ids) ) {
+      $filter['Query']['terms'][] = (array('attr' => 'MonitorId', 'op' => 'IN', 'val' => implode(',',$selected_monitor_ids), 'cnj' => 'and'));
+    } else if ( ( $group_id != 0 || isset($_SESSION['ServerFilter']) || isset($_SESSION['StorageFilter']) || isset($_SESSION['StatusFilter']) ) ) {
+      # this should be redundant
+      for ($i=0; $i < count($displayMonitors); $i++) {
+        if ($i == '0') {
+          $filter['Query']['terms'][] = array('attr' => 'MonitorId', 'op' => '=', 'val' => $displayMonitors[$i]['Id'], 'cnj' => 'and', 'obr' => '1');
+        } else if ($i == (count($displayMonitors)-1)) {
+          $filter['Query']['terms'][] = array('attr' => 'MonitorId', 'op' => '=', 'val' => $displayMonitors[$i]['Id'], 'cnj' => 'or', 'cbr' => '1');
+        } else {
+          $filter['Query']['terms'][] = array('attr' => 'MonitorId', 'op' => '=', 'val' => $displayMonitors[$i]['Id'], 'cnj' => 'or');
+        }
+      }
+    }
+  } # end if REQUEST[Filter]
   parseFilter($filter);
   # This is to enable the download button
   session_start();

From 8403bf92fcf357cde2e8e2f4a0ef82472af8a30a Mon Sep 17 00:00:00 2001
From: aktarus82 <11706557+aktarus82@users.noreply.github.com>
Date: Tue, 9 Apr 2019 16:20:54 +0200
Subject: [PATCH 187/214] updated Debian installation guide

---
 docs/installationguide/debian.rst | 144 +++++++++++++++++++++++++++++-
 1 file changed, 143 insertions(+), 1 deletion(-)

diff --git a/docs/installationguide/debian.rst b/docs/installationguide/debian.rst
index 96907eee7..9f26411e0 100644
--- a/docs/installationguide/debian.rst
+++ b/docs/installationguide/debian.rst
@@ -3,6 +3,147 @@ Debian
 
 .. contents::
 
+Easy Way: Debian Stretch
+------------------------
+
+This procedure will guide you through the installation of ZoneMinder on Debian 9 (Stretch). This section has been tested with ZoneMinder 1.32.3 on Debian 9.8.
+
+**Step 1:** Make sure your system is up to date
+
+Open a console and use ``su`` command to become Root.
+
+::
+
+    apt update
+    apt upgrade
+
+
+**Step 2:** Setup Sudo (optional but recommended)
+
+By default Debian does not come with sudo, so you have to install it and configure it manually. This step is optional but recommended and the following instructions assume that you have setup sudo. If you prefer to setup ZoneMinder as root, do it at your own risk and adapt the following instructions accordingly.
+
+::
+
+    apt install sudo
+    usermod -a -G sudo <username>
+    exit
+
+Now your terminal session is back under your normal user. You can check that you are now part of the sudo group with the command ``groups``, "sudo" should appear in the list. If not, run ``newgrp sudo`` and check again with ``groups``.
+
+
+**Step 3:** Install Apache and MySQL
+
+These are not dependencies for the ZoneMinder package as they could be installed elsewhere. If they are not installed yet in your system, you have to trigger their installation manually.
+
+::
+
+    sudo apt install apache2 mysql-server
+
+**Step 4:** Add ZoneMinder's Package repository to your apt sources
+
+ZoneMinder's Debian packages are not included in Debian's official package repositories. To be able to install ZoneMinder with APT, you have to edit the list of apt sources and add ZoneMinder's repository.
+
+::
+
+    sudo nano /etc/apt/sources.list
+
+Add the following to the bottom of the file
+
+::
+
+    # ZoneMinder repository
+    deb https://zmrepo.zoneminder.com/debian/release stretch/
+
+CTRL+o and <Enter> to save
+CTRL+x to exit
+
+Because ZoneMinder's package repository provides a secure connection through HTTPS, apt must be enabled for HTTPS.
+::
+
+    sudo apt install apt-transport-https
+
+Finally, download the GPG key for ZoneMinder's repository:
+::
+
+    sudo wget -O - https://zmrepo.zoneminder.com/debian/archive-keyring.gpg | sudo apt-key add -
+
+
+**Step 5:** Install ZoneMinder
+
+::
+
+    sudo apt update
+    sudo apt install zoneminder
+
+**Step 6:** Read the Readme
+
+The rest of the install process is covered in the README.Debian, so feel free to have
+a read.
+
+::
+
+    gunzip /usr/share/doc/zoneminder/README.Debian.gz
+    cat /usr/share/doc/zoneminder/README.Debian
+
+
+**Step 7:** Enable ZoneMinder service
+
+::
+
+    sudo systemctl enable zoneminder.service
+
+**Step 8:** Configure Apache
+
+The following commands will setup the default /zm virtual directory and configure
+required apache modules.
+
+::
+
+    sudo a2enconf zoneminder
+    sudo a2enmod rewrite
+    sudo a2enmod cgi # this is done automatically when installing the package. Redo this command manually only for troubleshooting.
+
+
+**Step 9:** Edit Timezone in PHP
+
+Automated way:
+::
+
+    sudo sed -i "s/;date.timezone =/date.timezone = $(sed 's/\//\\\//' /etc/timezone)/g" /etc/php/7.0/apache2/php.ini
+
+Manual way
+::
+
+    sudo nano /etc/php/7.0/apache2/php.ini
+
+Search for [Date] (Ctrl + w then type Date and press Enter) and change
+date.timezone for your time zone. Don't forget to remove the ; from in front
+of date.timezone.
+
+::
+
+        [Date]
+        ; Defines the default timezone used by the date functions
+        ; http://php.net/date.timezone
+        date.timezone = America/New_York
+
+CTRL+o then [Enter] to save
+
+CTRL+x to exit
+
+
+**Step 10:** Start ZoneMinder
+
+Reload Apache to enable your changes and then start ZoneMinder.
+
+::
+
+    sudo systemctl reload apache2
+    sudo systemctl start zoneminder
+
+You are now ready to go with ZoneMinder. Open a browser and type either ``localhost/zm`` one the local machine or ``{IP-OF-ZM-SERVER}/zm`` if you connect from a remote computer.
+
+
 Easy Way: Debian Jessie
 -----------------------
 
@@ -81,7 +222,7 @@ should you choose to change default database user and password.
     cat /usr/share/zoneminder/db/zm_create.sql | sudo mysql --defaults-file=/etc/mysql/debian.cnf
     echo 'grant lock tables,alter,create,select,insert,update,delete,index on zm.* to 'zmuser'@localhost identified by "zmpass";'    | sudo mysql --defaults-file=/etc/mysql/debian.cnf mysql
 
-** Step 8:** zm.conf Permissions
+**Step 8:** zm.conf Permissions
 
 Adjust permissions to the zm.conf file to allow web account to access it.
 
@@ -129,6 +270,7 @@ CTRL+x to exit
 
 
 **Step 12:** Please check the configuration
+
 Zoneminder 1.32.x
     1. Check path of ZM_PATH in '/etc/zm/conf.d/zmcustom.conf' is ZM_PATH_ZMS=/zm/cgi-bin/nph-zms
         ::

From aaf988576f97d98068b89441d2aa454d22d706f4 Mon Sep 17 00:00:00 2001
From: aktarus82 <11706557+aktarus82@users.noreply.github.com>
Date: Tue, 9 Apr 2019 21:42:40 +0200
Subject: [PATCH 188/214] removing test.txt

---
 docs/test.txt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 docs/test.txt

diff --git a/docs/test.txt b/docs/test.txt
deleted file mode 100644
index 7e957cbee..000000000
--- a/docs/test.txt
+++ /dev/null
@@ -1 +0,0 @@
-my test

From d270fbd0ad12a38a4cfc3fe94897ffb9f9e5fe7a Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@users.noreply.github.com>
Date: Tue, 9 Apr 2019 16:28:46 -0400
Subject: [PATCH 189/214] added support for named params to consoleEvents
 (#2571)

---
 web/api/app/Controller/EventsController.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/web/api/app/Controller/EventsController.php b/web/api/app/Controller/EventsController.php
index 91a2de75c..2f6cfd494 100644
--- a/web/api/app/Controller/EventsController.php
+++ b/web/api/app/Controller/EventsController.php
@@ -288,9 +288,12 @@ class EventsController extends AppController {
     $this->Event->recursive = -1;
     $results = array();
     $this->FilterComponent = $this->Components->load('Filter');
-    $conditions = $this->FilterComponent->buildFilter($conditions);
+    if ( $this->request->params['named'] ) {
+      $conditions = $this->FilterComponent->buildFilter($this->request->params['named']);
+    } else {
+      $conditions = array();
+    } 
     array_push($conditions, array("StartTime >= DATE_SUB(NOW(), INTERVAL $expr $unit)"));
-
     $query = $this->Event->find('all', array(
                                              'fields' => array(
                                                                'MonitorId',

From 69f812f5cc88c717bca87c0bce9112f6f80ce3a7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 9 Apr 2019 19:42:24 -0400
Subject: [PATCH 190/214] force section end when seconds % section_length == 0
 which is the old behaviour.

---
 src/zm_monitor.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index c211dd7db..f214e0943 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1456,7 +1456,10 @@ bool Monitor::Analyse() {
           if ( event ) {
             Debug(3, "Have signal and recording with open event at (%d.%d)", timestamp->tv_sec, timestamp->tv_usec);
 
-            if ( section_length && ( ( timestamp->tv_sec - video_store_data->recording.tv_sec ) >= section_length ) ) {
+            if ( section_length
+                && ( ( timestamp->tv_sec - video_store_data->recording.tv_sec ) >= section_length )
+                && ( ! ( timestamp->tv_sec % section_length ) ) 
+                ) {
               Info( "%s: %03d - Closing event %" PRIu64 ", section end forced %d - %d = %d >= %d",
                   name, image_count, event->Id(),
                   timestamp->tv_sec, video_store_data->recording.tv_sec, 

From f7dfe2982b3e45fdcc5b00f2b336f3bf76b2abc8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 10 Apr 2019 11:46:12 -0400
Subject: [PATCH 191/214] Fix deleting single events

---
 web/ajax/event.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/ajax/event.php b/web/ajax/event.php
index 1e78e740f..6298903e4 100644
--- a/web/ajax/event.php
+++ b/web/ajax/event.php
@@ -1,5 +1,5 @@
 <?php
-error_reporting(0);
+#error_reporting(0);
 
 if ( empty($_REQUEST['id']) && empty($_REQUEST['eids']) ) {
   ajaxError('No event id(s) supplied');
@@ -136,7 +136,7 @@ if ( canEdit('Events') ) {
     ajaxResponse(array('refreshEvent'=>true, 'refreshParent'=>false));
     break;
   case 'delete' :
-    $Event = new Event($_REQUEST['id']);
+    $Event = new ZM\Event($_REQUEST['id']);
     if ( ! $Event->Id() ) {
       ajaxResponse(array('refreshEvent'=>false, 'refreshParent'=>true, 'message'=> 'Event not found.'));
     } else {

From df348c3513d6078c427cd18aaa0f4a49a738e769 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 10 Apr 2019 11:48:17 -0400
Subject: [PATCH 192/214] lets go with reporting actual errors

---
 web/ajax/event.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/ajax/event.php b/web/ajax/event.php
index 6298903e4..3d9c89c36 100644
--- a/web/ajax/event.php
+++ b/web/ajax/event.php
@@ -1,5 +1,5 @@
 <?php
-#error_reporting(0);
+error_reporting(E_ERROR);
 
 if ( empty($_REQUEST['id']) && empty($_REQUEST['eids']) ) {
   ajaxError('No event id(s) supplied');

From 0dd4a23770fb5af9b56e5124899fa491bb52818a Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 12 Apr 2019 09:36:30 -0400
Subject: [PATCH 193/214] Add Config for showing a system shutdown/restart
 option

---
 scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index c6ec697f1..57bbc4aed 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -462,6 +462,15 @@ our @options = (
     type        => $types{string},
     category    => 'system',
   },
+  {
+    name        =>  'ZM_SYSTEM_SHUTDOWN',
+    default     =>  'true',
+    description =>  'Allow Admin users to power off or restart the system from the ZoneMinder UI.',
+    help        =>  'The system will need to have a polkit file installed to enable the apache user
+      to perform the shutdown or reboot',
+    type      =>  $types{boolean},
+    category  =>  'system',
+  },
   {
     name        => 'ZM_USE_DEEP_STORAGE',
     default     => 'yes',

From ec6d56fd7eab3285d2ba78b2c6867149b0441a09 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 12 Apr 2019 09:36:56 -0400
Subject: [PATCH 194/214] Add a translation for Shutdown

---
 web/lang/en_gb.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index 4eb493630..3e7fcf3fd 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -689,6 +689,7 @@ $SLANG = array(
     'Settings'              => 'Settings',
     'ShowFilterWindow'      => 'Show Filter Window',
     'ShowTimeline'          => 'Show Timeline',
+    'Shutdown'              => 'Shutdown',
     'SignalCheckColour'     => 'Signal Check Colour',
     'SignalCheckPoints'     => 'Signal Check Points',
     'Size'                  => 'Size',

From d7747b3385223383c6eae95d0aacaac01b6adaab Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 12 Apr 2019 09:37:14 -0400
Subject: [PATCH 195/214] add a shutdown power button to the navbar

---
 web/skins/classic/includes/functions.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index fa57411cd..cd97b9552 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -324,7 +324,9 @@ if (isset($_REQUEST['filter']['Query']['terms']['attr'])) {
 
 <?php if ( canEdit('System') ) { ?>
 		<button type="button" class="btn btn-default navbar-btn" data-toggle="modal" data-target="#modalState"><?php echo $status ?></button>
-
+<?php if ( ZM_SYSTEM_SHUTDOWN ) { ?>
+<?php echo makePopupLink('?view=shutdown', 'zmShutdown', 'shutdown', '<i class="material-icons md-18">power_settings_new</i></button>' ) ?>
+<?php } ?>
 <?php } else if ( canView('System') ) { ?>
 		<p class="navbar-text"> <?php echo $status ?></p>
 <?php } ?>

From 7b98dcbb9490e2650658d4b6666c5faf151ccb4f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 12 Apr 2019 13:08:58 -0400
Subject: [PATCH 196/214] but the shutdown icon in a navbar-txt

---
 web/skins/classic/includes/functions.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index cd97b9552..8de847f5b 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -321,12 +321,13 @@ if (isset($_REQUEST['filter']['Query']['terms']['attr'])) {
 <?php if ( ZM_OPT_USE_AUTH and $user ) { ?>
 	<p class="navbar-text"><i class="material-icons">account_circle</i> <?php echo makePopupLink( '?view=logout', 'zmLogout', 'logout', $user['Username'], (ZM_AUTH_TYPE == "builtin") ) ?> </p>
 <?php } ?>
-
 <?php if ( canEdit('System') ) { ?>
 		<button type="button" class="btn btn-default navbar-btn" data-toggle="modal" data-target="#modalState"><?php echo $status ?></button>
-<?php if ( ZM_SYSTEM_SHUTDOWN ) { ?>
-<?php echo makePopupLink('?view=shutdown', 'zmShutdown', 'shutdown', '<i class="material-icons md-18">power_settings_new</i></button>' ) ?>
-<?php } ?>
+  <?php if ( ZM_SYSTEM_SHUTDOWN ) { ?>
+  <p class="navbar-text">
+  <?php echo makePopupLink('?view=shutdown', 'zmShutdown', 'shutdown', '<i class="material-icons md-18">power_settings_new</i></button>' ) ?>
+  </p>
+  <?php } ?>
 <?php } else if ( canView('System') ) { ?>
 		<p class="navbar-text"> <?php echo $status ?></p>
 <?php } ?>

From 36336d67be91782345840491d2f5e5eec8646eae Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 12 Apr 2019 13:09:25 -0400
Subject: [PATCH 197/214] set width and height of shutdown window

---
 web/skins/classic/js/base.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/skins/classic/js/base.js b/web/skins/classic/js/base.js
index b0a28dc96..5d044f229 100644
--- a/web/skins/classic/js/base.js
+++ b/web/skins/classic/js/base.js
@@ -60,6 +60,7 @@ var popupSizes = {
   'preset':       {'width': 300, 'height': 220},
   'server':       {'width': 600, 'height': 405},
   'settings':     {'width': 220, 'height': 235},
+  'shutdown':     {'width': 400, 'height': 400},
   'state':        {'width': 400, 'height': 170},
   'stats':        {'width': 840, 'height': 200},
   'storage':      {'width': 600, 'height': 405},

From 9421c0208d36cea58843738d65b00673fa1406fe Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 12 Apr 2019 14:48:47 -0400
Subject: [PATCH 198/214] Add instructions for enabling the web user to run
 shutdown

---
 scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index 57bbc4aed..52dd2fb32 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -466,7 +466,10 @@ our @options = (
     name        =>  'ZM_SYSTEM_SHUTDOWN',
     default     =>  'true',
     description =>  'Allow Admin users to power off or restart the system from the ZoneMinder UI.',
-    help        =>  'The system will need to have a polkit file installed to enable the apache user
+    help        =>  'The system will need to have sudo installed and the following added to /etc/sudoers~~
+    ~~
+    @ZM_WEB_USER@ ALL=NOPASSWD: /sbin/shutdown~~
+    ~~
       to perform the shutdown or reboot',
     type      =>  $types{boolean},
     category  =>  'system',

From 1a1c2db15f57536a5f1146831f96665c55320441 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 12 Apr 2019 14:55:56 -0400
Subject: [PATCH 199/214] add the shutdown view and actions

---
 web/includes/actions/shutdown.php    | 44 ++++++++++++++++++
 web/skins/classic/views/shutdown.php | 69 ++++++++++++++++++++++++++++
 2 files changed, 113 insertions(+)
 create mode 100644 web/includes/actions/shutdown.php
 create mode 100644 web/skins/classic/views/shutdown.php

diff --git a/web/includes/actions/shutdown.php b/web/includes/actions/shutdown.php
new file mode 100644
index 000000000..f6d31b4f4
--- /dev/null
+++ b/web/includes/actions/shutdown.php
@@ -0,0 +1,44 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+if ( !canEdit('System') ) {
+  ZM\Warning('Need System permissions to shutdown server');
+  return;
+}
+if ( $action ) {
+  $when = isset($_POST['when']) and $_POST['when'] == 'now' ? 'now' : '+1';
+  if ( $action == 'shutdown' ) {
+    $output = array();
+    $rc = 0;
+    exec("sudo -n /sbin/shutdown -P $when 2>&1", $output, $rc);
+    #exec('sudo -n /bin/systemctl poweroff -i 2>&1', $output, $rc);
+    ZM\Logger::Debug("Shutdown output $rc " . implode("\n",$output));
+    #ZM\Logger::Debug("Shutdown output " . shell_exec('/bin/systemctl poweroff -i 2>&1'));
+  } else if ( $action == 'restart' ) {
+    $output = array();
+    exec("sudo -n /sbin/shutdown -r $when 2>&1", $output);
+    #exec('sudo -n /bin/systemctl reboot -i 2>&1', $output);
+    ZM\Logger::Debug("Shutdown output " . implode("\n",$output));
+  } else if ( $action == 'cancel' ) {
+    $output = array();
+    exec('sudo /sbin/shutdown -c 2>&1', $output);
+  }
+} # end if action
+?>
diff --git a/web/skins/classic/views/shutdown.php b/web/skins/classic/views/shutdown.php
new file mode 100644
index 000000000..5e032cd1c
--- /dev/null
+++ b/web/skins/classic/views/shutdown.php
@@ -0,0 +1,69 @@
+<?php
+//
+// ZoneMinder web shutdown view file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+if ( !canEdit('System') ) {
+  $view = 'error';
+  return;
+}
+
+$focusWindow = true;
+
+xhtmlHeaders(__FILE__, translate('Shutdown').' '.translate('Restart'));
+?>
+<body>
+  <div id="page">
+    <div id="header">
+      <h2><?php echo translate('Shutdown').' '.translate('Restart') ?></h2>
+    </div>
+    <div id="content">
+      <form name="contentForm" id="contentForm" method="post" action="?">
+        <input type="hidden" name="view" value="shutdown"/>
+<?php
+  if ( isset($output) ) {
+    echo '<p>'.implode('<br/>', $output).'</p>';
+  }
+  if ( isset($_POST['when']) and ($_POST['when'] != 'NOW') and ($action != 'cancel') ) {
+    echo '<p>You may cancel this shutdown by clicking '.translate('Cancel').'</p>';
+  }
+?>
+        <p class="warning"><h2>Warning</h2>
+          This command will either shutdown or restart all ZoneMinder Servers<br/>
+        </p>
+        <p>
+          <input type="radio" name="when" value="now" id="whennow"/><label for="whennow">Now</label>
+          <input type="radio" name="when" value="1min" id="when1min" checked="checked"/><label for="when1min">1 Minute</label>
+        </p>
+        <div id="contentButtons">
+<?php 
+  if ( isset($_POST['when']) and ($_POST['when'] != 'NOW') and ($action != 'cancel') ) {
+?>
+          <button type="submit" name="action" value="cancel"><?php echo translate('Cancel') ?></button>
+<?php 
+  }
+?>
+          <button type="submit" name="action" value="restart"><?php echo translate('Restart') ?></button>
+          <button type="submit" name="action" value="shutdown"><?php echo translate('Shutdown') ?></button>
+          <button type="button" data-on-click="closeWindow"><?php echo translate('Close') ?></button>
+        </div>
+      </form>
+    </div>
+  </div>
+</body>
+</html>

From d59f0589561bc89044a497fb5b6bea5825b8a78f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 12 Apr 2019 14:57:11 -0400
Subject: [PATCH 200/214] basic update of optionhelp view

---
 web/skins/classic/views/optionhelp.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/skins/classic/views/optionhelp.php b/web/skins/classic/views/optionhelp.php
index b5a596549..513560cb6 100644
--- a/web/skins/classic/views/optionhelp.php
+++ b/web/skins/classic/views/optionhelp.php
@@ -18,19 +18,19 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-$optionHelpIndex = preg_replace( '/^ZM_/', '', $_REQUEST['option'] );
+$optionHelpIndex = preg_replace('/^ZM_/', '', $_REQUEST['option']);
 if ( !empty($OLANG[$optionHelpIndex]) ) {
   $optionHelpText = $OLANG[$optionHelpIndex]['Help'];
 } else {
-  $optionHelpText = dbFetchOne('SELECT Help FROM Config WHERE Name=?', 'Help', array($_REQUEST['option']) );
+  $optionHelpText = dbFetchOne('SELECT Help FROM Config WHERE Name=?', 'Help', array($_REQUEST['option']));
 }
 $optionHelpText = validHtmlStr($optionHelpText);
-$optionHelpText = preg_replace( "/~~/", "<br/>", $optionHelpText );
-$optionHelpText = preg_replace( "/\[(.+)\]\((.+)\)/", "<a href=\"$2\" target=\"_blank\">$1</a>", $optionHelpText );
+$optionHelpText = preg_replace('/~~/', '<br/>', $optionHelpText );
+$optionHelpText = preg_replace('/\[(.+)\]\((.+)\)/', '<a href="$2" target="_blank">$1</a>', $optionHelpText);
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, translate('OptionHelp') );
+xhtmlHeaders(__FILE__, translate('OptionHelp'));
 ?>
 <body>
   <div id="page">

From ad61f770abf03c5190fa17d3fc3f30eea8dda038 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 14 Apr 2019 13:49:27 -0400
Subject: [PATCH 201/214] Don't set bitrate, etc when h264.  Causing crashes in
 ffmpeg 4.11.

---
 src/zm_videostore.cpp | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 95b4b26a6..127b75d77 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -103,7 +103,6 @@ VideoStore::VideoStore(
 #endif
   }
 
-#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
   video_out_stream = avformat_new_stream(oc, NULL);
   if ( !video_out_stream ) {
     Error("Unable to create video out stream");
@@ -112,6 +111,7 @@ VideoStore::VideoStore(
     Debug(2, "Success creating video out stream");
   }
 
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
   // by allocating our own copy, we don't run into the problems when we free the streams
   video_out_ctx = avcodec_alloc_context3(video_out_codec);
   // Since we are not re-encoding, all we have to do is copy the parameters
@@ -122,21 +122,9 @@ VideoStore::VideoStore(
     return;
   }
 #else
-  video_out_stream = avformat_new_stream(oc, NULL);
-  if ( !video_out_stream ) {
-    Error("Unable to create video out stream");
-    return;
-  } else {
-    Debug(2, "Success creating video out stream");
-  }
   video_out_ctx = video_out_stream->codec;
   // This will wipe out the codec defaults
   ret = avcodec_copy_context(video_out_ctx, video_in_ctx);
-  //video_out_ctx->width = video_in_ctx->width;
-  //video_out_ctx->height = video_in_ctx->height;
-  //video_out_ctx->pix_fmt = video_in_ctx->pix_fmt;
-  //video_out_ctx->max_b_frames = video_in_ctx->max_b_frames;
-  //video_out_ctx->has_b_frames = video_in_ctx->has_b_frames;
   if ( ret < 0 ) {
     Fatal("Unable to copy in video ctx to out video ctx %s",
           av_make_error_string(ret).c_str());
@@ -173,7 +161,6 @@ VideoStore::VideoStore(
       break;
   }
 
-
   if ( !video_out_ctx->codec_tag ) {
     Debug(2, "No codec_tag");
     if ( 
@@ -207,6 +194,7 @@ VideoStore::VideoStore(
     video_out_stream->r_frame_rate = video_in_stream->r_frame_rate;
   }
 #if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
+#if 0
   if ( video_out_ctx->codec_id == AV_CODEC_ID_H264 ) {
     //video_out_ctx->level = 32;I//
     video_out_ctx->bit_rate = 400*1024;
@@ -218,6 +206,7 @@ VideoStore::VideoStore(
       Debug(2, "Not setting priv_data");
     }
   }
+#endif
   ret = avcodec_parameters_from_context(video_out_stream->codecpar, video_out_ctx);
   if ( ret < 0 ) {
     Error("Could not initialize video_out_ctx parameters");

From 439a7b3ab332eb5bf2daa7c6bba667a0e7a2ed53 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 14 Apr 2019 13:50:10 -0400
Subject: [PATCH 202/214] Don't set bitrate, etc when h264.  Causing crashes in
 ffmpeg 4.11.

---
 src/zm_videostore.cpp | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 95b4b26a6..127b75d77 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -103,7 +103,6 @@ VideoStore::VideoStore(
 #endif
   }
 
-#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
   video_out_stream = avformat_new_stream(oc, NULL);
   if ( !video_out_stream ) {
     Error("Unable to create video out stream");
@@ -112,6 +111,7 @@ VideoStore::VideoStore(
     Debug(2, "Success creating video out stream");
   }
 
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
   // by allocating our own copy, we don't run into the problems when we free the streams
   video_out_ctx = avcodec_alloc_context3(video_out_codec);
   // Since we are not re-encoding, all we have to do is copy the parameters
@@ -122,21 +122,9 @@ VideoStore::VideoStore(
     return;
   }
 #else
-  video_out_stream = avformat_new_stream(oc, NULL);
-  if ( !video_out_stream ) {
-    Error("Unable to create video out stream");
-    return;
-  } else {
-    Debug(2, "Success creating video out stream");
-  }
   video_out_ctx = video_out_stream->codec;
   // This will wipe out the codec defaults
   ret = avcodec_copy_context(video_out_ctx, video_in_ctx);
-  //video_out_ctx->width = video_in_ctx->width;
-  //video_out_ctx->height = video_in_ctx->height;
-  //video_out_ctx->pix_fmt = video_in_ctx->pix_fmt;
-  //video_out_ctx->max_b_frames = video_in_ctx->max_b_frames;
-  //video_out_ctx->has_b_frames = video_in_ctx->has_b_frames;
   if ( ret < 0 ) {
     Fatal("Unable to copy in video ctx to out video ctx %s",
           av_make_error_string(ret).c_str());
@@ -173,7 +161,6 @@ VideoStore::VideoStore(
       break;
   }
 
-
   if ( !video_out_ctx->codec_tag ) {
     Debug(2, "No codec_tag");
     if ( 
@@ -207,6 +194,7 @@ VideoStore::VideoStore(
     video_out_stream->r_frame_rate = video_in_stream->r_frame_rate;
   }
 #if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
+#if 0
   if ( video_out_ctx->codec_id == AV_CODEC_ID_H264 ) {
     //video_out_ctx->level = 32;I//
     video_out_ctx->bit_rate = 400*1024;
@@ -218,6 +206,7 @@ VideoStore::VideoStore(
       Debug(2, "Not setting priv_data");
     }
   }
+#endif
   ret = avcodec_parameters_from_context(video_out_stream->codecpar, video_out_ctx);
   if ( ret < 0 ) {
     Error("Could not initialize video_out_ctx parameters");

From 164a2d4d70eec25ca3766ed394fc3a9b58c10ade Mon Sep 17 00:00:00 2001
From: andornaut <andornaut@users.noreply.github.com>
Date: Sun, 14 Apr 2019 15:41:58 -0400
Subject: [PATCH 203/214] Fix image path (#2576)

Change the path of the "center.png" image from skins/classic/graphics/graphics/center.png to skins/classic/graphics/center.png.

Note that the `graphics/` directory was previously duplicated.
---
 web/skins/classic/css/classic/views/control.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/classic/css/classic/views/control.css b/web/skins/classic/css/classic/views/control.css
index 381c9687c..55613d041 100644
--- a/web/skins/classic/css/classic/views/control.css
+++ b/web/skins/classic/css/classic/views/control.css
@@ -115,7 +115,7 @@
 }
 
 .ptzControls .controlsPanel .pantiltPanel .pantiltControls .centerBtn {
-    background: url("../skins/classic/graphics/graphics/center.png") no-repeat 0 0;
+    background: url("../skins/classic/graphics/center.png") no-repeat 0 0;
 }
 
 .ptzControls .controlsPanel .pantiltPanel .pantiltControls .rightBtn {

From 7c8b37e08ccc410037a1eaa577b119d1d35c5169 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 15 Apr 2019 11:21:23 -0400
Subject: [PATCH 204/214] fix mutex hang on Fatal

---
 src/zm_logger.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/zm_logger.cpp b/src/zm_logger.cpp
index 90a2b9aac..229e16aa4 100644
--- a/src/zm_logger.cpp
+++ b/src/zm_logger.cpp
@@ -252,8 +252,6 @@ void Logger::initialise(const std::string &id, const Options &options) {
 }
 
 void Logger::terminate() {
-  Debug(1, "Terminating Logger");
-
   if ( mFileLevel > NOLOG )
     closeFile();
 

From 93f0a03d8b6f858dcc6805caff0f57f7d1456f03 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 15 Apr 2019 12:55:28 -0400
Subject: [PATCH 205/214] spacing and code comments

---
 src/zm_monitor.cpp | 524 +++++++++++++++++++++++----------------------
 1 file changed, 267 insertions(+), 257 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index f214e0943..3979b5db6 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -889,12 +889,12 @@ double Monitor::GetFPS() const {
 useconds_t Monitor::GetAnalysisRate() {
   double capturing_fps = GetFPS();
   if ( !analysis_fps ) {
-    return( 0 );
+    return 0;
   } else if ( analysis_fps > capturing_fps ) {
-    Warning( "Analysis fps (%.2f) is greater than capturing fps (%.2f)", analysis_fps, capturing_fps );
-    return( 0 );
+    Warning("Analysis fps (%.2f) is greater than capturing fps (%.2f)", analysis_fps, capturing_fps);
+    return 0;
   } else {
-    return( ( 1000000 / analysis_fps ) - ( 1000000 / capturing_fps ) );
+    return ( ( 1000000 / analysis_fps ) - ( 1000000 / capturing_fps ) );
   }
 }
 
@@ -902,10 +902,10 @@ void Monitor::UpdateAdaptiveSkip() {
   if ( config.opt_adaptive_skip ) {
     double capturing_fps = GetFPS();
     if ( adaptive_skip && analysis_fps && ( analysis_fps < capturing_fps ) ) {
-      Info( "Analysis fps (%.2f) is lower than capturing fps (%.2f), disabling adaptive skip feature", analysis_fps, capturing_fps );
+      Info("Analysis fps (%.2f) is lower than capturing fps (%.2f), disabling adaptive skip feature", analysis_fps, capturing_fps);
       adaptive_skip = false;
     } else if ( !adaptive_skip && ( !analysis_fps || ( analysis_fps >= capturing_fps ) ) ) {
-      Info( "Enabling adaptive skip feature" );
+      Info("Enabling adaptive skip feature");
       adaptive_skip = true;
     }
   } else {
@@ -916,8 +916,8 @@ void Monitor::UpdateAdaptiveSkip() {
 void Monitor::ForceAlarmOn( int force_score, const char *force_cause, const char *force_text ) {
   trigger_data->trigger_state = TRIGGER_ON;
   trigger_data->trigger_score = force_score;
-  strncpy( trigger_data->trigger_cause, force_cause, sizeof(trigger_data->trigger_cause)-1 );
-  strncpy( trigger_data->trigger_text, force_text, sizeof(trigger_data->trigger_text)-1 );
+  strncpy(trigger_data->trigger_cause, force_cause, sizeof(trigger_data->trigger_cause)-1);
+  strncpy(trigger_data->trigger_text, force_text, sizeof(trigger_data->trigger_text)-1);
 }
 
 void Monitor::ForceAlarmOff() {
@@ -964,7 +964,7 @@ void Monitor::actionResume() {
   shared_data->action |= RESUME;
 }
 
-int Monitor::actionBrightness( int p_brightness ) {
+int Monitor::actionBrightness(int p_brightness) {
   if ( purpose != CAPTURE ) {
     if ( p_brightness >= 0 ) {
       shared_data->brightness = p_brightness;
@@ -972,10 +972,10 @@ int Monitor::actionBrightness( int p_brightness ) {
       int wait_loops = 10;
       while ( shared_data->action & SET_SETTINGS ) {
         if ( wait_loops-- ) {
-          usleep( 100000 );
+          usleep(100000);
         } else {
-          Warning( "Timed out waiting to set brightness" );
-          return( -1 );
+          Warning("Timed out waiting to set brightness");
+          return -1;
         }
       }
     } else {
@@ -983,19 +983,19 @@ int Monitor::actionBrightness( int p_brightness ) {
       int wait_loops = 10;
       while ( shared_data->action & GET_SETTINGS ) {
         if ( wait_loops-- ) {
-          usleep( 100000 );
+          usleep(100000);
         } else {
-          Warning( "Timed out waiting to get brightness" );
-          return( -1 );
+          Warning("Timed out waiting to get brightness");
+          return -1;
         }
       }
     }
-    return( shared_data->brightness );
+    return shared_data->brightness;
   }
-  return( camera->Brightness( p_brightness ) );
-}
+  return camera->Brightness(p_brightness);
+} // end int Monitor::actionBrightness(int p_brightness)
 
-int Monitor::actionContrast( int p_contrast ) {
+int Monitor::actionContrast(int p_contrast) {
   if ( purpose != CAPTURE ) {
     if ( p_contrast >= 0 ) {
       shared_data->contrast = p_contrast;
@@ -1003,10 +1003,10 @@ int Monitor::actionContrast( int p_contrast ) {
       int wait_loops = 10;
       while ( shared_data->action & SET_SETTINGS ) {
         if ( wait_loops-- ) {
-          usleep( 100000 );
+          usleep(100000);
         } else {
-          Warning( "Timed out waiting to set contrast" );
-          return( -1 );
+          Warning("Timed out waiting to set contrast");
+          return -1;
         }
       }
     } else {
@@ -1014,19 +1014,19 @@ int Monitor::actionContrast( int p_contrast ) {
       int wait_loops = 10;
       while ( shared_data->action & GET_SETTINGS ) {
         if ( wait_loops-- ) {
-          usleep( 100000 );
+          usleep(100000);
         } else {
-          Warning( "Timed out waiting to get contrast" );
-          return( -1 );
+          Warning("Timed out waiting to get contrast");
+          return -1;
         }
       }
     }
-    return( shared_data->contrast );
+    return shared_data->contrast;
   }
-  return( camera->Contrast( p_contrast ) );
-}
+  return camera->Contrast(p_contrast);
+} // end int Monitor::actionContrast(int p_contrast)
 
-int Monitor::actionHue( int p_hue ) {
+int Monitor::actionHue(int p_hue) {
   if ( purpose != CAPTURE ) {
     if ( p_hue >= 0 ) {
       shared_data->hue = p_hue;
@@ -1034,10 +1034,10 @@ int Monitor::actionHue( int p_hue ) {
       int wait_loops = 10;
       while ( shared_data->action & SET_SETTINGS ) {
         if ( wait_loops-- ) {
-          usleep( 100000 );
+          usleep(100000);
         } else {
-          Warning( "Timed out waiting to set hue" );
-          return( -1 );
+          Warning("Timed out waiting to set hue");
+          return -1;
         }
       }
     } else {
@@ -1045,19 +1045,19 @@ int Monitor::actionHue( int p_hue ) {
       int wait_loops = 10;
       while ( shared_data->action & GET_SETTINGS ) {
         if ( wait_loops-- ) {
-          usleep( 100000 );
+          usleep(100000);
         } else {
-          Warning( "Timed out waiting to get hue" );
-          return( -1 );
+          Warning("Timed out waiting to get hue");
+          return -1;
         }
       }
     }
-    return( shared_data->hue );
+    return shared_data->hue;
   }
-  return( camera->Hue( p_hue ) );
-}
+  return camera->Hue(p_hue);
+} // end int Monitor::actionHue(int p_hue)
 
-int Monitor::actionColour( int p_colour ) {
+int Monitor::actionColour(int p_colour) {
   if ( purpose != CAPTURE ) {
     if ( p_colour >= 0 ) {
       shared_data->colour = p_colour;
@@ -1065,10 +1065,10 @@ int Monitor::actionColour( int p_colour ) {
       int wait_loops = 10;
       while ( shared_data->action & SET_SETTINGS ) {
         if ( wait_loops-- ) {
-          usleep( 100000 );
+          usleep(100000);
         } else {
-          Warning( "Timed out waiting to set colour" );
-          return( -1 );
+          Warning("Timed out waiting to set colour");
+          return -1;
         }
       }
     } else {
@@ -1076,19 +1076,19 @@ int Monitor::actionColour( int p_colour ) {
       int wait_loops = 10;
       while ( shared_data->action & GET_SETTINGS ) {
         if ( wait_loops-- ) {
-          usleep( 100000 );
+          usleep(100000);
         } else {
-          Warning( "Timed out waiting to get colour" );
-          return( -1 );
+          Warning("Timed out waiting to get colour");
+          return -1;
         }
       }
     }
-    return( shared_data->colour );
+    return shared_data->colour;
   }
-  return( camera->Colour( p_colour ) );
-}
+  return camera->Colour(p_colour);
+} // end int Monitor::actionColour(int p_colour)
 
-void Monitor::DumpZoneImage( const char *zone_string ) {
+void Monitor::DumpZoneImage(const char *zone_string) {
   int exclude_id = 0;
   int extra_colour = 0;
   Polygon extra_zone;
@@ -1129,7 +1129,7 @@ void Monitor::DumpZoneImage( const char *zone_string ) {
     zone_image->Colourise(ZM_COLOUR_RGB24, ZM_SUBPIX_ORDER_RGB);
   }
 
-  for( int i = 0; i < n_zones; i++ ) {
+  for ( int i = 0; i < n_zones; i++ ) {
     if ( exclude_id && (!extra_colour || extra_zone.getNumCoords()) && zones[i]->Id() == exclude_id )
       continue;
 
@@ -1149,33 +1149,33 @@ void Monitor::DumpZoneImage( const char *zone_string ) {
         colour = RGB_WHITE;
       }
     }
-    zone_image->Fill( colour, 2, zones[i]->GetPolygon() );
-    zone_image->Outline( colour, zones[i]->GetPolygon() );
+    zone_image->Fill(colour, 2, zones[i]->GetPolygon());
+    zone_image->Outline(colour, zones[i]->GetPolygon());
   }
 
   if ( extra_zone.getNumCoords() ) {
-    zone_image->Fill( extra_colour, 2, extra_zone );
-    zone_image->Outline( extra_colour, extra_zone );
+    zone_image->Fill(extra_colour, 2, extra_zone);
+    zone_image->Outline(extra_colour, extra_zone);
   }
 
   static char filename[PATH_MAX];
-  snprintf( filename, sizeof(filename), "Zones%d.jpg", id );
-  zone_image->WriteJpeg( filename );
+  snprintf(filename, sizeof(filename), "Zones%d.jpg", id);
+  zone_image->WriteJpeg(filename);
   delete zone_image;
-}
+} // end void Monitor::DumpZoneImage(const char *zone_string)
 
-void Monitor::DumpImage( Image *dump_image ) const {
+void Monitor::DumpImage(Image *dump_image) const {
   if ( image_count && !(image_count%10) ) {
     static char filename[PATH_MAX];
     static char new_filename[PATH_MAX];
-    snprintf( filename, sizeof(filename), "Monitor%d.jpg", id );
-    snprintf( new_filename, sizeof(new_filename), "Monitor%d-new.jpg", id );
-    if ( dump_image->WriteJpeg( new_filename ) )
-      rename( new_filename, filename );
+    snprintf(filename, sizeof(filename), "Monitor%d.jpg", id);
+    snprintf(new_filename, sizeof(new_filename), "Monitor%d-new.jpg", id);
+    if ( dump_image->WriteJpeg(new_filename) )
+      rename(new_filename, filename);
   }
-}
+} // end void Monitor::DumpImage(Image *dump_image)
 
-bool Monitor::CheckSignal( const Image *image ) {
+bool Monitor::CheckSignal(const Image *image) {
   static bool static_undef = true;
   /* RGB24 colors */
   static uint8_t red_val;
@@ -1241,11 +1241,11 @@ bool Monitor::CheckSignal( const Image *image ) {
         }
       }
     } // end for < signal_check_points
-    Debug(1,"SignalCheck: %d points, colour_val(%d)", signal_check_points, colour_val);
+    Debug(1, "SignalCheck: %d points, colour_val(%d)", signal_check_points, colour_val);
     return false;
   } // end if signal_check_points
   return true;
-}
+} // end bool Monitor::CheckSignal(const Image *image)
 
 bool Monitor::Analyse() {
   if ( shared_data->last_read_index == shared_data->last_write_index ) {
@@ -1299,7 +1299,7 @@ bool Monitor::Analyse() {
       index = (shared_data->last_read_index+step)%image_buffer_count;
     } else {
       if ( pending_frames ) {
-        Warning( "Approaching buffer overrun, consider slowing capture, simplifying analysis or increasing ring buffer size" );
+        Warning("Approaching buffer overrun, consider slowing capture, simplifying analysis or increasing ring buffer size");
       }
       index = shared_data->last_write_index%image_buffer_count;
     }
@@ -1382,9 +1382,9 @@ bool Monitor::Analyse() {
             signalText = "Reacquired";
             score += 100;
           }
-          Warning( "%s: %s", SIGNAL_CAUSE, signalText );
+          Warning("%s: %s", SIGNAL_CAUSE, signalText);
           if ( event && !signal ) {
-            Info( "%s: %03d - Closing event %" PRIu64 ", signal loss", name, image_count, event->Id() );
+            Info("%s: %03d - Closing event %" PRIu64 ", signal loss", name, image_count, event->Id());
             closeEvent();
           }
           if ( !event ) {
@@ -1460,7 +1460,7 @@ bool Monitor::Analyse() {
                 && ( ( timestamp->tv_sec - video_store_data->recording.tv_sec ) >= section_length )
                 && ( ! ( timestamp->tv_sec % section_length ) ) 
                 ) {
-              Info( "%s: %03d - Closing event %" PRIu64 ", section end forced %d - %d = %d >= %d",
+              Info("%s: %03d - Closing event %" PRIu64 ", section end forced %d - %d = %d >= %d",
                   name, image_count, event->Id(),
                   timestamp->tv_sec, video_store_data->recording.tv_sec, 
                   timestamp->tv_sec - video_store_data->recording.tv_sec,
@@ -1479,7 +1479,7 @@ bool Monitor::Analyse() {
             snprintf(video_store_data->event_file, sizeof(video_store_data->event_file), "%s", event->getEventFile());
             video_store_data->recording = event->StartTime();
 
-            Info( "%s: %03d - Opening new event %" PRIu64 ", section start", name, image_count, event->Id() );
+            Info("%s: %03d - Opening new event %" PRIu64 ", section start", name, image_count, event->Id());
 
             /* To prevent cancelling out an existing alert\prealarm\alarm state */
             if ( state == IDLE ) {
@@ -1547,10 +1547,10 @@ bool Monitor::Analyse() {
                 int pre_index;
                 int pre_event_images = pre_event_count;
 
-if ( event ) {
-// SHouldn't be able to happen because 
-Error("Creating new event when one exists");
-}
+                if ( event ) {
+                  // Shouldn't be able to happen because 
+                  Error("Creating new event when one exists");
+                }
                 if ( analysis_fps && pre_event_count ) {
                   // If analysis fps is set,
                   // compute the index for pre event images in the dedicated buffer
@@ -1603,7 +1603,7 @@ Error("Creating new event when one exists");
                 snprintf(video_store_data->event_file, sizeof(video_store_data->event_file), "%s", event->getEventFile());
                 video_store_data->recording = event->StartTime();
 
-                Info( "%s: %03d - Opening new event %" PRIu64 ", alarm start", name, image_count, event->Id() );
+                Info("%s: %03d - Opening new event %" PRIu64 ", alarm start", name, image_count, event->Id());
 
                 if ( pre_event_images ) {
                   if ( analysis_fps ) {
@@ -1626,31 +1626,34 @@ Error("Creating new event when one exists");
                 }
               }
             } else if ( state != PREALARM ) {
-              Info( "%s: %03d - Gone into prealarm state", name, image_count );
+              Info("%s: %03d - Gone into prealarm state", name, image_count);
               shared_data->state = state = PREALARM;
             }
           } else if ( state == ALERT ) {
-            Info( "%s: %03d - Gone back into alarm state", name, image_count );
+            Info("%s: %03d - Gone back into alarm state", name, image_count);
             shared_data->state = state = ALARM;
           }
           last_alarm_count = image_count;
         } else {
           if ( state == ALARM ) {
-            Info( "%s: %03d - Gone into alert state", name, image_count );
+            Info("%s: %03d - Gone into alert state", name, image_count);
             shared_data->state = state = ALERT;
           } else if ( state == ALERT ) {
             if ( image_count-last_alarm_count > post_event_count ) {
-              Info( "%s: %03d - Left alarm state (%" PRIu64 ") - %d(%d) images", name, image_count, event->Id(), event->Frames(), event->AlarmFrames() );
+              Info("%s: %03d - Left alarm state (%" PRIu64 ") - %d(%d) images",
+                  name, image_count, event->Id(), event->Frames(), event->AlarmFrames());
               //if ( function != MOCORD || event_close_mode == CLOSE_ALARM || event->Cause() == SIGNAL_CAUSE )
               if ( function != MOCORD || event_close_mode == CLOSE_ALARM ) {
                 shared_data->state = state = IDLE;
-                Info( "%s: %03d - Closing event %" PRIu64 ", alarm end%s", name, image_count, event->Id(), (function==MOCORD)?", section truncated":"" );
+                Info("%s: %03d - Closing event %" PRIu64 ", alarm end%s",
+                    name, image_count, event->Id(), (function==MOCORD)?", section truncated":"");
                 closeEvent();
               } else {
                 shared_data->state = state = TAPE;
               }
             }
-          }
+          } // end if ALARM or ALERT
+
           if ( state == PREALARM ) {
             if ( function != MOCORD ) {
               shared_data->state = state = IDLE;
@@ -1669,46 +1672,47 @@ Error("Creating new event when one exists");
               for( int i = 0; i < n_zones; i++ ) {
                 if ( zones[i]->Alarmed() ) {
                   if ( zones[i]->AlarmImage() ) {
-                    alarm_image.Overlay( *(zones[i]->AlarmImage()) );
+                    alarm_image.Overlay(*(zones[i]->AlarmImage()));
                     got_anal_image = true;
                   }
                   if ( config.record_event_stats && state == ALARM ) {
-                    zones[i]->RecordStats( event );
+                    zones[i]->RecordStats(event);
                   }
                 }
-              }
+              } // end foreach zone
+
               if ( got_anal_image ) {
                 if ( state == PREALARM )
-                  Event::AddPreAlarmFrame( snap_image, *timestamp, score, &alarm_image );
+                  Event::AddPreAlarmFrame(snap_image, *timestamp, score, &alarm_image);
                 else
-                  event->AddFrame( snap_image, *timestamp, score, &alarm_image );
+                  event->AddFrame(snap_image, *timestamp, score, &alarm_image);
               } else {
                 if ( state == PREALARM )
-                  Event::AddPreAlarmFrame( snap_image, *timestamp, score );
+                  Event::AddPreAlarmFrame(snap_image, *timestamp, score);
                 else
-                  event->AddFrame( snap_image, *timestamp, score );
+                  event->AddFrame(snap_image, *timestamp, score);
               }
             } else {
-              for( int i = 0; i < n_zones; i++ ) {
+              for ( int i = 0; i < n_zones; i++ ) {
                 if ( zones[i]->Alarmed() ) {
                   if ( config.record_event_stats && state == ALARM ) {
-                    zones[i]->RecordStats( event );
+                    zones[i]->RecordStats(event);
                   }
                 }
               }
               if ( state == PREALARM )
-                Event::AddPreAlarmFrame( snap_image, *timestamp, score );
+                Event::AddPreAlarmFrame(snap_image, *timestamp, score);
               else
-                event->AddFrame( snap_image, *timestamp, score );
+                event->AddFrame(snap_image, *timestamp, score);
             }
             if ( event && noteSetMap.size() > 0 )
-              event->updateNotes( noteSetMap );
+              event->updateNotes(noteSetMap);
 
             if ( section_length
                 && ( ( timestamp->tv_sec - video_store_data->recording.tv_sec ) >= section_length )
                 && ! (image_count % fps_report_interval)
                 ) {
-              Warning( "%s: %03d - event %" PRIu64 ", has exceeded desired section length. %d - %d = %d >= %d",
+              Warning("%s: %03d - event %" PRIu64 ", has exceeded desired section length. %d - %d = %d >= %d",
                   name, image_count, event->Id(),
                   timestamp->tv_sec, video_store_data->recording.tv_sec,
                   timestamp->tv_sec - video_store_data->recording.tv_sec,
@@ -1717,9 +1721,9 @@ Error("Creating new event when one exists");
             }
 
           } else if ( state == ALERT ) {
-            event->AddFrame( snap_image, *timestamp );
+            event->AddFrame(snap_image, *timestamp);
             if ( noteSetMap.size() > 0 )
-              event->updateNotes( noteSetMap );
+              event->updateNotes(noteSetMap);
           } else if ( state == TAPE ) {
             //Video Storage: activate only for supported cameras. Event::AddFrame knows whether or not we are recording video and saves frames accordingly
             //if((GetOptVideoWriter() == 2) && camera->SupportsNativeVideo()) {
@@ -1729,9 +1733,9 @@ Error("Creating new event when one exists");
             //}
             if ( (!frame_skip) || !(image_count%(frame_skip+1)) ) {
               if ( config.bulk_frame_interval > 1 ) {
-                event->AddFrame( snap_image, *timestamp, (event->Frames()<pre_event_count?0:-1) );
+                event->AddFrame(snap_image, *timestamp, (event->Frames()<pre_event_count?0:-1));
               } else {
-                event->AddFrame( snap_image, *timestamp );
+                event->AddFrame(snap_image, *timestamp);
               }
             }
           }
@@ -1764,25 +1768,25 @@ Error("Creating new event when one exists");
     // If analysis fps is set, add analysed image to dedicated pre event buffer
     int pre_index = image_count%pre_event_buffer_count;
     pre_event_buffer[pre_index].image->Assign(*snap->image);
-    memcpy( pre_event_buffer[pre_index].timestamp, snap->timestamp, sizeof(struct timeval) );
+    memcpy(pre_event_buffer[pre_index].timestamp, snap->timestamp, sizeof(struct timeval));
   }
 
   image_count++;
 
   return true;
-}
+} // end Monitor::Analyze
 
 void Monitor::Reload() {
-  Debug( 1, "Reloading monitor %s", name );
+  Debug(1, "Reloading monitor %s", name);
 
   if ( event ) {
-    Info( "%s: %03d - Closing event %" PRIu64 ", reloading", name, image_count, event->Id() );
+    Info("%s: %03d - Closing event %" PRIu64 ", reloading", name, image_count, event->Id());
     closeEvent();
   }
 
   static char sql[ZM_SQL_MED_BUFSIZ];
   // This seems to have fallen out of date.
-  snprintf( sql, sizeof(sql), "select Function+0, Enabled, LinkedMonitors, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, WarmupCount, PreEventCount, PostEventCount, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPSLimit, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour from Monitors where Id = '%d'", id );
+  snprintf(sql, sizeof(sql), "select Function+0, Enabled, LinkedMonitors, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, WarmupCount, PreEventCount, PostEventCount, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPSLimit, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour from Monitors where Id = '%d'", id);
 
   zmDbRow *row = zmDbFetchOne(sql);
   if ( !row ) {
@@ -1794,13 +1798,13 @@ void Monitor::Reload() {
     const char *p_linked_monitors = dbrow[index++];
 
     if ( dbrow[index] ) {
-      strncpy( event_prefix, dbrow[index++], sizeof(event_prefix)-1 );
+      strncpy(event_prefix, dbrow[index++], sizeof(event_prefix)-1);
     } else {
       event_prefix[0] = 0;
       index++;
     }
     if ( dbrow[index] ) {
-      strncpy( label_format, dbrow[index++], sizeof(label_format)-1 );
+      strncpy(label_format, dbrow[index++], sizeof(label_format)-1);
     } else {
       label_format[0] = 0;
       index++;
@@ -1843,23 +1847,23 @@ void Monitor::Reload() {
   } // end if row
 
   ReloadZones();
-}
+} // end void Monitor::Reload()
 
 void Monitor::ReloadZones() {
-  Debug( 1, "Reloading zones for monitor %s", name );
-  for( int i = 0; i < n_zones; i++ ) {
+  Debug(1, "Reloading zones for monitor %s", name);
+  for ( int i = 0; i < n_zones; i++ ) {
     delete zones[i];
   }
   delete[] zones;
   zones = 0;
-  n_zones = Zone::Load( this, zones );
+  n_zones = Zone::Load(this, zones);
   //DumpZoneImage();
-}
+} // end void Monitor::ReloadZones()
 
 void Monitor::ReloadLinkedMonitors(const char *p_linked_monitors) {
   Debug(1, "Reloading linked monitors for monitor %s, '%s'", name, p_linked_monitors);
   if ( n_linked_monitors ) {
-    for( int i = 0; i < n_linked_monitors; i++ ) {
+    for ( int i = 0; i < n_linked_monitors; i++ ) {
       delete linked_monitors[i];
     }
     delete[] linked_monitors;
@@ -1874,9 +1878,9 @@ void Monitor::ReloadLinkedMonitors(const char *p_linked_monitors) {
     char link_id_str[8];
     char *dest_ptr = link_id_str;
     const char *src_ptr = p_linked_monitors;
-    while( 1 ) {
+    while ( 1 ) {
       dest_ptr = link_id_str;
-      while( *src_ptr >= '0' && *src_ptr <= '9' ) {
+      while ( *src_ptr >= '0' && *src_ptr <= '9' ) {
         if ( (dest_ptr-link_id_str) < (unsigned int)(sizeof(link_id_str)-1) ) {
           *dest_ptr++ = *src_ptr++;
         } else {
@@ -1955,10 +1959,10 @@ int Monitor::LoadMonitors(std::string sql, Monitor **&monitors, Purpose purpose)
     return 0;
   }
   int n_monitors = mysql_num_rows(result);
-  Debug( 1, "Got %d monitors", n_monitors );
+  Debug(1, "Got %d monitors", n_monitors);
   delete[] monitors;
   monitors = new Monitor *[n_monitors];
-  for( int i=0; MYSQL_ROW dbrow = mysql_fetch_row(result); i++ ) {
+  for ( int i=0; MYSQL_ROW dbrow = mysql_fetch_row(result); i++ ) {
     monitors[i] = Monitor::Load(dbrow, 1, purpose);
   }
   if ( mysql_errno(&dbconn) ) {
@@ -1968,10 +1972,10 @@ int Monitor::LoadMonitors(std::string sql, Monitor **&monitors, Purpose purpose)
   mysql_free_result(result);
 
   return n_monitors;
-}
+} // end int Monitor::LoadMonitors(std::string sql, Monitor **&monitors, Purpose purpose)
 
 #if ZM_HAS_V4L
-int Monitor::LoadLocalMonitors( const char *device, Monitor **&monitors, Purpose purpose ) {
+int Monitor::LoadLocalMonitors(const char *device, Monitor **&monitors, Purpose purpose) {
 
   std::string sql = load_monitor_sql + " WHERE Function != 'None' AND Type = 'Local'";
 
@@ -1980,28 +1984,28 @@ int Monitor::LoadLocalMonitors( const char *device, Monitor **&monitors, Purpose
   if ( staticConfig.SERVER_ID )
     sql += stringtf(" AND ServerId=%d", staticConfig.SERVER_ID);
   return LoadMonitors(sql, monitors, purpose);
-}
+} // end int Monitor::LoadLocalMonitors(const char *device, Monitor **&monitors, Purpose purpose)
 #endif // ZM_HAS_V4L
 
-int Monitor::LoadRemoteMonitors( const char *protocol, const char *host, const char *port, const char *path, Monitor **&monitors, Purpose purpose ) {
+int Monitor::LoadRemoteMonitors(const char *protocol, const char *host, const char *port, const char *path, Monitor **&monitors, Purpose purpose) {
   std::string sql = load_monitor_sql + " WHERE Function != 'None' AND Type = 'Remote'";
   if ( staticConfig.SERVER_ID )
-    sql += stringtf( " AND ServerId=%d", staticConfig.SERVER_ID );
+    sql += stringtf(" AND ServerId=%d", staticConfig.SERVER_ID);
 
   if ( protocol )
-    sql += stringtf(" AND Protocol = '%s' and Host = '%s' and Port = '%s' and Path = '%s'", protocol, host, port, path );
+    sql += stringtf(" AND Protocol = '%s' and Host = '%s' and Port = '%s' and Path = '%s'", protocol, host, port, path);
   return LoadMonitors(sql, monitors, purpose);
-}
+} // end int Monitor::LoadRemoteMonitors
 
-int Monitor::LoadFileMonitors( const char *file, Monitor **&monitors, Purpose purpose ) {
+int Monitor::LoadFileMonitors(const char *file, Monitor **&monitors, Purpose purpose) {
   std::string sql = load_monitor_sql + " WHERE Function != 'None' AND Type = 'File'";
   if ( file[0] )
     sql += " AND Path='" + std::string(file) + "'";
   if ( staticConfig.SERVER_ID ) {
-    sql += stringtf( " AND ServerId=%d", staticConfig.SERVER_ID );
+    sql += stringtf(" AND ServerId=%d", staticConfig.SERVER_ID);
   }
   return LoadMonitors(sql, monitors, purpose);
-}
+} // end int Monitor::LoadFileMonitors
 
 #if HAVE_LIBAVFORMAT
 int Monitor::LoadFfmpegMonitors(const char *file, Monitor **&monitors, Purpose purpose) {
@@ -2013,7 +2017,7 @@ int Monitor::LoadFfmpegMonitors(const char *file, Monitor **&monitors, Purpose p
     sql += stringtf(" AND ServerId=%d", staticConfig.SERVER_ID);
   }
   return LoadMonitors(sql, monitors, purpose);
-}
+} // end int Monitor::LoadFfmpegMonitors
 #endif // HAVE_LIBAVFORMAT
 
 /*
@@ -2068,7 +2072,7 @@ Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zones, Purpose purpose) {
   } else {
     v4l_captures_per_frame = config.captures_per_frame;
   }
-  Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
+  Debug(1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame);
   col++;
 
   std::string protocol = dbrow[col] ? dbrow[col] : ""; col++;
@@ -2189,7 +2193,7 @@ Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zones, Purpose purpose) {
     }
 #endif // HAVE_LIBAVFORMAT
     else {
-      Fatal( "Unexpected remote camera protocol '%s'", protocol.c_str() );
+      Fatal("Unexpected remote camera protocol '%s'", protocol.c_str());
     }
   } else if ( type == "File" ) {
     camera = new FileCamera(
@@ -2257,7 +2261,7 @@ Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zones, Purpose purpose) {
       record_audio
     );
 #else // HAVE_LIBVLC
-    Fatal( "You must have vlc libraries installed to use vlc cameras for monitor %d", id );
+    Fatal("You must have vlc libraries installed to use vlc cameras for monitor %d", id);
 #endif // HAVE_LIBVLC
   } else if ( type == "cURL" ) {
 #if HAVE_LIBCURL
@@ -2277,13 +2281,13 @@ Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zones, Purpose purpose) {
       record_audio
     );
 #else // HAVE_LIBCURL
-    Fatal( "You must have libcurl installed to use ffmpeg cameras for monitor %d", id );
+    Fatal("You must have libcurl installed to use ffmpeg cameras for monitor %d", id);
 #endif // HAVE_LIBCURL
   } else {
-    Fatal( "Bogus monitor type '%s' for monitor %d", type.c_str(), id );
+    Fatal("Bogus monitor type '%s' for monitor %d", type.c_str(), id);
   } // end if type
 
-    Monitor *monitor = new Monitor(
+  Monitor *monitor = new Monitor(
       id,
       name,
       server_id,
@@ -2325,7 +2329,7 @@ Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zones, Purpose purpose) {
       purpose,
       0,
       0
-    );
+        );
   camera->setMonitor(monitor);
   Zone **zones = 0;
   int n_zones = Zone::Load(monitor, zones);
@@ -2333,7 +2337,7 @@ Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zones, Purpose purpose) {
   monitor->AddPrivacyBitmask(zones);
   Debug(1, "Loaded monitor %d(%s), %d zones", id, name, n_zones);
   return monitor;
-}
+} // end Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zones, Purpose purpose)
 
 Monitor *Monitor::Load(unsigned int p_id, bool load_zones, Purpose purpose) {
   std::string sql = load_monitor_sql + stringtf(" WHERE Id=%d", p_id);
@@ -2397,7 +2401,7 @@ int Monitor::Capture() {
       /* Capture directly into image buffer, avoiding the need to memcpy() */
       captureResult = camera->Capture(*capture_image);
     }
-  }
+  } // end if deinterlacing or not
 
   if ( captureResult < 0 ) {
     Info("Return from Capture (%d), signal loss", captureResult);
@@ -2419,54 +2423,53 @@ int Monitor::Capture() {
     } else if ( deinterlacing_value == 3 ) {
       capture_image->Deinterlace_Blend();
     } else if ( deinterlacing_value == 4 ) {
-      capture_image->Deinterlace_4Field( next_buffer.image, (deinterlacing>>8)&0xff );
+      capture_image->Deinterlace_4Field(next_buffer.image, (deinterlacing>>8)&0xff);
     } else if ( deinterlacing_value == 5 ) {
-      capture_image->Deinterlace_Blend_CustomRatio( (deinterlacing>>8)&0xff );
+      capture_image->Deinterlace_Blend_CustomRatio((deinterlacing>>8)&0xff);
     }
 
     if ( orientation != ROTATE_0 ) {
       switch ( orientation ) {
-        case ROTATE_0 : {
+        case ROTATE_0 :
           // No action required
           break;
-        }
         case ROTATE_90 :
         case ROTATE_180 :
-        case ROTATE_270 : {
-          capture_image->Rotate( (orientation-1)*90 );
+        case ROTATE_270 :
+          capture_image->Rotate((orientation-1)*90);
           break;
-        }
         case FLIP_HORI :
-        case FLIP_VERT : {
-          capture_image->Flip( orientation==FLIP_HORI );
+        case FLIP_VERT :
+          capture_image->Flip(orientation==FLIP_HORI);
           break;
-        }
       }
     } // end if have rotation
 
     if ( capture_image->Size() > camera->ImageSize() ) {
-      Error( "Captured image %d does not match expected size %d check width, height and colour depth",capture_image->Size(),camera->ImageSize() );
+      Error("Captured image %d does not match expected size %d check width, height and colour depth",
+          capture_image->Size(),camera->ImageSize() );
       return -1;
     }
 
     if ( (index == shared_data->last_read_index) && (function > MONITOR) ) {
-      Warning( "Buffer overrun at index %d, image %d, slow down capture, speed up analysis or increase ring buffer size", index, image_count );
+      Warning("Buffer overrun at index %d, image %d, slow down capture, speed up analysis or increase ring buffer size",
+          index, image_count );
       time_t now = time(0);
       double approxFps = double(image_buffer_count)/double(now-image_buffer[index].timestamp->tv_sec);
       time_t last_read_delta = now - shared_data->last_read_time;
       if ( last_read_delta > (image_buffer_count/approxFps) ) {
-        Warning( "Last image read from shared memory %ld seconds ago, zma may have gone away", last_read_delta )
+        Warning("Last image read from shared memory %ld seconds ago, zma may have gone away", last_read_delta);
         shared_data->last_read_index = image_buffer_count;
       }
-    }
+    } // end if overrun
 
     if ( privacy_bitmask )
-      capture_image->MaskPrivacy( privacy_bitmask );
+      capture_image->MaskPrivacy(privacy_bitmask);
 
     // Might be able to remove this call, when we start passing around ZMPackets, which will already have a timestamp
-    gettimeofday( image_buffer[index].timestamp, NULL );
+    gettimeofday(image_buffer[index].timestamp, NULL);
     if ( config.timestamp_on_capture ) {
-      TimestampImage( capture_image, image_buffer[index].timestamp );
+      TimestampImage(capture_image, image_buffer[index].timestamp);
     }
     // Maybe we don't need to do this on all camera types
     shared_data->signal = signal_check_points ? CheckSignal(capture_image) : true;
@@ -2486,7 +2489,8 @@ int Monitor::Capture() {
         last_camera_bytes = new_camera_bytes;
         //Info( "%d -> %d -> %d", fps_report_interval, now, last_fps_time );
         //Info( "%d -> %d -> %lf -> %lf", now-last_fps_time, fps_report_interval/(now-last_fps_time), double(fps_report_interval)/(now-last_fps_time), fps );
-        Info("%s: images:%d - Capturing at %.2lf fps, capturing bandwidth %ubytes/sec", name, image_count, new_fps, new_capture_bandwidth);
+        Info("%s: images:%d - Capturing at %.2lf fps, capturing bandwidth %ubytes/sec",
+            name, image_count, new_fps, new_capture_bandwidth);
         last_fps_time = now;
         fps = new_fps;
         db_mutex.lock();
@@ -2517,104 +2521,108 @@ int Monitor::Capture() {
     shared_data->action &= ~GET_SETTINGS;
   }
   if ( shared_data->action & SET_SETTINGS ) {
-    camera->Brightness( shared_data->brightness );
-    camera->Hue( shared_data->hue );
-    camera->Colour( shared_data->colour );
-    camera->Contrast( shared_data->contrast );
+    camera->Brightness(shared_data->brightness);
+    camera->Hue(shared_data->hue);
+    camera->Colour(shared_data->colour);
+    camera->Contrast(shared_data->contrast);
     shared_data->action &= ~SET_SETTINGS;
   }
   return captureResult;
-}
+} // end int Monitor::Capture
 
-void Monitor::TimestampImage( Image *ts_image, const struct timeval *ts_time ) const {
-  if ( label_format[0] ) {
-    // Expand the strftime macros first
-    char label_time_text[256];
-    strftime( label_time_text, sizeof(label_time_text), label_format, localtime( &ts_time->tv_sec ) );
+void Monitor::TimestampImage(Image *ts_image, const struct timeval *ts_time) const {
+  if ( !label_format[0] )
+    return;
 
-    char label_text[1024];
-    const char *s_ptr = label_time_text;
-    char *d_ptr = label_text;
-    while ( *s_ptr && ((d_ptr-label_text) < (unsigned int)sizeof(label_text)) ) {
-      if ( *s_ptr == config.timestamp_code_char[0] ) {
-        bool found_macro = false;
-        switch ( *(s_ptr+1) ) {
-          case 'N' :
-            d_ptr += snprintf( d_ptr, sizeof(label_text)-(d_ptr-label_text), "%s", name );
-            found_macro = true;
-            break;
-          case 'Q' :
-            d_ptr += snprintf( d_ptr, sizeof(label_text)-(d_ptr-label_text), "%s", trigger_data->trigger_showtext );
-            found_macro = true;
-            break;
-          case 'f' :
-            d_ptr += snprintf( d_ptr, sizeof(label_text)-(d_ptr-label_text), "%02ld", ts_time->tv_usec/10000 );
-            found_macro = true;
-            break;
-        }
-        if ( found_macro ) {
-          s_ptr += 2;
-          continue;
-        }
+  // Expand the strftime macros first
+  char label_time_text[256];
+  strftime(label_time_text, sizeof(label_time_text), label_format, localtime(&ts_time->tv_sec));
+
+  char label_text[1024];
+  const char *s_ptr = label_time_text;
+  char *d_ptr = label_text;
+  while ( *s_ptr && ((d_ptr-label_text) < (unsigned int)sizeof(label_text)) ) {
+    if ( *s_ptr == config.timestamp_code_char[0] ) {
+      bool found_macro = false;
+      switch ( *(s_ptr+1) ) {
+        case 'N' :
+          d_ptr += snprintf(d_ptr, sizeof(label_text)-(d_ptr-label_text), "%s", name);
+          found_macro = true;
+          break;
+        case 'Q' :
+          d_ptr += snprintf(d_ptr, sizeof(label_text)-(d_ptr-label_text), "%s", trigger_data->trigger_showtext);
+          found_macro = true;
+          break;
+        case 'f' :
+          d_ptr += snprintf(d_ptr, sizeof(label_text)-(d_ptr-label_text), "%02ld", ts_time->tv_usec/10000);
+          found_macro = true;
+          break;
+      }
+      if ( found_macro ) {
+        s_ptr += 2;
+        continue;
       }
-      *d_ptr++ = *s_ptr++;
     }
-    *d_ptr = '\0';
-    ts_image->Annotate( label_text, label_coord, label_size );
-  }
-}
+    *d_ptr++ = *s_ptr++;
+  } // end while
+  *d_ptr = '\0';
+  ts_image->Annotate( label_text, label_coord, label_size );
+} // end void Monitor::TimestampImage
 
 bool Monitor::closeEvent() {
-  if ( event ) {
-    if ( function == RECORD || function == MOCORD ) {
-      gettimeofday(&(event->EndTime()), NULL);
-    }
-    if ( event_delete_thread ) {
-      event_delete_thread->join();
-      delete event_delete_thread;
-      event_delete_thread = NULL;
-    }
+  if ( !event )
+    return false;
+
+  if ( function == RECORD || function == MOCORD ) {
+    //FIXME Is this neccessary? ENdTime should be set in the destructor
+    gettimeofday(&(event->EndTime()), NULL);
+  }
+  if ( event_delete_thread ) {
+    event_delete_thread->join();
+    delete event_delete_thread;
+    event_delete_thread = NULL;
+  }
 #if 0
-    event_delete_thread = new std::thread([](Event *event) {
+  event_delete_thread = new std::thread([](Event *event) {
       Event * e = event;
       event = NULL;
       delete e;
       e = NULL;
-    }, event);
+      }, event);
 #else
-    delete event;
-    event = NULL;
+  delete event;
+  event = NULL;
 #endif
-    video_store_data->recording = (struct timeval){0};
-    return true;
-  }
-  return false;
-}
+  video_store_data->recording = (struct timeval){0};
+  return true;
+} // end bool Monitor::closeEvent()
 
-unsigned int Monitor::DetectMotion( const Image &comp_image, Event::StringSet &zoneSet ) {
+unsigned int Monitor::DetectMotion(const Image &comp_image, Event::StringSet &zoneSet) {
   bool alarm = false;
   unsigned int score = 0;
 
-  if ( n_zones <= 0 ) return( alarm );
+  if ( n_zones <= 0 ) return alarm;
 
   Storage *storage = this->getStorage();
 
   if ( config.record_diag_images ) {
     static char diag_path[PATH_MAX] = "";
     if ( !diag_path[0] ) {
-      snprintf( diag_path, sizeof(diag_path), "%s/%d/diag-r.jpg", storage->Path(), id );
+      // FIXME generate these in the constructor instead of constantly in here
+      snprintf(diag_path, sizeof(diag_path), "%s/%d/diag-r.jpg", storage->Path(), id);
     }
-    ref_image.WriteJpeg( diag_path );
+    ref_image.WriteJpeg(diag_path);
   }
 
-  ref_image.Delta( comp_image, &delta_image );
+  ref_image.Delta(comp_image, &delta_image);
 
   if ( config.record_diag_images ) {
     static char diag_path[PATH_MAX] = "";
     if ( !diag_path[0] ) {
-      snprintf( diag_path, sizeof(diag_path), "%s/%d/diag-d.jpg", storage->Path(), id );
+      // FIXME, this won't happen because it is already filled with diag-r
+      snprintf(diag_path, sizeof(diag_path), "%s/%d/diag-d.jpg", storage->Path(), id);
     }
-    delta_image.WriteJpeg( diag_path );
+    delta_image.WriteJpeg(diag_path);
   }
 
   // Blank out all exclusion zones
@@ -2628,7 +2636,7 @@ unsigned int Monitor::DetectMotion( const Image &comp_image, Event::StringSet &z
     }
     Debug( 3, "Blanking inactive zone %s", zone->Label() );
     delta_image.Fill( RGB_BLACK, zone->GetPolygon() );
-  }
+  } // end foreach zone
 
   // Check preclusive zones first
   for ( int n_zone = 0; n_zone < n_zones; n_zone++ ) {
@@ -2638,30 +2646,32 @@ unsigned int Monitor::DetectMotion( const Image &comp_image, Event::StringSet &z
     }
     int old_zone_score = zone->Score();
     bool old_zone_alarmed = zone->Alarmed();
-    Debug( 3, "Checking preclusive zone %s - old score: %d, state: %s", zone->Label(),old_zone_score, zone->Alarmed()?"alarmed":"quiet" );
-    if ( zone->CheckAlarms( &delta_image ) ) {
+    Debug(3, "Checking preclusive zone %s - old score: %d, state: %s",
+        zone->Label(),old_zone_score, zone->Alarmed()?"alarmed":"quiet");
+    if ( zone->CheckAlarms(&delta_image) ) {
       alarm = true;
       score += zone->Score();
       zone->SetAlarm();
-      Debug( 3, "Zone is alarmed, zone score = %d", zone->Score() );
-      zoneSet.insert( zone->Label() );
+      Debug(3, "Zone is alarmed, zone score = %d", zone->Score());
+      zoneSet.insert(zone->Label());
       //zone->ResetStats();
     } else {
       // check if end of alarm
-      if (old_zone_alarmed) {
-        Debug(3, "Preclusive Zone %s alarm Ends. Previous score: %d", zone->Label(), old_zone_score);
-        if (old_zone_score > 0) {
+      if ( old_zone_alarmed ) {
+        Debug(3, "Preclusive Zone %s alarm Ends. Previous score: %d",
+            zone->Label(), old_zone_score);
+        if ( old_zone_score > 0 ) {
           zone->SetExtendAlarmCount(zone->GetExtendAlarmFrames());
         }
-        if (zone->CheckExtendAlarmCount()) {
-          alarm=true;
+        if ( zone->CheckExtendAlarmCount() ) {
+          alarm = true;
           zone->SetAlarm();
         } else {
           zone->ClearAlarm();
         }
       }
-    }
-  }
+    } // end if CheckAlarms
+  } // end foreach zone
 
   Coord alarm_centre;
   int top_score = -1;
@@ -2676,13 +2686,13 @@ unsigned int Monitor::DetectMotion( const Image &comp_image, Event::StringSet &z
       if ( !zone->IsActive() || zone->IsPreclusive()) {
         continue;
       }
-      Debug( 3, "Checking active zone %s", zone->Label() );
-      if ( zone->CheckAlarms( &delta_image ) ) {
+      Debug(3, "Checking active zone %s", zone->Label());
+      if ( zone->CheckAlarms(&delta_image) ) {
         alarm = true;
         score += zone->Score();
         zone->SetAlarm();
-        Debug( 3, "Zone is alarmed, zone score = %d", zone->Score() );
-        zoneSet.insert( zone->Label() );
+        Debug(3, "Zone is alarmed, zone score = %d", zone->Score());
+        zoneSet.insert(zone->Label());
         if ( config.opt_control && track_motion ) {
           if ( (int)zone->Score() > top_score ) {
             top_score = zone->Score();
@@ -2690,7 +2700,7 @@ unsigned int Monitor::DetectMotion( const Image &comp_image, Event::StringSet &z
           }
         }
       }
-    }
+    } // end foreach zone
 
     if ( alarm ) {
       for ( int n_zone = 0; n_zone < n_zones; n_zone++ ) {
@@ -2699,12 +2709,12 @@ unsigned int Monitor::DetectMotion( const Image &comp_image, Event::StringSet &z
         if ( !zone->IsInclusive() ) {
           continue;
         }
-        Debug( 3, "Checking inclusive zone %s", zone->Label() );
-        if ( zone->CheckAlarms( &delta_image ) ) {
+        Debug(3, "Checking inclusive zone %s", zone->Label());
+        if ( zone->CheckAlarms(&delta_image) ) {
           alarm = true;
           score += zone->Score();
           zone->SetAlarm();
-          Debug( 3, "Zone is alarmed, zone score = %d", zone->Score() );
+          Debug(3, "Zone is alarmed, zone score = %d", zone->Score());
           zoneSet.insert( zone->Label() );
           if ( config.opt_control && track_motion ) {
             if ( zone->Score() > (unsigned int)top_score ) {
@@ -2712,8 +2722,8 @@ unsigned int Monitor::DetectMotion( const Image &comp_image, Event::StringSet &z
               alarm_centre = zone->GetAlarmCentre();
             }
           }
-        }
-      }
+        } // end if CheckAlarm
+      } // end foreach zone
     } else {
       // Find all alarm pixels in exclusive zones
       for ( int n_zone = 0; n_zone < n_zones; n_zone++ ) {
@@ -2721,32 +2731,33 @@ unsigned int Monitor::DetectMotion( const Image &comp_image, Event::StringSet &z
         if ( !zone->IsExclusive() ) {
           continue;
         }
-        Debug( 3, "Checking exclusive zone %s", zone->Label() );
-        if ( zone->CheckAlarms( &delta_image ) ) {
+        Debug(3, "Checking exclusive zone %s", zone->Label());
+        if ( zone->CheckAlarms(&delta_image) ) {
           alarm = true;
           score += zone->Score();
           zone->SetAlarm();
-          Debug( 3, "Zone is alarmed, zone score = %d", zone->Score() );
-          zoneSet.insert( zone->Label() );
+          Debug(3, "Zone is alarmed, zone score = %d", zone->Score());
+          zoneSet.insert(zone->Label());
         }
-      }
+      } // end foreach zone
     } // end if alarm or not
-  }
+  } // end if alarm
 
   if ( top_score > 0 ) {
     shared_data->alarm_x = alarm_centre.X();
     shared_data->alarm_y = alarm_centre.Y();
 
-    Info( "Got alarm centre at %d,%d, at count %d", shared_data->alarm_x, shared_data->alarm_y, image_count );
+    Info("Got alarm centre at %d,%d, at count %d",
+        shared_data->alarm_x, shared_data->alarm_y, image_count);
   } else {
     shared_data->alarm_x = shared_data->alarm_y = -1;
   }
 
   // This is a small and innocent hack to prevent scores of 0 being returned in alarm state
-  return( score?score:alarm );
-}
+  return score ? score : alarm;
+} // end MotionDetect
 
-bool Monitor::DumpSettings( char *output, bool verbose ) {
+bool Monitor::DumpSettings(char *output, bool verbose) {
   output[0] = 0;
 
   sprintf( output+strlen(output), "Id : %d\n", id );
@@ -2824,9 +2835,9 @@ Monitor::Snapshot *Monitor::getSnapshot() const {
   return &image_buffer[ shared_data->last_write_index%image_buffer_count ];
 }
 
-std::vector<Group *>  Monitor::Groups() {
+std::vector<Group *> Monitor::Groups() {
   // At the moment, only load groups once.
-  if ( ! groups.size() ) {
+  if ( !groups.size() ) {
     std::string sql = stringtf(
         "SELECT Id,ParentId,Name FROM Groups WHERE Groups.Id IN "
         "(SELECT GroupId FROM Groups_Monitors WHERE MonitorId=%d)",id);
@@ -2846,14 +2857,13 @@ std::vector<Group *>  Monitor::Groups() {
     mysql_free_result(result);
   }
   return groups;
-}
+} // end Monitor::Groups()
 
 StringVector Monitor::GroupNames() {
   StringVector groupnames;
-  for(Group * g: Groups()) {
+  for ( Group * g: Groups() ) {
     groupnames.push_back(std::string(g->Name()));
-Debug(1,"Groups: %s", g->Name());
+    Debug(1,"Groups: %s", g->Name());
   }
   return groupnames;
-} 
-  
+} // end Monitor::GroupNames()

From f28af7b72991b4fe1d23c759715c48e0f9491bbd Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 15 Apr 2019 13:26:55 -0400
Subject: [PATCH 206/214] store diag_path in the object and initialize them in
 constructor instead of constantly checking to see if they have been
 initialized in DetectMotion. Also use a string instead of a static
 char[MAX_PATH].  Also split it into diag_path_r and diag_path_d to fix the
 bug that only diag_path_r would ever get created and would be overwritten by
 the delta image.

---
 src/zm_monitor.cpp | 44 +++++++++++++++++-----------------------
 src/zm_monitor.h   | 50 ++++++++++++++++++++++++----------------------
 2 files changed, 44 insertions(+), 50 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 3979b5db6..7d7a09d94 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -360,17 +360,17 @@ Monitor::Monitor(
 {
   strncpy( name, p_name, sizeof(name)-1 );
 
-  strncpy( event_prefix, p_event_prefix, sizeof(event_prefix)-1 );
-  strncpy( label_format, p_label_format, sizeof(label_format)-1 );
+  strncpy(event_prefix, p_event_prefix, sizeof(event_prefix)-1);
+  strncpy(label_format, p_label_format, sizeof(label_format)-1);
 
   // Change \n to actual line feeds
   char *token_ptr = label_format;
   const char *token_string = "\n";
-  while( ( token_ptr = strstr( token_ptr, token_string ) ) ) {
+  while ( ( token_ptr = strstr(token_ptr, token_string) ) ) {
     if ( *(token_ptr+1) ) {
       *token_ptr = '\n';
       token_ptr++;
-      strcpy( token_ptr, token_ptr+1 );
+      strcpy(token_ptr, token_ptr+1);
     } else {
       *token_ptr = '\0';
       break;
@@ -434,7 +434,7 @@ Monitor::Monitor(
       exit(-1);
     }
 
-    memset( mem_ptr, 0, mem_size );
+    memset(mem_ptr, 0, mem_size);
     shared_data->size = sizeof(SharedData);
     shared_data->active = enabled;
     shared_data->signal = false;
@@ -510,10 +510,17 @@ Monitor::Monitor(
           shared_data->last_write_index, shared_data->last_write_time );
       sleep(1);
     }
-    ref_image.Assign( width, height, camera->Colours(), camera->SubpixelOrder(), image_buffer[shared_data->last_write_index].image->Buffer(), camera->ImageSize());
+    ref_image.Assign( width, height, camera->Colours(), camera->SubpixelOrder(),
+        image_buffer[shared_data->last_write_index].image->Buffer(), camera->ImageSize());
     adaptive_skip = true;
 
     ReloadLinkedMonitors(p_linked_monitors);
+
+    if ( config.record_diag_images ) {
+      diag_path_r = stringtf("%s/%d/diag-r.jpg", storage->Path(), id);
+      diag_path_d = stringtf("%s/%d/diag-d.jpg", storage->Path(), id);
+    }
+
   } // end if purpose == ANALYSIS
 } // Monitor::Monitor
 
@@ -2603,39 +2610,24 @@ unsigned int Monitor::DetectMotion(const Image &comp_image, Event::StringSet &zo
 
   if ( n_zones <= 0 ) return alarm;
 
-  Storage *storage = this->getStorage();
-
-  if ( config.record_diag_images ) {
-    static char diag_path[PATH_MAX] = "";
-    if ( !diag_path[0] ) {
-      // FIXME generate these in the constructor instead of constantly in here
-      snprintf(diag_path, sizeof(diag_path), "%s/%d/diag-r.jpg", storage->Path(), id);
-    }
-    ref_image.WriteJpeg(diag_path);
-  }
-
   ref_image.Delta(comp_image, &delta_image);
 
   if ( config.record_diag_images ) {
-    static char diag_path[PATH_MAX] = "";
-    if ( !diag_path[0] ) {
-      // FIXME, this won't happen because it is already filled with diag-r
-      snprintf(diag_path, sizeof(diag_path), "%s/%d/diag-d.jpg", storage->Path(), id);
-    }
-    delta_image.WriteJpeg(diag_path);
+    ref_image.WriteJpeg(diag_path_r.c_str());
+    delta_image.WriteJpeg(diag_path_d.c_str());
   }
 
   // Blank out all exclusion zones
   for ( int n_zone = 0; n_zone < n_zones; n_zone++ ) {
     Zone *zone = zones[n_zone];
     // need previous alarmed state for preclusive zone, so don't clear just yet
-    if (!zone->IsPreclusive())
+    if ( !zone->IsPreclusive() )
       zone->ClearAlarm();
     if ( !zone->IsInactive() ) {
       continue;
     }
-    Debug( 3, "Blanking inactive zone %s", zone->Label() );
-    delta_image.Fill( RGB_BLACK, zone->GetPolygon() );
+    Debug(3, "Blanking inactive zone %s", zone->Label());
+    delta_image.Fill(RGB_BLACK, zone->GetPolygon());
   } // end foreach zone
 
   // Check preclusive zones first
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index 8856e4b26..f3927144c 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -291,40 +291,42 @@ protected:
 
   bool last_signal;
 
-  double      fps;
-  unsigned int  last_camera_bytes;
+  double       fps;
+  unsigned int last_camera_bytes;
   
-  Image      delta_image;
-  Image      ref_image;
-  Image       alarm_image;  // Used in creating analysis images, will be initialized in Analysis
-  Image       write_image;    // Used when creating snapshot images
+  Image        delta_image;
+  Image        ref_image;
+  Image        alarm_image;  // Used in creating analysis images, will be initialized in Analysis
+  Image        write_image;    // Used when creating snapshot images
+  std::string diag_path_r;
+  std::string diag_path_d;
 
   Purpose      purpose;        // What this monitor has been created to do
-  int        event_count;
-  int        image_count;
-  int        ready_count;
-  int        first_alarm_count;
-  int        last_alarm_count;
-  int        buffer_count;
-  int        prealarm_count;
-  State      state;
-  time_t      start_time;
-  time_t      last_fps_time;
-  time_t      auto_resume_time;
+  int          event_count;
+  int          image_count;
+  int          ready_count;
+  int          first_alarm_count;
+  int          last_alarm_count;
+  int          buffer_count;
+  int          prealarm_count;
+  State        state;
+  time_t       start_time;
+  time_t       last_fps_time;
+  time_t       auto_resume_time;
   unsigned int      last_motion_score;
 
   EventCloseMode  event_close_mode;
 
 #if ZM_MEM_MAPPED
-  int        map_fd;
-  char      mem_file[PATH_MAX];
+  int             map_fd;
+  char            mem_file[PATH_MAX];
 #else // ZM_MEM_MAPPED
-  int       shm_id;
+  int             shm_id;
 #endif // ZM_MEM_MAPPED
-  off_t        mem_size;
-  unsigned char  *mem_ptr;
-  SharedData    *shared_data;
-  TriggerData    *trigger_data;
+  off_t           mem_size;
+  unsigned char   *mem_ptr;
+  SharedData      *shared_data;
+  TriggerData     *trigger_data;
   VideoStoreData  *video_store_data;
 
   Snapshot    *image_buffer;

From 36640848625de0da9ff67c700117a977b91a4340 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 15 Apr 2019 13:27:13 -0400
Subject: [PATCH 207/214] Handle out of order dts in writeAudioFrame

---
 src/zm_videostore.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 127b75d77..a8f3e3041 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -1135,11 +1135,22 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
     }
   } // end if encoding or copying
 
+
   opkt.pos = -1;
   opkt.stream_index = audio_out_stream->index;
   opkt.flags = ipkt->flags;
 
-  if ( opkt.dts > opkt.pts ) {
+  if ( opkt.dts < audio_out_stream->cur_dts ) {
+    Warning("non increasing dts, fixing");
+    opkt.dts = audio_out_stream->cur_dts;
+    if ( opkt.dts > opkt.pts ) {
+      Debug(1,
+          "opkt.dts(%" PRId64 ") must be <= opkt.pts(%" PRId64 ")."
+          "Decompression must happen before presentation.",
+          opkt.dts, opkt.pts);
+      opkt.pts = opkt.dts;
+    }
+  } else if ( opkt.dts > opkt.pts ) {
     Debug(1,
           "opkt.dts(%" PRId64 ") must be <= opkt.pts(%" PRId64 ")."
           "Decompression must happen before presentation.",

From 293ec20824f4f7734208041167a7aa7cea2a3d37 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 15 Apr 2019 17:54:17 -0400
Subject: [PATCH 208/214] Must unlock mutex before destructor as we do some
 logging in the mutex destructor when we destroy it while locked.

---
 src/zm_logger.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/zm_logger.cpp b/src/zm_logger.cpp
index 229e16aa4..2089fecc3 100644
--- a/src/zm_logger.cpp
+++ b/src/zm_logger.cpp
@@ -572,6 +572,7 @@ void Logger::logPrint( bool hex, const char * const filepath, const int line, co
 
   free(filecopy);
   if ( level <= FATAL ) {
+    log_mutex.unlock();
     logTerm();
     zmDbClose();
     if ( level <= PANIC )

From 98a9c68b8bf8802c9301839370d18ec818b5afff Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 15 Apr 2019 17:54:30 -0400
Subject: [PATCH 209/214] spacing and code documentation

---
 src/zm_monitor.cpp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 7d7a09d94..5240393c3 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1544,6 +1544,7 @@ bool Monitor::Analyse() {
             } // end if false or config.overlap_timed_events
           } // end if ! event
         } // end if ( (!signal_change && signal) && (function == RECORD || function == MOCORD) ) {
+
         if ( score ) {
           if ( state == IDLE || state == TAPE || state == PREALARM ) {
             if ( (!pre_event_count) || (Event::PreAlarmCount() >= alarm_frame_count) ) {
@@ -1592,15 +1593,16 @@ bool Monitor::Analyse() {
                   }
 
                   event = new Event(this, *(image_buffer[pre_index].timestamp), cause, noteSetMap);
-                }
+                } // end if analysis_fps && pre_event_count
+
                 shared_data->last_event = event->Id();
                 // lets construct alarm cause. It will contain cause + names of zones alarmed
-                std::string alarm_cause="";
-                for ( int i=0; i < n_zones; i++) {
-                  if (zones[i]->Alarmed()) {
+                std::string alarm_cause = "";
+                for ( int i=0; i < n_zones; i++ ) {
+                  if ( zones[i]->Alarmed() ) {
                     alarm_cause += std::string(zones[i]->Label());
-                    if (i < n_zones-1) {
-                      alarm_cause +=",";
+                    if ( i < n_zones-1 ) {
+                      alarm_cause += ",";
                     }
                   }
                 }
@@ -1641,7 +1643,7 @@ bool Monitor::Analyse() {
             shared_data->state = state = ALARM;
           }
           last_alarm_count = image_count;
-        } else {
+        } else { // not score
           if ( state == ALARM ) {
             Info("%s: %03d - Gone into alert state", name, image_count);
             shared_data->state = state = ALERT;
@@ -1670,7 +1672,8 @@ bool Monitor::Analyse() {
           }
           if ( Event::PreAlarmCount() )
             Event::EmptyPreAlarmFrames();
-        }
+        } // end if score or not
+
         if ( state != IDLE ) {
           if ( state == PREALARM || state == ALARM ) {
             if ( config.create_analysis_images ) {

From 2ff1e7ed6d3fc5495ab370c20fcf73bd25873005 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 16 Apr 2019 11:30:18 -0400
Subject: [PATCH 210/214] Fix crash when reporting an event longer than section
 length when event was just closed so event is null.

---
 src/zm_monitor.cpp | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 5240393c3..204284cd5 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1715,20 +1715,22 @@ bool Monitor::Analyse() {
               else
                 event->AddFrame(snap_image, *timestamp, score);
             }
-            if ( event && noteSetMap.size() > 0 )
-              event->updateNotes(noteSetMap);
+            if ( event ) {
+              if ( noteSetMap.size() > 0 )
+                event->updateNotes(noteSetMap);
 
-            if ( section_length
-                && ( ( timestamp->tv_sec - video_store_data->recording.tv_sec ) >= section_length )
-                && ! (image_count % fps_report_interval)
-                ) {
-              Warning("%s: %03d - event %" PRIu64 ", has exceeded desired section length. %d - %d = %d >= %d",
-                  name, image_count, event->Id(),
-                  timestamp->tv_sec, video_store_data->recording.tv_sec,
-                  timestamp->tv_sec - video_store_data->recording.tv_sec,
-                  section_length
-                  );
-            }
+              if ( section_length
+                  && ( ( timestamp->tv_sec - video_store_data->recording.tv_sec ) >= section_length )
+                  && ! (image_count % fps_report_interval)
+                 ) {
+                Warning("%s: %03d - event %" PRIu64 ", has exceeded desired section length. %d - %d = %d >= %d",
+                    name, image_count, event->Id(),
+                    timestamp->tv_sec, video_store_data->recording.tv_sec,
+                    timestamp->tv_sec - video_store_data->recording.tv_sec,
+                    section_length
+                    );
+              }
+            } // end if event
 
           } else if ( state == ALERT ) {
             event->AddFrame(snap_image, *timestamp);

From 22adb243ec1d679fb85d55cbcf7cb1a48a61b1ed Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 16 Apr 2019 11:30:18 -0400
Subject: [PATCH 211/214] Fix crash when reporting an event longer than section
 length when event was just closed so event is null.

---
 src/zm_monitor.cpp | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 7d7a09d94..09aaeeb87 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1712,20 +1712,22 @@ bool Monitor::Analyse() {
               else
                 event->AddFrame(snap_image, *timestamp, score);
             }
-            if ( event && noteSetMap.size() > 0 )
-              event->updateNotes(noteSetMap);
+            if ( event ) {
+              if ( noteSetMap.size() > 0 )
+                event->updateNotes(noteSetMap);
 
-            if ( section_length
-                && ( ( timestamp->tv_sec - video_store_data->recording.tv_sec ) >= section_length )
-                && ! (image_count % fps_report_interval)
-                ) {
-              Warning("%s: %03d - event %" PRIu64 ", has exceeded desired section length. %d - %d = %d >= %d",
-                  name, image_count, event->Id(),
-                  timestamp->tv_sec, video_store_data->recording.tv_sec,
-                  timestamp->tv_sec - video_store_data->recording.tv_sec,
-                  section_length
-                  );
-            }
+              if ( section_length
+                  && ( ( timestamp->tv_sec - video_store_data->recording.tv_sec ) >= section_length )
+                  && ! (image_count % fps_report_interval)
+                 ) {
+                Warning("%s: %03d - event %" PRIu64 ", has exceeded desired section length. %d - %d = %d >= %d",
+                    name, image_count, event->Id(),
+                    timestamp->tv_sec, video_store_data->recording.tv_sec,
+                    timestamp->tv_sec - video_store_data->recording.tv_sec,
+                    section_length
+                    );
+              }
+            } // end if event
 
           } else if ( state == ALERT ) {
             event->AddFrame(snap_image, *timestamp);

From 70ed4a46469c97fdce46a911ae4a006f3aa8f565 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 15 Apr 2019 17:54:17 -0400
Subject: [PATCH 212/214] Must unlock mutex before destructor as we do some
 logging in the mutex destructor when we destroy it while locked.

---
 src/zm_logger.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/zm_logger.cpp b/src/zm_logger.cpp
index 229e16aa4..2089fecc3 100644
--- a/src/zm_logger.cpp
+++ b/src/zm_logger.cpp
@@ -572,6 +572,7 @@ void Logger::logPrint( bool hex, const char * const filepath, const int line, co
 
   free(filecopy);
   if ( level <= FATAL ) {
+    log_mutex.unlock();
     logTerm();
     zmDbClose();
     if ( level <= PANIC )

From 5b68ddcc9a5713064de9567b87e22280952b3a29 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 17 Apr 2019 09:55:34 -0400
Subject: [PATCH 213/214] add a note deprecating getDiskPercent

---
 web/api/app/Controller/HostController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/api/app/Controller/HostController.php b/web/api/app/Controller/HostController.php
index 05b2ed3fa..2980902c3 100644
--- a/web/api/app/Controller/HostController.php
+++ b/web/api/app/Controller/HostController.php
@@ -95,6 +95,7 @@ class HostController extends AppController {
   // If $mid is set, only return disk usage for that monitor
   // Else, return an array of total disk usage, and per-monitor
   // usage.
+  // This function is deprecated.  Use the Storage object or monitor object instead
   function getDiskPercent($mid = null) {
     $this->loadModel('Config');
     $this->loadModel('Monitor');

From 3c56b32b08b10becbdf2b7767ca72303bea491fb Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 24 Apr 2019 10:38:08 -0400
Subject: [PATCH 214/214] Use GREATEST function prevent negative values in
 event counts

---
 db/triggers.sql         |  64 ++++-----
 db/zm_update-1.33.7.sql | 283 ++++++++++++++++++++++++++++++++++++++++
 version                 |   2 +-
 3 files changed, 317 insertions(+), 32 deletions(-)
 create mode 100644 db/zm_update-1.33.7.sql

diff --git a/db/triggers.sql b/db/triggers.sql
index 2f13be435..fb7a32b67 100644
--- a/db/triggers.sql
+++ b/db/triggers.sql
@@ -5,7 +5,7 @@ CREATE TRIGGER Events_Hour_delete_trigger BEFORE DELETE ON Events_Hour
 FOR EACH ROW BEGIN
   UPDATE Monitors SET
   HourEvents = COALESCE(HourEvents,1)-1,
-  HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
+  HourEventDiskSpace=GREATEST(COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
   WHERE Id=OLD.MonitorId;
 END; 
 //
@@ -20,23 +20,21 @@ FOR EACH ROW
     set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
     IF ( diff ) THEN
       IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitors SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0) WHERE Monitors.Id=OLD.MonitorId;
-        UPDATE Monitors SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)-COALESCE(NEW.DiskSpace,0) WHERE Monitors.Id=NEW.MonitorId;
+        UPDATE Monitors SET HourEventDiskSpace=GREATEST(COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Monitors.Id=OLD.MonitorId;
+        UPDATE Monitors SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Monitors.Id=NEW.MonitorId;
       ELSE
         UPDATE Monitors SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
       END IF;
     END IF;
   END;
 //
-DELIMITER ;
 
-delimiter //
 DROP TRIGGER IF EXISTS Events_Day_delete_trigger//
 CREATE TRIGGER Events_Day_delete_trigger BEFORE DELETE ON Events_Day
 FOR EACH ROW BEGIN
   UPDATE Monitors SET
-  DayEvents = COALESCE(DayEvents,1)-1,
-  DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
+  DayEvents = GREATEST(COALESCE(DayEvents,1)-1,0),
+  DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
   WHERE Id=OLD.MonitorId;
 END;
 //
@@ -50,10 +48,10 @@ FOR EACH ROW
     set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
     IF ( diff ) THEN
       IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitors SET DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0) WHERE Monitors.Id=OLD.MonitorId;
+        UPDATE Monitors SET DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Monitors.Id=OLD.MonitorId;
         UPDATE Monitors SET DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Monitors.Id=NEW.MonitorId;
       ELSE
-        UPDATE Monitors SET DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
+        UPDATE Monitors SET DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)+diff,0) WHERE Monitors.Id=NEW.MonitorId;
       END IF;
     END IF;
   END;
@@ -65,7 +63,7 @@ CREATE TRIGGER Events_Week_delete_trigger BEFORE DELETE ON Events_Week
 FOR EACH ROW BEGIN
   UPDATE Monitors SET
   WeekEvents = COALESCE(WeekEvents,1)-1,
-  WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
+  WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
   WHERE Id=OLD.MonitorId;
 END;
 //
@@ -79,10 +77,10 @@ FOR EACH ROW
     set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
     IF ( diff ) THEN
       IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitors SET WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0) WHERE Monitors.Id=OLD.MonitorId;
+        UPDATE Monitors SET WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Monitors.Id=OLD.MonitorId;
         UPDATE Monitors SET WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Monitors.Id=NEW.MonitorId;
       ELSE
-        UPDATE Monitors SET WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
+        UPDATE Monitors SET WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)+diff,0) WHERE Monitors.Id=NEW.MonitorId;
       END IF;
     END IF;
   END;
@@ -93,7 +91,7 @@ CREATE TRIGGER Events_Month_delete_trigger BEFORE DELETE ON Events_Month
 FOR EACH ROW BEGIN
   UPDATE Monitors SET
   MonthEvents = COALESCE(MonthEvents,1)-1,
-  MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
+  MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
   WHERE Id=OLD.MonitorId;
 END;
 //
@@ -107,10 +105,10 @@ FOR EACH ROW
     set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
     IF ( diff ) THEN
       IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitors SET MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace) WHERE Monitors.Id=OLD.MonitorId;
+        UPDATE Monitors SET MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace),0) WHERE Monitors.Id=OLD.MonitorId;
         UPDATE Monitors SET MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)+COALESCE(NEW.DiskSpace) WHERE Monitors.Id=NEW.MonitorId;
       ELSE
-        UPDATE Monitors SET MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
+        UPDATE Monitors SET MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)+diff,0) WHERE Monitors.Id=NEW.MonitorId;
       END IF;
     END IF;
   END;
@@ -128,14 +126,14 @@ BEGIN
   set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
   IF ( NEW.StorageId = OLD.StorageID ) THEN
     IF ( diff ) THEN
-      UPDATE Storage SET DiskSpace = COALESCE(DiskSpace,0) + diff WHERE Id = OLD.StorageId;
+      UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) + diff,0) WHERE Id = OLD.StorageId;
     END IF;
   ELSE
     IF ( NEW.DiskSpace ) THEN
       UPDATE Storage SET DiskSpace = COALESCE(DiskSpace,0) + NEW.DiskSpace WHERE Id = NEW.StorageId;
     END IF;
     IF ( OLD.DiskSpace ) THEN
-      UPDATE Storage SET DiskSpace = COALESCE(DiskSpace,0) - OLD.DiskSpace WHERE Id = OLD.StorageId;
+      UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) - OLD.DiskSpace,0) WHERE Id = OLD.StorageId;
     END IF;
   END IF;
 
@@ -150,12 +148,16 @@ BEGIN
       UPDATE Monitors SET ArchivedEvents = COALESCE(ArchivedEvents,0)+1, ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) + COALESCE(NEW.DiskSpace,0) WHERE Id=NEW.MonitorId;
     ELSEIF ( OLD.Archived ) THEN
       DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-      UPDATE Monitors SET ArchivedEvents = COALESCE(ArchivedEvents,0)-1, ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) WHERE Id=OLD.MonitorId;
+      UPDATE Monitors
+        SET
+          ArchivedEvents = GREATEST(COALESCE(ArchivedEvents,0)-1,0),
+          ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),0)
+        WHERE Id=OLD.MonitorId;
     ELSE
       IF ( OLD.DiskSpace != NEW.DiskSpace ) THEN
         UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
         UPDATE Monitors SET
-          ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0)
+          ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0),0)
           WHERE Id=OLD.MonitorId;
       END IF;
     END IF;
@@ -164,18 +166,18 @@ BEGIN
   END IF;
 
   IF ( diff ) THEN
-    UPDATE Monitors SET TotalEventDiskSpace = COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0) WHERE Id=OLD.MonitorId;
+    UPDATE Monitors
+      SET
+        TotalEventDiskSpace = GREATEST(COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0),0)
+      WHERE Id=OLD.MonitorId;
   END IF;
 
 END;
 
 //
 
-delimiter ;
+DROP TRIGGER IF EXISTS event_insert_trigger//
 
-DROP TRIGGER IF EXISTS event_insert_trigger;
-
-delimiter //
 /* The assumption is that when an Event is inserted, it has no size yet, so don't bother updating the DiskSpace, just the count.
  * The DiskSpace will get update in the Event Update Trigger
  */
@@ -203,7 +205,7 @@ CREATE TRIGGER event_delete_trigger BEFORE DELETE ON Events
 FOR EACH ROW
 BEGIN
   IF ( OLD.DiskSpace ) THEN
-    UPDATE Storage SET DiskSpace = COALESCE(DiskSpace,0) - CAST(OLD.DiskSpace AS SIGNED) WHERE Id = OLD.StorageId;
+    UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) - COALESCE(OLD.DiskSpace,0),0) WHERE Id = OLD.StorageId;
   END IF;
   DELETE FROM Events_Hour WHERE EventId=OLD.Id;
   DELETE FROM Events_Day WHERE EventId=OLD.Id;
@@ -212,15 +214,15 @@ BEGIN
   IF ( OLD.Archived ) THEN
     DELETE FROM Events_Archived WHERE EventId=OLD.Id;
     UPDATE Monitors SET
-      ArchivedEvents = COALESCE(ArchivedEvents,1) - 1,
-      ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),
-      TotalEvents = COALESCE(TotalEvents,1) - 1,
-      TotalEventDiskSpace = COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0)
+      ArchivedEvents = GREATEST(COALESCE(ArchivedEvents,1) - 1,0),
+      ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),0),
+      TotalEvents = GREATEST(COALESCE(TotalEvents,1) - 1,0),
+      TotalEventDiskSpace = GREATEST(COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),0)
       WHERE Id=OLD.MonitorId;
   ELSE
     UPDATE Monitors SET
-    TotalEvents = COALESCE(TotalEvents,1)-1,
-    TotalEventDiskSpace=COALESCE(TotalEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
+    TotalEvents = GREATEST(COALESCE(TotalEvents,1)-1,0),
+    TotalEventDiskSpace=GREATEST(COALESCE(TotalEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
     WHERE Id=OLD.MonitorId;
   END IF;
 END;
diff --git a/db/zm_update-1.33.7.sql b/db/zm_update-1.33.7.sql
new file mode 100644
index 000000000..b29fe0e88
--- /dev/null
+++ b/db/zm_update-1.33.7.sql
@@ -0,0 +1,283 @@
+
+delimiter //
+DROP TRIGGER IF EXISTS Events_Hour_delete_trigger//
+CREATE TRIGGER Events_Hour_delete_trigger BEFORE DELETE ON Events_Hour
+FOR EACH ROW BEGIN
+  UPDATE Monitors SET
+  HourEvents = COALESCE(HourEvents,1)-1,
+  HourEventDiskSpace=GREATEST(COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
+  WHERE Id=OLD.MonitorId;
+END; 
+//
+
+DROP TRIGGER IF EXISTS Events_Hour_update_trigger//
+
+CREATE TRIGGER Events_Hour_update_trigger AFTER UPDATE ON Events_Hour
+FOR EACH ROW
+  BEGIN
+    declare diff BIGINT default 0;
+
+    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
+    IF ( diff ) THEN
+      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
+        UPDATE Monitors SET HourEventDiskSpace=GREATEST(COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Monitors.Id=OLD.MonitorId;
+        UPDATE Monitors SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Monitors.Id=NEW.MonitorId;
+      ELSE
+        UPDATE Monitors SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
+      END IF;
+    END IF;
+  END;
+//
+
+DROP TRIGGER IF EXISTS Events_Day_delete_trigger//
+CREATE TRIGGER Events_Day_delete_trigger BEFORE DELETE ON Events_Day
+FOR EACH ROW BEGIN
+  UPDATE Monitors SET
+  DayEvents = GREATEST(COALESCE(DayEvents,1)-1,0),
+  DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
+  WHERE Id=OLD.MonitorId;
+END;
+//
+
+DROP TRIGGER IF EXISTS Events_Day_update_trigger;
+CREATE TRIGGER Events_Day_update_trigger AFTER UPDATE ON Events_Day
+FOR EACH ROW
+  BEGIN
+    declare diff BIGINT default 0;
+
+    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
+    IF ( diff ) THEN
+      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
+        UPDATE Monitors SET DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Monitors.Id=OLD.MonitorId;
+        UPDATE Monitors SET DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Monitors.Id=NEW.MonitorId;
+      ELSE
+        UPDATE Monitors SET DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)+diff,0) WHERE Monitors.Id=NEW.MonitorId;
+      END IF;
+    END IF;
+  END;
+  //
+
+
+DROP TRIGGER IF EXISTS Events_Week_delete_trigger//
+CREATE TRIGGER Events_Week_delete_trigger BEFORE DELETE ON Events_Week
+FOR EACH ROW BEGIN
+  UPDATE Monitors SET
+  WeekEvents = COALESCE(WeekEvents,1)-1,
+  WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
+  WHERE Id=OLD.MonitorId;
+END;
+//
+
+DROP TRIGGER IF EXISTS Events_Week_update_trigger;
+CREATE TRIGGER Events_Week_update_trigger AFTER UPDATE ON Events_Week
+FOR EACH ROW
+  BEGIN
+    declare diff BIGINT default 0;
+
+    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
+    IF ( diff ) THEN
+      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
+        UPDATE Monitors SET WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Monitors.Id=OLD.MonitorId;
+        UPDATE Monitors SET WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Monitors.Id=NEW.MonitorId;
+      ELSE
+        UPDATE Monitors SET WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)+diff,0) WHERE Monitors.Id=NEW.MonitorId;
+      END IF;
+    END IF;
+  END;
+  //
+
+DROP TRIGGER IF EXISTS Events_Month_delete_trigger//
+CREATE TRIGGER Events_Month_delete_trigger BEFORE DELETE ON Events_Month
+FOR EACH ROW BEGIN
+  UPDATE Monitors SET
+  MonthEvents = COALESCE(MonthEvents,1)-1,
+  MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
+  WHERE Id=OLD.MonitorId;
+END;
+//
+
+DROP TRIGGER IF EXISTS Events_Month_update_trigger;
+CREATE TRIGGER Events_Month_update_trigger AFTER UPDATE ON Events_Month
+FOR EACH ROW
+  BEGIN
+    declare diff BIGINT default 0;
+
+    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
+    IF ( diff ) THEN
+      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
+        UPDATE Monitors SET MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace),0) WHERE Monitors.Id=OLD.MonitorId;
+        UPDATE Monitors SET MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)+COALESCE(NEW.DiskSpace) WHERE Monitors.Id=NEW.MonitorId;
+      ELSE
+        UPDATE Monitors SET MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)+diff,0) WHERE Monitors.Id=NEW.MonitorId;
+      END IF;
+    END IF;
+  END;
+  //
+
+drop procedure if exists update_storage_stats//
+
+drop trigger if exists event_update_trigger//
+
+CREATE TRIGGER event_update_trigger AFTER UPDATE ON Events 
+FOR EACH ROW
+BEGIN
+  declare diff BIGINT default 0;
+
+  set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
+  IF ( NEW.StorageId = OLD.StorageID ) THEN
+    IF ( diff ) THEN
+      UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) + diff,0) WHERE Id = OLD.StorageId;
+    END IF;
+  ELSE
+    IF ( NEW.DiskSpace ) THEN
+      UPDATE Storage SET DiskSpace = COALESCE(DiskSpace,0) + NEW.DiskSpace WHERE Id = NEW.StorageId;
+    END IF;
+    IF ( OLD.DiskSpace ) THEN
+      UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) - OLD.DiskSpace,0) WHERE Id = OLD.StorageId;
+    END IF;
+  END IF;
+
+  UPDATE Events_Hour SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
+  UPDATE Events_Day SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
+  UPDATE Events_Week SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
+  UPDATE Events_Month SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
+
+  IF ( NEW.Archived != OLD.Archived ) THEN
+    IF ( NEW.Archived ) THEN
+      INSERT INTO Events_Archived (EventId,MonitorId,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.DiskSpace);
+      UPDATE Monitors SET ArchivedEvents = COALESCE(ArchivedEvents,0)+1, ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) + COALESCE(NEW.DiskSpace,0) WHERE Id=NEW.MonitorId;
+    ELSEIF ( OLD.Archived ) THEN
+      DELETE FROM Events_Archived WHERE EventId=OLD.Id;
+      UPDATE Monitors
+        SET
+          ArchivedEvents = GREATEST(COALESCE(ArchivedEvents,0)-1,0),
+          ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),0)
+        WHERE Id=OLD.MonitorId;
+    ELSE
+      IF ( OLD.DiskSpace != NEW.DiskSpace ) THEN
+        UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
+        UPDATE Monitors SET
+          ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0),0)
+          WHERE Id=OLD.MonitorId;
+      END IF;
+    END IF;
+  ELSEIF ( NEW.Archived AND diff ) THEN
+    UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
+  END IF;
+
+  IF ( diff ) THEN
+    UPDATE Monitors
+      SET
+        TotalEventDiskSpace = GREATEST(COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0),0)
+      WHERE Id=OLD.MonitorId;
+  END IF;
+
+END;
+
+//
+
+DROP TRIGGER IF EXISTS event_insert_trigger//
+
+/* The assumption is that when an Event is inserted, it has no size yet, so don't bother updating the DiskSpace, just the count.
+ * The DiskSpace will get update in the Event Update Trigger
+ */
+CREATE TRIGGER event_insert_trigger AFTER INSERT ON Events
+FOR EACH ROW
+  BEGIN
+
+  INSERT INTO Events_Hour (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
+  INSERT INTO Events_Day (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
+  INSERT INTO Events_Week (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
+  INSERT INTO Events_Month (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
+  UPDATE Monitors SET
+  HourEvents = COALESCE(HourEvents,0)+1,
+  DayEvents = COALESCE(DayEvents,0)+1,
+  WeekEvents = COALESCE(WeekEvents,0)+1,
+  MonthEvents = COALESCE(MonthEvents,0)+1,
+  TotalEvents = COALESCE(TotalEvents,0)+1
+  WHERE Id=NEW.MonitorId;
+END;
+//
+
+DROP TRIGGER IF EXISTS event_delete_trigger//
+
+CREATE TRIGGER event_delete_trigger BEFORE DELETE ON Events
+FOR EACH ROW
+BEGIN
+  IF ( OLD.DiskSpace ) THEN
+    UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) - COALESCE(OLD.DiskSpace,0),0) WHERE Id = OLD.StorageId;
+  END IF;
+  DELETE FROM Events_Hour WHERE EventId=OLD.Id;
+  DELETE FROM Events_Day WHERE EventId=OLD.Id;
+  DELETE FROM Events_Week WHERE EventId=OLD.Id;
+  DELETE FROM Events_Month WHERE EventId=OLD.Id;
+  IF ( OLD.Archived ) THEN
+    DELETE FROM Events_Archived WHERE EventId=OLD.Id;
+    UPDATE Monitors SET
+      ArchivedEvents = GREATEST(COALESCE(ArchivedEvents,1) - 1,0),
+      ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),0),
+      TotalEvents = GREATEST(COALESCE(TotalEvents,1) - 1,0),
+      TotalEventDiskSpace = GREATEST(COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),0)
+      WHERE Id=OLD.MonitorId;
+  ELSE
+    UPDATE Monitors SET
+    TotalEvents = GREATEST(COALESCE(TotalEvents,1)-1,0),
+    TotalEventDiskSpace=GREATEST(COALESCE(TotalEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
+    WHERE Id=OLD.MonitorId;
+  END IF;
+END;
+
+//
+
+DROP TRIGGER IF EXISTS Zone_Insert_Trigger//
+CREATE TRIGGER Zone_Insert_Trigger AFTER INSERT ON Zones
+FOR EACH ROW
+  BEGIN
+    UPDATE Monitors SET ZoneCount=(SELECT COUNT(*) FROM Zones WHERE MonitorId=NEW.MonitorId) WHERE Id=NEW.MonitorID;
+  END
+//
+DROP TRIGGER IF EXISTS Zone_Delete_Trigger//
+CREATE TRIGGER Zone_Delete_Trigger AFTER DELETE ON Zones
+FOR EACH ROW
+  BEGIN
+    UPDATE Monitors SET ZoneCount=(SELECT COUNT(*) FROM Zones WHERE MonitorId=OLD.MonitorId) WHERE Id=OLD.MonitorID;
+  END
+//
+
+DELIMITER ;
+
+REPLACE INTO Events_Hour SELECT Id,MonitorId,StartTime,DiskSpace FROM Events WHERE StartTime > DATE_SUB(NOW(),  INTERVAL 1 hour);
+REPLACE INTO Events_Day SELECT Id,MonitorId,StartTime,DiskSpace FROM Events WHERE StartTime > DATE_SUB(NOW(),  INTERVAL 1 day);
+REPLACE INTO Events_Week SELECT Id,MonitorId,StartTime,DiskSpace FROM Events WHERE StartTime > DATE_SUB(NOW(),  INTERVAL 1 week);
+REPLACE INTO Events_Month SELECT Id,MonitorId,StartTime,DiskSpace FROM Events WHERE StartTime > DATE_SUB(NOW(),  INTERVAL 1 month);
+REPLACE INTO Events_Archived SELECT Id,MonitorId,DiskSpace FROM Events WHERE Archived=1;
+
+UPDATE Monitors INNER JOIN (
+  SELECT  MonitorId,
+    COUNT(Id) AS TotalEvents,
+    SUM(DiskSpace) AS TotalEventDiskSpace,
+    SUM(IF(Archived,1,0)) AS ArchivedEvents,
+    SUM(IF(Archived,DiskSpace,0)) AS ArchivedEventDiskSpace,
+    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 hour),1,0)) AS HourEvents,
+    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 hour),DiskSpace,0)) AS HourEventDiskSpace,
+    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 day),1,0)) AS DayEvents,
+    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 day),DiskSpace,0)) AS DayEventDiskSpace,
+    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 week),1,0)) AS WeekEvents,
+    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 week),DiskSpace,0)) AS WeekEventDiskSpace,
+    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 month),1,0)) AS MonthEvents,
+    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 month),DiskSpace,0)) AS MonthEventDiskSpace
+    FROM Events GROUP BY MonitorId
+    ) AS E ON E.MonitorId=Monitors.Id SET
+    Monitors.TotalEvents = E.TotalEvents,
+    Monitors.TotalEventDiskSpace = E.TotalEventDiskSpace,
+    Monitors.ArchivedEvents = E.ArchivedEvents,
+    Monitors.ArchivedEventDiskSpace = E.ArchivedEventDiskSpace,
+    Monitors.HourEvents = E.HourEvents,
+    Monitors.HourEventDiskSpace = E.HourEventDiskSpace,
+    Monitors.DayEvents = E.DayEvents,
+    Monitors.DayEventDiskSpace = E.DayEventDiskSpace,
+    Monitors.WeekEvents = E.WeekEvents,
+    Monitors.WeekEventDiskSpace = E.WeekEventDiskSpace,
+    Monitors.MonthEvents = E.MonthEvents,
+    Monitors.MonthEventDiskSpace = E.MonthEventDiskSpace;
+
diff --git a/version b/version
index 170749774..1304b01de 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.33.6
+1.33.7