From 155835367249752a6c652a49f0fe6b18335bcdf7 Mon Sep 17 00:00:00 2001
From: "Jan M. Hochstein" <jan@altaroca.com>
Date: Sat, 9 Apr 2016 17:07:11 +0200
Subject: [PATCH 01/49] Force UTF-8 when sending WS-Discovery Probe

---
 onvif/modules/lib/WSDiscovery/TransportUDP.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/onvif/modules/lib/WSDiscovery/TransportUDP.pm b/onvif/modules/lib/WSDiscovery/TransportUDP.pm
index 375f9628d..edc837da6 100644
--- a/onvif/modules/lib/WSDiscovery/TransportUDP.pm
+++ b/onvif/modules/lib/WSDiscovery/TransportUDP.pm
@@ -61,16 +61,19 @@ sub _notify_response
 }
 
 sub send_multi() {
-  my ($self, $address, $port, $data) = @_;
+  my ($self, $address, $port, $utf8_string) = @_;
 
   my $destination = $address . ':' . $port;
   my $socket = IO::Socket::Multicast->new(PROTO => 'udp', 
       LocalPort=>$port, PeerAddr=>$destination, ReuseAddr=>1)
       
       or die 'Cannot open multicast socket to ' . ${address} . ':' . ${port};
+
+  my $bytes = $utf8_string;
+  utf8::encode($bytes);
       
   $socket->mcast_ttl(1);
-  $socket->send($data);
+  $socket->send($bytes);
 }
 
 sub receive_multi() {

From 2125faa4447dfd146fe6448f2bd3f6461f4c4bbd Mon Sep 17 00:00:00 2001
From: "Jan M. Hochstein" <jan@altaroca.com>
Date: Sun, 10 Apr 2016 09:37:16 +0200
Subject: [PATCH 02/49] Added header elements to perl WS-Discovery proxy

---
 .../WSDiscovery10/Interfaces/WSDiscovery/WSDiscoveryPort.pm | 6 +++++-
 onvif/proxy/lib/WSDiscovery10/Typemaps/WSDiscovery.pm       | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/onvif/proxy/lib/WSDiscovery10/Interfaces/WSDiscovery/WSDiscoveryPort.pm b/onvif/proxy/lib/WSDiscovery10/Interfaces/WSDiscovery/WSDiscoveryPort.pm
index d194bbc87..581d6e59e 100644
--- a/onvif/proxy/lib/WSDiscovery10/Interfaces/WSDiscovery/WSDiscoveryPort.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Interfaces/WSDiscovery/WSDiscoveryPort.pm
@@ -34,7 +34,11 @@ sub ProbeOp {
 
         },
         header => {
-            
+            'use'           => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/ws/2004/08/addressing',
+            encodingStyle   => '',
+            parts           => [qw(WSDiscovery10::Elements::To WSDiscovery10::Elements::Action)],
+ 
         },
         headerfault => {
             
diff --git a/onvif/proxy/lib/WSDiscovery10/Typemaps/WSDiscovery.pm b/onvif/proxy/lib/WSDiscovery10/Typemaps/WSDiscovery.pm
index 635a19393..4429a517b 100644
--- a/onvif/proxy/lib/WSDiscovery10/Typemaps/WSDiscovery.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Typemaps/WSDiscovery.pm
@@ -24,6 +24,11 @@ our $typemap_1 = {
                'ProbeMatches/ProbeMatch/EndpointReference' => 'WSDiscovery10::Types::EndpointReferenceType',
                'ProbeMatches/ProbeMatch/EndpointReference/ReferenceProperties' => 'WSDiscovery10::Types::ReferencePropertiesType',
                'ProbeMatches/ProbeMatch/EndpointReference/PortType' => 'WSDiscovery10::Types::AttributedQName'
+               'MessageID' => 'WSDiscovery10::Elements::MessageID',
+               'RelatesTo' => '__SKIP__',
+               'To' => '__SKIP__',
+               'Action' => '__SKIP__',
+               'AppSequence' => '__SKIP__',
              };
 ;
 

From edf3f3c43a1e197b4627d0ba11ec4a478e9b2517 Mon Sep 17 00:00:00 2001
From: "Jan M. Hochstein" <jan@altaroca.com>
Date: Sun, 10 Apr 2016 15:57:53 +0200
Subject: [PATCH 03/49] Fixed WS-Discovery Probe message header

---
 .../lib/WSDiscovery10/Elements/Header.pm      | 55 +++++++++++++++++++
 .../lib/WSDiscovery10/Typemaps/WSDiscovery.pm |  8 +--
 onvif/scripts/zmonvif-probe.pl                | 23 +++++++-
 3 files changed, 79 insertions(+), 7 deletions(-)
 create mode 100644 onvif/proxy/lib/WSDiscovery10/Elements/Header.pm

diff --git a/onvif/proxy/lib/WSDiscovery10/Elements/Header.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Header.pm
new file mode 100644
index 000000000..df2d7f389
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Header.pm
@@ -0,0 +1,55 @@
+
+package WSDiscovery10::Elements::Header;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Action_of :ATTR(:get<Action>);
+my %MessageID_of :ATTR(:get<MessageID>);
+my %ReplyTo_of :ATTR(:get<ReplyTo>);
+my %To_of :ATTR(:get<To>);
+
+__PACKAGE__->_factory(
+    [ qw( Action MessageID ReplyTo To ) ],
+    {
+        'Action' => \%Action_of,
+        'MessageID' => \%MessageID_of,
+        'ReplyTo' => \%ReplyTo_of,
+        'To' => \%To_of,
+    },
+    {
+        'Action' => 'WSDiscovery10::Elements::Action',
+        'MessageID' => 'WSDiscovery10::Elements::MessageID',
+        'ReplyTo' => 'WSDiscovery10::Elements::ReplyTo',
+        'To' => 'WSDiscovery10::Elements::To',
+    },
+    {
+        'Action' => '',
+        'MessageID' => '',
+        'ReplyTo' => '',
+        'To' => '',
+    }
+);
+
+} # end BLOCK
+
+
+1;
diff --git a/onvif/proxy/lib/WSDiscovery10/Typemaps/WSDiscovery.pm b/onvif/proxy/lib/WSDiscovery10/Typemaps/WSDiscovery.pm
index 4429a517b..f0d7b7931 100644
--- a/onvif/proxy/lib/WSDiscovery10/Typemaps/WSDiscovery.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Typemaps/WSDiscovery.pm
@@ -25,10 +25,10 @@ our $typemap_1 = {
                'ProbeMatches/ProbeMatch/EndpointReference/ReferenceProperties' => 'WSDiscovery10::Types::ReferencePropertiesType',
                'ProbeMatches/ProbeMatch/EndpointReference/PortType' => 'WSDiscovery10::Types::AttributedQName'
                'MessageID' => 'WSDiscovery10::Elements::MessageID',
-               'RelatesTo' => '__SKIP__',
-               'To' => '__SKIP__',
-               'Action' => '__SKIP__',
-               'AppSequence' => '__SKIP__',
+               'RelatesTo' => 'WSDiscovery10::Elements::RelatesTo',
+               'To' => 'WSDiscovery10::Elements::To',
+               'Action' => 'WSDiscovery10::Elements::Action',
+               'AppSequence' => 'WSDiscovery10::Elements::AppSequence',
              };
 ;
 
diff --git a/onvif/scripts/zmonvif-probe.pl b/onvif/scripts/zmonvif-probe.pl
index 93c12959f..8f1fccd17 100755
--- a/onvif/scripts/zmonvif-probe.pl
+++ b/onvif/scripts/zmonvif-probe.pl
@@ -25,13 +25,14 @@
 #
 
 use Getopt::Std;
+use Data::UUID;
 
 require ONVIF::Client;
 
 require WSDiscovery10::Interfaces::WSDiscovery::WSDiscoveryPort;
+require WSDiscovery10::Elements::Header;
 require WSDiscovery10::Elements::Types;
 require WSDiscovery10::Elements::Scopes;
-require WSDiscovery10::Elements::To;
 
 require WSDiscovery::TransportUDP;
 
@@ -169,6 +170,8 @@ sub discover
   ## try both soap versions
   my %services;
 
+  my $uuid_gen = Data::UUID->new();
+
   if($verbose) {
     print "Probing for SOAP 1.1\n"
   }
@@ -177,12 +180,18 @@ sub discover
   });
   $svc_discover->set_soap_version('1.1');
 
+  my $uuid = $uuid_gen->create_str();
+
   my $result = $svc_discover->ProbeOp(
     { # WSDiscovery::Types::ProbeType
       Types => 'http://www.onvif.org/ver10/network/wsdl:NetworkVideoTransmitter http://www.onvif.org/ver10/device/wsdl:Device', # QNameListType
       Scopes =>  { value => '' },
     },
-      WSDiscovery10::Elements::To->new({ value => 'urn:schemas-xmlsoap-org:ws:2005:04:discovery' })
+    WSDiscovery10::Elements::Header->new({
+      Action => { value => 'http://schemas.xmlsoap.org/ws/2005/04/discovery/Probe' },
+      MessageID => { value => "urn:uuid:$uuid" }, 
+      To => { value => 'urn:schemas-xmlsoap-org:ws:2005:04:discovery' },
+    })
   );
 #  print $result . "\n";
 
@@ -197,12 +206,20 @@ sub discover
   });
   $svc_discover->set_soap_version('1.2');
 
+  # copies of the same Probe message must have the same MessageID. 
+  # This is not a copy. So we generate a new uuid.
+  $uuid = $uuid_gen->create_str();
+
   $result = $svc_discover->ProbeOp(
     { # WSDiscovery::Types::ProbeType
       Types => 'http://www.onvif.org/ver10/network/wsdl:NetworkVideoTransmitter http://www.onvif.org/ver10/device/wsdl:Device', # QNameListType
       Scopes =>  { value => '' },
     },
-      WSDiscovery10::Elements::To->new({ value => 'urn:schemas-xmlsoap-org:ws:2005:04:discovery' })
+    WSDiscovery10::Elements::Header->new({
+      Action => { value => 'http://schemas.xmlsoap.org/ws/2005/04/discovery/Probe' },
+      MessageID => { value => "urn:uuid:$uuid" }, 
+      To => { value => 'urn:schemas-xmlsoap-org:ws:2005:04:discovery' },
+    })
   );
 #  print $result . "\n";
 

From 8b92151a0cb75c312d252e88a9759741f4367f85 Mon Sep 17 00:00:00 2001
From: "Jan M. Hochstein" <jan@altaroca.com>
Date: Sun, 10 Apr 2016 18:19:10 +0200
Subject: [PATCH 04/49] WS-Discovery header fixes

---
 .../Interfaces/WSDiscovery/WSDiscoveryPort.pm        |  2 +-
 .../proxy/lib/WSDiscovery10/Typemaps/WSDiscovery.pm  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/onvif/proxy/lib/WSDiscovery10/Interfaces/WSDiscovery/WSDiscoveryPort.pm b/onvif/proxy/lib/WSDiscovery10/Interfaces/WSDiscovery/WSDiscoveryPort.pm
index 581d6e59e..f1b6446a5 100644
--- a/onvif/proxy/lib/WSDiscovery10/Interfaces/WSDiscovery/WSDiscoveryPort.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Interfaces/WSDiscovery/WSDiscoveryPort.pm
@@ -37,7 +37,7 @@ sub ProbeOp {
             'use'           => 'literal',
             namespace       => 'http://schemas.xmlsoap.org/ws/2004/08/addressing',
             encodingStyle   => '',
-            parts           => [qw(WSDiscovery10::Elements::To WSDiscovery10::Elements::Action)],
+            parts           => [qw( WSDiscovery10::Elements::Header )],
  
         },
         headerfault => {
diff --git a/onvif/proxy/lib/WSDiscovery10/Typemaps/WSDiscovery.pm b/onvif/proxy/lib/WSDiscovery10/Typemaps/WSDiscovery.pm
index f0d7b7931..c19a7c647 100644
--- a/onvif/proxy/lib/WSDiscovery10/Typemaps/WSDiscovery.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Typemaps/WSDiscovery.pm
@@ -23,12 +23,12 @@ our $typemap_1 = {
                'ProbeMatches/ProbeMatch/Types' => 'WSDiscovery10::Types::QNameListType',
                'ProbeMatches/ProbeMatch/EndpointReference' => 'WSDiscovery10::Types::EndpointReferenceType',
                'ProbeMatches/ProbeMatch/EndpointReference/ReferenceProperties' => 'WSDiscovery10::Types::ReferencePropertiesType',
-               'ProbeMatches/ProbeMatch/EndpointReference/PortType' => 'WSDiscovery10::Types::AttributedQName'
-               'MessageID' => 'WSDiscovery10::Elements::MessageID',
-               'RelatesTo' => 'WSDiscovery10::Elements::RelatesTo',
-               'To' => 'WSDiscovery10::Elements::To',
-               'Action' => 'WSDiscovery10::Elements::Action',
-               'AppSequence' => 'WSDiscovery10::Elements::AppSequence',
+               'ProbeMatches/ProbeMatch/EndpointReference/PortType' => 'WSDiscovery10::Types::AttributedQName',
+               'MessageID' => '__SKIP__',
+               'RelatesTo' => '__SKIP__',
+               'To' => '__SKIP__',
+               'Action' => '__SKIP__',
+               'AppSequence' => '__SKIP__',
              };
 ;
 

From 2b05815bfa0c36aae5d486d6d77882db7f6128f6 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Fri, 15 Apr 2016 15:44:35 -0400
Subject: [PATCH 05/49] remove set height on the menu bars, fixing flow issues

---
 web/skins/classic/css/classic/views/event.css | 12 ++++++++++--
 web/skins/classic/css/dark/views/event.css    | 12 ++++++++++--
 web/skins/classic/css/flat/views/event.css    | 11 +++++++++--
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/web/skins/classic/css/classic/views/event.css b/web/skins/classic/css/classic/views/event.css
index 995a06c1d..13ac0cc0b 100644
--- a/web/skins/classic/css/classic/views/event.css
+++ b/web/skins/classic/css/classic/views/event.css
@@ -15,7 +15,6 @@
 
 #menuBar1 {
     width: 100%;
-    height: 1.5em;
     padding: 3px 0;
     text-align: center;
     clear: both;
@@ -41,7 +40,6 @@
 
 #menuBar2 {
     width: 100%;
-    height: 1.2em;
     padding: 3px 0;
     margin-bottom: 4px;
 }
@@ -57,6 +55,16 @@
     text-align: right;
 }
 
+#menuBar1:after,
+#menuBar2:after {
+    content: ".";
+    display: block;
+    height: 0;
+    font-size: 0;
+    clear: both;
+    visibility: hidden;
+}
+
 #imageFeed {
     text-align: center;
 }
diff --git a/web/skins/classic/css/dark/views/event.css b/web/skins/classic/css/dark/views/event.css
index 995a06c1d..13ac0cc0b 100644
--- a/web/skins/classic/css/dark/views/event.css
+++ b/web/skins/classic/css/dark/views/event.css
@@ -15,7 +15,6 @@
 
 #menuBar1 {
     width: 100%;
-    height: 1.5em;
     padding: 3px 0;
     text-align: center;
     clear: both;
@@ -41,7 +40,6 @@
 
 #menuBar2 {
     width: 100%;
-    height: 1.2em;
     padding: 3px 0;
     margin-bottom: 4px;
 }
@@ -57,6 +55,16 @@
     text-align: right;
 }
 
+#menuBar1:after,
+#menuBar2:after {
+    content: ".";
+    display: block;
+    height: 0;
+    font-size: 0;
+    clear: both;
+    visibility: hidden;
+}
+
 #imageFeed {
     text-align: center;
 }
diff --git a/web/skins/classic/css/flat/views/event.css b/web/skins/classic/css/flat/views/event.css
index 17c4f70cf..e69fe14f6 100644
--- a/web/skins/classic/css/flat/views/event.css
+++ b/web/skins/classic/css/flat/views/event.css
@@ -15,7 +15,6 @@
 
 #menuBar1 {
     width: 100%;
-    height: 1.5em;
     padding: 3px 0;
     text-align: center;
     clear: both;
@@ -41,7 +40,6 @@
 
 #menuBar2 {
     width: 100%;
-    height: 1.2em;
     padding: 3px 0;
     margin-bottom: 4px;
 }
@@ -57,6 +55,15 @@
     text-align: right;
 }
 
+#menuBar1:after,
+#menuBar2:after {
+    content: ".";
+    display: block;
+    height: 0;
+    font-size: 0;
+    clear: both;
+    visibility: hidden;
+}
 #imageFeed {
     text-align: center;
 }

From 5d3f5e5a4a14b7af57f246e62ae2f5a195b22690 Mon Sep 17 00:00:00 2001
From: "Jan M. Hochstein" <jan@altaroca.com>
Date: Sat, 16 Apr 2016 19:06:36 +0200
Subject: [PATCH 06/49] WSDiscovery: workaround for SOAP::WSDL QName limitation

---
 .../lib/WSDiscovery10/Types/ProbeType.pm      | 50 ++++++++++++++++++-
 onvif/scripts/zmonvif-probe.pl                |  4 +-
 2 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/onvif/proxy/lib/WSDiscovery10/Types/ProbeType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ProbeType.pm
index 10c290e8e..8d7e9e7ca 100644
--- a/onvif/proxy/lib/WSDiscovery10/Types/ProbeType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ProbeType.pm
@@ -7,8 +7,10 @@ __PACKAGE__->_set_element_form_qualified(0);
 
 sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
-our $XML_ATTRIBUTE_CLASS;
-undef $XML_ATTRIBUTE_CLASS;
+our $XML_ATTRIBUTE_CLASS = 'WSDiscovery10::Types::ProbeType::_ProbeType::XmlAttr';
+
+#our $XML_ATTRIBUTE_CLASS;
+#undef $XML_ATTRIBUTE_CLASS;
 
 sub __get_attr_class {
     return $XML_ATTRIBUTE_CLASS;
@@ -49,11 +51,55 @@ __PACKAGE__->_factory(
 } # end BLOCK
 
 
+package WSDiscovery10::Types::ProbeType::_ProbeType::XmlAttr;
+#use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+use Class::Std::Fast::Storable constructor => 'none', cache => 1;
+use base qw(SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType);
 
 
+{ # BLOCK to scope variables
 
+my %Attribs_of :ATTR(:get<Attribs>);
 
+sub new
+{
+  my $self = pop @{ Class::Std::Fast::OBJECT_CACHE_REF()->{ $_[0] } };
+  $self = bless \(my $o = Class::Std::Fast::ID()), $_[0]
+        if not defined $self;
+        
+  $self->BUILD(${$self}, $_[1]);
 
+  return $self;      
+}
+
+sub BUILD 
+{
+  my ($self, $ident, $arg_ref) = @_;
+
+  $Attribs_of{$ident} = $arg_ref;
+}
+
+# without this no attributes are serialized
+# SOAP::WSDL::XSD::Typelib::CompexType sub serialize_attr()
+
+sub as_bool :BOOLIFY { 1 }
+
+sub serialize() 
+{
+  my $ident = ${ $_[0] };
+  my $option_ref = $_[1];
+  my $attr_str = "";
+
+  foreach my $attr (keys %{$Attribs_of{$ident}})
+  {
+    my $value = %{$Attribs_of{$ident}}{$attr};
+    $attr_str .= " $attr=\"$value\"";
+  }
+  
+  return $attr_str;
+}
+
+} # end BLOCK
 
 1;
 
diff --git a/onvif/scripts/zmonvif-probe.pl b/onvif/scripts/zmonvif-probe.pl
index 8f1fccd17..10aa26a08 100755
--- a/onvif/scripts/zmonvif-probe.pl
+++ b/onvif/scripts/zmonvif-probe.pl
@@ -212,7 +212,9 @@ sub discover
 
   $result = $svc_discover->ProbeOp(
     { # WSDiscovery::Types::ProbeType
-      Types => 'http://www.onvif.org/ver10/network/wsdl:NetworkVideoTransmitter http://www.onvif.org/ver10/device/wsdl:Device', # QNameListType
+      xmlattr => { 'xmlns:dn'  => 'http://www.onvif.org/ver10/network/wsdl',
+                   'xmlns:tds' => 'http://www.onvif.org/ver10/device/wsdl', },
+      Types => 'dn:NetworkVideoTransmitter tds:Device', # QNameListType
       Scopes =>  { value => '' },
     },
     WSDiscovery10::Elements::Header->new({

From 0dc2987b84e12640bb793b188aae2b42d3e0724b Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 28 Apr 2016 16:32:50 -0400
Subject: [PATCH 07/49] add some error checking, but fix the call to bind which
 really should have a +1 in it.

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

diff --git a/src/zm_stream.cpp b/src/zm_stream.cpp
index 77c94e68c..eb15fe02c 100644
--- a/src/zm_stream.cpp
+++ b/src/zm_stream.cpp
@@ -291,7 +291,11 @@ void StreamBase::openComms()
     if ( connkey > 0 )
     {
 
-		snprintf( sock_path_lock, sizeof(sock_path_lock), "%s/zms-%06d.lock", config.path_socks, connkey);
+		unsigned int length = snprintf( sock_path_lock, sizeof(sock_path_lock), "%s/zms-%06d.lock", config.path_socks, connkey);
+        if ( length >= sizeof(sock_path_lock) ) {
+            Warning("Socket lock path was truncated.");
+            length = sizeof(sock_path_lock)-1;
+        }
 
         lock_fd = open(sock_path_lock, O_CREAT|O_WRONLY, S_IRUSR | S_IWUSR);
         if ( lock_fd <= 0 )
@@ -318,12 +322,19 @@ void StreamBase::openComms()
             Fatal( "Can't create socket: %s", strerror(errno) );
         }
 
-        snprintf( loc_sock_path, sizeof(loc_sock_path), "%s/zms-%06ds.sock", config.path_socks, connkey );
+        length = snprintf( loc_sock_path, sizeof(loc_sock_path), "%s/zms-%06ds.sock", config.path_socks, connkey );
+        if ( length >= sizeof(loc_sock_path) ) {
+            Warning("Socket path was truncated.");
+            length = sizeof(loc_sock_path)-1;
+        }
         unlink( loc_sock_path );
+        if ( sizeof(loc_addr.sun_path) < length ) {
+            Error("Not enough space %d in loc_addr.sun_path for socket file %s", sizeof(loc_addr.sun_path), loc_sock_path );
+        }
 
         strncpy( loc_addr.sun_path, loc_sock_path, sizeof(loc_addr.sun_path) );
         loc_addr.sun_family = AF_UNIX;
-        if ( bind( sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)) < 0 )
+        if ( bind( sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family))+1 < 0 )
         {
             Fatal( "Can't bind: %s", strerror(errno) );
         }

From 75f9fde9202a1f644e0ab3de9474a603a16d7a59 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Mon, 2 May 2016 10:37:19 -0400
Subject: [PATCH 08/49] rough in Server object support

---
 web/api/app/Controller/ServersController.php | 155 +++++++++++++++++++
 web/api/app/Model/Server.php                 |  74 +++++++++
 web/api/app/View/Servers/json/edit.ctp       |   2 +
 web/api/app/View/Servers/json/index.ctp      |   1 +
 web/api/app/View/Servers/json/view.ctp       |   1 +
 web/api/app/View/Servers/xml/edit.ctp        |   2 +
 web/api/app/View/Servers/xml/index.ctp       |   2 +
 web/api/app/View/Servers/xml/view.ctp        |   2 +
 8 files changed, 239 insertions(+)
 create mode 100644 web/api/app/Controller/ServersController.php
 create mode 100644 web/api/app/Model/Server.php
 create mode 100644 web/api/app/View/Servers/json/edit.ctp
 create mode 100644 web/api/app/View/Servers/json/index.ctp
 create mode 100644 web/api/app/View/Servers/json/view.ctp
 create mode 100644 web/api/app/View/Servers/xml/edit.ctp
 create mode 100644 web/api/app/View/Servers/xml/index.ctp
 create mode 100644 web/api/app/View/Servers/xml/view.ctp

diff --git a/web/api/app/Controller/ServersController.php b/web/api/app/Controller/ServersController.php
new file mode 100644
index 000000000..b9afe0033
--- /dev/null
+++ b/web/api/app/Controller/ServersController.php
@@ -0,0 +1,155 @@
+<?php
+App::uses('AppController', 'Controller');
+/**
+ * Servers Controller
+ *
+ * @property Server $Server
+ * @property PaginatorComponent $Paginator
+ */
+class ServersController extends AppController {
+
+
+/**
+ * Components
+ *
+ * @var array
+ */
+  public $components = array('Paginator', 'RequestHandler');
+
+
+public function beforeFilter() {
+  parent::beforeFilter();
+  $canView = $this->Session->Read('systemPermission');
+  if ($canView =='None') {
+    throw new UnauthorizedException(__('Insufficient Privileges'));
+    return;
+  }
+
+}
+
+
+/**
+ * index method
+ *
+ * @return void
+ */
+  public function index() {
+    $this->Server->recursive = 0;
+    
+    $options='';
+    $servers = $this->Server->find('all',$options);
+		$this->set(array(
+					'servers' => $servers,
+					'_serialize' => array('servers')
+					));
+	}
+
+/**
+ * view method
+ *
+ * @throws NotFoundException
+ * @param string $id
+ * @return void
+ */
+  public function view($id = null) {
+    $this->Server->recursive = 0;
+    if (!$this->Server->exists($id)) {
+      throw new NotFoundException(__('Invalid server'));
+    }
+    $restricted = '';
+    
+    $options = array('conditions' => array( 
+          array('Server.' . $this->Server->primaryKey => $id),
+          $restricted
+          )
+        );
+    $server = $this->Server->find('first', $options);
+    $this->set(array(
+      'server' => $server,
+      '_serialize' => array('server')
+    ));
+  }
+
+/**
+ * add method
+ *
+ * @return void
+ */
+  public function add() {
+    if ($this->request->is('post')) {
+
+      if ($this->Session->Read('systemPermission') != 'Edit')
+      {
+         throw new UnauthorizedException(__('Insufficient privileges'));
+        return;
+      }
+
+      $this->Server->create();
+      if ($this->Server->save($this->request->data)) {
+				# Might be nice to send it a start request
+        #$this->daemonControl($this->Server->id, 'start', $this->request->data);
+        return $this->flash(__('The server has been saved.'), array('action' => 'index'));
+      }
+    }
+  }
+
+/**
+ * edit method
+ *
+ * @throws NotFoundException
+ * @param string $id
+ * @return void
+ */
+  public function edit($id = null) {
+    $this->Server->id = $id;
+
+    if (!$this->Server->exists($id)) {
+      throw new NotFoundException(__('Invalid server'));
+    }
+    if ($this->Session->Read('systemPermission') != 'Edit')
+    {
+       throw new UnauthorizedException(__('Insufficient privileges'));
+      return;
+    }
+    if ($this->Server->save($this->request->data)) {
+      $message = 'Saved';
+    } else {
+      $message = 'Error';
+    }
+
+    $this->set(array(
+      'message' => $message,
+      '_serialize' => array('message')
+    ));
+    // - restart this server after change
+    #$this->daemonControl($this->Server->id, 'restart', $this->request->data);
+  }
+
+/**
+ * delete method
+ *
+ * @throws NotFoundException
+ * @param string $id
+ * @return void
+ */
+  public function delete($id = null) {
+    $this->Server->id = $id;
+    if (!$this->Server->exists()) {
+      throw new NotFoundException(__('Invalid server'));
+    }
+    if ($this->Session->Read('systemPermission') != 'Edit')
+    {
+       throw new UnauthorizedException(__('Insufficient privileges'));
+      return;
+    }
+    $this->request->allowMethod('post', 'delete');
+
+    #$this->daemonControl($this->Server->id, 'stop');
+
+    if ($this->Server->delete()) {
+      return $this->flash(__('The server has been deleted.'), array('action' => 'index'));
+    } else {
+      return $this->flash(__('The server could not be deleted. Please, try again.'), array('action' => 'index'));
+    }
+  }
+}
diff --git a/web/api/app/Model/Server.php b/web/api/app/Model/Server.php
new file mode 100644
index 000000000..b58450db5
--- /dev/null
+++ b/web/api/app/Model/Server.php
@@ -0,0 +1,74 @@
+<?php
+App::uses('AppModel', 'Model');
+/**
+ * Server Model
+ *
+ * @property Event $Event
+ * @property Zone $Zone
+ */
+class Server extends AppModel {
+
+/**
+ * Use table
+ *
+ * @var mixed False or table name
+ */
+	public $useTable = 'Servers';
+
+/**
+ * Primary key field
+ *
+ * @var string
+ */
+	public $primaryKey = 'Id';
+
+/**
+ * Display field
+ *
+ * @var string
+ */
+	public $displayField = 'Name';
+
+	public $recursive = -1;
+
+/**
+ * Validation rules
+ *
+ * @var array
+ */
+	public $validate = array(
+		'Id' => array(
+			'numeric' => array(
+				'rule' => array('numeric'),
+				//'message' => 'Your custom message here',
+				//'allowEmpty' => false,
+				//'required' => false,
+				//'last' => false, // Stop validation after this rule
+				//'on' => 'create', // Limit validation to 'create' or 'update' operations
+			),
+		),
+	);
+
+	//The Associations below have been created with all possible keys, those that are not needed can be removed
+
+/**
+ * hasMany associations
+ *
+ * @var array
+ */
+	public $hasMany = array(
+		'Monitor' => array(
+			'className' => 'Monitor',
+			'foreignKey' => 'ServerId',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		)
+	);
+}
diff --git a/web/api/app/View/Servers/json/edit.ctp b/web/api/app/View/Servers/json/edit.ctp
new file mode 100644
index 000000000..0be859571
--- /dev/null
+++ b/web/api/app/View/Servers/json/edit.ctp
@@ -0,0 +1,2 @@
+echo json_encode($message);
+echo json_encode($server);
diff --git a/web/api/app/View/Servers/json/index.ctp b/web/api/app/View/Servers/json/index.ctp
new file mode 100644
index 000000000..6e5cbd26d
--- /dev/null
+++ b/web/api/app/View/Servers/json/index.ctp
@@ -0,0 +1 @@
+echo json_encode($servers);
diff --git a/web/api/app/View/Servers/json/view.ctp b/web/api/app/View/Servers/json/view.ctp
new file mode 100644
index 000000000..c3d0226ab
--- /dev/null
+++ b/web/api/app/View/Servers/json/view.ctp
@@ -0,0 +1 @@
+echo json_encode($server);
diff --git a/web/api/app/View/Servers/xml/edit.ctp b/web/api/app/View/Servers/xml/edit.ctp
new file mode 100644
index 000000000..09fb8979a
--- /dev/null
+++ b/web/api/app/View/Servers/xml/edit.ctp
@@ -0,0 +1,2 @@
+$xml = Xml::fromArray(array('response' => $message));
+echo $xml->asXML();
diff --git a/web/api/app/View/Servers/xml/index.ctp b/web/api/app/View/Servers/xml/index.ctp
new file mode 100644
index 000000000..37afc918b
--- /dev/null
+++ b/web/api/app/View/Servers/xml/index.ctp
@@ -0,0 +1,2 @@
+$xml = Xml::fromArray(array('response' => $monitors));
+echo $xml->asXML();
diff --git a/web/api/app/View/Servers/xml/view.ctp b/web/api/app/View/Servers/xml/view.ctp
new file mode 100644
index 000000000..b33c6e79a
--- /dev/null
+++ b/web/api/app/View/Servers/xml/view.ctp
@@ -0,0 +1,2 @@
+$xml = Xml::fromArray(array('response' => $monitor));
+echo $xml->asXML();

From 01aa2c931940794a75348e5d3213dee015ec737d Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@testing.internal.point-one.com>
Date: Mon, 2 May 2016 19:48:24 -0400
Subject: [PATCH 09/49] change permissions to stream permissions for view

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

diff --git a/web/api/app/Controller/ServersController.php b/web/api/app/Controller/ServersController.php
index b9afe0033..88a5bec90 100644
--- a/web/api/app/Controller/ServersController.php
+++ b/web/api/app/Controller/ServersController.php
@@ -19,7 +19,7 @@ class ServersController extends AppController {
 
 public function beforeFilter() {
   parent::beforeFilter();
-  $canView = $this->Session->Read('systemPermission');
+  $canView = $this->Session->Read('streamPermission');
   if ($canView =='None') {
     throw new UnauthorizedException(__('Insufficient Privileges'));
     return;

From 55d58a140e8f376bd6264912a0ddabc66f3a5c38 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 3 May 2016 08:57:51 -0400
Subject: [PATCH 10/49] instead of code duplication for opening the db, use
 zmDbConnect everywhere

---
 scripts/ZoneMinder/lib/ZoneMinder/Logger.pm | 24 ++++-----------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
index a6a82db87..4c5acac2b 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
@@ -30,6 +30,7 @@ use warnings;
 
 require Exporter;
 require ZoneMinder::Base;
+require ZoneMinder::Database;
 
 our @ISA = qw(Exporter ZoneMinder::Base);
 
@@ -460,25 +461,7 @@ sub databaseLevel
             {
                 if ( !$this->{dbh} )
                 {
-                    my ( $host, $port ) = ( $Config{ZM_DB_HOST} =~ /^([^:]+)(?::(.+))?$/ );
-
-                    if ( defined($port) )
-                    {
-                        $this->{dbh} = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}
-                                                    .";host=".$host
-                                                    .";port=".$port
-                                                    , $Config{ZM_DB_USER}
-                                                    , $Config{ZM_DB_PASS}
-                        );
-                    }
-                    else
-                    {
-                        $this->{dbh} = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}
-                                                    .";host=".$Config{ZM_DB_HOST}
-                                                    , $Config{ZM_DB_USER}
-                                                    , $Config{ZM_DB_PASS}
-                        );
-                    }
+                    $this->{dbh} = zmDbConnect();
                     if ( !$this->{dbh} )
                     {
                         $databaseLevel = NOLOG;
@@ -505,7 +488,8 @@ sub databaseLevel
             {
                 if ( $this->{dbh} )
                 {
-                    $this->{dbh}->disconnect();
+                    # $this->dbh is now the global dbh, so don't close it.
+                    #$this->{dbh}->disconnect();
                     undef($this->{dbh});
                 }
             }

From 30f34a6f49f071b8f2f912d1a177cc7ab13a4a05 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 3 May 2016 08:59:40 -0400
Subject: [PATCH 11/49] instead of code duplication for opening the db, use
 zmDbConnect everywhere

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

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
index 3a226cdc8..4be86e962 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
@@ -30,6 +30,7 @@ use warnings;
 
 require Exporter;
 require ZoneMinder::Base;
+require ZoneMinder::Database;
 
 our @ISA = qw(Exporter ZoneMinder::Base);
 
@@ -82,12 +83,7 @@ BEGIN
     }
     close( $CONFIG );
 
-    use DBI;
-    my $dbh = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}
-                           .";host=".$Config{ZM_DB_HOST}
-                           , $Config{ZM_DB_USER}
-                           , $Config{ZM_DB_PASS}
-    ) or croak( "Can't connect to db" );
+    my $dbh = zmDbConnect() or croak( "Can't connect to db" );
     my $sql = 'select * from Config';
     my $sth = $dbh->prepare_cached( $sql ) or croak( "Can't prepare '$sql': ".$dbh->errstr() );
     my $res = $sth->execute() or croak( "Can't execute: ".$sth->errstr() );
@@ -95,7 +91,6 @@ BEGIN
         $Config{$config->{Name}} = $config->{Value};
     }
     $sth->finish();
