From 17a5519dd684ae39bad73159b4c96cd615ceec17 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Fri, 19 Oct 2018 13:39:37 -0400
Subject: [PATCH 01/86] Include the remoteAddr in the session authhash cache,
 so that a change of ip won't allow the same useless auth hash. (#2264)

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

diff --git a/web/includes/auth.php b/web/includes/auth.php
index 9cf8d37c1..c7df780ba 100644
--- a/web/includes/auth.php
+++ b/web/includes/auth.php
@@ -116,7 +116,7 @@ function generateAuthHash($useRemoteAddr, $force=false) {
     $time = time();
     $mintime = $time - ( ZM_AUTH_HASH_TTL * 1800 );
 
-    if ( $force or ( !isset($_SESSION['AuthHash']) ) or ( $_SESSION['AuthHashGeneratedAt'] < $mintime ) ) {
+    if ( $force or ( !isset($_SESSION['AuthHash'.$_SESSION['remoteAddr']]) ) or ( $_SESSION['AuthHashGeneratedAt'] < $mintime ) ) {
       # Don't both regenerating Auth Hash if an hour hasn't gone by yet
       $local_time = localtime();
       $authKey = '';
@@ -133,7 +133,7 @@ function generateAuthHash($useRemoteAddr, $force=false) {
           session_start();
           $close_session = 1;
         }
-        $_SESSION['AuthHash'] = $auth;
+        $_SESSION['AuthHash'.$_SESSION['remoteAddr']] = $auth;
         $_SESSION['AuthHashGeneratedAt'] = $time;
         session_write_close();
       } else {
@@ -143,7 +143,7 @@ function generateAuthHash($useRemoteAddr, $force=false) {
       #} else {
       #Logger::Debug("Using cached auth " . $_SESSION['AuthHash'] ." beacuse generatedat:" . $_SESSION['AuthHashGeneratedAt'] . ' < now:'. $time . ' - ' .  ZM_AUTH_HASH_TTL . ' * 1800 = '. $mintime);
     } # end if AuthHash is not cached
-    return $_SESSION['AuthHash'];
+    return $_SESSION['AuthHash'.$_SESSION['remoteAddr']];
   } # end if using AUTH and AUTH_RELAY
   return '';
 }

From 3723f7acb3081ae4892d983dd5b4a246abd56ddd Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 19 Oct 2018 15:02:10 -0400
Subject: [PATCH 02/86] comment out redundatn code increasing load on server

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

diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js
index c6d7f4854..750678797 100644
--- a/web/skins/classic/views/js/montage.js
+++ b/web/skins/classic/views/js/montage.js
@@ -422,6 +422,9 @@ function initPage() {
   }
   selectLayout('#zmMontageLayout');
 
+  if ( 0 ) {
+    // What is the purpose of this code?  I think it just starts up a second ajax thread,
+      //increasing the load on the server.
   for ( var i = 0; i < monitorData.length; i++ ) {
     if ( monitors[i].type == 'WebSite' )
       continue;
@@ -430,6 +433,7 @@ function initPage() {
     monitors[i].streamCmdQuery.delay( delay, monitors[i] );
     //monitors[i].zm_startup(delay);
   }
+  }
 }
 // Kick everything off
 window.addEvent( 'domready', initPage );

From 8878397622beb798addd7eb1af2551bd159a671a Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 20 Oct 2018 11:36:25 -0400
Subject: [PATCH 03/86] fix spacing

---
 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 f0df3797e..017bce798 100644
--- a/web/api/app/Controller/HostController.php
+++ b/web/api/app/Controller/HostController.php
@@ -69,7 +69,7 @@ class HostController extends AppController {
       $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'];
+        $zmAuthHashIps = $this->Config->find('first',array('conditions' => array('Config.' . $this->Config->primaryKey => 'ZM_AUTH_HASH_IPS')))['Config']['Value'];
         $credentials = 'auth='.generateAuthHash($zmAuthHashIps);
       } else if ( $zmAuthRelay == 'plain' ) {
         // user will need to append the store password here

From f5eca2da1ed4e40e8bd5be4ec0a2b8e0ab46d998 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 20 Oct 2018 11:37:36 -0400
Subject: [PATCH 04/86] No longer need to add thisUrl to monitorUrl

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

diff --git a/web/skins/classic/views/js/zones.js b/web/skins/classic/views/js/zones.js
index a01f8b56f..9ada175bc 100644
--- a/web/skins/classic/views/js/zones.js
+++ b/web/skins/classic/views/js/zones.js
@@ -1,5 +1,5 @@
 var streamCmdParms = "view=request&request=stream&connkey="+connKey;
-var streamCmdReq = new Request.JSON( { url: monitorUrl+thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel' } );
+var streamCmdReq = new Request.JSON( { url: monitorUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel' } );
 
 function streamCmdQuit( action ) {
   if ( action )

From c9c46aa12dcb1f169d7ff344e72f87721821ea94 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 20 Oct 2018 14:32:25 -0400
Subject: [PATCH 05/86] User Monitor->Url() instead of Monitor->Server->Url()
 which will append port #

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

diff --git a/web/skins/classic/views/js/zone.js.php b/web/skins/classic/views/js/zone.js.php
index 49946f767..434fec679 100644
--- a/web/skins/classic/views/js/zone.js.php
+++ b/web/skins/classic/views/js/zone.js.php
@@ -101,7 +101,7 @@ var streamMode = "<?php echo $streamMode ?>";
 var connKey = '<?php echo $connkey ?>';
 
 var monitorId = <?php echo $monitor->Id() ?>;
-var monitorUrl = '<?php echo ( $monitor->Server()->Url() ) ?>';
+var monitorUrl = '<?php echo ( $monitor->Url() ) ?>';
 
 var streamSrc = "<?php echo preg_replace( '/&amp;/', '&', $streamSrc ) ?>";
 

From 069f67a10f87f4f931fc54858e17018e0c44f039 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 20 Oct 2018 14:32:58 -0400
Subject: [PATCH 06/86] Break some long lines

---
 web/skins/classic/views/js/zone.js | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/web/skins/classic/views/js/zone.js b/web/skins/classic/views/js/zone.js
index 023671588..6389e3ce9 100644
--- a/web/skins/classic/views/js/zone.js
+++ b/web/skins/classic/views/js/zone.js
@@ -471,7 +471,13 @@ function setAlarmState( currentAlarmState ) {
 }
 
 var streamCmdParms = "view=request&request=stream&connkey="+connKey;
-var streamCmdReq = new Request.JSON( { url: monitorUrl+thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getStreamCmdResponse } );
+var streamCmdReq = new Request.JSON( {
+  url: monitorUrl,
+  method: 'get',
+  timeout: AJAX_TIMEOUT,
+  link: 'cancel',
+  onSuccess: getStreamCmdResponse
+} );
 var streamCmdTimer = null;
 
 var streamStatus;
@@ -546,7 +552,14 @@ function streamCmdQuery() {
 }
 
 var statusCmdParms = "view=request&request=status&entity=monitor&id="+monitorId+"&element[]=Status&element[]=FrameRate";
-var statusCmdReq = new Request.JSON( { url: monitorUrl+thisUrl, method: 'post', data: statusCmdParms, timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getStatusCmdResponse } );
+var statusCmdReq = new Request.JSON( {
+  url: monitorUrl,
+  method: 'get',
+  data: statusCmdParms,
+  timeout: AJAX_TIMEOUT,
+  link: 'cancel',
+  onSuccess: getStatusCmdResponse
+} );
 var statusCmdTimer = null;
 
 function getStatusCmdResponse( respObj, respText ) {
@@ -652,11 +665,13 @@ function initPage() {
   // Imported from watch.js and modified for new zone edit view
   //
 
+  var delay = (Math.random()+0.1)*statusRefreshTimeout;
+  //console.log("Delay for status updates is: " + delay );
   if ( streamMode == "single" ) {
-    statusCmdTimer = statusCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout );
+    statusCmdTimer = statusCmdQuery.delay( delay );
     watchdogCheck.pass('status').periodical(statusRefreshTimeout*2);
   } else {
-    streamCmdTimer = streamCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout );
+    streamCmdTimer = streamCmdQuery.delay( delay );
     watchdogCheck.pass('stream').periodical(statusRefreshTimeout*2);
   }
 

From 559f34a838800685afd0131d94af8e7387aaf421 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Sat, 20 Oct 2018 14:33:09 -0400
Subject: [PATCH 07/86] User Monitor->Url() instead of Monitor->Server->Url()
 which will append port #

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

diff --git a/web/skins/classic/views/js/zones.js.php b/web/skins/classic/views/js/zones.js.php
index ca234085e..d7144d18a 100644
--- a/web/skins/classic/views/js/zones.js.php
+++ b/web/skins/classic/views/js/zones.js.php
@@ -1,4 +1,4 @@
 var connKey = '<?php echo $connkey ?>';
-var monitorUrl = '<?php echo ( $monitor->Server()->Url() ) ?>';
+var monitorUrl = '<?php echo ( $monitor->Url() ) ?>';
 var CMD_QUIT = <?php echo CMD_QUIT ?>;
 

From 0f14df64e2e2369205e6a3d6a157634db0911366 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 22 Oct 2018 10:41:27 -0400
Subject: [PATCH 08/86] google code style and whitespace

---
 src/zm_image.cpp | 837 +++++++++++++++++------------------------------
 src/zm_image.h   |   1 +
 2 files changed, 296 insertions(+), 542 deletions(-)

diff --git a/src/zm_image.cpp b/src/zm_image.cpp
index ea7ad446b..491ae8470 100644
--- a/src/zm_image.cpp
+++ b/src/zm_image.cpp
@@ -1094,8 +1094,7 @@ bool Image::DecodeJpeg( const JOCTET *inbuffer, int inbuffer_size, unsigned int
 
   jpeg_read_header( cinfo, TRUE );
 
-  if ( cinfo->num_components != 1 && cinfo->num_components != 3 )
-  {
+  if ( cinfo->num_components != 1 && cinfo->num_components != 3 ) {
     Error( "Unexpected colours when reading jpeg image: %d", colours );
     jpeg_abort_decompress( cinfo );
     return( false );
@@ -1110,8 +1109,7 @@ bool Image::DecodeJpeg( const JOCTET *inbuffer, int inbuffer_size, unsigned int
   new_width = cinfo->image_width;
   new_height = cinfo->image_height;
 
-  if ( width != new_width || height != new_height )
-  {
+  if ( width != new_width || height != new_height ) {
     Debug(9,"Image dimensions differ. Old: %ux%u New: %ux%u",width,height,new_width,new_height);
   }
 
@@ -1173,7 +1171,7 @@ cinfo->out_color_space = JCS_RGB;
         }
         break;
       }
-  }
+  } // end switch
 
   if(WriteBuffer(new_width, new_height, new_colours, new_subpixelorder) == NULL) {
     Error("Failed requesting writeable buffer for reading JPEG image.");
@@ -1185,21 +1183,18 @@ cinfo->out_color_space = JCS_RGB;
 
   JSAMPROW row_pointer;  /* pointer to a single row */
   int row_stride = width * colours; /* physical row width in buffer */
-  while ( cinfo->output_scanline < cinfo->output_height )
-  {
+  while ( cinfo->output_scanline < cinfo->output_height ) {
     row_pointer = &buffer[cinfo->output_scanline * row_stride];
     jpeg_read_scanlines( cinfo, &row_pointer, 1 );
   }
 
   jpeg_finish_decompress( cinfo );
 
-  return( true );
+  return true;
 }
 
-bool Image::EncodeJpeg( JOCTET *outbuffer, int *outbuffer_size, int quality_override ) const
-{
-  if ( config.colour_jpeg_files && colours == ZM_COLOUR_GRAY8 )
-  {
+bool Image::EncodeJpeg( JOCTET *outbuffer, int *outbuffer_size, int quality_override ) const {
+  if ( config.colour_jpeg_files && colours == ZM_COLOUR_GRAY8 ) {
     Image temp_image( *this );
     temp_image.Colourise(ZM_COLOUR_RGB24, ZM_SUBPIX_ORDER_RGB );
     return( temp_image.EncodeJpeg( outbuffer, outbuffer_size, quality_override ) );
@@ -1209,8 +1204,7 @@ bool Image::EncodeJpeg( JOCTET *outbuffer, int *outbuffer_size, int quality_over
 
   struct jpeg_compress_struct *cinfo = encodejpg_ccinfo[quality];
 
-  if ( !cinfo )
-  {
+  if ( !cinfo ) {
     cinfo = encodejpg_ccinfo[quality] = new jpeg_compress_struct;
     cinfo->err = jpeg_std_error( &jpg_err.pub );
     jpg_err.pub.error_exit = zm_jpeg_error_exit;
@@ -1276,7 +1270,7 @@ cinfo->out_color_space = JCS_RGB;
         }
         break;
       }
-  }
+  } // end switch
 
   jpeg_set_defaults( cinfo );
   jpeg_set_quality( cinfo, quality, FALSE );
@@ -1286,44 +1280,38 @@ cinfo->out_color_space = JCS_RGB;
 
   JSAMPROW row_pointer;  /* pointer to a single row */
   int row_stride = cinfo->image_width * colours; /* physical row width in buffer */
-  while ( cinfo->next_scanline < cinfo->image_height )
-  {
+  while ( cinfo->next_scanline < cinfo->image_height ) {
     row_pointer = &buffer[cinfo->next_scanline * row_stride];
     jpeg_write_scanlines( cinfo, &row_pointer, 1 );
   }
 
   jpeg_finish_compress( cinfo );
 
-  return( true );
+  return true;
 }
 
 #if HAVE_ZLIB_H
-bool Image::Unzip( const Bytef *inbuffer, unsigned long inbuffer_size )
-{
+bool Image::Unzip( const Bytef *inbuffer, unsigned long inbuffer_size ) {
   unsigned long zip_size = size;
   int result = uncompress( buffer, &zip_size, inbuffer, inbuffer_size );
-  if ( result != Z_OK )
-  {
-    Error( "Unzip failed, result = %d", result );
-    return( false );
+  if ( result != Z_OK ) {
+    Error("Unzip failed, result = %d", result);
+    return false;
   }
-  if ( zip_size != (unsigned int)size )
-  {
-    Error( "Unzip failed, size mismatch, expected %d bytes, got %ld", size, zip_size );
-    return( false );
+  if ( zip_size != (unsigned int)size ) {
+    Error("Unzip failed, size mismatch, expected %d bytes, got %ld", size, zip_size);
+    return false;
   }
-  return( true );
+  return true;
 }
 
-bool Image::Zip( Bytef *outbuffer, unsigned long *outbuffer_size, int compression_level ) const
-{
+bool Image::Zip( Bytef *outbuffer, unsigned long *outbuffer_size, int compression_level ) const {
   int result = compress2( outbuffer, outbuffer_size, buffer, size, compression_level );
-  if ( result != Z_OK )
-  {
-    Error( "Zip failed, result = %d", result );
-    return( false );
+  if ( result != Z_OK ) {
+    Error("Zip failed, result = %d", result);
+    return false;
   }
-  return( true );
+  return true;
 }
 #endif // HAVE_ZLIB_H
 
@@ -1337,11 +1325,11 @@ bool Image::Crop( unsigned int lo_x, unsigned int lo_y, unsigned int hi_x, unsig
   }
   if ( hi_x > (width-1) || ( hi_y > (height-1) ) ) {
     Error( "Attempting to crop outside image, %d,%d -> %d,%d not in %d,%d", lo_x, lo_y, hi_x, hi_y, width-1, height-1 );
-    return( false );
+    return false;
   }
 
   if ( new_width == width && new_height == height ) {
-    return( true );
+    return true;
   }
 
   unsigned int new_size = new_width*new_height*colours;
@@ -1356,24 +1344,22 @@ bool Image::Crop( unsigned int lo_x, unsigned int lo_y, unsigned int hi_x, unsig
 
   AssignDirect(new_width, new_height, colours, subpixelorder, new_buffer, new_size, ZM_BUFTYPE_ZM);
 
-  return( true );
+  return true;
 }
 
-bool Image::Crop( const Box &limits )
-{
-  return( Crop( limits.LoX(), limits.LoY(), limits.HiX(), limits.HiY() ) );
+bool Image::Crop( const Box &limits ) {
+  return Crop( limits.LoX(), limits.LoY(), limits.HiX(), limits.HiY() );
 }
 
 /* Far from complete */
 /* Need to implement all possible of overlays possible */
-void Image::Overlay( const Image &image )
-{
-  if ( !(width == image.width && height == image.height) )
-  {
-    Panic( "Attempt to overlay different sized images, expected %dx%d, got %dx%d", width, height, image.width, image.height );
+void Image::Overlay( const Image &image ) {
+  if ( !(width == image.width && height == image.height) ) {
+    Panic("Attempt to overlay different sized images, expected %dx%d, got %dx%d",
+        width, height, image.width, image.height);
   }
 
-  if( colours == image.colours && subpixelorder != image.subpixelorder ) {
+  if ( colours == image.colours && subpixelorder != image.subpixelorder ) {
     Warning("Attempt to overlay images of same format but with different subpixel order.");
   }
 
@@ -1383,10 +1369,8 @@ void Image::Overlay( const Image &image )
     const uint8_t* psrc = image.buffer;
     uint8_t* pdest = buffer;
 
-    while( pdest < max_ptr )
-    {
-      if ( *psrc )
-      {
+    while( pdest < max_ptr ) {
+      if ( *psrc ) {
         *pdest = *psrc;
       }
       pdest++;
@@ -1401,10 +1385,8 @@ void Image::Overlay( const Image &image )
     const uint8_t* psrc = image.buffer;
     uint8_t* pdest = buffer;
 
-    while( pdest < max_ptr )
-    {
-      if ( RED_PTR_RGBA(psrc) || GREEN_PTR_RGBA(psrc) || BLUE_PTR_RGBA(psrc) )
-      {
+    while( pdest < max_ptr ) {
+      if ( RED_PTR_RGBA(psrc) || GREEN_PTR_RGBA(psrc) || BLUE_PTR_RGBA(psrc) ) {
         RED_PTR_RGBA(pdest) = RED_PTR_RGBA(psrc);
         GREEN_PTR_RGBA(pdest) = GREEN_PTR_RGBA(psrc);
         BLUE_PTR_RGBA(pdest) = BLUE_PTR_RGBA(psrc);
@@ -1421,11 +1403,10 @@ void Image::Overlay( const Image &image )
     const Rgb* prsrc = (Rgb*)image.buffer; 
     Rgb* prdest = (Rgb*)buffer;
 
-    if(subpixelorder == ZM_SUBPIX_ORDER_RGBA || subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
+    if ( subpixelorder == ZM_SUBPIX_ORDER_RGBA || subpixelorder == ZM_SUBPIX_ORDER_BGRA ) {
       /* RGB\BGR\RGBA\BGRA subpixel order - Alpha byte is last */
       while (prdest < max_ptr) {
-        if ( RED_PTR_RGBA(prsrc) || GREEN_PTR_RGBA(prsrc) || BLUE_PTR_RGBA(prsrc) )
-        {
+        if ( RED_PTR_RGBA(prsrc) || GREEN_PTR_RGBA(prsrc) || BLUE_PTR_RGBA(prsrc) ) {
           *prdest = *prsrc;
         }
         prdest++;
@@ -1434,8 +1415,7 @@ void Image::Overlay( const Image &image )
     } else {
       /* ABGR\ARGB subpixel order - Alpha byte is first */
       while (prdest < max_ptr) {
-        if ( RED_PTR_ABGR(prsrc) || GREEN_PTR_ABGR(prsrc) || BLUE_PTR_ABGR(prsrc) )
-        {
+        if ( RED_PTR_ABGR(prsrc) || GREEN_PTR_ABGR(prsrc) || BLUE_PTR_ABGR(prsrc) ) {
           *prdest = *prsrc;
         }
         prdest++;
@@ -1449,10 +1429,8 @@ void Image::Overlay( const Image &image )
     const uint8_t* psrc = image.buffer;
     uint8_t* pdest = buffer;
 
-    while( pdest < max_ptr )
-    {
-      if ( *psrc )
-      {
+    while( pdest < max_ptr ) {
+      if ( *psrc ) {
         RED_PTR_RGBA(pdest) = GREEN_PTR_RGBA(pdest) = BLUE_PTR_RGBA(pdest) = *psrc;
       }
       pdest += 3;
@@ -1465,10 +1443,8 @@ void Image::Overlay( const Image &image )
     const uint8_t* psrc = image.buffer;
     uint8_t* pdest = buffer;
 
-    while( pdest < max_ptr )
-    {
-      if ( RED_PTR_RGBA(psrc) || GREEN_PTR_RGBA(psrc) || BLUE_PTR_RGBA(psrc) )
-      {
+    while( pdest < max_ptr ) {
+      if ( RED_PTR_RGBA(psrc) || GREEN_PTR_RGBA(psrc) || BLUE_PTR_RGBA(psrc) ) {
         RED_PTR_RGBA(pdest) = RED_PTR_RGBA(psrc);
         GREEN_PTR_RGBA(pdest) = GREEN_PTR_RGBA(psrc);
         BLUE_PTR_RGBA(pdest) = BLUE_PTR_RGBA(psrc);
@@ -1487,11 +1463,10 @@ void Image::Overlay( const Image &image )
     Rgb* prdest = (Rgb*)buffer;
     const uint8_t* psrc = image.buffer;
 
-    if(subpixelorder == ZM_SUBPIX_ORDER_RGBA || subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
+    if ( subpixelorder == ZM_SUBPIX_ORDER_RGBA || subpixelorder == ZM_SUBPIX_ORDER_BGRA ) {
       /* RGBA\BGRA subpixel order - Alpha byte is last */
-      while (prdest < max_ptr) {
-        if ( *psrc )
-        {
+      while ( prdest < max_ptr ) {
+        if ( *psrc ) {
           RED_PTR_RGBA(prdest) = GREEN_PTR_RGBA(prdest) = BLUE_PTR_RGBA(prdest) = *psrc;
         }
         prdest++;
@@ -1499,9 +1474,8 @@ void Image::Overlay( const Image &image )
       }
     } else {
       /* ABGR\ARGB subpixel order - Alpha byte is first */
-      while (prdest < max_ptr) {
-        if ( *psrc )
-        {
+      while ( prdest < max_ptr ) {
+        if ( *psrc ) {
           RED_PTR_ABGR(prdest) = GREEN_PTR_ABGR(prdest) = BLUE_PTR_ABGR(prdest) = *psrc;
         }
         prdest++;
@@ -1519,11 +1493,10 @@ void Image::Overlay( const Image &image )
     Rgb* prdest = (Rgb*)buffer;
     const Rgb* prsrc = (Rgb*)image.buffer; 
 
-    if(image.subpixelorder == ZM_SUBPIX_ORDER_RGBA || image.subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
+    if ( image.subpixelorder == ZM_SUBPIX_ORDER_RGBA || image.subpixelorder == ZM_SUBPIX_ORDER_BGRA ) {
       /* RGB\BGR\RGBA\BGRA subpixel order - Alpha byte is last */
-      while (prdest < max_ptr) {
-        if ( RED_PTR_RGBA(prsrc) || GREEN_PTR_RGBA(prsrc) || BLUE_PTR_RGBA(prsrc) )
-        {
+      while ( prdest < max_ptr ) {
+        if ( RED_PTR_RGBA(prsrc) || GREEN_PTR_RGBA(prsrc) || BLUE_PTR_RGBA(prsrc) ) {
           *prdest = *prsrc;
         }
         prdest++;
@@ -1531,9 +1504,8 @@ void Image::Overlay( const Image &image )
       }
     } else {
       /* ABGR\ARGB subpixel order - Alpha byte is first */
-      while (prdest < max_ptr) {
-        if ( RED_PTR_ABGR(prsrc) || GREEN_PTR_ABGR(prsrc) || BLUE_PTR_ABGR(prsrc) )
-        {
+      while ( prdest < max_ptr ) {
+        if ( RED_PTR_ABGR(prsrc) || GREEN_PTR_ABGR(prsrc) || BLUE_PTR_ABGR(prsrc) ) {
           *prdest = *prsrc;
         }
         prdest++;
@@ -1545,61 +1517,49 @@ void Image::Overlay( const Image &image )
 }
 
 /* RGB32 compatible: complete */
-void Image::Overlay( const Image &image, unsigned int x, unsigned int y )
-{
-  if ( !(width < image.width || height < image.height) )
-  {
-    Panic( "Attempt to overlay image too big for destination, %dx%d > %dx%d", image.width, image.height, width, height );
+void Image::Overlay( const Image &image, unsigned int x, unsigned int y ) {
+  if ( !(width < image.width || height < image.height) ) {
+    Panic("Attempt to overlay image too big for destination, %dx%d > %dx%d",
+        image.width, image.height, width, height );
   }
 
-  if ( !(width < (x+image.width) || height < (y+image.height)) )
-  {
-    Panic( "Attempt to overlay image outside of destination bounds, %dx%d @ %dx%d > %dx%d", image.width, image.height, x, y, width, height );
+  if ( !(width < (x+image.width) || height < (y+image.height)) ) {
+    Panic("Attempt to overlay image outside of destination bounds, %dx%d @ %dx%d > %dx%d",
+        image.width, image.height, x, y, width, height );
   }
 
-  if ( !(colours == image.colours) )
-  {
-    Panic( "Attempt to partial overlay differently coloured images, expected %d, got %d", colours, image.colours );
+  if ( !(colours == image.colours) ) {
+    Panic("Attempt to partial overlay differently coloured images, expected %d, got %d",
+        colours, image.colours);
   }
 
   unsigned int lo_x = x;
   unsigned int lo_y = y;
   unsigned int hi_x = (x+image.width)-1;
   unsigned int hi_y = (y+image.height-1);
-  if ( colours == ZM_COLOUR_GRAY8 )
-  {
+  if ( colours == ZM_COLOUR_GRAY8 ) {
     const uint8_t *psrc = image.buffer;
-    for ( unsigned int y = lo_y; y <= hi_y; y++ )
-    {
+    for ( unsigned int y = lo_y; y <= hi_y; y++ ) {
       uint8_t *pdest = &buffer[(y*width)+lo_x];
-      for ( unsigned int x = lo_x; x <= hi_x; x++ )
-      {
+      for ( unsigned int x = lo_x; x <= hi_x; x++ ) {
         *pdest++ = *psrc++;
       }
     }
-  }
-  else if ( colours == ZM_COLOUR_RGB24 )
-  {
+  } else if ( colours == ZM_COLOUR_RGB24 ) {
     const uint8_t *psrc = image.buffer;
-    for ( unsigned int y = lo_y; y <= hi_y; y++ )
-    {
+    for ( unsigned int y = lo_y; y <= hi_y; y++ ) {
       uint8_t *pdest = &buffer[colours*((y*width)+lo_x)];
-      for ( unsigned int x = lo_x; x <= hi_x; x++ )
-      {
+      for ( unsigned int x = lo_x; x <= hi_x; x++ ) {
         *pdest++ = *psrc++;
         *pdest++ = *psrc++;
         *pdest++ = *psrc++;
       }
     }
-  }
-  else if ( colours == ZM_COLOUR_RGB32 )
-  {
+  } else if ( colours == ZM_COLOUR_RGB32 ) {
     const Rgb *psrc = (Rgb*)(image.buffer);
-    for ( unsigned int y = lo_y; y <= hi_y; y++ )
-    {
+    for ( unsigned int y = lo_y; y <= hi_y; y++ ) {
       Rgb *pdest = (Rgb*)&buffer[((y*width)+lo_x)<<2];
-      for ( unsigned int x = lo_x; x <= hi_x; x++ )
-      {
+      for ( unsigned int x = lo_x; x <= hi_x; x++ ) {
         *pdest++ = *psrc++;
       }
     }
@@ -1609,8 +1569,7 @@ void Image::Overlay( const Image &image, unsigned int x, unsigned int y )
 
 }
 
-void Image::Blend( const Image &image, int transparency )
-{
+void Image::Blend( const Image &image, int transparency ) {
 #ifdef ZM_IMAGE_PROFILING
   struct timespec start,end,diff;
   unsigned long long executetime;
@@ -1618,12 +1577,16 @@ void Image::Blend( const Image &image, int transparency )
 #endif
   uint8_t* new_buffer;
 
-  if ( !(width == image.width && height == image.height && colours == image.colours && subpixelorder == image.subpixelorder) )
-  {
-    Panic( "Attempt to blend different sized images, expected %dx%dx%d %d, got %dx%dx%d %d", width, height, colours, subpixelorder, image.width, image.height, image.colours, image.subpixelorder );
+  if ( !(
+        width == image.width && height == image.height
+        && colours == image.colours
+        && subpixelorder == image.subpixelorder
+        ) ) {
+    Panic("Attempt to blend different sized images, expected %dx%dx%d %d, got %dx%dx%d %d",
+        width, height, colours, subpixelorder, image.width, image.height, image.colours, image.subpixelorder );
   }
 
-  if(transparency <= 0)
+  if ( transparency <= 0 )
     return;
 
   new_buffer = AllocBuffer(size);
@@ -1644,7 +1607,7 @@ void Image::Blend( const Image &image, int transparency )
   Debug(5, "Blend: %u colours blended in %llu nanoseconds, %lu million colours/s\n",size,executetime,milpixels);
 #endif
 
-  AssignDirect( width, height, colours, subpixelorder, new_buffer, size, ZM_BUFTYPE_ZM);
+  AssignDirect(width, height, colours, subpixelorder, new_buffer, size, ZM_BUFTYPE_ZM);
 }
 
 Image *Image::Merge( unsigned int n_images, Image *images[] ) {
@@ -1655,7 +1618,8 @@ Image *Image::Merge( unsigned int n_images, Image *images[] ) {
   unsigned int colours = images[0]->colours;
   for ( unsigned int i = 1; i < n_images; i++ ) {
     if ( !(width == images[i]->width && height == images[i]->height && colours == images[i]->colours) ) {
-      Panic( "Attempt to merge different sized images, expected %dx%dx%d, got %dx%dx%d, for image %d", width, height, colours, images[i]->width, images[i]->height, images[i]->colours, i );
+      Panic("Attempt to merge different sized images, expected %dx%dx%d, got %dx%dx%d, for image %d",
+          width, height, colours, images[i]->width, images[i]->height, images[i]->colours, i );
     }
   }
 
@@ -1683,7 +1647,8 @@ Image *Image::Merge( unsigned int n_images, Image *images[], double weight ) {
   unsigned int colours = images[0]->colours;
   for ( unsigned int i = 1; i < n_images; i++ ) {
     if ( !(width == images[i]->width && height == images[i]->height && colours == images[i]->colours) ) {
-      Panic( "Attempt to merge different sized images, expected %dx%dx%d, got %dx%dx%d, for image %d", width, height, colours, images[i]->width, images[i]->height, images[i]->colours, i );
+      Panic("Attempt to merge different sized images, expected %dx%dx%d, got %dx%dx%d, for image %d",
+          width, height, colours, images[i]->width, images[i]->height, images[i]->colours, i );
     }
   }
 
@@ -1703,8 +1668,7 @@ Image *Image::Merge( unsigned int n_images, Image *images[], double weight ) {
   return result;
 }
 
-Image *Image::Highlight( unsigned int n_images, Image *images[], const Rgb threshold, const Rgb ref_colour )
-{
+Image *Image::Highlight( unsigned int n_images, Image *images[], const Rgb threshold, const Rgb ref_colour ) {
   if ( n_images == 1 ) return new Image(*images[0]);
 
   unsigned int width = images[0]->width;
@@ -1712,7 +1676,8 @@ Image *Image::Highlight( unsigned int n_images, Image *images[], const Rgb thres
   unsigned int colours = images[0]->colours;
   for ( unsigned int i = 1; i < n_images; i++ ) {
     if ( !(width == images[i]->width && height == images[i]->height && colours == images[i]->colours) ) {
-      Panic( "Attempt to highlight different sized images, expected %dx%dx%d, got %dx%dx%d, for image %d", width, height, colours, images[i]->width, images[i]->height, images[i]->colours, i );
+      Panic( "Attempt to highlight different sized images, expected %dx%dx%d, got %dx%dx%d, for image %d",
+          width, height, colours, images[i]->width, images[i]->height, images[i]->colours, i );
     }
   }
 
@@ -1738,26 +1703,25 @@ Image *Image::Highlight( unsigned int n_images, Image *images[], const Rgb thres
       pdest += 3;
     }
   }
-  return( result );
+  return result;
 }
 
 /* New function to allow buffer re-using instead of allocationg memory for the delta image every time */
-void Image::Delta( const Image &image, Image* targetimage) const
-{
+void Image::Delta( const Image &image, Image* targetimage) const {
 #ifdef ZM_IMAGE_PROFILING
   struct timespec start,end,diff;
   unsigned long long executetime;
   unsigned long milpixels;
 #endif
 
-  if ( !(width == image.width && height == image.height && colours == image.colours && subpixelorder == image.subpixelorder) )
-  {
-    Panic( "Attempt to get delta of different sized images, expected %dx%dx%d %d, got %dx%dx%d %d", width, height, colours, subpixelorder, image.width, image.height, image.colours, image.subpixelorder);
+  if ( !(width == image.width && height == image.height && colours == image.colours && subpixelorder == image.subpixelorder) ) {
+    Panic( "Attempt to get delta of different sized images, expected %dx%dx%d %d, got %dx%dx%d %d",
+        width, height, colours, subpixelorder, image.width, image.height, image.colours, image.subpixelorder);
   }
 
   uint8_t *pdiff = targetimage->WriteBuffer(width, height, ZM_COLOUR_GRAY8, ZM_SUBPIX_ORDER_NONE);
 
-  if(pdiff == NULL) {
+  if ( pdiff == NULL ) {
     Panic("Failed requesting writeable buffer for storing the delta image");
   }
 
@@ -1847,34 +1811,24 @@ void Image::MaskPrivacy( const unsigned char *p_bitmask, const Rgb pixel_colour
   unsigned char *ptr = &buffer[0];
   unsigned int i = 0;
 
-  for ( unsigned int y = 0; y < height; y++ )
-  {
-    if ( colours == ZM_COLOUR_GRAY8 )
-    {
-      for ( unsigned int x = 0; x < width; x++, ptr++ )
-      {
+  for ( unsigned int y = 0; y < height; y++ ) {
+    if ( colours == ZM_COLOUR_GRAY8 ) {
+      for ( unsigned int x = 0; x < width; x++, ptr++ ) {
         if ( p_bitmask[i] )
           *ptr = pixel_bw_col;
         i++;
       }
-    }
-    else if ( colours == ZM_COLOUR_RGB24 )
-    {
-      for ( unsigned int x = 0; x < width; x++, ptr += colours )
-      {
-        if ( p_bitmask[i] )
-        {
+    } else if ( colours == ZM_COLOUR_RGB24 ) {
+      for ( unsigned int x = 0; x < width; x++, ptr += colours ) {
+        if ( p_bitmask[i] ) {
           RED_PTR_RGBA(ptr) = pixel_r_col;
           GREEN_PTR_RGBA(ptr) = pixel_g_col;
           BLUE_PTR_RGBA(ptr) = pixel_b_col;
         }
         i++;
       }
-    }
-    else if ( colours == ZM_COLOUR_RGB32 )
-    {
-      for ( unsigned int x = 0; x < width; x++, ptr += colours )
-      {
+    } else if ( colours == ZM_COLOUR_RGB32 ) {
+      for ( unsigned int x = 0; x < width; x++, ptr += colours ) {
         Rgb *temp_ptr = (Rgb*)ptr;
         if ( p_bitmask[i] )
           *temp_ptr = pixel_rgb_col;
@@ -1884,8 +1838,7 @@ void Image::MaskPrivacy( const unsigned char *p_bitmask, const Rgb pixel_colour
       Panic("MaskPrivacy called with unexpected colours: %d", colours);
       return;
     }
-
-  }
+  } // end foreach y
 }
 
 /* RGB32 compatible: complete */
@@ -1917,8 +1870,7 @@ void Image::Annotate( const char *p_text, const Coord &coord, const unsigned int
   if (size == 2)
     zm_text_bitmask = 0x8000;
 
-  while ( (index < text_len) && (line_len = strcspn( line, "\n" )) )
-  {
+  while ( (index < text_len) && (line_len = strcspn( line, "\n" )) ) {
 
     unsigned int line_width = line_len * ZM_CHAR_WIDTH * size;
 
@@ -1948,62 +1900,46 @@ void Image::Annotate( const char *p_text, const Coord &coord, const unsigned int
     if ( hi_line_y > height )
       hi_line_y = height;
 
-    if ( colours == ZM_COLOUR_GRAY8 )
-    {
+    if ( colours == ZM_COLOUR_GRAY8 ) {
       unsigned char *ptr = &buffer[(lo_line_y*width)+lo_line_x];
-      for ( unsigned int y = lo_line_y, r = 0; y < hi_line_y && r < (ZM_CHAR_HEIGHT * size); y++, r++, ptr += width )
-      {
+      for ( unsigned int y = lo_line_y, r = 0; y < hi_line_y && r < (ZM_CHAR_HEIGHT * size); y++, r++, ptr += width ) {
         unsigned char *temp_ptr = ptr;
-        for ( unsigned int x = lo_line_x, c = 0; x < hi_line_x && c < line_len; c++ )
-        {
+        for ( unsigned int x = lo_line_x, c = 0; x < hi_line_x && c < line_len; c++ ) {
           int f;
           if (size == 2)
             f = bigfontdata[(line[c] * ZM_CHAR_HEIGHT * size) + r];
           else
             f = fontdata[(line[c] * ZM_CHAR_HEIGHT) + r];
-          for ( unsigned int i = 0; i < (ZM_CHAR_WIDTH * size) && x < hi_line_x; i++, x++, temp_ptr++ )
-          {
-            if ( f & (zm_text_bitmask >> i) )
-            {
+          for ( unsigned int i = 0; i < (ZM_CHAR_WIDTH * size) && x < hi_line_x; i++, x++, temp_ptr++ ) {
+            if ( f & (zm_text_bitmask >> i) ) {
               if ( !fg_trans )
                 *temp_ptr = fg_bw_col;
-            }
-            else if ( !bg_trans )
-            {
+            } else if ( !bg_trans ) {
               *temp_ptr = bg_bw_col;
             }
           }
         }
       }
-    }
-    else if ( colours == ZM_COLOUR_RGB24 )
-    {
+    } else if ( colours == ZM_COLOUR_RGB24 ) {
       unsigned int wc = width * colours;
 
       unsigned char *ptr = &buffer[((lo_line_y*width)+lo_line_x)*colours];
-      for ( unsigned int y = lo_line_y, r = 0; y < hi_line_y && r < (ZM_CHAR_HEIGHT * size); y++, r++, ptr += wc )
-      {
+      for ( unsigned int y = lo_line_y, r = 0; y < hi_line_y && r < (ZM_CHAR_HEIGHT * size); y++, r++, ptr += wc ) {
         unsigned char *temp_ptr = ptr;
-        for ( unsigned int x = lo_line_x, c = 0; x < hi_line_x && c < line_len; c++ )
-        {
+        for ( unsigned int x = lo_line_x, c = 0; x < hi_line_x && c < line_len; c++ ) {
           int f;
           if (size == 2)
             f = bigfontdata[(line[c] * ZM_CHAR_HEIGHT * size) + r];
           else
             f = fontdata[(line[c] * ZM_CHAR_HEIGHT) + r];
-          for ( unsigned int i = 0; i < (ZM_CHAR_WIDTH * size) && x < hi_line_x; i++, x++, temp_ptr += colours )
-          {
-            if ( f & (zm_text_bitmask >> i) )
-            {
-              if ( !fg_trans )
-              {
+          for ( unsigned int i = 0; i < (ZM_CHAR_WIDTH * size) && x < hi_line_x; i++, x++, temp_ptr += colours ) {
+            if ( f & (zm_text_bitmask >> i) ) {
+              if ( !fg_trans ) {
                 RED_PTR_RGBA(temp_ptr) = fg_r_col;
                 GREEN_PTR_RGBA(temp_ptr) = fg_g_col;
                 BLUE_PTR_RGBA(temp_ptr) = fg_b_col;
               }
-            }
-            else if ( !bg_trans )
-            {
+            } else if ( !bg_trans ) {
               RED_PTR_RGBA(temp_ptr) = bg_r_col;
               GREEN_PTR_RGBA(temp_ptr) = bg_g_col;
               BLUE_PTR_RGBA(temp_ptr) = bg_b_col;
@@ -2011,33 +1947,24 @@ void Image::Annotate( const char *p_text, const Coord &coord, const unsigned int
           }
         }
       }
-    } 
-    else if ( colours == ZM_COLOUR_RGB32 )
-    {
+    } else if ( colours == ZM_COLOUR_RGB32 ) {
       unsigned int wc = width * colours;
 
       uint8_t *ptr = &buffer[((lo_line_y*width)+lo_line_x)<<2];
-      for ( unsigned int y = lo_line_y, r = 0; y < hi_line_y && r < (ZM_CHAR_HEIGHT * size); y++, r++, ptr += wc )
-      {
+      for ( unsigned int y = lo_line_y, r = 0; y < hi_line_y && r < (ZM_CHAR_HEIGHT * size); y++, r++, ptr += wc ) {
         Rgb* temp_ptr = (Rgb*)ptr;
-        for ( unsigned int x = lo_line_x, c = 0; x < hi_line_x && c < line_len; c++ )
-        {
+        for ( unsigned int x = lo_line_x, c = 0; x < hi_line_x && c < line_len; c++ ) {
           int f;
           if (size == 2)
             f = bigfontdata[(line[c] * ZM_CHAR_HEIGHT * size) + r];
           else
             f = fontdata[(line[c] * ZM_CHAR_HEIGHT) + r];
-          for ( unsigned int i = 0; i < (ZM_CHAR_WIDTH * size) && x < hi_line_x; i++, x++, temp_ptr++ )
-          {
-            if ( f & (zm_text_bitmask >> i) )
-            {
-              if ( !fg_trans )
-              {
+          for ( unsigned int i = 0; i < (ZM_CHAR_WIDTH * size) && x < hi_line_x; i++, x++, temp_ptr++ ) {
+            if ( f & (zm_text_bitmask >> i) ) {
+              if ( !fg_trans ) {
                 *temp_ptr = fg_rgb_col;
               }
-            }
-            else if ( !bg_trans )
-            {
+            } else if ( !bg_trans ) {
               *temp_ptr = bg_rgb_col;
             }
           }
@@ -2050,8 +1977,7 @@ void Image::Annotate( const char *p_text, const Coord &coord, const unsigned int
     }
 
     index += line_len;
-    while ( text[index] == '\n' )
-    {
+    while ( text[index] == '\n' ) {
       index++;
     }
     line = text+index;
@@ -2072,8 +1998,7 @@ void Image::Timestamp( const char *label, const time_t when, const Coord &coord,
 }
 
 /* RGB32 compatible: complete */
-void Image::Colourise(const unsigned int p_reqcolours, const unsigned int p_reqsubpixelorder)
-{
+void Image::Colourise(const unsigned int p_reqcolours, const unsigned int p_reqsubpixelorder) {
   Debug(9, "Colourise: Req colours: %u Req subpixel order: %u Current colours: %u Current subpixel order: %u",p_reqcolours,p_reqsubpixelorder,colours,subpixelorder);
 
   if ( colours != ZM_COLOUR_GRAY8) {
@@ -2090,9 +2015,9 @@ void Image::Colourise(const unsigned int p_reqcolours, const unsigned int p_reqs
     Rgb subpixel;
     Rgb newpixel;
 
-    if ( p_reqsubpixelorder == ZM_SUBPIX_ORDER_ABGR || p_reqsubpixelorder == ZM_SUBPIX_ORDER_ARGB) {
+    if ( p_reqsubpixelorder == ZM_SUBPIX_ORDER_ABGR || p_reqsubpixelorder == ZM_SUBPIX_ORDER_ARGB ) {
       /* ARGB\ABGR subpixel order. alpha byte is first (mem+0), so we need to shift the pixel left in the end */
-      for(unsigned int i=0;i<pixels;i++) {
+      for ( unsigned int i=0; i < pixels; i++ ) {
         newpixel = subpixel = psrc[i];
         newpixel = (newpixel<<8) | subpixel;
         newpixel = (newpixel<<8) | subpixel;
@@ -2100,7 +2025,7 @@ void Image::Colourise(const unsigned int p_reqcolours, const unsigned int p_reqs
       }    
     } else {
       /* RGBA\BGRA subpixel order, alpha byte is last (mem+3) */
-      for(unsigned int i=0;i<pixels;i++) {
+      for ( unsigned int i=0; i < pixels; i++ ) {
         newpixel = subpixel = psrc[i];
         newpixel = (newpixel<<8) | subpixel;
         newpixel = (newpixel<<8) | subpixel;
@@ -2111,30 +2036,27 @@ void Image::Colourise(const unsigned int p_reqcolours, const unsigned int p_reqs
     /* Directly assign the new buffer and make sure it will be freed when not needed anymore */
     AssignDirect( width, height, p_reqcolours, p_reqsubpixelorder, (uint8_t*)new_buffer, pixels*4, ZM_BUFTYPE_ZM);
 
-  } else if(p_reqcolours == ZM_COLOUR_RGB24 ) {
+  } else if ( p_reqcolours == ZM_COLOUR_RGB24 ) {
     /* RGB24 */
     uint8_t *new_buffer = AllocBuffer(pixels*3);
 
     uint8_t *pdest = new_buffer;
     const uint8_t *psrc = buffer;
 
-    for(unsigned int i=0;i<(unsigned int)pixels;i++, pdest += 3)
-    {
+    for ( unsigned int i=0; i < (unsigned int)pixels; i++, pdest += 3 ) {
       RED_PTR_RGBA(pdest) = GREEN_PTR_RGBA(pdest) = BLUE_PTR_RGBA(pdest) = psrc[i];
     }
 
     /* Directly assign the new buffer and make sure it will be freed when not needed anymore */
     AssignDirect( width, height, p_reqcolours, p_reqsubpixelorder, new_buffer, pixels*3, ZM_BUFTYPE_ZM);
   } else {
-    Error("Colourise called with unexpected colours: %d",colours);
+    Error("Colourise called with unexpected colours: %d", colours);
     return;
   }
-
 }
 
 /* RGB32 compatible: complete */
-void Image::DeColourise()
-{
+void Image::DeColourise() {
   colours = ZM_COLOUR_GRAY8;
   subpixelorder = ZM_SUBPIX_ORDER_NONE;
   size = width * height;
@@ -2158,8 +2080,7 @@ void Image::DeColourise()
     }
   } else {
     /* Use standard functions */
-    if ( colours == ZM_COLOUR_RGB32 )
-    {
+    if ( colours == ZM_COLOUR_RGB32 ) {
       switch(subpixelorder) {
         case ZM_SUBPIX_ORDER_BGRA:
           std_convert_bgra_gray8(buffer,buffer,pixels);
@@ -2191,10 +2112,8 @@ void Image::DeColourise()
 }
 
 /* RGB32 compatible: complete */
-void Image::Fill( Rgb colour, const Box *limits )
-{
-  if ( !(colours == ZM_COLOUR_GRAY8 || colours == ZM_COLOUR_RGB24 || colours == ZM_COLOUR_RGB32 ) )
-  {
+void Image::Fill( Rgb colour, const Box *limits ) {
+  if ( !(colours == ZM_COLOUR_GRAY8 || colours == ZM_COLOUR_RGB24 || colours == ZM_COLOUR_RGB32 ) ) {
     Panic( "Attempt to fill image with unexpected colours %d", colours );
   }
 
@@ -2205,38 +2124,27 @@ void Image::Fill( Rgb colour, const Box *limits )
   unsigned int lo_y = limits?limits->Lo().Y():0;
   unsigned int hi_x = limits?limits->Hi().X():width-1;
   unsigned int hi_y = limits?limits->Hi().Y():height-1;
-  if ( colours == ZM_COLOUR_GRAY8 )
-  {
-    for ( unsigned int y = lo_y; y <= hi_y; y++ )
-    {
+  if ( colours == ZM_COLOUR_GRAY8 ) {
+    for ( unsigned int y = lo_y; y <= hi_y; y++ ) {
       unsigned char *p = &buffer[(y*width)+lo_x];
-      for ( unsigned int x = lo_x; x <= hi_x; x++, p++)
-      {
+      for ( unsigned int x = lo_x; x <= hi_x; x++, p++) {
         *p = colour;
       }
     }
-  }
-  else if ( colours == ZM_COLOUR_RGB24 )
-  {
-    for ( unsigned int y = lo_y; y <= hi_y; y++ )
-    {
+  } else if ( colours == ZM_COLOUR_RGB24 ) {
+    for ( unsigned int y = lo_y; y <= hi_y; y++ ) {
       unsigned char *p = &buffer[colours*((y*width)+lo_x)];
-      for ( unsigned int x = lo_x; x <= hi_x; x++, p += 3)
-      {
+      for ( unsigned int x = lo_x; x <= hi_x; x++, p += 3) {
         RED_PTR_RGBA(p) = RED_VAL_RGBA(colour);
         GREEN_PTR_RGBA(p) = GREEN_VAL_RGBA(colour);
         BLUE_PTR_RGBA(p) = BLUE_VAL_RGBA(colour);
       }
     }
-  }
-  else if ( colours == ZM_COLOUR_RGB32 ) /* RGB32 */
-  {
-    for ( unsigned int y = lo_y; y <= (unsigned int)hi_y; y++ )
-    {
+  } else if ( colours == ZM_COLOUR_RGB32 ) /* RGB32 */ {
+    for ( unsigned int y = lo_y; y <= (unsigned int)hi_y; y++ ) {
       Rgb *p = (Rgb*)&buffer[((y*width)+lo_x)<<2];
 
-      for ( unsigned int x = lo_x; x <= (unsigned int)hi_x; x++, p++)
-      {
+      for ( unsigned int x = lo_x; x <= (unsigned int)hi_x; x++, p++) {
         /* Fast, copies the entire pixel in a single pass */ 
         *p = colour;
       }
@@ -2245,15 +2153,13 @@ void Image::Fill( Rgb colour, const Box *limits )
 }
 
 /* RGB32 compatible: complete */
-void Image::Fill( Rgb colour, int density, const Box *limits )
-{
+void Image::Fill( Rgb colour, int density, const Box *limits ) {
   /* Allow the faster version to be used if density is not used (density=1) */
-  if(density <= 1)
+  if ( density <= 1 )
     return Fill(colour,limits);
 
-  if ( !(colours == ZM_COLOUR_GRAY8 || colours == ZM_COLOUR_RGB24 || colours == ZM_COLOUR_RGB32  ) )
-  {
-    Panic( "Attempt to fill image with unexpected colours %d", colours );
+  if ( !(colours == ZM_COLOUR_GRAY8 || colours == ZM_COLOUR_RGB24 || colours == ZM_COLOUR_RGB32  ) ) {
+    Panic("Attempt to fill image with unexpected colours %d", colours);
   }
 
   /* Convert the colour's RGBA subpixel order into the image's subpixel order */
@@ -2263,25 +2169,18 @@ void Image::Fill( Rgb colour, int density, const Box *limits )
   unsigned int lo_y = limits?limits->Lo().Y():0;
   unsigned int hi_x = limits?limits->Hi().X():width-1;
   unsigned int hi_y = limits?limits->Hi().Y():height-1;
-  if ( colours == ZM_COLOUR_GRAY8 )
-  {
-    for ( unsigned int y = lo_y; y <= hi_y; y++ )
-    {
+  if ( colours == ZM_COLOUR_GRAY8 ) {
+    for ( unsigned int y = lo_y; y <= hi_y; y++ ) {
       unsigned char *p = &buffer[(y*width)+lo_x];
-      for ( unsigned int x = lo_x; x <= hi_x; x++, p++)
-      {
+      for ( unsigned int x = lo_x; x <= hi_x; x++, p++) {
         if ( ( x == lo_x || x == hi_x || y == lo_y || y == hi_y ) || (!(x%density) && !(y%density) ) )
           *p = colour;
       }
     }
-  }
-  else if ( colours == ZM_COLOUR_RGB24 )
-  {
-    for ( unsigned int y = lo_y; y <= hi_y; y++ )
-    {
+  } else if ( colours == ZM_COLOUR_RGB24 ) {
+    for ( unsigned int y = lo_y; y <= hi_y; y++ ) {
       unsigned char *p = &buffer[colours*((y*width)+lo_x)];
-      for ( unsigned int x = lo_x; x <= hi_x; x++, p += 3)
-      {
+      for ( unsigned int x = lo_x; x <= hi_x; x++, p += 3) {
         if ( ( x == lo_x || x == hi_x || y == lo_y || y == hi_y ) || (!(x%density) && !(y%density) ) ) {
           RED_PTR_RGBA(p) = RED_VAL_RGBA(colour);
           GREEN_PTR_RGBA(p) = GREEN_VAL_RGBA(colour);
@@ -2289,38 +2188,30 @@ void Image::Fill( Rgb colour, int density, const Box *limits )
         }
       }
     }
-  }
-  else if ( colours == ZM_COLOUR_RGB32 ) /* RGB32 */
-  {
-    for ( unsigned int y = lo_y; y <= hi_y; y++ )
-    {
+  } else if ( colours == ZM_COLOUR_RGB32 ) /* RGB32 */ {
+    for ( unsigned int y = lo_y; y <= hi_y; y++ ) {
       Rgb* p = (Rgb*)&buffer[((y*width)+lo_x)<<2];
 
-      for ( unsigned int x = lo_x; x <= hi_x; x++, p++)
-      {
+      for ( unsigned int x = lo_x; x <= hi_x; x++, p++) {
         if ( ( x == lo_x || x == hi_x || y == lo_y || y == hi_y ) || (!(x%density) && !(y%density) ) )
           /* Fast, copies the entire pixel in a single pass */
           *p = colour;
       }
     }
   }  
-
 }
 
 /* RGB32 compatible: complete */
-void Image::Outline( Rgb colour, const Polygon &polygon )
-{
-  if ( !(colours == ZM_COLOUR_GRAY8 || colours == ZM_COLOUR_RGB24 || colours == ZM_COLOUR_RGB32 ) )
-  {
-    Panic( "Attempt to outline image with unexpected colours %d", colours );
+void Image::Outline( Rgb colour, const Polygon &polygon ) {
+  if ( !(colours == ZM_COLOUR_GRAY8 || colours == ZM_COLOUR_RGB24 || colours == ZM_COLOUR_RGB32 ) ) {
+    Panic("Attempt to outline image with unexpected colours %d", colours);
   }
 
   /* Convert the colour's RGBA subpixel order into the image's subpixel order */
   colour = rgb_convert(colour,subpixelorder);
 
   int n_coords = polygon.getNumCoords();
-  for ( int j = 0, i = n_coords-1; j < n_coords; i = j++ )
-  {
+  for ( int j = 0, i = n_coords-1; j < n_coords; i = j++ ) {
     const Coord &p1 = polygon.getCoord( i );
     const Coord &p2 = polygon.getCoord( j );
 
@@ -2335,8 +2226,7 @@ void Image::Outline( Rgb colour, const Polygon &polygon )
     double grad;
 
     //Debug( 9, "dx: %.2lf, dy: %.2lf", dx, dy );
-    if ( fabs(dx) <= fabs(dy) )
-    {
+    if ( fabs(dx) <= fabs(dy) ) {
       //Debug( 9, "dx <= dy" );
       if ( y1 != y2 )
         grad = dx/dy;
@@ -2346,35 +2236,25 @@ void Image::Outline( Rgb colour, const Polygon &polygon )
       double x;
       int y, yinc = (y1<y2)?1:-1;
       grad *= yinc;
-      if ( colours == ZM_COLOUR_GRAY8 )
-      {
+      if ( colours == ZM_COLOUR_GRAY8 ) {
         //Debug( 9, "x1:%d, x2:%d, y1:%d, y2:%d, gr:%.2f", x1, x2, y1, y2, grad );
-        for ( x = x1, y = y1; y != y2; y += yinc, x += grad )
-        {
+        for ( x = x1, y = y1; y != y2; y += yinc, x += grad ) {
           //Debug( 9, "x:%.2f, y:%d", x, y );
           buffer[(y*width)+int(round(x))] = colour;
         }
-      }
-      else if ( colours == ZM_COLOUR_RGB24 )
-      {
-        for ( x = x1, y = y1; y != y2; y += yinc, x += grad )
-        {
+      } else if ( colours == ZM_COLOUR_RGB24 ) {
+        for ( x = x1, y = y1; y != y2; y += yinc, x += grad ) {
           unsigned char *p = &buffer[colours*((y*width)+int(round(x)))];
           RED_PTR_RGBA(p) = RED_VAL_RGBA(colour);
           GREEN_PTR_RGBA(p) = GREEN_VAL_RGBA(colour);
           BLUE_PTR_RGBA(p) = BLUE_VAL_RGBA(colour);
         }
-      }
-      else if ( colours == ZM_COLOUR_RGB32 )
-      {
-        for ( x = x1, y = y1; y != y2; y += yinc, x += grad )
-        {
+      } else if ( colours == ZM_COLOUR_RGB32 ) {
+        for ( x = x1, y = y1; y != y2; y += yinc, x += grad ) {
           *(Rgb*)(buffer+(((y*width)+int(round(x)))<<2)) = colour;
         }
       }
-    }
-    else
-    {
+    } else {
       //Debug( 9, "dx > dy" );
       if ( x1 != x2 )
         grad = dy/dx;
@@ -2385,42 +2265,31 @@ void Image::Outline( Rgb colour, const Polygon &polygon )
       double y;
       int x, xinc = (x1<x2)?1:-1;
       grad *= xinc;
-      if ( colours == ZM_COLOUR_GRAY8 )
-      {
+      if ( colours == ZM_COLOUR_GRAY8 ) {
         //Debug( 9, "x1:%d, x2:%d, y1:%d, y2:%d, gr:%.2lf", x1, x2, y1, y2, grad );
-        for ( y = y1, x = x1; x != x2; x += xinc, y += grad )
-        {
+        for ( y = y1, x = x1; x != x2; x += xinc, y += grad ) {
           //Debug( 9, "x:%d, y:%.2f", x, y );
           buffer[(int(round(y))*width)+x] = colour;
         }
-      }
-      else if ( colours == ZM_COLOUR_RGB24 )
-      {
-        for ( y = y1, x = x1; x != x2; x += xinc, y += grad )
-        {
+      } else if ( colours == ZM_COLOUR_RGB24 ) {
+        for ( y = y1, x = x1; x != x2; x += xinc, y += grad ) {
           unsigned char *p = &buffer[colours*((int(round(y))*width)+x)];
           RED_PTR_RGBA(p) = RED_VAL_RGBA(colour);
           GREEN_PTR_RGBA(p) = GREEN_VAL_RGBA(colour);
           BLUE_PTR_RGBA(p) = BLUE_VAL_RGBA(colour);
         }
-      }
-      else if ( colours == ZM_COLOUR_RGB32 )
-      {
-        for ( y = y1, x = x1; x != x2; x += xinc, y += grad )
-        {
+      } else if ( colours == ZM_COLOUR_RGB32 ) {
+        for ( y = y1, x = x1; x != x2; x += xinc, y += grad ) {
           *(Rgb*)(buffer+(((int(round(y))*width)+x)<<2)) = colour;
         }
       }
-
     }
-  }
+  } // end foreach coordinate in the polygon
 }
 
 /* RGB32 compatible: complete */
-void Image::Fill( Rgb colour, int density, const Polygon &polygon )
-{
-  if ( !(colours == ZM_COLOUR_GRAY8 || colours == ZM_COLOUR_RGB24 || colours == ZM_COLOUR_RGB32 ) )
-  {
+void Image::Fill( Rgb colour, int density, const Polygon &polygon ) {
+  if ( !(colours == ZM_COLOUR_GRAY8 || colours == ZM_COLOUR_RGB24 || colours == ZM_COLOUR_RGB32 ) ) {
     Panic( "Attempt to fill image with unexpected colours %d", colours );
   }
 
@@ -2430,8 +2299,7 @@ void Image::Fill( Rgb colour, int density, const Polygon &polygon )
   int n_coords = polygon.getNumCoords();
   int n_global_edges = 0;
   Edge global_edges[n_coords];
-  for ( int j = 0, i = n_coords-1; j < n_coords; i = j++ )
-  {
+  for ( int j = 0, i = n_coords-1; j < n_coords; i = j++ ) {
     const Coord &p1 = polygon.getCoord( i );
     const Coord &p2 = polygon.getCoord( j );
 
@@ -2456,10 +2324,8 @@ void Image::Fill( Rgb colour, int density, const Polygon &polygon )
   qsort( global_edges, n_global_edges, sizeof(*global_edges), Edge::CompareYX );
 
 #ifndef ZM_DBG_OFF
-  if ( logLevel() >= Logger::DEBUG9 )
-  {
-    for ( int i = 0; i < n_global_edges; i++ )
-    {
+  if ( logLevel() >= Logger::DEBUG9 ) {
+    for ( int i = 0; i < n_global_edges; i++ ) {
       Debug( 9, "%d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f", i, global_edges[i].min_y, global_edges[i].max_y, global_edges[i].min_x, global_edges[i]._1_m );
     }
   }
@@ -2468,60 +2334,46 @@ void Image::Fill( Rgb colour, int density, const Polygon &polygon )
   int n_active_edges = 0;
   Edge active_edges[n_global_edges];
   int y = global_edges[0].min_y;
-  do 
-  {
-    for ( int i = 0; i < n_global_edges; i++ )
-    {
-      if ( global_edges[i].min_y == y )
-      {
-        Debug( 9, "Moving global edge" );
+  do {
+    for ( int i = 0; i < n_global_edges; i++ ) {
+      if ( global_edges[i].min_y == y ) {
+        Debug(9, "Moving global edge");
         active_edges[n_active_edges++] = global_edges[i];
-        if ( i < (n_global_edges-1) )
-        {
+        if ( i < (n_global_edges-1) ) {
           //memcpy( &global_edges[i], &global_edges[i+1], sizeof(*global_edges)*(n_global_edges-i) );
           memmove( &global_edges[i], &global_edges[i+1], sizeof(*global_edges)*(n_global_edges-i) );
           i--;
         }
         n_global_edges--;
-      }
-      else
-      {
+      } else {
         break;
       }
     }
     qsort( active_edges, n_active_edges, sizeof(*active_edges), Edge::CompareX );
 #ifndef ZM_DBG_OFF
-    if ( logLevel() >= Logger::DEBUG9 )
-    {
-      for ( int i = 0; i < n_active_edges; i++ )
-      {
+    if ( logLevel() >= Logger::DEBUG9 ) {
+      for ( int i = 0; i < n_active_edges; i++ ) {
         Debug( 9, "%d - %d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f", y, i, active_edges[i].min_y, active_edges[i].max_y, active_edges[i].min_x, active_edges[i]._1_m );
       }
     }
 #endif
-    if ( !(y%density) )
-    {
+    if ( !(y%density) ) {
       //Debug( 9, "%d", y );
-      for ( int i = 0; i < n_active_edges; )
-      {
+      for ( int i = 0; i < n_active_edges; ) {
         int lo_x = int(round(active_edges[i++].min_x));
         int hi_x = int(round(active_edges[i++].min_x));
-        if( colours == ZM_COLOUR_GRAY8 ) {
+        if ( colours == ZM_COLOUR_GRAY8 ) {
           unsigned char *p = &buffer[(y*width)+lo_x];
-          for ( int x = lo_x; x <= hi_x; x++, p++)
-          {
-            if ( !(x%density) )
-            {
+          for ( int x = lo_x; x <= hi_x; x++, p++) {
+            if ( !(x%density) ) {
               //Debug( 9, " %d", x );
               *p = colour;
             }
           }
-        } else if( colours == ZM_COLOUR_RGB24 ) {
+        } else if ( colours == ZM_COLOUR_RGB24 ) {
           unsigned char *p = &buffer[colours*((y*width)+lo_x)];
-          for ( int x = lo_x; x <= hi_x; x++, p += 3)
-          {
-            if ( !(x%density) )
-            {  
+          for ( int x = lo_x; x <= hi_x; x++, p += 3) {
+            if ( !(x%density) ) {  
               RED_PTR_RGBA(p) = RED_VAL_RGBA(colour);
               GREEN_PTR_RGBA(p) = GREEN_VAL_RGBA(colour);
               BLUE_PTR_RGBA(p) = BLUE_VAL_RGBA(colour);
@@ -2529,10 +2381,8 @@ void Image::Fill( Rgb colour, int density, const Polygon &polygon )
           }
         } else if( colours == ZM_COLOUR_RGB32 ) {
           Rgb *p = (Rgb*)&buffer[((y*width)+lo_x)<<2];
-          for ( int x = lo_x; x <= hi_x; x++, p++)
-          {
-            if ( !(x%density) )
-            {
+          for ( int x = lo_x; x <= hi_x; x++, p++) {
+            if ( !(x%density) ) {
               /* Fast, copies the entire pixel in a single pass */
               *p = colour;
             }
@@ -2541,43 +2391,35 @@ void Image::Fill( Rgb colour, int density, const Polygon &polygon )
       }
     }
     y++;
-    for ( int i = n_active_edges-1; i >= 0; i-- )
-    {
-      if ( y >= active_edges[i].max_y ) // Or >= as per sheets
-      {
+    for ( int i = n_active_edges-1; i >= 0; i-- ) {
+      if ( y >= active_edges[i].max_y ) {
+        // Or >= as per sheets
         Debug( 9, "Deleting active_edge" );
-        if ( i < (n_active_edges-1) )
-        {
+        if ( i < (n_active_edges-1) ) {
           //memcpy( &active_edges[i], &active_edges[i+1], sizeof(*active_edges)*(n_active_edges-i) );
           memmove( &active_edges[i], &active_edges[i+1], sizeof(*active_edges)*(n_active_edges-i) );
         }
         n_active_edges--;
-      }
-      else
-      {
+      } else {
         active_edges[i].min_x += active_edges[i]._1_m;
       }
     }
   } while ( n_global_edges || n_active_edges );
 }
 
-void Image::Fill( Rgb colour, const Polygon &polygon )
-{
+void Image::Fill( Rgb colour, const Polygon &polygon ) {
   Fill( colour, 1, polygon );
 }
 
 /* RGB32 compatible: complete */
-void Image::Rotate( int angle )
-{
+void Image::Rotate( int angle ) {
 
   angle %= 360;
 
-  if ( !angle )
-  {
+  if ( !angle ) {
     return;
   }
-  if ( angle%90 )
-  {
+  if ( angle%90 ) {
     return;
   }
 
@@ -2708,39 +2550,28 @@ void Image::Flip( bool leftright ) {
     unsigned char *d_ptr = flip_buffer;
     unsigned char *max_d_ptr = flip_buffer + size;
 
-    if ( colours == ZM_COLOUR_GRAY8 )
-    {
-      while( d_ptr < max_d_ptr )
-      {
-        for ( unsigned int j = 0; j < width; j++ )
-        {
+    if ( colours == ZM_COLOUR_GRAY8 ) {
+      while( d_ptr < max_d_ptr ) {
+        for ( unsigned int j = 0; j < width; j++ ) {
           s_ptr--;
           *d_ptr++ = *s_ptr;
         }
         s_ptr += line_bytes2;
       }
-    }
-    else if ( colours == ZM_COLOUR_RGB32 )
-    {
+    } else if ( colours == ZM_COLOUR_RGB32 ) {
       Rgb* s_rptr = (Rgb*)s_ptr;
       Rgb* d_rptr = (Rgb*)flip_buffer;
       Rgb* max_d_rptr = (Rgb*)max_d_ptr;
-      while( d_rptr < max_d_rptr )
-      {
-        for ( unsigned int j = 0; j < width; j++ )
-        {
+      while( d_rptr < max_d_rptr ) {
+        for ( unsigned int j = 0; j < width; j++ ) {
           s_rptr--;
           *d_rptr++ = *s_rptr;
         }
         s_rptr += width * 2;
       }
-    }
-    else /* Assume RGB24 */
-    {
-      while( d_ptr < max_d_ptr )
-      {
-        for ( unsigned int j = 0; j < width; j++ )
-        {
+    } else /* Assume RGB24 */ {
+      while( d_ptr < max_d_ptr ) {
+        for ( unsigned int j = 0; j < width; j++ ) {
           s_ptr -= 3;
           *d_ptr++ = *s_ptr;
           *d_ptr++ = *(s_ptr+1);
@@ -2749,15 +2580,12 @@ void Image::Flip( bool leftright ) {
         s_ptr += line_bytes2;
       }
     }    
-  }
-  else
-  {
+  } else {
     // Vertical flip, top to bottom
     unsigned char *s_ptr = buffer+(height*line_bytes);
     unsigned char *d_ptr = flip_buffer;
 
-    while( s_ptr > buffer )
-    {
+    while( s_ptr > buffer ) {
       s_ptr -= line_bytes;
       memcpy( d_ptr, s_ptr, line_bytes );
       d_ptr += line_bytes;
@@ -2768,15 +2596,12 @@ void Image::Flip( bool leftright ) {
 
 }
 
-void Image::Scale( unsigned int factor )
-{
-  if ( !factor )
-  {
+void Image::Scale( unsigned int factor ) {
+  if ( !factor ) {
     Error( "Bogus scale factor %d found", factor );
     return;
   }
-  if ( factor == ZM_SCALE_BASE )
-  {
+  if ( factor == ZM_SCALE_BASE ) {
     return;
   }
 
@@ -2787,8 +2612,7 @@ void Image::Scale( unsigned int factor )
 
   uint8_t* scale_buffer = AllocBuffer(scale_buffer_size);
 
-  if ( factor > ZM_SCALE_BASE )
-  {
+  if ( factor > ZM_SCALE_BASE ) {
     unsigned char *pd = scale_buffer;
     unsigned int wc = width*colours;
     unsigned int nwc = new_width*colours;
@@ -2796,20 +2620,16 @@ void Image::Scale( unsigned int factor )
     unsigned int last_h_index = 0;
     unsigned int last_w_index = 0;
     unsigned int h_index;
-    for ( unsigned int y = 0; y < height; y++ )
-    {
+    for ( unsigned int y = 0; y < height; y++ ) {
       unsigned char *ps = &buffer[y*wc];
       unsigned int w_count = ZM_SCALE_BASE/2;
       unsigned int w_index;
       last_w_index = 0;
-      for ( unsigned int x = 0; x < width; x++ )
-      {
+      for ( unsigned int x = 0; x < width; x++ ) {
         w_count += factor;
         w_index = w_count/ZM_SCALE_BASE;
-        for (unsigned int f = last_w_index; f < w_index; f++ )
-        {
-          for ( unsigned int c = 0; c < colours; c++ )
-          {
+        for (unsigned int f = last_w_index; f < w_index; f++ ) {
+          for ( unsigned int c = 0; c < colours; c++ ) {
             *pd++ = *(ps+c);
           }
         }
@@ -2818,8 +2638,7 @@ void Image::Scale( unsigned int factor )
       }
       h_count += factor;
       h_index = h_count/ZM_SCALE_BASE;
-      for ( unsigned int f = last_h_index+1; f < h_index; f++ )
-      {
+      for ( unsigned int f = last_h_index+1; f < h_index; f++ ) {
         memcpy( pd, pd-nwc, nwc );
         pd += nwc;
       }
@@ -2827,9 +2646,7 @@ void Image::Scale( unsigned int factor )
     }
     new_width = last_w_index;
     new_height = last_h_index;
-  }
-  else
-  {
+  } else {
     unsigned char *pd = scale_buffer;
     unsigned int wc = width*colours;
     unsigned int xstart = factor/2;
@@ -2838,31 +2655,24 @@ void Image::Scale( unsigned int factor )
     unsigned int last_h_index = 0;
     unsigned int last_w_index = 0;
     unsigned int h_index;
-    for ( unsigned int y = 0; y < (unsigned int)height; y++ )
-    {
+    for ( unsigned int y = 0; y < (unsigned int)height; y++ ) {
       h_count += factor;
       h_index = h_count/ZM_SCALE_BASE;
-      if ( h_index > last_h_index )
-      {
+      if ( h_index > last_h_index ) {
         unsigned int w_count = xstart;
         unsigned int w_index;
         last_w_index = 0;
 
         unsigned char *ps = &buffer[y*wc];
-        for ( unsigned int x = 0; x < (unsigned int)width; x++ )
-        {
+        for ( unsigned int x = 0; x < (unsigned int)width; x++ ) {
           w_count += factor;
           w_index = w_count/ZM_SCALE_BASE;
 
-          if ( w_index > last_w_index )
-          {
-            for ( unsigned int c = 0; c < colours; c++ )
-            {
+          if ( w_index > last_w_index ) {
+            for ( unsigned int c = 0; c < colours; c++ ) {
               *pd++ = *ps++;
             }
-          }
-          else
-          {
+          } else {
             ps += colours;
           }
           last_w_index = w_index;
@@ -2878,29 +2688,23 @@ void Image::Scale( unsigned int factor )
 
 }
 
-void Image::Deinterlace_Discard()
-{
+void Image::Deinterlace_Discard() {
   /* Simple deinterlacing. Copy the even lines into the odd lines */
 
-  if ( colours == ZM_COLOUR_GRAY8 )
-  {
+  if ( colours == ZM_COLOUR_GRAY8 ) {
     const uint8_t *psrc;
     uint8_t *pdest;
-    for (unsigned int y = 0; y < (unsigned int)height; y += 2)
-    {
+    for (unsigned int y = 0; y < (unsigned int)height; y += 2) {
       psrc = buffer + (y * width);
       pdest = buffer + ((y+1) * width);
       for (unsigned int x = 0; x < (unsigned int)width; x++) {
         *pdest++ = *psrc++;
       }
     }
-  }
-  else if ( colours == ZM_COLOUR_RGB24 )
-  {
+  } else if ( colours == ZM_COLOUR_RGB24 ) {
     const uint8_t *psrc;
     uint8_t *pdest;
-    for (unsigned int y = 0; y < (unsigned int)height; y += 2)
-    {
+    for (unsigned int y = 0; y < (unsigned int)height; y += 2) {
       psrc = buffer + ((y * width) * 3);
       pdest = buffer + (((y+1) * width) * 3);
       for (unsigned int x = 0; x < (unsigned int)width; x++) {
@@ -2909,13 +2713,10 @@ void Image::Deinterlace_Discard()
         *pdest++ = *psrc++;
       }
     }
-  }
-  else if ( colours == ZM_COLOUR_RGB32 )
-  {
+  } else if ( colours == ZM_COLOUR_RGB32 ) {
     const Rgb *psrc;
     Rgb *pdest;
-    for (unsigned int y = 0; y < (unsigned int)height; y += 2)
-    {
+    for (unsigned int y = 0; y < (unsigned int)height; y += 2) {
       psrc = (Rgb*)(buffer + ((y * width) << 2));
       pdest = (Rgb*)(buffer + (((y+1) * width) << 2));
       for (unsigned int x = 0; x < (unsigned int)width; x++) {
@@ -2928,17 +2729,14 @@ void Image::Deinterlace_Discard()
 
 }
 
-void Image::Deinterlace_Linear()
-{
+void Image::Deinterlace_Linear() {
   /* Simple deinterlacing. The odd lines are average of the line above and line below */
 
   const uint8_t *pbelow, *pabove;
   uint8_t *pcurrent;
 
-  if ( colours == ZM_COLOUR_GRAY8 )
-  {
-    for (unsigned int y = 1; y < (unsigned int)(height-1); y += 2)
-    {
+  if ( colours == ZM_COLOUR_GRAY8 ) {
+    for (unsigned int y = 1; y < (unsigned int)(height-1); y += 2) {
       pabove = buffer + ((y-1) * width);
       pbelow = buffer + ((y+1) * width);
       pcurrent = buffer + (y * width);
@@ -2952,11 +2750,8 @@ void Image::Deinterlace_Linear()
     for (unsigned int x = 0; x < (unsigned int)width; x++) {
       *pcurrent++ = *pabove++;
     }
-  }
-  else if ( colours == ZM_COLOUR_RGB24 )
-  {
-    for (unsigned int y = 1; y < (unsigned int)(height-1); y += 2)
-    {
+  } else if ( colours == ZM_COLOUR_RGB24 ) {
+    for (unsigned int y = 1; y < (unsigned int)(height-1); y += 2) {
       pabove = buffer + (((y-1) * width) * 3);
       pbelow = buffer + (((y+1) * width) * 3);
       pcurrent = buffer + ((y * width) * 3);
@@ -2974,11 +2769,8 @@ void Image::Deinterlace_Linear()
       *pcurrent++ = *pabove++;
       *pcurrent++ = *pabove++;
     }
-  }
-  else if ( colours == ZM_COLOUR_RGB32 )
-  {
-    for (unsigned int y = 1; y < (unsigned int)(height-1); y += 2)
-    {
+  } else if ( colours == ZM_COLOUR_RGB32 ) {
+    for (unsigned int y = 1; y < (unsigned int)(height-1); y += 2) {
       pabove = buffer + (((y-1) * width) << 2);
       pbelow = buffer + (((y+1) * width) << 2);
       pcurrent = buffer + ((y * width) << 2);
@@ -3004,16 +2796,13 @@ void Image::Deinterlace_Linear()
 
 }
 
-void Image::Deinterlace_Blend()
-{
+void Image::Deinterlace_Blend() {
   /* Simple deinterlacing. Blend the fields together. 50% blend */
 
   uint8_t *pabove, *pcurrent;
 
-  if ( colours == ZM_COLOUR_GRAY8 )
-  {
-    for (unsigned int y = 1; y < (unsigned int)height; y += 2)
-    {
+  if ( colours == ZM_COLOUR_GRAY8 ) {
+    for (unsigned int y = 1; y < (unsigned int)height; y += 2) {
       pabove = buffer + ((y-1) * width);
       pcurrent = buffer + (y * width);
       for (unsigned int x = 0; x < (unsigned int)width; x++) {
@@ -3021,11 +2810,8 @@ void Image::Deinterlace_Blend()
         *pcurrent++ = *pabove++;
       }
     }
-  }
-  else if ( colours == ZM_COLOUR_RGB24 )
-  {
-    for (unsigned int y = 1; y < (unsigned int)height; y += 2)
-    {
+  } else if ( colours == ZM_COLOUR_RGB24 ) {
+    for (unsigned int y = 1; y < (unsigned int)height; y += 2) {
       pabove = buffer + (((y-1) * width) * 3);
       pcurrent = buffer + ((y * width) * 3);
       for (unsigned int x = 0; x < (unsigned int)width; x++) {
@@ -3037,11 +2823,8 @@ void Image::Deinterlace_Blend()
         *pcurrent++ = *pabove++;
       }
     }
-  }
-  else if ( colours == ZM_COLOUR_RGB32 )
-  {
-    for (unsigned int y = 1; y < (unsigned int)height; y += 2)
-    {
+  } else if ( colours == ZM_COLOUR_RGB32 ) {
+    for (unsigned int y = 1; y < (unsigned int)height; y += 2) {
       pabove = buffer + (((y-1) * width) << 2);
       pcurrent = buffer + ((y * width) << 2);
       for (unsigned int x = 0; x < (unsigned int)width; x++) {
@@ -3061,8 +2844,7 @@ void Image::Deinterlace_Blend()
 
 }
 
-void Image::Deinterlace_Blend_CustomRatio(int divider)
-{
+void Image::Deinterlace_Blend_CustomRatio(int divider) {
   /* Simple deinterlacing. Blend the fields together at a custom ratio. */
   /* 1 = 50% blending   */
   /* 2 = 25% blending   */
@@ -3076,10 +2858,8 @@ void Image::Deinterlace_Blend_CustomRatio(int divider)
     Error("Deinterlace called with invalid blend ratio");
   }
 
-  if ( colours == ZM_COLOUR_GRAY8 )
-  {
-    for (unsigned int y = 1; y < (unsigned int)height; y += 2)
-    {
+  if ( colours == ZM_COLOUR_GRAY8 ) {
+    for (unsigned int y = 1; y < (unsigned int)height; y += 2) {
       pabove = buffer + ((y-1) * width);
       pcurrent = buffer + (y * width);
       for (unsigned int x = 0; x < (unsigned int)width; x++) {
@@ -3089,11 +2869,8 @@ void Image::Deinterlace_Blend_CustomRatio(int divider)
         *pabove++ = subpix2;
       }
     }
-  }
-  else if ( colours == ZM_COLOUR_RGB24 )
-  {
-    for (unsigned int y = 1; y < (unsigned int)height; y += 2)
-    {
+  } else if ( colours == ZM_COLOUR_RGB24 ) {
+    for (unsigned int y = 1; y < (unsigned int)height; y += 2) {
       pabove = buffer + (((y-1) * width) * 3);
       pcurrent = buffer + ((y * width) * 3);
       for (unsigned int x = 0; x < (unsigned int)width; x++) {
@@ -3111,11 +2888,8 @@ void Image::Deinterlace_Blend_CustomRatio(int divider)
         *pabove++ = subpix2;
       }
     }
-  }
-  else if ( colours == ZM_COLOUR_RGB32 )
-  {
-    for (unsigned int y = 1; y < (unsigned int)height; y += 2)
-    {
+  } else if ( colours == ZM_COLOUR_RGB32 ) {
+    for (unsigned int y = 1; y < (unsigned int)height; y += 2) {
       pabove = buffer + (((y-1) * width) << 2);
       pcurrent = buffer + ((y * width) << 2);
       for (unsigned int x = 0; x < (unsigned int)width; x++) {
@@ -3203,25 +2977,25 @@ void sse2_fastblend(const uint8_t* col1, const uint8_t* col2, uint8_t* result, u
   static uint32_t clearmask = 0;
   static double current_blendpercent = 0.0;
 
-  if(current_blendpercent != blendpercent) {
+  if ( current_blendpercent != blendpercent ) {
     /* Attempt to match the blending percent to one of the possible values */
-    if(blendpercent < 2.34375) {
+    if ( blendpercent < 2.34375 ) {
       // 1.5625% blending
       divider = 6;
       clearmask = 0x03030303;
-    } else if(blendpercent < 4.6875) {
+    } else if ( blendpercent < 4.6875 ) {
       // 3.125% blending
       divider = 5;
       clearmask = 0x07070707;
-    } else if(blendpercent < 9.375) {
+    } else if ( blendpercent < 9.375 ) {
       // 6.25% blending
       divider = 4;
       clearmask = 0x0F0F0F0F;
-    } else if(blendpercent < 18.75) {
+    } else if ( blendpercent < 18.75 ) {
       // 12.5% blending
       divider = 3;
       clearmask = 0x1F1F1F1F;
-    } else if(blendpercent < 37.5) {
+    } else if ( blendpercent < 37.5 ) {
       // 25% blending
       divider = 2;
       clearmask = 0x3F3F3F3F;
@@ -3267,21 +3041,21 @@ __attribute__((noinline)) void std_fastblend(const uint8_t* col1, const uint8_t*
   static double current_blendpercent = 0.0;
   const uint8_t* const max_ptr = result + count;
 
-  if(current_blendpercent != blendpercent) {
+  if ( current_blendpercent != blendpercent ) {
     /* Attempt to match the blending percent to one of the possible values */
-    if(blendpercent < 2.34375) {
+    if ( blendpercent < 2.34375 ) {
       // 1.5625% blending
       divider = 6;
-    } else if(blendpercent < 4.6875) {
+    } else if ( blendpercent < 4.6875 ) {
       // 3.125% blending
       divider = 5;
-    } else if(blendpercent < 9.375) {
+    } else if ( blendpercent < 9.375 ) {
       // 6.25% blending
       divider = 4;
-    } else if(blendpercent < 18.75) {
+    } else if ( blendpercent < 18.75 ) {
       // 12.5% blending
       divider = 3;
-    } else if(blendpercent < 37.5) {
+    } else if ( blendpercent < 37.5 ) {
       // 25% blending
       divider = 2;
     } else {
@@ -3291,8 +3065,7 @@ __attribute__((noinline)) void std_fastblend(const uint8_t* col1, const uint8_t*
     current_blendpercent = blendpercent;
   }
 
-
-  while(result < max_ptr) {
+  while ( result < max_ptr ) {
     result[0] = ((col2[0] - col1[0])>>divider) + col1[0];
     result[1] = ((col2[1] - col1[1])>>divider) + col1[1];
     result[2] = ((col2[2] - col1[2])>>divider) + col1[2];
@@ -3490,9 +3263,8 @@ __attribute__((noinline)) void std_blend(const uint8_t* col1, const uint8_t* col
   double opacity = 1.0 - divide;
   const uint8_t* const max_ptr = result + count;
 
-  while(result < max_ptr) {
+  while ( result < max_ptr ) {
     *result++ = (*col1++ * opacity) + (*col2++ * divide);
-
   } 
 }
 
@@ -4692,8 +4464,7 @@ __attribute__((noinline)) void zm_convert_rgb565_rgba(const uint8_t* col1, uint8
 /************************************************* DEINTERLACE FUNCTIONS *************************************************/
 
 /* Grayscale */
-__attribute__((noinline)) void std_deinterlace_4field_gray8(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height)
-{
+__attribute__((noinline)) void std_deinterlace_4field_gray8(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height) {
   uint8_t *pcurrent, *pabove, *pncurrent, *pnabove, *pbelow;
   const uint8_t* const max_ptr = col1 + (width*(height-1));
   const uint8_t *max_ptr2;
@@ -4703,8 +4474,7 @@ __attribute__((noinline)) void std_deinterlace_4field_gray8(uint8_t* col1, uint8
   pabove = col1;
   pnabove = col2;
   pbelow = col1 + (width*2);
-  while(pcurrent < max_ptr)
-  {
+  while(pcurrent < max_ptr) {
     max_ptr2 = pcurrent + width;
     while(pcurrent < max_ptr2) {
       if((unsigned int)((abs(*pnabove - *pabove) + abs(*pncurrent - *pcurrent)) >> 1) >= threshold) {
@@ -4721,7 +4491,6 @@ __attribute__((noinline)) void std_deinterlace_4field_gray8(uint8_t* col1, uint8
     pabove += width;
     pnabove += width;
     pbelow += width;
-
   }
 
   /* Special case for the last line */
@@ -4738,8 +4507,7 @@ __attribute__((noinline)) void std_deinterlace_4field_gray8(uint8_t* col1, uint8
 }
 
 /* RGB */
-__attribute__((noinline)) void std_deinterlace_4field_rgb(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height)
-{
+__attribute__((noinline)) void std_deinterlace_4field_rgb(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height) {
   uint8_t *pcurrent, *pabove, *pncurrent, *pnabove, *pbelow;
   const unsigned int row_width = width*3;
   const uint8_t* const max_ptr = col1 + (row_width * (height-1));
@@ -4752,8 +4520,7 @@ __attribute__((noinline)) void std_deinterlace_4field_rgb(uint8_t* col1, uint8_t
   pabove = col1;
   pnabove = col2;
   pbelow = col1 + ((width*2)*3);
-  while(pcurrent < max_ptr)
-  {
+  while(pcurrent < max_ptr) {
     max_ptr2 = pcurrent + row_width;
     while(pcurrent < max_ptr2) {
       r = abs(pnabove[0] - pabove[0]);
@@ -4780,7 +4547,6 @@ __attribute__((noinline)) void std_deinterlace_4field_rgb(uint8_t* col1, uint8_t
     pabove += row_width;
     pnabove += row_width;
     pbelow += row_width;
-
   }
 
   /* Special case for the last line */
@@ -4807,8 +4573,7 @@ __attribute__((noinline)) void std_deinterlace_4field_rgb(uint8_t* col1, uint8_t
 }
 
 /* BGR */
-__attribute__((noinline)) void std_deinterlace_4field_bgr(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height)
-{
+__attribute__((noinline)) void std_deinterlace_4field_bgr(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height) {
   uint8_t *pcurrent, *pabove, *pncurrent, *pnabove, *pbelow;
   const unsigned int row_width = width*3;
   const uint8_t* const max_ptr = col1 + (row_width * (height-1));
@@ -4821,8 +4586,7 @@ __attribute__((noinline)) void std_deinterlace_4field_bgr(uint8_t* col1, uint8_t
   pabove = col1;
   pnabove = col2;
   pbelow = col1 + ((width*2)*3);
-  while(pcurrent < max_ptr)
-  {
+  while(pcurrent < max_ptr) {
     max_ptr2 = pcurrent + row_width;
     while(pcurrent < max_ptr2) {
       b = abs(pnabove[0] - pabove[0]);
@@ -4876,8 +4640,7 @@ __attribute__((noinline)) void std_deinterlace_4field_bgr(uint8_t* col1, uint8_t
 }
 
 /* RGBA */
-__attribute__((noinline)) void std_deinterlace_4field_rgba(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height)
-{
+__attribute__((noinline)) void std_deinterlace_4field_rgba(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height) {
   uint8_t *pcurrent, *pabove, *pncurrent, *pnabove, *pbelow;
   const unsigned int row_width = width*4;
   const uint8_t* const max_ptr = col1 + (row_width * (height-1));
@@ -4890,8 +4653,7 @@ __attribute__((noinline)) void std_deinterlace_4field_rgba(uint8_t* col1, uint8_
   pabove = col1;
   pnabove = col2;
   pbelow = col1 + (row_width*2);
-  while(pcurrent < max_ptr)
-  {
+  while(pcurrent < max_ptr) {
     max_ptr2 = pcurrent + row_width;
     while(pcurrent < max_ptr2) {
       r = abs(pnabove[0] - pabove[0]);
@@ -4918,7 +4680,6 @@ __attribute__((noinline)) void std_deinterlace_4field_rgba(uint8_t* col1, uint8_
     pabove += row_width;
     pnabove += row_width;
     pbelow += row_width;
-
   }
 
   /* Special case for the last line */
@@ -4945,8 +4706,7 @@ __attribute__((noinline)) void std_deinterlace_4field_rgba(uint8_t* col1, uint8_
 }
 
 /* BGRA */
-__attribute__((noinline)) void std_deinterlace_4field_bgra(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height)
-{
+__attribute__((noinline)) void std_deinterlace_4field_bgra(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height) {
   uint8_t *pcurrent, *pabove, *pncurrent, *pnabove, *pbelow;
   const unsigned int row_width = width*4;
   const uint8_t* const max_ptr = col1 + (row_width * (height-1));
@@ -4959,8 +4719,7 @@ __attribute__((noinline)) void std_deinterlace_4field_bgra(uint8_t* col1, uint8_
   pabove = col1;
   pnabove = col2;
   pbelow = col1 + (row_width*2);
-  while(pcurrent < max_ptr)
-  {
+  while(pcurrent < max_ptr) {
     max_ptr2 = pcurrent + row_width;
     while(pcurrent < max_ptr2) {
       b = abs(pnabove[0] - pabove[0]);
@@ -4987,7 +4746,6 @@ __attribute__((noinline)) void std_deinterlace_4field_bgra(uint8_t* col1, uint8_
     pabove += row_width;
     pnabove += row_width;
     pbelow += row_width;
-
   }
 
   /* Special case for the last line */
@@ -5014,8 +4772,7 @@ __attribute__((noinline)) void std_deinterlace_4field_bgra(uint8_t* col1, uint8_
 }
 
 /* ARGB */
-__attribute__((noinline)) void std_deinterlace_4field_argb(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height)
-{
+__attribute__((noinline)) void std_deinterlace_4field_argb(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height) {
   uint8_t *pcurrent, *pabove, *pncurrent, *pnabove, *pbelow;
   const unsigned int row_width = width*4;
   const uint8_t* const max_ptr = col1 + (row_width * (height-1));
@@ -5028,8 +4785,7 @@ __attribute__((noinline)) void std_deinterlace_4field_argb(uint8_t* col1, uint8_
   pabove = col1;
   pnabove = col2;
   pbelow = col1 + (row_width*2);
-  while(pcurrent < max_ptr)
-  {
+  while(pcurrent < max_ptr) {
     max_ptr2 = pcurrent + row_width;
     while(pcurrent < max_ptr2) {
       r = abs(pnabove[1] - pabove[1]);
@@ -5056,7 +4812,6 @@ __attribute__((noinline)) void std_deinterlace_4field_argb(uint8_t* col1, uint8_
     pabove += row_width;
     pnabove += row_width;
     pbelow += row_width;
-
   }
 
   /* Special case for the last line */
@@ -5083,8 +4838,7 @@ __attribute__((noinline)) void std_deinterlace_4field_argb(uint8_t* col1, uint8_
 }
 
 /* ABGR */
-__attribute__((noinline)) void std_deinterlace_4field_abgr(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height)
-{
+__attribute__((noinline)) void std_deinterlace_4field_abgr(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height) {
   uint8_t *pcurrent, *pabove, *pncurrent, *pnabove, *pbelow;
   const unsigned int row_width = width*4;
   const uint8_t* const max_ptr = col1 + (row_width * (height-1));
@@ -5097,8 +4851,7 @@ __attribute__((noinline)) void std_deinterlace_4field_abgr(uint8_t* col1, uint8_
   pabove = col1;
   pnabove = col2;
   pbelow = col1 + (row_width*2);
-  while(pcurrent < max_ptr)
-  {
+  while(pcurrent < max_ptr) {
     max_ptr2 = pcurrent + row_width;
     while(pcurrent < max_ptr2) {
       b = abs(pnabove[1] - pabove[1]);
diff --git a/src/zm_image.h b/src/zm_image.h
index dafd067f1..66e7ef32e 100644
--- a/src/zm_image.h
+++ b/src/zm_image.h
@@ -274,6 +274,7 @@ void std_delta8_rgba(const uint8_t* col1, const uint8_t* col2, uint8_t* result,
 void std_delta8_bgra(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count);
 void std_delta8_argb(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count);
 void std_delta8_abgr(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count);
+
 void neon32_armv7_delta8_gray8(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count);
 void neon32_armv7_delta8_rgba(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count);
 void neon32_armv7_delta8_bgra(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count);

From 7e4c54fec02342f844d9da2fd4052c0ae0d28d27 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 22 Oct 2018 13:54:27 -0400
Subject: [PATCH 09/86] Use proper buttons and remove extra bootstrap styles
 from buttons so that they aren't all jammed together

---
 web/skins/classic/views/log.php | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/web/skins/classic/views/log.php b/web/skins/classic/views/log.php
index 4f2650865..d13381e2f 100644
--- a/web/skins/classic/views/log.php
+++ b/web/skins/classic/views/log.php
@@ -45,17 +45,16 @@ xhtmlHeaders(__FILE__, translate('SystemLog') );
         <tr class="row">
 	        <td class="col text-center">
             <div class="btn-group">
-              <button type="button" class="btn btn-sm" onclick="expandLog()"> <?php echo translate('More') ?></button>
-              <button type="button" class="btn btn-sm" onclick="clearLog()"> <?php echo translate('Clear') ?></button>
-              <button type="button" class="btn btn-sm" onclick="refreshLog()"> <?php echo translate('Refresh') ?></button>
-              <button type="button" class="btn btn-sm" onclick="exportLog()"> <?php echo translate('Export') ?></button>
-              <button type="button" class="btn btn-sm" onclick="closeWindow()"> <?php echo translate('Close') ?></button>
+              <button type="button" onclick="expandLog()"><?php echo translate('More') ?></button>
+              <button type="button" onclick="clearLog()"><?php echo translate('Clear') ?></button>
+              <button type="button" onclick="refreshLog()"><?php echo translate('Refresh') ?></button>
+              <button type="button" onclick="exportLog()"><?php echo translate('Export') ?></button>
+              <button type="button" onclick="closeWindow()"><?php echo translate('Close') ?></button>
             </div> <!--btn-->
           </td>
-      </tr>
-	  </table>
-
-  </div> <!--header-->
+        </tr>
+      </table>
+    </div> <!--header-->
   <div id="content">
     <div id="filters">
 
@@ -89,7 +88,7 @@ xhtmlHeaders(__FILE__, translate('SystemLog') );
           </td>
         </tr>
       </table>
-      <input type="reset" value="<?php echo translate('Reset') ?>" onclick="resetLog()"/>
+      <button type="reset" onclick="resetLog()"><?php echo translate('Reset') ?></button>
     </div>
     <form name="logForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
       <input type="hidden" name="view" value="<?php echo $view ?>"/>
@@ -137,8 +136,8 @@ xhtmlHeaders(__FILE__, translate('SystemLog') );
           <div id="exportError">
             <?php echo translate('ExportFailed') ?>: <span id="exportErrorText"></span>
           </div>
-          <input type="button" id="exportButton" value="<?php echo translate('Export') ?>" onclick="exportRequest()"/>
-          <input type="button" value="<?php echo translate('Cancel') ?>" class="overlayCloser"/>
+          <button type="button" id="exportButton" value="Export" onclick="exportRequest()"><?php echo translate('Export') ?></button>
+          <button type="button" value="Cancel" class="overlayCloser"><?php echo translate('Cancel') ?></button>
         </form>
       </div>
     </div>

From f4ddc0fe9b0ea557ea46d9c3416e48a9ec7e022e Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Mon, 22 Oct 2018 16:13:12 -0400
Subject: [PATCH 10/86] ob_clcean and flush break outputting the image

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

diff --git a/web/views/image.php b/web/views/image.php
index 552b81256..ed54a3735 100644
--- a/web/views/image.php
+++ b/web/views/image.php
@@ -69,6 +69,7 @@ if ( empty($_REQUEST['path']) ) {
   }
 
   if ( !empty($_REQUEST['eid']) ) {
+Logger::Debug("Loading by eid");
     $Event = Event::find_one(array('Id'=>$_REQUEST['eid']));
     if ( !$Event ) {
       header('HTTP/1.0 404 Not Found');
@@ -119,6 +120,7 @@ Logger::Debug("Got virtual frame from Bulk Frames previous delta: " . $previousB
       }
       // Frame can be non-existent.  We have Bulk frames.  So now we should try to load the bulk frame 
       $path = $Event->Path().'/'.sprintf('%0'.ZM_EVENT_IMAGE_DIGITS.'d',$Frame->FrameId()).'-'.$show.'.jpg';
+Logger::Debug("Path: $path");
     }
 
   } else {
@@ -208,12 +210,14 @@ if ( !empty($_REQUEST['scale']) ) {
 
 $width = 0;
 if ( !empty($_REQUEST['width']) ) {
+Logger::Debug("Setting width: " . $_REQUEST['width']);
   if ( is_numeric($_REQUEST['width']) ) {
     $x = $_REQUEST['width'];
     if ( $x >= 10 and $x <= 8000 )
       $width = $x;
   }
 }
+
 $height = 0;
 if ( !empty($_REQUEST['height']) ) {
   if ( is_numeric($_REQUEST['height']) ) {
@@ -229,14 +233,12 @@ if ( $errorText ) {
   # Clears the output buffer. Not sure what is there, but have had troubles.
   ob_end_clean();
   header('Content-type: image/jpeg');
-  if ( ( $scale==0 || $scale==100 ) && $width==0 && $height==0 ) {
+  if ( ( $scale==0 || $scale==100 ) && ($width==0) && ($height==0) ) {
     # This is so that Save Image As give a useful filename
     if ( $Event ) {
       $filename = $Event->MonitorId().'_'.$Event->Id().'_'.$Frame->FrameId().'.jpg';
       header('Content-Disposition: inline; filename="' . $filename . '"');
     }
-    ob_clean();
-    flush();
     if ( !readfile($path) ) {
       Error('No bytes read from '. $path);
     }
@@ -254,6 +256,7 @@ if ( $errorText ) {
         $width = ($height * $oldWidth) / $oldHeight;
       } elseif ( $width != 0 && $height == 0 ) {
         $height = ($width * $oldHeight) / $oldWidth;
+Logger::Debug("Figuring out height using width: $height = ($width * $oldHeight) / $oldWidth");
       }
       if ( $width == $oldWidth && $height == $oldHeight ) {
         Warning('No change to width despite scaling.');
@@ -266,8 +269,6 @@ if ( $errorText ) {
       $filename = $Event->MonitorId().'_'.$Event->Id().'_'.$Frame->FrameId()."-${width}x${height}.jpg";
       header('Content-Disposition: inline; filename="' . $filename . '"');
     }
-    //ob_clean();
-    //flush();
     if ( !( file_exists($scaled_path) and readfile($scaled_path) ) ) {
       Logger::Debug("Cached scaled image does not exist at $scaled_path or is no good.. Creating it");
       ob_start();

From 86b0e4ea188a018079a759908575630e99e103ff Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 22 Oct 2018 18:32:39 -0400
Subject: [PATCH 11/86] fix auth_hash.  Should use generateAuthHash instead of
 accessing session directly

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

diff --git a/web/skins/classic/js/skin.js.php b/web/skins/classic/js/skin.js.php
index f072a911e..b15ff51a5 100644
--- a/web/skins/classic/js/skin.js.php
+++ b/web/skins/classic/js/skin.js.php
@@ -55,7 +55,7 @@ if ( ! empty($refreshParent) ) {
 ?>;
 var closePopup = <?php
 if ( ( ! empty($closePopup) ) and ( $closePopup == true ) ) {
-    echo 'true';
+  echo 'true';
 } else {
   echo 'false';
 }
@@ -67,5 +67,5 @@ var imagePrefix = "<?php echo "?view=image&eid=" ?>";
 
 var auth_hash;
 <?php if ( ZM_OPT_USE_AUTH && ZM_AUTH_HASH_LOGINS ) { ?>
-auth_hash = '<?php echo isset($_SESSION['AuthHash']) ? $_SESSION['AuthHash'] : ''; ?>';
+auth_hash = '<?php echo generateAuthHash(ZM_AUTH_HASH_IPS) ?>';
 <?php } ?>

From 18850d8779ebff0ce65e282189afb3e74531d367 Mon Sep 17 00:00:00 2001
From: raTmole <ratmole@users.noreply.github.com>
Date: Tue, 23 Oct 2018 14:58:07 +0300
Subject: [PATCH 12/86] API getVersion Fix -> Undefined variable:
 eTagMatches... (#2268)

see https://github.com/cakephp/cakephp/issues/12536
---
 web/api/lib/Cake/Network/CakeResponse.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/api/lib/Cake/Network/CakeResponse.php b/web/api/lib/Cake/Network/CakeResponse.php
index 21dfd7b2e..982398e87 100644
--- a/web/api/lib/Cake/Network/CakeResponse.php
+++ b/web/api/lib/Cake/Network/CakeResponse.php
@@ -1168,6 +1168,9 @@ class CakeResponse {
 		if ($modifiedSince) {
 			$timeMatches = strtotime($this->modified()) === strtotime($modifiedSince);
 		}
+		if (!isset($etagMatches, $timeMatches)) {
+		return false;
+		}
 		$checks = compact('etagMatches', 'timeMatches');
 		if (empty($checks)) {
 			return false;

From 2024df43931754b5b2088f91074f98ac26b5c933 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 24 Oct 2018 09:49:56 -0400
Subject: [PATCH 13/86] use json_encode/decode instead of serialize/unserialize
 to pass onvif probe results around.  Also clean up some code/ add some
 missing things. Fixes #2271 and #2272

---
 web/lang/en_gb.php                     |   1 +
 web/skins/classic/views/monitor.php    |   2 +-
 web/skins/classic/views/onvifprobe.php | 118 ++++++++++++-------------
 3 files changed, 60 insertions(+), 61 deletions(-)

diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index 0fca2f81d..5412b94cd 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -237,6 +237,7 @@ $SLANG = array(
     'Cause'                 => 'Cause',
     'CheckMethod'           => 'Alarm Check Method',
     'ChooseDetectedCamera'  => 'Choose Detected Camera',
+    'ChooseDetectedProfile' => 'Choose Detected Profile',
     'ChooseFilter'          => 'Choose Filter',
     'ChooseLogFormat'       => 'Choose a log format',
     'ChooseLogSelection'    => 'Choose a log selection',
diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index fa2ebd44f..193b08d36 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -173,7 +173,7 @@ if ( !empty($_REQUEST['preset']) ) {
   }
 }
 if ( !empty($_REQUEST['probe']) ) {
-  $probe = unserialize(base64_decode($_REQUEST['probe']));
+  $probe = json_decode(base64_decode($_REQUEST['probe']));
   foreach ( $probe as $name=>$value ) {
     if ( isset($value) ) {
       # Does isset handle NULL's?  I don't think this code is correct. 
diff --git a/web/skins/classic/views/onvifprobe.php b/web/skins/classic/views/onvifprobe.php
index f9c766846..ddbd895b6 100644
--- a/web/skins/classic/views/onvifprobe.php
+++ b/web/skins/classic/views/onvifprobe.php
@@ -18,7 +18,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canEdit( 'Monitors' ) ) {
+if ( !canEdit('Monitors') ) {
   $view = 'error';
   return;
 }
@@ -73,26 +73,26 @@ function probeCameras( $localIp ) {
             } elseif ( $tokens[1] == 'location' ) {
               //                      $camera['location'] = $tokens[2];
             } else {
-              Logger::Debug('Unknown token ' . $tokens[1] );
+              Logger::Debug('Unknown token ' . $tokens[1]);
             }
           }
         } // end foreach token
         $cameras[] = $camera;
       }
     } // end foreach line
-  }
-  return( $cameras );
-}
+  } // end if results from execOnvif
+  return $cameras;
+} // end function probeCameras
 
 function probeProfiles( $device_ep, $soapversion, $username, $password ) {
   $profiles = array();
   if ( $lines = @execONVIF( "profiles $device_ep $soapversion $username $password" ) ) {
     foreach ( $lines as $line ) {
       $line = rtrim( $line );
-      if ( preg_match( '|^(.+),\s*(.+),\s*(.+),\s*(.+),\s*(.+),\s*(.+),\s*(.+)\s*$|', $line, $matches ) ) {
+      if ( preg_match('|^(.+),\s*(.+),\s*(.+),\s*(.+),\s*(.+),\s*(.+),\s*(.+)\s*$|', $line, $matches) ) {
         $stream_uri = $matches[7];
         // add user@pass to URI
-        if ( preg_match( '|^(\S+://)(.+)$|', $stream_uri, $tokens ) ) {
+        if ( preg_match('|^(\S+://)(.+)$|', $stream_uri, $tokens) ) {
           $stream_uri = $tokens[1].$username.':'.$password.'@'.$tokens[2];
       }
 
@@ -106,17 +106,15 @@ function probeProfiles( $device_ep, $soapversion, $username, $password ) {
             'Profile'     => $matches[1],
             'Name'        => $matches[2],
             'Encoding'    => $matches[3],
-
             );
         $profiles[] = $profile;
       } else {
         Logger::Debug("Line did not match preg: $line");
       }
-    }
-  }
-  return( $profiles );
-}
-
+    } // end foreach line
+  } // end if results from execONVIF
+  return $profiles;
+} // end function probeProfiles
 
 //==== STEP 1 ============================================================
 
@@ -124,20 +122,20 @@ $focusWindow = true;
 
 xhtmlHeaders(__FILE__, translate('MonitorProbe') );
 
-if( !isset($_REQUEST['step']) || ($_REQUEST['step'] == "1")) {
+if ( !isset($_REQUEST['step']) || ($_REQUEST['step'] == '1') ) {
 
   $monitors = array();
-  foreach ( dbFetchAll( "select Id, Name, Host from Monitors where Type = 'Remote' order by Host" ) as $monitor ) {
-      if ( preg_match( '/^(.+)@(.+)$/', $monitor['Host'], $matches ) ) {
-          //echo "1: ".$matches[2]." = ".gethostbyname($matches[2])."<br/>";
-          $monitors[gethostbyname($matches[2])] = $monitor;
-      } else {
-          //echo "2: ".$monitor['Host']." = ".gethostbyname($monitor['Host'])."<br/>";
-          $monitors[gethostbyname($monitor['Host'])] = $monitor;
-      }
+  foreach ( dbFetchAll("SELECT Id, Name, Host FROM Monitors WHERE Type = 'Remote' ORDER BY Host") as $monitor ) {
+    if ( preg_match( '/^(.+)@(.+)$/', $monitor['Host'], $matches ) ) {
+      //echo "1: ".$matches[2]." = ".gethostbyname($matches[2])."<br/>";
+      $monitors[gethostbyname($matches[2])] = $monitor;
+    } else {
+      //echo "2: ".$monitor['Host']." = ".gethostbyname($monitor['Host'])."<br/>";
+      $monitors[gethostbyname($monitor['Host'])] = $monitor;
+    }
   }
 
-  $detcameras = probeCameras( '' );
+  $detcameras = probeCameras('');
   foreach ( $detcameras as $camera ) {
     if ( preg_match( '|([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)|', $camera['monitor']['Host'], $matches ) ) {
       $ip = $matches[1];
@@ -157,13 +155,13 @@ if( !isset($_REQUEST['step']) || ($_REQUEST['step'] == "1")) {
     }
 */
 //       $sourceDesc = htmlspecialchars(serialize($camera['monitor']));
-       $sourceDesc = base64_encode(serialize($camera['monitor']));
-       $sourceString = $camera['model'].' @ '.$host . ' using version ' . $camera['monitor']['SOAP'] ;
-       $cameras[$sourceDesc] = $sourceString;
+    $sourceDesc = base64_encode(json_encode($camera['monitor']));
+    $sourceString = $camera['model'].' @ '.$host . ' using version ' . $camera['monitor']['SOAP'] ;
+    $cameras[$sourceDesc] = $sourceString;
   }
 
   if ( count($cameras) <= 0 )
-      $cameras[0] = translate('NoDetectedCameras');
+    $cameras[0] = translate('NoDetectedCameras');
 
 ?>
 <body>
@@ -180,22 +178,23 @@ if( !isset($_REQUEST['step']) || ($_REQUEST['step'] == "1")) {
           <?php echo translate('OnvifProbeIntro') ?>
         </p>
         <p>
-          <label for="probe"><?php echo translate('DetectedCameras') ?></label><?php echo buildSelect( "probe", $cameras, 'configureButtons( this )' ); ?>
+          <label for="probe"><?php echo translate('DetectedCameras') ?></label>
+          <?php echo htmlSelect('probe', $cameras, null, array('onchange'=>'configureButtons(this)')); ?>
         </p>
         <p>
           <?php echo translate('OnvifCredentialsIntro') ?>
         </p>
         <p>
           <label for="username"><?php echo translate('Username') ?></label>
-          <input type="text" name="username" value="" onChange="configureButtons( this )" />
+          <input type="text" name="username" value="" onChange="configureButtons(this)"/>
         </p>
         <p>
           <label for="password"><?php echo translate('Password') ?></label>
-          <input type="password" name="password" value=""onChange="configureButtons( this )" />
+          <input type="password" name="password" value=""onChange="configureButtons(this)"/>
         </p>
         <div id="contentButtons">
           <input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
-          <input type="submit" name="nextBtn" value="<?php echo translate('Next') ?>" onclick="gotoStep2( this )" disabled="disabled"/>
+          <input type="submit" name="nextBtn" value="<?php echo translate('Next') ?>" onclick="gotoStep2(this)" disabled="disabled"/>
         </div>
       </form>
     </div>
@@ -205,44 +204,42 @@ if( !isset($_REQUEST['step']) || ($_REQUEST['step'] == "1")) {
 <?php
 
 //==== STEP 2 ============================================================
-} 
-else if($_REQUEST['step'] == "2") 
-{
+} else if($_REQUEST['step'] == '2') {
   if ( empty($_REQUEST['probe']) ) 
-    Fatal("No probe passed in request. Please go back and try again.");
+    Fatal('No probe passed in request. Please go back and try again.');
 #|| empty($_REQUEST['username']) || 
        #empty($_REQUEST['password']) )
     
-  $probe = unserialize(base64_decode($_REQUEST['probe']));
+  $probe = json_decode(base64_decode($_REQUEST['probe']));
+  Logger::Debug(print_r($probe,true));
   foreach ( $probe as $name=>$value ) {
-      if ( isset($value) ) {
-          $monitor[$name] = $value;
-      }
+    if ( isset($value) ) {
+      $monitor[$name] = $value;
+    }
   }
   $camera['monitor'] = $monitor;
 
   //print $monitor['Host'].", ".$_REQUEST['username'].", ".$_REQUEST['password']."<br/>";
 
-  $detprofiles = probeProfiles( $monitor['Host'], $monitor['SOAP'], $_REQUEST['username'], $_REQUEST['password']);
+  $detprofiles = probeProfiles($monitor['Host'], $monitor['SOAP'], $_REQUEST['username'], $_REQUEST['password']);
   foreach ( $detprofiles as $profile ) {
-       $monitor = $camera['monitor'];
-       
-       $sourceString = "${profile['Name']} : ${profile['Encoding']}" .
-                       " (${profile['Width']}x${profile['Height']} @ ${profile['MaxFPS']}fps)";
-       // copy technical details
-       $monitor['Width']  = $profile['Width'];
-       $monitor['Height'] = $profile['Height'];
-// The maxfps fields do not work for ip streams. Can re-enable if that is fixed.
-//       $monitor['MaxFPS'] = $profile['MaxFPS'];
-//       $monitor['AlarmMaxFPS'] = $profile['AlarmMaxFPS'];
-       $monitor['Path'] = $profile['Path'];
-//       $sourceDesc = htmlspecialchars(serialize($monitor));
-       $sourceDesc = base64_encode(serialize($monitor));
-       $profiles[$sourceDesc] = $sourceString;
+    $monitor = $camera['monitor'];
+
+    $sourceString = "${profile['Name']} : ${profile['Encoding']}" .
+      " (${profile['Width']}x${profile['Height']} @ ${profile['MaxFPS']}fps)";
+    // copy technical details
+    $monitor['Width']  = $profile['Width'];
+    $monitor['Height'] = $profile['Height'];
+    // The maxfps fields do not work for ip streams. Can re-enable if that is fixed.
+    //       $monitor['MaxFPS'] = $profile['MaxFPS'];
+    //       $monitor['AlarmMaxFPS'] = $profile['AlarmMaxFPS'];
+    $monitor['Path'] = $profile['Path'];
+    $sourceDesc = base64_encode(json_encode($monitor));
+    $profiles[$sourceDesc] = $sourceString;
   }
 
   if ( count($profiles) <= 0 )
-      $profiles[0] = translate('NoDetectedProfiles');
+    $profiles[0] = translate('NoDetectedProfiles');
 
 ?>
 <body>
@@ -254,17 +251,18 @@ else if($_REQUEST['step'] == "2")
       <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
         <input type="hidden" name="view" value="none"/>
         <input type="hidden" name="mid" value="<?php echo validNum($_REQUEST['mid']) ?>"/>
-        <input type="hidden" name="step" value=""/>
+        <input type="hidden" name="step"/>
         <p>
           <?php echo translate('ProfileProbeIntro') ?>
         </p>
         <p>
-          <label for="probe"><?php echo translate('DetectedProfiles') ?></label><?php echo buildSelect( 'probe', $profiles, 'configureButtons( this )' ); ?>
+          <label for="probe"><?php echo translate('DetectedProfiles') ?></label>
+          <?php echo htmlSelect('probe', $profiles, null, array('onchange'=>'configureButtons(this)')); ?>
         </p>
         <div id="contentButtons">
-          <input type="button" name="prevBtn" value="<?php echo translate('Prev') ?>" onclick="gotoStep1( this )"/>
+          <input type="button" name="prevBtn" value="<?php echo translate('Prev') ?>" onclick="gotoStep1(this)"/>
           <input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
-          <input type="submit" name="saveBtn" value="<?php echo translate('Save') ?>" onclick="submitCamera( this )" disabled="disabled"/>
+          <input type="submit" name="saveBtn" value="<?php echo translate('Save') ?>" onclick="submitCamera(this)" disabled="disabled"/>
         </div>
       </form>
     </div>
@@ -272,5 +270,5 @@ else if($_REQUEST['step'] == "2")
 </body>
 </html>
 <?php
-}
+} // end if step 1 or 2
 ?>

From 115141bf9f13c2b7272f00651f7b6a0748059026 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 24 Oct 2018 10:02:42 -0400
Subject: [PATCH 14/86] add caching to Group::find

---
 web/includes/Group.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/web/includes/Group.php b/web/includes/Group.php
index df9fd611e..6c8338a55 100644
--- a/web/includes/Group.php
+++ b/web/includes/Group.php
@@ -95,13 +95,12 @@ class Group {
         }
       }
     } # end if options
-    $groups = array();
-    $result = dbQuery($sql, $values);
-    $results = $result->fetchALL(PDO::FETCH_CLASS | PDO::FETCH_PROPS_LATE, 'Group');
-    foreach ( $results as $row => $obj ) {
-      $groups[] = $obj;
+
+    $results = dbFetchAll($sql, NULL, $values);
+    if ( $results ) {
+      return array_map( function($row){ return new Group($row); }, $results );
     }
-    return $groups;
+    return array();
   } # end find()
 
   public static function find_one($parameters = null, $options = null) {

From bca2b305183470c56de7342f416b635620265f49 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 24 Oct 2018 13:45:33 -0400
Subject: [PATCH 15/86] Add a test for channel layout and correct it if not set

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

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index a1c52353c..a3b66646b 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -248,18 +248,18 @@ VideoStore::VideoStore(const char *filename_in, const char *format_in,
         // 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\n",
+        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\n",
+        if ( ret < 0 ) {
+          Error("Unable to copy audio params to stream %s",
                 av_make_error_string(ret).c_str());
         }
 
-        if (!audio_out_ctx->codec_tag) {
+        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",
@@ -271,12 +271,12 @@ VideoStore::VideoStore(const char *filename_in, const char *format_in,
         ret = avcodec_copy_context(audio_out_ctx, audio_in_ctx);
         audio_out_ctx->codec_tag = 0;
 #endif
-        if (ret < 0) {
-          Error("Unable to copy audio ctx %s\n",
+        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) {
+          if ( audio_out_ctx->channels > 1 ) {
             Warning("Audio isn't mono, changing it.");
             audio_out_ctx->channels = 1;
           } else {
@@ -286,7 +286,7 @@ VideoStore::VideoStore(const char *filename_in, const char *format_in,
       }  // end if audio_out_stream
     }    // end if is AAC
 
-    if (audio_out_stream) {
+    if ( audio_out_stream ) {
       if (oc->oformat->flags & AVFMT_GLOBALHEADER) {
 #if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
     audio_out_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
@@ -522,8 +522,8 @@ bool VideoStore::setup_resampler() {
   // 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\n");
+  if ( !audio_out_ctx ) {
+    Error("could not allocate codec ctx for AAC");
     audio_out_stream = NULL;
     return false;
   }
@@ -546,6 +546,13 @@ bool VideoStore::setup_resampler() {
 #else
   audio_out_ctx->refcounted_frames = 1;
 #endif
+  if ( ! audio_out_ctx->channel_layout ) {
+    Debug(3, "Correcting channel layout from (%d) to (%d)",
+        audio_out_ctx->channel_layout,
+        av_get_default_channel_layout(audio_out_ctx->channels)
+        );
+      audio_out_ctx->channel_layout = av_get_default_channel_layout(audio_out_ctx->channels);
+  }
 
   if (audio_out_codec->supported_samplerates) {
     int found = 0;

From d0080684b889ac4dbc4d30721681979ad175e573 Mon Sep 17 00:00:00 2001
From: Damir Merdan <44159556+dado-ca@users.noreply.github.com>
Date: Wed, 24 Oct 2018 19:52:32 +0200
Subject: [PATCH 16/86] Bosnian translation (#2266)

* Zoneminder bosnian translation

Hi,

this is a bosnian translation for zoneminder, but it can be used as croatian and serbian translation too

* Delete BA_ba.php

* Bosnian translation

80% translated, tested on my Zoneminder v1.30.4 installation and is looking good. ZmNinja also translated into Bosnian lagnuage.
---
 web/lang/ba_ba.php | 995 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 995 insertions(+)
 create mode 100644 web/lang/ba_ba.php

diff --git a/web/lang/ba_ba.php b/web/lang/ba_ba.php
new file mode 100644
index 000000000..e60e69066
--- /dev/null
+++ b/web/lang/ba_ba.php
@@ -0,0 +1,995 @@
+<?php
+//
+// ZoneMinder web UK English language file, $Date$, $Revision$
+// Copyright (C) 2001-2008 Philip Coombes
+//
+// 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.
+//
+
+// ZoneMinder Bosnian Translation by Damir Merdan (merdan.damir@gmail.com)
+
+// Notes for Translators
+// 0. Get some credit, put your name in the line above (optional)
+// 1. When composing the language tokens in your language you should try and keep to roughly the
+//   same length text if possible. Abbreviate where necessary as spacing is quite close in a number of places.
+// 2. There are four types of string replacement
+//   a) Simple replacements are words or short phrases that are static and used directly. This type of
+//     replacement can be used 'as is'.
+//   b) Complex replacements involve some dynamic element being included and so may require substitution
+//     or changing into a different order. The token listed in this file will be passed through sprintf as
+//     a formatting string. If the dynamic element is a number you will usually need to use a variable
+//     replacement also as described below.
+//   c) Variable replacements are used in conjunction with complex replacements and involve the generation
+//     of a singular or plural noun depending on the number passed into the zmVlang function. See the 
+//     the zmVlang section below for a further description of this.
+//   d) Optional strings which can be used to replace the prompts and/or help text for the Options section
+//     of the web interface. These are not listed below as they are quite large and held in the database
+//     so that they can also be used by the zmconfig.pl script. However you can build up your own list
+//     quite easily from the Config table in the database if necessary.
+// 3. The tokens listed below are not used to build up phrases or sentences from single words. Therefore
+//   you can safely assume that a single word token will only be used in that context.
+// 4. In new language files, or if you are changing only a few words or phrases it makes sense from a 
+//   maintenance point of view to include the original language file and override the old definitions rather
+//   than copy all the language tokens across. To do this change the line below to whatever your base language
+//   is and uncomment it.
+// require_once( 'zm_lang_en_gb.php' );
+
+// You may need to change the character set here, if your web server does not already
+// do this by default, uncomment this if required.
+//
+// Example
+// header( "Content-Type: text/html; charset=iso-8859-1" );
+
+// You may need to change your locale here if your default one is incorrect for the
+// language described in this file, or if you have multiple languages supported.
+// If you do need to change your locale, be aware that the format of this function
+// is subtlely different in versions of PHP before and after 4.3.0, see
+// http://uk2.php.net/manual/en/function.setlocale.php for details.
+// Also be aware that changing the whole locale may affect some floating point or decimal 
+// arithmetic in the database, if this is the case change only the individual locale areas
+// that don't affect this rather than all at once. See the examples below.
+// Finally, depending on your setup, PHP may not enjoy have multiple locales in a shared 
+// threaded environment, if you get funny errors it may be this.
+//
+// Examples
+// setlocale( 'LC_ALL', 'en_GB' ); All locale settings pre-4.3.0
+// setlocale( LC_ALL, 'en_GB' ); All locale settings 4.3.0 and after
+// setlocale( LC_CTYPE, 'en_GB' ); Character class settings 4.3.0 and after
+// setlocale( LC_TIME, 'en_GB' ); Date and time formatting 4.3.0 and after
+
+// Simple String Replacements
+$SLANG = array(
+    'SystemLog'             => 'Dnevnik',
+    'DateTime'              => 'Datum/Vrijeme',
+    'Component'             => 'Komponenta',
+    'Pid'                   => 'PID',
+    'Level'                 => 'Nivo',
+    'Message'               => 'Poruka',
+    'Line'                  => 'Linija',
+    'More'                  => 'Više',
+    'Clear'                 => 'Očisti',
+    '24BitColour'           => '24 bitne boje',
+    '32BitColour'           => '32 bitne boje',
+    '8BitGrey'              => '8 bit siva nijansa',
+    'Action'                => 'Action',
+    'Actual'                => 'Stvarno',
+    'AddNewControl'         => 'Dodaj kontrolu',
+    'AddNewMonitor'         => 'Dodaj monitor',
+    'AddNewServer'          => 'Dodaj novi server',
+    'AddNewStorage'         => 'Dodaj novi disk',
+    'AddNewUser'            => 'Dodaj novog korisnika',
+    'AddNewZone'            => 'Dodaj novu zonu',
+    'Alarm'                 => 'Alarm',
+    'AlarmBrFrames'         => 'Alarm<br/>Sličice',
+    'AlarmFrame'            => 'Alarm sličica',
+    'AlarmFrameCount'       => 'Brzina snimanja alarma (u frejmovima)',
+    'AlarmLimits'           => 'Alarm limiti',
+    'AlarmMaximumFPS'       => 'Alarm Max SPS',
+    'AlarmPx'               => 'Alarm Px',
+    'AlarmRefImageBlendPct' => 'Alarm Reference Image Blend %ge',
+    'AlarmRGBUnset'         => 'Morate postaviti RGB boju za alarm',
+    'Alert'                 => 'Uzbuna',
+    'All'                   => 'Sve',
+    'AnalysisFPS'           => 'Analiza frejmova',
+    'AnalysisUpdateDelay'   => 'Analysis Update Delay',
+    'Apply'                 => 'Primjeni',
+    'ApplyingStateChange'   => 'Primjenjujem promjenu stanja',
+    'ArchArchived'          => 'Samo arhivirano',
+    'Archive'               => 'Arhiva',
+    'Archived'              => 'Ahivirano',
+    'ArchUnarchived'        => 'Samo nearhivirano',
+    'Area'                  => 'Oblast',
+    'AreaUnits'             => 'Oblast (px/%)',
+    'AttrAlarmFrames'       => 'Alarm frejmovi',
+    'AttrArchiveStatus'     => 'Status arhive',
+    'AttrAvgScore'          => 'Prosj. score',
+    'AttrCause'             => 'Uzrok',
+    'AttrStartDate'         => 'Pocetni datum',
+    'AttrEndDate'           => 'Krajnji datum',
+    'AttrStartDateTime'     => 'Pocetni Datum/Vrijeme',
+    'AttrEndDateTime'       => 'Krajnji Datum/Vrijeme',
+    'AttrDiskSpace'         => 'Disk prostor',
+    'AttrDiskBlocks'        => 'Disk blokovi',
+    'AttrDiskPercent'       => 'Disk procentualno',
+    'AttrDuration'          => 'Trajanje',
+    'AttrFrames'            => 'Frejmovi',
+    'AttrId'                => 'Id',
+    'AttrMaxScore'          => 'Max. Score',
+    'AttrMonitorId'         => 'ID Kamere',
+    'AttrMonitorName'       => 'Naziv Kamere',
+    'AttrStorageArea'       => 'Storage Area',
+    'AttrFilterServer'      => 'Server Filter je pokrenut na',
+    'AttrMonitorServer'     => 'Server Monitor je pokrenut na',
+    'AttrStorageServer'     => 'Server Hosting Storage',
+    'AttrStateId'           => 'Status',
+    'AttrName'              => 'Naziv',
+    'AttrNotes'             => 'Bilješke',
+    'AttrSystemLoad'        => 'Opterećenje sistema',
+    'AttrStartTime'         => 'Vrijeme početka',
+    'AttrEndTime'           => 'Vrijeme završetka',
+    'AttrTotalScore'        => 'Ukupan score',
+    'AttrStartWeekday'      => 'Početni dan',
+    'AttrEndWeekday'        => 'Krajnji dan',
+    'Auto'                  => 'Automatski',
+    'AutoStopTimeout'       => 'Auto Stop Timeout',
+    'Available'             => 'Dostupno',
+    'AvgBrScore'            => 'Avg.<br/>Score',
+    'Available'             => 'Dostupno',
+    'Background'            => 'Pozadina',
+    'BackgroundFilter'      => 'Pokreni filter u pozadini',
+    'BadAlarmFrameCount'    => 'Brojač alarm frejmova mora biti tipa integer počevši od jedan ili više',
+    'BadAlarmMaxFPS'        => 'Max FPS za alarm mora biti pozitivan cjeli broj ili broj sa pomičnim zarezom',
+    'BadAnalysisFPS'        => 'Broj frejmova za analitiku mora pozitivan cjeli broj ili broj sa pomičnim zarezom',
+    'BadAnalysisUpdateDelay'=> 'Vrijeme zadrške analitike mora biti broj od nula ili više',
+    'BadChannel'            => 'Kanal mora biti postavljen na cjeli broj nula ili više',
+    'BadDevice'             => 'Uredaj mora biti postavljen na validnu vrijednost',
+    'BadFormat'             => 'Format mora biti postavljen na validnu vrijenost',
+    'BadFPSReportInterval'  => 'FPS report interval buffer count must be an integer of 0 or more',
+    'BadFrameSkip'          => 'Frame skip count must be an integer of zero or more',
+    'BadMotionFrameSkip'    => 'Motion Frame skip count must be an integer of zero or more',
+    'BadHeight'             => 'Height must be set to a valid value',
+    'BadHost'               => 'Host must be set to a valid ip address or hostname, do not include http://',
+    'BadImageBufferCount'   => 'Image buffer size must be an integer of 10 or more',
+    'BadLabelX'             => 'Label X co-ordinate must be set to an integer of zero or more',
+    'BadLabelY'             => 'Label Y co-ordinate must be set to an integer of zero or more',
+    'BadMaxFPS'             => 'Maximum FPS must be a positive integer or floating point value',
+    'BadNameChars'          => 'Names may only contain alphanumeric characters plus spaces, hyphen and underscore',
+    'BadPalette'            => 'Palette must be set to a valid value',
+    'BadColours'            => 'Target colour must be set to a valid value',
+    'BadPath'               => 'Path must be set to a valid value',
+    'BadPort'               => 'Port must be set to a valid number',
+    'BadPostEventCount'     => 'Post event image count must be an integer of zero or more',
+    'BadPreEventCount'      => 'Pre event image count must be at least zero, and less than image buffer size',
+    'BadRefBlendPerc'       => 'Reference blend percentage must be a positive integer',
+    'BadSectionLength'      => 'Section length must be an integer of 30 or more',
+    'BadSignalCheckColour'  => 'Signal check colour must be a valid RGB colour string',
+    'BadStreamReplayBuffer' => 'Stream replay buffer must be an integer of zero or more',
+    'BadSourceType'         => 'Source Type \"Web Site\" requires the Function to be set to \"Monitor\"',
+    'BadWarmupCount'        => 'Warmup frames must be an integer of zero or more',
+    'BadWebColour'          => 'Web colour must be a valid web colour string',
+    'BadWebSitePath'        => 'Please enter a complete website url, including the http:// or https:// prefix.',
+    'BadWidth'              => 'Width must be set to a valid value',
+    'Bandwidth'             => 'Propusnost',
+    'BandwidthHead'         => 'propusnost',	// This is the end of the bandwidth status on the top of the console, different in many language due to phrasing
+    'BlobPx'                => 'Blob Px',
+    'Blobs'                 => 'Blobs',
+    'BlobSizes'             => 'Blob velicine',
+    'Brightness'            => 'Svjetloća',
+    'Buffer'                => 'Bufer',
+    'Buffers'               => 'Buferi',
+    'CanAutoFocus'          => 'Podržava Auto fokusiranje',
+    'CanAutoGain'           => 'Podržava Auto pojačanje',
+    'CanAutoIris'           => 'Podržava Auto blenda',
+    'CanAutoWhite'          => 'Podržava Auto balans bijel.',
+    'CanAutoZoom'           => 'Podržava Auto zum',
+    'Cancel'                => 'otkaži',
+    'CancelForcedAlarm'     => 'Otkaži prisilni alarm',
+    'CanFocusAbs'           => 'Podržava Abs fokus',
+    'CanFocus'              => 'Podržava Fokus',
+    'CanFocusCon'           => 'Podržava Kontinuirani fokus',
+    'CanFocusRel'           => 'Podržava Relativni fokus',
+    'CanGainAbs'            => 'Podržava Aps. pojačanje',
+    'CanGain'               => 'Podržava Pojačanje ',
+    'CanGainCon'            => 'Podržava Kontinuirano pojačanje',
+    'CanGainRel'            => 'Podržava Relativno pojačanje',
+    'CanIrisAbs'            => 'Podržava Aps. blenda',
+    'CanIris'               => 'Podržava Blenda',
+    'CanIrisCon'            => 'Podržava kontinuirana blenda',
+    'CanIrisRel'            => 'Podržava Relativna blenda',
+    'CanMoveAbs'            => 'Podržava Aps. kretanje',
+    'CanMove'               => 'Podržava Kretanje',
+    'CanMoveCon'            => 'Podržava Kontinuirano kretanje',
+    'CanMoveDiag'           => 'Podržava Dijagonalno kretanje',
+    'CanMoveMap'            => 'Podržava Mapirano kretanje',
+    'CanMoveRel'            => 'Podržava Relativno kretanje',
+    'CanPan'                => 'Podržava Pomak' ,
+    'CanReset'              => 'PodržavaReset',
+    'CanSetPresets'         => 'Podržava presetove',
+    'CanSleep'              => 'Podržava Sleep',
+    'CanTilt'               => 'Podržava nagib',
+    'CanWake'               => 'Podržava Wake',
+    'CanWhiteAbs'           => 'Podržava Aps. balans bijele boje',
+    'CanWhiteBal'           => 'Podržava balans bijel.',
+    'CanWhite'              => 'Podržava bijelu',
+    'CanWhiteCon'           => 'Podržava kont. balans bijele boje',
+    'CanWhiteRel'           => 'Podržava relativ. balans bijele boje',
+    'CanZoomAbs'            => 'Podržava Aps. zoom',
+    'CanZoom'               => 'Podržava Zoom',
+    'CanZoomCon'            => 'Podržava kontinuirani Zoom',
+    'CanZoomRel'            => 'Podržava Relativni zoom',
+    'CaptureHeight'         => 'Visina slike',
+    'CaptureMethod'         => 'Metoda snimanja',
+    'CaptureResolution'     => 'Snimi rezoluciju',
+    'CapturePalette'        => 'Paleta boja',
+    'CaptureWidth'          => 'Širina slike',
+    'Cause'                 => 'Uzrok',
+    'CheckMethod'           => 'Metoda provjere alarma',
+    'ChooseDetectedCamera'  => 'Odaberi otkrivenu kameru',
+    'ChooseFilter'          => 'Odaberi filter',
+    'ChooseLogFormat'       => 'Odaberi dugi format',
+    'ChooseLogSelection'    => 'Odaberi dugu selekciju',
+    'ChoosePreset'          => 'Odaberi preset',
+    'CloneMonitor'          => 'Kloniraj',
+    'Close'                 => 'Zatvori',
+    'Colour'                => 'Bojs',
+    'Command'               => 'Komanda',
+    'ConcurrentFilter'      => 'Istovremeno pokreni filter',
+    'Config'                => 'Postavke',
+    'ConfiguredFor'         => 'Podešeno za',
+    'ConfirmDeleteEvents'   => 'Sigurni ste da želite izbrisati odabrane događaje?',
+    'ConfirmPassword'       => 'Potvrdi lozinku',
+    'ConjAnd'               => 'i',
+    'ConjOr'                => 'ili',
+    'Console'               => 'Konzola',
+    'ContactAdmin'          => 'Molimo konkatirajte svog administratora za detalje.',
+    'Continue'              => 'Nastavi',
+    'Contrast'              => 'Kontrast',
+    'ControlAddress'        => 'Kontrolna adresa',
+    'ControlCap'            => 'Control Capability',
+    'ControlCaps'           => 'Control Capabilities',
+    'Control'               => 'PTZ kontole',
+    'ControlDevice'         => 'Kontroliši uređaj',
+    'Controllable'          => 'Moguće kontrolisati',
+    'ControlType'           => 'Tipa kontrole',
+    'Current'               => 'Tekuće',
+    'Cycle'                 => 'Kruži',
+    'CycleWatch'            => 'Kružni prikaz',
+    'Day'                   => 'Dan',
+    'Debug'                 => 'Debug',
+    'DefaultRate'           => 'Podrazumjevana stopa',
+    'DefaultScale'          => 'Podrazumjevani razmjer',
+    'DefaultView'           => 'Podrazumjevani prikaz',
+    'Deinterlacing'         => 'Deinterlacing',
+    'RTSPDescribe'         => 'Use RTSP Response Media URL',
+    'Delay'                 => 'Zadrška',
+    'DeleteAndNext'         => 'Izbriši &amp; Sljedeće',
+    'DeleteAndPrev'         => 'Izbriši &amp; Preth',
+    'Delete'                => 'Izbriši',
+    'DeleteSavedFilter'     => 'Izbriši spremljeni filter',
+    'Description'           => 'Opis',
+    'DetectedCameras'       => 'Detektovane kamere:',
+    'DetectedProfiles'      => 'Otkriveni profili',
+    'DeviceChannel'         => 'Kanal',
+    'DeviceFormat'          => 'Sistem boja',
+    'DeviceNumber'          => 'Broj uređaja',
+    'DevicePath'            => 'Putanja uređaja',
+    'Device'                => 'Uređaj',
+    'Devices'               => 'Uređaji',
+    'Dimensions'            => 'Dimenzije',
+    'DisableAlarms'         => 'Onemogući alarme',
+    'Disk'                  => 'Disk',
+    'Display'               => 'Prikaz',
+    'Displaying'            => 'Prikazujem',
+    'DonateAlready'         => 'Ne, već sam napravio donaciju.',
+    'DonateEnticement'      => 'You\'ve been running ZoneMinder for a while now and hopefully are finding it a useful addition to your home or workplace security. Although ZoneMinder is, and will remain, free and open source, it costs money to develop and support. If you would like to help support future development and new features then please consider donating. Donating is, of course, optional but very much appreciated and you can donate as much or as little as you like.<br/><br/>If you would like to donate please select the option below or go to http://www.zoneminder.com/donate.html in your browser.<br/><br/>Thank you for using ZoneMinder and don\'t forget to visit the forums on ZoneMinder.com for support or suggestions about how to make your ZoneMinder experience even better.',
+    'Donate'                => 'Molimo donirajte',
+    'DonateRemindDay'       => 'Ne još, podsjetime za 1 dan',
+    'DonateRemindHour'      => 'Ne još, podsjetime za 1 sat',
+    'DonateRemindMonth'     => 'Ne još, podsjeti me za jedan mjesec',
+    'DonateRemindNever'     => 'Ne, ne želim donirati, nemoj me više podsjećati.',
+    'DonateRemindWeek'      => 'Ne još, podsjeti me za sedam dana.',
+    'DonateYes'             => 'Da, želim da doniram sada.',
+    'DoNativeMotionDetection'=> 'Nativna detekcija pokreta',
+    'Download'              => 'Preuzmi',
+    'DuplicateMonitorName'  => 'Dupliciraj ime monitora',
+    'Duration'              => 'Trajanje',
+    'Edit'                  => 'Uredi',
+    'EditLayout'            => 'Uredi raspored',
+    'Email'                 => 'Email',
+    'EnableAlarms'          => 'Omogući alarme',
+    'Enabled'               => 'Omogućeno',
+    'EnterNewFilterName'    => 'Unesi novo ime za filter',
+    'ErrorBrackets'         => 'Greška, provjerite da li imate jednak broj otvorenih i zatvorenih zagrada.',
+    'Error'                 => 'Greška',
+    'ErrorValidValue'       => 'Greška, osigurajte se da svi pojmovi imaju valide vrijednosti',
+    'Etc'                   => 'itd',
+    'Event'                 => 'Događaj',
+    'EventFilter'           => 'Filter događaja',
+    'EventId'               => 'ID događaja',
+    'EventName'             => 'Naziv događaja',
+    'EventPrefix'           => 'Prefiks događaja',
+    'Events'                => 'Događaji',
+    'Exclude'               => 'Isključi',
+    'Execute'               => 'Izvrši',
+    'ExportDetails'         => 'Izvezi detalje o događaju',
+    'Exif'                  => 'Umetni EXIF podatke u sliku',
+    'Export'                => 'Izvezi',
+    'DownloadVideo'         => 'Preuzmi video',
+    'GenerateDownload'      => 'Generiši preuzimanje',
+    'ExportFailed'          => 'Izvoz nije uspio',
+    'ExportFormat'          => 'Format za izvoz',
+    'ExportFormatTar'       => 'Tar',
+    'ExportFormatZip'       => 'Zip',
+    'ExportFrames'          => 'Izvezi detalje frejma',
+    'ExportImageFiles'      => 'Izvezi slike',
+    'ExportLog'             => 'Izvezi zapisnik',
+    'Exporting'             => 'Izvozim',
+    'ExportMiscFiles'       => 'Izvezi druge fajlove (ukoliko postoje)',
+    'ExportOptions'         => 'Opcije izvoženja',
+    'ExportSucceeded'       => 'Izvoz uspio',
+    'ExportVideoFiles'      => 'Izvezi video fileove (ukoliko postoje)',
+    'Far'                   => 'Far',
+    'FastForward'           => 'Naprijed',
+    'Feed'                  => 'Feed',
+    'Ffmpeg'                => 'Ffmpeg',
+    'File'                  => 'File',
+    'FilterArchiveEvents'   => 'Arhiviraj pronađeno',
+    'FilterUpdateDiskSpace' => 'Ažuriraj korišteni prostor na disku',
+    'FilterDeleteEvents'    => 'Izbriši sve pronađeno',
+    'FilterMoveEvents'      => 'Premjesti pronađeno',
+    'FilterEmailEvents'     => 'Pošalji detalje mailom',
+    'FilterExecuteEvents'   => 'Izvrši sljededeću komandu',
+    'FilterLog'             => 'Filtriraj zapis',
+    'FilterMessageEvents'   => 'Message details of all matches',
+    'FilterPx'              => 'Filter Px',
+    'Filter'                => 'Filter',
+    'Filters'               => 'Filteri',
+    'FilterUnset'           => 'Morate navesti širinu i visinu filtera',
+    'FilterUploadEvents'    => 'Učitaj sve događaje',
+    'FilterVideoEvents'     => 'Napravi video',
+    'First'                 => 'Prvi',
+    'FlippedHori'           => 'Zaokrenuto horizontalno',
+    'FlippedVert'           => 'Zaokrenuto vertikalno',
+    'FnNone'                => 'nijedan',            // Added 2013.08.16.
+    'FnMonitor'             => 'Monitor',            // Added 2013.08.16.
+    'FnModect'              => 'Modect',            // Added 2013.08.16.
+    'FnRecord'              => 'Record',            // Added 2013.08.16.
+    'FnMocord'              => 'Mocord',            // Added 2013.08.16.
+    'FnNodect'              => 'Nodect',            // Added 2013.08.16.
+    'Focus'                 => 'Fokus',
+    'ForceAlarm'            => 'Prisilni alarm',
+    'Format'                => 'Format',
+    'FPS'                   => 'fps',
+    'FPSReportInterval'     => 'FPS Report Interval',
+    'Frame'                 => 'Frame',
+    'FrameId'               => 'Frame Id',
+    'FrameRate'             => 'Frame Rate',
+    'Frames'                => 'Frejmovi',
+    'FrameSkip'             => 'Preskoči frejm',
+    'MotionFrameSkip'       => 'Motion Frame Skip',
+    'FTP'                   => 'FTP',
+    'Func'                  => 'Func',
+    'Function'              => 'Funkcija',
+    'Gain'                  => 'Pojačanje',
+    'General'               => 'Opšte',
+    'GenerateVideo'         => 'Generiši video',
+    'GeneratingVideo'       => 'Generiši video',
+    'GoToZoneMinder'        => 'Idi na ZoneMinder.com',
+    'Grey'                  => 'Siva',
+    'Group'                 => 'Grupa',
+    'Groups'                => 'Grupe',
+    'HasFocusSpeed'         => 'Posjeduje brzo fokusiranja',
+    'HasGainSpeed'          => 'Posjeduje brzo pojačanja',
+    'HasHomePreset'         => 'Has Home Preset',
+    'HasIrisSpeed'          => 'Posjeduje brzu blendu',
+    'HasPanSpeed'           => 'Posjeduje brzi pomak',
+    'HasPresets'            => 'Posjeduje pre-setove',
+    'HasTiltSpeed'          => 'Posjeduje brzi nagiba',
+    'HasTurboPan'           => 'Posjeduje turbo pomak',
+    'HasTurboTilt'          => 'Posjeduje turbo nagib',
+    'HasWhiteSpeed'         => 'Posjeduje brzo podeš.bijele',
+    'HasZoomSpeed'          => 'Posjeduje brzi zoom',
+    'HighBW'                => 'High&nbsp;B/W',
+    'High'                  => 'veliku',
+    'Home'                  => 'Početna',
+    'Hostname'				=> 'Hostname',
+    'Hour'                  => 'Sat',
+    'Hue'                   => 'Nijansa',
+    'Id'                    => 'Id',
+    'Idle'                  => 'Na čekanju',
+    'Ignore'                => 'Zanemari',
+    'ImageBufferSize'       => 'Veličina slikovnog bufera (u frejmovima)',
+    'Image'                 => 'Slika',
+    'Images'                => 'Slike',
+    'Include'               => 'Uključi',
+    'In'                    => 'U',
+    'Inverted'              => 'Invertirano',
+    'Iris'                  => 'Blenda',
+    'KeyString'             => 'Key String',
+    'Label'                 => 'Oznaka',
+    'Language'              => 'Jezik',
+    'Last'                  => 'Zadnje',
+    'Layout'                => 'Raspored',
+    'Libvlc'                => 'Libvlc',
+    'LimitResultsPost'      => 'results only', // This is used at the end of the phrase 'Limit to first N results only'
+    'LimitResultsPre'       => 'Limit to first', // This is used at the beginning of the phrase 'Limit to first N results only'
+    'LinkedMonitors'        => 'Povezani monitori',
+    'List'                  => 'Popis',
+    'ListMatches'           => 'Prikaži pronađeno',
+    'Load'                  => 'Opterećenje',
+    'Local'                 => 'Lokalno',
+    'Log'                   => 'Zapis',
+    'Logs'                  => 'Zapisi',
+    'Logging'               => 'Dnevnik događaja',
+    'LoggedInAs'            => 'Prijavljen kao',
+    'LoggingIn'             => 'Prijavljujem',
+    'Login'                 => 'prijava',
+    'Logout'                => 'odjava',
+    'LowBW'                 => 'Low&nbsp;B/W',
+    'Low'                   => 'nisku',
+    'Main'                  => 'Glavno',
+    'Man'                   => 'Man',
+    'Manual'                => 'Ručno',
+    'Mark'                  => 'Označi',
+    'MaxBandwidth'          => 'Max propusnost',
+    'MaxBrScore'            => 'Max.<br/>Score',
+    'MaxFocusRange'         => 'Max raspon fokusa',
+    'MaxFocusSpeed'         => 'Max brzina fokusa',
+    'MaxFocusStep'          => 'Max korak fokusa',
+    'MaxGainRange'          => 'Max raspon pojačanja',
+    'MaxGainSpeed'          => 'Max brzina pojačanja',
+    'MaxGainStep'           => 'Max korak pojačanja',
+    'MaximumFPS'            => 'Maximum FPS',
+    'MaxIrisRange'          => 'Max raspon blende',
+    'MaxIrisSpeed'          => 'Max brzina blende',
+    'MaxIrisStep'           => 'Max korak blende',
+    'Max'                   => 'Max',
+    'MaxPanRange'           => 'Max raspon pomaka',
+    'MaxPanSpeed'           => 'Max brzina pomaka',
+    'MaxPanStep'            => 'Max korak pomaka',
+    'MaxTiltRange'          => 'Max raspon nagiba',
+    'MaxTiltSpeed'          => 'Max brzina nagiba',
+    'MaxTiltStep'           => 'Max korak nagiba',
+    'MaxWhiteRange'         => 'Max raspon bijele',
+    'MaxWhiteSpeed'         => 'Max brzina bijele',
+    'MaxWhiteStep'          => 'Max korak bijele',
+    'MaxZoomRange'          => 'Max raspon zumiranja',
+    'MaxZoomSpeed'          => 'Max brzina zumiranja',
+    'MaxZoomStep'           => 'Max korak zumiranja',
+    'MediumBW'              => 'Medium&nbsp;B/W',
+    'Medium'                => 'srednju',
+    'MinAlarmAreaLtMax'     => 'Min područje alarma mora biti manje od maksimalnog',
+    'MinAlarmAreaUnset'     => 'Morate zadati minimalni broj alarm piksela',
+    'MinBlobAreaLtMax'      => 'Min blob područje mora biti manje od maksimalnog',
+    'MinBlobAreaUnset'      => 'Morate zadati minimalni broj blob piksela',
+    'MinBlobLtMinFilter'    => 'Min blob oblast mora biti manja ili jednaka minimalnoj oblasti filtera',
+    'MinBlobsLtMax'         => 'Min blob mora biti manji od maksimalne',
+    'MinBlobsUnset'         => 'morate zadati minimalni broj blob-ova',
+    'MinFilterAreaLtMax'    => 'Minimalna oblast filtera mora biti manja od maksimalne',
+    'MinFilterAreaUnset'    => 'Morate zadati minimalni broj filter piksela',
+    'MinFilterLtMinAlarm'   => 'Min oblast filtera mora biti manja ili jednaka minimalnoj oblasti alarmne oblasti',
+    'MinFocusRange'         => 'Min raspon fokusiranja',
+    'MinFocusSpeed'         => 'Min brzina fokusiranja',
+    'MinFocusStep'          => 'Min korak fokusiranja',
+    'MinGainRange'          => 'Min raspon pojačanja',
+    'MinGainSpeed'          => 'Min brzina pojačanja',
+    'MinGainStep'           => 'Min korak pojačanja',
+    'MinIrisRange'          => 'Min raspon blende',
+    'MinIrisSpeed'          => 'Min brzina blende',
+    'MinIrisStep'           => 'Min korak blende',
+    'MinPanRange'           => 'Min raspon pomaka',
+    'MinPanSpeed'           => 'Min brzina pomaka',
+    'MinPanStep'            => 'Min korak pomaka',
+    'MinPixelThresLtMax'    => 'Min prag piksela mora biti manji od maksimalnog',
+    'MinPixelThresUnset'    => 'Morate zadati minimalni prag piksela',
+    'MinTiltRange'          => 'Min Tilt Range',
+    'MinTiltSpeed'          => 'Min Tilt Speed',
+    'MinTiltStep'           => 'Min Tilt Step',
+    'MinWhiteRange'         => 'Min raspon bijelog balansa',
+    'MinWhiteSpeed'         => 'Min brzina bijelog balansa',
+    'MinWhiteStep'          => 'Min White Bal. Step',
+    'MinZoomRange'          => 'Min raspon zumiranja',
+    'MinZoomSpeed'          => 'Min brzina zumiranja',
+    'MinZoomStep'           => 'Min korak zumiranja',
+    'Misc'                  => 'Razno',
+    'Mode'                  => 'Modus',
+    'MonitorIds'            => 'Monitor&nbsp;Ids',
+    'Monitor'               => 'Monitor',
+    'MonitorPresetIntro'    => 'Odaberite odgovarajuće pre-setove sa popisa.<br/><br/>Imajte u vidu da ovo može prepisati bilo koju vrijednost koja postoji za odabrane monitore.<br/><br/>',
+    'MonitorPreset'         => 'Monitor Preset',
+    'MonitorProbeIntro'     => 'Donji popis prikazuje otkrivene analogne i mrežne kamere, te da li se iste već koriste i da li su dostupne.<br/><br/>Odaberite željenu kameru sa donjeg popisa.<br/><br/>Imajte u vidu da ovo može prepisati bilo koju vrijednost koja postoji za odabrane monitore.<br/><br/>',
+    'MonitorProbe'          => 'Detektuj kameru',
+    'Monitors'              => 'Monitori',
+    'Montage'               => 'Montage',
+    'MontageReview'         => 'Montage pregled',
+    'Month'                 => 'Mjesec',
+    'Move'                  => 'Pomjeri',
+    'MtgDefault'            => 'Podrazumjevano',              // Added 2013.08.15.
+    'Mtg2widgrd'            => '2-struka rešetka',              // Added 2013.08.15.
+    'Mtg3widgrd'            => '3-struka rešetka',              // Added 2013.08.15.
+    'Mtg4widgrd'            => '4-struka rešetka',              // Added 2013.08.15.
+    'Mtg3widgrx'            => '3-wide grid, scaled, enlarge on alarm',              // Added 2013.08.15.
+    'MustBeGe'              => 'mora biti veće ili jednako',
+    'MustBeLe'              => 'mora biti manje ili jednako',
+    'MustConfirmPassword'   => 'Morate potvrditi lozinku',
+    'MustSupplyPassword'    => 'Morate unjeti lozinku',
+    'MustSupplyUsername'    => 'Morate unjeti korisničko ime',
+    'Name'                  => 'Ime',
+    'Near'                  => 'Blizu',
+    'Network'               => 'Mreža',
+    'NewGroup'              => 'Nova grupa',
+    'NewLabel'              => 'Nova oznaka',
+    'New'                   => 'Novo',
+    'NewPassword'           => 'Nova lozinka',
+    'NewState'              => 'Novi radni modus',
+    'NewUser'               => 'Novi korisnik',
+    'Next'                  => 'Sljedeće',
+    'NoDetectedCameras'     => 'Nema otkrivenih kamera',
+    'NoDetectedProfiles'    => 'Nema otkrivenih profila',
+    'NoFramesRecorded'      => 'Nije ništa snimljeno za ovaj događaj',
+    'NoGroup'               => 'Nema grupe',
+    'NoneAvailable'         => 'Nijedno dostupno',
+    'None'                  => 'Nijedno',
+    'No'                    => 'Ne',
+    'Normal'                => 'Normalno',
+    'NoSavedFilters'        => 'NemaSnimljenihFiltera',
+    'NoStatisticsRecorded'  => 'Nema snimljenih statistika za ovaj događaj',
+    'Notes'                 => 'Bilješke',
+    'NumPresets'            => 'Num Presets',
+    'Off'                   => 'Isključeno',
+    'On'                    => 'Uključeno',
+    'OnvifProbe'            => 'ONVIF detekcija',
+    'OnvifProbeIntro'       => 'The list below shows detected ONVIF cameras and whether they are already being used or available for selection.<br/><br/>Select the desired entry from the list below.<br/><br/>Please note that not all cameras may be detected and that choosing a camera here may overwrite any values you already have configured for the current monitor.<br/><br/>',
+    'OnvifCredentialsIntro' => 'Please supply user name and password for the selected camera.<br/>If no user has been created for the camera then the user given here will be created with the given password.<br/><br/>',
+    'Open'                  => 'Otvori',
+    'OpEq'                  => 'jednako',
+    'OpGtEq'                => 'veće ili jednako od',
+    'OpGt'                  => 'veće ',
+    'OpIn'                  => 'in set',
+    'OpLtEq'                => 'manje ili jednako od',
+    'OpLt'                  => 'manje od',
+    'OpMatches'             => 'matches',
+    'OpNe'                  => 'nije jednako',
+    'OpNotIn'               => 'nije u ',
+    'OpNotMatches'          => 'ne poklapa se',
+    'OpIs'                  => 'je',
+    'OpIsNot'               => 'nije',
+    'OptionalEncoderParam'  => 'Opcionalni parametri enkodera',
+    'OptionHelp'            => 'Option Help',
+    'OptionRestartWarning'  => 'These changes may not come into effect fully\nwhile the system is running. When you have\nfinished making your changes please ensure that\nyou restart ZoneMinder.',
+    'Options'               => 'Opcije',
+    'Order'                 => 'Redosljed',
+    'OrEnterNewName'        => 'ili unesi novo ime',
+    'Orientation'           => 'Orijentacija',
+    'Out'                   => 'Izlaz',
+    'OverwriteExisting'     => 'Prepiši preko postojećeg',
+    'Paged'                 => 'stranično',
+    'PanLeft'               => 'Pomak lijevo',
+    'Pan'                   => 'Pomak',
+    'PanRight'              => 'Pomak desno',
+    'PanTilt'               => 'Pomak/Nagib',
+    'Parameter'             => 'Parametar',
+    'Password'              => 'Lozinka',
+    'PasswordsDifferent'    => 'Nova i potvrđena lozinka se razlikuju',
+    'Paths'                 => 'Putanje',
+    'Pause'                 => 'Pauza',
+    'PhoneBW'               => 'Telefon&nbsp;B/W',
+    'Phone'                 => 'Telefon',
+    'PixelDiff'             => 'Piksel razli.',
+    'Pixels'                => 'pikseli',
+    'PlayAll'               => 'play all',
+    'Play'                  => 'Play',
+    'Plugins'               => 'Plugini',
+    'PleaseWait'            => 'Molim čekati',
+    'Point'                 => 'Point',
+    'PostEventImageBuffer'  => 'Br. frejmova poslije događaja',
+    'PreEventImageBuffer'   => 'Br. frejmova prije događaja',
+    'PreserveAspect'        => 'Zadrži omjer',
+    'Preset'                => 'Preset',
+    'Presets'               => 'Presets',
+    'Prev'                  => 'Preth',
+    'Privacy'               => 'Privatnost',
+    'PrivacyAbout'          => 'O',
+    '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.',
+    'PrivacyContact'        => 'Konakt',
+    'PrivacyContactText'    => 'Please contact us <a href="https://zoneminder.com/contact/">here</a> for any questions regarding our privacy policy or to have your information removed.<br><br>For support, there are three primary ways to engage with the community:<ul><li>The ZoneMinder <a href="https://forums.zoneminder.com/">user forum</a></li><li>The ZoneMinder <a href="https://zoneminder-chat.herokuapp.com/">Slack channel</a></li><li>The ZoneMinder <a href="https://github.com/ZoneMinder/zoneminder/issues">Github forum</a></li></ul><p>Our Github forum is only for bug reporting. Please use our user forum or slack channel for all other questions or comments.</p>',
+    'PrivacyCookies'        => 'Kolačići',
+    'PrivacyCookiesText'    => 'Whether you use a web browser or a mobile app to communicate with the ZoneMinder server, a ZMSESSID cookie is created on the client to uniquely identify a session with the ZoneMinder server. ZmCSS and zmSkin cookies are created to remember your style and skin choices.',
+    'PrivacyTelemetry'      => 'Telemetry',
+    'PrivacyTelemetryText'  => 'Because ZoneMinder is open-source, anyone can install it without registering. This makes it difficult to  answer questions such as: how many systems are out there, what is the largest system out there, what kind of systems are out there, or where are these systems located? Knowing the answers to these questions, helps users who ask us these questions, and it helps us set priorities based on the majority user base.',
+    'PrivacyTelemetryList'  => 'The ZoneMinder Telemetry daemon collects the following data about your system:<ul><li>A unique identifier (UUID) <li>City based location is gathered by querying <a href="https://ipinfo.io/geo">ipinfo.io</a>. City, region, country, latitude, and longitude parameters are saved. The latitude and longitude coordinates are accurate down to the city or town level only!<li>Current time<li>Total number of monitors<li>Total number of events<li>System architecture<li>Operating system kernel, distro, and distro version<li>Version of ZoneMinder<li>Total amount of memory<li>Number of cpu cores</ul>',
+    'PrivacyMonitorList'    => 'The following configuration parameters from each monitor are collected:<ul><li>Id<li>Name<li>Type<li>Function<li>Width<li>Height<li>Colours<li>MaxFPS<li>AlarmMaxFPS</ul>',
+    'PrivacyConclusionText' => 'We are <u>NOT</u> collecting any image specific data from your cameras. We don�t know what your cameras are watching. This data will not be sold or used for any purpose not stated herein. By clicking accept, you agree to send us this data to help make ZoneMinder a better product. By clicking decline, you can still freely use ZoneMinder and all its features.',
+    'Probe'                 => 'Detektuj kameru',
+    'ProfileProbe'          => 'Stream proba',
+    'ProfileProbeIntro'     => 'The list below shows the existing stream profiles of the selected camera .<br/><br/>Select the desired entry from the list below.<br/><br/>Please note that ZoneMinder cannot configure additional profiles and that choosing a camera here may overwrite any values you already have configured for the current monitor.<br/><br/>',
+    'Progress'              => 'Napredak',
+    'Protocol'              => 'Protkol',
+    'Rate'                  => 'Stopa',
+    'RecaptchaWarning'      => 'Your reCaptcha secret key is invalid. Please correct it, or reCaptcha will not work', // added Sep 24 2015 - PP
+	'RecordAudio'			=> 'Whether to store the audio stream when saving an event.',
+    'Real'                  => 'Stvarno',
+    'Record'                => 'Snimaj',
+    'RefImageBlendPct'      => 'Reference Image Blend %ge',
+    'Refresh'               => 'Osvježi',
+    'RemoteHostName'        => 'Naziv uređaja',
+    'RemoteHostPath'        => 'Putanja',
+    'RemoteHostSubPath'     => 'Pod-putanja',
+    'RemoteHostPort'        => 'Port',
+    'RemoteImageColours'    => 'Boje slike',
+    'RemoteMethod'          => 'Metoda',
+    'RemoteProtocol'        => 'Protokol',
+    'Remote'                => 'Udaljeno',
+    'Rename'                => 'Preimenuj',
+    'ReplayAll'             => 'Svi događaji',
+    'ReplayGapless'         => 'Gapless Events',
+    'Replay'                => 'Ponovo odigraj',
+    'ReplaySingle'          => 'Jedan događaj',
+    'ReportEventAudit'      => 'Audit Events Report',
+    'ResetEventCounts'      => 'Resetiraj događaje',
+    'Reset'                 => 'Reset',
+    'Restarting'            => 'Restartiram',
+    'Restart'               => 'Restaruj',
+    'RestrictedCameraIds'   => 'Restricted Camera Ids',
+    'RestrictedMonitors'    => 'Ograničeni monitori',
+    'ReturnDelay'           => 'Vrati kašnjenje',
+    'ReturnLocation'        => 'Vrati lokaciju',
+    'Rewind'                => 'Premotaj',
+    'RotateLeft'            => 'Rotoraj ulijevo',
+    'RotateRight'           => 'Rotiraj udesno',
+    'RTSPTransport'         => 'RTSP Transport Protocol',
+    'RunAudit'              => 'Run Audit Process',
+    'RunLocalUpdate'        => 'Pokrenite zmupdate.pl za ažuriranje',
+    'RunMode'               => 'Modus rada',
+    'Running'               => 'Pokrenuto',
+    'RunState'              => 'Radni modus',
+    'RunStats'              => 'Pokreni stats proces',
+    'RunTrigger'            => 'Pokreni triger proces',
+    'SaveAs'                => 'Spremi kao',
+    'SaveFilter'            => 'Spremi Filter',
+    'SaveJPEGs'             => 'Spremi JPEGs',
+    'Save'                  => 'Spremi',
+    'Scale'                 => 'Razmjer',
+    'Score'                 => 'Zbir',
+    'Secs'                  => 'Secs',
+    'Sectionlength'         => 'Odaberi dužinu',
+    'SelectMonitors'        => 'SOdaberi monitore',
+    'Select'                => 'Odaberi',
+    'SelectFormat'          => 'Odaberi format',
+    'SelectLog'             => 'Odaberi zapis',
+    'SelfIntersecting'      => 'Polygon edges must not intersect',
+    'SetNewBandwidth'       => 'Postavi propusnost na',
+    'SetPreset'             => 'Postavi pozicije',
+    'Set'                   => 'Postavi',
+    'Settings'              => 'Postavke',
+    'ShowFilterWindow'      => 'Prikaži prozor za filter',
+    'ShowTimeline'          => 'Prikaži vremensku liniju',
+    'SignalCheckColour'     => 'Signal Check Colour',
+    'SignalCheckPoints'     => 'Signal Check Points',
+    'Size'                  => 'Veličina',
+    'SkinDescription'       => 'Izmjeni izgled za ovu sesiju',
+    'CSSDescription'        => 'Izmjeni css za ovu sesiju',
+    'Sleep'                 => 'Sleep',
+    'SortAsc'               => 'Rastuće',
+    'SortBy'                => 'Sortiraj po',
+    'SortDesc'              => 'Padajuće',
+    'Source'                => 'Izvor',
+    'SourceColours'         => 'Source Colours',
+    'SourcePath'            => 'Putanja izvora ',
+    'SourceType'            => 'Izvor videa',
+    'SpeedHigh'             => 'Velika brzina',
+    'SpeedLow'              => 'Niska brzina',
+    'SpeedMedium'           => 'Srednja brzina',
+    'Speed'                 => 'brzina',
+    'SpeedTurbo'            => 'Turbo brzina',
+    'Start'                 => 'Start',
+    'State'                 => 'Stanje',
+    'Stats'                 => 'Statistka',
+    'Status'                => 'Status',
+    'StatusUnknown'         => 'Nepoznato',
+    'StatusConnected'       => 'Snimam',
+    'StatusNotRunning'      => 'Nije pokrenuto',
+    'StatusRunning'         => 'Ne snima',
+    'StepBack'              => 'Korak nazad',
+    'StepForward'           => 'Korak naprijed',
+    'StepLarge'             => 'Veliki korak',
+    'StepMedium'            => 'Srednji korak',
+    'StepNone'              => 'Bez koraka',
+    'StepSmall'             => 'Mali korak',
+    'Step'                  => 'Korak',
+    'Stills'                => 'Stills',
+    'Stopped'               => 'Zaustavljeno',
+    'Stop'                  => 'Zaustavi',
+    'StorageArea'           => 'Storage Area',
+    'StorageDoDelete'       => 'Brisanja',
+    'StorageScheme'         => 'Šema',
+    'StreamReplayBuffer'    => 'Stream Replay Image Buffer',
+    'Stream'                => 'Stream',
+    'Submit'                => 'Pošalji',
+    'System'                => 'Sistem',
+    'TargetColorspace'      => 'Rezolucija boja',
+    'Tele'                  => 'Udaljeno',
+    'Thumbnail'             => 'Sličica',
+    'Tilt'                  => 'Tilt',
+    'TimeDelta'             => 'Vremenska razlika',
+    'Timeline'              => 'Vremenska linija',
+    'TimelineTip1'          => 'Pass your mouse over the graph to view a snapshot image and event details.',              // Added 2013.08.15.
+    'TimelineTip2'          => 'Click on the coloured sections of the graph, or the image, to view the event.',              // Added 2013.08.15.
+    'TimelineTip3'          => 'Click on the background to zoom in to a smaller time period based around your click.',              // Added 2013.08.15.
+    'TimelineTip4'          => 'Use the controls below to zoom out or navigate back and forward through the time range.',              // Added 2013.08.15.
+    'TimestampLabelFormat'  => 'Timestamp format oznake',
+    'TimestampLabelX'       => 'Timestamp oznaka X',
+    'TimestampLabelY'       => 'Timestamp oznaka Y',
+    'TimestampLabelSize'    => 'Veličina fonta',
+    'Timestamp'             => 'Timestamp',
+    'TimeStamp'             => 'Vremenski pečat',
+    'Time'                  => 'Vrijeme',
+    'Today'                 => 'Danas',
+    'Tools'                 => 'Alati',
+    'Total'                 => 'Ukupno',
+    'TotalBrScore'          => 'Total<br/>Score',
+    'TrackDelay'            => 'Kašnjenje',
+    'TrackMotion'           => 'Prati pokret',
+    'Triggers'              => 'Okidači',
+    'TurboPanSpeed'         => 'Turbo Pan brzina',
+    'TurboTiltSpeed'        => 'Turbo Tilt brzina',
+    'Type'                  => 'Tip',
+    'Unarchive'             => 'Dearhiviraj',
+    'Undefined'             => 'Nedefinisano',
+    'Units'                 => 'Mjere',
+    'Unknown'               => 'Nepoznato',
+    'UpdateAvailable'       => 'Dostupno je novo ažurranje za Zoneminder .',
+    'UpdateNotNecessary'    => 'Ažuriranje nije potrebno.',
+    'Update'                => 'Ažuiriaj',
+    'Upload'                => 'Upload',
+    'Updated'               => 'Ažurirano',
+    'UsedPlugins'	   => 'Korišteni plugini ',
+    'UseFilterExprsPost'    => '&nbsp;filter&nbsp;expressions', // This is used at the end of the phrase 'use N filter expressions'
+    'UseFilterExprsPre'     => 'Use&nbsp;', // This is used at the beginning of the phrase 'use N filter expressions'
+    'UseFilter'             => 'Koristi filter',
+    'Username'              => 'Korisničko ime',
+    'Users'                 => 'Korisnici',
+    'User'                  => 'Korisnik',
+    'Value'                 => 'Vrijednost',
+    'VersionIgnore'         => 'Ignoriši ovu verziju',
+    'VersionRemindDay'      => 'Podsjeti me za jedan dan',
+    'VersionRemindHour'     => 'Podsjeti me za jedan sat',
+    'VersionRemindNever'    => 'Ne podsjecaj me na nove verzije',
+    'VersionRemindWeek'     => 'Podsjeti me za sedam dana',
+    'Version'               => 'Verzija',
+    'VideoFormat'           => 'Video Format',
+    'VideoGenFailed'        => 'Generisanje videa nije uspjelo!',
+    'VideoGenFiles'         => 'Postojece video datoteke',
+    'VideoGenNoFiles'       => 'Video datoteke nisu pronadjene',
+    'VideoGenParms'         => 'Parametri za generisanje videa',
+    'VideoGenSucceeded'     => 'Generisanje videa uspjelo!',
+    'VideoSize'             => 'Velicina videa',
+    'VideoWriter'           => 'Video pisac',
+    'Video'                 => 'Video',
+    'ViewAll'               => 'Pregledaj sve',
+    'ViewEvent'             => 'Pregled događaja',
+    'ViewPaged'             => 'Stanični pregled',
+    'View'                  => 'Pregled',
+	'V4L'					=> 'V4L',
+	'V4LCapturesPerFrame'	=> 'Snimci po frejmu',
+	'V4LMultiBuffer'		=> 'Višestr. bafer',
+    'Wake'                  => 'Budi',
+    'WarmupFrames'          => 'Warmup frejmovi',
+    'Watch'                 => 'Gledaj',
+    'WebColour'             => 'Web boja',
+    'Web'                   => 'Web',
+    'WebSiteUrl'            => 'URL web stranice',
+    'Week'                  => 'Sedmica',
+    'WhiteBalance'          => 'Balans bijele',
+    'White'                 => 'Bijelo',
+    'Wide'                  => 'Široko',
+    'X10ActivationString'   => 'X10 znakovni niz za aktiviranje',
+    'X10InputAlarmString'   => 'X10 ulazni znakovni niz za alarm',
+    'X10OutputAlarmString'  => 'X10 izlazni znakovni niz za alarm',
+    'X10'                   => 'X10',
+    'X'                     => 'X',
+    'Yes'                   => 'Da',
+    'YouNoPerms'            => 'Nemate potrebne dozvole za pristup ovom resursu.',
+    'Y'                     => 'Y',
+    'ZoneAlarmColour'       => 'Boja alarma (Red/Green/Blue)',
+    'ZoneArea'              => 'Oblast zone',
+    'ZoneFilterSize'        => 'Filter Width/Height (pixels)',
+    'ZoneMinderLog'         => 'ZoneMinder zapisnik',
+    'ZoneMinMaxAlarmArea'   => 'Min/Max alarmirana oblast',
+    'ZoneMinMaxBlobArea'    => 'Min/Max blob oblast',
+    'ZoneMinMaxBlobs'       => 'Min/Max Blobovi',
+    'ZoneMinMaxFiltArea'    => 'Min/Max filtrirane oblasti',
+    'ZoneMinMaxPixelThres'  => 'Min/Max Pixel Threshold (0-255)',
+    'ZoneOverloadFrames'    => 'Overload Frame Ignore Count',
+    'ZoneExtendAlarmFrames' => 'Extend Alarm Frame Count',
+    'Zones'                 => 'Zone',
+    'Zone'                  => 'Zona',
+    'ZoomIn'                => 'Zoom In',
+    'ZoomOut'               => 'Zoom Out',
+    'Zoom'                  => 'Zumiranje',
+);
+
+// Complex replacements with formatting and/or placements, must be passed through sprintf
+$CLANG = array(
+    'CurrentLogin'          => 'Prijavljeni ste kao \'%1$s\'',
+    'EventCount'            => '%1$s %2$s', // For example '37 Events' (from Vlang below)
+    'LastEvents'            => 'Last %1$s %2$s', // For example 'Last 37 Events' (from Vlang below)
+    'LatestRelease'         => 'Zadnja verzija servera je v%1$s, vi imate v%2$s.',
+    'MonitorCount'          => '%1$s %2$s', // For example '4 Monitors' (from Vlang below)
+    'MonitorFunction'       => 'Monitor %1$s Function',
+    'RunningRecentVer'      => 'Koristite najnoviju verziju Zoneminder servera, v%s.',
+    'VersionMismatch'       => 'Version mismatch, system is version %1$s, database is %2$s.',
+);
+
+// The next section allows you to describe a series of word ending and counts used to 
+// generate the correctly conjugated forms of words depending on a count that is associated
+// with that word.
+// This intended to allow phrases such a '0 potatoes', '1 potato', '2 potatoes' etc to
+// conjugate correctly with the associated count.
+// In some languages such as English this is fairly simple and can be expressed by assigning
+// a count with a singular or plural form of a word and then finding the nearest (lower) value.
+// So '0' of something generally ends in 's', 1 of something is singular and has no extra
+// ending and 2 or more is a plural and ends in 's' also. So to find the ending for '187' of
+// something you would find the nearest lower count (2) and use that ending.
+//
+// So examples of this would be
+// $zmVlangPotato = array( 0=>'Potatoes', 1=>'Potato', 2=>'Potatoes' );
+// $zmVlangSheep = array( 0=>'Sheep' );
+//
+// where you can have as few or as many entries in the array as necessary
+// If your language is similar in form to this then use the same format and choose the
+// appropriate zmVlang function below.
+// If however you have a language with a different format of plural endings then another
+// approach is required . For instance in Russian the word endings change continuously
+// depending on the last digit (or digits) of the numerator. In this case then zmVlang
+// arrays could be written so that the array index just represents an arbitrary 'type'
+// and the zmVlang function does the calculation about which version is appropriate.
+//
+// So an example in Russian might be (using English words, and made up endings as I
+// don't know any Russian!!)
+// 'Potato' => array( 1=>'Potati', 2=>'Potaton', 3=>'Potaten' ),
+//
+// and the zmVlang function decides that the first form is used for counts ending in
+// 0, 5-9 or 11-19 and the second form when ending in 1 etc.
+//
+
+// Variable arrays expressing plurality, see the zmVlang description above
+$VLANG = array(
+    'Event'                 => array( 0=>'Events', 1=>'Event', 2=>'Events' ),
+    'Monitor'               => array( 0=>'Monitors', 1=>'Monitor', 2=>'Monitors' ),
+);
+// You will need to choose or write a function that can correlate the plurality string arrays
+// with variable counts. This is used to conjugate the Vlang arrays above with a number passed
+// in to generate the correct noun form.
+//
+// In languages such as English this is fairly simple 
+// Note this still has to be used with printf etc to get the right formatting
+function zmVlang( $langVarArray, $count )
+{
+    krsort( $langVarArray );
+    foreach ( $langVarArray as $key=>$value )
+    {
+        if ( abs($count) >= $key )
+        {
+            return( $value );
+        }
+    }
+    die( 'Error, unable to correlate variable language string' );
+}
+
+// This is an version that could be used in the Russian example above
+// The rules are that the first word form is used if the count ends in
+// 0, 5-9 or 11-19. The second form is used then the count ends in 1
+// (not including 11 as above) and the third form is used when the 
+// count ends in 2-4, again excluding any values ending in 12-14.
+// 
+// function zmVlang( $langVarArray, $count )
+// {
+//  $secondlastdigit = substr( $count, -2, 1 );
+//  $lastdigit = substr( $count, -1, 1 );
+//  // or
+//  // $secondlastdigit = ($count/10)%10;
+//  // $lastdigit = $count%10;
+// 
+//  // Get rid of the special cases first, the teens
+//  if ( $secondlastdigit == 1 && $lastdigit != 0 )
+//  {
+//      return( $langVarArray[1] );
+//  }
+//  switch ( $lastdigit )
+//  {
+//      case 0 :
+//      case 5 :
+//      case 6 :
+//      case 7 :
+//      case 8 :
+//      case 9 :
+//      {
+//          return( $langVarArray[1] );
+//          break;
+//      }
+//      case 1 :
+//      {
+//          return( $langVarArray[2] );
+//          break;
+//      }
+//      case 2 :
+//      case 3 :
+//      case 4 :
+//      {
+//          return( $langVarArray[3] );
+//          break;
+//      }
+//  }
+//  die( 'Error, unable to correlate variable language string' );
+// }
+
+// This is an example of how the function is used in the code which you can uncomment and 
+// use to test your custom function.
+//$monitors = array();
+//$monitors[] = 1; // Choose any number
+//echo sprintf( $CLANG['MonitorCount'], count($monitors), zmVlang( $VLANG['VlangMonitor'], count($monitors) ) );
+
+// In this section you can override the default prompt and help texts for the options area
+// These overrides are in the form show below where the array key represents the option name minus the initial ZM_
+// So for example, to override the help text for ZM_LANG_DEFAULT do
+$OLANG = array(
+	'OPTIONS_FFMPEG' => array(
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		          "Examples (do not enter quotes)~~~~".
+		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
+		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+	),
+        'OPTIONS_RTSPTrans' => array(
+		'Help' => "This sets the RTSP Transport Protocol for FFmpeg.~~ ".
+                          "TCP - Use TCP (interleaving within the RTSP control channel) as transport protocol.~~".
+                          "UDP - Use UDP as transport protocol. Higher resolution cameras have experienced some 'smearing' while using UDP, if so try TCP~~".
+                          "UDP Multicast - Use UDP Multicast as transport protocol~~".
+                          "HTTP - Use HTTP tunneling as transport protocol, which is useful for passing proxies.~~"
+	),
+	'OPTIONS_LIBVLC' => array(
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
+		          "Examples (do not enter quotes)~~~~".
+		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
+		          "\"--verbose=2\" Set verbosity of libVLC"
+	),
+	'OPTIONS_EXIF' => array(
+		'Help' => "Enable this option to embed EXIF data into each jpeg frame."
+	),
+	'OPTIONS_RTSPDESCRIBE' => array(
+		'Help' => "Sometimes, during the initial RTSP handshake, the camera will send an updated media URL. ".
+		          "Enable this option to tell ZoneMinder to use this URL. Disable this option to ignore the ".
+		          "value from the camera and use the value as entered in the monitor configuration~~~~". 
+		          "Generally this should be enabled. However, there are cases where the camera can get its".
+		          "own URL incorrect, such as when the camera is streaming through a firewall"),
+	'OPTIONS_MAXFPS' => array(
+		'Help' => "This field has certain limitations when used for non-local devices.~~ ".
+		          "Failure to adhere to these limitations will cause a delay in live video, irregular frame skipping, ".
+		          "and missed events~~".
+		          "For streaming IP cameras, do not use this field to reduce the frame rate. Set the frame rate in the".
+                          " camera, instead. You can, however, use a value that is slightly higher than the frame rate in the camera. ".
+		          "In this case, this helps keep the cpu from being overtaxed in the event of a network problem.~~". 
+		          "Some, mostly older, IP cameras support snapshot mode. In this case ZoneMinder is actively polling the camera ".
+		          "for new images. In this case, it is safe to use the field."
+	),
+	
+//    'LANG_DEFAULT' => array(
+//        'Prompt' => "This is a new prompt for this option",
+//        'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"
+//    ),
+);
+
+?>

From 349693e27de728eb20270f7b405c6a6b5c58de23 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 25 Oct 2018 11:24:23 -0400
Subject: [PATCH 17/86] Add a missing comma

---
 scripts/zmfilter.pl.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index f9029016a..3f7e720c3 100644
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -576,7 +576,8 @@ sub uploadArchFile {
       $host .= ':'.$Config{ZM_UPLOAD_PORT} if $Config{ZM_UPLOAD_PORT};
       Info('Uploading to '.$host.' using SFTP');
       my %sftpOptions = (
-          host=>$Config{ZM_UPLOAD_HOST}, user=>$Config{ZM_UPLOAD_USER} 
+          host=>$Config{ZM_UPLOAD_HOST},
+          user=>$Config{ZM_UPLOAD_USER},
           ($Config{ZM_UPLOAD_PASS} ? (password=>$Config{ZM_UPLOAD_PASS}) : ()),
           ($Config{ZM_UPLOAD_PORT} ? (port=>$Config{ZM_UPLOAD_PORT}) : ()),
           ($Config{ZM_UPLOAD_TIMEOUT} ? (timeout=>$Config{ZM_UPLOAD_TIMEOUT}) : ()),

From 91d83a89fa1909d27ad248e901151584823c877b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 25 Oct 2018 15:40:12 -0400
Subject: [PATCH 18/86] include semaphore function replacements

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

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 0f49f611c..76117ad5a 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -2273,4 +2273,30 @@ function unparse_url($parsed_url, $substitutions = array() ) {
   $fragment = isset($parsed_url['fragment']) ? '#' . $parsed_url['fragment'] : ''; 
   return "$scheme$user$pass$host$port$path$query$fragment"; 
 }
+
+// The following works around php not being built with semaphore functions.
+if (!function_exists('sem_get')) {
+  function sem_get($key) {
+    return fopen(__FILE__ . '.sem.' . $key, 'w+');
+  }
+  function sem_acquire($sem_id) {
+    return flock($sem_id, LOCK_EX);
+  }
+  function sem_release($sem_id) {
+    return flock($sem_id, LOCK_UN);
+  }
+}
+
+if( !function_exists('ftok') ) {
+  function ftok($filename = "", $proj = "") {
+    if ( empty($filename) || !file_exists($filename) ) {
+      return -1;
+    } else {
+      $filename = $filename . (string) $proj;
+      for($key = array(); sizeof($key) < strlen($filename); $key[] = ord(substr($filename, sizeof($key), 1)));
+      return dechex(array_sum($key));
+    }
+  }
+}
+
 ?>

From aaeb30a72f12524671ccd07c7ea51b26fc9bc573 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 28 Oct 2018 17:50:22 -0400
Subject: [PATCH 19/86] Move license down to perldocs at bottom.  Remove
 unecessary line feeds and spaces

---
 scripts/zmstats.pl.in | 77 ++++++++++++++++++++++---------------------
 1 file changed, 39 insertions(+), 38 deletions(-)

diff --git a/scripts/zmstats.pl.in b/scripts/zmstats.pl.in
index 25bccfebc..410459158 100644
--- a/scripts/zmstats.pl.in
+++ b/scripts/zmstats.pl.in
@@ -1,39 +1,4 @@
 #!/usr/bin/perl -wT
-#
-# ==========================================================================
-#
-# ZoneMinder WatchDog Script, $Date$, $Revision$
-# Copyright (C) 2001-2008 Philip Coombes
-#
-# 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.
-#
-# ==========================================================================
-
-=head1 NAME
-
-zmwatch.pl - ZoneMinder Stats Updating Script
-
-=head1 SYNOPSIS
-
-zmstats.pl
-
-=head1 DESCRIPTION
-
-This does background updating various stats in the db like event counts, diskspace, etc.
-
-=cut
 use strict;
 use bytes;
 
@@ -66,8 +31,8 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 logInit();
 logSetSignal();
 
-Info( "Stats Daemon starting in ".START_DELAY." seconds\n" );
-sleep( START_DELAY );
+Info("Stats Daemon starting in ".START_DELAY." seconds");
+sleep(START_DELAY);
 
 my $dbh = zmDbConnect();
 
@@ -88,7 +53,43 @@ while( 1 ) {
   sleep($Config{ZM_STATS_UPDATE_INTERVAL});
 } # end while (1)
 
-Info( "Stats Daemon exiting\n" );
+Info("Stats Daemon exiting");
 exit();
 1;
 __END__
+
+#
+# ==========================================================================
+#
+# ZoneMinder WatchDog Script, $Date$, $Revision$
+# Copyright (C) 2001-2008 Philip Coombes
+#
+# 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.
+#
+# ==========================================================================
+
+=head1 NAME
+
+zmstats.pl - ZoneMinder Stats Updating Script
+
+=head1 SYNOPSIS
+
+zmstats.pl
+
+=head1 DESCRIPTION
+
+This does background updating various stats in the db like event counts, diskspace, etc.
+
+=cut

From 0d1f8aaf03ca01f712206463254a3932eb099ef5 Mon Sep 17 00:00:00 2001
From: Matt N <github@matthew.noorenberghe.com>
Date: Sun, 28 Oct 2018 17:15:39 -0700
Subject: [PATCH 20/86] Document /api/monitors/daemonStatus/

---
 docs/api.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/api.rst b/docs/api.rst
index a6d0cc9aa..d4d4f3415 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -148,6 +148,13 @@ This API changes monitor 1 to Modect and Enabled
 ::
 
   curl -XPOST http://server/zm/api/monitors/1.json -d "Monitor[Function]=Modect&Monitor[Enabled]=1"
+  
+Get Daemon Status of Monitor 1
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+::
+
+  	curl http://server/zm/api/monitors/daemonStatus/id:1/daemon:zmc.json
 
 Add a monitor
 ^^^^^^^^^^^^^^

From 95a6d0666a55f2e734658b3ee2db9496661bead8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 29 Oct 2018 09:59:26 -0400
Subject: [PATCH 21/86] Improve behaviour and reduce extra logging when db goes
 away

---
 web/includes/Event.php                   |  8 +++---
 web/includes/functions.php               | 31 ++++++++++++------------
 web/skins/classic/includes/functions.php |  2 +-
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/web/includes/Event.php b/web/includes/Event.php
index 1852bb8b0..fb7af931e 100644
--- a/web/includes/Event.php
+++ b/web/includes/Event.php
@@ -546,9 +546,11 @@ class Event {
     }
     $filters = array();
     $result = dbQuery($sql, $values);
-    $results = $result->fetchALL();
-    foreach ( $results as $row ) {
-      $filters[] = new Event($row);
+    if ( $result ) {
+      $results = $result->fetchALL();
+      foreach ( $results as $row ) {
+        $filters[] = new Event($row);
+      }
     }
     return $filters;
   }
diff --git a/web/includes/functions.php b/web/includes/functions.php
index 76117ad5a..29f627722 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -1909,23 +1909,24 @@ function logState() {
 
   # This is an expensive request, as it has to hit every row of the Logs Table
   $sql = 'SELECT Level, COUNT(Level) AS LevelCount FROM Logs WHERE Level < '.Logger::INFO.' AND TimeKey > unix_timestamp(now() - interval '.ZM_LOG_CHECK_PERIOD.' second) GROUP BY Level ORDER BY Level ASC';
-  $counts = dbFetchAll( $sql );
-
-  foreach ( $counts as $count ) {
-    if ( $count['Level'] <= Logger::PANIC )
-      $count['Level'] = Logger::FATAL;
-    if ( !($levelCount = $levelCounts[$count['Level']]) ) {
-      Error( "Unexpected Log level ".$count['Level'] );
-      next;
-    }
-    if ( $levelCount[1] && $count['LevelCount'] >= $levelCount[1] ) {
-      $state = 'alarm';
-      break;
-    } elseif ( $levelCount[0] && $count['LevelCount'] >= $levelCount[0] ) {
-      $state = 'alert';
+  $counts = dbFetchAll($sql);
+  if ( $counts ) {
+    foreach ( $counts as $count ) {
+      if ( $count['Level'] <= Logger::PANIC )
+        $count['Level'] = Logger::FATAL;
+      if ( !($levelCount = $levelCounts[$count['Level']]) ) {
+        Error('Unexpected Log level '.$count['Level']);
+        next;
+      }
+      if ( $levelCount[1] && $count['LevelCount'] >= $levelCount[1] ) {
+        $state = 'alarm';
+        break;
+      } elseif ( $levelCount[0] && $count['LevelCount'] >= $levelCount[0] ) {
+        $state = 'alert';
+      }
     }
   }
-  return( $state );
+  return $state;
 }
 
 function isVector ( &$array ) {
diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index ceb12d621..7847e37c7 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -345,7 +345,7 @@ if ($reload == 'reload') ob_start();
 <?php 
   $connections = dbFetchOne( "SHOW status WHERE variable_name='threads_connected'", 'Value' );
   $max_connections = dbFetchOne( "SHOW variables WHERE variable_name='max_connections'", 'Value' );
-  $percent_used = 100 * $connections / $max_connections;
+  $percent_used = $max_connections ? 100 * $connections / $max_connections : 100;
   echo '<li'. ( $percent_used > 90 ? ' class="warning"' : '' ).'>'.translate('DB').':'.$connections.'/'.$max_connections.'</li>';
 ?>
 	  <li><?php echo translate('Storage') ?>:

From 9a2d58adceaa6b1335e48290dda64770812033f7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 29 Oct 2018 11:03:03 -0400
Subject: [PATCH 22/86] We don't store all the permissions in the session
 anymore.  We just use the global user object

---
 web/api/app/Controller/MonitorsController.php | 6 ++++--
 web/api/app/Controller/StatesController.php   | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/web/api/app/Controller/MonitorsController.php b/web/api/app/Controller/MonitorsController.php
index 5ce4bb476..185a06c84 100644
--- a/web/api/app/Controller/MonitorsController.php
+++ b/web/api/app/Controller/MonitorsController.php
@@ -207,8 +207,10 @@ class MonitorsController extends AppController {
     if ( !$this->Monitor->exists() ) {
       throw new NotFoundException(__('Invalid monitor'));
     }
-    if ( $this->Session->Read('systemPermission') != 'Edit' ) {
-       throw new UnauthorizedException(__('Insufficient privileges'));
+    global $user;
+    $canEdit = (!$user) || ($user['System'] == 'Edit');
+    if ( !$canEdit ) {
+      throw new UnauthorizedException(__('Insufficient privileges'));
       return;
     }
     $this->request->allowMethod('post', 'delete');
diff --git a/web/api/app/Controller/StatesController.php b/web/api/app/Controller/StatesController.php
index 29201d2c1..b96efe0aa 100644
--- a/web/api/app/Controller/StatesController.php
+++ b/web/api/app/Controller/StatesController.php
@@ -59,8 +59,9 @@ public function add() {
 
   if ($this->request->is('post')) {
 
-    if ($this->Session->Read('systemPermission') != 'Edit')
-    {
+    global $user;
+    $canEdit = (!$user) || ($user['System'] == 'Edit');
+    if ( !$canEdit ) {
       throw new UnauthorizedException(__('Insufficient privileges'));
       return;
     }

From 6691b5fb52b09f4dfcedd4b7bac47d421c991b1e Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 29 Oct 2018 12:50:50 -0400
Subject: [PATCH 23/86] Include CORS headers when there is a Server defined,
 instead of requiring there to be more than 1

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

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 29f627722..7fe174470 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -41,7 +41,7 @@ function CORSHeaders() {
 # The following is left for future reference/use.
     $valid = false;
     $Servers = Server::find();
-    if ( sizeof($Servers) <= 1 ) {
+    if ( sizeof($Servers) < 1 ) {
 # Only need CORSHeaders in the event that there are multiple servers in use.
       # ICON: Might not be true. multi-port?
       return;

From 39061038fb331369c12e984a08011a9fc7933a67 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 29 Oct 2018 14:40:05 -0400
Subject: [PATCH 24/86] Don't include related models in Storage index

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

diff --git a/web/api/app/Controller/StorageController.php b/web/api/app/Controller/StorageController.php
index 325dea4dd..16791788c 100644
--- a/web/api/app/Controller/StorageController.php
+++ b/web/api/app/Controller/StorageController.php
@@ -31,7 +31,7 @@ class StorageController extends AppController {
  * @return void
  */
   public function index() {
-    $this->Storage->recursive = 0;
+    $this->Storage->recursive = -1;
     
     $options = '';
     $storage_areas = $this->Storage->find('all',$options);

From a1937d9885b4cad36b174299819bc4ab77ab7afc Mon Sep 17 00:00:00 2001
From: Chris Kampmeier <chris@kampers.net>
Date: Tue, 30 Oct 2018 18:35:50 -0400
Subject: [PATCH 25/86] Fixes for a couple issues in the Ubuntu guide (#2285)

* Xenial needs the ppa:iconnor/zoneminder repo

Otherwise, trying to install the zoneminder package fails with an unmet
dependency on php-apc.

See https://forums.zoneminder.com/viewtopic.php?t=27638 for details.

* Add necessary modules before configuring Apache

When you add the zoneminder configuration before enabling mod_rewrite,
subsequent commands (like the one to enable mod_cgi) give you an error
like:

    AH00526: Syntax error on line 37 of /etc/apache2/conf-enabled/zoneminder.conf:
    Invalid command 'RewriteEngine', perhaps misspelled or defined by a module not included in the server configuration
---
 docs/installationguide/ubuntu.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/installationguide/ubuntu.rst b/docs/installationguide/ubuntu.rst
index 3df065264..6c686d7ed 100644
--- a/docs/installationguide/ubuntu.rst
+++ b/docs/installationguide/ubuntu.rst
@@ -49,7 +49,7 @@ guide you with a quick search.
 
         add-apt-repository ppa:iconnor/zoneminder-1.32
 
-    If you are on trusty, you may want to add both, as there are some packages for dependencies included in the old ppa.
+    If you are on Trusty or Xenial, you may want to add both, as there are some packages for dependencies included in the old ppa.
   
 
 Update repo and upgrade.
@@ -138,9 +138,9 @@ Set /etc/zm/zm.conf to root:www-data 740 and www-data access to content
 
 ::
 
-        a2enconf zoneminder
         a2enmod cgi
         a2enmod rewrite
+        a2enconf zoneminder
 
 You may also want to enable to following modules to improve caching performance
 

From 2b0df3e4e2c9b064088a02eac6d5ce190e9d0561 Mon Sep 17 00:00:00 2001
From: ratmole <ratmole@gmail.com>
Date: Wed, 31 Oct 2018 10:17:36 +0200
Subject: [PATCH 26/86] API - Disable E_NOTICE from php error reporting in cake
 debug

Using zmNinja, the API reports E_NOTICE errors

Notice (8): compact(): Undefined variable: subject [CORE/Cake/Utility/ObjectCollection.php, line 128]
Notice (8): compact() [<a href='http://php.net/function.compact'>function.compact</a>]: Undefined variable: subject [CORE/Cake/Utility/ObjectCollection.php, line 128]
Notice (8): compact() [<a href='http://php.net/function.compact'>function.compact</a>]: Undefined variable: subject [CORE/Cake/Utility/ObjectCollection.php, line 128]
Notice (8): compact() [<a href='http://php.net/function.compact'>function.compact</a>]: Undefined variable: subject [CORE/Cake/Utility/ObjectCollection.php, line 128]

and zmNinja will not work...
there is a better way, but i think disabling E_NOTICE error is way easier

see: https://github.com/ZoneMinder/zoneminder/pull/2269
---
 web/api/app/Config/core.php.default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/api/app/Config/core.php.default b/web/api/app/Config/core.php.default
index 39a51690c..64f439420 100644
--- a/web/api/app/Config/core.php.default
+++ b/web/api/app/Config/core.php.default
@@ -50,7 +50,7 @@
  */
 	Configure::write('Error', array(
 		'handler' => 'ErrorHandler::handleError',
-		'level' => E_ALL & ~E_DEPRECATED,
+		'level' => E_ALL & ~E_DEPRECATED & ~E_NOTICE,
 		'trace' => true
 	));
 

From e87ded35f1b7f530abb013bcf351431ad4a03a92 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 31 Oct 2018 11:08:44 -0400
Subject: [PATCH 27/86] rough in adding Monitor_Status to Monitors

---
 web/api/app/Model/Monitor.php        |  9 ++++-
 web/api/app/Model/Monitor_Status.php | 59 ++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 web/api/app/Model/Monitor_Status.php

diff --git a/web/api/app/Model/Monitor.php b/web/api/app/Model/Monitor.php
index 5c0f62641..2e6584794 100644
--- a/web/api/app/Model/Monitor.php
+++ b/web/api/app/Model/Monitor.php
@@ -116,8 +116,15 @@ class Monitor extends AppModel {
       'OutputCodec'     => array('h264','mjpeg','mpeg1','mpeg2'),
       'OutputContainer' => array('auto','mp4','mkv'),
       'DefaultView'     => array('Events','Control'),
-      'Status'          => array('Unknown','NotRunning','Running','NoSignal','Signal'),
+      #'Status'          => array('Unknown','NotRunning','Running','NoSignal','Signal'),
     )
   );
 
+  public $hasOne = array(
+    'Monitor_Status' => array(
+      'className' => 'Monitor_Status',
+      'foreignKey' => 'MonitorId',
+      'joinTable' =>  'Monitor_Status',
+    )
+  );
 }
diff --git a/web/api/app/Model/Monitor_Status.php b/web/api/app/Model/Monitor_Status.php
new file mode 100644
index 000000000..40f4aa2c2
--- /dev/null
+++ b/web/api/app/Model/Monitor_Status.php
@@ -0,0 +1,59 @@
+<?php
+App::uses('AppModel', 'Model');
+/**
+ * Monitor_Status Model
+ *
+ * @property Event $Event
+ * @property Zone $Zone
+ */
+class Monitor_Status extends AppModel {
+
+/**
+ * Use table
+ *
+ * @var mixed False or table name
+ */
+	public $useTable = 'Monitor_Status';
+
+/**
+ * Primary key field
+ *
+ * @var string
+ */
+	public $primaryKey = 'MonitorId';
+
+/**
+ * Display field
+ *
+ * @var string
+ */
+	public $displayField = 'Status';
+
+	public $recursive = -1;
+
+/**
+ * Validation rules
+ *
+ * @var array
+ */
+	public $validate = array(
+		'MonitorId' => array(
+			'numeric' => array(
+				'rule' => array('numeric'),
+				//'message' => 'Your custom message here',
+				//'allowEmpty' => false,
+				//'required' => false,
+				//'last' => false, // Stop validation after this rule
+				//'on' => 'create', // Limit validation to 'create' or 'update' operations
+			),
+		),
+	);
+
+  public $actsAs = array(
+    'CakePHP-Enum-Behavior.Enum' => array(
+      'Status'          => array('Unknown','NotRunning','Running','NoSignal','Signal'),
+    )
+  );
+
+	//The Associations below have been created with all possible keys, those that are not needed can be removed
+}

From 69f7d367296d16e11f3d6833bdbb6cca84444704 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 31 Oct 2018 11:34:30 -0400
Subject: [PATCH 28/86] Make it clear that audio recording is only for ffmpeg
 input type

---
 web/skins/classic/views/monitor.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index fa2ebd44f..979d4f34e 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -937,7 +937,15 @@ if ( $monitor->Type() == 'Local' ) {
 ?>
             </td></tr>
             <tr><td><?php echo translate('OptionalEncoderParam') ?></td><td><textarea name="newMonitor[EncoderParameters]" rows="4" cols="36"><?php echo validHtmlStr($monitor->EncoderParameters()) ?></textarea></td></tr>
-            <tr><td><?php echo translate('RecordAudio') ?></td><td><input type="checkbox" name="newMonitor[RecordAudio]" value="1"<?php if ( $monitor->RecordAudio() ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><td><?php echo translate('RecordAudio') ?></td><td>
+<?php if ( $monitor->Type() == 'Ffmpeg' ) { ?>
+              <input type="checkbox" name="newMonitor[RecordAudio]" value="1"<?php if ( $monitor->RecordAudio() ) { ?> checked="checked"<?php } ?>/>
+<?php } else { ?>
+              Audio recording only available with FFMPEG
+              <input type="hidden" name="newMonitor[RecordAudio]" value="<?php echo $monitor->RecordAudio() ? 1 : 0 ?>"/>
+<?php } ?>
+            </td></tr>
+
 <?php
       break;
   case 'timestamp' :

From 589b6f3eef323f14105dcda8475fd5451b76b54d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 31 Oct 2018 11:35:06 -0400
Subject: [PATCH 29/86] add further note about needing h264 passthrough

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

diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index 979d4f34e..5142e4a96 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -941,7 +941,7 @@ if ( $monitor->Type() == 'Local' ) {
 <?php if ( $monitor->Type() == 'Ffmpeg' ) { ?>
               <input type="checkbox" name="newMonitor[RecordAudio]" value="1"<?php if ( $monitor->RecordAudio() ) { ?> checked="checked"<?php } ?>/>
 <?php } else { ?>
-              Audio recording only available with FFMPEG
+              Audio recording only available with FFMPEG using H264 Passthrough
               <input type="hidden" name="newMonitor[RecordAudio]" value="<?php echo $monitor->RecordAudio() ? 1 : 0 ?>"/>
 <?php } ?>
             </td></tr>

From bdb50567df2787e52bca8bbb5f306a71c6871263 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 31 Oct 2018 11:56:08 -0400
Subject: [PATCH 30/86] fix disk_event_space to event_disk_space

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

diff --git a/web/includes/Storage.php b/web/includes/Storage.php
index 0744889f9..95f1dab84 100644
--- a/web/includes/Storage.php
+++ b/web/includes/Storage.php
@@ -189,7 +189,7 @@ class Storage {
     # This isn't a function like this in php, so we have to add up the space used in each event.
     if ( ( !array_key_exists('disk_used_space', $this)) or !$this->{'disk_used_space'} ) {
       if ( $this->{'Type'} == 's3fs' ) {
-        $this->{'disk_used_space'} = $this->disk_event_space();
+        $this->{'disk_used_space'} = $this->event_disk_space();
       } else { 
         $path = $this->Path();
         if ( file_exists($path) ) {

From 37b2da59ce7047b1d6d57bd1e63a6f4824e24232 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Thu, 1 Nov 2018 13:30:08 -0400
Subject: [PATCH 31/86] added streaming interface docs

---
 docs/api.rst | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 74 insertions(+), 1 deletion(-)

diff --git a/docs/api.rst b/docs/api.rst
index d4d4f3415..109569492 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -5,7 +5,6 @@ This document will provide an overview of ZoneMinder's API. This is work in prog
 
 Overview
 ^^^^^^^^
-
 In an effort to further 'open up' ZoneMinder, an API was needed.  This will
 allow quick integration with and development of ZoneMinder.
 
@@ -13,6 +12,78 @@ The API is built in CakePHP and lives under the ``/api`` directory.  It
 provides a RESTful service and supports CRUD (create, retrieve, update, delete)
 functions for Monitors, Events, Frames, Zones and Config.
 
+Streaming Interface
+^^^^^^^^^^^^^^^^^^^
+Developers working on their application often ask if there is an "API" to receive live streams, or recorded event streams.
+It is possible to stream both live and recorded streams. This isn't strictly an "API" per-se (that is, it is not integrated
+into the Cake PHP based API layer discussed here) and also why we've used the term "Interface" instead of an "API".
+
+Live Streams
+=============
+What you need to know is that if you want to display "live streams", ZoneMinder sends you streaming JPEG images (MJPEG)
+which can easily be rendered in a browser using an ``img src`` tag.
+
+For example:
+
+::
+
+    <img src="https://yourserver/zm/cgi-bin/nph-zms?scale=50&width=640p&height=480px&mode=jpeg&maxfps=5&buffer=1000&&monitor=1&auth=b54a589e09f330498f4ae2203&connkey=36139" />
+
+will display a live feed from monitor id 1, scaled down by 50% in quality and resized to 640x480px. 
+
+* This assumes ``/zm/cgi-bin`` is your CGI_BIN path. Change it to what is correct in your system
+* The "auth" token you see above is required if you use ZoneMinder authentication. To understand how to get the auth token, please read the "Login, Logout & API security" section below.
+* The "connkey" parameter is essentially a random number which uniquely identifies a stream. If you don't specify a connkey, ZM will generate its own. It is recommended to generate a connkey because you can then use it to "control" the stream (pause/resume etc.)
+* Instead of dealing with the "auth" token, you can also use ``&user=username&pass=password`` where "username" and "password" are your ZoneMinder username and password respectively. Note that this is not recommended because you are transmitting them in a URL and even if you use HTTPS, they may show up in web server logs.
+
+
+PTZ on live streams
+-------------------
+PTZ commands are pretty cryptic in ZoneMinder. This is not meant to be an exhaustive guide, but just something to whet your appetite:
+
+
+Lets assume you have a monitor, with ID=6. Let's further assume you want to pan it left.
+
+You'd need to send a:
+``POST`` command to ``https://yourserver/zm/index.php`` with the following data payload in the command (NOT in the URL)
+
+``view=request&request=control&id=6&control=moveConLeft&xge=30&yge=30``
+
+Obviously, if you are using authentication, you need to be logged in for this to work.
+
+Like I said, at this stage, this is only meant to get you started. Explore the ZoneMinder code and use "Inspect source" as you use PTZ commands in the ZoneMinder source code.
+`control_functions.php <https://github.com/ZoneMinder/zoneminder/blob/10531df54312f52f0f32adec3d4720c063897b62/web/skins/classic/includes/control_functions.php>`__ is a great place to start.
+
+
+Pre-recorded (past event) streams
+=================================
+
+Similar to live playback, if you have chosen to store events in JPEG mode, you can play it back using:
+
+::
+
+    <img src="https://yourserver/zm/cgi-bin/nph-zms?mode=jpeg&frame=1&replay=none&source=event&event=293820&connkey=77493&auth=b54a58f5f4ae2203" />
+
+
+* This assumes ``/zm/cgi-bin`` is your CGI_BIN path. Change it to what is correct in your system
+* This will playback event 293820, starting from frame 1 as an MJPEG stream
+* Like before, you can add more parameters like ``scale`` etc. 
+* auth and connkey have the same meaning as before, and yes, you can replace auth by ``&user=usename&pass=password`` as before and the same security concerns cited above apply.
+
+If instead, you have chosen to use the MP4 (Video) storage mode for events, you can directly play back the saved video file:
+
+::
+   
+    <video src="https://yourserver/zm/index.php?view=view_video&eid=294690&auth=33f3d558af84cf08" type="video/mp4"></video>
+
+* This will play back the video recording for event 294690
+
+What other parameters are supported?
+=====================================
+The best way to answer this question is to play with ZoneMinder console. Open a browser, play back live or recorded feed, and do an "Inspect Source" to see what parameters 
+are generated. Change and observe.
+
+
 Enabling API
 ^^^^^^^^^^^^
 A default ZoneMinder installs with APIs enabled. You can explictly enable/disable the APIs
@@ -396,6 +467,8 @@ PTZ Control APIs
 PTZ controls associated with a monitor are stored in the Controls table and not the Monitors table inside ZM. What that means is when you get the details of a Monitor, you will only know if it is controllable (isControllable:true) and the control ID.
 To be able to retrieve PTZ information related to that Control ID, you need to use the controls API
 
+Note that these APIs only retrieve control data related to PTZ. They don't actually move the camera. 
+
 This returns all the control definitions:
 ::
 

From 2953ff4db4afa15266917d9deffe28375108811e Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Thu, 1 Nov 2018 13:40:07 -0400
Subject: [PATCH 32/86] header level fix

---
 docs/api.rst | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/api.rst b/docs/api.rst
index 109569492..a06797cd1 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -19,7 +19,7 @@ It is possible to stream both live and recorded streams. This isn't strictly an
 into the Cake PHP based API layer discussed here) and also why we've used the term "Interface" instead of an "API".
 
 Live Streams
-=============
+~~~~~~~~~~~~~~
 What you need to know is that if you want to display "live streams", ZoneMinder sends you streaming JPEG images (MJPEG)
 which can easily be rendered in a browser using an ``img src`` tag.
 
@@ -56,7 +56,7 @@ Like I said, at this stage, this is only meant to get you started. Explore the Z
 
 
 Pre-recorded (past event) streams
-=================================
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Similar to live playback, if you have chosen to store events in JPEG mode, you can play it back using:
 
@@ -79,7 +79,7 @@ If instead, you have chosen to use the MP4 (Video) storage mode for events, you
 * This will play back the video recording for event 294690
 
 What other parameters are supported?
-=====================================
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 The best way to answer this question is to play with ZoneMinder console. Open a browser, play back live or recorded feed, and do an "Inspect Source" to see what parameters 
 are generated. Change and observe.
 
@@ -490,3 +490,4 @@ ZM APIs have various APIs that help you in determining host (aka ZM) daemon stat
   curl -XGET  http://server/zm/api/host/getLoad.json # returns current load of ZM
   curl -XGET  http://server/zm/api/host/getDiskPercent.json # returns in GB (not percentage), disk usage per monitor (that is,   space taken to store various event related information,images etc. per monitor)
 
+

From cd8d609e846eafa87b86e42fb59a4edf2ba1339c Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Thu, 1 Nov 2018 14:00:09 -0400
Subject: [PATCH 33/86] initial multi-server/storage changes

---
 docs/api.rst | 101 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 98 insertions(+), 3 deletions(-)

diff --git a/docs/api.rst b/docs/api.rst
index a06797cd1..d70c7eabc 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -142,7 +142,21 @@ using CuRL like so:
 
     curl -b cookies.txt http://yourzmip/zm/api/monitors.json
 
-This would return a list of monitors and pass on the authentication information to the ZM API layer.
+This would return a list of monitors and pass on the authentication information to the ZM API layer. It is worthwhile noting, that starting ZM 1.32.3 and beyond, this API also returns a ``Monitor_Status`` object per monitor. It looks like this:
+
+::
+
+        "Monitor_Status": {
+                "MonitorId": "2",
+                "Status": "Connected",
+                "CaptureFPS": "1.67",
+                "AnalysisFPS": "1.67",
+                "CaptureBandwidth": "52095"
+            }
+
+
+If you don't see this in your API, you are running an older version of ZM. This gives you a very convenient way to check monitor status without calling the ``daemonCheck`` API described later.
+
 
 A deeper dive into the login process
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -486,8 +500,89 @@ ZM APIs have various APIs that help you in determining host (aka ZM) daemon stat
 
 ::
 
-  curl -XGET  http://server/zm/api/host/daemonCheck.json # 1 = ZM running 0=not running
   curl -XGET  http://server/zm/api/host/getLoad.json # returns current load of ZM
-  curl -XGET  http://server/zm/api/host/getDiskPercent.json # returns in GB (not percentage), disk usage per monitor (that is,   space taken to store various event related information,images etc. per monitor)
+
+  # Note that ZM 1.32.3 onwards has the same information in Monitors.json which is more reliable and works for multi-server too.
+  curl -XGET  http://server/zm/api/host/daemonCheck.json # 1 = ZM running 0=not running
+
+  # The API below uses "du" to calculate disk space. We no longer recommend you use it if you have many events. Use the Storage APIs instead, described later
+  curl -XGET  http://server/zm/api/host/getDiskPercent.json # returns in GB (not percentage), disk usage per monitor (that is,space taken to store various event related information,images etc. per monitor)
+
+
+Storage and Server APIs
+^^^^^^^^^^^^^^^^^^^^^^^
+
+ZoneMinder introduced many new options that allowed you to configure multiserver/multistorage configurations. While a part of this was available in previous versions, a lot of rework was done as part of ZM 1.31 and 1.32. As part of that work, a lot of new and useful APIs were added. Some of these are part of ZM 1.32 and others will be part of ZM 1.32.3 (of course, if you build from master, you can access them right away, or wait till a stable release is out.
+
+
+
+This returns storage data for my single server install. If you are using multi-storage, you'll see many such "Storage" entries, one for each storage defined:
+
+::
+
+        curl http://server/zm/api/storage.json
+
+Returns:
+
+::
+
+        {
+            "storage": [
+                {
+                    "Storage": {
+                        "Id": "0",
+                        "Path": "\/var\/cache\/zoneminder\/events",
+                        "Name": "Default",
+                        "Type": "local",
+                        "Url": null,
+                        "DiskSpace": "364705447651",
+                        "Scheme": "Medium",
+                        "ServerId": null,
+                        "DoDelete": true
+                    }
+                 }
+               ]
+        }
+
+
+
+"DiskSpace" is the disk used in bytes. While this doesn't return disk space data as rich as  ``/host/getDiskPercent``, it is much more efficient.
+
+Similarly, 
+
+::
+        curl http://server/zm/api/server.json 
+
+Returns:
+
+::
+
+      {
+            "servers": [
+                {
+                    "Server": {
+                        "Id": "1",
+                        "Name": "server1",
+                        "Hostname": "sserver1.mydomain.com",
+                        "State_Id": null,
+                        "Status": "Running",
+                        "CpuLoad": "0.9",
+                        "TotalMem": "6186237952",
+                        "FreeMem": "156102656",
+                        "TotalSwap": "536866816",
+                        "FreeSwap": "525697024",
+                        "zmstats": false,
+                        "zmaudit": false,
+                        "zmtrigger": false
+                    }
+                }
+            ]
+        }
+
+This only works if you have a multiserver setup in place. If you don't it will return an empty array.
+
+
+
+
 
 

From 46cd2fc3ffb387762c8fa378cee96d117ea07ce6 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Thu, 1 Nov 2018 14:04:51 -0400
Subject: [PATCH 34/86] relocate monitor_status to the right place

---
 docs/api.rst | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/docs/api.rst b/docs/api.rst
index d70c7eabc..ec4fe8d55 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -142,21 +142,7 @@ using CuRL like so:
 
     curl -b cookies.txt http://yourzmip/zm/api/monitors.json
 
-This would return a list of monitors and pass on the authentication information to the ZM API layer. It is worthwhile noting, that starting ZM 1.32.3 and beyond, this API also returns a ``Monitor_Status`` object per monitor. It looks like this:
-
-::
-
-        "Monitor_Status": {
-                "MonitorId": "2",
-                "Status": "Connected",
-                "CaptureFPS": "1.67",
-                "AnalysisFPS": "1.67",
-                "CaptureBandwidth": "52095"
-            }
-
-
-If you don't see this in your API, you are running an older version of ZM. This gives you a very convenient way to check monitor status without calling the ``daemonCheck`` API described later.
-
+This would return a list of monitors and pass on the authentication information to the ZM API layer.
 
 A deeper dive into the login process
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -217,6 +203,22 @@ Return a list of all monitors
   
 	curl http://server/zm/api/monitors.json
 
+It is worthwhile to note that starting ZM 1.32.3 and beyond, this API also returns a ``Monitor_Status`` object per monitor. It looks like this:
+
+::
+
+        "Monitor_Status": {
+                "MonitorId": "2",
+                "Status": "Connected",
+                "CaptureFPS": "1.67",
+                "AnalysisFPS": "1.67",
+                "CaptureBandwidth": "52095"
+            }
+
+
+If you don't see this in your API, you are running an older version of ZM. This gives you a very convenient way to check monitor status without calling the ``daemonCheck`` API described later.
+
+
 Retrieve monitor 1
 ^^^^^^^^^^^^^^^^^^^
 
@@ -551,6 +553,7 @@ Returns:
 Similarly, 
 
 ::
+
         curl http://server/zm/api/server.json 
 
 Returns:

From 536d9226e0575ecc34a6f324cd2180b69d823fd8 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Thu, 1 Nov 2018 14:07:53 -0400
Subject: [PATCH 35/86] ptz - clarify this is meta-data

---
 docs/api.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/api.rst b/docs/api.rst
index ec4fe8d55..647eedac0 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -478,12 +478,12 @@ Create a Zone
   &Zone[MaxBlobs]=\
   &Zone[OverloadFrames]=0"
 
-PTZ Control APIs
-^^^^^^^^^^^^^^^^
+PTZ Control Meta-Data APIs
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
 PTZ controls associated with a monitor are stored in the Controls table and not the Monitors table inside ZM. What that means is when you get the details of a Monitor, you will only know if it is controllable (isControllable:true) and the control ID.
 To be able to retrieve PTZ information related to that Control ID, you need to use the controls API
 
-Note that these APIs only retrieve control data related to PTZ. They don't actually move the camera. 
+Note that these APIs only retrieve control data related to PTZ. They don't actually move the camera. See the "PTZ on live streams" section to move the camera.
 
 This returns all the control definitions:
 ::

From 14c30eac7682debb92dcc9633755d91bb61dba5c Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Thu, 1 Nov 2018 14:08:09 -0400
Subject: [PATCH 36/86] typo

---
 docs/api.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api.rst b/docs/api.rst
index 647eedac0..e102851a7 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -566,7 +566,7 @@ Returns:
                     "Server": {
                         "Id": "1",
                         "Name": "server1",
-                        "Hostname": "sserver1.mydomain.com",
+                        "Hostname": "server1.mydomain.com",
                         "State_Id": null,
                         "Status": "Running",
                         "CpuLoad": "0.9",

From 86a086c216647dc37b503a47be61cb97ea26a794 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Thu, 1 Nov 2018 14:13:22 -0400
Subject: [PATCH 37/86] server json api typo

---
 docs/api.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api.rst b/docs/api.rst
index e102851a7..2c7ad1d16 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -554,7 +554,7 @@ Similarly,
 
 ::
 
-        curl http://server/zm/api/server.json 
+        curl http://server/zm/api/servers.json 
 
 Returns:
 

From ace1134df137c1bb7bea35156158d57eafe50b0b Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Thu, 1 Nov 2018 14:40:31 -0400
Subject: [PATCH 38/86] further reading

---
 docs/api.rst | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/api.rst b/docs/api.rst
index 2c7ad1d16..2f90b7fdf 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -585,7 +585,14 @@ Returns:
 This only works if you have a multiserver setup in place. If you don't it will return an empty array.
 
 
-
+Further Reading
+^^^^^^^^^^^^^^^^
+As described earlier, treat this document as an "introduction" to the important parts of the API and streaming interfaces.
+There are several details that haven't yet been documented. Till they are, here are some resources:
+
+* zmNinja, the open source mobile app for ZoneMinder is 100% based on ZM APIs. Explore its `source code <https://github.com/pliablepixels/zmNinja>`__ to see how things work.
+* Launch up ZM console in a browser, and do an "Inspect source". See how images are being rendered. Go to the networks tab of the inspect source console and look at network requests that are made when you pause/play/forward streams.
+* If you still can't find an answer, post your question in the `forums <https://forums.zoneminder.com/index.php>`__ (not the github repo).
 
 
 

From 4b24bf4e36f9b0aa265c89b62dea12c11ec88890 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 2 Nov 2018 11:48:35 -0400
Subject: [PATCH 39/86] merge from storageareas, fully specify Module for
 zmDbDisconnect as we havn't 'used' it

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

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
index 3caa6af4a..6d7ecc660 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
@@ -705,7 +705,7 @@ sub Fatal( @ ) {
     $SIG{TERM}();
   }
   # I think if we don't disconnect we will leave sockets around in TIME_WAIT
-  zmDbDisconnect();
+  ZoneMinder::Database::zmDbDisconnect();
   exit(-1);
 }
 

From 3aee902a96daab320f6a1c17c81664d997916d75 Mon Sep 17 00:00:00 2001
From: Andy Bauer <knnniggett@hotmail.com>
Date: Sun, 4 Nov 2018 17:11:19 -0600
Subject: [PATCH 40/86] update nginx support on redhat

---
 distros/redhat/nginx/README.Fedora            | 168 +++++++++++-------
 distros/redhat/nginx/zoneminder.conf.in       |   4 +
 .../redhat/nginx/zoneminder.php-fpm.conf.in   |  12 +-
 distros/redhat/nginx/zoneminder.tmpfiles.in   |   3 +
 distros/redhat/zoneminder.spec                |   3 +-
 5 files changed, 118 insertions(+), 72 deletions(-)

diff --git a/distros/redhat/nginx/README.Fedora b/distros/redhat/nginx/README.Fedora
index 0a5168231..013a502b0 100644
--- a/distros/redhat/nginx/README.Fedora
+++ b/distros/redhat/nginx/README.Fedora
@@ -1,39 +1,34 @@
 What's New
 ==========
 
-1. This is an *experimental* build of zoneminder which uses the 
-   nginx web server.
+1. See the ZoneMinder release notes for a list of new features:
+   https://github.com/ZoneMinder/zoneminder/releases
 
-2. The Apache ScriptAlias has been changed from "/cgi-bin/zm/zms" to 
-   "/cgi-bin-zm/zms". This has been to done to avoid this bug:
-   https://bugzilla.redhat.com/show_bug.cgi?id=973067
+2. The contents of the ZoneMinder Apache config file have changed. In
+   addition, this ZoneMinder package now requires you to manually symlink the
+   ZoneMinder Apache config file. See new install step 6 and upgrade step 3
+   below for details.
 
-   IMPORTANT: You must manually inspect the value for PATH_ZMS under Options
-   and verify it is set to "/cgi-bin-zm/nph-zms". Failure to do so will result
-   in a broken system. You have been warned.
-
-3. Due to the active state of the ZoneMinder project, we now recommend granting
-   ALL permission to the ZoneMinder mysql account. This change must be done
-   manually before ZoneMinder will run. See the installation steps below.
-
-4. This package uses the HTTPS protocol by default to access the web portal.
-   Requests using HTTP will auto-redirect to HTTPS. See README.https for
-   more information.
-   
-5. This package ships with the new ZoneMinder API enabled.
+3. This is an experimental build of ZoneMinder supporting nginx, rather than
+   apache web server.
 
+4. If you have installed ZoneMinder from the FedBerry repositories, this build
+   of ZoneMinder has support for Raspberry Pi hardware acceleration when using
+   ffmpeg. Unforunately, there is a problem with the same hardware acceleration
+   when using libvlc. Consequently, libvlc support in thie build of ZoneMinder
+   has been disabled until the problem is resolved. See the following bug
+   report for details: https://trac.videolan.org/vlc/ticket/18594
+  
 New installs
 ============
 
-1. This package supports either community-mysql-server or mariadb-server with
-   mariadb being the preferred choice. Unless you are already using MariaDB or
-   Mysql server, you need to ensure that the server is configured to start
-   during boot and properly secured by running:
+1. Unless you are already using MariaDB server, you need to ensure that the
+   server is configured to start during boot and properly secured by running:
 
-	sudo dnf install mariadb-server
-	sudo systemctl enable mariadb
-	sudo systemctl start  mariadb.service
-	mysql_secure_installation
+     sudo dnf install mariadb-server
+     sudo systemctl enable mariadb
+     sudo systemctl start  mariadb.service
+     mysql_secure_installation
 
 2. Assuming the database is local and using the password for the root account
    set during the previous step, you will need to create the ZoneMinder
@@ -48,13 +43,17 @@ New installs
    anything that suits your environment.
 
 3. If you have chosen to change the zoneminder database account credentials to
-   something other than zmuser/zmpass, you must now edit /etc/zm/zm.conf.
-   Change ZM_DB_USER and ZM_DB_PASS to the values you created in the previous
-   step.
+   something other than zmuser/zmpass, you must now create a config file under
+   /etc/zm/conf.d and set your credentials there. For example, create the file
+   /etc/zm/conf.d/zm-db-user.conf and add the following content to it:
+      
+     ZM_DB_USER = {username of the sql account you want to use}
+     ZM_DB_PASS = {password of the sql account you want to use}
 
-   This version of zoneminder no longer requires you to make a similar change 
-   to the credentials in /usr/share/zoneminder/www/api/app/Config/database.php 
-   This now happens dynamically. Do *not* make any changes to this file.
+   Once the file has been saved, set proper file & ownership permissions on it:
+  
+     sudo chown root:apache *.conf
+     sudo chmod 640 *.conf     
 
 4. Edit /etc/php.ini, uncomment the date.timezone line, and add your local
    timezone.  PHP will complain loudly if this is not set, or if it is set
@@ -80,54 +79,87 @@ New installs
    SELINUX line from "enforcing" to "disabled". This change will take
    effect after a reboot.
 
-6. This package comes preconfigured for HTTPS using the default self signed
-   certificate on your system. We recommend you keep this configuration.
+6. Configure the web server
 
-   If this does not meet your needs, then read README.https to
-   learn about alternatives. 
+   This package uses the HTTPS protocol by default to access the web portal,
+   using the default self signed certificate on your system. Requests using
+   HTTP will auto-redirect to HTTPS. 
 
-7. Edit /etc/sysconfig/fcgiwrap and set DAEMON_PROCS to the maximum number of
+   Inspect the web server configuration file and verify it meets your needs:
+
+     /etc/zm/www/zoneminder.conf
+
+   If you are running other web enabled services then you may need to edit
+   this file to suite. See README.https to learn about other alternatives. 
+
+   When in doubt, proceed with the default:
+
+     sudo ln -s /etc/zm/www/zoneminder.conf /etc/nginx/default.d/
+
+7. Fcgiwrap is required when using ZoneMinder with Nginx. At the time of this
+   writing, fcgiwrap is not yet available in the Fedora repos. Until it
+   becomes available, you may install it from my Copr repository:
+
+      https://copr.fedorainfracloud.org/coprs/kni/fcgiwrap/
+
+   Follow the intructions on that site to enable the repo. Once enabled, 
+   install fcgiwrap:
+
+      sudo dnf install fcgiwrap
+
+   After fcgiwrap is installed, it must be configured. Edit 
+   /etc/sysconfig/fcgiwrap and set DAEMON_PROCS to the maximum number of
    simulatneous streams the server should support. Generally, a good minimum 
    value for this equals the total number of cameras you expect to view at the
    same time.
 
 8. Now start the web server:
 
-	sudo systemctl enable nginx
-	sudo systemctl start nginx
+     sudo systemctl enable nginx
+     sudo systemctl start nginx
 
 9. Now start zoneminder:
 
-	sudo systemctl enable zoneminder
-	sudo systemctl start zoneminder
+     sudo systemctl enable zoneminder
+     sudo systemctl start zoneminder
 
-10.The Fedora repos have a ZoneMinder package available, but it does not
-   support ffmpeg or libvlc, which many modern IP cameras require. Most users
-   will want to prevent the ZoneMinder package in the Fedora repos from
-   overwriting the ZoneMinder package in zmrepo, during a future dnf update. To
-   prevent that from happening you must edit /etc/yum.repos.d/fedora.repo
-   and /etc/yum.repos.d/fedora-updates.repo. Add the line "exclude=zoneminder*"
-   without the quotes under the [fedora] and [fedora-updates] blocks,
-   respectively.
+10. Optionally configure the firewall
+
+   All Redhat distros ship with the firewall enabled. That means you will not
+   be able to access the ZoneMinder web console from a remote machine until
+   changes are made to the firewall.
+
+   What follows are a set of minimal commands to allow remote access to the
+   ZoneMinder web console and also allow ZoneMinder's ONVIF discovery to
+   work. The following commands do not put any restrictions on which remote
+   machine(s) have access to the listed ports or services.
+
+     sudo firewall-cmd --permanent --zone=public --add-service=http
+     sudo firewall-cmd --permanent --zone=public --add-service=https
+     sudo firewall-cmd --permanent --zone=public --add-port=3702/udp
+     sudo firewall-cmd --reload
+
+   Additional changes to the firewall may be required, depending on your
+   security requirements and how you use the system. It is up to you to verify
+   these commands are sufficient.
+
+11. Access the ZoneMinder web console
+
+   You may now access the ZoneMinder web console from your web browser using
+   an appropriate url. Here are some examples:
+
+     http://localhost/zm (works from the local machine only)
+     http://{machine name}/zm (works only if dns is configured for your network)
+     http://{ip address}/zm
 
 Upgrades
 ========
 
-1. Verify /etc/zm/zm.conf.
-
-   If zm.conf was manually edited before running the upgrade, the installation
-   may not overwrite it. In this case, it will create the file
-   /etc/zm/zm.conf.rpmnew.
-
-   For example, this will happen if you are using database account credentials
-   other than zmuser/zmpass.
-
-   Compare /etc/zm/zm.conf to /etc/zm/zm.conf.rpmnew. Verify that zm.conf
-   contains any new config settings that may be in zm.conf.rpmnew.
-
-   This version of zoneminder no longer requires you to make a similar change 
-   to the credentials in /usr/share/zoneminder/www/api/app/Config/database.php 
-   This now happens dynamically. Do *not* make any changes to this file.
+1. Conf.d folder support has been added to ZoneMinder. Any custom
+   changes previously made to zm.conf must now be made in one or more custom
+   config files, created under the conf.d folder. Do this now. See 
+   /etc/zm/conf.d/README for details. Once you recreate any custom config changes
+   under the conf.d folder, they will remain in place indefinitely.
 
 2. Verify permissions of the zmuser account.
 
@@ -139,12 +171,16 @@ Upgrades
 
    See step 2 of the Installation section to add missing permissions.
    
-3. Verify the ZoneMinder Apache configuration file in the folder 
-   /etc/httpd/conf.d. You will have a file called "zoneminder.conf" and there
+3. Verify the ZoneMinder Nginx configuration file in the folder 
+   /etc/zm/www. You will have a file called "zoneminder.conf" and there
    may also be a file called "zoneminder.conf.rpmnew". If the rpmnew file
    exists, inspect it and merge anything new in that file with zoneminder.conf.
    Verify the SSL REquirements meet your needs. Read README.https if necessary.
 
+   The contents of this file must be merged into your Nginx configuration.
+   See step 6 of the installation section if you have not already done this
+   during a previous upgrade.
+
 4. Upgrade the database before starting ZoneMinder.
 
    Most upgrades can be performed by executing the following command:
diff --git a/distros/redhat/nginx/zoneminder.conf.in b/distros/redhat/nginx/zoneminder.conf.in
index b8ffd816a..cca9af54f 100644
--- a/distros/redhat/nginx/zoneminder.conf.in
+++ b/distros/redhat/nginx/zoneminder.conf.in
@@ -22,6 +22,10 @@ location /cgi-bin-zm {
     fastcgi_pass  unix:/run/fcgiwrap.sock;
 }
 
+location /zm/cache {
+    alias "@ZM_CACHEDIR@";
+}
+
 location /zm {
     gzip off;
     alias                   "@ZM_WEBDIR@";
diff --git a/distros/redhat/nginx/zoneminder.php-fpm.conf.in b/distros/redhat/nginx/zoneminder.php-fpm.conf.in
index 26e8c62cf..ffc44bbe0 100644
--- a/distros/redhat/nginx/zoneminder.php-fpm.conf.in
+++ b/distros/redhat/nginx/zoneminder.php-fpm.conf.in
@@ -1,10 +1,12 @@
-# Change the user and group of the default pool to the web server account
+; Change the user and group of the default pool to the web server account
 [www]
 
 user = @WEB_USER@
 group = @WEB_GROUP@
 
-# Uncomment these on machines with little memory
-#pm = ondemand
-#pm.max_children = 10
-#pm.process_idle_timeout = 10s
+; These parameters are typically a tradoff between performance and memory
+; consumption. See the contents of www.conf for details.
+
+pm = ondemand
+pm.max_children = 50
+pm.process_idle_timeout = 10s
diff --git a/distros/redhat/nginx/zoneminder.tmpfiles.in b/distros/redhat/nginx/zoneminder.tmpfiles.in
index 8040a7877..07bae0900 100644
--- a/distros/redhat/nginx/zoneminder.tmpfiles.in
+++ b/distros/redhat/nginx/zoneminder.tmpfiles.in
@@ -1,5 +1,8 @@
 D @ZM_TMPDIR@ 0755 @WEB_USER@ @WEB_GROUP@
 D @ZM_SOCKDIR@ 0755 @WEB_USER@ @WEB_GROUP@
+D @ZM_CACHEDIR@ 0755 @WEB_USER@ @WEB_GROUP@
+d @ZM_DIR_EVENTS@ 0755 @WEB_USER@ @WEB_GROUP@
+D @ZM_DIR_IMAGES@ 0755 @WEB_USER@ @WEB_GROUP@
 D /var/lib/php/session 770 root @WEB_GROUP@
 D /var/lib/php/wsdlcache 770 root @WEB_GROUP@
 
diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index de1d408ea..05d0cf653 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -84,7 +84,8 @@ BuildRequires: libmp4v2-devel
 BuildRequires: x264-devel
 
 %{?with_nginx:Requires: nginx}
-%{?with_nginx:Requires: fcgiwrap}
+# Enable only after fcgiwrap is in Fedora repos
+#%{?with_nginx:Requires: fcgiwrap}
 %{?with_nginx:Requires: php-fpm}
 %{!?with_nginx:Requires: httpd}
 %{!?with_nginx:Requires: php}

From 720505cbea163bf544b45cd861d6ae4592a174bb Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Sun, 4 Nov 2018 17:14:46 -0600
Subject: [PATCH 41/86] spelling

---
 distros/redhat/nginx/README.Fedora | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/distros/redhat/nginx/README.Fedora b/distros/redhat/nginx/README.Fedora
index 013a502b0..90d760952 100644
--- a/distros/redhat/nginx/README.Fedora
+++ b/distros/redhat/nginx/README.Fedora
@@ -15,7 +15,7 @@ What's New
 4. If you have installed ZoneMinder from the FedBerry repositories, this build
    of ZoneMinder has support for Raspberry Pi hardware acceleration when using
    ffmpeg. Unforunately, there is a problem with the same hardware acceleration
-   when using libvlc. Consequently, libvlc support in thie build of ZoneMinder
+   when using libvlc. Consequently, libvlc support in this build of ZoneMinder
    has been disabled until the problem is resolved. See the following bug
    report for details: https://trac.videolan.org/vlc/ticket/18594
   

From b8066e66ed6ab1b824fd6d058505c292d4873911 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Mon, 5 Nov 2018 06:51:08 -0600
Subject: [PATCH 42/86] 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 05d0cf653..4f51c73e4 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -307,7 +307,7 @@ EOF
 
 %{_libexecdir}/zoneminder/
 %{_datadir}/zoneminder/
-%{_datadir}/applications/*%{name}.desktop
+%{_datadir}/applications/*zoneminder.desktop
 
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/events

From d3064e440296152e66974f89a773ef0751e8f0a0 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Mon, 5 Nov 2018 07:06:34 -0600
Subject: [PATCH 43/86] Update zoneminder.spec

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

diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index 4f51c73e4..ecba0fb5a 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -84,8 +84,6 @@ BuildRequires: libmp4v2-devel
 BuildRequires: x264-devel
 
 %{?with_nginx:Requires: nginx}
-# Enable only after fcgiwrap is in Fedora repos
-#%{?with_nginx:Requires: fcgiwrap}
 %{?with_nginx:Requires: php-fpm}
 %{!?with_nginx:Requires: httpd}
 %{!?with_nginx:Requires: php}
@@ -132,7 +130,7 @@ designed to support as many cameras as you can attach to your computer without
 too much degradation of performance.
 
 %prep
-%autosetup -p 1 -a 1 -n ZoneMinder-%{version}
+%autosetup -p 1 -a 1
 %{__rm} -rf ./web/api/app/Plugin/Crud
 %{__mv} -f crud-%{crud_version} ./web/api/app/Plugin/Crud
 

From ec951638105b320ac3a9940abe0b24f50f1d9b01 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Mon, 5 Nov 2018 19:35:05 -0600
Subject: [PATCH 44/86] Add fedora 29 support to buildsystem

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 1ae0988d5..d46e0fc85 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,6 +38,7 @@ env:
   - OS=el DIST=7
   - OS=fedora DIST=27 DOCKER_REPO=knnniggett/packpack
   - OS=fedora DIST=28 DOCKER_REPO=knnniggett/packpack
+  - OS=fedora DIST=29 DOCKER_REPO=knnniggett/packpack
   - OS=ubuntu DIST=trusty
   - OS=ubuntu DIST=xenial
   - OS=ubuntu DIST=trusty ARCH=i386

From c0c1247fa023e830345869fc86b9cff9abd817a0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@fedora29.home.connortechnology.com>
Date: Wed, 7 Nov 2018 10:33:55 -0500
Subject: [PATCH 45/86] bump verion to 1.32.2

---
 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 32f052ecd..867942e4e 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -25,7 +25,7 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.32.1
+Version: 1.32.2
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons

From 56bdd537575a3dd4531222ed6045707238266c70 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@fedora29.home.connortechnology.com>
Date: Wed, 7 Nov 2018 10:40:44 -0500
Subject: [PATCH 46/86] Use the global dbh in ZoneMinder::Database instead of
 keeping our own copy of it in Logger

---
 scripts/ZoneMinder/lib/ZoneMinder/Logger.pm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
index 16535d9e3..2d15c045d 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
@@ -441,11 +441,11 @@ sub databaseLevel {
     $databaseLevel = $this->limit($databaseLevel);
     if ( $this->{databaseLevel} != $databaseLevel ) {
       if ( ( $databaseLevel > NOLOG ) and ( $this->{databaseLevel} <= NOLOG ) ) {
-        if ( !$this->{dbh} ) {
-          $this->{dbh} = ZoneMinder::Database::zmDbConnect();
+        if ( ! ( $ZoneMinder::Database::dbh or ZoneMinder::Database::zmDbConnect() ) ) {
+          Warning("Failed connecting to db.  Not using database logging.");
+          $this->{databaseLevel} = NOLOG;
+          return NOLOG;
         }
-      } elsif ( $databaseLevel <= NOLOG && $this->{databaseLevel} > NOLOG ) {
-        undef($this->{dbh});
       }
       $this->{databaseLevel} = $databaseLevel;
     }
@@ -558,12 +558,12 @@ sub logPrint {
     }
 
     if ( $level <= $this->{databaseLevel} ) {
-      if ( ! ( $this->{dbh} and $this->{dbh}->ping() ) ) {
+      if ( ! ( $ZoneMinder::Database::dbh and $ZoneMinder::Database::dbh->ping() ) ) {
         $this->{sth} = undef;
         # Turn this off because zDbConnect will do logging calls.
         my $oldlevel = $this->{databaseLevel};
         $this->{databaseLevel} = NOLOG;
-        if ( ! ( $this->{dbh} = ZoneMinder::Database::zmDbConnect() ) ) {
+        if ( ! ZoneMinder::Database::zmDbConnect() ) {
           #print(STDERR "Can't log to database: ");
           return;
         }
@@ -571,10 +571,10 @@ sub logPrint {
       }
 
       my $sql = 'INSERT INTO Logs ( TimeKey, Component, ServerId, Pid, Level, Code, Message, File, Line ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, NULL )';
-      $this->{sth} = $this->{dbh}->prepare_cached($sql) if ! $this->{sth};
+      $this->{sth} = $ZoneMinder::Database::dbh->prepare_cached($sql) if ! $this->{sth};
       if ( !$this->{sth} ) {
         $this->{databaseLevel} = NOLOG;
-        Error("Can't prepare log entry '$sql': ".$this->{dbh}->errstr());
+        Error("Can't prepare log entry '$sql': ".$ZoneMinder::Database::dbh->errstr());
         return;
       } 
 
@@ -590,7 +590,7 @@ sub logPrint {
           );
       if ( !$res ) {
         $this->{databaseLevel} = NOLOG;
-        Error("Can't execute log entry '$sql': ".$this->{dbh}->errstr());
+        Error("Can't execute log entry '$sql': ".$ZoneMinder::Database::dbh->errstr());
       }
     } # end if doing db logging
   } # end if level < effectivelevel

From 0ebcef732491aece126378c8306a551e6929f8b6 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@fedora29.home.connortechnology.com>
Date: Wed, 7 Nov 2018 11:01:12 -0500
Subject: [PATCH 47/86] in poddoc and over needs a =back

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

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
index d48747703..92085b07b 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
@@ -309,6 +309,8 @@ saving configuration is a convenient way to ensure that the configuration
 held in the database corresponds with the most recent definitions and that
 all components are using the same set of configuration.
 
+=back
+
 =head2 EXPORT
 
 None by default.

From 4107082845e396fb3dff0cc762ec41c7cfc040ce Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@fedora29.home.connortechnology.com>
Date: Wed, 7 Nov 2018 11:01:49 -0500
Subject: [PATCH 48/86] Don't delete default states if there are none

---
 scripts/zmpkg.pl.in | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/scripts/zmpkg.pl.in b/scripts/zmpkg.pl.in
index b29235f65..2d6593619 100644
--- a/scripts/zmpkg.pl.in
+++ b/scripts/zmpkg.pl.in
@@ -315,17 +315,19 @@ sub isActiveSanityCheck {
   if ( $sth->rows != 1 ) {
 # PP - no row, or too many rows. Either case is an error
     Info( 'Fixing States table - either no default state or duplicate default states' );
-    $sql = "DELETE FROM States WHERE Name='default'";
-    $sth = $dbh->prepare_cached( $sql )
-      or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-    $res = $sth->execute()
-      or Fatal( "Can't execute: ".$sth->errstr() );
-    $sql = q`"INSERT INTO States (Name,Definition,IsActive) VALUES ('default','','1');`;
+    if ( $sth->rows ) {
+      $sql = q`DELETE FROM States WHERE Name='default'`;
+      $sth = $dbh->prepare_cached( $sql )
+        or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+      $res = $sth->execute()
+        or Fatal( "Can't execute: ".$sth->errstr() );
+    }
+    $sql = q`INSERT INTO States (Name,Definition,IsActive) VALUES ('default','','1');`;
     $sth = $dbh->prepare_cached($sql)
       or Fatal("Can't prepare '$sql': ".$dbh->errstr());
     $res = $sth->execute()
       or Fatal("Can't execute: ".$sth->errstr());
-  }	
+  }
 
 # PP - Now make sure no two states have IsActive=1
   $sql = 'SELECT Name FROM States WHERE IsActive = 1';

From 0e3eb0df17a64ddd09eef53bfae6c78ad508887f Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@fedora29.home.connortechnology.com>
Date: Wed, 7 Nov 2018 11:26:48 -0500
Subject: [PATCH 49/86] remove extra quotes, google code style, update pod docs

---
 scripts/ZoneMinder/lib/ZoneMinder/General.pm | 150 ++++++++-----------
 1 file changed, 65 insertions(+), 85 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/General.pm b/scripts/ZoneMinder/lib/ZoneMinder/General.pm
index 900a8985f..d16c248d5 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/General.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/General.pm
@@ -1,27 +1,3 @@
-# ==========================================================================
-#
-# ZoneMinder General Utility Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# 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.
-#
-# ==========================================================================
-#
-# This module contains the common definitions and functions used by the rest
-# of the ZoneMinder scripts
-#
 package ZoneMinder::General;
 
 use 5.006;
@@ -42,7 +18,7 @@ our @ISA = qw(Exporter ZoneMinder::Base);
 # If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
 # will save memory.
 our %EXPORT_TAGS = (
-    'functions' => [ qw(
+    functions => [ qw(
       executeShellCommand
       getCmdFormat
       runCommand
@@ -56,7 +32,7 @@ our %EXPORT_TAGS = (
     );
 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();
 
@@ -80,74 +56,74 @@ sub executeShellCommand {
   my $output = qx( $command );
   my $status = $? >> 8;
   if ( $status || logDebugging() ) {
-    Debug( "Command: $command\n" );
+    Debug("Command: $command");
     chomp( $output );
-    Debug( "Output: $output\n" );
+    Debug("Output: $output");
   }
-  return( $status );
+  return $status;
 }
 
 sub getCmdFormat {
-  Debug( "Testing valid shell syntax\n" );
+  Debug("Testing valid shell syntax");
 
   my ( $name ) = getpwuid( $> );
   if ( $name eq $Config{ZM_WEB_USER} ) {
-    Debug( "Running as '$name', su commands not needed\n" );
-    return( "" );
+    Debug("Running as '$name', su commands not needed");
+    return '';
   }
 
-  my $null_command = "true";
+  my $null_command = 'true';
 
-  my $prefix = "sudo -u ".$Config{ZM_WEB_USER}." ";
-  my $suffix = "";
+  my $prefix = 'sudo -u '.$Config{ZM_WEB_USER}.' ';
+  my $suffix = '';
   my $command = $prefix.$null_command.$suffix;
-  Debug( "Testing \"$command\"\n" );
+  Debug("Testing \"$command\"");
   my $output = qx($command 2>&1);
   my $status = $? >> 8;
   $output //= $!;
   
   if ( !$status ) {
-    Debug( "Test ok, using format \"$prefix<command>$suffix\"\n" );
+    Debug("Test ok, using format \"$prefix<command>$suffix\"");
     return( $prefix, $suffix );
   } else {
     chomp( $output );
-    Debug( "Test failed, '$output'\n" );
+    Debug("Test failed, '$output'");
 
-    $prefix = "su ".$Config{ZM_WEB_USER}." --shell=/bin/sh --command='";
-    $suffix = "'";
+    $prefix = 'su '.$Config{ZM_WEB_USER}.q` --shell=/bin/sh --command='`;
+    $suffix = q`'`;
     $command = $prefix.$null_command.$suffix;
-    Debug( "Testing \"$command\"\n" );
+    Debug("Testing \"$command\"");
     my $output = qx($command 2>&1);
     my $status = $? >> 8;
     $output //= $!;
     
     if ( !$status ) {
-      Debug( "Test ok, using format \"$prefix<command>$suffix\"\n" );
+      Debug("Test ok, using format \"$prefix<command>$suffix\"");
       return( $prefix, $suffix );
     } else {
-      chomp( $output );
-      Debug( "Test failed, '$output'\n" );
+      chomp($output);
+      Debug("Test failed, '$output'");
 
       $prefix = "su ".$Config{ZM_WEB_USER}." -c '";
       $suffix = "'";
       $command = $prefix.$null_command.$suffix;
-      Debug( "Testing \"$command\"\n" );
+      Debug("Testing \"$command\"");
       $output = qx($command 2>&1);
       $status = $? >> 8;
       $output //= $!;
       
       if ( !$status ) {
-        Debug( "Test ok, using format \"$prefix<command>$suffix\"\n" );
+        Debug("Test ok, using format \"$prefix<command>$suffix\"");
         return( $prefix, $suffix );
       } else {
-        chomp( $output );
-        Debug( "Test failed, '$output'\n" );
+        chomp($output);
+        Debug("Test failed, '$output'");
       }
     }
   }
-  Error( "Unable to find valid 'su' syntax\n" );
-  exit( -1 );
-}
+  Error("Unable to find valid 'su' syntax");
+  exit -1;
+} # end sub getCmdFormat
 
 our $testedShellSyntax = 0;
 our ( $cmdPrefix, $cmdSuffix );
@@ -161,23 +137,23 @@ sub runCommand {
   }
 
   my $command = shift;
-  $command = $Config{ZM_PATH_BIN}."/".$command;
+  $command = $Config{ZM_PATH_BIN}.'/'.$command;
   if ( $cmdPrefix ) {
     $command = $cmdPrefix.$command.$cmdSuffix;
   }
-  Debug( "Command: $command\n" );
+  Debug("Command: $command");
   my $output = qx($command);
   my $status = $? >> 8;
-  chomp( $output );
+  chomp($output);
   if ( $status || logDebugging() ) {
     if ( $status ) {
-      Error( "Unable to run \"$command\", output is \"$output\", status is $status\n" );
+      Error("Unable to run \"$command\", output is \"$output\", status is $status");
     } else {
-      Debug( "Output: $output\n" );
+      Debug("Output: $output");
     }
   }
-  return( $output );
-}
+  return $output;
+} # end sub runCommand
 
 sub createEventPath {
   my $event = shift;
@@ -210,7 +186,7 @@ sub _checkProcessOwner {
       $_setFileOwner = 0;
     }
   }
-  return( $_setFileOwner );
+  return $_setFileOwner;
 }
 
 sub setFileOwner {
@@ -219,7 +195,7 @@ sub setFileOwner {
   if ( _checkProcessOwner() ) {
     chown( $_ownerUid, $_ownerGid, $file )
       or Fatal( "Can't change ownership of file '$file' to '"
-          .$Config{ZM_WEB_USER}.":".$Config{ZM_WEB_GROUP}."': $!"
+          .$Config{ZM_WEB_USER}.':'.$Config{ZM_WEB_GROUP}."': $!"
           );
   }
 }
@@ -234,13 +210,13 @@ sub _checkForImageInfo {
     };
     $_hasImageInfo = $@?0:1;
   }
-  return( $_hasImageInfo );
+  return $_hasImageInfo;
 }
 
 sub createEvent {
   my $event = shift;
 
-  Debug( "Creating event" );
+  Debug('Creating event');
 #print( Dumper( $event )."\n" );
 
   _checkForImageInfo();
@@ -561,38 +537,33 @@ __END__
 
 =head1 NAME
 
-ZoneMinder::Database - Perl extension for blah blah blah
+ZoneMinder::General - Utility Functions for ZoneMinder
 
 =head1 SYNOPSIS
 
-use ZoneMinder::Database;
+use ZoneMinder::General;
 blah blah blah
 
 =head1 DESCRIPTION
 
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
+This module contains the common definitions and functions used by the rest
+of the ZoneMinder scripts
 
 =head2 EXPORT
 
-None by default.
+    functions => [ qw(
+      executeShellCommand
+      getCmdFormat
+      runCommand
+      setFileOwner
+      createEventPath
+      createEvent
+      makePath
+      jsonEncode
+      jsonDecode
+      ) ]
 
 
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-    in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
 =head1 AUTHOR
 
 Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
@@ -601,9 +572,18 @@ Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
 
 Copyright (C) 2001-2008  Philip Coombes
 
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
+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.
 
 =cut

From 230ce61dc417506ecf38ee6ef509e2900ae4b1db Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 7 Nov 2018 11:54:18 -0500
Subject: [PATCH 50/86] fix #2296 by prepending bind with ::

---
 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 7ab844d78..461a6d74d 100644
--- a/src/zm_stream.cpp
+++ b/src/zm_stream.cpp
@@ -325,7 +325,7 @@ void StreamBase::openComms() {
     strncpy(loc_addr.sun_path, loc_sock_path, sizeof(loc_addr.sun_path));
     loc_addr.sun_family = AF_UNIX;
 		Debug(3, "Binding to %s", loc_sock_path);
-    if ( bind(sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)+1) < 0 ) {
+    if ( ::bind(sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)+1) < 0 ) {
       Fatal("Can't bind: %s", strerror(errno));
     }
 

From a066968acaf3dd61f484c71b32c4d90736d8e67c Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 7 Nov 2018 12:33:18 -0500
Subject: [PATCH 51/86] fix dbError and cause it to return the error string
 instead of just logging it.  Add error logging of db errors that don't throw
 exceptions.

---
 web/includes/database.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/web/includes/database.php b/web/includes/database.php
index 55535659f..95fabee11 100644
--- a/web/includes/database.php
+++ b/web/includes/database.php
@@ -98,7 +98,14 @@ function dbLog( $sql, $update=false ) {
 }
 
 function dbError( $sql ) {
-  Error( "SQL-ERR '".$dbConn->errorInfo()."', statement was '".$sql."'" );
+  global $dbConn;
+  $error = $dbConn->errorInfo();
+  if ( ! $error[0] )
+    return '';
+
+  $message = "SQL-ERR '".implode("\n",$dbConn->errorInfo())."', statement was '".$sql."'";
+  Error($message);
+  return $message;
 }
 
 function dbEscape( $string ) {
@@ -136,6 +143,10 @@ function dbQuery( $sql, $params=NULL ) {
 				Logger::Debug("SQL: $sql values:" . ($params?implode(',',$params):'') );
       }
       $result = $dbConn->query($sql);
+      if ( ! $result ) {
+        Error("SQL: Error preparing $sql: " . $pdo->errorInfo);
+        return NULL;
+      }
     }
     if ( defined('ZM_DB_DEBUG') ) {
       if ( $params )

From ec09a71ba0b6075b1daee93fe730d2f7ecf9f247 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 7 Nov 2018 13:18:53 -0500
Subject: [PATCH 52/86] Include defaults for all the missing Monitor Columns

---
 web/includes/Monitor.php | 81 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 78 insertions(+), 3 deletions(-)

diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index 2d84f5dae..e5b44682c 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -9,20 +9,95 @@ class Monitor {
 private $defaults = array(
   'Id' => null,
   'Name' => '',
-  'StorageId' => 0,
   'ServerId' => 0,
+  'StorageId' => 0,
   'Type'      =>  'Ffmpeg',
   'Function' => 'None',
   'Enabled' => 1,
   'LinkedMonitors' => null,
+  'Triggers'  =>  null,
+  'Device'  =>  '',
+  'Channel' =>  0,
+  'Format'  =>  '0',
+  'V4LMultiBuffer'  =>  null,
+  'V4LCapturesPerFrame' =>  null,
+  'Protocol'  =>  null,
+  'Method'  =>  '',
+  'Host'  =>  null,
+  'Port'  =>  '',
+  'SubPath' =>  '',
+  'Path'  =>  null,
+  'Options' =>  null,
+  'User'  =>  null,
+  'Pass'  =>  null,
+  // These are NOT NULL default 0 in the db, but 0 is not a valid value. FIXME
   'Width' => null,
   'Height' => null,
+  'Colours' => 1,
+  'Palette' =>  '0',
   'Orientation' => null,
+  'Deinterlacing' =>  0,
+  'SaveJPEGs' =>  3,
+  'VideoWriter' =>  '0',
+  'OutputCodec' =>  null,
+  'OutputContainer' => null,
+  'EncoderParameters' => null,
+  'RecordAudio' =>  0,
+  'RTSPDescribe'  =>  null,
+  'Brightness'  =>  -1,
+  'Contrast'    =>  -1,
+  'Hue'         =>  -1,
+  'Colour'      =>  -1,
+  'EventPrefix' =>  'Event-',
+  'LabelFormat' =>  null,
+  'LabelX'      =>  0,
+  'LabelY'      =>  0,
+  'LabelSize'   =>  1,
+  'ImageBufferCount'  =>  100,
+  'WarmupCount' =>  0,
+  'PreEventCount' =>  0,
+  'PostEventCount'  =>  0,
+  'StreamReplayBuffer'  => 0,
+  'AlarmFrameCount'     =>  1,
+  'SectionLength'       =>  600,
+  'FrameSkip'           =>  0,
   'AnalysisFPSLimit'  =>  null,
-  'ZoneCount' =>  0,
-  'Triggers'  =>  null,
+  'AnalysisUpdateDelete'  =>  0,
   'MaxFPS' => null,
   'AlarmMaxFPS' => null,
+  'FPSReportIneterval'  =>  100,
+  'RefBlencPerc'        =>  6,
+  'AlarmRefBlendPerc'   =>  6,
+  'Controllable'        =>  0,
+  'ControlId' =>  null,
+  'ControlDevice' =>  null,
+  'ControlAddress'  =>  null,
+  'AutoStopTimeout' => null,
+  'TrackMotion'     =>  0,
+  'TrackDelay'      =>  null,
+  'ReturnLocation'  =>  -1,
+  'ReturnDelay'     =>  null,
+  'DefaultView' =>  'Events',
+  'DefaultRate' =>  100,
+  'DefaultScale'  =>  100,
+  'SignalCheckPoints' =>  0,
+  'SignalCheckColour' =>  '#0000BE',
+  'WebColour'   =>  'red',
+  'Exif'    =>  0,
+  'Sequence'  =>  null,
+  'TotalEvents' =>  null,
+  'TotalEventDiskSpace' =>  null,
+  'HourEvents' =>  null,
+  'HourEventDiskSpace' =>  null,
+  'DayEvents' =>  null,
+  'DayEventDiskSpace' =>  null,
+  'WeekEvents' =>  null,
+  'WeekEventDiskSpace' =>  null,
+  'MonthEvents' =>  null,
+  'MonthEventDiskSpace' =>  null,
+  'ArchivedEvents' =>  null,
+  'ArchivedEventDiskSpace' =>  null,
+  'ZoneCount' =>  0,
   'Refresh' => null,
 );
 private $status_fields = array(

From 82abd04f363b6c3f4d21732ac07f4846111abd19 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 7 Nov 2018 13:19:42 -0500
Subject: [PATCH 53/86] Add type=button to buttons so they don't act like
 submit buttons

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

diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php
index 8671bfc03..12fd62c20 100644
--- a/web/skins/classic/views/event.php
+++ b/web/skins/classic/views/event.php
@@ -119,22 +119,22 @@ if ( ! $Event->Id() ) {
       <div id="menuBar1">
         <div id="nameControl">
           <input type="text" id="eventName" name="eventName" value="<?php echo validHtmlStr($Event->Name()) ?>" />
-          <button value="Rename" onclick="renameEvent()"<?php if ( !canEdit( 'Events' ) ) { ?> disabled="disabled"<?php } ?>>
+          <button value="Rename" type="button" onclick="renameEvent()"<?php if ( !canEdit('Events') ) { ?> disabled="disabled"<?php } ?>>
 <?php echo translate('Rename') ?></button>
         </div>
 <?php
 if ( canEdit('Events') ) {
 ?>
-        <div id="deleteEvent"><button onclick="deleteEvent()"><?php echo translate('Delete') ?></button></div>
-        <div id="editEvent"><button onclick="editEvent()"><?php echo translate('Edit') ?></button></div>
-        <div id="archiveEvent"<?php echo $Event->Archived == 1 ? ' class="hidden"' : ''  ?>><button onclick="archiveEvent()"><?php echo translate('Archive') ?></button></div>
-        <div id="unarchiveEvent"<?php echo $Event->Archived == 0 ? ' class="hidden"' : '' ?>><button onclick="unarchiveEvent()"><?php echo translate('Unarchive') ?></button></div>
+        <div id="deleteEvent"><button type="button" onclick="deleteEvent()"><?php echo translate('Delete') ?></button></div>
+        <div id="editEvent"><button type="button" onclick="editEvent()"><?php echo translate('Edit') ?></button></div>
+        <div id="archiveEvent"<?php echo $Event->Archived == 1 ? ' class="hidden"' : ''  ?>><button type="button" onclick="archiveEvent()"><?php echo translate('Archive') ?></button></div>
+        <div id="unarchiveEvent"<?php echo $Event->Archived == 0 ? ' class="hidden"' : '' ?>><button type="button" onclick="unarchiveEvent()"><?php echo translate('Unarchive') ?></button></div>
 <?php
 } // end if can edit Events
 ?>
-        <div id="framesEvent"><button onclick="showEventFrames()"><?php echo translate('Frames') ?></button></div>
+        <div id="framesEvent"><button type="button" onclick="showEventFrames()"><?php echo translate('Frames') ?></button></div>
         <div id="streamEvent" class="hidden"><button onclick="showStream()"><?php echo translate('Stream') ?></button></div>
-        <div id="stillsEvent"><button onclick="showStills()"><?php echo translate('Stills') ?></button></div>
+        <div id="stillsEvent"><button type="button" onclick="showStills()"><?php echo translate('Stills') ?></button></div>
 <?php
   if ( $Event->DefaultVideo() ) { 
 ?>
@@ -142,11 +142,11 @@ if ( canEdit('Events') ) {
 <?php
   } else {
 ?>
-        <div id="videoEvent"><button onclick="videoEvent();"><?php echo translate('Video') ?></button></div>
+        <div id="videoEvent"><button type="button" onclick="videoEvent();"><?php echo translate('Video') ?></button></div>
 <?php
   } // end if Event->DefaultVideo
 ?>
-        <div id="exportEvent"><button onclick="exportEvent();"><?php echo translate('Export') ?></button></div>
+        <div id="exportEvent"><button type="button" onclick="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>
@@ -214,8 +214,8 @@ if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT ) {
           <div id="eventImageFrame">
             <img id="eventImage" src="graphics/transparent.png" alt=""/>
             <div id="eventImageBar">
-              <div id="eventImageClose"><input type="button" value="<?php echo translate('Close') ?>" onclick="hideEventImage()"/></div>
-              <div id="eventImageStats" class="hidden"><input type="button" value="<?php echo translate('Stats') ?>" onclick="showFrameStats()"/></div>
+              <div id="eventImageClose"><button type="button" onclick="hideEventImage()"><?php echo translate('Close') ?></button></div>
+              <div id="eventImageStats" class="hidden"><button type="button" onclick="showFrameStats()"><?php echo translate('Stats') ?></button></div>
               <div id="eventImageData"><?php echo translate('Frame') ?> <span id="eventImageNo"></span></div>
             </div>
           </div>

From 1844a7eb292dec6188af0836feaea938b99537a7 Mon Sep 17 00:00:00 2001
From: Aktarus <11706557+aktarus82@users.noreply.github.com>
Date: Fri, 9 Nov 2018 13:59:06 +0100
Subject: [PATCH 54/86] Update definemonitor.rst (#2299)

---
 docs/userguide/definemonitor.rst | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/docs/userguide/definemonitor.rst b/docs/userguide/definemonitor.rst
index bf12a1bc5..bcd195570 100644
--- a/docs/userguide/definemonitor.rst
+++ b/docs/userguide/definemonitor.rst
@@ -164,6 +164,29 @@ Height (pixels)
 Web Site Refresh 
     If the website in question has static content, optionally enter a time period in seconds for ZoneMinder to refresh the content.
 
+Storage Tab
+-----------
+
+The storage section allows for each monitor to configure if and how video and audio are recorded.
+
+Save JPEGs
+    Records video in individual JPEG frames. Storing JPEG frames requires more storage space than h264 but it allows to view an event anytime while it is being recorded.
+
+    * Disabled – video is not recorded as JPEG frames. If this setting is selected, then "Video Writer" should be enabled otherwise there is no video recording at all.
+    * Frames only – video is recorded in individual JPEG frames.
+    * Analysis images only (if available) – video is recorded in invidual JPEG frames with an overlay of the motion detection analysis information. Note that this overlay remains permanently visible in the frames.
+    * Frames + Analysis images (if available) – video is recorded twice, once as normal individual JPEG frames and once in invidual JPEG frames with analysis information overlaid.
+
+Video Writer
+    Records video in real video format. It provides much better compression results than saving JPEGs, thus longer video history can be stored.
+	
+    * Disabled – video is not recorded in video format. If this setting is selected, then "Save JPEGs" should be enabled otherwise there is no video recording at all.
+    * X264 Encode – the video or picture frames received from the camera are transcoded into h264 and stored as a video. This option is useful if the camera cannot natively stream h264.
+    * H264 Camera Passthrough – this option assumes that the camera is already sending an h264 stream. Video will be recorded as is, without any post-processing in zoneminder. Video characteristics such as bitrate, encoding mode, etc. should be set directly in the camera.
+
+Recording Audio
+    Check the box labeled "Whether to store the audio stream when saving an event." in order to save audio (if available) when events are recorded.
+
 Timestamp Tab
 -------------
 

From 4ddd328c6186b1e40286994efed0f24b46023ea0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 9 Nov 2018 10:39:57 -0500
Subject: [PATCH 55/86] Check and Fix Scheme and StorageArea

---
 scripts/zmaudit.pl.in | 110 ++++++++++++++++++++++--------------------
 1 file changed, 59 insertions(+), 51 deletions(-)

diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in
index 495fdc031..66dab7ae4 100644
--- a/scripts/zmaudit.pl.in
+++ b/scripts/zmaudit.pl.in
@@ -508,68 +508,76 @@ MAIN: while( $loop ) {
 
   # Foreach database monitor and it's list of events.
   while ( my ( $db_monitor, $db_events ) = each(%$db_monitors) ) {
+    Debug("Checking db events for monitor $db_monitor");
+      if ( ! $db_events ) {
+        Debug("Skipping db events for $db_monitor because there are none");
+        next;
+      }
 
     # If we found the monitor in the file system
-    if ( my $fs_events = $fs_monitors->{$db_monitor} ) {
-      next if ! $db_events;
+    my $fs_events = $fs_monitors->{$db_monitor};
 
-      while ( my ( $db_event, $age ) = each( %$db_events ) ) {
-        if ( ! defined( $fs_events->{$db_event} ) ) {
-          my $Event = ZoneMinder::Event->find_one( Id=>$db_event );
-          if ( ! $Event ) {
-            Debug("Event $db_event is no longer in db.  Filter probably deleted it while we were auditing.");
-            next;
+    while ( my ( $db_event, $age ) = each( %$db_events ) ) {
+      if ( ! ($fs_events and defined( $fs_events->{$db_event} ) ) ) {
+        Debug("Don't have an fs event for $db_event");
+        my $Event = ZoneMinder::Event->find_one( Id=>$db_event );
+        if ( ! $Event ) {
+          Debug("Event $db_event is no longer in db.  Filter probably deleted it while we were auditing.");
+          next;
+        }
+        Debug("Event $db_event is not in fs. Should have been at ".$Event->Path());
+        if ( $Event->Archived() ) {
+          Warning("Event $$Event{Id} is Archived. Taking no further action on it.");
+          next;
+        }
+        if ( ! $Event->StartTime() ) {
+          Info("Event $$Event{Id} has no start time.  deleting it.");
+          if ( confirm() ) {
+            $Event->delete();
+            $cleaned = 1;
           }
-          Debug("Event $db_event is not in fs. Should have been at ".$Event->Path());
-          if ( $Event->Archived() ) {
-            Warning("Event $$Event{Id} is Archived. Taking no further action on it.");
-            next;
-          }
-          if ( ! $Event->StartTime() ) {
-            Info("Event $$Event{Id} has no start time.  deleting it.");
+          next;
+        } 
+        if ( ! $Event->EndTime() ) {
+          if ( $age > $Config{ZM_AUDIT_MIN_AGE} ) {
+            Info("Event $$Event{Id} has no end time and is $age seconds old.  deleting it.");
             if ( confirm() ) {
               $Event->delete();
               $cleaned = 1;
             }
             next;
-          } 
-          if ( ! $Event->EndTime() ) {
-            if ( $age > $Config{ZM_AUDIT_MIN_AGE} ) {
-              Info("Event $$Event{Id} has no end time and is $age seconds old.  deleting it.");
-              if ( confirm() ) {
-                $Event->delete();
-                $cleaned = 1;
-              }
-              next;
-            }
           }
-          if ( $Event->check_for_in_filesystem() ) {
-            Debug("Database event $$Event{Id} apparently exists at " . $Event->Path() );
-          } else {
-            if ( $age > $Config{ZM_AUDIT_MIN_AGE} ) {
-              aud_print( "Database event '$db_monitor/$db_event' does not exist at " . $Event->Path().' in filesystem, deleting' );
-              if ( confirm() ) {
-                $Event->delete();
-                $cleaned = 1;
-              }
-            } else {
-              aud_print( "Database event '".$Event->Path()." monitor:$db_monitor event:$db_event' does not exist in filesystem but too young to delete age: $age > MIN $Config{ZM_AUDIT_MIN_AGE}.\n" );
+        }
+        if ( $Event->check_for_in_filesystem() ) {
+          Debug("Database event $$Event{Id} apparently exists at " . $Event->Path() );
+        } else {
+          if ( $age > $Config{ZM_AUDIT_MIN_AGE} ) {
+            aud_print( "Database event '$db_monitor/$db_event' does not exist at " . $Event->Path().' in filesystem, deleting' );
+            if ( confirm() ) {
+              $Event->delete();
+              $cleaned = 1;
             }
-          } # end if exists in filesystem
-        } # end if ! in fs_events
-      } # foreach db_event
-      #} else {
-      #my $Monitor = new ZoneMinder::Monitor( $db_monitor );
-      #my $Storage = $Monitor->Storage();
-      #aud_print( "Database monitor '$db_monitor' does not exist in filesystem, should have been at ".$Storage->Path().'/'.$Monitor->Id()."\n" );
-#if ( confirm() )
-#{
-# We don't actually do this in case it's new
-#my $res = $deleteMonitorSth->execute( $db_monitor )
-#   or Fatal( "Can't execute: ".$deleteMonitorSth->errstr() );
-#$cleaned = 1;
-#}
-    }
+          } else {
+            aud_print( "Database event '".$Event->Path()." monitor:$db_monitor event:$db_event' does not exist in filesystem but too young to delete age: $age > MIN $Config{ZM_AUDIT_MIN_AGE}.\n" );
+          }
+        } # end if exists in filesystem
+      } else {
+        Debug("Found fs event for $db_event, $age at " . $$fs_events{$db_event}->Path());
+        my $Event = new ZoneMinder::Event( $db_event );
+        if ( ! $Event->check_for_in_filesystem() ) {
+          Warning("Not found at " . $Event->Path() );
+          if ( $$fs_events{$db_event}->Scheme() ne $Event->Scheme() ) {
+            Info("Updating scheme on event $$Event{Id} from $$Event{Scheme} to $$fs_events{$db_event}{Scheme}");
+            $Event->Scheme($$fs_events{$db_event}->Scheme());
+          } 
+          if ( $$fs_events{$db_event}->StorageId() != $Event->StorageId() ) {
+            Info("Updating storage area on event $$Event{Id} from $$Event{StorageId} to $$fs_events{$db_event}{StorageId}");
+            $Event->StorageId($$fs_events{$db_event}->StorageId());
+          }
+          $Event->save();
+        }
+      } # end if ! in fs_events
+    } # foreach db_event
   } # end foreach db_monitor
   if ( $cleaned ) {
     Debug("Have done some cleaning, restarting.");

From 5f81e9111f6e8e4b4ba2030e983babf3fb9a6bdf Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 9 Nov 2018 12:14:05 -0500
Subject: [PATCH 56/86] Add Scheme and SaveJPEGs to Event fields, and fix
 setting Scheme

---
 scripts/ZoneMinder/lib/ZoneMinder/Event.pm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
index d52c9829e..67cd850b9 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
@@ -70,6 +70,7 @@ $serial = $primary_key = 'Id';
   Frames
   AlarmFrames
   DefaultVideo
+  SaveJPEGs
   TotScore
   AvgScore
   MaxScore
@@ -83,6 +84,7 @@ $serial = $primary_key = 'Id';
   StateId
   Orientation
   DiskSpace
+  Scheme
 );
 
 use POSIX;
@@ -168,6 +170,8 @@ sub Path {
 
 sub Scheme {
   my $self = shift;
+  $$self{Scheme} = shift if @_;
+
   if ( ! $$self{Scheme} ) {
     if ( $$self{RelativePath} ) {
       if ( $$self{RelativePath} =~ /^\d+\/\d{4}\-\d{2}\-\d{2}\/\d+$/ ) {

From 1e98ecb5957a69970da2cadcea1412e0a217e220 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 9 Nov 2018 12:14:39 -0500
Subject: [PATCH 57/86] Sort keys in to_string

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

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Object.pm b/scripts/ZoneMinder/lib/ZoneMinder/Object.pm
index 8c28028a0..f779255b2 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Object.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Object.pm
@@ -456,7 +456,7 @@ sub transform {
 sub to_string {
   my $type = ref($_[0]);
   my $fields = eval '\%'.$type.'::fields';
-  return $type . ': '. join(' ' , map { $_[0]{$_} ? "$_ => $_[0]{$_}" : () } keys %$fields );
+  return $type . ': '. join(' ' , map { $_[0]{$_} ? "$_ => $_[0]{$_}" : () } sort { $a cmp $b } keys %$fields );
 }
 
 1;

From 967fe14b22dde95e07f7041655af2b2239aff218 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 11 Nov 2018 10:17:32 -0500
Subject: [PATCH 58/86] Add ability to update incorrect starttime.

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

diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in
index 66dab7ae4..ebd56229e 100644
--- a/scripts/zmaudit.pl.in
+++ b/scripts/zmaudit.pl.in
@@ -509,10 +509,10 @@ MAIN: while( $loop ) {
   # Foreach database monitor and it's list of events.
   while ( my ( $db_monitor, $db_events ) = each(%$db_monitors) ) {
     Debug("Checking db events for monitor $db_monitor");
-      if ( ! $db_events ) {
-        Debug("Skipping db events for $db_monitor because there are none");
-        next;
-      }
+    if ( ! $db_events ) {
+      Debug("Skipping db events for $db_monitor because there are none");
+      next;
+    }
 
     # If we found the monitor in the file system
     my $fs_events = $fs_monitors->{$db_monitor};
@@ -565,7 +565,9 @@ MAIN: while( $loop ) {
         Debug("Found fs event for $db_event, $age at " . $$fs_events{$db_event}->Path());
         my $Event = new ZoneMinder::Event( $db_event );
         if ( ! $Event->check_for_in_filesystem() ) {
-          Warning("Not found at " . $Event->Path() );
+          Warning("Not found at " . $Event->Path() . ' was found at ' . $$fs_events{$db_event}->Path() );
+          Warning($Event->to_string());
+          Warning($$fs_events{$db_event}->to_string());
           if ( $$fs_events{$db_event}->Scheme() ne $Event->Scheme() ) {
             Info("Updating scheme on event $$Event{Id} from $$Event{Scheme} to $$fs_events{$db_event}{Scheme}");
             $Event->Scheme($$fs_events{$db_event}->Scheme());
@@ -574,6 +576,15 @@ MAIN: while( $loop ) {
             Info("Updating storage area on event $$Event{Id} from $$Event{StorageId} to $$fs_events{$db_event}{StorageId}");
             $Event->StorageId($$fs_events{$db_event}->StorageId());
           }
+          if ( $$fs_events{$db_event}->StartTime() ne $Event->StartTime() ) {
+            if ( $$Event{Scheme} eq 'Deep' ) {
+              Info("Updating StartTime on event $$Event{Id} from $$Event{StartTime} to $$fs_events{$db_event}{StartTime}");
+              $Event->StartTime($$fs_events{$db_event}->StartTime());
+            } else {
+            }
+            $Event->save();
+          }
+
           $Event->save();
         }
       } # end if ! in fs_events
@@ -962,7 +973,7 @@ sub delete_empty_directories {
     return;
   }
   my @contents = map { ( $_ eq '.' or $_ eq '..' ) ? () : $_ } readdir( $DIR );
-  Debug("delete_empty_directories $_[0] has " . @contents .' entries:' . ( @contents <= 2 ? join(',',@contents) : '' ));
+  #Debug("delete_empty_directories $_[0] has " . @contents .' entries:' . ( @contents <= 2 ? join(',',@contents) : '' ));
   my @dirs = map { -d $_[0].'/'.$_ ? $_ : () } @contents;
   if ( @dirs ) {
     Debug("Have " . @dirs . " dirs");

From 246765ced975e4b5c4ef120c185c0bed91deb511 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sun, 11 Nov 2018 16:23:19 -0500
Subject: [PATCH 59/86] Add tooltip for sorting monitors

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

diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index 46575ffa0..1ebf49136 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -324,7 +324,7 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
 ?>
             <td class="colMark">
               <input type="checkbox" name="markMids[]" value="<?php echo $monitor['Id'] ?>" onclick="setButtonStates( this )"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/>
-              <span class="glyphicon glyphicon-sort"></span>
+              <span class="glyphicon glyphicon-sort" title="Click and drag to change order"></span>
             </td>
 <?php
   }

From 4a56a405b7ceba7bc3249b269fa7df79c5a43b46 Mon Sep 17 00:00:00 2001
From: rafidashab <39053108+rafidashab@users.noreply.github.com>
Date: Mon, 12 Nov 2018 06:18:13 -0800
Subject: [PATCH 60/86] Fix typos in README file (#2301)

* Fix typos in README file

* Improve clarity in introduction doc

* Improved word selection

* Revision of the README file

* Finish editing introduction documentation
---
 README.md                       |  4 ++--
 docs/userguide/introduction.rst | 13 ++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 94774364c..b8e3f34fd 100644
--- a/README.md
+++ b/README.md
@@ -53,9 +53,9 @@ Lastly, if you desire to build a development snapshot from the master branch, it
 Please visit our [ReadtheDocs site](https://zoneminder.readthedocs.org/en/stable/installationguide/index.html) for distro specific instructions.
 
 ### Package Maintainers
-Many of the ZoneMinder configration variable default values are not configurable at build time through autotools or cmake.  A new tool called *zmeditconfigdata.sh* has been added to allow package maintainers to manipulate any variable stored in ConfigData.pm without patching the source. 
+Many of the ZoneMinder configuration variable default values are not configurable at build time through autotools or cmake.  A new tool called *zmeditconfigdata.sh* has been added to allow package maintainers to manipulate any variable stored in ConfigData.pm without patching the source. 
 
-For example, let's say I have created a new ZoneMinder package that contains the cambozola javascript file.  However, by default cambozola support is turned off.  To fix that, add this to the pacakging script:
+For example, let's say I have created a new ZoneMinder package that contains the cambozola javascript file.  However, by default cambozola support is turned off.  To fix that, add this to the packaging script:
 ```bash
 ./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes
 ```
diff --git a/docs/userguide/introduction.rst b/docs/userguide/introduction.rst
index 8da67a5e9..2d9985eb1 100644
--- a/docs/userguide/introduction.rst
+++ b/docs/userguide/introduction.rst
@@ -1,15 +1,14 @@
 Introduction
 ============
 
-Welcome to ZoneMinder, the all-in-one Linux GPL'd security camera solution.
+Welcome to ZoneMinder, the all-in-one security camera solution for Linux with GPL License.
 
-Most commercial "security systems" are designed as a monitoring system that also records.  Recording quality can vary from bad to unusable, locating the relevant video can range from challenging to impractical, and exporting can often only be done with the manual present.  ZoneMinder was designed primarily to record, and allow easy searches and exporting.  Recordings are of the best possible quality, easy to filter and find, and simple to export using any system with a web browser.  It also monitors.
+Commercial "security systems" are often designed as a monitoring system with little attention to recording quality. In such a system, locating and exporting relevant video can be challenging and often requires extensive human intervention. ZoneMinder was designed to provide the best possible record quality while allowing easy searching, filtering and exporting of security footage. 
 
-ZoneMinder is designed around a series of independent components that only function when necessary limiting any wasted resource and maximising the efficiency of your machine. A fairly ancient Pentium II PC should be able to track one camera per device at up to 25 frames per second with this dropping by half approximately for each additional camera on the same device. Additional cameras on other devices do not interact so can maintain this frame rate. Even monitoring several cameras still will not overload the CPU as frame processing is designed to synchronise with capture and not stall it.
+ZoneMinder is designed around a series of independent components that only function when necessary, limiting any wasted resource and maximising the efficiency of your machine. An outdated Pentium II PC can have multiple recording devices connected to it, and it is able to track one camera per device at up to 25 frames per second, which drops by approximately half for each additional camera on the same device. Additional cameras on devices that do not interact with other devices can maintain the 25 frame rate per second. Monitoring several cameras will not overload the CPU as frame processing is designed to synchronise with capture.
 
-As well as being fast ZoneMinder is designed to be friendly and even more than that, actually useful. As well as the fast video interface core it also comes with a user friendly and comprehensive PHP based web interface allowing you to control and monitor your cameras from home, at work, on the road, or even a web enabled cell phone. It supports variable web capabilities based on available bandwidth. The web interface also allows you to view events that your cameras have captured and archive them or review them time and again, or delete the ones you no longer wish to keep. The web pages directly interact with the core daemons ensuring full co-operation at all times. ZoneMinder can even be installed as a system service ensuring it is right there if your computer has to reboot for any reason.
+A fast video interface core, a user-friendly and comprehensive PHP based web interface allows ZoneMinder to be efficient, friendly and most importantly useful. You can control and monitor your cameras from home, at work, on the road, or a web-enabled cell phone. It supports variable web capabilities based on available bandwidth. The web interface also allows you to view events that your cameras have captured, which can be archived, reviewed or deleted. The web application directly interacts with the core daemons ensuring full co-operation at all times. ZoneMinder can also be installed as a system service to reboot a system remotely.
 
-The core of ZoneMinder is the capture and analysis of images and there is a highly configurable set of parameters that allow you to ensure that you can eliminate false positives whilst ensuring that anything you don't want to miss will be captured and saved. ZoneMinder allows you to define a set of 'zones' for each camera of varying sensitivity and functionality. This allows you to eliminate regions that you don't wish to track or define areas that will alarm if various thresholds are exceeded in conjunction with other zones.
-
-ZoneMinder is free, but if you do find it useful then please feel free to visit http://www.zoneminder.com/donate.html and help to fund future improvements to ZoneMinder.
+The core of ZoneMinder is the capture and analysis of images and a highly configurable set of parameters that eliminate false positives whilst ensuring minimum loss of footage. For example, you can define a set of 'zones' for each camera of varying sensitivity and functionality. This eliminates zones that you don't wish to track or define areas that will alarm if various thresholds are exceeded in conjunction with other zones. 
 
+ZoneMinder is free under GPL License, but if you do find it useful, then please feel free to visit http://www.zoneminder.com/donate.html and help us fund our future improvements.

From a95a012fa5dbe9da7b126d04be46f941c1d7f96d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 12 Nov 2018 11:56:18 -0500
Subject: [PATCH 61/86] fix #2302

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

diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index 2e1e55691..8ff0a0a64 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -2110,6 +2110,7 @@ Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zones, Purpose purpose) {
   Camera *camera = 0;
   if ( type == "Local" ) {
 
+#if ZM_HAS_V4L
     int extras = (deinterlacing>>24)&0xff;
 
     camera = new LocalCamera(
@@ -2132,6 +2133,9 @@ Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zones, Purpose purpose) {
         record_audio,
         extras
         );
+#else
+    Fatal("ZoneMinder not built with Local Camera support");
+#endif
   } else if ( type == "Remote" ) {
     if ( protocol == "http" ) {
       camera = new RemoteCameraHttp(

From d76d6bb9d13bcbbb98adb35122c0cda2d859e938 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 12 Nov 2018 15:09:15 -0500
Subject: [PATCH 62/86] include overlay.js when viewing the log, so that export
 works

---
 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 7847e37c7..b21157607 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -192,7 +192,7 @@ echo output_link_if_exists( array(
   <script src="<?php echo cache_bust($skinJsFile) ?>"></script>
   <script src="js/logger.js"></script>
 <?php 
-  if ($basename == 'watch') {
+  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>

From abeafe9ba6c26bfc44c8f7123e2fe073d2007a4d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 12 Nov 2018 15:43:03 -0500
Subject: [PATCH 63/86] fix log export.  minTime and maxTime were being cleared
 by the regexp to detect sub second time.  Also use ZM_DIR_EXPORTS instead of
 ZM_PATH_SWAP

---
 web/ajax/log.php | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/web/ajax/log.php b/web/ajax/log.php
index f0703f871..fca79fda4 100644
--- a/web/ajax/log.php
+++ b/web/ajax/log.php
@@ -164,14 +164,23 @@ switch ( $_REQUEST['task'] ) {
     $where = array();
     $values = array();
     if ( $minTime ) {
-      preg_match('/(.+)(\.\d+)/', $minTime, $matches);
-      $minTime = strtotime($matches[1]).$matches[2];
+      Logger::Debug("MinTime: $minTime");
+      if ( preg_match('/(.+)(\.\d+)/', $minTime, $matches) ) {
+        # This handles sub second precision
+        $minTime = strtotime($matches[1]).$matches[2];
+        Logger::Debug("MinTime: $minTime");
+      } else {
+        $minTime = strtotime($minTime);
+      }
       $where[] = 'TimeKey >= ?';
       $values[] = $minTime;
     }
     if ( $maxTime ) {
-      preg_match('/(.+)(\.\d+)/', $maxTime, $matches);
-      $maxTime = strtotime($matches[1]).$matches[2];
+      if ( preg_match('/(.+)(\.\d+)/', $maxTime, $matches) ) {
+        $maxTime = strtotime($matches[1]).$matches[2];
+      } else {
+        $maxTime = strtotime($maxTime);
+      }
       $where[] = 'TimeKey <= ?';
       $values[] = $maxTime;
     }
@@ -209,8 +218,15 @@ switch ( $_REQUEST['task'] ) {
     }
     $exportKey = substr(md5(rand()),0,8);
     $exportFile = "zm-log.$exportExt";
-    $exportPath = ZM_PATH_SWAP."/zm-log-$exportKey.$exportExt";
-    if ( !($exportFP = fopen( $exportPath, "w" )) )
+    if ( ! file_exists(ZM_DIR_EXPORTS) ) {
+      Logger::Debug('Creating ' . ZM_DIR_EXPORTS);
+      if ( ! mkdir(ZM_DIR_EXPORTS) ) {
+        Fatal("Can't create exports dir at '".ZM_DIR_EXPORTS."'");
+      }
+    }
+    $exportPath = ZM_DIR_EXPORTS."/zm-log-$exportKey.$exportExt";
+    Logger::Debug("Exporting to $exportPath");
+    if ( !($exportFP = fopen($exportPath, 'w')) )
       Fatal("Unable to open log export file $exportPath");
     $logs = array();
     foreach ( dbFetchAll($sql, NULL, $values) as $log ) {
@@ -218,6 +234,8 @@ switch ( $_REQUEST['task'] ) {
       $log['Server'] = ( $log['ServerId'] and isset($servers_by_Id[$log['ServerId']]) ) ? $servers_by_Id[$log['ServerId']]->Name() : '';
       $logs[] = $log;
     }
+    Logger::Debug(count($logs)." lines being exported by $sql " . implode(',',$values));
+
   switch( $format ) {
     case 'text' :
     {
@@ -390,7 +408,7 @@ switch ( $_REQUEST['task'] ) {
     }
 
     $exportFile = "zm-log.$exportExt";
-    $exportPath = ZM_PATH_SWAP."/zm-log-$exportKey.$exportExt";
+    $exportPath = ZM_DIR_EXPORTS."/zm-log-$exportKey.$exportExt";
 
     header('Pragma: public');
     header('Expires: 0');

From 993da131f1b07940da5f8b91260d10cabe3eef6b Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@fedora29.home.connortechnology.com>
Date: Tue, 13 Nov 2018 10:29:19 -0500
Subject: [PATCH 64/86] tidy up and use Error instead of Carp::croak

---
 scripts/ZoneMinder/lib/ZoneMinder/Database.pm | 108 +++++++++++-------
 1 file changed, 69 insertions(+), 39 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
index b1fca1d16..dcc797bd4 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
@@ -41,17 +41,18 @@ our @ISA = qw(Exporter ZoneMinder::Base);
 # If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
 # will save memory.
 our %EXPORT_TAGS = (
-    'functions' => [ qw(
+    functions => [ qw(
       zmDbConnect
       zmDbDisconnect
       zmDbGetMonitors
       zmDbGetMonitor
       zmDbGetMonitorAndControl
+      zmDbDo
       ) ]
     );
 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();
 
@@ -66,8 +67,6 @@ our $VERSION = $ZoneMinder::Base::VERSION;
 use ZoneMinder::Logger qw(:all);
 use ZoneMinder::Config qw(:all);
 
-use Carp;
-
 our $dbh = undef;
 
 sub zmDbConnect {
@@ -93,7 +92,7 @@ sub zmDbConnect {
 
     my $sslOptions = '';
     if ( $Config{ZM_DB_SSL_CA_CERT} ) {
-      $sslOptions = ';'.join(';',
+      $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},
@@ -102,8 +101,9 @@ sub zmDbConnect {
     }
 
     eval {
-    $dbh = DBI->connect( 'DBI:mysql:database='.$Config{ZM_DB_NAME}
-        .$socket . $sslOptions . ($options?';'.join(';', map { $_.'='.$$options{$_} } keys %{$options} ) : '')
+      $dbh = DBI->connect(
+        'DBI:mysql:database='.$Config{ZM_DB_NAME}
+        .$socket . $sslOptions . ($options?join(';', '', map { $_.'='.$$options{$_} } keys %{$options} ) : '')
         , $Config{ZM_DB_USER}
         , $Config{ZM_DB_PASS}
         );
@@ -125,7 +125,7 @@ sub zmDbConnect {
 
 sub zmDbDisconnect {
   if ( defined( $dbh ) ) {
-    $dbh->disconnect();
+    $dbh->disconnect() or Error('Error disconnecting db? ' . $dbh->errstr());
     $dbh = undef;
   }
 }
@@ -141,7 +141,7 @@ sub zmDbGetMonitors {
   zmDbConnect();
 
   my $function = shift || DB_MON_ALL;
-  my $sql = "select * from Monitors";
+  my $sql = 'SELECT * FROM Monitors';
 
   if ( $function ) {
     if ( $function == DB_MON_CAPT ) {
@@ -156,26 +156,38 @@ sub zmDbGetMonitors {
       $sql .= " where Function = 'Nodect'";
     }
   }
-  my $sth = $dbh->prepare_cached( $sql )
-    or croak( "Can't prepare '$sql': ".$dbh->errstr() );
-  my $res = $sth->execute()
-    or croak( "Can't execute '$sql': ".$sth->errstr() );
+  my $sth = $dbh->prepare_cached( $sql );
+  if ( ! $sth ) {
+    Error("Can't prepare '$sql': ".$dbh->errstr());
+    return undef;
+  }
+  my $res = $sth->execute();
+  if ( ! $res ) {
+    Error("Can't execute '$sql': ".$sth->errstr());
+    return undef;
+  }
 
   my @monitors;
   while( my $monitor = $sth->fetchrow_hashref() ) {
     push( @monitors, $monitor );
   }
   $sth->finish();
-  return( \@monitors );
+  return \@monitors;
 }
 
 sub zmSQLExecute {
   my $sql = shift;
-  
-  my $sth = $dbh->prepare_cached( $sql )
-    or croak( "Can't prepare '$sql': ".$dbh->errstr() );
-  my $res = $sth->execute( @_ )
-    or croak( "Can't execute '$sql': ".$sth->errstr() );
+
+  my $sth = $dbh->prepare_cached( $sql );
+  if ( ! $sth ) {
+    Error("Can't prepare '$sql': ".$dbh->errstr());
+    return undef;
+  }
+  my $res = $sth->execute( @_ );
+  if ( ! $res ) {
+    Error("Can't execute '$sql': ".$sth->errstr());
+    return undef;
+  }
   return 1;
 }
 
@@ -185,17 +197,22 @@ sub zmDbGetMonitor {
   my $id = shift;
 
   if ( !defined($id) ) {
-    croak("Undefined id in zmDbgetMonitor");
+    Error('Undefined id in zmDbgetMonitor');
     return undef ;
   }
 
   my $sql = 'SELECT * FROM Monitors WHERE Id = ?';
-  my $sth = $dbh->prepare_cached($sql)
-    or croak("Can't prepare '$sql': ".$dbh->errstr());
-  my $res = $sth->execute($id)
-    or croak("Can't execute '$sql': ".$sth->errstr());
+  my $sth = $dbh->prepare_cached($sql);
+  if ( !$sth ) {
+    Error("Can't prepare '$sql': ".$dbh->errstr());
+    return undef;
+  }
+  my $res = $sth->execute($id);
+  if ( $res ) {
+    Error("Can't execute '$sql': ".$sth->errstr());
+    return undef;
+  }
   my $monitor = $sth->fetchrow_hashref();
-
   return $monitor;
 }
 
@@ -204,25 +221,28 @@ sub zmDbGetMonitorAndControl {
 
   my $id = shift;
 
-  return( undef ) if ( !defined($id) );
+  return undef if !defined($id);
 
-  my $sql = "SELECT C.*,M.*,C.Protocol
+  my $sql = 'SELECT C.*,M.*,C.Protocol
     FROM Monitors as M
     INNER JOIN Controls as C on (M.ControlId = C.Id)
-    WHERE M.Id = ?"
+    WHERE M.Id = ?'
     ;
-  my $sth = $dbh->prepare_cached( $sql )
-    or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-  my $res = $sth->execute( $id )
-    or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+  my $sth = $dbh->prepare_cached($sql);
+  if ( !$sth ) {
+    Error("Can't prepare '$sql': ".$dbh->errstr());
+    return undef;
+  }
+  my $res = $sth->execute( $id );
+  if ( !$res ) {
+    Error("Can't execute '$sql': ".$sth->errstr());
+    return undef;
+  }
   my $monitor = $sth->fetchrow_hashref();
-
-  return( $monitor );
+  return $monitor;
 }
 
 sub start_transaction {
-	#my ( $caller, undef, $line ) = caller;
-#$openprint::log->debug("Called start_transaction from $caller : $line");
 	my $d = shift;
 	$d = $dbh if ! $d;
 	my $ac = $d->{AutoCommit};
@@ -231,20 +251,29 @@ sub start_transaction {
 } # end sub start_transaction
 
 sub end_transaction {
-	#my ( $caller, undef, $line ) = caller;
-  #$openprint::log->debug("Called end_transaction from $caller : $line");
   my ( $d, $ac ) = @_;
   if ( ! defined $ac ) {
     Error("Undefined ac");
   }
 	$d = $dbh if ! $d;
 	if ( $ac ) {
-		#$log->debug("Committing");
 		$d->commit();
 	} # end if
 	$d->{AutoCommit} = $ac;
 } # end sub end_transaction
 
+# Basic execution of $dbh->do but with some pretty logging of the sql on error.
+# Returns 1 on success, 0 on error
+sub zmDbDo {
+	my $sql = shift;
+	if ( ! $dbh->do($sql, undef, @_) ) {
+		$sql =~ s/\?/'%s'/;
+		Error(sprintf("Failed $sql :", @_).$dbh->errstr());
+    return 0;
+	}
+  return 1;
+}
+
 1;
 __END__
 
@@ -266,6 +295,7 @@ zmDbDisconnect
 zmDbGetMonitors
 zmDbGetMonitor
 zmDbGetMonitorAndControl
+zmDbDo
 
 =head1 AUTHOR
 

From 31b0ed107d8209b5d4b178e5b3274217cf0a0f71 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 13 Nov 2018 14:02:44 -0500
Subject: [PATCH 65/86] remove epadding2, to restore the 64bit alignment of
 startup_time.  A proper fix instead of #2258

---
 scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in |  1 -
 src/zm_monitor.h                               | 11 ++++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
index 2529c8786..7c5292720 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
@@ -161,7 +161,6 @@ our $mem_data = {
     format           => { type=>'uint8', seq=>$mem_seq++ },
     imagesize        => { type=>'uint32', seq=>$mem_seq++ },
     epadding1        => { type=>'uint32', seq=>$mem_seq++ },
-    epadding2        => { type=>'uint32', seq=>$mem_seq++ },
     startup_time     => { type=>'time_t64', seq=>$mem_seq++ },
     last_write_time  => { type=>'time_t64', seq=>$mem_seq++ },
     last_read_time   => { type=>'time_t64', seq=>$mem_seq++ },
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index b98f5953f..d7be9555e 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -127,24 +127,25 @@ protected:
     uint8_t format;             /* +55   */
     uint32_t imagesize;         /* +56   */
     uint32_t epadding1;         /* +60   */
-    uint32_t epadding2;         /* +64   */
     /* 
      ** This keeps 32bit time_t and 64bit time_t identical and compatible as long as time is before 2038.
      ** Shared memory layout should be identical for both 32bit and 64bit and is multiples of 16.
+     ** Because startup_time is 64bit it may be aligned to a 64bit boundary.  So it's offset SHOULD be a multiple 
+     ** of 8. Add or delete epadding's to achieve this.
      */  
-    union {                     /* +68   */
+    union {                     /* +64   */
       time_t startup_time;			/* When the zmc process started.  zmwatch uses this to see how long the process has been running without getting any images */
       uint64_t extrapad1;
     };
-    union {                     /* +76   */
+    union {                     /* +72  */
       time_t last_write_time;
       uint64_t extrapad2;
     };
-    union {            /* +84   */
+    union {            /* +80   */
       time_t last_read_time;
       uint64_t extrapad3;
     };
-    uint8_t control_state[256];  /* +92   */
+    uint8_t control_state[256];  /* +88   */
 
     char alarm_cause[256];
     

From 798bf68df1ed1fef1031cc9a3595aabc2576e246 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 13 Nov 2018 14:13:32 -0500
Subject: [PATCH 66/86] add function time_of_youngest_file to determine the
 youngest file in an event dir, so as to guess the starttime of the event.

---
 scripts/ZoneMinder/lib/ZoneMinder/Event.pm | 112 ++++++++++-----------
 1 file changed, 52 insertions(+), 60 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
index 67cd850b9..5916f8cdb 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
@@ -320,11 +320,11 @@ sub GenerateVideo {
     my $file_size = 'S'.$size;
     push( @file_parts, $file_size );
   }
-  my $video_file = "$video_name-".$file_parts[0]."-".$file_parts[1].".$format";
+  my $video_file = join('-', $video_name, $file_parts[0], $file_parts[1] ).'.'.$format;
   if ( $overwrite || !-s $video_file ) {
-    Info( "Creating video file $video_file for event $self->{Id}\n" );
+    Info("Creating video file $video_file for event $self->{Id}");
 
-    my $frame_rate = sprintf( "%.2f", $self->{Frames}/$self->{FullLength} );
+    my $frame_rate = sprintf('%.2f', $self->{Frames}/$self->{FullLength});
     if ( $rate ) {
       if ( $rate != 1.0 ) {
         $frame_rate *= $rate;
@@ -355,19 +355,19 @@ sub GenerateVideo {
       .$Config{ZM_FFMPEG_OUTPUT_OPTIONS}
     ." '$video_file' > ffmpeg.log 2>&1"
       ;
-    Debug( $command."\n" );
+    Debug($command);
     my $output = qx($command);
 
     my $status = $? >> 8;
     if ( $status ) {
-      Error( "Unable to generate video, check $event_path/ffmpeg.log for details");
+      Error("Unable to generate video, check $event_path/ffmpeg.log for details");
       return;
     }
 
-    Info( "Finished $video_file\n" );
+    Info("Finished $video_file");
     return $event_path.'/'.$video_file;
   } else {
-    Info( "Video file $video_file already exists for event $self->{Id}\n" );
+    Info("Video file $video_file already exists for event $self->{Id}");
     return $event_path.'/'.$video_file;
   }
   return;
@@ -375,57 +375,49 @@ sub GenerateVideo {
 
 sub delete {
   my $event = $_[0];
-  if ( ! ( $event->{Id} and $event->{MonitorId} and $event->{StartTime} ) ) {
-    my ( $caller, undef, $line ) = caller;
-    Warning("Can't Delete event $event->{Id} from Monitor $event->{MonitorId} StartTime:$event->{StartTime} from $caller:$line\n");
-    return;
-  }
-  if ( ! -e $event->Storage()->Path() ) {
-    Warning("Not deleting event because storage path doesn't exist");
-    return;
-  }
-  Info("Deleting event $event->{Id} from Monitor $event->{MonitorId} StartTime:$event->{StartTime}\n");
-  $ZoneMinder::Database::dbh->ping();
 
-  $ZoneMinder::Database::dbh->begin_work();
-  #$event->lock_and_load();
+  my $in_zmaudit = ( $0 =~ 'zmaudit.pl$');
 
-  {
-    my $sql = 'DELETE FROM Frames WHERE EventId=?';
-    my $sth = $ZoneMinder::Database::dbh->prepare_cached($sql)
-      or Error( "Can't prepare '$sql': ".$ZoneMinder::Database::dbh->errstr() );
-    my $res = $sth->execute($event->{Id})
-      or Error( "Can't execute '$sql': ".$sth->errstr() );
-    $sth->finish();
+  if ( ! $in_zmaudit ) {
+    if ( ! ( $event->{Id} and $event->{MonitorId} and $event->{StartTime} ) ) {
+      # zmfilter shouldn't delete anything in an odd situation. zmaudit will though.
+      my ( $caller, undef, $line ) = caller;
+      Warning("$0 Can't Delete event $event->{Id} from Monitor $event->{MonitorId} StartTime:".
+        (defined($event->{StartTime})?$event->{StartTime}:'undef')." from $caller:$line");
+      return;
+    }
+    if ( !($event->Storage()->Path() and -e $event->Storage()->Path()) ) {
+      Warning('Not deleting event because storage path doesn\'t exist');
+      return;
+    }
+  }
+
+  if ( $$event{Id} ) {
+    # Need to have an event Id if we are to delete from the db.  
+    Info("Deleting event $event->{Id} from Monitor $event->{MonitorId} StartTime:$event->{StartTime}");
+    $ZoneMinder::Database::dbh->ping();
+
+    $ZoneMinder::Database::dbh->begin_work();
+    #$event->lock_and_load();
+
+    ZoneMinder::Database::zmDbDo('DELETE FROM Frames WHERE EventId=?', $$event{Id});
+    if ( $ZoneMinder::Database::dbh->errstr() ) {
+      $ZoneMinder::Database::dbh->commit();
+      return;
+    }
+    ZoneMinder::Database::zmDbDo('DELETE FROM Stats WHERE EventId=?', $$event{Id});
     if ( $ZoneMinder::Database::dbh->errstr() ) {
       $ZoneMinder::Database::dbh->commit();
       return;
     }
 
-    $sql = 'DELETE FROM Stats WHERE EventId=?';
-    $sth = $ZoneMinder::Database::dbh->prepare_cached($sql)
-      or Error("Can't prepare '$sql': ".$ZoneMinder::Database::dbh->errstr());
-    $res = $sth->execute($event->{Id})
-      or Error("Can't execute '$sql': ".$sth->errstr());
-    $sth->finish();
-    if ( $ZoneMinder::Database::dbh->errstr() ) {
-      $ZoneMinder::Database::dbh->commit();
-      return;
-    }
+    # Do it individually to avoid locking up the table for new events
+    ZoneMinder::Database::zmDbDo('DELETE FROM Events WHERE Id=?', $$event{Id});
+    $ZoneMinder::Database::dbh->commit();
   }
 
-# Do it individually to avoid locking up the table for new events
-  {
-    my $sql = 'DELETE FROM Events WHERE Id=?';
-    my $sth = $ZoneMinder::Database::dbh->prepare_cached($sql)
-      or Error("Can't prepare '$sql': ".$ZoneMinder::Database::dbh->errstr());
-    my $res = $sth->execute($event->{Id})
-      or Error("Can't execute '$sql': ".$sth->errstr());
-    $sth->finish();
-  }
-  $ZoneMinder::Database::dbh->commit();
-  if ( (! $Config{ZM_OPT_FAST_DELETE}) and $event->Storage()->DoDelete() ) {
-    $event->delete_files( );
+  if ( ( $in_zmaudit or (!$Config{ZM_OPT_FAST_DELETE})) and $event->Storage()->DoDelete() ) {
+    $event->delete_files();
   } else {
     Debug('Not deleting event files from '.$event->Path().' for speed.');
   }
@@ -434,11 +426,11 @@ sub delete {
 sub delete_files {
   my $event = shift;
 
-  my $Storage = @_ ? $_[0] : new ZoneMinder::Storage( $$event{StorageId} );
+  my $Storage = @_ ? $_[0] : new ZoneMinder::Storage($$event{StorageId});
   my $storage_path = $Storage->Path();
 
   if ( ! $storage_path ) {
-    Error("Empty storage path when deleting files for event $$event{Id} with storage id $$event{StorageId} ");
+    Error("Empty storage path when deleting files for event $$event{Id} with storage id $$event{StorageId}");
     return;
   }
 
@@ -470,14 +462,14 @@ sub delete_files {
         if ( $bucket->delete_key($event_path) ) {
           $deleted = 1;
         } else {
-          Error("Failed to delete from S3:".$s3->err . ": " . $s3->errstr);
+          Error('Failed to delete from S3:'.$s3->err . ': ' . $s3->errstr);
         }
       };
       Error($@) if $@;
     }
-    if ( ! $deleted ) {
+    if ( !$deleted ) {
       my $command = "/bin/rm -rf $storage_path/$event_path";
-      ZoneMinder::General::executeShellCommand( $command );
+      ZoneMinder::General::executeShellCommand($command);
     }
   }
 
@@ -486,7 +478,7 @@ sub delete_files {
     Debug("Deleting link for Event $$event{Id} from $storage_path/$link_path.");
     if ( $link_path ) {
       ( $link_path ) = ( $link_path =~ /^(.*)$/ ); # De-taint
-        unlink($storage_path.'/'.$link_path) or Error( "Unable to unlink '$storage_path/$link_path': $!" );
+        unlink($storage_path.'/'.$link_path) or Error("Unable to unlink '$storage_path/$link_path': $!");
     }
   }
 } # end sub delete_files
@@ -506,7 +498,7 @@ sub check_for_in_filesystem {
   if ( $path ) {
     if ( -e $path ) {
       my @files = glob "$path/*";
-      Debug("Checking for files for event $_[0]{Id} at $path using glob $path/* found " . scalar @files . " files");
+      Debug("Checking for files for event $_[0]{Id} at $path using glob $path/* found " . scalar @files . ' files');
       return 1 if @files;
     } else {
       Warning("Path not found for Event $_[0]{Id} at $path");
@@ -577,7 +569,7 @@ sub MoveTo {
 
   if ( $$OldStorage{Id} != $$self{StorageId} ) {
     $ZoneMinder::Database::dbh->commit();
-    return "Old Storage path changed, Event has moved somewhere else.";
+    return 'Old Storage path changed, Event has moved somewhere else.';
   }
 
   $$self{Storage} = $NewStorage;
@@ -621,11 +613,11 @@ Debug("Files to move @files");
         Debug("Moving file $file to $NewPath");
         my $size = -s $file;
         if ( ! $size ) {
-          Info("Not moving file with 0 size");
+          Info('Not moving file with 0 size');
         }
         my $file_contents = File::Slurp::read_file($file);
         if ( ! $file_contents ) {
-          die "Loaded empty file, but it had a size. Giving up";
+          die 'Loaded empty file, but it had a size. Giving up';
         }
 
         my $filename = $event_path.'/'.File::Basename::basename($file);
@@ -633,7 +625,7 @@ Debug("Files to move @files");
           die "Unable to add key for $filename";
         }
         my $duration = time - $starttime;
-        Debug("PUT to S3 " . Number::Bytes::Human::format_bytes($size) . " in $duration seconds = " . Number::Bytes::Human::format_bytes($duration?$size/$duration:$size) . '/sec');
+        Debug('PUT to S3 ' . Number::Bytes::Human::format_bytes($size) . " in $duration seconds = " . Number::Bytes::Human::format_bytes($duration?$size/$duration:$size) . '/sec');
       } # end foreach file.
 
       $moved = 1;

From ca87936cd78e427511e57408460045b72ae0fef7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 13 Nov 2018 14:13:41 -0500
Subject: [PATCH 67/86] add function time_of_youngest_file to determine the
 youngest file in an event dir, so as to guess the starttime of the event.

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

diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in
index ebd56229e..7a5017fbd 100644
--- a/scripts/zmaudit.pl.in
+++ b/scripts/zmaudit.pl.in
@@ -384,7 +384,7 @@ 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." );
+        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" );
@@ -403,6 +403,7 @@ MAIN: while( $loop ) {
           $$Event{RelativePath} = $event_dir;
           $Event->MonitorId( $monitor_dir );
           $Event->StorageId( $Storage->Id() );
+          $Event->StartTime( POSIX::strftime('%Y-%m-%d %H:%M:%S', gmtime(time_of_youngest_file($$Event{Path})) ) );
         } # end foreach event
       }
 
@@ -428,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\n" );
+      Debug( 'Got '.int(keys(%$fs_events))." filesystem events for monitor $monitor_dir" );
 
       delete_empty_subdirs($$Storage{Path}.'/'.$monitor_dir);
     } # end foreach monitor
@@ -446,7 +447,7 @@ MAIN: while( $loop ) {
           next;
         }
         my @event_ids = keys %$fs_events;
-        Debug("Have " .scalar @event_ids . " events for monitor $monitor_id");
+        Debug('Have ' .scalar @event_ids . " events for monitor $monitor_id");
 
         foreach my $fs_event_id ( sort { $a <=> $b } keys %$fs_events ) {
 
@@ -490,7 +491,11 @@ MAIN: while( $loop ) {
       }
     }
   } # end foreach Storage Area
-  redo MAIN if ( $cleaned );
+
+  if ( $cleaned ) {
+    Debug("Events were deleted, starting again.");
+    redo MAIN;
+  }
 
   $cleaned = 0;
   my $deleteMonitorSql = 'DELETE LOW_PRIORITY FROM Monitors WHERE Id = ?';
@@ -531,7 +536,7 @@ MAIN: while( $loop ) {
           next;
         }
         if ( ! $Event->StartTime() ) {
-          Info("Event $$Event{Id} has no start time.  deleting it.");
+          Info("Event $$Event{Id} has no start time.");
           if ( confirm() ) {
             $Event->delete();
             $cleaned = 1;
@@ -577,10 +582,11 @@ MAIN: while( $loop ) {
             $Event->StorageId($$fs_events{$db_event}->StorageId());
           }
           if ( $$fs_events{$db_event}->StartTime() ne $Event->StartTime() ) {
+            Info("Updating StartTime on event $$Event{Id} from $$Event{StartTime} to $$fs_events{$db_event}{StartTime}");
             if ( $$Event{Scheme} eq 'Deep' ) {
-              Info("Updating StartTime on event $$Event{Id} from $$Event{StartTime} to $$fs_events{$db_event}{StartTime}");
               $Event->StartTime($$fs_events{$db_event}->StartTime());
             } else {
+              $Event->StartTime($$fs_events{$db_event}->StartTime());
             }
             $Event->save();
           }
@@ -994,6 +1000,25 @@ sub delete_empty_directories {
   } 
 } # end sub delete_empty_directories
 
+sub time_of_youngest_file {
+  my $dir = shift;
+
+  if ( ! opendir(DIR, $dir) ) {
+    Error("Can't open directory '$dir': $!");
+    return;
+  }
+  my $youngest = (stat($dir))[9];
+  Debug("stat of $dir is $youngest");
+  foreach my $file ( readdir( DIR ) ) {
+    next if $file =~ /^\./;
+    $_ = (stat($dir))[9];
+    $youngest = $_ if $_ and ( $_ < $youngest );
+    #Debug("stat of $dir is $_ < $youngest");
+  }
+  Debug("stat of $dir is $youngest");
+  return $youngest;
+} # end sub time_of_youngest_file
+
 1;
 __END__
 

From 5120c6f540a06c7c57ee77bad775c92ced7b466e Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 13 Nov 2018 18:13:55 -0500
Subject: [PATCH 68/86] remove compile warning by assigning AV_CODEC_NONE to
 the codec_id.

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

diff --git a/src/zm_rtsp.cpp b/src/zm_rtsp.cpp
index 897859435..703328e2e 100644
--- a/src/zm_rtsp.cpp
+++ b/src/zm_rtsp.cpp
@@ -388,7 +388,7 @@ int RtspThread::run() {
   std::string trackUrl = mUrl;
   std::string controlUrl;
   
-  _AVCODECID codecId;
+  _AVCODECID codecId = AV_CODEC_ID_NONE;
   
   if ( mFormatContext->nb_streams >= 1 ) {
     for ( unsigned int i = 0; i < mFormatContext->nb_streams; i++ ) {

From 3be31020b79fb3b84d8230f2781bef312cb89563 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 14 Nov 2018 15:54:01 -0500
Subject: [PATCH 69/86] Automatically add width to frames view when thumbnails
 are turned on.

---
 web/skins/classic/js/base.js            | 2 +-
 web/skins/classic/views/js/event.js     | 2 +-
 web/skins/classic/views/js/event.js.php | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/js/base.js b/web/skins/classic/js/base.js
index 9eb93ee77..fa59c8103 100644
--- a/web/skins/classic/js/base.js
+++ b/web/skins/classic/js/base.js
@@ -40,7 +40,7 @@ var popupSizes = {
     'export':       { 'width': 400, 'height': 340 },
     'filter':       { 'width': 900, 'height': 700 },
     'frame':        { 'addWidth': 32, 'minWidth': 384, 'addHeight': 200 },
-    'frames':       { 'width': 600, 'height': 600 },
+    'frames':       { 'addWidth': 600, 'addHeight': 600 },
     'function':     { 'width': 350, 'height': 260 },
     'group':        { 'width': 760, 'height': 600 },
     'groups':       { 'width': 540, 'height': 420 },
diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js
index e90016c1c..7f46936a9 100644
--- a/web/skins/classic/views/js/event.js
+++ b/web/skins/classic/views/js/event.js
@@ -887,7 +887,7 @@ function unarchiveEvent() {
 }
 
 function showEventFrames() {
-  createPopup( '?view=frames&eid='+eventData.Id, 'zmFrames', 'frames' );
+  createPopup( '?view=frames&eid='+eventData.Id, 'zmFrames', 'frames', WEB_LIST_THUMB_WIDTH, WEB_LIST_THUMB_HEIGHT );
 }
 
 function showStream() {
diff --git a/web/skins/classic/views/js/event.js.php b/web/skins/classic/views/js/event.js.php
index dbdc5c514..b1924a752 100644
--- a/web/skins/classic/views/js/event.js.php
+++ b/web/skins/classic/views/js/event.js.php
@@ -55,3 +55,5 @@ var streamMode = '<?php echo $streamMode ?>';
 //
 var deleteString = "<?php echo translate('Delete') ?>";
 var causeString = "<?php echo translate('AttrCause') ?>";
+var WEB_LIST_THUMB_WIDTH = '<?php echo ZM_WEB_LIST_THUMB_WIDTH ?>';
+var WEB_LIST_THUMB_HEIGHT = '<?php echo ZM_WEB_LIST_THUMB_HEIGHT ?>';

From 3a409b26aa897d5154ca6f211a1089ff0c6e88bb Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 14 Nov 2018 15:54:34 -0500
Subject: [PATCH 70/86] Use buttons instead of anchor tags for
 Prev/Next/FIrst/Last buttons

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

diff --git a/web/skins/classic/views/frame.php b/web/skins/classic/views/frame.php
index 2e6bfb7b8..931951056 100644
--- a/web/skins/classic/views/frame.php
+++ b/web/skins/classic/views/frame.php
@@ -18,7 +18,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canView( 'Events' ) ) {
+if ( !canView('Events') ) {
   $view = 'error';
   return;
 }
@@ -29,7 +29,7 @@ $eid = validInt($_REQUEST['eid']);
 if ( !empty($_REQUEST['fid']) )
   $fid = validInt($_REQUEST['fid']);
 
-$Event = new Event( $eid );
+$Event = new Event($eid);
 $Monitor = $Event->Monitor();
 
 if ( !empty($fid) ) {
@@ -39,7 +39,7 @@ if ( !empty($fid) ) {
 } else {
   $frame = dbFetchOne( 'SELECT * FROM Frames WHERE EventId = ? AND Score = ?', NULL, array( $eid, $Event->MaxScore() ) );
 }
-$Frame = new Frame( $frame );
+$Frame = new Frame($frame);
 
 $maxFid = $Event->Frames();
 
@@ -91,10 +91,10 @@ xhtmlHeaders(__FILE__, translate('Frame').' - '.$Event->Id()." - ".$Frame->Frame
         <?php if ( canEdit( 'Events' ) ) { ?><a href="?view=none&amp;action=delete&amp;markEid=<?php echo $Event->Id() ?>"><?php echo translate('Delete') ?></a><?php } ?>
         <a href="#" onclick="closeWindow(); return( false );"><?php echo translate('Close') ?></a>
       </div>
-      <div id="scaleControl"><label for="scale"><?php echo translate('Scale') ?></label><?php echo buildSelect( "scale", $scales, "changeScale();" ); ?></div>
-      <h2><?php echo translate('Frame') ?> <?php echo $Event->Id()."-".$Frame->FrameId()." (".$Frame->Score().")" ?></h2>
-       <input type="hidden" name="base_width" id="base_width" value="<?php echo $Event->Width(); ?>"/>
-       <input type="hidden" name="base_height" id="base_height" value="<?php echo $Event->Height(); ?>"/>
+      <div id="scaleControl"><label for="scale"><?php echo translate('Scale') ?></label><?php echo buildSelect('scale', $scales, 'changeScale();'); ?></div>
+      <h2><?php echo translate('Frame') ?> <?php echo $Event->Id().'-'.$Frame->FrameId().' ('.$Frame->Score().')' ?></h2>
+      <input type="hidden" name="base_width" id="base_width" value="<?php echo $Event->Width(); ?>"/>
+      <input type="hidden" name="base_height" id="base_height" value="<?php echo $Event->Height(); ?>"/>
     </form>
     </div>
     <div id="content">
@@ -109,11 +109,13 @@ xhtmlHeaders(__FILE__, translate('Frame').' - '.$Event->Id()." - ".$Frame->Frame
       </p>
       <p id="controls">
 <?php if ( $Frame->FrameId() > 1 ) { ?>
-        <a id="firstLink" href="?view=frame&amp;eid=<?php echo $Event->Id() ?>&amp;fid=<?php echo $firstFid ?>&amp;scale=<?php echo $scale ?>&amp;show=<?php echo $show ?>"><?php echo translate('First') ?></a>
-        <a id="prevLink" href="?view=frame&amp;eid=<?php echo $Event->Id() ?>&amp;fid=<?php echo $prevFid ?>&amp;scale=<?php echo $scale ?>&amp;show=<?php echo $show ?>"><?php echo translate('Prev') ?></a>
-<?php } if ( $Frame->FrameId() < $maxFid ) { ?>
-        <a id="nextLink" href="?view=frame&amp;eid=<?php echo $Event->Id() ?>&amp;fid=<?php echo $nextFid ?>&amp;scale=<?php echo $scale ?>&amp;show=<?php echo $show ?>"><?php echo translate('Next') ?></a>
-        <a id="lastLink" href="?view=frame&amp;eid=<?php echo $Event->Id() ?>&amp;fid=<?php echo $lastFid ?>&amp;scale=<?php echo $scale ?>&amp;show=<?php echo $show ?>"><?php echo translate('Last') ?></a>
+        <button type="button" id="firstLink" onclick="window.location='?view=frame&amp;eid=<?php echo $Event->Id() ?>&amp;fid=<?php echo $firstFid ?>&amp;scale=<?php echo $scale ?>&amp;show=<?php echo $show ?>';"><?php echo translate('First') ?></button>
+        <button type="button" id="prevLink" onclick="window.location='?view=frame&amp;eid=<?php echo $Event->Id() ?>&amp;fid=<?php echo $prevFid ?>&amp;scale=<?php echo $scale ?>&amp;show=<?php echo $show ?>';"><?php echo translate('Prev') ?></button>
+<?php
+      }
+      if ( $Frame->FrameId() < $maxFid ) { ?>
+        <button type="button" id="nextLink" onclick="window.location='?view=frame&amp;eid=<?php echo $Event->Id() ?>&amp;fid=<?php echo $nextFid ?>&amp;scale=<?php echo $scale ?>&amp;show=<?php echo $show ?>';"><?php echo translate('Next') ?></button>
+        <button type="button" id="lastLink" onclick="window.location='?view=frame&amp;eid=<?php echo $Event->Id() ?>&amp;fid=<?php echo $lastFid ?>&amp;scale=<?php echo $scale ?>&amp;show=<?php echo $show ?>';"><?php echo translate('Last') ?></button>
 <?php } ?>
       </p>
 <?php if (file_exists ($dImagePath)) { ?>

From aa8ac9c31c65ae857024fb7a46a7ce9e60de025c Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 14 Nov 2018 15:54:45 -0500
Subject: [PATCH 71/86] spaces and quotes

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

diff --git a/web/skins/classic/views/frames.php b/web/skins/classic/views/frames.php
index c50da5e7e..f27f004c3 100644
--- a/web/skins/classic/views/frames.php
+++ b/web/skins/classic/views/frames.php
@@ -18,11 +18,11 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canView( 'Events' ) ) {
+if ( !canView('Events') ) {
   $view = 'error';
   return;
 }
-require_once( 'includes/Frame.php' );
+require_once('includes/Frame.php');
 $Event = new Event( $_REQUEST['eid'] );
 
 $sql = 'SELECT *, unix_timestamp( TimeStamp ) AS UnixTimeStamp FROM Frames WHERE EventID = ? ORDER BY FrameId';
@@ -30,7 +30,7 @@ $frames = dbFetchAll( $sql, NULL, array( $_REQUEST['eid'] ) );
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, translate('Frames')." - ".$Event->Id() );
+xhtmlHeaders(__FILE__, translate('Frames').' - '.$Event->Id() );
 ?>
 <body>
   <div id="page">

From f2fc2348801a5c79b1858d9d027cf99e05f7317b Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Thu, 15 Nov 2018 08:26:54 -0600
Subject: [PATCH 72/86] rpm pkg - install zm php-fpm config in all cases for
 future nginx support

---
 distros/redhat/CMakeLists.txt  | 6 ++----
 distros/redhat/zoneminder.spec | 7 ++-----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/distros/redhat/CMakeLists.txt b/distros/redhat/CMakeLists.txt
index d940942c1..0b4938661 100644
--- a/distros/redhat/CMakeLists.txt
+++ b/distros/redhat/CMakeLists.txt
@@ -15,11 +15,11 @@ endif((NOT ZM_TARGET_DISTRO MATCHES "^fc") AND (ZM_WEB_USER STREQUAL "nginx"))
 
 # Configure the zoneminder service files
 configure_file(systemd/zoneminder.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.logrotate @ONLY)
+configure_file(nginx/zoneminder.php-fpm.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.php-fpm.conf @ONLY)
 if(ZM_WEB_USER STREQUAL "nginx")
     configure_file(nginx/zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY)
     configure_file(nginx/zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.conf @ONLY)
     configure_file(nginx/zoneminder.tmpfiles.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.tmpfiles @ONLY)
-    configure_file(nginx/zoneminder.php-fpm.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.php-fpm.conf @ONLY)
     configure_file(nginx/README.Fedora ${CMAKE_CURRENT_SOURCE_DIR}/readme/README COPYONLY)
 else(ZM_WEB_USER STREQUAL "nginx")
     configure_file(systemd/zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY)
@@ -55,10 +55,8 @@ install(FILES misc/redalert.wav DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INST
 # Install zoneminder service files
 install(FILES zoneminder.logrotate DESTINATION /etc/logrotate.d RENAME zoneminder PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
 install(FILES zoneminder.conf DESTINATION /etc/zm/www PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
+install(FILES zoneminder.php-fpm.conf DESTINATION /etc/zm/www PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
 
-if(ZM_WEB_USER STREQUAL "nginx")
-    install(FILES zoneminder.php-fpm.conf DESTINATION /etc/php-fpm.d PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ RENAME zoneminder.conf)
-endif(ZM_WEB_USER STREQUAL "nginx")
 
 install(FILES zoneminder.service DESTINATION /usr/lib/systemd/system PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
 install(FILES zoneminder.tmpfiles DESTINATION /usr/lib/tmpfiles.d RENAME zoneminder.conf PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index ecba0fb5a..f594635ae 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -264,13 +264,10 @@ EOF
 %config(noreplace) %attr(640,root,%{zmgid_final}) %{_sysconfdir}/zm/conf.d/*.conf
 %ghost %attr(640,root,%{zmgid_final}) %{_sysconfdir}/zm/conf.d/zmcustom.conf
 
-%config(noreplace) %attr(644,root,root) /etc/zm/www/zoneminder.conf
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/zm/www/zoneminder.conf
+%config(noreplace) %{_sysconfdir}/www/zoneminder.php-fpm.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/zoneminder
 
-%if 0%{?with_nginx}
-%config(noreplace) %{_sysconfdir}/php-fpm.d/zoneminder.conf
-%endif
-
 %{_tmpfilesdir}/zoneminder.conf
 %{_unitdir}/zoneminder.service
 %{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy

From 2f8c0654d5aab9bd2200cd63f29b1ce319d52564 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Thu, 15 Nov 2018 08:31:04 -0600
Subject: [PATCH 73/86] rpm pkg - fix for zm php-fpm config path

---
 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 f594635ae..27cc59ba9 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -265,7 +265,7 @@ EOF
 %ghost %attr(640,root,%{zmgid_final}) %{_sysconfdir}/zm/conf.d/zmcustom.conf
 
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/zm/www/zoneminder.conf
-%config(noreplace) %{_sysconfdir}/www/zoneminder.php-fpm.conf
+%config(noreplace) %{_sysconfdir}/zm/www/zoneminder.php-fpm.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/zoneminder
 
 %{_tmpfilesdir}/zoneminder.conf

From 9b46c92ac559348e31e4c965a4cb10272efb2e7f Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Thu, 15 Nov 2018 09:19:26 -0600
Subject: [PATCH 74/86] rpm pkg - add note to zm php-fpm config file

---
 distros/redhat/nginx/zoneminder.php-fpm.conf.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/distros/redhat/nginx/zoneminder.php-fpm.conf.in b/distros/redhat/nginx/zoneminder.php-fpm.conf.in
index ffc44bbe0..a4537b236 100644
--- a/distros/redhat/nginx/zoneminder.php-fpm.conf.in
+++ b/distros/redhat/nginx/zoneminder.php-fpm.conf.in
@@ -1,3 +1,5 @@
+; This config file is needed when using ZoneMinder with web servers other
+; than Apache. You can ignore this file if you are using Apache web server.
 ; Change the user and group of the default pool to the web server account
 [www]
 

From f72651da5a3ab9f20fb1a21c8c8356815f322f4e Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 15 Nov 2018 12:22:35 -0500
Subject: [PATCH 75/86] Add auth hash to ajax fps and status calls in zone edit

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

diff --git a/web/skins/classic/views/js/zone.js b/web/skins/classic/views/js/zone.js
index 6389e3ce9..bfcd91943 100644
--- a/web/skins/classic/views/js/zone.js
+++ b/web/skins/classic/views/js/zone.js
@@ -471,6 +471,8 @@ function setAlarmState( currentAlarmState ) {
 }
 
 var streamCmdParms = "view=request&request=stream&connkey="+connKey;
+if ( auth_hash )
+    streamCmdParms += '&auth='+auth_hash;
 var streamCmdReq = new Request.JSON( {
   url: monitorUrl,
   method: 'get',
@@ -552,6 +554,8 @@ function streamCmdQuery() {
 }
 
 var statusCmdParms = "view=request&request=status&entity=monitor&id="+monitorId+"&element[]=Status&element[]=FrameRate";
+if ( auth_hash )
+    statusCmdParms += '&auth='+auth_hash;
 var statusCmdReq = new Request.JSON( {
   url: monitorUrl,
   method: 'get',

From 415d43fafbde7151ac62053882414bd178318806 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 15 Nov 2018 12:23:52 -0500
Subject: [PATCH 76/86] Include Server Name when testing for CORS. Also be case
 insensitive.

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

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 7fe174470..53ea7e199 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -47,7 +47,11 @@ function CORSHeaders() {
       return;
     }
     foreach( $Servers as $Server ) {
-      if ( preg_match('/^(https?:\/\/)?'.preg_quote($Server->Hostname(),'/').'/', $_SERVER['HTTP_ORIGIN']) ) {
+      if (
+        preg_match('/^(https?:\/\/)?'.preg_quote($Server->Hostname(),'/').'/i', $_SERVER['HTTP_ORIGIN'])
+        or
+        preg_match('/^(https?:\/\/)?'.preg_quote($Server->Name(),'/').'/i', $_SERVER['HTTP_ORIGIN'])
+      ) {
         $valid = true;
         Logger::Debug("Setting Access-Controll-Allow-Origin from " . $_SERVER['HTTP_ORIGIN']);
         header('Access-Control-Allow-Origin: ' . $_SERVER['HTTP_ORIGIN']);

From 5c2e5d89ed5fbf394cac971e6ff86cb3070e5011 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Thu, 15 Nov 2018 19:53:45 -0600
Subject: [PATCH 77/86] fix gpl mailing address

This makes rpmlint & lintian complain less
---
 web/skins/classic/views/storage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/skins/classic/views/storage.php b/web/skins/classic/views/storage.php
index dafd7bb67..3aecdb042 100644
--- a/web/skins/classic/views/storage.php
+++ b/web/skins/classic/views/storage.php
@@ -15,7 +15,7 @@
 //
 // 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
 if ( !canEdit( 'System' ) ) {

From e5f2212a32bd9ccb32c793f12a8c3e7aae5d3925 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Thu, 15 Nov 2018 20:00:53 -0600
Subject: [PATCH 78/86] fix gpl mailing address

---
 scripts/ZoneMinder/lib/ZoneMinder/Control/IPCAMIOS.pm | 2 +-
 scripts/ZoneMinder/lib/ZoneMinder/Control/Reolink.pm  | 2 +-
 scripts/ZoneMinder/lib/ZoneMinder/Storage.pm          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/IPCAMIOS.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/IPCAMIOS.pm
index 8465ee472..ec3bbfc70 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/IPCAMIOS.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/IPCAMIOS.pm
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # ==========================================================================
 #
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Reolink.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Reolink.pm
index 370d463c3..7a2f72fc6 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Reolink.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Reolink.pm
@@ -16,7 +16,7 @@
 #
 # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # ==========================================================================
 #
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Storage.pm b/scripts/ZoneMinder/lib/ZoneMinder/Storage.pm
index 134752594..1f7c1b9fe 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Storage.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Storage.pm
@@ -15,7 +15,7 @@
 #
 # 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #
 # ==========================================================================
 #

From 8df9e4c1ee23ebe2142bcaed101c567007539d60 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Thu, 15 Nov 2018 20:18:56 -0600
Subject: [PATCH 79/86] Update zoneminder.logrotate.in

---
 distros/redhat/systemd/zoneminder.logrotate.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/distros/redhat/systemd/zoneminder.logrotate.in b/distros/redhat/systemd/zoneminder.logrotate.in
index b4919eb5e..210a84c07 100644
--- a/distros/redhat/systemd/zoneminder.logrotate.in
+++ b/distros/redhat/systemd/zoneminder.logrotate.in
@@ -2,7 +2,11 @@
     missingok
     notifempty
     sharedscripts
+    delaycompress
+    compress
     postrotate
-        @BINDIR@/zmpkg.pl logrot 2> /dev/null > /dev/null || :
+        @BINDIR@/zmpkg.pl logrot > /dev/null 2>/dev/null || true
     endscript
+    daily
+    rotate 7
 }

From b353b625eb48751d0e1b6f72fe1f5440d8c7cccc Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Fri, 16 Nov 2018 10:40:39 -0600
Subject: [PATCH 80/86] rpm - configure the nginx config file in all cases

---
 distros/redhat/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/distros/redhat/CMakeLists.txt b/distros/redhat/CMakeLists.txt
index 0b4938661..37643cd89 100644
--- a/distros/redhat/CMakeLists.txt
+++ b/distros/redhat/CMakeLists.txt
@@ -16,9 +16,9 @@ endif((NOT ZM_TARGET_DISTRO MATCHES "^fc") AND (ZM_WEB_USER STREQUAL "nginx"))
 # Configure the zoneminder service files
 configure_file(systemd/zoneminder.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.logrotate @ONLY)
 configure_file(nginx/zoneminder.php-fpm.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.php-fpm.conf @ONLY)
+configure_file(nginx/zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.nginx.conf @ONLY)
 if(ZM_WEB_USER STREQUAL "nginx")
     configure_file(nginx/zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY)
-    configure_file(nginx/zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.conf @ONLY)
     configure_file(nginx/zoneminder.tmpfiles.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.tmpfiles @ONLY)
     configure_file(nginx/README.Fedora ${CMAKE_CURRENT_SOURCE_DIR}/readme/README COPYONLY)
 else(ZM_WEB_USER STREQUAL "nginx")
@@ -56,7 +56,7 @@ install(FILES misc/redalert.wav DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INST
 install(FILES zoneminder.logrotate DESTINATION /etc/logrotate.d RENAME zoneminder PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
 install(FILES zoneminder.conf DESTINATION /etc/zm/www PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
 install(FILES zoneminder.php-fpm.conf DESTINATION /etc/zm/www PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
-
+install(FILES zoneminder.nginx.conf DESTINATION /etc/zm/www PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
 
 install(FILES zoneminder.service DESTINATION /usr/lib/systemd/system PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
 install(FILES zoneminder.tmpfiles DESTINATION /usr/lib/tmpfiles.d RENAME zoneminder.conf PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)

From 713e810632b09c25ccd6838f0a832da48518a471 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Fri, 16 Nov 2018 17:08:23 -0600
Subject: [PATCH 81/86] Update ISSUE_TEMPLATE.md

---
 .github/ISSUE_TEMPLATE.md | 40 +++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 4e33ce4e0..512b5df1f 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,23 +1,43 @@
-You should only file an issue if you found a bug.  Feature and enhancement requests, general discussions and support questions should occur in one of the following areas:
+**THIS FORUM IS FOR BUG REPORTS ONLY**
+
+Do not post feature or enhancement requests, general discussions or support questions here.
+
+Feature and enhancement requests, general discussions and support questions should occur in one of the following areas:
 
 - The [ZoneMinder-Chat Slack channel](https://zoneminder-chat.herokuapp.com/)
 - The [ZoneMinder Forum](https://forums.zoneminder.com/)
 
-**Do not post feature or enhancement requests, general discussions or support questions here.**
-
 Docker related issues should be posted here: https://github.com/ZoneMinder/zmdockerfiles
 
-Make sure you are running the latest version of ZoneMinder before reporting an issue.
+In order to submit a bug report, please populate the field below. This is required.
 
-**ZoneMinder Version (`zmaudit.pl -v`):**
+**Describe Your Environment**
+- Version of ZoneMinder [release version, development version, or commit]
+- How you installed ZoneMinder [e.g. PPA, RPMFusion, from-source, etc]
+- Full name and version of OS
 
-**Are you using a development snapshot / git checkout?  If so, what is the latest commit? (`git rev-parse HEAD`):**
+**If the issue concerns a camera**
+- Make and Model
+- frame rate
+- resolution
+- ZoneMinder Source Type:
 
-**Linux Distribution and Version (`cat /etc/os-release` or `cat /etc/redhat-release`):**
+**Describe the bug**
+A clear and concise description of what the bug is.
 
-**If the issue concerns a camera, provide the make, model, frame rate, resolution and ZoneMinder Source Type:**
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
 
-**Relevant log lines:**
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Debug Logs**
 ```
-log lines here
+
+<insert debug logs here, please make sure they are within the ``` quotes so they are formatted properly>
+
 ```

From 6883d5b532e08f88993b5c951784929a189a18f5 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Fri, 16 Nov 2018 17:11:05 -0600
Subject: [PATCH 82/86] Update ISSUE_TEMPLATE.md

---
 .github/ISSUE_TEMPLATE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 512b5df1f..f52716c2d 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -2,14 +2,14 @@
 
 Do not post feature or enhancement requests, general discussions or support questions here.
 
-Feature and enhancement requests, general discussions and support questions should occur in one of the following areas:
+Feature and enhancement requests, general discussions, and support questions should occur in one of the following areas:
 
 - The [ZoneMinder-Chat Slack channel](https://zoneminder-chat.herokuapp.com/)
 - The [ZoneMinder Forum](https://forums.zoneminder.com/)
 
 Docker related issues should be posted here: https://github.com/ZoneMinder/zmdockerfiles
 
-In order to submit a bug report, please populate the field below. This is required.
+In order to submit a bug report, please populate the fields below. This is required.
 
 **Describe Your Environment**
 - Version of ZoneMinder [release version, development version, or commit]

From 15e720d4f7782c8f2355736509c6b3fee080e716 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Fri, 16 Nov 2018 17:50:54 -0600
Subject: [PATCH 83/86] Create config.yml

---
 .github/config.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 .github/config.yml

diff --git a/.github/config.yml b/.github/config.yml
new file mode 100644
index 000000000..543a2c160
--- /dev/null
+++ b/.github/config.yml
@@ -0,0 +1,21 @@
+# Configuration for welcome - https://github.com/behaviorbot/welcome
+
+# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome
+
+# Comment to be posted to on first time issues
+newIssueWelcomeComment: >
+  Thanks for opening your first issue here! Just a reminder, this forum is for Bug Reports only. Be sure to follow the issue template!
+
+# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
+
+# Comment to be posted to on PRs from first time contributors in your repository
+#newPRWelcomeComment: >
+#  Thanks for opening this pull request! Please check out our contributing guidelines.
+
+# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge
+
+# Comment to be posted to on pull requests merged by a first time user
+#firstPRMergeComment: >
+#  Congrats on merging your first pull request! We here at behaviorbot are proud of you! 
+
+# It is recommend to include as many gifs and emojis as possible

From 21d311942fdf32b9a879e488a445cc472a8480c3 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Fri, 16 Nov 2018 17:54:24 -0600
Subject: [PATCH 84/86] Create no-response.yml

---
 .github/no-response.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .github/no-response.yml

diff --git a/.github/no-response.yml b/.github/no-response.yml
new file mode 100644
index 000000000..7e40c036f
--- /dev/null
+++ b/.github/no-response.yml
@@ -0,0 +1,13 @@
+# Configuration for probot-no-response - https://github.com/probot/no-response
+
+# Number of days of inactivity before an Issue is closed for lack of response
+daysUntilClose: 7
+# Label requiring a response
+responseRequiredLabel: more-information-needed
+# Comment to post when closing an Issue for lack of response. Set to `false` to disable
+closeComment: >
+  This issue has been automatically closed because there has been no response
+  to our request for more information from the original author. With only the
+  information that is currently in the issue, we don't have enough information
+  to take action. Please reach out if you have or find the answers we need so
+  that we can investigate further.

From b4f77077e9aeffec8b92f163eb29f3e325462989 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Fri, 16 Nov 2018 18:33:54 -0600
Subject: [PATCH 85/86] Update zmdc.pl.in

temporary fix to #2292
---
 scripts/zmdc.pl.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/zmdc.pl.in b/scripts/zmdc.pl.in
index ac83fa6d6..4b32b3a65 100644
--- a/scripts/zmdc.pl.in
+++ b/scripts/zmdc.pl.in
@@ -438,7 +438,7 @@ sub start {
 
     $dbh = zmDbConnect(1);
     # This logReinit is required.  Not sure why.
-    #logReinit();
+    logReinit();
 
     $process->{pid} = $cpid;
     $process->{started} = time();

From 87140ecdb59d60c2f845e082bf94fae5094da28f Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Sat, 17 Nov 2018 10:39:42 -0500
Subject: [PATCH 86/86] white space and quiet warning

---
 src/zm_event.cpp                 |  2 +-
 web/skins/classic/views/zone.php | 64 ++++++++++++++++----------------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index 8d3108b31..fbf5cf848 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -174,7 +174,7 @@ Event::Event(
         Error("Can't mkdir %s: %s", path, strerror(errno));
     }
   } else {
-    path_ptr += snprintf(path, sizeof(path), "/%" PRIu64, id);
+    snprintf(path, sizeof(path), "/%" PRIu64, id);
     if ( mkdir(path, 0755) ) {
       if ( errno != EEXIST )
         Error("Can't mkdir %s: %s", path, strerror(errno));
diff --git a/web/skins/classic/views/zone.php b/web/skins/classic/views/zone.php
index f6a763c19..6c04abf2f 100644
--- a/web/skins/classic/views/zone.php
+++ b/web/skins/classic/views/zone.php
@@ -62,39 +62,39 @@ $minY = 0;
 $maxY = $monitor->Height()-1;
 
 if ( !isset($newZone) ) {
-    if ( $zid > 0 ) {
-        $zone = dbFetchOne( 'SELECT * FROM Zones WHERE MonitorId = ? AND Id=?', NULL, array( $monitor->Id(), $zid ) );
-    } else {
-        $zone = array(
-            'Id' => 0,
-            'Name' => translate('New'),
-            'Type'  =>  'Active',
-            'MonitorId' => $monitor->Id(),
-            'NumCoords' => 4,
-            'Coords' => sprintf( "%d,%d %d,%d, %d,%d %d,%d", $minX, $minY, $maxX, $minY, $maxX, $maxY, $minX, $maxY ),
-            'Area' => $monitor->Width() * $monitor->Height(),
-            'AlarmRGB' => 0xff0000,
-            'CheckMethod' => 'Blobs',
-            'MinPixelThreshold' => '',
-            'MaxPixelThreshold' => '',
-            'MinAlarmPixels' => '',
-            'MaxAlarmPixels' => '',
-            'FilterX' => '',
-            'FilterY' => '',
-            'MinFilterPixels' => '',
-            'MaxFilterPixels' => '',
-            'MinBlobPixels' => '',
-            'MaxBlobPixels' => '',
-            'MinBlobs' => '',
-            'MaxBlobs' => '',
-            'OverloadFrames' => '',
-            'ExtendAlarmFrames' => '',
-        );
-    }
-    $zone['Points'] = coordsToPoints( $zone['Coords'] );
-    $zone['AreaCoords'] = preg_replace( '/\s+/', ',', $zone['Coords'] );
+  if ( $zid > 0 ) {
+    $zone = dbFetchOne( 'SELECT * FROM Zones WHERE MonitorId = ? AND Id=?', NULL, array( $monitor->Id(), $zid ) );
+  } else {
+    $zone = array(
+      'Id' => 0,
+      'Name' => translate('New'),
+      'Type'  =>  'Active',
+      'MonitorId' => $monitor->Id(),
+      'NumCoords' => 4,
+      'Coords' => sprintf( "%d,%d %d,%d, %d,%d %d,%d", $minX, $minY, $maxX, $minY, $maxX, $maxY, $minX, $maxY ),
+      'Area' => $monitor->Width() * $monitor->Height(),
+      'AlarmRGB' => 0xff0000,
+      'CheckMethod' => 'Blobs',
+      'MinPixelThreshold' => '',
+      'MaxPixelThreshold' => '',
+      'MinAlarmPixels' => '',
+      'MaxAlarmPixels' => '',
+      'FilterX' => '',
+      'FilterY' => '',
+      'MinFilterPixels' => '',
+      'MaxFilterPixels' => '',
+      'MinBlobPixels' => '',
+      'MaxBlobPixels' => '',
+      'MinBlobs' => '',
+      'MaxBlobs' => '',
+      'OverloadFrames' => '',
+      'ExtendAlarmFrames' => '',
+    );
+  }
+  $zone['Points'] = coordsToPoints( $zone['Coords'] );
+  $zone['AreaCoords'] = preg_replace( '/\s+/', ',', $zone['Coords'] );
 
-    $newZone = $zone;
+  $newZone = $zone;
 } # end if new Zone
 
 # Ensure Zone fits within the limits of the Monitor