From 4dee84f799815b6e203420f460bdf77be22e83c8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@connortechnology.com>
Date: Fri, 26 May 2017 13:21:32 -0400
Subject: [PATCH 01/56] More updates from SA (#1895)

* merge from SA, includes StorageAreas support

* merge from SA.  Adds the ability to pass in additional options when connecting

* fix options, to remove indexes

* remove StorageAreas stuff

* put back AutoMessage and AutoVideo logic

* fixup docs, cleanup
---
 distros/debian/apache.conf                    |   4 +-
 scripts/ZoneMinder/lib/ZoneMinder/Database.pm |   8 +-
 scripts/ZoneMinder/lib/ZoneMinder/Filter.pm   |  69 ++------
 scripts/ZoneMinder/lib/ZoneMinder/Object.pm   | 150 ++++++++++++++++++
 4 files changed, 169 insertions(+), 62 deletions(-)
 create mode 100644 scripts/ZoneMinder/lib/ZoneMinder/Object.pm

diff --git a/distros/debian/apache.conf b/distros/debian/apache.conf
index 9a5e02690..b0a22c4d8 100644
--- a/distros/debian/apache.conf
+++ b/distros/debian/apache.conf
@@ -2,7 +2,7 @@ Alias /zm /usr/share/zoneminder/www
 
 <IfModule mod_fcgid.c>
   <Directory /usr/share/zoneminder/www>
-    Options +ExecCGI
+    Options -Indexes +ExecCGI
     AllowOverride All
     AddHandler fcgid-script .php
     FCGIWrapper /usr/bin/php5-cgi
@@ -12,7 +12,7 @@ Alias /zm /usr/share/zoneminder/www
 </IfModule>
 <IfModule mod_php5.c>
   <Directory /usr/share/zoneminder/www>
-    Options Indexes FollowSymLinks
+    Options -Indexes +FollowSymLinks
     <IfModule mod_dir.c>
       DirectoryIndex index.php
     </IfModule>
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
index 9e8e041c8..19374543e 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
@@ -75,9 +75,11 @@ sub zmDbConnect {
   if ( $force ) {
     zmDbDisconnect();
   }
-  if ( !defined( $dbh ) ) {
+  my $options = shift;
+
+  if ( ( ! defined( $dbh ) ) or ! $dbh->ping() ) {
+    my ( $host, $portOrSocket ) = ( $ZoneMinder::Config::Config{ZM_DB_HOST} =~ /^([^:]+)(?::(.+))?$/ );
     my $socket;
-    my ( $host, $portOrSocket ) = ( $Config{ZM_DB_HOST} =~ /^([^:]+)(?::(.+))?$/ );
 
     if ( defined($portOrSocket) ) {
       if ( $portOrSocket =~ /^\// ) {
@@ -89,7 +91,7 @@ sub zmDbConnect {
       $socket = ";host=".$Config{ZM_DB_HOST}; 
     }
     $dbh = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}
-        .$socket
+        .$socket . ($options?';'.join(';', map { $_.'='.$$options{$_} } keys %{$options} ) : '' )
         , $Config{ZM_DB_USER}
         , $Config{ZM_DB_PASS}
         );
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
index fe54e5a86..75d0e6ad4 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
@@ -28,31 +28,14 @@ use 5.006;
 use strict;
 use warnings;
 
-require Exporter;
 require ZoneMinder::Base;
 require Date::Manip;
 
-our @ISA = qw(Exporter ZoneMinder::Base);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration   use ZoneMinder ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our %EXPORT_TAGS = (
-    'functions' => [ qw(
-      ) ]
-    );
-push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
-
-our @EXPORT = qw();
-
-our $VERSION = $ZoneMinder::Base::VERSION;
+use parent qw(ZoneMinder::Object);
 
+use vars qw/ $table $primary_key /;
+$table = 'Filters';
+$primary_key = 'Id';
 # ==========================================================================
 #
 # General Utility Functions
@@ -62,40 +45,10 @@ our $VERSION = $ZoneMinder::Base::VERSION;
 use ZoneMinder::Config qw(:all);
 use ZoneMinder::Logger qw(:all);
 use ZoneMinder::Database qw(:all);
+require ZoneMinder::Server;
 
 use POSIX;
 
-sub new {
-  my ( $parent, $id, $data ) = @_;
-
-  my $self = {};
-  bless $self, $parent;
-  $$self{dbh} = $ZoneMinder::Database::dbh;
-#zmDbConnect();
-  if ( ( $$self{Id} = $id ) or $data ) {
-#$log->debug("loading $parent $id") if $debug or DEBUG_ALL;
-    $self->load( $data );
-  }
-  return $self;
-} # end sub new
-
-sub load {
-  my ( $self, $data ) = @_;
-  my $type = ref $self;
-  if ( ! $data ) {
-#$log->debug("Object::load Loading from db $type");
-    $data = $$self{dbh}->selectrow_hashref( 'SELECT * FROM Filter WHERE Id=?', {}, $$self{Id} );
-    if ( ! $data ) {
-      Error( "Failure to load Filter record for $$self{Id}: Reason: " . $$self{dbh}->errstr );
-    } else {
-      Debug( 3, "Loaded Filter $$self{Id}" );
-    } # end if
-  } # end if ! $data
-  if ( $data and %$data ) {
-    @$self{keys %$data} = values %$data;
-  } # end if
-} # end sub load
-
 sub Name {
   if ( @_ > 1 ) {
     $_[0]{Name} = $_[1];
@@ -142,7 +95,6 @@ sub find_one {
 
 sub Execute {
   my $self = $_[0];
-
   my $sql = $self->Sql();
 
   if ( $self->{HasDiskPercent} ) {
@@ -158,8 +110,9 @@ sub Execute {
     $sql =~ s/zmSystemLoad/$load/g;
   }
 
-  my $sth = $$self{dbh}->prepare_cached( $sql )
-    or Fatal( "Can't prepare '$sql': ".$$self{dbh}->errstr() );
+  Debug("Filter::Execute SQL ($sql)");
+  my $sth = $ZoneMinder::Database::dbh->prepare_cached( $sql )
+    or Fatal( "Can't prepare '$sql': ".$ZoneMinder::Database::dbh->errstr() );
   my $res = $sth->execute();
   if ( !$res ) {
     Error( "Can't execute filter '$sql', ignoring: ".$sth->errstr() );
@@ -171,6 +124,7 @@ sub Execute {
     push @results, $event;
   }
   $sth->finish();
+  Debug("Loaded " . @results . " events for filter $_[0]{Name} using query ($sql)");
   return @results;
 }
 
@@ -308,6 +262,8 @@ sub Sql {
     if ( $self->{AutoArchive} ) {
       push @auto_terms, "E.Archived = 0";
     }
+    # Don't do this, it prevents re-generation and concatenation.
+    # If the file already exists, then the video won't be re-recreated
     if ( $self->{AutoVideo} ) {
       push @auto_terms, "E.Videoed = 0";
     }
@@ -359,14 +315,13 @@ sub Sql {
     if ( $filter_expr->{limit} ) {
       $sql .= " limit 0,".$filter_expr->{limit};
     }
-    Debug( "SQL:$sql\n" );
     $self->{Sql} = $sql;
   } # end if has Sql
   return $self->{Sql};
 } # end sub Sql
 
 sub getDiskPercent {
-  my $command = "df .";
+  my $command = "df " . ($_[0] ? $_[0] : '.');
   my $df = qx( $command );
   my $space = -1;
   if ( $df =~ /\s(\d+)%/ms ) {
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Object.pm b/scripts/ZoneMinder/lib/ZoneMinder/Object.pm
new file mode 100644
index 000000000..b87e111a6
--- /dev/null
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Object.pm
@@ -0,0 +1,150 @@
+# ==========================================================================
+#
+# ZoneMinder Object Module, $Date$, $Revision$
+# Copyright (C) 2001-2017  ZoneMinder LLC
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# ==========================================================================
+#
+# This module contains the common definitions and functions used by the rest
+# of the ZoneMinder scripts
+#
+package ZoneMinder::Object;
+
+use 5.006;
+use strict;
+use warnings;
+
+require ZoneMinder::Base;
+
+our @ISA = qw(ZoneMinder::Base);
+
+# ==========================================================================
+#
+# General Utility Functions
+#
+# ==========================================================================
+
+use ZoneMinder::Config qw(:all);
+use ZoneMinder::Logger qw(:all);
+use ZoneMinder::Database qw(:all);
+
+use vars qw/ $AUTOLOAD /;
+
+sub new {
+  my ( $parent, $id, $data ) = @_;
+
+  my $self = {};
+  bless $self, $parent;
+  no strict 'refs';
+  my $primary_key = ${$parent.'::primary_key'};
+  if ( ! $primary_key ) {
+    Error( 'NO primary_key for type ' . $parent );
+    return;
+  } # end if
+  if ( ( $$self{$primary_key} = $id ) or $data ) {
+#$log->debug("loading $parent $id") if $debug or DEBUG_ALL;
+    $self->load( $data );
+  }
+  return $self;
+} # end sub new
+
+sub load {
+  my ( $self, $data ) = @_;
+  my $type = ref $self;
+  if ( ! $data ) {
+    no strict 'refs';
+    my $table = ${$type.'::table'};
+    if ( ! $table ) {
+      Error( 'NO table for type ' . $type );
+      return;
+    } # end if
+    my $primary_key = ${$type.'::primary_key'};
+    if ( ! $primary_key ) {
+      Error( 'NO primary_key for type ' . $type );
+      return;
+    } # end if
+
+    if ( ! $$self{$primary_key} ) { 
+      my ( $caller, undef, $line ) = caller;
+      Error( (ref $self) . "::load called without $primary_key from $caller:$line");
+    } else {
+#$log->debug("Object::load Loading from db $type");
+      Debug("Loading $type from $table WHERE $primary_key = $$self{$primary_key}");
+      $data = $ZoneMinder::Database::dbh->selectrow_hashref( "SELECT * FROM $table WHERE $primary_key=?", {}, $$self{$primary_key} );
+      if ( ! $data ) {
+        if ( $ZoneMinder::Database::dbh->errstr ) {
+          Error( "Failure to load Object record for $$self{$primary_key}: Reason: " . $ZoneMinder::Database::dbh->errstr );
+        } else {
+          Debug("No Results Loading $type from $table WHERE $primary_key = $$self{$primary_key}");
+        } # end if
+      } # end if
+    } # end if
+  } # end if ! $data
+  if ( $data and %$data ) {
+    @$self{keys %$data} = values %$data;
+  } # end if
+} # end sub load
+
+sub AUTOLOAD {
+  my ( $self, $newvalue ) = @_;
+  my $type = ref($_[0]);
+  my $name = $AUTOLOAD;
+  $name =~ s/.*://;
+  if ( @_ > 1 ) {
+    return $_[0]{$name} = $_[1];
+  }
+  return $_[0]{$name};
+}
+
+
+1;
+__END__
+
+# Below is stub documentation for your module. You'd better edit it!
+
+=head1 NAME
+
+ZoneMinder::Object
+
+=head1 SYNOPSIS
+
+  use parent ZoneMinder::Object;
+  
+  This package should likely not be used directly, as it is meant mainly to be a parent for all other ZoneMinder classes.
+
+=head1 DESCRIPTION
+
+  A base Object to act as parent for other ZoneMinder Objects.
+
+=head2 EXPORT
+
+None by default.
+
+=head1 AUTHOR
+
+Isaac Connor, E<lt>isaac@zoneminder.comE<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (C) 2001-2017  ZoneMinder LLC
+
+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.
+
+
+=cut

From 94151b031826274a0d985188a203696049385692 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 26 May 2017 14:30:21 -0400
Subject: [PATCH 02/56] put back changelog

---
 distros/ubuntu1204/changelog | 573 +++++++++++++++++++++++++++++++++++
 1 file changed, 573 insertions(+)
 create mode 100644 distros/ubuntu1204/changelog

diff --git a/distros/ubuntu1204/changelog b/distros/ubuntu1204/changelog
new file mode 100644
index 000000000..c7e86f69d
--- /dev/null
+++ b/distros/ubuntu1204/changelog
@@ -0,0 +1,573 @@
+zoneminder (1.28.1+1-vivid-SNAPSHOT2015081701) vivid; urgency=medium
+
+  * include api, switch to cmake build
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Mon, 17 Aug 2015 10:29:23 -0400
+
+
+zoneminder (1.28.1-8) unstable; urgency=medium
+
+  * Patchworks:
+    + New upstream "980-fix-image-size.patch".
+    + New "default_cgi-path.patch" to correct default ZM_PATH_ZMS.
+  * postinst: set "root" as group owner for "/var/log/zm" to silence
+    logrotate warnings.
+  * Minor correction to README.Debian.
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 16 Aug 2015 19:19:50 +1000
+
+zoneminder (1.28.1-7) unstable; urgency=medium
+
+  * Build-Depends += "cakephp (<< 3.0.0~)";
+    Zoneminder is not compatible with latest CakePHP.
+  * Handle conffile removal from maintscript.
+  * rules: build man pages reproducibly.
+  * gbp.conf: renamed old style config section [git-dch] to [dch].
+  * README
+    + added instructions to update owner of the "/etc/zm/zm.conf"
+      (Closes: #789327).
+    + zmupdate.pl needs CREATE rights.
+    + added note about required number of "fcgiwrap" workers.
+  * New upstream patch: "zmtrigger-plus.patch".
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Mon, 20 Jul 2015 16:30:15 +1000
+
+zoneminder (1.28.1-6) unstable; urgency=low
+
+  * New "zoneminder-doc" and "zoneminder-dbg" packages.
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 19 Apr 2015 14:50:41 +1000
+
+zoneminder (1.28.1-5) unstable; urgency=low
+
+  * Move handling of "/var/run/zm" and "/tmp/zm" from .service into .tmpfile.
+    Let dh_installinit do the job. Thanks, Andrew Bauer.
+  * Use dh_apache2 to install Apache conf file; remove old conf and symlink.
+  * Promote "libapache2-mod-php5 | php5-fpm" to Recommends.
+  * Build-Depends:
+    + dh-linktree
+    + cakephp (>= 2.6.3)
+    + libjs-jquery
+    + libjs-mootools
+  * Depends:
+    - libjs-jquery
+    - libjs-mootools
+  * Build-time replace bundled CakePHP with system one using "dh-linktree".
+  * Use "dh-linktree" to handle mootools and jquery symlinks.
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 19 Apr 2015 11:45:01 +1000
+
+zoneminder (1.28.1-4) unstable; urgency=low
+
+  * New patch to fix HTML export with USE_DEEP_STORAGE (closes: #723706).
+  * New "783.patch" to describe potential data loss in ZM_USE_DEEP_STORAGE.
+  * New patch to change default date format to region-neutral ISO notation
+    with time zone.
+  * Build sphinx documentation:
+    + Install "zoneminder.1" man page.
+    + Build-Depends += "python-sphinx | python3-sphinx"
+    + Added commented "zoneminder-doc" package.
+    + Added "docs.patch" to unlink distro-specific installation docs.
+  * rules:
+    + set ZM_CONTENTDIR, ZM_SOCKDIR and ZM_TMPDIR.
+    + remove mistakengly installed Perl module templates.
+  * Updated startup scripts to create ZM_TMPDIR.
+  * Hurd improvements:
+    + New patch to add PATH_MAX definitions.
+    + Build without MMAP support on Hurd.
+    + libsys-mmap-perl [!hurd-any].
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Mon, 06 Apr 2015 18:18:55 +1000
+
+zoneminder (1.28.1-3) unstable; urgency=low
+
+  * Updated Apache2 and nginx configuration templates to support CGI.
+  * Updated README.Debian to document cgi-bin setup.
+  * Removed "/usr/share/zoneminder/www/cgi-bin" symlink.
+  * Added "apache2.patch" to correct Apache2 site configuration example.
+  * control: Suggests += "fcgiwrap".
+  * rules: added dh_systemd overrides to prevent automatic service
+    activation and start.
+  * Added note about manual service activation to README.Debian
+    (Closes: #781733).
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Thu, 02 Apr 2015 23:20:20 +1100
+
+zoneminder (1.28.1-2) unstable; urgency=low
+
+  * Removed word "Linux" from short package description.
+  * Build-Depends: do not require "libv4l-dev" on Hurd i.e. [!hurd-any].
+  * Added run-time Perl Depends:
+     + libdbd-mysql-perl
+     + libimage-info-perl
+     + libmodule-load-conditional-perl
+     + libnet-sftp-foreign-perl
+     + liburi-encode-perl
+  * Prepare for package split: added commented "libzoneminder-perl"
+    and "zoneminder-dbg" packages to "debian/control".
+  * rules: do not install worthless ".packlist" file.
+  * Updated "libv4l1-videodev.h.patch" to fix v4lv1 detection in CMake.
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Thu, 02 Apr 2015 13:25:19 +1100
+
+zoneminder (1.28.1-1) unstable; urgency=low
+
+  [ Dmitry Smirnov <onlyjob@debian.org> ]
+  * New upstream release [February 2015].
+  * Upload to unstable.
+  * Disabled automatic database upgrades: post(inst|rm) scripts no longer
+    touch database or do unexpected stuff (Closes: #779254).
+    See README.Debian for details.
+  * Updated installation paths:
+    + /usr/share/zoneminder --> /usr/share/zoneminder/www
+    + /usr/lib/cgi-bin --> /usr/lib/zoneminder/cgi-bin
+  * Added logrotate config (Closes: #544826).
+    Thanks, Alberto Reyes.
+  * Native systemd service; "--with systemd" added to dh.
+  * Build with CMake instead of autoconf; rules clean-up.
+  * Build with all hardening.
+  * Build and install "zmupdate.pl.1" man page.
+  * Added nginx/php5-fpm configuration example.
+  * Install upstream "apache.conf" example.
+  * Described setup of Zoneminer web site and database in README.Debian.
+  * Install "/etc/zm/zm.conf" with tighter permissions.
+  * Added TODO.Debian.
+  * Added "debian/clean"; "debian/gbp.conf"; bug-presubj.
+  * Remove bundled Cake tests to take ~5 MB off big-usr-share.
+  * Standards-Version: 3.9.6; compat/debhelper to version 9.
+  * Vcs links to new git repository at collab-maint.
+  * Build-Depends:
+    + dh-systemd
+    + libgcrypt11-dev --> libgcrypt-dev
+    + libcurl4-gnutls-dev
+    + libvlc-dev
+    + policykit-1 (required by "zmsystemctl.pl")
+    - dh-autoreconf, autoconf, automake
+  * Depends:
+    - apache2
+    - libapache2-mod-php5 (moved to Suggests)
+    - libpcre3 (invalid)
+    - libmodule-load-perl (obsolete; replaced with perl-modules)
+    - libarchive-tar-perl (obsolete; replaced with perl-modules)
+    - mysql-server (moved to Recommends, Closes: #759504).
+    - php5
+    + libav-tools
+    + libjs-jquery  (replaces bundled component)
+    + libjs-mootool (replaces bundled component)
+    + libjson-any-perl (Closes: #690803).
+    + perl-modules (Closes: #745819).
+  * Recommends:
+    + apache2 | httpd
+    + mysql-server | virtual-mysql-server (Closes: #732874).
+  * Suggests:
+    + libapache2-mod-php5 | php5-fpm
+    + logrotate
+  * Refreshed, renamed and re-ordered patches; added DEP-3 headers.
+  * Removed "vendor_perl" patch (applied-upstream).
+  * New patches:
+    + cmake-fix-confpath.patch
+    + cmake-gnutls.patch
+    + cmake-nossl.patch
+    + cmake.patch
+    + format-hardening.patch
+    + pod_man_fixes.patch
+    + pod_name_fixes.patch
+    + pod_zmupdate-to-pod2usage.patch
+  * Lintianisation (incomplete):
+    - extra-license-file
+    - init.d-script-missing-lsb-description
+    - init.d-script-does-not-source-init-functions
+    - privacy-breach-generic
+    - package-contains-empty-directory
+    - manpage-has-errors-from-pod2man
+    - manpage-has-bad-whatis-entry
+    - quilt-patch-missing-description
+    - no-dep5-copyright
+  * Lintian-overrides:
+    + unusual-interpreter usr/bin/zmsystemctl.pl #!/usr/bin/pkexec
+    + script-not-executable usr/share/zoneminder/www/api/*
+    + script-with-language-extension usr/bin/*.pl
+    + source-is-missing web/tools/mootools/mootools-*-yc.js
+    + source-is-missing web/skins/*/js/jquery-1.4.2.min.js
+    + source-contains-prebuilt-javascript-object
+  * Renamed files in "debian".
+  * watch: dfsg repacksuffix and dversionmangle.
+  * "debian/copyright" to Copyright-Format-1.0.
+  * Set myself as new Maintainer (Closes: #760314).
+
+  [ Vagrant Cascadian <vagrant@debian.org> ]
+  * Removed obsolete DM-Upload-Allowed flag.
+  * Update debian/watch to use tarballs from github.
+  * Add Build-Depends on libgcrypt11-dev (Closes: #745819).
+  * Use canonical alioth Vcs-Hg URL.
+  * debian/control: Add Build-Depends: libpolkit-gobject-1-dev.
+  * Removed configure flag "--enable-crashtrace=no", which is no longer
+    present upstream.
+
+ -- Dmitry Smirnov <onlyjob@debian.org>  Tue, 31 Mar 2015 15:11:13 +1100
+
+zoneminder (1.26.5-3.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * Add libav10.patch and compile against libav10 (Closes: #739461)
+
+ -- Reinhard Tartler <siretart@tauware.de>  Wed, 19 Mar 2014 00:31:22 +0000
+
+zoneminder (1.26.5-3) unstable; urgency=low
+
+
+  * Previous release still didn't build on PPC - this has been corrected.
+    (Closes: #736516)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Tue, 4 Feb 2014 02:02:10 +1000
+
+zoneminder (1.26.5-2) unstable; urgency=low
+
+  * Remove dependency on ffmpeg
+    (Closes: #721161)
+
+  * Builds again on non-x86 target architectures.
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Thu, 23 Jan 2014 01:02:10 +1000
+
+zoneminder (1.26.5-1) unstable; urgency=low
+
+  * New upstream version
+    (Closes: #694131)
+  * Change Build-Depends on libgnutls-dev to libgnutls-openssl-dev
+    (Closes: #731560)
+ -- Peter Howard <pjh@northern-ridge.com.au>  Tue, 17 Dec 2013 01:02:10 +1000
+
+zoneminder (1.25.0-4) unstable; urgency=high
+
+  * Add CVE-2013-0232 patch
+    [SECURITY] CVE-2013-0232: Shell escape commands with untrusted content.
+    Thanks to James McCoy <jamessan@debian.org> (Closes: #698910)
+    Thanks also to Salvatore Bonaccorso <carnil@debian.org>
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Tue, 12 Jun 2013 12:02:10 +1000
+
+zoneminder (1.25.0-3) unstable; urgency=low
+
+  * debian/rules: Export CFLAGS, CPPFLAGS, CXXFLAGS and LDFLAGS, to ensure
+    hardening build flags are enabled.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Tue, 28 Aug 2012 12:10:03 -0700
+
+zoneminder (1.25.0-2) unstable; urgency=low
+
+  [ Vagrant Cascadian ]
+  * Add a patch to disable checking for updated versions by default, as
+    upgrades should happen through package management.
+  * Use dpkg-buildflags in debian/rules to set default compiler flags.
+  * Ensure zoneminder is stopped before starting (Closes: #657407).
+
+  [ Peter Howard ]
+  * Fix postinst to add permission for table creation during upgrade
+    (Closes: #657407).
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Thu, 23 Aug 2012 12:40:34 -0700
+
+zoneminder (1.25.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "ftbfs with GCC-4.7": add patch Fix-FTBFS-with-gcc-4.7 from Cyril
+    Brulebois: fix missing <unistd.h> includes.
+    (Closes: #667428)
+
+ -- gregor herrmann <gregoa@debian.org>  Sun, 13 May 2012 17:02:21 +0200
+
+zoneminder (1.25.0-1) unstable; urgency=low
+
+  * Fix typo in libv4l1-videodev.h patch that caused v4l1 support to be
+    dropped.
+  * Fail to build if version in postinst doesn't match upstream version.
+  * Add Build-Depends: libavdevice-dev to fix MPEG streaming (Closes: #515558).
+  * debian/rules: Convert to using debhelper overrides.
+  * Set debian/compat to 7.
+  * Simplify debian/watch file.
+  * Refresh debian/patches/use_libjs-mootools.
+  * Refresh debian/patches/libv4l1-videodev.h.
+  * Remove dependencies on php4 and related packages.
+  * Remove build-dependencies on libmysqlclient14-dev and
+    libmysqlclient15-dev.
+  * Update Build-Depends to use libjpeg-dev instead of libjpeg62-dev
+    (Closes: #647114).
+  * Add patch to fix build by testing for C headers rather than C++ headers.
+    Thanks to Ryan Niebur. (Closes: #654230)
+  * Add a patch to fix build problems caused by API changes in libav 0.8.
+    Thanks again to Ryan Niebur. (Closes: #654230)
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Mon, 16 Jan 2012 11:58:05 -0800
+
+zoneminder (1.24.4-1) unstable; urgency=low
+
+  [ Peter Howard ]
+  * Initial release of 1.24.4 (Closes: #634985).
+    - Fix 32/64-bit type declarations (Closes: #614404).
+  * Update patches.
+
+  [ Vagrant Cascadian ]
+  * Add patch to fix FTBFS by using libv4l1-videodev.h from libv4l-dev.
+    Thanks to Andreas Metzler for reporting the issue.
+    (Closes: #619813).
+  * Document adding the www-data user to the video group in README.Debian.
+    (Closes: #611324)
+  * Depend on libsys-mmap-perl to enable mapped memory support.
+    (Closes: #607331)
+  * Update libjs-mootools patch to use -nc variants (Closes: #635075).
+  * Depend on javascript-common, to ensure that /javascript is available in
+    the web server.
+  * Set the upstream version in postinst at build time.
+  * Use dh-autoreconf to properly clean up autogenerated files during build.
+  * Add Vcs-HG to debian/control.
+  * Add Build-Depends: libv4l-dev, libbz2-dev, dh-autoreconf, libsys-mmap-perl.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Sun, 24 Jul 2011 16:44:30 +0200
+
+zoneminder (1.24.2-9) unstable; urgency=low
+
+  * Apply patch from Ubuntu to fix FTBFS with ffmpeg 0.6:
+    - Add -D__STDC_CONSTANT_MACROS to CPPFLAGS (closes: 614080).
+  * Update Standards-Version to 3.9.1, no changes necessary.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Sun, 20 Feb 2011 23:43:02 -0800
+
+zoneminder (1.24.2-8) unstable; urgency=medium
+
+  [ Vagrant Cascadian ]
+  * Apply patch to fix V4L2 cameras without crop support (closes: #608790).
+    Thanks to piratebab.
+  * Add preinst script which aborts if dangerous symlinks exist.
+    (closes: #608793)
+
+  [ Peter Howard ]
+  * Added to README.Debian with info about images and events directories.
+    (closes: #608793)
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Sat, 15 Jan 2011 19:39:26 -0800
+
+zoneminder (1.24.2-7) unstable; urgency=medium
+
+  * Do not set ownership of /var/cache/zoneminder when upgrading, which fixes a
+    regression causing upgrades to take inordinately long with large
+    installations (closes: #597040).
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Fri, 17 Sep 2010 11:24:41 -0700
+
+zoneminder (1.24.2-6) unstable; urgency=low
+
+  * Only remove database on purge. This requires only creating the database if
+    it doesn't already exist, and upgrading the database only if the database
+    is an older version (closes: #497107).
+
+  * Do not prompt the user on database upgrades by using the --nointeractive
+    flag when calling zmupdate.pl from postinst (closes: #595902).
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Fri, 10 Sep 2010 10:06:06 -0700
+
+zoneminder (1.24.2-5) unstable; urgency=low
+
+  [ Peter Howard ]
+  * Add zip dependency
+    (closes: #494261)
+  * Add debian/watch file
+    (closes: #545552)
+  * Use packaged libjs-mootools
+    (closes: #585590)
+  * Miscellaneous cleanups
+
+  [ Vagrant Cascadian ]
+  * Add vagrant@debian.org as uploader
+  * Update Standards-Version to 3.9.0, no changes necessary.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Fri, 23 Jul 2010 18:12:50 -0500
+
+zoneminder (1.24.2-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "package removed, processes still running": apply patch to
+    debian/postinst by Vagrant Cascadian: use invoke-rc.d and run
+    mysql-related actions only when mysql is running (closes: #583648).
+
+ -- gregor herrmann <gregoa@debian.org>  Thu, 01 Jul 2010 19:47:10 +0200
+
+zoneminder (1.24.2-4) unstable; urgency=high
+  * Update init.d to list mysql dependency
+    (closes: #583505)
+  * Change dependency from libmime-perl to libmime-tools-perl
+    (closes: #585589)
+  * Problems in changelog format fixed
+    (closes: #585592)
+  * Fix debian-rules-ignores-make-clean-error
+    (closes: #585593)
+ -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 14 jun 2010 15:02:10 +1000
+
+zoneminder (1.24.2-3) unstable; urgency=high
+  * Changes symbols to build with libjpeg8
+    (closes: #565326, #568327)
+  * Note: location of all perl files should have been fixed in previous release
+    (closes: #553096)
+ -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 26 apr 2010 15:02:10 +1000
+
+zoneminder (1.24.2-2) unstable; urgency=high
+
+  * Remove custom perl parth from zmpkg.pl, fix location of manpages.
+    (closes: #551746, #553092)
+  * Fix GCC4.4 bug
+    (closes: #531717)
+  * Fix potential bug in postinst script
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 14 Nov 2009 15:02:10 +1000
+
+zoneminder (1.24.2-1) unstable; urgency=high
+
+  * Initial release of zoneminder 1.24.2
+ -- Peter Howard <pjh@northern-ridge.com.au>  Fri, 11 Sep 2009 07:02:50 +1000
+
+zoneminder (1.24.1-1) unstable; urgency=high
+
+  * Initial release of zoneminder 1.24.1, closing CVE-2008-3882,
+    CVE-2008-3881, CVE-2008-3880
+    (closes: #497640)
+  * Change syslog dependency to rsyslog.
+    (closes: #526918)
+  * Add missing perl dependency.
+  * Restore patch to disable "check for updates" by default.
+  * Removed spurious '$' in init script.
+    (closes: #486064)
+  * Change permission of zm.conf from 0600 to 0400 for CVE-2008-6755
+    (closes: #528252)
+ -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 16 May 2009 07:02:50 +1000
+
+zoneminder (1.23.3-4) unstable; urgency=high
+
+  * update to get it building with latest unstable. Thanks to waldi@debian.org
+    (closes: #517569)
+ -- Peter Howard <pjh@northern-ridge.com.au>  Thu, 16 Apr 2009 01:02:50 +1000
+
+zoneminder (1.23.3-3) unstable; urgency=high
+
+  * ffmpeg confirmed  working
+    (closes: #475145)
+  * Fix upgrade problem intrudouced in 1.23.3-1
+    (closes: #481637)
+  * Include libmime-lite-perl in dependencies
+    (closes: #486312)
+ -- Peter Howard <pjh@northern-ridge.com.au>  Thu, 18 Sep 2008 01:02:50 +1000
+
+zoneminder (1.23.3-2) unstable; urgency=high
+
+  * ffmpeg finally working?
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Wed, 13 Aug 2008 01:02:50 +1000
+
+zoneminder (1.23.3-1) unstable; urgency=high
+
+  * Initial version for 1.23.3 - security fix.
+    (closes: #479034)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Wed, 19 Mar 2008 01:02:50 +1000
+
+zoneminder (1.23.2-2) unstable; urgency=low
+
+  * Update to init.d
+    (closes: #468856)
+  * Add dependency on logging daemon
+    (closes: #471277)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Wed, 19 Mar 2008 01:02:50 +1000
+
+zoneminder (1.23.2-1) unstable; urgency=low
+
+  * Initial version for 1.23.2
+    (closes: #464152)
+  * Zoneminder 1.23.2 upstream includes fix for GCC 4.3
+    (closes: #454980)
+  * Includes ffmpeg patch by Alexander Kushnirenko <kushnir@uni-protvino.ru>
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 01 Mar 2008 16:02:50 +1000
+
+zoneminder (1.22.3-10) unstable; urgency=low
+
+  * Fix bug introduced in -9 where perl is put under /usr/local
+    (closes: #457507)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 24 Dec 2007 16:02:50 +1000
+
+zoneminder (1.22.3-9) unstable; urgency=low
+
+  * Starting zoneminder via init script now  invokes "zmfix -a"
+    (closes: #481637)
+  * Change apache2-mpm-prefork dependency to apache2
+  * Temp dir for export under /var/cache/zoneminder (but linked back to
+    /usr/share/zoneminder for now)
+  * Redo use of gnutls rather than openssl for md5 hashes
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 10 Dec 2007 16:02:50 +1000
+
+zoneminder (1.22.3-8) unstable; urgency=low
+
+  * Build now includes libpcre3
+    (closes: #437533)
+  * "Monitor Presets" patch now applied to package during build.
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 18 Aug 2007 14:35:23 +1000
+
+zoneminder (1.22.3-7) unstable; urgency=low
+
+  * Turn off debug trace and crash dump on build
+    (closes:#414857,#414891)
+  * Additional perl libraries added in dependencies
+    (closes:#416291)
+  * Change preferred PHP version from 4 to 5
+ -- Peter Howard <pjh@northern-ridge.com.au>  Sun, 29 Jul 2007 15:11:13 +1000
+
+zoneminder (1.22.3-6) unstable; urgency=low
+
+  * Removed a similar bash only statement from zmpkg.pl
+    (closes:414882)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 14 Apr 2007 11:46:56 +1000
+
+zoneminder (1.22.3-5) unstable; urgency=low
+
+  * Installs with "phone home" feature turned off by default, and permissions
+    on /etc/zm/zm.conf fixed (now the 0600 it s hould be)
+    (closes:415349)
+  * Removed "stupid bash-ism" on mysqld check in postinst file.
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Fri,  6 Apr 2007 15:50:00 +1000
+
+zoneminder (1.22.3-4) unstable; urgency=low
+
+  * Put libmysqlclient-15-dev in front of -14-dev so sbuild works
+    (closes: #414410)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 12 Mar 2007 11:38:56 +1100
+
+zoneminder (1.22.3-3) unstable; urgency=low
+
+  * Clean up of postinstall, postrm ; user "zm" definitely was a mistake
+  * Also in postinstall: check and start MySQL if it's not running.
+  * init.d script now checks if zoneminder isn't running and still returns 0
+    (which helps uninstalling)
+  * Addition of php5 dependency options as well as php4.
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 26 Feb 2007 10:40:52 +1100
+
+zoneminder (1.22.3-2) unstable; urgency=low
+
+  * Added zmuser in the mysql creation; this should fix the install problem
+    for people, but needs to be cleaned up (in -3)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Fri, 16 Feb 2007 14:16:03 +1100
+
+zoneminder (1.22.3-1) unstable; urgency=low
+
+  * Initial Version. (closes: #248393)
+  * Patched out use of openssl; uses gnutls instead for MD5 hashes.
+  * Removed MakeMaker-inserted Perl licensing (with authors permission) in
+    various scripts; replaced with GPL.
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Wed,  7 Feb 2007 14:09:01 +1100

From b23c45c9bcdf0b29910bd4a0845b956ecc6bddbf Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Mon, 29 May 2017 10:00:46 -0400
Subject: [PATCH 03/56] bump version to 1.31.0

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

diff --git a/version b/version
index 593d72103..34aae156b 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.30.4
+1.31.0

From 772df5b41b9d8710e41821484de55ce495070d36 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 30 May 2017 10:31:02 -0400
Subject: [PATCH 04/56] add a cast to quiet compiler warning

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

diff --git a/src/zma.cpp b/src/zma.cpp
index 4479b4f78..e59a0e65d 100644
--- a/src/zma.cpp
+++ b/src/zma.cpp
@@ -163,7 +163,7 @@ int main( int argc, char *argv[] )
       if ( analysis_update_delay )
       {
         cur_time = time( 0 );
-        if ( ( cur_time - last_analysis_update_time ) > analysis_update_delay )
+        if ( (unsigned int)( cur_time - last_analysis_update_time ) > analysis_update_delay )
         {
           analysis_rate = monitor->GetAnalysisRate();
           monitor->UpdateAdaptiveSkip();

From fe2155dd1a051872e1ded1560135ec9fa0ada395 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 30 May 2017 11:15:00 -0400
Subject: [PATCH 05/56] merges from SA

---
 web/includes/functions.php | 171 ++++++++++++++++++++++++++++---------
 1 file changed, 132 insertions(+), 39 deletions(-)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 06c3f6478..37dd33d91 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -27,13 +27,10 @@ if ( version_compare( phpversion(), '4.3.0', '<') ) {
   }
 }
 
-require_once( 'logger.php' );
-require_once( 'database.php' );
-
 function userLogin( $username, $password='', $passwordHashed=false ) {
   global $user, $cookies;
 
-  $sql = 'select * from Users where Enabled = 1';
+  $sql = 'SELECT * FROM Users WHERE Enabled = 1';
   $sql_values = NULL;
   if ( ZM_AUTH_TYPE == 'builtin' ) {
     if ( $passwordHashed ) {
@@ -323,9 +320,9 @@ function outputImageStream( $id, $src, $width, $height, $title='' ) {
 
 function getImageStream( $id, $src, $width, $height, $title='' ) {
   if ( canStreamIframe() ) {
-      return '<iframe id="'.$id.'" src="'.$src.'" alt="'. validHtmlStr($title) .'" width="'. validInt($width)." height=".validInt($height).'"/>';
+      return '<iframe id="'.$id.'" src="'.$src.'" alt="'. validHtmlStr($title) .'" '.($width? ' width="'. validInt($width).'"' : '').($height?' height="'.validInt($height).'"' : '' ).'/>';
   } else {
-      return '<img id="'.$id.'" src="'.$src.'" alt="'. validHtmlStr($title) .'" width="'. validInt($width) .'" height="'. validInt( $height ).'"/>';
+      return '<img id="'.$id.'" src="'.$src.'" alt="'. validHtmlStr($title) .'" style="'.($width? ' width:'. validInt($width) .'px;': '').($height ? ' height:'. validInt( $height ).'px;':'').'"/>';
   }
 }
 
@@ -357,17 +354,18 @@ function outputControlStream( $src, $width, $height, $monitor, $scale, $target )
 }
 
 function outputHelperStream( $id, $src, $width, $height, $title='' ) {
-?>
-  <applet id="<?php echo $id ?>" code="com.charliemouse.cambozola.Viewer"
-  archive="<?php echo ZM_PATH_CAMBOZOLA ?>"
-  align="middle"
-  width="<?php echo $width ?>"
-  height="<?php echo $height ?>"
-  title="<?php echo $title ?>">
-  <param name="accessories" value="none"/>
-  <param name="url" value="<?php echo $src ?>"/>
-  </applet>
-<?php
+  echo getHelperStream( $id, $src, $width, $height, $title );
+}
+function getHelperStream( $id, $src, $width, $height, $title='' ) {
+    return '<applet id="'.$id.'" code="com.charliemouse.cambozola.Viewer"
+    archive="'. ZM_PATH_CAMBOZOLA .'" 
+    align="middle"
+    width="'. $width .'"
+    height="'. $height .'"
+    title="'. $title .'">
+    <param name="accessories" value="none"/>
+    <param name="url" value="'. $src .'"/>
+    </applet>';
 }
 
 function outputImageStill( $id, $src, $width, $height, $title='' ) {
@@ -536,11 +534,11 @@ function makePopupLink( $url, $winName, $winSize, $label, $condition=1, $options
       $popupParms = "'".$url."', '".$winName."', '".$winSize."'";
 
     $string .= '<a href="'.$url.'" onclick="createPopup( '.$popupParms.' ); return( false );"'.($options?(' '.$options):'').'>';
+  } else {
+    $string .= '<a>';
   }
   $string .= $label;
-  if ( $condition ) {
-    $string .= '</a>';
-  }
+  $string .= '</a>';
   return( $string );
 }
 
@@ -852,15 +850,15 @@ function zmcControl( $monitor, $mode=false ) {
   if ( (!defined('ZM_SERVER_ID')) or ( ZM_SERVER_ID==$monitor['ServerId'] ) ) {
     $row = NULL;
     if ( $monitor['Type'] == 'Local' ) {
-      $row = dbFetchOne( "select count(if(Function!='None',1,NULL)) as ActiveCount from Monitors where Device = ?", NULL, array($monitor['Device']) );
+      $row = dbFetchOne( "SELECT count(if(Function!='None',1,NULL)) AS ActiveCount FROM Monitors WHERE Device = ?", NULL, array($monitor['Device']) );
       $zmcArgs = '-d '.$monitor['Device'];
     } else {
-      $row = dbFetchOne( "select count(if(Function!='None',1,NULL)) as ActiveCount from Monitors where Id = ?", NULL, array($monitor['Id']) );
+      $row = dbFetchOne( "SELECT count(if(Function!='None',1,NULL)) AS ActiveCount FROM Monitors WHERE Id = ?", NULL, array($monitor['Id']) );
       $zmcArgs = '-m '.$monitor['Id'];
     }
     $activeCount = $row['ActiveCount'];
 
-    if ( !$activeCount || $mode == 'stop' ) {
+    if ( (!$activeCount) || ($mode == 'stop') ) {
       daemonControl( 'stop', 'zmc', $zmcArgs );
     } else {
       if ( $mode == 'restart' ) {
@@ -868,6 +866,24 @@ function zmcControl( $monitor, $mode=false ) {
       }
       daemonControl( 'start', 'zmc', $zmcArgs );
     }
+  } else {
+    $Server = new Server( $monitor['ServerId'] );
+
+    #$url = $Server->Url() . '/zm/api/monitors.json?auth='.generateAuthHash( $_SESSION['remoteAddr'] );
+    $url = $Server->Url() . '/zm/api/monitors.json?user='.$_SESSION['username'].'&pass='.$_SESSION['passwordHash'];
+    $data = array('Monitor[Function]' => $monitor['Function'] );
+
+    // use key 'http' even if you send the request to https://...
+    $options = array(
+        'http' => array(
+          'header'  => "Content-type: application/x-www-form-urlencoded\r\n",
+          'method'  => 'POST',
+          'content' => http_build_query($data)
+          )
+        );
+    $context  = stream_context_create($options);
+    $result = file_get_contents($url, false, $context);
+    if ($result === FALSE) { /* Handle error */ }
   }
 }
 
@@ -917,9 +933,9 @@ function daemonStatus( $daemon, $args=false ) {
 
   initDaemonStatus();
 
-  $string = "$daemon";
+  $string = $daemon;
   if ( $args )
-    $string .= " $args";
+    $string .= ' ' . $args;
   return( strpos( $daemon_status, "'$string' running" ) !== false );
 }
 
@@ -1066,6 +1082,7 @@ function viewImagePath( $path, $querySep='&amp;' ) {
 }
 
 function createListThumbnail( $event, $overwrite=false ) {
+  # Load the frame with the highest score to use as a thumbnail
   if ( !($frame = dbFetchOne( "SELECT * FROM Frames WHERE EventId=? AND Score=? ORDER BY FrameId LIMIT 1", NULL, array( $event['Id'], $event['MaxScore'] ) )) )
     return( false );
 
@@ -1084,6 +1101,10 @@ function createListThumbnail( $event, $overwrite=false ) {
   }
 
   $imageData = getImageSrc( $event, $frame, $scale, false, $overwrite );
+  if ( ! $imageData ) {
+    return ( false );
+  }
+
   $thumbData = $frame;
   $thumbData['Path'] = $imageData['thumbPath'];
   $thumbData['Width'] = (int)$thumbWidth;
@@ -1788,6 +1809,33 @@ function coordsToPoints( $coords ) {
   return( $points );
 }
 
+function limitPoints( &$points, $min_x, $min_y, $max_x, $max_y ) {
+  foreach ( $points as &$point ) {
+    if ( $point['x'] < $min_x ) {
+      Logger::Debug('Limiting point x'.$point['x'].' to min_x ' . $min_x );
+      $point['x'] = $min_x;
+    } else if ( $point['x'] > $max_x ) {
+      Logger::Debug('Limiting point x'.$point['x'].' to max_x ' . $max_x );
+      $point['x'] = $max_x;
+    }
+    if ( $point['y'] < $min_y ) {
+      Logger::Debug('Limiting point y'.$point['y'].' to min_y ' . $min_y );
+      $point['y'] = $min_y;
+    } else if ( $point['y'] > $max_y ) {
+      Logger::Debug('Limiting point y'.$point['y'].' to max_y ' . $max_y );
+      $point['y'] = $max_y;
+    }
+  } // end foreach point
+} // end function limitPoints( $points, $min_x, $min_y, $max_x, $max_y )
+
+function scalePoints( &$points, $scale ) {
+  foreach ( $points as &$point ) {
+    $point['x'] = reScale( $point['x'], $scale );
+    $point['y'] = reScale( $point['y'], $scale );
+  }
+}
+
+
 function getLanguages() {
   $langs = array();
   foreach ( glob('lang/*_*.php') as $file ) {
@@ -2133,25 +2181,64 @@ function validHtmlStr( $input ) {
   return( htmlspecialchars( $input, ENT_QUOTES ) );
 }
 
-function getStreamHTML( $monitor, $scale=100 ) {
+function getStreamHTML( $monitor, $options = array() ) {
+
+  if ( isset($options['scale']) ) {
+    $options['width'] = reScale( $monitor->Width(), $options['scale'] );
+    $options['height'] = reScale( $monitor->Height(), $options['scale'] );
+  }
+  if ( ! isset($options['mode'] ) ) {
+    $options['mode'] = 'stream';
+  }
+  $options['maxfps'] = ZM_WEB_VIDEO_MAXFPS;
+  if ( $monitor->StreamReplayBuffer() )
+    $options['buffer'] = $monitor->StreamReplayBuffer();
+
 //FIXME, the width and height of the image need to be scaled.
     if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT ) {
-        $streamSrc = $monitor->getStreamSrc( array( 'mode=mpeg', 'scale='.$scale, 'bitrate='.ZM_WEB_VIDEO_BITRATE, 'maxfps='.ZM_WEB_VIDEO_MAXFPS, 'format='.ZM_MPEG_LIVE_FORMAT ) );
-        return getVideoStream( 'liveStream', $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), ZM_MPEG_LIVE_FORMAT, $monitor->Name() );
-    } else if ( canStream() ) {
-        $streamSrc = $monitor->getStreamSrc( array( 'mode=jpeg', 'scale='.$scale, 'maxfps='.ZM_WEB_VIDEO_MAXFPS, 'buffer='.$monitor->StreamReplayBuffer() ) );
-        if ( canStreamNative() ) {
-            return getImageStream( 'liveStream', $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() );
-        } elseif ( canStreamApplet() ) {
-            return getHelperStream( 'liveStream', $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() );
-        }
-    } else {
-        $streamSrc = $monitor->getStreamSrc( array( 'mode=single', 'scale='.$scale ) );
-        Info( 'The system has fallen back to single jpeg mode for streaming. Consider enabling Cambozola or upgrading the client browser.');
-        return getImageStill( 'liveStream', $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() );
+        $streamSrc = $monitor->getStreamSrc( array( 'mode'=>'mpeg', 'scale'=>$scale, 'bitrate'=>ZM_WEB_VIDEO_BITRATE, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'format'=>ZM_MPEG_LIVE_FORMAT ) );
+         return getVideoStream( 'liveStream'.$monitor->Id(), $streamSrc, $options, ZM_MPEG_LIVE_FORMAT, $monitor->Name() );
+ } else if ( $options['mode'] == 'stream' and canStream() ) {
+    $options['mode'] = 'jpeg';
+    $streamSrc = $monitor->getStreamSrc( $options );
+
+    if ( canStreamNative() )
+      return getImageStream( 'liveStream'.$monitor->Id(), $streamSrc,
+          ( isset($options['width']) ? $options['width'] : NULL ),
+          ( isset($options['height']) ? $options['height'] : NULL ),
+          $monitor->Name()
+          );
+    elseif ( canStreamApplet() )
+      return getHelperStream( 'liveStream'.$monitor->Id(), $streamSrc,
+          ( isset($options['width']) ? $options['width'] : NULL ),
+          ( isset($options['height']) ? $options['height'] : NULL ),
+          $monitor->Name()
+          );
+  } else {
+    $streamSrc = $monitor->getStreamSrc( $options );
+    if ( $mode == 'stream' ) {
+      Info( 'The system has fallen back to single jpeg mode for streaming. Consider enabling Cambozola or upgrading the client browser.' );
     }
+    return getImageStill( 'liveStream'.$monitor->Id(), $streamSrc,
+          ( isset($options['width']) ? $options['width'] : NULL ),
+          ( isset($options['height']) ? $options['height'] : NULL ),
+          $monitor->Name()
+        );
+  }
 } // end function getStreamHTML
 
+function getStreamMode( ) {
+  $streamMode = '';
+  if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT ) {
+    $streamMode = 'mpeg';
+  } elseif ( canStream() ) {
+    $streamMode = 'jpeg';
+  } else {
+    $streamMode = 'single';
+    Info( 'The system has fallen back to single jpeg mode for streaming. Consider enabling Cambozola or upgrading the client browser.' );
+  }
+} // end function getStreamMode
+
 function folder_size($dir) {
     $size = 0;
     foreach (glob(rtrim($dir, '/').'/*', GLOB_NOSORT) as $each) {
@@ -2160,6 +2247,12 @@ function folder_size($dir) {
     return $size;
 } // end function folder_size
 
+function human_filesize($bytes, $decimals = 2) {
+  $sz = 'BKMGTP';
+  $factor = floor((strlen($bytes) - 1) / 3);
+  return sprintf("%.{$decimals}f", $bytes / pow(1024, $factor)) . @$sz[$factor];
+}
+
 function csrf_startup() {
     csrf_conf('rewrite-js', 'includes/csrf/csrf-magic.js');
 }

From 3062fe43f3a8781ec408f455c74ddcf71a043071 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 30 May 2017 11:25:25 -0400
Subject: [PATCH 06/56] revert csrf on login page.  csrf needs to be off in
 order for zmNinja to work

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

diff --git a/web/index.php b/web/index.php
index 515175a66..c2b17c061 100644
--- a/web/index.php
+++ b/web/index.php
@@ -177,7 +177,7 @@ isset($view) || $view = NULL;
 isset($request) || $request = NULL;
 isset($action) || $action = NULL;
 
-if ( ZM_ENABLE_CSRF_MAGIC ) {
+if ( ZM_ENABLE_CSRF_MAGIC && $action != 'login' ) {
     Logger::Debug("Calling csrf_check with the following values: \$request = \"$request\", \$view = \"$view\", \$action = \"$action\"");
     csrf_check();
 }

From f88abfcb4ddedc8e53504661ee8a26b67965dcc5 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 30 May 2017 11:26:57 -0400
Subject: [PATCH 07/56] the liveStream element now has the monitorId appended
 to it, to be consistent with montage so we can reuse code

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

diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index e3d904b1f..c380e22a6 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -31,7 +31,7 @@ function changeScale() {
   Cookie.write( 'zmWatchScale'+monitorId, scale, { duration: 10*365 } );
 
   /*Stream could be an applet so can't use moo tools*/
-  var streamImg = document.getElementById('liveStream');
+  var streamImg = document.getElementById('liveStream'+monitorId);
   if ( streamImg ) {
     streamImg.style.width = newWidth + "px";
     streamImg.style.height = newHeight + "px";
@@ -146,14 +146,14 @@ function getStreamCmdResponse( respObj, respText ) {
           streamCmdSlowRev( false );
         else
           streamCmdFastRev( false );
-      }
+      } // rate
     } else {
       $('modeValue').set( 'text', "Live" );
       $('rate').addClass( 'hidden' );
       $('delay').addClass( 'hidden' );
       $('level').addClass( 'hidden' );
       streamCmdPlay( false );
-    }
+    } // end if paused or delayed
     $('zoomValue').set( 'text', streamStatus.zoom );
     if ( streamStatus.zoom == "1.0" )
       setButtonState( $('zoomOutBtn'), 'unavail' );

From 59d00b20b13312fea40d088a008719b69bb39bde Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 30 May 2017 11:35:52 -0400
Subject: [PATCH 08/56] fix fetchImage

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

diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index c380e22a6..0a9863b3c 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -538,13 +538,8 @@ function controlCmdImage( x, y ) {
     fetchImage.pass( $('imageFeed').getElement('img') ).delay( 1000 );
 }
 
-var tempImage = null;
 function fetchImage( streamImage ) {
-  var now = new Date();
-  if ( !tempImage )
-    tempImage = new Element( 'img' );
-  tempImage.setProperty( 'src', streamSrc+'&'+now.getTime() );
-  $(streamImage).setProperty( 'src', tempImage.getProperty( 'src' ) );
+  streamImage.src = streamImage.src.replace(/rand=\d+/i,'rand='+Math.floor((Math.random() * 1000000) ));
 }
 
 function handleClick( event ) {

From 5c5aafb1e84f792414f4449b5aed14cdc237ba3d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 30 May 2017 11:37:48 -0400
Subject: [PATCH 09/56] white space and a check for mid being set to quiet
 error messages

---
 web/skins/classic/views/control.php | 35 +++++++++++++----------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/web/skins/classic/views/control.php b/web/skins/classic/views/control.php
index a13ef750a..f1dd7b3e9 100644
--- a/web/skins/classic/views/control.php
+++ b/web/skins/classic/views/control.php
@@ -18,35 +18,32 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canView( 'Control' ) )
-{
-    $view = "error";
-    return;
+if ( !canView( 'Control' ) ) {
+  $view = 'error';
+  return;
 }
 
-$groupSql = "";
+$groupSql = '';
 if ( !empty($_REQUEST['group']) ) {
-    $row = dbFetchOne( 'SELECT * FROM Groups WHERE Id = ?', NULL, array($_REQUEST['group']) );
-    $groupSql = " and find_in_set( Id, '".$row['MonitorIds']."' )";
+  $row = dbFetchOne( 'SELECT * FROM Groups WHERE Id = ?', NULL, array($_REQUEST['group']) );
+  $groupSql = " and find_in_set( Id, '".$row['MonitorIds']."' )";
 }
 
-$mid = validInt($_REQUEST['mid']);
+$mid = !empty($_REQUEST['mid']) ? validInt($_REQUEST['mid']) : 0;
 
 $sql = "SELECT * FROM Monitors WHERE Function != 'None' AND Controllable = 1$groupSql ORDER BY Sequence";
 $mids = array();
-foreach( dbFetchAll( $sql ) as $row )
-{
-    if ( !visibleMonitor( $row['Id'] ) )
-    {
-        continue;
-    }
-    if ( empty($mid) )
-        $mid = $row['Id'];
-    $mids[$row['Id']] = $row['Name'];
+foreach( dbFetchAll( $sql ) as $row ) {
+  if ( !visibleMonitor( $row['Id'] ) ) {
+    continue;
+  }
+  if ( empty($mid) )
+    $mid = $row['Id'];
+  $mids[$row['Id']] = $row['Name'];
 }
 
 foreach ( getSkinIncludes( 'includes/control_functions.php' ) as $includeFile )
-    require_once $includeFile;
+  require_once $includeFile;
 
 $monitor = new Monitor( $mid );
 
@@ -70,7 +67,7 @@ xhtmlHeaders(__FILE__, translate('Control') );
     </div>
     <div id="content">
       <div id="ptzControls" class="ptzControls">
-<?php echo ptzControls( $monitor ) ?>
+      <?php echo ptzControls( $monitor ) ?>
       </div>
     </div>
   </div>

From a75488e0f3f9c88cd489ffc7251ce0650f7d7876 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 30 May 2017 11:52:04 -0400
Subject: [PATCH 10/56] flat and dark skins add some padding to the header,
 which makes it extend beyond 99%. These lines are not needed

---
 web/skins/classic/css/dark/views/montage.css | 4 ----
 web/skins/classic/css/flat/views/montage.css | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/web/skins/classic/css/dark/views/montage.css b/web/skins/classic/css/dark/views/montage.css
index 9eba3c569..9553f7ad1 100644
--- a/web/skins/classic/css/dark/views/montage.css
+++ b/web/skins/classic/css/dark/views/montage.css
@@ -1,7 +1,3 @@
-#header {
-    width: 99%;
-}
-
 #layout {
     margin-right: 10px;
 }
diff --git a/web/skins/classic/css/flat/views/montage.css b/web/skins/classic/css/flat/views/montage.css
index f37156633..e315443ff 100644
--- a/web/skins/classic/css/flat/views/montage.css
+++ b/web/skins/classic/css/flat/views/montage.css
@@ -1,7 +1,3 @@
-#header {
-    width: 99%;
-}
-
 #layout {
     margin-right: 10px;
 }

From 5bbe13f98f85b233b291cd1c678984bc604941f0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 30 May 2017 11:53:05 -0400
Subject: [PATCH 11/56] update cycle from SA

---
 web/skins/classic/views/cycle.php | 100 +++++++++---------------------
 1 file changed, 31 insertions(+), 69 deletions(-)

diff --git a/web/skins/classic/views/cycle.php b/web/skins/classic/views/cycle.php
index 2d486a176..24356fa2f 100644
--- a/web/skins/classic/views/cycle.php
+++ b/web/skins/classic/views/cycle.php
@@ -18,71 +18,49 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canView( 'Stream' ) )
-{
-    $view = "error";
-    return;
+if ( !canView( 'Stream' ) ) {
+  $view = 'error';
+  return;
 }
 
-if ( empty($_REQUEST['mode']) )
-{
-    if ( canStream() )
-        $mode = "stream";
-    else
-        $mode = "still";
-}
-else
-{
-    $mode = validHtmlStr($_REQUEST['mode']);
+if ( empty($_REQUEST['mode']) ) {
+  if ( canStream() )
+    $mode = 'stream';
+  else
+    $mode = 'still';
+} else {
+  $mode = validHtmlStr($_REQUEST['mode']);
 }
 
 $group = '';
 $groupSql = '';
-if ( !empty($_REQUEST['group']) )
-{
-    $group = validInt($_REQUEST['group']);
-    $row = dbFetchOne( 'SELECT * FROM Groups WHERE Id = ?', NULL, array($group) );
-    $groupSql = " and find_in_set( Id, '".$row['MonitorIds']."' )";
+if ( !empty($_REQUEST['group']) ) {
+  $group = validInt($_REQUEST['group']);
+  $row = dbFetchOne( 'SELECT * FROM Groups WHERE Id = ?', NULL, array($group) );
+  $groupSql = " and find_in_set( Id, '".$row['MonitorIds']."' )";
 }
 
 $sql = "SELECT * FROM Monitors WHERE Function != 'None'$groupSql ORDER BY Sequence";
 $monitors = array();
 $monIdx = 0;
-foreach( dbFetchAll( $sql ) as $row )
-{
-    if ( !visibleMonitor( $row['Id'] ) )
-        continue;
-    if ( isset($_REQUEST['mid']) && $row['Id'] == $_REQUEST['mid'] )
-        $monIdx = count($monitors);
-    $row['ScaledWidth'] = reScale( $row['Width'], $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE );
-    $row['ScaledHeight'] = reScale( $row['Height'], $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE );
-    $monitors[] = $row;
+foreach( dbFetchAll( $sql ) as $row ) {
+  if ( !visibleMonitor( $row['Id'] ) )
+    continue;
+  if ( isset($_REQUEST['mid']) && $row['Id'] == $_REQUEST['mid'] )
+    $monIdx = count($monitors);
+  $row['ScaledWidth'] = reScale( $row['Width'], $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE );
+  $row['ScaledHeight'] = reScale( $row['Height'], $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE );
+  $monitors[] = new Monitor( $row );
 }
 
 $monitor = $monitors[$monIdx];
-$nextMid = $monIdx==(count($monitors)-1)?$monitors[0]['Id']:$monitors[$monIdx+1]['Id'];
-$montageWidth = $monitor['ScaledWidth'];
-$montageHeight = $monitor['ScaledHeight'];
-$widthScale = ($montageWidth*SCALE_BASE)/$monitor['Width'];
-$heightScale = ($montageHeight*SCALE_BASE)/$monitor['Height'];
+$nextMid = $monIdx==(count($monitors)-1)?$monitors[0]->Id():$monitors[$monIdx+1]->Id();
+$montageWidth = $monitor->ScaledWidth();
+$montageHeight = $monitor->ScaledHeight();
+$widthScale = ($montageWidth*SCALE_BASE)/$monitor->Width();
+$heightScale = ($montageHeight*SCALE_BASE)/$monitor->Height();
 $scale = (int)(($widthScale<$heightScale)?$widthScale:$heightScale);
 
-if ( false && (ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT) )
-{
-    $streamMode = "mpeg";
-    $streamSrc = getStreamSrc( array( "mode=".$streamMode, "monitor=".$monitor['Id'], "scale=".$scale, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_MPEG_LIVE_FORMAT ) );
-}
-elseif ( $mode == 'stream' && canStream() )
-{
-    $streamMode = "jpeg";
-    $streamSrc = getStreamSrc( array( "mode=".$streamMode, "monitor=".$monitor['Id'], "scale=".$scale, "maxfps=".ZM_WEB_VIDEO_MAXFPS ) );
-}
-else
-{
-    $streamMode = "single";
-    $streamSrc = getStreamSrc( array( "mode=".$streamMode, "monitor=".$monitor['Id'], "scale=".$scale ) );
-}
-
 noCacheHeaders();
 
 $focusWindow = true;
@@ -94,33 +72,17 @@ xhtmlHeaders(__FILE__, translate('CycleWatch') );
     <div id="header">
       <div id="headerButtons">
 <?php if ( $mode == "stream" ) { ?>
-        <a href="?view=<?php echo $view ?>&amp;mode=still&amp;group=<?php echo $group ?>&amp;mid=<?php echo $monitor['Id'] ?>"><?php echo translate('Stills') ?></a>
+        <a href="?view=<?php echo $view ?>&amp;mode=still&amp;group=<?php echo $group ?>&amp;mid=<?php echo $monitor->Id() ?>"><?php echo translate('Stills') ?></a>
 <?php } else { ?>
-        <a href="?view=<?php echo $view ?>&amp;mode=stream&amp;group=<?php echo $group ?>&amp;mid=<?php echo $monitor['Id'] ?>"><?php echo translate('Stream') ?></a>
+        <a href="?view=<?php echo $view ?>&amp;mode=stream&amp;group=<?php echo $group ?>&amp;mid=<?php echo $monitor->Id() ?>"><?php echo translate('Stream') ?></a>
 <?php } ?>
         <a href="#" onclick="closeWindow(); return( false );"><?php echo translate('Close') ?></a>
       </div>
-      <h2><?php echo translate('Cycle') ?> - <?php echo validHtmlStr($monitor['Name']) ?></h2>
+      <h2><?php echo translate('Cycle') ?> - <?php echo validHtmlStr($monitor->Name()) ?></h2>
     </div>
     <div id="content">
       <div id="imageFeed">
-<?php
-if ( $streamMode == "mpeg" )
-{
-    outputVideoStream( "liveStream", $streamSrc, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), ZM_MPEG_LIVE_FORMAT, validHtmlStr($monitor['Name']) );
-}
-elseif ( $streamMode == "jpeg" )
-{
-    if ( canStreamNative() )
-        outputImageStream( "liveStream", $streamSrc, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), validHtmlStr($monitor['Name']) );
-    elseif ( canStreamApplet() )
-        outputHelperStream( "liveStream", $streamSrc, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), validHtmlStr($monitor['Name']) );
-}
-else
-{
-    outputImageStill( "liveStream", $streamSrc, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), validHtmlStr($monitor['Name']) );
-}
-?>
+      <?php echo getStreamHTML( $monitor, array( 'scale'=>$scale, 'mode'=>$mode ) ); ?>
       </div>
     </div>
   </div>

From c5288a172dc9ac7fe665523243b62cfde82f1c99 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 30 May 2017 11:57:20 -0400
Subject: [PATCH 12/56] fix merge problem

---
 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 37dd33d91..dd248f4c4 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -2196,7 +2196,7 @@ function getStreamHTML( $monitor, $options = array() ) {
 
 //FIXME, the width and height of the image need to be scaled.
     if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT ) {
-        $streamSrc = $monitor->getStreamSrc( array( 'mode'=>'mpeg', 'scale'=>$scale, 'bitrate'=>ZM_WEB_VIDEO_BITRATE, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'format'=>ZM_MPEG_LIVE_FORMAT ) );
+        $streamSrc = $monitor->getStreamSrc( array( 'mode'=>'mpeg', 'scale'=>$options['scale'], 'bitrate'=>ZM_WEB_VIDEO_BITRATE, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'format'=>ZM_MPEG_LIVE_FORMAT ) );
          return getVideoStream( 'liveStream'.$monitor->Id(), $streamSrc, $options, ZM_MPEG_LIVE_FORMAT, $monitor->Name() );
  } else if ( $options['mode'] == 'stream' and canStream() ) {
     $options['mode'] = 'jpeg';

From e9a0474cf7e58e9b9f648008ea38743db2aa0584 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 30 May 2017 12:04:12 -0400
Subject: [PATCH 13/56] add back required lines with a comment

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

diff --git a/web/includes/functions.php b/web/includes/functions.php
index dd248f4c4..0457b3667 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -27,6 +27,10 @@ if ( version_compare( phpversion(), '4.3.0', '<') ) {
   }
 }
 
+# We are requiring these because this file is getting included from the api, which hasn't already included them.
+require_once( 'logger.php' );
+require_once( 'database.php' );
+
 function userLogin( $username, $password='', $passwordHashed=false ) {
   global $user, $cookies;
 

From c7b52bd9980c1fd9cdad0199b5242979497d5a46 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 30 May 2017 13:14:43 -0400
Subject: [PATCH 14/56] fix logging dirs

---
 web/api/app/Config/bootstrap.php.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/api/app/Config/bootstrap.php.in b/web/api/app/Config/bootstrap.php.in
index ac3bcb62c..a2bfe9c26 100644
--- a/web/api/app/Config/bootstrap.php.in
+++ b/web/api/app/Config/bootstrap.php.in
@@ -100,12 +100,12 @@ App::uses('CakeLog', 'Log');
 CakeLog::config('debug', array(
 	'engine' => 'File',
 	'types' => array('notice', 'info', 'debug'),
-	'file' => 'cake_debug',
+	'file' => '@ZM_LOGDIR@/cake_debug',
 ));
 CakeLog::config('error', array(
 	'engine' => 'File',
 	'types' => array('warning', 'error', 'critical', 'alert', 'emergency'),
-	'file' => 'cake_error',
+	'file' => '@ZM_LOGDIR@/cake_error',
 ));
 CakeLog::config('custom_path', array(
     'engine' => 'File',

From 1a4333411381d7622c8e82845c110fa78e88c345 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 30 May 2017 13:38:57 -0400
Subject: [PATCH 15/56] Use NULLs instead of '' when saving things

---
 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 0457b3667..023f9fe10 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -705,7 +705,11 @@ function getFormChanges( $values, $newValues, $types=false, $columns=false ) {
       default :
         {
           if ( !isset($values[$key]) || ($values[$key] != $value) ) {
-            $changes[$key] = $key . ' = '.dbEscape(trim($value));
+            if ( ! isset($value) || $value == '' ) {
+              $changes[$key] = "$key = NULL";
+            } else {
+              $changes[$key] = $key . ' = '.dbEscape(trim($value));
+            }
           }
           break;
         }

From 8b3b9eb30e4c54f56f250a79e1382da0f5f508f1 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 30 May 2017 13:47:30 -0400
Subject: [PATCH 16/56] more merges/fixes from SA

---
 web/includes/Frame.php                 |    6 +-
 web/skins/classic/views/events.php     |  170 ++-
 web/skins/classic/views/frame.php      |   53 +-
 web/skins/classic/views/js/timeline.js |   14 +-
 web/skins/classic/views/monitor.php    | 1343 ++++++++++++------------
 web/views/image.php                    |  247 +++--
 6 files changed, 944 insertions(+), 889 deletions(-)

diff --git a/web/includes/Frame.php b/web/includes/Frame.php
index eaec94c58..5a31b3dc3 100644
--- a/web/includes/Frame.php
+++ b/web/includes/Frame.php
@@ -27,9 +27,11 @@ class Frame {
       Error("No row for Frame " . $IdOrRow );
     }
   } // end function __construct
+
   public function Storage() {
     return $this->Event()->Storage();
   }
+
   public function Event() {
     return new Event( $this->{'EventId'} );
   }
@@ -70,7 +72,9 @@ class Frame {
   }
 
   public function getImageSrc( $show='capture' ) {
-    return $_SERVER['PHP_SELF'].'?view=image&fid='.$this->{'Id'}.'&show='.$show.'&filename='.$this->Event()->MonitorId().'_'.$this->{'EventId'}.'_'.$this->{'FrameId'}.'.jpg';
+    
+    return $_SERVER['PHP_SELF'].'?view=image&fid='.$this->{'FrameId'}.'&eid='.$this->{'EventId'}.'&show='.$show;
+    #return $_SERVER['PHP_SELF'].'?view=image&fid='.$this->{'Id'}.'&show='.$show.'&filename='.$this->Event()->MonitorId().'_'.$this->{'EventId'}.'_'.$this->{'FrameId'}.'.jpg';
   } // end function getImageSrc
 
 	public static function find( $parameters = array(), $limit = NULL ) {
diff --git a/web/skins/classic/views/events.php b/web/skins/classic/views/events.php
index defc75272..e1747c5b9 100644
--- a/web/skins/classic/views/events.php
+++ b/web/skins/classic/views/events.php
@@ -18,76 +18,70 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canView( 'Events' ) || (!empty($_REQUEST['execute']) && !canEdit('Events')) )
-{
-    $view = "error";
-    return;
+if ( !canView( 'Events' ) || (!empty($_REQUEST['execute']) && !canEdit('Events')) ) {
+  $view = 'error';
+  return;
 }
 
 require_once( 'includes/Event.php' );
 
-if ( !empty($_REQUEST['execute']) )
-{
-    executeFilter( $tempFilterName );
+if ( !empty($_REQUEST['execute']) ) {
+  executeFilter( $tempFilterName );
 }
 
 $countSql = 'SELECT count(E.Id) AS EventCount FROM Monitors AS M INNER JOIN Events AS E ON (M.Id = E.MonitorId) WHERE';
-$eventsSql = 'SELECT E.*,M.Name AS MonitorName FROM Monitors AS M INNER JOIN Events AS E on (M.Id = E.MonitorId) WHERE';
+$eventsSql = 'SELECT E.*,M.Name AS MonitorName,M.DefaultScale FROM Monitors AS M INNER JOIN Events AS E on (M.Id = E.MonitorId) WHERE';
 if ( $user['MonitorIds'] ) {
 	$user_monitor_ids = ' M.Id in ('.$user['MonitorIds'].')';
 	$countSql .= $user_monitor_ids;
 	$eventsSql .= $user_monitor_ids;
 } else {
-    $countSql .= " 1";
-    $eventsSql .= " 1";
+  $countSql .= " 1";
+  $eventsSql .= " 1";
 }
 
 parseSort();
 parseFilter( $_REQUEST['filter'] );
 $filterQuery = $_REQUEST['filter']['query'];
 
-if ( $_REQUEST['filter']['sql'] )
-{
-    $countSql .= $_REQUEST['filter']['sql'];
-    $eventsSql .= $_REQUEST['filter']['sql'];
+if ( $_REQUEST['filter']['sql'] ) {
+  $countSql .= $_REQUEST['filter']['sql'];
+  $eventsSql .= $_REQUEST['filter']['sql'];
 }
 $eventsSql .= " ORDER BY $sortColumn $sortOrder";
 
 if ( isset($_REQUEST['page']) )
-    $page = validInt($_REQUEST['page']);
+  $page = validInt($_REQUEST['page']);
 else
-    $page = 0;
+  $page = 0;
 if ( isset($_REQUEST['limit']) )
-    $limit = validInt($_REQUEST['limit']);
+  $limit = validInt($_REQUEST['limit']);
 else
-    $limit = 0;
+  $limit = 0;
 
 $nEvents = dbFetchOne( $countSql, 'EventCount' );
-if ( !empty($limit) && $nEvents > $limit )
-{
-    $nEvents = $limit;
+if ( !empty($limit) && $nEvents > $limit ) {
+  $nEvents = $limit;
 }
 $pages = (int)ceil($nEvents/ZM_WEB_EVENTS_PER_PAGE);
 if ( !empty($page) ) {
-    if ( $page < 0 )
-        $page = 1;
-    if ( $page > $pages )
-        $page = $pages;
+  if ( $page < 0 )
+    $page = 1;
+  else if ( $page > $pages )
+    $page = $pages;
 }
+
 if ( !empty($page) ) {
-    $limitStart = (($page-1)*ZM_WEB_EVENTS_PER_PAGE);
-    if ( empty( $limit ) )
-    {
-        $limitAmount = ZM_WEB_EVENTS_PER_PAGE;
-    }
-    else
-    {
-        $limitLeft = $limit - $limitStart;
-        $limitAmount = ($limitLeft>ZM_WEB_EVENTS_PER_PAGE)?ZM_WEB_EVENTS_PER_PAGE:$limitLeft;
-    }
-    $eventsSql .= " limit $limitStart, $limitAmount";
+  $limitStart = (($page-1)*ZM_WEB_EVENTS_PER_PAGE);
+  if ( empty( $limit ) ) {
+    $limitAmount = ZM_WEB_EVENTS_PER_PAGE;
+  } else {
+    $limitLeft = $limit - $limitStart;
+    $limitAmount = ($limitLeft>ZM_WEB_EVENTS_PER_PAGE)?ZM_WEB_EVENTS_PER_PAGE:$limitLeft;
+  }
+  $eventsSql .= " limit $limitStart, $limitAmount";
 } elseif ( !empty( $limit ) ) {
-    $eventsSql .= " limit 0, ".$limit;
+  $eventsSql .= ' limit 0, '.$limit;
 }
 
 $maxWidth = 0;
@@ -95,20 +89,19 @@ $maxHeight = 0;
 $archived = false;
 $unarchived = false;
 $events = array();
-foreach ( dbFetchAll( $eventsSql ) as $event_row )
-{
-    $events[] = $event = new Event( $event_row );
+foreach ( dbFetchAll( $eventsSql ) as $event_row ) {
+  $events[] = $event = new Event( $event_row );
 
-   # Doesn this code do anything? 
-    $scale = max( reScale( SCALE_BASE, $event->DefaultScale(), ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
-    $eventWidth = reScale( $event_row['Width'], $scale );
-    $eventHeight = reScale( $event_row['Height'], $scale );
-    if ( $maxWidth < $eventWidth ) $maxWidth = $eventWidth;
-    if ( $maxHeight < $eventHeight ) $maxHeight = $eventHeight;
-    if ( $event_row['Archived'] )
-        $archived = true;
-    else
-        $unarchived = true;
+# Doesn this code do anything? 
+  $scale = max( reScale( SCALE_BASE, $event->DefaultScale(), ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
+  $eventWidth = reScale( $event_row['Width'], $scale );
+  $eventHeight = reScale( $event_row['Height'], $scale );
+  if ( $maxWidth < $eventWidth ) $maxWidth = $eventWidth;
+  if ( $maxHeight < $eventHeight ) $maxHeight = $eventHeight;
+  if ( $event_row['Archived'] )
+    $archived = true;
+  else
+    $unarchived = true;
 }
 
 $maxShortcuts = 5;
@@ -124,20 +117,16 @@ xhtmlHeaders(__FILE__, translate('Events') );
     <div id="header">
       <div id="headerButtons">
 <?php
-if ( $pages > 1 )
-{
-    if ( !empty($page) )
-    {
+if ( $pages > 1 ) {
+  if ( !empty($page) ) {
 ?>
         <a href="?view=<?php echo $view ?>&amp;page=0<?php echo $filterQuery ?><?php echo $sortQuery ?>&amp;limit=<?php echo $limit ?>"><?php echo translate('ViewAll') ?></a>
 <?php
-    }
-    else
-    {
+  } else {
 ?>
         <a href="?view=<?php echo $view ?>&amp;page=1<?php echo $filterQuery ?><?php echo $sortQuery ?>&amp;limit=<?php echo $limit ?>"><?php echo translate('ViewPaged') ?></a>
 <?php
-    }
+  }
 }
 ?>
         <a href="#" onclick="closeWindows();"><?php echo translate('Close') ?></a>
@@ -154,8 +143,7 @@ if ( $pages > 1 )
         <input type="hidden" name="sort_asc" value="<?php echo validHtmlStr($_REQUEST['sort_asc']) ?>"/>
         <input type="hidden" name="limit" value="<?php echo $limit ?>"/>
 <?php
-if ( $pagination )
-{
+if ( $pagination ) {
 ?>
         <h3 class="pagination"><?php echo $pagination ?></h3>
 <?php
@@ -170,10 +158,8 @@ if ( $pagination )
           <tbody>
 <?php
 $count = 0;
-foreach ( $events as $event )
-{
-    if ( ($count++%ZM_WEB_EVENTS_PER_PAGE) == 0 )
-    {
+foreach ( $events as $event ) {
+  if ( ($count++%ZM_WEB_EVENTS_PER_PAGE) == 0 ) {
 ?>
             <tr>
               <th class="colId"><a href="<?php echo sortHeader( 'Id' ) ?>"><?php echo translate('Id') ?><?php echo sortTag( 'Id' ) ?></a></th>
@@ -187,22 +173,22 @@ foreach ( $events as $event )
               <th class="colTotScore"><a href="<?php echo sortHeader( 'TotScore' ) ?>"><?php echo translate('TotalBrScore') ?><?php echo sortTag( 'TotScore' ) ?></a></th>
               <th class="colAvgScore"><a href="<?php echo sortHeader( 'AvgScore' ) ?>"><?php echo translate('AvgBrScore') ?><?php echo sortTag( 'AvgScore' ) ?></a></th>
               <th class="colMaxScore"><a href="<?php echo sortHeader( 'MaxScore' ) ?>"><?php echo translate('MaxBrScore') ?><?php echo sortTag( 'MaxScore' ) ?></a></th>
-<?php if ( ZM_WEB_EVENT_DISK_SPACE ) { ?>
+<?php
+    if ( ZM_WEB_EVENT_DISK_SPACE ) { ?>
               <th class="colDiskSpace"><a href="<?php echo sortHeader( 'DiskSpace' ) ?>"><?php echo translate('DiskSpace') ?><?php echo sortTag( 'DiskSpace' ) ?></a></th>
 <?php
-			}
-        if ( ZM_WEB_LIST_THUMBS )
-        {
+    }
+    if ( ZM_WEB_LIST_THUMBS ) {
 ?>
               <th class="colThumbnail"><?php echo translate('Thumbnail') ?></th>
 <?php
-        }
+    }
 ?>
               <th class="colMark"><input type="checkbox" name="toggleCheck" value="1" onclick="toggleCheckbox( this, 'markEids' );"<?php if ( !canEdit( 'Events' ) ) { ?> disabled="disabled"<?php } ?>/></th>
             </tr>
 <?php
-    }
-        $scale = max( reScale( SCALE_BASE, $event->DefaultScale(), ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
+  }
+  $scale = max( reScale( SCALE_BASE, $event->DefaultScale(), ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
 ?>
             <tr>
               <td class="colId"><?php echo makePopupLink( '?view=event&amp;eid='.$event->Id().$filterQuery.$sortQuery.'&amp;page=1', 'zmEvent', array( 'event', reScale( $event->Width(), $scale ), reScale( $event->Height(), $scale ) ), $event->Id().($event->Archived()?'*':'') ) ?></td>
@@ -216,25 +202,37 @@ foreach ( $events as $event )
               <td class="colTotScore"><?php echo $event->TotScore() ?></td>
               <td class="colAvgScore"><?php echo $event->AvgScore() ?></td>
               <td class="colMaxScore"><?php echo makePopupLink( '?view=frame&amp;eid='.$event->Id().'&amp;fid=0', 'zmImage', array( 'image', reScale( $event->Width(), $scale ), reScale( $event->Height(), $scale ) ), $event->MaxScore() ) ?></td>
-<?php if ( ZM_WEB_EVENT_DISK_SPACE ) { ?>
-              <td class="colDiskSpace"><?php echo $event->DiskSpace() ?></td>
 <?php
-		}
-    if ( ZM_WEB_LIST_THUMBS )
-    {
-        if ( $thumbData = $event->createListThumbnail() )
-        {
+  if ( ZM_WEB_EVENT_DISK_SPACE ) {
 ?>
-              <td class="colThumbnail"><?php echo makePopupLink( '?view=frame&amp;eid='.$event->Id().'&amp;fid='.$thumbData['FrameId'], 'zmImage', array( 'image', reScale( $event->Width(), $scale ), reScale( $event->Height(), $scale ) ), '<img src="?view=image&amp;eid='.$event->Id().'&amp;fid='.$thumbData['FrameId'].'&amp;width='.$thumbData['Width'].'&amp;height='.$thumbData['Height'].'" width="'.$thumbData['Width'].'" height="'.$thumbData['Height'].'" alt="'.$thumbData['FrameId'].'/'.$event->MaxScore().'"/>' ) ?></td>
+              <td class="colDiskSpace"><?php echo human_filesize( $event->DiskSpace() ) ?></td>
 <?php
-        }
-        else
-        {
+  }
+  if ( ZM_WEB_LIST_THUMBS ) {
+    if ( $thumbData = $event->createListThumbnail() ) {
+?>
+              <td class="colThumbnail">
+<?php 
+      $imgSrc = '?view=image&amp;eid='.$event->Id().'&amp;fid='.$thumbData['FrameId'].'&amp;width='.$thumbData['Width'].'&amp;height='.$thumbData['Height'];
+      $streamSrc = getStreamSrc( array( "source=event", "mode=jpeg", "event=".$event->Id(), "scale=".$scale, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "replay=single") );
+
+      $imgHtml = '<img id="thumbnail'.$event->id().'" src="'.$imgSrc.'" alt="'. validHtmlStr('Event '.$event->Id()) .'" style="width:'. validInt($thumbData['Width']) .'px;height:'. validInt( $thumbData['Height'] ).'px;" onmouseover="this.src=\''.$streamSrc.'\';" onmouseout="this.src=\''.$imgSrc.'\';"/>';
+
+      echo makePopupLink( 
+          '?view=frame&amp;eid='.$event->Id().'&amp;fid='.$thumbData['FrameId'],
+          'zmImage',
+          array( 'image', reScale( $event->Width(), $scale ), reScale( $event->Height(), $scale ) ),
+          $imgHtml
+        );
+?>
+              </td>
+<?php
+    } else {
 ?>
               <td class="colThumbnail">&nbsp;</td>
 <?php
-        }
     }
+  } // end if ZM_WEB_LIST_THUMBS
 ?>
               <td class="colMark"><input type="checkbox" name="markEids[]" value="<?php echo $event->Id() ?>" onclick="configureButton( this, 'markEids' );"<?php if ( !canEdit( 'Events' ) ) { ?> disabled="disabled"<?php } ?>/></td>
             </tr>
@@ -244,14 +242,12 @@ foreach ( $events as $event )
           </tbody>
         </table>
 <?php
-if ( $pagination )
-{
+if ( $pagination ) {
 ?>
         <h3 class="pagination"><?php echo $pagination ?></h3>
 <?php
 }
-if ( true || canEdit( 'Events' ) )
-{
+if ( true || canEdit( 'Events' ) ) {
 ?>
         <div id="contentButtons">
           <input type="button" name="viewBtn" value="<?php echo translate('View') ?>" onclick="viewEvents( this, 'markEids' );" disabled="disabled"/>
diff --git a/web/skins/classic/views/frame.php b/web/skins/classic/views/frame.php
index 2068aa7da..0bbda69fa 100644
--- a/web/skins/classic/views/frame.php
+++ b/web/skins/classic/views/frame.php
@@ -19,15 +19,15 @@
 //
 
 if ( !canView( 'Events' ) ) {
-    $view = "error";
-    return;
+  $view = 'error';
+  return;
 }
 
 require_once('includes/Frame.php');
 
 $eid = validInt($_REQUEST['eid']);
 if ( !empty($_REQUEST['fid']) )
-    $fid = validInt($_REQUEST['fid']);
+  $fid = validInt($_REQUEST['fid']);
 
 $Event = new Event( $eid );
 $Monitor = $Event->Monitor();
@@ -37,7 +37,7 @@ if ( !empty($fid) ) {
   if ( !($frame = dbFetchOne( $sql, NULL, array($eid, $fid) )) )
     $frame = array( 'FrameId'=>$fid, 'Type'=>'Normal', 'Score'=>0 );
 } else {
-    $frame = dbFetchOne( 'SELECT * FROM Frames WHERE EventId = ? AND Score = ?', NULL, array( $eid, $Event->MaxScore() ) );
+  $frame = dbFetchOne( 'SELECT * FROM Frames WHERE EventId = ? AND Score = ?', NULL, array( $eid, $Event->MaxScore() ) );
 }
 $Frame = new Frame( $frame );
 
@@ -60,16 +60,23 @@ if ( isset( $_REQUEST['scale'] ) ) {
   $scale = max( reScale( SCALE_BASE, $Monitor->DefaultScale(), ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
 }
 
-$imageData = $Event->getImageSrc( $frame, $scale, (isset($_REQUEST['show']) && $_REQUEST['show']=="capt") );
+$imageData = $Event->getImageSrc( $frame, $scale );
+
+$show = 'capt';
+if ( isset($_REQUEST['show']) ) {
+  $show = $_REQUEST['show'];
+} else if ( $imageData['hasAnalImage'] ) {
+  $show = 'anal';
+}
 
 $imagePath = $imageData['thumbPath'];
 $eventPath = $imageData['eventPath'];
-$dImagePath = sprintf( "%s/%0".ZM_EVENT_IMAGE_DIGITS."d-diag-d.jpg", $eventPath, $Frame->FrameId() );
-$rImagePath = sprintf( "%s/%0".ZM_EVENT_IMAGE_DIGITS."d-diag-r.jpg", $eventPath, $Frame->FrameId() );
+$dImagePath = sprintf( '%s/%0'.ZM_EVENT_IMAGE_DIGITS.'d-diag-d.jpg', $eventPath, $Frame->FrameId() );
+$rImagePath = sprintf( '%s/%0'.ZM_EVENT_IMAGE_DIGITS.'d-diag-r.jpg', $eventPath, $Frame->FrameId() );
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, translate('Frame')." - ".$Event->Id()." - ".$Frame->FrameId() );
+xhtmlHeaders(__FILE__, translate('Frame').' - '.$Event->Id()." - ".$Frame->FrameId() );
 ?>
 <body>
   <div id="page">
@@ -88,33 +95,29 @@ xhtmlHeaders(__FILE__, translate('Frame')." - ".$Event->Id()." - ".$Frame->Frame
     </div>
     <div id="content">
       <p id="image">
-<?php if ( in_array($event['VideoWriter'],array("1","2")) ) { ?>
-<img src="?view=image-ffmpeg&eid=<?php echo $event['Id'] ?>&fid=<?php echo $frame['FrameId'] ?>&scale=<?php echo $event['DefaultScale'] ?>" class="<?php echo $imageData['imageClass'] ?>">
-<?php } else {
-if ( $imageData['hasAnalImage'] ) { ?>
-<a href="?view=frame&amp;eid=<?php echo $Event->Id() ?>&amp;fid=<?php echo $Frame->FrameId() ?>&amp;scale=<?php echo $scale ?>&amp;show=<?php echo $imageData['isAnalImage']?"capt":"anal" ?>">
-<?php } ?>
-<img id="frameImg" src="<?php echo $Frame->getImageSrc($imageData['isAnalImage']?'analyse':'capture') ?>" width="<?php echo reScale( $Event->Width(), $Event->DefaultScale(), $scale ) ?>" height="<?php echo reScale( $Event->Height(), $Event->DefaultScale(), $scale ) ?>" alt="<?php echo $Frame->EventId()."-".$Frame->FrameId() ?>" class="<?php echo $imageData['imageClass'] ?>"/>
+
+<?php if ( $imageData['hasAnalImage'] ) {
+ echo sprintf('<a href="?view=frame&amp;eid=%d&amp;fid=%d&scale=%d&amp;show=%s">', $Event->Id(), $Frame->FrameId(), $scale, ( $show=='anal'?'capt':'anal' ) );
+} ?>
+<img id="frameImg" src="<?php echo $Frame->getImageSrc($show=='anal'?'analyse':'capture') ?>" width="<?php echo reScale( $Event->Width(), $Event->DefaultScale(), $scale ) ?>" height="<?php echo reScale( $Event->Height(), $Event->DefaultScale(), $scale ) ?>" alt="<?php echo $Frame->EventId()."-".$Frame->FrameId() ?>" class="<?php echo $imageData['imageClass'] ?>"/>
 <?php if ( $imageData['hasAnalImage'] ) { ?></a><?php } ?>
-<?php } ?>
-</p>
+
+      </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 ?>"><?php echo translate('First') ?></a>
-<?php } if ( $Frame->FrameId() > 1 ) { ?>
-        <a id="prevLink" href="?view=frame&amp;eid=<?php echo $Event->Id() ?>&amp;fid=<?php echo $prevFid ?>&amp;scale=<?php echo $scale ?>"><?php echo translate('Prev') ?></a>
+        <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 ?>"><?php echo translate('Next') ?></a>
-<?php } if ( $Frame->FrameId() < $maxFid ) { ?>
-        <a id="lastLink" href="?view=frame&amp;eid=<?php echo $Event->Id() ?>&amp;fid=<?php echo $lastFid ?>&amp;scale=<?php echo $scale ?>"><?php echo translate('Last') ?></a>
+        <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>
 <?php } ?>
       </p>
 <?php if (file_exists ($dImagePath)) { ?>
       <p id="diagImagePath"><?php echo $dImagePath ?></p>
-      <p id="diagImage"><img src=?"<?php echo viewImagePath( $dImagePath ) ?>" width="<?php echo reScale( $Event->Width(), $Event->DefaultScale(), $scale ) ?>" height="<?php echo reScale( $Event->Height(), $Event->DefaultScale(), $scale ) ?>" class="<?php echo $imageData['imageClass'] ?>"/></p>
+      <p id="diagImage"><img src="<?php echo viewImagePath( $dImagePath ) ?>" width="<?php echo reScale( $Event->Width(), $Monitor->DefaultScale(), $scale ) ?>" height="<?php echo reScale( $Event->Height(), $Monitor->DefaultScale(), $scale ) ?>" class="<?php echo $imageData['imageClass'] ?>"/></p>
 <?php } if (file_exists ($rImagePath)) { ?>
       <p id="refImagePath"><?php echo $rImagePath ?></p>
-      <p id="refImage"><img src="<?php echo viewImagePath( $rImagePath ) ?>" width="<?php echo reScale( $Event->Width(), $Event->DefaultScale(), $scale ) ?>" height="<?php echo reScale( $Event->Height(), $Event->DefaultScale(), $scale ) ?>" class="<?php echo $imageData['imageClass'] ?>"/></p>
+      <p id="refImage"><img src="<?php echo viewImagePath( $rImagePath ) ?>" width="<?php echo reScale( $Event->Width(), $Monitor->DefaultScale(), $scale ) ?>" height="<?php echo reScale( $Event->Height(), $Monitor->DefaultScale(), $scale ) ?>" class="<?php echo $imageData['imageClass'] ?>"/></p>
 <?php } ?>
     </div>
   </div>
diff --git a/web/skins/classic/views/js/timeline.js b/web/skins/classic/views/js/timeline.js
index 089f20e16..8210aa9e3 100644
--- a/web/skins/classic/views/js/timeline.js
+++ b/web/skins/classic/views/js/timeline.js
@@ -94,7 +94,7 @@ function previewEvent( eventId, frameId ) {
     if ( event['frames'] ) {
       if ( event['frames'][frameId] ) {
         showEventDetail( event['frames'][frameId]['html'] );
-        var imagePath = event.frames[frameId].Image.imagePath;
+        var imagePath = '/index.php?view=image&eid='+eventId+'&fid='+frameId;
         var videoName = event.DefaultVideo;
         loadEventImage( imagePath, eventId, frameId, event.Width, event.Height, event.Frames/event.Length, videoName, event.Length, event.StartTime, monitors[event.MonitorId]);
         return;
@@ -107,13 +107,13 @@ function previewEvent( eventId, frameId ) {
 function loadEventImage( imagePath, eid, fid, width, height, fps, videoName, duration, startTime, Monitor ) {
   var vid= $('preview');
   var imageSrc = $('imageSrc');
-  if(videoName) {
+  if ( videoName && vid ) {
     vid.show();
     imageSrc.hide();
-    var newsource=imagePrefix+imagePath.slice(0,imagePath.lastIndexOf('/'))+"/"+videoName;
+    var newsource=imagePath.slice(0,imagePath.lastIndexOf('/'))+"/"+videoName;
     //console.log(newsource);
     //console.log(sources[0].src.slice(-newsource.length));
-    if(newsource!=vid.currentSrc.slice(-newsource.length) || vid.readyState==0) {
+    if ( newsource != vid.currentSrc.slice(-newsource.length) || vid.readyState == 0 ) {
       //console.log("loading new");
       //it is possible to set a long source list here will that be unworkable?
       var sources = vid.getElementsByTagName('source');
@@ -126,13 +126,13 @@ function loadEventImage( imagePath, eid, fid, width, height, fps, videoName, dur
       addVideoTimingTrack(vid, Monitor.LabelFormat, Monitor.Name, duration, startTime)
         vid.currentTime = fid/fps;
     } else {
-      if(!vid.seeking)
+      if ( ! vid.seeking )
         vid.currentTime=fid/fps;
     }
   } else {
-    vid.hide();
+    if ( vid ) vid.hide();
     imageSrc.show();
-    imageSrc.setProperty( 'src', imagePrefix+imagePath );
+    imageSrc.setProperty( 'src', imagePath );
     imageSrc.removeEvent( 'click' );
     imageSrc.addEvent( 'click', showEvent.pass( [ eid, fid, width, height ] ) );
   }
diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index 84710a404..a43b74899 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -21,123 +21,47 @@
 require_once( 'includes/Server.php');
 
 if ( !canView( 'Monitors' ) ) {
-  $view = "error";
+  $view = 'error';
   return;
 }
 
 $tabs = array();
 $tabs["general"] = translate('General');
 $tabs["source"] = translate('Source');
+$tabs["storage"] = translate('Storage');
 $tabs["timestamp"] = translate('Timestamp');
 $tabs["buffers"] = translate('Buffers');
 if ( ZM_OPT_CONTROL && canView( 'Control' ) )
-$tabs["control"] = translate('Control');
+  $tabs["control"] = translate('Control');
 if ( ZM_OPT_X10 )
   $tabs["x10"] = translate('X10');
-  $tabs["misc"] = translate('Misc');
+$tabs["misc"] = translate('Misc');
 
-  if ( isset($_REQUEST['tab']) )
-  $tab = validHtmlStr($_REQUEST['tab']);
-  else
-  $tab = "general";
+if ( isset($_REQUEST['tab']) )
+    $tab = validHtmlStr($_REQUEST['tab']);
+else
+    $tab = "general";
 
-  $Server = null;
-  if ( defined( 'ZM_SERVER_ID' ) ) {
-    $Server = dbFetchOne( 'SELECT * FROM Servers WHERE Id=?', NULL, array( ZM_SERVER_ID ) );
-  }
+$Server = null;
+if ( defined( 'ZM_SERVER_ID' ) ) {
+  $Server = dbFetchOne( 'SELECT * FROM Servers WHERE Id=?', NULL, array( ZM_SERVER_ID ) );
+}
 if ( ! $Server ) {
   $Server = array( 'Id' => '' );
 }
 
 if ( ! empty($_REQUEST['mid']) ) {
-  $monitor = new Monitor( $_REQUEST['mid'] );
+  $monitor = dbFetchMonitor( $_REQUEST['mid'] );
   if ( ZM_OPT_X10 )
     $x10Monitor = dbFetchOne( 'SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($_REQUEST['mid']) );
 } else {
 
   $nextId = getTableAutoInc( 'Monitors' );
-  if ( ! empty( $_REQUEST['dupId'] ) ) {
-      $monitor = new Monitor( $_REQUEST['dupId'] );
-      if ( ZM_OPT_X10 )
-          $x10Monitor = dbFetchOne( 'SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($_REQUEST['dupId']) );
-      $clonedName = $monitor->Name();
-      $monitor->Name( translate('Monitor').'-'.$nextId );
-	  $monitor->Id( $nextId );
-  } else {
-      $monitor = new Monitor();
-      $monitor->set( array(
-                  'Id' => 0,
-                  'Name' => translate('Monitor').'-'.$nextId,
-                  'Function' => "Monitor",
-                  'Enabled' => true,
-                  'LinkedMonitors' => "",
-                  'Type' => "",
-                  'Device' => "/dev/video0",
-                  'Channel' => "0",
-                  'Format' => 0x000000ff,
-                  'Protocol' => "",
-                  'Method' => "",
-                  'Host' => "",
-                  'Path' => "",
-                  'Options' => "",
-                  'Port' => "80",
-                  'User' => "",
-                  'Pass' => "",
-                  'Colours' => 3,
-                  'Palette' => 0,
-                  'Width' => "320",
-                  'Height' => "240",
-                  'Orientation' => "0",
-                  'Deinterlacing' => 0,
-                  'RTSPDescribe' => 0,
-                  'SaveJPEGs' => "3",
-                  'VideoWriter' => "0",
-                  'EncoderParameters' => "# Lines beginning with # are a comment \n# For changing quality, use the crf option\n# 1 is best, 51 is worst quality\n#crf=23\n",
-                  'RecordAudio' => '0',
-                  'LabelFormat' => '%N - %d/%m/%y %H:%M:%S',
-                  'LabelX' => 0,
-                  'LabelY' => 0,
-                  'LabelSize' => 1,
-                  'ImageBufferCount' => 50,
-                  'WarmupCount' => 25,
-                  'PreEventCount' => 25,
-                  'PostEventCount' => 25,
-                  'StreamReplayBuffer' => 1000,
-                  'AlarmFrameCount' => 1,
-                  'Controllable' => 0,
-                  'ControlId' => "",
-                  'ControlType' => 0,
-                  'ControlDevice' => "",
-                  'ControlAddress' => "",
-                  'AutoStopTimeout' => "",
-                  'TrackMotion' => 0,
-                  'TrackDelay' => "",
-                  'ReturnLocation' => -1,
-                  'ReturnDelay' => "",
-                  'SectionLength' => 600,
-                  'FrameSkip' => 0,
-                  'MotionFrameSkip' => 0,
-                  'EventPrefix' => 'Event-',
-                  'AnalysisFPS' => "",
-                  'AnalysisUpdateDelay' => 0,
-                  'MaxFPS' => "",
-                  'AlarmMaxFPS' => "",
-                  'FPSReportInterval' => 1000,
-                  'RefBlendPerc' => 6,
-                  'AlarmRefBlendPerc' => 6,
-                  'DefaultView' => 'Events',
-                  'DefaultRate' => '100',
-                  'DefaultScale' => '100',
-                  'SignalCheckColour' => '#0000c0',
-                  'WebColour' => 'red',
-                  'Exif' => '0',
-                  'Triggers' => "",
-                  'V4LMultiBuffer'  =>  '',
-                  'V4LCapturesPerFrame'  =>  1,
-                  'ServerId'  =>  $Server['Id'],
-                  ) );
-    } # end if $_REQUEST['dupID']
-} # end if $_REQUEST['mid']
+  $monitor = getMonitorObject($_REQUEST['dupId']);
+  $clonedName = $monitor['Name'];
+  $monitor['Name'] = translate('Monitor').'-'.$nextId;
+  $monitor['Id']='0';
+}
 
 if ( ZM_OPT_X10 && empty($x10Monitor) ) {
   $x10Monitor = array(
@@ -147,55 +71,130 @@ if ( ZM_OPT_X10 && empty($x10Monitor) ) {
       );
 }
 
+function getMonitorObject( $mid = null ) {
+  if ( $mid !== null ) {
+    $monitor = dbFetchMonitor($mid);
+  } else {
+    $monitor = array(
+        'Id' => 0,
+        'Name' => "willbereplaced",
+        'Function' => "Monitor",
+        'Enabled' => true,
+        'LinkedMonitors' => "",
+        'Type' => "",
+        'Device' => "/dev/video0",
+        'Channel' => "0",
+        'Format' => 0x000000ff,
+        'Protocol' => "",
+        'Method' => "",
+        'Host' => "",
+        'Path' => "",
+        'Options' => "",
+        'Port' => "80",
+        'User' => "",
+        'Pass' => "",
+        'Colours' => 3,
+        'Palette' => 0,
+        'Width' => "320",
+        'Height' => "240",
+        'Orientation' => "0",
+        'Deinterlacing' => 0,
+        'RTSPDescribe' => 0,
+        'SaveJPEGs' => "3",
+        'VideoWriter' => "0",
+        'EncoderParameters' => "# Lines beginning with # are a comment \n# For changing quality, use the crf option\n# 1 is best, 51 is worst quality\n#crf=23\n",
+        'RecordAudio' => "0",
+        'LabelFormat' => '%N - %d/%m/%y %H:%M:%S',
+        'LabelX' => 0,
+        'LabelY' => 0,
+        'LabelSize' => 1,
+        'ImageBufferCount' => 50,
+        'WarmupCount' => 25,
+        'PreEventCount' => 25,
+        'PostEventCount' => 25,
+        'StreamReplayBuffer' => 1000,
+        'AlarmFrameCount' => 1,
+        'Controllable' => 0,
+        'ControlId' => "",
+        'ControlType' => 0,
+        'ControlDevice' => "",
+        'ControlAddress' => "",
+        'AutoStopTimeout' => "",
+        'TrackMotion' => 0,
+        'TrackDelay' => "",
+        'ReturnLocation' => -1,
+        'ReturnDelay' => "",
+        'SectionLength' => 600,
+        'FrameSkip' => 0,
+        'MotionFrameSkip' => 0,
+        'EventPrefix' => 'Event-',
+        'AnalysisFPS' => "",
+        'AnalysisUpdateDelay' => 0,
+        'MaxFPS' => "",
+        'AlarmMaxFPS' => "",
+        'FPSReportInterval' => 1000,
+        'RefBlendPerc' => 6,
+        'AlarmRefBlendPerc' => 6,
+        'DefaultView' => 'Events',
+        'DefaultRate' => '100',
+        'DefaultScale' => '100',
+        'SignalCheckColour' => '#0000c0',
+        'WebColour' => 'red',
+        'Exif' => '0',
+        'Triggers' => "",
+        'V4LMultiBuffer'  =>  '',
+        'V4LCapturesPerFrame' =>  1,
+        'ServerId'  =>  $Server['Id'],
+        );
+  }
+  return ($monitor);
+}
+
 function fourcc( $a, $b, $c, $d ) {
   return( ord($a) | (ord($b) << 8) | (ord($c) << 16) | (ord($d) << 24) );
-
 }
 
 if ( isset( $_REQUEST['newMonitor'] ) ) {
-# Update the monitor object with whatever has been set so far.
-  $monitor->set( $_REQUEST['newMonitor'] );
+  $newMonitor = $_REQUEST['newMonitor'];
   if ( ZM_OPT_X10 )
     $newX10Monitor = $_REQUEST['newX10Monitor'];
-# FIXME: Triggers in the db is a comma separated string.  Needs to be an array.
-#$monitor->Triggers = explode( ',', isset($monitor->Triggers)?$monitor->Triggers:"" );
 } else {
+  $newMonitor = $monitor;
+  $newMonitor['Triggers'] = explode( ',', isset($monitor['Triggers'])?$monitor['Triggers']:"" );
   if ( ZM_OPT_X10 )
     $newX10Monitor = $x10Monitor;
 }
 
-# What if it has less zeros?  This is not robust code.
-if ( $monitor->AnalysisFPS == '0.00' )
-$monitor->AnalysisFPS = '';
-if ( $monitor->MaxFPS == '0.00' )
-$monitor->MaxFPS = '';
-if ( $monitor->AlarmMaxFPS == '0.00' )
-$monitor->AlarmMaxFPS = '';
+$newMonitor['Name'] = trim($newMonitor['Name']);
+
+if ( $newMonitor['AnalysisFPS'] == '0.00' )
+  $newMonitor['AnalysisFPS'] = '';
+if ( $newMonitor['MaxFPS'] == '0.00' )
+  $newMonitor['MaxFPS'] = '';
+if ( $newMonitor['AlarmMaxFPS'] == '0.00' )
+  $newMonitor['AlarmMaxFPS'] = '';
 
 if ( !empty($_REQUEST['preset']) ) {
   $preset = dbFetchOne( 'SELECT Type, Device, Channel, Format, Protocol, Method, Host, Port, Path, Width, Height, Palette, MaxFPS, Controllable, ControlId, ControlDevice, ControlAddress, DefaultRate, DefaultScale FROM MonitorPresets WHERE Id = ?', NULL, array($_REQUEST['preset']) );
-#$monitor->set( $preset );
   foreach ( $preset as $name=>$value ) {
-# Does isset handle NULL's?  I don't think this code is correct.  
     if ( isset($value) ) {
-      $monitor->$name = $value;
+      $newMonitor[$name] = $value;
     }
   }
 }
 if ( !empty($_REQUEST['probe']) ) {
   $probe = unserialize(base64_decode($_REQUEST['probe']));
   foreach ( $probe as $name=>$value ) {
-# Again I don't think isset is useful here.
     if ( isset($value) ) {
-      $monitor->$name = $value;
+      $newMonitor[$name] = $value;
     }
   }
-  if ( ZM_HAS_V4L && $monitor->Type == 'Local' ) {
-    $monitor->Palette = fourCC( substr($monitor->Palette,0,1), substr($monitor->Palette,1,1), substr($monitor->Palette,2,1), substr($monitor->Palette,3,1) );
-    if ( $monitor->Format == 'PAL' )
-      $monitor->Format = 0x000000ff;
-    elseif ( $monitor->Format == 'NTSC' )
-      $monitor->Format = 0x0000b000;
+  if ( ZM_HAS_V4L && $newMonitor['Type'] == 'Local' ) {
+    $newMonitor['Palette'] = fourCC( substr($newMonitor['Palette'],0,1), substr($newMonitor['Palette'],1,1), substr($newMonitor['Palette'],2,1), substr($newMonitor['Palette'],3,1) );
+    if ( $newMonitor['Format'] == 'PAL' )
+      $newMonitor['Format'] = 0x000000ff;
+    elseif ( $newMonitor['Format'] == 'NTSC' )
+      $newMonitor['Format'] = 0x0000b000;
   }
 }
 
@@ -205,50 +204,51 @@ $sourceTypes = array(
     'File'   => translate('File'),
     'Ffmpeg' => translate('Ffmpeg'),
     'Libvlc' => translate('Libvlc'),
-    'cURL'   => "cURL (HTTP(S) only)"
-    );
-  if ( !ZM_HAS_V4L )
-    unset($sourceTypes['Local']);
+    'cURL'   => 'cURL (HTTP(S) only)'
+);
+if ( !ZM_HAS_V4L )
+  unset($sourceTypes['Local']);
 
-  $localMethods = array(
-      'v4l2' => "Video For Linux version 2",
-      'v4l1' => "Video For Linux version 1",
-      );
+$localMethods = array(
+    'v4l2' => 'Video For Linux version 2',
+    'v4l1' => 'Video For Linux version 1',
+    );
 if ( !ZM_HAS_V4L2 )
   unset($localMethods['v4l2']);
 if ( !ZM_HAS_V4L1 )
   unset($localMethods['v4l1']);
 
-  $remoteProtocols = array(
-      "http" => "HTTP",
-      "rtsp" => "RTSP"
-      );
+$remoteProtocols = array(
+    'http' => 'HTTP',
+    'rtsp' => 'RTSP'
+);
 
-  $rtspMethods = array(
-      "rtpUni"      => "RTP/Unicast",
-      "rtpMulti"    => "RTP/Multicast",
-      "rtpRtsp"     => "RTP/RTSP",
-      "rtpRtspHttp" => "RTP/RTSP/HTTP"
-      );
+$rtspMethods = array(
+    'rtpUni'      => 'RTP/Unicast',
+    'rtpMulti'    => 'RTP/Multicast',
+    'rtpRtsp'     => 'RTP/RTSP',
+    'rtpRtspHttp' => 'RTP/RTSP/HTTP'
+);
 
-  $rtspFFMpegMethods = array(
-      "rtpRtsp"     => "TCP",
-      "rtpUni"      => "UDP",
-      "rtpMulti"    => "UDP Multicast",
-      "rtpRtspHttp" => "HTTP Tunnel"
-  );
+$rtspFFMpegMethods = array(
+    'rtpRtsp'     => 'TCP',
+    'rtpUni'      => 'UDP',
+    'rtpMulti'    => 'UDP Multicast',
+    'rtpRtspHttp' => 'HTTP Tunnel'
+);
 
-  $httpMethods = array(
-      "simple"   => "Simple",
-      "regexp"   => "Regexp",
-      "jpegTags" => "JPEG Tags"
-      );
+$httpMethods = array(
+    "simple"   => "Simple",
+    "regexp"   => "Regexp",
+    "jpegTags" => "JPEG Tags"
+);
 if ( !ZM_PCRE )
-  unset($httpMethods['regexp']);
-  // Currently unsupported
-  unset($httpMethods['jpegTags']);
+    unset($httpMethods['regexp']);
+// Currently unsupported
+unset($httpMethods['jpegTags']);
 
-  if ( ZM_HAS_V4L1 ) {
+if ( ZM_HAS_V4L1 )
+{
     $v4l1DeviceFormats = array(
         "PAL"   => 0,
         "NTSC"  => 1,
@@ -258,12 +258,12 @@ if ( !ZM_PCRE )
         "FMT5"  => 5,
         "FMT6"  => 6,
         "FMT7"  => 7
-        );
+    );
 
     $v4l1MaxChannels = 15;
     $v4l1DeviceChannels = array();
     for ( $i = 0; $i <= $v4l1MaxChannels; $i++ )
-      $v4l1DeviceChannels["$i"] = $i;
+        $v4l1DeviceChannels["$i"] = $i;
 
     $v4l1LocalPalettes = array(
         translate('Grey')      => 1,
@@ -275,121 +275,120 @@ if ( !ZM_PCRE )
         "*YUV422"            => 7,
         "*YUV422P"           => 13,
         "*YUV420P"           => 15
-        );
-  }
+    );
+}
 
-if ( ZM_HAS_V4L2 )
-{
-  $v4l2DeviceFormats = array(
-      "PAL"         => 0x000000ff,
-      "NTSC"        => 0x0000b000,
-      "PAL B"       => 0x00000001,
-      "PAL B1"      => 0x00000002,
-      "PAL G"       => 0x00000004,
-      "PAL H"       => 0x00000008,
-      "PAL I"       => 0x00000010,
-      "PAL D"       => 0x00000020,
-      "PAL D1"      => 0x00000040,
-      "PAL K"       => 0x00000080,
-      "PAL M"       => 0x00000100,
-      "PAL N"       => 0x00000200,
-      "PAL Nc"      => 0x00000400,
-      "PAL 60"      => 0x00000800,
-      "NTSC M"      => 0x00001000,
-      "NTSC M JP"   => 0x00002000,
-      "NTSC 443"    => 0x00004000,
-      "NTSC M KR"   => 0x00008000,
-      "SECAM B"     => 0x00010000,
-      "SECAM D"     => 0x00020000,
-      "SECAM G"     => 0x00040000,
-      "SECAM H"     => 0x00080000,
-      "SECAM K"     => 0x00100000,
-      "SECAM K1"    => 0x00200000,
-      "SECAM L"     => 0x00400000,
-      "SECAM LC"    => 0x00800000,
-      "ATSC 8 VSB"  => 0x01000000,
-      "ATSC 16 VSB" => 0x02000000,
-      );
+if ( ZM_HAS_V4L2 ) {
+    $v4l2DeviceFormats = array(
+        "PAL"         => 0x000000ff,
+        "NTSC"        => 0x0000b000,
+        "PAL B"       => 0x00000001,
+        "PAL B1"      => 0x00000002,
+        "PAL G"       => 0x00000004,
+        "PAL H"       => 0x00000008,
+        "PAL I"       => 0x00000010,
+        "PAL D"       => 0x00000020,
+        "PAL D1"      => 0x00000040,
+        "PAL K"       => 0x00000080,
+        "PAL M"       => 0x00000100,
+        "PAL N"       => 0x00000200,
+        "PAL Nc"      => 0x00000400,
+        "PAL 60"      => 0x00000800,
+        "NTSC M"      => 0x00001000,
+        "NTSC M JP"   => 0x00002000,
+        "NTSC 443"    => 0x00004000,
+        "NTSC M KR"   => 0x00008000,
+        "SECAM B"     => 0x00010000,
+        "SECAM D"     => 0x00020000,
+        "SECAM G"     => 0x00040000,
+        "SECAM H"     => 0x00080000,
+        "SECAM K"     => 0x00100000,
+        "SECAM K1"    => 0x00200000,
+        "SECAM L"     => 0x00400000,
+        "SECAM LC"    => 0x00800000,
+        "ATSC 8 VSB"  => 0x01000000,
+        "ATSC 16 VSB" => 0x02000000,
+    );
 
-  $v4l2MaxChannels = 31;
-  $v4l2DeviceChannels = array();
-  for ( $i = 0; $i <= $v4l2MaxChannels; $i++ )
-    $v4l2DeviceChannels["$i"] = $i;
+    $v4l2MaxChannels = 31;
+    $v4l2DeviceChannels = array();
+    for ( $i = 0; $i <= $v4l2MaxChannels; $i++ )
+        $v4l2DeviceChannels["$i"] = $i;
 
-  $v4l2LocalPalettes = array(
-      "Auto" => 0, /* Automatic palette selection */
+    $v4l2LocalPalettes = array(
+        "Auto" => 0, /* Automatic palette selection */
 
-      /*      Pixel format         FOURCC                        depth  Description  */
-      translate('Grey') =>     fourcc('G','R','E','Y'), /*  8  Greyscale     */
-      "BGR32" =>    fourcc('B','G','R','4'), /* 32  BGR-8-8-8-8   */
-      "RGB32" =>    fourcc('R','G','B','4'), /* 32  RGB-8-8-8-8   */
-      "BGR24" =>    fourcc('B','G','R','3'), /* 24  BGR-8-8-8     */
-      "RGB24" =>    fourcc('R','G','B','3'), /* 24  RGB-8-8-8     */
-      "*YUYV" =>     fourcc('Y','U','Y','V'), /* 16  YUV 4:2:2     */
+        /*      Pixel format         FOURCC                        depth  Description  */
+        translate('Grey') =>     fourcc('G','R','E','Y'), /*  8  Greyscale     */
+        "BGR32" =>    fourcc('B','G','R','4'), /* 32  BGR-8-8-8-8   */
+        "RGB32" =>    fourcc('R','G','B','4'), /* 32  RGB-8-8-8-8   */
+        "BGR24" =>    fourcc('B','G','R','3'), /* 24  BGR-8-8-8     */
+        "RGB24" =>    fourcc('R','G','B','3'), /* 24  RGB-8-8-8     */
+        "*YUYV" =>     fourcc('Y','U','Y','V'), /* 16  YUV 4:2:2     */
 
-      /* compressed formats */
-      "*JPEG" =>     fourcc('J','P','E','G'), /* JFIF JPEG     */
-      "*MJPEG" =>    fourcc('M','J','P','G'), /* Motion-JPEG   */
-      //"DV" =>       fourcc('d','v','s','d'), /* 1394          */
-      //"MPEG" =>     fourcc('M','P','E','G'), /* MPEG-1/2/4    */
+        /* compressed formats */
+        "*JPEG" =>     fourcc('J','P','E','G'), /* JFIF JPEG     */
+        "*MJPEG" =>    fourcc('M','J','P','G'), /* Motion-JPEG   */
+        //"DV" =>       fourcc('d','v','s','d'), /* 1394          */
+        //"MPEG" =>     fourcc('M','P','E','G'), /* MPEG-1/2/4    */
 
-      //"RGB332" =>   fourcc('R','G','B','1'), /*  8  RGB-3-3-2     */
-      "*RGB444" =>   fourcc('R','4','4','4'), /* 16  xxxxrrrr ggggbbbb */
-      "*RGB555" =>   fourcc('R','G','B','O'), /* 16  RGB-5-5-5     */
-      "*RGB565" =>   fourcc('R','G','B','P'), /* 16  RGB-5-6-5     */
-      //"RGB555X" =>  fourcc('R','G','B','Q'), /* 16  RGB-5-5-5 BE  */
-      //"RGB565X" =>  fourcc('R','G','B','R'), /* 16  RGB-5-6-5 BE  */
-      //"Y16" =>      fourcc('Y','1','6',''), /* 16  Greyscale     */
-      //"PAL8" =>     fourcc('P','A','L','8'), /*  8  8-bit palette */
-      //"YVU410" =>   fourcc('Y','V','U','9'), /*  9  YVU 4:1:0     */
-      //"YVU420" =>   fourcc('Y','V','1','2'), /* 12  YVU 4:2:0     */
+        //"RGB332" =>   fourcc('R','G','B','1'), /*  8  RGB-3-3-2     */
+        "*RGB444" =>   fourcc('R','4','4','4'), /* 16  xxxxrrrr ggggbbbb */
+        "*RGB555" =>   fourcc('R','G','B','O'), /* 16  RGB-5-5-5     */
+        "*RGB565" =>   fourcc('R','G','B','P'), /* 16  RGB-5-6-5     */
+        //"RGB555X" =>  fourcc('R','G','B','Q'), /* 16  RGB-5-5-5 BE  */
+        //"RGB565X" =>  fourcc('R','G','B','R'), /* 16  RGB-5-6-5 BE  */
+        //"Y16" =>      fourcc('Y','1','6',''), /* 16  Greyscale     */
+        //"PAL8" =>     fourcc('P','A','L','8'), /*  8  8-bit palette */
+        //"YVU410" =>   fourcc('Y','V','U','9'), /*  9  YVU 4:1:0     */
+        //"YVU420" =>   fourcc('Y','V','1','2'), /* 12  YVU 4:2:0     */
 
-      "*UYVY" =>     fourcc('U','Y','V','Y'), /* 16  YUV 4:2:2     */
-      "*YUV422P" =>  fourcc('4','2','2','P'), /* 16  YVU422 planar */
-      "*YUV411P" =>  fourcc('4','1','1','P'), /* 16  YVU411 planar */
-      //"Y41P" =>     fourcc('Y','4','1','P'), /* 12  YUV 4:1:1     */
-      "*YUV444" =>   fourcc('Y','4','4','4'), /* 16  xxxxyyyy uuuuvvvv */
-      //"YUV555" =>   fourcc('Y','U','V','O'), /* 16  YUV-5-5-5     */
-      //"YUV565" =>   fourcc('Y','U','V','P'), /* 16  YUV-5-6-5     */
-      //"YUV32" =>    fourcc('Y','U','V','4'), /* 32  YUV-8-8-8-8   */
+        "*UYVY" =>     fourcc('U','Y','V','Y'), /* 16  YUV 4:2:2     */
+        "*YUV422P" =>  fourcc('4','2','2','P'), /* 16  YVU422 planar */
+        "*YUV411P" =>  fourcc('4','1','1','P'), /* 16  YVU411 planar */
+        //"Y41P" =>     fourcc('Y','4','1','P'), /* 12  YUV 4:1:1     */
+        "*YUV444" =>   fourcc('Y','4','4','4'), /* 16  xxxxyyyy uuuuvvvv */
+        //"YUV555" =>   fourcc('Y','U','V','O'), /* 16  YUV-5-5-5     */
+        //"YUV565" =>   fourcc('Y','U','V','P'), /* 16  YUV-5-6-5     */
+        //"YUV32" =>    fourcc('Y','U','V','4'), /* 32  YUV-8-8-8-8   */
 
-      /* two planes -- one Y, one Cr + Cb interleaved  */
-      //"NV12" =>     fourcc('N','V','1','2'), /* 12  Y/CbCr 4:2:0  */
-      //"NV21" =>     fourcc('N','V','2','1'), /* 12  Y/CrCb 4:2:0  */
+        /* two planes -- one Y, one Cr + Cb interleaved  */
+        //"NV12" =>     fourcc('N','V','1','2'), /* 12  Y/CbCr 4:2:0  */
+        //"NV21" =>     fourcc('N','V','2','1'), /* 12  Y/CrCb 4:2:0  */
 
-      /*  The following formats are not defined in the V4L2 specification */
-      "*YUV410" =>   fourcc('Y','U','V','9'), /*  9  YUV 4:1:0     */
-      "*YUV420" =>   fourcc('Y','U','1','2'), /* 12  YUV 4:2:0     */
-      //"YYUV" =>     fourcc('Y','Y','U','V'), /* 16  YUV 4:2:2     */
-      //"HI240" =>    fourcc('H','I','2','4'), /*  8  8-bit color   */
-      //"HM12" =>     fourcc('H','M','1','2'), /*  8  YUV 4:2:0 16x16 macroblocks */
+        /*  The following formats are not defined in the V4L2 specification */
+        "*YUV410" =>   fourcc('Y','U','V','9'), /*  9  YUV 4:1:0     */
+        "*YUV420" =>   fourcc('Y','U','1','2'), /* 12  YUV 4:2:0     */
+        //"YYUV" =>     fourcc('Y','Y','U','V'), /* 16  YUV 4:2:2     */
+        //"HI240" =>    fourcc('H','I','2','4'), /*  8  8-bit color   */
+        //"HM12" =>     fourcc('H','M','1','2'), /*  8  YUV 4:2:0 16x16 macroblocks */
 
-      /* see http://www.siliconimaging.com/RGB%20Bayer.htm */
-      //"SBGGR8" =>   fourcc('B','A','8','1'), /*  8  BGBG.. GRGR.. */
-      //"SGBRG8" =>   fourcc('G','B','R','G'), /*  8  GBGB.. RGRG.. */
-      //"SBGGR16" =>  fourcc('B','Y','R','2'), /* 16  BGBG.. GRGR.. */
+        /* see http://www.siliconimaging.com/RGB%20Bayer.htm */
+        //"SBGGR8" =>   fourcc('B','A','8','1'), /*  8  BGBG.. GRGR.. */
+        //"SGBRG8" =>   fourcc('G','B','R','G'), /*  8  GBGB.. RGRG.. */
+        //"SBGGR16" =>  fourcc('B','Y','R','2'), /* 16  BGBG.. GRGR.. */
 
-      /*  Vendor-specific formats   */
-      //"WNVA" =>     fourcc('W','N','V','A'), /* Winnov hw compress */
-      //"SN9C10X" =>  fourcc('S','9','1','0'), /* SN9C10x compression */
-      //"PWC1" =>     fourcc('P','W','C','1'), /* pwc older webcam */
-      //"PWC2" =>     fourcc('P','W','C','2'), /* pwc newer webcam */
-      //"ET61X251" => fourcc('E','6','2','5'), /* ET61X251 compression */
-      //"SPCA501" =>  fourcc('S','5','0','1'), /* YUYV per line */
-      //"SPCA505" =>  fourcc('S','5','0','5'), /* YYUV per line */
-      //"SPCA508" =>  fourcc('S','5','0','8'), /* YUVY per line */
-      //"SPCA561" =>  fourcc('S','5','6','1'), /* compressed GBRG bayer */
-      //"PAC207" =>   fourcc('P','2','0','7'), /* compressed BGGR bayer */
-      //"PJPG" =>     fourcc('P','J','P','G'), /* Pixart 73xx JPEG */
-      //"YVYU" =>     fourcc('Y','V','Y','U'), /* 16  YVU 4:2:2     */
-      );
+        /*  Vendor-specific formats   */
+        //"WNVA" =>     fourcc('W','N','V','A'), /* Winnov hw compress */
+        //"SN9C10X" =>  fourcc('S','9','1','0'), /* SN9C10x compression */
+        //"PWC1" =>     fourcc('P','W','C','1'), /* pwc older webcam */
+        //"PWC2" =>     fourcc('P','W','C','2'), /* pwc newer webcam */
+        //"ET61X251" => fourcc('E','6','2','5'), /* ET61X251 compression */
+        //"SPCA501" =>  fourcc('S','5','0','1'), /* YUYV per line */
+        //"SPCA505" =>  fourcc('S','5','0','5'), /* YYUV per line */
+        //"SPCA508" =>  fourcc('S','5','0','8'), /* YUVY per line */
+        //"SPCA561" =>  fourcc('S','5','6','1'), /* compressed GBRG bayer */
+        //"PAC207" =>   fourcc('P','2','0','7'), /* compressed BGGR bayer */
+        //"PJPG" =>     fourcc('P','J','P','G'), /* Pixart 73xx JPEG */
+        //"YVYU" =>     fourcc('Y','V','Y','U'), /* 16  YVU 4:2:2     */
+    );
 }
 
 $Colours = array(
     translate('8BitGrey')    => 1,
     translate('24BitColour') => 3,
     translate('32BitColour') => 4
-    );
+);
 
 $orientations = array(
     translate('Normal')      => '0',
@@ -398,7 +397,7 @@ $orientations = array(
     translate('RotateLeft')  => '270',
     translate('FlippedHori') => 'hori',
     translate('FlippedVert') => 'vert'
-    );
+);
 
 $deinterlaceopts = array(
     "Disabled"                                            => 0x00000000,
@@ -409,7 +408,7 @@ $deinterlaceopts = array(
     "Linear"                                              => 0x00000002,
     "Blend"                                               => 0x00000003,
     "Blend (25%)"                                         => 0x00000205
-    );
+);
 
 $deinterlaceopts_v4l2 = array(
     "Disabled"                                            => 0x00000000,
@@ -425,7 +424,7 @@ $deinterlaceopts_v4l2 = array(
     "V4L2: Alternate fields (Bob)"                        => 0x07000000,
     "V4L2: Progressive"                                   => 0x01000000,
     "V4L2: Interlaced"                                    => 0x04000000
-    );
+);
 
 $fastblendopts = array(
     "No blending"                                         => 0,
@@ -435,7 +434,7 @@ $fastblendopts = array(
     "12.5% (Outdoor)"                                     => 12,
     "25%"                                                 => 25,
     "50%"                                                 => 50
-    );
+);
 
 $fastblendopts_alarm = array(
     "No blending (Alarm lasts forever)"                   => 0,
@@ -445,12 +444,12 @@ $fastblendopts_alarm = array(
     "12.5%"                                               => 12,
     "25%"                                                 => 25,
     "50% (Alarm lasts a moment)"                          => 50
-    );
+);
 
 $label_size = array(
     "Default"                                             => 1,
     "Large"                                               => 2
-    );
+);
 
 $savejpegopts = array(
     "Disabled"                                            => 0,
@@ -458,493 +457,499 @@ $savejpegopts = array(
     "Analysis images only (if available)"                 => 2,
     "Frames + Analysis images (if available)"             => 3,
     "Snapshot Only"                                       => 4          
-    );
+);
 
 $videowriteropts = array(
     "Disabled"                                            => 0,
     "X264 Encode"                                         => 1,
     "H264 Camera Passthrough"                             => 2          
-    );
+);
 
-xhtmlHeaders(__FILE__, translate('Monitor')." - ".validHtmlStr($monitor->Name) );
+xhtmlHeaders(__FILE__, translate('Monitor')." - ".validHtmlStr($monitor['Name']) );
 ?>
 <body>
   <div id="page">
     <div id="header">
-<?php if ( canEdit( 'Monitors' ) ) { ?>
-    <?php if ( isset ($_REQUEST['dupId'])) { ?>
-    <div class="alert alert-info">
-      Configuration cloned from Monitor: <?php echo $clonedName ?>
-    </div>
-    <?php } ?>
-  <div id="headerButtons">
-    <a href="#" onclick="createPopup( '?view=monitorprobe&amp;mid=<?php echo $monitor->Id ?>', 'zmMonitorProbe<?php echo $monitor->Id ?>', 'monitorprobe' ); return( false );"><?php echo translate('Probe') ?></a>
-    <?php if ( ZM_HAS_ONVIF ) { ?>
-        <a href="#" onclick="createPopup( '?view=onvifprobe&amp;mid=<?php echo $monitor->Id ?>', 'zmOnvifProbe<?php echo $monitor->Id ?>', 'onvifprobe' ); return( false );"><?php echo  translate('OnvifProbe') ?></a>
-    <?php } ?>
-    <a href="#" onclick="createPopup( '?view=monitorpreset&amp;mid=<?php echo $monitor->Id ?>', 'zmMonitorPreset<?php echo $monitor->Id ?>', 'monitorpreset' ); return( false );"><?php echo translate('Presets') ?></a>
-    </div>
-<?php } ?>
-<h2><?php echo translate('Monitor') ?> - <?php echo validHtmlStr($monitor->Name) ?><?php if ( !empty($monitor->Id) ) { ?> (<?php echo $monitor->Id ?>)<?php } ?></h2>
-</div>
-<div id="content">
-  <ul class="tabList">
+<?php
+if ( canEdit( 'Monitors' ) ) {
+  if ( isset ($_REQUEST['dupId'])) {
+    $dupId = $_REQUEST['dupId'];
+?>
+      <div class="alert alert-info">
+        Configuration cloned from Monitor: <?php echo $clonedName ?>
+      </div>
+<?php 
+  }
+?>
+      <div id="headerButtons">
+        <a href="#" onclick="createPopup( '?view=monitorprobe&amp;mid=<?php echo $monitor['Id'] ?>', 'zmMonitorProbe<?php echo $monitor['Id'] ?>', 'monitorprobe' ); return( false );"><?php echo translate('Probe') ?></a>
   <?php
-foreach ( $tabs as $name=>$value ) {
-  if ( $tab == $name ) {
+  if ( ZM_HAS_ONVIF ) {
   ?>
-    <li class="active"><?php echo $value ?></li>
-  <?php
-  } else {
-    ?>
-    <li><a href="#" onclick="submitTab( '<?php echo $name ?>' ); return( false );"><?php echo $value ?></a></li>
+        <a href="#" onclick="createPopup( '?view=onvifprobe&amp;mid=<?php echo $monitor['Id'] ?>', 'zmOnvifProbe<?php echo $monitor['Id'] ?>', 'onvifprobe' ); return( false );"><?php echo  translate('OnvifProbe') ?></a>
   <?php
   }
+  ?>
+        <a href="#" onclick="createPopup( '?view=monitorpreset&amp;mid=<?php echo $monitor['Id'] ?>', 'zmMonitorPreset<?php echo $monitor['Id'] ?>', 'monitorpreset' ); return( false );"><?php echo translate('Presets') ?></a>
+      </div>
+<?php
 }
 ?>
-</ul>
-<div class="clear"></div>
-<form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>" onsubmit="return validateForm( this )">
-  <input type="hidden" name="view" value="<?php echo $view ?>"/>
-  <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
-  <input type="hidden" name="action" value="monitor"/>
-  <input type="hidden" name="mid" value="<?php echo $monitor->Id ?>"/>
-  <input type="hidden" name="newMonitor[LinkedMonitors]" value="<?php echo isset($monitor->LinkedMonitors)?$monitor->LinkedMonitors:'' ?>"/>
-  <input type="hidden" name="origMethod" value="<?php echo isset($monitor->Method)?$monitor->Method:'' ?>"/>
+      <h2><?php echo translate('Monitor') ?> - <?php echo validHtmlStr($monitor['Name']) ?><?php if ( !empty($monitor['Id']) ) { ?> (<?php echo $monitor['Id'] ?>)<?php } ?></h2>
+    </div>
+    <div id="content">
+      <ul class="tabList">
 <?php
-if ( $tab != 'general' ) {
+  foreach ( $tabs as $name=>$value ) {
+    if ( $tab == $name ) {
 ?>
-    <input type="hidden" name="newMonitor[Name]" value="<?php echo validHtmlStr($monitor->Name) ?>"/>
-    <input type="hidden" name="newMonitor[ServerId]" value="<?php echo validHtmlStr($monitor->ServerId() ) ?>"/>
-    <input type="hidden" name="newMonitor[Type]" value="<?php echo validHtmlStr($monitor->Type) ?>"/>
-    <input type="hidden" name="newMonitor[Function]" value="<?php echo validHtmlStr($monitor->Function) ?>"/>
-    <input type="hidden" name="newMonitor[Enabled]" value="<?php echo validHtmlStr($monitor->Enabled) ?>"/>
-    <input type="hidden" name="newMonitor[RefBlendPerc]" value="<?php echo validHtmlStr($monitor->RefBlendPerc) ?>"/>
-    <input type="hidden" name="newMonitor[AlarmRefBlendPerc]" value="<?php echo validHtmlStr($monitor->AlarmRefBlendPerc) ?>"/>
-    <input type="hidden" name="newMonitor[AnalysisFPS]" value="<?php echo validHtmlStr($monitor->AnalysisFPS) ?>"/>
-    <input type="hidden" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($monitor->MaxFPS) ?>"/>
-    <input type="hidden" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($monitor->AlarmMaxFPS) ?>"/>
-    <?php
-    if ( isset($monitor->Triggers) ) {
-      foreach( explode( ',', isset($monitor->Triggers)?$monitor->Triggers:"" ) as $newTrigger ) {
-        ?>
-          <input type="hidden" name="newMonitor[Triggers][]" value="<?php echo validHtmlStr($newTrigger) ?>"/>
-          <?php
-      }
+        <li class="active"><?php echo $value ?></li>
+<?php
+    } else {
+?>
+        <li><a href="#" onclick="submitTab( '<?php echo $name ?>' ); return( false );"><?php echo $value ?></a></li>
+<?php
     }
 }
-if ( ZM_HAS_V4L && ($tab != 'source' || $monitor->Type != 'Local') ) {
-  ?>
-    <input type="hidden" name="newMonitor[Device]" value="<?php echo validHtmlStr($monitor->Device) ?>"/>
-    <input type="hidden" name="newMonitor[Channel]" value="<?php echo validHtmlStr($monitor->Channel) ?>"/>
-    <input type="hidden" name="newMonitor[Format]" value="<?php echo validHtmlStr($monitor->Format) ?>"/>
-    <input type="hidden" name="newMonitor[Palette]" value="<?php echo validHtmlStr($monitor->Palette) ?>"/>
-    <input type="hidden" name="newMonitor[V4LMultiBuffer]" value="<?php echo validHtmlStr($monitor->V4LMultiBuffer) ?>"/>
-    <input type="hidden" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo validHtmlStr($monitor->V4LCapturesPerFrame) ?>"/>
-    <?php
+?>
+      </ul>
+      <div class="clear"></div>
+      <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>" onsubmit="return validateForm( this )">
+        <input type="hidden" name="view" value="<?php echo $view ?>"/>
+        <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
+        <input type="hidden" name="action" value="monitor"/>
+        <input type="hidden" name="mid" value="<?php echo $monitor['Id'] ?>"/>
+        <input type="hidden" name="newMonitor[LinkedMonitors]" value="<?php echo isset($newMonitor['LinkedMonitors'])?$newMonitor['LinkedMonitors']:'' ?>"/>
+        <input type="hidden" name="origMethod" value="<?php echo isset($newMonitor['Method'])?$newMonitor['Method']:'' ?>"/>
+<?php
+    if ( $tab != 'general' ) {
+?>
+        <input type="hidden" name="newMonitor[Name]" value="<?php echo validHtmlStr($newMonitor['Name']) ?>"/>
+        <input type="hidden" name="newMonitor[ServerId]" value="<?php echo validHtmlStr($newMonitor['ServerId']) ?>"/>
+        <input type="hidden" name="newMonitor[Type]" value="<?php echo validHtmlStr($newMonitor['Type']) ?>"/>
+        <input type="hidden" name="newMonitor[Function]" value="<?php echo validHtmlStr($newMonitor['Function']) ?>"/>
+        <input type="hidden" name="newMonitor[Enabled]" value="<?php echo validHtmlStr($newMonitor['Enabled']) ?>"/>
+        <input type="hidden" name="newMonitor[RefBlendPerc]" value="<?php echo validHtmlStr($newMonitor['RefBlendPerc']) ?>"/>
+        <input type="hidden" name="newMonitor[AlarmRefBlendPerc]" value="<?php echo validHtmlStr($newMonitor['AlarmRefBlendPerc']) ?>"/>
+        <input type="hidden" name="newMonitor[AnalysisFPS]" value="<?php echo validHtmlStr($newMonitor['AnalysisFPS']) ?>"/>
+        <input type="hidden" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($newMonitor['MaxFPS']) ?>"/>
+        <input type="hidden" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($newMonitor['AlarmMaxFPS']) ?>"/>
+<?php
+    if ( isset($newMonitor['Triggers']) ) {
+        foreach( $newMonitor['Triggers'] as $newTrigger ) {
+?>
+        <input type="hidden" name="newMonitor[Triggers][]" value="<?php echo validHtmlStr($newTrigger) ?>"/>
+<?php
+        }
+    }
 }
-if ( $tab != 'source' || $monitor->Type != 'Remote' )
-{
-  ?>
-    <input type="hidden" name="newMonitor[Protocol]" value="<?php echo validHtmlStr($monitor->Protocol()) ?>"/>
-    <input type="hidden" name="newMonitor[Host]" value="<?php echo validHtmlStr($monitor->Host) ?>"/>
-    <input type="hidden" name="newMonitor[Port]" value="<?php echo validHtmlStr($monitor->Port) ?>"/>
-    <?php
+    if ( ZM_HAS_V4L && ($tab != 'source' || $newMonitor['Type'] != 'Local') ) {
+?>
+    <input type="hidden" name="newMonitor[Device]" value="<?php echo validHtmlStr($newMonitor['Device']) ?>"/>
+    <input type="hidden" name="newMonitor[Channel]" value="<?php echo validHtmlStr($newMonitor['Channel']) ?>"/>
+    <input type="hidden" name="newMonitor[Format]" value="<?php echo validHtmlStr($newMonitor['Format']) ?>"/>
+    <input type="hidden" name="newMonitor[Palette]" value="<?php echo validHtmlStr($newMonitor['Palette']) ?>"/>
+    <input type="hidden" name="newMonitor[V4LMultiBuffer]" value="<?php echo validHtmlStr($newMonitor['V4LMultiBuffer']) ?>"/>
+    <input type="hidden" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo validHtmlStr($newMonitor['V4LCapturesPerFrame']) ?>"/>
+<?php
+    }
+    if ( $tab != 'source' || $newMonitor['Type'] != 'Remote' ) {
+?>
+    <input type="hidden" name="newMonitor[Protocol]" value="<?php echo validHtmlStr($newMonitor['Protocol']) ?>"/>
+    <input type="hidden" name="newMonitor[Host]" value="<?php echo validHtmlStr($newMonitor['Host']) ?>"/>
+    <input type="hidden" name="newMonitor[Port]" value="<?php echo validHtmlStr($newMonitor['Port']) ?>"/>
+<?php
+    }
+    if ( $tab != 'source' || ($newMonitor['Type'] != 'Local' && $newMonitor['Type'] != 'Remote' && $newMonitor['Type'] != 'Ffmpeg' && $newMonitor['Type'] != 'Libvlc') ) {
+?>
+    <input type="hidden" name="newMonitor[Method]" value="<?php echo validHtmlStr($newMonitor['Method']) ?>"/>
+<?php
+    }
+    if ( $tab != 'source' || ($newMonitor['Type'] != 'Ffmpeg' && $newMonitor['Type'] != 'Libvlc' )) {
+?>
+    <input type="hidden" name="newMonitor[Options]" value="<?php echo validHtmlStr($newMonitor['Options']) ?>"/>
+<?php
+    }
+    if ( $tab != 'source' || ($newMonitor['Type'] != 'Remote' && $newMonitor['Type'] != 'File' && $newMonitor['Type'] != 'Ffmpeg' && $newMonitor['Type'] != 'Libvlc' && $newMonitor['Type'] != 'cURL') ) {
+?>
+    <input type="hidden" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>"/>
+    <input type="hidden" name="newMonitor[User]" value="<?php echo validHtmlStr($newMonitor['User']) ?>"/>
+    <input type="hidden" name="newMonitor[Pass]" value="<?php echo validHtmlStr($newMonitor['Pass']) ?>"/>
+<?php
 }
-if ( $tab != 'source' || ($monitor->Type != 'Local' && $monitor->Type != 'Remote' && $monitor->Type != 'Ffmpeg' && $monitor->Type != 'Libvlc') )
-{
-  ?>
-    <input type="hidden" name="newMonitor[Method]" value="<?php echo validHtmlStr($monitor->Method) ?>"/>
-    <?php
-}
-if ( $tab != 'source' || ($monitor->Type != 'Ffmpeg' && $monitor->Type != 'Libvlc' ))
-{
-  ?>
-    <input type="hidden" name="newMonitor[Options]" value="<?php echo validHtmlStr($monitor->Options) ?>"/>
-    <?php
-}
-if ( $tab != 'source' || ($monitor->Type != 'Remote' && $monitor->Type != 'File' && $monitor->Type != 'Ffmpeg' && $monitor->Type != 'Libvlc' && $monitor->Type != 'cURL') )
-{
-  ?>
-    <input type="hidden" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path) ?>"/>
-    <input type="hidden" name="newMonitor[User]" value="<?php echo validHtmlStr($monitor->User) ?>"/>
-    <input type="hidden" name="newMonitor[Pass]" value="<?php echo validHtmlStr($monitor->Pass) ?>"/>
-    <?php
-}
-if ( $tab != 'source' )
-{
-  ?>
-    <input type="hidden" name="newMonitor[Colours]" value="<?php echo validHtmlStr($monitor->Colours) ?>"/>
-    <input type="hidden" name="newMonitor[Width]" value="<?php echo validHtmlStr($monitor->Width) ?>"/>
-    <input type="hidden" name="newMonitor[Height]" value="<?php echo validHtmlStr($monitor->Height) ?>"/>
-    <input type="hidden" name="newMonitor[Orientation]" value="<?php echo validHtmlStr($monitor->Orientation) ?>"/>
-    <input type="hidden" name="newMonitor[Deinterlacing]" value="<?php echo validHtmlStr($monitor->Deinterlacing) ?>"/>
-    <?php
+if ( $tab != 'source' ) {
+?>
+    <input type="hidden" name="newMonitor[Colours]" value="<?php echo validHtmlStr($newMonitor['Colours']) ?>"/>
+    <input type="hidden" name="newMonitor[Width]" value="<?php echo validHtmlStr($newMonitor['Width']) ?>"/>
+    <input type="hidden" name="newMonitor[Height]" value="<?php echo validHtmlStr($newMonitor['Height']) ?>"/>
+    <input type="hidden" name="newMonitor[Orientation]" value="<?php echo validHtmlStr($newMonitor['Orientation']) ?>"/>
+    <input type="hidden" name="newMonitor[Deinterlacing]" value="<?php echo validHtmlStr($newMonitor['Deinterlacing']) ?>"/>
+<?php
 }
 if ( $tab != 'storage' ) {
-  ?>
-    <input type="hidden" name="newMonitor[SaveJPEGs]" value="<?php echo validHtmlStr($monitor->SaveJPEGs) ?>"/>
-    <input type="hidden" name="newMonitor[VideoWriter]" value="<?php echo validHtmlStr($monitor->VideoWriter) ?>"/>
-    <input type="hidden" name="newMonitor[EncoderParameters]" value="<?php echo validHtmlStr($monitor->EncoderParameters) ?>"/>
-    <input type="hidden" name="newMonitor[RecordAudio]" value="<?php echo validHtmlStr($monitor->RecordAudio) ?>"/>
-    <?php
+?>
+    <input type="hidden" name="newMonitor[SaveJPEGs]" value="<?php echo validHtmlStr($newMonitor['SaveJPEGs']) ?>"/>
+    <input type="hidden" name="newMonitor[VideoWriter]" value="<?php echo validHtmlStr($newMonitor['VideoWriter']) ?>"/>
+    <input type="hidden" name="newMonitor[EncoderParameters]" value="<?php echo validHtmlStr($newMonitor['EncoderParameters']) ?>"/>
+    <input type="hidden" name="newMonitor[RecordAudio]" value="<?php echo validHtmlStr($newMonitor['RecordAudio']) ?>"/>
+<?php
 }
-if ( $tab != 'source' || ($monitor->Type != 'Remote' && $monitor->Protocol != 'rtsp'))
-{
-  ?>
-    <input type="hidden" name="newMonitor[RTSPDescribe]" value="<?php echo validHtmlStr($monitor->RTSPDescribe) ?>"/>
-    <?php
+if ( $tab != 'source' || ($newMonitor['Type'] != 'Remote' && $newMonitor['Protocol'] != 'RTSP')) {
+?>
+    <input type="hidden" name="newMonitor[RTSPDescribe]" value="<?php echo validHtmlStr($newMonitor['RTSPDescribe']) ?>"/>
+<?php
 }
-if ( $tab != 'timestamp' )
-{
-  ?>
-    <input type="hidden" name="newMonitor[LabelFormat]" value="<?php echo validHtmlStr($monitor->LabelFormat) ?>"/>
-    <input type="hidden" name="newMonitor[LabelX]" value="<?php echo validHtmlStr($monitor->LabelX) ?>"/>
-    <input type="hidden" name="newMonitor[LabelY]" value="<?php echo validHtmlStr($monitor->LabelY) ?>"/>
-    <input type="hidden" name="newMonitor[LabelSize]" value="<?php echo validHtmlStr($monitor->LabelSize) ?>"/>
-    <?php
+if ( $tab != 'timestamp' ) {
+?>
+    <input type="hidden" name="newMonitor[LabelFormat]" value="<?php echo validHtmlStr($newMonitor['LabelFormat']) ?>"/>
+    <input type="hidden" name="newMonitor[LabelX]" value="<?php echo validHtmlStr($newMonitor['LabelX']) ?>"/>
+    <input type="hidden" name="newMonitor[LabelY]" value="<?php echo validHtmlStr($newMonitor['LabelY']) ?>"/>
+    <input type="hidden" name="newMonitor[LabelSize]" value="<?php echo validHtmlStr($newMonitor['LabelSize']) ?>"/>
+<?php
 }
-if ( $tab != 'buffers' )
-{
-  ?>
-    <input type="hidden" name="newMonitor[ImageBufferCount]" value="<?php echo validHtmlStr($monitor->ImageBufferCount) ?>"/>
-    <input type="hidden" name="newMonitor[WarmupCount]" value="<?php echo validHtmlStr($monitor->WarmupCount) ?>"/>
-    <input type="hidden" name="newMonitor[PreEventCount]" value="<?php echo validHtmlStr($monitor->PreEventCount) ?>"/>
-    <input type="hidden" name="newMonitor[PostEventCount]" value="<?php echo validHtmlStr($monitor->PostEventCount) ?>"/>
-    <input type="hidden" name="newMonitor[StreamReplayBuffer]" value="<?php echo validHtmlStr($monitor->StreamReplayBuffer) ?>"/>
-    <input type="hidden" name="newMonitor[AlarmFrameCount]" value="<?php echo validHtmlStr($monitor->AlarmFrameCount) ?>"/>
-    <?php
+if ( $tab != 'buffers' ) {
+?>
+    <input type="hidden" name="newMonitor[ImageBufferCount]" value="<?php echo validHtmlStr($newMonitor['ImageBufferCount']) ?>"/>
+    <input type="hidden" name="newMonitor[WarmupCount]" value="<?php echo validHtmlStr($newMonitor['WarmupCount']) ?>"/>
+    <input type="hidden" name="newMonitor[PreEventCount]" value="<?php echo validHtmlStr($newMonitor['PreEventCount']) ?>"/>
+    <input type="hidden" name="newMonitor[PostEventCount]" value="<?php echo validHtmlStr($newMonitor['PostEventCount']) ?>"/>
+    <input type="hidden" name="newMonitor[StreamReplayBuffer]" value="<?php echo validHtmlStr($newMonitor['StreamReplayBuffer']) ?>"/>
+    <input type="hidden" name="newMonitor[AlarmFrameCount]" value="<?php echo validHtmlStr($newMonitor['AlarmFrameCount']) ?>"/>
+<?php
 }
-if ( ZM_OPT_CONTROL && $tab != 'control' )
-{
-  ?>
-    <input type="hidden" name="newMonitor[Controllable]" value="<?php echo validHtmlStr($monitor->Controllable) ?>"/>
-    <input type="hidden" name="newMonitor[ControlId]" value="<?php echo validHtmlStr($monitor->ControlId) ?>"/>
-    <input type="hidden" name="newMonitor[ControlDevice]" value="<?php echo validHtmlStr($monitor->ControlDevice) ?>"/>
-    <input type="hidden" name="newMonitor[ControlAddress]" value="<?php echo validHtmlStr($monitor->ControlAddress) ?>"/>
-    <input type="hidden" name="newMonitor[AutoStopTimeout]" value="<?php echo validHtmlStr($monitor->AutoStopTimeout) ?>"/>
-    <input type="hidden" name="newMonitor[TrackMotion]" value="<?php echo validHtmlStr($monitor->TrackMotion) ?>"/>
-    <input type="hidden" name="newMonitor[TrackDelay]" value="<?php echo validHtmlStr($monitor->TrackDelay) ?>"/>
-    <input type="hidden" name="newMonitor[ReturnLocation]" value="<?php echo validHtmlStr($monitor->ReturnLocation) ?>"/>
-    <input type="hidden" name="newMonitor[ReturnDelay]" value="<?php echo validHtmlStr($monitor->ReturnDelay) ?>"/>
-    <?php
+if ( ZM_OPT_CONTROL && $tab != 'control' ) {
+?>
+    <input type="hidden" name="newMonitor[Controllable]" value="<?php echo validHtmlStr($newMonitor['Controllable']) ?>"/>
+    <input type="hidden" name="newMonitor[ControlId]" value="<?php echo validHtmlStr($newMonitor['ControlId']) ?>"/>
+    <input type="hidden" name="newMonitor[ControlDevice]" value="<?php echo validHtmlStr($newMonitor['ControlDevice']) ?>"/>
+    <input type="hidden" name="newMonitor[ControlAddress]" value="<?php echo validHtmlStr($newMonitor['ControlAddress']) ?>"/>
+    <input type="hidden" name="newMonitor[AutoStopTimeout]" value="<?php echo validHtmlStr($newMonitor['AutoStopTimeout']) ?>"/>
+    <input type="hidden" name="newMonitor[TrackMotion]" value="<?php echo validHtmlStr($newMonitor['TrackMotion']) ?>"/>
+    <input type="hidden" name="newMonitor[TrackDelay]" value="<?php echo validHtmlStr($newMonitor['TrackDelay']) ?>"/>
+    <input type="hidden" name="newMonitor[ReturnLocation]" value="<?php echo validHtmlStr($newMonitor['ReturnLocation']) ?>"/>
+    <input type="hidden" name="newMonitor[ReturnDelay]" value="<?php echo validHtmlStr($newMonitor['ReturnDelay']) ?>"/>
+<?php
 }
-if ( ZM_OPT_X10 && $tab != 'x10' )
-{
-  ?>
+if ( ZM_OPT_X10 && $tab != 'x10' ) {
+?>
     <input type="hidden" name="newX10Monitor[Activation]" value="<?php echo validHtmlStr($newX10Monitor['Activation']) ?>"/>
     <input type="hidden" name="newX10Monitor[AlarmInput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmInput']) ?>"/>
     <input type="hidden" name="newX10Monitor[AlarmOutput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmOutput']) ?>"/>
-    <?php
+<?php
 }
-if ( $tab != 'misc' )
-{
-  ?>
-    <input type="hidden" name="newMonitor[EventPrefix]" value="<?php echo validHtmlStr($monitor->EventPrefix) ?>"/>
-    <input type="hidden" name="newMonitor[SectionLength]" value="<?php echo validHtmlStr($monitor->SectionLength) ?>"/>
-    <input type="hidden" name="newMonitor[FrameSkip]" value="<?php echo validHtmlStr($monitor->FrameSkip) ?>"/>
-    <input type="hidden" name="newMonitor[MotionFrameSkip]" value="<?php echo validHtmlStr($monitor->MotionFrameSkip) ?>"/>
-    <input type="hidden" name="newMonitor[AnalysisUpdateDelay]" value="<?php echo validHtmlStr($monitor->AnalysisUpdateDelay) ?>"/>
-    <input type="hidden" name="newMonitor[FPSReportInterval]" value="<?php echo validHtmlStr($monitor->FPSReportInterval) ?>"/>
-    <input type="hidden" name="newMonitor[DefaultView]" value="<?php echo validHtmlStr($monitor->DefaultView) ?>"/>
-    <input type="hidden" name="newMonitor[DefaultRate]" value="<?php echo validHtmlStr($monitor->DefaultRate) ?>"/>
-    <input type="hidden" name="newMonitor[DefaultScale]" value="<?php echo validHtmlStr($monitor->DefaultScale) ?>"/>
-    <input type="hidden" name="newMonitor[WebColour]" value="<?php echo validHtmlStr($monitor->WebColour) ?>"/>
-    <input type="hidden" name="newMonitor[Exif]" value="<?php echo validHtmlStr($monitor->Exif) ?>"/>
-    <?php
+if ( $tab != 'misc' ) {
+?>
+    <input type="hidden" name="newMonitor[EventPrefix]" value="<?php echo validHtmlStr($newMonitor['EventPrefix']) ?>"/>
+    <input type="hidden" name="newMonitor[SectionLength]" value="<?php echo validHtmlStr($newMonitor['SectionLength']) ?>"/>
+    <input type="hidden" name="newMonitor[FrameSkip]" value="<?php echo validHtmlStr($newMonitor['FrameSkip']) ?>"/>
+    <input type="hidden" name="newMonitor[MotionFrameSkip]" value="<?php echo validHtmlStr($newMonitor['MotionFrameSkip']) ?>"/>
+    <input type="hidden" name="newMonitor[AnalysisUpdateDelay]" value="<?php echo validHtmlStr($newMonitor['AnalysisUpdateDelay']) ?>"/>
+    <input type="hidden" name="newMonitor[FPSReportInterval]" value="<?php echo validHtmlStr($newMonitor['FPSReportInterval']) ?>"/>
+    <input type="hidden" name="newMonitor[DefaultView]" value="<?php echo validHtmlStr($newMonitor['DefaultView']) ?>"/>
+    <input type="hidden" name="newMonitor[DefaultRate]" value="<?php echo validHtmlStr($newMonitor['DefaultRate']) ?>"/>
+    <input type="hidden" name="newMonitor[DefaultScale]" value="<?php echo validHtmlStr($newMonitor['DefaultScale']) ?>"/>
+    <input type="hidden" name="newMonitor[WebColour]" value="<?php echo validHtmlStr($newMonitor['WebColour']) ?>"/>
+    <input type="hidden" name="newMonitor[Exif]" value="<?php echo validHtmlStr($newMonitor['Exif']) ?>"/>
+<?php
 }
-if ( ZM_HAS_V4L && ($tab != 'misc' || $monitor->Type != 'Local') )
-{
-  ?>
-    <input type="hidden" name="newMonitor[SignalCheckColour]" value="<?php echo validHtmlStr($monitor->SignalCheckColour) ?>"/>
-    <?php
+if ( ZM_HAS_V4L && ($tab != 'misc' || $newMonitor['Type'] != 'Local') ) {
+?>
+    <input type="hidden" name="newMonitor[SignalCheckColour]" value="<?php echo validHtmlStr($newMonitor['SignalCheckColour']) ?>"/>
+<?php
 }
 ?>
-<table id="contentTable" class="major" cellspacing="0">
-<tbody>
-  <?php
-switch ( $tab )
-{
-  case 'general' :
+        <table id="contentTable" class="major" cellspacing="0">
+          <tbody>
+<?php
+switch ( $tab ) {
+    case 'general' :
     {
-      ?>
-        <tr><td><?php echo translate('Name') ?></td><td><input type="text" name="newMonitor[Name]" value="<?php echo validHtmlStr($monitor->Name) ?>" size="16"/></td></tr>
-        <tr><td><?php echo translate('Server') ?></td><td>
-        <?php 
-        $servers = array(''=>'None');
-      $result = dbQuery( 'SELECT * FROM Servers ORDER BY Name');
-      $results = $result->fetchALL(PDO::FETCH_CLASS | PDO::FETCH_PROPS_LATE, 'Server' );
-      foreach ( $results as $row => $server_obj ) {
-        $servers[$server_obj->Id()] = $server_obj->Name();
-      }
-      echo htmlSelect( "newMonitor[ServerId]", $servers, $monitor->ServerId() );
-      ?>
-        </td></tr>
-        <tr><td><?php echo translate('SourceType') ?></td><td><?php echo htmlSelect( "newMonitor[Type]", $sourceTypes, $monitor->Type() ); ?></td></tr>
-        <tr><td><?php echo translate('Function') ?></td><td><select name="newMonitor[Function]">
-        <?php
-        foreach ( getEnumValues( 'Monitors', 'Function' ) as $optFunction )
-        {
-          ?>
-            <option value="<?php echo $optFunction ?>"<?php if ( $optFunction == $monitor->Function ) { ?> selected="selected"<?php } ?>><?php echo translate('Fn'.$optFunction) ?></option>
-            <?php
+?>
+            <tr><td><?php echo translate('Name') ?></td><td><input type="text" name="newMonitor[Name]" value="<?php echo validHtmlStr($newMonitor['Name']) ?>" size="16"/></td></tr>
+            <tr><td><?php echo translate('Server') ?></td><td>
+<?php 
+  $servers = array(''=>'None');
+  $result = dbQuery( 'SELECT * FROM Servers ORDER BY Name');
+  $results = $result->fetchALL(PDO::FETCH_CLASS | PDO::FETCH_PROPS_LATE, 'Server' );
+  foreach ( $results as $row => $server_obj ) {
+    $servers[$server_obj->Id] = $server_obj->Name();
+  }
+?>
+  <?php echo buildSelect( "newMonitor[ServerId]", $servers ); ?>
+</td></tr>
+            <tr><td><?php echo translate('SourceType') ?></td><td><?php echo buildSelect( "newMonitor[Type]", $sourceTypes ); ?></td></tr>
+            <tr><td><?php echo translate('Function') ?></td><td><select name="newMonitor[Function]">
+<?php
+        foreach ( getEnumValues( 'Monitors', 'Function' ) as $optFunction ) {
+?>
+              <option value="<?php echo $optFunction ?>"<?php if ( $optFunction == $newMonitor['Function'] ) { ?> selected="selected"<?php } ?>><?php echo translate('Fn'.$optFunction) ?></option>
+<?php
         }
-      ?>
-        </select></td></tr>
-        <tr><td><?php echo translate('Enabled') ?></td><td><input type="checkbox" name="newMonitor[Enabled]" value="1"<?php if ( !empty($monitor->Enabled) ) { ?> checked="checked"<?php } ?>/></td></tr>
-        <tr>
-        <td><?php echo translate('LinkedMonitors') ?></td>
-        <td>
-        <select name="monitorIds" size="4" multiple="multiple" onchange="updateLinkedMonitors( this )">
-        <?php
-        $monitors = dbFetchAll( "select Id,Name from Monitors order by Sequence asc" );
-      if ( !empty($monitor->LinkedMonitors) )
-        $monitorIds = array_flip( explode( ',', $monitor->LinkedMonitors ) );
-      else
+?>
+            </select></td></tr>
+            <tr><td><?php echo translate('Enabled') ?></td><td><input type="checkbox" name="newMonitor[Enabled]" value="1"<?php if ( !empty($newMonitor['Enabled']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr>
+              <td><?php echo translate('LinkedMonitors') ?></td>
+              <td>
+                <select name="monitorIds" size="4" multiple="multiple" onchange="updateLinkedMonitors( this )">
+<?php
+    $monitors = dbFetchAll( "select Id,Name from Monitors order by Sequence asc" );
+    if ( !empty($newMonitor['LinkedMonitors']) )
+        $monitorIds = array_flip( explode( ',', $newMonitor['LinkedMonitors'] ) );
+    else
         $monitorIds = array();
-      foreach ( $monitors as $linked_monitor ) {
-        if ( (empty($monitor->Id) || ($monitor->Id != $linked_monitor['Id'])) && visibleMonitor( $linked_monitor['Id'] ) ) {
-          ?>
-            <option value="<?php echo $linked_monitor['Id'] ?>"<?php if ( array_key_exists( $linked_monitor['Id'], $monitorIds ) ) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($linked_monitor['Name']) ?></option>
-            <?php
+    foreach ( $monitors as $monitor ) {
+        if ( (empty($newMonitor['Id']) || ($monitor['Id'] != $newMonitor['Id'])) && visibleMonitor( $monitor['Id'] ) ) {
+?>
+                  <option value="<?php echo $monitor['Id'] ?>"<?php if ( array_key_exists( $monitor['Id'], $monitorIds ) ) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($monitor['Name']) ?></option>
+<?php
         }
-      }
-      ?>
-        </select>
-        </td>
-        </tr>
-        <tr><td><?php echo translate('AnalysisFPS') ?></td><td><input type="text" name="newMonitor[AnalysisFPS]" value="<?php echo validHtmlStr($monitor->AnalysisFPS) ?>" size="6"/></td></tr>
-        <?php if ( $monitor->Type() != "Local" && $monitor->Type() != "File" ) { ?>
-            <tr>
-              <td><?php echo translate('MaximumFPS') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_MAXFPS', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td>
-              <td><input type="text" onclick="document.getElementById('newMonitor[MaxFPS]').innerHTML= ' CAUTION: See the help text'" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($monitor->MaxFPS) ?>" size="5"/><span id="newMonitor[MaxFPS]" style="color:red"></span></td>
+    }
+?>
+                </select>
+              </td>
             </tr>
-            <tr>
-              <td><?php echo translate('AlarmMaximumFPS') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_MAXFPS', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td>
-              <td><input type="text" onclick="document.getElementById('newMonitor[AlarmMaxFPS]').innerHTML= ' CAUTION: See the help text'" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($monitor->AlarmMaxFPS) ?>" size="5"/><span id="newMonitor[AlarmMaxFPS]" style="color:red"></span></td>
-            </tr>
-        <?php } else { ?>
-            <tr><td><?php echo translate('MaximumFPS') ?></td><td><input type="text" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($monitor->MaxFPS) ?>" size="5"/></td></tr>
-            <tr><td><?php echo translate('AlarmMaximumFPS') ?></td><td><input type="text" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($monitor->AlarmMaxFPS) ?>" size="5"/></td></tr>
-        <?php
+            <tr><td><?php echo translate('AnalysisFPS') ?></td><td><input type="text" name="newMonitor[AnalysisFPS]" value="<?php echo validHtmlStr($newMonitor['AnalysisFPS']) ?>" size="6"/></td></tr>
+<?php
+    if ( $newMonitor['Type'] != 'Local' && $newMonitor['Type'] != 'File' ) {
+?>
+            <tr><td><?php echo translate('MaximumFPS') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_MAXFPS', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><input type="text" onclick="document.getElementById('newMonitor[MaxFPS]').innerHTML= ' CAUTION: See the help text'" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($newMonitor['MaxFPS']) ?>" size="5"/><span id="newMonitor[MaxFPS]" style="color:red"></span></td></tr>
+            <tr><td><?php echo translate('AlarmMaximumFPS') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_MAXFPS', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><input type="text" onclick="document.getElementById('newMonitor[AlarmMaxFPS]').innerHTML= ' CAUTION: See the help text'" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($newMonitor['AlarmMaxFPS']) ?>" size="5"/><span id="newMonitor[AlarmMaxFPS]" style="color:red"></span></td></tr>
+<?php
+    } else {
+?>
+            <tr><td><?php echo translate('MaximumFPS') ?></td><td><input type="text" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($newMonitor['MaxFPS']) ?>" size="5"/></td></tr>
+            <tr><td><?php echo translate('AlarmMaximumFPS') ?></td><td><input type="text" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($newMonitor['AlarmMaxFPS']) ?>" size="5"/></td></tr>
+<?php
+    }
+  if ( ZM_FAST_IMAGE_BLENDS )
+        {
+?>
+            <tr><td><?php echo translate('RefImageBlendPct') ?></td><td><select name="newMonitor[RefBlendPerc]"><?php foreach ( $fastblendopts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['RefBlendPerc'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+            <tr><td><?php echo translate('AlarmRefImageBlendPct') ?></td><td><select name="newMonitor[AlarmRefBlendPerc]"><?php foreach ( $fastblendopts_alarm as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['AlarmRefBlendPerc'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+<?php
+  } else {
+?>
+            <tr><td><?php echo translate('RefImageBlendPct') ?></td><td><input type="text" name="newMonitor[RefBlendPerc]" value="<?php echo validHtmlStr($newMonitor['RefBlendPerc']) ?>" size="4"/></td></tr>
+            <tr><td><?php echo translate('AlarmRefImageBlendPct') ?></td><td><input type="text" name="newMonitor[AlarmRefBlendPerc]" value="<?php echo validHtmlStr($newMonitor['AlarmRefBlendPerc']) ?>" size="4"/></td></tr>
+<?php
         }
-        if ( ZM_FAST_IMAGE_BLENDS ) {
-        ?>
-          <tr>
-            <td><?php echo translate('RefImageBlendPct') ?></td>
-            <td><select name="newMonitor[RefBlendPerc]"><?php foreach ( $fastblendopts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $monitor->RefBlendPerc() ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td>
-          </tr>
-          <tr>  
-            <td><?php echo translate('AlarmRefImageBlendPct') ?></td>
-            <td>
-              <select name="newMonitor[AlarmRefBlendPerc]">
-                <?php foreach ( $fastblendopts_alarm as $name => $value ) { ?>
-                  <option value="<?php echo $value ?>"<?php if ( $value == $monitor->AlarmRefBlendPerc() ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option>
-                <?php } ?>
-              </select></td></tr>
-          <?php
-      } else {
-        ?>
-          <tr><td><?php echo translate('RefImageBlendPct') ?></td><td><input type="text" name="newMonitor[RefBlendPerc]" value="<?php echo validHtmlStr($monitor->RefBlendPerc) ?>" size="4"/></td></tr>
-          <tr><td><?php echo translate('AlarmRefImageBlendPct') ?></td><td><input type="text" name="newMonitor[AlarmRefBlendPerc]" value="<?php echo validHtmlStr($monitor->AlarmRefBlendPerc) ?>" size="4"/></td></tr>
-          <?php
-      }
-      ?>
-        <tr><td><?php echo translate('Triggers') ?></td><td>
-        <?php
+?>
+            <tr><td><?php echo translate('Triggers') ?></td><td>
+<?php
         $optTriggers = getSetValues( 'Monitors', 'Triggers' );
         $breakCount = (int)(ceil(count($optTriggers)));
         $breakCount = min( 3, $breakCount );
         $optCount = 0;
         foreach( $optTriggers as $optTrigger ) {
-          if ( ( ! ZM_OPT_X10 ) && ( $optTrigger == 'X10' ) )
-            continue;
-          if ( $optCount && ($optCount%$breakCount == 0) )
-            echo '</br>';
-          echo '<input type="checkbox" name="newMonitor[Triggers][]" value="'. $optTrigger .'"';
-          if ( isset($monitor->Triggers) && is_array( $monitor->Triggers ) and in_array( $optTrigger, $monitor->Triggers ) ) {
-            echo ' checked="checked"';
-          }
-          echo '/>&nbsp;'. $optTrigger ;
-          $optCount ++;
-      }
-      if ( !$optCount ) {
-        ?>
-          <em><?php echo translate('NoneAvailable') ?></em>
-          <?php
-      }
-      ?>
-        </td></tr>
-        <?php
+            if ( !ZM_OPT_X10 && $optTrigger == 'X10' )
+                continue;
+            if ( $optCount && ($optCount%$breakCount == 0) )
+                echo "</br>";
+?>
+              <input type="checkbox" name="newMonitor[Triggers][]" value="<?php echo $optTrigger ?>"<?php if ( isset($newMonitor['Triggers']) && in_array( $optTrigger, $newMonitor['Triggers'] ) ) { ?> checked="checked"<?php } ?>/>&nbsp;<?php echo $optTrigger ?>
+<?php
+            $optCount ++;
+        }
+        if ( !$optCount ) {
+?>
+              <em><?php echo translate('NoneAvailable') ?></em>
+<?php
+        }
+?>
+            </td></tr>
+<?php
         break;
-    } case 'source' : {
-      if ( ZM_HAS_V4L && $monitor->Type == "Local" ) {
-        ?>
-          <tr><td><?php echo translate('DevicePath') ?></td><td><input type="text" name="newMonitor[Device]" value="<?php echo validHtmlStr($monitor->Device) ?>" size="24"/></td></tr>
-          <tr><td><?php echo translate('CaptureMethod') ?></td><td><?php echo htmlSelect( "newMonitor[Method]", $localMethods, $monitor->Method(), "submitTab( '$tab' );" ); ?></td></tr>
-          <?php if ( ZM_HAS_V4L1 && $monitor->Method == 'v4l1' ) { ?>
-              <tr><td><?php echo translate('DeviceChannel') ?></td><td><select name="newMonitor[Channel]"><?php foreach ( $v4l1DeviceChannels as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $monitor->Channel ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
-              <tr><td><?php echo translate('DeviceFormat') ?></td><td><select name="newMonitor[Format]"><?php foreach ( $v4l1DeviceFormats as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $monitor->Format ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
-              <tr><td><?php echo translate('CapturePalette') ?></td><td><select name="newMonitor[Palette]"><?php foreach ( $v4l1LocalPalettes as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $monitor->Palette ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
-        <?php } else { ?>
-              <tr><td><?php echo translate('DeviceChannel') ?></td><td><select name="newMonitor[Channel]"><?php foreach ( $v4l2DeviceChannels as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $monitor->Channel ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
-              <tr><td><?php echo translate('DeviceFormat') ?></td><td><select name="newMonitor[Format]"><?php foreach ( $v4l2DeviceFormats as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $monitor->Format ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
-              <tr><td><?php echo translate('CapturePalette') ?></td><td><select name="newMonitor[Palette]"><?php foreach ( $v4l2LocalPalettes as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $monitor->Palette ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
-          <?php } ?>
-          <tr><td><?php echo translate('V4LMultiBuffer') ?></td><td>
-          <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]1" value="1" <?php echo ( $monitor->V4LMultiBuffer == 1 ? 'checked="checked"' : '' ) ?>/>
-          <label for="newMonitor[V4LMultiBuffer]1">Yes</label>
-          <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]0" value="0" <?php echo ( $monitor->V4LMultiBuffer == 0 ? 'checked="checked"' : '' ) ?>/>
-          <label for="newMonitor[V4LMultiBuffer]0">No</label>
-          <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]" value="" <?php echo ( empty($monitor->V4LMultiBuffer) ? 'checked="checked"' : '' ) ?>/>
-          <label for="newMonitor[V4LMultiBuffer]">Use Config Value</label>
-          </td></tr>
-          <tr><td><?php echo translate('V4LCapturesPerFrame') ?></td><td><input type="number" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo $monitor->V4LCapturesPerFrame ?>"/></td></tr>
-          <?php } elseif ( $monitor->Type == "Remote" ) { ?>
-          <tr><td><?php echo translate('RemoteProtocol') ?></td><td><?php echo htmlSelect( "newMonitor[Protocol]", $remoteProtocols, $monitor->Protocol(), "updateMethods( this );if(this.value=='rtsp'){\$('RTSPDescribe').setStyle('display','table-row');}else{\$('RTSPDescribe').hide();}" ); ?></td></tr>
-          <?php if ( empty($monitor->Protocol) || $monitor->Protocol == "http" ) { ?>
-              <tr><td><?php echo translate('RemoteMethod') ?></td><td><?php echo htmlSelect( "newMonitor[Method]", $httpMethods, $monitor->Method() ); ?></td></tr>
-          <?php } else { ?>
-              <tr><td><?php echo translate('RemoteMethod') ?></td><td><?php echo htmlSelect( "newMonitor[Method]", $rtspMethods, $monitor->Method() ); ?></td></tr>
-          <?php } ?>
-          <tr><td><?php echo translate('RemoteHostName') ?></td><td><input type="text" name="newMonitor[Host]" value="<?php echo validHtmlStr($monitor->Host) ?>" size="36"/></td></tr>
-          <tr><td><?php echo translate('RemoteHostPort') ?></td><td><input type="text" name="newMonitor[Port]" value="<?php echo validHtmlStr($monitor->Port) ?>" size="6"/></td></tr>
-          <tr><td><?php echo translate('RemoteHostPath') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path) ?>" size="36"/></td></tr>
-        <?php } elseif ( $monitor->Type == "File" ) { ?>
-          <tr><td><?php echo translate('SourcePath') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path) ?>" size="36"/></td></tr>
-        <?php } elseif ( $monitor->Type == "cURL" ) { ?>
-          <tr><td><?php echo "URL" ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path) ?>" size="36"/></td></tr>
-          <tr><td><?php echo "Username" ?></td><td><input type="text" name="newMonitor[User]" value="<?php echo validHtmlStr($monitor->User) ?>" size="12"/></td></tr>
-          <tr><td><?php echo "Password" ?></td><td><input type="text" name="newMonitor[Pass]" value="<?php echo validHtmlStr($monitor->Pass) ?>" size="12"/></td></tr>
-        <?php } elseif ( $monitor->Type == "Ffmpeg" || $monitor->Type == "Libvlc") { ?>
-          <tr><td><?php echo translate('SourcePath') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path) ?>" size="36"/></td></tr>
-          <tr><td><?php echo translate('RemoteMethod') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_RTSPTrans', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><?php echo htmlSelect( "newMonitor[Method]", $rtspFFMpegMethods, $monitor->Method() ); ?></td></tr>
-          <tr><td><?php echo translate('Options') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_'.strtoupper($monitor->Type), 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><input type="text" name="newMonitor[Options]" value="<?php echo validHtmlStr($monitor->Options) ?>" size="36"/></td></tr>
-        <?php } ?>
-        <tr><td><?php echo translate('TargetColorspace') ?></td><td><select name="newMonitor[Colours]"><?php foreach ( $Colours as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $monitor->Colours ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
-        <tr><td><?php echo translate('CaptureWidth') ?> (<?php echo translate('Pixels') ?>)</td><td><input type="text" name="newMonitor[Width]" value="<?php echo validHtmlStr($monitor->Width) ?>" size="4" onkeyup="updateMonitorDimensions(this);"/></td></tr>
-        <tr><td><?php echo translate('CaptureHeight') ?> (<?php echo translate('Pixels') ?>)</td><td><input type="text" name="newMonitor[Height]" value="<?php echo validHtmlStr($monitor->Height) ?>" size="4" onkeyup="updateMonitorDimensions(this);"/></td></tr>
-        <tr><td><?php echo translate('PreserveAspect') ?></td><td><input type="checkbox" name="preserveAspectRatio" value="1"/></td></tr> 
-        <tr><td><?php echo translate('Orientation') ?></td><td><select name="newMonitor[Orientation]"><?php foreach ( $orientations as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $monitor->Orientation ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
-        <?php
-        if ( $monitor->Type == "Local" ) {
-          ?>
-            <tr><td><?php echo translate('Deinterlacing') ?></td><td><select name="newMonitor[Deinterlacing]"><?php foreach ( $deinterlaceopts_v4l2 as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $monitor->Deinterlacing ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
-            <?php
+    }
+    case 'source' :
+    {
+        if ( ZM_HAS_V4L && $newMonitor['Type'] == 'Local' ) {
+?>
+            <tr><td><?php echo translate('DevicePath') ?></td><td><input type="text" name="newMonitor[Device]" value="<?php echo validHtmlStr($newMonitor['Device']) ?>" size="24"/></td></tr>
+            <tr><td><?php echo translate('CaptureMethod') ?></td><td><?php echo buildSelect( "newMonitor[Method]", $localMethods, "submitTab( '$tab' )" ); ?></td></tr>
+<?php
+            if ( ZM_HAS_V4L1 && $newMonitor['Method'] == 'v4l1' ) {
+?>
+            <tr><td><?php echo translate('DeviceChannel') ?></td><td><select name="newMonitor[Channel]"><?php foreach ( $v4l1DeviceChannels as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Channel'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+            <tr><td><?php echo translate('DeviceFormat') ?></td><td><select name="newMonitor[Format]"><?php foreach ( $v4l1DeviceFormats as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Format'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+            <tr><td><?php echo translate('CapturePalette') ?></td><td><select name="newMonitor[Palette]"><?php foreach ( $v4l1LocalPalettes as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Palette'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+<?php
+            } else {
+?>
+            <tr><td><?php echo translate('DeviceChannel') ?></td><td><select name="newMonitor[Channel]"><?php foreach ( $v4l2DeviceChannels as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Channel'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+            <tr><td><?php echo translate('DeviceFormat') ?></td><td><select name="newMonitor[Format]"><?php foreach ( $v4l2DeviceFormats as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Format'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+            <tr><td><?php echo translate('CapturePalette') ?></td><td><select name="newMonitor[Palette]"><?php foreach ( $v4l2LocalPalettes as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Palette'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+<?php
+            }
+?>
+      <tr><td><?php echo translate('V4LMultiBuffer') ?></td><td>
+        <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]1" value="1" <?php echo ( $newMonitor['V4LMultiBuffer'] == 1 ? 'checked="checked"' : '' ) ?>/>
+        <label for="newMonitor[V4LMultiBuffer]1">Yes</label>
+        <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]0" value="0" <?php echo ( $newMonitor['V4LMultiBuffer'] == 0 ? 'checked="checked"' : '' ) ?>/>
+        <label for="newMonitor[V4LMultiBuffer]0">No</label>
+        <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]" value="" <?php echo ( empty($newMonitor['V4LMultiBuffer']) ? 'checked="checked"' : '' ) ?>/>
+        <label for="newMonitor[V4LMultiBuffer]">Use Config Value</label>
+      </td></tr>
+      <tr><td><?php echo translate('V4LCapturesPerFrame') ?></td><td><input type="number" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo $newMonitor['V4LCapturesPerFrame'] ?>"/></td></tr>
+<?php
+        } elseif ( $newMonitor['Type'] == 'Remote' ) {
+?>
+            <tr><td><?php echo translate('RemoteProtocol') ?></td><td><?php echo buildSelect( "newMonitor[Protocol]", $remoteProtocols, "updateMethods( this );if(this.value=='rtsp'){\$('RTSPDescribe').setStyle('display','table-row');}else{\$('RTSPDescribe').hide();}" ); ?></td></tr>
+<?php
+            if ( empty($newMonitor['Protocol']) || $newMonitor['Protocol'] == 'http' ) {
+?>
+            <tr><td><?php echo translate('RemoteMethod') ?></td><td><?php echo buildSelect( 'newMonitor[Method]', $httpMethods ); ?></td></tr>
+<?php
+            } else {
+?>
+            <tr><td><?php echo translate('RemoteMethod') ?></td><td><?php echo buildSelect( 'newMonitor[Method]', $rtspMethods ); ?></td></tr>
+<?php
+            }
+?>
+            <tr><td><?php echo translate('RemoteHostName') ?></td><td><input type="text" name="newMonitor[Host]" value="<?php echo validHtmlStr($newMonitor['Host']) ?>" size="36"/></td></tr>
+            <tr><td><?php echo translate('RemoteHostPort') ?></td><td><input type="text" name="newMonitor[Port]" value="<?php echo validHtmlStr($newMonitor['Port']) ?>" size="6"/></td></tr>
+            <tr><td><?php echo translate('RemoteHostPath') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr>
+<?php
+        } elseif ( $newMonitor['Type'] == 'File' ) {
+?>
+            <tr><td><?php echo translate('SourcePath') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr>
+<?php
+        } elseif ( $newMonitor['Type'] == 'cURL' ) {
+?>
+            <tr><td><?php echo 'URL' ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr>
+            <tr><td><?php echo 'Username' ?></td><td><input type="text" name="newMonitor[User]" value="<?php echo validHtmlStr($newMonitor['User']) ?>" size="12"/></td></tr>
+            <tr><td><?php echo 'Password' ?></td><td><input type="text" name="newMonitor[Pass]" value="<?php echo validHtmlStr($newMonitor['Pass']) ?>" size="12"/></td></tr>
+<?php
+        } elseif ( $newMonitor['Type'] == 'Ffmpeg' || $newMonitor['Type'] == 'Libvlc') {
+?>
+            <tr><td><?php echo translate('SourcePath') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr>
+            <tr><td><?php echo translate('RemoteMethod') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_RTSPTrans', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><?php echo buildSelect( "newMonitor[Method]", $rtspFFMpegMethods ); ?></td></tr>
+            <tr><td><?php echo translate('Options') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_'.strtoupper($newMonitor['Type']), 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><input type="text" name="newMonitor[Options]" value="<?php echo validHtmlStr($newMonitor['Options']) ?>" size="36"/></td></tr>
+<?php
+        }
+?>
+            <tr><td><?php echo translate('TargetColorspace') ?></td><td><select name="newMonitor[Colours]"><?php foreach ( $Colours as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Colours'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+            <tr><td><?php echo translate('CaptureWidth') ?> (<?php echo translate('Pixels') ?>)</td><td><input type="text" name="newMonitor[Width]" value="<?php echo validHtmlStr($newMonitor['Width']) ?>" size="4" onkeyup="updateMonitorDimensions(this);"/></td></tr>
+            <tr><td><?php echo translate('CaptureHeight') ?> (<?php echo translate('Pixels') ?>)</td><td><input type="text" name="newMonitor[Height]" value="<?php echo validHtmlStr($newMonitor['Height']) ?>" size="4" onkeyup="updateMonitorDimensions(this);"/></td></tr>
+            <tr><td><?php echo translate('PreserveAspect') ?></td><td><input type="checkbox" name="preserveAspectRatio" value="1"/></td></tr> 
+            <tr><td><?php echo translate('Orientation') ?></td><td><select name="newMonitor[Orientation]"><?php foreach ( $orientations as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Orientation'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+<?php
+        if ( $newMonitor['Type'] == 'Local' ) {
+?>
+            <tr><td><?php echo translate('Deinterlacing') ?></td><td><select name="newMonitor[Deinterlacing]"><?php foreach ( $deinterlaceopts_v4l2 as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Deinterlacing'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+<?php
         } else {
-          ?>
-            <tr><td><?php echo translate('Deinterlacing') ?></td><td><select name="newMonitor[Deinterlacing]"><?php foreach ( $deinterlaceopts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $monitor->Deinterlacing ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
-            <?php
+?>
+            <tr><td><?php echo translate('Deinterlacing') ?></td><td><select name="newMonitor[Deinterlacing]"><?php foreach ( $deinterlaceopts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Deinterlacing'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+<?php
         }
-      ?>
-        <?php
-        if ( $monitor->Type == "Remote" )
-        {
-          ?>
-            <tr id="RTSPDescribe"<?php if ( $monitor->Protocol != 'rtsp' ) { echo ' style="display:none;"'; } ?>><td><?php echo translate('RTSPDescribe') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_RTSPDESCRIBE', 'zmOptionHelp', 'optionhelp', '?' ) ?>) </td><td><input type="checkbox" name="newMonitor[RTSPDescribe]" value="1"<?php if ( !empty($monitor->RTSPDescribe) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <?php
+?>
+<?php
+        if ( $newMonitor['Type'] == 'Remote' ) {
+?>
+            <tr id="RTSPDescribe"<?php if ( $newMonitor['Protocol'] != 'rtsp' ) { echo ' style="display:none;"'; } ?>><td><?php echo translate('RTSPDescribe') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_RTSPDESCRIBE', 'zmOptionHelp', 'optionhelp', '?' ) ?>) </td><td><input type="checkbox" name="newMonitor[RTSPDescribe]" value="1"<?php if ( !empty($newMonitor['RTSPDescribe']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+<?php
         }
-      ?>
-        <?php
+?>
+<?php
         break;
     }
-  case 'storage'   :
-    ?>
-      <tr><td><?php echo translate('SaveJPEGs') ?></td><td><select name="newMonitor[SaveJPEGs]"><?php foreach ( $savejpegopts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $monitor->SaveJPEGs ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
-      <tr><td><?php echo translate('VideoWriter') ?></td><td><select name="newMonitor[VideoWriter]"><?php foreach ( $videowriteropts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $monitor->VideoWriter ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></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>
-      <?php
-      break;
-  case 'timestamp' :
+    case 'storage'   :
+?>
+            <tr><td><?php echo translate('SaveJPEGs') ?></td><td><select name="newMonitor[SaveJPEGs]"><?php foreach ( $savejpegopts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['SaveJPEGs'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+            <tr><td><?php echo translate('VideoWriter') ?></td><td><select name="newMonitor[VideoWriter]"><?php foreach ( $videowriteropts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['VideoWriter'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+            <tr><td><?php echo translate('OptionalEncoderParam') ?></td><td><textarea name="newMonitor[EncoderParameters]" rows="4" cols="36"><?php echo validHtmlStr($newMonitor['EncoderParameters']) ?></textarea></td></tr>
+            <tr><td><?php echo translate('RecordAudio') ?></td><td><input type="checkbox" name="newMonitor[RecordAudio]" value="1"<?php if ( !empty($newMonitor['RecordAudio']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+<?php
+        break;
+    case 'timestamp' :
     {
-      ?>
-        <tr><td><?php echo translate('TimestampLabelFormat') ?></td><td><input type="text" name="newMonitor[LabelFormat]" value="<?php echo validHtmlStr($monitor->LabelFormat) ?>" size="32"/></td></tr>
-        <tr><td><?php echo translate('TimestampLabelX') ?></td><td><input type="text" name="newMonitor[LabelX]" value="<?php echo validHtmlStr($monitor->LabelX) ?>" size="4"/></td></tr>
-        <tr><td><?php echo translate('TimestampLabelY') ?></td><td><input type="text" name="newMonitor[LabelY]" value="<?php echo validHtmlStr($monitor->LabelY) ?>" size="4"/></td></tr>
-        <tr><td><?php echo translate('TimestampLabelSize') ?></td><td><select name="newMonitor[LabelSize]"><?php foreach ( $label_size as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $monitor->LabelSize ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
-        <?php
+?>
+            <tr><td><?php echo translate('TimestampLabelFormat') ?></td><td><input type="text" name="newMonitor[LabelFormat]" value="<?php echo validHtmlStr($newMonitor['LabelFormat']) ?>" size="32"/></td></tr>
+            <tr><td><?php echo translate('TimestampLabelX') ?></td><td><input type="text" name="newMonitor[LabelX]" value="<?php echo validHtmlStr($newMonitor['LabelX']) ?>" size="4"/></td></tr>
+            <tr><td><?php echo translate('TimestampLabelY') ?></td><td><input type="text" name="newMonitor[LabelY]" value="<?php echo validHtmlStr($newMonitor['LabelY']) ?>" size="4"/></td></tr>
+            <tr><td><?php echo translate('TimestampLabelSize') ?></td><td><select name="newMonitor[LabelSize]"><?php foreach ( $label_size as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['LabelSize'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
+<?php
         break;
     }
-  case 'buffers' :
+    case 'buffers' :
     {
-      ?>
-        <tr><td><?php echo translate('ImageBufferSize') ?></td><td><input type="text" name="newMonitor[ImageBufferCount]" value="<?php echo validHtmlStr($monitor->ImageBufferCount) ?>" size="6"/></td></tr>
-        <tr><td><?php echo translate('WarmupFrames') ?></td><td><input type="text" name="newMonitor[WarmupCount]" value="<?php echo validHtmlStr($monitor->WarmupCount) ?>" size="4"/></td></tr>
-        <tr><td><?php echo translate('PreEventImageBuffer') ?></td><td><input type="text" name="newMonitor[PreEventCount]" value="<?php echo validHtmlStr($monitor->PreEventCount) ?>" size="4"/></td></tr>
-        <tr><td><?php echo translate('PostEventImageBuffer') ?></td><td><input type="text" name="newMonitor[PostEventCount]" value="<?php echo validHtmlStr($monitor->PostEventCount) ?>" size="4"/></td></tr>
-        <tr><td><?php echo translate('StreamReplayBuffer') ?></td><td><input type="text" name="newMonitor[StreamReplayBuffer]" value="<?php echo validHtmlStr($monitor->StreamReplayBuffer) ?>" size="6"/></td></tr>
-        <tr><td><?php echo translate('AlarmFrameCount') ?></td><td><input type="text" name="newMonitor[AlarmFrameCount]" value="<?php echo validHtmlStr($monitor->AlarmFrameCount) ?>" size="4"/></td></tr>
-        <?php
+?>
+            <tr><td><?php echo translate('ImageBufferSize') ?></td><td><input type="text" name="newMonitor[ImageBufferCount]" value="<?php echo validHtmlStr($newMonitor['ImageBufferCount']) ?>" size="6"/></td></tr>
+            <tr><td><?php echo translate('WarmupFrames') ?></td><td><input type="text" name="newMonitor[WarmupCount]" value="<?php echo validHtmlStr($newMonitor['WarmupCount']) ?>" size="4"/></td></tr>
+            <tr><td><?php echo translate('PreEventImageBuffer') ?></td><td><input type="text" name="newMonitor[PreEventCount]" value="<?php echo validHtmlStr($newMonitor['PreEventCount']) ?>" size="4"/></td></tr>
+            <tr><td><?php echo translate('PostEventImageBuffer') ?></td><td><input type="text" name="newMonitor[PostEventCount]" value="<?php echo validHtmlStr($newMonitor['PostEventCount']) ?>" size="4"/></td></tr>
+            <tr><td><?php echo translate('StreamReplayBuffer') ?></td><td><input type="text" name="newMonitor[StreamReplayBuffer]" value="<?php echo validHtmlStr($newMonitor['StreamReplayBuffer']) ?>" size="6"/></td></tr>
+<tr><td><?php echo translate('AlarmFrameCount') ?></td><td><input type="text" name="newMonitor[AlarmFrameCount]" value="<?php echo validHtmlStr($newMonitor['AlarmFrameCount']) ?>" size="4"/></td></tr>
+<?php
         break;
     }
-  case 'control' :
+    case 'control' :
     {
-      ?>
-        <tr><td><?php echo translate('Controllable') ?></td><td><input type="checkbox" name="newMonitor[Controllable]" value="1"<?php if ( !empty($monitor->Controllable) ) { ?> checked="checked"<?php } ?>/></td></tr>
-        <tr><td><?php echo translate('ControlType') ?></td><td><?php echo htmlSelect( "newMonitor[ControlId]", $controlTypes, $monitor->ControlId(), 'loadLocations( this )' ); ?><?php if ( canEdit( 'Control' ) ) { ?>&nbsp;<a href="#" onclick="createPopup( '?view=controlcaps', 'zmControlCaps', 'controlcaps' );"><?php echo translate('Edit') ?></a><?php } ?></td></tr>
-        <tr><td><?php echo translate('ControlDevice') ?></td><td><input type="text" name="newMonitor[ControlDevice]" value="<?php echo validHtmlStr($monitor->ControlDevice) ?>" size="32"/></td></tr>
-        <tr><td><?php echo translate('ControlAddress') ?></td><td><input type="text" name="newMonitor[ControlAddress]" value="<?php echo validHtmlStr($monitor->ControlAddress) ?>" size="32"/></td></tr>
-        <tr><td><?php echo translate('AutoStopTimeout') ?></td><td><input type="text" name="newMonitor[AutoStopTimeout]" value="<?php echo validHtmlStr($monitor->AutoStopTimeout) ?>" size="4"/></td></tr>
-        <tr><td><?php echo translate('TrackMotion') ?></td><td><input type="checkbox" name="newMonitor[TrackMotion]" value="1"<?php if ( !empty($monitor->TrackMotion) ) { ?> checked="checked"<?php } ?>/></td></tr>
-        <?php
+?>
+            <tr><td><?php echo translate('Controllable') ?></td><td><input type="checkbox" name="newMonitor[Controllable]" value="1"<?php if ( !empty($newMonitor['Controllable']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><td><?php echo translate('ControlType') ?></td><td><?php echo buildSelect( "newMonitor[ControlId]", $controlTypes, 'loadLocations( this )' ); ?><?php if ( canEdit( 'Control' ) ) { ?>&nbsp;<a href="#" onclick="createPopup( '?view=controlcaps', 'zmControlCaps', 'controlcaps' );"><?php echo translate('Edit') ?></a><?php } ?></td></tr>
+            <tr><td><?php echo translate('ControlDevice') ?></td><td><input type="text" name="newMonitor[ControlDevice]" value="<?php echo validHtmlStr($newMonitor['ControlDevice']) ?>" size="32"/></td></tr>
+            <tr><td><?php echo translate('ControlAddress') ?></td><td><input type="text" name="newMonitor[ControlAddress]" value="<?php echo validHtmlStr($newMonitor['ControlAddress']) ?>" size="32"/></td></tr>
+            <tr><td><?php echo translate('AutoStopTimeout') ?></td><td><input type="text" name="newMonitor[AutoStopTimeout]" value="<?php echo validHtmlStr($newMonitor['AutoStopTimeout']) ?>" size="4"/></td></tr>
+            <tr><td><?php echo translate('TrackMotion') ?></td><td><input type="checkbox" name="newMonitor[TrackMotion]" value="1"<?php if ( !empty($newMonitor['TrackMotion']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+<?php
         $return_options = array(
             '-1' => translate('None'),
             '0' => translate('Home'),
             '1' => translate('Preset')." 1",
-            );
-      ?>
-        <tr><td><?php echo translate('TrackDelay') ?></td><td><input type="text" name="newMonitor[TrackDelay]" value="<?php echo validHtmlStr($monitor->TrackDelay) ?>" size="4"/></td></tr>
-        <tr><td><?php echo translate('ReturnLocation') ?></td><td><?php echo htmlSelect( "newMonitor[ReturnLocation]", $return_options, $monitor->ReturnLocation() ); ?></td></tr>
-        <tr><td><?php echo translate('ReturnDelay') ?></td><td><input type="text" name="newMonitor[ReturnDelay]" value="<?php echo validHtmlStr($monitor->ReturnDelay) ?>" size="4"/></td></tr>
-        <?php
+        );
+?>
+            <tr><td><?php echo translate('TrackDelay') ?></td><td><input type="text" name="newMonitor[TrackDelay]" value="<?php echo validHtmlStr($newMonitor['TrackDelay']) ?>" size="4"/></td></tr>
+            <tr><td><?php echo translate('ReturnLocation') ?></td><td><?php echo buildSelect( "newMonitor[ReturnLocation]", $return_options ); ?></td></tr>
+            <tr><td><?php echo translate('ReturnDelay') ?></td><td><input type="text" name="newMonitor[ReturnDelay]" value="<?php echo validHtmlStr($newMonitor['ReturnDelay']) ?>" size="4"/></td></tr>
+<?php
         break;
     }
-  case 'x10' :
+    case 'x10' :
     {
-      ?>
-        <tr><td><?php echo translate('X10ActivationString') ?></td><td><input type="text" name="newX10Monitor[Activation]" value="<?php echo validHtmlStr($newX10Monitor['Activation']) ?>" size="20"/></td></tr>
-        <tr><td><?php echo translate('X10InputAlarmString') ?></td><td><input type="text" name="newX10Monitor[AlarmInput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmInput']) ?>" size="20"/></td></tr>
-        <tr><td><?php echo translate('X10OutputAlarmString') ?></td><td><input type="text" name="newX10Monitor[AlarmOutput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmOutput']) ?>" size="20"/></td></tr>
-        <?php
+?>
+            <tr><td><?php echo translate('X10ActivationString') ?></td><td><input type="text" name="newX10Monitor[Activation]" value="<?php echo validHtmlStr($newX10Monitor['Activation']) ?>" size="20"/></td></tr>
+            <tr><td><?php echo translate('X10InputAlarmString') ?></td><td><input type="text" name="newX10Monitor[AlarmInput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmInput']) ?>" size="20"/></td></tr>
+            <tr><td><?php echo translate('X10OutputAlarmString') ?></td><td><input type="text" name="newX10Monitor[AlarmOutput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmOutput']) ?>" size="20"/></td></tr>
+<?php
         break;
     }
-  case 'misc' :
+    case 'misc' :
     {
-      ?>
-        <tr><td><?php echo translate('EventPrefix') ?></td><td><input type="text" name="newMonitor[EventPrefix]" value="<?php echo validHtmlStr($monitor->EventPrefix) ?>" size="24"/></td></tr>
-        <tr><td><?php echo translate('Sectionlength') ?></td><td><input type="text" name="newMonitor[SectionLength]" value="<?php echo validHtmlStr($monitor->SectionLength) ?>" size="6"/></td></tr>
-        <tr><td><?php echo translate('FrameSkip') ?></td><td><input type="text" name="newMonitor[FrameSkip]" value="<?php echo validHtmlStr($monitor->FrameSkip) ?>" size="6"/></td></tr>
-        <tr><td><?php echo translate('MotionFrameSkip') ?></td><td><input type="text" name="newMonitor[MotionFrameSkip]" value="<?php echo validHtmlStr($monitor->MotionFrameSkip) ?>" size="6"/></td></tr>
-        <tr><td><?php echo translate('AnalysisUpdateDelay') ?></td><td><input type="text" name="newMonitor[AnalysisUpdateDelay]" value="<?php echo validHtmlStr($monitor->AnalysisUpdateDelay) ?>" size="6"/></td></tr>
-        <tr><td><?php echo translate('FPSReportInterval') ?></td><td><input type="text" name="newMonitor[FPSReportInterval]" value="<?php echo validHtmlStr($monitor->FPSReportInterval) ?>" size="6"/></td></tr>
-        <tr><td><?php echo translate('DefaultView') ?></td><td><select name="newMonitor[DefaultView]">
-        <?php
-        foreach ( getEnumValues( 'Monitors', 'DefaultView' ) as $opt_view )
-        {
-          if ( $opt_view == 'Control' && ( !ZM_OPT_CONTROL || !$monitor->Controllable ) )
+?>
+            <tr><td><?php echo translate('EventPrefix') ?></td><td><input type="text" name="newMonitor[EventPrefix]" value="<?php echo validHtmlStr($newMonitor['EventPrefix']) ?>" size="24"/></td></tr>
+            <tr><td><?php echo translate('Sectionlength') ?></td><td><input type="text" name="newMonitor[SectionLength]" value="<?php echo validHtmlStr($newMonitor['SectionLength']) ?>" size="6"/></td></tr>
+            <tr><td><?php echo translate('FrameSkip') ?></td><td><input type="text" name="newMonitor[FrameSkip]" value="<?php echo validHtmlStr($newMonitor['FrameSkip']) ?>" size="6"/></td></tr>
+            <tr><td><?php echo translate('MotionFrameSkip') ?></td><td><input type="text" name="newMonitor[MotionFrameSkip]" value="<?php echo validHtmlStr($newMonitor['MotionFrameSkip']) ?>" size="6"/></td></tr>
+            <tr><td><?php echo translate('AnalysisUpdateDelay') ?></td><td><input type="text" name="newMonitor[AnalysisUpdateDelay]" value="<?php echo validHtmlStr($newMonitor['AnalysisUpdateDelay']) ?>" size="6"/></td></tr>
+            <tr><td><?php echo translate('FPSReportInterval') ?></td><td><input type="text" name="newMonitor[FPSReportInterval]" value="<?php echo validHtmlStr($newMonitor['FPSReportInterval']) ?>" size="6"/></td></tr>
+            <tr><td><?php echo translate('DefaultView') ?></td><td><select name="newMonitor[DefaultView]">
+<?php
+        foreach ( getEnumValues( 'Monitors', 'DefaultView' ) as $opt_view ) {
+          if ( $opt_view == 'Control' && ( !ZM_OPT_CONTROL || !$monitor['Controllable'] ) )
             continue;
-          ?>
-            <option value="<?php echo $opt_view ?>"<?php if ( $opt_view == $monitor->DefaultView ) { ?> selected="selected"<?php } ?>><?php echo $opt_view ?></option>
-            <?php
+?>
+              <option value="<?php echo $opt_view ?>"<?php if ( $opt_view == $newMonitor['DefaultView'] ) { ?> selected="selected"<?php } ?>><?php echo $opt_view ?></option>
+<?php
         }
-      ?>
-        </select></td></tr>
-        <tr><td><?php echo translate('DefaultRate') ?></td><td><?php echo htmlSelect( "newMonitor[DefaultRate]", $rates, $monitor->DefaultRate() ); ?></td></tr>
-        <tr><td><?php echo translate('DefaultScale') ?></td><td><?php echo htmlSelect( "newMonitor[DefaultScale]", $scales, $monitor->DefaultScale() ); ?></td></tr>
-        <?php
-        if ( ZM_HAS_V4L && $monitor->Type == "Local" ) {
-          ?>
-            <tr><td><?php echo translate('SignalCheckColour') ?></td><td><input type="text" name="newMonitor[SignalCheckColour]" value="<?php echo validHtmlStr($monitor->SignalCheckColour) ?>" size="10" onchange="$('SignalCheckSwatch').setStyle( 'backgroundColor', this.value )"/><span id="SignalCheckSwatch" class="swatch" style="background-color: <?php echo $monitor->SignalCheckColour ?>;">&nbsp;&nbsp;&nbsp;&nbsp;</span></td></tr>
-            <?php
+?>
+            </select></td></tr>
+            <tr><td><?php echo translate('DefaultRate') ?></td><td><?php echo buildSelect( "newMonitor[DefaultRate]", $rates ); ?></td></tr>
+            <tr><td><?php echo translate('DefaultScale') ?></td><td><?php echo buildSelect( "newMonitor[DefaultScale]", $scales ); ?></td></tr>
+<?php
+        if ( ZM_HAS_V4L && $newMonitor['Type'] == 'Local' ) {
+?>
+            <tr><td><?php echo translate('SignalCheckColour') ?></td><td><input type="text" name="newMonitor[SignalCheckColour]" value="<?php echo validHtmlStr($newMonitor['SignalCheckColour']) ?>" size="10" onchange="$('SignalCheckSwatch').setStyle( 'backgroundColor', this.value )"/><span id="SignalCheckSwatch" class="swatch" style="background-color: <?php echo $newMonitor['SignalCheckColour'] ?>;">&nbsp;&nbsp;&nbsp;&nbsp;</span></td></tr>
+<?php
         }
-      ?>
-        <tr><td><?php echo translate('WebColour') ?></td><td><input type="text" name="newMonitor[WebColour]" value="<?php echo validHtmlStr($monitor->WebColour) ?>" size="10" onchange="$('WebSwatch').setStyle( 'backgroundColor', this.value )"/><span id="WebSwatch" class="swatch" style="background-color: <?php echo validHtmlStr($monitor->WebColour) ?>;">&nbsp;&nbsp;&nbsp;&nbsp;</span></td></tr>
-        <tr><td><?php echo translate('Exif') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_EXIF', 'zmOptionHelp', 'optionhelp', '?' ) ?>) </td><td><input type="checkbox" name="newMonitor[Exif]" value="1"<?php if ( !empty($monitor->Exif) ) { ?> checked="checked"<?php } ?>/></td></tr>
-        <?php
+?>
+            <tr><td><?php echo translate('WebColour') ?></td><td><input type="text" name="newMonitor[WebColour]" value="<?php echo validHtmlStr($newMonitor['WebColour']) ?>" size="10" onchange="$('WebSwatch').setStyle( 'backgroundColor', this.value )"/><span id="WebSwatch" class="swatch" style="background-color: <?php echo validHtmlStr($newMonitor['WebColour']) ?>;">&nbsp;&nbsp;&nbsp;&nbsp;</span></td></tr>
+            <tr><td><?php echo translate('Exif') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_EXIF', 'zmOptionHelp', 'optionhelp', '?' ) ?>) </td><td><input type="checkbox" name="newMonitor[Exif]" value="1"<?php if ( !empty($newMonitor['Exif']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+<?php
         break;
     }
-}
+} // end switch tab
 ?>
           </tbody>
         </table>
@@ -955,5 +960,5 @@ switch ( $tab )
       </form>
     </div>
     </div>
-</body>
+  </body>
 </html>
diff --git a/web/views/image.php b/web/views/image.php
index 82f0ed046..ab15763b3 100644
--- a/web/views/image.php
+++ b/web/views/image.php
@@ -32,136 +32,183 @@
 //     If both scale and either width or height are specified, scale is ignored
 //
 
-if ( !canView( 'Events' ) )
-{
-    $view = "error";
-    return;
+if ( !canView( 'Events' ) ) {
+  $view = 'error';
+  return;
 }
 require_once('includes/Event.php');
 require_once('includes/Frame.php');
 
-header( 'Content-type: image/jpeg' );
-
 // Compatibility for PHP 5.4 
-if (!function_exists('imagescale'))
-{
-    function imagescale($image, $new_width, $new_height = -1, $mode = 0)
-    {
-        $mode; // Not supported
+if (!function_exists('imagescale')) {
+  function imagescale($image, $new_width, $new_height = -1, $mode = 0) {
+    $mode; // Not supported
 
-        $new_height = ($new_height == -1) ? imagesy($image) : $new_height;
-        $imageNew = imagecreatetruecolor($new_width, $new_height);
-        imagecopyresampled($imageNew, $image, 0, 0, 0, 0, (int)$new_width, (int)$new_height, imagesx($image), imagesy($image));
-        
-        return $imageNew;
-    }
+    $new_height = ($new_height == -1) ? imagesy($image) : $new_height;
+    $imageNew = imagecreatetruecolor($new_width, $new_height);
+    imagecopyresampled($imageNew, $image, 0, 0, 0, 0, (int)$new_width, (int)$new_height, imagesx($image), imagesy($image));
+
+    return $imageNew;
+  }
 }
 
 $errorText = false;
-if ( empty($_REQUEST['path']) )
-{
+$filename = '';
+$Frame = null;
+$Event = null;
+$path = null;
+
+if ( empty($_REQUEST['path']) ) {
   if ( ! empty($_REQUEST['fid']) ) {
     $show = empty($_REQUEST['show']) ? 'capture' : $_REQUEST['show'];
+ 
     if ( ! empty($_REQUEST['eid'] ) ) {
       $Event = new Event( $_REQUEST['eid'] );
       $Frame = Frame::find_one( array( 'EventId' => $_REQUEST['eid'], 'FrameId' => $_REQUEST['fid'] ) );
       if ( ! $Frame ) {
         Fatal("No Frame found for event(".$_REQUEST['eid'].") and frame id(".$_REQUEST['fid'].")");
       }
-      $path = $Event->Path().'/'.sprintf("%'.0".ZM_EVENT_IMAGE_DIGITS.'d',$_REQUEST['fid']).'-'.$show.'.jpg';
     } else {
 # If we are only specifying fid, then the fid must be the primary key into the frames table. But when the event is specified, then it is the frame #
       $Frame = new Frame( $_REQUEST['fid'] );
       $Event = new Event( $Frame->EventId() );
-      $path = $Event->Path().'/'.sprintf("%'.0".ZM_EVENT_IMAGE_DIGITS.'d',$Frame->FrameId()).'-'.$show.'.jpg';
+    }
+    $path = $Event->Path().'/'.sprintf('%0'.ZM_EVENT_IMAGE_DIGITS.'d',$Frame->FrameId()).'-'.$show.'.jpg';
+    
+  } else {
+    Fatal("No Frame ID specified");
+    header("HTTP/1.0 404 Not Found");
+    return;
+  }
+
+  if ( ! file_exists( $path ) ) {
+    Logger::Debug( "$path does not exist");
+# Generate the frame JPG
+    if ( $show == 'capture' and $Event->DefaultVideo() ) {
+      $command ='ffmpeg -ss '. $Frame->Delta() .' -i '.$Event->Path().'/'.$Event->DefaultVideo().' -frames:v 1 '.$path;
+      #$command ='ffmpeg -ss '. $Frame->Delta() .' -i '.$Event->Path().'/'.$Event->DefaultVideo().' -vf "select=gte(n\\,'.$Frame->FrameId().'),setpts=PTS-STARTPTS" '.$path;
+#$command ='ffmpeg -v 0 -i '.$Storage->Path().'/'.$Event->Path().'/'.$Event->DefaultVideo().' -vf "select=gte(n\\,'.$Frame->FrameId().'),setpts=PTS-STARTPTS" '.$path;
+      Logger::Debug( "Running $command" );
+      $output = array();
+      $retval = 0;
+      exec( $command, $output, $retval );
+      Logger::Debug("Command: $command, retval: $retval, output: " . implode("\n", $output));
+      if ( ! file_exists( $path ) ) {
+        header('HTTP/1.0 404 Not Found');
+        Fatal("Can't create frame images from video for this event (".$Event->DefaultVideo() );
+      }
+    } else {
+      header('HTTP/1.0 404 Not Found');
+      Fatal("Can't create frame images from video becuase there is no video file for this event (".$Event->DefaultVideo() );
+    }
+  }
+
+} else {
+  Warning('Loading images by path is deprecated');
+  $dir_events = realpath(ZM_DIR_EVENTS);
+  $path = realpath($dir_events . '/' . $_REQUEST['path']);
+  $pos = strpos($path, $dir_events);
+
+  if ( $pos == 0 && $pos !== false ) {
+    if ( ! empty( $user['MonitorIds'] ) ) {
+      $imageOk = false;
+      $pathMonId = substr( $path, 0, strspn( $path, '1234567890' ) );
+      foreach ( preg_split( '/["\'\s]*,["\'\s]*/', $user['MonitorIds'] ) as $monId ) {
+        if ( $pathMonId == $monId ) {
+          $imageOk = true;
+          break;
+        }
+      }
+      if ( !$imageOk )
+        $errorText = 'No image permissions';
     }
   } else {
-    $errorText = "No image path";
+    $errorText = 'Invalid image path';
+  }
+  if ( ! file_exists( $path ) ) {
+    header('HTTP/1.0 404 Not Found');
+    Fatal("Image not found at $path");
   }
-} else {
-    $dir_events = realpath(ZM_DIR_EVENTS);
-    $path = realpath($dir_events . '/' . $_REQUEST['path']);
-    $pos = strpos($path, $dir_events);
-
-    if($pos == 0 && $pos !== false) {
-        if ( !empty($user['MonitorIds']) ) {
-            $imageOk = false;
-            $pathMonId = substr( $path, 0, strspn( $path, "1234567890" ) );
-            foreach ( preg_split( '/["\'\s]*,["\'\s]*/', $user['MonitorIds'] ) as $monId ) {
-                if ( $pathMonId == $monId ) {
-                    $imageOk = true;
-                    break;
-                }
-            }
-            if ( !$imageOk )
-                $errorText = "No image permissions";
-        }
-    } else {
-            $errorText = "Invalid image path";
-    }
 }
 
 $scale=0;
-if( !empty($_REQUEST['scale']) )
-    if (is_numeric($_REQUEST['scale']))
-    {
-        $x = $_REQUEST['scale'];
-        if($x >= 1 and $x <= 400)
-            $scale=$x;
-    }
+if( !empty($_REQUEST['scale']) ) {
+  if (is_numeric($_REQUEST['scale'])) {
+    $x = $_REQUEST['scale'];
+    if($x >= 1 and $x <= 400)
+      $scale=$x;
+  }
+}
 
 $width=0;
-if( !empty($_REQUEST['width']) )
-    if (is_numeric($_REQUEST['width']))
-    {
-        $x = $_REQUEST['width'];
-        if($x >= 10 and $x <= 8000)
-            $width=$x;
-    }
+if ( !empty($_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']))
-    {
-        $x = $_REQUEST['height'];
-        if($x >= 10 and $x <= 8000)
-            $height=$x;
-    }
+if( !empty($_REQUEST['height']) ) {
+  if (is_numeric($_REQUEST['height'])) {
+    $x = $_REQUEST['height'];
+    if($x >= 10 and $x <= 8000)
+      $height=$x;
+  }
+}
 
+header( 'Content-type: image/jpeg' );
 
-if ( $errorText )
-    Error( $errorText );
-else
-    if( ($scale==0 || $scale==100) && $width==0 && $height==0 )
-        readfile( $path );
-    else
-    {
-        $i = imagecreatefromjpeg ( $path );
-        $oldWidth=imagesx($i);
-        $oldHeight=imagesy($i);
-        if($width==0 && $height==0)  // scale has to be set to get here with both zero
-        {
-            $width = $oldWidth  * $scale / 100.0;
-            $height= $oldHeight * $scale / 100.0;
-        }
-        elseif ($width==0 && $height!=0)
-        {
-            $width = ($height * $oldWidth) / $oldHeight;
-        }
-        elseif ($width!=0 && $height==0)
-        {
-            $height = ($width * $oldHeight) / $oldWidth;
-        }
-        if($width==$oldWidth && $height==$oldHeight)  // See if we really need to scale
-        {
-            imagejpeg($i);
-            imagedestroy($i);
-        }
-        else  // we do need to scale
-        {
-            $iScale = imagescale($i, $width, $height);
-            imagejpeg($iScale);
-            imagedestroy($i);
-            imagedestroy($iScale);
-        }
+# 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 ( $errorText ) {
+  Error( $errorText );
+} else {
+  if ( ( $scale==0 || $scale==100 ) && $width==0 && $height==0 ) {
+    if ( ! readfile( $path ) ) {
+      Error("No bytes read from ". $path );
     }
-?>
+  } else {
+    Logger::Debug("Doing a scaled image: scale($scale) width($width) height($height)");
+    $i = 0;
+    if ( ! ( $width && $height ) ) {
+      $i = imagecreatefromjpeg( $path );
+      $oldWidth = imagesx( $i );
+      $oldHeight = imagesy( $i );
+      if ( $width == 0 && $height == 0 ) { // scale has to be set to get here with both zero
+        $width = $oldWidth  * $scale / 100.0;
+        $height= $oldHeight * $scale / 100.0;
+      } elseif ( $width == 0 && $height != 0 ) {
+        $width = ($height * $oldWidth) / $oldHeight;
+      } elseif ( $width != 0 && $height == 0 ) {
+        $height = ($width * $oldHeight) / $oldWidth;
+      }
+      if ( $width == $oldWidth && $height == $oldHeight) {
+        Warning( 'No change to width despite scaling.' );
+      }
+    }
+  
+    # Slight optimisation, thumbnails always specify width and height, so we can cache them.
+    $scaled_path = preg_replace('/\.jpg$/', "-${width}x${height}.jpg", $path );
+    if ( ! file_exists( $scaled_path ) or ! readfile( $scaled_path ) ) {
+      Logger::Debug( "Cached scaled image does not exist at $scaled_path or is no good.. Creating it");
+      ob_start();
+      if ( ! $i )
+        $i = imagecreatefromjpeg( $path );
+      $iScale = imagescale( $i, $width, $height );
+      imagejpeg( $iScale );
+      imagedestroy( $i );
+      imagedestroy( $iScale );
+      $scaled_jpeg_data = ob_get_contents();
+      file_put_contents( $scaled_path, $scaled_jpeg_data );
+      ob_end_clean();
+      echo $scaled_jpeg_data;
+    }
+  }
+}

From b96f5cf49d5902c3c37c098153c98bc9ef57fc36 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 30 May 2017 13:50:24 -0400
Subject: [PATCH 17/56] more merges/fixes from SA

---
 web/skins/classic/views/zone.php  | 58 ++++++++++++++-----------------
 web/skins/classic/views/zones.php | 56 ++++++++++++++++-------------
 2 files changed, 58 insertions(+), 56 deletions(-)

diff --git a/web/skins/classic/views/zone.php b/web/skins/classic/views/zone.php
index b0dd88508..ba0cb7328 100644
--- a/web/skins/classic/views/zone.php
+++ b/web/skins/classic/views/zone.php
@@ -18,9 +18,8 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canView( 'Monitors' ) )
-{
-    $view = "error";
+if ( !canView( 'Monitors' ) ) {
+    $view = 'error';
     return;
 }
 
@@ -34,29 +33,25 @@ $hicolor = '0x00ff00'; // Green
 $presets = array();
 $presetNames = array();
 $presetNames[0] = translate('ChoosePreset');
-$sql = "select *, Units-1 as UnitsIndex, CheckMethod-1 as CheckMethodIndex from ZonePresets order by Id asc";
-foreach( dbFetchAll( $sql ) as $preset )
-{
-    $presetNames[$preset['Id']] = $preset['Name'];
-    $presets[] = $preset;
+$sql = 'SELECT *, Units-1 AS UnitsIndex, CheckMethod-1 AS CheckMethodIndex FROM ZonePresets ORDER BY Id ASC';
+foreach( dbFetchAll( $sql ) as $preset ) {
+  $presetNames[$preset['Id']] = $preset['Name'];
+  $presets[] = $preset;
 }
 
 $optTypes = array();
-foreach ( getEnumValues( 'Zones', 'Type' ) as $optType )
-{
-    $optTypes[$optType] = $optType;
+foreach ( getEnumValues( 'Zones', 'Type' ) as $optType ) {
+  $optTypes[$optType] = $optType;
 }
 
 $optUnits = array();
-foreach ( getEnumValues( 'Zones', 'Units' ) as $optUnit )
-{
-    $optUnits[$optUnit] = $optUnit;
+foreach ( getEnumValues( 'Zones', 'Units' ) as $optUnit ) {
+  $optUnits[$optUnit] = $optUnit;
 }
 
 $optCheckMethods = array();
-foreach ( getEnumValues( 'Zones', 'CheckMethod' ) as $optCheckMethod )
-{
-    $optCheckMethods[$optCheckMethod] = $optCheckMethod;
+foreach ( getEnumValues( 'Zones', 'CheckMethod' ) as $optCheckMethod ) {
+  $optCheckMethods[$optCheckMethod] = $optCheckMethod;
 }
 
 $monitor = new Monitor( $mid );
@@ -66,14 +61,10 @@ $maxX = $monitor->Width()-1;
 $minY = 0;
 $maxY = $monitor->Height()-1;
 
-if ( !isset($newZone) )
-{
-    if ( $zid > 0 )
-    {
+if ( !isset($newZone) ) {
+    if ( $zid > 0 ) {
         $zone = dbFetchOne( 'SELECT * FROM Zones WHERE MonitorId = ? AND Id=?', NULL, array( $monitor->Id(), $zid ) );
-    }
-    else
-    {
+    } else {
         $zone = array(
             'Id' => 0,
             'Name' => translate('New'),
@@ -104,17 +95,16 @@ if ( !isset($newZone) )
     $zone['AreaCoords'] = preg_replace( '/\s+/', ',', $zone['Coords'] );
 
     $newZone = $zone;
-}
+} # end if new Zone
 
-//if ( !$points )
-//{
-    //$points = $zone['Points'];
-//}
+# Ensure Zone fits within the limits of the Monitor
+limitPoints( $newZone['Points'], $minX, $minY, $maxX, $maxY );
 
 ksort( $newZone['Points'], SORT_NUMERIC );
 
 $newZone['Coords'] = pointsToCoords( $newZone['Points'] );
 $newZone['Area'] = getPolyArea( $newZone['Points'] );
+$newZone['AreaCoords'] = preg_replace( '/\s+/', ',', $newZone['Coords'] );
 $selfIntersecting = isSelfIntersecting( $newZone['Points'] );
 
 $focusWindow = true;
@@ -122,7 +112,7 @@ $connkey = generateConnKey();
 $streamSrc = '';
 $streamMode = '';
 # Have to do this here, because the .js.php references somethings figured out when generating the streamHTML
-$StreamHTML = getStreamHTML( $monitor, $scale );
+$StreamHTML = getStreamHTML( $monitor, array('scale'=>$scale) );
 
 xhtmlHeaders(__FILE__, translate('Zone') );
 ?>
@@ -162,7 +152,13 @@ xhtmlHeaders(__FILE__, translate('Zone') );
               </tr>
               <tr>
                 <th scope="row"><?php echo translate('ZoneAlarmColour') ?></th>
-                <td colspan="2"><input type="text" name="newAlarmRgbR" value="<?php echo ($newZone['AlarmRGB']>>16)&0xff ?>" size="3" onchange="limitRange( this, 0, 255 )"/>&nbsp;/&nbsp;<input type="text" name="newAlarmRgbG" value="<?php echo ($newZone['AlarmRGB']>>8)&0xff ?>" size="3" onchange="limitRange( this, 0, 255 )"/>&nbsp;/&nbsp;<input type="text" name="newAlarmRgbB" value="<?php echo $newZone['AlarmRGB']&0xff ?>" size="3" onchange="limitRange( this, 0, 255 )"/></td>
+                <td colspan="2">
+                  <input type="text" name="newAlarmRgbR" value="<?php echo ($newZone['AlarmRGB']>>16)&0xff ?>" size="3" onchange="limitRange( this, 0, 255 )"/>
+                  /
+                  <input type="text" name="newAlarmRgbG" value="<?php echo ($newZone['AlarmRGB']>>8)&0xff ?>" size="3" onchange="limitRange( this, 0, 255 )"/>
+                  /
+                  <input type="text" name="newAlarmRgbB" value="<?php echo $newZone['AlarmRGB']&0xff ?>" size="3" onchange="limitRange( this, 0, 255 )"/>
+                </td>
               </tr>
               <tr>
                 <th scope="row"><?php echo translate('CheckMethod') ?></th>
diff --git a/web/skins/classic/views/zones.php b/web/skins/classic/views/zones.php
index ee767acf1..c153d69c2 100644
--- a/web/skins/classic/views/zones.php
+++ b/web/skins/classic/views/zones.php
@@ -18,23 +18,27 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canView( 'Monitors' ) )
-{
-    $view = "error";
-    return;
+if ( !canView( 'Monitors' ) ) {
+  $view = 'error';
+  return;
 }
 
 $mid = validInt($_REQUEST['mid']);
 $monitor = new Monitor( $mid );
+# Width() and Height() are already rotated
+  $minX = 0;
+  $maxX = $monitor->Width()-1;
+  $minY = 0;
+  $maxY = $monitor->Height()-1;
 
 $zones = array();
-foreach( dbFetchAll( 'select * from Zones where MonitorId = ? order by Area desc', NULL, array($mid) ) as $row )
-{
-    if ( $row['Points'] = coordsToPoints( $row['Coords'] ) )
-    {
-        $row['AreaCoords'] = preg_replace( '/\s+/', ',', $row['Coords'] );
-        $zones[] = $row;
-    }
+foreach( dbFetchAll( 'SELECT * FROM Zones WHERE MonitorId=? ORDER BY Area DESC', NULL, array($mid) ) as $row ) {
+  $row['Points'] = coordsToPoints( $row['Coords'] );
+
+  limitPoints( $row['Points'], $minX, $minY, $maxX, $maxY );
+  $row['Coords'] = pointsToCoords( $row['Points'] );
+  $row['AreaCoords'] = preg_replace( '/\s+/', ',', $row['Coords'] );
+  $zones[] = $row;
 }
 
 $connkey = generateConnKey();
@@ -48,21 +52,14 @@ xhtmlHeaders(__FILE__, translate('Zones') );
       <h2><?php echo translate('Zones') ?></h2>
     </div>
     <div id="content" style="width:<?php echo $monitor->Width() ?>px; height:<?php echo $monitor->Height() ?>px; position:relative; margin: 0 auto;">
-      <?php echo getStreamHTML( $monitor ); ?>
-      <svg class="zones" width="<?php echo $monitor->Width() ?>" height="<?php echo $monitor->Height() ?>" style="position:absolute; top: 0; left: 0; background: none;">
-<?php
-      foreach( array_reverse($zones) as $zone ) {
-?>
-        <polygon points="<?php echo $zone['AreaCoords'] ?>" class="<?php echo $zone['Type']?>" onclick="streamCmdQuit( true ); createPopup( '?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=<?php echo $zone['Id'] ?>', 'zmZone', 'zone', <?php echo $monitor->Width ?>, <?php echo $monitor->Height ?> ); return( false );"/>
-<?php
-      } // end foreach zone
-?>
-          Sorry, your browser does not support inline SVG
-        </svg>
       <form name="contentForm" id="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="action" value="delete"/>
         <input type="hidden" name="mid" value="<?php echo $mid ?>"/>
+        <div id="contentButtons">
+          <input type="button" value="<?php echo translate('AddNewZone') ?>" onclick="createPopup( '?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=0', 'zmZone', 'zone', <?php echo $monitor->Width() ?>, <?php echo $monitor->Height() ?> );"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/>
+          <input type="submit" name="deleteBtn" value="<?php echo translate('Delete') ?>" disabled="disabled"/>
+        </div>
         <table id="contentTable" class="major" cellspacing="0">
           <thead>
             <tr>
@@ -88,9 +85,18 @@ foreach( $zones as $zone )
 ?>
           </tbody>
         </table>
-        <div id="contentButtons">
-          <input type="button" value="<?php echo translate('AddNewZone') ?>" onclick="createPopup( '?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=0', 'zmZone', 'zone', <?php echo $monitor->Width() ?>, <?php echo $monitor->Height() ?> );"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/>
-          <input type="submit" name="deleteBtn" value="<?php echo translate('Delete') ?>" disabled="disabled"/>
+        <div class="ZonesImage" style="position:relative; clear:both;">
+      <?php echo getStreamHTML( $monitor ); ?>
+      <svg class="zones" width="<?php echo $monitor->Width() ?>" height="<?php echo $monitor->Height() ?>" style="position:absolute; top: 0; left: 0; background: none;">
+<?php
+      foreach( array_reverse($zones) as $zone ) {
+?>
+        <polygon points="<?php echo $zone['AreaCoords'] ?>" class="<?php echo $zone['Type']?>" onclick="streamCmdQuit( true ); createPopup( '?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=<?php echo $zone['Id'] ?>', 'zmZone', 'zone', <?php echo $monitor->Width ?>, <?php echo $monitor->Height ?> ); return( false );"/>
+<?php
+      } // end foreach zone
+?>
+          Sorry, your browser does not support inline SVG
+        </svg>
         </div>
       </form>
     </div>

From 83d6f415b397e179ea3147eea6010b26d86da4f3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 30 May 2017 14:07:37 -0400
Subject: [PATCH 18/56] cleanup whitespace

---
 web/skins/classic/views/monitor.php | 526 ++++++++++++++--------------
 1 file changed, 265 insertions(+), 261 deletions(-)

diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index a43b74899..982131589 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -26,16 +26,16 @@ if ( !canView( 'Monitors' ) ) {
 }
 
 $tabs = array();
-$tabs["general"] = translate('General');
-$tabs["source"] = translate('Source');
-$tabs["storage"] = translate('Storage');
-$tabs["timestamp"] = translate('Timestamp');
-$tabs["buffers"] = translate('Buffers');
+$tabs[''] = translate('General');
+$tabs[''] = translate('Source');
+$tabs[''] = translate('Storage');
+$tabs[''] = translate('Timestamp');
+$tabs[''] = translate('Buffers');
 if ( ZM_OPT_CONTROL && canView( 'Control' ) )
-  $tabs["control"] = translate('Control');
+  $tabs[''] = translate('Control');
 if ( ZM_OPT_X10 )
-  $tabs["x10"] = translate('X10');
-$tabs["misc"] = translate('Misc');
+  $tabs[''] = translate('X10');
+$tabs[''] = translate('Misc');
 
 if ( isset($_REQUEST['tab']) )
     $tab = validHtmlStr($_REQUEST['tab']);
@@ -238,9 +238,9 @@ $rtspFFMpegMethods = array(
 );
 
 $httpMethods = array(
-    "simple"   => "Simple",
-    "regexp"   => "Regexp",
-    "jpegTags" => "JPEG Tags"
+    'simple'   => "Simple",
+    'regexp'   => "Regexp",
+    'jpegTags' => "JPEG Tags"
 );
 if ( !ZM_PCRE )
     unset($httpMethods['regexp']);
@@ -250,137 +250,137 @@ unset($httpMethods['jpegTags']);
 if ( ZM_HAS_V4L1 )
 {
     $v4l1DeviceFormats = array(
-        "PAL"   => 0,
-        "NTSC"  => 1,
-        "SECAM" => 2,
-        "AUTO"  => 3,
-        "FMT4"  => 4,
-        "FMT5"  => 5,
-        "FMT6"  => 6,
-        "FMT7"  => 7
+        'PAL'   => 0,
+        'NTSC'  => 1,
+        'SECAM' => 2,
+        'AUTO'  => 3,
+        'FMT4'  => 4,
+        'FMT5'  => 5,
+        'FMT6'  => 6,
+        'FMT7'  => 7
     );
 
     $v4l1MaxChannels = 15;
     $v4l1DeviceChannels = array();
     for ( $i = 0; $i <= $v4l1MaxChannels; $i++ )
-        $v4l1DeviceChannels["$i"] = $i;
+        $v4l1DeviceChannels[''] = $i;
 
     $v4l1LocalPalettes = array(
         translate('Grey')      => 1,
-        "BGR32"             => 5,
-        "BGR24"             => 4,
-        "*YUYV"              => 8,
-        "*RGB565"            => 3,
-        "*RGB555"            => 6,
-        "*YUV422"            => 7,
-        "*YUV422P"           => 13,
-        "*YUV420P"           => 15
+        'BGR32'             => 5,
+        'BGR24'             => 4,
+        '*YUYV'              => 8,
+        '*RGB565'            => 3,
+        '*RGB555'            => 6,
+        '*YUV422'            => 7,
+        '*YUV422P'           => 13,
+        '*YUV420P'           => 15
     );
 }
 
 if ( ZM_HAS_V4L2 ) {
     $v4l2DeviceFormats = array(
-        "PAL"         => 0x000000ff,
-        "NTSC"        => 0x0000b000,
-        "PAL B"       => 0x00000001,
-        "PAL B1"      => 0x00000002,
-        "PAL G"       => 0x00000004,
-        "PAL H"       => 0x00000008,
-        "PAL I"       => 0x00000010,
-        "PAL D"       => 0x00000020,
-        "PAL D1"      => 0x00000040,
-        "PAL K"       => 0x00000080,
-        "PAL M"       => 0x00000100,
-        "PAL N"       => 0x00000200,
-        "PAL Nc"      => 0x00000400,
-        "PAL 60"      => 0x00000800,
-        "NTSC M"      => 0x00001000,
-        "NTSC M JP"   => 0x00002000,
-        "NTSC 443"    => 0x00004000,
-        "NTSC M KR"   => 0x00008000,
-        "SECAM B"     => 0x00010000,
-        "SECAM D"     => 0x00020000,
-        "SECAM G"     => 0x00040000,
-        "SECAM H"     => 0x00080000,
-        "SECAM K"     => 0x00100000,
-        "SECAM K1"    => 0x00200000,
-        "SECAM L"     => 0x00400000,
-        "SECAM LC"    => 0x00800000,
-        "ATSC 8 VSB"  => 0x01000000,
-        "ATSC 16 VSB" => 0x02000000,
+        'PAL'         => 0x000000ff,
+        'NTSC'        => 0x0000b000,
+        'PAL B'       => 0x00000001,
+        'PAL B1'      => 0x00000002,
+        'PAL G'       => 0x00000004,
+        'PAL H'       => 0x00000008,
+        'PAL I'       => 0x00000010,
+        'PAL D'       => 0x00000020,
+        'PAL D1'      => 0x00000040,
+        'PAL K'       => 0x00000080,
+        'PAL M'       => 0x00000100,
+        'PAL N'       => 0x00000200,
+        'PAL Nc'      => 0x00000400,
+        'PAL 60'      => 0x00000800,
+        'NTSC M'      => 0x00001000,
+        'NTSC M JP'   => 0x00002000,
+        'NTSC 443'    => 0x00004000,
+        'NTSC M KR'   => 0x00008000,
+        'SECAM B'     => 0x00010000,
+        'SECAM D'     => 0x00020000,
+        'SECAM G'     => 0x00040000,
+        'SECAM H'     => 0x00080000,
+        'SECAM K'     => 0x00100000,
+        'SECAM K1'    => 0x00200000,
+        'SECAM L'     => 0x00400000,
+        'SECAM LC'    => 0x00800000,
+        'ATSC 8 VSB'  => 0x01000000,
+        'ATSC 16 VSB' => 0x02000000,
     );
 
     $v4l2MaxChannels = 31;
     $v4l2DeviceChannels = array();
     for ( $i = 0; $i <= $v4l2MaxChannels; $i++ )
-        $v4l2DeviceChannels["$i"] = $i;
+        $v4l2DeviceChannels[''] = $i;
 
     $v4l2LocalPalettes = array(
-        "Auto" => 0, /* Automatic palette selection */
+        'Auto' => 0, /* Automatic palette selection */
 
         /*      Pixel format         FOURCC                        depth  Description  */
         translate('Grey') =>     fourcc('G','R','E','Y'), /*  8  Greyscale     */
-        "BGR32" =>    fourcc('B','G','R','4'), /* 32  BGR-8-8-8-8   */
-        "RGB32" =>    fourcc('R','G','B','4'), /* 32  RGB-8-8-8-8   */
-        "BGR24" =>    fourcc('B','G','R','3'), /* 24  BGR-8-8-8     */
-        "RGB24" =>    fourcc('R','G','B','3'), /* 24  RGB-8-8-8     */
-        "*YUYV" =>     fourcc('Y','U','Y','V'), /* 16  YUV 4:2:2     */
+        'BGR32' =>    fourcc('B','G','R','4'), /* 32  BGR-8-8-8-8   */
+        'RGB32' =>    fourcc('R','G','B','4'), /* 32  RGB-8-8-8-8   */
+        'BGR24' =>    fourcc('B','G','R','3'), /* 24  BGR-8-8-8     */
+        'RGB24' =>    fourcc('R','G','B','3'), /* 24  RGB-8-8-8     */
+        '*YUYV' =>     fourcc('Y','U','Y','V'), /* 16  YUV 4:2:2     */
 
         /* compressed formats */
-        "*JPEG" =>     fourcc('J','P','E','G'), /* JFIF JPEG     */
-        "*MJPEG" =>    fourcc('M','J','P','G'), /* Motion-JPEG   */
-        //"DV" =>       fourcc('d','v','s','d'), /* 1394          */
-        //"MPEG" =>     fourcc('M','P','E','G'), /* MPEG-1/2/4    */
+        '*JPEG' =>     fourcc('J','P','E','G'), /* JFIF JPEG     */
+        '*MJPEG' =>    fourcc('M','J','P','G'), /* Motion-JPEG   */
+        //'DV' =>       fourcc('d','v','s','d'), /* 1394          */
+        //'MPEG' =>     fourcc('M','P','E','G'), /* MPEG-1/2/4    */
 
-        //"RGB332" =>   fourcc('R','G','B','1'), /*  8  RGB-3-3-2     */
-        "*RGB444" =>   fourcc('R','4','4','4'), /* 16  xxxxrrrr ggggbbbb */
-        "*RGB555" =>   fourcc('R','G','B','O'), /* 16  RGB-5-5-5     */
-        "*RGB565" =>   fourcc('R','G','B','P'), /* 16  RGB-5-6-5     */
-        //"RGB555X" =>  fourcc('R','G','B','Q'), /* 16  RGB-5-5-5 BE  */
-        //"RGB565X" =>  fourcc('R','G','B','R'), /* 16  RGB-5-6-5 BE  */
-        //"Y16" =>      fourcc('Y','1','6',''), /* 16  Greyscale     */
-        //"PAL8" =>     fourcc('P','A','L','8'), /*  8  8-bit palette */
-        //"YVU410" =>   fourcc('Y','V','U','9'), /*  9  YVU 4:1:0     */
-        //"YVU420" =>   fourcc('Y','V','1','2'), /* 12  YVU 4:2:0     */
+        //'RGB332' =>   fourcc('R','G','B','1'), /*  8  RGB-3-3-2     */
+        '*RGB444' =>   fourcc('R','4','4','4'), /* 16  xxxxrrrr ggggbbbb */
+        '*RGB555' =>   fourcc('R','G','B','O'), /* 16  RGB-5-5-5     */
+        '*RGB565' =>   fourcc('R','G','B','P'), /* 16  RGB-5-6-5     */
+        //'RGB555X' =>  fourcc('R','G','B','Q'), /* 16  RGB-5-5-5 BE  */
+        //'RGB565X' =>  fourcc('R','G','B','R'), /* 16  RGB-5-6-5 BE  */
+        //'Y16' =>      fourcc('Y','1','6',''), /* 16  Greyscale     */
+        //'PAL8' =>     fourcc('P','A','L','8'), /*  8  8-bit palette */
+        //'YVU410' =>   fourcc('Y','V','U','9'), /*  9  YVU 4:1:0     */
+        //'YVU420' =>   fourcc('Y','V','1','2'), /* 12  YVU 4:2:0     */
 
-        "*UYVY" =>     fourcc('U','Y','V','Y'), /* 16  YUV 4:2:2     */
-        "*YUV422P" =>  fourcc('4','2','2','P'), /* 16  YVU422 planar */
-        "*YUV411P" =>  fourcc('4','1','1','P'), /* 16  YVU411 planar */
-        //"Y41P" =>     fourcc('Y','4','1','P'), /* 12  YUV 4:1:1     */
-        "*YUV444" =>   fourcc('Y','4','4','4'), /* 16  xxxxyyyy uuuuvvvv */
-        //"YUV555" =>   fourcc('Y','U','V','O'), /* 16  YUV-5-5-5     */
-        //"YUV565" =>   fourcc('Y','U','V','P'), /* 16  YUV-5-6-5     */
-        //"YUV32" =>    fourcc('Y','U','V','4'), /* 32  YUV-8-8-8-8   */
+        '*UYVY' =>     fourcc('U','Y','V','Y'), /* 16  YUV 4:2:2     */
+        '*YUV422P' =>  fourcc('4','2','2','P'), /* 16  YVU422 planar */
+        '*YUV411P' =>  fourcc('4','1','1','P'), /* 16  YVU411 planar */
+        //'Y41P' =>     fourcc('Y','4','1','P'), /* 12  YUV 4:1:1     */
+        '*YUV444' =>   fourcc('Y','4','4','4'), /* 16  xxxxyyyy uuuuvvvv */
+        //'YUV555' =>   fourcc('Y','U','V','O'), /* 16  YUV-5-5-5     */
+        //'YUV565' =>   fourcc('Y','U','V','P'), /* 16  YUV-5-6-5     */
+        //'YUV32' =>    fourcc('Y','U','V','4'), /* 32  YUV-8-8-8-8   */
 
         /* two planes -- one Y, one Cr + Cb interleaved  */
-        //"NV12" =>     fourcc('N','V','1','2'), /* 12  Y/CbCr 4:2:0  */
-        //"NV21" =>     fourcc('N','V','2','1'), /* 12  Y/CrCb 4:2:0  */
+        //'NV12' =>     fourcc('N','V','1','2'), /* 12  Y/CbCr 4:2:0  */
+        //'NV21' =>     fourcc('N','V','2','1'), /* 12  Y/CrCb 4:2:0  */
 
         /*  The following formats are not defined in the V4L2 specification */
-        "*YUV410" =>   fourcc('Y','U','V','9'), /*  9  YUV 4:1:0     */
-        "*YUV420" =>   fourcc('Y','U','1','2'), /* 12  YUV 4:2:0     */
-        //"YYUV" =>     fourcc('Y','Y','U','V'), /* 16  YUV 4:2:2     */
-        //"HI240" =>    fourcc('H','I','2','4'), /*  8  8-bit color   */
-        //"HM12" =>     fourcc('H','M','1','2'), /*  8  YUV 4:2:0 16x16 macroblocks */
+        '*YUV410' =>   fourcc('Y','U','V','9'), /*  9  YUV 4:1:0     */
+        '*YUV420' =>   fourcc('Y','U','1','2'), /* 12  YUV 4:2:0     */
+        //'YYUV' =>     fourcc('Y','Y','U','V'), /* 16  YUV 4:2:2     */
+        //'HI240' =>    fourcc('H','I','2','4'), /*  8  8-bit color   */
+        //'HM12' =>     fourcc('H','M','1','2'), /*  8  YUV 4:2:0 16x16 macroblocks */
 
         /* see http://www.siliconimaging.com/RGB%20Bayer.htm */
-        //"SBGGR8" =>   fourcc('B','A','8','1'), /*  8  BGBG.. GRGR.. */
-        //"SGBRG8" =>   fourcc('G','B','R','G'), /*  8  GBGB.. RGRG.. */
-        //"SBGGR16" =>  fourcc('B','Y','R','2'), /* 16  BGBG.. GRGR.. */
+        //'SBGGR8' =>   fourcc('B','A','8','1'), /*  8  BGBG.. GRGR.. */
+        //'SGBRG8' =>   fourcc('G','B','R','G'), /*  8  GBGB.. RGRG.. */
+        //'SBGGR16' =>  fourcc('B','Y','R','2'), /* 16  BGBG.. GRGR.. */
 
         /*  Vendor-specific formats   */
-        //"WNVA" =>     fourcc('W','N','V','A'), /* Winnov hw compress */
-        //"SN9C10X" =>  fourcc('S','9','1','0'), /* SN9C10x compression */
-        //"PWC1" =>     fourcc('P','W','C','1'), /* pwc older webcam */
-        //"PWC2" =>     fourcc('P','W','C','2'), /* pwc newer webcam */
-        //"ET61X251" => fourcc('E','6','2','5'), /* ET61X251 compression */
-        //"SPCA501" =>  fourcc('S','5','0','1'), /* YUYV per line */
-        //"SPCA505" =>  fourcc('S','5','0','5'), /* YYUV per line */
-        //"SPCA508" =>  fourcc('S','5','0','8'), /* YUVY per line */
-        //"SPCA561" =>  fourcc('S','5','6','1'), /* compressed GBRG bayer */
-        //"PAC207" =>   fourcc('P','2','0','7'), /* compressed BGGR bayer */
-        //"PJPG" =>     fourcc('P','J','P','G'), /* Pixart 73xx JPEG */
-        //"YVYU" =>     fourcc('Y','V','Y','U'), /* 16  YVU 4:2:2     */
+        //'WNVA' =>     fourcc('W','N','V','A'), /* Winnov hw compress */
+        //'SN9C10X' =>  fourcc('S','9','1','0'), /* SN9C10x compression */
+        //'PWC1' =>     fourcc('P','W','C','1'), /* pwc older webcam */
+        //'PWC2' =>     fourcc('P','W','C','2'), /* pwc newer webcam */
+        //'ET61X251' => fourcc('E','6','2','5'), /* ET61X251 compression */
+        //'SPCA501' =>  fourcc('S','5','0','1'), /* YUYV per line */
+        //'SPCA505' =>  fourcc('S','5','0','5'), /* YYUV per line */
+        //'SPCA508' =>  fourcc('S','5','0','8'), /* YUVY per line */
+        //'SPCA561' =>  fourcc('S','5','6','1'), /* compressed GBRG bayer */
+        //'PAC207' =>   fourcc('P','2','0','7'), /* compressed BGGR bayer */
+        //'PJPG' =>     fourcc('P','J','P','G'), /* Pixart 73xx JPEG */
+        //'YVYU' =>     fourcc('Y','V','Y','U'), /* 16  YVU 4:2:2     */
     );
 }
 
@@ -400,70 +400,70 @@ $orientations = array(
 );
 
 $deinterlaceopts = array(
-    "Disabled"                                            => 0x00000000,
-    "Four field motion adaptive - Soft"                   => 0x00001E04, /* 30 change */
-    "Four field motion adaptive - Medium"                 => 0x00001404, /* 20 change */
-    "Four field motion adaptive - Hard"                   => 0x00000A04, /* 10 change */
-    "Discard"                                             => 0x00000001,
-    "Linear"                                              => 0x00000002,
-    "Blend"                                               => 0x00000003,
-    "Blend (25%)"                                         => 0x00000205
+    'Disabled'                                            => 0x00000000,
+    'Four field motion adaptive - Soft'                   => 0x00001E04, /* 30 change */
+    'Four field motion adaptive - Medium'                 => 0x00001404, /* 20 change */
+    'Four field motion adaptive - Hard'                   => 0x00000A04, /* 10 change */
+    'Discard'                                             => 0x00000001,
+    'Linear'                                              => 0x00000002,
+    'Blend'                                               => 0x00000003,
+    'Blend (25%)'                                         => 0x00000205
 );
 
 $deinterlaceopts_v4l2 = array(
-    "Disabled"                                            => 0x00000000,
-    "Four field motion adaptive - Soft"                   => 0x00001E04, /* 30 change */
-    "Four field motion adaptive - Medium"                 => 0x00001404, /* 20 change */
-    "Four field motion adaptive - Hard"                   => 0x00000A04, /* 10 change */
-    "Discard"                                             => 0x00000001,
-    "Linear"                                              => 0x00000002,
-    "Blend"                                               => 0x00000003,
-    "Blend (25%)"                                         => 0x00000205,
-    "V4L2: Capture top field only"                        => 0x02000000,
-    "V4L2: Capture bottom field only"                     => 0x03000000,
-    "V4L2: Alternate fields (Bob)"                        => 0x07000000,
-    "V4L2: Progressive"                                   => 0x01000000,
-    "V4L2: Interlaced"                                    => 0x04000000
+    'Disabled'                                            => 0x00000000,
+    'Four field motion adaptive - Soft'                   => 0x00001E04, /* 30 change */
+    'Four field motion adaptive - Medium'                 => 0x00001404, /* 20 change */
+    'Four field motion adaptive - Hard'                   => 0x00000A04, /* 10 change */
+    'Discard'                                             => 0x00000001,
+    'Linear'                                              => 0x00000002,
+    'Blend'                                               => 0x00000003,
+    'Blend (25%)'                                         => 0x00000205,
+    'V4L2: Capture top field only'                        => 0x02000000,
+    'V4L2: Capture bottom field only'                     => 0x03000000,
+    'V4L2: Alternate fields (Bob)'                        => 0x07000000,
+    'V4L2: Progressive'                                   => 0x01000000,
+    'V4L2: Interlaced'                                    => 0x04000000
 );
 
 $fastblendopts = array(
-    "No blending"                                         => 0,
-    "1.5625%"                                             => 1,
-    "3.125%"                                              => 3,
-    "6.25% (Indoor)"                                      => 6,
-    "12.5% (Outdoor)"                                     => 12,
-    "25%"                                                 => 25,
-    "50%"                                                 => 50
-);
+    'No blending'                                         => 0,
+    '1.5625%'                                             => 1,
+    '3.125%'                                              => 3,
+    '6.25% (Indoor)'                                      => 6,
+    '12.5% (Outdoor)'                                     => 12,
+    '25%'                                                 => 25,
+    '50%'                                                 => 50
+    );
 
 $fastblendopts_alarm = array(
-    "No blending (Alarm lasts forever)"                   => 0,
-    "1.5625%"                                             => 1,
-    "3.125%"                                              => 3,
-    "6.25%"                                               => 6,
-    "12.5%"                                               => 12,
-    "25%"                                                 => 25,
-    "50% (Alarm lasts a moment)"                          => 50
-);
+    'No blending (Alarm lasts forever)'                   => 0,
+    '1.5625%'                                             => 1,
+    '3.125%'                                              => 3,
+    '6.25%'                                               => 6,
+    '12.5%'                                               => 12,
+    '25%'                                                 => 25,
+    '50% (Alarm lasts a moment)'                          => 50
+    );
 
 $label_size = array(
-    "Default"                                             => 1,
-    "Large"                                               => 2
-);
+    'Default'                                             => 1,
+    'Large'                                               => 2
+    );
 
 $savejpegopts = array(
-    "Disabled"                                            => 0,
-    "Frames only"                                         => 1,
-    "Analysis images only (if available)"                 => 2,
-    "Frames + Analysis images (if available)"             => 3,
-    "Snapshot Only"                                       => 4          
-);
+    'Disabled'                                            => 0,
+    'Frames only'                                         => 1,
+    'Analysis images only (if available)'                 => 2,
+    'Frames + Analysis images (if available)'             => 3,
+    'Snapshot Only'                                       => 4          
+    );
 
 $videowriteropts = array(
-    "Disabled"                                            => 0,
-    "X264 Encode"                                         => 1,
-    "H264 Camera Passthrough"                             => 2          
-);
+    'Disabled'                                            => 0,
+    'X264 Encode'                                         => 1,
+    'H264 Camera Passthrough'                             => 2          
+    );
 
 xhtmlHeaders(__FILE__, translate('Monitor')." - ".validHtmlStr($monitor['Name']) );
 ?>
@@ -483,33 +483,33 @@ if ( canEdit( 'Monitors' ) ) {
 ?>
       <div id="headerButtons">
         <a href="#" onclick="createPopup( '?view=monitorprobe&amp;mid=<?php echo $monitor['Id'] ?>', 'zmMonitorProbe<?php echo $monitor['Id'] ?>', 'monitorprobe' ); return( false );"><?php echo translate('Probe') ?></a>
-  <?php
+<?php
   if ( ZM_HAS_ONVIF ) {
-  ?>
+?>
         <a href="#" onclick="createPopup( '?view=onvifprobe&amp;mid=<?php echo $monitor['Id'] ?>', 'zmOnvifProbe<?php echo $monitor['Id'] ?>', 'onvifprobe' ); return( false );"><?php echo  translate('OnvifProbe') ?></a>
-  <?php
+<?php
   }
-  ?>
+?>
         <a href="#" onclick="createPopup( '?view=monitorpreset&amp;mid=<?php echo $monitor['Id'] ?>', 'zmMonitorPreset<?php echo $monitor['Id'] ?>', 'monitorpreset' ); return( false );"><?php echo translate('Presets') ?></a>
       </div>
 <?php
-}
+} // end if canEdit('Monitors')
 ?>
       <h2><?php echo translate('Monitor') ?> - <?php echo validHtmlStr($monitor['Name']) ?><?php if ( !empty($monitor['Id']) ) { ?> (<?php echo $monitor['Id'] ?>)<?php } ?></h2>
     </div>
     <div id="content">
       <ul class="tabList">
 <?php
-  foreach ( $tabs as $name=>$value ) {
-    if ( $tab == $name ) {
+foreach ( $tabs as $name=>$value ) {
+  if ( $tab == $name ) {
 ?>
         <li class="active"><?php echo $value ?></li>
 <?php
-    } else {
+  } else {
 ?>
         <li><a href="#" onclick="submitTab( '<?php echo $name ?>' ); return( false );"><?php echo $value ?></a></li>
 <?php
-    }
+  }
 }
 ?>
       </ul>
@@ -522,7 +522,7 @@ if ( canEdit( 'Monitors' ) ) {
         <input type="hidden" name="newMonitor[LinkedMonitors]" value="<?php echo isset($newMonitor['LinkedMonitors'])?$newMonitor['LinkedMonitors']:'' ?>"/>
         <input type="hidden" name="origMethod" value="<?php echo isset($newMonitor['Method'])?$newMonitor['Method']:'' ?>"/>
 <?php
-    if ( $tab != 'general' ) {
+  if ( $tab != 'general' ) {
 ?>
         <input type="hidden" name="newMonitor[Name]" value="<?php echo validHtmlStr($newMonitor['Name']) ?>"/>
         <input type="hidden" name="newMonitor[ServerId]" value="<?php echo validHtmlStr($newMonitor['ServerId']) ?>"/>
@@ -535,15 +535,15 @@ if ( canEdit( 'Monitors' ) ) {
         <input type="hidden" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($newMonitor['MaxFPS']) ?>"/>
         <input type="hidden" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($newMonitor['AlarmMaxFPS']) ?>"/>
 <?php
-    if ( isset($newMonitor['Triggers']) ) {
-        foreach( $newMonitor['Triggers'] as $newTrigger ) {
+  if ( isset($newMonitor['Triggers']) ) {
+    foreach( $newMonitor['Triggers'] as $newTrigger ) {
 ?>
         <input type="hidden" name="newMonitor[Triggers][]" value="<?php echo validHtmlStr($newTrigger) ?>"/>
 <?php
-        }
     }
+  }
 }
-    if ( ZM_HAS_V4L && ($tab != 'source' || $newMonitor['Type'] != 'Local') ) {
+  if ( ZM_HAS_V4L && ($tab != 'source' || $newMonitor['Type'] != 'Local') ) {
 ?>
     <input type="hidden" name="newMonitor[Device]" value="<?php echo validHtmlStr($newMonitor['Device']) ?>"/>
     <input type="hidden" name="newMonitor[Channel]" value="<?php echo validHtmlStr($newMonitor['Channel']) ?>"/>
@@ -552,32 +552,32 @@ if ( canEdit( 'Monitors' ) ) {
     <input type="hidden" name="newMonitor[V4LMultiBuffer]" value="<?php echo validHtmlStr($newMonitor['V4LMultiBuffer']) ?>"/>
     <input type="hidden" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo validHtmlStr($newMonitor['V4LCapturesPerFrame']) ?>"/>
 <?php
-    }
-    if ( $tab != 'source' || $newMonitor['Type'] != 'Remote' ) {
+  }
+  if ( $tab != 'source' || $newMonitor['Type'] != 'Remote' ) {
 ?>
     <input type="hidden" name="newMonitor[Protocol]" value="<?php echo validHtmlStr($newMonitor['Protocol']) ?>"/>
     <input type="hidden" name="newMonitor[Host]" value="<?php echo validHtmlStr($newMonitor['Host']) ?>"/>
     <input type="hidden" name="newMonitor[Port]" value="<?php echo validHtmlStr($newMonitor['Port']) ?>"/>
 <?php
-    }
-    if ( $tab != 'source' || ($newMonitor['Type'] != 'Local' && $newMonitor['Type'] != 'Remote' && $newMonitor['Type'] != 'Ffmpeg' && $newMonitor['Type'] != 'Libvlc') ) {
+  }
+  if ( $tab != 'source' || ($newMonitor['Type'] != 'Local' && $newMonitor['Type'] != 'Remote' && $newMonitor['Type'] != 'Ffmpeg' && $newMonitor['Type'] != 'Libvlc') ) {
 ?>
     <input type="hidden" name="newMonitor[Method]" value="<?php echo validHtmlStr($newMonitor['Method']) ?>"/>
 <?php
-    }
-    if ( $tab != 'source' || ($newMonitor['Type'] != 'Ffmpeg' && $newMonitor['Type'] != 'Libvlc' )) {
+  }
+  if ( $tab != 'source' || ($newMonitor['Type'] != 'Ffmpeg' && $newMonitor['Type'] != 'Libvlc' )) {
 ?>
     <input type="hidden" name="newMonitor[Options]" value="<?php echo validHtmlStr($newMonitor['Options']) ?>"/>
 <?php
-    }
-    if ( $tab != 'source' || ($newMonitor['Type'] != 'Remote' && $newMonitor['Type'] != 'File' && $newMonitor['Type'] != 'Ffmpeg' && $newMonitor['Type'] != 'Libvlc' && $newMonitor['Type'] != 'cURL') ) {
+  }
+  if ( $tab != 'source' || ($newMonitor['Type'] != 'Remote' && $newMonitor['Type'] != 'File' && $newMonitor['Type'] != 'Ffmpeg' && $newMonitor['Type'] != 'Libvlc' && $newMonitor['Type'] != 'cURL') ) {
 ?>
     <input type="hidden" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>"/>
     <input type="hidden" name="newMonitor[User]" value="<?php echo validHtmlStr($newMonitor['User']) ?>"/>
     <input type="hidden" name="newMonitor[Pass]" value="<?php echo validHtmlStr($newMonitor['Pass']) ?>"/>
 <?php
-}
-if ( $tab != 'source' ) {
+  }
+  if ( $tab != 'source' ) {
 ?>
     <input type="hidden" name="newMonitor[Colours]" value="<?php echo validHtmlStr($newMonitor['Colours']) ?>"/>
     <input type="hidden" name="newMonitor[Width]" value="<?php echo validHtmlStr($newMonitor['Width']) ?>"/>
@@ -585,29 +585,29 @@ if ( $tab != 'source' ) {
     <input type="hidden" name="newMonitor[Orientation]" value="<?php echo validHtmlStr($newMonitor['Orientation']) ?>"/>
     <input type="hidden" name="newMonitor[Deinterlacing]" value="<?php echo validHtmlStr($newMonitor['Deinterlacing']) ?>"/>
 <?php
-}
-if ( $tab != 'storage' ) {
+  }
+  if ( $tab != 'storage' ) {
 ?>
     <input type="hidden" name="newMonitor[SaveJPEGs]" value="<?php echo validHtmlStr($newMonitor['SaveJPEGs']) ?>"/>
     <input type="hidden" name="newMonitor[VideoWriter]" value="<?php echo validHtmlStr($newMonitor['VideoWriter']) ?>"/>
     <input type="hidden" name="newMonitor[EncoderParameters]" value="<?php echo validHtmlStr($newMonitor['EncoderParameters']) ?>"/>
     <input type="hidden" name="newMonitor[RecordAudio]" value="<?php echo validHtmlStr($newMonitor['RecordAudio']) ?>"/>
 <?php
-}
-if ( $tab != 'source' || ($newMonitor['Type'] != 'Remote' && $newMonitor['Protocol'] != 'RTSP')) {
+  }
+  if ( $tab != 'source' || ($newMonitor['Type'] != 'Remote' && $newMonitor['Protocol'] != 'RTSP')) {
 ?>
     <input type="hidden" name="newMonitor[RTSPDescribe]" value="<?php echo validHtmlStr($newMonitor['RTSPDescribe']) ?>"/>
 <?php
-}
-if ( $tab != 'timestamp' ) {
+  }
+  if ( $tab != 'timestamp' ) {
 ?>
     <input type="hidden" name="newMonitor[LabelFormat]" value="<?php echo validHtmlStr($newMonitor['LabelFormat']) ?>"/>
     <input type="hidden" name="newMonitor[LabelX]" value="<?php echo validHtmlStr($newMonitor['LabelX']) ?>"/>
     <input type="hidden" name="newMonitor[LabelY]" value="<?php echo validHtmlStr($newMonitor['LabelY']) ?>"/>
     <input type="hidden" name="newMonitor[LabelSize]" value="<?php echo validHtmlStr($newMonitor['LabelSize']) ?>"/>
 <?php
-}
-if ( $tab != 'buffers' ) {
+  }
+  if ( $tab != 'buffers' ) {
 ?>
     <input type="hidden" name="newMonitor[ImageBufferCount]" value="<?php echo validHtmlStr($newMonitor['ImageBufferCount']) ?>"/>
     <input type="hidden" name="newMonitor[WarmupCount]" value="<?php echo validHtmlStr($newMonitor['WarmupCount']) ?>"/>
@@ -616,8 +616,8 @@ if ( $tab != 'buffers' ) {
     <input type="hidden" name="newMonitor[StreamReplayBuffer]" value="<?php echo validHtmlStr($newMonitor['StreamReplayBuffer']) ?>"/>
     <input type="hidden" name="newMonitor[AlarmFrameCount]" value="<?php echo validHtmlStr($newMonitor['AlarmFrameCount']) ?>"/>
 <?php
-}
-if ( ZM_OPT_CONTROL && $tab != 'control' ) {
+  }
+  if ( ZM_OPT_CONTROL && $tab != 'control' ) {
 ?>
     <input type="hidden" name="newMonitor[Controllable]" value="<?php echo validHtmlStr($newMonitor['Controllable']) ?>"/>
     <input type="hidden" name="newMonitor[ControlId]" value="<?php echo validHtmlStr($newMonitor['ControlId']) ?>"/>
@@ -629,15 +629,15 @@ if ( ZM_OPT_CONTROL && $tab != 'control' ) {
     <input type="hidden" name="newMonitor[ReturnLocation]" value="<?php echo validHtmlStr($newMonitor['ReturnLocation']) ?>"/>
     <input type="hidden" name="newMonitor[ReturnDelay]" value="<?php echo validHtmlStr($newMonitor['ReturnDelay']) ?>"/>
 <?php
-}
-if ( ZM_OPT_X10 && $tab != 'x10' ) {
+  }
+  if ( ZM_OPT_X10 && $tab != 'x10' ) {
 ?>
     <input type="hidden" name="newX10Monitor[Activation]" value="<?php echo validHtmlStr($newX10Monitor['Activation']) ?>"/>
     <input type="hidden" name="newX10Monitor[AlarmInput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmInput']) ?>"/>
     <input type="hidden" name="newX10Monitor[AlarmOutput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmOutput']) ?>"/>
 <?php
-}
-if ( $tab != 'misc' ) {
+  }
+  if ( $tab != 'misc' ) {
 ?>
     <input type="hidden" name="newMonitor[EventPrefix]" value="<?php echo validHtmlStr($newMonitor['EventPrefix']) ?>"/>
     <input type="hidden" name="newMonitor[SectionLength]" value="<?php echo validHtmlStr($newMonitor['SectionLength']) ?>"/>
@@ -651,32 +651,32 @@ if ( $tab != 'misc' ) {
     <input type="hidden" name="newMonitor[WebColour]" value="<?php echo validHtmlStr($newMonitor['WebColour']) ?>"/>
     <input type="hidden" name="newMonitor[Exif]" value="<?php echo validHtmlStr($newMonitor['Exif']) ?>"/>
 <?php
-}
-if ( ZM_HAS_V4L && ($tab != 'misc' || $newMonitor['Type'] != 'Local') ) {
+  }
+  if ( ZM_HAS_V4L && ($tab != 'misc' || $newMonitor['Type'] != 'Local') ) {
 ?>
     <input type="hidden" name="newMonitor[SignalCheckColour]" value="<?php echo validHtmlStr($newMonitor['SignalCheckColour']) ?>"/>
 <?php
-}
+  }
 ?>
-        <table id="contentTable" class="major" cellspacing="0">
-          <tbody>
+    <table id="contentTable" class="major" cellspacing="0">
+      <tbody>
 <?php
-switch ( $tab ) {
+  switch ( $tab ) {
     case 'general' :
-    {
+      {
 ?>
             <tr><td><?php echo translate('Name') ?></td><td><input type="text" name="newMonitor[Name]" value="<?php echo validHtmlStr($newMonitor['Name']) ?>" size="16"/></td></tr>
             <tr><td><?php echo translate('Server') ?></td><td>
 <?php 
-  $servers = array(''=>'None');
-  $result = dbQuery( 'SELECT * FROM Servers ORDER BY Name');
-  $results = $result->fetchALL(PDO::FETCH_CLASS | PDO::FETCH_PROPS_LATE, 'Server' );
-  foreach ( $results as $row => $server_obj ) {
-    $servers[$server_obj->Id] = $server_obj->Name();
-  }
-?>
-  <?php echo buildSelect( "newMonitor[ServerId]", $servers ); ?>
-</td></tr>
+        $servers = array(''=>'None');
+        $result = dbQuery( 'SELECT * FROM Servers ORDER BY Name');
+        $results = $result->fetchALL(PDO::FETCH_CLASS | PDO::FETCH_PROPS_LATE, 'Server' );
+        foreach ( $results as $row => $server_obj ) {
+          $servers[$server_obj->Id] = $server_obj->Name();
+        }
+        echo buildSelect( "newMonitor[ServerId]", $servers );
+ ?>
+              </td></tr>
             <tr><td><?php echo translate('SourceType') ?></td><td><?php echo buildSelect( "newMonitor[Type]", $sourceTypes ); ?></td></tr>
             <tr><td><?php echo translate('Function') ?></td><td><select name="newMonitor[Function]">
 <?php
@@ -693,42 +693,41 @@ switch ( $tab ) {
               <td>
                 <select name="monitorIds" size="4" multiple="multiple" onchange="updateLinkedMonitors( this )">
 <?php
-    $monitors = dbFetchAll( "select Id,Name from Monitors order by Sequence asc" );
-    if ( !empty($newMonitor['LinkedMonitors']) )
-        $monitorIds = array_flip( explode( ',', $newMonitor['LinkedMonitors'] ) );
-    else
-        $monitorIds = array();
-    foreach ( $monitors as $monitor ) {
-        if ( (empty($newMonitor['Id']) || ($monitor['Id'] != $newMonitor['Id'])) && visibleMonitor( $monitor['Id'] ) ) {
+        $monitors = dbFetchAll( "select Id,Name from Monitors order by Sequence asc" );
+        if ( !empty($newMonitor['LinkedMonitors']) )
+          $monitorIds = array_flip( explode( ',', $newMonitor['LinkedMonitors'] ) );
+        else
+          $monitorIds = array();
+        foreach ( $monitors as $monitor ) {
+          if ( (empty($newMonitor['Id']) || ($monitor['Id'] != $newMonitor['Id'])) && visibleMonitor( $monitor['Id'] ) ) {
 ?>
                   <option value="<?php echo $monitor['Id'] ?>"<?php if ( array_key_exists( $monitor['Id'], $monitorIds ) ) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($monitor['Name']) ?></option>
 <?php
+          }
         }
-    }
 ?>
                 </select>
               </td>
             </tr>
             <tr><td><?php echo translate('AnalysisFPS') ?></td><td><input type="text" name="newMonitor[AnalysisFPS]" value="<?php echo validHtmlStr($newMonitor['AnalysisFPS']) ?>" size="6"/></td></tr>
 <?php
-    if ( $newMonitor['Type'] != 'Local' && $newMonitor['Type'] != 'File' ) {
+        if ( $newMonitor['Type'] != 'Local' && $newMonitor['Type'] != 'File' ) {
 ?>
             <tr><td><?php echo translate('MaximumFPS') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_MAXFPS', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><input type="text" onclick="document.getElementById('newMonitor[MaxFPS]').innerHTML= ' CAUTION: See the help text'" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($newMonitor['MaxFPS']) ?>" size="5"/><span id="newMonitor[MaxFPS]" style="color:red"></span></td></tr>
             <tr><td><?php echo translate('AlarmMaximumFPS') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_MAXFPS', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><input type="text" onclick="document.getElementById('newMonitor[AlarmMaxFPS]').innerHTML= ' CAUTION: See the help text'" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($newMonitor['AlarmMaxFPS']) ?>" size="5"/><span id="newMonitor[AlarmMaxFPS]" style="color:red"></span></td></tr>
 <?php
-    } else {
+        } else {
 ?>
             <tr><td><?php echo translate('MaximumFPS') ?></td><td><input type="text" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($newMonitor['MaxFPS']) ?>" size="5"/></td></tr>
             <tr><td><?php echo translate('AlarmMaximumFPS') ?></td><td><input type="text" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($newMonitor['AlarmMaxFPS']) ?>" size="5"/></td></tr>
 <?php
-    }
-  if ( ZM_FAST_IMAGE_BLENDS )
-        {
+        }
+        if ( ZM_FAST_IMAGE_BLENDS ) {
 ?>
             <tr><td><?php echo translate('RefImageBlendPct') ?></td><td><select name="newMonitor[RefBlendPerc]"><?php foreach ( $fastblendopts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['RefBlendPerc'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
             <tr><td><?php echo translate('AlarmRefImageBlendPct') ?></td><td><select name="newMonitor[AlarmRefBlendPerc]"><?php foreach ( $fastblendopts_alarm as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['AlarmRefBlendPerc'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
 <?php
-  } else {
+        } else {
 ?>
             <tr><td><?php echo translate('RefImageBlendPct') ?></td><td><input type="text" name="newMonitor[RefBlendPerc]" value="<?php echo validHtmlStr($newMonitor['RefBlendPerc']) ?>" size="4"/></td></tr>
             <tr><td><?php echo translate('AlarmRefImageBlendPct') ?></td><td><input type="text" name="newMonitor[AlarmRefBlendPerc]" value="<?php echo validHtmlStr($newMonitor['AlarmRefBlendPerc']) ?>" size="4"/></td></tr>
@@ -742,14 +741,14 @@ switch ( $tab ) {
         $breakCount = min( 3, $breakCount );
         $optCount = 0;
         foreach( $optTriggers as $optTrigger ) {
-            if ( !ZM_OPT_X10 && $optTrigger == 'X10' )
-                continue;
-            if ( $optCount && ($optCount%$breakCount == 0) )
-                echo "</br>";
+          if ( !ZM_OPT_X10 && $optTrigger == 'X10' )
+            continue;
+          if ( $optCount && ($optCount%$breakCount == 0) )
+            echo '</br>';
 ?>
               <input type="checkbox" name="newMonitor[Triggers][]" value="<?php echo $optTrigger ?>"<?php if ( isset($newMonitor['Triggers']) && in_array( $optTrigger, $newMonitor['Triggers'] ) ) { ?> checked="checked"<?php } ?>/>&nbsp;<?php echo $optTrigger ?>
 <?php
-            $optCount ++;
+          $optCount ++;
         }
         if ( !$optCount ) {
 ?>
@@ -760,51 +759,51 @@ switch ( $tab ) {
             </td></tr>
 <?php
         break;
-    }
+      }
     case 'source' :
-    {
+      {
         if ( ZM_HAS_V4L && $newMonitor['Type'] == 'Local' ) {
 ?>
             <tr><td><?php echo translate('DevicePath') ?></td><td><input type="text" name="newMonitor[Device]" value="<?php echo validHtmlStr($newMonitor['Device']) ?>" size="24"/></td></tr>
             <tr><td><?php echo translate('CaptureMethod') ?></td><td><?php echo buildSelect( "newMonitor[Method]", $localMethods, "submitTab( '$tab' )" ); ?></td></tr>
 <?php
-            if ( ZM_HAS_V4L1 && $newMonitor['Method'] == 'v4l1' ) {
+          if ( ZM_HAS_V4L1 && $newMonitor['Method'] == 'v4l1' ) {
 ?>
             <tr><td><?php echo translate('DeviceChannel') ?></td><td><select name="newMonitor[Channel]"><?php foreach ( $v4l1DeviceChannels as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Channel'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
             <tr><td><?php echo translate('DeviceFormat') ?></td><td><select name="newMonitor[Format]"><?php foreach ( $v4l1DeviceFormats as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Format'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
             <tr><td><?php echo translate('CapturePalette') ?></td><td><select name="newMonitor[Palette]"><?php foreach ( $v4l1LocalPalettes as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Palette'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
 <?php
-            } else {
+          } else {
 ?>
             <tr><td><?php echo translate('DeviceChannel') ?></td><td><select name="newMonitor[Channel]"><?php foreach ( $v4l2DeviceChannels as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Channel'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
             <tr><td><?php echo translate('DeviceFormat') ?></td><td><select name="newMonitor[Format]"><?php foreach ( $v4l2DeviceFormats as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Format'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
             <tr><td><?php echo translate('CapturePalette') ?></td><td><select name="newMonitor[Palette]"><?php foreach ( $v4l2LocalPalettes as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Palette'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
 <?php
-            }
+          }
 ?>
-      <tr><td><?php echo translate('V4LMultiBuffer') ?></td><td>
-        <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]1" value="1" <?php echo ( $newMonitor['V4LMultiBuffer'] == 1 ? 'checked="checked"' : '' ) ?>/>
-        <label for="newMonitor[V4LMultiBuffer]1">Yes</label>
-        <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]0" value="0" <?php echo ( $newMonitor['V4LMultiBuffer'] == 0 ? 'checked="checked"' : '' ) ?>/>
-        <label for="newMonitor[V4LMultiBuffer]0">No</label>
-        <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]" value="" <?php echo ( empty($newMonitor['V4LMultiBuffer']) ? 'checked="checked"' : '' ) ?>/>
-        <label for="newMonitor[V4LMultiBuffer]">Use Config Value</label>
-      </td></tr>
-      <tr><td><?php echo translate('V4LCapturesPerFrame') ?></td><td><input type="number" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo $newMonitor['V4LCapturesPerFrame'] ?>"/></td></tr>
+            <tr><td><?php echo translate('V4LMultiBuffer') ?></td><td>
+              <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]1" value="1" <?php echo ( $newMonitor['V4LMultiBuffer'] == 1 ? 'checked="checked"' : '' ) ?>/>
+              <label for="newMonitor[V4LMultiBuffer]1">Yes</label>
+              <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]0" value="0" <?php echo ( $newMonitor['V4LMultiBuffer'] == 0 ? 'checked="checked"' : '' ) ?>/>
+              <label for="newMonitor[V4LMultiBuffer]0">No</label>
+              <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]" value="" <?php echo ( empty($newMonitor['V4LMultiBuffer']) ? 'checked="checked"' : '' ) ?>/>
+              <label for="newMonitor[V4LMultiBuffer]">Use Config Value</label>
+            </td></tr>
+            <tr><td><?php echo translate('V4LCapturesPerFrame') ?></td><td><input type="number" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo $newMonitor['V4LCapturesPerFrame'] ?>"/></td></tr>
 <?php
         } elseif ( $newMonitor['Type'] == 'Remote' ) {
 ?>
             <tr><td><?php echo translate('RemoteProtocol') ?></td><td><?php echo buildSelect( "newMonitor[Protocol]", $remoteProtocols, "updateMethods( this );if(this.value=='rtsp'){\$('RTSPDescribe').setStyle('display','table-row');}else{\$('RTSPDescribe').hide();}" ); ?></td></tr>
 <?php
-            if ( empty($newMonitor['Protocol']) || $newMonitor['Protocol'] == 'http' ) {
+          if ( empty($newMonitor['Protocol']) || $newMonitor['Protocol'] == 'http' ) {
 ?>
             <tr><td><?php echo translate('RemoteMethod') ?></td><td><?php echo buildSelect( 'newMonitor[Method]', $httpMethods ); ?></td></tr>
 <?php
-            } else {
+          } else {
 ?>
             <tr><td><?php echo translate('RemoteMethod') ?></td><td><?php echo buildSelect( 'newMonitor[Method]', $rtspMethods ); ?></td></tr>
 <?php
-            }
+          }
 ?>
             <tr><td><?php echo translate('RemoteHostName') ?></td><td><input type="text" name="newMonitor[Host]" value="<?php echo validHtmlStr($newMonitor['Host']) ?>" size="36"/></td></tr>
             <tr><td><?php echo translate('RemoteHostPort') ?></td><td><input type="text" name="newMonitor[Port]" value="<?php echo validHtmlStr($newMonitor['Port']) ?>" size="6"/></td></tr>
@@ -824,7 +823,10 @@ switch ( $tab ) {
 ?>
             <tr><td><?php echo translate('SourcePath') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr>
             <tr><td><?php echo translate('RemoteMethod') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_RTSPTrans', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><?php echo buildSelect( "newMonitor[Method]", $rtspFFMpegMethods ); ?></td></tr>
-            <tr><td><?php echo translate('Options') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_'.strtoupper($newMonitor['Type']), 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><input type="text" name="newMonitor[Options]" value="<?php echo validHtmlStr($newMonitor['Options']) ?>" size="36"/></td></tr>
+            <tr>
+              <td><?php echo translate('Options') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_'.strtoupper($newMonitor['Type']), 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td>
+              <td><input type="text" name="newMonitor[Options]" value="<?php echo validHtmlStr($newMonitor['Options']) ?>" size="36"/></td>
+            </tr>
 <?php
         }
 ?>
@@ -853,8 +855,9 @@ switch ( $tab ) {
 ?>
 <?php
         break;
-    }
-    case 'storage'   :
+      }
+    case 'storage' :
+      {
 ?>
             <tr><td><?php echo translate('SaveJPEGs') ?></td><td><select name="newMonitor[SaveJPEGs]"><?php foreach ( $savejpegopts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['SaveJPEGs'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
             <tr><td><?php echo translate('VideoWriter') ?></td><td><select name="newMonitor[VideoWriter]"><?php foreach ( $videowriteropts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['VideoWriter'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
@@ -862,8 +865,9 @@ switch ( $tab ) {
             <tr><td><?php echo translate('RecordAudio') ?></td><td><input type="checkbox" name="newMonitor[RecordAudio]" value="1"<?php if ( !empty($newMonitor['RecordAudio']) ) { ?> checked="checked"<?php } ?>/></td></tr>
 <?php
         break;
+      }
     case 'timestamp' :
-    {
+      {
 ?>
             <tr><td><?php echo translate('TimestampLabelFormat') ?></td><td><input type="text" name="newMonitor[LabelFormat]" value="<?php echo validHtmlStr($newMonitor['LabelFormat']) ?>" size="32"/></td></tr>
             <tr><td><?php echo translate('TimestampLabelX') ?></td><td><input type="text" name="newMonitor[LabelX]" value="<?php echo validHtmlStr($newMonitor['LabelX']) ?>" size="4"/></td></tr>
@@ -871,9 +875,9 @@ switch ( $tab ) {
             <tr><td><?php echo translate('TimestampLabelSize') ?></td><td><select name="newMonitor[LabelSize]"><?php foreach ( $label_size as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['LabelSize'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
 <?php
         break;
-    }
+      }
     case 'buffers' :
-    {
+      {
 ?>
             <tr><td><?php echo translate('ImageBufferSize') ?></td><td><input type="text" name="newMonitor[ImageBufferCount]" value="<?php echo validHtmlStr($newMonitor['ImageBufferCount']) ?>" size="6"/></td></tr>
             <tr><td><?php echo translate('WarmupFrames') ?></td><td><input type="text" name="newMonitor[WarmupCount]" value="<?php echo validHtmlStr($newMonitor['WarmupCount']) ?>" size="4"/></td></tr>
@@ -883,9 +887,9 @@ switch ( $tab ) {
 <tr><td><?php echo translate('AlarmFrameCount') ?></td><td><input type="text" name="newMonitor[AlarmFrameCount]" value="<?php echo validHtmlStr($newMonitor['AlarmFrameCount']) ?>" size="4"/></td></tr>
 <?php
         break;
-    }
+      }
     case 'control' :
-    {
+      {
 ?>
             <tr><td><?php echo translate('Controllable') ?></td><td><input type="checkbox" name="newMonitor[Controllable]" value="1"<?php if ( !empty($newMonitor['Controllable']) ) { ?> checked="checked"<?php } ?>/></td></tr>
             <tr><td><?php echo translate('ControlType') ?></td><td><?php echo buildSelect( "newMonitor[ControlId]", $controlTypes, 'loadLocations( this )' ); ?><?php if ( canEdit( 'Control' ) ) { ?>&nbsp;<a href="#" onclick="createPopup( '?view=controlcaps', 'zmControlCaps', 'controlcaps' );"><?php echo translate('Edit') ?></a><?php } ?></td></tr>
@@ -905,18 +909,18 @@ switch ( $tab ) {
             <tr><td><?php echo translate('ReturnDelay') ?></td><td><input type="text" name="newMonitor[ReturnDelay]" value="<?php echo validHtmlStr($newMonitor['ReturnDelay']) ?>" size="4"/></td></tr>
 <?php
         break;
-    }
+      }
     case 'x10' :
-    {
+      {
 ?>
             <tr><td><?php echo translate('X10ActivationString') ?></td><td><input type="text" name="newX10Monitor[Activation]" value="<?php echo validHtmlStr($newX10Monitor['Activation']) ?>" size="20"/></td></tr>
             <tr><td><?php echo translate('X10InputAlarmString') ?></td><td><input type="text" name="newX10Monitor[AlarmInput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmInput']) ?>" size="20"/></td></tr>
             <tr><td><?php echo translate('X10OutputAlarmString') ?></td><td><input type="text" name="newX10Monitor[AlarmOutput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmOutput']) ?>" size="20"/></td></tr>
 <?php
         break;
-    }
+      }
     case 'misc' :
-    {
+      {
 ?>
             <tr><td><?php echo translate('EventPrefix') ?></td><td><input type="text" name="newMonitor[EventPrefix]" value="<?php echo validHtmlStr($newMonitor['EventPrefix']) ?>" size="24"/></td></tr>
             <tr><td><?php echo translate('Sectionlength') ?></td><td><input type="text" name="newMonitor[SectionLength]" value="<?php echo validHtmlStr($newMonitor['SectionLength']) ?>" size="6"/></td></tr>
@@ -948,8 +952,8 @@ switch ( $tab ) {
             <tr><td><?php echo translate('Exif') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_EXIF', 'zmOptionHelp', 'optionhelp', '?' ) ?>) </td><td><input type="checkbox" name="newMonitor[Exif]" value="1"<?php if ( !empty($newMonitor['Exif']) ) { ?> checked="checked"<?php } ?>/></td></tr>
 <?php
         break;
-    }
-} // end switch tab
+      }
+  } // end switch tab
 ?>
           </tbody>
         </table>

From cca2c624f95b32fffb441976516c8400e64bf561 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 30 May 2017 19:42:38 -0400
Subject: [PATCH 19/56] fix spelling mistake

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

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index 3b2f255a8..5cb5d8f25 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -1815,7 +1815,7 @@ our @options = (
       ZM_CAPTURES_PER_FRAME option and you should normally change the
       value of only one of the options at a time.  If you have
       different capture cards that need different values you can
-      ovveride them in each individual monitor on the source page.
+      override them in each individual monitor on the source page.
       `,
     type        => $types{boolean},
     category    => 'config',
@@ -1839,7 +1839,7 @@ our @options = (
       ZM_V4L_MULTI_BUFFER option and you should normally change the
       value of only one of the options at a time.  If you have
       different capture cards that need different values you can
-      ovveride them in each individual monitor on the source page.
+      override them in each individual monitor on the source page.
       `,
     type        => $types{integer},
     category    => 'config',

From 0bb2bed32cff4f4abe80c9319125bf26a7be74fd Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 30 May 2017 19:47:35 -0400
Subject: [PATCH 20/56] remove blank lines, do some better escaping

---
 scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index 5cb5d8f25..294564dae 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -397,7 +397,6 @@ our @options = (
     type        => $types{boolean},
     category    => 'system',
   },
-
   {
     name        => 'ZM_OPT_GOOG_RECAPTCHA_SITEKEY',
     default     => '...Insert your recaptcha site-key here...',
@@ -428,8 +427,6 @@ our @options = (
     type        => $types{string},
     category    => 'system',
   },
-
-
   {
     name        => 'ZM_DIR_EVENTS',
     default     => 'events',
@@ -1580,7 +1577,7 @@ our @options = (
   },
   {
     name        => 'ZM_WEB_EVENT_DISK_SPACE',
-    default     => '',
+    default     => 'no',
     description => 'Whether to show disk space used by each event.',
     help        => q`Adds another column to the listing of events
       showing the disk space used by the event.  This will impart a small
@@ -2498,7 +2495,6 @@ our @options = (
     category    => 'system',
   },
   {
-
     name        => 'ZM_RUN_AUDIT',
     default     => 'yes',
     description => 'Run zmaudit to check data consistency',
@@ -3370,7 +3366,7 @@ our @options = (
   {
     name        => 'ZM_WEB_M_DEFAULT_SCALE',
     default     => '100',
-    description => 'What the default scaling factor applied to \'live\' or \'event\' views is (%)',
+    description => q`'What the default scaling factor applied to 'live' or 'event' views is (%)`,
     help        => q`
       Normally ZoneMinder will display 'live' or 'event' streams in
       their native size. However if you have monitors with large
@@ -3633,7 +3629,7 @@ our @options = (
   {
     name        => 'ZM_WEB_L_DEFAULT_SCALE',
     default     => '100',
-    description => 'What the default scaling factor applied to \'live\' or \'event\' views is (%)',
+    description => q`What the default scaling factor applied to 'live' or 'event' views is (%)`,
     help        => q`
       Normally ZoneMinder will display 'live' or 'event' streams in
       their native size. However if you have monitors with large
@@ -3654,7 +3650,7 @@ our @options = (
   {
     name        => 'ZM_WEB_L_DEFAULT_RATE',
     default     => '100',
-    description => 'What the default replay rate factor applied to \'event\' views is (%)',
+    description => q`What the default replay rate factor applied to 'event' views is (%)`,
     help        => q`
       Normally ZoneMinder will display 'event' streams at their
       native rate, i.e. as close to real-time as possible. However if

From ab85239d82e1da80098ecb248ea65a5a3caa257a Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 30 May 2017 19:49:30 -0400
Subject: [PATCH 21/56] fix braces, invert control directions when camera is
 flipped

---
 .../lib/ZoneMinder/Control/SkyIPCam7xx.pm     | 359 ++++++++----------
 1 file changed, 166 insertions(+), 193 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm
index e5917536f..b3f9418ce 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm
@@ -45,265 +45,239 @@ use ZoneMinder::Config qw(:all);
 
 use Time::HiRes qw( usleep );
 
-sub new
-{
-    my $class = shift;
-    my $id = shift;
-    my $self = ZoneMinder::Control->new( $id );
-    bless( $self, $class );
-    srand( time() );
-    return $self;
+sub new {
+  my $class = shift;
+  my $id = shift;
+  my $self = ZoneMinder::Control->new( $id );
+  bless( $self, $class );
+  srand( time() );
+  return $self;
 }
 
 our $AUTOLOAD;
 
-sub AUTOLOAD
-{
-    my $self = shift;
-    my $class = ref($self) || croak( "$self not object" );
-    my $name = $AUTOLOAD;
-    $name =~ s/.*://;
-    if ( exists($self->{$name}) )
-    {
-        return( $self->{$name} );
-    }
-    Fatal( "Can't access $name member of object of class $class" );
+sub AUTOLOAD {
+  my $self = shift;
+  my $class = ref($self) || croak( "$self not object" );
+  my $name = $AUTOLOAD;
+  $name =~ s/.*://;
+  if ( exists($self->{$name}) ) {
+    return( $self->{$name} );
+  }
+  Fatal( "Can't access $name member of object of class $class" );
 }
 
-sub open
-{
-    my $self = shift;
+sub open {
+  my $self = shift;
 
-    $self->loadMonitor();
+  $self->loadMonitor();
 
-    use LWP::UserAgent;
-    $self->{ua} = LWP::UserAgent->new;
-    $self->{ua}->agent( "ZoneMinder Control Agent/".ZoneMinder::Base::ZM_VERSION );
+  use LWP::UserAgent;
+  $self->{ua} = LWP::UserAgent->new;
+  $self->{ua}->agent( "ZoneMinder Control Agent/".ZoneMinder::Base::ZM_VERSION );
 
-    $self->{state} = 'open';
+  $self->{state} = 'open';
 }
 
-sub close
-{
-    my $self = shift;
-    $self->{state} = 'closed';
+sub close {
+  my $self = shift;
+  $self->{state} = 'closed';
 }
 
-sub printMsg
-{
-    my $self = shift;
-    my $msg = shift;
-    my $msg_len = length($msg);
+sub printMsg {
+  my $self = shift;
+  my $msg = shift;
+  my $msg_len = length($msg);
 
-    Debug( $msg."[".$msg_len."]" );
+  Debug( $msg."[".$msg_len."]" );
 }
 
-sub sendCmd
-{
-    my $self = shift;
-    my $cmd = shift;
+sub sendCmd {
+  my $self = shift;
+  my $cmd = shift;
 
-    my $result = undef;
+  my $result = undef;
 
-    printMsg( $cmd, "Tx" );
+  printMsg( $cmd, "Tx" );
 
-	my $url;
-	if ( $self->{Monitor}->{ControlAddress} =~ /^http/ ) {
-		$url = $self->{Monitor}->{ControlAddress}.$cmd;
-	} else {
-		$url = 'http://'.$self->{Monitor}->{ControlAddress}.$cmd;
-	} # en dif
-	my $req = HTTP::Request->new( GET=>$url );
+  my $url;
+  if ( $self->{Monitor}->{ControlAddress} =~ /^http/ ) {
+    $url = $self->{Monitor}->{ControlAddress}.$cmd;
+  } else {
+    $url = 'http://'.$self->{Monitor}->{ControlAddress}.$cmd;
+  } # en dif
+  my $req = HTTP::Request->new( GET=>$url );
 
-    my $res = $self->{ua}->request($req);
+  my $res = $self->{ua}->request($req);
 
-    if ( $res->is_success )
-    {
-        $result = !undef;
-    }
-    else
-    {
-        Error( "Error check failed: '".$res->status_line()."'" );
-    }
+  if ( $res->is_success ) {
+    $result = !undef;
+  } else {
+    Error( "Error check failed: '".$res->status_line()."'" );
+  }
 
-    return( $result );
+  return( $result );
 }
 
-sub reset
-{
-    my $self = shift;
-    Debug( "Camera Reset" );
-    my $cmd = "/admin/ptctl.cgi?move=reset";
-    $self->sendCmd( $cmd );
+sub reset {
+  my $self = shift;
+  Debug( "Camera Reset" );
+  my $cmd = "/admin/ptctl.cgi?move=reset";
+  $self->sendCmd( $cmd );
 }
 
-sub moveMap
-{
-    my $self = shift;
-    my $params = shift;
-    my $xcoord = $self->getParam( $params, 'xcoord' );
-    my $ycoord = $self->getParam( $params, 'ycoord' );
+sub moveMap {
+  my $self = shift;
+  my $params = shift;
+  my $xcoord = $self->getParam( $params, 'xcoord' );
+  my $ycoord = $self->getParam( $params, 'ycoord' );
 
-    my $hor = $xcoord * 100 / $self->{Monitor}->{Width};
-    my $ver = $ycoord * 100 / $self->{Monitor}->{Height};
+  my $hor = $xcoord * 100 / $self->{Monitor}->{Width};
+  my $ver = $ycoord * 100 / $self->{Monitor}->{Height};
 
-    my $maxver = 8;
-    my $maxhor = 30;
-    
-    my $horDir = "right";
-    my $verDir = "up";
-    my $horSteps = 0;
-    my $verSteps = 0;
+  my $maxver = 8;
+  my $maxhor = 30;
 
-    # Horizontal movement
-    if ($hor < 50) {
-    	# left
-	$horSteps = ((50 - $hor) / 50) * $maxhor;
-	$horDir = "left";
-    }
-    elsif ($hor > 50) {
-	# right
- 	$horSteps = (($hor - 50) / 50) * $maxhor;
-	$horDir = "right";
-    }
-   
-    # Vertical movement
-    if ($ver < 50) {
-	# up
-	$verSteps = ((50 - $ver) / 50) * $maxver;
-	$verDir = "up";
-    }
-    elsif ($ver > 50) {
-	# down
-	$verSteps = (($ver - 50) / 50) * $maxver;
-	$verDir = "down";
-    }
+  my $horDir = "right";
+  my $verDir = "up";
+  my $horSteps = 0;
+  my $verSteps = 0;
 
-    my $v = int($verSteps);
-    my $h = int($horSteps);
+# Horizontal movement
+  if ( $hor < 50 ) {
+# left
+    $horSteps = ((50 - $hor) / 50) * $maxhor;
+    $horDir = "left";
+  }
+  elsif ( $hor > 50 ) {
+# right
+    $horSteps = (($hor - 50) / 50) * $maxhor;
+    $horDir = "right";
+  }
 
-    Debug( "Move Map to $xcoord,$ycoord, hor=$h $horDir, ver=$v $verDir");
-    my $cmd = "/cgi/admin/ptctrl.cgi?action=movedegree&Cmd=$horDir&Degree=$h";
-    $self->sendCmd( $cmd );
-    $cmd = "/cgi/admin/ptctrl.cgi?action=movedegree&Cmd=$verDir&Degree=$v";
-    $self->sendCmd( $cmd );
+# Vertical movement
+  if ( $ver < 50 ) {
+# up
+    $verSteps = ((50 - $ver) / 50) * $maxver;
+    $verDir = "up";
+  }
+  elsif ( $ver > 50 ) {
+# down
+    $verSteps = (($ver - 50) / 50) * $maxver;
+    $verDir = "down";
+  }
+
+  my $v = int($verSteps);
+  my $h = int($horSteps);
+
+  Debug( "Move Map to $xcoord,$ycoord, hor=$h $horDir, ver=$v $verDir");
+  my $cmd = "/cgi/admin/ptctrl.cgi?action=movedegree&Cmd=$horDir&Degree=$h";
+  $self->sendCmd( $cmd );
+  $cmd = "/cgi/admin/ptctrl.cgi?action=movedegree&Cmd=$verDir&Degree=$v";
+  $self->sendCmd( $cmd );
 }
 
-sub moveRelUp
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'tiltstep' );
-    Debug( "Step Up $step" );
-    my $cmd = "/admin/ptctl.cgi?move=up";
-    $self->sendCmd( $cmd );
+sub moveRelUp {
+  my $self = shift;
+  my $params = shift;
+  my $step = $self->getParam( $params, 'tiltstep' );
+  Debug( "Step Up $step" );
+  my $cmd = "/admin/ptctl.cgi?move=up";
+  $self->sendCmd( $cmd );
 }
 
-sub moveRelDown
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'tiltstep' );
-    Debug( "Step Down $step" );
-    my $cmd = "/admin/ptctl.cgi?move=down";
-    $self->sendCmd( $cmd );
+sub moveRelDown {
+  my $self = shift;
+  my $params = shift;
+  my $step = $self->getParam( $params, 'tiltstep' );
+  Debug( "Step Down $step" );
+  my $cmd = "/admin/ptctl.cgi?move=down";
+  $self->sendCmd( $cmd );
 }
 
-sub moveRelLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'panstep' );
-    Debug( "Step Left $step" );
-    my $cmd = "/admin/ptctl.cgi?move=left";
-    $self->sendCmd( $cmd );
+sub moveRelLeft {
+  my $self = shift;
+  my $params = shift;
+  my $step = $self->getParam( $params, 'panstep' );
+
+  if ( $self->{Monitor}->{Orientation} eq "hori" ) {
+    Debug( "Stepping Right because flipped horizontally " );
+    $self->sendCmd( "/admin/ptctl.cgi?move=right" );
+  } else {
+    Debug( "Step Left" );
+    $self->sendCmd( "/admin/ptctl.cgi?move=left" );
+  }
 }
 
-sub moveRelRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'panstep' );
-    Debug( "Step Right $step" );
-    my $cmd = "/admin/ptctl.cgi?move=right";
-    $self->sendCmd( $cmd );
+sub moveRelRight {
+  my $self = shift;
+  my $params = shift;
+  my $step = $self->getParam( $params, 'panstep' );
+  if ( $self->{Monitor}->{Orientation} eq "hori" ) {
+    Debug( "Stepping Left because flipped horizontally " );
+    $self->sendCmd( "/admin/ptctl.cgi?move=left" );
+  } else {
+    Debug( "Step Right" );
+    $self->sendCmd( "/admin/ptctl.cgi?move=right" );
+  }
 }
 
-sub presetClear
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset' );
-    Debug( "Clear Preset $preset" );
-    #my $cmd = "/axis-cgi/com/ptz.cgi?removeserverpresetno=$preset";
-    #$self->sendCmd( $cmd );
+sub presetClear {
+  my $self = shift;
+  my $params = shift;
+  my $preset = $self->getParam( $params, 'preset' );
+  Debug( "Clear Preset $preset" );
+#my $cmd = "/axis-cgi/com/ptz.cgi?removeserverpresetno=$preset";
+#$self->sendCmd( $cmd );
 }
 
-sub presetSet
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset' );
-    Debug( "Set Preset $preset" );
-    my $cmd = "/admin/ptctl.cgi?position=" . ($preset - 1) . "&positionname=zm$preset";
-    $self->sendCmd( $cmd );
+sub presetSet {
+  my $self = shift;
+  my $params = shift;
+  my $preset = $self->getParam( $params, 'preset' );
+  Debug( "Set Preset $preset" );
+  my $cmd = "/admin/ptctl.cgi?position=" . ($preset - 1) . "&positionname=zm$preset";
+  $self->sendCmd( $cmd );
 }
 
-sub presetGoto
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset' );
-    Debug( "Goto Preset $preset" );
-    my $cmd = "/admin/ptctl.cgi?move=p" . ($preset - 1);
-    $self->sendCmd( $cmd );
+sub presetGoto {
+  my $self = shift;
+  my $params = shift;
+  my $preset = $self->getParam( $params, 'preset' );
+  Debug( "Goto Preset $preset" );
+  my $cmd = "/admin/ptctl.cgi?move=p" . ($preset - 1);
+  $self->sendCmd( $cmd );
 }
 
-sub presetHome
-{
-    my $self = shift;
-    Debug( "Home Preset" );
-    my $cmd = "/admin/ptctl.cgi?move=h";
-    $self->sendCmd( $cmd );
+sub presetHome {
+  my $self = shift;
+  Debug( "Home Preset" );
+  my $cmd = "/admin/ptctl.cgi?move=h";
+  $self->sendCmd( $cmd );
 }
 
 1;
 __END__
-# Below is stub documentation for your module. You'd better edit it!
 
 =head1 NAME
 
-ZoneMinder::Database - Perl extension for blah blah blah
+ZoneMinder::Control::SkyIPCam7xx.pm - Module for controlling AirLink101 SkyIPams
 
 =head1 SYNOPSIS
 
-  use ZoneMinder::Database;
-  blah blah blah
+use ZoneMinder::Control::SkyIPCam7xx;
 
 =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.
+Module for controlling AirLink101 Cameras.
 
 =head2 EXPORT
 
 None by default.
 
-
-
 =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.
+ZoneMinder::Control
 
 =head1 AUTHOR
 
@@ -318,5 +292,4 @@ 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.
 
-
 =cut

From 1d5248c0b8966f85d6871dd7939be134b1ff5aae Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 30 May 2017 20:06:29 -0400
Subject: [PATCH 22/56] merge from SA, but remove Storageareas bits

---
 scripts/ZoneMinder/lib/ZoneMinder/Event.pm | 272 +++++++++++++--------
 1 file changed, 171 insertions(+), 101 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
index 71ca57680..d616d893f 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
@@ -28,30 +28,12 @@ use 5.006;
 use strict;
 use warnings;
 
-require Exporter;
 require ZoneMinder::Base;
+require ZoneMinder::Object;
 require Date::Manip;
 
-our @ISA = qw(Exporter ZoneMinder::Base);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration   use ZoneMinder ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our %EXPORT_TAGS = (
-    'functions' => [ qw(
-      ) ]
-    );
-push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
-
-our @EXPORT = qw();
-
-our $VERSION = $ZoneMinder::Base::VERSION;
+#our @ISA = qw(ZoneMinder::Object);
+use parent qw(ZoneMinder::Object);
 
 # ==========================================================================
 #
@@ -62,39 +44,24 @@ our $VERSION = $ZoneMinder::Base::VERSION;
 use ZoneMinder::Config qw(:all);
 use ZoneMinder::Logger qw(:all);
 use ZoneMinder::Database qw(:all);
+require Date::Parse;
+
+use vars qw/ $table $primary_key /;
+$table = 'Events';
+$primary_key = 'Id';
 
 use POSIX;
 
-sub new {
-  my ( $parent, $id, $data ) = @_;
-
-  my $self = {};
-  bless $self, $parent;
-  $$self{dbh} = $ZoneMinder::Database::dbh;
-#zmDbConnect();
-  if ( ( $$self{Id} = $id ) or $data ) {
-#$log->debug("loading $parent $id") if $debug or DEBUG_ALL;
-    $self->load( $data );
+sub Time {
+  if ( @_ > 1 ) {
+    $_[0]{Time} = $_[1];
   }
-  return $self;
-} # end sub new
+  if ( ! defined $_[0]{Time} ) {
 
-sub load {
-  my ( $self, $data ) = @_;
-  my $type = ref $self;
-  if ( ! $data ) {
-#$log->debug("Object::load Loading from db $type");
-    $data = $$self{dbh}->selectrow_hashref( 'SELECT * FROM Events WHERE Id=?', {}, $$self{Id} );
-    if ( ! $data ) {
-      Error( "Failure to load Event record for $$self{Id}: Reason: " . $$self{dbh}->errstr );
-    } else {
-      Debug( 3, "Loaded Event $$self{Id}" );	
-    } # end if
-  } # end if ! $data
-  if ( $data and %$data ) {
-    @$self{keys %$data} = values %$data;
-  } # end if
-} # end sub load
+    $_[0]{Time} = Date::Parse::str2time( $_[0]{StartTime} );
+  }
+  return $_[0]{Time};
+}
 
 sub Name {
   if ( @_ > 1 ) {
@@ -130,6 +97,7 @@ sub find {
     my $filter = new ZoneMinder::Event( $$db_filter{Id}, $db_filter );
     push @results, $filter;
   } # end while
+  $sth->finish();
   return @results;
 }
 
@@ -138,36 +106,51 @@ sub find_one {
   return $results[0] if @results;
 }
 
-sub getEventPath {
+sub getPath {
+  return Path( @_ );
+}
+sub Path {
   my $event = shift;
 
-  my $event_path = "";
-  if ( $Config{ZM_USE_DEEP_STORAGE} ) {
-    $event_path = $Config{ZM_DIR_EVENTS}
-    .'/'.$event->{MonitorId}
-    .'/'.strftime( "%y/%m/%d/%H/%M/%S",
-        localtime($event->{Time})
-        )
-      ;
-  } else {
-    $event_path = $Config{ZM_DIR_EVENTS}
-    .'/'.$event->{MonitorId}
-    .'/'.$event->{Id}
-    ;
+  if ( @_ > 1 ) {
+    $$event{Path} = $_[1];
+    if ( ! -e $$event{Path} ) {
+      Error("Setting path for event $$event{Id} to $_[1] but does not exist!");
+    }
   }
 
-  if ( index($Config{ZM_DIR_EVENTS},'/') != 0 ){
-    $event_path = $Config{ZM_PATH_WEB}
-    .'/'.$event_path
-      ;
-  }
-  return( $event_path );
+  if ( ! $$event{Path} ) {
+    my $path = ($Config{ZM_DIR_EVENTS}=~/^\//) ? $Config{ZM_DIR_EVENTS} : $Config{ZM_PATH_WEB}.'/'.$Config{ZM_DIR_EVENTS};
+
+    if ( $Config{ZM_USE_DEEP_STORAGE} ) {
+      if ( $event->Time() ) {
+        $$event{Path} = join('/',
+            $path,
+            $event->{MonitorId},
+            strftime( "%y/%m/%d/%H/%M/%S",
+              localtime($event->Time())
+              ),
+            );
+      } else {
+        Error("Event $$event{Id} has no value for Time(), unable to determine path");
+        $$event{Path} = '';
+      }
+    } else {
+      $$event{Path} = join('/',
+          $path,
+          $event->{MonitorId},
+          $event->{Id},
+          );
+    }
+  } # end if
+
+  return $$event{Path};
 }
 
 sub GenerateVideo {
   my ( $self, $rate, $fps, $scale, $size, $overwrite, $format ) = @_;
 
-  my $event_path = getEventPath( $self );
+  my $event_path = $self->getPath( );
   chdir( $event_path );
   ( my $video_name = $self->{Name} ) =~ s/\s/_/g;
 
@@ -228,9 +211,7 @@ sub GenerateVideo {
     my $command = $Config{ZM_PATH_FFMPEG}
     ." -y -r $frame_rate "
       .$Config{ZM_FFMPEG_INPUT_OPTIONS}
-    ." -i %0"
-      .$Config{ZM_EVENT_IMAGE_DIGITS}
-    ."d-capture.jpg -s $video_size "
+    .' -i ' . ( $$self{DefaultVideo} ? $$self{DefaultVideo} : '%0'.$Config{ZM_EVENT_IMAGE_DIGITS} .'d-capture.jpg' )
 #. " -f concat -i /tmp/event_files.txt"
       ." -s $video_size "
       .$Config{ZM_FFMPEG_OUTPUT_OPTIONS}
@@ -253,54 +234,143 @@ sub GenerateVideo {
     Info( "Video file $video_file already exists for event $self->{Id}\n" );
     return $event_path.'/'.$video_file;
   }
-  return;	
+  return;
 } # end sub GenerateVideo
 
+sub delete {
+  my $event = $_[0];
+  Info( "Deleting event $event->{Id} from Monitor $event->{MonitorId} $event->{StartTime}\n" );
+  $ZoneMinder::Database::dbh->ping();
+# 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 Fatal( "Can't prepare '$sql': ".$ZoneMinder::Database::dbh->errstr() );
+  my $res = $sth->execute( $event->{Id} )
+    or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+  $sth->finish();
+
+  if ( ! $Config{ZM_OPT_FAST_DELETE} ) {
+    my $sql = 'delete from Frames where EventId = ?';
+    my $sth = $ZoneMinder::Database::dbh->prepare_cached( $sql )
+      or Fatal( "Can't prepare '$sql': ".$ZoneMinder::Database::dbh->errstr() );
+    my $res = $sth->execute( $event->{Id} )
+      or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+    $sth->finish();
+
+    $sql = 'delete from Stats where EventId = ?';
+    $sth = $ZoneMinder::Database::dbh->prepare_cached( $sql )
+      or Fatal( "Can't prepare '$sql': ".$ZoneMinder::Database::dbh->errstr() );
+    $res = $sth->execute( $event->{Id} )
+      or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+    $sth->finish();
+
+    $event->delete_files( );
+  } else {
+    Debug('Not deleting frames, stats and files for speed.');
+  }
+} # end sub delete
+
+
+sub delete_files {
+
+  my $storage_path = ($Config{ZM_DIR_EVENTS}=~/^\//) ? $Config{ZM_DIR_EVENTS} : $Config{ZM_PATH_WEB}.'/'.$Config{ZM_DIR_EVENTS};
+
+  if ( ! $storage_path ) {
+    Fatal("Empty path when deleting files for event $_[0]{Id} ");
+    return;
+  }
+
+  chdir ( $storage_path );
+
+  if ( $Config{ZM_USE_DEEP_STORAGE} ) {
+    if ( ! $_[0]{MonitorId} ) {
+      Error("No monitor id assigned to event $_[0]{Id}");
+      return;
+    }
+    Debug("Deleting files for Event $_[0]{Id} from $storage_path.");
+    my $link_path = $_[0]{MonitorId}.'/*/*/*/.'.$_[0]{Id};
+#Debug( "LP1:$link_path" );
+    my @links = glob($link_path);
+#Debug( "L:".$links[0].": $!" );
+    if ( @links ) {
+      ( $link_path ) = ( $links[0] =~ /^(.*)$/ ); # De-taint
+#Debug( "LP2:$link_path" );
+
+        ( my $day_path = $link_path ) =~ s/\.\d+//;
+#Debug( "DP:$day_path" );
+      my $event_path = $day_path.readlink( $link_path );
+      ( $event_path ) = ( $event_path =~ /^(.*)$/ ); # De-taint
+#Debug( "EP:$event_path" );
+        my $command = "/bin/rm -rf $event_path";
+#Debug( "C:$command" );
+      ZoneMinder::General::executeShellCommand( $command );
+
+      unlink( $link_path ) or Error( "Unable to unlink '$link_path': $!" );
+
+      my @path_parts = split( /\//, $event_path );
+      for ( my $i = int(@path_parts)-2; $i >= 1; $i-- ) {
+        my $delete_path = join( '/', @path_parts[0..$i] );
+#Debug( "DP$i:$delete_path" );
+        my @has_files = glob( join('/', $storage_path,$delete_path,'*' ) );
+#Debug( "HF1:".$has_files[0] ) if ( @has_files );
+        last if ( @has_files );
+        @has_files = glob( join('/', $storage_path, $delete_path, '.[0-9]*' ) );
+#Debug( "HF2:".$has_files[0] ) if ( @has_files );
+        last if ( @has_files );
+        my $command = "/bin/rm -rf $storage_path/$delete_path";
+        ZoneMinder::General::executeShellCommand( $command );
+      }
+    }
+  } else {
+    my $command = "/bin/rm -rf $storage_path/$_[0]{MonitorId}/$_[0]{Id}";
+    ZoneMinder::General::executeShellCommand( $command );
+  }
+} # end sub delete_files
+
+sub Storage {
+  return new ZoneMinder::Storage( $_[0]{StorageId} );
+}
+
+sub check_for_in_filesystem {
+  my $path = $_[0]->Path();
+  if ( $path ) {
+    my @files = glob( $path . '/*' );
+Debug("Checking for files for event $_[0]{Id} at $path using glob $path/* found " . scalar @files . " files");
+    return 1 if @files;
+  }
+Debug("Checking for files for event $_[0]{Id} at $path using glob $path/* found no files");
+  return 0;
+}
+
+sub age {
+  if ( ! $_[0]{age} ) {
+    $_[0]{age} = (time() - ($^T - ((-M $_[0]->Path() ) * 24*60*60)));
+  }
+  return $_[0]{age};
+}
+
 1;
 __END__
-# Below is stub documentation for your module. You'd better edit it!
 
 =head1 NAME
 
-ZoneMinder::Database - Perl extension for blah blah blah
+ZoneMinder::Event - Perl Class for events
 
 =head1 SYNOPSIS
 
 use ZoneMinder::Event;
-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.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=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.
+The Event class has everything you need to deal with events from Perl.
 
 =head1 AUTHOR
 
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
+Isaac Connor, E<lt>isaac@zoneminder.comE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2001-2008  Philip Coombes
+Copyright (C) 2001-2017  ZoneMinder LLC
 
 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,

From 885823aeb62f3fbdb94425fca216864205d1cd67 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 30 May 2017 21:11:51 -0400
Subject: [PATCH 23/56] remove unnecessary quotes and convert double quotes to
 single quotes

---
 .../ZoneMinder/lib/ZoneMinder/Memory.pm.in    | 262 +++++++++---------
 1 file changed, 131 insertions(+), 131 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
index 38a8d3b5c..5751bf49a 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
@@ -41,7 +41,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 = (
-    'constants' => [ qw(
+    constants => [ qw(
       STATE_IDLE
       STATE_PREALARM
       STATE_ALARM
@@ -56,7 +56,7 @@ our %EXPORT_TAGS = (
       TRIGGER_ON
       TRIGGER_OFF
       ) ],
-    'functions' => [ qw(
+    functions => [ qw(
       zmMemVerify
       zmMemInvalidate
       zmMemRead
@@ -77,7 +77,7 @@ our %EXPORT_TAGS = (
       zmTriggerEventOn
       zmTriggerEventOff
       zmTriggerEventCancel
-    zmTriggerShowtext
+      zmTriggerShowtext
     ) ],
     );
 push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
@@ -115,7 +115,7 @@ use constant TRIGGER_OFF    => 2;
 
 use Storable qw( freeze thaw );
 
-if ( "@ENABLE_MMAP@" eq 'yes' ) {
+if ( '@ENABLE_MMAP@' eq 'yes' ) {
 # 'yes' if memory is mmapped
   require ZoneMinder::Memory::Mapped;
   ZoneMinder::Memory::Mapped->import();
@@ -141,42 +141,42 @@ our $native = $arch/8;
 our $mem_seq = 0;
 
 our $mem_data = {
-  "shared_data" => { "type"=>"SharedData", "seq"=>$mem_seq++, "contents"=> {
-    "size"             => { "type"=>"uint32", "seq"=>$mem_seq++ },
-    "last_write_index" => { "type"=>"uint32", "seq"=>$mem_seq++ },
-    "last_read_index"  => { "type"=>"uint32", "seq"=>$mem_seq++ },
-    "state"            => { "type"=>"uint32", "seq"=>$mem_seq++ },
-    "last_event"       => { "type"=>"uint32", "seq"=>$mem_seq++ },
-    "action"           => { "type"=>"uint32", "seq"=>$mem_seq++ },
-    "brightness"       => { "type"=>"int32", "seq"=>$mem_seq++ },
-    "hue"              => { "type"=>"int32", "seq"=>$mem_seq++ },
-    "colour"           => { "type"=>"int32", "seq"=>$mem_seq++ },
-    "contrast"         => { "type"=>"int32", "seq"=>$mem_seq++ },
-    "alarm_x"          => { "type"=>"int32", "seq"=>$mem_seq++ },
-    "alarm_y"          => { "type"=>"int32", "seq"=>$mem_seq++ },
-    "valid"            => { "type"=>"uint8", "seq"=>$mem_seq++ },
-    "active"           => { "type"=>"uint8", "seq"=>$mem_seq++ },
-    "signal"           => { "type"=>"uint8", "seq"=>$mem_seq++ },
-    "format"           => { "type"=>"uint8", "seq"=>$mem_seq++ },
-    "imagesize"        => { "type"=>"uint32", "seq"=>$mem_seq++ },
-    "epadding1"        => { "type"=>"uint32", "seq"=>$mem_seq++ },
-    "epadding2"        => { "type"=>"uint32", "seq"=>$mem_seq++ },
-    "last_write_time"  => { "type"=>"time_t64", "seq"=>$mem_seq++ },
-    "last_read_time"   => { "type"=>"time_t64", "seq"=>$mem_seq++ },
-    "control_state"    => { "type"=>"uint8[256]", "seq"=>$mem_seq++ },
+  shared_data => { type=>'SharedData', seq=>$mem_seq++, contents=> {
+    size             => { type=>'uint32', seq=>$mem_seq++ },
+    last_write_index => { type=>'uint32', seq=>$mem_seq++ },
+    last_read_index  => { type=>'uint32', seq=>$mem_seq++ },
+    state            => { type=>'uint32', seq=>$mem_seq++ },
+    last_event       => { type=>'uint32', seq=>$mem_seq++ },
+    action           => { type=>'uint32', seq=>$mem_seq++ },
+    brightness       => { type=>'int32', seq=>$mem_seq++ },
+    hue              => { type=>'int32', seq=>$mem_seq++ },
+    colour           => { type=>'int32', seq=>$mem_seq++ },
+    contrast         => { type=>'int32', seq=>$mem_seq++ },
+    alarm_x          => { type=>'int32', seq=>$mem_seq++ },
+    alarm_y          => { type=>'int32', seq=>$mem_seq++ },
+    valid            => { type=>'uint8', seq=>$mem_seq++ },
+    active           => { type=>'uint8', seq=>$mem_seq++ },
+    signal           => { type=>'uint8', seq=>$mem_seq++ },
+    format           => { type=>'uint8', seq=>$mem_seq++ },
+    imagesize        => { type=>'uint32', seq=>$mem_seq++ },
+    epadding1        => { type=>'uint32', seq=>$mem_seq++ },
+    epadding2        => { type=>'uint32', seq=>$mem_seq++ },
+    last_write_time  => { type=>'time_t64', seq=>$mem_seq++ },
+    last_read_time   => { type=>'time_t64', seq=>$mem_seq++ },
+    control_state    => { type=>'uint8[256]', seq=>$mem_seq++ },
   }
   },
-  "trigger_data" => { "type"=>"TriggerData", "seq"=>$mem_seq++, "contents"=> {
-    "size"             => { "type"=>"uint32", "seq"=>$mem_seq++ },
-    "trigger_state"    => { "type"=>"uint32", "seq"=>$mem_seq++ },
-    "trigger_score"    => { "type"=>"uint32", "seq"=>$mem_seq++ },
-    "padding"          => { "type"=>"uint32", "seq"=>$mem_seq++ },
-    "trigger_cause"    => { "type"=>"int8[32]", "seq"=>$mem_seq++ },
-    "trigger_text"     => { "type"=>"int8[256]", "seq"=>$mem_seq++ },
-    "trigger_showtext" => { "type"=>"int8[256]", "seq"=>$mem_seq++ },
+  trigger_data => { type=>'TriggerData', seq=>$mem_seq++, 'contents'=> {
+    size             => { type=>'uint32', seq=>$mem_seq++ },
+    trigger_state    => { type=>'uint32', seq=>$mem_seq++ },
+    trigger_score    => { type=>'uint32', seq=>$mem_seq++ },
+    padding          => { type=>'uint32', seq=>$mem_seq++ },
+    trigger_cause    => { type=>'int8[32]', seq=>$mem_seq++ },
+    trigger_text     => { type=>'int8[256]', seq=>$mem_seq++ },
+    trigger_showtext => { type=>'int8[256]', seq=>$mem_seq++ },
   }
   },
-  "end" => { "seq"=>$mem_seq++, "size"=> 0 }
+  end => { seq=>$mem_seq++, size=>0 }
 };
 
 our $mem_size = 0;
@@ -195,28 +195,28 @@ sub zmMemInit {
       }
     }
     foreach my $member_data ( sort { $a->{seq} <=> $b->{seq} } values( %{$section_data->{contents}} ) ) {
-      if ( $member_data->{type} eq "long"
-          || $member_data->{type} eq "ulong"
-          || $member_data->{type} eq "size_t"
+      if ( $member_data->{type} eq 'long'
+          || $member_data->{type} eq 'ulong'
+          || $member_data->{type} eq 'size_t'
          ) {
         $member_data->{size} = $member_data->{align} = $native;
-      } elsif ( $member_data->{type} eq "int64"
-          || $member_data->{type} eq "uint64"
-          || $member_data->{type} eq "time_t64"
+      } elsif ( $member_data->{type} eq 'int64'
+          || $member_data->{type} eq 'uint64'
+          || $member_data->{type} eq 'time_t64'
           ) {
         $member_data->{size} = $member_data->{align} = 8;
-      } elsif ( $member_data->{type} eq "int32"
-          || $member_data->{type} eq "uint32"
-          || $member_data->{type} eq "bool4"
+      } elsif ( $member_data->{type} eq 'int32'
+          || $member_data->{type} eq 'uint32'
+          || $member_data->{type} eq 'bool4'
           ) {
         $member_data->{size} = $member_data->{align} = 4;
-      } elsif ($member_data->{type} eq "int16"
-          || $member_data->{type} eq "uint16"
+      } elsif ($member_data->{type} eq 'int16'
+          || $member_data->{type} eq 'uint16'
           ) {
         $member_data->{size} = $member_data->{align} = 2;
-      } elsif ( $member_data->{type} eq "int8"
-          || $member_data->{type} eq "uint8"
-          || $member_data->{type} eq "bool1"
+      } elsif ( $member_data->{type} eq 'int8'
+          || $member_data->{type} eq 'uint8'
+          || $member_data->{type} eq 'bool1'
           ) {
         $member_data->{size} = $member_data->{align} = 1;
       } elsif ( $member_data->{type} =~ /^u?int8\[(\d+)\]$/ ) {
@@ -325,32 +325,32 @@ sub zmMemRead {
       return( undef );
     }
     my $value;
-    if ( $type eq "long" ) {
+    if ( $type eq 'long' ) {
       ( $value ) = unpack( "l!", $data );
-    } elsif ( $type eq "ulong" || $type eq "size_t" ) {
+    } elsif ( $type eq 'ulong' || $type eq 'size_t' ) {
       ( $value ) = unpack( "L!", $data );
-    } elsif ( $type eq "int64" || $type eq "time_t64" ) {
-# The "q" type is only available on 64bit platforms, so use native.
+    } elsif ( $type eq 'int64' || $type eq 'time_t64' ) {
+# The 'q' type is only available on 64bit platforms, so use native.
       ( $value ) = unpack( "l!", $data );
-    } elsif ( $type eq "uint64" ) {
-# The "q" type is only available on 64bit platforms, so use native.
+    } elsif ( $type eq 'uint64' ) {
+# The 'q' type is only available on 64bit platforms, so use native.
       ( $value ) = unpack( "L!", $data );
-    } elsif ( $type eq "int32" ) {
-      ( $value ) = unpack( "l", $data );
-    } elsif ( $type eq "uint32" || $type eq "bool4" ) {
-      ( $value ) = unpack( "L", $data );
-    } elsif ( $type eq "int16" ) {
-      ( $value ) = unpack( "s", $data );
-    } elsif ( $type eq "uint16" ) {
-      ( $value ) = unpack( "S", $data );
-    } elsif ( $type eq "int8" ) {
-      ( $value ) = unpack( "c", $data );
-    } elsif ( $type eq "uint8" || $type eq "bool1" ) {
-      ( $value ) = unpack( "C", $data );
+    } elsif ( $type eq 'int32' ) {
+      ( $value ) = unpack( 'l', $data );
+    } elsif ( $type eq 'uint32' || $type eq 'bool4' ) {
+      ( $value ) = unpack( 'L', $data );
+    } elsif ( $type eq 'int16' ) {
+      ( $value ) = unpack( 's', $data );
+    } elsif ( $type eq 'uint16' ) {
+      ( $value ) = unpack( 'S', $data );
+    } elsif ( $type eq 'int8' ) {
+      ( $value ) = unpack( 'c', $data );
+    } elsif ( $type eq 'uint8' || $type eq 'bool1' ) {
+      ( $value ) = unpack( 'C', $data );
     } elsif ( $type =~ /^int8\[\d+\]$/ ) {
-      ( $value ) = unpack( "Z".$size, $data );
+      ( $value ) = unpack( 'Z'.$size, $data );
     } elsif ( $type =~ /^uint8\[\d+\]$/ ) {
-      ( $value ) = unpack( "C".$size, $data );
+      ( $value ) = unpack( 'C'.$size, $data );
     } else {
       Fatal( "Unexpected type '".$type."' found for '".$field."'" );
     }
@@ -394,34 +394,34 @@ sub zmMemWrite {
     my $size = $mem_data->{$section}->{contents}->{$element}->{size};
 
     my $data;
-    if ( $type eq "long" ) {
-      $data = pack( "l!", $value );
-    } elsif ( $type eq "ulong" || $type eq "size_t" ) {
-      $data = pack( "L!", $value );
-    } elsif ( $type eq "int64" || $type eq "time_t64" ) {
-# The "q" type is only available on 64bit platforms, so use native.
-      $data = pack( "l!", $value );
-    } elsif ( $type eq "uint64" ) {
-# The "q" type is only available on 64bit platforms, so use native.
-      $data = pack( "L!", $value );
-    } elsif ( $type eq "int32" ) {
-      $data = pack( "l", $value );
-    } elsif ( $type eq "uint32" || $type eq "bool4" ) {
-      $data = pack( "L", $value );
-    } elsif ( $type eq "int16" ) {
-      $data = pack( "s", $value );
-    } elsif ( $type eq "uint16" ) {
-      $data = pack( "S", $value );
-    } elsif ( $type eq "int8" ) {
-      $data = pack( "c", $value );
-    } elsif ( $type eq "uint8" || $type eq "bool1" ) {
-      $data = pack( "C", $value );
+    if ( $type eq 'long' ) {
+      $data = pack( 'l!', $value );
+    } elsif ( $type eq 'ulong' || $type eq 'size_t' ) {
+      $data = pack( 'L!', $value );
+    } elsif ( $type eq 'int64' || $type eq 'time_t64' ) {
+# The 'q' type is only available on 64bit platforms, so use native.
+      $data = pack( 'l!', $value );
+    } elsif ( $type eq 'uint64' ) {
+# The 'q' type is only available on 64bit platforms, so use native.
+      $data = pack( 'L!', $value );
+    } elsif ( $type eq 'int32' ) {
+      $data = pack( 'l', $value );
+    } elsif ( $type eq 'uint32' || $type eq 'bool4' ) {
+      $data = pack( 'L', $value );
+    } elsif ( $type eq 'int16' ) {
+      $data = pack( 's', $value );
+    } elsif ( $type eq 'uint16' ) {
+      $data = pack( 'S', $value );
+    } elsif ( $type eq 'int8' ) {
+      $data = pack( 'c', $value );
+    } elsif ( $type eq 'uint8' || $type eq 'bool1' ) {
+      $data = pack( 'C', $value );
     } elsif ( $type =~ /^int8\[\d+\]$/ ) {
-      $data = pack( "Z".$size, $value );
+      $data = pack( 'Z'.$size, $value );
     } elsif ( $type =~ /^uint8\[\d+\]$/ ) {
-      $data = pack( "C".$size, $value );
+      $data = pack( 'C'.$size, $value );
     } else {
-      Fatal( "Unexpected type '".$type."' found for '".$field."'" );
+      Fatal( "Unexpected type \"$type\" found for \"$field\'' );
     }
 
     if ( !zmMemPut( $monitor, $offset, $size, $data ) ) {
@@ -438,26 +438,26 @@ sub zmMemWrite {
 sub zmGetMonitorState {
   my $monitor = shift;
 
-  return( zmMemRead( $monitor, "shared_data:state" ) );
+  return( zmMemRead( $monitor, 'shared_data:state' ) );
 }
 
 sub zmGetAlarmLocation {
   my $monitor = shift;
 
-  return( zmMemRead( $monitor, [ "shared_data:alarm_x", "shared_data:alarm_y" ] ) );
+  return( zmMemRead( $monitor, [ 'shared_data:alarm_x', 'shared_data:alarm_y' ] ) );
 }
 
 sub zmSetControlState {
   my $monitor = shift;
   my $control_state = shift;
 
-  zmMemWrite( $monitor, { "shared_data:control_state" => $control_state } );
+  zmMemWrite( $monitor, { 'shared_data:control_state' => $control_state } );
 }
 
 sub zmGetControlState {
   my $monitor = shift;
 
-  return( zmMemRead( $monitor, "shared_data:control_state" ) );
+  return( zmMemRead( $monitor, 'shared_data:control_state' ) );
 }
 
 sub zmSaveControlState {
@@ -493,8 +493,8 @@ sub zmHasAlarmed {
   my $monitor = shift;
   my $last_event_id = shift;
 
-  my ( $state, $last_event ) = zmMemRead( $monitor, [ "shared_data:state"
-      ,"shared_data:last_event"
+  my ( $state, $last_event ) = zmMemRead( $monitor, [ 'shared_data:state'
+      ,'shared_data:last_event'
   ]
   );
 
@@ -509,63 +509,63 @@ sub zmHasAlarmed {
 sub zmGetLastEvent {
   my $monitor = shift;
 
-  return( zmMemRead( $monitor, "shared_data:last_event" ) );
+  return( zmMemRead( $monitor, 'shared_data:last_event' ) );
 }
 
 sub zmGetLastWriteTime {
   my $monitor = shift;
 
-  return( zmMemRead( $monitor, "shared_data:last_write_time" ) );
+  return( zmMemRead( $monitor, 'shared_data:last_write_time' ) );
 }
 
 sub zmGetLastReadTime {
   my $monitor = shift;
 
-  return( zmMemRead( $monitor, "shared_data:last_read_time" ) );
+  return( zmMemRead( $monitor, 'shared_data:last_read_time' ) );
 }
 
 sub zmGetMonitorActions {
   my $monitor = shift;
 
-  return( zmMemRead( $monitor, "shared_data:action" ) );
+  return( zmMemRead( $monitor, 'shared_data:action' ) );
 }
 
 sub zmMonitorEnable {
   my $monitor = shift;
 
-  my $action = zmMemRead( $monitor, "shared_data:action" );
+  my $action = zmMemRead( $monitor, 'shared_data:action' );
   $action |= ACTION_SUSPEND;
-  zmMemWrite( $monitor, { "shared_data:action" => $action } );
+  zmMemWrite( $monitor, { 'shared_data:action' => $action } );
 }
 
 sub zmMonitorDisable {
   my $monitor = shift;
 
-  my $action = zmMemRead( $monitor, "shared_data:action" );
+  my $action = zmMemRead( $monitor, 'shared_data:action' );
   $action |= ACTION_RESUME;
-  zmMemWrite( $monitor, { "shared_data:action" => $action } );
+  zmMemWrite( $monitor, { 'shared_data:action' => $action } );
 }
 
 sub zmMonitorSuspend {
   my $monitor = shift;
 
-  my $action = zmMemRead( $monitor, "shared_data:action" );
+  my $action = zmMemRead( $monitor, 'shared_data:action' );
   $action |= ACTION_SUSPEND;
-  zmMemWrite( $monitor, { "shared_data:action" => $action } );
+  zmMemWrite( $monitor, { 'shared_data:action' => $action } );
 }
 
 sub zmMonitorResume {
   my $monitor = shift;
 
-  my $action = zmMemRead( $monitor, "shared_data:action" );
+  my $action = zmMemRead( $monitor, 'shared_data:action' );
   $action |= ACTION_RESUME;
-  zmMemWrite( $monitor, { "shared_data:action" => $action } );
+  zmMemWrite( $monitor, { 'shared_data:action' => $action } );
 }
 
 sub zmGetTriggerState {
   my $monitor = shift;
 
-  return( zmMemRead( $monitor, "trigger_data:trigger_state" ) );
+  return( zmMemRead( $monitor, 'trigger_data:trigger_state' ) );
 }
 
 sub zmTriggerEventOn {
@@ -576,12 +576,12 @@ sub zmTriggerEventOn {
   my $showtext = shift;
 
   my $values = {
-    "trigger_data:trigger_score" => $score,
-    "trigger_data:trigger_cause" => $cause,
+    'trigger_data:trigger_score' => $score,
+    'trigger_data:trigger_cause' => $cause,
   };
-  $values->{"trigger_data:trigger_text"} = $text if ( defined($text) );
-  $values->{"trigger_data:trigger_showtext"} = $showtext if ( defined($showtext) );
-  $values->{"trigger_data:trigger_state"} = TRIGGER_ON; # Write state last so event not read incomplete
+  $values->{'trigger_data:trigger_text'} = $text if ( defined($text) );
+  $values->{'trigger_data:trigger_showtext'} = $showtext if ( defined($showtext) );
+  $values->{'trigger_data:trigger_state'} = TRIGGER_ON; # Write state last so event not read incomplete
 
   zmMemWrite( $monitor, $values );
 }
@@ -590,11 +590,11 @@ sub zmTriggerEventOff {
   my $monitor = shift;
 
   my $values = {
-    "trigger_data:trigger_state"    => TRIGGER_OFF,
-    "trigger_data:trigger_score"    => 0,
-    "trigger_data:trigger_cause"    => "",
-    "trigger_data:trigger_text"     => "",
-    "trigger_data:trigger_showtext" => "",
+    'trigger_data:trigger_state'    => TRIGGER_OFF,
+    'trigger_data:trigger_score'    => 0,
+    'trigger_data:trigger_cause'    => '',
+    'trigger_data:trigger_text'     => '',
+    'trigger_data:trigger_showtext' => '',
   };
 
   zmMemWrite( $monitor, $values );
@@ -604,11 +604,11 @@ sub zmTriggerEventCancel {
   my $monitor = shift;
 
   my $values = {
-    "trigger_data:trigger_state"    => TRIGGER_CANCEL,
-    "trigger_data:trigger_score"    => 0,
-    "trigger_data:trigger_cause"    => "",
-    "trigger_data:trigger_text"     => "",
-    "trigger_data:trigger_showtext" => "",
+    'trigger_data:trigger_state'    => TRIGGER_CANCEL,
+    'trigger_data:trigger_score'    => 0,
+    'trigger_data:trigger_cause'    => '',
+    'trigger_data:trigger_text'     => '',
+    'trigger_data:trigger_showtext' => '',
   };
 
   zmMemWrite( $monitor, $values );
@@ -619,7 +619,7 @@ sub zmTriggerShowtext {
   my $showtext = shift;
 
   my $values = {
-    "trigger_data:trigger_showtext" => $showtext,
+    'trigger_data:trigger_showtext' => $showtext,
   };
 
   zmMemWrite( $monitor, $values );
@@ -648,7 +648,7 @@ if ( zmMemVerify( $monitor ) ) {
     "shared_data:last_write_index"
 ]
 );
-zmMemWrite( $monitor, { "trigger_data:trigger_showtext" => "Some Text" } );
+zmMemWrite( $monitor, { 'trigger_data:trigger_showtext' => "Some Text" } );
 
 =head1 DESCRIPTION
 

From 32d1e62f738836992db797d39aac1b83ef9e6a56 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 30 May 2017 21:18:13 -0400
Subject: [PATCH 24/56] braces, spacing, quotes

---
 .../lib/ZoneMinder/Memory/Mapped.pm           | 219 ++++++++----------
 1 file changed, 102 insertions(+), 117 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm b/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm
index b6aaf68b5..bd826c9c7 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm
@@ -40,15 +40,15 @@ 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(
-        zmMemKey
-        zmMemAttach
-        zmMemDetach
-        zmMemGet
-        zmMemPut
-        zmMemClean
-    ) ],
-);
+    functions => [ qw(
+      zmMemKey
+      zmMemAttach
+      zmMemDetach
+      zmMemGet
+      zmMemPut
+      zmMemClean
+      ) ],
+    );
 push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
 
 our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
@@ -68,134 +68,119 @@ use ZoneMinder::Logger qw(:all);
 
 use Sys::Mmap;
 
-sub zmMemKey
-{
-    my $monitor = shift;
-    return( defined($monitor->{MMapAddr})?$monitor->{MMapAddr}:undef );
+sub zmMemKey {
+  my $monitor = shift;
+  return( defined($monitor->{MMapAddr})?$monitor->{MMapAddr}:undef );
 }
 
-sub zmMemAttach
-{
-    my ( $monitor, $size ) = @_;
-    if ( ! $size ) {
-        Error( "No size passed to zmMemAttach for monitor $$monitor{Id}\n" );
-        return( undef );
+sub zmMemAttach {
+  my ( $monitor, $size ) = @_;
+  if ( ! $size ) {
+    Error( "No size passed to zmMemAttach for monitor $$monitor{Id}\n" );
+    return( undef );
+  }
+  if ( !defined($monitor->{MMapAddr}) ) {
+
+    my $mmap_file = $Config{ZM_PATH_MAP}."/zm.mmap.".$monitor->{Id};
+    if ( ! -e $mmap_file ) {
+      Error( sprintf( "Memory map file '%s' does not exist.  zmc might not be running."
+            , $mmap_file
+            )
+          );
+      return ( undef );
     }
-    if ( !defined($monitor->{MMapAddr}) )
-    {
 
-        my $mmap_file = $Config{ZM_PATH_MAP}."/zm.mmap.".$monitor->{Id};
-        if ( ! -e $mmap_file ) {
-            Error( sprintf( "Memory map file '%s' does not exist.  zmc might not be running."
-                            , $mmap_file
-                          )
-            );
-            return ( undef );
-        }
+    my $mmap_file_size = -s $mmap_file;
 
-        my $mmap_file_size = -s $mmap_file;
-
-        if ( $mmap_file_size < $size ) {
-            Error( sprintf( "Memory map file '%s' should have been %d but was instead %d"
-                            , $mmap_file
-                            , $size
-                            , $mmap_file_size
-                          )
-            );
-            return ( undef );
-        }
-        my $MMAP;
-        if ( !open( $MMAP, "+<", $mmap_file ) )
-        {
-            Error( sprintf( "Can't open memory map file '%s': $!\n", $mmap_file ) );
-            return( undef );
-        }
-        my $mmap = undef;
-        my $mmap_addr = mmap( $mmap, $size, PROT_READ|PROT_WRITE, MAP_SHARED, $MMAP );
-        if ( !$mmap_addr || !$mmap )
-        {
-            Error( sprintf( "Can't mmap to file '%s': $!\n", $mmap_file ) );
-            close( $MMAP );
-            return( undef );
-        }
-        $monitor->{MMapHandle} = $MMAP;
-        $monitor->{MMapAddr} = $mmap_addr;
-        $monitor->{MMap} = \$mmap;
+    if ( $mmap_file_size < $size ) {
+      Error( sprintf( "Memory map file '%s' should have been %d but was instead %d"
+            , $mmap_file
+            , $size
+            , $mmap_file_size
+            )
+          );
+      return ( undef );
     }
-    return( !undef );
+    my $MMAP;
+    if ( !open( $MMAP, '+<', $mmap_file ) ) {
+      Error( sprintf( "Can't open memory map file '%s': $!\n", $mmap_file ) );
+      return( undef );
+    }
+    my $mmap = undef;
+    my $mmap_addr = mmap( $mmap, $size, PROT_READ|PROT_WRITE, MAP_SHARED, $MMAP );
+    if ( !$mmap_addr || !$mmap ) {
+      Error( sprintf( "Can't mmap to file '%s': $!\n", $mmap_file ) );
+      close( $MMAP );
+      return( undef );
+    }
+    $monitor->{MMapHandle} = $MMAP;
+    $monitor->{MMapAddr} = $mmap_addr;
+    $monitor->{MMap} = \$mmap;
+  }
+  return( !undef );
 }
 
-sub zmMemDetach
-{
-    my $monitor = shift;
+sub zmMemDetach {
+  my $monitor = shift;
 
-    if ( $monitor->{MMap} )
-    {
-        if ( ! munmap( ${$monitor->{MMap}} ) ) {
-            Warn( "Unable to munmap for monitor $$monitor{Id}\n");
-        }
-        delete $monitor->{MMap};
-    }
-    if ( $monitor->{MMapAddr} )
-    {
-        delete $monitor->{MMapAddr};
-    }
-    if ( $monitor->{MMapHandle} )
-    {
-        close( $monitor->{MMapHandle} );
-        delete $monitor->{MMapHandle};
+  if ( $monitor->{MMap} ) {
+    if ( ! munmap( ${$monitor->{MMap}} ) ) {
+      Warn( "Unable to munmap for monitor $$monitor{Id}\n");
     }
+    delete $monitor->{MMap};
+  }
+  if ( $monitor->{MMapAddr} ) {
+    delete $monitor->{MMapAddr};
+  }
+  if ( $monitor->{MMapHandle} ) {
+    close( $monitor->{MMapHandle} );
+    delete $monitor->{MMapHandle};
+  }
 }
 
-sub zmMemGet
-{
-    my $monitor = shift;
-    my $offset = shift;
-    my $size = shift;
+sub zmMemGet {
+  my $monitor = shift;
+  my $offset = shift;
+  my $size = shift;
 
-    my $mmap = $monitor->{MMap};
-    if ( !$mmap || !$$mmap )
-    {
-        Error( sprintf( "Can't read from mapped memory for monitor '%d', gone away?"
-                        , $monitor->{Id}
-                      )
+  my $mmap = $monitor->{MMap};
+  if ( !$mmap || !$$mmap ) {
+    Error( sprintf( "Can't read from mapped memory for monitor '%d', gone away?"
+          , $monitor->{Id}
+          )
         );
-        return( undef );
-    }
-    my $data = substr( $$mmap, $offset, $size );
-    return( $data );
+    return( undef );
+  }
+  my $data = substr( $$mmap, $offset, $size );
+  return( $data );
 }
 
-sub zmMemPut
-{
-    my $monitor = shift;
-    my $offset = shift;
-    my $size = shift;
-    my $data = shift;
+sub zmMemPut {
+  my $monitor = shift;
+  my $offset = shift;
+  my $size = shift;
+  my $data = shift;
 
-    my $mmap = $monitor->{MMap};
-    if ( !$mmap || !$$mmap )
-    {
-        Error( sprintf( "Can't write mapped memory for monitor '%d', gone away?"
-                        , $monitor->{Id}
-                      )
+  my $mmap = $monitor->{MMap};
+  if ( !$mmap || !$$mmap ) {
+    Error( sprintf( "Can't write mapped memory for monitor '%d', gone away?"
+          , $monitor->{Id}
+          )
         );
-        return( undef );
-    }
-    substr( $$mmap, $offset, $size ) = $data;
-    return( !undef );
+    return( undef );
+  }
+  substr( $$mmap, $offset, $size ) = $data;
+  return( !undef );
 }
 
-sub zmMemClean
-{
-    Debug( "Removing memory map files\n" );
-    my $mapPath = $Config{ZM_PATH_MAP}."/zm.mmap.*";
-    foreach my $mapFile( glob( $mapPath ) )
-    {
-        ( $mapFile ) = $mapFile =~ /^(.+)$/;
-        Debug( "Removing memory map file '$mapFile'\n" );
-        unlink( $mapFile );
-    }
+sub zmMemClean {
+  Debug( "Removing memory map files\n" );
+  my $mapPath = $Config{ZM_PATH_MAP}.'/zm.mmap.*';
+  foreach my $mapFile( glob( $mapPath ) ) {
+    ( $mapFile ) = $mapFile =~ /^(.+)$/;
+    Debug( "Removing memory map file '$mapFile'\n" );
+    unlink( $mapFile );
+  }
 }
 
 1;

From 82a13fac76b468ddb5aaba7fda0a8809d879dbb0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Tue, 30 May 2017 21:21:51 -0400
Subject: [PATCH 25/56] new class for Monitors

---
 scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm | 85 ++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm b/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
new file mode 100644
index 000000000..d5b7d7f53
--- /dev/null
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
@@ -0,0 +1,85 @@
+# ==========================================================================
+#
+# ZoneMinder Monitor 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# ==========================================================================
+#
+# This module contains the common definitions and functions used by the rest
+# of the ZoneMinder scripts
+#
+package ZoneMinder::Monitor;
+
+use 5.006;
+use strict;
+use warnings;
+
+require ZoneMinder::Base;
+require ZoneMinder::Object;
+require ZoneMinder::Server;
+
+#our @ISA = qw(Exporter ZoneMinder::Base);
+use parent qw(ZoneMinder::Object);
+
+# ==========================================================================
+#
+# General Utility Functions
+#
+# ==========================================================================
+
+use ZoneMinder::Config qw(:all);
+use ZoneMinder::Logger qw(:all);
+use ZoneMinder::Database qw(:all);
+
+use POSIX;
+use vars qw/ $table $primary_key /;
+$table = 'Monitors';
+$primary_key = 'Id';
+
+sub Server {
+	return new ZoneMinder::Server( $_[0]{ServerId} );
+} # end sub Server
+
+1;
+__END__
+
+=head1 NAME
+
+ZoneMinder::Monitor - Perl Class for Monitors
+
+=head1 SYNOPSIS
+
+use ZoneMinder::Monitor;
+
+=head1 DESCRIPTION
+
+
+
+=head1 AUTHOR
+
+Isaac Connor, E<lt>isaac@zoneminder.comE<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (C) 2001-2017  ZoneMinder LLC
+
+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.
+
+
+=cut

From 36ccc5b7b694929513edc78dc7824ca6485fc8de Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 31 May 2017 09:33:51 -0400
Subject: [PATCH 26/56] Merge bits from SA.  Mostly double to single quotes
 plus some debug lines when errors happen

---
 scripts/zmaudit.pl.in | 97 +++++++++++++++++++++----------------------
 1 file changed, 48 insertions(+), 49 deletions(-)

diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in
index eaf724366..c671e9989 100644
--- a/scripts/zmaudit.pl.in
+++ b/scripts/zmaudit.pl.in
@@ -41,9 +41,9 @@ yet.
 
 =head1 OPTIONS
 
- -r, --report               - Just report don't actually do anything
- -i, --interactive          - Ask before applying any changes
  -c, --continuous           - Run continuously
+ -i, --interactive          - Ask before applying any changes
+ -r, --report               - Just report don't actually do anything
  -v, --version              - Print the installed version of ZoneMinder
 
 =cut
@@ -57,8 +57,8 @@ use bytes;
 # ==========================================================================
 
 use constant MAX_AGED_DIRS => 10; # Number of event dirs to check age on
-use constant RECOVER_TAG => "(r)"; # Tag to append to event name when recovered
-use constant RECOVER_TEXT => "Recovered."; # Text to append to event notes when recovered
+use constant RECOVER_TAG => '(r)'; # Tag to append to event name when recovered
+use constant RECOVER_TEXT => 'Recovered.'; # Text to append to event notes when recovered
 
 # ==========================================================================
 #
@@ -96,10 +96,10 @@ logInit();
 logSetSignal();
 
 GetOptions(
-    'report'        =>\$report,
-    'interactive'   =>\$interactive,
-    'continuous'    =>\$continuous,
-    'version'       =>\$version
+    continuous    =>\$continuous,
+    interactive   =>\$interactive,
+    report        =>\$report,
+    version       =>\$version
     ) or pod2usage(-exitstatus => -1);
 
 if ( $version ) {
@@ -126,13 +126,13 @@ MAIN: while( $loop ) {
     $dbh = zmDbConnect();
 
     if ( $continuous ) {
-      Error("Unable to connect to database");
+      Error('Unable to connect to database');
 # if we are running continuously, then just skip to the next
 # interval, otherwise we are a one off run, so wait a second and
 # retry until someone kills us.
       sleep( $Config{ZM_AUDIT_CHECK_INTERVAL} );
     } else {
-      Fatal("Unable to connect to database");
+      Fatal('Unable to connect to database');
     } # end if
   } # end while can't connect to the db
 
@@ -146,15 +146,15 @@ MAIN: while( $loop ) {
   } # end if
 
   if ( ! exists $Config{ZM_AUDIT_MIN_AGE} ) {
-    Fatal("ZM_AUDIT_MIN_AGE is not set in config.");
+    Fatal('ZM_AUDIT_MIN_AGE is not set in config.');
   }
 
   my $db_monitors;
   my $monitorSelectSql = "select Id from Monitors order by Id";
   my $monitorSelectSth = $dbh->prepare_cached( $monitorSelectSql )
     or Fatal( "Can't prepare '$monitorSelectSql': ".$dbh->errstr() );
-  my $eventSelectSql = "SELECT Id, (unix_timestamp() - unix_timestamp(StartTime)) as Age
-    FROM Events WHERE MonitorId = ? ORDER BY Id";
+  my $eventSelectSql = 'SELECT Id, (unix_timestamp() - unix_timestamp(StartTime)) as Age
+    FROM Events WHERE MonitorId = ? ORDER BY Id';
   my $eventSelectSth = $dbh->prepare_cached( $eventSelectSql )
     or Fatal( "Can't prepare '$eventSelectSql': ".$dbh->errstr() );
 
@@ -169,11 +169,11 @@ MAIN: while( $loop ) {
     while ( my $event = $eventSelectSth->fetchrow_hashref() ) {
       $db_events->{$event->{Id}} = $event->{Age};
     }
-    Debug( "Got ".int(keys(%$db_events))." events\n" );
+    Debug( 'Got '.int(keys(%$db_events))." events\n" );
   }
 
   my $fs_monitors;
-  foreach my $monitor ( glob("[0-9]*") ) {
+  foreach my $monitor ( glob('[0-9]*') ) {
 # Thie glob above gives all files starting with a digit.  So a monitor with a name starting with a digit will be in this list.
     next if $monitor =~ /\D/;
     Debug( "Found filesystem monitor '$monitor'" );
@@ -182,11 +182,17 @@ MAIN: while( $loop ) {
 
     if ( $Config{ZM_USE_DEEP_STORAGE} ) {
       foreach my $day_dir ( glob("$monitor_dir/*/*/*") ) {
-        Debug( "Checking $day_dir" );
+        Debug( "Checking day dir $day_dir" );
         ( $day_dir ) = ( $day_dir =~ /^(.*)$/ ); # De-taint
-          chdir( $day_dir );
-        opendir( DIR, "." )
-          or Fatal( "Can't open directory '$day_dir': $!" );
+        if ( ! chdir( $day_dir ) ) {
+          Error( "Can't chdir to '$$Storage{Path}/$day_dir': $!" );
+          next;
+        }
+        if ( ! opendir( DIR, '.' ) ) {
+          Error( "Can't open directory '$$Storage{Path}/$day_dir': $!" );
+          next;
+        }
+
         my @event_links = sort { $b <=> $a } grep { -l $_ } readdir( DIR );
         closedir( DIR );
         my $count = 0;
@@ -226,7 +232,7 @@ MAIN: while( $loop ) {
       }
       chdir( EVENT_PATH );
     }
-    Debug( "Got ".int(keys(%$fs_events))." events\n" );
+    Debug( 'Got '.int(keys(%$fs_events))." events\n" );
   } # end foreach monitor Id
   redo MAIN if ( $cleaned );
 
@@ -255,7 +261,7 @@ MAIN: while( $loop ) {
   }
 
   my $monitor_links;
-  foreach my $link ( glob("*") ) {
+  foreach my $link ( glob('*') ) {
     next if ( !-l $link );
     next if ( -e $link );
 
@@ -270,16 +276,16 @@ MAIN: while( $loop ) {
   redo MAIN if ( $cleaned );
 
   $cleaned = 0;
-  my $deleteMonitorSql = "delete low_priority from Monitors where Id = ?";
+  my $deleteMonitorSql = 'delete low_priority from Monitors where Id = ?';
   my $deleteMonitorSth = $dbh->prepare_cached( $deleteMonitorSql )
     or Fatal( "Can't prepare '$deleteMonitorSql': ".$dbh->errstr() );
-  my $deleteEventSql = "delete low_priority from Events where Id = ?";
+  my $deleteEventSql = 'delete low_priority from Events where Id = ?';
   my $deleteEventSth = $dbh->prepare_cached( $deleteEventSql )
     or Fatal( "Can't prepare '$deleteEventSql': ".$dbh->errstr() );
-  my $deleteFramesSql = "delete low_priority from Frames where EventId = ?";
+  my $deleteFramesSql = 'delete low_priority from Frames where EventId = ?';
   my $deleteFramesSth = $dbh->prepare_cached( $deleteFramesSql )
     or Fatal( "Can't prepare '$deleteFramesSql': ".$dbh->errstr() );
-  my $deleteStatsSql = "delete low_priority from Stats where EventId = ?";
+  my $deleteStatsSql = 'delete low_priority from Stats where EventId = ?';
   my $deleteStatsSth = $dbh->prepare_cached( $deleteStatsSql )
     or Fatal( "Can't prepare '$deleteStatsSql': ".$dbh->errstr() );
   while ( my ( $db_monitor, $db_events ) = each(%$db_monitors) ) {
@@ -319,9 +325,9 @@ MAIN: while( $loop ) {
 
 # Remove orphaned events (with no monitor)
   $cleaned = 0;
-  my $selectOrphanedEventsSql = "SELECT Events.Id, Events.Name
+  my $selectOrphanedEventsSql = 'SELECT Events.Id, Events.Name
     FROM Events LEFT JOIN Monitors ON (Events.MonitorId = Monitors.Id)
-    WHERE isnull(Monitors.Id)";
+    WHERE isnull(Monitors.Id)';
   my $selectOrphanedEventsSth = $dbh->prepare_cached( $selectOrphanedEventsSql )
     or Fatal( "Can't prepare '$selectOrphanedEventsSql': ".$dbh->errstr() );
   $res = $selectOrphanedEventsSth->execute()
@@ -356,8 +362,8 @@ MAIN: while( $loop ) {
 
 # Remove orphaned frame records
   $cleaned = 0;
-  my $selectOrphanedFramesSql = "SELECT DISTINCT EventId FROM Frames
-    WHERE EventId NOT IN (SELECT Id FROM Events)";
+  my $selectOrphanedFramesSql = 'SELECT DISTINCT EventId FROM Frames
+    WHERE EventId NOT IN (SELECT Id FROM Events)';
   my $selectOrphanedFramesSth = $dbh->prepare_cached( $selectOrphanedFramesSql )
     or Fatal( "Can't prepare '$selectOrphanedFramesSql': ".$dbh->errstr() );
   $res = $selectOrphanedFramesSth->execute()
@@ -374,8 +380,8 @@ MAIN: while( $loop ) {
 
 # Remove orphaned stats records
   $cleaned = 0;
-  my $selectOrphanedStatsSql = "SELECT DISTINCT EventId FROM Stats
-    WHERE EventId NOT IN (SELECT Id FROM Events)";
+  my $selectOrphanedStatsSql = 'SELECT DISTINCT EventId FROM Stats
+    WHERE EventId NOT IN (SELECT Id FROM Events)';
   my $selectOrphanedStatsSth = $dbh->prepare_cached( $selectOrphanedStatsSql )
     or Fatal( "Can't prepare '$selectOrphanedStatsSql': ".$dbh->errstr() );
   $res = $selectOrphanedStatsSth->execute()
@@ -429,20 +435,13 @@ MAIN: while( $loop ) {
     aud_print( "Found open event '$event->{Id}'" );
     if ( confirm( 'close', 'closing' ) ) {
       $res = $updateUnclosedEventsSth->execute(
-         sprintf("%s%d%s",
-           $event->{Prefix},
-           $event->{Id},
-           RECOVER_TAG
-           ),
+         sprintf('%s%d%s', $event->{Prefix}, $event->{Id}, RECOVER_TAG),
          $event->{EndTime},
          $event->{Length},
          $event->{Frames},
          $event->{AlarmFrames},
          $event->{TotScore},
-         $event->{AlarmFrames}
-         ? int($event->{TotScore} / $event->{AlarmFrames})
-         : 0
-         ,
+         $event->{AlarmFrames} ? int($event->{TotScore} / $event->{AlarmFrames}) : 0,
          $event->{MaxScore},
          RECOVER_TEXT,
          $event->{Id}
@@ -453,8 +452,8 @@ MAIN: while( $loop ) {
 # Now delete any old image files
   my @old_files = grep { -M > $max_image_age } <$image_path/*.{jpg,gif,wbmp}>;
   if ( @old_files ) {
-    aud_print( "Deleting ".int(@old_files)." old images\n" );
-    my $untainted_old_files = join( ";", @old_files );
+    aud_print( 'Deleting '.( scalar @old_files )." old images\n" );
+    my $untainted_old_files = join( ';', @old_files );
     ( $untainted_old_files ) = ( $untainted_old_files =~ /^(.*)$/ );
     unlink( split( /;/, $untainted_old_files ) );
   }
@@ -467,7 +466,7 @@ MAIN: while( $loop ) {
   if ( $Config{ZM_LOG_DATABASE_LIMIT} ) {
     if ( $Config{ZM_LOG_DATABASE_LIMIT} =~ /^\d+$/ ) {
       # Number of rows
-      my $selectLogRowCountSql = "SELECT count(*) as Rows from Logs";
+      my $selectLogRowCountSql = 'SELECT count(*) AS Rows FROM Logs';
       my $selectLogRowCountSth = $dbh->prepare_cached( $selectLogRowCountSql )
         or Fatal( "Can't prepare '$selectLogRowCountSql': ".$dbh->errstr() );
       $res = $selectLogRowCountSth->execute()
@@ -475,20 +474,20 @@ MAIN: while( $loop ) {
       my $row = $selectLogRowCountSth->fetchrow_hashref();
       my $logRows = $row->{Rows};
       if ( $logRows > $Config{ZM_LOG_DATABASE_LIMIT} ) {
-        my $deleteLogByRowsSql = "DELETE low_priority FROM Logs ORDER BY TimeKey ASC LIMIT ?";
+        my $deleteLogByRowsSql = 'DELETE low_priority FROM Logs ORDER BY TimeKey ASC LIMIT ?';
         my $deleteLogByRowsSth = $dbh->prepare_cached( $deleteLogByRowsSql )
           or Fatal( "Can't prepare '$deleteLogByRowsSql': ".$dbh->errstr() );
         $res = $deleteLogByRowsSth->execute( $logRows - $Config{ZM_LOG_DATABASE_LIMIT} )
           or Fatal( "Can't execute: ".$deleteLogByRowsSth->errstr() );
         if ( $deleteLogByRowsSth->rows() ) {
-          aud_print( "Deleted ".$deleteLogByRowsSth->rows() ." log table entries by count\n" );
+          aud_print( 'Deleted '.$deleteLogByRowsSth->rows() ." log table entries by count\n" );
         }
       }
     } else {
       # Time of record
       my $deleteLogByTimeSql =
-      "DELETE low_priority FROM Logs
-      WHERE TimeKey < unix_timestamp(now() - interval ".$Config{ZM_LOG_DATABASE_LIMIT}.")";
+      'DELETE low_priority FROM Logs
+      WHERE TimeKey < unix_timestamp(now() - interval '.$Config{ZM_LOG_DATABASE_LIMIT}.')';
       my $deleteLogByTimeSth = $dbh->prepare_cached( $deleteLogByTimeSql )
         or Fatal( "Can't prepare '$deleteLogByTimeSql': ".$dbh->errstr() );
       $res = $deleteLogByTimeSth->execute()
@@ -515,8 +514,8 @@ sub aud_print {
 }
 
 sub confirm {
-  my $prompt = shift || "delete";
-  my $action = shift || "deleting";
+  my $prompt = shift || 'delete';
+  my $action = shift || 'deleting';
 
   my $yesno = 0;
   if ( $report ) {

From 53a7b2e72c5b57cd12a3d82ec6db2ab400fc311d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 31 May 2017 09:57:55 -0400
Subject: [PATCH 27/56] more double quotes to single quotes and fix some
 spacing

---
 .../ZoneMinder/lib/ZoneMinder/Memory.pm.in    | 98 +++++++++----------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
index 5751bf49a..91f2d0b54 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
@@ -82,7 +82,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();
 
@@ -248,51 +248,51 @@ sub zmMemVerify {
     return( undef );
   }
 
-    my $sd_size = zmMemRead( $monitor, "shared_data:size", 1 );
-    if ( $sd_size != $mem_data->{shared_data}->{size} ) {
-      if ( $sd_size ) {
-        Error( "Shared data size conflict in shared_data for monitor "
-            .$monitor->{Name}
-            .", expected "
-            .$mem_data->{shared_data}->{size}
-            .", got "
-            .$sd_size
-            );
-      } else {
-        Debug( "Shared data size conflict in shared_data for monitor "
-            .$monitor->{Name}
-            .", expected "
-            .$mem_data->{shared_data}->{size}
-            .", got ".$sd_size
-            );
-      }
-      return( undef );
+  my $sd_size = zmMemRead( $monitor, 'shared_data:size', 1 );
+  if ( $sd_size != $mem_data->{shared_data}->{size} ) {
+    if ( $sd_size ) {
+      Error( "Shared data size conflict in shared_data for monitor "
+          .$monitor->{Name}
+          .", expected "
+          .$mem_data->{shared_data}->{size}
+          .", got "
+          .$sd_size
+          );
+    } else {
+      Debug( "Shared data size conflict in shared_data for monitor "
+          .$monitor->{Name}
+          .", expected "
+          .$mem_data->{shared_data}->{size}
+          .", got ".$sd_size
+          );
     }
-    my $td_size = zmMemRead( $monitor, "trigger_data:size", 1 );
-    if ( $td_size != $mem_data->{trigger_data}->{size} ) {
-      if ( $td_size ) {
-        Error( "Shared data size conflict in trigger_data for monitor "
-            .$monitor->{Name}
-            .", expected "
-            .$mem_data->{triggger_data}->{size}
-            .", got "
-            .$td_size
-            );
-      } else {
-        Debug( "Shared data size conflict in trigger_data for monitor "
-            .$monitor->{Name}
-            .", expected "
-            .$mem_data->{triggger_data}->{size}
-            .", got "
-            .$td_size
-            );
-      }
-      return( undef );
-    }
-    if ( !zmMemRead($monitor, "shared_data:valid",1) ) {
-        Error( "Shared data not valid for monitor $$monitor{Id}" );
-        return( undef );
+    return( undef );
+  }
+  my $td_size = zmMemRead( $monitor, 'trigger_data:size', 1 );
+  if ( $td_size != $mem_data->{trigger_data}->{size} ) {
+    if ( $td_size ) {
+      Error( "Shared data size conflict in trigger_data for monitor "
+          .$monitor->{Name}
+          .", expected "
+          .$mem_data->{triggger_data}->{size}
+          .", got "
+          .$td_size
+          );
+    } else {
+      Debug( "Shared data size conflict in trigger_data for monitor "
+          .$monitor->{Name}
+          .", expected "
+          .$mem_data->{triggger_data}->{size}
+          .", got "
+          .$td_size
+          );
     }
+    return( undef );
+  }
+  if ( !zmMemRead($monitor, 'shared_data:valid',1) ) {
+    Error( "Shared data not valid for monitor $$monitor{Id}" );
+    return( undef );
+  }
 
   return( !undef );
 }
@@ -326,15 +326,15 @@ sub zmMemRead {
     }
     my $value;
     if ( $type eq 'long' ) {
-      ( $value ) = unpack( "l!", $data );
+      ( $value ) = unpack( 'l!', $data );
     } elsif ( $type eq 'ulong' || $type eq 'size_t' ) {
-      ( $value ) = unpack( "L!", $data );
+      ( $value ) = unpack( 'L!', $data );
     } elsif ( $type eq 'int64' || $type eq 'time_t64' ) {
 # The 'q' type is only available on 64bit platforms, so use native.
-      ( $value ) = unpack( "l!", $data );
+      ( $value ) = unpack( 'l!', $data );
     } elsif ( $type eq 'uint64' ) {
 # The 'q' type is only available on 64bit platforms, so use native.
-      ( $value ) = unpack( "L!", $data );
+      ( $value ) = unpack( 'L!', $data );
     } elsif ( $type eq 'int32' ) {
       ( $value ) = unpack( 'l', $data );
     } elsif ( $type eq 'uint32' || $type eq 'bool4' ) {
@@ -421,7 +421,7 @@ sub zmMemWrite {
     } elsif ( $type =~ /^uint8\[\d+\]$/ ) {
       $data = pack( 'C'.$size, $value );
     } else {
-      Fatal( "Unexpected type \"$type\" found for \"$field\'' );
+      Fatal( "Unexpected type \"$type\" found for \"$field\"" );
     }
 
     if ( !zmMemPut( $monitor, $offset, $size, $data ) ) {

From ece10d6278c5c1fd43c55a0cac81cf6308388f2c Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 31 May 2017 11:16:55 -0400
Subject: [PATCH 28/56] braces and whitspace

---
 web/skins/classic/includes/functions.php | 59 +++++++++++-------------
 1 file changed, 27 insertions(+), 32 deletions(-)

diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index ed11748ab..0a85569ed 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -21,24 +21,23 @@
 // Only load new js & css in these views
 $new_views = array('login');
 
-function xhtmlHeaders( $file, $title )
-{
-    global  $css;
-    global  $skin;
-    $skinCssFile = getSkinFile( 'css/'.$css.'/skin.css' );
-    $skinCssPhpFile = getSkinFile( 'css/'.$css.'/skin.css.php' );
+function xhtmlHeaders( $file, $title ) {
+  global  $css;
+  global  $skin;
+  $skinCssFile = getSkinFile( 'css/'.$css.'/skin.css' );
+  $skinCssPhpFile = getSkinFile( 'css/'.$css.'/skin.css.php' );
 
-    $skinJsFile = getSkinFile( 'js/skin.js' );
-    $skinJsPhpFile = getSkinFile( 'js/skin.js.php' );
-    $cssJsFile = getSkinFile( 'js/'.$css.'.js' );
+  $skinJsFile = getSkinFile( 'js/skin.js' );
+  $skinJsPhpFile = getSkinFile( 'js/skin.js.php' );
+  $cssJsFile = getSkinFile( 'js/'.$css.'.js' );
 
-    $basename = basename( $file, '.php' );
-    $viewCssFile = getSkinFile( '/css/'.$css.'/views/'.$basename.'.css' );
-    $viewCssPhpFile = getSkinFile( '/css/'.$css.'/views/'.$basename.'.css.php' );
-    $viewJsFile = getSkinFile( 'views/js/'.$basename.'.js' );
-    $viewJsPhpFile = getSkinFile( 'views/js/'.$basename.'.js.php' );
+  $basename = basename( $file, '.php' );
+  $viewCssFile = getSkinFile( '/css/'.$css.'/views/'.$basename.'.css' );
+  $viewCssPhpFile = getSkinFile( '/css/'.$css.'/views/'.$basename.'.css.php' );
+  $viewJsFile = getSkinFile( 'views/js/'.$basename.'.js' );
+  $viewJsPhpFile = getSkinFile( 'views/js/'.$basename.'.js.php' );
 
-    extract( $GLOBALS, EXTR_OVERWRITE );
+  extract( $GLOBALS, EXTR_OVERWRITE );
 ?>
 <!DOCTYPE html>
 <html lang="en">
@@ -56,19 +55,17 @@ function xhtmlHeaders( $file, $title )
 <?php } ?>
   <link rel="stylesheet" href="<?php echo $skinCssFile ?>" type="text/css" media="screen"/>
 <?php
-    if ( $viewCssFile )
-    {
+  if ( $viewCssFile ) {
 ?>
   <link rel="stylesheet" href="<?php echo $viewCssFile ?>" type="text/css" media="screen"/>
 <?php
-    }
-    if ( $viewCssPhpFile )
-    {
+  }
+  if ( $viewCssPhpFile ) {
 ?>
   <style type="text/css">
   /*<![CDATA[*/
 <?php
-        require_once( $viewCssPhpFile );
+    require_once( $viewCssPhpFile );
 ?>
   /*]]>*/
   </style>
@@ -88,9 +85,9 @@ function xhtmlHeaders( $file, $title )
   <script src="skins/<?php echo $skin ?>/js/video.js"></script>
   <script src="./js/videojs.zoomrotate.js"></script>
   <script src="skins/<?php echo $skin ?>/js/moment.min.js"></script>
-<?php }
-    if ( $skinJsPhpFile )
-    {
+<?php
+  }
+  if ( $skinJsPhpFile ) {
 ?>
   <script type="text/javascript">
   //<![CDATA[
@@ -102,33 +99,31 @@ function xhtmlHeaders( $file, $title )
   //]]>
   </script>
 <?php
-    }
-    if ( $viewJsPhpFile )
-    {
+  }
+  if ( $viewJsPhpFile ) {
 ?>
   <script type="text/javascript">
   //<![CDATA[
   <!--
 <?php
-        require_once( $viewJsPhpFile );
+    require_once( $viewJsPhpFile );
 ?>
   //-->
   //]]>
   </script>
 <?php
-    }
+  }
 	if ( $cssJsFile ) {
 ?>
   <script type="text/javascript" src="<?php echo $cssJsFile ?>"></script>
 <?php } ?>
   <script type="text/javascript" src="<?php echo $skinJsFile ?>"></script>
 <?php
-    if ( $viewJsFile )
-    {
+  if ( $viewJsFile ) {
 ?>
   <script type="text/javascript" src="<?php echo $viewJsFile ?>"></script>
 <?php
-    }
+  }
 ?>
 </head>
 <?php

From 8596891e4dcde84b3348be2f4f25cc7d94542378 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 31 May 2017 12:55:27 -0400
Subject: [PATCH 29/56] fix double to single quote mistakes

---
 web/skins/classic/views/monitor.php | 242 ++++++++++++++--------------
 1 file changed, 119 insertions(+), 123 deletions(-)

diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index 982131589..da74fbb70 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -26,16 +26,16 @@ if ( !canView( 'Monitors' ) ) {
 }
 
 $tabs = array();
-$tabs[''] = translate('General');
-$tabs[''] = translate('Source');
-$tabs[''] = translate('Storage');
-$tabs[''] = translate('Timestamp');
-$tabs[''] = translate('Buffers');
+$tabs['general'] = translate('General');
+$tabs['source'] = translate('Source');
+$tabs['storage'] = translate('Storage');
+$tabs['timestamp'] = translate('Timestamp');
+$tabs['buffers'] = translate('Buffers');
 if ( ZM_OPT_CONTROL && canView( 'Control' ) )
-  $tabs[''] = translate('Control');
+  $tabs['control'] = translate('Control');
 if ( ZM_OPT_X10 )
-  $tabs[''] = translate('X10');
-$tabs[''] = translate('Misc');
+  $tabs['x10'] = translate('X10');
+$tabs['misc'] = translate('Misc');
 
 if ( isset($_REQUEST['tab']) )
     $tab = validHtmlStr($_REQUEST['tab']);
@@ -263,7 +263,7 @@ if ( ZM_HAS_V4L1 )
     $v4l1MaxChannels = 15;
     $v4l1DeviceChannels = array();
     for ( $i = 0; $i <= $v4l1MaxChannels; $i++ )
-        $v4l1DeviceChannels[''] = $i;
+        $v4l1DeviceChannels['$i'] = $i;
 
     $v4l1LocalPalettes = array(
         translate('Grey')      => 1,
@@ -313,7 +313,7 @@ if ( ZM_HAS_V4L2 ) {
     $v4l2MaxChannels = 31;
     $v4l2DeviceChannels = array();
     for ( $i = 0; $i <= $v4l2MaxChannels; $i++ )
-        $v4l2DeviceChannels[''] = $i;
+        $v4l2DeviceChannels[$i] = $i;
 
     $v4l2LocalPalettes = array(
         'Auto' => 0, /* Automatic palette selection */
@@ -434,7 +434,7 @@ $fastblendopts = array(
     '12.5% (Outdoor)'                                     => 12,
     '25%'                                                 => 25,
     '50%'                                                 => 50
-    );
+);
 
 $fastblendopts_alarm = array(
     'No blending (Alarm lasts forever)'                   => 0,
@@ -444,12 +444,12 @@ $fastblendopts_alarm = array(
     '12.5%'                                               => 12,
     '25%'                                                 => 25,
     '50% (Alarm lasts a moment)'                          => 50
-    );
+);
 
 $label_size = array(
     'Default'                                             => 1,
     'Large'                                               => 2
-    );
+);
 
 $savejpegopts = array(
     'Disabled'                                            => 0,
@@ -457,13 +457,13 @@ $savejpegopts = array(
     'Analysis images only (if available)'                 => 2,
     'Frames + Analysis images (if available)'             => 3,
     'Snapshot Only'                                       => 4          
-    );
+);
 
 $videowriteropts = array(
     'Disabled'                                            => 0,
     'X264 Encode'                                         => 1,
     'H264 Camera Passthrough'                             => 2          
-    );
+);
 
 xhtmlHeaders(__FILE__, translate('Monitor')." - ".validHtmlStr($monitor['Name']) );
 ?>
@@ -483,33 +483,33 @@ if ( canEdit( 'Monitors' ) ) {
 ?>
       <div id="headerButtons">
         <a href="#" onclick="createPopup( '?view=monitorprobe&amp;mid=<?php echo $monitor['Id'] ?>', 'zmMonitorProbe<?php echo $monitor['Id'] ?>', 'monitorprobe' ); return( false );"><?php echo translate('Probe') ?></a>
-<?php
+  <?php
   if ( ZM_HAS_ONVIF ) {
-?>
+  ?>
         <a href="#" onclick="createPopup( '?view=onvifprobe&amp;mid=<?php echo $monitor['Id'] ?>', 'zmOnvifProbe<?php echo $monitor['Id'] ?>', 'onvifprobe' ); return( false );"><?php echo  translate('OnvifProbe') ?></a>
-<?php
+  <?php
   }
-?>
+  ?>
         <a href="#" onclick="createPopup( '?view=monitorpreset&amp;mid=<?php echo $monitor['Id'] ?>', 'zmMonitorPreset<?php echo $monitor['Id'] ?>', 'monitorpreset' ); return( false );"><?php echo translate('Presets') ?></a>
       </div>
 <?php
-} // end if canEdit('Monitors')
+}
 ?>
       <h2><?php echo translate('Monitor') ?> - <?php echo validHtmlStr($monitor['Name']) ?><?php if ( !empty($monitor['Id']) ) { ?> (<?php echo $monitor['Id'] ?>)<?php } ?></h2>
     </div>
     <div id="content">
       <ul class="tabList">
 <?php
-foreach ( $tabs as $name=>$value ) {
-  if ( $tab == $name ) {
+  foreach ( $tabs as $name=>$value ) {
+    if ( $tab == $name ) {
 ?>
         <li class="active"><?php echo $value ?></li>
 <?php
-  } else {
+    } else {
 ?>
         <li><a href="#" onclick="submitTab( '<?php echo $name ?>' ); return( false );"><?php echo $value ?></a></li>
 <?php
-  }
+    }
 }
 ?>
       </ul>
@@ -522,7 +522,7 @@ foreach ( $tabs as $name=>$value ) {
         <input type="hidden" name="newMonitor[LinkedMonitors]" value="<?php echo isset($newMonitor['LinkedMonitors'])?$newMonitor['LinkedMonitors']:'' ?>"/>
         <input type="hidden" name="origMethod" value="<?php echo isset($newMonitor['Method'])?$newMonitor['Method']:'' ?>"/>
 <?php
-  if ( $tab != 'general' ) {
+    if ( $tab != 'general' ) {
 ?>
         <input type="hidden" name="newMonitor[Name]" value="<?php echo validHtmlStr($newMonitor['Name']) ?>"/>
         <input type="hidden" name="newMonitor[ServerId]" value="<?php echo validHtmlStr($newMonitor['ServerId']) ?>"/>
@@ -535,15 +535,15 @@ foreach ( $tabs as $name=>$value ) {
         <input type="hidden" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($newMonitor['MaxFPS']) ?>"/>
         <input type="hidden" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($newMonitor['AlarmMaxFPS']) ?>"/>
 <?php
-  if ( isset($newMonitor['Triggers']) ) {
-    foreach( $newMonitor['Triggers'] as $newTrigger ) {
+    if ( isset($newMonitor['Triggers']) ) {
+        foreach( $newMonitor['Triggers'] as $newTrigger ) {
 ?>
         <input type="hidden" name="newMonitor[Triggers][]" value="<?php echo validHtmlStr($newTrigger) ?>"/>
 <?php
+        }
     }
-  }
 }
-  if ( ZM_HAS_V4L && ($tab != 'source' || $newMonitor['Type'] != 'Local') ) {
+    if ( ZM_HAS_V4L && ($tab != 'source' || $newMonitor['Type'] != 'Local') ) {
 ?>
     <input type="hidden" name="newMonitor[Device]" value="<?php echo validHtmlStr($newMonitor['Device']) ?>"/>
     <input type="hidden" name="newMonitor[Channel]" value="<?php echo validHtmlStr($newMonitor['Channel']) ?>"/>
@@ -552,32 +552,32 @@ foreach ( $tabs as $name=>$value ) {
     <input type="hidden" name="newMonitor[V4LMultiBuffer]" value="<?php echo validHtmlStr($newMonitor['V4LMultiBuffer']) ?>"/>
     <input type="hidden" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo validHtmlStr($newMonitor['V4LCapturesPerFrame']) ?>"/>
 <?php
-  }
-  if ( $tab != 'source' || $newMonitor['Type'] != 'Remote' ) {
+    }
+    if ( $tab != 'source' || $newMonitor['Type'] != 'Remote' ) {
 ?>
     <input type="hidden" name="newMonitor[Protocol]" value="<?php echo validHtmlStr($newMonitor['Protocol']) ?>"/>
     <input type="hidden" name="newMonitor[Host]" value="<?php echo validHtmlStr($newMonitor['Host']) ?>"/>
     <input type="hidden" name="newMonitor[Port]" value="<?php echo validHtmlStr($newMonitor['Port']) ?>"/>
 <?php
-  }
-  if ( $tab != 'source' || ($newMonitor['Type'] != 'Local' && $newMonitor['Type'] != 'Remote' && $newMonitor['Type'] != 'Ffmpeg' && $newMonitor['Type'] != 'Libvlc') ) {
+    }
+    if ( $tab != 'source' || ($newMonitor['Type'] != 'Local' && $newMonitor['Type'] != 'Remote' && $newMonitor['Type'] != 'Ffmpeg' && $newMonitor['Type'] != 'Libvlc') ) {
 ?>
     <input type="hidden" name="newMonitor[Method]" value="<?php echo validHtmlStr($newMonitor['Method']) ?>"/>
 <?php
-  }
-  if ( $tab != 'source' || ($newMonitor['Type'] != 'Ffmpeg' && $newMonitor['Type'] != 'Libvlc' )) {
+    }
+    if ( $tab != 'source' || ($newMonitor['Type'] != 'Ffmpeg' && $newMonitor['Type'] != 'Libvlc' )) {
 ?>
     <input type="hidden" name="newMonitor[Options]" value="<?php echo validHtmlStr($newMonitor['Options']) ?>"/>
 <?php
-  }
-  if ( $tab != 'source' || ($newMonitor['Type'] != 'Remote' && $newMonitor['Type'] != 'File' && $newMonitor['Type'] != 'Ffmpeg' && $newMonitor['Type'] != 'Libvlc' && $newMonitor['Type'] != 'cURL') ) {
+    }
+    if ( $tab != 'source' || ($newMonitor['Type'] != 'Remote' && $newMonitor['Type'] != 'File' && $newMonitor['Type'] != 'Ffmpeg' && $newMonitor['Type'] != 'Libvlc' && $newMonitor['Type'] != 'cURL') ) {
 ?>
     <input type="hidden" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>"/>
     <input type="hidden" name="newMonitor[User]" value="<?php echo validHtmlStr($newMonitor['User']) ?>"/>
     <input type="hidden" name="newMonitor[Pass]" value="<?php echo validHtmlStr($newMonitor['Pass']) ?>"/>
 <?php
-  }
-  if ( $tab != 'source' ) {
+}
+if ( $tab != 'source' ) {
 ?>
     <input type="hidden" name="newMonitor[Colours]" value="<?php echo validHtmlStr($newMonitor['Colours']) ?>"/>
     <input type="hidden" name="newMonitor[Width]" value="<?php echo validHtmlStr($newMonitor['Width']) ?>"/>
@@ -585,29 +585,29 @@ foreach ( $tabs as $name=>$value ) {
     <input type="hidden" name="newMonitor[Orientation]" value="<?php echo validHtmlStr($newMonitor['Orientation']) ?>"/>
     <input type="hidden" name="newMonitor[Deinterlacing]" value="<?php echo validHtmlStr($newMonitor['Deinterlacing']) ?>"/>
 <?php
-  }
-  if ( $tab != 'storage' ) {
+}
+if ( $tab != 'storage' ) {
 ?>
     <input type="hidden" name="newMonitor[SaveJPEGs]" value="<?php echo validHtmlStr($newMonitor['SaveJPEGs']) ?>"/>
     <input type="hidden" name="newMonitor[VideoWriter]" value="<?php echo validHtmlStr($newMonitor['VideoWriter']) ?>"/>
     <input type="hidden" name="newMonitor[EncoderParameters]" value="<?php echo validHtmlStr($newMonitor['EncoderParameters']) ?>"/>
     <input type="hidden" name="newMonitor[RecordAudio]" value="<?php echo validHtmlStr($newMonitor['RecordAudio']) ?>"/>
 <?php
-  }
-  if ( $tab != 'source' || ($newMonitor['Type'] != 'Remote' && $newMonitor['Protocol'] != 'RTSP')) {
+}
+if ( $tab != 'source' || ($newMonitor['Type'] != 'Remote' && $newMonitor['Protocol'] != 'RTSP')) {
 ?>
     <input type="hidden" name="newMonitor[RTSPDescribe]" value="<?php echo validHtmlStr($newMonitor['RTSPDescribe']) ?>"/>
 <?php
-  }
-  if ( $tab != 'timestamp' ) {
+}
+if ( $tab != 'timestamp' ) {
 ?>
     <input type="hidden" name="newMonitor[LabelFormat]" value="<?php echo validHtmlStr($newMonitor['LabelFormat']) ?>"/>
     <input type="hidden" name="newMonitor[LabelX]" value="<?php echo validHtmlStr($newMonitor['LabelX']) ?>"/>
     <input type="hidden" name="newMonitor[LabelY]" value="<?php echo validHtmlStr($newMonitor['LabelY']) ?>"/>
     <input type="hidden" name="newMonitor[LabelSize]" value="<?php echo validHtmlStr($newMonitor['LabelSize']) ?>"/>
 <?php
-  }
-  if ( $tab != 'buffers' ) {
+}
+if ( $tab != 'buffers' ) {
 ?>
     <input type="hidden" name="newMonitor[ImageBufferCount]" value="<?php echo validHtmlStr($newMonitor['ImageBufferCount']) ?>"/>
     <input type="hidden" name="newMonitor[WarmupCount]" value="<?php echo validHtmlStr($newMonitor['WarmupCount']) ?>"/>
@@ -616,8 +616,8 @@ foreach ( $tabs as $name=>$value ) {
     <input type="hidden" name="newMonitor[StreamReplayBuffer]" value="<?php echo validHtmlStr($newMonitor['StreamReplayBuffer']) ?>"/>
     <input type="hidden" name="newMonitor[AlarmFrameCount]" value="<?php echo validHtmlStr($newMonitor['AlarmFrameCount']) ?>"/>
 <?php
-  }
-  if ( ZM_OPT_CONTROL && $tab != 'control' ) {
+}
+if ( ZM_OPT_CONTROL && $tab != 'control' ) {
 ?>
     <input type="hidden" name="newMonitor[Controllable]" value="<?php echo validHtmlStr($newMonitor['Controllable']) ?>"/>
     <input type="hidden" name="newMonitor[ControlId]" value="<?php echo validHtmlStr($newMonitor['ControlId']) ?>"/>
@@ -629,15 +629,15 @@ foreach ( $tabs as $name=>$value ) {
     <input type="hidden" name="newMonitor[ReturnLocation]" value="<?php echo validHtmlStr($newMonitor['ReturnLocation']) ?>"/>
     <input type="hidden" name="newMonitor[ReturnDelay]" value="<?php echo validHtmlStr($newMonitor['ReturnDelay']) ?>"/>
 <?php
-  }
-  if ( ZM_OPT_X10 && $tab != 'x10' ) {
+}
+if ( ZM_OPT_X10 && $tab != 'x10' ) {
 ?>
     <input type="hidden" name="newX10Monitor[Activation]" value="<?php echo validHtmlStr($newX10Monitor['Activation']) ?>"/>
     <input type="hidden" name="newX10Monitor[AlarmInput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmInput']) ?>"/>
     <input type="hidden" name="newX10Monitor[AlarmOutput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmOutput']) ?>"/>
 <?php
-  }
-  if ( $tab != 'misc' ) {
+}
+if ( $tab != 'misc' ) {
 ?>
     <input type="hidden" name="newMonitor[EventPrefix]" value="<?php echo validHtmlStr($newMonitor['EventPrefix']) ?>"/>
     <input type="hidden" name="newMonitor[SectionLength]" value="<?php echo validHtmlStr($newMonitor['SectionLength']) ?>"/>
@@ -651,32 +651,32 @@ foreach ( $tabs as $name=>$value ) {
     <input type="hidden" name="newMonitor[WebColour]" value="<?php echo validHtmlStr($newMonitor['WebColour']) ?>"/>
     <input type="hidden" name="newMonitor[Exif]" value="<?php echo validHtmlStr($newMonitor['Exif']) ?>"/>
 <?php
-  }
-  if ( ZM_HAS_V4L && ($tab != 'misc' || $newMonitor['Type'] != 'Local') ) {
+}
+if ( ZM_HAS_V4L && ($tab != 'misc' || $newMonitor['Type'] != 'Local') ) {
 ?>
     <input type="hidden" name="newMonitor[SignalCheckColour]" value="<?php echo validHtmlStr($newMonitor['SignalCheckColour']) ?>"/>
 <?php
-  }
+}
 ?>
-    <table id="contentTable" class="major" cellspacing="0">
-      <tbody>
+        <table id="contentTable" class="major" cellspacing="0">
+          <tbody>
 <?php
-  switch ( $tab ) {
+switch ( $tab ) {
     case 'general' :
-      {
+    {
 ?>
             <tr><td><?php echo translate('Name') ?></td><td><input type="text" name="newMonitor[Name]" value="<?php echo validHtmlStr($newMonitor['Name']) ?>" size="16"/></td></tr>
             <tr><td><?php echo translate('Server') ?></td><td>
 <?php 
-        $servers = array(''=>'None');
-        $result = dbQuery( 'SELECT * FROM Servers ORDER BY Name');
-        $results = $result->fetchALL(PDO::FETCH_CLASS | PDO::FETCH_PROPS_LATE, 'Server' );
-        foreach ( $results as $row => $server_obj ) {
-          $servers[$server_obj->Id] = $server_obj->Name();
-        }
-        echo buildSelect( "newMonitor[ServerId]", $servers );
- ?>
-              </td></tr>
+  $servers = array(''=>'None');
+  $result = dbQuery( 'SELECT * FROM Servers ORDER BY Name');
+  $results = $result->fetchALL(PDO::FETCH_CLASS | PDO::FETCH_PROPS_LATE, 'Server' );
+  foreach ( $results as $row => $server_obj ) {
+    $servers[$server_obj->Id] = $server_obj->Name();
+  }
+?>
+  <?php echo buildSelect( "newMonitor[ServerId]", $servers ); ?>
+</td></tr>
             <tr><td><?php echo translate('SourceType') ?></td><td><?php echo buildSelect( "newMonitor[Type]", $sourceTypes ); ?></td></tr>
             <tr><td><?php echo translate('Function') ?></td><td><select name="newMonitor[Function]">
 <?php
@@ -693,41 +693,42 @@ foreach ( $tabs as $name=>$value ) {
               <td>
                 <select name="monitorIds" size="4" multiple="multiple" onchange="updateLinkedMonitors( this )">
 <?php
-        $monitors = dbFetchAll( "select Id,Name from Monitors order by Sequence asc" );
-        if ( !empty($newMonitor['LinkedMonitors']) )
-          $monitorIds = array_flip( explode( ',', $newMonitor['LinkedMonitors'] ) );
-        else
-          $monitorIds = array();
-        foreach ( $monitors as $monitor ) {
-          if ( (empty($newMonitor['Id']) || ($monitor['Id'] != $newMonitor['Id'])) && visibleMonitor( $monitor['Id'] ) ) {
+    $monitors = dbFetchAll( "select Id,Name from Monitors order by Sequence asc" );
+    if ( !empty($newMonitor['LinkedMonitors']) )
+        $monitorIds = array_flip( explode( ',', $newMonitor['LinkedMonitors'] ) );
+    else
+        $monitorIds = array();
+    foreach ( $monitors as $monitor ) {
+        if ( (empty($newMonitor['Id']) || ($monitor['Id'] != $newMonitor['Id'])) && visibleMonitor( $monitor['Id'] ) ) {
 ?>
                   <option value="<?php echo $monitor['Id'] ?>"<?php if ( array_key_exists( $monitor['Id'], $monitorIds ) ) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($monitor['Name']) ?></option>
 <?php
-          }
         }
+    }
 ?>
                 </select>
               </td>
             </tr>
             <tr><td><?php echo translate('AnalysisFPS') ?></td><td><input type="text" name="newMonitor[AnalysisFPS]" value="<?php echo validHtmlStr($newMonitor['AnalysisFPS']) ?>" size="6"/></td></tr>
 <?php
-        if ( $newMonitor['Type'] != 'Local' && $newMonitor['Type'] != 'File' ) {
+    if ( $newMonitor['Type'] != 'Local' && $newMonitor['Type'] != 'File' ) {
 ?>
             <tr><td><?php echo translate('MaximumFPS') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_MAXFPS', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><input type="text" onclick="document.getElementById('newMonitor[MaxFPS]').innerHTML= ' CAUTION: See the help text'" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($newMonitor['MaxFPS']) ?>" size="5"/><span id="newMonitor[MaxFPS]" style="color:red"></span></td></tr>
             <tr><td><?php echo translate('AlarmMaximumFPS') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_MAXFPS', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><input type="text" onclick="document.getElementById('newMonitor[AlarmMaxFPS]').innerHTML= ' CAUTION: See the help text'" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($newMonitor['AlarmMaxFPS']) ?>" size="5"/><span id="newMonitor[AlarmMaxFPS]" style="color:red"></span></td></tr>
 <?php
-        } else {
+    } else {
 ?>
             <tr><td><?php echo translate('MaximumFPS') ?></td><td><input type="text" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($newMonitor['MaxFPS']) ?>" size="5"/></td></tr>
             <tr><td><?php echo translate('AlarmMaximumFPS') ?></td><td><input type="text" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($newMonitor['AlarmMaxFPS']) ?>" size="5"/></td></tr>
 <?php
-        }
-        if ( ZM_FAST_IMAGE_BLENDS ) {
+    }
+  if ( ZM_FAST_IMAGE_BLENDS )
+        {
 ?>
             <tr><td><?php echo translate('RefImageBlendPct') ?></td><td><select name="newMonitor[RefBlendPerc]"><?php foreach ( $fastblendopts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['RefBlendPerc'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
             <tr><td><?php echo translate('AlarmRefImageBlendPct') ?></td><td><select name="newMonitor[AlarmRefBlendPerc]"><?php foreach ( $fastblendopts_alarm as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['AlarmRefBlendPerc'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
 <?php
-        } else {
+  } else {
 ?>
             <tr><td><?php echo translate('RefImageBlendPct') ?></td><td><input type="text" name="newMonitor[RefBlendPerc]" value="<?php echo validHtmlStr($newMonitor['RefBlendPerc']) ?>" size="4"/></td></tr>
             <tr><td><?php echo translate('AlarmRefImageBlendPct') ?></td><td><input type="text" name="newMonitor[AlarmRefBlendPerc]" value="<?php echo validHtmlStr($newMonitor['AlarmRefBlendPerc']) ?>" size="4"/></td></tr>
@@ -741,14 +742,14 @@ foreach ( $tabs as $name=>$value ) {
         $breakCount = min( 3, $breakCount );
         $optCount = 0;
         foreach( $optTriggers as $optTrigger ) {
-          if ( !ZM_OPT_X10 && $optTrigger == 'X10' )
-            continue;
-          if ( $optCount && ($optCount%$breakCount == 0) )
-            echo '</br>';
+            if ( !ZM_OPT_X10 && $optTrigger == 'X10' )
+                continue;
+            if ( $optCount && ($optCount%$breakCount == 0) )
+                echo "</br>";
 ?>
               <input type="checkbox" name="newMonitor[Triggers][]" value="<?php echo $optTrigger ?>"<?php if ( isset($newMonitor['Triggers']) && in_array( $optTrigger, $newMonitor['Triggers'] ) ) { ?> checked="checked"<?php } ?>/>&nbsp;<?php echo $optTrigger ?>
 <?php
-          $optCount ++;
+            $optCount ++;
         }
         if ( !$optCount ) {
 ?>
@@ -759,51 +760,51 @@ foreach ( $tabs as $name=>$value ) {
             </td></tr>
 <?php
         break;
-      }
+    }
     case 'source' :
-      {
+    {
         if ( ZM_HAS_V4L && $newMonitor['Type'] == 'Local' ) {
 ?>
             <tr><td><?php echo translate('DevicePath') ?></td><td><input type="text" name="newMonitor[Device]" value="<?php echo validHtmlStr($newMonitor['Device']) ?>" size="24"/></td></tr>
             <tr><td><?php echo translate('CaptureMethod') ?></td><td><?php echo buildSelect( "newMonitor[Method]", $localMethods, "submitTab( '$tab' )" ); ?></td></tr>
 <?php
-          if ( ZM_HAS_V4L1 && $newMonitor['Method'] == 'v4l1' ) {
+            if ( ZM_HAS_V4L1 && $newMonitor['Method'] == 'v4l1' ) {
 ?>
             <tr><td><?php echo translate('DeviceChannel') ?></td><td><select name="newMonitor[Channel]"><?php foreach ( $v4l1DeviceChannels as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Channel'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
             <tr><td><?php echo translate('DeviceFormat') ?></td><td><select name="newMonitor[Format]"><?php foreach ( $v4l1DeviceFormats as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Format'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
             <tr><td><?php echo translate('CapturePalette') ?></td><td><select name="newMonitor[Palette]"><?php foreach ( $v4l1LocalPalettes as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Palette'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
 <?php
-          } else {
+            } else {
 ?>
             <tr><td><?php echo translate('DeviceChannel') ?></td><td><select name="newMonitor[Channel]"><?php foreach ( $v4l2DeviceChannels as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Channel'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
             <tr><td><?php echo translate('DeviceFormat') ?></td><td><select name="newMonitor[Format]"><?php foreach ( $v4l2DeviceFormats as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Format'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
             <tr><td><?php echo translate('CapturePalette') ?></td><td><select name="newMonitor[Palette]"><?php foreach ( $v4l2LocalPalettes as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Palette'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
 <?php
-          }
+            }
 ?>
-            <tr><td><?php echo translate('V4LMultiBuffer') ?></td><td>
-              <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]1" value="1" <?php echo ( $newMonitor['V4LMultiBuffer'] == 1 ? 'checked="checked"' : '' ) ?>/>
-              <label for="newMonitor[V4LMultiBuffer]1">Yes</label>
-              <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]0" value="0" <?php echo ( $newMonitor['V4LMultiBuffer'] == 0 ? 'checked="checked"' : '' ) ?>/>
-              <label for="newMonitor[V4LMultiBuffer]0">No</label>
-              <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]" value="" <?php echo ( empty($newMonitor['V4LMultiBuffer']) ? 'checked="checked"' : '' ) ?>/>
-              <label for="newMonitor[V4LMultiBuffer]">Use Config Value</label>
-            </td></tr>
-            <tr><td><?php echo translate('V4LCapturesPerFrame') ?></td><td><input type="number" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo $newMonitor['V4LCapturesPerFrame'] ?>"/></td></tr>
+      <tr><td><?php echo translate('V4LMultiBuffer') ?></td><td>
+        <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]1" value="1" <?php echo ( $newMonitor['V4LMultiBuffer'] == 1 ? 'checked="checked"' : '' ) ?>/>
+        <label for="newMonitor[V4LMultiBuffer]1">Yes</label>
+        <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]0" value="0" <?php echo ( $newMonitor['V4LMultiBuffer'] == 0 ? 'checked="checked"' : '' ) ?>/>
+        <label for="newMonitor[V4LMultiBuffer]0">No</label>
+        <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]" value="" <?php echo ( empty($newMonitor['V4LMultiBuffer']) ? 'checked="checked"' : '' ) ?>/>
+        <label for="newMonitor[V4LMultiBuffer]">Use Config Value</label>
+      </td></tr>
+      <tr><td><?php echo translate('V4LCapturesPerFrame') ?></td><td><input type="number" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo $newMonitor['V4LCapturesPerFrame'] ?>"/></td></tr>
 <?php
         } elseif ( $newMonitor['Type'] == 'Remote' ) {
 ?>
             <tr><td><?php echo translate('RemoteProtocol') ?></td><td><?php echo buildSelect( "newMonitor[Protocol]", $remoteProtocols, "updateMethods( this );if(this.value=='rtsp'){\$('RTSPDescribe').setStyle('display','table-row');}else{\$('RTSPDescribe').hide();}" ); ?></td></tr>
 <?php
-          if ( empty($newMonitor['Protocol']) || $newMonitor['Protocol'] == 'http' ) {
+            if ( empty($newMonitor['Protocol']) || $newMonitor['Protocol'] == 'http' ) {
 ?>
             <tr><td><?php echo translate('RemoteMethod') ?></td><td><?php echo buildSelect( 'newMonitor[Method]', $httpMethods ); ?></td></tr>
 <?php
-          } else {
+            } else {
 ?>
             <tr><td><?php echo translate('RemoteMethod') ?></td><td><?php echo buildSelect( 'newMonitor[Method]', $rtspMethods ); ?></td></tr>
 <?php
-          }
+            }
 ?>
             <tr><td><?php echo translate('RemoteHostName') ?></td><td><input type="text" name="newMonitor[Host]" value="<?php echo validHtmlStr($newMonitor['Host']) ?>" size="36"/></td></tr>
             <tr><td><?php echo translate('RemoteHostPort') ?></td><td><input type="text" name="newMonitor[Port]" value="<?php echo validHtmlStr($newMonitor['Port']) ?>" size="6"/></td></tr>
@@ -823,10 +824,7 @@ foreach ( $tabs as $name=>$value ) {
 ?>
             <tr><td><?php echo translate('SourcePath') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr>
             <tr><td><?php echo translate('RemoteMethod') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_RTSPTrans', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><?php echo buildSelect( "newMonitor[Method]", $rtspFFMpegMethods ); ?></td></tr>
-            <tr>
-              <td><?php echo translate('Options') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_'.strtoupper($newMonitor['Type']), 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td>
-              <td><input type="text" name="newMonitor[Options]" value="<?php echo validHtmlStr($newMonitor['Options']) ?>" size="36"/></td>
-            </tr>
+            <tr><td><?php echo translate('Options') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_'.strtoupper($newMonitor['Type']), 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><input type="text" name="newMonitor[Options]" value="<?php echo validHtmlStr($newMonitor['Options']) ?>" size="36"/></td></tr>
 <?php
         }
 ?>
@@ -855,9 +853,8 @@ foreach ( $tabs as $name=>$value ) {
 ?>
 <?php
         break;
-      }
-    case 'storage' :
-      {
+    }
+    case 'storage'   :
 ?>
             <tr><td><?php echo translate('SaveJPEGs') ?></td><td><select name="newMonitor[SaveJPEGs]"><?php foreach ( $savejpegopts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['SaveJPEGs'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
             <tr><td><?php echo translate('VideoWriter') ?></td><td><select name="newMonitor[VideoWriter]"><?php foreach ( $videowriteropts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['VideoWriter'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
@@ -865,9 +862,8 @@ foreach ( $tabs as $name=>$value ) {
             <tr><td><?php echo translate('RecordAudio') ?></td><td><input type="checkbox" name="newMonitor[RecordAudio]" value="1"<?php if ( !empty($newMonitor['RecordAudio']) ) { ?> checked="checked"<?php } ?>/></td></tr>
 <?php
         break;
-      }
     case 'timestamp' :
-      {
+    {
 ?>
             <tr><td><?php echo translate('TimestampLabelFormat') ?></td><td><input type="text" name="newMonitor[LabelFormat]" value="<?php echo validHtmlStr($newMonitor['LabelFormat']) ?>" size="32"/></td></tr>
             <tr><td><?php echo translate('TimestampLabelX') ?></td><td><input type="text" name="newMonitor[LabelX]" value="<?php echo validHtmlStr($newMonitor['LabelX']) ?>" size="4"/></td></tr>
@@ -875,9 +871,9 @@ foreach ( $tabs as $name=>$value ) {
             <tr><td><?php echo translate('TimestampLabelSize') ?></td><td><select name="newMonitor[LabelSize]"><?php foreach ( $label_size as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['LabelSize'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
 <?php
         break;
-      }
+    }
     case 'buffers' :
-      {
+    {
 ?>
             <tr><td><?php echo translate('ImageBufferSize') ?></td><td><input type="text" name="newMonitor[ImageBufferCount]" value="<?php echo validHtmlStr($newMonitor['ImageBufferCount']) ?>" size="6"/></td></tr>
             <tr><td><?php echo translate('WarmupFrames') ?></td><td><input type="text" name="newMonitor[WarmupCount]" value="<?php echo validHtmlStr($newMonitor['WarmupCount']) ?>" size="4"/></td></tr>
@@ -887,9 +883,9 @@ foreach ( $tabs as $name=>$value ) {
 <tr><td><?php echo translate('AlarmFrameCount') ?></td><td><input type="text" name="newMonitor[AlarmFrameCount]" value="<?php echo validHtmlStr($newMonitor['AlarmFrameCount']) ?>" size="4"/></td></tr>
 <?php
         break;
-      }
+    }
     case 'control' :
-      {
+    {
 ?>
             <tr><td><?php echo translate('Controllable') ?></td><td><input type="checkbox" name="newMonitor[Controllable]" value="1"<?php if ( !empty($newMonitor['Controllable']) ) { ?> checked="checked"<?php } ?>/></td></tr>
             <tr><td><?php echo translate('ControlType') ?></td><td><?php echo buildSelect( "newMonitor[ControlId]", $controlTypes, 'loadLocations( this )' ); ?><?php if ( canEdit( 'Control' ) ) { ?>&nbsp;<a href="#" onclick="createPopup( '?view=controlcaps', 'zmControlCaps', 'controlcaps' );"><?php echo translate('Edit') ?></a><?php } ?></td></tr>
@@ -909,18 +905,18 @@ foreach ( $tabs as $name=>$value ) {
             <tr><td><?php echo translate('ReturnDelay') ?></td><td><input type="text" name="newMonitor[ReturnDelay]" value="<?php echo validHtmlStr($newMonitor['ReturnDelay']) ?>" size="4"/></td></tr>
 <?php
         break;
-      }
+    }
     case 'x10' :
-      {
+    {
 ?>
             <tr><td><?php echo translate('X10ActivationString') ?></td><td><input type="text" name="newX10Monitor[Activation]" value="<?php echo validHtmlStr($newX10Monitor['Activation']) ?>" size="20"/></td></tr>
             <tr><td><?php echo translate('X10InputAlarmString') ?></td><td><input type="text" name="newX10Monitor[AlarmInput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmInput']) ?>" size="20"/></td></tr>
             <tr><td><?php echo translate('X10OutputAlarmString') ?></td><td><input type="text" name="newX10Monitor[AlarmOutput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmOutput']) ?>" size="20"/></td></tr>
 <?php
         break;
-      }
+    }
     case 'misc' :
-      {
+    {
 ?>
             <tr><td><?php echo translate('EventPrefix') ?></td><td><input type="text" name="newMonitor[EventPrefix]" value="<?php echo validHtmlStr($newMonitor['EventPrefix']) ?>" size="24"/></td></tr>
             <tr><td><?php echo translate('Sectionlength') ?></td><td><input type="text" name="newMonitor[SectionLength]" value="<?php echo validHtmlStr($newMonitor['SectionLength']) ?>" size="6"/></td></tr>
@@ -952,8 +948,8 @@ foreach ( $tabs as $name=>$value ) {
             <tr><td><?php echo translate('Exif') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_EXIF', 'zmOptionHelp', 'optionhelp', '?' ) ?>) </td><td><input type="checkbox" name="newMonitor[Exif]" value="1"<?php if ( !empty($newMonitor['Exif']) ) { ?> checked="checked"<?php } ?>/></td></tr>
 <?php
         break;
-      }
-  } // end switch tab
+    }
+} // end switch tab
 ?>
           </tbody>
         </table>

From bc32837e3abe7990f9b832b15eca5e3748222914 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 31 May 2017 13:55:21 -0400
Subject: [PATCH 30/56] fix braces

---
 src/zmu.cpp | 249 +++++++++++++++++-----------------------------------
 1 file changed, 80 insertions(+), 169 deletions(-)

diff --git a/src/zmu.cpp b/src/zmu.cpp
index 21b623c4b..c3a795ad4 100644
--- a/src/zmu.cpp
+++ b/src/zmu.cpp
@@ -95,8 +95,7 @@ Options for use with monitors:
 #include "zm_monitor.h"
 #include "zm_local_camera.h"
 
-void Usage( int status=-1 )
-{
+void Usage( int status=-1 ) {
   fprintf( stderr, "zmu <-d device_path> [-v] [function] [-U<username> -P<password>]\n" );
   fprintf( stderr, "zmu <-m monitor_id> [-v] [function] [-U<username> -P<password>]\n" );
   fprintf( stderr, "General options:\n" );
@@ -167,48 +166,38 @@ typedef enum {
   ZMU_LIST     = 0x10000000,
 } Function;
 
-bool ValidateAccess( User *user, int mon_id, int function )
-{
+bool ValidateAccess( User *user, int mon_id, int function ) {
   bool allowed = true;
-  if ( function & (ZMU_STATE|ZMU_IMAGE|ZMU_TIME|ZMU_READ_IDX|ZMU_WRITE_IDX|ZMU_FPS) )
-  {
+  if ( function & (ZMU_STATE|ZMU_IMAGE|ZMU_TIME|ZMU_READ_IDX|ZMU_WRITE_IDX|ZMU_FPS) ) {
     if ( user->getStream() < User::PERM_VIEW )
       allowed = false;
   }
-  if ( function & ZMU_EVENT )
-  {
+  if ( function & ZMU_EVENT ) {
     if ( user->getEvents() < User::PERM_VIEW )
       allowed = false;
   }
-  if ( function & (ZMU_ZONES|ZMU_QUERY|ZMU_LIST) )
-  {
+  if ( function & (ZMU_ZONES|ZMU_QUERY|ZMU_LIST) ) {
     if ( user->getMonitors() < User::PERM_VIEW )
       allowed = false;
   }
-  if ( function & (ZMU_ALARM|ZMU_NOALARM|ZMU_CANCEL|ZMU_RELOAD|ZMU_ENABLE|ZMU_DISABLE|ZMU_SUSPEND|ZMU_RESUME|ZMU_BRIGHTNESS|ZMU_CONTRAST|ZMU_HUE|ZMU_COLOUR) )
-  {
+  if ( function & (ZMU_ALARM|ZMU_NOALARM|ZMU_CANCEL|ZMU_RELOAD|ZMU_ENABLE|ZMU_DISABLE|ZMU_SUSPEND|ZMU_RESUME|ZMU_BRIGHTNESS|ZMU_CONTRAST|ZMU_HUE|ZMU_COLOUR) ) {
     if ( user->getMonitors() < User::PERM_EDIT )
       allowed = false;
   }
-  if ( mon_id > 0 )
-  {
-    if ( !user->canAccess( mon_id ) )
-    {
+  if ( mon_id > 0 ) {
+    if ( !user->canAccess( mon_id ) ) {
       allowed = false;
     }
   }
-  if ( !allowed )
-  {
+  if ( !allowed ) {
     fprintf( stderr, "Error, insufficient privileges for requested action\n" );
     exit( -1 );
   }
   return( allowed );
 }
 
-int main( int argc, char *argv[] )
-{
-  if ( access(ZM_CONFIG, R_OK) != 0 )
-  {
+int main( int argc, char *argv[] ) {
+  if ( access(ZM_CONFIG, R_OK) != 0 ) {
     fprintf( stderr, "Can't open %s: %s\n", ZM_CONFIG, strerror(errno) );
     exit( -1 );
   }
@@ -274,18 +263,15 @@ int main( int argc, char *argv[] )
   int v4lVersion = 1;
 #endif // ZM_HAS_V4L2/1
 #endif // ZM_HAS_V4L
-  while (1)
-  {
+  while (1) {
     int option_index = 0;
 
     int c = getopt_long (argc, argv, "d:m:vsEDLurwei::S:t::fz::ancqhlB::C::H::O::U:P:A:V:", long_options, &option_index);
-    if (c == -1)
-    {
+    if (c == -1) {
       break;
     }
 
-    switch (c)
-    {
+    switch (c) {
       case 'd':
         if ( optarg )
           device = optarg;
@@ -405,8 +391,7 @@ int main( int argc, char *argv[] )
     }
   }
 
-  if (optind < argc)
-  {
+  if (optind < argc) {
     fprintf( stderr, "Extraneous options, " );
     while (optind < argc)
       fprintf( stderr, "%s ", argv[optind++]);
@@ -414,13 +399,11 @@ int main( int argc, char *argv[] )
     Usage();
   }
 
-  if ( device && !(function&ZMU_QUERY) )
-  {
+  if ( device && !(function&ZMU_QUERY) ) {
     fprintf( stderr, "Error, -d option cannot be used with this option\n" );
     Usage();
   }
-  if ( scale != -1 && !(function&ZMU_IMAGE) )
-  {
+  if ( scale != -1 && !(function&ZMU_IMAGE) ) {
     fprintf( stderr, "Error, -S option cannot be used with this option\n" );
     Usage();
   }
@@ -435,46 +418,36 @@ int main( int argc, char *argv[] )
 
   User *user = 0;
 
-  if ( config.opt_use_auth )
-  {
-    if ( strcmp( config.auth_relay, "none" ) == 0 )
-    {
-      if ( !username )
-      {
+  if ( config.opt_use_auth ) {
+    if ( strcmp( config.auth_relay, "none" ) == 0 ) {
+      if ( !username ) {
         fprintf( stderr, "Error, username must be supplied\n" );
         exit( -1 );
       }
 
-      if ( username )
-      {
+      if ( username ) {
         user = zmLoadUser( username );
       }
-    }
-    else
-    {
-      if ( !(username && password) && !auth )
-      {
+    } else {
+      if ( !(username && password) && !auth ) {
         fprintf( stderr, "Error, username and password or auth string must be supplied\n" );
         exit( -1 );
       }
 
       //if ( strcmp( config.auth_relay, "hashed" ) == 0 )
       {
-        if ( auth )
-        {
+        if ( auth ) {
           user = zmLoadAuthUser( auth, false );
         }
       }
       //else if ( strcmp( config.auth_relay, "plain" ) == 0 )
       {
-        if ( username && password )
-        {
+        if ( username && password ) {
           user = zmLoadUser( username, password );
         }
       }
     }
-    if ( !user )
-    {
+    if ( !user ) {
       fprintf( stderr, "Error, unable to authenticate user\n" );
       exit( -1 );
     }
@@ -482,13 +455,10 @@ int main( int argc, char *argv[] )
   }
   
 
-  if ( mon_id > 0 )
-  {
+  if ( mon_id > 0 ) {
     Monitor *monitor = Monitor::Load( mon_id, function&(ZMU_QUERY|ZMU_ZONES), Monitor::QUERY );
-    if ( monitor )
-    {
-      if ( verbose )
-      {
+    if ( monitor ) {
+      if ( verbose ) {
         printf( "Monitor %d(%s)\n", monitor->Id(), monitor->Name() );
       }
       if ( ! monitor->connect() ) {
@@ -498,23 +468,19 @@ int main( int argc, char *argv[] )
 
       char separator = ' ';
       bool have_output = false;
-      if ( function & ZMU_STATE )
-      {
+      if ( function & ZMU_STATE ) {
         Monitor::State state = monitor->GetState();
         if ( verbose )
           printf( "Current state: %s\n", state==Monitor::ALARM?"Alarm":(state==Monitor::ALERT?"Alert":"Idle") );
-        else
-        {
+        else {
           if ( have_output ) printf( "%c", separator );
           printf( "%d", state );
           have_output = true;
         }
       }
-      if ( function & ZMU_TIME )
-      {
+      if ( function & ZMU_TIME ) {
         struct timeval timestamp = monitor->GetTimestamp( image_idx );
-        if ( verbose )
-        {
+        if ( verbose ) {
           char timestamp_str[64] = "None";
           if ( timestamp.tv_sec )
             strftime( timestamp_str, sizeof(timestamp_str), "%Y-%m-%d %H:%M:%S", localtime( &timestamp.tv_sec ) );
@@ -522,62 +488,50 @@ int main( int argc, char *argv[] )
             printf( "Time of last image capture: %s.%02ld\n", timestamp_str, timestamp.tv_usec/10000 );
           else
             printf( "Time of image %d capture: %s.%02ld\n", image_idx, timestamp_str, timestamp.tv_usec/10000 );
-        }
-        else
-        {
+        } else {
           if ( have_output ) printf( "%c", separator );
           printf( "%ld.%02ld", timestamp.tv_sec, timestamp.tv_usec/10000 );
           have_output = true;
         }
       }
-      if ( function & ZMU_READ_IDX )
-      {
+      if ( function & ZMU_READ_IDX ) {
         if ( verbose )
           printf( "Last read index: %d\n", monitor->GetLastReadIndex() );
-        else
-        {
+        else {
           if ( have_output ) printf( "%c", separator );
           printf( "%d", monitor->GetLastReadIndex() );
           have_output = true;
         }
       }
-      if ( function & ZMU_WRITE_IDX )
-      {
+      if ( function & ZMU_WRITE_IDX ) {
         if ( verbose )
           printf( "Last write index: %d\n", monitor->GetLastWriteIndex() );
-        else
-        {
+        else {
           if ( have_output ) printf( "%c", separator );
           printf( "%d", monitor->GetLastWriteIndex() );
           have_output = true;
         }
       }
-      if ( function & ZMU_EVENT )
-      {
+      if ( function & ZMU_EVENT ) {
         if ( verbose )
           printf( "Last event id: %d\n", monitor->GetLastEvent() );
-        else
-        {
+        else {
           if ( have_output ) printf( "%c", separator );
           printf( "%d", monitor->GetLastEvent() );
           have_output = true;
         }
       }
-      if ( function & ZMU_FPS )
-      {
+      if ( function & ZMU_FPS ) {
         if ( verbose )
           printf( "Current capture rate: %.2f frames per second\n", monitor->GetFPS() );
-        else
-        {
+        else {
           if ( have_output ) printf( "%c", separator );
           printf( "%.2f", monitor->GetFPS() );
           have_output = true;
         }
       }
-      if ( function & ZMU_IMAGE )
-      {
-        if ( verbose )
-        {
+      if ( function & ZMU_IMAGE ) {
+        if ( verbose ) {
           if ( image_idx == -1 )
             printf( "Dumping last image captured to Monitor%d.jpg", monitor->Id() );
           else
@@ -588,77 +542,63 @@ int main( int argc, char *argv[] )
         }
         monitor->GetImage( image_idx, scale>0?scale:100 );
       }
-      if ( function & ZMU_ZONES )
-      {
+      if ( function & ZMU_ZONES ) {
         if ( verbose )
           printf( "Dumping zone image to Zones%d.jpg\n", monitor->Id() );
         monitor->DumpZoneImage( zoneString );
       }
-      if ( function & ZMU_ALARM )
-      {
+      if ( function & ZMU_ALARM ) {
         if ( verbose )
           printf( "Forcing alarm on\n" );
         monitor->ForceAlarmOn( config.forced_alarm_score, "Forced Web" );
       }
-      if ( function & ZMU_NOALARM )
-      {
+      if ( function & ZMU_NOALARM ) {
         if ( verbose )
           printf( "Forcing alarm off\n" );
         monitor->ForceAlarmOff();
       }
-      if ( function & ZMU_CANCEL )
-      {
+      if ( function & ZMU_CANCEL ) {
         if ( verbose )
           printf( "Cancelling forced alarm on/off\n" );
         monitor->CancelForced();
       }
-      if ( function & ZMU_RELOAD )
-      {
+      if ( function & ZMU_RELOAD ) {
         if ( verbose )
           printf( "Reloading monitor settings\n" );
         monitor->actionReload();
       }
-      if ( function & ZMU_ENABLE )
-      {
+      if ( function & ZMU_ENABLE ) {
         if ( verbose )
           printf( "Enabling event generation\n" );
         monitor->actionEnable();
       }
-      if ( function & ZMU_DISABLE )
-      {
+      if ( function & ZMU_DISABLE ) {
         if ( verbose )
           printf( "Disabling event generation\n" );
         monitor->actionDisable();
       }
-      if ( function & ZMU_SUSPEND )
-      {
+      if ( function & ZMU_SUSPEND ) {
         if ( verbose )
           printf( "Suspending event generation\n" );
         monitor->actionSuspend();
       }
-      if ( function & ZMU_RESUME )
-      {
+      if ( function & ZMU_RESUME ) {
         if ( verbose )
           printf( "Resuming event generation\n" );
         monitor->actionResume();
       }
-      if ( function & ZMU_QUERY )
-      {
+      if ( function & ZMU_QUERY ) {
         char monString[16382] = "";
         monitor->DumpSettings( monString, verbose );
         printf( "%s\n", monString );
       }
-      if ( function & ZMU_BRIGHTNESS )
-      {
-        if ( verbose )
-        {
+      if ( function & ZMU_BRIGHTNESS ) {
+        if ( verbose ) {
           if ( brightness >= 0 )
             printf( "New brightness: %d\n", monitor->actionBrightness( brightness ) );
           else
             printf( "Current brightness: %d\n", monitor->actionBrightness() );
-        }
-        else
-        {
+        } else {
           if ( have_output ) printf( "%c", separator );
           if ( brightness >= 0 )
             printf( "%d", monitor->actionBrightness( brightness ) );
@@ -667,17 +607,13 @@ int main( int argc, char *argv[] )
           have_output = true;
         }
       }
-      if ( function & ZMU_CONTRAST )
-      {
-        if ( verbose )
-        {
+      if ( function & ZMU_CONTRAST ) {
+        if ( verbose ) {
           if ( contrast >= 0 )
             printf( "New brightness: %d\n", monitor->actionContrast( contrast ) );
           else
             printf( "Current contrast: %d\n", monitor->actionContrast() );
-        }
-        else
-        {
+        } else {
           if ( have_output ) printf( "%c", separator );
           if ( contrast >= 0 )
             printf( "%d", monitor->actionContrast( contrast ) );
@@ -686,17 +622,13 @@ int main( int argc, char *argv[] )
           have_output = true;
         }
       }
-      if ( function & ZMU_HUE )
-      {
-        if ( verbose )
-        {
+      if ( function & ZMU_HUE ) {
+        if ( verbose ) {
           if ( hue >= 0 )
             printf( "New hue: %d\n", monitor->actionHue( hue ) );
           else
             printf( "Current hue: %d\n", monitor->actionHue() );
-        }
-        else
-        {
+        } else {
           if ( have_output ) printf( "%c", separator );
           if ( hue >= 0 )
             printf( "%d", monitor->actionHue( hue ) );
@@ -705,17 +637,13 @@ int main( int argc, char *argv[] )
           have_output = true;
         }
       }
-      if ( function & ZMU_COLOUR )
-      {
-        if ( verbose )
-        {
+      if ( function & ZMU_COLOUR ) {
+        if ( verbose ) {
           if ( colour >= 0 )
             printf( "New colour: %d\n", monitor->actionColour( colour ) );
           else
             printf( "Current colour: %d\n", monitor->actionColour() );
-        }
-        else
-        {
+        } else {
           if ( have_output ) printf( "%c", separator );
           if ( colour >= 0 )
             printf( "%d", monitor->actionColour( colour ) );
@@ -724,26 +652,19 @@ int main( int argc, char *argv[] )
           have_output = true;
         }
       }
-      if ( have_output )
-      {
+      if ( have_output ) {
         printf( "\n" );
       }
-      if ( !function )
-      {
+      if ( !function ) {
         Usage();
       }
       delete monitor;
-    }
-    else
-    {
+    } else {
       fprintf( stderr, "Error, invalid monitor id %d\n", mon_id );
       exit( -1 );
     }
-  }
-  else
-  {
-    if ( function & ZMU_QUERY )
-    {
+  } else {
+    if ( function & ZMU_QUERY ) {
 #if ZM_HAS_V4L
       char vidString[0x10000] = "";
       bool ok = LocalCamera::GetCurrentSettings( device, vidString, v4lVersion, verbose );
@@ -755,24 +676,20 @@ int main( int argc, char *argv[] )
 #endif // ZM_HAS_V4L
     }
 
-    if ( function & ZMU_LIST )
-    {
+    if ( function & ZMU_LIST ) {
       std::string sql = "select Id, Function+0 from Monitors";
-      if ( !verbose )
-      {
+      if ( !verbose ) {
         sql += "where Function != 'None'";
       }
       sql += " order by Id asc";
 
-      if ( mysql_query( &dbconn, sql.c_str() ) )
-      {
+      if ( mysql_query( &dbconn, sql.c_str() ) ) {
         Error( "Can't run query: %s", mysql_error( &dbconn ) );
         exit( mysql_errno( &dbconn ) );
       }
 
       MYSQL_RES *result = mysql_store_result( &dbconn );
-      if ( !result )
-      {
+      if ( !result ) {
         Error( "Can't use query result: %s", mysql_error( &dbconn ) );
         exit( mysql_errno( &dbconn ) );
       }
@@ -780,17 +697,13 @@ int main( int argc, char *argv[] )
       Debug( 1, "Got %d monitors", n_monitors );
 
       printf( "%4s%5s%6s%9s%14s%6s%6s%8s%8s\n", "Id", "Func", "State", "TrgState", "LastImgTim", "RdIdx", "WrIdx", "LastEvt", "FrmRate" );
-      for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ )
-      {
+      for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ ) {
         int mon_id = atoi(dbrow[0]);
         int function = atoi(dbrow[1]);
-        if ( !user || user->canAccess( mon_id ) )
-        {
-          if ( function > 1 )
-          {
+        if ( !user || user->canAccess( mon_id ) ) {
+          if ( function > 1 ) {
             Monitor *monitor = Monitor::Load( mon_id, false, Monitor::QUERY );
-            if ( monitor && monitor->connect() )
-            {
+            if ( monitor && monitor->connect() ) {
               struct timeval tv = monitor->GetTimestamp();
               printf( "%4d%5d%6d%9d%11ld.%02ld%6d%6d%8d%8.2f\n",
                 monitor->Id(),
@@ -805,9 +718,7 @@ int main( int argc, char *argv[] )
               );
               delete monitor;
             }
-          }
-          else
-          {
+          } else {
             struct timeval tv = { 0, 0 };
             printf( "%4d%5d%6d%9d%11ld.%02ld%6d%6d%8d%8.2f\n",
               mon_id,

From a7ca9bf2121bcdadcaa63c285b2348fa4755949f Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Wed, 31 May 2017 15:28:05 -0500
Subject: [PATCH 31/56] Update startpackpack.sh

spelling typo
---
 utils/packpack/startpackpack.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/packpack/startpackpack.sh b/utils/packpack/startpackpack.sh
index 51b6c4a58..e50579525 100755
--- a/utils/packpack/startpackpack.sh
+++ b/utils/packpack/startpackpack.sh
@@ -46,7 +46,7 @@ commonprep () {
         echo "Checking packpack github repo for changes..."
         git -C packpack pull origin master
     else
-        echo "Cloning pakcpack github repo..."
+        echo "Cloning packpack github repo..."
         git clone https://github.com/packpack/packpack.git packpack
     fi
 

From c555ea0f7601d71fcb0e6f1ef4ed9f3fb8d464a4 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Wed, 31 May 2017 15:53:06 -0500
Subject: [PATCH 32/56] Update .travis.yml

ensure sed is installed in the Travis environment
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index cd9a44b9a..e9a5116ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,7 @@ addons:
     - git
     - curl
     - sshfs
+    - sed
 env:
   matrix:
   - OS=el DIST=6

From 106a8ab7208ce7805727a21e1321803126936b72 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Wed, 31 May 2017 19:00:17 -0500
Subject: [PATCH 33/56] Update startpackpack.sh

add debug lines for troubleshooting
---
 utils/packpack/startpackpack.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/utils/packpack/startpackpack.sh b/utils/packpack/startpackpack.sh
index e50579525..9f010d190 100755
--- a/utils/packpack/startpackpack.sh
+++ b/utils/packpack/startpackpack.sh
@@ -117,6 +117,11 @@ installtrusty () {
 # This sets the naming convention for the deb packages
 setdebpkgver () {
 
+    # DEBUG
+    git describe --long --always
+    sed -n 's/^\([0-9\.]*\)-\([0-9]*\)-\([a-z0-9]*\)/\1/p')
+    sed -n 's/^\([0-9\.]*\)-\([0-9]*\)-\([a-z0-9]*\)/\2/p')
+    
     # Set VERSION to x.xx.x+x e.g. 1.30.2+15
     # the last x is number of commits since release
     # Creates zoneminder packages in the format: zoneminder-{version}-{release}

From 85c19532cfd40a834b8d32515dc42e24ff18a277 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <zonexpertconsulting@outlook.com>
Date: Wed, 31 May 2017 19:04:14 -0500
Subject: [PATCH 34/56] Update startpackpack.sh

fix copy/paste error
---
 utils/packpack/startpackpack.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/packpack/startpackpack.sh b/utils/packpack/startpackpack.sh
index 9f010d190..d5ca7ff71 100755
--- a/utils/packpack/startpackpack.sh
+++ b/utils/packpack/startpackpack.sh
@@ -119,8 +119,8 @@ setdebpkgver () {
 
     # DEBUG
     git describe --long --always
-    sed -n 's/^\([0-9\.]*\)-\([0-9]*\)-\([a-z0-9]*\)/\1/p')
-    sed -n 's/^\([0-9\.]*\)-\([0-9]*\)-\([a-z0-9]*\)/\2/p')
+    git describe --long --always | sed -n 's/^\([0-9\.]*\)-\([0-9]*\)-\([a-z0-9]*\)/\1/p'
+    git describe --long --always | sed -n 's/^\([0-9\.]*\)-\([0-9]*\)-\([a-z0-9]*\)/\2/p'
     
     # Set VERSION to x.xx.x+x e.g. 1.30.2+15
     # the last x is number of commits since release

From 2eabf13eaf05fc18cbbcaec84bb55cdf2e2c2e15 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 31 May 2017 20:44:13 -0400
Subject: [PATCH 35/56] handle deprecations, make some logic more clear

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

diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index 4c7f4cff0..b296b6fca 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -167,11 +167,8 @@ int FfmpegCamera::Capture( Image &image )
     Debug( 5, "Got packet from stream %d dts (%d) pts(%d)", packet.stream_index, packet.pts, packet.dts );
     // What about audio stream? Maybe someday we could do sound detection...
     if ( packet.stream_index == mVideoStreamId ) {
-#if LIBAVCODEC_VERSION_CHECK(52, 23, 0, 23, 0)
-      if (avcodec_decode_video2(mVideoCodecContext, mRawFrame, &frameComplete, &packet) < 0)
-#else
-      if (avcodec_decode_video(mVideoCodecContext, mRawFrame, &frameComplete, packet.data, packet.size) < 0)
-#endif
+      int ret = zm_avcodec_decode_video( mVideoCodecContext, mRawFrame, &frameComplete, &packet );
+      if ( ret < 0 )
         Fatal( "Unable to decode frame at frame %d", frameCount );
 
       Debug( 4, "Decoded video packet at frame %d", frameCount );
@@ -639,6 +636,7 @@ int FfmpegCamera::CaptureAndRecord( Image &image, timeval recording, char* event
         unsigned int packet_count = 0;
         ZMPacket *queued_packet;
 
+        // Clear all packets that predate the moment when the recording began
         packetqueue.clear_unwanted_packets( &recording, mVideoStreamId );
 
         while ( ( queued_packet = packetqueue.popPacket() ) ) {
@@ -673,7 +671,7 @@ int FfmpegCamera::CaptureAndRecord( Image &image, timeval recording, char* event
 
       // Buffer video packets, since we are not recording.
       // All audio packets are keyframes, so only if it's a video keyframe
-      if ( packet.stream_index == mVideoStreamId) {
+      if ( packet.stream_index == mVideoStreamId ) {
         if ( key_frame ) {
           Debug(3, "Clearing queue");
           packetqueue.clearQueue( monitor->GetPreEventCount(), mVideoStreamId );
@@ -688,18 +686,19 @@ else if ( packet.pts && video_last_pts > packet.pts ) {
         }
 #endif
       } 
-
-      if ( 
-          ( packet.stream_index != mAudioStreamId || record_audio ) 
-          &&
-          ( key_frame || packetqueue.size() )
-         ) {
-        packetqueue.queuePacket( &packet );
+ 
+      // The following lines should ensure that the queue always begins with a video keyframe
+      if ( packet.stream_index == mAudioStreamId ) {
+        if ( record_audio && packetqueue.size() ) // if it's audio, and we are doing audio, and there is already something in the queue
+          packetqueue.queuePacket( &packet );
+      } else if ( packet.stream_index == mVideoStreamId ) {
+        if ( key_frame || packetqueue.size() ) // it's a keyframe or we already have something in the queue
+          packetqueue.queuePacket( &packet );
       }
     } // end if recording or not
 
     if ( packet.stream_index == mVideoStreamId ) {
-       if ( videoStore ) {
+      if ( videoStore ) {
         //Write the packet to our video store
         int ret = videoStore->writeVideoFramePacket( &packet );
         if ( ret < 0 ) { //Less than zero and we skipped a frame

From a6421a9126b1f508b2c13f6a76532c13c092ea3d Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 31 May 2017 20:44:23 -0400
Subject: [PATCH 36/56] handle deprecations

---
 src/zm_videostore.cpp | 75 ++++++++++++++++++++-----------------------
 1 file changed, 35 insertions(+), 40 deletions(-)

diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 99b521c3c..0f7892f80 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -82,28 +82,36 @@ VideoStore::VideoStore(const char *filename_in, const char *format_in,
   if (dsr < 0) Warning("%s:%d: title set failed", __FILE__, __LINE__ );
 
   oc->metadata = pmetadata;
-
   output_format = oc->oformat;
+  Debug(2, "setting parameters");
 
+#if LIBAVCODEC_VERSION_CHECK(58, 0, 0, 0, 0)
+  AVCodec *codec = avcodec_find_decoder( video_input_stream->codecpar->codec_id );
+  video_output_context = avcodec_alloc_context3( codec );
+  ret = avcodec_parameters_to_context( video_output_context, video_input_stream->codecpar );
+  if ( ret < 0 ) {
+    Error( "Could not initialize stream parameteres");
+    return;
+  } else {
+    Debug(2, "Success setting parameters");
+  }
+  if ( avcodec_open2( video_output_context, codec, NULL ) < 0 ) {
+    Fatal("Unable to open video out codec\n");
+  }
+  video_output_stream = avformat_new_stream( oc, codec );
+  if (!video_output_stream) {
+    Fatal("Unable to create video out stream\n");
+  } else {
+    Debug(2, "Success creating video out stream" );
+  }
+#else
   video_output_stream = avformat_new_stream(oc, (AVCodec*)video_input_context->codec);
   if (!video_output_stream) {
     Fatal("Unable to create video out stream\n");
   } else {
     Debug(2, "Success creating video out stream" );
   }
-
   video_output_context = video_output_stream->codec;
-
-#if LIBAVCODEC_VERSION_CHECK(58, 0, 0, 0, 0)
-  Debug(2, "setting parameters");
-  ret = avcodec_parameters_to_context( video_output_context, video_input_stream->codecpar );
-  if ( ret < 0 ) {
-    Error( "Could not initialize stream parameteres");
-    return;
-  } else {
-    Debug(2, "Success getting parameters");
-  }
-#else
   ret = avcodec_copy_context(video_output_context, video_input_context );
   if (ret < 0) { 
     Fatal("Unable to copy input video context to output video context %s\n", 
@@ -145,6 +153,7 @@ VideoStore::VideoStore(const char *filename_in, const char *format_in,
   }
 
 	Monitor::Orientation orientation = monitor->getOrientation();
+    Debug(3, "Have orientation" );
   if ( orientation ) {
     if ( orientation == Monitor::ROTATE_0 ) {
 
@@ -170,6 +179,7 @@ VideoStore::VideoStore(const char *filename_in, const char *format_in,
 #endif
 
   if (audio_input_stream) {
+    Debug(3, "Have audio stream" );
     audio_input_context = audio_input_stream->codec;
 
     if ( audio_input_context->codec_id != AV_CODEC_ID_AAC ) {
@@ -187,9 +197,13 @@ VideoStore::VideoStore(const char *filename_in, const char *format_in,
         Error("Unable to create audio out stream\n");
         audio_output_stream = NULL;
       } else {
+        Debug(2, "setting parameters");
         audio_output_context = audio_output_stream->codec;
-
+#if LIBAVCODEC_VERSION_CHECK(57, 0, 0, 0, 0)
+        ret = avcodec_parameters_to_context( audio_output_context, audio_input_stream->codecpar );
+#else
         ret = avcodec_copy_context(audio_output_context, audio_input_context);
+#endif
         if (ret < 0) {
           Error("Unable to copy audio context %s\n", av_make_error_string(ret).c_str());
           audio_output_stream = NULL;
@@ -233,7 +247,8 @@ VideoStore::VideoStore(const char *filename_in, const char *format_in,
   //av_dict_set(&opts, "movflags", "frag_custom+dash+delay_moov", 0);
   //av_dict_set(&opts, "movflags", "frag_custom+dash+delay_moov", 0);
   //av_dict_set(&opts, "movflags", "frag_keyframe+empty_moov+default_base_moof", 0);
-  if ((ret = avformat_write_header(oc, &opts)) < 0) {
+  if ((ret = avformat_write_header(oc, NULL)) < 0) {
+  //if ((ret = avformat_write_header(oc, &opts)) < 0) {
     Warning("Unable to set movflags to frag_custom+dash+delay_moov");
     /* Write the stream header, if any. */
     ret = avformat_write_header(oc, NULL);
@@ -262,14 +277,14 @@ VideoStore::~VideoStore(){
   if ( audio_output_codec ) {
     // Do we need to flush the outputs?  I have no idea.
     AVPacket pkt;
-    int got_packet;
+    int got_packet = 0;
     av_init_packet(&pkt);
     pkt.data = NULL;
     pkt.size = 0;
     int64_t size;
 
     while(1) {
-#if LIBAVCODEC_VERSION_CHECK(58, 0, 0, 0, 0)
+#if LIBAVCODEC_VERSION_CHECK(57, 0, 0, 0, 0)
       ret = avcodec_receive_packet( audio_output_context, &pkt );
 #else
       ret = avcodec_encode_audio2( audio_output_context, &pkt, NULL, &got_packet );
@@ -677,7 +692,7 @@ int VideoStore::writeAudioFramePacket( AVPacket *ipkt ) {
   if ( audio_output_codec ) {
 #ifdef HAVE_LIBAVRESAMPLE
 
-#if 0
+#if LIBAVCODEC_VERSION_CHECK(57, 0, 0, 0, 0)
     ret = avcodec_send_packet( audio_input_context, ipkt );
     if ( ret < 0 ) {
       Error("avcodec_send_packet fail %s", av_make_error_string(ret).c_str());
@@ -696,26 +711,7 @@ int VideoStore::writeAudioFramePacket( AVPacket *ipkt ) {
         input_frame->channel_layout,
         audio_output_context->refcounted_frames
         );
-
-    ret = avcodec_send_frame( audio_output_context, input_frame );
-    if ( ret < 0 ) {
-      av_frame_unref( input_frame );
-      Error("avcodec_send_frame fail(%d),  %s codec is open(%d) is_encoder(%d)", ret, av_make_error_string(ret).c_str(),
-          avcodec_is_open( audio_output_context ),
-          av_codec_is_encoder( audio_output_context->codec)
-          );
-      return 0;
-    }
-    ret = avcodec_receive_packet( audio_output_context, &opkt );
-    if ( ret < 0 ) {
-      av_frame_unref( input_frame );
-      Error("avcodec_receive_packet fail %s", av_make_error_string(ret).c_str());
-      return 0;
-    }
-    av_frame_unref( input_frame );
 #else
-
-
     /**
      * Decode the audio frame stored in the packet.
      * The input audio stream decoder is used to do this.
@@ -736,7 +732,7 @@ int VideoStore::writeAudioFramePacket( AVPacket *ipkt ) {
       zm_av_packet_unref(&opkt);
       return 0;
     }
-
+#endif
     int frame_size = input_frame->nb_samples;
     Debug(4, "Frame size: %d", frame_size );
 
@@ -778,7 +774,7 @@ int VideoStore::writeAudioFramePacket( AVPacket *ipkt ) {
      * Encode the audio frame and store it in the temporary packet.
      * The output audio stream encoder is used to do this.
      */
-#if LIBAVCODEC_VERSION_CHECK(58, 0, 0, 0, 0)
+#if LIBAVCODEC_VERSION_CHECK(57, 0, 0, 0, 0)
     if (( ret = avcodec_receive_packet( audio_output_context, &opkt )) < 0 ) {
 #else
     if (( ret = avcodec_encode_audio2( audio_output_context, &opkt, output_frame, &data_present )) < 0) {
@@ -794,7 +790,6 @@ int VideoStore::writeAudioFramePacket( AVPacket *ipkt ) {
       return 0;
     }
 
-#endif
 #endif
   } else {
     av_init_packet(&opkt);

From 98b3621681986e70c47cb76a5d2cc05e18f712cf Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 31 May 2017 20:44:43 -0400
Subject: [PATCH 37/56] add Debug, and fix logic deleting frames before the
 appropriate keyframe

---
 src/zm_packetqueue.cpp | 39 +++++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/zm_packetqueue.cpp b/src/zm_packetqueue.cpp
index f60b11df5..d4520caba 100644
--- a/src/zm_packetqueue.cpp
+++ b/src/zm_packetqueue.cpp
@@ -60,14 +60,12 @@ ZMPacket* zm_packetqueue::popPacket( ) {
 
 unsigned int zm_packetqueue::clearQueue( unsigned int frames_to_keep, int stream_id ) {
   
-  Debug(3, "Clearing all but %d frames", frames_to_keep );
+  Debug(3, "Clearing all but %d frames, queue has %d", frames_to_keep, pktQueue.size() );
   frames_to_keep += 1;
 
 	if ( pktQueue.empty() ) {
     Debug(3, "Queue is empty");
     return 0;
-  } else {
-    Debug(3, "Queue has (%d)", pktQueue.size() );
   }
 
   list<ZMPacket *>::reverse_iterator it;
@@ -77,18 +75,19 @@ unsigned int zm_packetqueue::clearQueue( unsigned int frames_to_keep, int stream
     ZMPacket *zm_packet = *it;
     AVPacket *av_packet = &(zm_packet->packet);
        
-    Debug(3, "Looking at packet with stream index (%d) with keyframe (%d), frames_to_keep is (%d)", av_packet->stream_index, ( av_packet->flags & AV_PKT_FLAG_KEY ), frames_to_keep );
+    Debug(4, "Looking at packet with stream index (%d) with keyframe (%d), frames_to_keep is (%d)", av_packet->stream_index, ( av_packet->flags & AV_PKT_FLAG_KEY ), frames_to_keep );
     
     // Want frames_to_keep video keyframes.  Otherwise, we may not have enough
     if ( ( av_packet->stream_index == stream_id) && ( av_packet->flags & AV_PKT_FLAG_KEY ) ) {
-      if (!frames_to_keep)
-        break;
       frames_to_keep --;
     }
   }
+  if ( frames_to_keep ) {
+    Debug(3, "Hit end of queue, still need (%d) video keyframes", frames_to_keep );
+  }
   unsigned int delete_count = 0;
   while ( it != pktQueue.rend() ) {
-    Debug(3, "Deleting a packet from the front, count is (%d)", delete_count );
+    Debug(4, "Deleting a packet from the front, count is (%d)", delete_count );
 
     packet = pktQueue.front();
     pktQueue.pop_front();
@@ -96,6 +95,7 @@ unsigned int zm_packetqueue::clearQueue( unsigned int frames_to_keep, int stream
 
     delete_count += 1;
   }    
+  Debug(3, "Deleted (%d) packets", delete_count );
   return delete_count; 
 } // end unsigned int zm_packetqueue::clearQueue( unsigned int frames_to_keep, int stream_id )
 
@@ -123,10 +123,10 @@ void zm_packetqueue::clear_unwanted_packets( timeval *recording_started, int mVi
   // Step 2 - pop packets until we get to the packet in step 2
   list<ZMPacket *>::reverse_iterator it;
 
+  Debug(3, "Looking for keyframe after start recording stream id (%d)", mVideoStreamId );
   for ( it = pktQueue.rbegin(); it != pktQueue.rend(); ++ it ) {
     ZMPacket *zm_packet = *it;
     AVPacket *av_packet = &(zm_packet->packet);
-Debug(1, "Looking for keyframe after start" );
     if ( 
         ( av_packet->flags & AV_PKT_FLAG_KEY ) 
         && 
@@ -134,7 +134,7 @@ Debug(1, "Looking for keyframe after start" );
         && 
         timercmp( &(zm_packet->timestamp), recording_started, < )
        ) {
-Debug(1, "Found keyframe before start" );
+    Debug(3, "Found keyframe before start with stream index (%d) with keyframe (%d)", av_packet->stream_index, ( av_packet->flags & AV_PKT_FLAG_KEY ) );
       break;
     }
   }
@@ -143,10 +143,29 @@ Debug(1, "Found keyframe before start" );
     return;
   }
 
+  ZMPacket *zm_packet = *it;
+  AVPacket *av_packet = &(zm_packet->packet);
+  Debug(3, "Found packet before start with stream index (%d) with keyframe (%d), distance(%d), size(%d)", 
+      av_packet->stream_index, 
+      ( av_packet->flags & AV_PKT_FLAG_KEY ), 
+      distance( it, pktQueue.rend() ),
+      pktQueue.size() );
+
+  unsigned int deleted_frames = 0;
   ZMPacket *packet = NULL;
-  while ( pktQueue.rend() != it ) {
+  while ( distance( it, pktQueue.rend() ) > 1 ) {
+  //while ( pktQueue.rend() != it ) {
     packet = pktQueue.front();
     pktQueue.pop_front();
     delete packet;
+    deleted_frames += 1;
+  }
+
+  zm_packet = pktQueue.front();
+  av_packet = &(zm_packet->packet);
+  if ( ( ! ( av_packet->flags & AV_PKT_FLAG_KEY ) ) || ( av_packet->stream_index != mVideoStreamId ) ) {
+    Error( "Done looking for keyframe.  Deleted %d frames. Remaining frames in queue: %d stream of head packet is (%d), keyframe (%d), distance(%d), packets(%d)", deleted_frames, pktQueue.size(), av_packet->stream_index, ( av_packet->flags & AV_PKT_FLAG_KEY ), distance( it, pktQueue.rend() ), pktQueue.size() );
+  } else {
+    Debug(1, "Done looking for keyframe.  Deleted %d frames. Remaining frames in queue: %d stream of head packet is (%d), keyframe (%d), distance(%d), packets(%d)", deleted_frames, pktQueue.size(), av_packet->stream_index, ( av_packet->flags & AV_PKT_FLAG_KEY ), distance( it, pktQueue.rend() ), pktQueue.size() );
   }
 }

From 2b9134512f9bfe64e1e1f566ed58a25d33bad4df Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 31 May 2017 20:45:21 -0400
Subject: [PATCH 38/56] remove leftover

---
 web/skins/classic/views/js/watch.js.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web/skins/classic/views/js/watch.js.php b/web/skins/classic/views/js/watch.js.php
index c5e7e316c..35a2debca 100644
--- a/web/skins/classic/views/js/watch.js.php
+++ b/web/skins/classic/views/js/watch.js.php
@@ -52,8 +52,6 @@ var monitorUrl = '<?php echo ( $monitor->Server()->Url() ) ?>';
 
 var scale = <?php echo $scale ?>;
 
-var streamSrc = "<?php echo preg_replace( '/&amp;/', '&', $streamSrc ) ?>";
-
 var statusRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_STATUS ?>;
 var eventsRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_EVENTS ?>;
 var imageRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_IMAGE ?>;

From 4889f3d0e8866171ca47dfc79f8f2f6e81dd8663 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 31 May 2017 20:54:34 -0400
Subject: [PATCH 39/56] rework logic in GetStreamImg a bit.  If no frame is
 specified, then we can use snapshot...otherwise it should do the frame image!

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

diff --git a/web/includes/Event.php b/web/includes/Event.php
index 0e072fb33..f4bf4a3da 100644
--- a/web/includes/Event.php
+++ b/web/includes/Event.php
@@ -29,12 +29,15 @@ class Event {
       Error('No row for Event ' . $IdOrRow );
     }
   } // end function __construct
+
   public function Storage() {
     return new Storage( isset($this->{'StorageId'}) ? $this->{'StorageId'} : NULL );
   }
+
   public function Monitor() {
     return new Monitor( isset($this->{'MonitorId'}) ? $this->{'MonitorId'} : NULL );
   }
+
   public function __call( $fn, array $args){
     if ( array_key_exists( $fn, $this ) ) {
       return $this->{$fn};
@@ -54,6 +57,7 @@ class Event {
     $Storage = $this->Storage();
     return $Storage->Path().'/'.$this->Relative_Path();
   }
+
   public function Relative_Path() {
     $event_path = '';
 
@@ -197,20 +201,26 @@ class Event {
     return( $thumbData );
   } // end function createListThumbnail
 
+  // frame is an array representing the db row for a frame.
   function getImageSrc( $frame, $scale=SCALE_BASE, $captureOnly=false, $overwrite=false ) {
     $Storage = new Storage(  isset($this->{'StorageId'}) ? $this->{'StorageId'} : NULL  );
     $Event = $this;
     $eventPath = $Event->Path();
 
-    if ( !is_array($frame) )
+    if ( $frame and ! is_array($frame) ) {
+      # Must be an Id
+      Debug("Assuming that $frame is an Id");
       $frame = array( 'FrameId'=>$frame, 'Type'=>'' );
+    }
 
-    if ( file_exists( $eventPath.'/snapshot.jpg' ) ) {
-      $captImage = "snapshot.jpg";
+    if ( ( ! $frame ) and file_exists( $eventPath.'/snapshot.jpg' ) ) {
+      # No frame specified, so look for a snapshot to use
+      $captImage = 'snapshot.jpg';
+      Debug("Frame not specified, using snapshot");
     } else {
       $captImage = sprintf( '%0'.ZM_EVENT_IMAGE_DIGITS.'d-capture.jpg', $frame['FrameId'] );
       if ( ! file_exists( $eventPath.'/'.$captImage ) ) {
-  # Generate the frame JPG
+        # Generate the frame JPG
         if ( $Event->DefaultVideo() ) {
           $videoPath = $eventPath.'/'.$Event->DefaultVideo();
 
@@ -275,8 +285,7 @@ class Event {
       }
 
       $thumbFile = $thumbPath;
-      if ( $overwrite || !file_exists( $thumbFile ) || !filesize( $thumbFile ) )
-      {
+      if ( $overwrite || ! file_exists( $thumbFile ) || ! filesize( $thumbFile ) ) {
         // Get new dimensions
         list( $imageWidth, $imageHeight ) = getimagesize( $imagePath );
         $thumbWidth = $imageWidth * $fraction;
@@ -290,7 +299,7 @@ class Event {
         if ( !imagejpeg( $thumbImage, $thumbPath ) )
           Error( "Can't create thumbnail '$thumbPath'" );
       }
-    }
+    } # Create thumbnails
 
     $imageData = array(
         'eventPath' => $eventPath,
@@ -298,7 +307,7 @@ class Event {
         'thumbPath' => $thumbPath,
         'imageFile' => $imagePath,
         'thumbFile' => $thumbFile,
-        'imageClass' => $alarmFrame?"alarm":"normal",
+        'imageClass' => $alarmFrame?'alarm':'normal',
         'isAnalImage' => $isAnalImage,
         'hasAnalImage' => $hasAnalImage,
         );

From 17c82247339d575a82e3210af21190b7e1013755 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 31 May 2017 20:55:10 -0400
Subject: [PATCH 40/56] begin to ahndle imageData not being populated

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

diff --git a/web/skins/classic/views/frame.php b/web/skins/classic/views/frame.php
index 0bbda69fa..4d526b683 100644
--- a/web/skins/classic/views/frame.php
+++ b/web/skins/classic/views/frame.php
@@ -60,7 +60,11 @@ if ( isset( $_REQUEST['scale'] ) ) {
   $scale = max( reScale( SCALE_BASE, $Monitor->DefaultScale(), ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
 }
 
-$imageData = $Event->getImageSrc( $frame, $scale );
+$imageData = $Event->getImageSrc( $frame, $scale, 0 );
+if ( ! $imageData ) {
+  Error("No data found for Event $eid frame $fid");
+  $imageData = array();
+}
 
 $show = 'capt';
 if ( isset($_REQUEST['show']) ) {

From 1df147e183ec19e6b4a56092fd9011e399e33be6 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 31 May 2017 22:01:35 -0400
Subject: [PATCH 41/56] adjust spacing

---
 web/skins/classic/views/monitor.php | 609 ++++++++++++++--------------
 1 file changed, 303 insertions(+), 306 deletions(-)

diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index da74fbb70..a3893092d 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -38,9 +38,9 @@ if ( ZM_OPT_X10 )
 $tabs['misc'] = translate('Misc');
 
 if ( isset($_REQUEST['tab']) )
-    $tab = validHtmlStr($_REQUEST['tab']);
+  $tab = validHtmlStr($_REQUEST['tab']);
 else
-    $tab = "general";
+  $tab = 'general';
 
 $Server = null;
 if ( defined( 'ZM_SERVER_ID' ) ) {
@@ -205,7 +205,7 @@ $sourceTypes = array(
     'Ffmpeg' => translate('Ffmpeg'),
     'Libvlc' => translate('Libvlc'),
     'cURL'   => 'cURL (HTTP(S) only)'
-);
+    );
 if ( !ZM_HAS_V4L )
   unset($sourceTypes['Local']);
 
@@ -213,6 +213,7 @@ $localMethods = array(
     'v4l2' => 'Video For Linux version 2',
     'v4l1' => 'Video For Linux version 1',
     );
+
 if ( !ZM_HAS_V4L2 )
   unset($localMethods['v4l2']);
 if ( !ZM_HAS_V4L1 )
@@ -221,174 +222,174 @@ if ( !ZM_HAS_V4L1 )
 $remoteProtocols = array(
     'http' => 'HTTP',
     'rtsp' => 'RTSP'
-);
+    );
 
 $rtspMethods = array(
     'rtpUni'      => 'RTP/Unicast',
     'rtpMulti'    => 'RTP/Multicast',
     'rtpRtsp'     => 'RTP/RTSP',
     'rtpRtspHttp' => 'RTP/RTSP/HTTP'
-);
+    );
 
 $rtspFFMpegMethods = array(
     'rtpRtsp'     => 'TCP',
     'rtpUni'      => 'UDP',
     'rtpMulti'    => 'UDP Multicast',
     'rtpRtspHttp' => 'HTTP Tunnel'
-);
+    );
 
 $httpMethods = array(
     'simple'   => "Simple",
     'regexp'   => "Regexp",
     'jpegTags' => "JPEG Tags"
-);
+    );
+
 if ( !ZM_PCRE )
-    unset($httpMethods['regexp']);
+  unset($httpMethods['regexp']);
 // Currently unsupported
 unset($httpMethods['jpegTags']);
 
-if ( ZM_HAS_V4L1 )
-{
-    $v4l1DeviceFormats = array(
-        'PAL'   => 0,
-        'NTSC'  => 1,
-        'SECAM' => 2,
-        'AUTO'  => 3,
-        'FMT4'  => 4,
-        'FMT5'  => 5,
-        'FMT6'  => 6,
-        'FMT7'  => 7
-    );
+if ( ZM_HAS_V4L1 ) {
+  $v4l1DeviceFormats = array(
+      'PAL'   => 0,
+      'NTSC'  => 1,
+      'SECAM' => 2,
+      'AUTO'  => 3,
+      'FMT4'  => 4,
+      'FMT5'  => 5,
+      'FMT6'  => 6,
+      'FMT7'  => 7
+      );
 
-    $v4l1MaxChannels = 15;
-    $v4l1DeviceChannels = array();
-    for ( $i = 0; $i <= $v4l1MaxChannels; $i++ )
-        $v4l1DeviceChannels['$i'] = $i;
+  $v4l1MaxChannels = 15;
+  $v4l1DeviceChannels = array();
+  for ( $i = 0; $i <= $v4l1MaxChannels; $i++ )
+    $v4l1DeviceChannels['$i'] = $i;
 
-    $v4l1LocalPalettes = array(
-        translate('Grey')      => 1,
-        'BGR32'             => 5,
-        'BGR24'             => 4,
-        '*YUYV'              => 8,
-        '*RGB565'            => 3,
-        '*RGB555'            => 6,
-        '*YUV422'            => 7,
-        '*YUV422P'           => 13,
-        '*YUV420P'           => 15
-    );
+  $v4l1LocalPalettes = array(
+      translate('Grey')      => 1,
+      'BGR32'             => 5,
+      'BGR24'             => 4,
+      '*YUYV'              => 8,
+      '*RGB565'            => 3,
+      '*RGB555'            => 6,
+      '*YUV422'            => 7,
+      '*YUV422P'           => 13,
+      '*YUV420P'           => 15
+      );
 }
 
 if ( ZM_HAS_V4L2 ) {
-    $v4l2DeviceFormats = array(
-        'PAL'         => 0x000000ff,
-        'NTSC'        => 0x0000b000,
-        'PAL B'       => 0x00000001,
-        'PAL B1'      => 0x00000002,
-        'PAL G'       => 0x00000004,
-        'PAL H'       => 0x00000008,
-        'PAL I'       => 0x00000010,
-        'PAL D'       => 0x00000020,
-        'PAL D1'      => 0x00000040,
-        'PAL K'       => 0x00000080,
-        'PAL M'       => 0x00000100,
-        'PAL N'       => 0x00000200,
-        'PAL Nc'      => 0x00000400,
-        'PAL 60'      => 0x00000800,
-        'NTSC M'      => 0x00001000,
-        'NTSC M JP'   => 0x00002000,
-        'NTSC 443'    => 0x00004000,
-        'NTSC M KR'   => 0x00008000,
-        'SECAM B'     => 0x00010000,
-        'SECAM D'     => 0x00020000,
-        'SECAM G'     => 0x00040000,
-        'SECAM H'     => 0x00080000,
-        'SECAM K'     => 0x00100000,
-        'SECAM K1'    => 0x00200000,
-        'SECAM L'     => 0x00400000,
-        'SECAM LC'    => 0x00800000,
-        'ATSC 8 VSB'  => 0x01000000,
-        'ATSC 16 VSB' => 0x02000000,
-    );
+  $v4l2DeviceFormats = array(
+      'PAL'         => 0x000000ff,
+      'NTSC'        => 0x0000b000,
+      'PAL B'       => 0x00000001,
+      'PAL B1'      => 0x00000002,
+      'PAL G'       => 0x00000004,
+      'PAL H'       => 0x00000008,
+      'PAL I'       => 0x00000010,
+      'PAL D'       => 0x00000020,
+      'PAL D1'      => 0x00000040,
+      'PAL K'       => 0x00000080,
+      'PAL M'       => 0x00000100,
+      'PAL N'       => 0x00000200,
+      'PAL Nc'      => 0x00000400,
+      'PAL 60'      => 0x00000800,
+      'NTSC M'      => 0x00001000,
+      'NTSC M JP'   => 0x00002000,
+      'NTSC 443'    => 0x00004000,
+      'NTSC M KR'   => 0x00008000,
+      'SECAM B'     => 0x00010000,
+      'SECAM D'     => 0x00020000,
+      'SECAM G'     => 0x00040000,
+      'SECAM H'     => 0x00080000,
+      'SECAM K'     => 0x00100000,
+      'SECAM K1'    => 0x00200000,
+      'SECAM L'     => 0x00400000,
+      'SECAM LC'    => 0x00800000,
+      'ATSC 8 VSB'  => 0x01000000,
+      'ATSC 16 VSB' => 0x02000000,
+      );
 
-    $v4l2MaxChannels = 31;
-    $v4l2DeviceChannels = array();
-    for ( $i = 0; $i <= $v4l2MaxChannels; $i++ )
-        $v4l2DeviceChannels[$i] = $i;
+  $v4l2MaxChannels = 31;
+  $v4l2DeviceChannels = array();
+  for ( $i = 0; $i <= $v4l2MaxChannels; $i++ )
+    $v4l2DeviceChannels[$i] = $i;
 
-    $v4l2LocalPalettes = array(
-        'Auto' => 0, /* Automatic palette selection */
+  $v4l2LocalPalettes = array(
+      'Auto' => 0, /* Automatic palette selection */
 
-        /*      Pixel format         FOURCC                        depth  Description  */
-        translate('Grey') =>     fourcc('G','R','E','Y'), /*  8  Greyscale     */
-        'BGR32' =>    fourcc('B','G','R','4'), /* 32  BGR-8-8-8-8   */
-        'RGB32' =>    fourcc('R','G','B','4'), /* 32  RGB-8-8-8-8   */
-        'BGR24' =>    fourcc('B','G','R','3'), /* 24  BGR-8-8-8     */
-        'RGB24' =>    fourcc('R','G','B','3'), /* 24  RGB-8-8-8     */
-        '*YUYV' =>     fourcc('Y','U','Y','V'), /* 16  YUV 4:2:2     */
+      /*      Pixel format         FOURCC                        depth  Description  */
+      translate('Grey') =>     fourcc('G','R','E','Y'), /*  8  Greyscale     */
+      'BGR32' =>    fourcc('B','G','R','4'), /* 32  BGR-8-8-8-8   */
+      'RGB32' =>    fourcc('R','G','B','4'), /* 32  RGB-8-8-8-8   */
+      'BGR24' =>    fourcc('B','G','R','3'), /* 24  BGR-8-8-8     */
+      'RGB24' =>    fourcc('R','G','B','3'), /* 24  RGB-8-8-8     */
+      '*YUYV' =>     fourcc('Y','U','Y','V'), /* 16  YUV 4:2:2     */
 
-        /* compressed formats */
-        '*JPEG' =>     fourcc('J','P','E','G'), /* JFIF JPEG     */
-        '*MJPEG' =>    fourcc('M','J','P','G'), /* Motion-JPEG   */
-        //'DV' =>       fourcc('d','v','s','d'), /* 1394          */
-        //'MPEG' =>     fourcc('M','P','E','G'), /* MPEG-1/2/4    */
+      /* compressed formats */
+      '*JPEG' =>     fourcc('J','P','E','G'), /* JFIF JPEG     */
+      '*MJPEG' =>    fourcc('M','J','P','G'), /* Motion-JPEG   */
+      //'DV' =>       fourcc('d','v','s','d'), /* 1394          */
+      //'MPEG' =>     fourcc('M','P','E','G'), /* MPEG-1/2/4    */
 
-        //'RGB332' =>   fourcc('R','G','B','1'), /*  8  RGB-3-3-2     */
-        '*RGB444' =>   fourcc('R','4','4','4'), /* 16  xxxxrrrr ggggbbbb */
-        '*RGB555' =>   fourcc('R','G','B','O'), /* 16  RGB-5-5-5     */
-        '*RGB565' =>   fourcc('R','G','B','P'), /* 16  RGB-5-6-5     */
-        //'RGB555X' =>  fourcc('R','G','B','Q'), /* 16  RGB-5-5-5 BE  */
-        //'RGB565X' =>  fourcc('R','G','B','R'), /* 16  RGB-5-6-5 BE  */
-        //'Y16' =>      fourcc('Y','1','6',''), /* 16  Greyscale     */
-        //'PAL8' =>     fourcc('P','A','L','8'), /*  8  8-bit palette */
-        //'YVU410' =>   fourcc('Y','V','U','9'), /*  9  YVU 4:1:0     */
-        //'YVU420' =>   fourcc('Y','V','1','2'), /* 12  YVU 4:2:0     */
+      //'RGB332' =>   fourcc('R','G','B','1'), /*  8  RGB-3-3-2     */
+      '*RGB444' =>   fourcc('R','4','4','4'), /* 16  xxxxrrrr ggggbbbb */
+      '*RGB555' =>   fourcc('R','G','B','O'), /* 16  RGB-5-5-5     */
+      '*RGB565' =>   fourcc('R','G','B','P'), /* 16  RGB-5-6-5     */
+      //'RGB555X' =>  fourcc('R','G','B','Q'), /* 16  RGB-5-5-5 BE  */
+      //'RGB565X' =>  fourcc('R','G','B','R'), /* 16  RGB-5-6-5 BE  */
+      //'Y16' =>      fourcc('Y','1','6',''), /* 16  Greyscale     */
+      //'PAL8' =>     fourcc('P','A','L','8'), /*  8  8-bit palette */
+      //'YVU410' =>   fourcc('Y','V','U','9'), /*  9  YVU 4:1:0     */
+      //'YVU420' =>   fourcc('Y','V','1','2'), /* 12  YVU 4:2:0     */
 
-        '*UYVY' =>     fourcc('U','Y','V','Y'), /* 16  YUV 4:2:2     */
-        '*YUV422P' =>  fourcc('4','2','2','P'), /* 16  YVU422 planar */
-        '*YUV411P' =>  fourcc('4','1','1','P'), /* 16  YVU411 planar */
-        //'Y41P' =>     fourcc('Y','4','1','P'), /* 12  YUV 4:1:1     */
-        '*YUV444' =>   fourcc('Y','4','4','4'), /* 16  xxxxyyyy uuuuvvvv */
-        //'YUV555' =>   fourcc('Y','U','V','O'), /* 16  YUV-5-5-5     */
-        //'YUV565' =>   fourcc('Y','U','V','P'), /* 16  YUV-5-6-5     */
-        //'YUV32' =>    fourcc('Y','U','V','4'), /* 32  YUV-8-8-8-8   */
+      '*UYVY' =>     fourcc('U','Y','V','Y'), /* 16  YUV 4:2:2     */
+      '*YUV422P' =>  fourcc('4','2','2','P'), /* 16  YVU422 planar */
+      '*YUV411P' =>  fourcc('4','1','1','P'), /* 16  YVU411 planar */
+      //'Y41P' =>     fourcc('Y','4','1','P'), /* 12  YUV 4:1:1     */
+      '*YUV444' =>   fourcc('Y','4','4','4'), /* 16  xxxxyyyy uuuuvvvv */
+      //'YUV555' =>   fourcc('Y','U','V','O'), /* 16  YUV-5-5-5     */
+      //'YUV565' =>   fourcc('Y','U','V','P'), /* 16  YUV-5-6-5     */
+      //'YUV32' =>    fourcc('Y','U','V','4'), /* 32  YUV-8-8-8-8   */
 
-        /* two planes -- one Y, one Cr + Cb interleaved  */
-        //'NV12' =>     fourcc('N','V','1','2'), /* 12  Y/CbCr 4:2:0  */
-        //'NV21' =>     fourcc('N','V','2','1'), /* 12  Y/CrCb 4:2:0  */
+      /* two planes -- one Y, one Cr + Cb interleaved  */
+      //'NV12' =>     fourcc('N','V','1','2'), /* 12  Y/CbCr 4:2:0  */
+      //'NV21' =>     fourcc('N','V','2','1'), /* 12  Y/CrCb 4:2:0  */
 
-        /*  The following formats are not defined in the V4L2 specification */
-        '*YUV410' =>   fourcc('Y','U','V','9'), /*  9  YUV 4:1:0     */
-        '*YUV420' =>   fourcc('Y','U','1','2'), /* 12  YUV 4:2:0     */
-        //'YYUV' =>     fourcc('Y','Y','U','V'), /* 16  YUV 4:2:2     */
-        //'HI240' =>    fourcc('H','I','2','4'), /*  8  8-bit color   */
-        //'HM12' =>     fourcc('H','M','1','2'), /*  8  YUV 4:2:0 16x16 macroblocks */
+      /*  The following formats are not defined in the V4L2 specification */
+      '*YUV410' =>   fourcc('Y','U','V','9'), /*  9  YUV 4:1:0     */
+      '*YUV420' =>   fourcc('Y','U','1','2'), /* 12  YUV 4:2:0     */
+      //'YYUV' =>     fourcc('Y','Y','U','V'), /* 16  YUV 4:2:2     */
+      //'HI240' =>    fourcc('H','I','2','4'), /*  8  8-bit color   */
+      //'HM12' =>     fourcc('H','M','1','2'), /*  8  YUV 4:2:0 16x16 macroblocks */
 
-        /* see http://www.siliconimaging.com/RGB%20Bayer.htm */
-        //'SBGGR8' =>   fourcc('B','A','8','1'), /*  8  BGBG.. GRGR.. */
-        //'SGBRG8' =>   fourcc('G','B','R','G'), /*  8  GBGB.. RGRG.. */
-        //'SBGGR16' =>  fourcc('B','Y','R','2'), /* 16  BGBG.. GRGR.. */
+      /* see http://www.siliconimaging.com/RGB%20Bayer.htm */
+      //'SBGGR8' =>   fourcc('B','A','8','1'), /*  8  BGBG.. GRGR.. */
+      //'SGBRG8' =>   fourcc('G','B','R','G'), /*  8  GBGB.. RGRG.. */
+      //'SBGGR16' =>  fourcc('B','Y','R','2'), /* 16  BGBG.. GRGR.. */
 
-        /*  Vendor-specific formats   */
-        //'WNVA' =>     fourcc('W','N','V','A'), /* Winnov hw compress */
-        //'SN9C10X' =>  fourcc('S','9','1','0'), /* SN9C10x compression */
-        //'PWC1' =>     fourcc('P','W','C','1'), /* pwc older webcam */
-        //'PWC2' =>     fourcc('P','W','C','2'), /* pwc newer webcam */
-        //'ET61X251' => fourcc('E','6','2','5'), /* ET61X251 compression */
-        //'SPCA501' =>  fourcc('S','5','0','1'), /* YUYV per line */
-        //'SPCA505' =>  fourcc('S','5','0','5'), /* YYUV per line */
-        //'SPCA508' =>  fourcc('S','5','0','8'), /* YUVY per line */
-        //'SPCA561' =>  fourcc('S','5','6','1'), /* compressed GBRG bayer */
-        //'PAC207' =>   fourcc('P','2','0','7'), /* compressed BGGR bayer */
-        //'PJPG' =>     fourcc('P','J','P','G'), /* Pixart 73xx JPEG */
-        //'YVYU' =>     fourcc('Y','V','Y','U'), /* 16  YVU 4:2:2     */
-    );
+      /*  Vendor-specific formats   */
+      //'WNVA' =>     fourcc('W','N','V','A'), /* Winnov hw compress */
+      //'SN9C10X' =>  fourcc('S','9','1','0'), /* SN9C10x compression */
+      //'PWC1' =>     fourcc('P','W','C','1'), /* pwc older webcam */
+      //'PWC2' =>     fourcc('P','W','C','2'), /* pwc newer webcam */
+      //'ET61X251' => fourcc('E','6','2','5'), /* ET61X251 compression */
+      //'SPCA501' =>  fourcc('S','5','0','1'), /* YUYV per line */
+      //'SPCA505' =>  fourcc('S','5','0','5'), /* YYUV per line */
+      //'SPCA508' =>  fourcc('S','5','0','8'), /* YUVY per line */
+      //'SPCA561' =>  fourcc('S','5','6','1'), /* compressed GBRG bayer */
+      //'PAC207' =>   fourcc('P','2','0','7'), /* compressed BGGR bayer */
+      //'PJPG' =>     fourcc('P','J','P','G'), /* Pixart 73xx JPEG */
+      //'YVYU' =>     fourcc('Y','V','Y','U'), /* 16  YVU 4:2:2     */
+      );
 }
 
 $Colours = array(
     translate('8BitGrey')    => 1,
     translate('24BitColour') => 3,
     translate('32BitColour') => 4
-);
+    );
 
 $orientations = array(
     translate('Normal')      => '0',
@@ -397,7 +398,7 @@ $orientations = array(
     translate('RotateLeft')  => '270',
     translate('FlippedHori') => 'hori',
     translate('FlippedVert') => 'vert'
-);
+    );
 
 $deinterlaceopts = array(
     'Disabled'                                            => 0x00000000,
@@ -408,7 +409,7 @@ $deinterlaceopts = array(
     'Linear'                                              => 0x00000002,
     'Blend'                                               => 0x00000003,
     'Blend (25%)'                                         => 0x00000205
-);
+    );
 
 $deinterlaceopts_v4l2 = array(
     'Disabled'                                            => 0x00000000,
@@ -424,7 +425,7 @@ $deinterlaceopts_v4l2 = array(
     'V4L2: Alternate fields (Bob)'                        => 0x07000000,
     'V4L2: Progressive'                                   => 0x01000000,
     'V4L2: Interlaced'                                    => 0x04000000
-);
+    );
 
 $fastblendopts = array(
     'No blending'                                         => 0,
@@ -434,7 +435,7 @@ $fastblendopts = array(
     '12.5% (Outdoor)'                                     => 12,
     '25%'                                                 => 25,
     '50%'                                                 => 50
-);
+    );
 
 $fastblendopts_alarm = array(
     'No blending (Alarm lasts forever)'                   => 0,
@@ -444,12 +445,12 @@ $fastblendopts_alarm = array(
     '12.5%'                                               => 12,
     '25%'                                                 => 25,
     '50% (Alarm lasts a moment)'                          => 50
-);
+    );
 
 $label_size = array(
     'Default'                                             => 1,
     'Large'                                               => 2
-);
+    );
 
 $savejpegopts = array(
     'Disabled'                                            => 0,
@@ -457,13 +458,13 @@ $savejpegopts = array(
     'Analysis images only (if available)'                 => 2,
     'Frames + Analysis images (if available)'             => 3,
     'Snapshot Only'                                       => 4          
-);
+    );
 
 $videowriteropts = array(
     'Disabled'                                            => 0,
     'X264 Encode'                                         => 1,
     'H264 Camera Passthrough'                             => 2          
-);
+    );
 
 xhtmlHeaders(__FILE__, translate('Monitor')." - ".validHtmlStr($monitor['Name']) );
 ?>
@@ -545,146 +546,146 @@ if ( canEdit( 'Monitors' ) ) {
 }
     if ( ZM_HAS_V4L && ($tab != 'source' || $newMonitor['Type'] != 'Local') ) {
 ?>
-    <input type="hidden" name="newMonitor[Device]" value="<?php echo validHtmlStr($newMonitor['Device']) ?>"/>
-    <input type="hidden" name="newMonitor[Channel]" value="<?php echo validHtmlStr($newMonitor['Channel']) ?>"/>
-    <input type="hidden" name="newMonitor[Format]" value="<?php echo validHtmlStr($newMonitor['Format']) ?>"/>
-    <input type="hidden" name="newMonitor[Palette]" value="<?php echo validHtmlStr($newMonitor['Palette']) ?>"/>
-    <input type="hidden" name="newMonitor[V4LMultiBuffer]" value="<?php echo validHtmlStr($newMonitor['V4LMultiBuffer']) ?>"/>
-    <input type="hidden" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo validHtmlStr($newMonitor['V4LCapturesPerFrame']) ?>"/>
+        <input type="hidden" name="newMonitor[Device]" value="<?php echo validHtmlStr($newMonitor['Device']) ?>"/>
+        <input type="hidden" name="newMonitor[Channel]" value="<?php echo validHtmlStr($newMonitor['Channel']) ?>"/>
+        <input type="hidden" name="newMonitor[Format]" value="<?php echo validHtmlStr($newMonitor['Format']) ?>"/>
+        <input type="hidden" name="newMonitor[Palette]" value="<?php echo validHtmlStr($newMonitor['Palette']) ?>"/>
+        <input type="hidden" name="newMonitor[V4LMultiBuffer]" value="<?php echo validHtmlStr($newMonitor['V4LMultiBuffer']) ?>"/>
+        <input type="hidden" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo validHtmlStr($newMonitor['V4LCapturesPerFrame']) ?>"/>
 <?php
     }
     if ( $tab != 'source' || $newMonitor['Type'] != 'Remote' ) {
 ?>
-    <input type="hidden" name="newMonitor[Protocol]" value="<?php echo validHtmlStr($newMonitor['Protocol']) ?>"/>
-    <input type="hidden" name="newMonitor[Host]" value="<?php echo validHtmlStr($newMonitor['Host']) ?>"/>
-    <input type="hidden" name="newMonitor[Port]" value="<?php echo validHtmlStr($newMonitor['Port']) ?>"/>
+        <input type="hidden" name="newMonitor[Protocol]" value="<?php echo validHtmlStr($newMonitor['Protocol']) ?>"/>
+        <input type="hidden" name="newMonitor[Host]" value="<?php echo validHtmlStr($newMonitor['Host']) ?>"/>
+        <input type="hidden" name="newMonitor[Port]" value="<?php echo validHtmlStr($newMonitor['Port']) ?>"/>
 <?php
     }
     if ( $tab != 'source' || ($newMonitor['Type'] != 'Local' && $newMonitor['Type'] != 'Remote' && $newMonitor['Type'] != 'Ffmpeg' && $newMonitor['Type'] != 'Libvlc') ) {
 ?>
-    <input type="hidden" name="newMonitor[Method]" value="<?php echo validHtmlStr($newMonitor['Method']) ?>"/>
+        <input type="hidden" name="newMonitor[Method]" value="<?php echo validHtmlStr($newMonitor['Method']) ?>"/>
 <?php
     }
     if ( $tab != 'source' || ($newMonitor['Type'] != 'Ffmpeg' && $newMonitor['Type'] != 'Libvlc' )) {
 ?>
-    <input type="hidden" name="newMonitor[Options]" value="<?php echo validHtmlStr($newMonitor['Options']) ?>"/>
+        <input type="hidden" name="newMonitor[Options]" value="<?php echo validHtmlStr($newMonitor['Options']) ?>"/>
 <?php
     }
     if ( $tab != 'source' || ($newMonitor['Type'] != 'Remote' && $newMonitor['Type'] != 'File' && $newMonitor['Type'] != 'Ffmpeg' && $newMonitor['Type'] != 'Libvlc' && $newMonitor['Type'] != 'cURL') ) {
 ?>
-    <input type="hidden" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>"/>
-    <input type="hidden" name="newMonitor[User]" value="<?php echo validHtmlStr($newMonitor['User']) ?>"/>
-    <input type="hidden" name="newMonitor[Pass]" value="<?php echo validHtmlStr($newMonitor['Pass']) ?>"/>
+        <input type="hidden" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>"/>
+        <input type="hidden" name="newMonitor[User]" value="<?php echo validHtmlStr($newMonitor['User']) ?>"/>
+        <input type="hidden" name="newMonitor[Pass]" value="<?php echo validHtmlStr($newMonitor['Pass']) ?>"/>
 <?php
-}
-if ( $tab != 'source' ) {
+    }
+    if ( $tab != 'source' ) {
 ?>
-    <input type="hidden" name="newMonitor[Colours]" value="<?php echo validHtmlStr($newMonitor['Colours']) ?>"/>
-    <input type="hidden" name="newMonitor[Width]" value="<?php echo validHtmlStr($newMonitor['Width']) ?>"/>
-    <input type="hidden" name="newMonitor[Height]" value="<?php echo validHtmlStr($newMonitor['Height']) ?>"/>
-    <input type="hidden" name="newMonitor[Orientation]" value="<?php echo validHtmlStr($newMonitor['Orientation']) ?>"/>
-    <input type="hidden" name="newMonitor[Deinterlacing]" value="<?php echo validHtmlStr($newMonitor['Deinterlacing']) ?>"/>
+        <input type="hidden" name="newMonitor[Colours]" value="<?php echo validHtmlStr($newMonitor['Colours']) ?>"/>
+        <input type="hidden" name="newMonitor[Width]" value="<?php echo validHtmlStr($newMonitor['Width']) ?>"/>
+        <input type="hidden" name="newMonitor[Height]" value="<?php echo validHtmlStr($newMonitor['Height']) ?>"/>
+        <input type="hidden" name="newMonitor[Orientation]" value="<?php echo validHtmlStr($newMonitor['Orientation']) ?>"/>
+        <input type="hidden" name="newMonitor[Deinterlacing]" value="<?php echo validHtmlStr($newMonitor['Deinterlacing']) ?>"/>
 <?php
-}
-if ( $tab != 'storage' ) {
+    }
+    if ( $tab != 'storage' ) {
 ?>
-    <input type="hidden" name="newMonitor[SaveJPEGs]" value="<?php echo validHtmlStr($newMonitor['SaveJPEGs']) ?>"/>
-    <input type="hidden" name="newMonitor[VideoWriter]" value="<?php echo validHtmlStr($newMonitor['VideoWriter']) ?>"/>
-    <input type="hidden" name="newMonitor[EncoderParameters]" value="<?php echo validHtmlStr($newMonitor['EncoderParameters']) ?>"/>
-    <input type="hidden" name="newMonitor[RecordAudio]" value="<?php echo validHtmlStr($newMonitor['RecordAudio']) ?>"/>
+        <input type="hidden" name="newMonitor[SaveJPEGs]" value="<?php echo validHtmlStr($newMonitor['SaveJPEGs']) ?>"/>
+        <input type="hidden" name="newMonitor[VideoWriter]" value="<?php echo validHtmlStr($newMonitor['VideoWriter']) ?>"/>
+        <input type="hidden" name="newMonitor[EncoderParameters]" value="<?php echo validHtmlStr($newMonitor['EncoderParameters']) ?>"/>
+        <input type="hidden" name="newMonitor[RecordAudio]" value="<?php echo validHtmlStr($newMonitor['RecordAudio']) ?>"/>
 <?php
-}
-if ( $tab != 'source' || ($newMonitor['Type'] != 'Remote' && $newMonitor['Protocol'] != 'RTSP')) {
+    }
+    if ( $tab != 'source' || ($newMonitor['Type'] != 'Remote' && $newMonitor['Protocol'] != 'RTSP')) {
 ?>
-    <input type="hidden" name="newMonitor[RTSPDescribe]" value="<?php echo validHtmlStr($newMonitor['RTSPDescribe']) ?>"/>
+        <input type="hidden" name="newMonitor[RTSPDescribe]" value="<?php echo validHtmlStr($newMonitor['RTSPDescribe']) ?>"/>
 <?php
-}
-if ( $tab != 'timestamp' ) {
+    }
+    if ( $tab != 'timestamp' ) {
 ?>
-    <input type="hidden" name="newMonitor[LabelFormat]" value="<?php echo validHtmlStr($newMonitor['LabelFormat']) ?>"/>
-    <input type="hidden" name="newMonitor[LabelX]" value="<?php echo validHtmlStr($newMonitor['LabelX']) ?>"/>
-    <input type="hidden" name="newMonitor[LabelY]" value="<?php echo validHtmlStr($newMonitor['LabelY']) ?>"/>
-    <input type="hidden" name="newMonitor[LabelSize]" value="<?php echo validHtmlStr($newMonitor['LabelSize']) ?>"/>
+        <input type="hidden" name="newMonitor[LabelFormat]" value="<?php echo validHtmlStr($newMonitor['LabelFormat']) ?>"/>
+        <input type="hidden" name="newMonitor[LabelX]" value="<?php echo validHtmlStr($newMonitor['LabelX']) ?>"/>
+        <input type="hidden" name="newMonitor[LabelY]" value="<?php echo validHtmlStr($newMonitor['LabelY']) ?>"/>
+        <input type="hidden" name="newMonitor[LabelSize]" value="<?php echo validHtmlStr($newMonitor['LabelSize']) ?>"/>
 <?php
-}
-if ( $tab != 'buffers' ) {
+    }
+    if ( $tab != 'buffers' ) {
 ?>
-    <input type="hidden" name="newMonitor[ImageBufferCount]" value="<?php echo validHtmlStr($newMonitor['ImageBufferCount']) ?>"/>
-    <input type="hidden" name="newMonitor[WarmupCount]" value="<?php echo validHtmlStr($newMonitor['WarmupCount']) ?>"/>
-    <input type="hidden" name="newMonitor[PreEventCount]" value="<?php echo validHtmlStr($newMonitor['PreEventCount']) ?>"/>
-    <input type="hidden" name="newMonitor[PostEventCount]" value="<?php echo validHtmlStr($newMonitor['PostEventCount']) ?>"/>
-    <input type="hidden" name="newMonitor[StreamReplayBuffer]" value="<?php echo validHtmlStr($newMonitor['StreamReplayBuffer']) ?>"/>
-    <input type="hidden" name="newMonitor[AlarmFrameCount]" value="<?php echo validHtmlStr($newMonitor['AlarmFrameCount']) ?>"/>
+        <input type="hidden" name="newMonitor[ImageBufferCount]" value="<?php echo validHtmlStr($newMonitor['ImageBufferCount']) ?>"/>
+        <input type="hidden" name="newMonitor[WarmupCount]" value="<?php echo validHtmlStr($newMonitor['WarmupCount']) ?>"/>
+        <input type="hidden" name="newMonitor[PreEventCount]" value="<?php echo validHtmlStr($newMonitor['PreEventCount']) ?>"/>
+        <input type="hidden" name="newMonitor[PostEventCount]" value="<?php echo validHtmlStr($newMonitor['PostEventCount']) ?>"/>
+        <input type="hidden" name="newMonitor[StreamReplayBuffer]" value="<?php echo validHtmlStr($newMonitor['StreamReplayBuffer']) ?>"/>
+        <input type="hidden" name="newMonitor[AlarmFrameCount]" value="<?php echo validHtmlStr($newMonitor['AlarmFrameCount']) ?>"/>
 <?php
-}
-if ( ZM_OPT_CONTROL && $tab != 'control' ) {
+    }
+    if ( ZM_OPT_CONTROL && $tab != 'control' ) {
 ?>
-    <input type="hidden" name="newMonitor[Controllable]" value="<?php echo validHtmlStr($newMonitor['Controllable']) ?>"/>
-    <input type="hidden" name="newMonitor[ControlId]" value="<?php echo validHtmlStr($newMonitor['ControlId']) ?>"/>
-    <input type="hidden" name="newMonitor[ControlDevice]" value="<?php echo validHtmlStr($newMonitor['ControlDevice']) ?>"/>
-    <input type="hidden" name="newMonitor[ControlAddress]" value="<?php echo validHtmlStr($newMonitor['ControlAddress']) ?>"/>
-    <input type="hidden" name="newMonitor[AutoStopTimeout]" value="<?php echo validHtmlStr($newMonitor['AutoStopTimeout']) ?>"/>
-    <input type="hidden" name="newMonitor[TrackMotion]" value="<?php echo validHtmlStr($newMonitor['TrackMotion']) ?>"/>
-    <input type="hidden" name="newMonitor[TrackDelay]" value="<?php echo validHtmlStr($newMonitor['TrackDelay']) ?>"/>
-    <input type="hidden" name="newMonitor[ReturnLocation]" value="<?php echo validHtmlStr($newMonitor['ReturnLocation']) ?>"/>
-    <input type="hidden" name="newMonitor[ReturnDelay]" value="<?php echo validHtmlStr($newMonitor['ReturnDelay']) ?>"/>
+        <input type="hidden" name="newMonitor[Controllable]" value="<?php echo validHtmlStr($newMonitor['Controllable']) ?>"/>
+        <input type="hidden" name="newMonitor[ControlId]" value="<?php echo validHtmlStr($newMonitor['ControlId']) ?>"/>
+        <input type="hidden" name="newMonitor[ControlDevice]" value="<?php echo validHtmlStr($newMonitor['ControlDevice']) ?>"/>
+        <input type="hidden" name="newMonitor[ControlAddress]" value="<?php echo validHtmlStr($newMonitor['ControlAddress']) ?>"/>
+        <input type="hidden" name="newMonitor[AutoStopTimeout]" value="<?php echo validHtmlStr($newMonitor['AutoStopTimeout']) ?>"/>
+        <input type="hidden" name="newMonitor[TrackMotion]" value="<?php echo validHtmlStr($newMonitor['TrackMotion']) ?>"/>
+        <input type="hidden" name="newMonitor[TrackDelay]" value="<?php echo validHtmlStr($newMonitor['TrackDelay']) ?>"/>
+        <input type="hidden" name="newMonitor[ReturnLocation]" value="<?php echo validHtmlStr($newMonitor['ReturnLocation']) ?>"/>
+        <input type="hidden" name="newMonitor[ReturnDelay]" value="<?php echo validHtmlStr($newMonitor['ReturnDelay']) ?>"/>
 <?php
-}
-if ( ZM_OPT_X10 && $tab != 'x10' ) {
+  }
+  if ( ZM_OPT_X10 && $tab != 'x10' ) {
 ?>
-    <input type="hidden" name="newX10Monitor[Activation]" value="<?php echo validHtmlStr($newX10Monitor['Activation']) ?>"/>
-    <input type="hidden" name="newX10Monitor[AlarmInput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmInput']) ?>"/>
-    <input type="hidden" name="newX10Monitor[AlarmOutput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmOutput']) ?>"/>
+        <input type="hidden" name="newX10Monitor[Activation]" value="<?php echo validHtmlStr($newX10Monitor['Activation']) ?>"/>
+        <input type="hidden" name="newX10Monitor[AlarmInput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmInput']) ?>"/>
+        <input type="hidden" name="newX10Monitor[AlarmOutput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmOutput']) ?>"/>
 <?php
-}
-if ( $tab != 'misc' ) {
+  }
+  if ( $tab != 'misc' ) {
 ?>
-    <input type="hidden" name="newMonitor[EventPrefix]" value="<?php echo validHtmlStr($newMonitor['EventPrefix']) ?>"/>
-    <input type="hidden" name="newMonitor[SectionLength]" value="<?php echo validHtmlStr($newMonitor['SectionLength']) ?>"/>
-    <input type="hidden" name="newMonitor[FrameSkip]" value="<?php echo validHtmlStr($newMonitor['FrameSkip']) ?>"/>
-    <input type="hidden" name="newMonitor[MotionFrameSkip]" value="<?php echo validHtmlStr($newMonitor['MotionFrameSkip']) ?>"/>
-    <input type="hidden" name="newMonitor[AnalysisUpdateDelay]" value="<?php echo validHtmlStr($newMonitor['AnalysisUpdateDelay']) ?>"/>
-    <input type="hidden" name="newMonitor[FPSReportInterval]" value="<?php echo validHtmlStr($newMonitor['FPSReportInterval']) ?>"/>
-    <input type="hidden" name="newMonitor[DefaultView]" value="<?php echo validHtmlStr($newMonitor['DefaultView']) ?>"/>
-    <input type="hidden" name="newMonitor[DefaultRate]" value="<?php echo validHtmlStr($newMonitor['DefaultRate']) ?>"/>
-    <input type="hidden" name="newMonitor[DefaultScale]" value="<?php echo validHtmlStr($newMonitor['DefaultScale']) ?>"/>
-    <input type="hidden" name="newMonitor[WebColour]" value="<?php echo validHtmlStr($newMonitor['WebColour']) ?>"/>
-    <input type="hidden" name="newMonitor[Exif]" value="<?php echo validHtmlStr($newMonitor['Exif']) ?>"/>
+        <input type="hidden" name="newMonitor[EventPrefix]" value="<?php echo validHtmlStr($newMonitor['EventPrefix']) ?>"/>
+        <input type="hidden" name="newMonitor[SectionLength]" value="<?php echo validHtmlStr($newMonitor['SectionLength']) ?>"/>
+        <input type="hidden" name="newMonitor[FrameSkip]" value="<?php echo validHtmlStr($newMonitor['FrameSkip']) ?>"/>
+        <input type="hidden" name="newMonitor[MotionFrameSkip]" value="<?php echo validHtmlStr($newMonitor['MotionFrameSkip']) ?>"/>
+        <input type="hidden" name="newMonitor[AnalysisUpdateDelay]" value="<?php echo validHtmlStr($newMonitor['AnalysisUpdateDelay']) ?>"/>
+        <input type="hidden" name="newMonitor[FPSReportInterval]" value="<?php echo validHtmlStr($newMonitor['FPSReportInterval']) ?>"/>
+        <input type="hidden" name="newMonitor[DefaultView]" value="<?php echo validHtmlStr($newMonitor['DefaultView']) ?>"/>
+        <input type="hidden" name="newMonitor[DefaultRate]" value="<?php echo validHtmlStr($newMonitor['DefaultRate']) ?>"/>
+        <input type="hidden" name="newMonitor[DefaultScale]" value="<?php echo validHtmlStr($newMonitor['DefaultScale']) ?>"/>
+        <input type="hidden" name="newMonitor[WebColour]" value="<?php echo validHtmlStr($newMonitor['WebColour']) ?>"/>
+        <input type="hidden" name="newMonitor[Exif]" value="<?php echo validHtmlStr($newMonitor['Exif']) ?>"/>
 <?php
-}
-if ( ZM_HAS_V4L && ($tab != 'misc' || $newMonitor['Type'] != 'Local') ) {
+  }
+  if ( ZM_HAS_V4L && ($tab != 'misc' || $newMonitor['Type'] != 'Local') ) {
 ?>
-    <input type="hidden" name="newMonitor[SignalCheckColour]" value="<?php echo validHtmlStr($newMonitor['SignalCheckColour']) ?>"/>
+        <input type="hidden" name="newMonitor[SignalCheckColour]" value="<?php echo validHtmlStr($newMonitor['SignalCheckColour']) ?>"/>
 <?php
-}
+  }
 ?>
         <table id="contentTable" class="major" cellspacing="0">
           <tbody>
 <?php
 switch ( $tab ) {
-    case 'general' :
+  case 'general' :
     {
 ?>
             <tr><td><?php echo translate('Name') ?></td><td><input type="text" name="newMonitor[Name]" value="<?php echo validHtmlStr($newMonitor['Name']) ?>" size="16"/></td></tr>
             <tr><td><?php echo translate('Server') ?></td><td>
 <?php 
-  $servers = array(''=>'None');
-  $result = dbQuery( 'SELECT * FROM Servers ORDER BY Name');
-  $results = $result->fetchALL(PDO::FETCH_CLASS | PDO::FETCH_PROPS_LATE, 'Server' );
-  foreach ( $results as $row => $server_obj ) {
-    $servers[$server_obj->Id] = $server_obj->Name();
-  }
+      $servers = array(''=>'None');
+      $result = dbQuery( 'SELECT * FROM Servers ORDER BY Name');
+      $results = $result->fetchALL(PDO::FETCH_CLASS | PDO::FETCH_PROPS_LATE, 'Server' );
+      foreach ( $results as $row => $server_obj ) {
+        $servers[$server_obj->Id] = $server_obj->Name();
+      }
 ?>
   <?php echo buildSelect( "newMonitor[ServerId]", $servers ); ?>
-</td></tr>
+            </td></tr>
             <tr><td><?php echo translate('SourceType') ?></td><td><?php echo buildSelect( "newMonitor[Type]", $sourceTypes ); ?></td></tr>
             <tr><td><?php echo translate('Function') ?></td><td><select name="newMonitor[Function]">
 <?php
-        foreach ( getEnumValues( 'Monitors', 'Function' ) as $optFunction ) {
+      foreach ( getEnumValues( 'Monitors', 'Function' ) as $optFunction ) {
 ?>
               <option value="<?php echo $optFunction ?>"<?php if ( $optFunction == $newMonitor['Function'] ) { ?> selected="selected"<?php } ?>><?php echo translate('Fn'.$optFunction) ?></option>
 <?php
-        }
+      }
 ?>
             </select></td></tr>
             <tr><td><?php echo translate('Enabled') ?></td><td><input type="checkbox" name="newMonitor[Enabled]" value="1"<?php if ( !empty($newMonitor['Enabled']) ) { ?> checked="checked"<?php } ?>/></td></tr>
@@ -693,140 +694,139 @@ switch ( $tab ) {
               <td>
                 <select name="monitorIds" size="4" multiple="multiple" onchange="updateLinkedMonitors( this )">
 <?php
-    $monitors = dbFetchAll( "select Id,Name from Monitors order by Sequence asc" );
-    if ( !empty($newMonitor['LinkedMonitors']) )
+      $monitors = dbFetchAll( "select Id,Name from Monitors order by Sequence asc" );
+      if ( !empty($newMonitor['LinkedMonitors']) )
         $monitorIds = array_flip( explode( ',', $newMonitor['LinkedMonitors'] ) );
-    else
+      else
         $monitorIds = array();
-    foreach ( $monitors as $monitor ) {
+      foreach ( $monitors as $monitor ) {
         if ( (empty($newMonitor['Id']) || ($monitor['Id'] != $newMonitor['Id'])) && visibleMonitor( $monitor['Id'] ) ) {
 ?>
                   <option value="<?php echo $monitor['Id'] ?>"<?php if ( array_key_exists( $monitor['Id'], $monitorIds ) ) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($monitor['Name']) ?></option>
 <?php
         }
-    }
+      }
 ?>
                 </select>
               </td>
             </tr>
             <tr><td><?php echo translate('AnalysisFPS') ?></td><td><input type="text" name="newMonitor[AnalysisFPS]" value="<?php echo validHtmlStr($newMonitor['AnalysisFPS']) ?>" size="6"/></td></tr>
 <?php
-    if ( $newMonitor['Type'] != 'Local' && $newMonitor['Type'] != 'File' ) {
+      if ( $newMonitor['Type'] != 'Local' && $newMonitor['Type'] != 'File' ) {
 ?>
             <tr><td><?php echo translate('MaximumFPS') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_MAXFPS', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><input type="text" onclick="document.getElementById('newMonitor[MaxFPS]').innerHTML= ' CAUTION: See the help text'" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($newMonitor['MaxFPS']) ?>" size="5"/><span id="newMonitor[MaxFPS]" style="color:red"></span></td></tr>
             <tr><td><?php echo translate('AlarmMaximumFPS') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_MAXFPS', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><input type="text" onclick="document.getElementById('newMonitor[AlarmMaxFPS]').innerHTML= ' CAUTION: See the help text'" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($newMonitor['AlarmMaxFPS']) ?>" size="5"/><span id="newMonitor[AlarmMaxFPS]" style="color:red"></span></td></tr>
 <?php
-    } else {
+      } else {
 ?>
             <tr><td><?php echo translate('MaximumFPS') ?></td><td><input type="text" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($newMonitor['MaxFPS']) ?>" size="5"/></td></tr>
             <tr><td><?php echo translate('AlarmMaximumFPS') ?></td><td><input type="text" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($newMonitor['AlarmMaxFPS']) ?>" size="5"/></td></tr>
 <?php
-    }
-  if ( ZM_FAST_IMAGE_BLENDS )
-        {
+      }
+      if ( ZM_FAST_IMAGE_BLENDS ) {
 ?>
             <tr><td><?php echo translate('RefImageBlendPct') ?></td><td><select name="newMonitor[RefBlendPerc]"><?php foreach ( $fastblendopts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['RefBlendPerc'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
             <tr><td><?php echo translate('AlarmRefImageBlendPct') ?></td><td><select name="newMonitor[AlarmRefBlendPerc]"><?php foreach ( $fastblendopts_alarm as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['AlarmRefBlendPerc'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
 <?php
-  } else {
+      } else {
 ?>
             <tr><td><?php echo translate('RefImageBlendPct') ?></td><td><input type="text" name="newMonitor[RefBlendPerc]" value="<?php echo validHtmlStr($newMonitor['RefBlendPerc']) ?>" size="4"/></td></tr>
             <tr><td><?php echo translate('AlarmRefImageBlendPct') ?></td><td><input type="text" name="newMonitor[AlarmRefBlendPerc]" value="<?php echo validHtmlStr($newMonitor['AlarmRefBlendPerc']) ?>" size="4"/></td></tr>
 <?php
-        }
+      }
 ?>
             <tr><td><?php echo translate('Triggers') ?></td><td>
 <?php
-        $optTriggers = getSetValues( 'Monitors', 'Triggers' );
-        $breakCount = (int)(ceil(count($optTriggers)));
-        $breakCount = min( 3, $breakCount );
-        $optCount = 0;
-        foreach( $optTriggers as $optTrigger ) {
-            if ( !ZM_OPT_X10 && $optTrigger == 'X10' )
-                continue;
-            if ( $optCount && ($optCount%$breakCount == 0) )
-                echo "</br>";
+      $optTriggers = getSetValues( 'Monitors', 'Triggers' );
+      $breakCount = (int)(ceil(count($optTriggers)));
+      $breakCount = min( 3, $breakCount );
+      $optCount = 0;
+      foreach( $optTriggers as $optTrigger ) {
+        if ( !ZM_OPT_X10 && $optTrigger == 'X10' )
+          continue;
+        if ( $optCount && ($optCount%$breakCount == 0) )
+          echo '</br>';
 ?>
               <input type="checkbox" name="newMonitor[Triggers][]" value="<?php echo $optTrigger ?>"<?php if ( isset($newMonitor['Triggers']) && in_array( $optTrigger, $newMonitor['Triggers'] ) ) { ?> checked="checked"<?php } ?>/>&nbsp;<?php echo $optTrigger ?>
 <?php
-            $optCount ++;
-        }
-        if ( !$optCount ) {
+          $optCount ++;
+      } // end foreach $optTrigger
+      if ( !$optCount ) {
 ?>
               <em><?php echo translate('NoneAvailable') ?></em>
 <?php
-        }
+      }
 ?>
             </td></tr>
 <?php
-        break;
+      break;
     }
-    case 'source' :
+  case 'source' :
     {
-        if ( ZM_HAS_V4L && $newMonitor['Type'] == 'Local' ) {
+      if ( ZM_HAS_V4L && $newMonitor['Type'] == 'Local' ) {
 ?>
             <tr><td><?php echo translate('DevicePath') ?></td><td><input type="text" name="newMonitor[Device]" value="<?php echo validHtmlStr($newMonitor['Device']) ?>" size="24"/></td></tr>
             <tr><td><?php echo translate('CaptureMethod') ?></td><td><?php echo buildSelect( "newMonitor[Method]", $localMethods, "submitTab( '$tab' )" ); ?></td></tr>
 <?php
-            if ( ZM_HAS_V4L1 && $newMonitor['Method'] == 'v4l1' ) {
+        if ( ZM_HAS_V4L1 && $newMonitor['Method'] == 'v4l1' ) {
 ?>
             <tr><td><?php echo translate('DeviceChannel') ?></td><td><select name="newMonitor[Channel]"><?php foreach ( $v4l1DeviceChannels as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Channel'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
             <tr><td><?php echo translate('DeviceFormat') ?></td><td><select name="newMonitor[Format]"><?php foreach ( $v4l1DeviceFormats as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Format'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
             <tr><td><?php echo translate('CapturePalette') ?></td><td><select name="newMonitor[Palette]"><?php foreach ( $v4l1LocalPalettes as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Palette'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
 <?php
-            } else {
+        } else {
 ?>
             <tr><td><?php echo translate('DeviceChannel') ?></td><td><select name="newMonitor[Channel]"><?php foreach ( $v4l2DeviceChannels as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Channel'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
             <tr><td><?php echo translate('DeviceFormat') ?></td><td><select name="newMonitor[Format]"><?php foreach ( $v4l2DeviceFormats as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Format'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
             <tr><td><?php echo translate('CapturePalette') ?></td><td><select name="newMonitor[Palette]"><?php foreach ( $v4l2LocalPalettes as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Palette'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
 <?php
-            }
+        }
 ?>
-      <tr><td><?php echo translate('V4LMultiBuffer') ?></td><td>
-        <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]1" value="1" <?php echo ( $newMonitor['V4LMultiBuffer'] == 1 ? 'checked="checked"' : '' ) ?>/>
-        <label for="newMonitor[V4LMultiBuffer]1">Yes</label>
-        <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]0" value="0" <?php echo ( $newMonitor['V4LMultiBuffer'] == 0 ? 'checked="checked"' : '' ) ?>/>
-        <label for="newMonitor[V4LMultiBuffer]0">No</label>
-        <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]" value="" <?php echo ( empty($newMonitor['V4LMultiBuffer']) ? 'checked="checked"' : '' ) ?>/>
-        <label for="newMonitor[V4LMultiBuffer]">Use Config Value</label>
-      </td></tr>
-      <tr><td><?php echo translate('V4LCapturesPerFrame') ?></td><td><input type="number" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo $newMonitor['V4LCapturesPerFrame'] ?>"/></td></tr>
+            <tr><td><?php echo translate('V4LMultiBuffer') ?></td><td>
+              <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]1" value="1" <?php echo ( $newMonitor['V4LMultiBuffer'] == 1 ? 'checked="checked"' : '' ) ?>/>
+              <label for="newMonitor[V4LMultiBuffer]1">Yes</label>
+              <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]0" value="0" <?php echo ( $newMonitor['V4LMultiBuffer'] == 0 ? 'checked="checked"' : '' ) ?>/>
+              <label for="newMonitor[V4LMultiBuffer]0">No</label>
+              <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]" value="" <?php echo ( empty($newMonitor['V4LMultiBuffer']) ? 'checked="checked"' : '' ) ?>/>
+              <label for="newMonitor[V4LMultiBuffer]">Use Config Value</label>
+            </td></tr>
+            <tr><td><?php echo translate('V4LCapturesPerFrame') ?></td><td><input type="number" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo $newMonitor['V4LCapturesPerFrame'] ?>"/></td></tr>
 <?php
-        } elseif ( $newMonitor['Type'] == 'Remote' ) {
+      } elseif ( $newMonitor['Type'] == 'Remote' ) {
 ?>
             <tr><td><?php echo translate('RemoteProtocol') ?></td><td><?php echo buildSelect( "newMonitor[Protocol]", $remoteProtocols, "updateMethods( this );if(this.value=='rtsp'){\$('RTSPDescribe').setStyle('display','table-row');}else{\$('RTSPDescribe').hide();}" ); ?></td></tr>
 <?php
-            if ( empty($newMonitor['Protocol']) || $newMonitor['Protocol'] == 'http' ) {
+        if ( empty($newMonitor['Protocol']) || $newMonitor['Protocol'] == 'http' ) {
 ?>
             <tr><td><?php echo translate('RemoteMethod') ?></td><td><?php echo buildSelect( 'newMonitor[Method]', $httpMethods ); ?></td></tr>
 <?php
-            } else {
+        } else {
 ?>
             <tr><td><?php echo translate('RemoteMethod') ?></td><td><?php echo buildSelect( 'newMonitor[Method]', $rtspMethods ); ?></td></tr>
 <?php
-            }
+        }
 ?>
             <tr><td><?php echo translate('RemoteHostName') ?></td><td><input type="text" name="newMonitor[Host]" value="<?php echo validHtmlStr($newMonitor['Host']) ?>" size="36"/></td></tr>
             <tr><td><?php echo translate('RemoteHostPort') ?></td><td><input type="text" name="newMonitor[Port]" value="<?php echo validHtmlStr($newMonitor['Port']) ?>" size="6"/></td></tr>
             <tr><td><?php echo translate('RemoteHostPath') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr>
 <?php
-        } elseif ( $newMonitor['Type'] == 'File' ) {
+      } elseif ( $newMonitor['Type'] == 'File' ) {
 ?>
             <tr><td><?php echo translate('SourcePath') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr>
 <?php
-        } elseif ( $newMonitor['Type'] == 'cURL' ) {
+      } elseif ( $newMonitor['Type'] == 'cURL' ) {
 ?>
             <tr><td><?php echo 'URL' ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr>
             <tr><td><?php echo 'Username' ?></td><td><input type="text" name="newMonitor[User]" value="<?php echo validHtmlStr($newMonitor['User']) ?>" size="12"/></td></tr>
             <tr><td><?php echo 'Password' ?></td><td><input type="text" name="newMonitor[Pass]" value="<?php echo validHtmlStr($newMonitor['Pass']) ?>" size="12"/></td></tr>
 <?php
-        } elseif ( $newMonitor['Type'] == 'Ffmpeg' || $newMonitor['Type'] == 'Libvlc') {
+      } elseif ( $newMonitor['Type'] == 'Ffmpeg' || $newMonitor['Type'] == 'Libvlc' ) {
 ?>
             <tr><td><?php echo translate('SourcePath') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr>
             <tr><td><?php echo translate('RemoteMethod') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_RTSPTrans', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><?php echo buildSelect( "newMonitor[Method]", $rtspFFMpegMethods ); ?></td></tr>
             <tr><td><?php echo translate('Options') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_'.strtoupper($newMonitor['Type']), 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><input type="text" name="newMonitor[Options]" value="<?php echo validHtmlStr($newMonitor['Options']) ?>" size="36"/></td></tr>
 <?php
-        }
+      }
 ?>
             <tr><td><?php echo translate('TargetColorspace') ?></td><td><select name="newMonitor[Colours]"><?php foreach ( $Colours as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Colours'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
             <tr><td><?php echo translate('CaptureWidth') ?> (<?php echo translate('Pixels') ?>)</td><td><input type="text" name="newMonitor[Width]" value="<?php echo validHtmlStr($newMonitor['Width']) ?>" size="4" onkeyup="updateMonitorDimensions(this);"/></td></tr>
@@ -834,35 +834,31 @@ switch ( $tab ) {
             <tr><td><?php echo translate('PreserveAspect') ?></td><td><input type="checkbox" name="preserveAspectRatio" value="1"/></td></tr> 
             <tr><td><?php echo translate('Orientation') ?></td><td><select name="newMonitor[Orientation]"><?php foreach ( $orientations as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Orientation'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
 <?php
-        if ( $newMonitor['Type'] == 'Local' ) {
+      if ( $newMonitor['Type'] == 'Local' ) {
 ?>
             <tr><td><?php echo translate('Deinterlacing') ?></td><td><select name="newMonitor[Deinterlacing]"><?php foreach ( $deinterlaceopts_v4l2 as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Deinterlacing'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
 <?php
-        } else {
+      } else {
 ?>
             <tr><td><?php echo translate('Deinterlacing') ?></td><td><select name="newMonitor[Deinterlacing]"><?php foreach ( $deinterlaceopts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['Deinterlacing'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
 <?php
-        }
-?>
-<?php
-        if ( $newMonitor['Type'] == 'Remote' ) {
+      }
+      if ( $newMonitor['Type'] == 'Remote' ) {
 ?>
             <tr id="RTSPDescribe"<?php if ( $newMonitor['Protocol'] != 'rtsp' ) { echo ' style="display:none;"'; } ?>><td><?php echo translate('RTSPDescribe') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_RTSPDESCRIBE', 'zmOptionHelp', 'optionhelp', '?' ) ?>) </td><td><input type="checkbox" name="newMonitor[RTSPDescribe]" value="1"<?php if ( !empty($newMonitor['RTSPDescribe']) ) { ?> checked="checked"<?php } ?>/></td></tr>
 <?php
-        }
-?>
-<?php
-        break;
+      }
+      break;
     }
-    case 'storage'   :
+  case 'storage' :
 ?>
             <tr><td><?php echo translate('SaveJPEGs') ?></td><td><select name="newMonitor[SaveJPEGs]"><?php foreach ( $savejpegopts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['SaveJPEGs'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
             <tr><td><?php echo translate('VideoWriter') ?></td><td><select name="newMonitor[VideoWriter]"><?php foreach ( $videowriteropts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['VideoWriter'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
             <tr><td><?php echo translate('OptionalEncoderParam') ?></td><td><textarea name="newMonitor[EncoderParameters]" rows="4" cols="36"><?php echo validHtmlStr($newMonitor['EncoderParameters']) ?></textarea></td></tr>
             <tr><td><?php echo translate('RecordAudio') ?></td><td><input type="checkbox" name="newMonitor[RecordAudio]" value="1"<?php if ( !empty($newMonitor['RecordAudio']) ) { ?> checked="checked"<?php } ?>/></td></tr>
 <?php
-        break;
-    case 'timestamp' :
+      break;
+  case 'timestamp' :
     {
 ?>
             <tr><td><?php echo translate('TimestampLabelFormat') ?></td><td><input type="text" name="newMonitor[LabelFormat]" value="<?php echo validHtmlStr($newMonitor['LabelFormat']) ?>" size="32"/></td></tr>
@@ -870,9 +866,9 @@ switch ( $tab ) {
             <tr><td><?php echo translate('TimestampLabelY') ?></td><td><input type="text" name="newMonitor[LabelY]" value="<?php echo validHtmlStr($newMonitor['LabelY']) ?>" size="4"/></td></tr>
             <tr><td><?php echo translate('TimestampLabelSize') ?></td><td><select name="newMonitor[LabelSize]"><?php foreach ( $label_size as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['LabelSize'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
 <?php
-        break;
+      break;
     }
-    case 'buffers' :
+  case 'buffers' :
     {
 ?>
             <tr><td><?php echo translate('ImageBufferSize') ?></td><td><input type="text" name="newMonitor[ImageBufferCount]" value="<?php echo validHtmlStr($newMonitor['ImageBufferCount']) ?>" size="6"/></td></tr>
@@ -882,9 +878,9 @@ switch ( $tab ) {
             <tr><td><?php echo translate('StreamReplayBuffer') ?></td><td><input type="text" name="newMonitor[StreamReplayBuffer]" value="<?php echo validHtmlStr($newMonitor['StreamReplayBuffer']) ?>" size="6"/></td></tr>
 <tr><td><?php echo translate('AlarmFrameCount') ?></td><td><input type="text" name="newMonitor[AlarmFrameCount]" value="<?php echo validHtmlStr($newMonitor['AlarmFrameCount']) ?>" size="4"/></td></tr>
 <?php
-        break;
+      break;
     }
-    case 'control' :
+  case 'control' :
     {
 ?>
             <tr><td><?php echo translate('Controllable') ?></td><td><input type="checkbox" name="newMonitor[Controllable]" value="1"<?php if ( !empty($newMonitor['Controllable']) ) { ?> checked="checked"<?php } ?>/></td></tr>
@@ -894,28 +890,28 @@ switch ( $tab ) {
             <tr><td><?php echo translate('AutoStopTimeout') ?></td><td><input type="text" name="newMonitor[AutoStopTimeout]" value="<?php echo validHtmlStr($newMonitor['AutoStopTimeout']) ?>" size="4"/></td></tr>
             <tr><td><?php echo translate('TrackMotion') ?></td><td><input type="checkbox" name="newMonitor[TrackMotion]" value="1"<?php if ( !empty($newMonitor['TrackMotion']) ) { ?> checked="checked"<?php } ?>/></td></tr>
 <?php
-        $return_options = array(
-            '-1' => translate('None'),
-            '0' => translate('Home'),
-            '1' => translate('Preset')." 1",
-        );
+      $return_options = array(
+          '-1' => translate('None'),
+          '0' => translate('Home'),
+          '1' => translate('Preset')." 1",
+      );
 ?>
             <tr><td><?php echo translate('TrackDelay') ?></td><td><input type="text" name="newMonitor[TrackDelay]" value="<?php echo validHtmlStr($newMonitor['TrackDelay']) ?>" size="4"/></td></tr>
             <tr><td><?php echo translate('ReturnLocation') ?></td><td><?php echo buildSelect( "newMonitor[ReturnLocation]", $return_options ); ?></td></tr>
             <tr><td><?php echo translate('ReturnDelay') ?></td><td><input type="text" name="newMonitor[ReturnDelay]" value="<?php echo validHtmlStr($newMonitor['ReturnDelay']) ?>" size="4"/></td></tr>
 <?php
-        break;
+      break;
     }
-    case 'x10' :
+  case 'x10' :
     {
 ?>
             <tr><td><?php echo translate('X10ActivationString') ?></td><td><input type="text" name="newX10Monitor[Activation]" value="<?php echo validHtmlStr($newX10Monitor['Activation']) ?>" size="20"/></td></tr>
             <tr><td><?php echo translate('X10InputAlarmString') ?></td><td><input type="text" name="newX10Monitor[AlarmInput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmInput']) ?>" size="20"/></td></tr>
             <tr><td><?php echo translate('X10OutputAlarmString') ?></td><td><input type="text" name="newX10Monitor[AlarmOutput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmOutput']) ?>" size="20"/></td></tr>
 <?php
-        break;
+      break;
     }
-    case 'misc' :
+  case 'misc' :
     {
 ?>
             <tr><td><?php echo translate('EventPrefix') ?></td><td><input type="text" name="newMonitor[EventPrefix]" value="<?php echo validHtmlStr($newMonitor['EventPrefix']) ?>" size="24"/></td></tr>
@@ -926,35 +922,36 @@ switch ( $tab ) {
             <tr><td><?php echo translate('FPSReportInterval') ?></td><td><input type="text" name="newMonitor[FPSReportInterval]" value="<?php echo validHtmlStr($newMonitor['FPSReportInterval']) ?>" size="6"/></td></tr>
             <tr><td><?php echo translate('DefaultView') ?></td><td><select name="newMonitor[DefaultView]">
 <?php
-        foreach ( getEnumValues( 'Monitors', 'DefaultView' ) as $opt_view ) {
-          if ( $opt_view == 'Control' && ( !ZM_OPT_CONTROL || !$monitor['Controllable'] ) )
-            continue;
+      foreach ( getEnumValues( 'Monitors', 'DefaultView' ) as $opt_view ) {
+        if ( $opt_view == 'Control' && ( !ZM_OPT_CONTROL || !$monitor['Controllable'] ) )
+          continue;
 ?>
               <option value="<?php echo $opt_view ?>"<?php if ( $opt_view == $newMonitor['DefaultView'] ) { ?> selected="selected"<?php } ?>><?php echo $opt_view ?></option>
 <?php
-        }
+      } // end foreach
 ?>
             </select></td></tr>
             <tr><td><?php echo translate('DefaultRate') ?></td><td><?php echo buildSelect( "newMonitor[DefaultRate]", $rates ); ?></td></tr>
             <tr><td><?php echo translate('DefaultScale') ?></td><td><?php echo buildSelect( "newMonitor[DefaultScale]", $scales ); ?></td></tr>
 <?php
-        if ( ZM_HAS_V4L && $newMonitor['Type'] == 'Local' ) {
+      if ( ZM_HAS_V4L && $newMonitor['Type'] == 'Local' ) {
 ?>
             <tr><td><?php echo translate('SignalCheckColour') ?></td><td><input type="text" name="newMonitor[SignalCheckColour]" value="<?php echo validHtmlStr($newMonitor['SignalCheckColour']) ?>" size="10" onchange="$('SignalCheckSwatch').setStyle( 'backgroundColor', this.value )"/><span id="SignalCheckSwatch" class="swatch" style="background-color: <?php echo $newMonitor['SignalCheckColour'] ?>;">&nbsp;&nbsp;&nbsp;&nbsp;</span></td></tr>
 <?php
-        }
+      }
 ?>
             <tr><td><?php echo translate('WebColour') ?></td><td><input type="text" name="newMonitor[WebColour]" value="<?php echo validHtmlStr($newMonitor['WebColour']) ?>" size="10" onchange="$('WebSwatch').setStyle( 'backgroundColor', this.value )"/><span id="WebSwatch" class="swatch" style="background-color: <?php echo validHtmlStr($newMonitor['WebColour']) ?>;">&nbsp;&nbsp;&nbsp;&nbsp;</span></td></tr>
             <tr><td><?php echo translate('Exif') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_EXIF', 'zmOptionHelp', 'optionhelp', '?' ) ?>) </td><td><input type="checkbox" name="newMonitor[Exif]" value="1"<?php if ( !empty($newMonitor['Exif']) ) { ?> checked="checked"<?php } ?>/></td></tr>
 <?php
-        break;
+      break;
     }
 } // end switch tab
 ?>
           </tbody>
         </table>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo translate('Save') ?>"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
+          <input type="submit" value="<?php echo translate('Save') ?>"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/>
+          <input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
         </div>
         
       </form>

From a940fe429c41ac06c445bcdb61eaab7a1a2ed0f0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 31 May 2017 22:08:05 -0400
Subject: [PATCH 42/56] deprecate the use of the center tag, and only put in
 the development h3 if it has contents

---
 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 628d92859..42251adf0 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -186,7 +186,7 @@ xhtmlHeaders( __FILE__, translate('Console') );
       <h3 id="systemStats"><?php echo translate('Load') ?>: <?php echo getLoad() ?> - <?php echo translate('Disk') ?>: <?php echo getDiskPercent() ?>% - <?php echo ZM_PATH_MAP ?>: <?php echo getDiskPercent(ZM_PATH_MAP) ?>%</h3>
       <h2 id="title"><a href="http://www.zoneminder.com" target="ZoneMinder">ZoneMinder</a> <?php echo translate('Console') ?> - <?php echo makePopupLink( '?view=state', 'zmState', 'state', $status, canEdit( 'System' ) ) ?> - <?php echo $run_state ?> <?php echo makePopupLink( '?view=version', 'zmVersion', 'version', '<span class="'.$versionClass.'">v'.ZM_VERSION.'</span>', canEdit( 'System' ) ) ?></h2>
       <div class="clear"></div>
-      <h3 id="development"><center><?php echo ZM_WEB_CONSOLE_BANNER ?></center></h3>
+      <?php if ( ZM_WEB_CONSOLE_BANNER ) { ?><h3 id="development"><?php echo ZM_WEB_CONSOLE_BANNER ?></h3><?php } ?>
       <div id="monitorSummary"><?php echo makePopupLink( '?view=groups', 'zmGroups', 'groups', sprintf( $CLANG['MonitorCount'], count($displayMonitors), zmVlang( $VLANG['Monitor'], count($displayMonitors) ) ).($group?' ('.$group['Name'].')':''), canView( 'Groups' ) ); ?></div>
 <?php
 if ( ZM_OPT_X10 && canView( 'Devices' ) ) {

From 5c67c871479e9986da8b918202086f06457c39e1 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 31 May 2017 22:08:44 -0400
Subject: [PATCH 43/56] remove deprecated cellspacing attr on table

---
 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 42251adf0..2db165c09 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -222,7 +222,7 @@ if ( ZM_OPT_USE_AUTH ) {
 ?>&nbsp;<?php echo makePopupLink( '?view=bandwidth', 'zmBandwidth', 'bandwidth', $bwArray[$_COOKIE['zmBandwidth']], ($user && $user['MaxBandwidth'] != 'low' ) ) ?> <?php echo translate('BandwidthHead') ?></h3>
     </div>
     <div id="content">
-      <table id="consoleTable" cellspacing="0">
+      <table id="consoleTable">
         <thead>
           <tr>
 <?php if ( ZM_WEB_ID_ON_CONSOLE ) { ?>

From 73ca07792b2398b300cd01ce6ff1f2d4e761380c Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Wed, 31 May 2017 22:11:54 -0400
Subject: [PATCH 44/56] double quotes to single quotes

---
 web/skins/classic/views/console.php | 65 ++++++++++++++---------------
 1 file changed, 31 insertions(+), 34 deletions(-)

diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index 2db165c09..1c5f93c7f 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -23,49 +23,49 @@ $servers = Server::find_all();
 
 $eventCounts = array(
     array(
-        "title" => translate('Events'),
-        "filter" => array(
-            "terms" => array(
+        'title' => translate('Events'),
+        'filter' => array(
+            'terms' => array(
             )
         ),
     ),
     array(
-        "title" => translate('Hour'),
-        "filter" => array(
-            "terms" => array(
-                array( "attr" => "DateTime", "op" => ">=", "val" => "-1 hour" ),
+        'title' => translate('Hour'),
+        'filter' => array(
+            'terms' => array(
+                array( 'attr' => "DateTime", 'op' => ">=", 'val' => "-1 hour" ),
             )
         ),
     ),
     array(
-        "title" => translate('Day'),
-        "filter" => array(
-            "terms" => array(
-                array( "attr" => "DateTime", "op" => ">=", "val" => "-1 day" ),
+        'title' => translate('Day'),
+        'filter' => array(
+            'terms' => array(
+                array( 'attr' => "DateTime", 'op' => ">=", 'val' => "-1 day" ),
             )
         ),
     ),
     array(
-        "title" => translate('Week'),
-        "filter" => array(
-            "terms" => array(
-                array( "attr" => "DateTime", "op" => ">=", "val" => "-7 day" ),
+        'title' => translate('Week'),
+        'filter' => array(
+            'terms' => array(
+                array( 'attr' => "DateTime", 'op' => ">=", 'val' => "-7 day" ),
             )
         ),
     ),
     array(
-        "title" => translate('Month'),
-        "filter" => array(
-            "terms" => array(
-                array( "attr" => "DateTime", "op" => ">=", "val" => "-1 month" ),
+        'title' => translate('Month'),
+        'filter' => array(
+            'terms' => array(
+                array( 'attr' => "DateTime", 'op' => ">=", 'val' => "-1 month" ),
             )
         ),
     ),
     array(
-        "title" => translate('Archived'),
-        "filter" => array(
-            "terms" => array(
-                array( "attr" => "Archived", "op" => "=", "val" => "1" ),
+        'title' => translate('Archived'),
+        'filter' => array(
+            'terms' => array(
+                array( 'attr' => "Archived", 'op' => "=", 'val' => "1" ),
             )
         ),
     ),
@@ -110,12 +110,12 @@ for ( $i = 0; $i < count($monitors); $i++ ) {
   $monitors[$i]['ZoneCount'] = dbFetchOne( 'select count(Id) as ZoneCount from Zones where MonitorId = ?', 'ZoneCount', array($monitors[$i]['Id']) );
   $counts = array();
   for ( $j = 0; $j < count($eventCounts); $j++ ) {
-    $filter = addFilterTerm( $eventCounts[$j]['filter'], count($eventCounts[$j]['filter']['terms']), array( "cnj" => "and", "attr" => "MonitorId", "op" => "=", "val" => $monitors[$i]['Id'] ) );
+    $filter = addFilterTerm( $eventCounts[$j]['filter'], count($eventCounts[$j]['filter']['terms']), array( 'cnj' => 'and', 'attr' => 'MonitorId', 'op' => '=', 'val' => $monitors[$i]['Id'] ) );
     parseFilter( $filter );
-    $counts[] = "count(if(1".$filter['sql'].",1,NULL)) as EventCount$j";
+    $counts[] = 'count(if(1'.$filter['sql'].",1,NULL)) as EventCount$j";
     $monitors[$i]['eventCounts'][$j]['filter'] = $filter;
   }
-  $sql = "select ".join($counts,", ")." from Events as E where MonitorId = ?";
+  $sql = 'select '.join($counts,", ").' from Events as E where MonitorId = ?';
   $counts = dbFetchOne( $sql, NULL, array($monitors[$i]['Id']) );
   if ( $monitors[$i]['Function'] != 'None' ) {
     $cycleCount++;
@@ -208,14 +208,11 @@ if ( canView( 'Stream' ) && $cycleCount > 1 ) {
         <?php echo makePopupLink( '?view=montagereview&amp;group='.$cycleGroup, 'zmMontage'.$cycleGroup, 'montagereview', translate('Montage Review'), $running ) ?>
       </div>
 <?php
-} else {
-?>
-<?php
 }
 ?>
       <h3 id="loginBandwidth"><?php
 if ( ZM_OPT_USE_AUTH ) {
-?><?php echo translate('LoggedInAs') ?> <?php echo makePopupLink( '?view=logout', 'zmLogout', 'logout', $user['Username'], (ZM_AUTH_TYPE == "builtin") ) ?>, <?php echo strtolower( translate('ConfiguredFor') ) ?><?php
+?><?php echo translate('LoggedInAs') ?> <?php echo makePopupLink( '?view=logout', 'zmLogout', 'logout', $user['Username'], (ZM_AUTH_TYPE == 'builtin') ) ?>, <?php echo strtolower( translate('ConfiguredFor') ) ?><?php
 } else {
 ?><?php echo translate('ConfiguredFor') ?><?php
 }
@@ -235,19 +232,19 @@ if ( ZM_OPT_USE_AUTH ) {
 <?php } ?>
             <th class="colSource"><?php echo translate('Source') ?></th>
 <?php
-for ( $i = 0; $i < count($eventCounts); $i++ ) {
+      for ( $i = 0; $i < count($eventCounts); $i++ ) {
 ?>
             <th class="colEvents"><?php echo $eventCounts[$i]['title'] ?></th>
 <?php
-}
+      }
 ?>
             <th class="colZones"><?php echo translate('Zones') ?></th>
 <?php
-if ( canEdit('Monitors') ) {
+      if ( canEdit('Monitors') ) {
 ?>
             <th class="colOrder"><?php echo translate('Order') ?></th>
 <?php
-}
+      }
 ?>
             <th class="colMark"><?php echo translate('Mark') ?></th>
           </tr>

From a1af422d29fccefb2995bb07c531790514b9e07b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 1 Jun 2017 09:35:38 -0400
Subject: [PATCH 45/56] the [filter][terms] etc part needs to be urlencoded as
 well.  Becase [] are not valid in urls.

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

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 023f9fe10..8e0004ea9 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -1241,17 +1241,17 @@ function parseFilter( &$filter, $saveToSession=false, $querySep='&amp;' ) {
   if ( isset($filter['terms']) && count($filter['terms']) ) {
     for ( $i = 0; $i < count($filter['terms']); $i++ ) {
       if ( isset($filter['terms'][$i]['cnj']) ) {
-        $filter['query'] .= $querySep."filter[terms][$i][cnj]=".urlencode($filter['terms'][$i]['cnj']);
-        $filter['sql'] .= " ".$filter['terms'][$i]['cnj']." ";
+        $filter['query'] .= $querySep.urlencode("filter[terms][$i][cnj]").'='.urlencode($filter['terms'][$i]['cnj']);
+        $filter['sql'] .= ' '.$filter['terms'][$i]['cnj'].' ';
         $filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][cnj]\" value=\"".htmlspecialchars($filter['terms'][$i]['cnj'])."\"/>\n";
       }
       if ( isset($filter['terms'][$i]['obr']) ) {
-        $filter['query'] .= $querySep."filter[terms][$i][obr]=".urlencode($filter['terms'][$i]['obr']);
-        $filter['sql'] .= " ".str_repeat( "(", $filter['terms'][$i]['obr'] )." ";
+        $filter['query'] .= $querySep.urlencode("filter[terms][$i][obr]").'='.urlencode($filter['terms'][$i]['obr']);
+        $filter['sql'] .= ' '.str_repeat( '(', $filter['terms'][$i]['obr'] ).' ';
         $filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][obr]\" value=\"".htmlspecialchars($filter['terms'][$i]['obr'])."\"/>\n";
       }
       if ( isset($filter['terms'][$i]['attr']) ) {
-        $filter['query'] .= $querySep."filter[terms][$i][attr]=".urlencode($filter['terms'][$i]['attr']);
+        $filter['query'] .= $querySep.urlencode("filter[terms][$i][attr]").'='.urlencode($filter['terms'][$i]['attr']);
         $filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][attr]\" value=\"".htmlspecialchars($filter['terms'][$i]['attr'])."\"/>\n";
         switch ( $filter['terms'][$i]['attr'] ) {
           case 'MonitorName':
@@ -1335,7 +1335,7 @@ function parseFilter( &$filter, $saveToSession=false, $querySep='&amp;' ) {
           case '>' :
           case '<' :
           case '<=' :
-            $filter['sql'] .= ' '.$filter['terms'][$i]['op']." $value";
+            $filter['sql'] .= ' '.$filter['terms'][$i]['op'].' '. $value;
             break;
           case '=~' :
             $filter['sql'] .= ' regexp '.$value;
@@ -1344,20 +1344,20 @@ function parseFilter( &$filter, $saveToSession=false, $querySep='&amp;' ) {
             $filter['sql'] .= ' not regexp '.$value;
             break;
           case '=[]' :
-            $filter['sql'] .= ' in ('.join( ",", $valueList ).')';
+            $filter['sql'] .= ' in ('.join( ',', $valueList ).')';
             break;
           case '![]' :
             $filter['sql'] .= ' not in ('.join( ',', $valueList ).')';
             break;
         }
 
-        $filter['query'] .= $querySep."filter[terms][$i][op]=".urlencode($filter['terms'][$i]['op']);
+        $filter['query'] .= $querySep.urlencode("filter[terms][$i][op]").'='.urlencode($filter['terms'][$i]['op']);
         $filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][op]\" value=\"".htmlspecialchars($filter['terms'][$i]['op'])."\"/>\n";
-        $filter['query'] .= $querySep."filter[terms][$i][val]=".urlencode($filter['terms'][$i]['val']);
+        $filter['query'] .= $querySep.urlencode("filter[terms][$i][val]").'='.urlencode($filter['terms'][$i]['val']);
         $filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][val]\" value=\"".htmlspecialchars($filter['terms'][$i]['val'])."\"/>\n";
       }
       if ( isset($filter['terms'][$i]['cbr']) ) {
-        $filter['query'] .= $querySep."filter[terms][$i][cbr]=".urlencode($filter['terms'][$i]['cbr']);
+        $filter['query'] .= $querySep.urlencode("filter[terms][$i][cbr]").'='.urlencode($filter['terms'][$i]['cbr']);
         $filter['sql'] .= ' '.str_repeat( ')', $filter['terms'][$i]['cbr'] ).' ';
         $filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][cbr]\" value=\"".htmlspecialchars($filter['terms'][$i]['cbr'])."\"/>\n";
       }

From e47adcf6cc5629c5cffafdf267ca46b6c133c9a5 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 1 Jun 2017 09:36:00 -0400
Subject: [PATCH 46/56] the tfoot has to come after the tbody

---
 web/skins/classic/views/console.php | 54 ++++++++++++++---------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index 1c5f93c7f..8de087281 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -249,26 +249,6 @@ if ( ZM_OPT_USE_AUTH ) {
             <th class="colMark"><?php echo translate('Mark') ?></th>
           </tr>
         </thead>
-        <tfoot>
-          <tr>
-            <td class="colLeftButtons" colspan="<?php echo $left_columns ?>">
-              <input type="button" value="<?php echo translate('Refresh') ?>" onclick="location.reload(true);"/>
-              <input type="button" name="addBtn" value="<?php echo translate('AddNewMonitor') ?>" onclick="addMonitor( this )"/>
-              <!-- <?php echo makePopupButton( '?view=monitor', 'zmMonitor0', 'monitor', translate('AddNewMonitor'), (canEdit( 'Monitors' ) && !$user['MonitorIds']) ) ?> -->
-              <?php echo makePopupButton( '?view=filter&amp;filter[terms][0][attr]=DateTime&amp;filter[terms][0][op]=%3c&amp;filter[terms][0][val]=now', 'zmFilter', 'filter', translate('Filters'), canView( 'Events' ) ) ?>
-            </td>
-<?php
-for ( $i = 0; $i < count($eventCounts); $i++ ) {
-  parseFilter( $eventCounts[$i]['filter'] );
-?>
-            <td class="colEvents"><?php echo makePopupLink( '?view='.$eventsView.'&amp;page=1'.$eventCounts[$i]['filter']['query'], $eventsWindow, $eventsView, $eventCounts[$i]['total'], canView( 'Events' ) ) ?></td>
-<?php
-}
-?>
-            <td class="colZones"><?php echo $zoneCount ?></td>
-            <td class="colRightButtons" colspan="<?php echo canEdit('Monitors')?2:1 ?>"><input type="button" name="editBtn" value="<?php echo translate('Edit') ?>" onclick="editMonitor( this )" disabled="disabled"/><input type="button" name="deleteBtn" value="<?php echo translate('Delete') ?>" onclick="deleteMonitor( this )" disabled="disabled"/></td>
-          </tr>
-        </tfoot>
         <tbody>
 <?php
 foreach( $displayMonitors as $monitor ) {
@@ -276,22 +256,22 @@ foreach( $displayMonitors as $monitor ) {
           <tr>
 <?php
     if ( !$monitor['zmc'] ) {
-      $dclass = "errorText";
+      $dclass = 'errorText';
     } else {
     // https://github.com/ZoneMinder/ZoneMinder/issues/1082
       if ( !$monitor['zma'] && $monitor['Function']!='Monitor' )
-        $dclass = "warnText";
+        $dclass = 'warnText';
       else
-        $dclass = "infoText";
+        $dclass = 'infoText';
     }
     if ( $monitor['Function'] == 'None' )
-      $fclass = "errorText";
+      $fclass = 'errorText';
     //elseif ( $monitor['Function'] == 'Monitor' )
-     //   $fclass = "warnText";
+     //   $fclass = 'warnText';
     else
-      $fclass = "infoText";
+      $fclass = 'infoText';
     if ( !$monitor['Enabled'] )
-      $fclass .= " disabledText";
+      $fclass .= ' disabledText';
     $scale = max( reScale( SCALE_BASE, $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE ), SCALE_BASE );
 ?>
 <?php if ( ZM_WEB_ID_ON_CONSOLE ) { ?>
@@ -345,6 +325,26 @@ echo $Server->Name();
 }
 ?>
         </tbody>
+        <tfoot>
+          <tr>
+            <td class="colLeftButtons" colspan="<?php echo $left_columns ?>">
+              <input type="button" value="<?php echo translate('Refresh') ?>" onclick="location.reload(true);"/>
+              <input type="button" name="addBtn" value="<?php echo translate('AddNewMonitor') ?>" onclick="addMonitor( this )"/>
+              <!-- <?php echo makePopupButton( '?view=monitor', 'zmMonitor0', 'monitor', translate('AddNewMonitor'), (canEdit( 'Monitors' ) && !$user['MonitorIds']) ) ?> -->
+              <?php echo makePopupButton( urlencode('?view=filter&filter[terms][0][attr]=DateTime&filter[terms][0][op]=%3c&filter[terms][0][val]=now'), 'zmFilter', 'filter', translate('Filters'), canView( 'Events' ) ) ?>
+            </td>
+<?php
+for ( $i = 0; $i < count($eventCounts); $i++ ) {
+  parseFilter( $eventCounts[$i]['filter'] );
+?>
+            <td class="colEvents"><?php echo makePopupLink( '?view='.$eventsView.'&amp;page=1'.$eventCounts[$i]['filter']['query'], $eventsWindow, $eventsView, $eventCounts[$i]['total'], canView( 'Events' ) ) ?></td>
+<?php
+}
+?>
+            <td class="colZones"><?php echo $zoneCount ?></td>
+            <td class="colRightButtons" colspan="<?php echo canEdit('Monitors')?2:1 ?>"><input type="button" name="editBtn" value="<?php echo translate('Edit') ?>" onclick="editMonitor( this )" disabled="disabled"/><input type="button" name="deleteBtn" value="<?php echo translate('Delete') ?>" onclick="deleteMonitor( this )" disabled="disabled"/></td>
+          </tr>
+        </tfoot>
       </table>
     </div>
     </form>

From 915450de1318c9d7b6bd313cc29aec8b39b7df1c Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Thu, 1 Jun 2017 17:48:52 -0400
Subject: [PATCH 47/56] spacing and comments

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

diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index b296b6fca..d11ea936e 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -361,7 +361,7 @@ int FfmpegCamera::OpenFfmpeg() {
     Fatal( "Unable to open codec for video stream from %s", mPath.c_str() );
   }
 
-  if (mAudioStreamId >= 0) {
+  if ( mAudioStreamId >= 0 ) {
     mAudioCodecContext = mFormatContext->streams[mAudioStreamId]->codec;
     if ((mAudioCodec = avcodec_find_decoder(mAudioCodecContext->codec_id)) == NULL) {
       Debug(1, "Can't find codec for audio stream from %s", mPath.c_str());
@@ -434,7 +434,7 @@ int FfmpegCamera::OpenFfmpeg() {
   mCanCapture = true;
 
   return 0;
-}
+} // int FfmpegCamera::OpenFfmpeg()
 
 int FfmpegCamera::ReopenFfmpeg() {
 
@@ -689,8 +689,11 @@ else if ( packet.pts && video_last_pts > packet.pts ) {
  
       // The following lines should ensure that the queue always begins with a video keyframe
       if ( packet.stream_index == mAudioStreamId ) {
-        if ( record_audio && packetqueue.size() ) // if it's audio, and we are doing audio, and there is already something in the queue
+Debug(2, "Have audio packet, reocrd_audio is (%d) and packetqueue.size is (%d)", record_audio, packetqueue.size() );
+        if ( record_audio && packetqueue.size() ) { 
+          // if it's audio, and we are doing audio, and there is already something in the queue
           packetqueue.queuePacket( &packet );
+        }
       } else if ( packet.stream_index == mVideoStreamId ) {
         if ( key_frame || packetqueue.size() ) // it's a keyframe or we already have something in the queue
           packetqueue.queuePacket( &packet );

From be5b93a64e90b09c420eae73ff46e778ac09e673 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 2 Jun 2017 11:39:35 -0400
Subject: [PATCH 48/56] whitespace, braces, quotes

---
 scripts/zmfilter.pl.in | 1649 ++++++++++++++++++----------------------
 1 file changed, 751 insertions(+), 898 deletions(-)

diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index a60fc497e..ef4a2a43e 100644
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -27,7 +27,7 @@ zmfilter.pl - ZoneMinder tool to filter events
 
 =head1 SYNOPSIS
 
- zmfilter.pl [-f <filter name>,--filter=<filter name>] | -v, --version
+zmfilter.pl [-f <filter name>,--filter=<filter name>] | -v, --version
 
 =head1 DESCRIPTION
 
@@ -37,8 +37,8 @@ matching events.
 
 =head1 OPTIONS
 
- -f{filter name}, --filter={filter name}  - The name of a specific filter to run
- -v, --version                            - Print ZoneMinder version
+-f{filter name}, --filter={filter name}  - The name of a specific filter to run
+-v, --version                            - Print ZoneMinder version
 
 =cut
 use strict;
@@ -70,60 +70,45 @@ use autouse 'Pod::Usage'=>qw(pod2usage);
 use autouse 'Data::Dumper'=>qw(Dumper);
 
 use constant EVENT_PATH => ($Config{ZM_DIR_EVENTS}=~m|/|)
-             ? $Config{ZM_DIR_EVENTS}
-             : ($Config{ZM_PATH_WEB}.'/'.$Config{ZM_DIR_EVENTS})
-;
+  ? $Config{ZM_DIR_EVENTS}
+  : ($Config{ZM_PATH_WEB}.'/'.$Config{ZM_DIR_EVENTS})
+  ;
 
-logInit();
-logSetSignal();
+  logInit();
+  logSetSignal();
 
-if ( $Config{ZM_OPT_UPLOAD} )
-{
-    # Comment these out if you don't have them and don't want to upload
-    # or don't want to use that format
-    if ( $Config{ZM_UPLOAD_ARCH_FORMAT} eq "zip" )
-    {
-        require Archive::Zip;
-        import Archive::Zip qw( :ERROR_CODES :CONSTANTS );
+  if ( $Config{ZM_OPT_UPLOAD} ) {
+# Comment these out if you don't have them and don't want to upload
+# or don't want to use that format
+    if ( $Config{ZM_UPLOAD_ARCH_FORMAT} eq 'zip' ) {
+      require Archive::Zip;
+      import Archive::Zip qw( :ERROR_CODES :CONSTANTS );
+    } else {
+      require Archive::Tar;
     }
-    else
-    {
-        require Archive::Tar;
-    }
-    if ( $Config{ZM_UPLOAD_PROTOCOL} eq "ftp" )
-    {
-        require Net::FTP;
-    }
-    else
-    {
-        require Net::SFTP::Foreign;
+    if ( $Config{ZM_UPLOAD_PROTOCOL} eq 'ftp' ) {
+      require Net::FTP;
+    } else {
+      require Net::SFTP::Foreign;
     }
+  }
+
+if ( $Config{ZM_OPT_EMAIL} ) {
+  if ( $Config{ZM_NEW_MAIL_MODULES} ) {
+    require MIME::Lite;
+    require Net::SMTP;
+  } else {
+    require MIME::Entity;
+  }
 }
 
-if ( $Config{ZM_OPT_EMAIL} )
-{
-    if ( $Config{ZM_NEW_MAIL_MODULES} )
-    {
-        require MIME::Lite;
-        require Net::SMTP;
-    }
-    else
-    {
-        require MIME::Entity;
-    }
-}
-
-if ( $Config{ZM_OPT_MESSAGE} )
-{
-    if ( $Config{ZM_NEW_MAIL_MODULES} )
-    {
-        require MIME::Lite;
-        require Net::SMTP;
-    }
-    else
-    {
-        require MIME::Entity;
-    }
+if ( $Config{ZM_OPT_MESSAGE} ) {
+  if ( $Config{ZM_NEW_MAIL_MODULES} ) {
+    require MIME::Lite;
+    require Net::SMTP;
+  } else {
+    require MIME::Entity;
+  }
 }
 
 $| = 1;
@@ -134,7 +119,7 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
 my $delay = $Config{ZM_FILTER_EXECUTE_INTERVAL};
 my $event_id = 0;
-my $filter_parm = "";
+my $filter_parm = '';
 my $version = 0;
 
 #
@@ -142,925 +127,793 @@ my $version = 0;
 GetOptions(
     'filter=s'      =>\$filter_parm,
     'version'       =>\$version
-) or pod2usage(-exitstatus => -1);
+    ) or pod2usage(-exitstatus => -1);
 
 if ( $version ) {
-    print ZoneMinder::Base::ZM_VERSION . "\n";
-    exit(0);
+  print ZoneMinder::Base::ZM_VERSION . '\n';
+  exit(0);
 }
 
 if ( ! EVENT_PATH ) {
-    Error( "No event path defined. Config was $Config{ZM_DIR_EVENTS}\n" );
-    die;
+  Error( "No event path defined. Config was $Config{ZM_DIR_EVENTS}\n" );
+  die;
 }
 
 chdir( EVENT_PATH );
 
 my $dbh = zmDbConnect();
 
-if ( $filter_parm )
-{
-    Info( "Scanning for events using filter '$filter_parm'\n" );
-}
-else
-{
-    Info( "Scanning for events\n" );
+if ( $filter_parm ) {
+  Info( "Scanning for events using filter '$filter_parm'\n" );
+} else {
+  Info( "Scanning for events\n" );
 }
 
-if ( !$filter_parm )
-{
-    sleep( START_DELAY );
+if ( !$filter_parm ) {
+  sleep( START_DELAY );
 }
 
 my $filters;
 my $last_action = 0;
 
-while( 1 )
-{
-    my $now = time;
-    if ( ($now - $last_action) > $Config{ZM_FILTER_RELOAD_DELAY} )
-    {
-        Debug( "Reloading filters\n" );
-        $last_action = $now;
-        $filters = getFilters( $filter_parm );
-    }
+while( 1 ) {
+  my $now = time;
+  if ( ($now - $last_action) > $Config{ZM_FILTER_RELOAD_DELAY} ) {
+    Debug( "Reloading filters\n" );
+    $last_action = $now;
+    $filters = getFilters( $filter_parm );
+  }
 
-    foreach my $filter ( @$filters )
-    {
-        checkFilter( $filter );
-    }
+  foreach my $filter ( @$filters ) {
+    checkFilter( $filter );
+  }
 
-    last if ( $filter_parm );
+  last if ( $filter_parm );
 
-    Debug( "Sleeping for $delay seconds\n" );
-    sleep( $delay );
+  Debug( "Sleeping for $delay seconds\n" );
+  sleep( $delay );
 }
 
-sub getFilters
-{
-    my $filter_name = shift;
+sub getFilters {
+  my $filter_name = shift;
 
-    my @filters;
-    my $sql = "SELECT * FROM Filters WHERE";
-    if ( $filter_name )
-    {
-        $sql .= " Name = ? and";
-    }
-    else
-    {
-        $sql .= " Background = 1 and";
-    }
-    $sql .= "(  AutoArchive = 1
-                or AutoVideo = 1
-                or AutoUpload = 1
-                or AutoEmail = 1
-                or AutoMessage = 1
-                or AutoExecute = 1
-                or AutoDelete = 1
-             ) ORDER BY Name";
-    my $sth = $dbh->prepare_cached( $sql )
+  my @filters;
+  my $sql = 'SELECT * FROM Filters WHERE';
+  if ( $filter_name ) {
+    $sql .= ' Name = ? and';
+  } else {
+    $sql .= ' Background = 1 and';
+  }
+  $sql .= '(  AutoArchive = 1
+    or AutoVideo = 1
+    or AutoUpload = 1
+    or AutoEmail = 1
+    or AutoMessage = 1
+    or AutoExecute = 1
+    or AutoDelete = 1
+    ) ORDER BY Name';
+  my $sth = $dbh->prepare_cached( $sql )
+    or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+  my $res;
+  if ( $filter_name ) {
+    $res = $sth->execute( $filter_name )
+      or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+  } else {
+    $res = $sth->execute()
+      or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+  }
+FILTER: while( my $db_filter = $sth->fetchrow_hashref() ) {
+          my $filter = new ZoneMinder::Filter( $$db_filter{Id}, $db_filter );
+          Debug( "Found filter '$db_filter->{Name}'\n" );
+          my $sql = $filter->Sql();
+
+          if ( ! $sql ) {
+            Error( "Error parsing Sql. skipping filter '$db_filter->{Name}'\n" );
+            next FILTER;
+          }
+          push( @filters, $filter );
+        }
+        $sth->finish();
+        Debug( 'Got ' . @filters . ' filters' );
+        return( \@filters );
+}
+
+sub checkFilter {
+  my $filter = shift;
+
+  Debug( "Checking filter '$filter->{Name}'".
+      ($filter->{AutoDelete}?', delete':'').
+      ($filter->{AutoArchive}?', archive':'').
+      ($filter->{AutoVideo}?', video':'').
+      ($filter->{AutoUpload}?', upload':'').
+      ($filter->{AutoEmail}?', email':'').
+      ($filter->{AutoMessage}?', message':'').
+      ($filter->{AutoExecute}?', execute':'').
+      '\n'
+      );
+
+  foreach my $event ( $filter->Execute() ) {
+    Debug( "Checking event $event->{Id}\n" );
+    my $delete_ok = !undef;
+    $dbh->ping();
+    if ( $filter->{AutoArchive} ) {
+      Info( "Archiving event $event->{Id}\n" );
+# Do it individually to avoid locking up the table for new events
+      my $sql = 'update Events set Archived = 1 where Id = ?';
+      my $sth = $dbh->prepare_cached( $sql )
         or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-    my $res;
-    if ( $filter_name )
-    {
-        $res = $sth->execute( $filter_name )
-            or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+      my $res = $sth->execute( $event->{Id} )
+        or Error( "Can't execute '$sql': ".$sth->errstr() );
     }
-    else
-    {
-        $res = $sth->execute()
-            or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+    if ( $Config{ZM_OPT_FFMPEG} && $filter->{AutoVideo} ) {
+      if ( !$event->{Videoed} ) {
+        $delete_ok = undef if ( !generateVideo( $filter, $event ) );
+      }
     }
-    FILTER: while( my $db_filter = $sth->fetchrow_hashref() )
-    {
-		my $filter = new ZoneMinder::Filter( $$db_filter{Id}, $db_filter );
-        Debug( "Found filter '$db_filter->{Name}'\n" );
-		my $sql = $filter->Sql();
-
-		if ( ! $sql ) {
-			Error( "Error parsing Sql. skipping filter '$db_filter->{Name}'\n" );
-			next FILTER;
-		}
-		push( @filters, $filter );
+    if ( $Config{ZM_OPT_EMAIL} && $filter->{AutoEmail} ) {
+      if ( !$event->{Emailed} ) {
+        $delete_ok = undef if ( !sendEmail( $filter, $event ) );
+      }
     }
-    $sth->finish();
-	Debug( "Got " . @filters . " filters" );
-    return( \@filters );
-}
-
-sub checkFilter
-{
-    my $filter = shift;
-
-    Debug( "Checking filter '$filter->{Name}'".
-        ($filter->{AutoDelete}?", delete":"").
-        ($filter->{AutoArchive}?", archive":"").
-        ($filter->{AutoVideo}?", video":"").
-        ($filter->{AutoUpload}?", upload":"").
-        ($filter->{AutoEmail}?", email":"").
-        ($filter->{AutoMessage}?", message":"").
-        ($filter->{AutoExecute}?", execute":"").
-        "\n"
-    );
-
-	foreach my $event ( $filter->Execute() ) {
-        Debug( "Checking event $event->{Id}\n" );
-        my $delete_ok = !undef;
-$dbh->ping();
-        if ( $filter->{AutoArchive} )
-        {
-            Info( "Archiving event $event->{Id}\n" );
-            # Do it individually to avoid locking up the table for new events
-            my $sql = "update Events set Archived = 1 where Id = ?";
-            my $sth = $dbh->prepare_cached( $sql )
-                or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-            my $res = $sth->execute( $event->{Id} )
-                or Error( "Can't execute '$sql': ".$sth->errstr() );
-        }
-        if ( $Config{ZM_OPT_FFMPEG} && $filter->{AutoVideo} )
-        {
-            if ( !$event->{Videoed} )
-            {
-                $delete_ok = undef if ( !generateVideo( $filter, $event ) );
-            }
-        }
-        if ( $Config{ZM_OPT_EMAIL} && $filter->{AutoEmail} )
-        {
-            if ( !$event->{Emailed} )
-            {
-                $delete_ok = undef if ( !sendEmail( $filter, $event ) );
-            }
-        }
-        if ( $Config{ZM_OPT_MESSAGE} && $filter->{AutoMessage} )
-        {
-            if ( !$event->{Messaged} )
-            {
-                $delete_ok = undef if ( !sendMessage( $filter, $event ) );
-            }
-        }
-        if ( $Config{ZM_OPT_UPLOAD} && $filter->{AutoUpload} )
-        {
-            if ( !$event->{Uploaded} )
-            {
-                $delete_ok = undef if ( !uploadArchFile( $filter, $event ) );
-            }
-        }
-        if ( $filter->{AutoExecute} )
-        {
-            if ( !$event->{Executed} )
-            {
-                $delete_ok = undef if ( !executeCommand( $filter, $event ) );
-            }
-        }
-        if ( $filter->{AutoDelete} )
-        {
-            if ( $delete_ok )
-            {
-                Info( "Deleting event $event->{Id} from Monitor $event->{MonitorId}\n" );
-                # Do it individually to avoid locking up the table for new events
-                my $sql = "delete from Events where Id = ?";
-                my $sth = $dbh->prepare_cached( $sql )
-                    or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-                my $res = $sth->execute( $event->{Id} )
-                    or Fatal( "Can't execute '$sql': ".$sth->errstr() );
-
-                if ( ! $Config{ZM_OPT_FAST_DELETE} )
-                {
-                    my $sql = "delete from Frames where EventId = ?";
-                    my $sth = $dbh->prepare_cached( $sql )
-                        or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-                    my $res = $sth->execute( $event->{Id} )
-                        or Fatal( "Can't execute '$sql': ".$sth->errstr() );
-
-                    $sql = "delete from Stats where EventId = ?";
-                    $sth = $dbh->prepare_cached( $sql )
-                        or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-                    $res = $sth->execute( $event->{Id} )
-                        or Fatal( "Can't execute '$sql': ".$sth->errstr() );
-
-                    deleteEventFiles( $event->{Id}, $event->{MonitorId} );
-                }
-            }
-            else
-            {
-                Error( "Unable to delete event $event->{Id} as previous operations failed\n" );
-            }
-        }
+    if ( $Config{ZM_OPT_MESSAGE} && $filter->{AutoMessage} ) {
+      if ( !$event->{Messaged} ) {
+        $delete_ok = undef if ( !sendMessage( $filter, $event ) );
+      }
     }
-}
-
-sub generateVideo
-{
-    my $filter = shift;
-    my $event = shift;
-    my $phone = shift;
-
-    my $rate = $event->{DefaultRate}/100;
-    my $scale = $event->{DefaultScale}/100;
-    my $format;
-
-    my @ffmpeg_formats = split( /\s+/, $Config{ZM_FFMPEG_FORMATS} );
-    my $default_video_format;
-    my $default_phone_format;
-    foreach my $ffmpeg_format( @ffmpeg_formats )
-    {
-        if ( $ffmpeg_format =~ /^(.+)\*\*$/ )
-        {
-            $default_phone_format = $1;
-        }
-        elsif ( $ffmpeg_format =~ /^(.+)\*$/ )
-        {
-            $default_video_format = $1;
-        }
+    if ( $Config{ZM_OPT_UPLOAD} && $filter->{AutoUpload} ) {
+      if ( !$event->{Uploaded} ) {
+        $delete_ok = undef if ( !uploadArchFile( $filter, $event ) );
+      }
     }
-
-    if ( $phone && $default_phone_format )
-    {
-        $format = $default_phone_format;
+    if ( $filter->{AutoExecute} ) {
+      if ( !$event->{Executed} ) {
+        $delete_ok = undef if ( !executeCommand( $filter, $event ) );
+      }
     }
-    elsif ( $default_video_format )
-    {
-        $format = $default_video_format;
-    }
-    else
-    {
-        $format = $ffmpeg_formats[0];
-    }
-
-    my $command = $Config{ZM_PATH_BIN}."/zmvideo.pl -e "
-                  .$event->{Id}." -r ".$rate." -s ".$scale." -f ".$format;
-    my $output = qx($command);
-    chomp( $output );
-    my $status = $? >> 8;
-    if ( $status || logDebugging() )
-    {
-        Debug( "Output: $output\n" );
-    }
-    if ( $status )
-    {
-        Error( "Video generation '$command' failed with status: $status\n" );
-        if ( wantarray() )
-        {
-            return( undef, undef );
-        }
-        return( 0 );
-    }
-    else
-    {
-        my $sql = "update Events set Videoed = 1 where Id = ?";
+    if ( $filter->{AutoDelete} ) {
+      if ( $delete_ok ) {
+        Info( "Deleting event $event->{Id} from Monitor $event->{MonitorId}\n" );
+# Do it individually to avoid locking up the table for new events
+        my $sql = 'delete from Events where Id = ?';
         my $sth = $dbh->prepare_cached( $sql )
-            or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+          or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
         my $res = $sth->execute( $event->{Id} )
+          or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+
+        if ( ! $Config{ZM_OPT_FAST_DELETE} ) {
+          my $sql = 'delete from Frames where EventId = ?';
+          my $sth = $dbh->prepare_cached( $sql )
+            or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+          my $res = $sth->execute( $event->{Id} )
             or Fatal( "Can't execute '$sql': ".$sth->errstr() );
-        if ( wantarray() )
-        {
-            return( $format, $output );
+
+          $sql = 'delete from Stats where EventId = ?';
+          $sth = $dbh->prepare_cached( $sql )
+            or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+          $res = $sth->execute( $event->{Id} )
+            or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+
+          deleteEventFiles( $event->{Id}, $event->{MonitorId} );
         }
+      } else {
+        Error( "Unable to delete event $event->{Id} as previous operations failed\n" );
+      }
     }
-    return( 1 );
+  }
+}
+
+sub generateVideo {
+  my $filter = shift;
+  my $event = shift;
+  my $phone = shift;
+
+  my $rate = $event->{DefaultRate}/100;
+  my $scale = $event->{DefaultScale}/100;
+  my $format;
+
+  my @ffmpeg_formats = split( /\s+/, $Config{ZM_FFMPEG_FORMATS} );
+  my $default_video_format;
+  my $default_phone_format;
+  foreach my $ffmpeg_format( @ffmpeg_formats ) {
+    if ( $ffmpeg_format =~ /^(.+)\*\*$/ ) {
+      $default_phone_format = $1;
+    } elsif ( $ffmpeg_format =~ /^(.+)\*$/ ) {
+      $default_video_format = $1;
+    }
+  }
+
+  if ( $phone && $default_phone_format ) {
+    $format = $default_phone_format;
+  } elsif ( $default_video_format ) {
+    $format = $default_video_format;
+  } else {
+    $format = $ffmpeg_formats[0];
+  }
+
+  my $command = join('',
+      $Config{ZM_PATH_BIN},
+      '/zmvideo.pl -e ',
+      .$event->{Id},
+      ' -r ',$rate,' -s ',$scale,' -f ',$format,
+      );
+  my $output = qx($command);
+  chomp( $output );
+  my $status = $? >> 8;
+  if ( $status || logDebugging() ) {
+    Debug( "Output: $output\n" );
+  }
+  if ( $status ) {
+    Error( "Video generation '$command' failed with status: $status\n" );
+    if ( wantarray() ) {
+      return( undef, undef );
+    }
+    return( 0 );
+  } else {
+    my $sql = 'update Events set Videoed = 1 where Id = ?';
+    my $sth = $dbh->prepare_cached( $sql )
+      or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+    my $res = $sth->execute( $event->{Id} )
+      or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+    if ( wantarray() ) {
+      return( $format, $output );
+    }
+  }
+  return( 1 );
 }
 
 # Returns an image absolute path for given event and frame
 # Optionally an analyse image path may be returned if an analyse image exists
 # If neither capture nor analyse image exists it will try to extract a frame from .mp4 file if exists
 # An empty string is returned if no one from methods above works
-sub generateImage
-{
-    my $event = shift;
-    my $frame = shift;
-    my $analyse = do { @_ ? shift : 0 }; # don't return analyse image by default
+sub generateImage {
+  my $event = shift;
+  my $frame = shift;
+  my $analyse = do { @_ ? shift : 0 }; # don't return analyse image by default
 
-    my $capture_image_path = sprintf("%s/%0".$Config{ZM_EVENT_IMAGE_DIGITS}."d-capture.jpg", getEventPath($event), $frame->{FrameId});
-    my $analyse_image_path = sprintf("%s/%0".$Config{ZM_EVENT_IMAGE_DIGITS}."d-analyse.jpg", getEventPath($event), $frame->{FrameId}) if $analyse;
-    my $video_path =  sprintf("%s/%d-video.mp4", getEventPath($event), $event->{Id});
-    my $image_path = "";
+  my $capture_image_path = sprintf('%s/%0'.$Config{ZM_EVENT_IMAGE_DIGITS}.'d-capture.jpg', getEventPath($event), $frame->{FrameId});
+  my $analyse_image_path = sprintf('%s/%0'.$Config{ZM_EVENT_IMAGE_DIGITS}.'d-analyse.jpg', getEventPath($event), $frame->{FrameId}) if $analyse;
+  my $video_path =  sprintf('%s/%d-video.mp4', getEventPath($event), $event->{Id});
+  my $image_path = '';
 
-    # check if the image file exists. If the file doesn't exist and we use H264 try to extract it from .mp4 video
-    if ( $analyse && -r $analyse_image_path ) {
-        $image_path = $analyse_image_path;
-    } elsif ( -r $capture_image_path ) {
-        $image_path = $capture_image_path;
-    } elsif ( -e $video_path ) {
-        if ( !system("ffmpeg -y -v 0 -i ".$video_path." -vf 'select=gte(n\\,".$frame->{FrameId}."),setpts=PTS-STARTPTS' -vframes 1 -f image2 ".$capture_image_path) ) {
-            $image_path = $capture_image_path;
-        }
+# check if the image file exists. If the file doesn't exist and we use H264 try to extract it from .mp4 video
+  if ( $analyse && -r $analyse_image_path ) {
+    $image_path = $analyse_image_path;
+  } elsif ( -r $capture_image_path ) {
+    $image_path = $capture_image_path;
+  } elsif ( -e $video_path ) {
+    if ( !system('ffmpeg -y -v 0 -i '.$video_path." -vf 'select=gte(n\\,".$frame->{FrameId}."),setpts=PTS-STARTPTS' -vframes 1 -f image2 ".$capture_image_path) ) {
+      $image_path = $capture_image_path;
     }
-    return $image_path;
+  }
+  return $image_path;
 }
 
 
-sub uploadArchFile
-{
-    my $filter = shift;
-    my $event = shift;
+sub uploadArchFile {
+  my $filter = shift;
+  my $event = shift;
 
-    if ( ! $Config{ZM_UPLOAD_HOST} )
-    {
-        Error( "Cannot upload archive as no upload host defined" );
-        return( 0 );
-    }
+  if ( ! $Config{ZM_UPLOAD_HOST} ) {
+    Error( 'Cannot upload archive as no upload host defined' );
+    return( 0 );
+  }
 
-    my $archFile = $event->{MonitorName}.'-'.$event->{Id};
-    my $archImagePath = getEventPath( $event )
-                       ."/"
-                       .(
-                            ( $Config{ZM_UPLOAD_ARCH_ANALYSE} )
-                            ? '{*analyse,*capture}'
-                            : '*capture'
-                        )
-                       .".jpg"
+  my $archFile = $event->{MonitorName}.'-'.$event->{Id};
+  my $archImagePath = getEventPath( $event )
+    .'/'
+    .(
+        ( $Config{ZM_UPLOAD_ARCH_ANALYSE} )
+        ? '{*analyse,*capture}'
+        : '*capture'
+     )
+    .'.jpg'
     ;
-    my @archImageFiles = glob($archImagePath);
-    my $archLocPath;
+  my @archImageFiles = glob($archImagePath);
+  my $archLocPath;
 
-    my $archError = 0;
-    if ( $Config{ZM_UPLOAD_ARCH_FORMAT} eq "zip" )
-    {
-        $archFile .= '.zip';
-        $archLocPath = $Config{ZM_UPLOAD_LOC_DIR}.'/'.$archFile;
-        my $zip = Archive::Zip->new();
-        Info( "Creating upload file '$archLocPath', ".int(@archImageFiles)." files\n" );
+  my $archError = 0;
+  if ( $Config{ZM_UPLOAD_ARCH_FORMAT} eq 'zip' ) {
+    $archFile .= '.zip';
+    $archLocPath = $Config{ZM_UPLOAD_LOC_DIR}.'/'.$archFile;
+    my $zip = Archive::Zip->new();
+    Info( "Creating upload file '$archLocPath', ".int(@archImageFiles)." files\n" );
 
-        my $status = &AZ_OK;
-        foreach my $imageFile ( @archImageFiles )
-        {
-            Debug( "Adding $imageFile\n" );
-            my $member = $zip->addFile( $imageFile );
-            if ( !$member )
-            {
-                Error( "Unable to add image file $imageFile to zip archive $archLocPath" );
-                $archError = 1;
-                last;
-            }
-            $member->desiredCompressionMethod( $Config{ZM_UPLOAD_ARCH_COMPRESS}
-                                               ? &COMPRESSION_DEFLATED
-                                               : &COMPRESSION_STORED
-            );
-        }
-        if ( !$archError )
-        {
-            $status = $zip->writeToFileNamed( $archLocPath );
-
-            if ( $archError = ($status != &AZ_OK) )
-            {
-                Error( "Zip error: $status\n " );
-            }
-        }
-        else
-        {
-            Error( "Error adding images to zip archive $archLocPath, not writing" );
-        }
+    my $status = &AZ_OK;
+    foreach my $imageFile ( @archImageFiles ) {
+      Debug( "Adding $imageFile\n" );
+      my $member = $zip->addFile( $imageFile );
+      if ( !$member ) {
+        Error( "Unable to add image file $imageFile to zip archive $archLocPath" );
+        $archError = 1;
+        last;
+      }
+      $member->desiredCompressionMethod( $Config{ZM_UPLOAD_ARCH_COMPRESS}
+          ? &COMPRESSION_DEFLATED
+          : &COMPRESSION_STORED
+          );
     }
-    elsif ( $Config{ZM_UPLOAD_ARCH_FORMAT} eq "tar" )
-    {
-        if ( $Config{ZM_UPLOAD_ARCH_COMPRESS} )
-        {
-            $archFile .= '.tar.gz';
-        }
-        else
-        {
-            $archFile .= '.tar';
-        }
-        $archLocPath = $Config{ZM_UPLOAD_LOC_DIR}.'/'.$archFile;
-        Info( "Creating upload file '$archLocPath', ".int(@archImageFiles)." files\n" );
+    if ( !$archError ) {
+      $status = $zip->writeToFileNamed( $archLocPath );
 
-        if ( $archError = !Archive::Tar->create_archive(
-                                $archLocPath,
-                                $Config{ZM_UPLOAD_ARCH_COMPRESS},
-                                @archImageFiles
-                          )
-           )
-        {
-            Error( "Tar error: ".Archive::Tar->error()."\n " );
-        }
+      if ( $archError = ($status != &AZ_OK) ) {
+        Error( "Zip error: $status\n " );
+      }
+    } else {
+      Error( "Error adding images to zip archive $archLocPath, not writing" );
     }
+  } elsif ( $Config{ZM_UPLOAD_ARCH_FORMAT} eq 'tar' ) {
+    if ( $Config{ZM_UPLOAD_ARCH_COMPRESS} ) {
+      $archFile .= '.tar.gz';
+    } else {
+      $archFile .= '.tar';
+    }
+    $archLocPath = $Config{ZM_UPLOAD_LOC_DIR}.'/'.$archFile;
+    Info( "Creating upload file '$archLocPath', ".int(@archImageFiles)." files\n" );
 
-    if ( $archError )
-    {
+    if ( $archError = !Archive::Tar->create_archive(
+          $archLocPath,
+          $Config{ZM_UPLOAD_ARCH_COMPRESS},
+          @archImageFiles
+          )
+       ) {
+      Error( 'Tar error: '.Archive::Tar->error()."\n " );
+    }
+  }
+
+  if ( $archError ) {
+    return( 0 );
+  } else {
+    if ( $Config{ZM_UPLOAD_PROTOCOL} eq 'ftp' ) {
+      Info( 'Uploading to '.$Config{ZM_UPLOAD_HOST}." using FTP\n" );
+      my $ftp = Net::FTP->new(
+          $Config{ZM_UPLOAD_HOST},
+          Timeout=>$Config{ZM_UPLOAD_TIMEOUT},
+          Passive=>$Config{ZM_UPLOAD_FTP_PASSIVE},
+          Debug=>$Config{ZM_UPLOAD_DEBUG}
+          );
+      if ( !$ftp ) {
+        Error( "Can't create FTP connection: $@" );
         return( 0 );
-    }
-    else
-    {
-        if ( $Config{ZM_UPLOAD_PROTOCOL} eq "ftp" )
-        {
-            Info( "Uploading to ".$Config{ZM_UPLOAD_HOST}." using FTP\n" );
-            my $ftp = Net::FTP->new(
-                $Config{ZM_UPLOAD_HOST},
-                Timeout=>$Config{ZM_UPLOAD_TIMEOUT},
-                Passive=>$Config{ZM_UPLOAD_FTP_PASSIVE},
-                Debug=>$Config{ZM_UPLOAD_DEBUG}
-            );
-            if ( !$ftp )
-            {
-                Error( "Can't create FTP connection: $@" );
-                return( 0 );
-            }
-            $ftp->login( $Config{ZM_UPLOAD_USER}, $Config{ZM_UPLOAD_PASS} )
-                or Error( "FTP - Can't login" );
-            $ftp->binary()
-                or Error( "FTP - Can't go binary" );
-            $ftp->cwd( $Config{ZM_UPLOAD_REM_DIR} )
-                or Error( "FTP - Can't cwd" )
-                if ( $Config{ZM_UPLOAD_REM_DIR} );
-            $ftp->put( $archLocPath )
-                or Error( "FTP - Can't upload '$archLocPath'" );
-            $ftp->quit()
-                or Error( "FTP - Can't quit" );
-        }
-        else
-        {
-            my $host = $Config{ZM_UPLOAD_HOST};
-            $host .= ":".$Config{ZM_UPLOAD_PORT}
-                if $Config{ZM_UPLOAD_PORT};
-            Info( "Uploading to ".$host." using SFTP\n" );
-            my %sftpOptions = ( host=>$Config{ZM_UPLOAD_HOST}, user=>$Config{ZM_UPLOAD_USER} );
-            $sftpOptions{password} = $Config{ZM_UPLOAD_PASS}
-                if $Config{ZM_UPLOAD_PASS};
-            $sftpOptions{port} = $Config{ZM_UPLOAD_PORT}
-                if $Config{ZM_UPLOAD_PORT};
-            $sftpOptions{timeout} = $Config{ZM_UPLOAD_TIMEOUT}
-                if $Config{ZM_UPLOAD_TIMEOUT};
-            my @more_ssh_args;
-            push @more_ssh_args, '-o'=>'StrictHostKeyChecking=no'
-		if ! $Config{ZM_UPLOAD_STRICT};
-            push @more_ssh_args, '-v'
-                if $Config{ZM_UPLOAD_DEBUG};
-            $sftpOptions{more} = [@more_ssh_args];
-            my $sftp = Net::SFTP::Foreign->new( $Config{ZM_UPLOAD_HOST}, %sftpOptions );
-            if ( $sftp->error )
-            {
-                Error( "Can't create SFTP connection: ".$sftp->error );
-                return( 0 );
-            }
-            $sftp->setcwd( $Config{ZM_UPLOAD_REM_DIR} )
-                or Error( "SFTP - Can't setcwd: ".$sftp->error )
-                if $Config{ZM_UPLOAD_REM_DIR};
-            $sftp->put( $archLocPath, $archFile )
-                or Error( "SFTP - Can't upload '$archLocPath': ".$sftp->error );
-        }
-        unlink( $archLocPath );
-        my $sql = "update Events set Uploaded = 1 where Id = ?";
-        my $sth = $dbh->prepare_cached( $sql )
-            or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute( $event->{Id} )
-            or Fatal( "Can't execute '$sql': ".$sth->errstr() );
-    }
-    return( 1 );
-}
-
-sub substituteTags
-{
-    my $text = shift;
-    my $filter = shift;
-    my $event = shift;
-    my $attachments_ref = shift;
-
-    # First we'd better check what we need to get
-    # We have a filter and an event, do we need any more
-    # monitor information?
-    my $need_monitor = $text =~ /%(?:MET|MEH|MED|MEW|MEN|MEA)%/;
-
-    my $monitor = {};
-    if ( $need_monitor )
-    {
-        my $db_now = strftime( "%Y-%m-%d %H:%M:%S", localtime() );
-        my $sql = "SELECT
-            M.Id,
-            count(E.Id) as EventCount,
-            count(if(E.Archived,1,NULL))
-                as ArchEventCount,
-            count(if(E.StartTime>'$db_now' - INTERVAL 1 HOUR && E.Archived = 0,1,NULL))
-                as HourEventCount,
-            count(if(E.StartTime>'$db_now' - INTERVAL 1 DAY && E.Archived = 0,1,NULL))
-                as DayEventCount,
-            count(if(E.StartTime>'$db_now' - INTERVAL 7 DAY && E.Archived = 0,1,NULL))
-                as WeekEventCount,
-            count(if(E.StartTime>'$db_now' - INTERVAL 1 MONTH && E.Archived = 0,1,NULL))
-                as MonthEventCount
-            FROM Monitors as M LEFT JOIN Events as E on E.MonitorId = M.Id
-            WHERE MonitorId = ?
-            GROUP BY E.MonitorId
-            ORDER BY Id"
-        ;
-        my $sth = $dbh->prepare_cached( $sql )
-            or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute( $event->{MonitorId} )
-            or Fatal( "Can't execute '$sql': ".$sth->errstr() );
-        $monitor = $sth->fetchrow_hashref();
-        $sth->finish();
-        return() if ( !$monitor );
-    }
-
-    # Do we need the image information too?
-    my $need_images = $text =~ /%(?:EPI1|EPIM|EI1|EIM|EI1A|EIMA)%/;
-    my $first_alarm_frame;
-    my $max_alarm_frame;
-    my $max_alarm_score = 0;
-    if ( $need_images )
-    {
-        my $sql = "SELECT * FROM Frames
-                   WHERE EventId = ? AND Type = 'Alarm'
-                   ORDER BY FrameId"
-        ;
-        my $sth = $dbh->prepare_cached( $sql )
-            or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute( $event->{Id} )
-            or Fatal( "Can't execute '$sql': ".$sth->errstr() );
-        while( my $frame = $sth->fetchrow_hashref() )
-        {
-            if ( !$first_alarm_frame )
-            {
-                $first_alarm_frame = $frame;
-            }
-            if ( $frame->{Score} > $max_alarm_score )
-            {
-                $max_alarm_frame = $frame;
-                $max_alarm_score = $frame->{Score};
-            }
-        }
-        $sth->finish();
-    }
-
-    my $url = $Config{ZM_URL};
-    $text =~ s/%ZP%/$url/g;
-    $text =~ s/%MN%/$event->{MonitorName}/g;
-    $text =~ s/%MET%/$monitor->{EventCount}/g;
-    $text =~ s/%MEH%/$monitor->{HourEventCount}/g;
-    $text =~ s/%MED%/$monitor->{DayEventCount}/g;
-    $text =~ s/%MEW%/$monitor->{WeekEventCount}/g;
-    $text =~ s/%MEM%/$monitor->{MonthEventCount}/g;
-    $text =~ s/%MEA%/$monitor->{ArchEventCount}/g;
-    $text =~ s/%MP%/$url?view=watch&mid=$event->{MonitorId}/g;
-    $text =~ s/%MPS%/$url?view=watchfeed&mid=$event->{MonitorId}&mode=stream/g;
-    $text =~ s/%MPI%/$url?view=watchfeed&mid=$event->{MonitorId}&mode=still/g;
-    $text =~ s/%EP%/$url?view=event&mid=$event->{MonitorId}&eid=$event->{Id}/g;
-    $text =~ s/%EPS%/$url?view=event&mode=stream&mid=$event->{MonitorId}&eid=$event->{Id}/g;
-    $text =~ s/%EPI%/$url?view=event&mode=still&mid=$event->{MonitorId}&eid=$event->{Id}/g;
-    $text =~ s/%EI%/$event->{Id}/g;
-    $text =~ s/%EN%/$event->{Name}/g;
-    $text =~ s/%EC%/$event->{Cause}/g;
-    $text =~ s/%ED%/$event->{Notes}/g;
-    $text =~ s/%ET%/$event->{StartTime}/g;
-    $text =~ s/%EL%/$event->{Length}/g;
-    $text =~ s/%EF%/$event->{Frames}/g;
-    $text =~ s/%EFA%/$event->{AlarmFrames}/g;
-    $text =~ s/%EST%/$event->{TotScore}/g;
-    $text =~ s/%ESA%/$event->{AvgScore}/g;
-    $text =~ s/%ESM%/$event->{MaxScore}/g;
-    if ( $first_alarm_frame )
-    {
-        $text =~ s/%EPI1%/$url?view=frame&mid=$event->{MonitorId}&eid=$event->{Id}&fid=$first_alarm_frame->{FrameId}/g;
-        $text =~ s/%EPIM%/$url?view=frame&mid=$event->{MonitorId}&eid=$event->{Id}&fid=$max_alarm_frame->{FrameId}/g;
-        if ( $attachments_ref && $text =~ s/%EI1%//g )
-        {
-            my $path = generateImage( $event, $first_alarm_frame);
-            if ( -e $path ) {
-                push( @$attachments_ref,
-                    {
-                        type=>"image/jpeg",
-                        path=>$path
-                    }
-                );
-            }
-        }
-        if ( $attachments_ref && $text =~ s/%EIM%//g )
-        {
-            # Don't attach the same image twice
-            if ( !@$attachments_ref
-                 || ($first_alarm_frame->{FrameId} != $max_alarm_frame->{FrameId} )
-            )
-            {
-                my $path = generateImage( $event, $max_alarm_frame);
-                if ( -e $path ) {
-                    push( @$attachments_ref,
-                        {
-                            type=>"image/jpeg",
-                            path=>$path
-                        }
-                    );
-                }
-            }
-        }
-        if ( $attachments_ref && $text =~ s/%EI1A%//g )
-        {
-            my $path = generateImage( $event, $first_alarm_frame, "analyse" );
-            if ( -e $path ) {
-                push( @$attachments_ref,
-                    {
-                        type=>"image/jpeg",
-                        path=>$path
-                    }
-                );
-            }
-        }
-        if ( $attachments_ref && $text =~ s/%EIMA%//g )
-        {
-            # Don't attach the same image twice
-            if ( !@$attachments_ref
-                 || ($first_alarm_frame->{FrameId} != $max_alarm_frame->{FrameId} )
-            )
-            {
-                my $path = generateImage( $event, $max_alarm_frame, "analyse");
-                if ( -e $path ) {
-                    push( @$attachments_ref,
-                        {
-                            type=>"image/jpeg",
-                            path=>$path
-                        }
-                    );
-                }
-            }
-        }
-    }
-    if ( $attachments_ref && $Config{ZM_OPT_FFMPEG} )
-    {
-        if ( $text =~ s/%EV%//g )
-        {
-            my ( $format, $path ) = generateVideo( $filter, $event );
-            if ( !$format )
-            {
-                return( undef );
-            }
-            push( @$attachments_ref, { type=>"video/$format", path=>$path } );
-        }
-        if ( $text =~ s/%EVM%//g )
-        {
-            my ( $format, $path ) = generateVideo( $filter, $event, 1 );
-            if ( !$format )
-            {
-                return( undef );
-            }
-            push( @$attachments_ref, { type=>"video/$format", path=>$path } );
-        }
-    }
-    $text =~ s/%FN%/$filter->{Name}/g;
-    ( my $filter_name = $filter->{Name} ) =~ s/ /+/g;
-    $text =~ s/%FP%/$url?view=filter&mid=$event->{MonitorId}&filter_name=$filter_name/g;
-
-    return( $text );
-}
-
-sub sendEmail
-{
-    my $filter = shift;
-    my $event = shift;
-
-    if ( ! $Config{ZM_FROM_EMAIL} )
-    {
-        Error( "No 'from' email address defined, not sending email" );
+      }
+      $ftp->login( $Config{ZM_UPLOAD_USER}, $Config{ZM_UPLOAD_PASS} )
+        or Error( "FTP - Can't login" );
+      $ftp->binary()
+        or Error( "FTP - Can't go binary" );
+      $ftp->cwd( $Config{ZM_UPLOAD_REM_DIR} )
+        or Error( "FTP - Can't cwd" )
+        if ( $Config{ZM_UPLOAD_REM_DIR} );
+      $ftp->put( $archLocPath )
+        or Error( "FTP - Can't upload '$archLocPath'" );
+      $ftp->quit()
+        or Error( "FTP - Can't quit" );
+    } else {
+      my $host = $Config{ZM_UPLOAD_HOST};
+      $host .= ':'.$Config{ZM_UPLOAD_PORT}
+      if $Config{ZM_UPLOAD_PORT};
+      Info( 'Uploading to '.$host." using SFTP\n" );
+      my %sftpOptions = ( host=>$Config{ZM_UPLOAD_HOST}, user=>$Config{ZM_UPLOAD_USER} );
+      $sftpOptions{password} = $Config{ZM_UPLOAD_PASS}
+      if $Config{ZM_UPLOAD_PASS};
+      $sftpOptions{port} = $Config{ZM_UPLOAD_PORT}
+      if $Config{ZM_UPLOAD_PORT};
+      $sftpOptions{timeout} = $Config{ZM_UPLOAD_TIMEOUT}
+      if $Config{ZM_UPLOAD_TIMEOUT};
+      my @more_ssh_args;
+      push @more_ssh_args, '-o'=>'StrictHostKeyChecking=no'
+        if ! $Config{ZM_UPLOAD_STRICT};
+      push @more_ssh_args, '-v'
+        if $Config{ZM_UPLOAD_DEBUG};
+      $sftpOptions{more} = [@more_ssh_args];
+      my $sftp = Net::SFTP::Foreign->new( $Config{ZM_UPLOAD_HOST}, %sftpOptions );
+      if ( $sftp->error ) {
+        Error( "Can't create SFTP connection: ".$sftp->error );
         return( 0 );
+      }
+      $sftp->setcwd( $Config{ZM_UPLOAD_REM_DIR} )
+        or Error( "SFTP - Can't setcwd: ".$sftp->error )
+        if $Config{ZM_UPLOAD_REM_DIR};
+      $sftp->put( $archLocPath, $archFile )
+        or Error( "SFTP - Can't upload '$archLocPath': ".$sftp->error );
     }
-    if ( ! $Config{ZM_EMAIL_ADDRESS} )
-    {
-        Error( "No email address defined, not sending email" );
-        return( 0 );
-    }
-
-    Info( "Creating notification email\n" );
-
-    my $subject = substituteTags( $Config{ZM_EMAIL_SUBJECT}, $filter, $event );
-    return( 0 ) if ( !$subject );
-    my @attachments;
-    my $body = substituteTags( $Config{ZM_EMAIL_BODY}, $filter, $event, \@attachments );
-    return( 0 ) if ( !$body );
-
-    Info( "Sending notification email '$subject'\n" );
-
-    eval
-    {
-        if ( $Config{ZM_NEW_MAIL_MODULES} )
-        {
-            ### Create the multipart container
-            my $mail = MIME::Lite->new (
-                From => $Config{ZM_FROM_EMAIL},
-                To => $Config{ZM_EMAIL_ADDRESS},
-                Subject => $subject,
-                Type => "multipart/mixed"
-            );
-            ### Add the text message part
-            $mail->attach (
-                Type => "TEXT",
-                Data => $body
-            );
-            ### Add the attachments
-            foreach my $attachment ( @attachments )
-            {
-                Info( "Attaching '$attachment->{path}\n" );
-                $mail->attach(
-                    Path => $attachment->{path},
-                    Type => $attachment->{type},
-                    Disposition => "attachment"
-                );
-            }
-            ### Send the Message
-            if ( $Config{ZM_SSMTP_MAIL} ) {
-                my $ssmtp_location = $Config{ZM_SSMTP_PATH};
-                if ( !$ssmtp_location ) {
-                    if ( logDebugging() ) {
-                        Debug( "which ssmtp: $ssmtp_location - set ssmtp path in options to suppress this message\n" );
-                    }
-                    $ssmtp_location = qx('which ssmtp');
-                }
-                if ( !$ssmtp_location ) {
-                    Debug( "Can't find ssmtp, trying MIME::Lite->send" );
-                    MIME::Lite->send( "smtp", $Config{ZM_EMAIL_HOST}, Timeout=>60 );
-                    $mail->send();
-                } else {
-                    ### Send using SSMTP
-                    $mail->send( 'sendmail', $ssmtp_location, $Config{ZM_EMAIL_ADDRESS} );
-                }
-            } else {
-                MIME::Lite->send( "smtp", $Config{ZM_EMAIL_HOST}, Timeout=>60 );
-                $mail->send();
-            }
-        }
-        else
-        {
-            my $mail = MIME::Entity->build(
-                From => $Config{ZM_FROM_EMAIL},
-                To => $Config{ZM_EMAIL_ADDRESS},
-                Subject => $subject,
-                Type => (($body=~/<html>/)?'text/html':'text/plain'),
-                Data => $body
-            );
-
-            foreach my $attachment ( @attachments )
-            {
-                Info( "Attaching '$attachment->{path}\n" );
-                $mail->attach(
-                    Path => $attachment->{path},
-                    Type => $attachment->{type},
-                    Encoding => "base64"
-                );
-            }
-            $mail->smtpsend( Host => $Config{ZM_EMAIL_HOST}, MailFrom => $Config{ZM_FROM_EMAIL} );
-        }
-    };
-    if ( $@ )
-    {
-        Error( "Can't send email: $@" );
-        return( 0 );
-    }
-    else
-    {
-        Info( "Notification email sent\n" );
-    }
-    my $sql = "update Events set Emailed = 1 where Id = ?";
+    unlink( $archLocPath );
+    my $sql = 'update Events set Uploaded = 1 where Id = ?';
     my $sth = $dbh->prepare_cached( $sql )
-        or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+      or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
     my $res = $sth->execute( $event->{Id} )
-        or Fatal( "Can't execute '$sql': ".$sth->errstr() );
-
-    return( 1 );
+      or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+  }
+  return( 1 );
 }
 
-sub sendMessage
-{
-    my $filter = shift;
-    my $event = shift;
+sub substituteTags {
+  my $text = shift;
+  my $filter = shift;
+  my $event = shift;
+  my $attachments_ref = shift;
 
-    if ( ! $Config{ZM_FROM_EMAIL} )
-    {
-        Error( "No 'from' email address defined, not sending message" );
-        return( 0 );
-    }
-    if ( ! $Config{ZM_MESSAGE_ADDRESS} )
-    {
-        Error( "No message address defined, not sending message" );
-        return( 0 );
-    }
+# First we'd better check what we need to get
+# We have a filter and an event, do we need any more
+# monitor information?
+  my $need_monitor = $text =~ /%(?:MET|MEH|MED|MEW|MEN|MEA)%/;
 
-    Info( "Creating notification message\n" );
-
-    my $subject = substituteTags( $Config{ZM_MESSAGE_SUBJECT}, $filter, $event );
-    return( 0 ) if ( !$subject );
-    my @attachments;
-    my $body = substituteTags( $Config{ZM_MESSAGE_BODY}, $filter, $event, \@attachments );
-    return( 0 ) if ( !$body );
-
-    Info( "Sending notification message '$subject'\n" );
-
-    eval
-    {
-        if ( $Config{ZM_NEW_MAIL_MODULES} )
-        {
-            ### Create the multipart container
-            my $mail = MIME::Lite->new (
-                From => $Config{ZM_FROM_EMAIL},
-                To => $Config{ZM_MESSAGE_ADDRESS},
-                Subject => $subject,
-                Type => "multipart/mixed"
-            );
-            ### Add the text message part
-            $mail->attach (
-                Type => "TEXT",
-                Data => $body
-            );
-            ### Add the attachments
-            foreach my $attachment ( @attachments )
-            {
-                Info( "Attaching '$attachment->{path}\n" );
-                $mail->attach(
-                    Path => $attachment->{path},
-                    Type => $attachment->{type},
-                    Disposition => "attachment"
-                );
-            }
-            ### Send the Message
-            if ( $Config{ZM_SSMTP_MAIL} ) {
-                my $ssmtp_location = $Config{ZM_SSMTP_PATH};
-                if ( !$ssmtp_location ) {
-                    if ( logDebugging() ) {
-                        Debug( "which ssmtp: $ssmtp_location - set ssmtp path in options to suppress this message\n" );
-                    }
-                    $ssmtp_location = qx('which ssmtp');
-                }
-                if ( !$ssmtp_location ) {
-                    Debug( "Can't find ssmtp, trying MIME::Lite->send" );
-                    MIME::Lite->send( "smtp", $Config{ZM_EMAIL_HOST}, Timeout=>60 );
-                    $mail->send();
-                } else {
-                    ### Send using SSMTP
-                    $mail->send( 'sendmail', $ssmtp_location, $Config{ZM_MESSAGE_ADDRESS} );
-                }
-            } else {
-                MIME::Lite->send( "smtp", $Config{ZM_EMAIL_HOST}, Timeout=>60 );
-                $mail->send();
-            }
-        }
-        else
-        {
-            my $mail = MIME::Entity->build(
-                From => $Config{ZM_FROM_EMAIL},
-                To => $Config{ZM_MESSAGE_ADDRESS},
-                Subject => $subject,
-                Type => (($body=~/<html>/)?'text/html':'text/plain'),
-                Data => $body
-            );
-
-            foreach my $attachment ( @attachments )
-            {
-                Info( "Attaching '$attachment->{path}\n" );
-                $mail->attach(
-                    Path => $attachment->{path},
-                    Type => $attachment->{type},
-                    Encoding => "base64"
-                );
-            }
-            $mail->smtpsend( Host => $Config{ZM_EMAIL_HOST},
-                             MailFrom => $Config{ZM_FROM_EMAIL}
-            );
-        }
-    };
-    if ( $@ )
-    {
-        Error( "Can't send email: $@" );
-        return( 0 );
-    }
-    else
-    {
-        Info( "Notification message sent\n" );
-    }
-    my $sql = "update Events set Messaged = 1 where Id = ?";
+  my $monitor = {};
+  if ( $need_monitor ) {
+    my $db_now = strftime( "%Y-%m-%d %H:%M:%S", localtime() );
+    my $sql = "SELECT
+      M.Id,
+      count(E.Id) as EventCount,
+      count(if(E.Archived,1,NULL))
+        as ArchEventCount,
+      count(if(E.StartTime>'$db_now' - INTERVAL 1 HOUR && E.Archived = 0,1,NULL))
+        as HourEventCount,
+      count(if(E.StartTime>'$db_now' - INTERVAL 1 DAY && E.Archived = 0,1,NULL))
+        as DayEventCount,
+      count(if(E.StartTime>'$db_now' - INTERVAL 7 DAY && E.Archived = 0,1,NULL))
+        as WeekEventCount,
+      count(if(E.StartTime>'$db_now' - INTERVAL 1 MONTH && E.Archived = 0,1,NULL))
+        as MonthEventCount
+        FROM Monitors as M LEFT JOIN Events as E on E.MonitorId = M.Id
+        WHERE MonitorId = ?
+        GROUP BY E.MonitorId
+        ORDER BY Id"
+        ;
     my $sth = $dbh->prepare_cached( $sql )
-        or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+      or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+    my $res = $sth->execute( $event->{MonitorId} )
+      or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+    $monitor = $sth->fetchrow_hashref();
+    $sth->finish();
+    return() if ( !$monitor );
+  }
+
+# Do we need the image information too?
+  my $need_images = $text =~ /%(?:EPI1|EPIM|EI1|EIM|EI1A|EIMA)%/;
+  my $first_alarm_frame;
+  my $max_alarm_frame;
+  my $max_alarm_score = 0;
+  if ( $need_images ) {
+    my $sql = "SELECT * FROM Frames
+      WHERE EventId = ? AND Type = 'Alarm'
+      ORDER BY FrameId"
+      ;
+    my $sth = $dbh->prepare_cached( $sql )
+      or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
     my $res = $sth->execute( $event->{Id} )
-        or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+      or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+    while( my $frame = $sth->fetchrow_hashref() ) {
+      if ( !$first_alarm_frame ) {
+        $first_alarm_frame = $frame;
+      }
+      if ( $frame->{Score} > $max_alarm_score ) {
+        $max_alarm_frame = $frame;
+        $max_alarm_score = $frame->{Score};
+      }
+    }
+    $sth->finish();
+  }
 
-    return( 1 );
+  my $url = $Config{ZM_URL};
+  $text =~ s/%ZP%/$url/g;
+  $text =~ s/%MN%/$event->{MonitorName}/g;
+  $text =~ s/%MET%/$monitor->{EventCount}/g;
+  $text =~ s/%MEH%/$monitor->{HourEventCount}/g;
+  $text =~ s/%MED%/$monitor->{DayEventCount}/g;
+  $text =~ s/%MEW%/$monitor->{WeekEventCount}/g;
+  $text =~ s/%MEM%/$monitor->{MonthEventCount}/g;
+  $text =~ s/%MEA%/$monitor->{ArchEventCount}/g;
+  $text =~ s/%MP%/$url?view=watch&mid=$event->{MonitorId}/g;
+  $text =~ s/%MPS%/$url?view=watchfeed&mid=$event->{MonitorId}&mode=stream/g;
+  $text =~ s/%MPI%/$url?view=watchfeed&mid=$event->{MonitorId}&mode=still/g;
+  $text =~ s/%EP%/$url?view=event&mid=$event->{MonitorId}&eid=$event->{Id}/g;
+  $text =~ s/%EPS%/$url?view=event&mode=stream&mid=$event->{MonitorId}&eid=$event->{Id}/g;
+  $text =~ s/%EPI%/$url?view=event&mode=still&mid=$event->{MonitorId}&eid=$event->{Id}/g;
+  $text =~ s/%EI%/$event->{Id}/g;
+  $text =~ s/%EN%/$event->{Name}/g;
+  $text =~ s/%EC%/$event->{Cause}/g;
+  $text =~ s/%ED%/$event->{Notes}/g;
+  $text =~ s/%ET%/$event->{StartTime}/g;
+  $text =~ s/%EL%/$event->{Length}/g;
+  $text =~ s/%EF%/$event->{Frames}/g;
+  $text =~ s/%EFA%/$event->{AlarmFrames}/g;
+  $text =~ s/%EST%/$event->{TotScore}/g;
+  $text =~ s/%ESA%/$event->{AvgScore}/g;
+  $text =~ s/%ESM%/$event->{MaxScore}/g;
+
+  if ( $first_alarm_frame ) {
+    $text =~ s/%EPI1%/$url?view=frame&mid=$event->{MonitorId}&eid=$event->{Id}&fid=$first_alarm_frame->{FrameId}/g;
+    $text =~ s/%EPIM%/$url?view=frame&mid=$event->{MonitorId}&eid=$event->{Id}&fid=$max_alarm_frame->{FrameId}/g;
+    if ( $attachments_ref && $text =~ s/%EI1%//g ) {
+      my $path = generateImage( $event, $first_alarm_frame );
+      if ( -e $path ) {
+        push( @$attachments_ref, { type=>'image/jpeg', path=>$path } );
+      }
+    }
+
+    if ( $attachments_ref && $text =~ s/%EIM%//g ) {
+  # Don't attach the same image twice
+      if ( !@$attachments_ref
+          || ($first_alarm_frame->{FrameId} != $max_alarm_frame->{FrameId} )
+         ) {
+        my $path = generateImage( $event, $max_alarm_frame );
+        if ( -e $path ) {
+          push( @$attachments_ref, { type=>'image/jpeg', path=>$path } );
+        }
+      }
+    }
+    if ( $attachments_ref && $text =~ s/%EI1A%//g ) {
+      my $path = generateImage( $event, $first_alarm_frame, 'analyse' );
+      if ( -e $path ) {
+        push( @$attachments_ref, { type=>'image/jpeg', path=>$path } );
+      }
+    }
+    if ( $attachments_ref && $text =~ s/%EIMA%//g ) {
+  # Don't attach the same image twice
+      if ( !@$attachments_ref
+          || ($first_alarm_frame->{FrameId} != $max_alarm_frame->{FrameId} )
+         ) {
+        my $path = generateImage( $event, $max_alarm_frame, 'analyse');
+        if ( -e $path ) {
+          push( @$attachments_ref, { type=>'image/jpeg', path=>$path } );
+        }
+      }
+    }
+  } # end if $first_alarm_frame
+
+  if ( $attachments_ref && $Config{ZM_OPT_FFMPEG} ) {
+    if ( $text =~ s/%EV%//g ) {
+      my ( $format, $path ) = generateVideo( $filter, $event );
+      if ( !$format ) {
+        return( undef );
+      }
+      push( @$attachments_ref, { type=>"video/$format", path=>$path } );
+    }
+    if ( $text =~ s/%EVM%//g ) {
+      my ( $format, $path ) = generateVideo( $filter, $event, 1 );
+      if ( !$format ) {
+        return( undef );
+      }
+      push( @$attachments_ref, { type=>"video/$format", path=>$path } );
+    }
+  }
+  $text =~ s/%FN%/$filter->{Name}/g;
+  ( my $filter_name = $filter->{Name} ) =~ s/ /+/g;
+  $text =~ s/%FP%/$url?view=filter&mid=$event->{MonitorId}&filter_name=$filter_name/g;
+
+  return( $text );
+} # end subsitituteTags
+
+sub sendEmail {
+  my $filter = shift;
+  my $event = shift;
+
+  if ( ! $Config{ZM_FROM_EMAIL} ) {
+    Error( "No 'from' email address defined, not sending email" );
+    return( 0 );
+  }
+  if ( ! $Config{ZM_EMAIL_ADDRESS} ) {
+    Error( 'No email address defined, not sending email' );
+    return( 0 );
+  }
+
+  Info( "Creating notification email\n" );
+
+  my $subject = substituteTags( $Config{ZM_EMAIL_SUBJECT}, $filter, $event );
+  return( 0 ) if ( !$subject );
+  my @attachments;
+  my $body = substituteTags( $Config{ZM_EMAIL_BODY}, $filter, $event, \@attachments );
+  return( 0 ) if ( !$body );
+
+  Info( "Sending notification email '$subject'\n" );
+
+  eval {
+    if ( $Config{ZM_NEW_MAIL_MODULES} ) {
+### Create the multipart container
+      my $mail = MIME::Lite->new (
+          From => $Config{ZM_FROM_EMAIL},
+          To => $Config{ZM_EMAIL_ADDRESS},
+          Subject => $subject,
+          Type => 'multipart/mixed'
+          );
+### Add the text message part
+      $mail->attach (
+          Type => 'TEXT',
+          Data => $body
+          );
+### Add the attachments
+      foreach my $attachment ( @attachments ) {
+        Info( "Attaching '$attachment->{path}\n" );
+        $mail->attach(
+            Path => $attachment->{path},
+            Type => $attachment->{type},
+            Disposition => 'attachment'
+            );
+      }
+### Send the Message
+      if ( $Config{ZM_SSMTP_MAIL} ) {
+        my $ssmtp_location = $Config{ZM_SSMTP_PATH};
+        if ( !$ssmtp_location ) {
+          if ( logDebugging() ) {
+            Debug( "which ssmtp: $ssmtp_location - set ssmtp path in options to suppress this message\n" );
+          }
+          $ssmtp_location = qx('which ssmtp');
+        }
+        if ( !$ssmtp_location ) {
+          Debug( "Can't find ssmtp, trying MIME::Lite->send" );
+          MIME::Lite->send( 'smtp', $Config{ZM_EMAIL_HOST}, Timeout=>60 );
+          $mail->send();
+        } else {
+### Send using SSMTP
+          $mail->send( 'sendmail', $ssmtp_location, $Config{ZM_EMAIL_ADDRESS} );
+        }
+      } else {
+        MIME::Lite->send( 'smtp', $Config{ZM_EMAIL_HOST}, Timeout=>60 );
+        $mail->send();
+      }
+    } else {
+      my $mail = MIME::Entity->build(
+          From => $Config{ZM_FROM_EMAIL},
+          To => $Config{ZM_EMAIL_ADDRESS},
+          Subject => $subject,
+          Type => (($body=~/<html>/)?'text/html':'text/plain'),
+          Data => $body
+          );
+
+      foreach my $attachment ( @attachments ) {
+        Info( "Attaching '$attachment->{path}\n" );
+        $mail->attach(
+            Path => $attachment->{path},
+            Type => $attachment->{type},
+            Encoding => 'base64'
+            );
+      }
+      $mail->smtpsend( Host => $Config{ZM_EMAIL_HOST}, MailFrom => $Config{ZM_FROM_EMAIL} );
+    }
+  };
+  if ( $@ ) {
+    Error( "Can't send email: $@" );
+    return( 0 );
+  } else {
+    Info( "Notification email sent\n" );
+  }
+  my $sql = 'update Events set Emailed = 1 where Id = ?';
+  my $sth = $dbh->prepare_cached( $sql )
+    or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+  my $res = $sth->execute( $event->{Id} )
+    or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+
+  return( 1 );
 }
 
-sub executeCommand
-{
-    my $filter = shift;
-    my $event = shift;
+sub sendMessage {
+  my $filter = shift;
+  my $event = shift;
 
-    my $event_path = getEventPath( $event );
+  if ( ! $Config{ZM_FROM_EMAIL} ) {
+    Error( 'No 'from' email address defined, not sending message' );
+    return( 0 );
+  }
+  if ( ! $Config{ZM_MESSAGE_ADDRESS} ) {
+    Error( 'No message address defined, not sending message' );
+    return( 0 );
+  }
 
-    my $command = $filter->{AutoExecuteCmd};
-    $command .= " $event_path";
-    $command = substituteTags( $command, $filter, $event );
+  Info( "Creating notification message\n" );
 
-    Info( "Executing '$command'\n" );
-    my $output = qx($command);
-    my $status = $? >> 8;
-    if ( $status || logDebugging() )
-    {
-        chomp( $output );
-        Debug( "Output: $output\n" );
+  my $subject = substituteTags( $Config{ZM_MESSAGE_SUBJECT}, $filter, $event );
+  return( 0 ) if ( !$subject );
+  my @attachments;
+  my $body = substituteTags( $Config{ZM_MESSAGE_BODY}, $filter, $event, \@attachments );
+  return( 0 ) if ( !$body );
+
+  Info( "Sending notification message '$subject'\n" );
+
+  eval {
+    if ( $Config{ZM_NEW_MAIL_MODULES} ) {
+### Create the multipart container
+      my $mail = MIME::Lite->new (
+          From => $Config{ZM_FROM_EMAIL},
+          To => $Config{ZM_MESSAGE_ADDRESS},
+          Subject => $subject,
+          Type => 'multipart/mixed'
+          );
+### Add the text message part
+      $mail->attach (
+          Type => 'TEXT',
+          Data => $body
+          );
+### Add the attachments
+      foreach my $attachment ( @attachments ) {
+        Info( "Attaching '$attachment->{path}\n" );
+        $mail->attach(
+            Path => $attachment->{path},
+            Type => $attachment->{type},
+            Disposition => 'attachment'
+            );
+      }
+### Send the Message
+      if ( $Config{ZM_SSMTP_MAIL} ) {
+        my $ssmtp_location = $Config{ZM_SSMTP_PATH};
+        if ( !$ssmtp_location ) {
+          if ( logDebugging() ) {
+            Debug( "which ssmtp: $ssmtp_location - set ssmtp path in options to suppress this message\n" );
+          }
+          $ssmtp_location = qx('which ssmtp');
+        }
+        if ( !$ssmtp_location ) {
+          Debug( "Can't find ssmtp, trying MIME::Lite->send" );
+          MIME::Lite->send( 'smtp', $Config{ZM_EMAIL_HOST}, Timeout=>60 );
+          $mail->send();
+        } else {
+### Send using SSMTP
+          $mail->send( 'sendmail', $ssmtp_location, $Config{ZM_MESSAGE_ADDRESS} );
+        }
+      } else {
+        MIME::Lite->send( 'smtp', $Config{ZM_EMAIL_HOST}, Timeout=>60 );
+        $mail->send();
+      }
+    } else {
+      my $mail = MIME::Entity->build(
+          From => $Config{ZM_FROM_EMAIL},
+          To => $Config{ZM_MESSAGE_ADDRESS},
+          Subject => $subject,
+          Type => (($body=~/<html>/)?'text/html':'text/plain'),
+          Data => $body
+          );
+
+      foreach my $attachment ( @attachments ) {
+        Info( "Attaching '$attachment->{path}\n" );
+        $mail->attach(
+            Path => $attachment->{path},
+            Type => $attachment->{type},
+            Encoding => 'base64'
+            );
+      }
+      $mail->smtpsend( Host => $Config{ZM_EMAIL_HOST},
+          MailFrom => $Config{ZM_FROM_EMAIL}
+          );
     }
-    if ( $status )
-    {
-        Error( "Command '$command' exited with status: $status\n" );
-        return( 0 );
-    }
-    else
-    {
-        my $sql = "update Events set Executed = 1 where Id = ?";
-        my $sth = $dbh->prepare_cached( $sql )
-            or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute( $event->{Id} )
-            or Fatal( "Can't execute '$sql': ".$sth->errstr() );
-    }
-    return( 1 );
+  };
+  if ( $@ ) {
+    Error( "Can't send email: $@" );
+    return( 0 );
+  } else {
+    Info( "Notification message sent\n" );
+  }
+  my $sql = 'update Events set Messaged = 1 where Id = ?';
+  my $sth = $dbh->prepare_cached( $sql )
+    or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+  my $res = $sth->execute( $event->{Id} )
+    or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+
+  return( 1 );
+}
+
+sub executeCommand {
+  my $filter = shift;
+  my $event = shift;
+
+  my $event_path = getEventPath( $event );
+
+  my $command = $filter->{AutoExecuteCmd};
+  $command .= " $event_path";
+  $command = substituteTags( $command, $filter, $event );
+
+  Info( "Executing '$command'\n" );
+  my $output = qx($command);
+  my $status = $? >> 8;
+  if ( $status || logDebugging() ) {
+    chomp( $output );
+    Debug( "Output: $output\n" );
+  }
+  if ( $status ) {
+    Error( "Command '$command' exited with status: $status\n" );
+    return( 0 );
+  } else {
+    my $sql = 'update Events set Executed = 1 where Id = ?';
+    my $sth = $dbh->prepare_cached( $sql )
+      or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
+    my $res = $sth->execute( $event->{Id} )
+      or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+  }
+  return( 1 );
 }

From 5228b9d00896287b0f1c7f4aa2a9f050e84f3101 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 2 Jun 2017 11:54:40 -0400
Subject: [PATCH 49/56] move command line option parsing up, so if we are just
 getting the version we exit quick before doing a bunch of other things.

---
 scripts/zmfilter.pl.in | 69 ++++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index ef4a2a43e..4538c099c 100644
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -60,7 +60,6 @@ use constant START_DELAY => 5; # How long to wait before starting
 
 @EXTRA_PERL_LIB@
 use ZoneMinder;
-require ZoneMinder::Filter;
 use DBI;
 use POSIX;
 use Time::HiRes qw/gettimeofday/;
@@ -69,29 +68,44 @@ use Getopt::Long;
 use autouse 'Pod::Usage'=>qw(pod2usage);
 use autouse 'Data::Dumper'=>qw(Dumper);
 
+my $filter_parm = '';
+my $version = 0;
+
+GetOptions(
+    'filter=s'      =>\$filter_parm,
+    'version'       =>\$version
+    ) or pod2usage(-exitstatus => -1);
+
+if ( $version ) {
+  print ZoneMinder::Base::ZM_VERSION . "\n";
+  exit(0);
+}
+
+require ZoneMinder::Filter;
+
 use constant EVENT_PATH => ($Config{ZM_DIR_EVENTS}=~m|/|)
   ? $Config{ZM_DIR_EVENTS}
   : ($Config{ZM_PATH_WEB}.'/'.$Config{ZM_DIR_EVENTS})
   ;
 
-  logInit();
-  logSetSignal();
+logInit();
+logSetSignal();
 
-  if ( $Config{ZM_OPT_UPLOAD} ) {
+if ( $Config{ZM_OPT_UPLOAD} ) {
 # Comment these out if you don't have them and don't want to upload
 # or don't want to use that format
-    if ( $Config{ZM_UPLOAD_ARCH_FORMAT} eq 'zip' ) {
-      require Archive::Zip;
-      import Archive::Zip qw( :ERROR_CODES :CONSTANTS );
-    } else {
-      require Archive::Tar;
-    }
-    if ( $Config{ZM_UPLOAD_PROTOCOL} eq 'ftp' ) {
-      require Net::FTP;
-    } else {
-      require Net::SFTP::Foreign;
-    }
+  if ( $Config{ZM_UPLOAD_ARCH_FORMAT} eq 'zip' ) {
+    require Archive::Zip;
+    import Archive::Zip qw( :ERROR_CODES :CONSTANTS );
+  } else {
+    require Archive::Tar;
   }
+  if ( $Config{ZM_UPLOAD_PROTOCOL} eq 'ftp' ) {
+    require Net::FTP;
+  } else {
+    require Net::SFTP::Foreign;
+  }
+}
 
 if ( $Config{ZM_OPT_EMAIL} ) {
   if ( $Config{ZM_NEW_MAIL_MODULES} ) {
@@ -119,20 +133,6 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
 my $delay = $Config{ZM_FILTER_EXECUTE_INTERVAL};
 my $event_id = 0;
-my $filter_parm = '';
-my $version = 0;
-
-#
-
-GetOptions(
-    'filter=s'      =>\$filter_parm,
-    'version'       =>\$version
-    ) or pod2usage(-exitstatus => -1);
-
-if ( $version ) {
-  print ZoneMinder::Base::ZM_VERSION . '\n';
-  exit(0);
-}
 
 if ( ! EVENT_PATH ) {
   Error( "No event path defined. Config was $Config{ZM_DIR_EVENTS}\n" );
@@ -330,11 +330,16 @@ sub generateVideo {
     $format = $ffmpeg_formats[0];
   }
 
-  my $command = join('',
+  my $command = join( '',
       $Config{ZM_PATH_BIN},
       '/zmvideo.pl -e ',
-      .$event->{Id},
-      ' -r ',$rate,' -s ',$scale,' -f ',$format,
+      $event->{Id},
+      ' -r ',
+      $rate,
+      ' -s ',
+      $scale,
+      ' -f ',
+      $format,
       );
   my $output = qx($command);
   chomp( $output );

From 352ea6b6aea1b5a29f2e887c26918921e5187300 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 2 Jun 2017 12:12:41 -0400
Subject: [PATCH 50/56] spacing

---
 web/skins/classic/views/filter.php | 167 +++++++++++++----------------
 1 file changed, 74 insertions(+), 93 deletions(-)

diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php
index 43b651ea9..3057fad74 100644
--- a/web/skins/classic/views/filter.php
+++ b/web/skins/classic/views/filter.php
@@ -18,34 +18,31 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canView( 'Events' ) )
-{
-    $view = "error";
-    return;
+if ( !canView( 'Events' ) ) {
+  $view = 'error';
+  return;
 }
-$selectName = "filterName";
+$selectName = 'filterName';
 $filterNames = array( ''=>translate('ChooseFilter') );
-foreach ( dbFetchAll( "select * from Filters order by Name" ) as $row )
-{
-    $filterNames[$row['Name']] = $row['Name'];
-    if ( $row['Background'] )
-        $filterNames[$row['Name']] .= "*";
-    if ( !empty($_REQUEST['reload']) && isset($_REQUEST['filterName']) && $_REQUEST['filterName'] == $row['Name'] )
-        $dbFilter = $row;
+foreach ( dbFetchAll( 'select * from Filters order by Name' ) as $row ) {
+  $filterNames[$row['Name']] = $row['Name'];
+  if ( $row['Background'] )
+    $filterNames[$row['Name']] .= '*';
+  if ( !empty($_REQUEST['reload']) && isset($_REQUEST['filterName']) && $_REQUEST['filterName'] == $row['Name'] )
+    $dbFilter = $row;
 }
 
-$backgroundStr = "";
-if ( isset($dbFilter) )
-{
-    if ( $dbFilter['Background'] ) 
-        $backgroundStr = '['.strtolower(translate('Background')).']';
-    $_REQUEST['filter'] = jsonDecode( $dbFilter['Query'] );
-    $_REQUEST['sort_field'] = isset($_REQUEST['filter']['sort_field'])?$_REQUEST['filter']['sort_field']:"DateTime";
-    $_REQUEST['sort_asc'] = isset($_REQUEST['filter']['sort_asc'])?$_REQUEST['filter']['sort_asc']:"1";
-    $_REQUEST['limit'] = isset($_REQUEST['filter']['limit'])?$_REQUEST['filter']['limit']:"";
-    unset( $_REQUEST['filter']['sort_field'] );
-    unset( $_REQUEST['filter']['sort_asc'] );
-    unset( $_REQUEST['filter']['limit'] );
+$backgroundStr = '';
+if ( isset($dbFilter) ) {
+  if ( $dbFilter['Background'] ) 
+    $backgroundStr = '['.strtolower(translate('Background')).']';
+  $_REQUEST['filter'] = jsonDecode( $dbFilter['Query'] );
+  $_REQUEST['sort_field'] = isset($_REQUEST['filter']['sort_field'])?$_REQUEST['filter']['sort_field']:"DateTime";
+  $_REQUEST['sort_asc'] = isset($_REQUEST['filter']['sort_asc'])?$_REQUEST['filter']['sort_asc']:"1";
+  $_REQUEST['limit'] = isset($_REQUEST['filter']['limit'])?$_REQUEST['filter']['limit']:"";
+  unset( $_REQUEST['filter']['sort_field'] );
+  unset( $_REQUEST['filter']['sort_asc'] );
+  unset( $_REQUEST['filter']['limit'] );
 }
 
 # reload is set when the dropdown is changed. 
@@ -64,16 +61,14 @@ if ( isset( $_REQUEST['reload'] ) and ! $_REQUEST['reload'] ) {
 $conjunctionTypes = array(
     'and' => translate('ConjAnd'),
     'or'  => translate('ConjOr')
-);
+    );
 $obracketTypes = array(); 
 $cbracketTypes = array();
-if ( isset($_REQUEST['filter']['terms']) )
-{
-    for ( $i = 0; $i <= count($_REQUEST['filter']['terms'])-2; $i++ )
-    {
-        $obracketTypes[$i] = str_repeat( "(", $i );
-        $cbracketTypes[$i] = str_repeat( ")", $i );
-    }
+if ( isset($_REQUEST['filter']['terms']) ) {
+  for ( $i = 0; $i <= count($_REQUEST['filter']['terms'])-2; $i++ ) {
+    $obracketTypes[$i] = str_repeat( "(", $i );
+    $cbracketTypes[$i] = str_repeat( ")", $i );
+  }
 }
 
 $attrTypes = array(
@@ -98,7 +93,7 @@ $attrTypes = array(
     'DiskBlocks'  => translate('AttrDiskBlocks'),
     'SystemLoad'  => translate('AttrSystemLoad'),
     'ServerId'    => translate('AttrServer'),
-);
+    );
 $opTypes = array(
     '='   => translate('OpEq'),
     '!='  => translate('OpNe'),
@@ -110,15 +105,14 @@ $opTypes = array(
     '!~'  => translate('OpNotMatches'),
     '=[]' => translate('OpIn'),
     '![]' => translate('OpNotIn'),
-);
+    );
 $archiveTypes = array(
     '0' => translate('ArchUnarchived'),
     '1' => translate('ArchArchived')
-);
+    );
 $weekdays = array();
-for ( $i = 0; $i < 7; $i++ )
-{
-    $weekdays[$i] = strftime( "%A", mktime( 12, 0, 0, 1, $i+1, 2001 ) );
+for ( $i = 0; $i < 7; $i++ ) {
+  $weekdays[$i] = strftime( '%A', mktime( 12, 0, 0, 1, $i+1, 2001 ) );
 }
 $sort_fields = array(
     'Id'          => translate('AttrId'),
@@ -133,13 +127,12 @@ $sort_fields = array(
     'TotScore'    => translate('AttrTotalScore'),
     'AvgScore'    => translate('AttrAvgScore'),
     'MaxScore'    => translate('AttrMaxScore'),
-);
+    );
 $sort_dirns = array(
     '1' => translate('SortAsc'),
     '0'  => translate('SortDesc')
-);
-if ( empty($_REQUEST['sort_field']) )
-{
+    );
+if ( empty($_REQUEST['sort_field']) ) {
     $_REQUEST['sort_field'] = ZM_WEB_EVENT_SORT_FIELD; 
     $_REQUEST['sort_asc'] = (ZM_WEB_EVENT_SORT_ORDER == "asc");
 }
@@ -174,105 +167,93 @@ xhtmlHeaders(__FILE__, translate('EventFilter') );
         <table id="fieldsTable" class="filterTable" cellspacing="0">
           <tbody>
 <?php
-for ( $i = 0; isset($_REQUEST['filter']) && $i < count($_REQUEST['filter']['terms']); $i++ )
-{
+for ( $i = 0; isset($_REQUEST['filter']) && $i < count($_REQUEST['filter']['terms']); $i++ ) {
 ?>
             <tr>
 <?php
-    if ( $i == 0 )
-    {
+  if ( $i == 0 ) {
 ?>
               <td>&nbsp;</td>
 <?php
-    }
-    else
-    {
+  } else {
 ?>
               <td><?php echo buildSelect( "filter[terms][$i][cnj]", $conjunctionTypes ); ?></td>
 <?php
-    }
+  }
 ?>
               <td><?php if ( count($_REQUEST['filter']['terms']) > 2 ) { echo buildSelect( "filter[terms][$i][obr]", $obracketTypes ); } else { ?>&nbsp;<?php } ?></td>
               <td><?php echo buildSelect( "filter[terms][$i][attr]", $attrTypes, "clearValue( this, $i ); submitToFilter( this, 0 );" ); ?></td>
 <?php
-    if ( isset($_REQUEST['filter']['terms'][$i]['attr']) )
-    {
-        if ( $_REQUEST['filter']['terms'][$i]['attr'] == "Archived" )
-        {
+  if ( isset($_REQUEST['filter']['terms'][$i]['attr']) ) {
+    if ( $_REQUEST['filter']['terms'][$i]['attr'] == 'Archived' ) {
 ?>
               <td><?php echo translate('OpEq') ?><input type="hidden" name="filter[terms][<?php echo $i ?>][op]" value="="/></td>
               <td><?php echo buildSelect( "filter[terms][$i][val]", $archiveTypes ); ?></td>
 <?php
-        }
-        elseif ( $_REQUEST['filter']['terms'][$i]['attr'] == "DateTime" )
-        {
+    } elseif ( $_REQUEST['filter']['terms'][$i]['attr'] == 'DateTime' ) {
 ?>
               <td><?php echo buildSelect( "filter[terms][$i][op]", $opTypes ); ?></td>
-              <td><input name="filter[terms][<?php echo $i ?>][val]" id="filter[terms][<?php echo $i ?>][val]" value="<?php echo isset($_REQUEST['filter']['terms'][$i]['val'])?validHtmlStr($_REQUEST['filter']['terms'][$i]['val']):'' ?>"/><?php if ( $hasCal ) { ?><script type="text/javascript">Calendar.setup( { inputField: "filter[terms][<?php echo $i ?>][val]", ifFormat: "%Y-%m-%d %H:%M", showsTime: true, timeFormat: "24", showOthers: true, weekNumbers: false });</script><?php } ?></td>
+              <td>
+                <input name="filter[terms][<?php echo $i ?>][val]" id="filter[terms][<?php echo $i ?>][val]" value="<?php echo isset($_REQUEST['filter']['terms'][$i]['val'])?validHtmlStr($_REQUEST['filter']['terms'][$i]['val']):'' ?>"/>
+<?php if ( $hasCal ) { ?>
+                <script type="text/javascript">Calendar.setup( { inputField: "filter[terms][<?php echo $i ?>][val]", ifFormat: "%Y-%m-%d %H:%M", showsTime: true, timeFormat: "24", showOthers: true, weekNumbers: false });</script>
+<?php } ?>
+              </td>
 <?php
-        }
-        elseif ( $_REQUEST['filter']['terms'][$i]['attr'] == "Date" )
-        {
+    } elseif ( $_REQUEST['filter']['terms'][$i]['attr'] == 'Date' ) {
 ?>
               <td><?php echo buildSelect( "filter[terms][$i][op]", $opTypes ); ?></td>
-              <td><input name="filter[terms][<?php echo $i ?>][val]" id="filter[terms][<?php echo $i ?>][val]" value="<?php echo isset($_REQUEST['filter']['terms'][$i]['val'])?validHtmlStr($_REQUEST['filter']['terms'][$i]['val']):'' ?>"/><?php if ( $hasCal ) { ?><script type="text/javascript">Calendar.setup( { inputField: "filter[terms][<?php echo $i ?>][val]", ifFormat: "%Y-%m-%d", showOthers: true, weekNumbers: false });</script><?php } ?></td>
+              <td>
+                <input name="filter[terms][<?php echo $i ?>][val]" id="filter[terms][<?php echo $i ?>][val]" value="<?php echo isset($_REQUEST['filter']['terms'][$i]['val'])?validHtmlStr($_REQUEST['filter']['terms'][$i]['val']):'' ?>"/>
+<?php if ( $hasCal ) { ?>
+                <script type="text/javascript">Calendar.setup( { inputField: "filter[terms][<?php echo $i ?>][val]", ifFormat: "%Y-%m-%d", showOthers: true, weekNumbers: false });</script>
+<?php } ?>
+              </td>
 <?php
-        }
-        elseif ( $_REQUEST['filter']['terms'][$i]['attr'] == "Weekday" )
-        {
+    } elseif ( $_REQUEST['filter']['terms'][$i]['attr'] == 'Weekday' ) {
 ?>
               <td><?php echo buildSelect( "filter[terms][$i][op]", $opTypes ); ?></td>
               <td><?php echo buildSelect( "filter[terms][$i][val]", $weekdays ); ?></td>
 <?php
+    } elseif ( false && $_REQUEST['filter']['terms'][$i]['attr'] == 'MonitorName' ) {
+      $monitors = array();
+      foreach ( dbFetchAll( "select Id,Name from Monitors order by Sequence asc" ) as $monitor ) {
+        if ( visibleMonitor( $monitor['Id'] ) ) {
+          $monitors[$monitor['Name']] = $monitor['Name'];
         }
-        elseif ( false && $_REQUEST['filter']['terms'][$i]['attr'] == "MonitorName" )
-        {
-            $monitors = array();
-            foreach ( dbFetchAll( "select Id,Name from Monitors order by Sequence asc" ) as $monitor )
-            {
-                if ( visibleMonitor( $monitor['Id'] ) )
-                {
-                    $monitors[$monitor['Name']] = $monitor['Name'];
-                }
-            }
+      }
 ?>
               <td><?php echo buildSelect( "filter[terms][$i][op]", $opTypes ); ?></td>
               <td><?php echo buildSelect( "filter[terms][$i][val]", $monitors ); ?></td>
 <?php
-        }
-        elseif ( $_REQUEST['filter']['terms'][$i]['attr'] == "ServerId" )
-        {
-            $servers = array();
-            $servers['ZM_SERVER_ID'] = 'Current Server';
-            foreach ( dbFetchAll( "SELECT Id,Name FROM Servers ORDER BY lower(Name) ASC" ) as $server ) {
-              $servers[$server['Id']] = $server['Name'];
-            }
+    } elseif ( $_REQUEST['filter']['terms'][$i]['attr'] == 'ServerId' ) {
+      $servers = array();
+      $servers['ZM_SERVER_ID'] = 'Current Server';
+      foreach ( dbFetchAll( 'SELECT Id,Name FROM Servers ORDER BY lower(Name) ASC' ) as $server ) {
+        $servers[$server['Id']] = $server['Name'];
+      }
 ?>
             <td><?php echo buildSelect( "filter[terms][$i][op]", $opTypes ); ?></td>
             <td><?php echo buildSelect( "filter[terms][$i][val]", $servers ); ?></td>
 <?php
-        }
-        else
-        {
+    } else {
 ?>
               <td><?php echo buildSelect( "filter[terms][$i][op]", $opTypes ); ?></td>
               <td><input name="filter[terms][<?php echo $i ?>][val]" value="<?php echo $_REQUEST['filter']['terms'][$i]['val'] ?>"/></td>
 <?php
-        }
     }
-    else
-    {
+  } else {
 ?>
               <td><?php echo buildSelect( "filter[terms][$i][op]", $opTypes ); ?></td>
               <td><input name="filter[terms][<?php echo $i ?>][val]" value="<?php echo isset($_REQUEST['filter']['terms'][$i]['val'])?$_REQUEST['filter']['terms'][$i]['val']:'' ?>"/></td>
 <?php
-    }
+  }
 ?>
               <td><?php if ( count($_REQUEST['filter']['terms']) > 2 ) { echo buildSelect( "filter[terms][$i][cbr]", $cbracketTypes ); } else { ?>&nbsp;<?php } ?></td>
               <td><input type="button" onclick="addTerm( this, <?php echo $i+1 ?> )" value="+"/><?php if ( $_REQUEST['filter']['terms'] > 1 ) { ?><input type="button" onclick="delTerm( this, <?php echo $i ?> )" value="-"/><?php } ?></td>
             </tr>
 <?php
-}
+} # end foreach filter
 ?>
           </tbody>
         </table>
@@ -346,9 +327,9 @@ if ( ZM_OPT_MESSAGE )
           <input type="button" name="executeButton" id="executeButton" value="<?php echo translate('Execute') ?>" onclick="executeFilter( this );"/>
 <?php if ( canEdit( 'Events' ) ) { ?>
           <input type="button" value="<?php echo translate('Save') ?>" onclick="saveFilter( this );"/>
-<?php } ?>
-<?php if ( canEdit( 'Events' ) && isset($dbFilter) && $dbFilter['Name'] ) { ?>
+<?php if ( isset($dbFilter) && $dbFilter['Name'] ) { ?>
           <input type="button" value="<?php echo translate('Delete') ?>" onclick="deleteFilter( this, '<?php echo $dbFilter['Name'] ?>' );"/>
+<?php } ?>
 <?php } ?>
           <input type="button" value="<?php echo translate('Reset') ?>" onclick="submitToFilter( this, 1 );"/>
         </div>

From 555a6670357f9e627575023de591def6f5f3bcd6 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 2 Jun 2017 12:12:59 -0400
Subject: [PATCH 51/56] fix filter button

---
 web/skins/classic/views/console.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index 8de087281..ede536295 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -331,7 +331,7 @@ echo $Server->Name();
               <input type="button" value="<?php echo translate('Refresh') ?>" onclick="location.reload(true);"/>
               <input type="button" name="addBtn" value="<?php echo translate('AddNewMonitor') ?>" onclick="addMonitor( this )"/>
               <!-- <?php echo makePopupButton( '?view=monitor', 'zmMonitor0', 'monitor', translate('AddNewMonitor'), (canEdit( 'Monitors' ) && !$user['MonitorIds']) ) ?> -->
-              <?php echo makePopupButton( urlencode('?view=filter&filter[terms][0][attr]=DateTime&filter[terms][0][op]=%3c&filter[terms][0][val]=now'), 'zmFilter', 'filter', translate('Filters'), canView( 'Events' ) ) ?>
+              <?php echo makePopupButton( '?view=filter&filter[terms][0][attr]=DateTime&filter[terms][0][op]=%3c&filter[terms][0][val]=now', 'zmFilter', 'filter', translate('Filters'), canView( 'Events' ) ) ?>
             </td>
 <?php
 for ( $i = 0; $i < count($eventCounts); $i++ ) {
@@ -342,7 +342,10 @@ for ( $i = 0; $i < count($eventCounts); $i++ ) {
 }
 ?>
             <td class="colZones"><?php echo $zoneCount ?></td>
-            <td class="colRightButtons" colspan="<?php echo canEdit('Monitors')?2:1 ?>"><input type="button" name="editBtn" value="<?php echo translate('Edit') ?>" onclick="editMonitor( this )" disabled="disabled"/><input type="button" name="deleteBtn" value="<?php echo translate('Delete') ?>" onclick="deleteMonitor( this )" disabled="disabled"/></td>
+            <td class="colRightButtons" colspan="<?php echo canEdit('Monitors')?2:1 ?>">
+              <input type="button" name="editBtn" value="<?php echo translate('Edit') ?>" onclick="editMonitor( this )" disabled="disabled"/>
+              <input type="button" name="deleteBtn" value="<?php echo translate('Delete') ?>" onclick="deleteMonitor( this )" disabled="disabled"/>
+            </td>
           </tr>
         </tfoot>
       </table>

From a9268d10e33400ba55e14f6b6cf956e2b223785e Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 2 Jun 2017 12:21:12 -0400
Subject: [PATCH 52/56] fix the use of ZM_OPT constants in javascript. 
 Instead, check for existence of the element in the form.

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

diff --git a/web/skins/classic/views/js/filter.js b/web/skins/classic/views/js/filter.js
index 599a3c589..385ef3c7e 100644
--- a/web/skins/classic/views/js/filter.js
+++ b/web/skins/classic/views/js/filter.js
@@ -7,13 +7,13 @@ function updateButtons( element ) {
     var canExecute = false;
     if ( form.elements['AutoArchive'].checked )
       canExecute = true;
-    else if ( typeof ZM_OPT_FFMPEG !== "undefined" && form.elements['AutoVideo'].checked )
+    else if ( form.elements['AutoVideo'] && form.elements['AutoVideo'].checked )
       canExecute = true;
-    else if ( typeof ZM_OPT_UPLOAD !== "undefined" && form.elements['AutoUpload'].checked )
+    else if ( form.elements['AutoUpload'] && form.elements['AutoUpload'].checked )
       canExecute = true;
-    else if ( typeof ZM_OPT_EMAIL !== "undefined" && form.elements['AutoEmail'].checked )
+    else if ( form.elements['AutoEmail'] && form.elements['AutoEmail'].checked )
       canExecute = true;
-    else if ( typeof ZM_OPT_MESSAGE !== "undefined" && form.elements['AutoMessage'].checked )
+    else if ( form.elements['AutoMessage'] && form.elements['AutoMessage'].checked )
       canExecute = true;
     else if ( form.elements['AutoExecute'].checked && form.elements['AutoExecuteCmd'].value != '' )
       canExecute = true;

From 71b9ca97c61988bd95bfc870fd9d5997881b8a93 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 2 Jun 2017 12:25:26 -0400
Subject: [PATCH 53/56] no need to store filters as an array ref

---
 scripts/zmfilter.pl.in | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index 4538c099c..a508473bf 100644
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -153,7 +153,7 @@ if ( !$filter_parm ) {
   sleep( START_DELAY );
 }
 
-my $filters;
+my @filters;
 my $last_action = 0;
 
 while( 1 ) {
@@ -161,14 +161,14 @@ while( 1 ) {
   if ( ($now - $last_action) > $Config{ZM_FILTER_RELOAD_DELAY} ) {
     Debug( "Reloading filters\n" );
     $last_action = $now;
-    $filters = getFilters( $filter_parm );
+    @filters = getFilters( $filter_parm );
   }
 
-  foreach my $filter ( @$filters ) {
+  foreach my $filter ( @filters ) {
     checkFilter( $filter );
   }
 
-  last if ( $filter_parm );
+  last if $filter_parm;
 
   Debug( "Sleeping for $delay seconds\n" );
   sleep( $delay );
@@ -203,19 +203,19 @@ sub getFilters {
       or Fatal( "Can't execute '$sql': ".$sth->errstr() );
   }
 FILTER: while( my $db_filter = $sth->fetchrow_hashref() ) {
-          my $filter = new ZoneMinder::Filter( $$db_filter{Id}, $db_filter );
-          Debug( "Found filter '$db_filter->{Name}'\n" );
-          my $sql = $filter->Sql();
+    my $filter = new ZoneMinder::Filter( $$db_filter{Id}, $db_filter );
+    Debug( "Found filter '$db_filter->{Name}'\n" );
+    my $sql = $filter->Sql();
 
-          if ( ! $sql ) {
-            Error( "Error parsing Sql. skipping filter '$db_filter->{Name}'\n" );
-            next FILTER;
-          }
-          push( @filters, $filter );
-        }
-        $sth->finish();
-        Debug( 'Got ' . @filters . ' filters' );
-        return( \@filters );
+    if ( ! $sql ) {
+      Error( "Error parsing Sql. skipping filter '$db_filter->{Name}'\n" );
+      next FILTER;
+    }
+    push( @filters, $filter );
+  }
+  $sth->finish();
+  Debug( 'Got ' . @filters . ' filters' );
+  return( @filters );
 }
 
 sub checkFilter {

From b6b4738b9fb945189f605db82355d7f84769bd99 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 2 Jun 2017 12:31:54 -0400
Subject: [PATCH 54/56] fix quotes

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

diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index a508473bf..aeb11b509 100644
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -794,7 +794,7 @@ sub sendMessage {
   my $event = shift;
 
   if ( ! $Config{ZM_FROM_EMAIL} ) {
-    Error( 'No 'from' email address defined, not sending message' );
+    Error( "No 'from' email address defined, not sending message" );
     return( 0 );
   }
   if ( ! $Config{ZM_MESSAGE_ADDRESS} ) {

From 8b91403c256955ea90233d7a4454eb25069e519b Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 2 Jun 2017 12:32:02 -0400
Subject: [PATCH 55/56] remove references to Storage object

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

diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in
index c671e9989..58b4a2739 100644
--- a/scripts/zmaudit.pl.in
+++ b/scripts/zmaudit.pl.in
@@ -185,11 +185,11 @@ MAIN: while( $loop ) {
         Debug( "Checking day dir $day_dir" );
         ( $day_dir ) = ( $day_dir =~ /^(.*)$/ ); # De-taint
         if ( ! chdir( $day_dir ) ) {
-          Error( "Can't chdir to '$$Storage{Path}/$day_dir': $!" );
+          Error( "Can't chdir to '$day_dir': $!" );
           next;
         }
         if ( ! opendir( DIR, '.' ) ) {
-          Error( "Can't open directory '$$Storage{Path}/$day_dir': $!" );
+          Error( "Can't open directory '$day_dir': $!" );
           next;
         }
 

From 9c9eaa6851fbdc2470202d6fdfe979cbe4f10068 Mon Sep 17 00:00:00 2001
From: Isaac Connor <isaac@zoneminder.com>
Date: Fri, 2 Jun 2017 12:35:01 -0400
Subject: [PATCH 56/56] move test for MIN_AGE up.  Don't need to constantly
 check for it because it won't change.

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

diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in
index 58b4a2739..6cf2af2e3 100644
--- a/scripts/zmaudit.pl.in
+++ b/scripts/zmaudit.pl.in
@@ -111,6 +111,10 @@ if ( ($report + $interactive + $continuous) > 1 ) {
   pod2usage(-exitstatus => -1);
 }
 
+if ( ! exists $Config{ZM_AUDIT_MIN_AGE} ) {
+  Fatal('ZM_AUDIT_MIN_AGE is not set in config.');
+}
+
 my $dbh = zmDbConnect();
 
 chdir( EVENT_PATH );
@@ -145,12 +149,8 @@ MAIN: while( $loop ) {
     sleep 1;
   } # end if
 
-  if ( ! exists $Config{ZM_AUDIT_MIN_AGE} ) {
-    Fatal('ZM_AUDIT_MIN_AGE is not set in config.');
-  }
-
   my $db_monitors;
-  my $monitorSelectSql = "select Id from Monitors order by Id";
+  my $monitorSelectSql = 'select Id from Monitors order by Id';
   my $monitorSelectSth = $dbh->prepare_cached( $monitorSelectSql )
     or Fatal( "Can't prepare '$monitorSelectSql': ".$dbh->errstr() );
   my $eventSelectSql = 'SELECT Id, (unix_timestamp() - unix_timestamp(StartTime)) as Age