-    #$dbh->disconnect();
 
 	if ( ! exists $Config{ZM_SERVER_ID} ) {
 		$Config{ZM_SERVER_ID} = undef;

From 9406a2337f5fd20ed5a7af3a62d58f49b825d9b2 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 3 May 2016 10:21:01 -0400
Subject: [PATCH 12/49] Add a BEGIN section to load things in the correct
 order.

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

diff --git a/scripts/ZoneMinder/lib/ZoneMinder.pm b/scripts/ZoneMinder/lib/ZoneMinder.pm
index 87a6b14b7..37292a44d 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder.pm
@@ -81,6 +81,13 @@ our @EXPORT = ( @EXPORT_OK );
 
 our $VERSION = $ZoneMinder::Base::VERSION;
 
+BEGIN {
+  require ZoneMinder::Config;
+  require ZoneMinder::Database;
+  ZoneMinder::Config::zmConfigLoad();
+  ZoneMinder::Database::zmDbConnect();
+}
+
 1;
 __END__
 

From 49e3d3be7aaafdb9975719207e44134dbf210b24 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 3 May 2016 10:21:50 -0400
Subject: [PATCH 13/49] Turn the config loading code from a BEGIN to a function
 that could be called repeatedly.

---
 scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
index 4be86e962..03f05d0e8 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
@@ -30,7 +30,6 @@ use warnings;
 
 require Exporter;
 require ZoneMinder::Base;
-require ZoneMinder::Database;
 
 our @ISA = qw(Exporter ZoneMinder::Base);
 
@@ -64,8 +63,9 @@ use constant ZM_CONFIG => "@ZM_CONFIG@"; # Path to the ZoneMinder config file
 use Carp;
 
 # Load the config from the database into the symbol table
-BEGIN
-{
+sub zmConfigLoad {
+  %Config = ();
+
     my $config_file = ZM_CONFIG;
     open( my $CONFIG, "<", $config_file )
         or croak( "Can't open config file '$config_file': $!" );
@@ -83,7 +83,8 @@ BEGIN
     }
     close( $CONFIG );
 
-    my $dbh = zmDbConnect() or croak( "Can't connect to db" );
+    require ZoneMinder::Database;
+    my $dbh = ZoneMinder::Database::zmDbConnect() or croak( "Can't connect to db" );
     my $sql = 'select * from Config';
     my $sth = $dbh->prepare_cached( $sql ) or croak( "Can't prepare '$sql': ".$dbh->errstr() );
     my $res = $sth->execute() or croak( "Can't execute: ".$sth->errstr() );

From e80db4c4339c4a86f4583899cb882104aa3883d3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 3 May 2016 10:22:16 -0400
Subject: [PATCH 14/49] Use zmDbConnect instead of duplicated db connect code

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

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
index 4c5acac2b..0e454d784 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
@@ -461,7 +461,7 @@ sub databaseLevel
             {
                 if ( !$this->{dbh} )
                 {
-                    $this->{dbh} = zmDbConnect();
+                    $this->{dbh} = ZoneMinder::Database::zmDbConnect();
                     if ( !$this->{dbh} )
                     {
                         $databaseLevel = NOLOG;

From 24bf91707f0119fef79af05e8fe0e48917870968 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 3 May 2016 10:22:38 -0400
Subject: [PATCH 15/49] Database module should really use DBI

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

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
index 7dfe0654b..fdea725fe 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
@@ -27,6 +27,7 @@ package ZoneMinder::Database;
 use 5.006;
 use strict;
 use warnings;
+use DBI;
 
 require Exporter;
 require ZoneMinder::Base;

From c0509691412fa8312968ed31fb773d050a7922d1 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 5 May 2016 15:33:28 -0400
Subject: [PATCH 16/49] Merge object model classes from storageareas

---
 web/includes/Event.php   | 152 +++++++++++++++++++++++++++++++++++++++
 web/includes/Frame.php   | 103 ++++++++++++++++++++++++++
 web/includes/Server.php  |  79 +++++++++++++-------
 web/includes/Storage.php |  51 +++++++++++++
 4 files changed, 359 insertions(+), 26 deletions(-)
 create mode 100644 web/includes/Event.php
 create mode 100644 web/includes/Frame.php
 create mode 100644 web/includes/Storage.php

diff --git a/web/includes/Event.php b/web/includes/Event.php
new file mode 100644
index 000000000..5ad1c4031
--- /dev/null
+++ b/web/includes/Event.php
@@ -0,0 +1,152 @@
+<?php
+require_once( 'database.php' );
+require_once( 'Storage.php' );
+
+class Event {
+  public function __construct( $IdOrRow ) {
+    $row = NULL;
+    if ( $IdOrRow ) {
+      if ( is_integer( $IdOrRow ) or is_numeric( $IdOrRow ) ) {
+        $row = dbFetchOne( 'SELECT *,unix_timestamp(StartTime) as Time FROM Events WHERE Id=?', NULL, array( $IdOrRow ) );
+        if ( ! $row ) {
+          Error("Unable to load Event record for Id=" . $IdOrRow );
+        }
+      } elseif ( is_array( $IdOrRow ) ) {
+        $row = $IdOrRow;
+      } else {
+        Error("Unknown argument passed to Event Constructor ($IdOrRow)");
+        return;
+      }
+    } # end if isset($IdOrRow)
+
+    if ( $row ) {
+      foreach ($row as $k => $v) {
+        $this->{$k} = $v;
+      }
+    } else {
+      Error("No row for Event " . $IdOrRow );
+    }
+  } // end function __construct
+  public function Storage() {
+    return new Storage( $this->{'StorageId'} );
+  }
+  public function __call( $fn, array $args){
+    if(isset($this->{$fn})){
+      return $this->{$fn};
+#array_unshift($args, $this);
+#call_user_func_array( $this->{$fn}, $args);
+    }
+  }
+
+  public function Time() {
+    if ( ! isset( $this->{'Time'} ) ) {
+      $this->{'Time'} = strtotime($this->{'StartTime'});
+    }
+    return $this->{'Time'};
+  }
+
+  public function Path() {
+    $Storage = $this->Storage();
+    return $Storage->Path().'/'.$this->Relative_Path();
+  }
+  public function Relative_Path() {
+    $event_path = "";
+
+    if ( ZM_USE_DEEP_STORAGE )
+    {
+      $event_path = 
+        $this->{'MonitorId'}
+      .'/'.strftime( "%y/%m/%d/%H/%M/%S",
+          $this->Time()
+          )
+        ;
+    }
+    else
+    {
+      $event_path = 
+        $this->{'MonitorId'}
+      .'/'.$this->{'Id'}
+      ;
+    }
+
+    return( $event_path );
+
+  }
+
+  public function LinkPath() {
+    if ( ZM_USE_DEEP_STORAGE ) {
+      return $this->{'MonitorId'} .'/'.strftime( "%y/%m/%d/.", $this->Time()).$this->{'Id'};
+    }
+    Error("Calling Link_Path when not using deep storage");
+    return '';
+  }
+
+  public function delete() {
+    dbQuery( 'DELETE FROM Events WHERE Id = ?', array($this->{'Id'}) );
+    if ( !ZM_OPT_FAST_DELETE ) {
+      dbQuery( 'DELETE FROM Stats WHERE EventId = ?', array($this->{'Id'}) );
+      dbQuery( 'DELETE FROM Frames WHERE EventId = ?', array($this->{'Id'}) );
+      if ( ZM_USE_DEEP_STORAGE ) {
+
+# Assumption: All events haev a start time
+        $start_date = date_parse( $this->{'StartTime'} );
+        $start_date['year'] = $start_date['year'] % 100;
+
+        $Storage = $this->Storage();
+# So this is  because ZM creates a link under teh day pointing to the time that the event happened. 
+        $eventlink_path = $Storage->Path().'/'.$this->Link_Path();
+
+        if ( $id_files = glob( $eventlink_path ) ) {
+# I know we are using arrays here, but really there can only ever be 1 in the array
+          $eventPath = preg_replace( '/\.'.$event['Id'].'$/', readlink($id_files[0]), $id_files[0] );
+          deletePath( $eventPath );
+          deletePath( $id_files[0] );
+          $pathParts = explode(  '/', $eventPath );
+          for ( $i = count($pathParts)-1; $i >= 2; $i-- ) {
+            $deletePath = join( '/', array_slice( $pathParts, 0, $i ) );
+            if ( !glob( $deletePath."/*" ) ) {
+              deletePath( $deletePath );
+            }
+          }
+        } else {
+          Warning( "Found no event files under $eventlink_path" );
+        } # end if found files
+      } else {
+        $eventPath = $this->Path();
+        deletePath( $eventPath );
+      } # USE_DEEP_STORAGE OR NOT
+    } # ! ZM_OPT_FAST_DELETE
+  } # end Event->delete
+
+public function getStreamSrc( $args, $querySep='&amp;' ) {
+    return ZM_BASE_URL.'/index.php?view=view_video&eid='.$this->{'Id'};
+
+    $streamSrc = ZM_BASE_URL.ZM_PATH_ZMS;
+
+    $args[] = "source=event&event=".$this->{'Id'};
+
+    if ( ZM_OPT_USE_AUTH ) {
+      if ( ZM_AUTH_RELAY == "hashed" ) {
+        $args[] = "auth=".generateAuthHash( ZM_AUTH_HASH_IPS );
+      } elseif ( ZM_AUTH_RELAY == "plain" ) {
+        $args[] = "user=".$_SESSION['username'];
+        $args[] = "pass=".$_SESSION['password'];
+      } elseif ( ZM_AUTH_RELAY == "none" ) {
+        $args[] = "user=".$_SESSION['username'];
+      }
+    }
+    if ( !in_array( "mode=single", $args ) && !empty($GLOBALS['connkey']) ) {
+      $args[] = "connkey=".$GLOBALS['connkey'];
+    }
+    if ( ZM_RAND_STREAM ) {
+      $args[] = "rand=".time();
+    }
+
+    if ( count($args) ) {
+      $streamSrc .= "?".join( $querySep, $args );
+    }
+
+    return( $streamSrc );
+  } // end function getStreamSrc
+} # end class
+?>
diff --git a/web/includes/Frame.php b/web/includes/Frame.php
new file mode 100644
index 000000000..5973cd1bf
--- /dev/null
+++ b/web/includes/Frame.php
@@ -0,0 +1,103 @@
+<?php
+require_once( 'database.php' );
+require_once( 'Event.php' );
+
+class Frame {
+  public function __construct( $IdOrRow ) {
+    $row = NULL;
+    if ( $IdOrRow ) {
+      if ( is_integer( $IdOrRow ) or is_numeric( $IdOrRow ) ) {
+        $row = dbFetchOne( 'SELECT * FROM Frames WHERE Id=?', NULL, array( $IdOrRow ) );
+        if ( ! $row ) {
+          Error("Unable to load Frame record for Id=" . $IdOrRow );
+        }
+      } elseif ( is_array( $IdOrRow ) ) {
+        $row = $IdOrRow;
+      } else {
+        Error("Unknown argument passed to Frame Constructor ($IdOrRow)");
+        return;
+      }
+    } # end if isset($IdOrRow)
+
+    if ( $row ) {
+      foreach ($row as $k => $v) {
+        $this->{$k} = $v;
+      }
+    } else {
+      Error("No row for Frame " . $IdOrRow );
+    }
+  } // end function __construct
+  public function Storage() {
+    return $this->Event()->Storage();
+  }
+  public function Event() {
+    return new Event( $this->{'EventId'} );
+  }
+  public function __call( $fn, array $args){
+    if(isset($this->{$fn})){
+      return $this->{$fn};
+#array_unshift($args, $this);
+#call_user_func_array( $this->{$fn}, $args);
+    }
+  }
+
+  public function Path() {
+    $Storage = $this->Storage();
+    return $Storage->Path().'/'.$this->Relative_Path();
+  }
+  public function Relative_Path() {
+    $event_path = "";
+
+    if ( ZM_USE_DEEP_STORAGE )
+    {
+      $event_path = 
+        $this->{'MonitorId'}
+      .'/'.strftime( "%y/%m/%d/%H/%M/%S",
+          $this->Time()
+          )
+        ;
+    }
+    else
+    {
+      $event_path = 
+        $this->{'MonitorId'}
+      .'/'.$this->{'Id'}
+      ;
+    }
+
+    return( $event_path );
+
+  }
+
+  public function getImageSrc( ) {
+    return ZM_BASE_URL.'/index.php?view=image&fid='.$this->{'Id'};
+  } // end function getImageSrc
+
+	public static function find( $parameters = array(), $limit = NULL ) {
+		$sql = 'SELECT * FROM Frames';
+		$values = array();
+		if ( sizeof($parameters) ) {
+			$sql .= ' WHERE ' . implode( ' AND ', array_map( 
+				function($v){ return $v.'=?'; }, 
+				array_keys( $parameters ) 
+				) );
+			$values = array_values( $parameters );
+		}
+		if ( $limit ) {
+			$sql .= ' LIMIT ' . $limit;
+		}
+		$results = dbFetchAll( $sql, NULL, $values );
+		if ( $results ) {
+		  return array_map( function($id){ return new Frame($id); }, $results );
+		}
+	}
+
+	public static function find_one( $parameters = array() ) {
+	  $results = Frame::find( $parameters, 1 );
+	  if ( ! sizeof( $results ) ) {
+		  return;
+	  }
+	  return $results[0];
+	}
+} # end class
+?>
diff --git a/web/includes/Server.php b/web/includes/Server.php
index e8402809c..dfce67eb8 100644
--- a/web/includes/Server.php
+++ b/web/includes/Server.php
@@ -1,28 +1,28 @@
 <?php
 require_once( 'database.php' );
-class Server {
 
-    public function __construct( $IdOrRow = NULL ) {
-		$row = NULL;
-		if ( $IdOrRow ) {
-			if ( is_integer( $IdOrRow ) or is_numeric( $IdOrRow ) ) {
-				$row = dbFetchOne( 'SELECT * FROM Servers WHERE Id=?', NULL, array( $IdOrRow ) );
-				if ( ! $row ) {
-					Error("Unable to load Server record for Id=" . $IdOrRow );
-				}
-			} elseif ( is_array( $IdOrRow ) ) {
-				$row = $IdOrRow;
-			}
-		} # end if isset($IdOrRow)
-		if ( $row ) {
-			foreach ($row as $k => $v) {
-				$this->{$k} = $v;
-			}
-		} else {
-			$this->{'Name'} = '';
-			$this->{'Hostname'} = '';
-		}
+class Server {
+  public function __construct( $IdOrRow = NULL ) {
+    $row = NULL;
+    if ( $IdOrRow ) {
+      if ( is_integer( $IdOrRow ) or is_numeric( $IdOrRow ) ) {
+        $row = dbFetchOne( 'SELECT * FROM Servers WHERE Id=?', NULL, array( $IdOrRow ) );
+        if ( ! $row ) {
+          Error("Unable to load Server record for Id=" . $IdOrRow );
+        }
+      } elseif ( is_array( $IdOrRow ) ) {
+        $row = $IdOrRow;
+      }
+    } # end if isset($IdOrRow)
+    if ( $row ) {
+      foreach ($row as $k => $v) {
+        $this->{$k} = $v;
+      }
+    } else {
+      $this->{'Name'} = '';
+      $this->{'Hostname'} = '';
     }
+  }
 	public static function find_all() {
 		$servers = array();
 		$result = dbQuery( 'SELECT * FROM Servers ORDER BY Name');
@@ -47,11 +47,38 @@ class Server {
 		return $this->{'Name'};
 	}
 	public function __call( $fn, array $args= NULL){
-        if(isset($this->{$fn})){
-            return $this->{$fn};
-            #array_unshift($args, $this);
-            #call_user_func_array( $this->{$fn}, $args);
-        }
+    if(isset($this->{$fn})){
+      return $this->{$fn};
+#array_unshift($args, $this);
+#call_user_func_array( $this->{$fn}, $args);
     }
+  }
+  public static function find( $parameters = array(), $limit = NULL ) {
+    $sql = 'SELECT * FROM Servers';
+    $values = array();
+    if ( sizeof($parameters) ) {
+      $sql .= ' WHERE ' . implode( ' AND ', array_map(
+        function($v){ return $v.'=?'; },
+        array_keys( $parameters )
+        ) );
+      $values = array_values( $parameters );
+    }
+    if ( $limit ) {
+      $sql .= ' LIMIT ' . $limit;
+    }
+    $results = dbFetchAll( $sql, NULL, $values );
+    if ( $results ) {
+      return array_map( function($id){ return new Server($id); }, $results );
+    }
+  }
+
+  public static function find_one( $parameters = array() ) {
+    $results = Server::find( $parameters, 1 );
+    if ( ! sizeof( $results ) ) {
+      return;
+    }
+    return $results[0];
+  }
+
 }
 ?>
diff --git a/web/includes/Storage.php b/web/includes/Storage.php
new file mode 100644
index 000000000..546cb9cbe
--- /dev/null
+++ b/web/includes/Storage.php
@@ -0,0 +1,51 @@
+<?php
+require_once( 'database.php' );
+class Storage {
+    public function __construct( $IdOrRow = NULL ) {
+		$row = NULL;
+		if ( $IdOrRow ) {
+			if ( is_integer( $IdOrRow ) or is_numeric( $IdOrRow ) ) {
+				$row = dbFetchOne( 'SELECT * FROM Storage WHERE Id=?', NULL, array( $IdOrRow ) );
+				if ( ! $row ) {
+					Error("Unable to load Storage record for Id=" . $IdOrRow );
+				}
+			} elseif ( is_array( $IdOrRow ) ) {
+				$row = $IdOrRow;
+			}
+		}
+		if ( $row ) {
+			foreach ($row as $k => $v) {
+				$this->{$k} = $v;
+			}
+		} else {
+			$this->{'Name'} = '';
+			$this->{'Path'} = '';
+		}
+    }
+
+	public function Path() {
+		if ( isset( $this->{'Path'} ) and ( $this->{'Path'} != '' ) ) {
+			return $this->{'Path'};
+		} else if ( ! isset($this->{'Id'}) ) {
+			return ZM_DIR_EVENTS;
+		}
+		return $this->{'Name'};
+	}
+	public function __call( $fn, array $args= NULL){
+        if(isset($this->{$fn})){
+            return $this->{$fn};
+            #array_unshift($args, $this);
+            #call_user_func_array( $this->{$fn}, $args);
+        }
+    }
+    public static function find_all() {
+        $storage_areas = array();
+        $result = dbQuery( 'SELECT * FROM Storage ORDER BY Name');
+        $results = $result->fetchALL(PDO::FETCH_CLASS | PDO::FETCH_PROPS_LATE, 'Storage' );
+        foreach ( $results as $row => $obj ) {
+            $storage_areas[] = $obj;
+        }
+        return $storage_areas;
+    }
+}
+?>

From f55f979cc9c63201de7d3727265a319312dd00bc Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Sat, 7 May 2016 09:30:03 -0400
Subject: [PATCH 17/49] use fully specified Config to simplify symbol tables

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

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
index 0e454d784..7366ada90 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
@@ -31,6 +31,8 @@ use warnings;
 require Exporter;
 require ZoneMinder::Base;
 require ZoneMinder::Database;
+require ZoneMinder::Config;
+
 
 our @ISA = qw(Exporter ZoneMinder::Base);
 
@@ -87,8 +89,6 @@ our $VERSION = $ZoneMinder::Base::VERSION;
 #
 # ==========================================================================
 
-use ZoneMinder::Config qw(:all);
-
 use DBI;
 use Carp;
 use POSIX;
@@ -152,7 +152,7 @@ sub new
     $this->{hasTerm} = -t STDERR;
 
     ( $this->{fileName} = $0 ) =~ s|^.*/||;
-    $this->{logPath} = $Config{ZM_PATH_LOGS};
+    $this->{logPath} = $ZoneMinder::Config::Config{ZM_PATH_LOGS};
     $this->{logFile} = $this->{logPath}."/".$this->{id}.".log";
 
     $this->{trace} = 0;
@@ -165,7 +165,7 @@ sub BEGIN
 {
     # Fake the config variables that are used in case they are not defined yet
     # Only really necessary to support upgrade from previous version
-    if ( !eval('defined($Config{ZM_LOG_DEBUG})') )
+    if ( !eval('defined($ZoneMinder::Config::Config{ZM_LOG_DEBUG})') )
     {
         no strict 'subs';
         no strict 'refs';
@@ -223,7 +223,7 @@ sub initialise( @ )
     }
     else
     {
-        $tempDatabaseLevel = $Config{ZM_LOG_LEVEL_DATABASE};
+        $tempDatabaseLevel = $ZoneMinder::Config::Config{ZM_LOG_LEVEL_DATABASE};
     }
     if ( defined($options{fileLevel}) )
     {
@@ -231,7 +231,7 @@ sub initialise( @ )
     }
     else
     {
-        $tempFileLevel = $Config{ZM_LOG_LEVEL_FILE};
+        $tempFileLevel = $ZoneMinder::Config::Config{ZM_LOG_LEVEL_FILE};
     }
     if ( defined($options{syslogLevel}) )
     {
@@ -239,7 +239,7 @@ sub initialise( @ )
     }
     else
     {
-        $tempSyslogLevel = $Config{ZM_LOG_LEVEL_SYSLOG};
+        $tempSyslogLevel = $ZoneMinder::Config::Config{ZM_LOG_LEVEL_SYSLOG};
     }
 
     if ( defined($ENV{'LOG_PRINT'}) )
@@ -255,9 +255,9 @@ sub initialise( @ )
     $tempFileLevel = $level if ( defined($level = $this->getTargettedEnv('LOG_LEVEL_FILE')) );
     $tempSyslogLevel = $level if ( defined($level = $this->getTargettedEnv('LOG_LEVEL_SYSLOG')) );
 
-    if ( $Config{ZM_LOG_DEBUG} )
+    if ( $ZoneMinder::Config::Config{ZM_LOG_DEBUG} )
     {
-        foreach my $target ( split( /\|/, $Config{ZM_LOG_DEBUG_TARGET} ) )
+        foreach my $target ( split( /\|/, $ZoneMinder::Config::Config{ZM_LOG_DEBUG_TARGET} ) )
         {
             if ( $target eq $this->{id}
                  || $target eq "_".$this->{id}
@@ -266,12 +266,12 @@ sub initialise( @ )
                  || $target eq ""
             )
             {
-                if ( $Config{ZM_LOG_DEBUG_LEVEL} > NOLOG )
+                if ( $ZoneMinder::Config::Config{ZM_LOG_DEBUG_LEVEL} > NOLOG )
                 {
-                    $tempLevel = $this->limit( $Config{ZM_LOG_DEBUG_LEVEL} );
-                    if ( $Config{ZM_LOG_DEBUG_FILE} ne "" )
+                    $tempLevel = $this->limit( $ZoneMinder::Config::Config{ZM_LOG_DEBUG_LEVEL} );
+                    if ( $ZoneMinder::Config::Config{ZM_LOG_DEBUG_FILE} ne "" )
                     {
-                        $tempLogFile = $Config{ZM_LOG_DEBUG_FILE};
+                        $tempLogFile = $ZoneMinder::Config::Config{ZM_LOG_DEBUG_FILE};
                         $tempFileLevel = $tempLevel;
                     }
                 }
@@ -466,9 +466,9 @@ sub databaseLevel
                     {
                         $databaseLevel = NOLOG;
                         Error( "Unable to write log entries to DB, can't connect to database '"
-                               .$Config{ZM_DB_NAME}
+                               .$ZoneMinder::Config::Config{ZM_DB_NAME}
                                ."' on host '"
-                               .$Config{ZM_DB_HOST}
+                               .$ZoneMinder::Config::Config{ZM_DB_HOST}
                                ."'"
                         );
                     }
@@ -566,8 +566,8 @@ sub openFile
     {
         $LOGFILE->autoflush() if ( $this->{autoFlush} );
 
-        my $webUid = (getpwnam( $Config{ZM_WEB_USER} ))[2];
-        my $webGid = (getgrnam( $Config{ZM_WEB_GROUP} ))[2];
+        my $webUid = (getpwnam( $ZoneMinder::Config::Config{ZM_WEB_USER} ))[2];
+        my $webGid = (getgrnam( $ZoneMinder::Config::Config{ZM_WEB_GROUP} ))[2];
         if ( $> == 0 )
         {
             chown( $webUid, $webGid, $this->{logFile} )

From 6e32b5d26610f40dc5c260ef4271fca1054cd760 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Sat, 7 May 2016 09:34:04 -0400
Subject: [PATCH 18/49] Use fully specified COnfig hash to simplify Symbol
 tables

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

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
index fdea725fe..574c382f5 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
@@ -31,6 +31,7 @@ use DBI;
 
 require Exporter;
 require ZoneMinder::Base;
+require ZoneMinder::Config;
 
 our @ISA = qw(Exporter ZoneMinder::Base);
 
@@ -65,7 +66,6 @@ our $VERSION = $ZoneMinder::Base::VERSION;
 # ==========================================================================
 
 use ZoneMinder::Logger qw(:all);
-use ZoneMinder::Config qw(:all);
 
 use Carp;
 
@@ -80,23 +80,23 @@ sub zmDbConnect
     }
     if ( !defined( $dbh ) )
     {
-        my ( $host, $port ) = ( $Config{ZM_DB_HOST} =~ /^([^:]+)(?::(.+))?$/ );
+        my ( $host, $port ) = ( $ZoneMinder::Config::Config{ZM_DB_HOST} =~ /^([^:]+)(?::(.+))?$/ );
 
         if ( defined($port) )
         {
-            $dbh = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}
+            $dbh = DBI->connect( "DBI:mysql:database=".$ZoneMinder::Config::Config{ZM_DB_NAME}
                                 .";host=".$host
                                 .";port=".$port
-                                , $Config{ZM_DB_USER}
-                                , $Config{ZM_DB_PASS}
+                                , $ZoneMinder::Config::Config{ZM_DB_USER}
+                                , $ZoneMinder::Config::Config{ZM_DB_PASS}
             );
         }
         else
         {
-            $dbh = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}
-                                .";host=".$Config{ZM_DB_HOST}
-                                , $Config{ZM_DB_USER}
-                                , $Config{ZM_DB_PASS}
+            $dbh = DBI->connect( "DBI:mysql:database=".$ZoneMinder::Config::Config{ZM_DB_NAME}
+                                .";host=".$ZoneMinder::Config::Config{ZM_DB_HOST}
+                                , $ZoneMinder::Config::Config{ZM_DB_USER}
+                                , $ZoneMinder::Config::Config{ZM_DB_PASS}
             );
         }
         $dbh->trace( 0 );

From b444c8a6b41238e2557fef4258422bea41d6ec85 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Sat, 7 May 2016 09:34:45 -0400
Subject: [PATCH 19/49] Move the BEGIN from ZoneMinder to ZoneMinder/Base.

---
 scripts/ZoneMinder/lib/ZoneMinder.pm | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder.pm b/scripts/ZoneMinder/lib/ZoneMinder.pm
index 37292a44d..63b7c8108 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder.pm
@@ -81,12 +81,6 @@ our @EXPORT = ( @EXPORT_OK );
 
 our $VERSION = $ZoneMinder::Base::VERSION;
 
-BEGIN {
-  require ZoneMinder::Config;
-  require ZoneMinder::Database;
-  ZoneMinder::Config::zmConfigLoad();
-  ZoneMinder::Database::zmDbConnect();
-}
 
 1;
 __END__

From 3522c5796bd05e5a4475484ec277f274a71c16de Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 9 May 2016 12:01:26 -0400
Subject: [PATCH 20/49] add BEGIN Back to ZoneMinder.pm

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

diff --git a/scripts/ZoneMinder/lib/ZoneMinder.pm b/scripts/ZoneMinder/lib/ZoneMinder.pm
index 63b7c8108..6d8b3bfc8 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder.pm
@@ -81,6 +81,10 @@ our @EXPORT = ( @EXPORT_OK );
 
 our $VERSION = $ZoneMinder::Base::VERSION;
 
+BEGIN {
+  ZoneMinder::Config::zmConfigLoad();
+  ZoneMinder::Database::zmDbConnect();
+}
 
 1;
 __END__

From b33e35bda7f1bedbc795fc320d2a65cc8460edab Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 9 May 2016 12:14:59 -0400
Subject: [PATCH 21/49] move the require to the top

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

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
index 03f05d0e8..54cc8c3f3 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
@@ -30,6 +30,7 @@ use warnings;
 
 require Exporter;
 require ZoneMinder::Base;
+require ZoneMinder::Database;
 
 our @ISA = qw(Exporter ZoneMinder::Base);
 
@@ -83,7 +84,6 @@ sub zmConfigLoad {
     }
     close( $CONFIG );
 
-    require ZoneMinder::Database;
     my $dbh = ZoneMinder::Database::zmDbConnect() or croak( "Can't connect to db" );
     my $sql = 'select * from Config';
     my $sth = $dbh->prepare_cached( $sql ) or croak( "Can't prepare '$sql': ".$dbh->errstr() );

From 08bf97fe85c8f6de5b44234147cc87818b254bed Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 9 May 2016 12:44:41 -0400
Subject: [PATCH 22/49] Add a config entry for ZM_LD_PRELOAD

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

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index fc4143d8a..01d4b534c 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -1709,6 +1709,16 @@ our @options =
         type        => $types{boolean},
         category    => "config",
     },
+    {
+      name          =>  'ZM_LD_PRELOAD',
+      default       =>  '',
+      description   =>  "Some older cameras require the use of the v4l1 compat
+                         library. This setting allows the setting of the path 
+                         to the library, so that it can be loaded by zmdc.pl 
+                         before launching zmc."),
+      type          =>  $types{abs_path},
+      category      =>  'config',
+    },
     {
         name        => "ZM_SIGNAL_CHECK_POINTS",
         default     => "10",

From 605edfd6d0d80c688ec3b8e247d5ef973ab34b6a Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 9 May 2016 12:46:26 -0400
Subject: [PATCH 23/49] add ENV{LD_PRELOAD} setting

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

diff --git a/scripts/zmdc.pl.in b/scripts/zmdc.pl.in
index 36d5e922a..730af9995 100644
--- a/scripts/zmdc.pl.in
+++ b/scripts/zmdc.pl.in
@@ -75,6 +75,10 @@ $| = 1;
 
 $ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
+if ( $Config{ZM_LD_PRELOAD} ) {
+  Debug("Adding ENV{LD_PRELOAD} = $Config{ZM_LD_PRELOAD}");
+  $ENV{LD_PRELOAD} = $Config{ZM_LD_PRELOAD};
+}
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
 my @daemons = (

From 5566d1881df20b0283ae73f0a68e3304deb2635e Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 9 May 2016 21:34:12 -0400
Subject: [PATCH 24/49] add perl dbd mysql to build depends.  Seems to need it.

---
 distros/ubuntu1204/control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/distros/ubuntu1204/control b/distros/ubuntu1204/control
index 6368d9417..3fedf7129 100644
--- a/distros/ubuntu1204/control
+++ b/distros/ubuntu1204/control
@@ -16,6 +16,7 @@ Build-Depends: debhelper (>= 9), python-sphinx | python3-sphinx, apache2-dev, dh
               ,libpolkit-gobject-1-dev
               ,libv4l-dev (>= 0.8.3) [!hurd-any]
               ,libvlc-dev
+              ,libdbd-mysql-perl
 # Unbundled (dh_linktree):
         ,libjs-jquery
         ,libjs-mootools

From 4d20d35f8d46fc2db6b51e5f30778e17e0a13f11 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 10 May 2016 08:43:38 -0400
Subject: [PATCH 25/49] add back missing depends for perl modules which are
 needed both for building and installing

---
 distros/ubuntu1204/control | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/distros/ubuntu1204/control b/distros/ubuntu1204/control
index 3fedf7129..0791622ed 100644
--- a/distros/ubuntu1204/control
+++ b/distros/ubuntu1204/control
@@ -5,18 +5,22 @@ Maintainer: Dmitry Smirnov <onlyjob@debian.org>
 Uploaders: Vagrant Cascadian <vagrant@debian.org>
 Build-Depends: debhelper (>= 9), python-sphinx | python3-sphinx, apache2-dev, dh-linktree
               ,cmake
-			  ,libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libavdevice-dev
+              ,libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libavdevice-dev
               ,libbz2-dev
               ,libgcrypt-dev
               ,libcurl4-gnutls-dev
               ,libgnutls-openssl-dev
-			  ,libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev, 
+              ,libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev, 
               ,libmysqlclient-dev
               ,libpcre3-dev
               ,libpolkit-gobject-1-dev
               ,libv4l-dev (>= 0.8.3) [!hurd-any]
               ,libvlc-dev
+              ,libdate-manip-perl
               ,libdbd-mysql-perl
+              ,libphp-serialization-perl
+              ,libsys-mmap-perl [!hurd-any]
+              ,libwww-perl
 # Unbundled (dh_linktree):
         ,libjs-jquery
         ,libjs-mootools

From a5ba4759bf27108aed334f1d7a0b6f5fa30fd5fe Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 10 May 2016 10:54:40 -0400
Subject: [PATCH 26/49] fix new config entry

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

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index 01d4b534c..610d2432d 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -1712,7 +1712,8 @@ our @options =
     {
       name          =>  'ZM_LD_PRELOAD',
       default       =>  '',
-      description   =>  "Some older cameras require the use of the v4l1 compat
+      description   =>  "Path to library to preload before launching daemons",
+      help          => qqq("Some older cameras require the use of the v4l1 compat
                          library. This setting allows the setting of the path 
                          to the library, so that it can be loaded by zmdc.pl 
                          before launching zmc."),

From 2888142e682bbc9950535d7e5aaef2cd20cda38d Mon Sep 17 00:00:00 2001
From: arjunrc <pliablepixels@gmail.com>
Date: Tue, 10 May 2016 16:55:43 -0400
Subject: [PATCH 27/49] added status command to retrieve alarmed status of
 monitor in addition to on/of

---
 web/api/app/Controller/MonitorsController.php | 79 ++++++++++++++++++-
 1 file changed, 78 insertions(+), 1 deletion(-)

diff --git a/web/api/app/Controller/MonitorsController.php b/web/api/app/Controller/MonitorsController.php
index 9ab7461f9..d87b115e8 100644
--- a/web/api/app/Controller/MonitorsController.php
+++ b/web/api/app/Controller/MonitorsController.php
@@ -97,7 +97,7 @@ public function beforeFilter() {
 
 			if ($this->Session->Read('systemPermission') != 'Edit')
 			{
-				 throw new UnauthotizedException(__('Insufficient privileges'));
+				 throw new UnauthorizedException(__('Insufficient privileges'));
 				return;
 			}
 
@@ -183,6 +183,83 @@ public function beforeFilter() {
 		));
 	}
 
+	// arm/disarm alarms
+	// expected format: http(s):/portal-api-url/monitors/alarm/id:M/command:C.json
+	// where M=monitorId
+	// where C=on|off|status
+	public function alarm()
+	{
+		$id = $this->request->params['named']['id'];
+		$cmd = strtolower($this->request->params['named']['command']);
+		if (!$this->Monitor->exists($id)) {
+			throw new NotFoundException(__('Invalid monitor'));
+		}
+		if ( $cmd != 'on' && $cmd != 'off' && $cmd != 'status')
+		{
+			throw new BadRequestException(__('Invalid command'));
+		}
+		$zm_path_bin = Configure::read('ZM_PATH_BIN');
+
+		switch ($cmd) 
+		{
+			case "on":
+				$q = '-a';
+				break;
+			case "off":
+			  $q = "-c";
+				break;
+			case "status":
+				$q = "-s";
+				break;			
+		}
+
+		// form auth key based on auth credentials
+		$this->loadModel('Config');
+		$options = array('conditions' => array('Config.' . $this->Config->primaryKey => 'ZM_OPT_USE_AUTH'));
+                $config = $this->Config->find('first', $options);
+		$zmOptAuth = $config['Config']['Value'];
+
+
+		$options = array('conditions' => array('Config.' . $this->Config->primaryKey => 'ZM_AUTH_RELAY'));
+                $config = $this->Config->find('first', $options);
+		$zmAuthRelay = $config['Config']['Value'];
+	
+		$auth="";
+		if ($zmOptAuth)
+		{
+			if ($zmAuthRelay == 'hashed')
+			{
+				$options = array('conditions' => array('Config.' . $this->Config->primaryKey => 'ZM_AUTH_HASH_SECRET'));
+                		$config = $this->Config->find('first', $options);
+				$zmAuthHashSecret = $config['Config']['Value'];
+
+				$time = localtime();
+				$ak = $zmAuthHashSecret.$this->Session->Read('username').$this->Session->Read('passwordHash').$time[2].$time[3].$time[4].$time[5];
+				$ak = md5($ak);
+				$auth = " -A ".$ak;
+			}
+			elseif ($zmAuthRelay == 'plain')
+			{
+				$auth = " -U " .$this->Session->Read('username')." -P ".$this->Session->Read('password');
+				
+			}
+			elseif ($zmAuthRelay == 'none')
+			{
+				$auth = " -U " .$this->Session->Read('username');
+			}
+		}
+		
+		$shellcmd = escapeshellcmd("$zm_path_bin/zmu -v -m$id $q $auth");
+		$status = exec ($shellcmd);
+
+		$this->set(array(
+			'status' => $status,
+			'_serialize' => array('status'),
+		));
+
+		
+	}
+
 	// Check if a daemon is running for the monitor id
 	public function daemonStatus() {
 		$id = $this->request->params['named']['id'];

From 8d5f2a8e5dbc946fb652cb530ded953a766a5192 Mon Sep 17 00:00:00 2001
From: arjunrc <pliablepixels@gmail.com>
Date: Tue, 10 May 2016 19:17:09 -0400
Subject: [PATCH 28/49] added iconnor's change back

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

diff --git a/web/api/app/Controller/MonitorsController.php b/web/api/app/Controller/MonitorsController.php
index d87b115e8..63849af69 100644
--- a/web/api/app/Controller/MonitorsController.php
+++ b/web/api/app/Controller/MonitorsController.php
@@ -138,7 +138,8 @@ public function beforeFilter() {
 			'_serialize' => array('message')
 		));
 		// - restart this monitor after change
-		$this->daemonControl($this->Monitor->id, 'restart', $this->request->data);
+		// We don't pass the request data as the monitor object because it may be a subset of the full monitor array
+		$this->daemonControl( $this->Monitor->id, 'restart' );
 	}
 
 /**

From af3cae578e501694e7fc2e15bf668736055a3f3d Mon Sep 17 00:00:00 2001
From: arjunrc <pliablepixels@gmail.com>
Date: Tue, 10 May 2016 20:07:28 -0400
Subject: [PATCH 29/49] fixed verbose handling bug for status command on zmu

---
 web/api/app/Controller/MonitorsController.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/web/api/app/Controller/MonitorsController.php b/web/api/app/Controller/MonitorsController.php
index 63849af69..cda5081d7 100644
--- a/web/api/app/Controller/MonitorsController.php
+++ b/web/api/app/Controller/MonitorsController.php
@@ -138,8 +138,7 @@ public function beforeFilter() {
 			'_serialize' => array('message')
 		));
 		// - restart this monitor after change
-		// We don't pass the request data as the monitor object because it may be a subset of the full monitor array
-		$this->daemonControl( $this->Monitor->id, 'restart' );
+		$this->daemonControl($this->Monitor->id, 'restart', $this->request->data);
 	}
 
 /**
@@ -205,11 +204,14 @@ public function beforeFilter() {
 		{
 			case "on":
 				$q = '-a';
+				$verbose = "-v";
 				break;
 			case "off":
 			  $q = "-c";
+				$verbose = "-v";
 				break;
 			case "status":
+				$verbose = ""; // zmu has a bug - gives incorrect verbose output in this case
 				$q = "-s";
 				break;			
 		}
@@ -250,7 +252,7 @@ public function beforeFilter() {
 			}
 		}
 		
-		$shellcmd = escapeshellcmd("$zm_path_bin/zmu -v -m$id $q $auth");
+		$shellcmd = escapeshellcmd("$zm_path_bin/zmu $verbose -m$id $q $auth");
 		$status = exec ($shellcmd);
 
 		$this->set(array(

From b513bcef821a0423eee2cffe7073b8c58a36a9f1 Mon Sep 17 00:00:00 2001
From: arjunrc <pliablepixels@gmail.com>
Date: Tue, 10 May 2016 20:09:41 -0400
Subject: [PATCH 30/49] icon's gonna kill me

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

diff --git a/web/api/app/Controller/MonitorsController.php b/web/api/app/Controller/MonitorsController.php
index cda5081d7..893410ce8 100644
--- a/web/api/app/Controller/MonitorsController.php
+++ b/web/api/app/Controller/MonitorsController.php
@@ -138,7 +138,8 @@ public function beforeFilter() {
 			'_serialize' => array('message')
 		));
 		// - restart this monitor after change
-		$this->daemonControl($this->Monitor->id, 'restart', $this->request->data);
+		// We don't pass the request data as the monitor object because it may be a subset of the full monitor array
+ 		$this->daemonControl( $this->Monitor->id, 'restart' );
 	}
 
 /**

From 1530096560e9f48e003efcaebcdcdea983b5391a Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 12 May 2016 10:17:41 -0400
Subject: [PATCH 31/49] whitespace/google code style

---
 web/includes/functions.php | 4030 ++++++++++++++++--------------------
 1 file changed, 1814 insertions(+), 2216 deletions(-)

diff --git a/web/includes/functions.php b/web/includes/functions.php
index 9a8264548..314806105 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -19,2501 +19,2099 @@
 // 
 
 // Compatibility functions
-if ( version_compare( phpversion(), "4.3.0", "<") )
-{
-    function ob_get_clean()
-    {
-        $buffer = ob_get_contents();
-        ob_end_clean();
-        return( $buffer );
-    }
+if ( version_compare( phpversion(), "4.3.0", "<") ) {
+  function ob_get_clean() {
+    $buffer = ob_get_contents();
+    ob_end_clean();
+    return( $buffer );
+  }
 }
 
-function userLogin( $username, $password="", $passwordHashed=false )
-{
-    global $user, $cookies;
+function userLogin( $username, $password="", $passwordHashed=false ) {
+  global $user, $cookies;
 
-	$sql = "select * from Users where Enabled = 1";
-	$sql_values = NULL;
-    if ( ZM_AUTH_TYPE == "builtin" )
-    {
-        if ( $passwordHashed ) {
-            $sql .= " AND Username=? AND Password=?";
-        } else {
-            $sql .= " AND Username=? AND Password=password(?)";
-        }
-		$sql_values = array( $username, $password );
+  $sql = "select * from Users where Enabled = 1";
+  $sql_values = NULL;
+  if ( ZM_AUTH_TYPE == "builtin" ) {
+    if ( $passwordHashed ) {
+      $sql .= " AND Username=? AND Password=?";
     } else {
-        $sql .= " AND Username = ?";
-		$sql_values = array( $username );
+      $sql .= " AND Username=? AND Password=password(?)";
     }
-    $_SESSION['username'] = $username;
-    if ( ZM_AUTH_RELAY == "plain" )
-    {
-        // Need to save this in session
-        $_SESSION['password'] = $password;
+    $sql_values = array( $username, $password );
+  } else {
+    $sql .= " AND Username = ?";
+    $sql_values = array( $username );
+  }
+  $_SESSION['username'] = $username;
+  if ( ZM_AUTH_RELAY == "plain" ) {
+    // Need to save this in session
+    $_SESSION['password'] = $password;
+  }
+  $_SESSION['remoteAddr'] = $_SERVER['REMOTE_ADDR']; // To help prevent session hijacking
+  if ( $dbUser = dbFetchOne( $sql, NULL, $sql_values ) ) {
+    Info( "Login successful for user \"$username\"" );
+    $_SESSION['user'] = $user = $dbUser;
+    if ( ZM_AUTH_TYPE == "builtin" ) {
+      $_SESSION['passwordHash'] = $user['Password'];
     }
-    $_SESSION['remoteAddr'] = $_SERVER['REMOTE_ADDR']; // To help prevent session hijacking
-    if ( $dbUser = dbFetchOne( $sql, NULL, $sql_values ) )
-    {
-        Info( "Login successful for user \"$username\"" );
-        $_SESSION['user'] = $user = $dbUser;
-        if ( ZM_AUTH_TYPE == "builtin" )
-        {
-            $_SESSION['passwordHash'] = $user['Password'];
-        }
-    }
-    else
-    {
-        Warning( "Login denied for user \"$username\"" );
-        unset( $user );
-    }
-    if ( $cookies )
-        session_write_close();
-}
-
-function userLogout()
-{
-    global $user;
-    $username = $user['Username'];
-
-    Info( "User \"$username\" logged out" );
-
-    unset( $_SESSION['user'] );
+  } else {
+    Warning( "Login denied for user \"$username\"" );
     unset( $user );
-
-    session_destroy();
+  }
+  if ( $cookies )
+    session_write_close();
 }
 
-function noCacheHeaders()
-{
-    header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");    // Date in the past
-    header("Last-Modified: ".gmdate( "D, d M Y H:i:s" )." GMT"); // always modified
-    header("Cache-Control: no-store, no-cache, must-revalidate");  // HTTP/1.1
-    header("Cache-Control: post-check=0, pre-check=0", false);
-    header("Pragma: no-cache");         // HTTP/1.0
+function userLogout() {
+  global $user;
+  $username = $user['Username'];
+
+  Info( "User \"$username\" logged out" );
+
+  unset( $_SESSION['user'] );
+  unset( $user );
+
+  session_destroy();
+}
+
+function noCacheHeaders() {
+  header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");    // Date in the past
+  header("Last-Modified: ".gmdate( "D, d M Y H:i:s" )." GMT"); // always modified
+  header("Cache-Control: no-store, no-cache, must-revalidate");  // HTTP/1.1
+  header("Cache-Control: post-check=0, pre-check=0", false);
+  header("Pragma: no-cache");         // HTTP/1.0
 }
 
 function CORSHeaders() {
-	if ( isset( $_SERVER['HTTP_ORIGIN'] ) ) {
+  if ( isset( $_SERVER['HTTP_ORIGIN'] ) ) {
 
-		# The following is left for future reference/use.
-		$valid = false;
-		$servers = dbFetchAll( 'SELECT * FROM Servers' );
-		if ( sizeof($servers) <= 1 ) {
-			# Only need CORSHeaders in the event that there are multiple servers in use.
-			return;
-		}
-		foreach( dbFetchAll( 'SELECT * FROM Servers' ) as $row ) {
-			$Server = new Server( $row );
-			if ( $_SERVER['HTTP_ORIGIN'] == $Server->Url() ) {
-				$valid = true;
-				header("Access-Control-Allow-Origin: " . $Server->Url() );
-				header("Access-Control-Allow-Headers: x-requested-with,x-request");
-			}
-		}
-		if ( ! $valid ) {
-			Warning( $_SERVER['HTTP_ORIGIN'] . " is not found in servers list." );
-		}
-	}
+# The following is left for future reference/use.
+    $valid = false;
+    $servers = dbFetchAll( 'SELECT * FROM Servers' );
+    if ( sizeof($servers) <= 1 ) {
+# Only need CORSHeaders in the event that there are multiple servers in use.
+      return;
+    }
+    foreach( dbFetchAll( 'SELECT * FROM Servers' ) as $row ) {
+      $Server = new Server( $row );
+      if ( $_SERVER['HTTP_ORIGIN'] == $Server->Url() ) {
+        $valid = true;
+        header("Access-Control-Allow-Origin: " . $Server->Url() );
+        header("Access-Control-Allow-Headers: x-requested-with,x-request");
+      }
+    }
+    if ( ! $valid ) {
+      Warning( $_SERVER['HTTP_ORIGIN'] . " is not found in servers list." );
+    }
+  }
 }
 
-function getAuthUser( $auth )
-{
-    if ( ZM_OPT_USE_AUTH && ZM_AUTH_RELAY == "hashed" && !empty($auth) )
-    {
+function getAuthUser( $auth ) {
+  if ( ZM_OPT_USE_AUTH && ZM_AUTH_RELAY == "hashed" && !empty($auth) ) {
+    $remoteAddr = "";
+    if ( ZM_AUTH_HASH_IPS ) {
+      $remoteAddr = $_SERVER['REMOTE_ADDR'];
+      if ( !$remoteAddr ) {
+        Error( "Can't determine remote address for authentication, using empty string" );
         $remoteAddr = "";
-        if ( ZM_AUTH_HASH_IPS )
-        {
-            $remoteAddr = $_SERVER['REMOTE_ADDR'];
-            if ( !$remoteAddr )
-            {
-                Error( "Can't determine remote address for authentication, using empty string" );
-                $remoteAddr = "";
-            }
-        }
-
-        $sql = "select Username, Password, Enabled, Stream+0, Events+0, Control+0, Monitors+0, System+0, MonitorIds from Users where Enabled = 1";
-        foreach ( dbFetchAll( $sql ) as $user )
-        {
-            $now = time();
-            for ( $i = 0; $i < 2; $i++, $now -= (60*60) ) // Try for last two hours
-            {
-                $time = localtime( $now );
-                $authKey = ZM_AUTH_HASH_SECRET.$user['Username'].$user['Password'].$remoteAddr.$time[2].$time[3].$time[4].$time[5];
-                $authHash = md5( $authKey );
-
-                if ( $auth == $authHash )
-                {
-                    return( $user );
-                }
-            }
-        }
+      }
     }
-    Error( "Unable to authenticate user from auth hash '$auth'" );
-    return( false );
+
+    $sql = "select Username, Password, Enabled, Stream+0, Events+0, Control+0, Monitors+0, System+0, MonitorIds from Users where Enabled = 1";
+    foreach ( dbFetchAll( $sql ) as $user ) {
+      $now = time();
+      for ( $i = 0; $i < 2; $i++, $now -= (60*60) ) { // Try for last two hours
+        $time = localtime( $now );
+        $authKey = ZM_AUTH_HASH_SECRET.$user['Username'].$user['Password'].$remoteAddr.$time[2].$time[3].$time[4].$time[5];
+        $authHash = md5( $authKey );
+
+        if ( $auth == $authHash ) {
+          return( $user );
+        }
+      }
+    }
+  }
+  Error( "Unable to authenticate user from auth hash '$auth'" );
+  return( false );
 }
 
-function generateAuthHash( $useRemoteAddr )
-{
-    if ( ZM_OPT_USE_AUTH && ZM_AUTH_RELAY == "hashed" )
-    {
-        $time = localtime();
-        if ( $useRemoteAddr )
-        {
-            $authKey = ZM_AUTH_HASH_SECRET.$_SESSION['username'].$_SESSION['passwordHash'].$_SESSION['remoteAddr'].$time[2].$time[3].$time[4].$time[5];
-        }
-        else
-        {
-            $authKey = ZM_AUTH_HASH_SECRET.$_SESSION['username'].$_SESSION['passwordHash'].$time[2].$time[3].$time[4].$time[5];
-        }
-        $auth = md5( $authKey );
+function generateAuthHash( $useRemoteAddr ) {
+  if ( ZM_OPT_USE_AUTH && ZM_AUTH_RELAY == "hashed" ) {
+    $time = localtime();
+    if ( $useRemoteAddr ) {
+      $authKey = ZM_AUTH_HASH_SECRET.$_SESSION['username'].$_SESSION['passwordHash'].$_SESSION['remoteAddr'].$time[2].$time[3].$time[4].$time[5];
+    } else {
+      $authKey = ZM_AUTH_HASH_SECRET.$_SESSION['username'].$_SESSION['passwordHash'].$time[2].$time[3].$time[4].$time[5];
     }
-    else
-    {
-        $auth = "";
-    }
-    return( $auth );
+    $auth = md5( $authKey );
+  } else {
+    $auth = "";
+  }
+  return( $auth );
 }
 
-function getStreamSrc( $args, $querySep='&amp;' )
-{
-    $streamSrc = ZM_BASE_URL.ZM_PATH_ZMS;
+function getStreamSrc( $args, $querySep='&amp;' ) {
+  $streamSrc = ZM_BASE_URL.ZM_PATH_ZMS;
 
-    if ( ZM_OPT_USE_AUTH )
-    {
-        if ( ZM_AUTH_RELAY == "hashed" )
-        {
-            $args[] = "auth=".generateAuthHash( ZM_AUTH_HASH_IPS );
-        }
-        elseif ( ZM_AUTH_RELAY == "plain" )
-        {
-            $args[] = "user=".$_SESSION['username'];
-            $args[] = "pass=".$_SESSION['password'];
-        }
-        elseif ( ZM_AUTH_RELAY == "none" )
-        {
-            $args[] = "user=".$_SESSION['username'];
-        }
-    }
-    if ( !in_array( "mode=single", $args ) && !empty($GLOBALS['connkey']) )
-    {   
-        $args[] = "connkey=".$GLOBALS['connkey'];
-    }       
-    if ( ZM_RAND_STREAM )
-    {
-        $args[] = "rand=".time();
+  if ( ZM_OPT_USE_AUTH ) {
+    if ( ZM_AUTH_RELAY == "hashed" ) {
+      $args[] = "auth=".generateAuthHash( ZM_AUTH_HASH_IPS );
+    } elseif ( ZM_AUTH_RELAY == "plain" ) {
+      $args[] = "user=".$_SESSION['username'];
+      $args[] = "pass=".$_SESSION['password'];
+    } elseif ( ZM_AUTH_RELAY == "none" ) {
+      $args[] = "user=".$_SESSION['username'];
     }
+  }
+  if ( !in_array( "mode=single", $args ) && !empty($GLOBALS['connkey']) ) {   
+    $args[] = "connkey=".$GLOBALS['connkey'];
+  }       
+  if ( ZM_RAND_STREAM ) {
+    $args[] = "rand=".time();
+  }
 
-    if ( count($args) )
-    {
-        $streamSrc .= "?".join( $querySep, $args );
-    }
+  if ( count($args) ) {
+    $streamSrc .= "?".join( $querySep, $args );
+  }
 
-    return( $streamSrc );
+  return( $streamSrc );
 }
 
-function getMimeType( $file )
-{
-    if ( function_exists('mime_content_type') )
-    {
-        return( mime_content_type( $file ) );
-    }
-    elseif ( function_exists('finfo_file') )
-    {
-        $finfo = finfo_open( FILEINFO_MIME );
-        $mimeType = finfo_file( $finfo, $file );
-        finfo_close($finfo);
-        return( $mimeType );
-    }
-    return( trim( exec( 'file -bi '.escapeshellarg( $file ).' 2>/dev/null' ) ) );
+function getMimeType( $file ) {
+  if ( function_exists('mime_content_type') ) {
+    return( mime_content_type( $file ) );
+  } elseif ( function_exists('finfo_file') ) {
+    $finfo = finfo_open( FILEINFO_MIME );
+    $mimeType = finfo_file( $finfo, $file );
+    finfo_close($finfo);
+    return( $mimeType );
+  }
+  return( trim( exec( 'file -bi '.escapeshellarg( $file ).' 2>/dev/null' ) ) );
 }
 
-function outputVideoStream( $id, $src, $width, $height, $format, $title="" )
-{
-    if ( file_exists( $src ) )
-        $mimeType = getMimeType( $src );
-    else
-    {
-        switch( $format )
+function outputVideoStream( $id, $src, $width, $height, $format, $title="" ) {
+  if ( file_exists( $src ) ) {
+    $mimeType = getMimeType( $src );
+  } else {
+    switch( $format ) {
+      case 'asf' :
+        $mimeType = "video/x-ms-asf";
+        break;
+      case 'avi' :
+      case 'wmv' :
+        $mimeType = "video/x-msvideo";
+        break;
+      case 'mov' :
+        $mimeType = "video/quicktime";
+        break;
+      case 'mpg' :
+      case 'mpeg' :
+        $mimeType = "video/mpeg";
+        break;
+      case 'swf' :
+        $mimeType = "application/x-shockwave-flash";
+        break;
+      case '3gp' :
+        $mimeType = "video/3gpp";
+        break;
+      default :
+        $mimeType = "video/$format";
+        break;
+    }
+  }
+  if ( !$mimeType || ($mimeType == 'application/octet-stream') )
+    $mimeType = 'video/'.$format;
+  $objectTag = false;
+  if ( ZM_WEB_USE_OBJECT_TAGS ) {
+    switch( $mimeType ) {
+      case "video/x-ms-asf" :
+      case "video/x-msvideo" :
+      case "video/mp4" :
         {
-            case 'asf' :
-                $mimeType = "video/x-ms-asf";
-                break;
-            case 'avi' :
-            case 'wmv' :
-                $mimeType = "video/x-msvideo";
-                break;
-            case 'mov' :
-                $mimeType = "video/quicktime";
-                break;
-            case 'mpg' :
-            case 'mpeg' :
-                $mimeType = "video/mpeg";
-                break;
-            case 'swf' :
-                $mimeType = "application/x-shockwave-flash";
-                break;
-            case '3gp' :
-                $mimeType = "video/3gpp";
-                break;
-            default :
-                $mimeType = "video/$format";
-                break;
+          if ( isWindows() ) {
+            ?>
+              <object id="<?php echo $id ?>" width="<?php echo validNum($width) ?>" height="<?php echo validNum($height) ?>"
+              classid="CLSID:22D6F312-B0F6-11D0-94AB-0080C74C7E95"
+              codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,02,902"
+              standby="Loading Microsoft Windows Media Player components..."
+              type="<?php echo $mimeType ?>">
+              <param name="FileName" value="<?php echo $src ?>"/>
+              <param name="autoStart" value="1"/>
+              <param name="showControls" value="0"/>
+              <embed type="<?php echo $mimeType ?>"
+              pluginspage="http://www.microsoft.com/Windows/MediaPlayer/"
+              src="<?php echo $src ?>"
+              name="<?php echo validHtmlStr($title) ?>"
+              width="<?php echo validNum($width) ?>"
+              height="<?php echo validInt($height) ?>"
+              autostart="1"
+              showcontrols="0">
+              </embed>
+              </object>
+              <?php
+              $objectTag = true;
+          }
+          break;
+        }
+      case "video/quicktime" :
+        {
+          ?>
+            <object id="<?php echo $id ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"
+            classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"
+            codebase="http://www.apple.com/qtactivex/qtplugin.cab"
+            type="<?php echo $mimeType ?>">
+            <param name="src" value="<?php echo $src ?>"/>
+            <param name="autoplay" VALUE="true"/>
+            <param name="controller" VALUE="false"/>
+            <embed type="<?php echo $mimeType ?>"
+            src="<?php echo $src ?>"
+            pluginspage="http://www.apple.com/quicktime/download/"
+            name="<?php echo validHtmlStr($title) ?>"
+            width="<?php echo validInt($width) ?>"
+            height="<?php echo validInt($height) ?>"
+            autoplay="true"
+            controller="true">
+            </embed>
+            </object>
+            <?php
+            $objectTag = true;
+          break;
+        }
+      case "application/x-shockwave-flash" :
+        {
+          ?>
+            <object id="<?php echo $id ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"
+            classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+            codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"
+            type="<?php echo $mimeType ?>">
+            <param name="movie" value="<?php echo $src ?>"/>
+            <param name="quality" value="high"/>
+            <param name="bgcolor" value="#ffffff"/>
+            <embed type="<?php echo $mimeType ?>"
+            pluginspage="http://www.macromedia.com/go/getflashplayer"
+            src="<?php echo $src ?>"
+            name="<?php echo validHtmlStr($title) ?>"
+            width="<?php echo validInt($width) ?>"
+            height="<?php echo validInt($height) ?>"
+            quality="high"
+            bgcolor="#ffffff">
+            </embed>
+            </object>
+            <?php
+            $objectTag = true;
+          break;
         }
     }
-    if ( !$mimeType || ($mimeType == 'application/octet-stream') )
-        $mimeType = 'video/'.$format;
-    $objectTag = false;
-    if ( ZM_WEB_USE_OBJECT_TAGS )
-    {
-        switch( $mimeType )
-        {
-            case "video/x-ms-asf" :
-            case "video/x-msvideo" :
-            case "video/mp4" :
-            {
-                if ( isWindows() )
-                {
-?>
-<object id="<?php echo $id ?>" width="<?php echo validNum($width) ?>" height="<?php echo validNum($height) ?>"
-classid="CLSID:22D6F312-B0F6-11D0-94AB-0080C74C7E95"
-codebase="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=6,0,02,902"
-standby="Loading Microsoft Windows Media Player components..."
-type="<?php echo $mimeType ?>">
-<param name="FileName" value="<?php echo $src ?>"/>
-<param name="autoStart" value="1"/>
-<param name="showControls" value="0"/>
-<embed type="<?php echo $mimeType ?>"
-pluginspage="http://www.microsoft.com/Windows/MediaPlayer/"
-src="<?php echo $src ?>"
-name="<?php echo validHtmlStr($title) ?>"
-width="<?php echo validNum($width) ?>"
-height="<?php echo validInt($height) ?>"
-autostart="1"
-showcontrols="0">
-</embed>
-</object>
-<?php
-                    $objectTag = true;
-                }
-                break;
-            }
-            case "video/quicktime" :
-            {
-?>
-<object id="<?php echo $id ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"
-classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"
-codebase="http://www.apple.com/qtactivex/qtplugin.cab"
-type="<?php echo $mimeType ?>">
-<param name="src" value="<?php echo $src ?>"/>
-<param name="autoplay" VALUE="true"/>
-<param name="controller" VALUE="false"/>
-<embed type="<?php echo $mimeType ?>"
-src="<?php echo $src ?>"
-pluginspage="http://www.apple.com/quicktime/download/"
-name="<?php echo validHtmlStr($title) ?>"
-width="<?php echo validInt($width) ?>"
-height="<?php echo validInt($height) ?>"
-autoplay="true"
-controller="true">
-</embed>
-</object>
-<?php
-                $objectTag = true;
-                break;
-            }
-            case "application/x-shockwave-flash" :
-            {
-?>
-<object id="<?php echo $id ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"
-classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0"
-type="<?php echo $mimeType ?>">
-<param name="movie" value="<?php echo $src ?>"/>
-<param name="quality" value="high"/>
-<param name="bgcolor" value="#ffffff"/>
-<embed type="<?php echo $mimeType ?>"
-pluginspage="http://www.macromedia.com/go/getflashplayer"
-src="<?php echo $src ?>"
-name="<?php echo validHtmlStr($title) ?>"
-width="<?php echo validInt($width) ?>"
-height="<?php echo validInt($height) ?>"
-quality="high"
-bgcolor="#ffffff">
-</embed>
-</object>
-<?php
-                $objectTag = true;
-                break;
-            }
-        }
-    }
-    if ( !$objectTag )
-    {
-?>
-<embed<?php echo isset($mimeType)?(' type="'.$mimeType.'"'):"" ?> 
-src="<?php echo $src ?>"
-name="<?php echo validHtmlStr($title) ?>"
-width="<?php echo validInt($width) ?>"
-height="<?php echo validInt($height) ?>"
-autostart="1"
-autoplay="1"
-showcontrols="0"
-controller="0">
-</embed>
-<?php
-    }
+  }
+  if ( !$objectTag ) {
+    ?>
+      <embed<?php echo isset($mimeType)?(' type="'.$mimeType.'"'):"" ?> 
+      src="<?php echo $src ?>"
+      name="<?php echo validHtmlStr($title) ?>"
+      width="<?php echo validInt($width) ?>"
+      height="<?php echo validInt($height) ?>"
+      autostart="1"
+      autoplay="1"
+      showcontrols="0"
+      controller="0">
+      </embed>
+      <?php
+  }
 }
 
-function outputImageStream( $id, $src, $width, $height, $title="" )
-{
-   if ( canStreamIframe() ) {
+function outputImageStream( $id, $src, $width, $height, $title="" ) {
+  if ( canStreamIframe() ) {
 ?>
-<iframe id="<?php echo $id ?>" src="<?php echo $src ?>" alt="<?php echo validHtmlStr($title) ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"/>
+    <iframe id="<?php echo $id ?>" src="<?php echo $src ?>" alt="<?php echo validHtmlStr($title) ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"/>
 <?php
-   } else {
+  } else {
 ?>
-<img id="<?php echo $id ?>" src="<?php echo $src ?>" alt="<?php echo validHtmlStr($title) ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"/>
+    <img id="<?php echo $id ?>" src="<?php echo $src ?>" alt="<?php echo validHtmlStr($title) ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"/>
 <?php
-   }
+  }
 }
 
-function outputControlStream( $src, $width, $height, $monitor, $scale, $target )
-{
+function outputControlStream( $src, $width, $height, $monitor, $scale, $target ) {
 ?>
-<form name="ctrlForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>" target="<?php echo $target ?>">
-<input type="hidden" name="view" value="blank">
-<input type="hidden" name="mid" value="<?php echo $monitor['Id'] ?>">
-<input type="hidden" name="action" value="control">
-<?php
-                if ( $monitor['CanMoveMap'] ) 
-                {
-?>
-<input type="hidden" name="control" value="moveMap">
-<?php
-                }
-                elseif ( $monitor['CanMoveRel'] )
-                {
-?>
-<input type="hidden" name="control" value="movePseudoMap">
-<?php
-                }
-                elseif ( $monitor['CanMoveCon'] )
-                {
-?>
-<input type="hidden" name="control" value="moveConMap">
-<?php
-                }
-?>
-<input type="hidden" name="scale" value="<?php echo $scale ?>">
-<input type="image" src="<?php echo $src ?>" width="<?php echo $width ?>" height="<?php echo $height ?>">
-</form>
+  <form name="ctrlForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>" target="<?php echo $target ?>">
+    <input type="hidden" name="view" value="blank">
+    <input type="hidden" name="mid" value="<?php echo $monitor['Id'] ?>">
+    <input type="hidden" name="action" value="control">
+    <?php
+    if ( $monitor['CanMoveMap'] ) {
+    ?>
+    <input type="hidden" name="control" value="moveMap">
+    <?php
+    } elseif ( $monitor['CanMoveRel'] ) {
+    ?>
+    <input type="hidden" name="control" value="movePseudoMap">
+    <?php
+    } elseif ( $monitor['CanMoveCon'] ) {
+    ?>
+    <input type="hidden" name="control" value="moveConMap">
+    <?php
+    }
+    ?>
+    <input type="hidden" name="scale" value="<?php echo $scale ?>">
+    <input type="image" src="<?php echo $src ?>" width="<?php echo $width ?>" height="<?php echo $height ?>">
+  </form>
 <?php
 }
 
-function outputHelperStream( $id, $src, $width, $height, $title="" )
-{
+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>
+  <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
 }
 
-function outputImageStill( $id, $src, $width, $height, $title="" )
-{
+function outputImageStill( $id, $src, $width, $height, $title="" ) {
 ?>
-<img id="<?php echo $id ?>" src="<?php echo $src ?>" alt="<?php echo $title ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"/>
+  <img id="<?php echo $id ?>" src="<?php echo $src ?>" alt="<?php echo $title ?>" width="<?php echo $width ?>" height="<?php echo $height ?>"/>
 <?php
 }
 
-function outputControlStill( $src, $width, $height, $monitor, $scale, $target )
-{
+function outputControlStill( $src, $width, $height, $monitor, $scale, $target ) {
 ?>
-<form name="ctrlForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>" target="<?php echo $target ?>">
-<input type="hidden" name="view" value="blank">
-<input type="hidden" name="mid" value="<?php echo $monitor['Id'] ?>">
-<input type="hidden" name="action" value="control">
-<?php
-                if ( $monitor['CanMoveMap'] ) 
-                {
-?>
-<input type="hidden" name="control" value="moveMap">
-<?php
-                }
-                elseif ( $monitor['CanMoveRel'] )
-                {
-?>
-<input type="hidden" name="control" value="movePseudoMap">
-<?php
-                }
-                elseif ( $monitor['CanMoveCon'] )
-                {
-?>
-<input type="hidden" name="control" value="moveConMap">
-<?php
-                }
-?>
-<input type="hidden" name="scale" value="<?php echo $scale ?>">
-<input type="image" src="<?php echo $src ?>" width="<?php echo $width ?>" height="<?php echo $height ?>">
-</form>
+  <form name="ctrlForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>" target="<?php echo $target ?>">
+    <input type="hidden" name="view" value="blank">
+    <input type="hidden" name="mid" value="<?php echo $monitor['Id'] ?>">
+    <input type="hidden" name="action" value="control">
+    <?php
+    if ( $monitor['CanMoveMap'] ) {
+    ?>
+    <input type="hidden" name="control" value="moveMap">
+    <?php
+    } elseif ( $monitor['CanMoveRel'] ) {
+    ?>
+    <input type="hidden" name="control" value="movePseudoMap">
+    <?php
+    } elseif ( $monitor['CanMoveCon'] ) {
+    ?>
+    <input type="hidden" name="control" value="moveConMap">
+    <?php
+    }
+    ?>
+    <input type="hidden" name="scale" value="<?php echo $scale ?>">
+    <input type="image" src="<?php echo $src ?>" width="<?php echo $width ?>" height="<?php echo $height ?>">
+    </form>
 <?php
 }
 
 // Incoming args are shell-escaped. This function must escape any further arguments it cannot guarantee.
-function getZmuCommand( $args )
-{
-    $zmuCommand = ZMU_PATH;
+function getZmuCommand( $args ) {
+  $zmuCommand = ZMU_PATH;
 
-    if ( ZM_OPT_USE_AUTH )
-    {
-        if ( ZM_AUTH_RELAY == "hashed" )
-        {
-            $zmuCommand .= " -A ".generateAuthHash( false );
-        }
-        elseif ( ZM_AUTH_RELAY == "plain" )
-        {
-			$zmuCommand .= " -U " .escapeshellarg($_SESSION['username'])." -P ".escapeshellarg($_SESSION['password']);
-        }
-        elseif ( ZM_AUTH_RELAY == "none" )
-        {
-            $zmuCommand .= " -U ".escapeshellarg($_SESSION['username']);
-        }
+  if ( ZM_OPT_USE_AUTH ) {
+    if ( ZM_AUTH_RELAY == "hashed" ) {
+      $zmuCommand .= " -A ".generateAuthHash( false );
+    } elseif ( ZM_AUTH_RELAY == "plain" ) {
+      $zmuCommand .= " -U " .escapeshellarg($_SESSION['username'])." -P ".escapeshellarg($_SESSION['password']);
+    } elseif ( ZM_AUTH_RELAY == "none" ) {
+      $zmuCommand .= " -U ".escapeshellarg($_SESSION['username']);
     }
+  }
 
-    $zmuCommand .= $args;
+  $zmuCommand .= $args;
 
-    return( $zmuCommand );
+  return( $zmuCommand );
 }
 
-function visibleMonitor( $mid )
-{
-    global $user;
+function visibleMonitor( $mid ) {
+  global $user;
 
-    return( empty($user['MonitorIds']) || in_array( $mid, explode( ',', $user['MonitorIds'] ) ) );
+  return( empty($user['MonitorIds']) || in_array( $mid, explode( ',', $user['MonitorIds'] ) ) );
 }
 
-function canView( $area, $mid=false )
-{
-    global $user;
+function canView( $area, $mid=false ) {
+  global $user;
 
-    return( ($user[$area] == 'View' || $user[$area] == 'Edit') && ( !$mid || visibleMonitor( $mid ) ) );
+  return( ($user[$area] == 'View' || $user[$area] == 'Edit') && ( !$mid || visibleMonitor( $mid ) ) );
 }
 
-function canEdit( $area, $mid=false )
-{
-    global $user;
+function canEdit( $area, $mid=false ) {
+  global $user;
 
-    return( $user[$area] == 'Edit' && ( !$mid || visibleMonitor( $mid ) ) );
+  return( $user[$area] == 'Edit' && ( !$mid || visibleMonitor( $mid ) ) );
 }
 
-function getEventPath( $event )
-{
-    if ( ZM_USE_DEEP_STORAGE )
-        $eventPath = $event['MonitorId'].'/'.strftime( "%y/%m/%d/%H/%M/%S", strtotime($event['StartTime']) );
-    else
-        $eventPath = $event['MonitorId'].'/'.$event['Id'];
-    return( $eventPath );
+function getEventPath( $event ) {
+  if ( ZM_USE_DEEP_STORAGE )
+    $eventPath = $event['MonitorId'].'/'.strftime( "%y/%m/%d/%H/%M/%S", strtotime($event['StartTime']) );
+  else
+    $eventPath = $event['MonitorId'].'/'.$event['Id'];
+  return( $eventPath );
 }
 
 
-function deletePath( $path )
-{
-    if ( is_dir( $path ) )
-    {
-        system( escapeshellcmd( "rm -rf ".$path ) );
-    }
-    else
-    {
-        unlink( $path );
-    }
+function deletePath( $path ) {
+  if ( is_dir( $path ) ) {
+    system( escapeshellcmd( "rm -rf ".$path ) );
+  } else {
+    unlink( $path );
+  }
 }
 
-function deleteEvent( $event, $mid=false ) {
+function deleteEvent( $event, $mid=false ) { 
+  if ( empty($event) ) {
+    Error( "Empty event passed to deleteEvent.");
+    return;
+  }
 
-	if ( empty($event) ) {
-		Error( "Empty event passed to deleteEvent.");
-		return;
-	}
+  if ( gettype($event) != 'array' ) {
+# $event could be an eid, so turn it into an event hash
+    $event = dbFetchOne( 'SELECT Id, MonitorId, StartTime FROM Events WHERE Id=?', NULL, array( $event ) );
+  }
 
-    if ( gettype($event) != 'array' ) {
-		# $event could be an eid, so turn it into an event hash
-        $event = dbFetchOne( 'SELECT Id, MonitorId, StartTime FROM Events WHERE Id=?', NULL, array( $event ) );
-    }
+  global $user;
 
-    global $user;
+  if ( !$mid )
+    $mid = $event['MonitorId'];
 
-    if ( !$mid )
-        $mid = $event['MonitorId'];
+  if ( $user['Events'] == 'Edit' ) {
 
-    if ( $user['Events'] == 'Edit' ) {
+    dbQuery( 'DELETE FROM Events WHERE Id = ?', array($event['Id']) );
+    if ( !ZM_OPT_FAST_DELETE ) {
+      dbQuery( 'DELETE FROM Stats WHERE EventId = ?', array($event['Id']) );
+      dbQuery( 'DELETE FROM Frames WHERE EventId = ?', array($event['Id']) );
+      if ( ZM_USE_DEEP_STORAGE ) {
 
-        dbQuery( 'DELETE FROM Events WHERE Id = ?', array($event['Id']) );
-        if ( !ZM_OPT_FAST_DELETE ) {
-            dbQuery( 'DELETE FROM Stats WHERE EventId = ?', array($event['Id']) );
-            dbQuery( 'DELETE FROM Frames WHERE EventId = ?', array($event['Id']) );
-            if ( ZM_USE_DEEP_STORAGE ) {
+# Assumption: All events haev a start time
+        $start_date = date_parse( $event['StartTime'] );
+        $start_date['year'] = $start_date['year'] % 100;
 
-				# Assumption: All events haev a start time
-				$start_date = date_parse( $event['StartTime'] );
-				$start_date['year'] = $start_date['year'] % 100;
+# So this is  because ZM creates a link under teh day pointing to the time that the event happened. 
+        $eventlink_path = sprintf('%s/%d/%02d/%02d/%02d/.%d', ZM_DIR_EVENTS, $mid, $start_date['year'], $start_date['month'], $start_date['day'], $event['Id'] );
 
-				# So this is  because ZM creates a link under teh day pointing to the time that the event happened. 
-				$eventlink_path = sprintf('%s/%d/%02d/%02d/%02d/.%d', ZM_DIR_EVENTS, $mid, $start_date['year'], $start_date['month'], $start_date['day'], $event['Id'] );
-
-                if ( $id_files = glob( $eventlink_path ) ) {
-					# I know we are using arrays here, but really there can only ever be 1 in the array
-                    $eventPath = preg_replace( '/\.'.$event['Id'].'$/', readlink($id_files[0]), $id_files[0] );
-					deletePath( $eventPath );
-					deletePath( $id_files[0] );
-					$pathParts = explode(  '/', $eventPath );
-					for ( $i = count($pathParts)-1; $i >= 2; $i-- ) {
-						$deletePath = join( '/', array_slice( $pathParts, 0, $i ) );
-						if ( !glob( $deletePath."/*" ) ) {
-							deletePath( $deletePath );
-						}
-					}
-				} else {
-					Warning( "Found no event files under $eventlink_path" );
-				} # end if found files
-            } else {
-                $eventPath = implode( '/', array( ZM_DIR_EVENTS, $mid, $event['Id'] ) );
-                deletePath( $eventPath );
-            } # USE_DEEP_STORAGE OR NOT
-        } # ! ZM_OPT_FAST_DELETE
-    } # CAN EDIT
+        if ( $id_files = glob( $eventlink_path ) ) {
+# I know we are using arrays here, but really there can only ever be 1 in the array
+          $eventPath = preg_replace( '/\.'.$event['Id'].'$/', readlink($id_files[0]), $id_files[0] );
+          deletePath( $eventPath );
+          deletePath( $id_files[0] );
+          $pathParts = explode(  '/', $eventPath );
+          for ( $i = count($pathParts)-1; $i >= 2; $i-- ) {
+            $deletePath = join( '/', array_slice( $pathParts, 0, $i ) );
+            if ( !glob( $deletePath."/*" ) ) {
+              deletePath( $deletePath );
+            }
+          }
+        } else {
+          Warning( "Found no event files under $eventlink_path" );
+        } # end if found files
+      } else {
+        $eventPath = implode( '/', array( ZM_DIR_EVENTS, $mid, $event['Id'] ) );
+        deletePath( $eventPath );
+      } # USE_DEEP_STORAGE OR NOT
+    } # ! ZM_OPT_FAST_DELETE
+  } # CAN EDIT
 }
 
-function makeLink( $url, $label, $condition=1, $options="" )
-{
-    $string = "";
-    if ( $condition )
-    {
-        $string .= '<a href="'.$url.'"'.($options?(' '.$options):'').'>';
-    }
-    $string .= $label;
-    if ( $condition )
-    {
-        $string .= '</a>';
-    }
-    return( $string );
+function makeLink( $url, $label, $condition=1, $options="" ) {
+  $string = "";
+  if ( $condition ) {
+    $string .= '<a href="'.$url.'"'.($options?(' '.$options):'').'>';
+  }
+  $string .= $label;
+  if ( $condition ) {
+    $string .= '</a>';
+  }
+  return( $string );
 }
 
-function makePopupLink( $url, $winName, $winSize, $label, $condition=1, $options="" )
-{
-    $string = "";
-    if ( $condition )
-    {
-        if ( is_array( $winSize ) )
-            $popupParms = "'".$url."', '".$winName."', '".$winSize[0]."', ".$winSize[1].", ".$winSize[2];
-        else
-            $popupParms = "'".$url."', '".$winName."', '".$winSize."'";
-
-        $string .= '<a href="'.$url.'" onclick="createPopup( '.$popupParms.' ); return( false );"'.($options?(' '.$options):'').'>';
-    }
-    $string .= $label;
-    if ( $condition )
-    {
-        $string .= '</a>';
-    }
-    return( $string );
-}
-
-function makePopupButton( $url, $winName, $winSize, $buttonValue, $condition=1, $options="" )
-{
+function makePopupLink( $url, $winName, $winSize, $label, $condition=1, $options="" ) {
+  $string = "";
+  if ( $condition ) {
     if ( is_array( $winSize ) )
-        $popupParms = "'".$url."', '".$winName."', '".$winSize[0]."', ".$winSize[1].", ".$winSize[2];
+      $popupParms = "'".$url."', '".$winName."', '".$winSize[0]."', ".$winSize[1].", ".$winSize[2];
     else
-        $popupParms = "'".$url."', '".$winName."', '".$winSize."'";
-    $string = '<input type="button" value="'.$buttonValue.'" onclick="createPopup( '.$popupParms.' ); return( false );"'.($condition?'':' disabled="disabled"').($options?(' '.$options):'').'/>';
-    return( $string );
+      $popupParms = "'".$url."', '".$winName."', '".$winSize."'";
+
+    $string .= '<a href="'.$url.'" onclick="createPopup( '.$popupParms.' ); return( false );"'.($options?(' '.$options):'').'>';
+  }
+  $string .= $label;
+  if ( $condition ) {
+    $string .= '</a>';
+  }
+  return( $string );
 }
 
-function truncText( $text, $length, $deslash=1 )
-{       
-    return( preg_replace( "/^(.{".$length.",}?)\b.*$/", "\\1&hellip;", ($deslash?stripslashes($text):$text) ) );       
+function makePopupButton( $url, $winName, $winSize, $buttonValue, $condition=1, $options="" ) {
+  if ( is_array( $winSize ) )
+    $popupParms = "'".$url."', '".$winName."', '".$winSize[0]."', ".$winSize[1].", ".$winSize[2];
+  else
+    $popupParms = "'".$url."', '".$winName."', '".$winSize."'";
+  $string = '<input type="button" value="'.$buttonValue.'" onclick="createPopup( '.$popupParms.' ); return( false );"'.($condition?'':' disabled="disabled"').($options?(' '.$options):'').'/>';
+  return( $string );
+}
+
+function truncText( $text, $length, $deslash=1 ) {       
+  return( preg_replace( "/^(.{".$length.",}?)\b.*$/", "\\1&hellip;", ($deslash?stripslashes($text):$text) ) );       
 }               
 
-function buildSelect( $name, $contents, $behaviours=false )
-{
-    $value = "";
-    if ( preg_match( "/^\s*(\w+)\s*(\[.*\])?\s*$/", $name, $matches ) && count($matches) > 2 )
-    {
-        $arr = $matches[1];
-        if ( isset($GLOBALS[$arr]) )
-            $value = $GLOBALS[$arr];
-        elseif ( isset($_REQUEST[$arr]) )
-            $value = $_REQUEST[$arr];
-        if ( !preg_match_all( "/\[\s*['\"]?(\w+)[\"']?\s*\]/", $matches[2], $matches ) )
+function buildSelect( $name, $contents, $behaviours=false ) {
+  $value = "";
+  if ( preg_match( "/^\s*(\w+)\s*(\[.*\])?\s*$/", $name, $matches ) && count($matches) > 2 ) {
+    $arr = $matches[1];
+    if ( isset($GLOBALS[$arr]) )
+      $value = $GLOBALS[$arr];
+    elseif ( isset($_REQUEST[$arr]) )
+      $value = $_REQUEST[$arr];
+    if ( !preg_match_all( "/\[\s*['\"]?(\w+)[\"']?\s*\]/", $matches[2], $matches ) ) {
+      Fatal( "Can't parse selector '$name'" );
+    }
+    for ( $i = 0; $i < count($matches[1]); $i++ ) {
+      $idx = $matches[1][$i];
+      $value = isset($value[$idx])?$value[$idx]:false;
+    }
+  } else {
+    if ( isset($GLOBALS[$name]) )
+      $value = $GLOBALS[$name];
+    elseif ( isset($_REQUEST[$name]) )
+      $value = $_REQUEST[$name];
+  }
+  ob_start();
+  $behaviourText = "";
+  if ( !empty($behaviours) ) {
+    if ( is_array($behaviours) ) {
+      foreach ( $behaviours as $event=>$action ) {
+        $behaviourText .= ' '.$event.'="'.$action.'"';
+      }
+    } else {
+      $behaviourText = ' onchange="'.$behaviours.'"';
+    }
+  }
+  ?>
+  <select name="<?php echo $name ?>" id="<?php echo $name ?>"<?php echo $behaviourText ?>>
+  <?php
+  foreach ( $contents as $contentValue => $contentText ) {
+  ?>
+    <option value="<?php echo $contentValue ?>"<?php if ( $value == $contentValue ) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($contentText) ?></option>
+  <?php
+  }
+  ?>
+  </select>
+  <?php
+  $html = ob_get_contents();
+  ob_end_clean();
+
+  return( $html );
+}
+
+function getFormChanges( $values, $newValues, $types=false, $columns=false ) {
+  $changes = array();
+  if ( !$types )
+    $types = array();
+
+  foreach( $newValues as $key=>$value ) {
+    if ( $columns && !$columns[$key] )
+      continue;
+
+    if ( !isset($types[$key]) )
+      $types[$key] = false;
+    switch( $types[$key] ) {
+      case 'set' :
         {
-            Fatal( "Can't parse selector '$name'" );
+          if ( is_array( $newValues[$key] ) ) {
+            if ( join(',',$newValues[$key]) != $values[$key] ) {
+              $changes[$key] = "$key = ".dbEscape(join(',',$newValues[$key]));
+            }
+          } elseif ( $values[$key] ) {
+            $changes[$key] = "$key = ''";
+          }
+          break;
         }
-        for ( $i = 0; $i < count($matches[1]); $i++ )
+      case 'image' :
         {
-            $idx = $matches[1][$i];
-            $value = isset($value[$idx])?$value[$idx]:false;
+          if ( is_array( $newValues[$key] ) ) {
+            $imageData = getimagesize( $newValues[$key]['tmp_name'] );
+            $changes[$key.'Width'] = $key."Width = ".$imageData[0];
+            $changes[$key.'Height'] = $key."Height = ".$imageData[1];
+            $changes[$key.'Type'] = $key."Type = '".$newValues[$key]['type']."'";
+            $changes[$key.'Size'] = $key."Size = ".$newValues[$key]['size'];
+            ob_start();
+            readfile( $newValues[$key]['tmp_name'] );
+            $changes[$key] = $key." = ".dbEscape( ob_get_contents() );
+            ob_end_clean();
+          } else {
+            $changes[$key] = "$key = ".dbEscape($value);
+          }
+          break;
+        }
+      case 'document' :
+        {
+          if ( is_array( $newValues[$key] ) ) {
+            $imageData = getimagesize( $newValues[$key]['tmp_name'] );
+            $changes[$key.'Type'] = $key."Type = '".$newValues[$key]['type']."'";
+            $changes[$key.'Size'] = $key."Size = ".$newValues[$key]['size'];
+            ob_start();
+            readfile( $newValues[$key]['tmp_name'] );
+            $changes[$key] = $key." = ".dbEscape( ob_get_contents() );
+            ob_end_clean();
+          } else {
+            $changes[$key] = "$key = ".dbEscape($value);
+          }
+          break;
+        }
+      case 'file' :
+        {
+          $changes[$key.'Type'] = $key."Type = ".dbEscape($newValues[$key]['type']);
+          $changes[$key.'Size'] = $key."Size = ".dbEscape($newValues[$key]['size']);
+          ob_start();
+          readfile( $newValues[$key]['tmp_name'] );
+          $changes[$key] = $key." = '".dbEscape( ob_get_contents() )."'";
+          ob_end_clean();
+          break;
+        }
+      case 'raw' :
+        {
+          if ( $values[$key] != $value ) {
+            $changes[$key] = "$key = ".dbEscape($value);
+          }
+          break;
+        }
+      default :
+        {
+          if ( !isset($values[$key]) || ($values[$key] != $value) ) {
+            $changes[$key] = "$key = ".dbEscape(trim($value));
+          }
+          break;
         }
     }
-    else
-    {
-        if ( isset($GLOBALS[$name]) )
-            $value = $GLOBALS[$name];
-        elseif ( isset($_REQUEST[$name]) )
-            $value = $_REQUEST[$name];
+  }
+  foreach( $values as $key=>$value ) {
+    if ( !empty($columns[$key]) ) {
+      if ( !empty($types[$key]) ) {
+        if ( $types[$key] == 'toggle' ) {
+          if ( !isset($newValues[$key]) && !empty($value) ) {
+            $changes[$key] = "$key = 0";
+          }
+        } else if ( $types[$key] == 'set' ) {
+          $changes[$key] = "$key = ''";
+        }
+      }
     }
-    ob_start();
-    $behaviourText = "";
-    if ( !empty($behaviours) )
-    {
-        if ( is_array($behaviours) )
-        {
-            foreach ( $behaviours as $event=>$action )
-            {
-                $behaviourText .= ' '.$event.'="'.$action.'"';
-            }
-        }
-        else
-        {
-            $behaviourText = ' onchange="'.$behaviours.'"';
-        }
+  }
+  return( $changes );
+}
+
+function getBrowser( &$browser, &$version ) {
+  if ( isset($_SESSION['browser']) ) {
+    $browser = $_SESSION['browser'];
+    $version = $_SESSION['version'];
+  } else {
+    if (( preg_match( '/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $logVersion)) || (preg_match( '/.*Trident.*rv:(.*?)(;|\))/', $_SERVER['HTTP_USER_AGENT'], $logVersion))) {
+      $version = $logVersion[1];
+      $browser = 'ie';
+    } elseif ( preg_match( '/Chrome\/([0-9.]+)/', $_SERVER['HTTP_USER_AGENT'], $logVersion) ) {
+      $version = $logVersion[1];
+      // Check for old version of Chrome with bug 5876
+      if ( $version < 7 ) {
+        $browser = 'oldchrome';
+      } else {
+        $browser = 'chrome';
+      }
+    } elseif ( preg_match( '/Safari\/([0-9.]+)/', $_SERVER['HTTP_USER_AGENT'], $logVersion) ) {
+      $version = $logVersion[1];
+      $browser = 'safari';
+    } elseif ( preg_match( '/Opera[ \/]([0-9].[0-9]{1,2})/', $_SERVER['HTTP_USER_AGENT'], $logVersion) ) {
+      $version = $logVersion[1];
+      $browser = 'opera';
+    } elseif ( preg_match( '/Konqueror\/([0-9.]+)/', $_SERVER['HTTP_USER_AGENT'], $logVersion) ) {
+      $version = $logVersion[1];
+      $browser = 'konqueror';
+    } elseif ( preg_match( '/Mozilla\/([0-9].[0-9]{1,2})/', $_SERVER['HTTP_USER_AGENT'], $logVersion) ) {
+      $version = $logVersion[1];
+      $browser = 'mozilla';
+    } else {
+      $version = 0;
+      $browser = 'unknown';
     }
-?>
-<select name="<?php echo $name ?>" id="<?php echo $name ?>"<?php echo $behaviourText ?>>
-<?php
-    foreach ( $contents as $contentValue => $contentText )
-    {
-?>
-<option value="<?php echo $contentValue ?>"<?php if ( $value == $contentValue ) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($contentText) ?></option>
-<?php
+    $_SESSION['browser'] = $browser;
+    $_SESSION['version'] = $version;
+  }
+}
+
+function isMozilla() {
+  getBrowser( $browser, $version );
+
+  return( $browser == "mozilla" );
+}
+
+function isKonqueror() {
+  getBrowser( $browser, $version );
+
+  return( $browser == "konqueror" );
+}
+
+function isInternetExplorer() {
+  getBrowser( $browser, $version );
+
+  return( $browser == "ie" );
+}
+
+function isOldChrome() {
+  getBrowser( $browser, $version );
+
+  return( $browser == "oldchrome" );
+}
+
+function isChrome() {
+  getBrowser( $browser, $version );
+
+  return( $browser == "chrome" );
+}
+
+function isOpera() {
+  getBrowser( $browser, $version );
+
+  return( $browser == "opera" );
+}
+
+function isSafari() {
+  getBrowser( $browser, $version );
+
+  return( $browser == "safari" );
+}
+
+function isWindows() {
+  return ( preg_match( '/Win/', $_SERVER['HTTP_USER_AGENT'] ) );
+}
+
+function canStreamIframe() {
+  return( isKonqueror() );
+}
+
+function canStreamNative() {
+  // Old versions of Chrome can display the stream, but then it blocks everything else (Chrome bug 5876)
+  return( ZM_WEB_CAN_STREAM == "yes" || ( ZM_WEB_CAN_STREAM == "auto" && (!isInternetExplorer() && !isOldChrome()) ) );
+}
+
+function canStreamApplet() {
+  if ( (ZM_OPT_CAMBOZOLA && !file_exists( ZM_PATH_WEB.'/'.ZM_PATH_CAMBOZOLA )) ) {
+    Warning ( "ZM_OPT_CAMBOZOLA is enabled, but the system cannot find ".ZM_PATH_WEB."/".ZM_PATH_CAMBOZOLA );
+  }
+
+  return( (ZM_OPT_CAMBOZOLA && file_exists( ZM_PATH_WEB.'/'.ZM_PATH_CAMBOZOLA )) );
+}
+
+function canStream() {
+  return( canStreamNative() | canStreamApplet() );
+}
+
+function packageControl( $command ) {
+  $string = ZM_PATH_BIN.'/zmpkg.pl '.escapeshellarg( $command );
+  $string .= " 2>/dev/null >&- <&- >/dev/null";
+  exec( $string );
+}
+
+function daemonControl( $command, $daemon=false, $args=false ) {
+  $string = ZM_PATH_BIN."/zmdc.pl $command";
+  if ( $daemon ) {
+    $string .= " $daemon";
+    if ( $args ) {
+      $string .= " $args";
     }
-?>
-</select>
-<?php
-    $html = ob_get_contents();
-    ob_end_clean();
-    
-    return( $html );
+  }
+  $string .= " 2>/dev/null >&- <&- >/dev/null";
+  exec( $string );
 }
 
-function getFormChanges( $values, $newValues, $types=false, $columns=false )
-{
-    $changes = array();
-    if ( !$types )
-        $types = array();
-
-    foreach( $newValues as $key=>$value )
-    {
-        if ( $columns && !$columns[$key] )
-            continue;
-
-        if ( !isset($types[$key]) )
-            $types[$key] = false;
-        switch( $types[$key] )
-        {
-            case 'set' :
-            {
-                if ( is_array( $newValues[$key] ) )
-                {
-                    if ( join(',',$newValues[$key]) != $values[$key] )
-                    {
-                        $changes[$key] = "$key = ".dbEscape(join(',',$newValues[$key]));
-                    }
-                }
-                elseif ( $values[$key] )
-                {
-                    $changes[$key] = "$key = ''";
-                }
-                break;
-            }
-            case 'image' :
-            {
-                if ( is_array( $newValues[$key] ) )
-                {
-                    $imageData = getimagesize( $newValues[$key]['tmp_name'] );
-                    $changes[$key.'Width'] = $key."Width = ".$imageData[0];
-                    $changes[$key.'Height'] = $key."Height = ".$imageData[1];
-                    $changes[$key.'Type'] = $key."Type = '".$newValues[$key]['type']."'";
-                    $changes[$key.'Size'] = $key."Size = ".$newValues[$key]['size'];
-                    ob_start();
-                    readfile( $newValues[$key]['tmp_name'] );
-                    $changes[$key] = $key." = ".dbEscape( ob_get_contents() );
-                    ob_end_clean();
-                }
-                else
-                {
-                    $changes[$key] = "$key = ".dbEscape($value);
-                }
-                break;
-            }
-            case 'document' :
-            {
-                if ( is_array( $newValues[$key] ) )
-                {
-                    $imageData = getimagesize( $newValues[$key]['tmp_name'] );
-                    $changes[$key.'Type'] = $key."Type = '".$newValues[$key]['type']."'";
-                    $changes[$key.'Size'] = $key."Size = ".$newValues[$key]['size'];
-                    ob_start();
-                    readfile( $newValues[$key]['tmp_name'] );
-                    $changes[$key] = $key." = ".dbEscape( ob_get_contents() );
-                    ob_end_clean();
-                }
-                else
-                {
-                    $changes[$key] = "$key = ".dbEscape($value);
-                }
-                break;
-            }
-            case 'file' :
-            {
-                $changes[$key.'Type'] = $key."Type = ".dbEscape($newValues[$key]['type']);
-                $changes[$key.'Size'] = $key."Size = ".dbEscape($newValues[$key]['size']);
-                ob_start();
-                readfile( $newValues[$key]['tmp_name'] );
-                $changes[$key] = $key." = '".dbEscape( ob_get_contents() )."'";
-                ob_end_clean();
-                break;
-            }
-            case 'raw' :
-            {
-                if ( $values[$key] != $value )
-                {
-                    $changes[$key] = "$key = ".dbEscape($value);
-                }
-                break;
-            }
-            default :
-            {
-                if ( !isset($values[$key]) || ($values[$key] != $value) )
-                {
-                    $changes[$key] = "$key = ".dbEscape(trim($value));
-                }
-                break;
-            }
-        }
-    }
-    foreach( $values as $key=>$value )
-    {
-        if ( !empty($columns[$key]) )
-        {
-            if ( !empty($types[$key]) )
-            {
-                if ( $types[$key] == 'toggle' )
-                {
-                    if ( !isset($newValues[$key]) && !empty($value) )
-                    {
-                        $changes[$key] = "$key = 0";
-                    }
-                }
-                else if ( $types[$key] == 'set' )
-                {
-                    $changes[$key] = "$key = ''";
-                }
-            }
-        }
-    }
-    return( $changes );
-}
-
-function getBrowser( &$browser, &$version )
-{
-    if ( isset($_SESSION['browser']) )
-    {
-        $browser = $_SESSION['browser'];
-        $version = $_SESSION['version'];
-    }
-    else
-    {
-	if (( preg_match( '/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $logVersion)) || (preg_match( '/.*Trident.*rv:(.*?)(;|\))/', $_SERVER['HTTP_USER_AGENT'], $logVersion)))
-        {
-            $version = $logVersion[1];
-            $browser = 'ie';
-        }
-        elseif ( preg_match( '/Chrome\/([0-9.]+)/', $_SERVER['HTTP_USER_AGENT'], $logVersion) )
-        {
-            $version = $logVersion[1];
-            // Check for old version of Chrome with bug 5876
-            if ( $version < 7 )
-            {
-                $browser = 'oldchrome';
-            }
-            else
-            {
-                $browser = 'chrome';
-            }
-        }
-        elseif ( preg_match( '/Safari\/([0-9.]+)/', $_SERVER['HTTP_USER_AGENT'], $logVersion) )
-        {
-            $version = $logVersion[1];
-            $browser = 'safari';
-        }
-        elseif ( preg_match( '/Opera[ \/]([0-9].[0-9]{1,2})/', $_SERVER['HTTP_USER_AGENT'], $logVersion) )
-        {
-            $version = $logVersion[1];
-            $browser = 'opera';
-        }
-        elseif ( preg_match( '/Konqueror\/([0-9.]+)/', $_SERVER['HTTP_USER_AGENT'], $logVersion) )
-        {
-            $version = $logVersion[1];
-            $browser = 'konqueror';
-        }
-        elseif ( preg_match( '/Mozilla\/([0-9].[0-9]{1,2})/', $_SERVER['HTTP_USER_AGENT'], $logVersion) )
-        {
-            $version = $logVersion[1];
-            $browser = 'mozilla';
-        }
-        else
-        {
-            $version = 0;
-            $browser = 'unknown';
-        }
-        $_SESSION['browser'] = $browser;
-        $_SESSION['version'] = $version;
-    }
-}
-
-function isMozilla()
-{
-    getBrowser( $browser, $version );
-
-    return( $browser == "mozilla" );
-}
-
-function isKonqueror()
-{
-   getBrowser( $browser, $version );
-
-   return( $browser == "konqueror" );
-}
-
-function isInternetExplorer()
-{
-    getBrowser( $browser, $version );
-
-    return( $browser == "ie" );
-}
-
-function isOldChrome()
-{
-    getBrowser( $browser, $version );
-
-    return( $browser == "oldchrome" );
-}
-
-function isChrome()
-{
-    getBrowser( $browser, $version );
-
-    return( $browser == "chrome" );
-}
-
-function isOpera()
-{
-    getBrowser( $browser, $version );
-
-    return( $browser == "opera" );
-}
-
-function isSafari()
-{
-    getBrowser( $browser, $version );
-
-    return( $browser == "safari" );
-}
-
-function isWindows()
-{
-    return ( preg_match( '/Win/', $_SERVER['HTTP_USER_AGENT'] ) );
-}
-
-function canStreamIframe()
-{
-   return( isKonqueror() );
-}
-
-function canStreamNative()
-{
-   // Old versions of Chrome can display the stream, but then it blocks everything else (Chrome bug 5876)
-   return( ZM_WEB_CAN_STREAM == "yes" || ( ZM_WEB_CAN_STREAM == "auto" && (!isInternetExplorer() && !isOldChrome()) ) );
-}
-
-function canStreamApplet()
-{
-    if ( (ZM_OPT_CAMBOZOLA && !file_exists( ZM_PATH_WEB.'/'.ZM_PATH_CAMBOZOLA )) )
-    {
-        Warning ( "ZM_OPT_CAMBOZOLA is enabled, but the system cannot find ".ZM_PATH_WEB."/".ZM_PATH_CAMBOZOLA );
-    }
-
-    return( (ZM_OPT_CAMBOZOLA && file_exists( ZM_PATH_WEB.'/'.ZM_PATH_CAMBOZOLA )) );
-}
-
-function canStream()
-{
-    return( canStreamNative() | canStreamApplet() );
-}
-
-function packageControl( $command )
-{
-    $string = ZM_PATH_BIN.'/zmpkg.pl '.escapeshellarg( $command );
-    $string .= " 2>/dev/null >&- <&- >/dev/null";
-    exec( $string );
-}
-
-function daemonControl( $command, $daemon=false, $args=false )
-{
-    $string = ZM_PATH_BIN."/zmdc.pl $command";
-    if ( $daemon )
-    {
-        $string .= " $daemon";
-        if ( $args )
-        {
-            $string .= " $args";
-        }
-    }
-    $string .= " 2>/dev/null >&- <&- >/dev/null";
-    exec( $string );
-}
-
-function zmcControl( $monitor, $mode=false )
-{
+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']) );
-        $zmcArgs = "-d ".$monitor['Device'];
-    }
-    else
-    {
-		$row = dbFetchOne( "select count(if(Function!='None',1,NULL)) as ActiveCount from Monitors where Id = ?", NULL, array($monitor['Id']) );
-        $zmcArgs = "-m ".$monitor['Id'];
+    $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']) );
+      $zmcArgs = "-d ".$monitor['Device'];
+    } else {
+      $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" ) {
         daemonControl( "stop", "zmc", $zmcArgs );
-    }
-    else
-    {
-        if ( $mode == "restart" )
-        {
-            daemonControl( "stop", "zmc", $zmcArgs );
-        }
-        daemonControl( "start", "zmc", $zmcArgs );
+      }
+      daemonControl( "start", "zmc", $zmcArgs );
     }
   }
 }
 
-function zmaControl( $monitor, $mode=false )
-{
+function zmaControl( $monitor, $mode=false ) {
   if ( (!defined('ZM_SERVER_ID')) or ( ZM_SERVER_ID==$monitor['ServerId'] ) ) {
-    if ( !is_array( $monitor ) )
-    {
-        $monitor = dbFetchOne( "select C.*, M.* from Monitors as M left join Controls as C on (M.ControlId = C.Id ) where M.Id=?", NULL, array($monitor) );
+    if ( !is_array( $monitor ) ) {
+      $monitor = dbFetchOne( "select C.*, M.* from Monitors as M left join Controls as C on (M.ControlId = C.Id ) where M.Id=?", NULL, array($monitor) );
     }
-    if ( !$monitor || $monitor['Function'] == 'None' || $monitor['Function'] == 'Monitor' || $mode == "stop" )
-    {
-        if ( ZM_OPT_CONTROL )
-        {
-            daemonControl( "stop", "zmtrack.pl", "-m ".$monitor['Id'] );
+    if ( !$monitor || $monitor['Function'] == 'None' || $monitor['Function'] == 'Monitor' || $mode == "stop" ) {
+      if ( ZM_OPT_CONTROL ) {
+        daemonControl( "stop", "zmtrack.pl", "-m ".$monitor['Id'] );
+      }
+      daemonControl( "stop", "zma", "-m ".$monitor['Id'] );
+      if ( ZM_OPT_FRAME_SERVER ) {
+        daemonControl( "stop", "zmf", "-m ".$monitor['Id'] );
+      }
+    } else {
+      if ( $mode == "restart" ) {
+        if ( ZM_OPT_CONTROL ) {
+          daemonControl( "stop", "zmtrack.pl", "-m ".$monitor['Id'] );
         }
         daemonControl( "stop", "zma", "-m ".$monitor['Id'] );
-        if ( ZM_OPT_FRAME_SERVER )
-        {
-            daemonControl( "stop", "zmf", "-m ".$monitor['Id'] );
-        }
-    }
-    else
-    {
-        if ( $mode == "restart" )
-        {
-            if ( ZM_OPT_CONTROL )
-            {
-                daemonControl( "stop", "zmtrack.pl", "-m ".$monitor['Id'] );
-            }
-            daemonControl( "stop", "zma", "-m ".$monitor['Id'] );
-            if ( ZM_OPT_FRAME_SERVER )
-            {
-                daemonControl( "stop", "zmf", "-m ".$monitor['Id'] );
-            }
-        }
-        if ( ZM_OPT_FRAME_SERVER )
-        {
-            daemonControl( "start", "zmf", "-m ".$monitor['Id'] );
-        }
-        daemonControl( "start", "zma", "-m ".$monitor['Id'] );
-        if ( ZM_OPT_CONTROL && $monitor['Controllable'] && $monitor['TrackMotion'] && ( $monitor['Function'] == 'Modect' || $monitor['Function'] == 'Mocord' ) )
-        {
-            daemonControl( "start", "zmtrack.pl", "-m ".$monitor['Id'] );
-        }
-        if ( $mode == "reload" )
-        {
-            daemonControl( "reload", "zma", "-m ".$monitor['Id'] );
+        if ( ZM_OPT_FRAME_SERVER ) {
+          daemonControl( "stop", "zmf", "-m ".$monitor['Id'] );
         }
+      }
+      if ( ZM_OPT_FRAME_SERVER ) {
+        daemonControl( "start", "zmf", "-m ".$monitor['Id'] );
+      }
+      daemonControl( "start", "zma", "-m ".$monitor['Id'] );
+      if ( ZM_OPT_CONTROL && $monitor['Controllable'] && $monitor['TrackMotion'] && ( $monitor['Function'] == 'Modect' || $monitor['Function'] == 'Mocord' ) ) {
+        daemonControl( "start", "zmtrack.pl", "-m ".$monitor['Id'] );
+      }
+      if ( $mode == "reload" ) {
+        daemonControl( "reload", "zma", "-m ".$monitor['Id'] );
+      }
     }
   }
 }
 
-function initDaemonStatus()
-{
-    global $daemon_status;
+function initDaemonStatus() {
+  global $daemon_status;
 
-    if ( !isset($daemon_status) )
-    {
-        if ( daemonCheck() )
-        {
-            $string = ZM_PATH_BIN."/zmdc.pl status";
-            $daemon_status = shell_exec( $string );
-        }
-        else
-        {
-            $daemon_status = "";
-        }
+  if ( !isset($daemon_status) ) {
+    if ( daemonCheck() ) {
+      $string = ZM_PATH_BIN."/zmdc.pl status";
+      $daemon_status = shell_exec( $string );
+    } else {
+      $daemon_status = "";
     }
+  }
 }
 
-function daemonStatus( $daemon, $args=false )
-{
-    global $daemon_status;
+function daemonStatus( $daemon, $args=false ) {
+  global $daemon_status;
 
-    initDaemonStatus();
-    
-    $string = "$daemon";
+  initDaemonStatus();
+
+  $string = "$daemon";
+  if ( $args )
+    $string .= " $args";
+  return( strpos( $daemon_status, "'$string' running" ) !== false );
+}
+
+function zmcStatus( $monitor ) {
+  if ( $monitor['Type'] == 'Local' ) {
+    $zmcArgs = "-d ".$monitor['Device'];
+  } else {
+    $zmcArgs = "-m ".$monitor['Id'];
+  }
+  return( daemonStatus( "zmc", $zmcArgs ) );
+}
+
+function zmaStatus( $monitor ) {
+  if ( is_array( $monitor ) ) {
+    $monitor = $monitor['Id'];
+  }
+  return( daemonStatus( "zma", "-m $monitor" ) );
+}
+
+function daemonCheck( $daemon=false, $args=false ) {
+  $string = ZM_PATH_BIN."/zmdc.pl check";
+  if ( $daemon ) {
+    $string .= " $daemon";
     if ( $args )
-        $string .= " $args";
-    return( strpos( $daemon_status, "'$string' running" ) !== false );
+      $string .= " $args";
+  }
+  $result = exec( $string );
+  return( preg_match( '/running/', $result ) );
 }
 
-function zmcStatus( $monitor )
-{
-    if ( $monitor['Type'] == 'Local' )
-    {
-        $zmcArgs = "-d ".$monitor['Device'];
-    }
+function zmcCheck( $monitor ) {
+  if ( $monitor['Type'] == 'Local' ) {
+    $zmcArgs = "-d ".$monitor['Device'];
+  } else {
+    $zmcArgs = "-m ".$monitor['Id'];
+  }
+  return( daemonCheck( "zmc", $zmcArgs ) );
+}
+
+function zmaCheck( $monitor ) {
+  if ( is_array( $monitor ) ) {
+    $monitor = $monitor['Id'];
+  }
+  return( daemonCheck( "zma", "-m $monitor" ) );
+}
+
+function getImageSrc( $event, $frame, $scale=SCALE_BASE, $captureOnly=false, $overwrite=false ) {
+  $eventPath = getEventPath( $event );
+
+  if ( !is_array($frame) )
+    $frame = array( 'FrameId'=>$frame, 'Type'=>'' );
+
+  //echo "S:$scale, CO:$captureOnly<br>";
+  $captImage = sprintf( "%0".ZM_EVENT_IMAGE_DIGITS."d-capture.jpg", $frame['FrameId'] );
+  $captPath = $eventPath.'/'.$captImage;
+  $thumbCaptPath = ZM_DIR_IMAGES.'/'.$event['Id'].'-'.$captImage;
+  //echo "CI:$captImage, CP:$captPath, TCP:$thumbCaptPath<br>";
+
+  $analImage = sprintf( "%0".ZM_EVENT_IMAGE_DIGITS."d-analyse.jpg", $frame['FrameId'] );
+  $analPath = $eventPath.'/'.$analImage;
+  $analFile =  ZM_DIR_EVENTS."/".$analPath;
+  $thumbAnalPath = ZM_DIR_IMAGES.'/'.$event['Id'].'-'.$analImage;
+  //echo "AI:$analImage, AP:$analPath, TAP:$thumbAnalPath<br>";
+
+  $alarmFrame = $frame['Type']=='Alarm';
+
+  $hasAnalImage = $alarmFrame && file_exists( $analFile ) && filesize( $analFile );
+  $isAnalImage = $hasAnalImage && !$captureOnly;
+
+  if ( !ZM_WEB_SCALE_THUMBS || $scale >= SCALE_BASE || !function_exists( 'imagecreatefromjpeg' ) ) {
+    $imagePath = $thumbPath = $isAnalImage?$analPath:$captPath;
+    $imageFile = ZM_DIR_EVENTS."/".$imagePath;
+    $thumbFile = ZM_DIR_EVENTS."/".$thumbPath;
+  } else {
+    if ( version_compare( phpversion(), "4.3.10", ">=") )
+      $fraction = sprintf( "%.3F", $scale/SCALE_BASE );
     else
-    {
-        $zmcArgs = "-m ".$monitor['Id'];
+      $fraction = sprintf( "%.3f", $scale/SCALE_BASE );
+    $scale = (int)round( $scale );
+
+    $thumbCaptPath = preg_replace( "/\.jpg$/", "-$scale.jpg", $thumbCaptPath );
+    $thumbAnalPath = preg_replace( "/\.jpg$/", "-$scale.jpg", $thumbAnalPath );
+
+    if ( $isAnalImage ) {
+      $imagePath = $analPath;
+      $thumbPath = $thumbAnalPath;
+    } else {
+      $imagePath = $captPath;
+      $thumbPath = $thumbCaptPath;
     }
-    return( daemonStatus( "zmc", $zmcArgs ) );
+
+    $imageFile = ZM_DIR_EVENTS."/".$imagePath;
+    //$thumbFile = ZM_DIR_EVENTS."/".$thumbPath;
+    $thumbFile = $thumbPath;
+    if ( $overwrite || !file_exists( $thumbFile ) || !filesize( $thumbFile ) ) {
+      // Get new dimensions
+      list( $imageWidth, $imageHeight ) = getimagesize( $imageFile );
+      $thumbWidth = $imageWidth * $fraction;
+      $thumbHeight = $imageHeight * $fraction;
+
+      // Resample
+      $thumbImage = imagecreatetruecolor( $thumbWidth, $thumbHeight );
+      $image = imagecreatefromjpeg( $imageFile );
+      imagecopyresampled( $thumbImage, $image, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imageWidth, $imageHeight );
+
+      if ( !imagejpeg( $thumbImage, $thumbFile ) )
+        Error( "Can't create thumbnail '$thumbPath'" );
+    }
+  }
+
+  $imageData = array(
+      'eventPath' => $eventPath,
+      'imagePath' => $imagePath,
+      'thumbPath' => $thumbPath,
+      'imageFile' => $imageFile,
+      'thumbFile' => $thumbFile,
+      'imageClass' => $alarmFrame?"alarm":"normal",
+      'isAnalImage' => $isAnalImage,
+      'hasAnalImage' => $hasAnalImage,
+      );
+
+  //echo "IP:$imagePath<br>";
+  //echo "TP:$thumbPath<br>";
+  return( $imageData );
 }
 
-function zmaStatus( $monitor )
-{
-    if ( is_array( $monitor ) )
-    {
-        $monitor = $monitor['Id'];
-    }
-    return( daemonStatus( "zma", "-m $monitor" ) );
+function viewImagePath( $path, $querySep='&amp;' ) {
+  if ( strncmp( $path, ZM_DIR_IMAGES, strlen(ZM_DIR_IMAGES) ) == 0 ) {
+    // Thumbnails
+    return( $path );
+  } elseif ( strpos( ZM_DIR_EVENTS, '/' ) === 0 ) {
+    return( '?view=image'.$querySep.'path='.$path );
+  }
+  return( ZM_DIR_EVENTS.'/'.$path );
 }
 
-function daemonCheck( $daemon=false, $args=false )
-{
-    $string = ZM_PATH_BIN."/zmdc.pl check";
-    if ( $daemon )
-    {
-        $string .= " $daemon";
-        if ( $args )
-            $string .= " $args";
-    }
-    $result = exec( $string );
-    return( preg_match( '/running/', $result ) );
+function createListThumbnail( $event, $overwrite=false ) {
+  if ( !($frame = dbFetchOne( "SELECT * FROM Frames WHERE EventId=? AND Score=? ORDER BY FrameId LIMIT 1", NULL, array( $event['Id'], $event['MaxScore'] ) )) )
+    return( false );
+
+  $frameId = $frame['FrameId'];
+
+  if ( ZM_WEB_LIST_THUMB_WIDTH ) {
+    $thumbWidth = ZM_WEB_LIST_THUMB_WIDTH;
+    $scale = (SCALE_BASE*ZM_WEB_LIST_THUMB_WIDTH)/$event['Width'];
+    $thumbHeight = reScale( $event['Height'], $scale );
+  } elseif ( ZM_WEB_LIST_THUMB_HEIGHT ) {
+    $thumbHeight = ZM_WEB_LIST_THUMB_HEIGHT;
+    $scale = (SCALE_BASE*ZM_WEB_LIST_THUMB_HEIGHT)/$event['Height'];
+    $thumbWidth = reScale( $event['Width'], $scale );
+  } else {
+    Fatal( "No thumbnail width or height specified, please check in Options->Web" );
+  }
+
+  $imageData = getImageSrc( $event, $frame, $scale, false, $overwrite );
+  $thumbData = $frame;
+  $thumbData['Path'] = $imageData['thumbPath'];
+  $thumbData['Width'] = (int)$thumbWidth;
+  $thumbData['Height'] = (int)$thumbHeight;
+
+  return( $thumbData );
 }
 
-function zmcCheck( $monitor )
-{
-    if ( $monitor['Type'] == 'Local' )
-    {
-        $zmcArgs = "-d ".$monitor['Device'];
-    }
+function createVideo( $event, $format, $rate, $scale, $overwrite=false ) {
+  $command = ZM_PATH_BIN."/zmvideo.pl -e ".$event['Id']." -f ".$format." -r ".sprintf( "%.2F", ($rate/RATE_BASE) );
+  if ( preg_match( '/\d+x\d+/', $scale ) )
+    $command .= " -S ".$scale;
+  else
+    if ( version_compare( phpversion(), "4.3.10", ">=") )
+      $command .= " -s ".sprintf( "%.2F", ($scale/SCALE_BASE) );
     else
-    {
-        $zmcArgs = "-m ".$monitor['Id'];
-    }
-    return( daemonCheck( "zmc", $zmcArgs ) );
+      $command .= " -s ".sprintf( "%.2f", ($scale/SCALE_BASE) );
+  if ( $overwrite )
+    $command .= " -o";
+  $result = exec( escapeshellcmd( $command ), $output, $status );
+  return( $status?"":rtrim($result) );
 }
 
-function zmaCheck( $monitor )
-{
-    if ( is_array( $monitor ) )
-    {
-        $monitor = $monitor['Id'];
-    }
-    return( daemonCheck( "zma", "-m $monitor" ) );
-}
-
-function getImageSrc( $event, $frame, $scale=SCALE_BASE, $captureOnly=false, $overwrite=false )
-{
-    $eventPath = getEventPath( $event );
-
-    if ( !is_array($frame) )
-        $frame = array( 'FrameId'=>$frame, 'Type'=>'' );
-
-    //echo "S:$scale, CO:$captureOnly<br>";
-    $captImage = sprintf( "%0".ZM_EVENT_IMAGE_DIGITS."d-capture.jpg", $frame['FrameId'] );
-    $captPath = $eventPath.'/'.$captImage;
-    $thumbCaptPath = ZM_DIR_IMAGES.'/'.$event['Id'].'-'.$captImage;
-    //echo "CI:$captImage, CP:$captPath, TCP:$thumbCaptPath<br>";
-
-    $analImage = sprintf( "%0".ZM_EVENT_IMAGE_DIGITS."d-analyse.jpg", $frame['FrameId'] );
-    $analPath = $eventPath.'/'.$analImage;
-    $analFile =  ZM_DIR_EVENTS."/".$analPath;
-    $thumbAnalPath = ZM_DIR_IMAGES.'/'.$event['Id'].'-'.$analImage;
-    //echo "AI:$analImage, AP:$analPath, TAP:$thumbAnalPath<br>";
-
-    $alarmFrame = $frame['Type']=='Alarm';
-
-    $hasAnalImage = $alarmFrame && file_exists( $analFile ) && filesize( $analFile );
-    $isAnalImage = $hasAnalImage && !$captureOnly;
-
-    if ( !ZM_WEB_SCALE_THUMBS || $scale >= SCALE_BASE || !function_exists( 'imagecreatefromjpeg' ) )
-    {
-        $imagePath = $thumbPath = $isAnalImage?$analPath:$captPath;
-        $imageFile = ZM_DIR_EVENTS."/".$imagePath;
-        $thumbFile = ZM_DIR_EVENTS."/".$thumbPath;
-    }
-    else
-    {
-        if ( version_compare( phpversion(), "4.3.10", ">=") )
-            $fraction = sprintf( "%.3F", $scale/SCALE_BASE );
-        else
-            $fraction = sprintf( "%.3f", $scale/SCALE_BASE );
-        $scale = (int)round( $scale );
-
-        $thumbCaptPath = preg_replace( "/\.jpg$/", "-$scale.jpg", $thumbCaptPath );
-        $thumbAnalPath = preg_replace( "/\.jpg$/", "-$scale.jpg", $thumbAnalPath );
-
-        if ( $isAnalImage )
-        {
-            $imagePath = $analPath;
-            $thumbPath = $thumbAnalPath;
-        }
-        else
-        {
-            $imagePath = $captPath;
-            $thumbPath = $thumbCaptPath;
-        }
-
-        $imageFile = ZM_DIR_EVENTS."/".$imagePath;
-        //$thumbFile = ZM_DIR_EVENTS."/".$thumbPath;
-        $thumbFile = $thumbPath;
-        if ( $overwrite || !file_exists( $thumbFile ) || !filesize( $thumbFile ) )
-        {
-            // Get new dimensions
-            list( $imageWidth, $imageHeight ) = getimagesize( $imageFile );
-            $thumbWidth = $imageWidth * $fraction;
-            $thumbHeight = $imageHeight * $fraction;
-
-            // Resample
-            $thumbImage = imagecreatetruecolor( $thumbWidth, $thumbHeight );
-            $image = imagecreatefromjpeg( $imageFile );
-            imagecopyresampled( $thumbImage, $image, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imageWidth, $imageHeight );
-
-            if ( !imagejpeg( $thumbImage, $thumbFile ) )
-                Error( "Can't create thumbnail '$thumbPath'" );
-        }
-    }
-
-    $imageData = array(
-        'eventPath' => $eventPath,
-        'imagePath' => $imagePath,
-        'thumbPath' => $thumbPath,
-        'imageFile' => $imageFile,
-        'thumbFile' => $thumbFile,
-        'imageClass' => $alarmFrame?"alarm":"normal",
-        'isAnalImage' => $isAnalImage,
-        'hasAnalImage' => $hasAnalImage,
-    );
-
-    //echo "IP:$imagePath<br>";
-    //echo "TP:$thumbPath<br>";
-    return( $imageData );
-}
-
-function viewImagePath( $path, $querySep='&amp;' )
-{
-    if ( strncmp( $path, ZM_DIR_IMAGES, strlen(ZM_DIR_IMAGES) ) == 0 )
-    {
-        // Thumbnails
-        return( $path );
-    }
-    elseif ( strpos( ZM_DIR_EVENTS, '/' ) === 0 )
-    {
-        return( '?view=image'.$querySep.'path='.$path );
-    }
-    return( ZM_DIR_EVENTS.'/'.$path );
-}
-
-function createListThumbnail( $event, $overwrite=false )
-{
-    if ( !($frame = dbFetchOne( "SELECT * FROM Frames WHERE EventId=? AND Score=? ORDER BY FrameId LIMIT 1", NULL, array( $event['Id'], $event['MaxScore'] ) )) )
-        return( false );
-
-    $frameId = $frame['FrameId'];
-
-    if ( ZM_WEB_LIST_THUMB_WIDTH )
-    {
-        $thumbWidth = ZM_WEB_LIST_THUMB_WIDTH;
-        $scale = (SCALE_BASE*ZM_WEB_LIST_THUMB_WIDTH)/$event['Width'];
-        $thumbHeight = reScale( $event['Height'], $scale );
-    }
-    elseif ( ZM_WEB_LIST_THUMB_HEIGHT )
-    {
-        $thumbHeight = ZM_WEB_LIST_THUMB_HEIGHT;
-        $scale = (SCALE_BASE*ZM_WEB_LIST_THUMB_HEIGHT)/$event['Height'];
-        $thumbWidth = reScale( $event['Width'], $scale );
-    }
-    else
-    {
-        Fatal( "No thumbnail width or height specified, please check in Options->Web" );
-    }
-
-    $imageData = getImageSrc( $event, $frame, $scale, false, $overwrite );
-    $thumbData = $frame;
-    $thumbData['Path'] = $imageData['thumbPath'];
-    $thumbData['Width'] = (int)$thumbWidth;
-    $thumbData['Height'] = (int)$thumbHeight;
-
-    return( $thumbData );
-}
-
-function createVideo( $event, $format, $rate, $scale, $overwrite=false )
-{
-    $command = ZM_PATH_BIN."/zmvideo.pl -e ".$event['Id']." -f ".$format." -r ".sprintf( "%.2F", ($rate/RATE_BASE) );
-    if ( preg_match( '/\d+x\d+/', $scale ) )
-        $command .= " -S ".$scale;
-    else
-        if ( version_compare( phpversion(), "4.3.10", ">=") )
-            $command .= " -s ".sprintf( "%.2F", ($scale/SCALE_BASE) );
-        else
-            $command .= " -s ".sprintf( "%.2f", ($scale/SCALE_BASE) );
-    if ( $overwrite )
-        $command .= " -o";
-    $result = exec( escapeshellcmd( $command ), $output, $status );
-    return( $status?"":rtrim($result) );
-}
-
-function executeFilter( $filter )
-{
-    $command = ZM_PATH_BIN."/zmfilter.pl --filter ".escapeshellarg($filter);
-    $result = exec( $command, $output, $status );
-    dbQuery( "delete from Filters where Name like '_TempFilter%'" );
-    return( $status );
+function executeFilter( $filter ) {
+  $command = ZM_PATH_BIN."/zmfilter.pl --filter ".escapeshellarg($filter);
+  $result = exec( $command, $output, $status );
+  dbQuery( "delete from Filters where Name like '_TempFilter%'" );
+  return( $status );
 }
 
 # This takes more than one scale amount, so it runs through each and alters dimension.
 # I can't imagine why you would want to do that.
-function reScale( $dimension, $dummy )
-{
-    $new_dimension = $dimension;
-    for ( $i = 1; $i < func_num_args(); $i++ )
-    {
-        $scale = func_get_arg( $i );
-        if ( !empty($scale) && $scale != SCALE_BASE )
-            $new_dimension = (int)(($new_dimension*$scale)/SCALE_BASE);
-    }
-    return( $new_dimension );
+function reScale( $dimension, $dummy ) {
+  $new_dimension = $dimension;
+  for ( $i = 1; $i < func_num_args(); $i++ ) {
+    $scale = func_get_arg( $i );
+    if ( !empty($scale) && $scale != SCALE_BASE )
+      $new_dimension = (int)(($new_dimension*$scale)/SCALE_BASE);
+  }
+  return( $new_dimension );
 }
 
-function deScale( $dimension, $dummy )
-{
-    $new_dimension = $dimension;
-    for ( $i = 1; $i < func_num_args(); $i++ )
-    {
-        $scale = func_get_arg( $i );
-        if ( !empty($scale) && $scale != SCALE_BASE )
-            $new_dimension = (int)(($new_dimension*SCALE_BASE)/$scale);
-    }
-    return( $new_dimension );
+function deScale( $dimension, $dummy ) {
+  $new_dimension = $dimension;
+  for ( $i = 1; $i < func_num_args(); $i++ ) {
+    $scale = func_get_arg( $i );
+    if ( !empty($scale) && $scale != SCALE_BASE )
+      $new_dimension = (int)(($new_dimension*SCALE_BASE)/$scale);
+  }
+  return( $new_dimension );
 }
 
-function monitorLimitSql()
-{
-    global $user;
-    if ( !empty($user['MonitorIds']) )
-        $midSql = " and MonitorId in (".join( ",", preg_split( '/["\'\s]*,["\'\s]*/', $user['MonitorIds'] ) ).")";
+function monitorLimitSql() {
+  global $user;
+  if ( !empty($user['MonitorIds']) )
+    $midSql = " and MonitorId in (".join( ",", preg_split( '/["\'\s]*,["\'\s]*/', $user['MonitorIds'] ) ).")";
+  else
+    $midSql = '';
+  return( $midSql );
+}
+
+function parseSort( $saveToSession=false, $querySep='&amp;' ) {
+  global $sortQuery, $sortColumn, $sortOrder; // Outputs
+
+  if ( empty($_REQUEST['sort_field']) ) {
+    $_REQUEST['sort_field'] = ZM_WEB_EVENT_SORT_FIELD;
+    $_REQUEST['sort_asc'] = (ZM_WEB_EVENT_SORT_ORDER == "asc");
+  }
+  switch( $_REQUEST['sort_field'] ) {
+    case 'Id' :
+      $sortColumn = "E.Id";
+      break;
+    case 'MonitorName' :
+      $sortColumn = "M.Name";
+      break;
+    case 'Name' :
+      $sortColumn = "E.Name";
+      break;
+    case 'Cause' :
+      $sortColumn = "E.Cause";
+      break;
+    case 'DateTime' :
+      $_REQUEST['sort_field'] = 'StartTime';
+    case 'StartTime' :
+      $sortColumn = "E.StartTime";
+      break;
+    case 'Length' :
+      $sortColumn = "E.Length";
+      break;
+    case 'Frames' :
+      $sortColumn = "E.Frames";
+      break;
+    case 'AlarmFrames' :
+      $sortColumn = "E.AlarmFrames";
+      break;
+    case 'TotScore' :
+      $sortColumn = "E.TotScore";
+      break;
+    case 'AvgScore' :
+      $sortColumn = "E.AvgScore";
+      break;
+    case 'MaxScore' :
+      $sortColumn = "E.MaxScore";
+      break;
+    default:
+      $sortColumn = "E.StartTime";
+      break;
+  }
+  $sortOrder = $_REQUEST['sort_asc']?"asc":"desc";
+  if ( !$_REQUEST['sort_asc'] )
+    $_REQUEST['sort_asc'] = 0;
+  $sortQuery = $querySep."sort_field=".validHtmlStr($_REQUEST['sort_field']).$querySep."sort_asc=".validHtmlStr($_REQUEST['sort_asc']);
+  if ( !isset($_REQUEST['limit']) )
+    $_REQUEST['limit'] = "";
+  if ( $saveToSession ) {
+    $_SESSION['sort_field'] = validHtmlStr($_REQUEST['sort_field']);
+    $_SESSION['sort_asc'] = validHtmlStr($_REQUEST['sort_asc']);
+  }
+}
+
+function parseFilter( &$filter, $saveToSession=false, $querySep='&amp;' ) {
+  $filter['query'] = ''; 
+  $filter['sql'] = '';
+  $filter['fields'] = '';
+
+  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['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['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['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][attr]\" value=\"".htmlspecialchars($filter['terms'][$i]['attr'])."\"/>\n";
+        switch ( $filter['terms'][$i]['attr'] ) {
+          case 'MonitorName':
+            $filter['sql'] .= 'M.'.preg_replace( '/^Monitor/', '', $filter['terms'][$i]['attr'] );
+            break;
+          case 'DateTime':
+            $filter['sql'] .= "E.StartTime";
+            break;
+          case 'Date':
+            $filter['sql'] .= "to_days( E.StartTime )";
+            break;
+          case 'Time':
+            $filter['sql'] .= "extract( hour_second from E.StartTime )";
+            break;
+          case 'Weekday':
+            $filter['sql'] .= "weekday( E.StartTime )";
+            break;
+          case 'Id':
+          case 'Name':
+          case 'MonitorId':
+          case 'Length':
+          case 'Frames':
+          case 'AlarmFrames':
+          case 'TotScore':
+          case 'AvgScore':
+          case 'MaxScore':
+          case 'Cause':
+          case 'Notes':
+          case 'Archived':
+            $filter['sql'] .= 'E.'.$filter['terms'][$i]['attr'];
+            break;
+          case 'DiskPercent':
+            $filter['sql'] .= getDiskPercent();
+            break;
+          case 'DiskBlocks':
+            $filter['sql'] .= getDiskBlocks();
+            break;
+          case 'SystemLoad':
+            $filter['sql'] .= getLoad();
+            break;
+        }
+        $valueList = array();
+        foreach ( preg_split( '/["\'\s]*?,["\'\s]*?/', preg_replace( '/^["\']+?(.+)["\']+?$/', '$1', $filter['terms'][$i]['val'] ) ) as $value ) {
+          switch ( $filter['terms'][$i]['attr'] ) {
+            case 'MonitorName':
+            case 'Name':
+            case 'Cause':
+            case 'Notes':
+              $value = dbEscape($value);
+              break;
+            case 'DateTime':
+              $value = "'".strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) )."'";
+              break;
+            case 'Date':
+              $value = "to_days( '".strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) )."' )";
+              break;
+            case 'Time':
+              $value = "extract( hour_second from '".strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) )."' )";
+              break;
+            default :
+              $value = dbEscape($value);
+              break;
+          }
+          $valueList[] = $value;
+        }
+
+        switch ( $filter['terms'][$i]['op'] ) {
+          case '=' :
+          case '!=' :
+          case '>=' :
+          case '>' :
+          case '<' :
+          case '<=' :
+            $filter['sql'] .= " ".$filter['terms'][$i]['op']." $value";
+            break;
+          case '=~' :
+            $filter['sql'] .= " regexp ".$value;
+            break;
+          case '!~' :
+            $filter['sql'] .= " not regexp ".$value;
+            break;
+          case '=[]' :
+            $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['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['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['sql'] .= " ".str_repeat( ")", $filter['terms'][$i]['cbr'] )." ";
+        $filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][cbr]\" value=\"".htmlspecialchars($filter['terms'][$i]['cbr'])."\"/>\n";
+      }
+    }
+    if ( $filter['sql'] )
+      $filter['sql'] = " and ( ".$filter['sql']." )";
+    if ( $saveToSession ) {
+      $_SESSION['filter'] = $filter;
+    }
+  }
+}
+
+function addFilterTerm( $filter, $position, $term=false ) {
+  if ( $position < 0 )
+    $position = 0;
+  elseif( $position > count($filter['terms']) )
+    $position = count($filter['terms']);
+  if ( $term && $position == 0 )
+    unset( $term['cnj'] );
+  array_splice( $filter['terms'], $position, 0, array( $term?$term:array() ) );
+
+  return( $filter );
+}
+
+function delFilterTerm( $filter, $position ) {
+  if ( $position < 0 )
+    $position = 0;
+  elseif( $position >= count($filter['terms']) )
+    $position = count($filter['terms']);
+  array_splice( $filter['terms'], $position, 1 );
+
+  return( $filter );
+}
+
+function getPagination( $pages, $page, $maxShortcuts, $query, $querySep='&amp;' ) {
+  global $view;
+
+  $pageText = "";
+  if ( $pages > 1 ) {
+    if ( $page ) {
+      if ( $page < 0 )
+        $page = 1;
+      if ( $page > $pages )
+        $page = $pages;
+
+      if ( $page > 1 ) {
+        if ( false && $page > 2 ) {
+          $pageText .= '<a href="?view='.$view.$querySep.'page=1'.$query.'">&lt;&lt;</a>';
+        }
+        $pageText .= '<a href="?view='.$view.$querySep.'page='.($page-1).$query.'">&lt;</a>';
+
+        $newPages = array();
+        $pagesUsed = array();
+        $lo_exp = max(2,log($page-1)/log($maxShortcuts));
+        for ( $i = 0; $i < $maxShortcuts; $i++ ) {
+          $newPage = round($page-pow($lo_exp,$i));
+          if ( isset($pagesUsed[$newPage]) )
+            continue;
+          if ( $newPage <= 1 )
+            break;
+          $pagesUsed[$newPage] = true;
+          array_unshift( $newPages, $newPage );
+        }
+        if ( !isset($pagesUsed[1]) )
+          array_unshift( $newPages, 1 );
+
+        foreach ( $newPages as $newPage ) {
+          $pageText .= '<a href="?view='.$view.$querySep.'page='.$newPage.$query.'">'.$newPage.'</a>&nbsp;';
+        }
+
+      }
+      $pageText .= '-&nbsp;'.$page.'&nbsp;-';
+      if ( $page < $pages ) {
+        $newPages = array();
+        $pagesUsed = array();
+        $hi_exp = max(2,log($pages-$page)/log($maxShortcuts));
+        for ( $i = 0; $i < $maxShortcuts; $i++ ) {
+          $newPage = round($page+pow($hi_exp,$i));
+          if ( isset($pagesUsed[$newPage]) )
+            continue;
+          if ( $newPage > $pages )
+            break;
+          $pagesUsed[$newPage] = true;
+          array_push( $newPages, $newPage );
+        }
+        if ( !isset($pagesUsed[$pages]) )
+          array_push( $newPages, $pages );
+
+        foreach ( $newPages as $newPage ) {
+          $pageText .= '&nbsp;<a href="?view='.$view.$querySep.'page='.$newPage.$query.'">'.$newPage.'</a>';
+        }
+        $pageText .= '<a href="?view='.$view.$querySep.'page='.($page+1).$query.'">&gt;</a>';
+        if ( false && $page < ($pages-1) ) {
+          $pageText .= '<a href="?view='.$view.$querySep.'page='.$pages.$query.'">&gt;&gt;</a>';
+        }
+      }
+    }
+  }
+  return( $pageText );
+}
+
+function sortHeader( $field, $querySep='&amp;' ) {
+  global $view;
+  return( '?view='.$view.$querySep.'page=1'.$_REQUEST['filter']['query'].$querySep.'sort_field='.$field.$querySep.'sort_asc='.($_REQUEST['sort_field'] == $field?!$_REQUEST['sort_asc']:0).$querySep.'limit='.$_REQUEST['limit'] );
+}
+
+function sortTag( $field ) {
+  if ( $_REQUEST['sort_field'] == $field )
+    if ( $_REQUEST['sort_asc'] )
+      return( "(^)" );
     else
-        $midSql = '';
-    return( $midSql );
+      return( "(v)" );
+  return( false );
 }
 
-function parseSort( $saveToSession=false, $querySep='&amp;' )
-{
-    global $sortQuery, $sortColumn, $sortOrder; // Outputs
-
-    if ( empty($_REQUEST['sort_field']) )
-    {
-        $_REQUEST['sort_field'] = ZM_WEB_EVENT_SORT_FIELD;
-        $_REQUEST['sort_asc'] = (ZM_WEB_EVENT_SORT_ORDER == "asc");
-    }
-    switch( $_REQUEST['sort_field'] )
-    {
-        case 'Id' :
-            $sortColumn = "E.Id";
-            break;
-        case 'MonitorName' :
-            $sortColumn = "M.Name";
-            break;
-        case 'Name' :
-            $sortColumn = "E.Name";
-            break;
-        case 'Cause' :
-            $sortColumn = "E.Cause";
-            break;
-        case 'DateTime' :
-            $_REQUEST['sort_field'] = 'StartTime';
-        case 'StartTime' :
-            $sortColumn = "E.StartTime";
-            break;
-        case 'Length' :
-            $sortColumn = "E.Length";
-            break;
-        case 'Frames' :
-            $sortColumn = "E.Frames";
-            break;
-        case 'AlarmFrames' :
-            $sortColumn = "E.AlarmFrames";
-            break;
-        case 'TotScore' :
-            $sortColumn = "E.TotScore";
-            break;
-        case 'AvgScore' :
-            $sortColumn = "E.AvgScore";
-            break;
-        case 'MaxScore' :
-            $sortColumn = "E.MaxScore";
-            break;
-        default:
-            $sortColumn = "E.StartTime";
-            break;
-    }
-    $sortOrder = $_REQUEST['sort_asc']?"asc":"desc";
-    if ( !$_REQUEST['sort_asc'] )
-        $_REQUEST['sort_asc'] = 0;
-    $sortQuery = $querySep."sort_field=".validHtmlStr($_REQUEST['sort_field']).$querySep."sort_asc=".validHtmlStr($_REQUEST['sort_asc']);
-    if ( !isset($_REQUEST['limit']) )
-        $_REQUEST['limit'] = "";
-    if ( $saveToSession )
-    {
-        $_SESSION['sort_field'] = validHtmlStr($_REQUEST['sort_field']);
-        $_SESSION['sort_asc'] = validHtmlStr($_REQUEST['sort_asc']);
-    }
+function getLoad() {
+  $load = sys_getloadavg();
+  return( $load[0] );
 }
 
-function parseFilter( &$filter, $saveToSession=false, $querySep='&amp;' )
-{
-    $filter['query'] = ''; 
-    $filter['sql'] = '';
-    $filter['fields'] = '';
-
-    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['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['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['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][attr]\" value=\"".htmlspecialchars($filter['terms'][$i]['attr'])."\"/>\n";
-                switch ( $filter['terms'][$i]['attr'] )
-                {
-                    case 'MonitorName':
-                        $filter['sql'] .= 'M.'.preg_replace( '/^Monitor/', '', $filter['terms'][$i]['attr'] );
-                        break;
-                    case 'DateTime':
-                        $filter['sql'] .= "E.StartTime";
-                        break;
-                    case 'Date':
-                        $filter['sql'] .= "to_days( E.StartTime )";
-                        break;
-                    case 'Time':
-                        $filter['sql'] .= "extract( hour_second from E.StartTime )";
-                        break;
-                    case 'Weekday':
-                        $filter['sql'] .= "weekday( E.StartTime )";
-                        break;
-                    case 'Id':
-                    case 'Name':
-                    case 'MonitorId':
-                    case 'Length':
-                    case 'Frames':
-                    case 'AlarmFrames':
-                    case 'TotScore':
-                    case 'AvgScore':
-                    case 'MaxScore':
-                    case 'Cause':
-                    case 'Notes':
-                    case 'Archived':
-                        $filter['sql'] .= 'E.'.$filter['terms'][$i]['attr'];
-                        break;
-                    case 'DiskPercent':
-                        $filter['sql'] .= getDiskPercent();
-                        break;
-                    case 'DiskBlocks':
-                        $filter['sql'] .= getDiskBlocks();
-                        break;
-                    case 'SystemLoad':
-                        $filter['sql'] .= getLoad();
-                        break;
-                }
-                $valueList = array();
-                foreach ( preg_split( '/["\'\s]*?,["\'\s]*?/', preg_replace( '/^["\']+?(.+)["\']+?$/', '$1', $filter['terms'][$i]['val'] ) ) as $value )
-                {
-                    switch ( $filter['terms'][$i]['attr'] )
-                    {
-                        case 'MonitorName':
-                        case 'Name':
-                        case 'Cause':
-                        case 'Notes':
-                            $value = dbEscape($value);
-                            break;
-                        case 'DateTime':
-                            $value = "'".strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) )."'";
-                            break;
-                        case 'Date':
-                            $value = "to_days( '".strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) )."' )";
-                            break;
-                        case 'Time':
-                            $value = "extract( hour_second from '".strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) )."' )";
-                            break;
-                        default :
-                            $value = dbEscape($value);
-                            break;
-                    }
-                    $valueList[] = $value;
-                }
-
-                switch ( $filter['terms'][$i]['op'] )
-                {
-                    case '=' :
-                    case '!=' :
-                    case '>=' :
-                    case '>' :
-                    case '<' :
-                    case '<=' :
-                        $filter['sql'] .= " ".$filter['terms'][$i]['op']." $value";
-                        break;
-                    case '=~' :
-                        $filter['sql'] .= " regexp ".$value;
-                        break;
-                    case '!~' :
-                        $filter['sql'] .= " not regexp ".$value;
-                        break;
-                    case '=[]' :
-                        $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['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['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['sql'] .= " ".str_repeat( ")", $filter['terms'][$i]['cbr'] )." ";
-                $filter['fields'] .= "<input type=\"hidden\" name=\"filter[terms][$i][cbr]\" value=\"".htmlspecialchars($filter['terms'][$i]['cbr'])."\"/>\n";
-            }
-        }
-        if ( $filter['sql'] )
-            $filter['sql'] = " and ( ".$filter['sql']." )";
-        if ( $saveToSession )
-        {
-            $_SESSION['filter'] = $filter;
-        }
-    }
+function getDiskPercent() {
+  $total = disk_total_space(ZM_DIR_EVENTS);
+  if ( ! $total ) {
+    Error("disk_total_space returned false for " . ZM_DIR_EVENTS );
+    return 0;
+  }
+  $free = disk_free_space(ZM_DIR_EVENTS);
+  if ( ! $free ) {
+    Error("disk_free_space returned false for " . ZM_DIR_EVENTS );
+  }
+  $space = round(($total - $free) / $total * 100);
+  return( $space );
 }
 
-function addFilterTerm( $filter, $position, $term=false )
-{
-    if ( $position < 0 )
-        $position = 0;
-    elseif( $position > count($filter['terms']) )
-        $position = count($filter['terms']);
-    if ( $term && $position == 0 )
-        unset( $term['cnj'] );
-    array_splice( $filter['terms'], $position, 0, array( $term?$term:array() ) );
-    
-    return( $filter );
-}
-
-function delFilterTerm( $filter, $position )
-{
-    if ( $position < 0 )
-        $position = 0;
-    elseif( $position >= count($filter['terms']) )
-        $position = count($filter['terms']);
-    array_splice( $filter['terms'], $position, 1 );
-    
-    return( $filter );
-}
-
-function getPagination( $pages, $page, $maxShortcuts, $query, $querySep='&amp;' )
-{
-    global $view;
-
-    $pageText = "";
-    if ( $pages > 1 )
-    {
-        if ( $page )
-        {
-            if ( $page < 0 )
-                $page = 1;
-            if ( $page > $pages )
-                $page = $pages;
-
-            if ( $page > 1 )
-            {
-                if ( false && $page > 2 )
-                {
-                    $pageText .= '<a href="?view='.$view.$querySep.'page=1'.$query.'">&lt;&lt;</a>';
-                }
-                $pageText .= '<a href="?view='.$view.$querySep.'page='.($page-1).$query.'">&lt;</a>';
-
-                $newPages = array();
-                $pagesUsed = array();
-                $lo_exp = max(2,log($page-1)/log($maxShortcuts));
-                for ( $i = 0; $i < $maxShortcuts; $i++ )
-                {
-                    $newPage = round($page-pow($lo_exp,$i));
-                    if ( isset($pagesUsed[$newPage]) )
-                        continue;
-                    if ( $newPage <= 1 )
-                        break;
-                    $pagesUsed[$newPage] = true;
-                    array_unshift( $newPages, $newPage );
-                }
-                if ( !isset($pagesUsed[1]) )
-                    array_unshift( $newPages, 1 );
-
-                foreach ( $newPages as $newPage )
-                {
-                    $pageText .= '<a href="?view='.$view.$querySep.'page='.$newPage.$query.'">'.$newPage.'</a>&nbsp;';
-                }
-
-            }
-            $pageText .= '-&nbsp;'.$page.'&nbsp;-';
-            if ( $page < $pages )
-            {
-                $newPages = array();
-                $pagesUsed = array();
-                $hi_exp = max(2,log($pages-$page)/log($maxShortcuts));
-                for ( $i = 0; $i < $maxShortcuts; $i++ )
-                {
-                    $newPage = round($page+pow($hi_exp,$i));
-                    if ( isset($pagesUsed[$newPage]) )
-                        continue;
-                    if ( $newPage > $pages )
-                        break;
-                    $pagesUsed[$newPage] = true;
-                    array_push( $newPages, $newPage );
-                }
-                if ( !isset($pagesUsed[$pages]) )
-                    array_push( $newPages, $pages );
-
-                foreach ( $newPages as $newPage )
-                {
-                    $pageText .= '&nbsp;<a href="?view='.$view.$querySep.'page='.$newPage.$query.'">'.$newPage.'</a>';
-                }
-                $pageText .= '<a href="?view='.$view.$querySep.'page='.($page+1).$query.'">&gt;</a>';
-                if ( false && $page < ($pages-1) )
-                {
-                    $pageText .= '<a href="?view='.$view.$querySep.'page='.$pages.$query.'">&gt;&gt;</a>';
-                }
-            }
-        }
-    }
-    return( $pageText );
-}
-
-function sortHeader( $field, $querySep='&amp;' )
-{
-    global $view;
-    return( '?view='.$view.$querySep.'page=1'.$_REQUEST['filter']['query'].$querySep.'sort_field='.$field.$querySep.'sort_asc='.($_REQUEST['sort_field'] == $field?!$_REQUEST['sort_asc']:0).$querySep.'limit='.$_REQUEST['limit'] );
-}
-
-function sortTag( $field )
-{
-    if ( $_REQUEST['sort_field'] == $field )
-        if ( $_REQUEST['sort_asc'] )
-            return( "(^)" );
-        else
-            return( "(v)" );
-    return( false );
-}
-
-function getLoad()
-{
-    $load = sys_getloadavg();
-    return( $load[0] );
-}
-
-function getDiskPercent()
-{
-    $total = disk_total_space(ZM_DIR_EVENTS);
-    if ( ! $total ) {
-        Error("disk_total_space returned false for " . ZM_DIR_EVENTS );
-        return 0;
-    }
-    $free = disk_free_space(ZM_DIR_EVENTS);
-    if ( ! $free ) {
-        Error("disk_free_space returned false for " . ZM_DIR_EVENTS );
-    }
-    $space = round(($total - $free) / $total * 100);
-    return( $space );
-}
-
-function getDiskBlocks()
-{
-    $df = shell_exec( 'df '.ZM_DIR_EVENTS );
-    $space = -1;
-    if ( preg_match( '/\s(\d+)\s+\d+\s+\d+%/ms', $df, $matches ) )
-        $space = $matches[1];
-    return( $space );
+function getDiskBlocks() {
+  $df = shell_exec( 'df '.ZM_DIR_EVENTS );
+  $space = -1;
+  if ( preg_match( '/\s(\d+)\s+\d+\s+\d+%/ms', $df, $matches ) )
+    $space = $matches[1];
+  return( $space );
 }
 
 // Function to fix a problem whereby the built in PHP session handling 
 // features want to put the sid as a hidden field after the form or 
 // fieldset tag, neither of which will work with strict XHTML Basic.
-function sidField()
-{
-    if ( SID )
-    {
-        list( $sessname, $sessid ) = explode( "=", SID );
+function sidField() {
+  if ( SID ) {
+    list( $sessname, $sessid ) = explode( "=", SID );
 ?>
-<input type="hidden" name="<?php echo $sessname ?>" value="<?php echo $sessid ?>"/>
+    <input type="hidden" name="<?php echo $sessname ?>" value="<?php echo $sessid ?>"/>
 <?php
-    }
+  }
 }
 
-function verNum( $version )
-{
-    $vNum = "";
-    $maxFields = 3;
-    $vFields = explode( ".", $version );
-    array_splice( $vFields, $maxFields );
-    while ( count($vFields) < $maxFields )
-    {
-        $vFields[] = 0;
+function verNum( $version ) {
+  $vNum = "";
+  $maxFields = 3;
+  $vFields = explode( ".", $version );
+  array_splice( $vFields, $maxFields );
+  while ( count($vFields) < $maxFields ) {
+    $vFields[] = 0;
+  }
+  foreach ( $vFields as $vField ) {
+    $vField = sprintf( "%02d", $vField );
+    while ( strlen($vField) < 2 ) {
+      $vField = "0".$vField;
     }
-    foreach ( $vFields as $vField )
-    {
-        $vField = sprintf( "%02d", $vField );
-        while ( strlen($vField) < 2 )
-        {
-            $vField = "0".$vField;
-        }
-        $vNum .= $vField;
-    }
-    return( $vNum );
+    $vNum .= $vField;
+  }
+  return( $vNum );
 }
 
-function fixSequences()
-{
-    $sequence = 1;
-    $sql = "select * from Monitors order by Sequence asc, Id asc";
-    foreach( dbFetchAll( $sql ) as $monitor )
-    {
-        if ( $monitor['Sequence'] != $sequence )
-        {
-            dbQuery( 'update Monitors set Sequence = ? WHERE Id=?', array( $sequence, $monitor['Id'] ) );
-        }
-        $sequence++;
+function fixSequences() {
+  $sequence = 1;
+  $sql = "select * from Monitors order by Sequence asc, Id asc";
+  foreach( dbFetchAll( $sql ) as $monitor ) {
+    if ( $monitor['Sequence'] != $sequence ) {
+      dbQuery( 'update Monitors set Sequence = ? WHERE Id=?', array( $sequence, $monitor['Id'] ) );
     }
+    $sequence++;
+  }
 }
 
-function firstSet()
-{
-    foreach ( func_get_args() as $arg )
-    {
-        if ( !empty( $arg ) )
-            return( $arg );
-    }
+function firstSet() {
+  foreach ( func_get_args() as $arg ) {
+    if ( !empty( $arg ) )
+      return( $arg );
+  }
 }
 
-function linesIntersect( $line1, $line2 )
-{
-    global $debug;
+function linesIntersect( $line1, $line2 ) {
+  global $debug;
 
-    $min_x1 = min( $line1[0]['x'], $line1[1]['x'] );
-    $max_x1 = max( $line1[0]['x'], $line1[1]['x'] );
-    $min_x2 = min( $line2[0]['x'], $line2[1]['x'] );
-    $max_x2 = max( $line2[0]['x'], $line2[1]['x'] );
-    $min_y1 = min( $line1[0]['y'], $line1[1]['y'] );
-    $max_y1 = max( $line1[0]['y'], $line1[1]['y'] );
-    $min_y2 = min( $line2[0]['y'], $line2[1]['y'] );
-    $max_y2 = max( $line2[0]['y'], $line2[1]['y'] );
+  $min_x1 = min( $line1[0]['x'], $line1[1]['x'] );
+  $max_x1 = max( $line1[0]['x'], $line1[1]['x'] );
+  $min_x2 = min( $line2[0]['x'], $line2[1]['x'] );
+  $max_x2 = max( $line2[0]['x'], $line2[1]['x'] );
+  $min_y1 = min( $line1[0]['y'], $line1[1]['y'] );
+  $max_y1 = max( $line1[0]['y'], $line1[1]['y'] );
+  $min_y2 = min( $line2[0]['y'], $line2[1]['y'] );
+  $max_y2 = max( $line2[0]['y'], $line2[1]['y'] );
 
-    // Checking if bounding boxes intersect
-    if ( $max_x1 < $min_x2 || $max_x2 < $min_x1 ||$max_y1 < $min_y2 || $max_y2 < $min_y1 )
-    {
-        if ( $debug ) echo "Not intersecting, out of bounds<br>";
+  // Checking if bounding boxes intersect
+  if ( $max_x1 < $min_x2 || $max_x2 < $min_x1 ||$max_y1 < $min_y2 || $max_y2 < $min_y1 ) {
+    if ( $debug ) echo "Not intersecting, out of bounds<br>";
+    return( false );
+  }
+
+  $dx1 = $line1[1]['x'] - $line1[0]['x'];
+  $dy1 = $line1[1]['y'] - $line1[0]['y'];
+  $dx2 = $line2[1]['x'] - $line2[0]['x'];
+  $dy2 = $line2[1]['y'] - $line2[0]['y'];
+
+  if ( $dx1 ) {
+    $m1 = $dy1/$dx1;
+    $b1 = $line1[0]['y'] - ($m1 * $line1[0]['x']);
+  } else {
+    $b1 = $line1[0]['y'];
+  }
+  if ( $dx2 ) {
+    $m2 = $dy2/$dx2;
+    $b2 = $line2[0]['y'] - ($m2 * $line2[0]['x']);
+  } else {
+    $b2 = $line2[0]['y'];
+  }
+
+  if ( $dx1 && $dx2 ) { // Both not vertical
+    if ( $m1 != $m2 ) { // Not parallel or colinear
+      $x = ( $b2 - $b1 ) / ( $m1 - $m2 );
+
+      if ( $x >= $min_x1 && $x <= $max_x1 && $x >= $min_x2 && $x <= $max_x2 ) {
+        if ( $debug ) echo "Intersecting, at x $x<br>";
+        return( true );
+      } else {
+        if ( $debug ) echo "Not intersecting, out of range at x $x<br>";
         return( false );
+      }
+    } elseif ( $b1 == $b2 ) {
+      // Colinear, must overlap due to box check, intersect? 
+      if ( $debug ) echo "Intersecting, colinear<br>";
+      return( true );
+    } else {
+      // Parallel
+      if ( $debug ) echo "Not intersecting, parallel<br>";
+      return( false );
     }
-
-    $dx1 = $line1[1]['x'] - $line1[0]['x'];
-    $dy1 = $line1[1]['y'] - $line1[0]['y'];
-    $dx2 = $line2[1]['x'] - $line2[0]['x'];
-    $dy2 = $line2[1]['y'] - $line2[0]['y'];
-
-    if ( $dx1 )
-    {
-        $m1 = $dy1/$dx1;
-        $b1 = $line1[0]['y'] - ($m1 * $line1[0]['x']);
+  } elseif ( !$dx1 ) { // Line 1 is vertical 
+    $y = ( $m2 * $line1[0]['x'] ) * $b2;
+    if ( $y >= $min_y1 && $y <= $max_y1 ) {
+      if ( $debug ) echo "Intersecting, at y $y<br>";
+      return( true );
+    } else {
+      if ( $debug ) echo "Not intersecting, out of range at y $y<br>";
+      return( false );
     }
-    else
-    {
-        $b1 = $line1[0]['y'];
+  } elseif ( !$dx2 ) { // Line 2 is vertical 
+    $y = ( $m1 * $line2[0]['x'] ) * $b1;
+    if ( $y >= $min_y2 && $y <= $max_y2 ) {
+      if ( $debug ) echo "Intersecting, at y $y<br>";
+      return( true );
+    } else {
+      if ( $debug ) echo "Not intersecting, out of range at y $y<br>";
+      return( false );
     }
-    if ( $dx2 )
-    {
-        $m2 = $dy2/$dx2;
-        $b2 = $line2[0]['y'] - ($m2 * $line2[0]['x']);
+  } else { // Both lines are vertical
+    if ( $line1[0]['x'] == $line2[0]['x'] ) {
+      // Colinear, must overlap due to box check, intersect? 
+      if ( $debug ) echo "Intersecting, vertical, colinear<br>";
+      return( true );
+    } else {
+      // Parallel
+      if ( $debug ) echo "Not intersecting, vertical, parallel<br>";
+      return( false );
     }
-    else
-    {
-        $b2 = $line2[0]['y'];
-    }
-
-    if ( $dx1 && $dx2 ) // Both not vertical
-    {
-        if ( $m1 != $m2 ) // Not parallel or colinear
-        {
-            $x = ( $b2 - $b1 ) / ( $m1 - $m2 );
-
-            if ( $x >= $min_x1 && $x <= $max_x1 && $x >= $min_x2 && $x <= $max_x2 )
-            {
-                if ( $debug ) echo "Intersecting, at x $x<br>";
-                return( true );
-            }
-            else
-            {
-                if ( $debug ) echo "Not intersecting, out of range at x $x<br>";
-                return( false );
-            }
-        }
-        elseif ( $b1 == $b2 )
-        {
-            // Colinear, must overlap due to box check, intersect? 
-            if ( $debug ) echo "Intersecting, colinear<br>";
-            return( true );
-        }
-        else
-        {
-            // Parallel
-            if ( $debug ) echo "Not intersecting, parallel<br>";
-            return( false );
-        }
-    }
-    elseif ( !$dx1 ) // Line 1 is vertical
-    {
-        $y = ( $m2 * $line1[0]['x'] ) * $b2;
-        if ( $y >= $min_y1 && $y <= $max_y1 )
-        {
-            if ( $debug ) echo "Intersecting, at y $y<br>";
-            return( true );
-        }
-        else
-        {
-            if ( $debug ) echo "Not intersecting, out of range at y $y<br>";
-            return( false );
-        }
-    }
-    elseif ( !$dx2 ) // Line 2 is vertical
-    {
-        $y = ( $m1 * $line2[0]['x'] ) * $b1;
-        if ( $y >= $min_y2 && $y <= $max_y2 )
-        {
-            if ( $debug ) echo "Intersecting, at y $y<br>";
-            return( true );
-        }
-        else
-        {
-            if ( $debug ) echo "Not intersecting, out of range at y $y<br>";
-            return( false );
-        }
-    }
-    else // Both lines are vertical
-    {
-        if ( $line1[0]['x'] == $line2[0]['x'] )
-        {
-            // Colinear, must overlap due to box check, intersect? 
-            if ( $debug ) echo "Intersecting, vertical, colinear<br>";
-            return( true );
-        }
-        else
-        {
-            // Parallel
-            if ( $debug ) echo "Not intersecting, vertical, parallel<br>";
-            return( false );
-        }
-    }
-    if ( $debug ) echo "Whoops, unexpected scenario<br>";
-    return( false );
+  }
+  if ( $debug ) echo "Whoops, unexpected scenario<br>";
+  return( false );
 }
 
-function isSelfIntersecting( $points )
-{
-    global $debug;
+function isSelfIntersecting( $points ) {
+  global $debug;
 
-    $n_coords = count($points);
-    $edges = array();
-    for ( $j = 0, $i = $n_coords-1; $j < $n_coords; $i = $j++ )
-    {
-        $edges[] = array( $points[$i], $points[$j] );
-    }
+  $n_coords = count($points);
+  $edges = array();
+  for ( $j = 0, $i = $n_coords-1; $j < $n_coords; $i = $j++ ) {
+    $edges[] = array( $points[$i], $points[$j] );
+  }
 
-    for ( $i = 0; $i <= ($n_coords-2); $i++ )
-    {
-        for ( $j = $i+2; $j < $n_coords+min(0,$i-1); $j++ )
-        {
-            if ( $debug ) echo "Checking $i and $j<br>";
-            if ( linesIntersect( $edges[$i], $edges[$j] ) )
-            {
-                if ( $debug ) echo "Lines $i and $j intersect<br>";
-                return( true );
-            }
-        }
+  for ( $i = 0; $i <= ($n_coords-2); $i++ ) {
+    for ( $j = $i+2; $j < $n_coords+min(0,$i-1); $j++ ) {
+      if ( $debug ) echo "Checking $i and $j<br>";
+      if ( linesIntersect( $edges[$i], $edges[$j] ) ) {
+        if ( $debug ) echo "Lines $i and $j intersect<br>";
+        return( true );
+      }
     }
-    return( false );
+  }
+  return( false );
 }
 
-function getPolyCentre( $points, $area=0 )
-{
-    $cx = 0.0;
-    $cy = 0.0;
-    if ( !$area )
-        $area = getPolyArea( $points );
-    for ( $i = 0, $j = count($points)-1; $i < count($points); $j = $i++ )
-    {
-        $ct = ($points[$i]['x'] * $points[$j]['y']) - ($points[$j]['x'] * $points[$i]['y']);
-        $cx += ($points[$i]['x'] + $points[$j]['x']) * ct;
-        $cy += ($points[$i]['y'] + $points[$j]['y']) * ct;
-    }
-    $cx = intval(round(abs($cx/(6.0*$area))));
-    $cy = intval(round(abs($cy/(6.0*$area))));
-    printf( "X:%cx, Y:$cy<br>" );
-    return( array( 'x'=>$cx, 'y'=>$cy ) );
+function getPolyCentre( $points, $area=0 ) {
+  $cx = 0.0;
+  $cy = 0.0;
+  if ( !$area )
+    $area = getPolyArea( $points );
+  for ( $i = 0, $j = count($points)-1; $i < count($points); $j = $i++ ) {
+    $ct = ($points[$i]['x'] * $points[$j]['y']) - ($points[$j]['x'] * $points[$i]['y']);
+    $cx += ($points[$i]['x'] + $points[$j]['x']) * ct;
+    $cy += ($points[$i]['y'] + $points[$j]['y']) * ct;
+  }
+  $cx = intval(round(abs($cx/(6.0*$area))));
+  $cy = intval(round(abs($cy/(6.0*$area))));
+  printf( "X:%cx, Y:$cy<br>" );
+  return( array( 'x'=>$cx, 'y'=>$cy ) );
 }
 
-function _CompareXY( $a, $b )
-{
-    if ( $a['min_y'] == $b['min_y'] )
-        return( intval($a['min_x'] - $b['min_x']) );
-    else
-        return( intval($a['min_y'] - $b['min_y']) );
-}
-
-function _CompareX( $a, $b )
-{
+function _CompareXY( $a, $b ) {
+  if ( $a['min_y'] == $b['min_y'] )
     return( intval($a['min_x'] - $b['min_x']) );
+  else
+    return( intval($a['min_y'] - $b['min_y']) );
 }
 
-function getPolyArea( $points )
-{
-    global $debug;
+function _CompareX( $a, $b ) {
+  return( intval($a['min_x'] - $b['min_x']) );
+}
 
-    $n_coords = count($points);
-    $global_edges = array();
-    for ( $j = 0, $i = $n_coords-1; $j < $n_coords; $i = $j++ )
-    {
-        $x1 = $points[$i]['x'];
-        $x2 = $points[$j]['x'];
-        $y1 = $points[$i]['y'];
-        $y2 = $points[$j]['y'];
+function getPolyArea( $points ) {
+  global $debug;
 
-        //printf( "x1:%d,y1:%d x2:%d,y2:%d\n", x1, y1, x2, y2 );
-        if ( $y1 == $y2 )
-            continue;
+  $n_coords = count($points);
+  $global_edges = array();
+  for ( $j = 0, $i = $n_coords-1; $j < $n_coords; $i = $j++ ) {
+    $x1 = $points[$i]['x'];
+    $x2 = $points[$j]['x'];
+    $y1 = $points[$i]['y'];
+    $y2 = $points[$j]['y'];
 
-        $dx = $x2 - $x1;
-        $dy = $y2 - $y1;
+    //printf( "x1:%d,y1:%d x2:%d,y2:%d\n", x1, y1, x2, y2 );
+    if ( $y1 == $y2 )
+      continue;
 
-        $global_edges[] = array(
-            "min_y" => $y1<$y2?$y1:$y2,
-            "max_y" => ($y1<$y2?$y2:$y1)+1,
-            "min_x" => $y1<$y2?$x1:$x2,
-            "_1_m" => $dx/$dy,
+    $dx = $x2 - $x1;
+    $dy = $y2 - $y1;
+
+    $global_edges[] = array(
+        "min_y" => $y1<$y2?$y1:$y2,
+        "max_y" => ($y1<$y2?$y2:$y1)+1,
+        "min_x" => $y1<$y2?$x1:$x2,
+        "_1_m" => $dx/$dy,
         );
+  }
+
+  usort( $global_edges, "_CompareXY" );
+
+  if ( $debug ) {
+    for ( $i = 0; $i < count($global_edges); $i++ ) {
+      printf( "%d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f<br>", $i, $global_edges[$i]['min_y'], $global_edges[$i]['max_y'], $global_edges[$i]['min_x'], $global_edges[$i]['_1_m'] );
     }
+  }
 
-    usort( $global_edges, "_CompareXY" );
-
-    if ( $debug )
-    {
-        for ( $i = 0; $i < count($global_edges); $i++ )
-        {
-            printf( "%d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f<br>", $i, $global_edges[$i]['min_y'], $global_edges[$i]['max_y'], $global_edges[$i]['min_x'], $global_edges[$i]['_1_m'] );
-        }
+  $area = 0.0;
+  $active_edges = array();
+  $y = $global_edges[0]['min_y'];
+  do {
+    for ( $i = 0; $i < count($global_edges); $i++ ) {
+      if ( $global_edges[$i]['min_y'] == $y ) {
+        if ( $debug ) printf( "Moving global edge<br>" );
+        $active_edges[] = $global_edges[$i];
+        array_splice( $global_edges, $i, 1 );
+        $i--;
+      } else {
+        break;
+      }
     }
-
-    $area = 0.0;
-    $active_edges = array();
-    $y = $global_edges[0]['min_y'];
-    do 
-    {
-        for ( $i = 0; $i < count($global_edges); $i++ )
-        {
-            if ( $global_edges[$i]['min_y'] == $y )
-            {
-                if ( $debug ) printf( "Moving global edge<br>" );
-                $active_edges[] = $global_edges[$i];
-                array_splice( $global_edges, $i, 1 );
-                $i--;
-            }
-            else
-            {
-                break;
-            }
-        }
-        usort( $active_edges, "_CompareX" );
-        if ( $debug )
-        {
-            for ( $i = 0; $i < count($active_edges); $i++ )
-            {
-                printf( "%d - %d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f<br>", $y, $i, $active_edges[$i]['min_y'], $active_edges[$i]['max_y'], $active_edges[$i]['min_x'], $active_edges[$i]['_1_m'] );
-            }
-        }
-        $last_x = 0;
-        $row_area = 0;
-        $parity = false;
-        for ( $i = 0; $i < count($active_edges); $i++ )
-        {
-            $x = intval(round($active_edges[$i]['min_x']));
-            if ( $parity )
-            {
-                $row_area += ($x - $last_x)+1;
-                $area += $row_area;
-            }
-            if ( $active_edges[$i]['max_y'] != $y )
-                $parity = !$parity;
-            $last_x = $x;
-        }
-        if ( $debug ) printf( "%d: Area:%d<br>", $y, $row_area );
-        $y++;
-        for ( $i = 0; $i < count($active_edges); $i++ )
-        {
-            if ( $y >= $active_edges[$i]['max_y'] ) // Or >= as per sheets
-            {
-                if ( $debug ) printf( "Deleting active_edge<br>" );
-                array_splice( $active_edges, $i, 1 );
-                $i--;
-            }
-            else
-            {
-                $active_edges[$i]['min_x'] += $active_edges[$i]['_1_m'];
-            }
-        }
-    } while ( count($global_edges) || count($active_edges) );
-    if ( $debug ) printf( "Area:%d<br>", $area );
-    return( $area );
+    usort( $active_edges, "_CompareX" );
+    if ( $debug ) {
+      for ( $i = 0; $i < count($active_edges); $i++ ) {
+        printf( "%d - %d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f<br>", $y, $i, $active_edges[$i]['min_y'], $active_edges[$i]['max_y'], $active_edges[$i]['min_x'], $active_edges[$i]['_1_m'] );
+      }
+    }
+    $last_x = 0;
+    $row_area = 0;
+    $parity = false;
+    for ( $i = 0; $i < count($active_edges); $i++ ) {
+      $x = intval(round($active_edges[$i]['min_x']));
+      if ( $parity ) {
+        $row_area += ($x - $last_x)+1;
+        $area += $row_area;
+      }
+      if ( $active_edges[$i]['max_y'] != $y )
+        $parity = !$parity;
+      $last_x = $x;
+    }
+    if ( $debug ) printf( "%d: Area:%d<br>", $y, $row_area );
+    $y++;
+    for ( $i = 0; $i < count($active_edges); $i++ ) {
+      if ( $y >= $active_edges[$i]['max_y'] ) { // Or >= as per sheets
+        if ( $debug ) printf( "Deleting active_edge<br>" );
+        array_splice( $active_edges, $i, 1 );
+        $i--;
+      } else {
+        $active_edges[$i]['min_x'] += $active_edges[$i]['_1_m'];
+      }
+    }
+  } while ( count($global_edges) || count($active_edges) );
+  if ( $debug ) printf( "Area:%d<br>", $area );
+  return( $area );
 }
 
-function getPolyAreaOld( $points )
-{
-    $area = 0.0;
-    $edge = 0.0;
-    for ( $i = 0, $j = count($points)-1; $i < count($points); $j = $i++ )
-    {
-        $x_diff = ($points[$i]['x'] - $points[$j]['x']);
-        $y_diff = ($points[$i]['y'] - $points[$j]['y']);
-        $y_sum = ($points[$i]['y'] + $points[$j]['y']);
-        $trap_edge = sqrt(pow(abs($x_diff)+1,2) + pow(abs($y_diff)+1,2) );
-        $edge += $trap_edge;
-        $trap_area = ($x_diff * $y_sum );
-        $area += $trap_area;
-        printf( "%d->%d, %d-%d=%.2f, %d+%d=%.2f(%.2f), %.2f, %.2f<br>", i, j, $points[$i]['x'], $points[$j]['x'], $x_diff, $points[$i]['y'], $points[$j]['y'], $y_sum, $y_diff, $trap_area, $trap_edge );
-    }
-    $edge = intval(round(abs($edge)));
-    $area = intval(round((abs($area)+$edge)/2));
-    echo "E:$edge<br>";
-    echo "A:$area<br>";
-    return( $area );
+function getPolyAreaOld( $points ) {
+  $area = 0.0;
+  $edge = 0.0;
+  for ( $i = 0, $j = count($points)-1; $i < count($points); $j = $i++ ) {
+    $x_diff = ($points[$i]['x'] - $points[$j]['x']);
+    $y_diff = ($points[$i]['y'] - $points[$j]['y']);
+    $y_sum = ($points[$i]['y'] + $points[$j]['y']);
+    $trap_edge = sqrt(pow(abs($x_diff)+1,2) + pow(abs($y_diff)+1,2) );
+    $edge += $trap_edge;
+    $trap_area = ($x_diff * $y_sum );
+    $area += $trap_area;
+    printf( "%d->%d, %d-%d=%.2f, %d+%d=%.2f(%.2f), %.2f, %.2f<br>", i, j, $points[$i]['x'], $points[$j]['x'], $x_diff, $points[$i]['y'], $points[$j]['y'], $y_sum, $y_diff, $trap_area, $trap_edge );
+  }
+  $edge = intval(round(abs($edge)));
+  $area = intval(round((abs($area)+$edge)/2));
+  echo "E:$edge<br>";
+  echo "A:$area<br>";
+  return( $area );
 }
 
-function mapCoords( $a )
-{
-    return( $a['x'].",".$a['y'] );
+function mapCoords( $a ) {
+  return( $a['x'].",".$a['y'] );
 }
 
-function pointsToCoords( $points )
-{
-    return( join( " ", array_map( "mapCoords", $points ) ) );
+function pointsToCoords( $points ) {
+  return( join( " ", array_map( "mapCoords", $points ) ) );
 }
 
-function coordsToPoints( $coords )
-{
-    $points = array();
-    if ( preg_match_all( '/(\d+,\d+)+/', $coords, $matches ) )
-    {
-        for ( $i = 0; $i < count($matches[1]); $i++ )
-        {
-            if ( preg_match( '/(\d+),(\d+)/', $matches[1][$i], $cmatches ) )
-            {
-                $points[] = array( 'x'=>$cmatches[1], 'y'=>$cmatches[2] );
-            }
-            else
-            {
-                echo( "Bogus coordinates '".$matches[$i]."'" );
-                return( false );
-            }
-        }
-    }
-    else
-    {
-        echo( "Bogus coordinate string '$coords'" );
+function coordsToPoints( $coords ) {
+  $points = array();
+  if ( preg_match_all( '/(\d+,\d+)+/', $coords, $matches ) ) {
+    for ( $i = 0; $i < count($matches[1]); $i++ ) {
+      if ( preg_match( '/(\d+),(\d+)/', $matches[1][$i], $cmatches ) ) {
+        $points[] = array( 'x'=>$cmatches[1], 'y'=>$cmatches[2] );
+      } else {
+        echo( "Bogus coordinates '".$matches[$i]."'" );
         return( false );
+      }
     }
-    return( $points );
+  } else {
+    echo( "Bogus coordinate string '$coords'" );
+    return( false );
+  }
+  return( $points );
 }
 
-function getLanguages()
-{
-    $langs = array();
-    foreach ( glob("lang/*_*.php") as $file )
-    {
-        preg_match( '/([^\/]+_.+)\.php/', $file, $matches );
-        $langs[$matches[1]] = $matches[1];
+function getLanguages() {
+  $langs = array();
+  foreach ( glob("lang/*_*.php") as $file ) {
+    preg_match( '/([^\/]+_.+)\.php/', $file, $matches );
+    $langs[$matches[1]] = $matches[1];
+  }
+  return( $langs );
+}
+
+function trimString( $string, $length ) {
+  return( preg_replace( '/^(.{'.$length.',}?)\b.*$/', '\\1&hellip;', $string ) );
+}
+
+function monitorIdsToNames( $ids ) {
+  global $mITN_monitors;
+  if ( !$mITN_monitors ) {
+    $sql = "select Id, Name from Monitors";
+    foreach( dbFetchAll( $sql ) as $monitor ) {
+      $mITN_monitors[$monitor['Id']] = $monitor;
     }
-    return( $langs );
-}
-
-function trimString( $string, $length )
-{
-    return( preg_replace( '/^(.{'.$length.',}?)\b.*$/', '\\1&hellip;', $string ) );
-}
-
-function monitorIdsToNames( $ids )
-{
-    global $mITN_monitors;
-    if ( !$mITN_monitors )
-    {
-        $sql = "select Id, Name from Monitors";
-        foreach( dbFetchAll( $sql ) as $monitor )
-        {
-            $mITN_monitors[$monitor['Id']] = $monitor;
-        }
+  }
+  $names = array();
+  foreach ( preg_split( '/\s*,\s*/', $ids ) as $id ) {
+    if ( visibleMonitor( $id ) ) {
+      if ( isset($mITN_monitors[$id]) ) {
+        $names[] = $mITN_monitors[$id]['Name'];
+      }
     }
-    $names = array();
-    foreach ( preg_split( '/\s*,\s*/', $ids ) as $id )
-    {
-        if ( visibleMonitor( $id ) )
-        {
-            if ( isset($mITN_monitors[$id]) )
-            {
-                $names[] = $mITN_monitors[$id]['Name'];
-            }
-        }
-    }
-    $name_string = join( ', ', $names );
-    return( $name_string );
+  }
+  $name_string = join( ', ', $names );
+  return( $name_string );
 }
 
-function initX10Status()
-{
-    global $x10_status;
+function initX10Status() {
+  global $x10_status;
 
-    if ( !isset($x10_status) )
-    {
-        $socket = socket_create( AF_UNIX, SOCK_STREAM, 0 );
-        if ( $socket < 0 )
-        {
-            Fatal( "socket_create() failed: ".socket_strerror($socket) );
-        }
-        $sock_file = ZM_PATH_SOCKS.'/zmx10.sock';
-        if ( @socket_connect( $socket, $sock_file ) )
-        {
-            $command = "status";
-            if ( !socket_write( $socket, $command ) )
-            {
-                Fatal( "Can't write to control socket: ".socket_strerror(socket_last_error($socket)) );
-            }
-            socket_shutdown( $socket, 1 );
-            $x10Output = "";
-            while ( $x10Response = socket_read( $socket, 256 ) )
-            {
-                $x10Output .= $x10Response;
-            }
-            socket_close( $socket );
-        }
-        else
-        {
-            // Can't connect so use script
-            $command = ZM_PATH_BIN."/zmx10.pl --command status";
-            //$command .= " 2>/dev/null >&- <&- >/dev/null";
-
-            $x10Output = exec( escapeshellcmd( $command ) );
-        }
-        foreach ( explode( "\n", $x10Output ) as $x10Response )
-        {
-            if ( preg_match( "/^(\d+)\s+(.+)$/", $x10Response, $matches ) )
-            {
-                $x10_status[$matches[1]] = $matches[2];
-            }
-        }
-    }
-}
-
-function getDeviceStatusX10( $key )
-{
-    global $x10_status;
-
-    initX10Status();
-
-    if ( empty($x10_status[$key]) || !($status = $x10_status[$key]) )
-        $status = "unknown";
-    return( $status );
-}
-
-function setDeviceStatusX10( $key, $status )
-{
+  if ( !isset($x10_status) ) {
     $socket = socket_create( AF_UNIX, SOCK_STREAM, 0 );
-    if ( $socket < 0 )
-    {
-        Fatal( "socket_create() failed: ".socket_strerror($socket) );
+    if ( $socket < 0 ) {
+      Fatal( "socket_create() failed: ".socket_strerror($socket) );
     }
     $sock_file = ZM_PATH_SOCKS.'/zmx10.sock';
-    if ( @socket_connect( $socket, $sock_file ) )
-    {
-        $command = "$status;$key";
-        if ( !socket_write( $socket, $command ) )
-        {
-            Fatal( "Can't write to control socket: ".socket_strerror(socket_last_error($socket)) );
-        }
-        socket_shutdown( $socket, 1 );
-        $x10Response = socket_read( $socket, 256 );
-        socket_close( $socket );
+    if ( @socket_connect( $socket, $sock_file ) ) {
+      $command = "status";
+      if ( !socket_write( $socket, $command ) ) {
+        Fatal( "Can't write to control socket: ".socket_strerror(socket_last_error($socket)) );
+      }
+      socket_shutdown( $socket, 1 );
+      $x10Output = "";
+      while ( $x10Response = socket_read( $socket, 256 ) ) {
+        $x10Output .= $x10Response;
+      }
+      socket_close( $socket );
+    } else {
+      // Can't connect so use script
+      $command = ZM_PATH_BIN."/zmx10.pl --command status";
+      //$command .= " 2>/dev/null >&- <&- >/dev/null";
+
+      $x10Output = exec( escapeshellcmd( $command ) );
     }
-    else
-    {
-        // Can't connect so use script
-        $command = ZM_PATH_BIN.'/zmx10.pl --command '.escapeshellarg( $status );
-        $command .= ' --unit-code '.escapeshellarg( $key );
-        //$command .= " 2>/dev/null >&- <&- >/dev/null";
-        $x10Response = exec( $command );
+    foreach ( explode( "\n", $x10Output ) as $x10Response ) {
+      if ( preg_match( "/^(\d+)\s+(.+)$/", $x10Response, $matches ) ) {
+        $x10_status[$matches[1]] = $matches[2];
+      }
     }
-    if ( preg_match( '/^'.$key.'\s+(.*)/', $x10Response, $matches ) )
-        $status = $matches[1];
-    else
-        $status = "unknown";
-    return( $status );
+  }
 }
 
-function logState()
-{
-    $state = 'ok';
+function getDeviceStatusX10( $key ) {
+  global $x10_status;
 
-    $levelCounts = array(
-        Logger::FATAL => array( ZM_LOG_ALERT_FAT_COUNT, ZM_LOG_ALARM_FAT_COUNT ),
-        Logger::ERROR => array( ZM_LOG_ALERT_ERR_COUNT, ZM_LOG_ALARM_ERR_COUNT ),
-        Logger::WARNING => array( ZM_LOG_ALERT_WAR_COUNT, ZM_LOG_ALARM_WAR_COUNT ),
-    );
+  initX10Status();
 
-    $sql = "select Level, count(Level) as LevelCount from Logs where Level < ".Logger::INFO." and TimeKey > unix_timestamp(now() - interval ".ZM_LOG_CHECK_PERIOD." second) group by Level order by Level asc";
-    $counts = dbFetchAll( $sql );
-
-    foreach ( $counts as $count )
-    {
-        if ( $count['Level'] <= Logger::PANIC )
-            $count['Level'] = Logger::FATAL;
-        if ( !($levelCount = $levelCounts[$count['Level']]) )
-        {
-            Error( "Unexpected Log level ".$count['Level'] );
-            next;
-        }
-        if ( $levelCount[1] && $count['LevelCount'] >= $levelCount[1] )
-        {
-            $state = 'alarm';
-            break;
-        }
-        elseif ( $levelCount[0] && $count['LevelCount'] >= $levelCount[0] )
-        {
-            $state = 'alert';
-        }
-    }
-    return( $state );
+  if ( empty($x10_status[$key]) || !($status = $x10_status[$key]) )
+    $status = "unknown";
+  return( $status );
 }
 
-function isVector ( &$array )
-{
-    $next_key = 0;
-    foreach ( array_keys($array) as $key )
-    {
-        if ( !is_int( $key ) )
-            return( false );
-        if ( $key != $next_key++ )
-            return( false );
+function setDeviceStatusX10( $key, $status ) {
+  $socket = socket_create( AF_UNIX, SOCK_STREAM, 0 );
+  if ( $socket < 0 ) {
+    Fatal( "socket_create() failed: ".socket_strerror($socket) );
+  }
+  $sock_file = ZM_PATH_SOCKS.'/zmx10.sock';
+  if ( @socket_connect( $socket, $sock_file ) ) {
+    $command = "$status;$key";
+    if ( !socket_write( $socket, $command ) ) {
+      Fatal( "Can't write to control socket: ".socket_strerror(socket_last_error($socket)) );
     }
-    return( true );
+    socket_shutdown( $socket, 1 );
+    $x10Response = socket_read( $socket, 256 );
+    socket_close( $socket );
+  } else {
+    // Can't connect so use script
+    $command = ZM_PATH_BIN.'/zmx10.pl --command '.escapeshellarg( $status );
+    $command .= ' --unit-code '.escapeshellarg( $key );
+    //$command .= " 2>/dev/null >&- <&- >/dev/null";
+    $x10Response = exec( $command );
+  }
+  if ( preg_match( '/^'.$key.'\s+(.*)/', $x10Response, $matches ) )
+    $status = $matches[1];
+  else
+    $status = "unknown";
+  return( $status );
 }
 
-function checkJsonError($value)
-{
-    if ( function_exists('json_last_error') )
-    {
-        $value = var_export($value,true);
-        switch( json_last_error() )
-        {
-            case JSON_ERROR_DEPTH :
-                Fatal( "Unable to decode JSON string '$value', maximum stack depth exceeded" );
-            case JSON_ERROR_CTRL_CHAR :
-                Fatal( "Unable to decode JSON string '$value', unexpected control character found" );
-            case JSON_ERROR_STATE_MISMATCH :
-                Fatal( "Unable to decode JSON string '$value', invalid or malformed JSON" );
-            case JSON_ERROR_SYNTAX :
-                Fatal( "Unable to decode JSON string '$value', syntax error" );
-            default :
-                Fatal( "Unable to decode JSON string '$value', unexpected error ".json_last_error() );
-            case JSON_ERROR_NONE:
-                break;
-        }
+function logState() {
+  $state = 'ok';
+
+  $levelCounts = array(
+      Logger::FATAL => array( ZM_LOG_ALERT_FAT_COUNT, ZM_LOG_ALARM_FAT_COUNT ),
+      Logger::ERROR => array( ZM_LOG_ALERT_ERR_COUNT, ZM_LOG_ALARM_ERR_COUNT ),
+      Logger::WARNING => array( ZM_LOG_ALERT_WAR_COUNT, ZM_LOG_ALARM_WAR_COUNT ),
+      );
+
+  $sql = "select Level, count(Level) as LevelCount from Logs where Level < ".Logger::INFO." and TimeKey > unix_timestamp(now() - interval ".ZM_LOG_CHECK_PERIOD." second) group by Level order by Level asc";
+  $counts = dbFetchAll( $sql );
+
+  foreach ( $counts as $count ) {
+    if ( $count['Level'] <= Logger::PANIC )
+      $count['Level'] = Logger::FATAL;
+    if ( !($levelCount = $levelCounts[$count['Level']]) ) {
+      Error( "Unexpected Log level ".$count['Level'] );
+      next;
     }
+    if ( $levelCount[1] && $count['LevelCount'] >= $levelCount[1] ) {
+      $state = 'alarm';
+      break;
+    } elseif ( $levelCount[0] && $count['LevelCount'] >= $levelCount[0] ) {
+      $state = 'alert';
+    }
+  }
+  return( $state );
 }
 
-function jsonEncode( &$value )
-{
-    if ( function_exists('json_encode') )
-    {
-        $string = json_encode( $value );
-        checkJsonError($value);
-        return( $string );
-    }
-
-    switch ( gettype($value) )
-    {
-        case 'double':
-        case 'integer':
-            return( $value );
-        case 'boolean':
-            return( $value?'true':'false' );
-        case 'string':
-            return( '"'.preg_replace( "/\r?\n/", '\\n', addcslashes($value,'"\\/') ).'"' );
-        case 'NULL':
-            return( 'null' );
-        case 'object':
-            return( '"Object '.addcslashes(get_class($value),'"\\/').'"' );
-        case 'array':
-            if ( isVector( $value ) )
-                return( '['.join( ',', array_map( 'jsonEncode', $value) ).']' );
-            else
-            {
-                $result = '{';
-                foreach ($value as $subkey => $subvalue )
-                {
-                    if ( $result != '{' )
-                        $result .= ',';
-                    $result .= '"'.$subkey.'":'.jsonEncode( $subvalue );
-                }
-                return( $result.'}' );
-            }
-        default:
-            return( '"'.addcslashes(gettype($value),'"\\/').'"' );
-    }
+function isVector ( &$array ) {
+  $next_key = 0;
+  foreach ( array_keys($array) as $key ) {
+    if ( !is_int( $key ) )
+      return( false );
+    if ( $key != $next_key++ )
+      return( false );
+  }
+  return( true );
 }
 
-function jsonDecode( $value )
-{
-    if ( function_exists('json_decode') )
-    {
-        $object = json_decode( $value, true );
-        checkJsonError($value);
-        return( $object );
+function checkJsonError($value) {
+  if ( function_exists('json_last_error') ) {
+    $value = var_export($value,true);
+    switch( json_last_error() ) {
+      case JSON_ERROR_DEPTH :
+        Fatal( "Unable to decode JSON string '$value', maximum stack depth exceeded" );
+      case JSON_ERROR_CTRL_CHAR :
+        Fatal( "Unable to decode JSON string '$value', unexpected control character found" );
+      case JSON_ERROR_STATE_MISMATCH :
+        Fatal( "Unable to decode JSON string '$value', invalid or malformed JSON" );
+      case JSON_ERROR_SYNTAX :
+        Fatal( "Unable to decode JSON string '$value', syntax error" );
+      default :
+        Fatal( "Unable to decode JSON string '$value', unexpected error ".json_last_error() );
+      case JSON_ERROR_NONE:
+        break;
     }
+  }
+}
 
-    $comment = false;
-    $unescape = false;
-    $out = '$result=';
-    for ( $i = 0; $i < strlen($value); $i++ )
-    {
-        if ( !$comment )
-        {
-            if ( ($value[$i] == '{') || ($value[$i] == '[') )
-                $out .= ' array(';
-            else if ( ($value[$i] == '}') || ($value[$i] == ']') )
-                $out .= ')';
-            else if ( $value[$i] == ':' )
-                $out .= '=>';
-            else
-                $out .= $value[$i];         
+function jsonEncode( &$value ) {
+  if ( function_exists('json_encode') ) {
+    $string = json_encode( $value );
+    checkJsonError($value);
+    return( $string );
+  }
+
+  switch ( gettype($value) ) {
+    case 'double':
+    case 'integer':
+      return( $value );
+    case 'boolean':
+      return( $value?'true':'false' );
+    case 'string':
+      return( '"'.preg_replace( "/\r?\n/", '\\n', addcslashes($value,'"\\/') ).'"' );
+    case 'NULL':
+      return( 'null' );
+    case 'object':
+      return( '"Object '.addcslashes(get_class($value),'"\\/').'"' );
+    case 'array':
+      if ( isVector( $value ) )
+        return( '['.join( ',', array_map( 'jsonEncode', $value) ).']' );
+      else {
+        $result = '{';
+        foreach ($value as $subkey => $subvalue ) {
+          if ( $result != '{' )
+            $result .= ',';
+          $result .= '"'.$subkey.'":'.jsonEncode( $subvalue );
         }
-        else if ( !$unescape )
-        {
-            if ( $value[$i] == '\\' )
-                $unescape = true;
-            else
-                $out .= $value[$i];
-        }
-        else
-        {
-            if ( $value[$i] != '/' )
-                $out .= '\\';
-            $out .= $value[$i];
-            $unescape = false;
-        }
-        if ( $value[$i] == '"' )
-            $comment = !$comment;
+        return( $result.'}' );
+      }
+    default:
+      return( '"'.addcslashes(gettype($value),'"\\/').'"' );
+  }
+}
+
+function jsonDecode( $value ) {
+  if ( function_exists('json_decode') ) {
+    $object = json_decode( $value, true );
+    checkJsonError($value);
+    return( $object );
+  }
+
+  $comment = false;
+  $unescape = false;
+  $out = '$result=';
+  for ( $i = 0; $i < strlen($value); $i++ ) {
+    if ( !$comment ) {
+      if ( ($value[$i] == '{') || ($value[$i] == '[') ) {
+        $out .= ' array(';
+      } else if ( ($value[$i] == '}') || ($value[$i] == ']') ) {
+        $out .= ')';
+      } else if ( $value[$i] == ':' ) {
+        $out .= '=>';
+      } else {
+        $out .= $value[$i];         
+      }
+    } else if ( !$unescape ) {
+      if ( $value[$i] == '\\' )
+        $unescape = true;
+      else
+        $out .= $value[$i];
+    } else {
+      if ( $value[$i] != '/' )
+        $out .= '\\';
+      $out .= $value[$i];
+      $unescape = false;
     }
-    eval( $out.';' );
-    return( $result );
+    if ( $value[$i] == '"' ) {
+      $comment = !$comment;
+    }
+  }
+  eval( $out.';' );
+  return( $result );
 }
 
 define( 'HTTP_STATUS_OK', 200 );
 define( 'HTTP_STATUS_BAD_REQUEST', 400 );
 define( 'HTTP_STATUS_FORBIDDEN', 403 );
 
-function ajaxError( $message, $code=HTTP_STATUS_OK )
-{
-    Error( $message );
-    if ( function_exists( 'ajaxCleanup' ) )
-        ajaxCleanup();
-    if ( $code == HTTP_STATUS_OK )
-    {
-        $response = array( 'result'=>'Error', 'message'=>$message );
-        header( "Content-type: text/plain" );
-        exit( jsonEncode( $response ) );
-    }
-    header( "HTTP/1.0 $code $message" );
-    exit();
-}
-
-function ajaxResponse( $result=false )
-{
-    if ( function_exists( 'ajaxCleanup' ) )
-        ajaxCleanup();
-    $response = array( 'result'=>'Ok' );
-    if ( is_array( $result ) )
-        $response = array_merge( $response, $result );
-    elseif ( !empty($result) )
-        $response['message'] = $result;
+function ajaxError( $message, $code=HTTP_STATUS_OK ) {
+  Error( $message );
+  if ( function_exists( 'ajaxCleanup' ) )
+    ajaxCleanup();
+  if ( $code == HTTP_STATUS_OK ) {
+    $response = array( 'result'=>'Error', 'message'=>$message );
     header( "Content-type: text/plain" );
     exit( jsonEncode( $response ) );
+  }
+  header( "HTTP/1.0 $code $message" );
+  exit();
 }
 
-function generateConnKey()
-{
-    return( rand( 1, 999999 ) );
+function ajaxResponse( $result=false ) {
+  if ( function_exists( 'ajaxCleanup' ) )
+    ajaxCleanup();
+  $response = array( 'result'=>'Ok' );
+  if ( is_array( $result ) )
+    $response = array_merge( $response, $result );
+  elseif ( !empty($result) )
+    $response['message'] = $result;
+  header( "Content-type: text/plain" );
+  exit( jsonEncode( $response ) );
 }
 
-function detaintPath( $path )
-{
-    // Remove any absolute paths, or relative ones that want to go up
-    $path = preg_replace( '/\.(?:\.+[\\/][\\/]*)+/', '', $path );
-    $path = preg_replace( '/^[\\/]+/', '', $path );
-    return( $path );
+function generateConnKey() {
+  return( rand( 1, 999999 ) );
 }
 
-function getSkinFile( $file )
-{
-    global $skinBase;
-    $skinFile = false;
-    foreach ( $skinBase as $skin )
-    {
-        $tempSkinFile = detaintPath( 'skins'.'/'.$skin.'/'.$file );
-        if ( file_exists( $tempSkinFile ) )
-            $skinFile = $tempSkinFile;
-    }
-    return( $skinFile );
+function detaintPath( $path ) {
+  // Remove any absolute paths, or relative ones that want to go up
+  $path = preg_replace( '/\.(?:\.+[\\/][\\/]*)+/', '', $path );
+  $path = preg_replace( '/^[\\/]+/', '', $path );
+  return( $path );
+}
+
+function getSkinFile( $file ) {
+  global $skinBase;
+  $skinFile = false;
+  foreach ( $skinBase as $skin ) {
+    $tempSkinFile = detaintPath( 'skins'.'/'.$skin.'/'.$file );
+    if ( file_exists( $tempSkinFile ) )
+      $skinFile = $tempSkinFile;
+  }
+  return( $skinFile );
 }
 
 function getSkinIncludes( $file, $includeBase=false, $asOverride=false )
 {
-    global $skinBase;
-    $skinFile = false;
-    foreach ( $skinBase as $skin )
-    {
-        $tempSkinFile = detaintPath( 'skins'.'/'.$skin.'/'.$file );
-        if ( file_exists( $tempSkinFile ) )
-            $skinFile = $tempSkinFile;
-    }
-    $includeFiles = array();
-    if ( $asOverride )
-    {
-        if ( $skinFile )
-            $includeFiles[] = $skinFile;
-        else if ( $includeBase )
-            $includeFiles[] = $file;
-    }
-    else
-    {
-        if ( $includeBase )
-            $includeFiles[] = $file;
-        if ( $skinFile )
-            $includeFiles[] = $skinFile;
-    }
-    return( $includeFiles );
+  global $skinBase;
+  $skinFile = false;
+  foreach ( $skinBase as $skin ) {
+    $tempSkinFile = detaintPath( 'skins'.'/'.$skin.'/'.$file );
+    if ( file_exists( $tempSkinFile ) )
+      $skinFile = $tempSkinFile;
+  }
+  $includeFiles = array();
+  if ( $asOverride ) {
+    if ( $skinFile )
+      $includeFiles[] = $skinFile;
+    else if ( $includeBase )
+      $includeFiles[] = $file;
+  } else {
+    if ( $includeBase )
+      $includeFiles[] = $file;
+    if ( $skinFile )
+      $includeFiles[] = $skinFile;
+  }
+  return( $includeFiles );
 }
 
-function requestVar( $name, $default="" )
-{
-    return( isset($_REQUEST[$name])?validHtmlStr($_REQUEST[$name]):$default );
+function requestVar( $name, $default="" ) {
+  return( isset($_REQUEST[$name])?validHtmlStr($_REQUEST[$name]):$default );
 }
 
 // For numbers etc in javascript or tags etc
-function validInt( $input )
-{
-    return( preg_replace( '/\D/', '', $input ) );
+function validInt( $input ) {
+  return( preg_replace( '/\D/', '', $input ) );
 }
 
-function validNum( $input )
-{
-    return( preg_replace( '/[^\d.-]/', '', $input ) );
+function validNum( $input ) {
+  return( preg_replace( '/[^\d.-]/', '', $input ) );
 }
 
 // For general strings
-function validStr( $input )
-{
-    return( strip_tags( $input ) );
+function validStr( $input ) {
+  return( strip_tags( $input ) );
 }
 
 // For strings in javascript or tags etc, expected to be in quotes so further quotes escaped rather than converted
-function validJsStr( $input )
-{
-    return( strip_tags( addslashes( $input ) ) );
+function validJsStr( $input ) {
+  return( strip_tags( addslashes( $input ) ) );
 }
 
 // For general text in pages outside of tags or quotes so quotes converted to entities
-function validHtmlStr( $input )
-{
-    return( htmlspecialchars( $input, ENT_QUOTES ) );
+function validHtmlStr( $input ) {
+  return( htmlspecialchars( $input, ENT_QUOTES ) );
 }
 
 function getStreamHTML( $monitor, $scale=100 ) {
-//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 ) );
-        outputVideoStream( "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() )
-            outputImageStream( "liveStream", $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() );
-        elseif ( canStreamApplet() )
-            outputHelperStream( "liveStream", $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() );
-    } else {
-        $streamSrc = $monitor->getStreamSrc( array( 'mode=single', "scale=".$scale ) );
-        outputImageStill( "liveStream", $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() );
-        Info( "The system has fallen back to single jpeg mode for streaming. Consider enabling Cambozola or upgrading the client browser.");
-    }
+  //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 ) );
+    outputVideoStream( "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() )
+      outputImageStream( "liveStream", $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() );
+    elseif ( canStreamApplet() )
+      outputHelperStream( "liveStream", $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() );
+  } else {
+    $streamSrc = $monitor->getStreamSrc( array( 'mode=single', "scale=".$scale ) );
+    outputImageStill( "liveStream", $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() );
+    Info( "The system has fallen back to single jpeg mode for streaming. Consider enabling Cambozola or upgrading the client browser.");
+  }
 } // end function getStreamHTML
 
 ?>

From 8cb2692bbbb695421024ff7eebb57dcdb1b5635f Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Fri, 13 May 2016 11:09:12 -0400
Subject: [PATCH 32/49] pass in the server url into the monitor object to use
 instead of the portal url

---
 web/skins/classic/views/js/montage.js     | 11 ++++++-----
 web/skins/classic/views/js/montage.js.php |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js
index 1367bc8b1..a6c459760 100644
--- a/web/skins/classic/views/js/montage.js
+++ b/web/skins/classic/views/js/montage.js
@@ -1,10 +1,11 @@
 var requestQueue = new Request.Queue( { concurrent: 2 } );
 
-function Monitor( index, id, connKey )
+function Monitor( index, monitorData )
 {
     this.index = index;
-    this.id = id;
-    this.connKey = connKey;
+    this.id = monitorData.id;
+    this.connKey = monitorData.connKey;
+    this.server_url = monitorData.server_url;
     this.status = null;
     this.alarmState = STATE_IDLE;
     this.lastAlarmState = STATE_IDLE;
@@ -110,7 +111,7 @@ function Monitor( index, id, connKey )
         this.streamCmdReq.send( this.streamCmdParms+"&command="+CMD_QUERY );
     }
 
-    this.streamCmdReq = new Request.JSON( { url: thisUrl, method: 'post', timeout: AJAX_TIMEOUT, onSuccess: this.getStreamCmdResponse.bind( this ), onTimeout: this.streamCmdQuery.bind( this, true ), link: 'cancel' } );
+    this.streamCmdReq = new Request.JSON( { url: this.server_url, method: 'get', timeout: AJAX_TIMEOUT, onSuccess: this.getStreamCmdResponse.bind( this ), onTimeout: this.streamCmdQuery.bind( this, true ), link: 'cancel' } );
 
     requestQueue.addRequest( "cmdReq"+this.id, this.streamCmdReq );
 }
@@ -146,7 +147,7 @@ function initPage()
 {
     for ( var i = 0; i < monitorData.length; i++ )
     {
-        monitors[i] = new Monitor( i, monitorData[i].id, monitorData[i].connKey );
+        monitors[i] = new Monitor( i, monitorData[i] );
         var delay = Math.round( (Math.random()+0.5)*statusRefreshTimeout );
         monitors[i].start( delay );
     }
diff --git a/web/skins/classic/views/js/montage.js.php b/web/skins/classic/views/js/montage.js.php
index 80f652fd5..7eaebb75b 100644
--- a/web/skins/classic/views/js/montage.js.php
+++ b/web/skins/classic/views/js/montage.js.php
@@ -35,7 +35,8 @@ monitorData[monitorData.length] = {
 	'id': <?php echo $monitor->Id() ?>, 
 	'connKey': <?php echo $monitor->connKey() ?>, 
 	'width': <?php echo $monitor->Width() ?>,
-	'height':<?php echo $monitor->Height() ?>
+	'height':<?php echo $monitor->Height() ?>,
+  'server_url': '<?php echo $monitor->Server()->Url().$_SERVER['PHP_SELF'] ?>'
 };
 <?php
 }

From 5df85770cd305f42936055c2e27a2a59dd1fba98 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@ubuntu1204.connortechnology.com>
Date: Fri, 13 May 2016 13:52:34 -0400
Subject: [PATCH 33/49] zmupdate.pl.in

---
 scripts/zmupdate.pl.in | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/scripts/zmupdate.pl.in b/scripts/zmupdate.pl.in
index 3143b2d50..be1d309c9 100644
--- a/scripts/zmupdate.pl.in
+++ b/scripts/zmupdate.pl.in
@@ -67,12 +67,8 @@ use constant CHECK_INTERVAL => (1*24*60*60); # Interval between version checks
 # ==========================================================================
 
 @EXTRA_PERL_LIB@
-use ZoneMinder::Base qw(:all);
+use ZoneMinder;
 use ZoneMinder::Config qw(:all);
-use ZoneMinder::Logger qw(:all);
-use ZoneMinder::General qw(:all);
-use ZoneMinder::Database qw(:all);
-use ZoneMinder::ConfigAdmin qw( :functions );
 use POSIX;
 use DBI;
 use Getopt::Long;
@@ -155,6 +151,7 @@ if ( $check && $Config{ZM_CHECK_FOR_UPDATES} )
         my $sql = "update Config set Value = ? where Name = 'ZM_DYN_CURR_VERSION'";
         my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
         my $res = $sth->execute( "$currVersion" ) or die( "Can't execute: ".$sth->errstr() );
+        $sth->finish();
     }
 
     while( 1 )
@@ -184,10 +181,12 @@ if ( $check && $Config{ZM_CHECK_FOR_UPDATES} )
                 my $lv_sql = "update Config set Value = ? where Name = 'ZM_DYN_LAST_VERSION'";
                 my $lv_sth = $dbh->prepare_cached( $lv_sql ) or die( "Can't prepare '$lv_sql': ".$dbh->errstr() );
                 my $lv_res = $lv_sth->execute( $lastVersion ) or die( "Can't execute: ".$lv_sth->errstr() );
+                $lv_sth->finish();
 
                 my $lc_sql = "update Config set Value = ? where Name = 'ZM_DYN_LAST_CHECK'";
                 my $lc_sth = $dbh->prepare_cached( $lc_sql ) or die( "Can't prepare '$lc_sql': ".$dbh->errstr() );
                 my $lc_res = $lc_sth->execute( $lastCheck ) or die( "Can't execute: ".$lc_sth->errstr() );
+                $lc_sth->finish();
             }
             else
             {
@@ -239,14 +238,14 @@ if ( $zoneFix )
     }
     $sth->finish();
 
+    $sql = "update Zones set MinAlarmPixels = ?, MaxAlarmPixels = ?, MinFilterPixels = ?, MaxFilterPixels = ?, MinBlobPixels = ?, MaxBlobPixels = ? where Id = ?";
+    $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
     foreach my $zone ( @zones )
     {
         my $zone_width = (($zone->{HiX}*$zone->{MonitorWidth})-($zone->{LoX}*$zone->{MonitorWidth}))/100;
         my $zone_height = (($zone->{HiY}*$zone->{MonitorHeight})-($zone->{LoY}*$zone->{MonitorHeight}))/100;
         my $zone_area = $zone_width * $zone_height;
         my $monitor_area = $zone->{MonitorWidth} * $zone->{MonitorHeight};
-        my $sql = "update Zones set MinAlarmPixels = ?, MaxAlarmPixels = ?, MinFilterPixels = ?, MaxFilterPixels = ?, MinBlobPixels = ?, MaxBlobPixels = ? where Id = ?";
-        my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
         my $res = $sth->execute(
             ($zone->{MinAlarmPixels}*$monitor_area)/$zone_area,
             ($zone->{MaxAlarmPixels}*$monitor_area)/$zone_area,
@@ -257,6 +256,7 @@ if ( $zoneFix )
             $zone->{Id}
         ) or die( "Can't execute: ".$sth->errstr() );
     }
+    $sth->finish();
 }
 if ( $migrateEvents )
 {
@@ -318,11 +318,13 @@ if ( $migrateEvents )
             symlink( $newTimePath, $idLink ) or die( "Can't symlink $newTimePath -> $idLink: $!" );
             rename( $oldEventPath, $newEventPath ) or die( "Can't move $oldEventPath -> $newEventPath: $!" );
         }
+        $sth->finish();
 
         print( "Updating configuration.\n" );
         $sql = "update Config set Value = ? where Name = 'ZM_USE_DEEP_STORAGE'";
         $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
         $res = $sth->execute( 1 ) or die( "Can't execute: ".$sth->errstr() );
+        $sth->finish();
 
         print( "All events converted.\n\n" );
     }
@@ -334,8 +336,8 @@ if ( $migrateEvents )
 if ( $freshen )
 {
     print( "\nFreshening configuration in database\n" );
-    loadConfigFromDB();
-    saveConfigToDB();
+    ZoneMinder::Config::loadConfigFromDB();
+    ZoneMinder::Config::saveConfigToDB();
 }
 
 # Don't do innoDB upgrade if not interactive
@@ -359,12 +361,12 @@ if ( $interactive ) {
 		if ( $response =~ /^[yY]$/ ) {
 			$dbh->do(q|SET sql_mode='traditional'|); # Elevate warnings to errors
 			print "\nConverting MyISAM tables to InnoDB. Please wait.\n";
+      my $sql = "ALTER TABLE $_ ENGINE = InnoDB";
+      my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
 			foreach (@MyISAM_Tables) {
-				my $sql = "ALTER TABLE $_ ENGINE = InnoDB";
-				my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
 				my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
-				$sth->finish();
 			}
+			$sth->finish();
 			$dbh->do(q|SET sql_mode=''|); # Set mode back to default
 		}
 	}
@@ -494,8 +496,8 @@ if ( $version )
     print( "\nUpgrading database to version ".ZM_VERSION."\n" );
 
     # Update config first of all
-    loadConfigFromDB();
-    saveConfigToDB();
+    ZoneMinder::Config::loadConfigFromDB();
+    ZoneMinder::Config::saveConfigToDB();
 
     my $cascade = undef;
     if ( $cascade || $version eq "1.19.0" )
@@ -1064,6 +1066,7 @@ if ( $version )
         my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
         my $res = $sth->execute( "$installed_version", "ZM_DYN_DB_VERSION" ) or die( "Can't execute: ".$sth->errstr() );
         $res = $sth->execute( "$installed_version", "ZM_DYN_CURR_VERSION" ) or die( "Can't execute: ".$sth->errstr() );
+        $sth->finish();
     }
     else
     {

From 3780f8a2e6383855082f876f8bcc6c0e2222d846 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@ubuntu1204.connortechnology.com>
Date: Mon, 16 May 2016 09:31:54 -0400
Subject: [PATCH 34/49] move functions from ConfigAdmin into Config. I see no
 reason for them to be in a separate module

---
 .../ZoneMinder/lib/ZoneMinder/Config.pm.in    | 222 ++++++++++++++----
 1 file changed, 181 insertions(+), 41 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
index 54cc8c3f3..754e4a591 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
@@ -31,6 +31,7 @@ use warnings;
 require Exporter;
 require ZoneMinder::Base;
 require ZoneMinder::Database;
+use ZoneMinder::ConfigData qw(:all);
 
 our @ISA = qw(Exporter ZoneMinder::Base);
 
@@ -45,7 +46,12 @@ use vars qw( %Config );
 our @EXPORT_CONFIG = qw( %Config ); # Get populated by BEGIN
 
 our %EXPORT_TAGS = (
-    'constants' => [ qw(
+    functions => [ qw(
+        zmConfigLoad
+        loadConfigFromDB
+        saveConfigToDB
+    ) ],
+    constants => [ qw(
         ZM_PID
     ) ]
 );
@@ -67,47 +73,163 @@ use Carp;
 sub zmConfigLoad {
   %Config = ();
 
-    my $config_file = ZM_CONFIG;
-    open( my $CONFIG, "<", $config_file )
-        or croak( "Can't open config file '$config_file': $!" );
-    foreach my $str ( <$CONFIG> )
-    {
-        next if ( $str =~ /^\s*$/ );
-        next if ( $str =~ /^\s*#/ );
-        my ( $name, $value ) = $str =~ /^\s*([^=\s]+)\s*=\s*(.*?)\s*$/;
-        if ( ! $name ) {
-            print( STDERR "Warning, bad line in $config_file: $str\n" );
-            next;
-        } # end if
-        $name =~ tr/a-z/A-Z/;
-        $Config{$name} = $value;
-    }
-    close( $CONFIG );
+  my $config_file = ZM_CONFIG;
+  open( my $CONFIG, "<", $config_file )
+    or croak( "Can't open config file '$config_file': $!" );
+  foreach my $str ( <$CONFIG> ) {
+    next if ( $str =~ /^\s*$/ );
+    next if ( $str =~ /^\s*#/ );
+    my ( $name, $value ) = $str =~ /^\s*([^=\s]+)\s*=\s*(.*?)\s*$/;
+    if ( ! $name ) {
+      print( STDERR "Warning, bad line in $config_file: $str\n" );
+      next;
+    } # end if
+    $name =~ tr/a-z/A-Z/;
+    $Config{$name} = $value;
+  }
+  close( $CONFIG );
 
-    my $dbh = ZoneMinder::Database::zmDbConnect() or croak( "Can't connect to db" );
-    my $sql = 'select * from Config';
-    my $sth = $dbh->prepare_cached( $sql ) or croak( "Can't prepare '$sql': ".$dbh->errstr() );
-    my $res = $sth->execute() or croak( "Can't execute: ".$sth->errstr() );
-    while( my $config = $sth->fetchrow_hashref() ) {
-        $Config{$config->{Name}} = $config->{Value};
+  my $dbh = ZoneMinder::Database::zmDbConnect() or croak( "Can't connect to db" );
+  my $sql = 'select * from Config';
+  my $sth = $dbh->prepare_cached( $sql ) or croak( "Can't prepare '$sql': ".$dbh->errstr() );
+  my $res = $sth->execute() or croak( "Can't execute: ".$sth->errstr() );
+  while( my $config = $sth->fetchrow_hashref() ) {
+    $Config{$config->{Name}} = $config->{Value};
+  }
+  $sth->finish();
+
+  if ( ! exists $Config{ZM_SERVER_ID} ) {
+    $Config{ZM_SERVER_ID} = undef;
+    $sth = $dbh->prepare_cached( 'SELECT * FROM Servers WHERE Name=?' );
+    if ( $Config{ZM_SERVER_NAME} ) {
+      $res = $sth->execute( $Config{ZM_SERVER_NAME} );
+      my $result = $sth->fetchrow_hashref();
+      $Config{ZM_SERVER_ID} = $$result{Id};
+    } elsif ( $Config{ZM_SERVER_HOST} ) {
+      $res = $sth->execute( $Config{ZM_SERVER_HOST} );
+      my $result = $sth->fetchrow_hashref();
+      $Config{ZM_SERVER_ID} = $$result{Id};
     }
     $sth->finish();
-
-	if ( ! exists $Config{ZM_SERVER_ID} ) {
-		$Config{ZM_SERVER_ID} = undef;
-		$sth = $dbh->prepare_cached( 'SELECT * FROM Servers WHERE Name=?' );
-		if ( $Config{ZM_SERVER_NAME} ) {
-			$res = $sth->execute( $Config{ZM_SERVER_NAME} );
-			my $result = $sth->fetchrow_hashref();
-			$Config{ZM_SERVER_ID} = $$result{Id};
-		} elsif ( $Config{ZM_SERVER_HOST} ) {
-			$res = $sth->execute( $Config{ZM_SERVER_HOST} );
-			my $result = $sth->fetchrow_hashref();
-			$Config{ZM_SERVER_ID} = $$result{Id};
-		}
-	}
+  }
 }
 
+sub loadConfigFromDB {
+  print( "Loading config from DB\n" );
+  my $dbh = ZoneMinder::Database::zmDbConnect();
+  if ( !$dbh ) {
+    print( "Error: unable to load options from database: $DBI::errstr\n" );
+    return( 0 );
+  }
+  my $sql = "select * from Config";
+  my $sth = $dbh->prepare_cached( $sql )
+    or croak( "Can't prepare '$sql': ".$dbh->errstr() );
+  my $res = $sth->execute()
+    or croak( "Can't execute: ".$sth->errstr() );
+  my $option_count = 0;
+  while( my $config = $sth->fetchrow_hashref() ) {
+    my ( $name, $value ) = ( $config->{Name}, $config->{Value} );
+#print( "Name = '$name'\n" );
+    my $option = $options_hash{$name};
+    if ( !$option ) {
+      warn( "No option '$name' found, removing" );
+      next;
+    }
+#next if ( $option->{category} eq 'hidden' );
+    if ( defined($value) ) {
+      if ( $option->{type} == $types{boolean} ) {
+        $option->{value} = $value?"yes":"no";
+      } else {
+        $option->{value} = $value;
+      }
+    }
+    $option_count++;;
+  }
+  $sth->finish();
+  return( $option_count );
+}
+
+sub saveConfigToDB {
+  print( "Saving config to DB\n" );
+  my $dbh = ZoneMinder::Database::zmDbConnect();
+  if ( !$dbh )
+  {
+    print( "Error: unable to save options to database: $DBI::errstr\n" );
+    return( 0 );
+  }
+
+  my $ac = $dbh->{AutoCommit};
+  $dbh->{AutoCommit} = 0;
+
+  $dbh->do('LOCK TABLE Config WRITE')
+    or croak( "Can't lock Config table: " . $dbh->errstr() );
+
+  my $sql = "delete from Config";
+  my $res = $dbh->do( $sql )
+    or croak( "Can't do '$sql': ".$dbh->errstr() );
+
+  $sql = "replace into Config set Id = ?, Name = ?, Value = ?, Type = ?, DefaultValue = ?, Hint = ?, Pattern = ?, Format = ?, Prompt = ?, Help = ?, Category = ?, Readonly = ?, Requires = ?";
+  my $sth = $dbh->prepare_cached( $sql )
+    or croak( "Can't prepare '$sql': ".$dbh->errstr() );
+  foreach my $option ( @options )
+  {
+#next if ( $option->{category} eq 'hidden' );
+#print( $option->{name}."\n" ) if ( !$option->{category} );
+    $option->{db_type} = $option->{type}->{db_type};
+    $option->{db_hint} = $option->{type}->{hint};
+    $option->{db_pattern} = $option->{type}->{pattern};
+    $option->{db_format} = $option->{type}->{format};
+    if ( $option->{db_type} eq "boolean" )
+    {
+      $option->{db_value} = ($option->{value} eq "yes")
+        ? "1"
+        : "0"
+        ;
+    }
+    else
+    {
+      $option->{db_value} = $option->{value};
+    }
+    if ( my $requires = $option->{requires} )
+    {
+      $option->{db_requires} = join( ";",
+          map {
+          my $value = $_->{value};
+          $value = ($value eq "yes")
+          ? 1
+          : 0
+          if ( $options_hash{$_->{name}}->{db_type} eq "boolean" )
+          ; ( "$_->{name}=$value" )
+          } @$requires
+          );
+    }
+    else
+    {
+    }
+    my $res = $sth->execute(
+        $option->{id},
+        $option->{name},
+        $option->{db_value},
+        $option->{db_type},
+        $option->{default},
+        $option->{db_hint},
+        $option->{db_pattern},
+        $option->{db_format},
+        $option->{description},
+        $option->{help},
+        $option->{category},
+        $option->{readonly} ? 1 : 0,
+        $option->{db_requires}
+        ) or croak( "Can't execute: ".$sth->errstr() );
+  }
+  $sth->finish();
+
+  $dbh->do('UNLOCK TABLES');
+  $dbh->{AutoCommit} = $ac;
+}
+
+1;
+__END__
 1;
 __END__
 
@@ -117,7 +239,7 @@ ZoneMinder::Config - ZoneMinder configuration module.
 
 =head1 SYNOPSIS
 
-  use ZoneMinder::Config qw(:all);
+use ZoneMinder::Config qw(:all);
 
 =head1 DESCRIPTION
 
@@ -132,7 +254,25 @@ namespace of the calling program or module.
 Once the configuration has been imported then configuration variables are
 defined as constants and can be accessed directory by name, e.g.
 
- $lang = $Config{ZM_LANG_DEFAULT};
+$lang = $Config{ZM_LANG_DEFAULT};
+
+=head1 METHODS
+
+=over 4
+
+=item loadConfigFromDB ();
+
+Loads existing configuration from the database (if any) and merges it with
+the definitions held in this module. This results in the merging of any new
+configuration and the removal of any deprecated configuration while
+preserving the existing values of every else.
+
+=item saveConfigToDB ();
+
+Saves configuration held in memory to the database. The act of loading and
+saving configuration is a convenient way to ensure that the configuration
+held in the database corresponds with the most recent definitions and that
+all components are using the same set of configuration.
 
 =head2 EXPORT
 
@@ -155,7 +295,7 @@ Copyright (C) 2001-2008  Philip Coombes
 
 This library is free software; you can redistribute it and/or modify
 it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
+   at your option, any later version of Perl 5 you may have available.
 
 
-=cut
+   =cut

From dd24c35afa03361494ad1686fc67886db68a7ee2 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@ubuntu1204.connortechnology.com>
Date: Mon, 16 May 2016 10:05:12 -0400
Subject: [PATCH 35/49] revert bogus optimisation

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

diff --git a/scripts/zmupdate.pl.in b/scripts/zmupdate.pl.in
index be1d309c9..cce15500b 100644
--- a/scripts/zmupdate.pl.in
+++ b/scripts/zmupdate.pl.in
@@ -361,9 +361,9 @@ if ( $interactive ) {
 		if ( $response =~ /^[yY]$/ ) {
 			$dbh->do(q|SET sql_mode='traditional'|); # Elevate warnings to errors
 			print "\nConverting MyISAM tables to InnoDB. Please wait.\n";
-      my $sql = "ALTER TABLE $_ ENGINE = InnoDB";
-      my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
 			foreach (@MyISAM_Tables) {
+        my $sql = "ALTER TABLE $_ ENGINE = InnoDB";
+        my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
 				my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
 			}
 			$sth->finish();

From b53a0a564d6cadb0a72f10b5ecd94510ba79bdcb Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@ubuntu1204.connortechnology.com>
Date: Mon, 16 May 2016 10:07:24 -0400
Subject: [PATCH 36/49] Don't need the extra use ZoneMinder::Config

---
 scripts/zmupdate.pl.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/zmupdate.pl.in b/scripts/zmupdate.pl.in
index cce15500b..176de10a6 100644
--- a/scripts/zmupdate.pl.in
+++ b/scripts/zmupdate.pl.in
@@ -68,7 +68,6 @@ use constant CHECK_INTERVAL => (1*24*60*60); # Interval between version checks
 
 @EXTRA_PERL_LIB@
 use ZoneMinder;
-use ZoneMinder::Config qw(:all);
 use POSIX;
 use DBI;
 use Getopt::Long;

From 6084e2d00f08c9a342dd3cabfcaca736de592f24 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Mon, 16 May 2016 14:38:40 -0400
Subject: [PATCH 37/49] improve error message.  The unrecognized action error
 happens above, so this error should just mention permissions

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

diff --git a/web/ajax/alarm.php b/web/ajax/alarm.php
index b1f5f1496..2d4690866 100644
--- a/web/ajax/alarm.php
+++ b/web/ajax/alarm.php
@@ -1,5 +1,4 @@
 <?php
-
 define( "MSG_TIMEOUT", 2.0 );
 define( "MSG_DATA_SIZE", 4+256 );
 
@@ -35,8 +34,7 @@ if ( canEdit( 'Monitors' ) )
         }
     }
     ajaxResponse( exec( escapeshellcmd( $zmuCommand ) ) );
+} else {
+  ajaxError( 'Insufficient permissions' );
 }
-
-ajaxError( 'Unrecognised action or insufficient permissions' );
-
 ?>

From 435a1f7a2e0ab7e5d2cd05ed62cd6feaa6844bc0 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 17 May 2016 09:11:52 -0400
Subject: [PATCH 38/49] remove duplicated locking code created by bind_fixes

---
 src/zm_stream.cpp | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/src/zm_stream.cpp b/src/zm_stream.cpp
index 908256638..8c89c33b6 100644
--- a/src/zm_stream.cpp
+++ b/src/zm_stream.cpp
@@ -291,36 +291,6 @@ void StreamBase::openComms()
   if ( connkey > 0 )
   {
 
-    snprintf( sock_path_lock, sizeof(sock_path_lock), "%s/zms-%06d.lock", config.path_socks, connkey);
-
-    lock_fd = open(sock_path_lock, O_CREAT|O_WRONLY, S_IRUSR | S_IWUSR);
-    if ( lock_fd <= 0 )
-    {
-      Error("Unable to open sock lock file %s: %s", sock_path_lock, strerror(errno) );
-      lock_fd = 0;
-    }
-    else if ( flock(lock_fd, LOCK_EX) != 0 )
-    {
-      Error("Unable to lock sock lock file %s: %s", sock_path_lock, strerror(errno) );
-
-      close(lock_fd);
-      lock_fd = 0;
-    }
-    else
-    {
-      Debug( 1, "We have obtained a lock on %s fd: %d", sock_path_lock, lock_fd);
-    }
-
-
-    sd = socket( AF_UNIX, SOCK_DGRAM, 0 );
-    if ( sd < 0 )
-    {
-      Fatal( "Can't create socket: %s", strerror(errno) );
-    }
-
-    snprintf( loc_sock_path, sizeof(loc_sock_path), "%s/zms-%06ds.sock", config.path_socks, connkey );
-    unlink( loc_sock_path );
-
 		unsigned int length = snprintf( sock_path_lock, sizeof(sock_path_lock), "%s/zms-%06d.lock", config.path_socks, connkey);
     if ( length >= sizeof(sock_path_lock) ) {
       Warning("Socket lock path was truncated.");

From 58d326681a5b44bbb0fbb815c28cf0bbd06ea7a6 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 17 May 2016 09:17:19 -0400
Subject: [PATCH 39/49] quick fix for gcc6

---
 src/zm_rtp_ctrl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/zm_rtp_ctrl.h b/src/zm_rtp_ctrl.h
index 2526f22ce..f487d1191 100644
--- a/src/zm_rtp_ctrl.h
+++ b/src/zm_rtp_ctrl.h
@@ -123,7 +123,7 @@ private:
       } sdes;
 
       // BYE
-      struct Bye
+      struct
       {
         uint32_t srcN[];   // list of sources
         // can't express trailing text for reason (what does this mean? it's not even english!)

From 09e4aca0be10aacfe2674d133730d97b65b9d1b8 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Tue, 17 May 2016 09:26:36 -0400
Subject: [PATCH 40/49] add libdata-uuid-perl to debian/ubuntu dependencies

---
 distros/debian/control     |  9 +++++++++
 distros/ubuntu1204/control | 18 ++++++++++--------
 distros/ubuntu1604/control | 30 ++++++++++++++++--------------
 3 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/distros/debian/control b/distros/debian/control
index 3b11f37b8..ebb59b3ab 100644
--- a/distros/debian/control
+++ b/distros/debian/control
@@ -17,6 +17,14 @@ Build-Depends: debhelper (>= 9), cmake
     , libvlccore-dev, libvlc-dev
     , libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
     , libgcrypt11-dev, libpolkit-gobject-1-dev
+    , libphp-serialization-perl
+    , libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, libdbd-mysql-perl
+    , libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl
+    , libmodule-load-perl, libsys-mmap-perl, libjson-any-perl
+    , libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl
+    , libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
+    , libsys-cpu-perl, libsys-meminfo-perl
+    , libdata-uuid-perl
 Standards-Version: 3.9.4
 
 Package: zoneminder
@@ -32,6 +40,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
     , libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl
     , libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
     , libsys-cpu-perl, libsys-meminfo-perl
+    , libdata-uuid-perl
     , libpcre3
     , libav-tools, libavdevice53
     , rsyslog | system-log-daemon
diff --git a/distros/ubuntu1204/control b/distros/ubuntu1204/control
index 0791622ed..d7c2232cf 100644
--- a/distros/ubuntu1204/control
+++ b/distros/ubuntu1204/control
@@ -21,6 +21,7 @@ Build-Depends: debhelper (>= 9), python-sphinx | python3-sphinx, apache2-dev, dh
               ,libphp-serialization-perl
               ,libsys-mmap-perl [!hurd-any]
               ,libwww-perl
+              ,libdata-uuid-perl 
 # Unbundled (dh_linktree):
         ,libjs-jquery
         ,libjs-mootools
@@ -42,14 +43,15 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,libmodule-load-conditional-perl
         ,libnet-sftp-foreign-perl
 #       ,libzoneminder-perl (= ${source:Version})
-          ,libarchive-zip-perl
-          ,libdbd-mysql-perl
-          ,libdevice-serialport-perl
-          ,libimage-info-perl
-          ,libjson-any-perl
-          ,libsys-mmap-perl [!hurd-any]
-          ,liburi-encode-perl
-          ,libwww-perl
+        ,libarchive-zip-perl
+        ,libdbd-mysql-perl
+        ,libdevice-serialport-perl
+        ,libimage-info-perl
+        ,libjson-any-perl
+        ,libsys-mmap-perl [!hurd-any]
+        ,liburi-encode-perl
+        ,libwww-perl
+        ,libdata-uuid-perl 
         ,mysql-client | virtual-mysql-client
         ,perl-modules
         ,php5-mysql, php5-gd
diff --git a/distros/ubuntu1604/control b/distros/ubuntu1604/control
index f16685b5e..c1ee3cc0d 100644
--- a/distros/ubuntu1604/control
+++ b/distros/ubuntu1604/control
@@ -25,6 +25,7 @@ Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apa
               ,libphp-serialization-perl
               ,libsys-mmap-perl [!hurd-any]
               ,libwww-perl
+              ,libdata-uuid-perl 
 # Unbundled (dh_linktree):
         ,libjs-jquery
         ,libjs-mootools
@@ -45,20 +46,21 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,libphp-serialization-perl
         ,libmodule-load-conditional-perl
         ,libnet-sftp-foreign-perl
-          ,libarchive-zip-perl
-          ,libdbd-mysql-perl
-          ,libdevice-serialport-perl
-          ,libimage-info-perl
-          ,libjson-any-perl
-          ,libsys-mmap-perl [!hurd-any]
-          ,liburi-encode-perl
-          ,libwww-perl
-          ,libdata-dump-perl
-          ,libclass-std-fast-perl
-          ,libsoap-wsdl-perl
-          ,libio-socket-multicast-perl
-          ,libdigest-sha-perl
-          ,libsys-cpu-perl, libsys-meminfo-perl
+        ,libarchive-zip-perl
+        ,libdbd-mysql-perl
+        ,libdevice-serialport-perl
+        ,libimage-info-perl
+        ,libjson-any-perl
+        ,libsys-mmap-perl [!hurd-any]
+        ,liburi-encode-perl
+        ,libwww-perl
+        ,libdata-dump-perl
+        ,libclass-std-fast-perl
+        ,libsoap-wsdl-perl
+        ,libio-socket-multicast-perl
+        ,libdigest-sha-perl
+        ,libsys-cpu-perl, libsys-meminfo-perl
+        ,libdata-uuid-perl 
         ,mysql-client | virtual-mysql-client
         ,perl-modules
         ,php5-mysql | php-mysql, php5-gd | php-gd

From 8bac5fbdfb151a0920456781f01b16f51aaa3c15 Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@hotmail.com>
Date: Wed, 18 May 2016 16:58:04 -0500
Subject: [PATCH 41/49] typo - remove extra comma

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

diff --git a/scripts/zmdc.pl.in b/scripts/zmdc.pl.in
index 730af9995..e70c4d568 100644
--- a/scripts/zmdc.pl.in
+++ b/scripts/zmdc.pl.in
@@ -92,7 +92,7 @@ my @daemons = (
     'zmwatch.pl',
     'zmupdate.pl',
     'zmtrack.pl',
-    'zmtelemetry.pl',
+    'zmtelemetry.pl'
 );
 
 my $command = shift @ARGV;

From 183f9c70a4ab8cc4a75e603da4405b02e90b0963 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 19 May 2016 12:08:25 -0400
Subject: [PATCH 42/49] Must use ZoneMinder instead of ZoneMinder::Logger

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

diff --git a/scripts/zmsystemctl.pl.in b/scripts/zmsystemctl.pl.in
index 75acae242..b6753fa26 100644
--- a/scripts/zmsystemctl.pl.in
+++ b/scripts/zmsystemctl.pl.in
@@ -48,7 +48,7 @@ use bytes;
 use autouse 'Pod::Usage'=>qw(pod2usage);
 
 @EXTRA_PERL_LIB@
-use ZoneMinder::Logger qw(:all);
+use ZoneMinder;
 
 my $command = $ARGV[0];
 

From 4018cab743f78777507a82bc7581d59060b577cb Mon Sep 17 00:00:00 2001
From: arjunrc <pliablepixels@gmail.com>
Date: Thu, 19 May 2016 14:53:16 -0400
Subject: [PATCH 43/49] don't pass partial data to daemoncontrol

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

diff --git a/web/api/app/Controller/MonitorsController.php b/web/api/app/Controller/MonitorsController.php
index 893410ce8..7bf36de75 100644
--- a/web/api/app/Controller/MonitorsController.php
+++ b/web/api/app/Controller/MonitorsController.php
@@ -103,7 +103,7 @@ public function beforeFilter() {
 
 			$this->Monitor->create();
 			if ($this->Monitor->save($this->request->data)) {
-				$this->daemonControl($this->Monitor->id, 'start', $this->request->data);
+				$this->daemonControl($this->Monitor->id, 'start');
 				return $this->flash(__('The monitor has been saved.'), array('action' => 'index'));
 			}
 		}

From 924acf4284cd55b029f55a63937c5911d67133c7 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Thu, 19 May 2016 15:01:31 -0400
Subject: [PATCH 44/49] fix zmdc.pl hang due to needing to connect to db after
 fork

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

diff --git a/scripts/zmdc.pl.in b/scripts/zmdc.pl.in
index e70c4d568..1046c1b91 100644
--- a/scripts/zmdc.pl.in
+++ b/scripts/zmdc.pl.in
@@ -459,6 +459,8 @@ sub start
     }
     elsif ( defined($cpid ) )
     {
+        # Force reconnection to the db.
+        zmDbConnect(1);
         logReinit();
 
         dPrint( ZoneMinder::Logger::INFO, "'".join( ' ', ( $daemon, @args ) )

From 13feb968111a14c7fa9eabda64e4d59dcaedd8dd Mon Sep 17 00:00:00 2001
From: arjunrc <pliablepixels@gmail.com>
Date: Thu, 19 May 2016 15:06:41 -0400
Subject: [PATCH 45/49] added alarm apis

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

diff --git a/docs/api.rst b/docs/api.rst
index 53c6d155b..e4e7bb1ee 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -130,6 +130,28 @@ depend on it.
   curl -XDELETE http://server/zm/api/monitors/1.json
 
 
+Arm/Disarm monitors
+^^^^^^^^^^^^^^^^^^^^
+
+This command will force an alarm on Monitor 1:
+
+::
+
+  curl http://server/zm/api/monitors/alarm/id:1/command:on.json
+
+This command will disable the  alarm on Monitor 1:
+
+::
+
+  curl http://server/zm/api/monitors/alarm/id:1/command:off.json
+
+This command will report the status of the alarm  Monitor 1:
+
+::
+
+  curl http://server/zm/api/monitors/alarm/id:1/command:status.json
+
+
 Return a list of all events
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

From e0c5b2a78ff85dc3d8ce99619e027d0a59565b06 Mon Sep 17 00:00:00 2001
From: arjunrc <pliablepixels@gmail.com>
Date: Thu, 19 May 2016 15:15:48 -0400
Subject: [PATCH 46/49] added consoleEvents API

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

diff --git a/docs/api.rst b/docs/api.rst
index e4e7bb1ee..9546a279a 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -238,6 +238,26 @@ Return a list of events for all monitors within a specified date/time range
   curl -XGET "http://server/zm/api/events/index/StartTime%20>=:2015-05-15%2018:43:56/EndTime%20<=:208:43:56.json"
 
 
+Return event count based on times and conditions
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The API also supports a handy mechanism to return a count of events for a period of time.
+
+This returns number of events per monitor that were recorded in the last one hour
+
+::
+
+  curl "http://server/zm/api/events/consoleEvents/1%20hour.json"
+
+This returns number of events per monitor that were recorded in the last day where there were atleast 10 frames that were alarms"
+
+::
+
+  curl "http://server/zm/api/events/consoleEvents/1%20day.json/AlarmFrames >=: 10.json"
+
+
+
+
 
 Configuration Apis
 ^^^^^^^^^^^^^^^^^^^

From 182fa9a5cd3107f115d5f87ce3394ffc1970d2e3 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Fri, 20 May 2016 08:53:53 -0400
Subject: [PATCH 47/49] revert the bulk of the merge_db_connects changes.

---
 scripts/ZoneMinder/lib/ZoneMinder.pm          |  5 --
 .../ZoneMinder/lib/ZoneMinder/Config.pm.in    | 73 ++++++++-----------
 scripts/ZoneMinder/lib/ZoneMinder/Database.pm | 19 +++--
 scripts/ZoneMinder/lib/ZoneMinder/Logger.pm   | 58 +++++++++------
 scripts/zmdc.pl.in                            |  2 -
 scripts/zmsystemctl.pl.in                     |  2 +-
 scripts/zmupdate.pl.in                        |  9 ++-
 7 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/scripts/ZoneMinder/lib/ZoneMinder.pm b/scripts/ZoneMinder/lib/ZoneMinder.pm
index 6d8b3bfc8..87a6b14b7 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder.pm
@@ -81,11 +81,6 @@ our @EXPORT = ( @EXPORT_OK );
 
 our $VERSION = $ZoneMinder::Base::VERSION;
 
-BEGIN {
-  ZoneMinder::Config::zmConfigLoad();
-  ZoneMinder::Database::zmDbConnect();
-}
-
 1;
 __END__
 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
index 754e4a591..06f3656c7 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
@@ -30,8 +30,6 @@ use warnings;
 
 require Exporter;
 require ZoneMinder::Base;
-require ZoneMinder::Database;
-use ZoneMinder::ConfigData qw(:all);
 
 our @ISA = qw(Exporter ZoneMinder::Base);
 
@@ -70,48 +68,39 @@ use constant ZM_CONFIG => "@ZM_CONFIG@"; # Path to the ZoneMinder config file
 use Carp;
 
 # Load the config from the database into the symbol table
-sub zmConfigLoad {
-  %Config = ();
+BEGIN
+{
+    my $config_file = ZM_CONFIG;
+    open( my $CONFIG, "<", $config_file )
+        or croak( "Can't open config file '$config_file': $!" );
+    foreach my $str ( <$CONFIG> )
+    {
+        next if ( $str =~ /^\s*$/ );
+        next if ( $str =~ /^\s*#/ );
+        my ( $name, $value ) = $str =~ /^\s*([^=\s]+)\s*=\s*(.*?)\s*$/;
+        if ( ! $name ) {
+            print( STDERR "Warning, bad line in $config_file: $str\n" );
+            next;
+        } # end if
+        $name =~ tr/a-z/A-Z/;
+        $Config{$name} = $value;
+    }
+    close( $CONFIG );
 
-  my $config_file = ZM_CONFIG;
-  open( my $CONFIG, "<", $config_file )
-    or croak( "Can't open config file '$config_file': $!" );
-  foreach my $str ( <$CONFIG> ) {
-    next if ( $str =~ /^\s*$/ );
-    next if ( $str =~ /^\s*#/ );
-    my ( $name, $value ) = $str =~ /^\s*([^=\s]+)\s*=\s*(.*?)\s*$/;
-    if ( ! $name ) {
-      print( STDERR "Warning, bad line in $config_file: $str\n" );
-      next;
-    } # end if
-    $name =~ tr/a-z/A-Z/;
-    $Config{$name} = $value;
-  }
-  close( $CONFIG );
-
-  my $dbh = ZoneMinder::Database::zmDbConnect() or croak( "Can't connect to db" );
-  my $sql = 'select * from Config';
-  my $sth = $dbh->prepare_cached( $sql ) or croak( "Can't prepare '$sql': ".$dbh->errstr() );
-  my $res = $sth->execute() or croak( "Can't execute: ".$sth->errstr() );
-  while( my $config = $sth->fetchrow_hashref() ) {
-    $Config{$config->{Name}} = $config->{Value};
-  }
-  $sth->finish();
-
-  if ( ! exists $Config{ZM_SERVER_ID} ) {
-    $Config{ZM_SERVER_ID} = undef;
-    $sth = $dbh->prepare_cached( 'SELECT * FROM Servers WHERE Name=?' );
-    if ( $Config{ZM_SERVER_NAME} ) {
-      $res = $sth->execute( $Config{ZM_SERVER_NAME} );
-      my $result = $sth->fetchrow_hashref();
-      $Config{ZM_SERVER_ID} = $$result{Id};
-    } elsif ( $Config{ZM_SERVER_HOST} ) {
-      $res = $sth->execute( $Config{ZM_SERVER_HOST} );
-      my $result = $sth->fetchrow_hashref();
-      $Config{ZM_SERVER_ID} = $$result{Id};
+    use DBI;
+    my $dbh = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}
+                           .";host=".$Config{ZM_DB_HOST}
+                           , $Config{ZM_DB_USER}
+                           , $Config{ZM_DB_PASS}
+    ) or croak( "Can't connect to db" );
+    my $sql = 'select * from Config';
+    my $sth = $dbh->prepare_cached( $sql ) or croak( "Can't prepare '$sql': ".$dbh->errstr() );
+    my $res = $sth->execute() or croak( "Can't execute: ".$sth->errstr() );
+    while( my $config = $sth->fetchrow_hashref() ) {
+        $Config{$config->{Name}} = $config->{Value};
     }
     $sth->finish();
-  }
+    #$dbh->disconnect();
 }
 
 sub loadConfigFromDB {
@@ -228,8 +217,6 @@ sub saveConfigToDB {
   $dbh->{AutoCommit} = $ac;
 }
 
-1;
-__END__
 1;
 __END__
 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
index 574c382f5..7dfe0654b 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
@@ -27,11 +27,9 @@ package ZoneMinder::Database;
 use 5.006;
 use strict;
 use warnings;
-use DBI;
 
 require Exporter;
 require ZoneMinder::Base;
-require ZoneMinder::Config;
 
 our @ISA = qw(Exporter ZoneMinder::Base);
 
@@ -66,6 +64,7 @@ our $VERSION = $ZoneMinder::Base::VERSION;
 # ==========================================================================
 
 use ZoneMinder::Logger qw(:all);
+use ZoneMinder::Config qw(:all);
 
 use Carp;
 
@@ -80,23 +79,23 @@ sub zmDbConnect
     }
     if ( !defined( $dbh ) )
     {
-        my ( $host, $port ) = ( $ZoneMinder::Config::Config{ZM_DB_HOST} =~ /^([^:]+)(?::(.+))?$/ );
+        my ( $host, $port ) = ( $Config{ZM_DB_HOST} =~ /^([^:]+)(?::(.+))?$/ );
 
         if ( defined($port) )
         {
-            $dbh = DBI->connect( "DBI:mysql:database=".$ZoneMinder::Config::Config{ZM_DB_NAME}
+            $dbh = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}
                                 .";host=".$host
                                 .";port=".$port
-                                , $ZoneMinder::Config::Config{ZM_DB_USER}
-                                , $ZoneMinder::Config::Config{ZM_DB_PASS}
+                                , $Config{ZM_DB_USER}
+                                , $Config{ZM_DB_PASS}
             );
         }
         else
         {
-            $dbh = DBI->connect( "DBI:mysql:database=".$ZoneMinder::Config::Config{ZM_DB_NAME}
-                                .";host=".$ZoneMinder::Config::Config{ZM_DB_HOST}
-                                , $ZoneMinder::Config::Config{ZM_DB_USER}
-                                , $ZoneMinder::Config::Config{ZM_DB_PASS}
+            $dbh = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}
+                                .";host=".$Config{ZM_DB_HOST}
+                                , $Config{ZM_DB_USER}
+                                , $Config{ZM_DB_PASS}
             );
         }
         $dbh->trace( 0 );
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
index 7366ada90..a6a82db87 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
@@ -30,9 +30,6 @@ use warnings;
 
 require Exporter;
 require ZoneMinder::Base;
-require ZoneMinder::Database;
-require ZoneMinder::Config;
-
 
 our @ISA = qw(Exporter ZoneMinder::Base);
 
@@ -89,6 +86,8 @@ our $VERSION = $ZoneMinder::Base::VERSION;
 #
 # ==========================================================================
 
+use ZoneMinder::Config qw(:all);
+
 use DBI;
 use Carp;
 use POSIX;
@@ -152,7 +151,7 @@ sub new
     $this->{hasTerm} = -t STDERR;
 
     ( $this->{fileName} = $0 ) =~ s|^.*/||;
-    $this->{logPath} = $ZoneMinder::Config::Config{ZM_PATH_LOGS};
+    $this->{logPath} = $Config{ZM_PATH_LOGS};
     $this->{logFile} = $this->{logPath}."/".$this->{id}.".log";
 
     $this->{trace} = 0;
@@ -165,7 +164,7 @@ sub BEGIN
 {
     # Fake the config variables that are used in case they are not defined yet
     # Only really necessary to support upgrade from previous version
-    if ( !eval('defined($ZoneMinder::Config::Config{ZM_LOG_DEBUG})') )
+    if ( !eval('defined($Config{ZM_LOG_DEBUG})') )
     {
         no strict 'subs';
         no strict 'refs';
@@ -223,7 +222,7 @@ sub initialise( @ )
     }
     else
     {
-        $tempDatabaseLevel = $ZoneMinder::Config::Config{ZM_LOG_LEVEL_DATABASE};
+        $tempDatabaseLevel = $Config{ZM_LOG_LEVEL_DATABASE};
     }
     if ( defined($options{fileLevel}) )
     {
@@ -231,7 +230,7 @@ sub initialise( @ )
     }
     else
     {
-        $tempFileLevel = $ZoneMinder::Config::Config{ZM_LOG_LEVEL_FILE};
+        $tempFileLevel = $Config{ZM_LOG_LEVEL_FILE};
     }
     if ( defined($options{syslogLevel}) )
     {
@@ -239,7 +238,7 @@ sub initialise( @ )
     }
     else
     {
-        $tempSyslogLevel = $ZoneMinder::Config::Config{ZM_LOG_LEVEL_SYSLOG};
+        $tempSyslogLevel = $Config{ZM_LOG_LEVEL_SYSLOG};
     }
 
     if ( defined($ENV{'LOG_PRINT'}) )
@@ -255,9 +254,9 @@ sub initialise( @ )
     $tempFileLevel = $level if ( defined($level = $this->getTargettedEnv('LOG_LEVEL_FILE')) );
     $tempSyslogLevel = $level if ( defined($level = $this->getTargettedEnv('LOG_LEVEL_SYSLOG')) );
 
-    if ( $ZoneMinder::Config::Config{ZM_LOG_DEBUG} )
+    if ( $Config{ZM_LOG_DEBUG} )
     {
-        foreach my $target ( split( /\|/, $ZoneMinder::Config::Config{ZM_LOG_DEBUG_TARGET} ) )
+        foreach my $target ( split( /\|/, $Config{ZM_LOG_DEBUG_TARGET} ) )
         {
             if ( $target eq $this->{id}
                  || $target eq "_".$this->{id}
@@ -266,12 +265,12 @@ sub initialise( @ )
                  || $target eq ""
             )
             {
-                if ( $ZoneMinder::Config::Config{ZM_LOG_DEBUG_LEVEL} > NOLOG )
+                if ( $Config{ZM_LOG_DEBUG_LEVEL} > NOLOG )
                 {
-                    $tempLevel = $this->limit( $ZoneMinder::Config::Config{ZM_LOG_DEBUG_LEVEL} );
-                    if ( $ZoneMinder::Config::Config{ZM_LOG_DEBUG_FILE} ne "" )
+                    $tempLevel = $this->limit( $Config{ZM_LOG_DEBUG_LEVEL} );
+                    if ( $Config{ZM_LOG_DEBUG_FILE} ne "" )
                     {
-                        $tempLogFile = $ZoneMinder::Config::Config{ZM_LOG_DEBUG_FILE};
+                        $tempLogFile = $Config{ZM_LOG_DEBUG_FILE};
                         $tempFileLevel = $tempLevel;
                     }
                 }
@@ -461,14 +460,32 @@ sub databaseLevel
             {
                 if ( !$this->{dbh} )
                 {
-                    $this->{dbh} = ZoneMinder::Database::zmDbConnect();
+                    my ( $host, $port ) = ( $Config{ZM_DB_HOST} =~ /^([^:]+)(?::(.+))?$/ );
+
+                    if ( defined($port) )
+                    {
+                        $this->{dbh} = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}
+                                                    .";host=".$host
+                                                    .";port=".$port
+                                                    , $Config{ZM_DB_USER}
+                                                    , $Config{ZM_DB_PASS}
+                        );
+                    }
+                    else
+                    {
+                        $this->{dbh} = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME}
+                                                    .";host=".$Config{ZM_DB_HOST}
+                                                    , $Config{ZM_DB_USER}
+                                                    , $Config{ZM_DB_PASS}
+                        );
+                    }
                     if ( !$this->{dbh} )
                     {
                         $databaseLevel = NOLOG;
                         Error( "Unable to write log entries to DB, can't connect to database '"
-                               .$ZoneMinder::Config::Config{ZM_DB_NAME}
+                               .$Config{ZM_DB_NAME}
                                ."' on host '"
-                               .$ZoneMinder::Config::Config{ZM_DB_HOST}
+                               .$Config{ZM_DB_HOST}
                                ."'"
                         );
                     }
@@ -488,8 +505,7 @@ sub databaseLevel
             {
                 if ( $this->{dbh} )
                 {
-                    # $this->dbh is now the global dbh, so don't close it.
-                    #$this->{dbh}->disconnect();
+                    $this->{dbh}->disconnect();
                     undef($this->{dbh});
                 }
             }
@@ -566,8 +582,8 @@ sub openFile
     {
         $LOGFILE->autoflush() if ( $this->{autoFlush} );
 
-        my $webUid = (getpwnam( $ZoneMinder::Config::Config{ZM_WEB_USER} ))[2];
-        my $webGid = (getgrnam( $ZoneMinder::Config::Config{ZM_WEB_GROUP} ))[2];
+        my $webUid = (getpwnam( $Config{ZM_WEB_USER} ))[2];
+        my $webGid = (getgrnam( $Config{ZM_WEB_GROUP} ))[2];
         if ( $> == 0 )
         {
             chown( $webUid, $webGid, $this->{logFile} )
diff --git a/scripts/zmdc.pl.in b/scripts/zmdc.pl.in
index 1046c1b91..e70c4d568 100644
--- a/scripts/zmdc.pl.in
+++ b/scripts/zmdc.pl.in
@@ -459,8 +459,6 @@ sub start
     }
     elsif ( defined($cpid ) )
     {
-        # Force reconnection to the db.
-        zmDbConnect(1);
         logReinit();
 
         dPrint( ZoneMinder::Logger::INFO, "'".join( ' ', ( $daemon, @args ) )
diff --git a/scripts/zmsystemctl.pl.in b/scripts/zmsystemctl.pl.in
index b6753fa26..75acae242 100644
--- a/scripts/zmsystemctl.pl.in
+++ b/scripts/zmsystemctl.pl.in
@@ -48,7 +48,7 @@ use bytes;
 use autouse 'Pod::Usage'=>qw(pod2usage);
 
 @EXTRA_PERL_LIB@
-use ZoneMinder;
+use ZoneMinder::Logger qw(:all);
 
 my $command = $ARGV[0];
 
diff --git a/scripts/zmupdate.pl.in b/scripts/zmupdate.pl.in
index 176de10a6..ccc76ba02 100644
--- a/scripts/zmupdate.pl.in
+++ b/scripts/zmupdate.pl.in
@@ -67,7 +67,12 @@ use constant CHECK_INTERVAL => (1*24*60*60); # Interval between version checks
 # ==========================================================================
 
 @EXTRA_PERL_LIB@
-use ZoneMinder;
+use ZoneMinder::Base qw(:all);
+use ZoneMinder::Config qw(:all);
+use ZoneMinder::Logger qw(:all);
+use ZoneMinder::General qw(:all);
+use ZoneMinder::Database qw(:all);
+use ZoneMinder::ConfigAdmin qw( :functions );
 use POSIX;
 use DBI;
 use Getopt::Long;
@@ -364,8 +369,8 @@ if ( $interactive ) {
         my $sql = "ALTER TABLE $_ ENGINE = InnoDB";
         my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
 				my $res = $sth->execute() or die( "Can't execute: ".$sth->errstr() );
+			  $sth->finish();
 			}
-			$sth->finish();
 			$dbh->do(q|SET sql_mode=''|); # Set mode back to default
 		}
 	}

From bb5dbf3e4ad3884c867fd2a6642b6b8b39666b1f Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@ubuntu1204.connortechnology.com>
Date: Fri, 20 May 2016 09:29:40 -0400
Subject: [PATCH 48/49] Need to import Config Data into Config

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

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
index 06f3656c7..0cc8081d2 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
@@ -30,6 +30,7 @@ use warnings;
 
 require Exporter;
 require ZoneMinder::Base;
+use ZoneMinder::ConfigData qw(:all);
 
 our @ISA = qw(Exporter ZoneMinder::Base);
 

From 8bbb443c67898e7b7da0e1bf0a1c96b8e084821a Mon Sep 17 00:00:00 2001
From: Andrew Bauer <knnniggett@users.sourceforge.net>
Date: Fri, 20 May 2016 10:35:03 -0500
Subject: [PATCH 49/49] fix invalid key name in config hash

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

diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index c7bf4a3f3..5a5328829 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -71,7 +71,7 @@ if ( $Config{ZM_TELEMETRY_DATA} )
 {
     print( "Update agent starting at ".strftime( '%y/%m/%d %H:%M:%S', localtime() )."\n" );
 
-    my $lastCheck = $Config{ZM_TELEMETRY_LAST_CHECK};
+    my $lastCheck = $Config{ZM_TELEMETRY_LAST_UPLOAD};
 
     while( 1 ) {
         my $now = time();