Packman Build Service PMBS

ZoneMinder.changes Changed

ZoneMinder.spec Changed

checkout-diego.sh Changed

zoneminder-1.34.8.tar.gz/.git/HEAD -> zoneminder-1.34.16.tar.gz/.git/HEAD Changed

zoneminder-1.34.8.tar.gz/.git/index -> zoneminder-1.34.16.tar.gz/.git/index Changed

zoneminder-1.34.8.tar.gz/.git/logs/HEAD -> zoneminder-1.34.16.tar.gz/.git/logs/HEAD Changed

zoneminder-1.34.8.tar.gz/.git/logs/refs/remotes/origin/HEAD -> zoneminder-1.34.16.tar.gz/.git/logs/refs/remotes/origin/HEAD Changed

zoneminder-1.34.16.tar.gz/.git/objects/pack/pack-e0e556ebca6351b7230296436ac495b605085cc6.idx Added

zoneminder-1.34.16.tar.gz/.git/objects/pack/pack-e0e556ebca6351b7230296436ac495b605085cc6.pack Added

zoneminder-1.34.8.tar.gz/.git/packed-refs -> zoneminder-1.34.16.tar.gz/.git/packed-refs Changed

@@ -6,14 +6,14 @@
 fcc507b93eed0a89ae6dee815b5c676777bb933e refs/remotes/origin/fix_zms_params
 b67450b8ae460eca2c331aa86d12c0fa979d6a24 refs/remotes/origin/fix_zmvideo
 b3d04f04ae48658e0cd44e6d30fbb9c91d348a2f refs/remotes/origin/gh-pages
-ebac665d4d796a09ff52ee1236067c9cdf6db52f refs/remotes/origin/master
+87078dfc31e1dc0b035672b1db4f91148a4fb78f refs/remotes/origin/master
 b8ad9aa8979daa0841587fe3e0e2cb3d688b2e6b refs/remotes/origin/osx-port
 1aaa52b994f70fc2fd28161643fe9579a9e1b6b3 refs/remotes/origin/pliablepixels-patch-1
 b4a8790555eecd7a7b90926e68f6da351510441e refs/remotes/origin/pliablepixels-patch-2
 02be9076928e2ac4a6e9c5406fe85638c4c5105b refs/remotes/origin/release-1.30
 b6a1885167c40e67f13f86c4a61216e83c04adcb refs/remotes/origin/release-1.30.4
 32b91df395766152edd3fce0f7496b7847dd455d refs/remotes/origin/release-1.32
-a555e09cad328e9991b9245bad8409460ee69018 refs/remotes/origin/release-1.34
+402ab9ad9f92e29e879e07d95a92a6d070c88e1b refs/remotes/origin/release-1.34
 444c6fd372293450e00f168376c1d23ec11c45e4 refs/remotes/origin/revert-2844-2810-libjwt
 3fe846c411c0b4cf62b0bc89171cf79e5e9a303a refs/remotes/origin/slack-join
 ce4ea7d42e50a773f2c9f4d70da3fc417f88b1a5 refs/remotes/origin/thumbnail_on_console
@@ -40,6 +40,15 @@
 ^a398f33e68408bb489e3f8b90ba239e3424903a0
 840f8b91b7c29641ca84c92d1382b055071454a2 refs/tags/1.34.1
 ^fb5111ffe4de9b5f417150af14f9bca236d7b620
+e79a9d5abf7bc0c7e3fe850d64e5b0cbb65fdc4f refs/tags/1.34.10
+3f680e11fa60014ecbd6f16fa19bae54b73cc354 refs/tags/1.34.11
+1238b92bbe2473b867f75412eed988db06490e47 refs/tags/1.34.12
+^8d74a973fc7f670ce9151adc62d0086e7264970d
+4fed2d6d267ff849de73e9971cb1062334a663db refs/tags/1.34.13
+3cf18bc277415016ae57d2c8e1446b37503d9299 refs/tags/1.34.14
+^9ea1c637f96a5de2ac8f17778abf54e9fece0b7d
+2c347d051801b24dd633f54b379fbbfc61af39dd refs/tags/1.34.15
+402ab9ad9f92e29e879e07d95a92a6d070c88e1b refs/tags/1.34.16
 b7ad7ab1fc25dfaf626f12c97d3403ff0aab1b2e refs/tags/1.34.2
 ea2eba4110af76376c1bff308290ab84ae371033 refs/tags/1.34.3
 e630550d0f1ef169aca011a6a0220c7db3d0268f refs/tags/1.34.4
@@ -47,6 +56,8 @@
 6d787fd77e1281bdf9f2fc59538d6ac1addd30d0 refs/tags/1.34.6
 c880793fdc411558236e8d8c55ec29c455e6c416 refs/tags/1.34.7
 a555e09cad328e9991b9245bad8409460ee69018 refs/tags/1.34.8
+968ecda2f7cbf78bad6e211f067df13462285a95 refs/tags/1.34.9
+^28e21fb0b15bf8852b78fddbe7eaa84662a1f2c3
 4d508d8be232a4f84aefe37327b0e737196f58d1 refs/tags/v1.25
 6c411b5c43b88bc292a65609c78e5b56dd85562a refs/tags/v1.26-beta.1
 0a911d9d27bc0adf6d8272f6db11a0816a422fb9 refs/tags/v1.26-beta.2

zoneminder-1.34.8.tar.gz/.travis.yml -> zoneminder-1.34.16.tar.gz/.travis.yml Changed

zoneminder-1.34.8.tar.gz/CMakeLists.txt -> zoneminder-1.34.16.tar.gz/CMakeLists.txt Changed

@@ -358,21 +358,23 @@
 endif(LIBJWT_FOUND)
 
 # gnutls (using find_library and find_path)
-find_library(GNUTLS_LIBRARIES gnutls)
-if(GNUTLS_LIBRARIES)
-	set(HAVE_LIBGNUTLS 1)
-	list(APPEND ZM_BIN_LIBS "${GNUTLS_LIBRARIES}")
-	find_path(GNUTLS_INCLUDE_DIR gnutls/gnutls.h)
-	if(GNUTLS_INCLUDE_DIR)
-		include_directories("${GNUTLS_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
-	endif(GNUTLS_INCLUDE_DIR)
-	mark_as_advanced(FORCE GNUTLS_LIBRARIES GNUTLS_INCLUDE_DIR)
-	check_include_file("gnutls/gnutls.h" HAVE_GNUTLS_GNUTLS_H)
-	set(optlibsfound "${optlibsfound} GnuTLS")
-else(GNUTLS_LIBRARIES)
-	set(optlibsnotfound "${optlibsnotfound} GnuTLS")
-endif(GNUTLS_LIBRARIES)
+if(HAVE_LIBJWT)
+	find_library(GNUTLS_LIBRARIES gnutls)
+	if(GNUTLS_LIBRARIES)
+		set(HAVE_LIBGNUTLS 1)
+		list(APPEND ZM_BIN_LIBS "${GNUTLS_LIBRARIES}")
+		find_path(GNUTLS_INCLUDE_DIR gnutls/gnutls.h)
+		if(GNUTLS_INCLUDE_DIR)
+			include_directories("${GNUTLS_INCLUDE_DIR}")
+			set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
+		endif(GNUTLS_INCLUDE_DIR)
+		mark_as_advanced(FORCE GNUTLS_LIBRARIES GNUTLS_INCLUDE_DIR)
+		check_include_file("gnutls/gnutls.h" HAVE_GNUTLS_GNUTLS_H)
+		set(optlibsfound "${optlibsfound} GnuTLS")
+	else(GNUTLS_LIBRARIES)
+		set(optlibsnotfound "${optlibsnotfound} GnuTLS")
+	endif(GNUTLS_LIBRARIES)
+endif(HAVE_LIBJWT)
 
 # OpenSSL
 if(NOT HAVE_LIBGNUTLS OR NOT HAVE_LIBJWT)
@@ -738,6 +740,7 @@
             "unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md)" "NULL" "openssl/md5.h" 
             HAVE_MD5_OPENSSL)
 endif(HAVE_OPENSSL_MD5_H)
+
 if(HAVE_GNUTLS_GNUTLS_H)
 	set(CMAKE_REQUIRED_LIBRARIES "${GNUTLS_LIBRARIES}")
 	set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
@@ -746,13 +749,17 @@
             "int gnutls_fingerprint (gnutls_digest_algorithm_t algo, const gnutls_datum_t * data, void *result, size_t * result_size)" "0" "stdlib.h;gnutls/gnutls.h" 
             HAVE_DECL_GNUTLS_FINGERPRINT)
 endif(HAVE_GNUTLS_GNUTLS_H)
+
 if(HAVE_MD5_OPENSSL)
 	set(HAVE_DECL_MD5 1)
-else(HAVE_MD5_OPENSSL)
-	message(AUTHOR_WARNING 
-        "ZoneMinder requires a working MD5 function for hashed authenication but 
-        none were found - hashed authenication will not be available")
 endif(HAVE_MD5_OPENSSL)
+
+if((NOT HAVE_MD5_OPENSSL) AND (NOT HAVE_DECL_GNUTLS_FINGERPRINT))
+	message(AUTHOR_WARNING 
+        "ZoneMinder requires a working MD5 function for hashed authentication but 
+        none were found - hashed authentication will not be available")
+endif((NOT HAVE_MD5_OPENSSL) AND (NOT HAVE_DECL_GNUTLS_FINGERPRINT))
+
 # Dirty fix for zm_user only using openssl's md5 if gnutls and gcrypt are not available.
 # This needs to be fixed in zm_user.[h,cpp] but such fix will also require changes to configure.ac
 if(HAVE_LIBCRYPTO AND HAVE_OPENSSL_MD5_H AND HAVE_MD5_OPENSSL)
@@ -902,7 +909,7 @@
 
 # Run ZM configuration generator
 message(STATUS "Running ZoneMinder configuration generator")
-execute_process(COMMAND perl ./zmconfgen.pl RESULT_VARIABLE zmconfgen_result)
+execute_process(COMMAND perl ${CMAKE_CURRENT_BINARY_DIR}/zmconfgen.pl RESULT_VARIABLE zmconfgen_result)
 if(zmconfgen_result EQUAL 0)
 	message(STATUS 
             "ZoneMinder configuration generator completed successfully")

zoneminder-1.34.8.tar.gz/distros/redhat/zoneminder.spec -> zoneminder-1.34.16.tar.gz/distros/redhat/zoneminder.spec Changed

zoneminder-1.34.8.tar.gz/distros/ubuntu1604/zoneminder.postinst -> zoneminder-1.34.16.tar.gz/distros/ubuntu1604/zoneminder.postinst Changed

@@ -19,6 +19,10 @@
     echo "The cgi module is not enabled in apache2.  I am enabling it using a2enmod cgi."
     a2enmod cgi
   fi
+  if [ ! -e "/etc/apache2/mods-enabled/rewrite.load" ] && [ "$(command -v a2enmod)" != "" ]; then
+    echo "The rewrite module is not enabled in apache2.  I am enabling it using a2enmod rewrite."
+    a2enmod rewrite
+  fi
 
   if [ "$ZM_DB_HOST" = "localhost" ]; then
 
@@ -61,11 +65,10 @@
               exit 1;
             fi
             # This creates the user.
-            echo "grant lock tables,alter,drop,select,insert,update,delete,create,index,alter routine,create routine, trigger,execute  on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost identified by \"${ZM_DB_PASS}\";" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-        else
-            echo "Updating permissions"
-            echo "grant lock tables,alter,drop,select,insert,update,delete,create,index,alter routine,create routine, trigger,execute  on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost;" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+            echo "CREATE USER '${ZM_DB_USER}'@localhost IDENTIFIED BY '${ZM_DB_PASS}';" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
         fi
+        echo "Updating permissions"
+        echo "grant lock tables,alter,drop,select,insert,update,delete,create,index,alter routine,create routine, trigger,execute  on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost;" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
 
         zmupdate.pl --nointeractive
         zmupdate.pl --nointeractive -f

zoneminder-1.34.8.tar.gz/docs/api.rst -> zoneminder-1.34.16.tar.gz/docs/api.rst Changed

zoneminder-1.34.8.tar.gz/docs/installationguide/ubuntu.rst -> zoneminder-1.34.16.tar.gz/docs/installationguide/ubuntu.rst Changed

zoneminder-1.34.8.tar.gz/scripts/ZoneMinder/lib/ZoneMinder/Control.pm -> zoneminder-1.34.16.tar.gz/scripts/ZoneMinder/lib/ZoneMinder/Control.pm Changed

zoneminder-1.34.8.tar.gz/scripts/ZoneMinder/lib/ZoneMinder/Control/DCS5020L.pm -> zoneminder-1.34.16.tar.gz/scripts/ZoneMinder/lib/ZoneMinder/Control/DCS5020L.pm Changed

@@ -46,243 +46,187 @@
 
 use Time::HiRes qw( usleep );
 
-sub new
-{
-    my $class = shift;
-    my $id = shift;
-    my $self = ZoneMinder::Control->new( $id );
-    bless( $self, $class );
-    srand( time() );
-    return $self;
-}
-
-our $AUTOLOAD;
-
-sub AUTOLOAD
-{
-    my $self = shift;
-    my $class = ref($self) || croak( "$self not object" );
-    my $name = $AUTOLOAD;
-    $name =~ s/.*://;
-    if ( exists($self->{$name}) )
-    {
-        return( $self->{$name} );
-    }
-    Fatal( "Can't access $name member of object of class $class" );
-}
+sub open {
+  my $self = shift;
 
-sub open
-{
-    my $self = shift;
+  $self->loadMonitor();
 
-    $self->loadMonitor();
-
-    use LWP::UserAgent;
-    $self->{ua} = LWP::UserAgent->new;
-    $self->{ua}->agent( "ZoneMinder Control Agent/" . ZoneMinder::Base::ZM_VERSION );
-    $self->{state} = 'open';
+  use LWP::UserAgent;
+  $self->{ua} = LWP::UserAgent->new;
+  $self->{ua}->agent('ZoneMinder Control Agent/' . ZoneMinder::Base::ZM_VERSION);
+  $self->{state} = 'open';
 }
 
-sub close
-{
-    my $self = shift;
-    $self->{state} = 'closed';
+sub close {
+  my $self = shift;
+  $self->{state} = 'closed';
 }
 
-sub printMsg
-{
-    my $self = shift;
-    my $msg = shift;
-    my $msg_len = length($msg);
-
-    Debug( $msg."[".$msg_len."]" );
-}
+sub sendCmd {
+  my $self = shift;
+  my $cmd = shift;
+  my $cgi = shift;
 
-sub sendCmd
-{
-    my $self = shift;
-    my $cmd = shift;
-    my $cgi = shift;
+  my $result = undef;
 
-    my $result = undef;
+  $self->printMsg($cmd, 'Tx');
 
-    printMsg( $cmd, "Tx" );
+  my $req = HTTP::Request->new(POST=>"http://$self->{Monitor}->{ControlAddress}/$cgi.cgi");
+  $req->content($cmd);
+  my $res = $self->{ua}->request($req);
 
-    my $req = HTTP::Request->new( POST=>"http://$self->{Monitor}->{ControlAddress}/$cgi.cgi" );
-    $req->content($cmd);
-    my $res = $self->{ua}->request($req);
+  if ( $res->is_success ) {
+    $result = !undef;
+  } else {
+    Error("Error check failed: '".$res->status_line()."'");
+  }
 
-    if ( $res->is_success )
-    {
-        $result = !undef;
-    }
-    else
-    {
-        Error( "Error check failed: '".$res->status_line()."'" );
-    }
-
-    return( $result );
+  return $result;
 }
 
-sub move
-{
-    my $self = shift;
-    my $dir = shift;
-    my $panStep = shift;
-    my $tiltStep = shift;
-    my $cmd = "PanSingleMoveDegree=$panStep&TiltSingleMoveDegree=$tiltStep&PanTiltSingleMove=$dir";
-    $self->sendCmd( $cmd, 'pantiltcontrol' );
+sub move {
+  my $self = shift;
+  my $dir = shift;
+  my $panStep = shift;
+  my $tiltStep = shift;
+  my $cmd = "PanSingleMoveDegree=$panStep&TiltSingleMoveDegree=$tiltStep&PanTiltSingleMove=$dir";
+  $self->sendCmd($cmd, 'pantiltcontrol');
 }
 
-sub moveRel
-{
-    my $self = shift;
-    my $params = shift;
-    my $panStep = $self->getParam($params, 'panstep', 0);
-    my $tiltStep = $self->getParam($params, 'tiltstep', 0);
-    my $dir = shift;
-    $self->move( $dir, $panStep, $tiltStep );
+sub moveRel {
+  my $self = shift;
+  my $params = shift;
+  my $panStep = $self->getParam($params, 'panstep', 0);
+  my $tiltStep = $self->getParam($params, 'tiltstep', 0);
+  my $dir = shift;
+  $self->move( $dir, $panStep, $tiltStep );
 }
 
-sub moveRelUpLeft
-{
-    my $self = shift;
-    my $params = shift;
-    $self->moveRel( $params, 0 );
+sub moveRelUpLeft {
+  my $self = shift;
+  my $params = shift;
+  $self->moveRel($params, 0);
 }
 
-sub moveRelUp
-{
-    my $self = shift;
-    my $params = shift;
-    $self->moveRel( $params, 1 );
+sub moveRelUp {
+  my $self = shift;
+  my $params = shift;
+  $self->moveRel($params, 1);
 }
 
-sub moveRelUpRight
-{
-    my $self = shift;
-    my $params = shift;
-    $self->moveRel( $params, 2 );
+sub moveRelUpRight {
+  my $self = shift;
+  my $params = shift;
+  $self->moveRel($params, 2);
 }
 
-sub moveRelLeft
-{
-    my $self = shift;
-    my $params = shift;
-    $self->moveRel( $params, 3 );
+sub moveRelLeft {
+  my $self = shift;
+  my $params = shift;
+  $self->moveRel($params, 3);
 }
 
-sub moveRelRight
-{
-    my $self = shift;
-    my $params = shift;
-    $self->moveRel( $params, 5 );
+sub moveRelRight {
+  my $self = shift;
+  my $params = shift;
+  $self->moveRel($params, 5);
 }
 
-sub moveRelDownLeft
-{
-    my $self = shift;
-    my $params = shift;

zoneminder-1.34.8.tar.gz/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm -> zoneminder-1.34.16.tar.gz/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm Changed

zoneminder-1.34.8.tar.gz/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in -> zoneminder-1.34.16.tar.gz/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in Changed

zoneminder-1.34.8.tar.gz/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm -> zoneminder-1.34.16.tar.gz/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm Changed

@@ -51,7 +51,7 @@
     );
 push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
 
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+our @EXPORT_OK = ( @{ $EXPORT_TAGS{all} } );
 
 our @EXPORT = @EXPORT_OK;
 
@@ -77,17 +77,17 @@
   my ( $monitor, $size ) = @_;
 
   if ( !$size ) {
-    Error("No size passed to zmMemAttach for monitor $$monitor{Id}");
+    Error('No size passed to zmMemAttach for monitor '.$$monitor{Id});
     return undef;
   }
   if ( defined($monitor->{MMapAddr}) ) {
-    Debug("zmMemAttach already attached at $monitor->{MMapAddr}");
+    Debug("zmMemAttach already attached at $monitor->{MMapAddr} for $$monitor{Id}");
     return !undef;
   }
 
   my $mmap_file = $Config{ZM_PATH_MAP}.'/zm.mmap.'.$monitor->{Id};
   if ( ! -e $mmap_file ) {
-    Error("Memory map file '$mmap_file' does not exist.  zmc might not be running.");
+    Error("Memory map file '$mmap_file' does not exist in zmMemAttach.  zmc might not be running.");
     return undef;
   }
   my $mmap_file_size = -s $mmap_file;
@@ -119,18 +119,24 @@
 
   if ( $monitor->{MMap} ) {
     if ( ! munmap(${$monitor->{MMap}}) ) {
-      Warn( "Unable to munmap for monitor $$monitor{Id}\n");
+      Warn("Unable to munmap for monitor $$monitor{Id}");
     }
     delete $monitor->{MMap};
+  } else {
+    Warn("No MMap for $$monitor{Id}");
   }
   if ( $monitor->{MMapAddr} ) {
     delete $monitor->{MMapAddr};
+  } else {
+    Warn("No MMapAddr in $$monitor{Id}");
   }
   if ( $monitor->{MMapHandle} ) {
     close($monitor->{MMapHandle});
     delete $monitor->{MMapHandle};
+  } else {
+    Warn("No MMapHandle in $$monitor{Id}");
   }
-}
+} # end sub zmMemDetach
 
 sub zmMemGet {
   my $monitor = shift;
@@ -162,7 +168,7 @@
 }
 
 sub zmMemClean {
-  Debug("Removing memory map files");
+  Debug('Removing memory map files');
   my $mapPath = $Config{ZM_PATH_MAP}.'/zm.mmap.*';
   foreach my $mapFile( glob( $mapPath ) ) {
     ( $mapFile ) = $mapFile =~ /^(.+)$/;

zoneminder-1.34.8.tar.gz/scripts/zmcamtool.pl.in -> zoneminder-1.34.16.tar.gz/scripts/zmcamtool.pl.in Changed

zoneminder-1.34.8.tar.gz/scripts/zmfilter.pl.in -> zoneminder-1.34.16.tar.gz/scripts/zmfilter.pl.in Changed

zoneminder-1.34.8.tar.gz/scripts/zmtelemetry.pl.in -> zoneminder-1.34.16.tar.gz/scripts/zmtelemetry.pl.in Changed

@@ -214,7 +214,7 @@
     $uuid = $Config{ZM_TELEMETRY_UUID} = $sth->fetchrow_array();
     $sth->finish();
 
-    $sql = q`UPDATE Config set Value = ? WHERE Name = 'ZM_TELEMETRY_UUID'`;
+    $sql = q`UPDATE Config SET Value = ? WHERE Name = 'ZM_TELEMETRY_UUID'`;
     $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
     $res = $sth->execute( "$uuid" ) or die( "Can't execute: ".$sth->errstr() );
     $sth->finish();
@@ -250,9 +250,9 @@
   my $dbh = shift;
   my $table = shift;
 
-  my $sql = "SELECT count(*) FROM $table";
-  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() );
+  my $sql = "SELECT count(*) FROM `$table`";
+  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();
   my $count = $sth->fetchrow_array();
   $sth->finish();
 
@@ -263,7 +263,7 @@
 sub getMonitorRef {
   my $dbh = shift;
 
-  my $sql = 'SELECT Id,Name,Type,Function,Width,Height,Colours,MaxFPS,AlarmMaxFPS FROM Monitors';
+  my $sql = 'SELECT `Id`,`Name`,`Type`,`Function`,`Width`,`Height`,`Colours`,`MaxFPS`,`AlarmMaxFPS` FROM `Monitors`';
   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() );
   my $arrayref = $sth->fetchall_arrayref({});

zoneminder-1.34.8.tar.gz/scripts/zmtrigger.pl.in -> zoneminder-1.34.16.tar.gz/scripts/zmtrigger.pl.in Changed

zoneminder-1.34.8.tar.gz/scripts/zmupdate.pl.in -> zoneminder-1.34.16.tar.gz/scripts/zmupdate.pl.in Changed

@@ -121,6 +121,8 @@
 my $dbh = zmDbConnect(undef, { mysql_multi_statements=>1 } );
 $Config{ZM_DB_USER} = $dbUser;
 $Config{ZM_DB_PASS} = $dbPass;
+# we escape dbpass with single quotes so that $ in the password has no effect, but dbpass could have a ' in it.
+$dbPass =~ s/'/\\'/g;
 
 if ( ! ($check || $freshen || $rename || $zoneFix || $migrateEvents || $version) ) {
   if ( $Config{ZM_DYN_DB_VERSION} ) {
@@ -384,21 +386,22 @@
       my $command = 'mysqldump';
       if ( defined($portOrSocket) ) {
         if ( $portOrSocket =~ /^\// ) {
-          $command .= " -S".$portOrSocket;
+          $command .= ' -S'.$portOrSocket;
         } else {
-          $command .= " -h".$host." -P".$portOrSocket;
+          $command .= ' -h'.$host.' -P'.$portOrSocket;
         }
       } else {
-        $command .= " -h".$host; 
+        $command .= ' -h'.$host; 
       }
       if ( $dbUser ) {
         $command .= ' -u'.$dbUser;
-        $command .= ' -p"'.$dbPass.'"' if $dbPass;
+        $command .= ' -p\''.$dbPass.'\'' if $dbPass;
       }
-      my $backup = "@ZM_TMPDIR@/".$Config{ZM_DB_NAME}."-".$version.".dump";
-      $command .= " --add-drop-table --databases ".$Config{ZM_DB_NAME}." > ".$backup;
-      print( "Creating backup to $backup. This may take several minutes.\n" );
-      print( "Executing '$command'\n" ) if ( logDebugging() );
+      my $backup = '@ZM_TMPDIR@/'.$Config{ZM_DB_NAME}.'-'.$version.'.dump';
+      $command .= ' --add-drop-table --databases '.$Config{ZM_DB_NAME}.' > '.$backup;
+      print("Creating backup to $backup. This may take several minutes.\n");
+      ($command) = $command =~ /(.*)/; # detaint
+      print("Executing '$command'\n") if logDebugging();
       my $output = qx($command);
       my $status = $? >> 8;
       if ( $status || logDebugging() ) {
@@ -847,9 +850,9 @@
     }
     $cascade = !undef;
   }
-  if ( $cascade || $version eq "1.24.4" ) {
+  if ( $cascade || $version eq '1.24.4' ) {
 # Patch the database
-    patchDB( $dbh, "1.24.4" );
+    patchDB($dbh, '1.24.4');
 
 # Copy the FTP specific values to the new general config
     my $fetchSql = "select * from Config where Name like 'ZM_UPLOAD_FTP_%'";
@@ -863,12 +866,12 @@
     }
     $cascade = !undef;
   }
-  if ( $cascade || $version lt "1.26.0" ) {
-    my $sth = $dbh->prepare_cached( 'select * from Monitors LIMIT 0,1' );
+  if ( $cascade || $version lt '1.26.0' ) {
+    my $sth = $dbh->prepare_cached('SELECT * FROM Monitors LIMIT 0,1');
     die "Error: " . $dbh->errstr . "\n" unless ($sth);
     die "Error: " . $sth->errstr . "\n" unless ($sth->execute);
 
-    my $columns = $sth->{'NAME'};
+    my $columns = $sth->{NAME};
     if ( ! grep(/^Colours$/, @$columns ) ) {
       $dbh->do(q{alter table Monitors add column `Colours` tinyint(3) unsigned NOT NULL default '1' after `Height`;});
     } # end if
@@ -898,28 +901,31 @@
       die "Should have found upgrade scripts at $updateDir\n";
     } # end if
 
+    my $sql = "UPDATE `Config` SET `Value` = ? WHERE `Name` = 'ZM_DYN_DB_VERSION'";
+    my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
+
     foreach my $patch ( @files ) {
       my ( $v ) = $patch =~ /^zm_update\-([\d\.]+)\.sql$/;
 #PP make sure we use version compare 
-      if ( version->parse('v' . $v) > version->parse('v' . $version) ) {
-        print( "Upgrading DB to $v from $version\n" );
-        patchDB( $dbh, $v );
-  my $sql = "update Config set Value = ? where Name = 'ZM_DYN_DB_VERSION'";
-  my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-  my $res = $sth->execute( $version ) or die( "Can't execute: ".$sth->errstr() );
-  $sth->finish();
+      if ( version->parse('v'.$v) > version->parse('v'.$version) ) {
+        print("Upgrading DB to $v from $version\n");
+        if ( patchDB($dbh, $v) ) {
+          my $res = $sth->execute($version) or die( "Can't execute: ".$sth->errstr() );
+        }
         #patchDB_using_do( $dbh, $version, $updateDir.'/'.$patch );
       } # end if newer version
     } # end foreach patchfile
+
+    $sth->finish();
     $cascade = !undef;
   } # end if
 
   if ( $cascade ) {
-    my $installed_version = ZM_VERSION;
-    my $sql = 'update Config set Value = ? where Name = ?';
+    # This is basically here so that we don't need zm-update-blah.sql files for versions without db changes
+    my $sql = 'UPDATE `Config` SET `Value` = ? WHERE `Name` = ?';
     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->execute(ZM_VERSION, 'ZM_DYN_DB_VERSION') or die( "Can't execute: ".$sth->errstr() );
+    $sth->execute(ZM_VERSION, 'ZM_DYN_CURR_VERSION') or die( "Can't execute: ".$sth->errstr() );
     $sth->finish();
   } else {
     zmDbDisconnect();
@@ -930,42 +936,43 @@
   #my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
   #my $res = $sth->execute( ) or die( "Can't execute: ".$sth->errstr() );
   #$sth->finish();
-  print( "\nDatabase upgrade to version ".ZM_VERSION." successful.\n\n" );
-}
+  print("\nDatabase upgrade to version ".ZM_VERSION." successful.\n\n");
+} # end if version
+
 zmDbDisconnect();
-exit( 0 );
+exit(0);
 
 sub patchDB_using_do {
   my ( $dbh, $version, $file ) = @_;
 
-  open( my $fh, '<', $file ) or die "Unable to open $file $!";
+  open(my $fh, '<', $file) or die "Unable to open $file $!";
   $/ = undef;
   my $sql = <$fh>;
   close $fh;
   if ( $sql ) {
-    $dbh->{'AutoCommit'} = 0;
+    $dbh->{AutoCommit} = 0;
     $dbh->do($sql);
     if ( $dbh->errstr() ) {
       $dbh->rollback();
-      die "Error: " . $dbh->errstr(). ".  Rolled back.\n";		
+      die 'Error: '.$dbh->errstr().".  Rolled back.\n";		
     } # end if error
 
-    my $sql = "update Config set Value = ? where Name = 'ZM_DYN_DB_VERSION'";
-    my $sth = $dbh->prepare_cached( $sql ) or die( "Can't prepare '$sql': ".$dbh->errstr() );
-    my $res = $sth->execute( $version ) or die( "Can't execute: ".$sth->errstr() );
+    my $sql = 'UPDATE `Config` SET `Value` = ? WHERE `Name` = \'ZM_DYN_DB_VERSION\'';
+    my $sth = $dbh->prepare_cached($sql) or die "Can't prepare '$sql': ".$dbh->errstr();
+    my $res = $sth->execute($version) or die 'Can\'t execute: '.$sth->errstr();
     $sth->finish();
 
-    $dbh->{'AutoCommit'} = 1;
+    $dbh->{AutoCommit} = 1;
   } else {
     Warning("Empty db update file at $file");
   }
-}
+} # end sub patchDB_using_do
+
 sub patchDB {
   my $dbh = shift;
   my $version = shift;
 
-
-  my ( $host, $portOrSocket ) = ( $Config{ZM_DB_HOST} =~ /^([^:]+)(?::(.+))?$/ );
+  my ( $host, $portOrSocket ) = ( $Config{ZM_DB_HOST} =~ /^([^:]+)(?::(.+))?$/ ) if $Config{ZM_DB_HOST};
   my $command = 'mysql';
   if ( defined($portOrSocket) ) {
     if ( $portOrSocket =~ /^\// ) {
@@ -973,12 +980,12 @@
     } else {
       $command .= ' -h'.$host.' -P'.$portOrSocket;
     }
-  } else {
+  } elsif ( $host ) {
     $command .= ' -h'.$host;
   }
   if ( $dbUser ) {
     $command .= ' -u'.$dbUser;
-    $command .= ' -p"'.$dbPass.'"' if $dbPass;
+    $command .= ' -p\''.$dbPass.'\'' if $dbPass;
   }
   $command .= ' '.$Config{ZM_DB_NAME}.' < ';
   if ( $updateDir ) {
@@ -988,39 +995,38 @@
   }
   $command .= '/zm_update-'.$version.'.sql';
 
-  print( "Executing '$command'\n" ) if ( logDebugging() );
+  print("Executing '$command'\n") if logDebugging();
   my $output = qx($command);
   my $status = $? >> 8;
   if ( $status || logDebugging() ) {
-    chomp( $output );
-    print( "Output: $output\n" );
+    chomp($output);
+    print("Output: $output\n");
   }
   if ( $status ) {
-    die( "Command '$command' exited with status: $status\n" );
+    die("Command '$command' exited with status: $status\n");

zoneminder-1.34.8.tar.gz/scripts/zmx10.pl.in -> zoneminder-1.34.16.tar.gz/scripts/zmx10.pl.in Changed

@@ -83,72 +83,64 @@
 my $version;
 
 GetOptions(
-    'command=s'     =>\$command,
-    'unit-code=i'   =>\$unit_code,
-    'version'       =>\$version
+  'command=s'     =>\$command,
+  'unit-code=i'   =>\$unit_code,
+  'version'       =>\$version
 ) or pod2usage(-exitstatus => -1);
 
 if ( $version ) {
-    print ZoneMinder::Base::ZM_VERSION;
-    exit(0);
+  print ZoneMinder::Base::ZM_VERSION;
+  exit(0);
 }
 
-die( 'No command given' ) unless( $command );
-die( 'No unit code given' )
-    unless( $unit_code || ($command =~ /(?:start|status|shutdown)/) );
+die 'No command given' unless $command;
+die 'No unit code given'
+unless( $unit_code || ($command =~ /(?:start|status|shutdown)/) );
 
-if ( $command eq 'start' )
-{
-    X10Server::runServer();
-    exit();
+if ( $command eq 'start' ) {
+  X10Server::runServer();
+  exit();
 }
 
-socket( CLIENT, PF_UNIX, SOCK_STREAM, 0 )
-    or Fatal( "Can't open socket: $!" );
-
-my $saddr = sockaddr_un( SOCK_FILE );
-
-if ( !connect( CLIENT, $saddr ) )
-{
-    # The server isn't there 
-    print( "Unable to connect, starting server\n" );
-    close( CLIENT );
-
-    if ( my $cpid = fork() )
-    {
-        # Parent process just sleep and fall through
-        sleep( 2 );
-        logReinit();
-        socket( CLIENT, PF_UNIX, SOCK_STREAM, 0 )
-            or Fatal( "Can't open socket: $!" );
-        connect( CLIENT, $saddr )
-            or Fatal( "Can't connect: $!" );
-    }
-    elsif ( defined($cpid) )
-    {
-        setpgrp();
+socket(CLIENT, PF_UNIX, SOCK_STREAM, 0)
+  or Fatal("Can't open socket: $!");
 
-        logReinit();
-        X10Server::runServer();
-    }
-    else
-    {
-        Fatal( "Can't fork: $!" );
-    }
+my $saddr = sockaddr_un(SOCK_FILE);
+
+if ( !connect(CLIENT, $saddr) ) {
+  # The server isn't there 
+  print("Unable to connect, starting server\n");
+  close(CLIENT);
+
+  if ( my $cpid = fork() ) {
+    # Parent process just sleep and fall through
+    sleep(2);
+    logReinit();
+    socket(CLIENT, PF_UNIX, SOCK_STREAM, 0)
+      or Fatal("Can't open socket: $!");
+    connect(CLIENT, $saddr)
+      or Fatal("Can't connect: $!");
+  } elsif ( defined($cpid) ) {
+    setpgrp();
+
+    logReinit();
+    X10Server::runServer();
+  } else {
+    Fatal("Can't fork: $!");
+  }
 }
 # The server is there, connect to it
 #print( "Writing commands\n" );
 CLIENT->autoflush();
-my $message = "$command";
-$message .= ";$unit_code" if ( $unit_code );
-print( CLIENT $message );
-shutdown( CLIENT, 1 );
-while ( my $line = <CLIENT> )
-{
-    chomp( $line );
-    print( "$line\n" );
+my $message = $command;
+$message .= ';'.$unit_code if $unit_code;
+print(CLIENT $message);
+shutdown(CLIENT, 1);
+while ( my $line = <CLIENT> ) {
+  chomp($line);
+  print("$line\n");
 }
-close( CLIENT );
+close(CLIENT);
 #print( "Finished writing, bye\n" );
 exit;
 
@@ -178,605 +170,497 @@
 our %device_hash;
 our %pending_tasks;
 
-sub runServer
-{
-    Info( "X10 server starting\n" );
-
-    socket( SERVER, PF_UNIX, SOCK_STREAM, 0 )
-        or Fatal( "Can't open socket: $!" );
-    unlink( main::SOCK_FILE );
-    my $saddr = sockaddr_un( main::SOCK_FILE );
-    bind( SERVER, $saddr ) or Fatal( "Can't bind: $!" );
-    listen( SERVER, SOMAXCONN ) or Fatal( "Can't listen: $!" );
-
-    $dbh = zmDbConnect();
-
-    $x10 = new X10::ActiveHome( port=>$Config{ZM_X10_DEVICE}, house_code=>$Config{ZM_X10_HOUSE_CODE}, debug=>0 );
-
-    loadTasks();
-
-    $x10->register_listener( \&x10listen );
-
-    my $rin = '';
-    vec( $rin, fileno(SERVER),1) = 1;
-    vec( $rin, $x10->select_fds(),1) = 1;
-    my $timeout = 0.2;
-    #print( 'F:'.fileno(SERVER)."\n" );
-    my $reload = undef;
-    my $reload_count = 0;
-    my $reload_limit = $Config{ZM_X10_DB_RELOAD_INTERVAL} / $timeout;
-    while( 1 )
-    {
-        my $nfound = select( my $rout = $rin, undef, undef, $timeout );
-        #print( "Off select, NF:$nfound, ER:$!\n" );
-        #print( vec( $rout, fileno(SERVER),1)."\n" );
-        #print( vec( $rout, $x10->select_fds(),1)."\n" );
-        if ( $nfound > 0 )
-        {
-            if ( vec( $rout, fileno(SERVER),1) )
-            {
-                my $paddr = accept( CLIENT, SERVER );
-                my $message = <CLIENT>;
-
-                my ( $command, $unit_code ) = split( /;/, $message );
-
-                my $device;
-                if ( defined($unit_code) )
-                {
-                    if ( $unit_code < 1 || $unit_code > 16 )
-                    {
-                        dPrint( ZoneMinder::Logger::ERROR, "Invalid unit code '$unit_code'\n" );
-                        next;
-                    }
-
-                    $device = $device_hash{$unit_code};
-                    if ( !$device )
-                    {
-                        $device = $device_hash{$unit_code} = { appliance=>$x10->Appliance( unit_code=>$unit_code ),
-                                                               status=>'unknown'
-                                                             };
-                    }
-                }
-
-                my $result;
-                if ( $command eq 'on' )
-                {
-                    $result = $device->{appliance}->on();
-                }
-                elsif ( $command eq 'off' )
-                {
-                    $result = $device->{appliance}->off();
-                }
-                #elsif ( $command eq 'dim' )
-                #{
-                    #$result = $device->{appliance}->dim();
-                #}
-                #elsif ( $command eq 'bright' )
-                #{
-                    #$result = $device->{appliance}->bright();
-                #}
-                elsif ( $command eq 'status' )
-                {

zoneminder-1.34.8.tar.gz/src/zm_box.h -> zoneminder-1.34.16.tar.gz/src/zm_box.h Changed

@@ -33,37 +33,33 @@
 // Class used for storing a box, which is defined as a region
 // defined by two coordinates
 //
-class Box
-{
+class Box {
 private:
   Coord lo, hi;
   Coord size;
 
 public:
-  inline Box()
-  {
-  }
+  inline Box() { }
   explicit inline Box( int p_size ) : lo( 0, 0 ), hi ( p_size-1, p_size-1 ), size( Coord::Range( hi, lo ) ) { }
   inline Box( int p_x_size, int p_y_size ) : lo( 0, 0 ), hi ( p_x_size-1, p_y_size-1 ), size( Coord::Range( hi, lo ) ) { }
   inline Box( int lo_x, int lo_y, int hi_x, int hi_y ) : lo( lo_x, lo_y ), hi( hi_x, hi_y ), size( Coord::Range( hi, lo ) ) { }
   inline Box( const Coord &p_lo, const Coord &p_hi ) : lo( p_lo ), hi( p_hi ), size( Coord::Range( hi, lo ) ) { }
 
-  inline const Coord &Lo() const { return( lo ); }
-  inline int LoX() const { return( lo.X() ); }
-  inline int LoY() const { return( lo.Y() ); }
-  inline const Coord &Hi() const { return( hi ); }
-  inline int HiX() const { return( hi.X() ); }
-  inline int HiY() const { return( hi.Y() ); }
-  inline const Coord &Size() const { return( size ); }
-  inline int Width() const { return( size.X() ); }
-  inline int Height() const { return( size.Y() ); }
-  inline int Area() const { return( size.X()*size.Y() ); }
+  inline const Coord &Lo() const { return lo; }
+  inline int LoX() const { return lo.X(); }
+  inline int LoY() const { return lo.Y(); }
+  inline const Coord &Hi() const { return hi; }
+  inline int HiX() const { return hi.X(); }
+  inline int HiY() const { return hi.Y(); }
+  inline const Coord &Size() const { return size; }
+  inline int Width() const { return size.X(); }
+  inline int Height() const { return size.Y(); }
+  inline int Area() const { return size.X()*size.Y(); }
 
-  inline const Coord Centre() const
-  {
+  inline const Coord Centre() const {
     int mid_x = int(round(lo.X()+(size.X()/2.0)));
     int mid_y = int(round(lo.Y()+(size.Y()/2.0)));
-    return( Coord( mid_x, mid_y ) );
+    return Coord( mid_x, mid_y );
   }
   inline bool Inside( const Coord &coord ) const
   {

zoneminder-1.34.8.tar.gz/src/zm_config.cpp -> zoneminder-1.34.16.tar.gz/src/zm_config.cpp Changed

zoneminder-1.34.8.tar.gz/src/zm_coord.h -> zoneminder-1.34.16.tar.gz/src/zm_coord.h Changed

zoneminder-1.34.8.tar.gz/src/zm_db.cpp -> zoneminder-1.34.16.tar.gz/src/zm_db.cpp Changed

zoneminder-1.34.8.tar.gz/src/zm_eventstream.cpp -> zoneminder-1.34.16.tar.gz/src/zm_eventstream.cpp Changed

@@ -100,6 +100,7 @@
     if ( init_frame_id >= event_data->frame_count ) {
       Error("Invalid frame id specified. %d > %d", init_frame_id, event_data->frame_count);
       curr_stream_time = event_data->start_time;
+      curr_frame_id = 1;
     } else {
       curr_stream_time = event_data->frames[init_frame_id-1].timestamp;
       curr_frame_id = init_frame_id;
@@ -163,7 +164,22 @@
   event_data->Orientation = (Monitor::Orientation)(dbrow[8] == NULL ? 0 : atoi(dbrow[8]));
   mysql_free_result(result);
 
-  Storage * storage = new Storage(event_data->storage_id);
+  if ( !monitor ) {
+    monitor = Monitor::Load(event_data->monitor_id, false, Monitor::QUERY);
+  } else if ( monitor->Id() != event_data->monitor_id ) {
+    delete monitor;
+    monitor = Monitor::Load(event_data->monitor_id, false, Monitor::QUERY);
+  }
+  if ( !monitor ) {
+    Fatal("Unable to load monitor id %d for streaming", event_data->monitor_id);
+  }
+
+  if ( !storage ) {
+    storage = new Storage(event_data->storage_id);
+  } else if ( storage->Id() != event_data->storage_id ) {
+    delete storage;
+    storage = new Storage(event_data->storage_id);
+  }
   const char *storage_path = storage->Path();
 
   if ( event_data->scheme == Storage::DEEP ) {
@@ -205,7 +221,6 @@
           staticConfig.PATH_WEB.c_str(), storage_path, event_data->monitor_id,
           event_data->event_id);
   }
-  delete storage; storage = NULL;
 
   updateFrameRate((double)event_data->frame_count/event_data->duration);
   Debug(3, "fps set by frame_count(%d)/duration(%f)",
@@ -245,7 +260,7 @@
         event_data->frames[i-1].timestamp = last_timestamp + ((i-last_id)*frame_delta);
         event_data->frames[i-1].offset = event_data->frames[i-1].timestamp - event_data->start_time;
         event_data->frames[i-1].in_db = false;
-        Debug(3,"Frame %d timestamp:(%f), offset(%f) delta(%f), in_db(%d)",
+        Debug(3, "Frame %d timestamp:(%f), offset(%f) delta(%f), in_db(%d)",
             i,
             event_data->frames[i-1].timestamp,
             event_data->frames[i-1].offset,
@@ -276,7 +291,10 @@
 
   mysql_free_result(result);
 
-  if ( event_data->video_file[0] ) {
+  if ( event_data->video_file[0] || (monitor->GetOptVideoWriter() > 0) ) {
+    if ( !event_data->video_file[0] ) {
+      snprintf(event_data->video_file, sizeof(event_data->video_file), "%" PRIu64 "-%s", event_data->event_id, "video.mp4");
+    }
     std::string filepath = std::string(event_data->path) + "/" + std::string(event_data->video_file);
     //char filepath[PATH_MAX];
     //snprintf(filepath, sizeof(filepath), "%s/%s", event_data->path, event_data->video_file);
@@ -304,7 +322,7 @@
 void EventStream::processCommand(const CmdMsg *msg) {
   Debug(2, "Got message, type %d, msg %d", msg->msg_type, msg->msg_data[0]);
   // Check for incoming command
-  switch( (MsgCommand)msg->msg_data[0] ) {
+  switch ( (MsgCommand)msg->msg_data[0] ) {
     case CMD_PAUSE :
         Debug(1, "Got PAUSE command");
 
@@ -385,6 +403,8 @@
         paused = true;
         replay_rate = ZM_RATE_BASE;
         step = -1;
+        curr_frame_id -= 1;
+        if ( curr_frame_id < 1 ) curr_frame_id = 1;
         break;
     case CMD_FASTREV :
         Debug(1, "Got FAST REV command");
@@ -540,7 +560,7 @@
   updateFrameRate((double)event_data->frame_count/event_data->duration);
 } // void EventStream::processCommand(const CmdMsg *msg)
 
-void EventStream::checkEventLoaded() {
+bool EventStream::checkEventLoaded() {
   static char sql[ZM_SQL_SML_BUFSIZ];
 
   if ( curr_frame_id <= 0 ) {
@@ -555,7 +575,7 @@
     // No event change required
     Debug(3, "No event change required, as curr frame %d <=> event frames %d",
         curr_frame_id, event_data->frame_count);
-    return;
+    return false;
   }
 
   // Event change required.
@@ -583,12 +603,12 @@
 
       loadEventData(event_id);
 
-      Debug(2, "Current frame id = %d", curr_frame_id);
       if ( replay_rate < 0 )  // rewind
         curr_frame_id = event_data->frame_count;
       else
         curr_frame_id = 1;
       Debug(2, "New frame id = %d", curr_frame_id);
+      return true;
     } else {
       Debug(2, "No next event loaded using %s. Pausing", sql);
       if ( curr_frame_id <= 0 )
@@ -608,6 +628,7 @@
       curr_frame_id = event_data->frame_count;
     paused = true;
   }
+  return false;
 } // void EventStream::checkEventLoaded()
 
 Image * EventStream::getImage( ) {
@@ -653,7 +674,8 @@
     Image *send_image = prepareImage(&image);
 
     if ( !vid_stream ) {
-      vid_stream = new VideoStream("pipe:", format, bitrate, effective_fps, send_image->Colours(), send_image->SubpixelOrder(), send_image->Width(), send_image->Height());
+      vid_stream = new VideoStream("pipe:", format, bitrate, effective_fps,
+          send_image->Colours(), send_image->SubpixelOrder(), send_image->Width(), send_image->Height());
       fprintf(stdout, "Content-type: %s\r\n\r\n", vid_stream->MimeType());
       vid_stream->OpenStream();
     }
@@ -696,9 +718,10 @@
       } else if ( ffmpeg_input ) {
         // Get the frame from the mp4 input
         Debug(1,"Getting frame from ffmpeg");
-        AVFrame *frame;
         FrameData *frame_data = &event_data->frames[curr_frame_id-1];
-        frame = ffmpeg_input->get_frame( ffmpeg_input->get_video_stream_id(), frame_data->offset );
+        AVFrame *frame = ffmpeg_input->get_frame(
+            ffmpeg_input->get_video_stream_id(),
+            frame_data->offset);
         if ( frame ) {
           image = new Image(frame);
           //av_frame_free(&frame);
@@ -929,7 +952,7 @@
         send_frame = true;
       }
     } else if ( step != 0 ) {
-      Debug(2, "Paused with step");
+      Debug(2, "Paused with step %d", step);
       // We are paused and are just stepping forward or backward one frame
       step = 0;
       send_frame = true;
@@ -978,8 +1001,8 @@
       // you can calculate the relationship between now and the start
       // or calc the relationship from the last frame.  I think from the start is better as it self-corrects
 
-      if ( send_frame && type != STREAM_MPEG ) {
-        if ( delta_us > 0) {
+      if ( send_frame && (type != STREAM_MPEG) ) {
+        if ( delta_us > 0 ) {
           if ( delta_us > MAX_SLEEP_USEC ) {
             Debug(1, "Limiting sleep to %d because calculated sleep is too long %d", MAX_SLEEP_USEC, delta_us);
             delta_us = MAX_SLEEP_USEC;
@@ -1022,18 +1045,12 @@
   closeComms();
 } // void EventStream::runStream()
 
-void EventStream::setStreamStart( uint64_t init_event_id, unsigned int init_frame_id=0 ) {
+void EventStream::setStreamStart(
+    uint64_t init_event_id,
+    unsigned int init_frame_id=0) {
   loadInitialEventData(init_event_id, init_frame_id);
-  if ( !(monitor = Monitor::Load(event_data->monitor_id, false, Monitor::QUERY)) ) {
-    Fatal("Unable to load monitor id %d for streaming", event_data->monitor_id);
-    return;
-  }
-}
+}  // end void EventStream::setStreamStart(init_event_id,init_frame_id=0)
 
 void EventStream::setStreamStart(int monitor_id, time_t event_time) {
   loadInitialEventData(monitor_id, event_time);
-  if ( !(monitor = Monitor::Load(event_data->monitor_id, false, Monitor::QUERY)) ) {
-    Fatal("Unable to load monitor id %d for streaming", monitor_id);
-    return;
-  }
 }

zoneminder-1.34.8.tar.gz/src/zm_eventstream.h -> zoneminder-1.34.16.tar.gz/src/zm_eventstream.h Changed

@@ -20,9 +20,6 @@
 #ifndef ZM_EVENTSTREAM_H
 #define ZM_EVENTSTREAM_H
 
-#include <set>
-#include <map>
-
 #include "zm_image.h"
 #include "zm_stream.h"
 #include "zm_video.h"
@@ -83,35 +80,51 @@
     struct timeval start;     // clock time when started the event
 
     EventData *event_data;
-    FFmpeg_Input  *ffmpeg_input;
 
   protected:
     bool loadEventData( uint64_t event_id );
     bool loadInitialEventData( uint64_t init_event_id, unsigned int init_frame_id );
     bool loadInitialEventData( int monitor_id, time_t event_time );
 
-    void checkEventLoaded();
+    bool checkEventLoaded();
     void processCommand( const CmdMsg *msg );
     bool sendFrame( int delta_us );
 
   public:
-    EventStream() {
-      mode = DEFAULT_MODE;
-    replay_rate = DEFAULT_RATE;
-
-      forceEventChange = false;
-
-      curr_frame_id = 0;
-      curr_stream_time = 0.0;
-      send_frame = false;
-
-      event_data = 0;
-
+    EventStream() :
+      mode(DEFAULT_MODE),
+      forceEventChange(false),
+      curr_frame_id(0),
+      curr_stream_time(0.0),
+      send_frame(false),
+      event_data(0),
+      storage(NULL),
+      ffmpeg_input(NULL),
       // Used when loading frames from an mp4
-      input_codec_context = 0;
-      input_codec = 0;
-
-      ffmpeg_input = NULL;
+      input_codec_context(0),
+      input_codec(0)
+    {}
+    ~EventStream() {
+        if ( event_data ) {
+          if ( event_data->frames ) {
+            delete[] event_data->frames;
+            event_data->frames = NULL;
+          }
+          delete event_data;
+          event_data = NULL;
+        }
+        if ( monitor ) {
+          delete monitor;
+          monitor = NULL;
+        }
+        if ( storage ) {
+          delete storage;
+          storage = NULL;
+        }
+        if ( ffmpeg_input ) {
+          delete ffmpeg_input;
+          ffmpeg_input = NULL;
+        }
     }
     void setStreamStart( uint64_t init_event_id, unsigned int init_frame_id );
     void setStreamStart( int monitor_id, time_t event_time );
@@ -121,8 +134,10 @@
     void runStream();
     Image *getImage();
   private:
-      AVCodecContext *input_codec_context;
-      AVCodec *input_codec;
+    Storage *storage;
+    FFmpeg_Input  *ffmpeg_input;
+    AVCodecContext *input_codec_context;
+    AVCodec *input_codec;
 };
 
 #endif // ZM_EVENTSTREAM_H

zoneminder-1.34.8.tar.gz/src/zm_ffmpeg.h -> zoneminder-1.34.16.tar.gz/src/zm_ffmpeg.h Changed

zoneminder-1.34.8.tar.gz/src/zm_ffmpeg_camera.cpp -> zoneminder-1.34.16.tar.gz/src/zm_ffmpeg_camera.cpp Changed

@@ -148,6 +148,7 @@
   have_video_keyframe = false;
   packetqueue = NULL;
   error_count = 0;
+  use_hwaccel = true;
 #if HAVE_LIBAVUTIL_HWCONTEXT_H
   hwFrame = NULL;
   hw_device_ctx = NULL;
@@ -471,7 +472,7 @@
 
   zm_dump_stream_format(mFormatContext, mVideoStreamId, 0, 0);
 
-  if ( hwaccel_name != "" ) {
+  if ( use_hwaccel && (hwaccel_name != "") ) {
 #if HAVE_LIBAVUTIL_HWCONTEXT_H
     // 3.2 doesn't seem to have all the bits in place, so let's require 3.3 and up
 #if LIBAVCODEC_VERSION_CHECK(57, 89, 0, 89, 0)
@@ -503,8 +504,9 @@
         hw_pix_fmt = config->pix_fmt;
         break;
       } else {
-        Debug(1, "decoder %s hwConfig doesn't match our type: %s, pix_fmt %s.",
+        Debug(1, "decoder %s hwConfig doesn't match our type: %s != %s, pix_fmt %s.",
             mVideoCodec->name,
+            av_hwdevice_get_type_name(type),
             av_hwdevice_get_type_name(config->device_type),
             av_get_pix_fmt_name(config->pix_fmt)
             );
@@ -603,6 +605,8 @@
     Error("Unable to allocate frame for %s", mPath.c_str());
     return -1;
   }
+  mFrame->width = width;
+  mFrame->height = height;
 
 #if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
   int pSize = av_image_get_buffer_size(imagePixFormat, width, height, 1);
@@ -630,20 +634,6 @@
     return -1;
   }
 
-# if 0
-  // Must get a frame first to find out the actual format returned by decoding
-  mConvertContext = sws_getContext(
-      mVideoCodecContext->width,
-      mVideoCodecContext->height,
-      mVideoCodecContext->pix_fmt,
-      width, height,
-      imagePixFormat, SWS_BICUBIC, NULL,
-      NULL, NULL);
-  if ( mConvertContext == NULL ) {
-    Error("Unable to create conversion context for %s", mPath.c_str());
-    return -1;
-  }
-#endif
 #else  // HAVE_LIBSWSCALE
   Fatal("You must compile ffmpeg with the --enable-swscale "
       "option to use ffmpeg cameras");
@@ -985,6 +975,12 @@
             Error("Error count over 100, going to close and re-open stream");
             return -1;
           }
+#if HAVE_LIBAVUTIL_HWCONTEXT_H
+          if ( (ret == AVERROR_INVALIDDATA ) && (hw_pix_fmt != AV_PIX_FMT_NONE) ) {
+            use_hwaccel = false;
+            return -1;
+          }
+#endif
         }
         zm_av_packet_unref(&packet);
         continue;
@@ -1090,7 +1086,9 @@
   // From what I've read, we should align the linesizes to 32bit so that ffmpeg can use SIMD instructions too.
   int size = av_image_fill_arrays(
       output_frame->data, output_frame->linesize,
-      directbuffer, imagePixFormat, width, height, 32);
+      directbuffer, imagePixFormat, width, height, 
+      (AV_PIX_FMT_RGBA == imagePixFormat ? 32 : 1)
+      );
   if ( size < 0 ) {
     Error("Problem setting up data pointers into image %s",
         av_make_error_string(size).c_str());
@@ -1130,12 +1128,12 @@
         0, mVideoCodecContext->height,
         output_frame->data, output_frame->linesize);
   if ( ret < 0 ) {
-    Error("Unable to convert format %u %s linesize %d height %d to format %u %s linesize %d at frame %d codec %u %s lines %d: code: %d",
+    Error("Unable to convert format %u %s linesize %d,%d height %d to format %u %s linesize %d,%d at frame %d codec %u %s lines %d: code: %d",
         input_frame->format, av_get_pix_fmt_name((AVPixelFormat)input_frame->format),
-        input_frame->linesize, mVideoCodecContext->height,
+        input_frame->linesize[0], input_frame->linesize[1], mVideoCodecContext->height,
         imagePixFormat,
         av_get_pix_fmt_name(imagePixFormat),
-        output_frame->linesize,
+        output_frame->linesize[0], output_frame->linesize[1],
         frameCount,
         mVideoCodecContext->pix_fmt, av_get_pix_fmt_name(mVideoCodecContext->pix_fmt),
         mVideoCodecContext->height,
@@ -1143,6 +1141,17 @@
         );
     return -1;
   }
+    Debug(4, "Able to convert format %u %s linesize %d,%d height %d to format %u %s linesize %d,%d at frame %d codec %u %s %dx%d ",
+        input_frame->format, av_get_pix_fmt_name((AVPixelFormat)input_frame->format),
+        input_frame->linesize[0], input_frame->linesize[1], mVideoCodecContext->height,
+        imagePixFormat,
+        av_get_pix_fmt_name(imagePixFormat),
+        output_frame->linesize[0], output_frame->linesize[1],
+        frameCount,
+        mVideoCodecContext->pix_fmt, av_get_pix_fmt_name(mVideoCodecContext->pix_fmt),
+        output_frame->width,
+        output_frame->height
+        );
 #else  // HAVE_LIBSWSCALE
   Fatal("You must compile ffmpeg with the --enable-swscale "
       "option to use ffmpeg cameras");

zoneminder-1.34.8.tar.gz/src/zm_ffmpeg_camera.h -> zoneminder-1.34.16.tar.gz/src/zm_ffmpeg_camera.h Changed

zoneminder-1.34.8.tar.gz/src/zm_ffmpeg_input.cpp -> zoneminder-1.34.16.tar.gz/src/zm_ffmpeg_input.cpp Changed

@@ -15,10 +15,26 @@
 
 FFmpeg_Input::~FFmpeg_Input() {
   if ( streams ) {
+    for ( unsigned int i = 0; i < input_format_context->nb_streams; i += 1 ) {
+      avcodec_close(streams[i].context);
+      streams[i].context = NULL;
+    }
     delete streams;
     streams = NULL;
   }
-}
+  if ( frame ) {
+    av_frame_free(&frame);
+    frame = NULL;
+  }
+  if ( input_format_context ) {
+#if !LIBAVFORMAT_VERSION_CHECK(53, 17, 0, 25, 0)
+    av_close_input_file(input_format_context);
+#else
+    avformat_close_input(&input_format_context);
+#endif
+    input_format_context = NULL;
+  }
+}  // end ~FFmpeg_Input()
 
 int FFmpeg_Input::Open(const char *filepath) {
 
@@ -90,6 +106,7 @@
       avcodec_free_context(&streams[i].context);
 #endif
       avformat_close_input(&input_format_context);
+      input_format_context = NULL;
       return error;
     }
   } // end foreach stream
@@ -103,7 +120,6 @@
 } // end int FFmpeg_Input::Open( const char * filepath )
 
 AVFrame *FFmpeg_Input::get_frame(int stream_id) {
-
   int frameComplete = false;
   AVPacket packet;
   av_init_packet(&packet);
@@ -139,13 +155,17 @@
       }
       ret = zm_send_packet_receive_frame(context, frame, packet);
       if ( ret < 0 ) {
-        Error("Unable to decode frame at frame %d: %s, continuing",
-            streams[packet.stream_index].frame_count, av_make_error_string(ret).c_str());
+        Error("Unable to decode frame at frame %d: %d %s, continuing",
+            streams[packet.stream_index].frame_count, ret, av_make_error_string(ret).c_str());
         zm_av_packet_unref(&packet);
         av_frame_free(&frame);
         continue;
 			} else {
-				zm_dump_frame(frame, "resulting frame");
+        if ( is_video_stream(input_format_context->streams[packet.stream_index]) ) {
+          zm_dump_video_frame(frame, "resulting video frame");
+        } else {
+          zm_dump_frame(frame, "resulting frame");
+        }
       }
 
       frameComplete = 1;
@@ -207,15 +227,17 @@
 	last_seek_request = seek_target;
 
   // Seeking seems to typically seek to a keyframe, so then we have to decode until we get the frame we want.
-  if ( frame->pts <= seek_target  ) {
+  if ( frame->pts <= seek_target ) {
     zm_dump_frame(frame, "pts <= seek_target");
     while ( frame && (frame->pts < seek_target) ) {
-      if ( !get_frame(stream_id) ) 
+      if ( !get_frame(stream_id) ) {
+        Warning("Got no frame. returning nothing");
         return frame;
+      }
     }
+    zm_dump_frame(frame, "frame->pts <= seek_target, got");
     return frame;
   }
 
   return get_frame(stream_id);
-
-} // end AVFrame *FFmpeg_Input::get_frame( int stream_id, struct timeval at)
+}  // end AVFrame *FFmpeg_Input::get_frame( int stream_id, struct timeval at)

zoneminder-1.34.8.tar.gz/src/zm_image.cpp -> zoneminder-1.34.16.tar.gz/src/zm_image.cpp Changed

@@ -48,6 +48,8 @@
 static short *g_u_table;
 static short *b_u_table;
 
+struct SwsContext *sws_convert_context = NULL;
+
 jpeg_compress_struct *Image::writejpg_ccinfo[101] = { 0 };
 jpeg_compress_struct *Image::encodejpg_ccinfo[101] = { 0 };
 jpeg_decompress_struct *Image::readjpg_dcinfo = 0;
@@ -160,15 +162,17 @@
   update_function_pointers();
 }
 
-Image::Image( const AVFrame *frame ) {
+Image::Image(const AVFrame *frame) {
   AVFrame *dest_frame = zm_av_frame_alloc();
   text[0] = '\0';
 
   width = frame->width;
   height = frame->height;
   pixels = width*height;
+
   colours = ZM_COLOUR_RGB32;
   subpixelorder = ZM_SUBPIX_ORDER_RGBA;
+
   size = pixels*colours;
   buffer = 0;
   holdbuffer = 0;
@@ -183,26 +187,28 @@
 #endif
 
 #if HAVE_LIBSWSCALE
-  struct SwsContext   *mConvertContext = sws_getContext(
+  sws_convert_context = sws_getCachedContext(
+      sws_convert_context,
       width,
       height,
       (AVPixelFormat)frame->format,
       width, height,
       AV_PIX_FMT_RGBA, SWS_BICUBIC, NULL,
       NULL, NULL);
-  if ( mConvertContext == NULL )
-    Fatal( "Unable to create conversion context" );
+  if ( sws_convert_context == NULL )
+    Fatal("Unable to create conversion context");
 
-  if ( sws_scale(mConvertContext, frame->data, frame->linesize, 0, frame->height, dest_frame->data, dest_frame->linesize) < 0 )
+  if ( sws_scale(sws_convert_context, frame->data, frame->linesize, 0, frame->height,
+        dest_frame->data, dest_frame->linesize) < 0 )
     Fatal("Unable to convert raw format %u to target format %u", frame->format, AV_PIX_FMT_RGBA);
 #else // HAVE_LIBSWSCALE
   Fatal("You must compile ffmpeg with the --enable-swscale option to use ffmpeg cameras");
 #endif // HAVE_LIBSWSCALE
-  av_frame_free( &dest_frame );
+  av_frame_free(&dest_frame);
   update_function_pointers();
-}
+}  // end Image::Image(const AVFrame *frame)
 
-Image::Image( const Image &p_image ) {
+Image::Image(const Image &p_image) {
   if ( !initialised )
     Initialise();
   width = p_image.width;
@@ -215,7 +221,7 @@
   holdbuffer = 0;
   AllocImgBuffer(size);
   (*fptr_imgbufcpy)(buffer, p_image.buffer, size);
-  strncpy( text, p_image.text, sizeof(text) );
+  strncpy(text, p_image.text, sizeof(text));
   update_function_pointers();
 }
 
@@ -225,35 +231,39 @@
 
 /* Should be called as part of program shutdown to free everything */
 void Image::Deinitialise() {
-  if ( initialised ) {
-    /*
-       delete[] y_table;
-       delete[] uv_table;
-       delete[] r_v_table;
-       delete[] g_v_table;
-       delete[] g_u_table;
-       delete[] b_u_table;
+  if ( !initialised ) return;
+  /*
+     delete[] y_table;
+     delete[] uv_table;
+     delete[] r_v_table;
+     delete[] g_v_table;
+     delete[] g_u_table;
+     delete[] b_u_table;
      */
-    initialised = false;
-    if ( readjpg_dcinfo ) {
-      jpeg_destroy_decompress( readjpg_dcinfo );
-      delete readjpg_dcinfo;
-      readjpg_dcinfo = 0;
-    }
-    if ( decodejpg_dcinfo ) {
-      jpeg_destroy_decompress( decodejpg_dcinfo );
-      delete decodejpg_dcinfo;
-      decodejpg_dcinfo = 0;
-    }
-    for ( unsigned int quality=0; quality <= 100; quality += 1 ) {
-      if ( writejpg_ccinfo[quality] ) {
-        jpeg_destroy_compress( writejpg_ccinfo[quality] );
-        delete writejpg_ccinfo[quality];
-        writejpg_ccinfo[quality] = NULL;
-      }
-    } // end foreach quality
+  initialised = false;
+  if ( readjpg_dcinfo ) {
+    jpeg_destroy_decompress( readjpg_dcinfo );
+    delete readjpg_dcinfo;
+    readjpg_dcinfo = 0;
+  }
+  if ( decodejpg_dcinfo ) {
+    jpeg_destroy_decompress( decodejpg_dcinfo );
+    delete decodejpg_dcinfo;
+    decodejpg_dcinfo = 0;
+  }
+  for ( unsigned int quality=0; quality <= 100; quality += 1 ) {
+    if ( writejpg_ccinfo[quality] ) {
+      jpeg_destroy_compress( writejpg_ccinfo[quality] );
+      delete writejpg_ccinfo[quality];
+      writejpg_ccinfo[quality] = NULL;
+    }
+  } // end foreach quality
+
+  if ( sws_convert_context ) {
+    sws_freeContext(sws_convert_context);
+    sws_convert_context = NULL;
   }
-}
+}  // end void Image::Deinitialise()
 
 void Image::Initialise() {
   /* Assign the blend pointer to function */
@@ -655,15 +665,16 @@
     return;
   }
 
-  if ( !buffer || image.width != width || image.height != height || image.colours != colours || image.subpixelorder != subpixelorder) {
+  if ( !buffer || image.width != width || image.height != height
+      || image.colours != colours || image.subpixelorder != subpixelorder) {
 
-    if (holdbuffer && buffer) {
-      if (new_size > allocation) {
+    if ( holdbuffer && buffer ) {
+      if ( new_size > allocation ) {
         Error("Held buffer is undersized for assigned buffer");
         return;
       }
     } else {
-      if(new_size > allocation || !buffer) {
+      if ( new_size > allocation || !buffer) {
         // DumpImgBuffer(); This is also done in AllocImgBuffer
         AllocImgBuffer(new_size);
       }
@@ -1894,11 +1905,11 @@
 /* RGB32 compatible: complete */
 void Image::Annotate( const char *p_text, const Coord &coord, const unsigned int size, const Rgb fg_colour, const Rgb bg_colour )
 {
-  strncpy( text, p_text, sizeof(text)-1 );
+  strncpy(text, p_text, sizeof(text)-1);
 
   unsigned int index = 0;
   unsigned int line_no = 0;
-  unsigned int text_len = strlen( text );
+  unsigned int text_len = strlen(text);
   unsigned int line_len = 0;
   const char *line = text;
 
@@ -1917,10 +1928,10 @@
   const bool bg_trans = (bg_colour == RGB_TRANSPARENT);
 
   int zm_text_bitmask = 0x80;
-  if (size == 2)
+  if ( size == 2 )
     zm_text_bitmask = 0x8000;
 
-  while ( (index < text_len) && (line_len = strcspn( line, "\n" )) ) {
+  while ( (index < text_len) && (line_len = strcspn(line, "\n")) ) {
 
     unsigned int line_width = line_len * ZM_CHAR_WIDTH * size;
 
@@ -1956,10 +1967,19 @@
         unsigned char *temp_ptr = ptr;
         for ( unsigned int x = lo_line_x, c = 0; x < hi_line_x && c < line_len; c++ ) {
           int f;
-          if (size == 2)
+          if ( size == 2 ) {
+            if ( (line[c] * ZM_CHAR_HEIGHT * size) + r > sizeof(bigfontdata) ) {
+              Warning("Unsupported character %c in %s", line[c], line);
+              continue;
+            }
             f = bigfontdata[(line[c] * ZM_CHAR_HEIGHT * size) + r];
-          else

zoneminder-1.34.8.tar.gz/src/zm_image.h -> zoneminder-1.34.16.tar.gz/src/zm_image.h Changed

zoneminder-1.34.8.tar.gz/src/zm_logger.cpp -> zoneminder-1.34.16.tar.gz/src/zm_logger.cpp Changed

zoneminder-1.34.8.tar.gz/src/zm_monitor.cpp -> zoneminder-1.34.16.tar.gz/src/zm_monitor.cpp Changed

@@ -555,14 +555,18 @@
   snprintf(mem_file, sizeof(mem_file), "%s/zm.mmap.%d", staticConfig.PATH_MAP.c_str(), id);
   map_fd = open(mem_file, O_RDWR|O_CREAT, (mode_t)0600);
   if ( map_fd < 0 ) {
-    Fatal("Can't open memory map file %s, probably not enough space free: %s", mem_file, strerror(errno));
+    Error("Can't open memory map file %s, probably not enough space free: %s", mem_file, strerror(errno));
+    return false;
   } else {
     Debug(3, "Success opening mmap file at (%s)", mem_file);
   }
 
   struct stat map_stat;
-  if ( fstat(map_fd, &map_stat) < 0 )
-    Fatal("Can't stat memory map file %s: %s, is the zmc process for this monitor running?", mem_file, strerror(errno));
+  if ( fstat(map_fd, &map_stat) < 0 ) {
+    Error("Can't stat memory map file %s: %s, is the zmc process for this monitor running?", mem_file, strerror(errno));
+    close(map_fd);
+    return false;
+  }
 
   if ( map_stat.st_size != mem_size ) {
     if ( purpose == CAPTURE ) {
@@ -1655,7 +1659,7 @@
               Info("%s: %03d - Left alarm state (%" PRIu64 ") - %d(%d) images",
                   name, image_count, event->Id(), event->Frames(), event->AlarmFrames());
               //if ( function != MOCORD || event_close_mode == CLOSE_ALARM || event->Cause() == SIGNAL_CAUSE )
-              if ( function != MOCORD || event_close_mode == CLOSE_ALARM ) {
+              if ( ( function != MOCORD && function != RECORD ) || event_close_mode == CLOSE_ALARM ) {
                 shared_data->state = state = IDLE;
                 Info("%s: %03d - Closing event %" PRIu64 ", alarm end%s",
                     name, image_count, event->Id(), (function==MOCORD)?", section truncated":"");
@@ -1815,7 +1819,7 @@
       "`AlarmFrameCount`, `SectionLength`, `MinSectionLength`, `FrameSkip`, "
       "`MotionFrameSkip`, `AnalysisFPSLimit`, `AnalysisUpdateDelay`, `MaxFPS`, `AlarmMaxFPS`, "
       "`FPSReportInterval`, `RefBlendPerc`, `AlarmRefBlendPerc`, `TrackMotion`, "
-      "`SignalCheckColour` FROM `Monitors` WHERE `Id` = '%d'", id);
+      "`SignalCheckPoints`, `SignalCheckColour` FROM `Monitors` WHERE `Id` = '%d'", id);
 
   zmDbRow *row = zmDbFetchOne(sql);
   if ( !row ) {
@@ -1861,13 +1865,8 @@
     alarm_ref_blend_perc = atoi(dbrow[index++]);
     track_motion = atoi(dbrow[index++]);
 
-    signal_check_points = dbrow[index]?atoi(dbrow[index]):0;index++;
-
-    if ( dbrow[index][0] == '#' )
-      signal_check_colour = strtol(dbrow[index]+1,0,16);
-    else
-      signal_check_colour = strtol(dbrow[index],0,16);
-    index++;
+    signal_check_points = dbrow[index]?atoi(dbrow[index]):0; index++;
+    signal_check_colour = strtol(dbrow[index][0]=='#'?dbrow[index]+1:dbrow[index], 0, 16); index++;
 
     shared_data->state = state = IDLE;
     shared_data->alarm_x = shared_data->alarm_y = -1;
@@ -1880,7 +1879,7 @@
   } // end if row
 
   ReloadZones();
-} // end void Monitor::Reload()
+}  // end void Monitor::Reload()
 
 void Monitor::ReloadZones() {
   Debug(1, "Reloading zones for monitor %s", name);
@@ -2059,20 +2058,21 @@
 } // end int Monitor::LoadFfmpegMonitors
 #endif // HAVE_LIBAVFORMAT
 
-/*
-  std::string load_monitor_sql =
- "SELECT Id, Name, ServerId, StorageId, Type, Function+0, Enabled, LinkedMonitors, "
- "AnalysisFPSLimit, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS,"
- "Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, " // V4L Settings
- "Protocol, Method, Options, User, Pass, Host, Port, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, RTSPDescribe, "
- "SaveJPEGs, VideoWriter, EncoderParameters,
-"OutputCodec, Encoder, OutputContainer,"
-" RecordAudio, "
- "Brightness, Contrast, Hue, Colour, "
- "EventPrefix, LabelFormat, LabelX, LabelY, LabelSize,"
- "ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, "
- "SectionLength, MinSectionLength, FrameSkip, MotionFrameSkip, "
- "FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif, SignalCheckColour FROM Monitors";
+/* For reference
+std::string load_monitor_sql =
+"SELECT `Id`, `Name`, `ServerId`, `StorageId`, `Type`, `Function`+0, `Enabled`, `LinkedMonitors`, "
+"`AnalysisFPSLimit`, `AnalysisUpdateDelay`, `MaxFPS`, `AlarmMaxFPS`,"
+"`Device`, `Channel`, `Format`, `V4LMultiBuffer`, `V4LCapturesPerFrame`, " // V4L Settings
+"`Protocol`, `Method`, `Options`, `User`, `Pass`, `Host`, `Port`, `Path`, `Width`, `Height`, `Colours`, `Palette`, `Orientation`+0, `Deinterlacing`, "
+"`DecoderHWAccelName`, `DecoderHWAccelDevice`, `RTSPDescribe`, "
+"`SaveJPEGs`, `VideoWriter`, `EncoderParameters`, "
+//" OutputCodec, Encoder, OutputContainer, "
+"`RecordAudio`, "
+"`Brightness`, `Contrast`, `Hue`, `Colour`, "
+"`EventPrefix`, `LabelFormat`, `LabelX`, `LabelY`, `LabelSize`,"
+"`ImageBufferCount`, `WarmupCount`, `PreEventCount`, `PostEventCount`, `StreamReplayBuffer`, `AlarmFrameCount`, "
+"`SectionLength`, `MinSectionLength`, `FrameSkip`, `MotionFrameSkip`, "
+"`FPSReportInterval`, `RefBlendPerc`, `AlarmRefBlendPerc`, `TrackMotion`, `Exif`, `SignalCheckPoints`, `SignalCheckColour` FROM `Monitors`";
 */
 
 Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zones, Purpose purpose) {
@@ -2092,8 +2092,6 @@
 
   double capture_max_fps = dbrow[col] ? atof(dbrow[col]) : 0.0; col++;
   double capture_delay = ( capture_max_fps > 0.0 ) ? int(DT_PREC_3/capture_max_fps) : 0;
-
-  Debug(1,"Capture Delay!? %.3f", capture_delay);
   unsigned int alarm_capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
 
   const char *device = dbrow[col]; col++;
@@ -2166,9 +2164,9 @@
   int ref_blend_perc = atoi(dbrow[col]); col++;
   int alarm_ref_blend_perc = atoi(dbrow[col]); col++;
   int track_motion = atoi(dbrow[col]); col++;
+  bool embed_exif = (*dbrow[col] != '0'); col++;
   int signal_check_points = dbrow[col] ? atoi(dbrow[col]) : 0;col++;
   int signal_check_color = strtol(dbrow[col][0] == '#' ? dbrow[col]+1 : dbrow[col], 0, 16); col++;
-  bool embed_exif = (*dbrow[col] != '0'); col++;
 
   Camera *camera = 0;
   if ( type == "Local" ) {

zoneminder-1.34.8.tar.gz/src/zm_poly.cpp -> zoneminder-1.34.16.tar.gz/src/zm_poly.cpp Changed

@@ -26,11 +26,9 @@
 #include <cmath>
 #endif
 
-void Polygon::calcArea()
-{
+void Polygon::calcArea() {
   double float_area = 0.0L;
-  for ( int i = 0, j = n_coords-1; i < n_coords; j = i++ )
-  {
+  for ( int i = 0, j = n_coords-1; i < n_coords; j = i++ ) {
     double trap_area = ((coords[i].X()-coords[j].X())*((coords[i].Y()+coords[j].Y())))/2.0L;
     float_area += trap_area;
     //printf( "%.2f (%.2f)\n", float_area, trap_area );
@@ -38,13 +36,11 @@
   area = (int)round(fabs(float_area));
 }
 
-void Polygon::calcCentre()
-{
+void Polygon::calcCentre() {
   if ( !area && n_coords )
     calcArea();
   double float_x = 0.0L, float_y = 0.0L;
-  for ( int i = 0, j = n_coords-1; i < n_coords; j = i++ )
-  {
+  for ( int i = 0, j = n_coords-1; i < n_coords; j = i++ ) {
     float_x += ((coords[i].Y()-coords[j].Y())*((coords[i].X()*2)+(coords[i].X()*coords[j].X())+(coords[j].X()*2)));
     float_y += ((coords[j].X()-coords[i].X())*((coords[i].Y()*2)+(coords[i].Y()*coords[j].Y())+(coords[j].Y()*2)));
   }
@@ -54,16 +50,14 @@
   centre = Coord( (int)round(float_x), (int)round(float_y) );
 }
 
-Polygon::Polygon( int p_n_coords, const Coord *p_coords ) : n_coords( p_n_coords )
-{
+Polygon::Polygon(int p_n_coords, const Coord *p_coords) : n_coords( p_n_coords ) {
   coords = new Coord[n_coords];
 
   int min_x = -1;
   int max_x = -1;
   int min_y = -1;
   int max_y = -1;
-  for( int i = 0; i < n_coords; i++ )
-  {
+  for ( int i = 0; i < n_coords; i++ ) {
     coords[i] = p_coords[i];
     if ( min_x == -1 || coords[i].X() < min_x )
       min_x = coords[i].X();
@@ -79,38 +73,36 @@
   calcCentre();
 }
 
-Polygon::Polygon( const Polygon &p_polygon ) : n_coords( p_polygon.n_coords ), extent( p_polygon.extent ), area( p_polygon.area ), centre( p_polygon.centre )
+Polygon::Polygon( const Polygon &p_polygon ) :
+  n_coords(p_polygon.n_coords),
+  extent(p_polygon.extent),
+  area(p_polygon.area),
+  centre(p_polygon.centre)
 {
   coords = new Coord[n_coords];
-  for( int i = 0; i < n_coords; i++ )
-  {
+  for( int i = 0; i < n_coords; i++ ) {
     coords[i] = p_polygon.coords[i];
   }
 }
 
-Polygon &Polygon::operator=( const Polygon &p_polygon )
-{
-  if ( n_coords < p_polygon.n_coords )
-  {
+Polygon &Polygon::operator=( const Polygon &p_polygon ) {
+  if ( n_coords < p_polygon.n_coords ) {
     delete[] coords;
     coords = new Coord[p_polygon.n_coords];
   }
   n_coords = p_polygon.n_coords;
-  for( int i = 0; i < n_coords; i++ )
-  {
+  for ( int i = 0; i < n_coords; i++ ) {
     coords[i] = p_polygon.coords[i];
   }
   extent = p_polygon.extent;
   area = p_polygon.area;
   centre = p_polygon.centre;
-  return( *this );
+  return *this ;
 }
 
-bool Polygon::isInside( const Coord &coord ) const
-{
+bool Polygon::isInside( const Coord &coord ) const {
   bool inside = false;
-  for ( int i = 0, j = n_coords-1; i < n_coords; j = i++ )
-  {
+  for ( int i = 0, j = n_coords-1; i < n_coords; j = i++ ) {
     if ( (((coords[i].Y() <= coord.Y()) && (coord.Y() < coords[j].Y()) )
     || ((coords[j].Y() <= coord.Y()) && (coord.Y() < coords[i].Y())))
     && (coord.X() < (coords[j].X() - coords[i].X()) * (coord.Y() - coords[i].Y()) / (coords[j].Y() - coords[i].Y()) + coords[i].X()))
@@ -118,5 +110,5 @@
       inside = !inside;
     }
   }
-  return( inside );
+  return inside;
 }

zoneminder-1.34.8.tar.gz/src/zm_poly.h -> zoneminder-1.34.16.tar.gz/src/zm_poly.h Changed

@@ -41,13 +41,13 @@
     static int CompareYX( const void *p1, const void *p2 ) {
         const Edge *e1 = reinterpret_cast<const Edge *>(p1), *e2 = reinterpret_cast<const Edge *>(p2);
       if ( e1->min_y == e2->min_y )
-        return( int(e1->min_x - e2->min_x) );
+        return int(e1->min_x - e2->min_x);
       else
-        return( int(e1->min_y - e2->min_y) );
+        return int(e1->min_y - e2->min_y);
     }
     static int CompareX( const void *p1, const void *p2 ) {
       const Edge *e1 = reinterpret_cast<const Edge *>(p1), *e2 = reinterpret_cast<const Edge *>(p2);
-      return( int(e1->min_x - e2->min_x) );
+      return int(e1->min_x - e2->min_x);
     }
   };
 
@@ -83,32 +83,32 @@
   void calcCentre();
 
 public:
-  inline Polygon() : n_coords( 0 ), coords( 0 ), area( 0 ), edges(0), slices(0) {
+  inline Polygon() : n_coords(0), coords(0), area(0), edges(0), slices(0) {
   }
-  Polygon( int p_n_coords, const Coord *p_coords );
-  Polygon( const Polygon &p_polygon );
+  Polygon(int p_n_coords, const Coord *p_coords);
+  Polygon(const Polygon &p_polygon);
   ~Polygon() {
     delete[] coords;
   }
 
   Polygon &operator=( const Polygon &p_polygon );
 
-  inline int getNumCoords() const { return( n_coords ); }
+  inline int getNumCoords() const { return n_coords; }
   inline const Coord &getCoord( int index ) const {
-    return( coords[index] );
+    return coords[index];
   }
 
-  inline const Box &Extent() const { return( extent ); }
-  inline int LoX() const { return( extent.LoX() ); }
-  inline int HiX() const { return( extent.HiX() ); }
-  inline int LoY() const { return( extent.LoY() ); }
-  inline int HiY() const { return( extent.HiY() ); }
-  inline int Width() const { return( extent.Width() ); }
-  inline int Height() const { return( extent.Height() ); }
+  inline const Box &Extent() const { return extent; }
+  inline int LoX() const { return extent.LoX(); }
+  inline int HiX() const { return extent.HiX(); }
+  inline int LoY() const { return extent.LoY(); }
+  inline int HiY() const { return extent.HiY(); }
+  inline int Width() const { return extent.Width(); }
+  inline int Height() const { return extent.Height(); }
 
-  inline int Area() const { return( area ); }
+  inline int Area() const { return area; }
   inline const Coord &Centre() const {
-    return( centre );
+    return centre;
   }
   bool isInside( const Coord &coord ) const;
 };

zoneminder-1.34.8.tar.gz/src/zm_stream.cpp -> zoneminder-1.34.16.tar.gz/src/zm_stream.cpp Changed

@@ -114,7 +114,7 @@
   return false;
 }
 
-Image *StreamBase::prepareImage( Image *image ) {
+Image *StreamBase::prepareImage(Image *image) {
 
   // Do not bother to scale zoomed in images, just crop them and let the browser scale
   // Works in FF2 but breaks FF3 which doesn't like image sizes changing in mid stream.
@@ -124,50 +124,51 @@
 
   int mag = (scale * zoom) / ZM_SCALE_BASE;
   int act_mag = optimisedScaling?(mag > ZM_SCALE_BASE?ZM_SCALE_BASE:mag):mag;
-  Debug( 3, "Scaling by %d, zooming by %d = magnifying by %d(%d)", scale, zoom, mag, act_mag );
 
   int last_mag = (last_scale * last_zoom) / ZM_SCALE_BASE;
   int last_act_mag = last_mag > ZM_SCALE_BASE?ZM_SCALE_BASE:last_mag;
-  Debug( 3, "Last scaling by %d, zooming by %d = magnifying by %d(%d)", last_scale, last_zoom, last_mag, last_act_mag );
-
   int base_image_width = image->Width(), base_image_height = image->Height();
-  Debug( 3, "Base image width = %d, height = %d", base_image_width, base_image_height );
-
   int virt_image_width = (base_image_width * mag) / ZM_SCALE_BASE, virt_image_height = (base_image_height * mag) / ZM_SCALE_BASE;
-  Debug( 3, "Virtual image width = %d, height = %d", virt_image_width, virt_image_height );
-
   int last_virt_image_width = (base_image_width * last_mag) / ZM_SCALE_BASE, last_virt_image_height = (base_image_height * last_mag) / ZM_SCALE_BASE;
-  Debug( 3, "Last virtual image width = %d, height = %d", last_virt_image_width, last_virt_image_height );
-
   int act_image_width = (base_image_width * act_mag ) / ZM_SCALE_BASE, act_image_height = (base_image_height * act_mag ) / ZM_SCALE_BASE;
-  Debug( 3, "Actual image width = %d, height = %d", act_image_width, act_image_height );
-
   int last_act_image_width = (base_image_width * last_act_mag ) / ZM_SCALE_BASE, last_act_image_height = (base_image_height * last_act_mag ) / ZM_SCALE_BASE;
-  Debug( 3, "Last actual image width = %d, height = %d", last_act_image_width, last_act_image_height );
-
   int disp_image_width = (image->Width() * scale) / ZM_SCALE_BASE, disp_image_height = (image->Height() * scale) / ZM_SCALE_BASE;
-  Debug( 3, "Display image width = %d, height = %d", disp_image_width, disp_image_height );
-
   int last_disp_image_width = (image->Width() * last_scale) / ZM_SCALE_BASE, last_disp_image_height = (image->Height() * last_scale) / ZM_SCALE_BASE;
-  Debug( 3, "Last display image width = %d, height = %d", last_disp_image_width, last_disp_image_height );
-
   int send_image_width = (disp_image_width * act_mag ) / mag, send_image_height = (disp_image_height * act_mag ) / mag;
-  Debug( 3, "Send image width = %d, height = %d", send_image_width, send_image_height );
-
   int last_send_image_width = (last_disp_image_width * last_act_mag ) / last_mag, last_send_image_height = (last_disp_image_height * last_act_mag ) / last_mag;
-  Debug( 3, "Last send image width = %d, height = %d", last_send_image_width, last_send_image_height );
-
-  if ( mag != ZM_SCALE_BASE ) {
-    if ( act_mag != ZM_SCALE_BASE ) {
-      Debug(3, "Magnifying by %d", mag);
-      if ( !image_copied ) {
-        static Image copy_image;
-        copy_image.Assign(*image);
-        image = &copy_image;
-        image_copied = true;
-      }
-      image->Scale(mag);
-    }
+
+  Debug(3,
+      "Scaling by %d, zooming by %d = magnifying by %d(%d)\n"
+      "Last scaling by %d, zooming by %d = magnifying by %d(%d)\n"
+      "Base image width = %d, height = %d\n"
+      "Virtual image width = %d, height = %d\n"
+      "Last virtual image width = %d, height = %d\n"
+      "Actual image width = %d, height = %d\n"
+      "Last actual image width = %d, height = %d\n"
+      "Display image width = %d, height = %d\n"
+      "Last display image width = %d, height = %d\n"
+      "Send image width = %d, height = %d\n"
+      "Last send image width = %d, height = %d\n",
+      scale, zoom, mag, act_mag,
+      last_scale, last_zoom, last_mag, last_act_mag,
+      base_image_width, base_image_height,
+      virt_image_width, virt_image_height,
+      last_virt_image_width, last_virt_image_height,
+      act_image_width, act_image_height,
+      last_act_image_width, last_act_image_height,
+      disp_image_width, disp_image_height,
+      last_disp_image_width, last_disp_image_height,
+      send_image_width, send_image_height,
+      last_send_image_width, last_send_image_height
+      );
+
+  if ( ( mag != ZM_SCALE_BASE ) && (act_mag != ZM_SCALE_BASE) ) {
+    Debug(3, "Magnifying by %d", mag);
+    static Image copy_image;
+    copy_image.Assign(*image);
+    image = &copy_image;
+    image_copied = true;
+    image->Scale(mag);
   }
 
   Debug(3, "Real image width = %d, height = %d", image->Width(), image->Height());
@@ -176,26 +177,22 @@
     static Box last_crop;
 
     if ( mag != last_mag || x != last_x || y != last_y ) {
-      Debug( 3, "Got click at %d,%d x %d", x, y, mag );
-
-      //if ( !last_mag )
-        //last_mag = mag;
+      Debug(3, "Got click at %d,%d x %d", x, y, mag);
 
       if ( !(last_disp_image_width < last_virt_image_width || last_disp_image_height < last_virt_image_height) )
         last_crop = Box();
 
-      Debug( 3, "Recalculating crop" );
       // Recalculate crop parameters, as %ges
       int click_x = (last_crop.LoX() * 100 ) / last_act_image_width; // Initial crop offset from last image
       click_x += ( x * 100 ) / last_virt_image_width;
       int click_y = (last_crop.LoY() * 100 ) / last_act_image_height; // Initial crop offset from last image
       click_y += ( y * 100 ) / last_virt_image_height;
-      Debug( 3, "Got adjusted click at %d%%,%d%%", click_x, click_y );
+      Debug(3, "Got adjusted click at %d%%,%d%%", click_x, click_y);
 
       // Convert the click locations to the current image pixels
       click_x = ( click_x * act_image_width ) / 100;
       click_y = ( click_y * act_image_height ) / 100;
-      Debug( 3, "Got readjusted click at %d,%d", click_x, click_y );
+      Debug(3, "Got readjusted click at %d,%d", click_x, click_y);
 
       int lo_x = click_x - (send_image_width/2);
       if ( lo_x < 0 )
@@ -214,23 +211,25 @@
         lo_y = hi_y - (send_image_height - 1);
       }
       last_crop = Box( lo_x, lo_y, hi_x, hi_y );
-    }
-    Debug( 3, "Cropping to %d,%d -> %d,%d", last_crop.LoX(), last_crop.LoY(), last_crop.HiX(), last_crop.HiY() );
+    }  // end if ( mag != last_mag || x != last_x || y != last_y )
+
+    Debug(3, "Cropping to %d,%d -> %d,%d", last_crop.LoX(), last_crop.LoY(), last_crop.HiX(), last_crop.HiY());
     if ( !image_copied ) {
       static Image copy_image;
-      copy_image.Assign( *image );
+      copy_image.Assign(*image);
       image = &copy_image;
       image_copied = true;
     }
-    image->Crop( last_crop );
-  }
+    image->Crop(last_crop);
+  }  // end if difference in image vs displayed dimensions
+
   last_scale = scale;
   last_zoom = zoom;
   last_x = x;
   last_y = y;
 
   return image;
-}
+}  // end Image *StreamBase::prepareImage(Image *image)
 
 bool StreamBase::sendTextFrame(const char *frame_text) {
   Debug(2, "Sending %dx%d * %d text frame '%s'",
@@ -349,7 +348,7 @@
     }
 
     snprintf(rem_sock_path, sizeof(rem_sock_path), "%s/zms-%06dw.sock", staticConfig.PATH_SOCKS.c_str(), connkey);
-    strncpy(rem_addr.sun_path, rem_sock_path, sizeof(rem_addr.sun_path)-1);
+    strncpy(rem_addr.sun_path, rem_sock_path, sizeof(rem_addr.sun_path));
     rem_addr.sun_family = AF_UNIX;
 
     gettimeofday(&last_comm_update, NULL);

zoneminder-1.34.8.tar.gz/src/zm_stream.h -> zoneminder-1.34.16.tar.gz/src/zm_stream.h Changed

zoneminder-1.34.8.tar.gz/src/zm_user.cpp -> zoneminder-1.34.16.tar.gz/src/zm_user.cpp Changed

@@ -1,21 +1,21 @@
 /*
  * ZoneMinder regular expression class implementation, $Date$, $Revision$
  * Copyright (C) 2001-2008 Philip Coombes
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/ 
+*/
 
 #include "zm.h"
 #include "zm_db.h"
@@ -26,6 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include <utility>
 
 #if HAVE_GNUTLS_GNUTLS_H
 #include <gnutls/gnutls.h>
@@ -35,7 +36,7 @@
 #include <gcrypt.h>
 #elif HAVE_LIBCRYPTO
 #include <openssl/md5.h>
-#endif // HAVE_L || HAVE_LIBCRYPTO
+#endif  // HAVE_GCRYPT_H || HAVE_LIBCRYPTO
 
 #include "zm_utils.h"
 #include "zm_crypt.h"
@@ -52,7 +53,7 @@
   id = atoi(dbrow[index++]);
   strncpy(username, dbrow[index++], sizeof(username)-1);
   strncpy(password, dbrow[index++], sizeof(password)-1);
-  enabled = (bool)atoi(dbrow[index++]);
+  enabled = static_cast<bool>(atoi(dbrow[index++]));
   stream = (Permission)atoi(dbrow[index++]);
   events = (Permission)atoi(dbrow[index++]);
   control = (Permission)atoi(dbrow[index++]);
@@ -61,7 +62,7 @@
   char *monitor_ids_str = dbrow[index++];
   if ( monitor_ids_str && *monitor_ids_str ) {
     StringVector ids = split(monitor_ids_str, ",");
-    for( StringVector::iterator i = ids.begin(); i < ids.end(); ++i ) {
+    for ( StringVector::iterator i = ids.begin(); i < ids.end(); ++i ) {
       monitor_ids.push_back(atoi((*i).c_str()));
     }
   }
@@ -72,9 +73,9 @@
 }
 
 void User::Copy(const User &u) {
-  id=u.id;
-  strncpy(username, u.username, sizeof(username)-1);
-  strncpy(password, u.password, sizeof(password)-1);
+  id = u.id;
+  strncpy(username, u.username, sizeof(username));
+  strncpy(password, u.password, sizeof(password));
   enabled = u.enabled;
   stream = u.stream;
   events = u.events;
@@ -87,8 +88,9 @@
 bool User::canAccess(int monitor_id) {
   if ( monitor_ids.empty() )
     return true;
-  
-  for ( std::vector<int>::iterator i = monitor_ids.begin(); i != monitor_ids.end(); ++i ) {
+
+  for ( std::vector<int>::iterator i = monitor_ids.begin();
+      i != monitor_ids.end(); ++i ) {
     if ( *i == monitor_id ) {
       return true;
     }
@@ -103,18 +105,23 @@
   int username_length = strlen(username);
   char *safer_username = new char[(username_length * 2) + 1];
 
-  // According to docs, size of safer_whatever must be 2*length+1 due to unicode conversions + null terminator.
+  // According to docs, size of safer_whatever must be 2*length+1
+  // due to unicode conversions + null terminator.
   mysql_real_escape_string(&dbconn, safer_username, username, username_length);
 
   snprintf(sql, sizeof(sql),
-      "SELECT `Id`, `Username`, `Password`, `Enabled`, `Stream`+0, `Events`+0, `Control`+0, `Monitors`+0, `System`+0, `MonitorIds`"
-      " FROM `Users` WHERE `Username` = '%s' AND `Enabled` = 1", safer_username);
+      "SELECT `Id`, `Username`, `Password`, `Enabled`,"
+      " `Stream`+0, `Events`+0, `Control`+0, `Monitors`+0, `System`+0,"
+      " `MonitorIds`"
+      " FROM `Users` WHERE `Username` = '%s' AND `Enabled` = 1",
+      safer_username);
+  delete[] safer_username;
+  safer_username = NULL;
 
   if ( mysql_query(&dbconn, sql) ) {
     Error("Can't run query: %s", mysql_error(&dbconn));
-    exit(mysql_errno(&dbconn)); 
+    exit(mysql_errno(&dbconn));
   }
-  delete safer_username;
 
   MYSQL_RES *result = mysql_store_result(&dbconn);
   if ( !result ) {
@@ -122,162 +129,157 @@
     exit(mysql_errno(&dbconn));
   }
 
-  if ( mysql_num_rows(result) != 1 ) {
+  if ( mysql_num_rows(result) == 1 ) {
+    MYSQL_ROW dbrow = mysql_fetch_row(result);
+    User *user = new User(dbrow);
     mysql_free_result(result);
-    Warning("Unable to authenticate user %s", username);
-    return NULL;
-  }
 
-  MYSQL_ROW dbrow = mysql_fetch_row(result);
-  User *user = new User(dbrow);
+    if ( 
+        (! password )  // relay type must be none
+        ||
+        verifyPassword(username, password, user->getPassword()) ) {
+      Info("Authenticated user '%s'", user->getUsername());
+      return user;
+    } 
+  }  // end if 1 result from db
   mysql_free_result(result);
 
-  if ( !password ) {
-    // relay type must be none
-    return user;
-  }
- 
-  if ( verifyPassword(username, password, user->getPassword()) ) {
-    Info("Authenticated user '%s'", user->getUsername());
-    return user;
-  } 
-
   Warning("Unable to authenticate user %s", username);
   return NULL;
-}
+}  // end User *zmLoadUser(const char *username, const char *password)
 
-User *zmLoadTokenUser (std::string jwt_token_str, bool use_remote_addr ) {
+User *zmLoadTokenUser(std::string jwt_token_str, bool use_remote_addr) {
   std::string key = config.auth_hash_secret;
   std::string remote_addr = "";
-  
-  if (use_remote_addr) {
-    remote_addr = std::string(getenv( "REMOTE_ADDR" ));
+
+  if ( use_remote_addr ) {
+    remote_addr = std::string(getenv("REMOTE_ADDR"));
     if ( remote_addr == "" ) {
-      Warning( "Can't determine remote address, using null" );
+      Warning("Can't determine remote address, using null");
       remote_addr = "";
     }
     key += remote_addr;
   }
 
-  Debug (1,"Inside zmLoadTokenUser, formed key=%s", key.c_str());
+  Debug(1, "Inside zmLoadTokenUser, formed key=%s", key.c_str());
 
   std::pair<std::string, unsigned int> ans = verifyToken(jwt_token_str, key);
   std::string username = ans.first;
   unsigned int iat = ans.second;
-  Debug (1,"retrieved user '%s' from token", username.c_str());
+  Debug(1, "retrieved user '%s' from token", username.c_str());
 
-  if (username != "") {
-    char sql[ZM_SQL_MED_BUFSIZ] = "";
-    snprintf(sql, sizeof(sql),
-      "SELECT `Id`, `Username`, `Password`, `Enabled`, `Stream`+0, `Events`+0, `Control`+0, `Monitors`+0, `System`+0, `MonitorIds`, `TokenMinExpiry`"
-      " FROM `Users` WHERE `Username` = '%s' AND `Enabled` = 1", username.c_str() );
+  if ( username == "" ) {
+    return NULL;
+  }
 
-    if ( mysql_query(&dbconn, sql) ) {
-      Error("Can't run query: %s", mysql_error(&dbconn));
-      exit(mysql_errno(&dbconn)); 
-    }
+  char sql[ZM_SQL_MED_BUFSIZ] = "";
+  snprintf(sql, sizeof(sql),
+    "SELECT `Id`, `Username`, `Password`, `Enabled`, `Stream`+0, `Events`+0,"
+    " `Control`+0, `Monitors`+0, `System`+0, `MonitorIds`, `TokenMinExpiry`"
+    " FROM `Users` WHERE `Username` = '%s' AND `Enabled` = 1", username.c_str());

zoneminder-1.34.8.tar.gz/src/zm_utils.cpp -> zoneminder-1.34.16.tar.gz/src/zm_utils.cpp Changed

zoneminder-1.34.8.tar.gz/src/zm_videostore.cpp -> zoneminder-1.34.16.tar.gz/src/zm_videostore.cpp Changed

zoneminder-1.34.8.tar.gz/src/zms.cpp -> zoneminder-1.34.16.tar.gz/src/zms.cpp Changed

@@ -95,7 +95,7 @@
     Debug(1, "Query: %s", query);
 
     char temp_query[1024];
-    strncpy(temp_query, query, sizeof(temp_query));
+    strncpy(temp_query, query, sizeof(temp_query)-1);
     char *q_ptr = temp_query;
     char *parms[16];  // Shouldn't be more than this
     int parm_no = 0;
@@ -106,9 +106,9 @@
 
     for ( int p = 0; p < parm_no; p++ ) {
       char *name = strtok(parms[p], "=");
-      char *value = strtok(NULL, "=");
+      char const *value = strtok(NULL, "=");
       if ( !value )
-        value = (char *)"";
+        value = "";
       if ( !strcmp(name, "source") ) {
         source = !strcmp(value, "event")?ZMS_EVENT:ZMS_MONITOR;
         if ( !strcmp(value, "fifo") )
@@ -127,10 +127,10 @@
       } else if ( !strcmp(name, "time") ) {
         event_time = atoi(value);
       } else if ( !strcmp(name, "event") ) {
-        event_id = strtoull(value, (char **)NULL, 10);
+        event_id = strtoull(value, NULL, 10);
         source = ZMS_EVENT;
       } else if ( !strcmp(name, "frame") ) {
-        frame_id = strtoull(value, (char **)NULL, 10);
+        frame_id = strtoull(value, NULL, 10);
         source = ZMS_EVENT;
       } else if ( !strcmp(name, "scale") ) {
         scale = atoi(value);
@@ -159,7 +159,7 @@
       } else if ( !strcmp(name, "buffer") ) {
         playback_buffer = atoi(value);
       } else if ( !strcmp(name, "auth") ) {
-        strncpy( auth, value, sizeof(auth)-1 );
+        strncpy(auth, value, sizeof(auth)-1);
       } else if ( !strcmp(name, "token") ) {
         jwt_token_str = value;
         Debug(1, "ZMS: JWT token found: %s", jwt_token_str.c_str());
@@ -184,7 +184,7 @@
   logInit(log_id_string);
 
   if ( config.opt_use_auth ) {
-    User *user = 0;
+    User *user = NULL;
 
     if ( jwt_token_str != "" ) {
       // user = zmLoadTokenUser(jwt_token_str, config.auth_hash_ips);
@@ -195,19 +195,11 @@
       } else {
         Error("Bad username");
       }
-
     } else {
-      // if ( strcmp( config.auth_relay, "hashed" ) == 0 )
-      {
-        if ( *auth ) {
-          user = zmLoadAuthUser(auth, config.auth_hash_ips);
-        }
-      }
-      // else if ( strcmp( config.auth_relay, "plain" ) == 0 )
-      {
-        if ( username.length() && password.length() ) {
-          user = zmLoadUser(username.c_str(), password.c_str());
-        }
+      if ( *auth ) {
+        user = zmLoadAuthUser(auth, config.auth_hash_ips);
+      } else if ( username.length() && password.length() ) {
+        user = zmLoadUser(username.c_str(), password.c_str());
       }
     }
     if ( !user ) {
@@ -218,11 +210,15 @@
       return 0;
     }
     if ( !ValidateAccess(user, monitor_id) ) {
+      delete user;
+      user = NULL;
       fputs("HTTP/1.0 403 Forbidden\r\n\r\n", stdout);
       logTerm();
       zmDbClose();
       return 0;
     }
+    delete user;
+    user = NULL;
   }  // end if config.opt_use_auth
 
   hwcaps_detect();
@@ -237,11 +233,13 @@
 
   time_t now = time(0);
   char date_string[64];
-  strftime(date_string, sizeof(date_string)-1, "%a, %d %b %Y %H:%M:%S GMT", gmtime(&now));
+  strftime(date_string, sizeof(date_string)-1,
+      "%a, %d %b %Y %H:%M:%S GMT", gmtime(&now));
 
-  fprintf(stdout, "Last-Modified: %s\r\n", date_string);
+  fputs("Last-Modified: ", stdout);
+  fputs(date_string, stdout);
   fputs(
-      "Expires: Mon, 26 Jul 1997 05:00:00 GMT\r\n"
+      "\r\nExpires: Mon, 26 Jul 1997 05:00:00 GMT\r\n"
       "Cache-Control: no-store, no-cache, must-revalidate\r\n"
       "Cache-Control: post-check=0, pre-check=0\r\n"
       "Pragma: no-cache\r\n",
@@ -279,7 +277,9 @@
       stream.setStreamType(MonitorStream::STREAM_MPEG);
 #else  // HAVE_LIBAVCODEC
       Error("MPEG streaming of '%s' attempted while disabled", query);
-      fprintf(stderr, "MPEG streaming is disabled.\nYou should configure with the --with-ffmpeg option and rebuild to use this functionality.\n");
+      fprintf(stderr, "MPEG streaming is disabled.\n"
+          "You should configure with the --with-ffmpeg"
+          " option and rebuild to use this functionality.\n");
       logTerm();
       zmDbClose();
       return -1;
@@ -332,5 +332,5 @@
   logTerm();
   zmDbClose();
 
-  return(0);
+  return 0;
 }

zoneminder-1.34.8.tar.gz/src/zmu.cpp -> zoneminder-1.34.16.tar.gz/src/zmu.cpp Changed

@@ -196,12 +196,11 @@
   return allowed;
 }
 
-int exit_zmu(int exit_code) {
+void exit_zmu(int exit_code) {
   logTerm();
   zmDbClose();
 
   exit(exit_code);
-  return exit_code;
 }
 
 int main(int argc, char *argv[]) {
@@ -476,225 +475,234 @@
   } // end if auth
 
   if ( mon_id > 0 ) {
-		//fprintf(stderr,"Monitor %d\n", mon_id);
     Monitor *monitor = Monitor::Load(mon_id, function&(ZMU_QUERY|ZMU_ZONES), Monitor::QUERY);
-    if ( monitor ) {
-        //fprintf(stderr,"Monitor %d(%s)\n", monitor->Id(), monitor->Name());
-      if ( verbose ) {
-        printf("Monitor %d(%s)\n", monitor->Id(), monitor->Name());
-      }
-      if ( ! monitor->connect() ) {
-        Error("Can't connect to capture daemon: %d %s", monitor->Id(), monitor->Name());
-        exit_zmu(-1);
-      }
+    if ( !monitor ) {
+      Error("Unable to load monitor %d", mon_id);
+      exit_zmu(-1);
+    } // end if ! MONITOR
 
-      char separator = ' ';
-      bool have_output = false;
-      if ( function & ZMU_STATE ) {
-        Monitor::State state = monitor->GetState();
-        if ( verbose ) {
-          printf("Current state: %s\n", state==Monitor::ALARM?"Alarm":(state==Monitor::ALERT?"Alert":"Idle"));
-        } else {
-          if ( have_output ) printf("%c", separator);
-          printf("%d", state);
-          have_output = true;
-        }
-      }
-      if ( function & ZMU_TIME ) {
-        struct timeval timestamp = monitor->GetTimestamp( image_idx );
-        if ( verbose ) {
-          char timestamp_str[64] = "None";
-          if ( timestamp.tv_sec )
-            strftime(timestamp_str, sizeof(timestamp_str), "%Y-%m-%d %H:%M:%S", localtime(&timestamp.tv_sec));
-          if ( image_idx == -1 )
-            printf("Time of last image capture: %s.%02ld\n", timestamp_str, timestamp.tv_usec/10000);
-          else
-            printf("Time of image %d capture: %s.%02ld\n", image_idx, timestamp_str, timestamp.tv_usec/10000);
-        } else {
-          if ( have_output ) printf("%c", separator);
-          printf("%ld.%02ld", timestamp.tv_sec, timestamp.tv_usec/10000);
-          have_output = true;
-        }
-      }
-      if ( function & ZMU_READ_IDX ) {
-        if ( verbose )
-          printf("Last read index: %d\n", monitor->GetLastReadIndex());
-        else {
-          if ( have_output ) printf("%c", separator);
-          printf("%d", monitor->GetLastReadIndex());
-          have_output = true;
-        }
-      }
-      if ( function & ZMU_WRITE_IDX ) {
-        if ( verbose ) {
-          printf("Last write index: %d\n", monitor->GetLastWriteIndex());
-        } else {
-          if ( have_output ) printf("%c", separator);
-          printf("%d", monitor->GetLastWriteIndex());
-          have_output = true;
-        }
-      }
-      if ( function & ZMU_EVENT ) {
-        if ( verbose ) {
-          printf("Last event id: %" PRIu64 "\n", monitor->GetLastEventId());
-        } else {
-          if ( have_output ) printf("%c", separator);
-          printf("%" PRIu64, monitor->GetLastEventId());
-          have_output = true;
-        }
-      }
-      if ( function & ZMU_FPS ) {
-        if ( verbose )
-          printf("Current capture rate: %.2f frames per second\n", monitor->GetFPS());
-        else {
-          if ( have_output ) printf("%c", separator);
-          printf("%.2f", monitor->GetFPS());
-          have_output = true;
-        }
-      }
-      if ( function & ZMU_IMAGE ) {
-        if ( verbose ) {
-          if ( image_idx == -1 )
-            printf("Dumping last image captured to Monitor%d.jpg", monitor->Id());
-          else
-            printf("Dumping buffer image %d to Monitor%d.jpg", image_idx, monitor->Id());
-          if ( scale != -1 )
-            printf(", scaling by %d%%", scale);
-          printf("\n");
-        }
-        monitor->GetImage(image_idx, scale>0?scale:100);
-      }
-      if ( function & ZMU_ZONES ) {
-        if ( verbose )
-          printf("Dumping zone image to Zones%d.jpg\n", monitor->Id());
-        monitor->DumpZoneImage(zoneString);
-      }
-      if ( function & ZMU_ALARM ) {
-        if ( monitor->GetFunction() == Monitor::Function::MONITOR ) {
-         printf("A Monitor in monitor mode cannot handle alarms.  Please use NoDect\n");
-        } else {
-          if ( verbose )
-            printf("Forcing alarm on\n");
-          monitor->ForceAlarmOn(config.forced_alarm_score, "Forced Web");
-          while ( (monitor->GetState() != Monitor::ALARM) && !zm_terminate ) {
-            // Wait for monitor to notice.
-            usleep(1000);
-          }
-          printf("Alarmed event id: %" PRIu64 "\n", monitor->GetLastEventId());
-        } // end if ! MONITOR
-      }
-      if ( function & ZMU_NOALARM ) {
-        if ( verbose )
-          printf("Forcing alarm off\n");
-        monitor->ForceAlarmOff();
-      }
-      if ( function & ZMU_CANCEL ) {
-        if ( verbose )
-          printf("Cancelling forced alarm on/off\n");
-        monitor->CancelForced();
+    if ( verbose ) {
+      printf("Monitor %d(%s)\n", monitor->Id(), monitor->Name());
+    }
+    if ( !monitor->connect() ) {
+      Error("Can't connect to capture daemon: %d %s", monitor->Id(), monitor->Name());
+      delete monitor;
+      monitor = NULL;
+      exit_zmu(-1);
+    }
+
+    char separator = ' ';
+    bool have_output = false;
+    if ( function & ZMU_STATE ) {
+      Monitor::State state = monitor->GetState();
+      if ( verbose ) {
+        printf("Current state: %s\n", state==Monitor::ALARM?"Alarm":(state==Monitor::ALERT?"Alert":"Idle"));
+      } else {
+        if ( have_output ) fputc(separator, stdout);
+        printf("%d", state);
+        have_output = true;
       }
-      if ( function & ZMU_RELOAD ) {
-        if ( verbose )
-          printf("Reloading monitor settings\n");
-        monitor->actionReload();
+    }
+    if ( function & ZMU_TIME ) {
+      struct timeval timestamp = monitor->GetTimestamp(image_idx);
+      if ( verbose ) {
+        char timestamp_str[64] = "None";
+        if ( timestamp.tv_sec )
+          strftime(timestamp_str, sizeof(timestamp_str), "%Y-%m-%d %H:%M:%S", localtime(&timestamp.tv_sec));
+        if ( image_idx == -1 )
+          printf("Time of last image capture: %s.%02ld\n", timestamp_str, timestamp.tv_usec/10000);
+        else
+          printf("Time of image %d capture: %s.%02ld\n", image_idx, timestamp_str, timestamp.tv_usec/10000);
+      } else {
+        if ( have_output ) fputc(separator, stdout);
+        printf("%ld.%02ld", timestamp.tv_sec, timestamp.tv_usec/10000);
+        have_output = true;
       }
-      if ( function & ZMU_ENABLE ) {
-        if ( verbose )
-          printf("Enabling event generation\n");
-        monitor->actionEnable();
+    }
+    if ( function & ZMU_READ_IDX ) {
+      if ( verbose )
+        printf("Last read index: %d\n", monitor->GetLastReadIndex());
+      else {
+        if ( have_output ) fputc(separator, stdout);
+        printf("%d", monitor->GetLastReadIndex());
+        have_output = true;
       }
-      if ( function & ZMU_DISABLE ) {
-        if ( verbose )
-          printf("Disabling event generation\n");
-        monitor->actionDisable();
+    }
+    if ( function & ZMU_WRITE_IDX ) {
+      if ( verbose ) {
+        printf("Last write index: %d\n", monitor->GetLastWriteIndex());

zoneminder-1.34.8.tar.gz/version -> zoneminder-1.34.16.tar.gz/version Changed

zoneminder-1.34.8.tar.gz/web/ajax/event.php -> zoneminder-1.34.16.tar.gz/web/ajax/event.php Changed

zoneminder-1.34.8.tar.gz/web/ajax/log.php -> zoneminder-1.34.16.tar.gz/web/ajax/log.php Changed

@@ -1,14 +1,15 @@
 <?php
+ini_set('display_errors', '0');
 
 # Moved up here because it is used in several spots.
 # These are the valid columns that you can filter on.
-$filterFields = array( 'Component', 'ServerId', 'Pid', 'Level', 'File', 'Line' );
+$filterFields = array('Component', 'ServerId', 'Pid', 'Level', 'File', 'Line');
 
 function buildLogQuery($action) {
   global $filterFields;
 
-  $minTime = isset($_REQUEST['minTime'])?$_REQUEST['minTime']:NULL;
-  $maxTime = isset($_REQUEST['maxTime'])?$_REQUEST['maxTime']:NULL;
+  $minTime = isset($_REQUEST['minTime']) ? $_REQUEST['minTime'] : NULL;
+  $maxTime = isset($_REQUEST['maxTime']) ? $_REQUEST['maxTime'] : NULL;
 
   $limit = 100;
   if ( isset($_REQUEST['limit']) ) {
@@ -42,10 +43,10 @@
 
   foreach ( $filter as $field=>$value ) {
     if ( !in_array($field, $filterFields) ) {
-      ZM\Error("'$field' is not in valid filter fields " . print_r($filterField,true));
+      ZM\Error("'$field' is not in valid filter fields " . print_r($filterField, true));
       continue;
     }
-    if ( $field == 'Level' ){
+    if ( $field == 'Level' ) {
       $where[] = $field.' <= ?';
       $values[] = $value;
     } else {
@@ -69,8 +70,8 @@
 
       $string = $_POST['message'];
 
-      $file = !empty($_POST['file']) ? preg_replace( '/\w+:\/\/[\w.:]+\//', '', $_POST['file'] ) : '';
-      if ( !empty( $_POST['line'] ) ) {
+      $file = !empty($_POST['file']) ? preg_replace('/\w+:\/\/[\w.:]+\//', '', $_POST['file']) : '';
+      if ( !empty($_POST['line']) ) {
         $line = validInt($_POST['line']);
       } else {
         $line = NULL;
@@ -82,6 +83,8 @@
       }
       $level = $levels[$_POST['level']];
       ZM\Logger::fetch()->logPrint($level, $string, $file, $line);
+    } else {
+      ZM\Error('Invalid log create: '.print_r($_POST, true));
     }
     ajaxResponse();
     break;
@@ -93,12 +96,7 @@
 
     $query = buildLogQuery('DELETE');
     $result = dbQuery($query['sql'], $query['values']);
-    ajaxResponse( array(
-      'result'=>'Ok',
-      'deleted'=>$result->rowCount(),
-    ) );
-
-
+    ajaxResponse(array('result'=>'Ok', 'deleted'=>$result->rowCount()));
   }
   case 'query' :
   {
@@ -107,10 +105,12 @@
     $total = dbFetchOne('SELECT count(*) AS Total FROM Logs', 'Total');
     $query = buildLogQuery('SELECT *');
 
-    $servers = ZM\Server::find();
+    global $Servers;
+    if ( !$Servers )
+      $Servers = ZM\Server::find();
     $servers_by_Id = array();
     # There is probably a better way to do this.
-    foreach ( $servers as $server ) {
+    foreach ( $Servers as $server ) {
       $servers_by_Id[$server->Id()] = $server;
     }
 
@@ -120,11 +120,9 @@
     foreach ( dbFetchAll($query['sql'], NULL, $query['values']) as $log ) {
 
       $log['DateTime'] = strftime('%Y-%m-%d %H:%M:%S', intval($log['TimeKey']));
-      #Warning("TimeKey: " . $log['TimeKey'] . 'Intval:'.intval($log['TimeKey']).' DateTime:'.$log['DateTime']);
-      #$log['DateTime'] = preg_replace('/^\d+/', strftime('%Y-%m-%d %H:%M:%S', intval($log['TimeKey'])), $log['TimeKey']);
       $log['Server'] = ( $log['ServerId'] and isset($servers_by_Id[$log['ServerId']]) ) ? $servers_by_Id[$log['ServerId']]->Name() : '';
       $log['Message'] = preg_replace('/[\x00-\x1F\x7F-\xFF]/', '', $log['Message']);
-      foreach( $filterFields as $field ) {
+      foreach ( $filterFields as $field ) {
         if ( !isset($options[$field]) ) 
           $options[$field] = array();
         $value = $log[$field];
@@ -141,21 +139,21 @@
         }
       }
       $logs[] = $log;
-    }
+    } # end foreach log db row
 
     foreach ( $options as $field => $values ) {
       asort($options[$field]);
     }
 
     $available = count($logs);
-    ajaxResponse( array(
-      'updated' => preg_match('/%/', DATE_FMT_CONSOLE_LONG)?strftime(DATE_FMT_CONSOLE_LONG):date(DATE_FMT_CONSOLE_LONG), 
+    ajaxResponse(array(
+      'updated' => preg_match('/%/', DATE_FMT_CONSOLE_LONG) ? strftime(DATE_FMT_CONSOLE_LONG) : date(DATE_FMT_CONSOLE_LONG), 
       'total' => $total,
       'available' => isset($available) ? $available : $total,
       'logs' => $logs,
       'state' => logState(),
       'options' => $options,
-    ) );
+    ));
     break;
   }
   case 'export' :
@@ -163,9 +161,9 @@
     if ( !canView('System') )
       ajaxError('Insufficient permissions to export logs');
 
-    $minTime = isset($_POST['minTime'])?$_POST['minTime']:NULL;
-    $maxTime = isset($_POST['maxTime'])?$_POST['maxTime']:NULL;
-    if ( !is_null($minTime) && !is_null($maxTime) && $minTime > $maxTime ) {
+    $minTime = isset($_POST['minTime']) ? $_POST['minTime'] : NULL;
+    $maxTime = isset($_POST['maxTime']) ? $_POST['maxTime'] : NULL;
+    if ( !is_null($minTime) && !is_null($maxTime) && ($minTime > $maxTime) ) {
       $tempTime = $minTime;
       $minTime = $maxTime;
       $maxTime = $tempTime;
@@ -174,15 +172,17 @@
     $filter = isset($_POST['filter'])?$_POST['filter']:array();
     $sortField = 'TimeKey';
     if ( isset($_POST['sortField']) ) {
-      if ( ! in_array( $_POST['sortField'], $filterFields ) and ( $_POST['sortField'] != 'TimeKey' ) ) {
-        ZM\Error("Invalid sort field " . $_POST['sortField'] );
+      if ( !in_array($_POST['sortField'], $filterFields) and ($_POST['sortField'] != 'TimeKey') ) {
+        ZM\Error('Invalid sort field '.$_POST['sortField']);
       } else {
         $sortField = $_POST['sortField'];
       }
     }
-    $sortOrder = (isset($_POST['sortOrder']) and $_POST['sortOrder']) == 'asc' ? 'asc':'desc';
+    $sortOrder = (isset($_POST['sortOrder']) and $_POST['sortOrder']) == 'asc' ? 'asc' : 'desc';
 
-    $servers = ZM\Server::find();
+    global $Servers;
+    if ( !$Servers )
+      $Servers = ZM\Server::find();
     $servers_by_Id = array();
     # There is probably a better way to do this.
     foreach ( $servers as $server ) {
@@ -193,11 +193,9 @@
     $where = array();
     $values = array();
     if ( $minTime ) {
-      ZM\Logger::Debug("MinTime: $minTime");
       if ( preg_match('/(.+)(\.\d+)/', $minTime, $matches) ) {
         # This handles sub second precision
         $minTime = strtotime($matches[1]).$matches[2];
-        ZM\Logger::Debug("MinTime: $minTime");
       } else {
         $minTime = strtotime($minTime);
       }
@@ -225,11 +223,11 @@
       }
     }
     if ( count($where) )
-      $sql.= ' WHERE '.join( ' AND ', $where );
+      $sql.= ' WHERE '.join(' AND ', $where);
     $sql .= ' ORDER BY '.$sortField.' '.$sortOrder;
     //$sql .= " limit ".dbEscape($limit);
-    $format = isset($_POST['format'])?$_POST['format']:'text';
-    switch( $format ) {
+    $format = isset($_POST['format']) ? $_POST['format'] : 'text';
+    switch ( $format ) {
       case 'text' :
         $exportExt = 'txt';
         break;
@@ -245,43 +243,40 @@
       default :
         ZM\Fatal("Unrecognised log export format '$format'");
     }
-    $exportKey = substr(md5(rand()),0,8);
-    $exportFile = "zm-log.$exportExt";
-    if ( ! file_exists(ZM_DIR_EXPORTS) ) {
-      ZM\Logger::Debug('Creating ' . ZM_DIR_EXPORTS);
-      if ( ! mkdir(ZM_DIR_EXPORTS) ) {
-        ZM\Fatal("Can't create exports dir at '".ZM_DIR_EXPORTS."'");
-      }
+    $exportKey = substr(md5(rand()), 0, 8);
+    $exportFile = 'zm-log.'.$exportExt;
+    if ( ! ( mkdir(ZM_DIR_EXPORTS) || file_exists(ZM_DIR_EXPORTS) ) ) {
+      ZM\Fatal('Can\'t create exports dir at \''.ZM_DIR_EXPORTS.'\'');
     }
-    $exportPath = ZM_DIR_EXPORTS."/zm-log-$exportKey.$exportExt";
+    $exportPath = ZM_DIR_EXPORTS.'/zm-log-'.$exportKey.$exportExt;

zoneminder-1.34.8.tar.gz/web/ajax/status.php -> zoneminder-1.34.16.tar.gz/web/ajax/status.php Changed

zoneminder-1.34.8.tar.gz/web/api/app/Controller/HostController.php -> zoneminder-1.34.16.tar.gz/web/api/app/Controller/HostController.php Changed

@@ -50,8 +50,10 @@
     $cred_depr = [];
 
     if ( $username && $password ) {
+      ZM\Logger::Debug('Username and password provided, generating access and refresh tokens');
       $cred = $this->_getCredentials(true, '', $username); // generate refresh
     } else {
+      ZM\Logger::Debug('Only generating access token');
       $cred = $this->_getCredentials(false, $token); // don't generate refresh
     }
 
@@ -69,6 +71,8 @@
       $cred_depr = $this->_getCredentialsDeprecated();
       $login_array['credentials'] = $cred_depr[0];
       $login_array['append_password'] = $cred_depr[1];
+    } else {
+      ZM\Logger::Debug('Legacy Auth is disabled, not generating auth= credentials');
     }
 
     $login_array['version'] = $ver[0];
@@ -108,8 +112,11 @@
 
   private function _getCredentials($generate_refresh_token=false, $token='', $username='') {
 
-    if ( !ZM_OPT_USE_AUTH )
+    if ( !ZM_OPT_USE_AUTH ) {
+      ZM\Error('OPT_USE_AUTH is turned off. Tokens will be null');
       return;
+    }
+      
 
     if ( !ZM_AUTH_HASH_SECRET )
       throw new ForbiddenException(__('Please create a valid AUTH_HASH_SECRET in ZoneMinder'));

zoneminder-1.34.8.tar.gz/web/api/app/Controller/ServersController.php -> zoneminder-1.34.16.tar.gz/web/api/app/Controller/ServersController.php Changed

@@ -17,12 +17,17 @@
 
   public function beforeFilter() {
     parent::beforeFilter();
+    /*
+     * A user needs the server data to calculate how to view a monitor, and there really isn't anything sensitive in this data.
+     * So it has been decided for now to just let everyone read it.
+     
     global $user;
     $canView = (!$user) || ($user['System'] != 'None');
     if ( !$canView ) {
       throw new UnauthorizedException(__('Insufficient Privileges'));
       return;
     }
+     */
   }
 
 /**
@@ -34,7 +39,7 @@
     $this->Server->recursive = 0;
     
     $options = '';
-    $servers = $this->Server->find('all',$options);
+    $servers = $this->Server->find('all', $options);
 		$this->set(array(
 					'servers' => $servers,
 					'_serialize' => array('servers')
@@ -50,13 +55,13 @@
  */
   public function view($id = null) {
     $this->Server->recursive = 0;
-    if (!$this->Server->exists($id)) {
+    if ( !$this->Server->exists($id) ) {
       throw new NotFoundException(__('Invalid server'));
     }
     $restricted = '';
     
     $options = array('conditions' => array( 
-          array('Server.' . $this->Server->primaryKey => $id),
+          array('Server.'.$this->Server->primaryKey => $id),
           $restricted
           )
         );

zoneminder-1.34.8.tar.gz/web/includes/Event.php -> zoneminder-1.34.16.tar.gz/web/includes/Event.php Changed

@@ -417,31 +417,27 @@
           }
         } // end if capture file exists
       } // end if analyze file exists
-    }
+    } // end if frame or snapshot
 
     $captPath = $eventPath.'/'.$captImage;
     if ( ! file_exists($captPath) ) {
       Error("Capture file does not exist at $captPath");
     }
     
-    //echo "CI:$captImage, CP:$captPath, TCP:$captPath<br>";
-
     $analImage = sprintf('%0'.ZM_EVENT_IMAGE_DIGITS.'d-analyse.jpg', $frame['FrameId']);
     $analPath = $eventPath.'/'.$analImage;
 
-    //echo "AI:$analImage, AP:$analPath, TAP:$analPath<br>";
-
     $alarmFrame = $frame['Type']=='Alarm';
 
     $hasAnalImage = $alarmFrame && file_exists($analPath) && filesize($analPath);
     $isAnalImage = $hasAnalImage && !$captureOnly;
 
-    if ( !ZM_WEB_SCALE_THUMBS || $scale >= SCALE_BASE || !function_exists('imagecreatefromjpeg') ) {
+    if ( !ZM_WEB_SCALE_THUMBS || ($scale >= SCALE_BASE) || !function_exists('imagecreatefromjpeg') ) {
       $imagePath = $thumbPath = $isAnalImage ? $analPath : $captPath;
       $imageFile = $imagePath;
       $thumbFile = $thumbPath;
     } else {
-      if ( version_compare( phpversion(), '4.3.10', '>=') )
+      if ( version_compare(phpversion(), '4.3.10', '>=') )
         $fraction = sprintf('%.3F', $scale/SCALE_BASE);
       else
         $fraction = sprintf('%.3f', $scale/SCALE_BASE);
@@ -459,19 +455,19 @@
       }
 
       $thumbFile = $thumbPath;
-      if ( $overwrite || ! file_exists( $thumbFile ) || ! filesize( $thumbFile ) ) {
+      if ( $overwrite || ! file_exists($thumbFile) || ! filesize($thumbFile) ) {
         // Get new dimensions
-        list( $imageWidth, $imageHeight ) = getimagesize( $imagePath );
+        list( $imageWidth, $imageHeight ) = getimagesize($imagePath);
         $thumbWidth = $imageWidth * $fraction;
         $thumbHeight = $imageHeight * $fraction;
 
         // Resample
-        $thumbImage = imagecreatetruecolor( $thumbWidth, $thumbHeight );
-        $image = imagecreatefromjpeg( $imagePath );
-        imagecopyresampled( $thumbImage, $image, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imageWidth, $imageHeight );
+        $thumbImage = imagecreatetruecolor($thumbWidth, $thumbHeight);
+        $image = imagecreatefromjpeg($imagePath);
+        imagecopyresampled($thumbImage, $image, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imageWidth, $imageHeight);
 
-        if ( !imagejpeg( $thumbImage, $thumbPath ) )
-          Error( "Can't create thumbnail '$thumbPath'" );
+        if ( !imagejpeg($thumbImage, $thumbPath) )
+          Error("Can't create thumbnail '$thumbPath'");
       }
     } # Create thumbnails
 
@@ -555,7 +551,7 @@
     $Server = $Storage->ServerId() ? $Storage->Server() : $this->Monitor()->Server();
     if ( $Server->Id() != ZM_SERVER_ID ) {
 
-      $url = $Server->UrlToApi() . '/events/'.$this->{'Id'}.'.json';
+      $url = $Server->UrlToApi().'/events/'.$this->{'Id'}.'.json';
       if ( ZM_OPT_USE_AUTH ) {
         if ( ZM_AUTH_RELAY == 'hashed' ) {
           $url .= '?auth='.generateAuthHash(ZM_AUTH_HASH_IPS);

zoneminder-1.34.8.tar.gz/web/includes/Group.php -> zoneminder-1.34.16.tar.gz/web/includes/Group.php Changed

@@ -19,9 +19,9 @@
 
   public function delete() {
     if ( property_exists($this, 'Id') ) {
-      dbQuery('DELETE FROM Groups_Monitors WHERE GroupId=?', array($this->{'Id'}));
-      dbQuery('UPDATE Groups SET ParentId=NULL WHERE ParentId=?', array($this->{'Id'}));
-      dbQuery('DELETE FROM Groups WHERE Id=?', array($this->{'Id'}));
+      dbQuery('DELETE FROM `Groups_Monitors` WHERE `GroupId`=?', array($this->{'Id'}));
+      dbQuery('UPDATE `Groups` SET `ParentId`=NULL WHERE `ParentId`=?', array($this->{'Id'}));
+      dbQuery('DELETE FROM `Groups` WHERE Id=?', array($this->{'Id'}));
       if ( isset($_COOKIE['zmGroup']) ) {
         if ( $this->{'Id'} == $_COOKIE['zmGroup'] ) {
           unset($_COOKIE['zmGroup']);
@@ -47,7 +47,7 @@
 
   public function MonitorIds( ) {
     if ( ! property_exists($this, 'MonitorIds') ) {
-      $this->{'MonitorIds'} = dbFetchAll('SELECT MonitorId FROM Groups_Monitors WHERE GroupId=?', 'MonitorId', array($this->{'Id'}));
+      $this->{'MonitorIds'} = dbFetchAll('SELECT `MonitorId` FROM `Groups_Monitors` WHERE `GroupId`=?', 'MonitorId', array($this->{'Id'}));
     }
     return $this->{'MonitorIds'};
   }
@@ -65,7 +65,7 @@
       session_write_close();
     }
 
-    return htmlSelect( 'GroupId[]', Group::get_dropdown_options(), isset($_SESSION['GroupId'])?$_SESSION['GroupId']:null, array(
+    return htmlSelect('GroupId[]', Group::get_dropdown_options(), isset($_SESSION['GroupId'])?$_SESSION['GroupId']:null, array(
           'data-on-change' => 'submitThisForm',
           'class'=>'chosen',
           'multiple'=>'multiple',

zoneminder-1.34.8.tar.gz/web/includes/Monitor.php -> zoneminder-1.34.16.tar.gz/web/includes/Monitor.php Changed

@@ -11,7 +11,7 @@
 
   protected $defaults = array(
     'Id' => null,
-    'Name' => '',
+    'Name' => array('type'=>'text','filter_regexp'=>'/[^\w\-\.\:\/ ]/'),
     'Notes' => '',
     'ServerId' => 0,
     'StorageId' => 0,
@@ -39,7 +39,7 @@
     'Height' => null,
     'Colours' => 4,
     'Palette' =>  '0',
-    'Orientation' => null,
+    'Orientation' => 'ROTATE_0',
     'Deinterlacing' =>  0,
     'DecoderHWAccelName'  =>  null,
     'DecoderHWAccelDevice'  =>  null,
@@ -495,12 +495,16 @@
       }
     }
     if ( !count($options) ) {
-      if ( $command == 'quit' ) {
-        $options['command'] = 'quit';
-      } else if ( $command == 'start' ) {
-        $options['command'] = 'start';
-      } else if ( $command == 'stop' ) {
-        $options['command'] = 'stop';
+
+      if ( $command == 'quit' or $command == 'start' or $command == 'stop' ) {
+        # These are special as we now run zmcontrol as a daemon through zmdc.
+        $status = daemonStatus('zmcontrol.pl', array('--id', $this->{'Id'}));
+        Logger::Debug("Current status $status");
+        if ( $status or ( (!defined('ZM_SERVER_ID')) or ( property_exists($this, 'ServerId') and (ZM_SERVER_ID==$this->{'ServerId'}) ) ) ) {
+          daemonControl($command, 'zmcontrol.pl', '--id '.$this->{'Id'});
+          return;
+        }
+        $options['command'] = $command;
       } else {
         Warning("No commands to send to zmcontrol from $command");
         return false;
@@ -538,12 +542,12 @@
       $url = ZM_BASE_PROTOCOL . '://'.$Server->Hostname().'/zm/api/monitors/daemonControl/'.$this->{'Id'}.'/'.$command.'/zmcontrol.pl.json';
       if ( ZM_OPT_USE_AUTH ) {
         if ( ZM_AUTH_RELAY == 'hashed' ) {
-          $url .= '?auth='.generateAuthHash( ZM_AUTH_HASH_IPS );
+          $url .= '?auth='.generateAuthHash(ZM_AUTH_HASH_IPS);
         } else if ( ZM_AUTH_RELAY == 'plain' ) {
-          $url = '?user='.$_SESSION['username'];
-          $url = '?pass='.$_SESSION['password'];
+          $url .= '?user='.$_SESSION['username'];
+          $url .= '?pass='.$_SESSION['password'];
         } else if ( ZM_AUTH_RELAY == 'none' ) {
-          $url = '?user='.$_SESSION['username'];
+          $url .= '?user='.$_SESSION['username'];
         }
       }
       Logger::Debug("sending command to $url");

zoneminder-1.34.8.tar.gz/web/includes/Object.php -> zoneminder-1.34.16.tar.gz/web/includes/Object.php Changed

@@ -39,10 +39,13 @@
   public function __call($fn, array $args){
     $type = (array_key_exists($fn, $this->defaults) && is_array($this->defaults[$fn])) ? $this->defaults[$fn]['type'] : 'scalar';
     if ( count($args) ) {
-      if ( $type == 'set' and is_array($args[0]) )
+      if ( $type == 'set' and is_array($args[0]) ) {
         $this->{$fn} = implode(',', $args[0]);
-      else
+      } else if ( array_key_exists($fn, $this->defaults) && is_array($this->defaults[$fn]) && isset($this->defaults[$fn]['filter_regexp']) ) {
+        $this->{$fn} = preg_replace($this->defaults[$fn]['filter_regexp'], '', $args[0]);
+      } else {
         $this->{$fn} = $args[0];
+      }
     }
 
     if ( property_exists($this, $fn) ) {
@@ -63,7 +66,7 @@
   public static function _find($class, $parameters = null, $options = null ) {
     $table = $class::$table;
     $filters = array();
-    $sql = "SELECT * FROM `$table` ";
+    $sql = 'SELECT * FROM `'.$table.'` ';
     $values = array();
 
     if ( $parameters ) {
@@ -164,24 +167,11 @@
 # perhaps should turn into a comma-separated string
           $this->{$k} = implode(',', $v);
         } else if ( is_string($v) ) {
-if ( 0 ) {
-# Remarking this out.  We are setting a value, not asking for a default to be set. 
-# So don't do defaults here, do them somewhere else
-          if ( ($v == null) and array_key_exists($k, $this->defaults) ) {
-Logger::Debug("$k => Have default for $v: ");
-            if ( is_array($this->defaults[$k]) ) {
-              $this->{$k} = $this->defaults[$k]['default'];
-            } else {
-							$this->{$k} = $this->defaults[$k];
-							Logger::Debug("$k => Have default for $v: " . $this->{$k});
-						}
-					} else {
+          if ( array_key_exists($k, $this->defaults) && is_array($this->defaults[$k]) && isset($this->defaults[$k]['filter_regexp']) ) {
+            $this->{$k} = preg_replace($this->defaults[$k]['filter_regexp'], '', trim($v));
+          } else {
 						$this->{$k} = trim($v);
           }
-} else {
-						$this->{$k} = trim($v);
-}
-
         } else if ( is_integer($v) ) {
           $this->{$k} = $v;
         } else if ( is_bool($v) ) {
@@ -216,7 +206,8 @@
           }
         }
       } # end foreach default
-    }
+    } # end if defaults
+
     foreach ( $new_values as $field => $value ) {
 
       if ( method_exists($this, $field) ) {
@@ -250,12 +241,15 @@
           # Input might be a command separated string, or an array
           
         } else {
+          if ( array_key_exists($field, $this->defaults) && is_array($this->defaults[$field]) && isset($this->defaults[$field]['filter_regexp']) ) {
+            $value = preg_replace($this->defaults[$field]['filter_regexp'], '', trim($value));
+          }
           if ( $this->{$field} != $value ) {
             $changes[$field] = $value;
           }
         }
       } else if ( array_key_exists($field, $this->defaults) ) {
-        if ( is_array($this->defaults[$field]) ) {
+        if ( is_array($this->defaults[$field]) and isset($this->defaults[$field]['default']) ) {
           $default = $this->defaults[$field]['default'];
         } else {
           $default = $this->defaults[$field];
@@ -270,17 +264,6 @@
           $changes[$field] = $value;
         }
       }
-
-        #if ( (!array_key_exists($field, $this)) or ( $this->{$field} != $new_values[$field] ) ) {
-      #Logger::Debug("Checking default $field => $default_value changes becaause" . $new_values[$field].' != '.$new_values[$field]);
-          #$changes[$field] = $new_values[$field];
-        ##} else if  {
-      #Logger::Debug("Checking default $field => $default_value changes becaause " . $new_values[$field].' != '.$new_values[$field]);
-          ##array_push( $changes, [$field=>$defaults[$field]] );
-        #}
-      #} else {
-        #Logger::Debug("Checking default $field => $default_value not in new_values");
-      #}
     } # end foreach newvalue
 
 
@@ -299,7 +282,7 @@
     # Set defaults.  Note that we only replace "" with null, not other values
     # because for example if we want to clear TimestampFormat, we clear it, but the default is a string value
     foreach ( $this->defaults as $field => $default ) {
-      if ( (!array_key_exists($field, $this)) or ($this->{$field} == '') ) {
+      if ( (!property_exists($this, $field)) or ($this->{$field} === '') ) {
         if ( is_array($default) ) {
           $this->{$field} = $default['default'];
         } else if ( $default == null ) {
@@ -323,7 +306,7 @@
     $fields = array_keys($fields);
 
     if ( $this->Id() ) {
-      $sql = 'UPDATE '.$table.' SET '.implode(', ', array_map(function($field) {return '`'.$field.'`=?';}, $fields)).' WHERE Id=?';
+      $sql = 'UPDATE `'.$table.'` SET '.implode(', ', array_map(function($field) {return '`'.$field.'`=?';}, $fields)).' WHERE Id=?';
       $values = array_map(function($field){ return $this->{$field};}, $fields);
       $values[] = $this->{'Id'};
       if ( dbQuery($sql, $values) )
@@ -331,8 +314,8 @@
     } else {
       unset($fields['Id']);
 
-      $sql = 'INSERT INTO '.$table.
-        ' ('.implode(', ', array_map(function($field) {return '`'.$field.'`';}, $fields)).
+      $sql = 'INSERT INTO `'.$table.
+        '` ('.implode(', ', array_map(function($field) {return '`'.$field.'`';}, $fields)).
           ') VALUES ('.
           implode(', ', array_map(function($field){return '?';}, $fields)).')';
 
@@ -348,7 +331,7 @@
   public function delete() {
     $class = get_class($this);
     $table = $class::$table;
-    dbQuery("DELETE FROM $table WHERE Id=?", array($this->{'Id'}));
+    dbQuery("DELETE FROM `$table` WHERE Id=?", array($this->{'Id'}));
     if ( isset($object_cache[$class]) and isset($object_cache[$class][$this->{'Id'}]) )
       unset($object_cache[$class][$this->{'Id'}]);
   }

zoneminder-1.34.16.tar.gz/web/includes/Zone.php Added

@@ -0,0 +1,41 @@
+<?php
+namespace ZM;
+require_once('database.php');
+require_once('Object.php');
+
+
+class Zone extends ZM_Object {
+  protected static $table = 'Zones';
+
+	protected $defaults = array(
+			'Id'                   => null,
+			'Name'                 => '',
+			'Type' => 'Active',
+			'Units' => 'Pixels',
+			'CheckMethod' => 'Blobs',
+			'MinPixelThreshold' => null,
+			'MaxPixelThreshold' => null,
+			'MinAlarmPixels' => null,
+			'MaxAlarmPixels' => null,
+			'FilterX' => null,
+			'FilterY' => null,
+			'MinFilterPixels' => null,
+			'MaxFilterPixels' => null,
+			'MinBlobPixels' => null,
+			'MaxBlobPixels' => null,
+			'MinBlobs' => null,
+			'MaxBlobs' => null,
+			'OverloadFrames' => 0,
+			'ExtendAlarmFrames' => 0,
+			);
+
+  public static function find( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find(get_class(), $parameters, $options);
+  }
+
+  public static function find_one( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find_one(get_class(), $parameters, $options);
+  }
+
+} # end class Zone
+?>

zoneminder-1.34.8.tar.gz/web/includes/actions/group.php -> zoneminder-1.34.16.tar.gz/web/includes/actions/group.php Changed

@@ -21,42 +21,31 @@
 // Group edit actions
 # Should probably verify that each monitor id is a valid monitor, that we have access to.
 # However at the moment, you have to have System permissions to do this
-if ( ! canEdit('Groups') ) {
+if ( !canEdit('Groups') ) {
   ZM\Warning('Need group edit permissions to edit groups');
   return;
 }
 
 if ( $action == 'Save' ) {
-  $monitors = empty($_POST['newGroup']['MonitorIds']) ? '' : implode(',', $_POST['newGroup']['MonitorIds']);
   $group_id = null;
-  if ( !empty($_POST['gid']) ) {
+  if ( !empty($_POST['gid']) )
     $group_id = $_POST['gid'];
-    dbQuery(
-      'UPDATE Groups SET Name=?, ParentId=? WHERE Id=?',
+  $group = new ZM\Group($group_id);
+  $group->save(
       array(
-        $_POST['newGroup']['Name'],
-        ( $_POST['newGroup']['ParentId'] == '' ? null : $_POST['newGroup']['ParentId'] ),
-        $group_id,
+      'Name'=>  $_POST['newGroup']['Name'],
+      'ParentId'=>( $_POST['newGroup']['ParentId'] == '' ? null : $_POST['newGroup']['ParentId'] ),
       )
     );
-    dbQuery('DELETE FROM Groups_Monitors WHERE GroupId=?', array($group_id));
-  } else {
-    dbQuery(
-      'INSERT INTO Groups (Name,ParentId) VALUES (?,?)',
-      array(
-        $_POST['newGroup']['Name'],
-        ( $_POST['newGroup']['ParentId'] == '' ? null : $_POST['newGroup']['ParentId'] ),
-      )
-    );
-    $group_id = dbInsertId();
-  }
+  dbQuery('DELETE FROM `Groups_Monitors` WHERE `GroupId`=?', array($group_id));
+  $group_id = $group->Id();
   if ( $group_id ) {
     foreach ( $_POST['newGroup']['MonitorIds'] as $mid ) {
-      dbQuery('INSERT INTO Groups_Monitors (GroupId,MonitorId) VALUES (?,?)', array($group_id, $mid));
+      dbQuery('INSERT INTO `Groups_Monitors` (`GroupId`,`MonitorId`) VALUES (?,?)', array($group_id, $mid));
     }
   }
   $view = 'none';
   $refreshParent = true;
   $closePopup = true;
-} 
+}
 ?>

zoneminder-1.34.8.tar.gz/web/includes/actions/login.php -> zoneminder-1.34.16.tar.gz/web/includes/actions/login.php Changed

zoneminder-1.34.8.tar.gz/web/includes/actions/version.php -> zoneminder-1.34.16.tar.gz/web/includes/actions/version.php Changed

zoneminder-1.34.8.tar.gz/web/includes/config.php.in -> zoneminder-1.34.16.tar.gz/web/includes/config.php.in Changed

zoneminder-1.34.8.tar.gz/web/includes/database.php -> zoneminder-1.34.16.tar.gz/web/includes/database.php Changed

@@ -25,20 +25,26 @@
 $GLOBALS['dbLogLevel'] = DB_LOG_OFF;
 
 $GLOBALS['dbConn'] = false;
+require_once('logger.php');
 
 function dbConnect() {
   global $dbConn;
 
-  if ( strpos(ZM_DB_HOST, ':') ) {
-    // Host variable may carry a port or socket.
-    list($host, $portOrSocket) = explode(':', ZM_DB_HOST, 2);
-    if ( ctype_digit($portOrSocket) ) {
-      $socket = ':host='.$host . ';port='.$portOrSocket;
+  $socket = '';
+  if ( ZM_DB_HOST ) {
+    if ( strpos(ZM_DB_HOST, ':') ) {
+      // Host variable may carry a port or socket.
+      list($host, $portOrSocket) = explode(':', ZM_DB_HOST, 2);
+      if ( ctype_digit($portOrSocket) ) {
+        $socket = ':host='.$host . ';port='.$portOrSocket.';';
+      } else {
+        $socket = ':unix_socket='.$portOrSocket.';';
+      }
     } else {
-      $socket = ':unix_socket='.$portOrSocket;
+      $socket = ':host='.ZM_DB_HOST.';';
     }
   } else {
-    $socket = ':host='.ZM_DB_HOST;
+    $socket = ':host=localhost;';
   }
 
   try {
@@ -49,9 +55,9 @@
         PDO::MYSQL_ATTR_SSL_KEY  => ZM_DB_SSL_CLIENT_KEY,
         PDO::MYSQL_ATTR_SSL_CERT => ZM_DB_SSL_CLIENT_CERT,
       );
-      $dbConn = new PDO(ZM_DB_TYPE . $socket . ';dbname='.ZM_DB_NAME, ZM_DB_USER, ZM_DB_PASS, $dbOptions);
+      $dbConn = new PDO(ZM_DB_TYPE.$socket.'dbname='.ZM_DB_NAME, ZM_DB_USER, ZM_DB_PASS, $dbOptions);
     } else {
-      $dbConn = new PDO(ZM_DB_TYPE . $socket . ';dbname='.ZM_DB_NAME, ZM_DB_USER, ZM_DB_PASS);
+      $dbConn = new PDO(ZM_DB_TYPE.$socket.'dbname='.ZM_DB_NAME, ZM_DB_USER, ZM_DB_PASS);
     }
 
     $dbConn->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
@@ -61,9 +67,12 @@
     error_log('Unable to connect to ZM DB ' . $ex->getMessage());
     $dbConn = null;
   }
-}
+  return $dbConn;
+}  // end function dbConnect
 
-dbConnect();
+if ( !dbConnect() ) {
+  ZM\Fatal("Failed db connection to $socket");
+}
 
 function dbDisconnect() {
   global $dbConn;

zoneminder-1.34.8.tar.gz/web/includes/functions.php -> zoneminder-1.34.16.tar.gz/web/includes/functions.php Changed

@@ -36,14 +36,18 @@
 }
 
 function CSPHeaders($view, $nonce) {
-  $additionalScriptSrc = '';
+  global $Servers;
+  if ( ! $Servers )
+    $Servers = ZM\Server::find();
+
+  $additionalScriptSrc = implode(' ', array_map(function($S){return $S->Url();}, $Servers));
   switch ($view) {
     case 'login': {
       if (defined('ZM_OPT_USE_GOOG_RECAPTCHA')
           && defined('ZM_OPT_GOOG_RECAPTCHA_SITEKEY')
           && defined('ZM_OPT_GOOG_RECAPTCHA_SECRETKEY')
           && ZM_OPT_USE_GOOG_RECAPTCHA && ZM_OPT_GOOG_RECAPTCHA_SITEKEY && ZM_OPT_GOOG_RECAPTCHA_SECRETKEY) {
-        $additionalScriptSrc = "https://www.google.com";
+        $additionalScriptSrc .= ' https://www.google.com';
       }
       // fall through
     }
@@ -92,7 +96,9 @@
 
 # The following is left for future reference/use.
     $valid = false;
-    $Servers = ZM\Server::find();
+    global $Servers;
+    if ( ! $Servers )
+      $Servers = ZM\Server::find();
     if ( sizeof($Servers) < 1 ) {
 # Only need CORSHeaders in the event that there are multiple servers in use.
       # ICON: Might not be true. multi-port?
@@ -1057,7 +1063,7 @@
       $sortColumn = 'E.StartTime';
       break;
   }
-  if ( !$_REQUEST['sort_asc'] )
+  if ( !isset($_REQUEST['sort_asc']) )
     $_REQUEST['sort_asc'] = 0;
   $sortOrder = $_REQUEST['sort_asc'] ? 'asc' : 'desc';
   $sortQuery = $querySep.'sort_field='.validHtmlStr($_REQUEST['sort_field']).$querySep.'sort_asc='.validHtmlStr($_REQUEST['sort_asc']);
@@ -1224,6 +1230,7 @@
             break;
         }
         $valueList = array();
+        if ( !isset($term['val']) ) $term['val'] = '';
         foreach ( preg_split('/["\'\s]*?,["\'\s]*?/', preg_replace('/^["\']+?(.+)["\']+?$/', '$1', $term['val'])) as $value ) {
           switch ( $term['attr'] ) {
             case 'MonitorName':
@@ -1477,15 +1484,15 @@
 function getDiskPercent($path = ZM_DIR_EVENTS) {
   $total = disk_total_space($path);
   if ( $total === false ) {
-    Error('disk_total_space returned false. Verify the web account user has access to ' . $path);
+    ZM\Error('disk_total_space returned false. Verify the web account user has access to ' . $path);
     return 0;
   } elseif ( $total == 0 ) {
-    Error('disk_total_space indicates the following path has a filesystem size of zero bytes ' . $path);
+    ZM\Error('disk_total_space indicates the following path has a filesystem size of zero bytes ' . $path);
     return 100;
   }
   $free = disk_free_space($path);
   if ( $free === false ) {
-    Error('disk_free_space returned false. Verify the web account user has access to ' . $path);
+    ZM\Error('disk_free_space returned false. Verify the web account user has access to ' . $path);
   }
   $space = round((($total - $free) / $total) * 100);
   return $space;
@@ -2041,7 +2048,7 @@
       if ( $count['Level'] <= ZM\Logger::PANIC )
         $count['Level'] = ZM\Logger::FATAL;
       if ( !($levelCount = $levelCounts[$count['Level']]) ) {
-        Error('Unexpected Log level '.$count['Level']);
+        ZM\Error('Unexpected Log level '.$count['Level']);
         next;
       }
       if ( $levelCount[1] && $count['LevelCount'] >= $levelCount[1] ) {
@@ -2172,7 +2179,7 @@
     ajaxCleanup();
   if ( $code == HTTP_STATUS_OK ) {
     $response = array('result'=>'Error', 'message'=>$message);
-    header('Content-type: text/plain');
+    header('Content-type: application/json');
     exit(jsonEncode($response));
   }
   header("HTTP/1.0 $code $message");
@@ -2188,7 +2195,7 @@
   } else if ( !empty($result) ) {
     $response['message'] = $result;
   }
-  header('Content-type: text/plain');
+  header('Content-type: application/json');
   exit(jsonEncode($response));
 }
 
@@ -2283,7 +2290,7 @@
 function getStreamHTML($monitor, $options = array()) {
 
   if ( isset($options['scale']) ) {
-    if ( $options['scale'] != 'auto' ) {
+    if ( $options['scale'] != 'auto' && $options['scale'] != '0' ) {
       $options['width'] = reScale($monitor->ViewWidth(), $options['scale']).'px';
       $options['height'] = reScale($monitor->ViewHeight(), $options['scale']).'px';
     } else {

zoneminder-1.34.8.tar.gz/web/includes/lang.php -> zoneminder-1.34.16.tar.gz/web/includes/lang.php Changed

@@ -18,40 +18,52 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-function translate( $name ) {
+function translate($name) {
   global $SLANG;
-  if ( array_key_exists($name, $SLANG) )
+  // The isset is more performant
+  if ( isset($SLANG[$name]) || array_key_exists($name, $SLANG) )
     return $SLANG[$name];
   else
     return $name;
 }
 
-function loadLanguage( $prefix='' ) {
+function loadLanguage($prefix='') {
   global $user;
 
   if ( $prefix )
     $prefix = $prefix.'/';
 
-  $fallbackLangFile = $prefix.'lang/en_gb.php';
-  $systemLangFile = $prefix.'lang/'.ZM_LANG_DEFAULT.'.php';
-  if ( isset($user['Language']) )
+  if ( isset($user['Language']) and $user['Language'] ) {
     $userLangFile = $prefix.'lang/'.$user['Language'].'.php';
 
-  if ( isset($userLangFile) && file_exists($userLangFile) )
-    return $userLangFile;
-  elseif ( file_exists($systemLangFile) )
+    if ( file_exists($userLangFile) ) {
+      return $userLangFile;
+    } else {
+      ZM\Warning("User language file $userLangFile does not exist.");
+    }
+  }
+
+  $systemLangFile = $prefix.'lang/'.ZM_LANG_DEFAULT.'.php';
+  if ( file_exists($systemLangFile) ) {
     return $systemLangFile;
-  elseif ( file_exists($fallbackLangFile) )
+  } else {
+    ZM\Warning("System language file $systemLangFile does not exist.");
+  }
+
+  $fallbackLangFile = $prefix.'lang/en_gb.php';
+  if ( file_exists($fallbackLangFile) ) {
     return $fallbackLangFile;
-  else
-    return false;
+  } else {
+    ZM\Error("Default language file $fallbackLangFile does not exist.");
+  }
+  return false;
 }
 
 if ( $langFile = loadLanguage() ) {
   require_once($langFile);
   require_once('lang/default.php');
   foreach ($DLANG as $key => $value) {
-    if ( ! array_key_exists($key, $SLANG) )
+    if ( ! (isset($SLANG[$key]) || array_key_exists($key, $SLANG)) )
       $SLANG[$key] = $DLANG[$key];
   }
 }

zoneminder-1.34.8.tar.gz/web/includes/logger.php -> zoneminder-1.34.16.tar.gz/web/includes/logger.php Changed

@@ -1,7 +1,7 @@
 <?php
 
 namespace ZM;
-require_once( 'config.php' );
+require_once('config.php');
 
 class Logger {
   private static $instance;
@@ -70,7 +70,7 @@
     $this->terminate();
   }
 
-  public function initialise( $options=array() ) {
+  public function initialise($options=array()) {
     if ( !empty($options['id']) )
       $this->id = $options['id'];
 
@@ -237,31 +237,31 @@
         $this->effectiveLevel = $this->level;
       if ( !$this->hasTerm ) {
         if ( $lastLevel < self::DEBUG && $this->level >= self::DEBUG ) {
-          $this->savedErrorReporting = error_reporting( E_ALL );
-          $this->savedDisplayErrors = ini_set( 'display_errors', true );
+          $this->savedErrorReporting = error_reporting(E_ALL);
+          $this->savedDisplayErrors = ini_set('display_errors', true);
         } elseif ( $lastLevel >= self::DEBUG && $this->level < self::DEBUG ) {
-          error_reporting( $this->savedErrorReporting );
-          ini_set( 'display_errors', $this->savedDisplayErrors );
+          error_reporting($this->savedErrorReporting);
+          ini_set('display_errors', $this->savedDisplayErrors);
         }
       }
     }
-    return( $this->level );
+    return $this->level;
   }
 
   public function debugOn() {
     return( $this->effectiveLevel >= self::DEBUG );
   }
 
-  public function termLevel( $termLevel ) {
+  public function termLevel($termLevel) {
     if ( isset($termLevel) ) {
       $termLevel = $this->limit($termLevel);
       if ( $this->termLevel != $termLevel )
         $this->termLevel = $termLevel;
     }
-    return( $this->termLevel );
+    return $this->termLevel;
   }
 
-  public function databaseLevel( $databaseLevel=NULL ) {
+  public function databaseLevel($databaseLevel=NULL) {
     if ( !is_null($databaseLevel) ) {
       $databaseLevel = $this->limit($databaseLevel);
       if ( $this->databaseLevel != $databaseLevel ) {
@@ -269,7 +269,7 @@
         if ( $this->databaseLevel > self::NOLOG ) {
           if ( (include_once 'database.php') === FALSE ) {
             $this->databaseLevel = self::NOLOG;
-            Warning( 'Unable to write log entries to DB, database.php not found' );
+            Warning('Unable to write log entries to DB, database.php not found');
           }
         }
       }
@@ -277,7 +277,7 @@
     return $this->databaseLevel;
   }
 
-  public function fileLevel( $fileLevel ) {
+  public function fileLevel($fileLevel) {
     if ( isset($fileLevel) ) {
       $fileLevel = $this->limit($fileLevel);
       if ( $this->fileLevel != $fileLevel ) {
@@ -291,14 +291,14 @@
     return $this->fileLevel;
   }
 
-  public function weblogLevel( $weblogLevel ) {
+  public function weblogLevel($weblogLevel) {
     if ( isset($weblogLevel) ) {
       $weblogLevel = $this->limit($weblogLevel);
       if ( $this->weblogLevel != $weblogLevel ) {
         if ( $weblogLevel > self::NOLOG && $this->weblogLevel <= self::NOLOG ) {
-          $this->savedLogErrors = ini_set( 'log_errors', true );
+          $this->savedLogErrors = ini_set('log_errors', true);
         } elseif ( $weblogLevel <= self::NOLOG && $this->weblogLevel > self::NOLOG ) {
-          ini_set( 'log_errors', $this->savedLogErrors );
+          ini_set('log_errors', $this->savedLogErrors);
         }
         $this->weblogLevel = $weblogLevel;
       }
@@ -306,7 +306,7 @@
     return $this->weblogLevel;
   }
 
-  public function syslogLevel( $syslogLevel ) {
+  public function syslogLevel($syslogLevel) {
     if ( isset($syslogLevel) ) {
       $syslogLevel = $this->limit($syslogLevel);
       if ( $this->syslogLevel != $syslogLevel ) {
@@ -353,7 +353,7 @@
       fclose($this->logFd);
   }
 
-  public function logPrint( $level, $string, $file=NULL, $line=NULL ) {
+  public function logPrint($level, $string, $file=NULL, $line=NULL) {
     if ( $level > $this->effectiveLevel ) {
       return;
     }
@@ -375,21 +375,21 @@
           $rootPath = getcwd();
         else
           $rootPath = $_SERVER['DOCUMENT_ROOT'];
-        $file = preg_replace('/^'.addcslashes($rootPath,'/').'\/?/', '', $file);
+        $file = preg_replace('/^'.addcslashes($rootPath, '/').'\/?/', '', $file);
       }
     }
 
     if ( $this->useErrorLog ) {
       $message .= ' at '.$file.' line '.$line;
-    } else {
-      $message = $message;
     }
 
     if ( $level <= $this->termLevel ) {
-      if ( $this->hasTerm )
+      if ( $this->hasTerm ) {
         print($message."\n");
-      else
-        print(preg_replace("/\n/", '<br/>', htmlspecialchars($message)).'<br/>');
+      } else {
+        // Didn't we already replace all newlines with spaces above?
+        print(preg_replace('/\n/', '<br/>', htmlspecialchars($message)).'<br/>');
+      }
     }
 
     if ( $level <= $this->fileLevel ) {
@@ -402,6 +402,9 @@
         }
       } else if ( $this->logFd ) {
         fprintf($this->logFd, $message."\n");
+      } else {
+        $this->fileLevel = self::NOLOG;
+        Error('No logFd but have fileLevel logging!?');
       }
     }

zoneminder-1.34.8.tar.gz/web/index.php -> zoneminder-1.34.16.tar.gz/web/index.php Changed

zoneminder-1.34.8.tar.gz/web/js/logger.js -> zoneminder-1.34.16.tar.gz/web/js/logger.js Changed

@@ -53,12 +53,13 @@
   /* eslint-enable no-caller */
 
   if ( !debugReq ) {
+    debugParms = "view=request&request=log&task=create";
     if ( Browser ) {
-      debugParms = "view=request&request=log&task=create&browser[name]="+Browser.name+"&browser[version]="+Browser.version+"&browser[platform]="+(Browser.Platform?Browser.Platform.name:'unknown');
+      debugParms += "&browser[name]="+Browser.name+"&browser[version]="+Browser.version+"&browser[platform]="+(Browser.Platform?Browser.Platform.name:'unknown');
     } else {
-      debugParms = "view=request&request=log&task=create&browser[name]=unknown&browser[version]=unknown&browser[platform]=unknown";
+      debugParms += "&browser[name]=unknown&browser[version]=unknown&browser[platform]=unknown";
     }
-    debugReq = new Request.JSON( {url: thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'chain'} );
+    debugReq = new Request.JSON({url: thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'chain'});
   }
   var requestParms = debugParms;
   requestParms += "&level="+level+"&message="+encodeURIComponent(message);
@@ -71,57 +72,57 @@
   if ( line ) {
     requestParms += "&line="+line;
   }
-  debugReq.send( requestParms );
+  debugReq.send(requestParms);
 }
 
-function Panic( message ) {
-  console.error( message );
-  logReport( "PNC", message );
-  alert( "PANIC: "+message );
+function Panic(message) {
+  console.error(message);
+  logReport("PNC", message);
+  alert("PANIC: "+message);
 }
 
-function Fatal( message ) {
-  console.error( message );
+function Fatal(message) {
+  console.error(message);
   logReport( "FAT", message );
   alert( "FATAL: "+message );
 }
 
-function Error( message ) {
-  console.error( message );
-  logReport( "ERR", message );
+function Error(message) {
+  console.error(message);
+  logReport("ERR", message);
 }
 
-function Warning( message ) {
-  console.warn( message );
-  logReport( "WAR", message );
+function Warning(message) {
+  console.warn(message);
+  logReport("WAR", message);
 }
 
-function Info( message ) {
-  console.info( message );
-  logReport( "INF", message );
+function Info(message) {
+  console.info(message);
+  logReport("INF", message);
 }
 
-function Debug( message ) {
-  console.debug( message );
-  //logReport( "DBG", message );
+function Debug(message) {
+  console.debug(message);
+  //logReport("DBG", message);
 }
 
-function Dump( value, label ) {
+function Dump(value, label) {
   if ( label ) {
-    console.debug( label+" => " );
+    console.debug(label+" => ");
   }
-  console.debug( value );
+  console.debug(value);
 }
 
 window.onerror =
     function( message, url, line ) {
-      logReport( "ERR", message, url, line );
+      logReport("ERR", message, url, line);
     };
 
 window.addEventListener("securitypolicyviolation", function logCSP(evt) {
   var level = evt.disposition == "enforce" ? "ERR" : "DBG";
   var message = evt.blockedURI + " violated CSP " + evt.violatedDirective;
-  if (evt.sample) {
+  if ( evt.sample ) {
     message += " (Sample: " + evt.sample + ")";
   }
   logReport(level, message, evt.sourceFile, evt.lineNumber);

zoneminder-1.34.8.tar.gz/web/js/overlay.js -> zoneminder-1.34.16.tar.gz/web/js/overlay.js Changed

zoneminder-1.34.8.tar.gz/web/lang/cn_zh.php -> zoneminder-1.34.16.tar.gz/web/lang/cn_zh.php Changed

@@ -74,12 +74,14 @@
     '24BitColour'           => '24 位彩色',
     '32BitColour'           => '32 位彩色',          // Added - 2011-06-15
     '8BitGrey'              => '8 位灰度',
+    'API'                  => 'API',                    // Added - 2020-04-09
+    'APIEnabled'           => 'API已启用',            // Added - 2020-04-09
     'Action'                => '活动动作',
     'Actual'                => '实际',
     'AddNewControl'         => '新建控制',
     'AddNewMonitor'         => '新建监视器',
-    'AddNewServer'         => 'Add New Server',         // Added - 2018-08-30
-    'AddNewStorage'        => 'Add New Storage',        // Added - 2018-08-30
+    'AddNewServer'         => '新建服务器',         // Added - 2018-08-30
+    'AddNewStorage'        => '新建存储',        // Added - 2018-08-30
     'AddNewUser'            => '新建用户',
     'AddNewZone'            => '新建区域',
     'Alarm'                 => '报警',
@@ -90,11 +92,12 @@
     'AlarmMaximumFPS'       => '报警最大帧率FPS',
     'AlarmPx'               => '报警像素',
     'AlarmRGBUnset'         => '你必须设置一个报警颜色(RGB)',
-    'AlarmRefImageBlendPct'=> 'Alarm Reference Image Blend %ge', // Added - 2015-04-18
+    'AlarmRefImageBlendPct'=> '报警参考影像混合 %ge', // Added - 2015-04-18
     'Alert'                 => '警报',
     'All'                   => '全部',
-    'AnalysisFPS'          => 'Analysis FPS',           // Added - 2015-07-22
-    'AnalysisUpdateDelay'  => 'Analysis Update Delay',  // Added - 2015-07-23
+    'AllTokensRevoked'     => '已撤销所有tokens',     // Added - 2020-04-09
+    'AnalysisFPS'          => '分析帧率 FPS',           // Added - 2015-07-22
+    'AnalysisUpdateDelay'  => '分析更新延迟',  // Added - 2015-07-23
     'Apply'                 => '应用',
     'ApplyingStateChange'   => '状态改变生效',
     'ArchArchived'          => '仅限于存档',
@@ -107,30 +110,31 @@
     'AttrArchiveStatus'     => '存档状态',
     'AttrAvgScore'          => '平均分数',
     'AttrCause'             => '原因',
-    'AttrDiskBlocks'        => '磁碟区块',
-    'AttrDiskPercent'       => '磁碟百分比',
-    'AttrDiskSpace'        => 'Disk Space',             // Added - 2018-08-30
+    'AttrDiskBlocks'        => '磁盘区块',
+    'AttrDiskPercent'       => '磁盘百分比',
+    'AttrDiskSpace'        => '磁盘空间',             // Added - 2018-08-30
     'AttrDuration'          => '过程',
-    'AttrEndDate'          => 'End Date',               // Added - 2018-08-30
-    'AttrEndDateTime'      => 'End Date/Time',          // Added - 2018-08-30
-    'AttrEndTime'          => 'End Time',               // Added - 2018-08-30
-    'AttrEndWeekday'       => 'End Weekday',            // Added - 2018-08-30
-    'AttrFilterServer'     => 'Server Filter is Running On', // Added - 2018-08-30
+    'AttrEndDate'          => '结束日期',               // Added - 2018-08-30
+    'AttrEndDateTime'      => '结束日期/时间',          // Added - 2018-08-30
+    'AttrEndTime'          => '结束时间',               // Added - 2018-08-30
+    'AttrEndWeekday'       => '结束星期',            // Added - 2018-08-30
+    'AttrFilterServer'     => '过滤服务正运行在', // Added - 2018-08-30
     'AttrFrames'            => '帧',
     'AttrId'                => 'Id',
     'AttrMaxScore'          => '最大分数',
     'AttrMonitorId'         => '监视器 Id',
     'AttrMonitorName'       => '监视器名称',
-    'AttrMonitorServer'    => 'Server Monitor is Running On', // Added - 2018-08-30
+    'AttrMonitorServer'    => '监控服务正运行在', // Added - 2018-08-30
     'AttrName'              => '名称',
     'AttrNotes'             => '备注',
-    'AttrStartDate'        => 'Start Date',             // Added - 2018-08-30
-    'AttrStartDateTime'    => 'Start Date/Time',        // Added - 2018-08-30
-    'AttrStartTime'        => 'Start Time',             // Added - 2018-08-30
-    'AttrStartWeekday'     => 'Start Weekday',          // Added - 2018-08-30
-    'AttrStateId'          => 'Run State',              // Added - 2018-08-30
-    'AttrStorageArea'      => 'Storage Area',           // Added - 2018-08-30
-    'AttrStorageServer'    => 'Server Hosting Storage', // Added - 2018-08-30
+    'AttrSecondaryStorageArea'=> '第二存储区域', // Added - 2020-04-09
+    'AttrStartDate'        => '开始日期',             // Added - 2018-08-30
+    'AttrStartDateTime'    => '开始日期/时间',        // Added - 2018-08-30
+    'AttrStartTime'        => '开始时间',             // Added - 2018-08-30
+    'AttrStartWeekday'     => '开始星期',          // Added - 2018-08-30
+    'AttrStateId'          => '运行状态',              // Added - 2018-08-30
+    'AttrStorageArea'      => '存储区域',           // Added - 2018-08-30
+    'AttrStorageServer'    => '存储服务器', // Added - 2018-08-30
     'AttrSystemLoad'        => '系统负载',
     'AttrTotalScore'        => '总分数',
     'Auto'                  => '自动',
@@ -141,10 +145,10 @@
     'BackgroundFilter'      => '在后台运行筛选器',
     'BadAlarmFrameCount'    => '报警帧数必须设为大于1的整数',
     'BadAlarmMaxFPS'        => '报警最大帧率必须是正整数或正浮点数',
-    'BadAnalysisFPS'       => 'Analysis FPS must be a positive integer or floating point value', // Added - 2015-07-22
-    'BadAnalysisUpdateDelay'=> 'Analysis update delay must be set to an integer of zero or more', // Added - 2015-07-23
+    'BadAnalysisFPS'       => '分析帧率 FPS 必须是正整数或正浮点数', // Added - 2015-07-22
+    'BadAnalysisUpdateDelay'=> '分析更新延迟必须设为大于零的整数', // Added - 2015-07-23
     'BadChannel'            => '通道必须设为大于零的整数',
-    'BadColours'           => 'Target colour must be set to a valid value', // Added - 2011-06-15
+    'BadColours'           => '颜色必须设置为有效值', // Added - 2011-06-15
     'BadDevice'             => '必须为器件设置有效值',
     'BadFPSReportInterval'  => 'FPS帧数报告间隔缓冲数必须是0以上整数',
     'BadFormat'             => '格式必须设为大于零的整数',
@@ -155,9 +159,10 @@
     'BadLabelX'             => '标签 X 坐标必须设为大于零的整数',
     'BadLabelY'             => '标签 Y 坐标必须设为大于零的整数',
     'BadMaxFPS'             => '最大帧数FPS必须设为正整数或着浮点数',
-    'BadMotionFrameSkip'    => 'Motion Frame skip count must be an integer of zero or more',
+    'BadMotionFrameSkip'    => '运动跳帧数必须设为大于零的整数',
     'BadNameChars'          => '名称只可以包含字母，数字，波折号和下划线',
-    'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
+    'BadNoSaveJPEGsOrVideoWriter'=> '保存为JPEGs和保存为视频同时禁用后。不会有任何记录 ', // Added - 2020-04-09
+    'BadPalette'           => '调色板必须设为有效值', // Added - 2009-03-31
     'BadPath'               => '路径必须设为有效值',
     'BadPort'               => '端口必须设为有效数字',
     'BadPostEventCount'     => '之后事件影像数目必须设为大于零的整数',
@@ -165,11 +170,11 @@
     'BadRefBlendPerc'       => '参考混合百分比必须设为一个正整数',
     'BadSectionLength'      => '节长度必须设为30的整数倍',
     'BadSignalCheckColour'  => '信号检查颜色必须设为有效的RGB颜色字符',
-    'BadSourceType'        => 'Source Type \"Web Site\" requires the Function to be set to \"Monitor\"', // Added - 2018-08-30
+    'BadSourceType'        => '源类型 \"网站\" 要求 功能 设置为 \"监视\"', // Added - 2018-08-30
     'BadStreamReplayBuffer' => '流重放缓冲必须为零或更多整数',
     'BadWarmupCount'        => '预热帪必须设为零或更多整数',
     'BadWebColour'          => 'Web颜色必须设为有效Web颜色字符',
-    'BadWebSitePath'       => 'Please enter a complete website url, including the http:// or https:// prefix.', // Added - 2018-08-30
+    'BadWebSitePath'       => '请输入一个完整的网站链接，包括http://或https://前缀。', // Added - 2018-08-30
     'BadWidth'              => '宽度必须设为有效值',
     'Bandwidth'             => '带宽',
     'BandwidthHead'         => 'Bandwidth',	// This is the end of the bandwidth status on the top of the console, different in many language due to phrasing
@@ -177,9 +182,9 @@
     'BlobSizes'             => 'Blob大小',
     'Blobs'                 => 'Blobs',
     'Brightness'            => '亮度',
-    'Buffer'               => 'Buffer',                 // Added - 2015-04-18
+    'Buffer'               => '缓冲',                 // Added - 2015-04-18
     'Buffers'               => '缓冲器',
-    'CSSDescription'       => 'Change the default css for this computer', // Added - 2015-04-18
+    'CSSDescription'       => '改变本机默认css', // Added - 2015-04-18
     'CanAutoFocus'          => '可以自动对焦',
     'CanAutoGain'           => '可以自动增益控制',
     'CanAutoIris'           => '可以自动光圈',
@@ -204,8 +209,8 @@
     'CanMoveMap'            => '可以映射网格移动',
     'CanMoveRel'            => '可以相对移动',
     'CanPan'                => '可以平移' ,
+	'CanReboot'             => '可以重启',
     'CanReset'              => '可以复位',
-	'CanReboot'             => 'Can Reboot',
     'CanSetPresets'         => '可以进行预设',
     'CanSleep'              => '可以休眠',
     'CanTilt'               => '可以倾斜',
@@ -224,22 +229,23 @@
     'CaptureHeight'         => '捕获高度',
     'CaptureMethod'         => '捕获方式',
     'CapturePalette'        => '捕获调色板',
-    'CaptureResolution'    => 'Capture Resolution',     // Added - 2015-04-18
+    'CaptureResolution'    => '捕获分辨率',     // Added - 2015-04-18
     'CaptureWidth'          => '捕获宽度',
     'Cause'                 => '原因',
     'CheckMethod'           => '报警检查方式',
-    'ChooseDetectedCamera' => 'Choose Detected Camera', // Added - 2009-03-31
+    'ChooseDetectedCamera' => '选择检测到的摄像头', // Added - 2009-03-31
+    'ChooseDetectedProfile'=> '选择检测到的流媒体', // Added - 2020-04-09
     'ChooseFilter'          => '选择筛选器',
-    'ChooseLogFormat'      => 'Choose a log format',    // Added - 2011-06-17
+    'ChooseLogFormat'      => '选择日志格式',    // Added - 2011-06-17
     'ChooseLogSelection'   => 'Choose a log selection', // Added - 2011-06-17
     'ChoosePreset'          => '选择预置',
-    'Clear'                => 'Clear',                  // Added - 2011-06-16
-    'CloneMonitor'         => 'Clone',                  // Added - 2018-08-30
+    'Clear'                => '清除',                  // Added - 2011-06-16
+    'CloneMonitor'         => '克隆',                  // Added - 2018-08-30
     'Close'                 => '关闭',
     'Colour'                => '彩色',
     'Command'               => '命令',
-    'Component'            => 'Component',              // Added - 2011-06-16
-    'ConcurrentFilter'     => 'Run filter concurrently', // Added - 2018-08-30
+    'Component'            => '组件',              // Added - 2011-06-16
+    'ConcurrentFilter'     => '同时应用筛选器', // Added - 2018-08-30
     'Config'                => '配置',
     'ConfiguredFor'         => '配置标的',
     'ConfirmDeleteEvents'   => '确认希望删除所选事件？',
@@ -257,24 +263,25 @@
     'ControlDevice'         => '控制设备',
     'ControlType'           => '控制类型',
     'Controllable'          => '可控',
-    'Current'              => 'Current',                // Added - 2015-04-18
+    'Current'              => '现在',                // Added - 2015-04-18
     'Cycle'                 => '循环',
     'CycleWatch'            => '循环监视',
-    'DateTime'             => 'Date/Time',              // Added - 2011-06-16
+    'DateTime'             => '日期',              // Added - 2011-06-16
     'Day'                   => '日',
     'Debug'                 => '调试',
+    'DefaultCodec'         => '默认即时观看方法', // Added - 2020-04-09
     'DefaultRate'           => '缺省速率',
     'DefaultScale'          => '缺省缩放',
     'DefaultView'           => '缺省视角',
-    'Deinterlacing'        => 'Deinterlacing',          // Added - 2015-04-18
-    'Delay'                => 'Delay',                  // Added - 2015-04-18
+    'Deinterlacing'        => '去隔行',          // Added - 2015-04-18
+    'Delay'                => '延迟',                  // Added - 2015-04-18
     'Delete'                => '删除',
     'DeleteAndNext'         => '删除并下一个',
     'DeleteAndPrev'         => '删除并前一个',
     'DeleteSavedFilter'     => '删除存储过滤器',
     'Description'           => '描述',

zoneminder-1.34.8.tar.gz/web/lang/en_gb.php -> zoneminder-1.34.16.tar.gz/web/lang/en_gb.php Changed

zoneminder-1.34.8.tar.gz/web/skins/classic/css/base/export.css -> zoneminder-1.34.16.tar.gz/web/skins/classic/css/base/export.css Changed

zoneminder-1.34.8.tar.gz/web/skins/classic/css/base/skin.css -> zoneminder-1.34.16.tar.gz/web/skins/classic/css/base/skin.css Changed

zoneminder-1.34.8.tar.gz/web/skins/classic/css/base/views/monitor.css -> zoneminder-1.34.16.tar.gz/web/skins/classic/css/base/views/monitor.css Changed

zoneminder-1.34.8.tar.gz/web/skins/classic/css/classic/export.css -> zoneminder-1.34.16.tar.gz/web/skins/classic/css/classic/export.css Changed

zoneminder-1.34.8.tar.gz/web/skins/classic/css/dark/export.css -> zoneminder-1.34.16.tar.gz/web/skins/classic/css/dark/export.css Changed

zoneminder-1.34.8.tar.gz/web/skins/classic/includes/config.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/includes/config.php Changed

zoneminder-1.34.8.tar.gz/web/skins/classic/includes/control_functions.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/includes/control_functions.php Changed

@@ -25,15 +25,15 @@
 ?>
 <div class="arrowControl focusControls">
   <div class="arrowLabel"><?php echo translate('Near') ?></div>
-  <button type="button" class="longArrowBtn upBtn" onclick="controlCmd('<?php echo $cmds['FocusNear'] ?>',event,0,-1)"></button>
-  <button type="button" class="arrowCenter"<?php if ( $control->CanFocusCon() ) { ?> onclick="controlCmd('<?php echo $cmds['FocusStop'] ?>')"<?php } ?>><?php echo translate('Focus') ?></button>
-  <button type="button" class="longArrowBtn downBtn" onclick="controlCmd('<?php echo $cmds['FocusFar'] ?>',event,0,1)"></button>
+  <button type="button" class="longArrowBtn upBtn" value="<?php echo $cmds['FocusNear'] ?>" data-on-click="controlCmd" data-xtell="0" data-ytell="-1"></button>
+  <button type="button" class="arrowCenter"<?php if ( $control->CanFocusCon() ) { ?> data-on-click="controlCmd" value="<?php echo $cmds['FocusStop'] ?>"<?php } ?>><?php echo translate('Focus') ?></button>
+  <button type="button" class="longArrowBtn downBtn" data-on-click="controlCmd" value="<?php echo $cmds['FocusFar'] ?>" data-xtell="0" data-ytell="1"></button>
   <div class="arrowLabel"><?php echo translate('Far') ?></div>
 <?php
   if ( $control->CanAutoFocus() ) {
 ?>
-  <button type="button" class="ptzTextBtn" value="<?php echo $cmds['FocusAuto'] ?>" onclick="controlCmd('<?php echo $cmds['FocusAuto'] ?>')"><?php echo translate('Auto') ?></button>
-  <button type="button" class="ptzTextBtn" value="<?php echo $cmds['FocusMan'] ?>" onclick="controlCmd('<?php echo $cmds['FocusMan'] ?>')"><?php echo translate('Man') ?></button>
+  <button type="button" class="ptzTextBtn" value="<?php echo $cmds['FocusAuto'] ?>" data-on-click="controlCmd"><?php echo translate('Auto') ?></button>
+  <button type="button" class="ptzTextBtn" value="<?php echo $cmds['FocusMan'] ?>" data-on-click="controlCmd"><?php echo translate('Man') ?></button>
 <?php
   }
 ?>
@@ -48,15 +48,15 @@
 ?>
 <div class="arrowControl zoomControls">
   <div class="arrowLabel"><?php echo translate('Tele') ?></div>
-  <button type="button" class="longArrowBtn upBtn" onclick="controlCmd('<?php echo $cmds['ZoomTele'] ?>',event,0,-1)"></button>
-  <button type="button" class="arrowCenter"<?php if ( $control->CanZoomCon() ) { ?> onclick="controlCmd('<?php echo $cmds['ZoomStop'] ?>')"<?php } ?>><?php echo translate('Zoom') ?></button>
-  <button type="button" class="longArrowBtn downBtn" onclick="controlCmd('<?php echo $cmds['ZoomWide'] ?>',event,0,1)"></button>
+  <button type="button" class="longArrowBtn upBtn" data-on-click="controlCmd" value="<?php echo $cmds['ZoomTele'] ?>" data-xtell="0" data-ytell="-1"></button>
+  <button type="button" class="arrowCenter"<?php if ( $control->CanZoomCon() ) { ?> data-on-click="controlCmd" value="<?php echo $cmds['ZoomStop'] ?>"<?php } ?>><?php echo translate('Zoom') ?></button>
+  <button type="button" class="longArrowBtn downBtn" data-on-click="controlCmd" value="<?php echo $cmds['ZoomWide'] ?>" data-xtell="0" data-ytell="1"></button>
   <div class="arrowLabel"><?php echo translate('Wide') ?></div>
 <?php
   if ( $control->CanAutoZoom() ) {
 ?>
-  <button type="button" class="ptzTextBtn" value="Auto" onclick="controlCmd('<?php echo $cmds['ZoomAuto'] ?>')"><?php echo translate('Auto') ?></button>
-  <button type="button" class="ptzTextBtn" value="Man" onclick="controlCmd('<?php echo $cmds['ZoomMan'] ?>')"><?php echo translate('Man') ?></button>
+  <button type="button" class="ptzTextBtn" data-on-click="controlCmd" value="<?php echo $cmds['ZoomAuto'] ?>"><?php echo translate('Auto') ?></button>
+  <button type="button" class="ptzTextBtn" data-on-click="controlCmd" value="<?php echo $cmds['ZoomMan'] ?>"><?php echo translate('Man') ?></button>
 <?php
   }
 ?>
@@ -70,15 +70,15 @@
 ?>
 <div class="arrowControl irisControls">
   <div class="arrowLabel"><?php echo translate('Open') ?></div>
-  <button type="button" class="longArrowBtn upBtn" onclick="controlCmd('<?php echo $cmds['IrisOpen'] ?>',event,0,-1)"></button>
-  <button type="button" class="arrowCenter"<?php if ( $control->CanIrisCon() ) { ?> onclick="controlCmd('<?php echo $cmds['IrisStop'] ?>')"<?php } ?>><?php echo translate('Iris') ?></button>
-  <button type="button" class="longArrowBtn downBtn" onclick="controlCmd('<?php echo $cmds['IrisClose'] ?>',event,0,1)"></button>
+  <button type="button" class="longArrowBtn upBtn" data-on-click="controlCmd" value="<?php echo $cmds['IrisOpen'] ?>" data-xtell="0" data-ytell="-1"></button>
+  <button type="button" class="arrowCenter"<?php if ( $control->CanIrisCon() ) { ?> data-on-click="controlCmd" value="<?php echo $cmds['IrisStop'] ?>"<?php } ?>><?php echo translate('Iris') ?></button>
+  <button type="button" class="longArrowBtn downBtn" data-on-click="controlCmd" value="<?php echo $cmds['IrisClose'] ?>" data-xtell="0" data-ytell="1"></button>
   <div class="arrowLabel"><?php echo translate('Close') ?></div>
 <?php
   if ( $control->CanAutoIris() ) {
 ?>
-  <button type="button" class="ptzTextBtn" value="Auto" onclick="controlCmd('<?php echo $cmds['IrisAuto'] ?>')"><?php echo translate('Auto') ?></button>
-  <button type="button" class="ptzTextBtn" value="Man" onclick="controlCmd('<?php echo $cmds['IrisMan'] ?>')"><?php echo translate('Man') ?></button>
+  <button type="button" class="ptzTextBtn" data-on-click="controlCmd" value="<?php echo $cmds['IrisAuto'] ?>"><?php echo translate('Auto') ?></button>
+  <button type="button" class="ptzTextBtn" data-on-click="controlCmd" value="<?php echo $cmds['IrisMan'] ?>"><?php echo translate('Man') ?></button>
 <?php
   }
 ?>
@@ -93,15 +93,15 @@
 ?>
 <div class="arrowControl whiteControls">
   <div class="arrowLabel"><?php echo translate('In') ?></div>
-  <button type="button" class="longArrowBtn upBtn" onclick="controlCmd('<?php echo $cmds['WhiteIn'] ?>',event,0,-1)"></button>
-  <button type="button" class="arrowCenter"<?php if ( $control->CanWhiteCon() ) { ?> onclick="controlCmd('<?php echo $cmds['WhiteStop'] ?>')"<?php } ?>><?php echo translate('White') ?></button>
-  <button type="button" class="longArrowBtn downBtn" onclick="controlCmd('<?php echo $cmds['WhiteOut'] ?>',event,0,1)"></button>
+  <button type="button" class="longArrowBtn upBtn" data-on-click="controlCmd" value="<?php echo $cmds['WhiteIn'] ?>" data-xtell="0" data-ytell="-1"></button>
+  <button type="button" class="arrowCenter"<?php if ( $control->CanWhiteCon() ) { ?> data-on-click="controlCmd" value="<?php echo $cmds['WhiteStop'] ?>"<?php } ?>><?php echo translate('White') ?></button>
+  <button type="button" class="longArrowBtn downBtn" data-on-click="controlCmd" value="<?php echo $cmds['WhiteOut'] ?>" data-xtell="0" data-ytell="1)"></button>
   <div class="arrowLabel"><?php echo translate('Out') ?></div>
 <?php
   if ( $control->CanAutoWhite() ) {
 ?>
-  <button type="button" class="ptzTextBtn" value="Auto" onclick="controlCmd('<?php echo $cmds['WhiteAuto'] ?>')"><?php echo translate('Auto') ?></button>
-  <button type="button" class="ptzTextBtn" value="Man" onclick="controlCmd('<?php echo $cmds['WhiteMan'] ?>')"><?php echo translate('Man') ?></button>
+  <button type="button" class="ptzTextBtn" data-on-click="controlCmd" value="<?php echo $cmds['WhiteAuto'] ?>"><?php echo translate('Auto') ?></button>
+  <button type="button" class="ptzTextBtn" data-on-click="controlCmd" value="<?php echo $cmds['WhiteMan'] ?>"><?php echo translate('Man') ?></button>
 <?php
   }
 ?>
@@ -122,19 +122,19 @@
   $hasTilt = $control->CanTilt();
   $hasDiag = $hasPan && $hasTilt && $control->CanMoveDiag();
 ?>
-    <button type="button" class="arrowBtn upLeftBtn<?php echo $hasDiag?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveUpLeft'] ?>',event,-1,-1)"></button>
-    <button type="button" class="arrowBtn upBtn<?php echo $hasTilt?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveUp'] ?>',event,0,-1)"></button>
-    <button type="button" class="arrowBtn upRightBtn<?php echo $hasDiag?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveUpRight'] ?>',event,1,-1)"></button>
-    <button type="button" class="arrowBtn leftBtn<?php echo $hasPan?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveLeft'] ?>',event,-1,0)"></button>
+    <button type="button" class="arrowBtn upLeftBtn<?php echo $hasDiag?'':' invisible' ?>" data-on-click="controlCmd" value="<?php echo $cmds['MoveUpLeft'] ?>" data-xtell="-1" data-ytell="-1"></button>
+    <button type="button" class="arrowBtn upBtn<?php echo $hasTilt?'':' invisible' ?>" data-on-click="controlCmd" value="<?php echo $cmds['MoveUp'] ?>" data-xtell="0" data-ytell="-1"></button>
+    <button type="button" class="arrowBtn upRightBtn<?php echo $hasDiag?'':' invisible' ?>" data-on-click="controlCmd" value="<?php echo $cmds['MoveUpRight'] ?>" data-xtell="1" data-ytell="-1"></button>
+    <button type="button" class="arrowBtn leftBtn<?php echo $hasPan?'':' invisible' ?>" data-on-click="controlCmd" value="<?php echo $cmds['MoveLeft'] ?>" data-xtell="-1" data-ytell="0"></button>
 <?php if ( isset($cmds['Center']) ) { ?>
-    <button type="button" class="arrowBtn centerBtn" onclick="controlCmd('<?php echo $cmds['Center'] ?>')"></button>
+    <button type="button" class="arrowBtn centerBtn" data-on-click="controlCmd" value="<?php echo $cmds['Center'] ?>"></button>
 <?php } else { ?>
     <button type="button" class="arrowBtn NocenterBtn"></button>
 <?php } ?>
-    <button type="button" class="arrowBtn rightBtn<?php echo $hasPan?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveRight'] ?>',event,1,0)"></button>
-    <button type="button" class="arrowBtn downLeftBtn<?php echo $hasDiag?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveDownLeft'] ?>',event,-1,1)"></button>
-    <button type="button" class="arrowBtn downBtn<?php echo $hasTilt?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveDown'] ?>',event,0,1)"></button>
-    <button type="button" class="arrowBtn downRightBtn<?php echo $hasDiag?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveDownRight'] ?>',event,1,1)"></button>
+    <button type="button" class="arrowBtn rightBtn<?php echo $hasPan?'':' invisible' ?>" data-on-click="controlCmd" value="<?php echo $cmds['MoveRight'] ?>" data-xtell="1" data-ytell="0"></button>
+    <button type="button" class="arrowBtn downLeftBtn<?php echo $hasDiag?'':' invisible' ?>" data-on-click="controlCmd" value="<?php echo $cmds['MoveDownLeft'] ?>" data-xtell="-1" data-ytell="1"></button>
+    <button type="button" class="arrowBtn downBtn<?php echo $hasTilt?'':' invisible' ?>" data-on-click="controlCmd" value="<?php echo $cmds['MoveDown'] ?>" data-xtell="0" data-ytell="1"></button>
+    <button type="button" class="arrowBtn downRightBtn<?php echo $hasDiag?'':' invisible' ?>" data-on-click="controlCmd" value="<?php echo $cmds['MoveDownRight'] ?>" data-xtell="1" data-ytell="1"></button>
   </div>
 </div>
 <?php
@@ -148,7 +148,7 @@
 
   $sql = 'SELECT * FROM ControlPresets WHERE MonitorId = ?';
   $labels = array();
-  foreach( dbFetchAll( $sql, NULL, array( $monitor->Id() ) ) as $row ) {
+  foreach ( dbFetchAll($sql, NULL, array($monitor->Id())) as $row ) {
     $labels[$row['Preset']] = $row['Label'];
   }
 
@@ -162,7 +162,7 @@
 <?php
   for ( $i = 1; $i <= $control->NumPresets(); $i++ ) {
     ?>
-      <button type="button" class="ptzNumBtn" title="<?php echo isset($labels[$i])?htmlentities($labels[$i]):'' ?>" value="<?php echo $i ?>" onclick="controlCmd('<?php echo $cmds['PresetGoto'] ?><?php echo $i ?>');"/><?php echo $i ?></button>
+      <button type="button" class="ptzNumBtn" title="<?php echo isset($labels[$i])?htmlentities($labels[$i]):'' ?>" data-on-click="controlCmd" value="<?php echo $cmds['PresetGoto'].$i ?>"/><?php echo $i ?></button>
 <?php
   } // end foreach preset
 ?>
@@ -171,7 +171,7 @@
 <?php
   if ( $control->HasHomePreset() ) {
 ?>
-    <button type="button" class="ptzTextBtn" value="Home" onclick="controlCmd('<?php echo $cmds['PresetHome'] ?>');"><?php echo translate('Home') ?></button>
+    <button type="button" class="ptzTextBtn" data-on-click="controlCmd" value="<?php echo $cmds['PresetHome'] ?>"><?php echo translate('Home') ?></button>
 <?php
   }
   if ( canEdit('Monitors') && $control->CanSetPresets() ) {
@@ -196,22 +196,22 @@
 <?php
   if ( $control->CanWake() ) {
 ?>
-    <button type="button" class="ptzTextBtn" value="Wake" onclick="controlCmd('<?php echo $cmds['Wake'] ?>')"><?php echo translate('Wake') ?></button>
+    <button type="button" class="ptzTextBtn" data-on-click="controlCmd" value="<?php echo $cmds['Wake'] ?>"><?php echo translate('Wake') ?></button>
 <?php
   }
   if ( $control->CanSleep() ) {
 ?>
-    <button type="button" class="ptzTextBtn" value="Sleep" onclick="controlCmd('<?php echo $cmds['Sleep'] ?>')"><?php echo translate('Sleep') ?></button>
+    <button type="button" class="ptzTextBtn" data-on-click="controlCmd" value="<?php echo $cmds['Sleep'] ?>"><?php echo translate('Sleep') ?></button>
 <?php
   }
   if ( $control->CanReset() ) {
 ?>
-    <button type="button" class="ptzTextBtn" value="Reset" onclick="controlCmd('<?php echo $cmds['Reset'] ?>')"><?php echo translate('Reset') ?></button>
+    <button type="button" class="ptzTextBtn" data-on-click="controlCmd" value="<?php echo $cmds['Reset'] ?>"><?php echo translate('Reset') ?></button>
 <?php
   }
   if ( $control->CanReboot() ) {
 ?>
-    <button type="button" class="ptzTextBtn" value="Reboot" onclick="controlCmd('<?php echo $cmds['Reboot'] ?>')"><?php echo translate('Reboot') ?></button>
+    <button type="button" class="ptzTextBtn" data-on-click="controlCmd" value="<?php echo $cmds['Reboot'] ?>"><?php echo translate('Reboot') ?></button>
 <?php
   }
 ?>
@@ -223,9 +223,7 @@
 
 function ptzControls($monitor) {
   $control = $monitor->Control();
-  //ZM\Error("Control: " . print_r($control,true));
   $cmds = $control->commands();
-  //ZM\Error("Cmds: " . print_r($cmds, true));
   ob_start();
 ?>
 <div class="controlsPanel">

zoneminder-1.34.8.tar.gz/web/skins/classic/includes/export_functions.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/includes/export_functions.php Changed

@@ -20,52 +20,18 @@
 
 function exportHeader($title) {
 ?>
+<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="utf-8">
     <title><?php echo $title ?></title>
-    <style type="text/css">
-<?php include(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/css/'.ZM_SKIN_NAME.'/export.css'); ?>
-
-ul.tabs {
-	margin: 0;
-  margin-bottom: -1px;
-	padding: 0;
-	float: left;
-	list-style: none;
-	height: 32px;
-	border-bottom: 1px solid #7f7fb2;
-	border-left: 1px solid #7f7fb2;
-	width: 100%;
-}
-ul.tabs li {
-	float: left;
-	margin: 0;
-	padding: 0;
-	height: 31px;
-	line-height: 31px;
-	border: 1px solid #7f7fb2;
-	border-left: none;
-	margin-bottom: -1px;
-	background: #fff;
-	overflow: hidden;
-	position: relative;
-}
-ul.tabs li a {
-	text-decoration: none;
-	color: #000;
-	display: block;
-	font-size: 1.2em;
-	padding: 0 20px;
-	outline: none;
-}
-ul.tabs li a:hover {
-	background: #ccc;
-}
-html ul.tabs li.active, html ul.tabs li.active a:hover  {
-	background: #dddddd;
-	border-bottom: 1px solid #e0e0e0;
-}
+    <style>
+<?php 
+  include(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/css/base/export.css');
+  if ( $css != 'base' ) {
+    include(ZM_PATH_WEB.'/'.ZM_SKIN_PATH.'/css/'.$css.'/export.css');
+  }
+?>
     </style>
     <script src="<?php echo ($title == translate('Images').' Master' ? '' : '../') ?>jquery.js"></script>
     
@@ -95,21 +61,21 @@
     </script>
   </head>
 <?php
-}
+} // end exportHeader
 
 function exportEventDetail($event, $exportFrames, $exportImages) {
   ob_start();
   exportHeader(translate('Event').' '.$event->Id());
 	
 	$otherlinks = '';
-	if( $exportFrames ) $otherlinks .= '<a href="zmEventFrames.html">'.translate('Frames').'</a>,';
-	if( $exportImages ) $otherlinks .= '<a href="zmEventImages.html">'.translate('Images').'</a>,';
-	$otherlinks = substr($otherlinks,0,-1);
+	if ( $exportFrames ) $otherlinks .= ' <a href="zmEventFrames.html">'.translate('Frames').'</a>,';
+	if ( $exportImages ) $otherlinks .= ' <a href="zmEventImages.html">'.translate('Images').'</a>,';
+	$otherlinks = substr($otherlinks, 0, -1);
 ?>
 <body>
   <div id="page">
     <div id="content">
-		<h2><?php echo translate('Event') ?>: <?php echo validHtmlStr($event->Name()) ?><?php if(!empty($otherlinks)) { ?> (<?php echo$otherlinks?>) <?php } ?></h2>
+		  <h2><?php echo translate('Event') .': '.validHtmlStr($event->Name()).( (!empty($otherlinks)) ? ' ('.$otherlinks.') ' : '' ) ?></h2>
       <table id="eventDetail">
         <tr><th scope="row"><?php echo translate('Id') ?></th><td><?php echo $event->Id() ?></td></tr>
         <tr><th scope="row"><?php echo translate('Name') ?></th><td><?php echo validHtmlStr($event->Name()) ?></td></tr>
@@ -134,21 +100,21 @@
 }
 
 function exportEventFrames($event, $exportDetail, $exportImages) {
-  $sql = 'SELECT *, unix_timestamp( TimeStamp ) AS UnixTimeStamp FROM Frames WHERE EventID = ? ORDER BY FrameId';
+  $sql = 'SELECT *, unix_timestamp(TimeStamp) AS UnixTimeStamp FROM Frames WHERE EventID = ? ORDER BY FrameId';
   $frames = dbFetchAll($sql, NULL, array($event->Id()));
 
   ob_start();
   exportHeader(translate('Frames').' '.$event->Id());
 	
 	$otherlinks = '';
-	if ( $exportDetail ) $otherlinks .= '<a href="zmEventDetail.html">'.translate('Event').'</a>,';
-	if ( $exportImages ) $otherlinks .= '<a href="zmEventImages.html">'.translate('Images').'</a>,';
-	$otherlinks = substr($otherlinks,0,-1);
+	if ( $exportDetail ) $otherlinks .= ' <a href="zmEventDetail.html">'.translate('Event').'</a>,';
+	if ( $exportImages ) $otherlinks .= ' <a href="zmEventImages.html">'.translate('Images').'</a>,';
+	$otherlinks = substr($otherlinks, 0, -1);
 ?>
 <body>
   <div id="page">
     <div id="content">
-		<h2><?php echo translate('Frames') ?>: <?php echo validHtmlStr($event->Name()) ?><?php if(!empty($otherlinks)) { ?> (<?php echo$otherlinks?>) <?php } ?></h2>
+		<h2><?php echo translate('Frames').': '.validHtmlStr($event->Name()).( (!empty($otherlinks)) ? ' ('.$otherlinks.')':'') ?></h2>
       <table id="eventFrames">
         <tr>
           <th><?php echo translate('FrameId') ?></th>
@@ -208,26 +174,45 @@
 </html>
 <?php
   return ob_get_clean();
-}
+} // end function exportEventFrames($event, $exportDetail, $exportImages)
 
 function exportEventImages($event, $exportDetail, $exportFrames, $myfilelist) {
   ob_start();
   exportHeader(translate('Images').' '.$event->Id());
 	
 	$otherlinks = '';
-	if( $exportDetail ) $otherlinks .= '<a href="zmEventDetail.html">'.translate('Event').'</a>,';
-	if( $exportFrames ) $otherlinks .= '<a href="zmEventFrames.html">'.translate('Frames').'</a>,';
-	$otherlinks = substr($otherlinks,0,-1);
+	if ( $exportDetail ) $otherlinks .= ' <a href="zmEventDetail.html">'.translate('Event').'</a>,';
+	if ( $exportFrames ) $otherlinks .= ' <a href="zmEventFrames.html">'.translate('Frames').'</a>,';
+	$otherlinks = substr($otherlinks, 0, -1);
 
 	$filelist = array_keys($myfilelist);
-	sort($filelist,SORT_NUMERIC);
+	sort($filelist, SORT_NUMERIC);
 	$slides = '"'.implode('","',$filelist).'"';
 	$listcount = count($filelist);
 ?>
 <body>
 <style>
-.horizontal_track {background-color: #bbb;width: <?php echo $event->Width()?>px;line-height: 0px;font-size: 0px;text-align: left;padding: 4px;border: 1px solid;border-color: #ddd #999 #999 #ddd;}
-.horizontal_slider {background-color: #666;width: 16px;height: 8px;position: relative;z-index: 2;line-height: 0;margin: 0;border: 2px solid;border-color: #999 #333 #333 #999;}
+.horizontal_track {
+  background-color: #bbb;
+  width: <?php echo $event->Width()?>px;
+  line-height: 0;
+  font-size: 0;
+  text-align: left;
+  padding: 4px;
+  border: 1px solid;
+  border-color: #ddd #999 #999 #ddd;
+}
+.horizontal_slider {
+  background-color: #666;
+  width: 16px;
+  height: 8px;
+  position: relative;
+  z-index: 2;
+  line-height: 0;
+  margin: 0;
+  border: 2px solid;
+  border-color: #999 #333 #333 #999;
+}
 .horizontal_slit {background-color: #333;width: <?php echo($event->Width()-10)?>px;height: 2px;margin: 4px 4px 2px 4px;line-height: 0;position: absolute;z-index: 1;border: 1px solid;border-color: #999 #ddd #ddd #999;}
 .vertical_track {background-color: #bbb;padding: 3px 5px 15px 5px;border: 1px solid;border-color: #ddd #999 #999 #ddd;}
 .vertical_slider {background-color: #666;width: 18px;height: 8px;font: 0px;text-align: left;line-height: 0px;position: relative;z-index: 1;border: 2px solid;border-color: #999 #333 #333 #999;}
@@ -236,7 +221,7 @@
 .value_display {background-color: #bbb;color: #333;width: 30px;margin: 0 2px;text-align: right;font-size: 8pt;font-face: verdana, arial, helvetica, sans-serif;font-weight: bold;line-height: 12px;border: 0;cursor: default;}
 </style>
 
-<h2><?php echo translate('Images') ?>: <?php echo validHtmlStr($event->Name()) ?><?php if(!empty($otherlinks)) { ?> (<?php echo$otherlinks?>) <?php } ?></h2>
+<h2><?php echo translate('Images').': '.validHtmlStr($event->Name()).( (!empty($otherlinks)) ? ' ('.$otherlinks.') ' : '' ) ?></h2>
 
 <?php
   if ( $event->DefaultVideo() ) {
@@ -247,12 +232,12 @@
     if ( $Monitor->VideoWriter() == '2' ) {
       # Passthrough
       $Rotation = $event->Orientation();
-      if ( in_array($event->Orientation(),array('ROTATE_90','ROTATE_270')) )
+      if ( in_array($event->Orientation(), array('ROTATE_90','ROTATE_270')) )
         $Zoom = $event->Height()/$event->Width();
-    }
+    } # end if passthrough
 ?>
     <div id="videoFeed">
-      <video id="videoobj" class="video-js vjs-default-skin" style="transform: matrix(1, 0, 0, 1, 0, 0)"
+      <video id="videoobj" class="video-js vjs-default-skin" style="transform: matrix(1, 0, 0, 1, 0, 0);"
         width="<?php echo $event->Width() ?>"
         height="<?php echo $event->Height() ?>"
         data-setup='{ "controls": true, "autoplay": true, "preload": "auto", "plugins": { "zoomrotate": { "zoom": "<?php echo $Zoom ?>"}}}'>
@@ -582,36 +567,45 @@
 </html>
 <?php
   return ob_get_clean();
-}
+} # end function exportEventImages($event, $exportDetail, $exportFrames, $myfilelist)

zoneminder-1.34.8.tar.gz/web/skins/classic/includes/functions.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/includes/functions.php Changed

@@ -1,6 +1,6 @@
 <?php
 //
-// ZoneMinder web function library, $Date: 2008-07-08 16:06:45 +0100 (Tue, 08 Jul 2008) $, $Revision: 2484 $
+// ZoneMinder web function library
 // Copyright (C) 2001-2008 Philip Coombes
 // 
 // This program is free software; you can redistribute it and/or
@@ -117,9 +117,11 @@
 <?php
 ?>
 
+<?php if ( $basename != 'login' ) { ?>
   <script src="tools/mootools/mootools-core.js"></script>
   <script src="tools/mootools/mootools-more.js"></script>
   <script src="js/mootools.ext.js"></script>
+<?php } ?>
   <script src="skins/<?php echo $skin; ?>/js/jquery.js"></script>
   <script src="skins/<?php echo $skin; ?>/js/jquery-ui-1.12.1/jquery-ui.js"></script>
   <script src="skins/<?php echo $skin; ?>/js/bootstrap.min.js"></script>
@@ -146,11 +148,7 @@
   </script>
   <script src="<?php echo cache_bust('skins/'.$skin.'/views/js/state.js') ?>"></script>
 <?php
-  if ( $title == 'Login' && (defined('ZM_OPT_USE_GOOG_RECAPTCHA') && ZM_OPT_USE_GOOG_RECAPTCHA) ) {
-?>
-  <script src='https://www.google.com/recaptcha/api.js'></script>
-<?php
-  } else if ( $view == 'event' ) {
+  if ( $view == 'event' ) {
 ?>
   <link href="skins/<?php echo $skin ?>/js/video-js.css" rel="stylesheet">
   <link href="skins/<?php echo $skin ?>/js/video-js-skin.css" rel="stylesheet">
@@ -341,33 +339,35 @@
       <li><a href="?view=montagereview<?php echo isset($montageReviewQuery)?'&fit=1'.$montageReviewQuery.'&live=0':'' ?>"<?php echo $view=='montagereview'?' class="selected"':''?>><?php echo translate('MontageReview')?></a></li>
       <li><a href="?view=report_event_audit"<?php echo $view=='report_event_audit'?' class="selected"':''?>><?php echo translate('ReportEventAudit') ?></a></li>
 <?php
-  }
+  } // end if canView(Events)
 ?>
       <li><a href="#"><i id="flip" class="material-icons md-18 pull-right">keyboard_arrow_<?php echo ( isset($_COOKIE['zmHeaderFlip']) and $_COOKIE['zmHeaderFlip'] == 'down') ? 'down' : 'up' ?></i></a></li>
 		</ul>
 
-<div class="navbar-right">
+    <div class="navbar-right">
 <?php
-if ( ZM_OPT_USE_AUTH and $user ) {
+  if ( ZM_OPT_USE_AUTH and $user ) {
 ?>
-  <p class="navbar-text">
-    <i class="material-icons">account_circle</i>
-    <?php echo makePopupLink( '?view=logout', 'zmLogout', 'logout', $user['Username'], (ZM_AUTH_TYPE == "builtin") ) ?>
-  </p>
-<?php
-}
-if ( canEdit('System') ) {
+    <p class="navbar-text">
+      <i class="material-icons">account_circle</i>
+      <?php echo makePopupLink( '?view=logout', 'zmLogout', 'logout', $user['Username'], (ZM_AUTH_TYPE == "builtin") ) ?>
+    </p>
+  <?php
+  }
+  if ( canEdit('System') ) {
 ?>
 		<button type="button" class="btn btn-default navbar-btn" data-toggle="modal" data-target="#modalState"><?php echo $status ?></button>
-  <?php if ( ZM_SYSTEM_SHUTDOWN ) { ?>
-  <p class="navbar-text">
-  <?php echo makePopupLink('?view=shutdown', 'zmShutdown', 'shutdown', '<i class="material-icons md-18">power_settings_new</i>' ) ?>
-  </p>
-  <?php } ?>
+    <?php if ( ZM_SYSTEM_SHUTDOWN ) { ?>
+    <p class="navbar-text">
+    <?php echo makePopupLink('?view=shutdown', 'zmShutdown', 'shutdown', '<i class="material-icons md-18">power_settings_new</i>' ) ?>
+    </p>
+    <?php } ?>
 <?php } else if ( canView('System') ) { ?>
 		<p class="navbar-text"><?php echo $status ?></p>
 <?php } ?>
-</div>
+  </div>
+<?php } else { # end if !$user or $user['Id'] meaning logged in ?>
+</ul>
 <?php } # end if !$user or $user['Id'] meaning logged in ?>
 		</div>
 	</div>

zoneminder-1.34.8.tar.gz/web/skins/classic/js/skin.js -> zoneminder-1.34.16.tar.gz/web/skins/classic/js/skin.js Changed

@@ -182,8 +182,8 @@
       return;
     }
 
-    el.onclick = function() {
-      window[fnName]();
+    el.onclick = function(ev) {
+      window[fnName](ev);
     };
   });
 
@@ -453,10 +453,37 @@
   //convert label format from strftime to moment's format (modified from
   //https://raw.githubusercontent.com/benjaminoakes/moment-strftime/master/lib/moment-strftime.js
   //added %f and %N below (TODO: add %Q)
-  var replacements = {"a": 'ddd', "A": 'dddd', "b": 'MMM', "B": 'MMMM', "d": 'DD', "e": 'D', "F": 'YYYY-MM-DD', "H": 'HH', "I": 'hh', "j": 'DDDD', "k": 'H', "l": 'h', "m": 'MM', "M": 'mm', "p": 'A', "S": 'ss', "u": 'E', "w": 'd', "W": 'WW', "y": 'YY', "Y": 'YYYY', "z": 'ZZ', "Z": 'z', 'f': 'SS', 'N': "["+monitorName+"]", '%': '%'};
+  var replacements = {
+    'a': 'ddd',
+    'A': 'dddd',
+    'b': 'MMM',
+    'B': 'MMMM',
+    'd': 'DD',
+    'e': 'D',
+    'F': 'YYYY-MM-DD',
+    'H': 'HH',
+    'I': 'hh',
+    'j': 'DDDD',
+    'k': 'H',
+    'l': 'h',
+    'm': 'MM',
+    'M': 'mm',
+    'p': 'A',
+    'r': 'hh:mm:ss A',
+    'S': 'ss',
+    'u': 'E',
+    'w': 'd',
+    'W': 'WW',
+    'y': 'YY',
+    'Y': 'YYYY',
+    'z': 'ZZ',
+    'Z': 'z',
+    'f': 'SS',
+    'N': '['+monitorName+']',
+    '%': '%'};
   var momentLabelFormat = Object.keys(replacements).reduce(function(momentFormat, key) {
     var value = replacements[key];
-    return momentFormat.replace("%" + key, value);
+    return momentFormat.replace('%' + key, value);
   }, LabelFormat);
   return momentLabelFormat;
 }
@@ -467,7 +494,7 @@
   var labelFormat = convertLabelFormat(LabelFormat, monitorName);
   startTime = moment(startTime);
 
-  for (var i = 0; i <= duration; i++) {
+  for ( var i = 0; i <= duration; i++ ) {
     cues[i] = {id: i, index: i, startTime: i, endTime: i+1, text: startTime.format(labelFormat)};
     startTime.add(1, 's');
   }
@@ -530,3 +557,17 @@
   autoScale = closest;
   return {width: Math.floor(newWidth), height: Math.floor(newHeight), autoScale: autoScale};
 }
+
+function setButtonState(element_id, butClass) {
+  var element = $(element_id);
+  if ( element ) {
+    element.className = butClass;
+    if (butClass == 'unavail' || (butClass == 'active' && (element.id == 'pauseBtn' || element.id == 'playBtn'))) {
+      element.disabled = true;
+    } else {
+      element.disabled = false;
+    }
+  } else {
+    console.log('Element was null or not found in setButtonState. id:'+element_id);
+  }
+}

zoneminder-1.34.8.tar.gz/web/skins/classic/js/skin.js.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/js/skin.js.php Changed

zoneminder-1.34.8.tar.gz/web/skins/classic/views/_monitor_filters.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/_monitor_filters.php Changed

zoneminder-1.34.8.tar.gz/web/skins/classic/views/console.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/console.php Changed

@@ -280,7 +280,7 @@
 ?>
             <td class="colName">
             <i class="material-icons md-18 <?php echo $dot_class ?>">lens</i>
-              <a <?php echo ($stream_available ? 'href="?view=watch&amp;mid='.$monitor['Id'].'">' : '>') . $monitor['Name'] ?></a><br/>
+              <a <?php echo ($stream_available ? 'href="?view=watch&amp;mid='.$monitor['Id'].'">' : '>') . validHtmlStr($monitor['Name']) ?></a><br/>
               <div class="small text-nowrap text-muted">
 
               <?php echo implode('<br/>',
@@ -290,7 +290,7 @@
                       $Groups = $Group->Parents();
                       array_push( $Groups, $Group );
                     }
-                    return implode(' &gt; ', array_map(function($Group){ return '<a href="?view=montagereview&amp;GroupId='.$Group->Id().'">'.$Group->Name().'</a>'; }, $Groups ));
+                    return implode(' &gt; ', array_map(function($Group){ return '<a href="?view=montagereview&amp;GroupId='.$Group->Id().'">'.validHtmlStr($Group->Name()).'</a>'; }, $Groups ));
                     }, $Monitor->GroupIds() ) ); 
 ?>
             </div></td>
@@ -315,13 +315,13 @@
               </div></td>
 <?php
   if ( count($servers) ) { ?>
-            <td class="colServer"><?php $Server = isset($ServersById[$monitor['ServerId']]) ? $ServersById[$monitor['ServerId']] : new ZM\Server($monitor['ServerId']); echo $Server->Name(); ?></td>
+            <td class="colServer"><?php $Server = isset($ServersById[$monitor['ServerId']]) ? $ServersById[$monitor['ServerId']] : new ZM\Server($monitor['ServerId']); echo validHtmlStr($Server->Name()); ?></td>
 <?php
   }
   echo '<td class="colSource">'. makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$source_class.'">'.validHtmlStr($Monitor->Source()).'</span>', canEdit('Monitors') ).'</td>';
   if ( $show_storage_areas ) {
 ?>
-            <td class="colStorage"><?php if ( isset($StorageById[$monitor['StorageId']]) ) { echo $StorageById[ $monitor['StorageId'] ]->Name(); } ?></td>
+            <td class="colStorage"><?php if ( isset($StorageById[$monitor['StorageId']]) ) { echo validHtmlStr($StorageById[$monitor['StorageId']]->Name()); } ?></td>
 <?php
   }

zoneminder-1.34.8.tar.gz/web/skins/classic/views/cycle.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/cycle.php Changed

@@ -40,7 +40,7 @@
 }
 
 $widths = array(
-  ''  => translate('auto'),
+  'auto'  => translate('auto'),
   '100%'  => '100%',
   '160px' => '160px',
   '320px' => '320px',
@@ -62,13 +62,11 @@
 
 if ( isset($_REQUEST['scale']) ) {
   $options['scale'] = validInt($_REQUEST['scale']);
-  ZM\Logger::Debug('Setting scale from request to '.$options['scale']);
 } else if ( isset($_COOKIE['zmCycleScale']) ) {
   $options['scale'] = $_COOKIE['zmCycleScale'];
-  ZM\Logger::Debug('Setting scale from cookie to '.$options['scale']);
 }
 
-if ( !(isset($options['scale']) and $options['scale']) )
+if ( !isset($options['scale']) )
   $options['scale'] = 100;
 
 if ( isset($_COOKIE['zmCycleWidth']) and $_COOKIE['zmCycleWidth'] ) {
@@ -167,7 +165,7 @@
       <div class="buttons">
         <button type="button" value="&lt;" id="prevBtn" title="<?php echo translate('PreviousMonitor') ?>" class="active" data-on-click-true="cyclePrev">&lt;&lt;</button>
         <button type="button" value="||" id="pauseBtn" title="<?php echo translate('PauseCycle') ?>" class="active" data-on-click-true="cyclePause">||</button>
-        <button type="button" value="|&gt;" id="playBtn" title="<?php echo translate('PlayCycle') ?>" class="inactive" disabled="disabled" data-on-click-true="streamCmdPlay">|&gt;</button>
+        <button type="button" value="|&gt;" id="playBtn" title="<?php echo translate('PlayCycle') ?>" class="inactive" disabled="disabled" data-on-click-true="cycleStart">|&gt;</button>
         <button type="button" value="&gt;" id="nextBtn" title="<?php echo translate('NextMonitor') ?>" class="active" data-on-click-true="cycleNext">&gt;&gt;</button>
       </div>

zoneminder-1.34.8.tar.gz/web/skins/classic/views/event.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/event.php Changed

@@ -24,7 +24,7 @@
 }
 
 $eid = validInt($_REQUEST['eid']);
-$fid = !empty($_REQUEST['fid'])?validInt($_REQUEST['fid']):1;
+$fid = !empty($_REQUEST['fid']) ? validInt($_REQUEST['fid']) : 1;
 
 $Event = new ZM\Event($eid);
 if ( $user['MonitorIds'] ) {
@@ -48,7 +48,7 @@
   $scale = validInt($_REQUEST['scale']);
 } else if ( isset($_COOKIE['zmEventScaleAuto']) ) {
   // If we're using scale to fit use it on all monitors
-  $scale = 'auto';
+  $scale = '0';
 } else if ( isset($_COOKIE['zmEventScale'.$Event->MonitorId()]) ) {
   $scale = $_COOKIE['zmEventScale'.$Event->MonitorId()];
 } else {
@@ -79,15 +79,15 @@
   'gapless' => translate('ReplayGapless'),
 );
 
-if ( isset( $_REQUEST['streamMode'] ) )
+if ( isset($_REQUEST['streamMode']) )
   $streamMode = validHtmlStr($_REQUEST['streamMode']);
 else
   $streamMode = 'video';
 
 $replayMode = '';
-if ( isset( $_REQUEST['replayMode'] ) )
+if ( isset($_REQUEST['replayMode']) )
   $replayMode = validHtmlStr($_REQUEST['replayMode']);
-if ( isset( $_COOKIE['replayMode']) && preg_match('#^[a-z]+$#', $_COOKIE['replayMode']) )
+if ( isset($_COOKIE['replayMode']) && preg_match('#^[a-z]+$#', $_COOKIE['replayMode']) )
   $replayMode = validHtmlStr($_COOKIE['replayMode']);
 
 if ( ( ! $replayMode ) or ( ! $replayModes[$replayMode] ) ) {
@@ -104,7 +104,16 @@
     $Zoom = $Event->Height()/$Event->Width();
 }
 
-// These are here to figure out the next/prev event
+// These are here to figure out the next/prev event, however if there is no filter, then default to one that specifies the Monitor
+if ( !isset($_REQUEST['filter']) ) {
+  $_REQUEST['filter'] = array(
+    'Query'=>array(
+      'terms'=>array(
+        array('attr'=>'MonitorId', 'op'=>'=', 'val'=>$Event->MonitorId())
+      )
+    )
+  );
+}
 parseSort();
 parseFilter($_REQUEST['filter']);
 $filterQuery = $_REQUEST['filter']['query'];
@@ -122,22 +131,22 @@
     <?php if ( !$popup ) echo getNavBarHTML() ?>
     <div id="header">
 <?php 
-if ( ! $Event->Id() ) {
+if ( !$Event->Id() ) {
   echo 'Event was not found.';
 } else {
 ?>
       <div id="dataBar">
         <span id="dataId" title="<?php echo translate('Id') ?>"><?php echo $Event->Id() ?></span>
-        <span id="dataMonitor" title="<?php echo translate('Monitor') ?>"><?php echo $Monitor->Id() . ' ' . $Monitor->Name() ?></span>
+        <span id="dataMonitor" title="<?php echo translate('Monitor') ?>"><?php echo $Monitor->Id().' '.validHtmlStr($Monitor->Name()) ?></span>
         <span id="dataCause" title="<?php echo $Event->Notes()?validHtmlStr($Event->Notes()):translate('AttrCause') ?>"><?php echo validHtmlStr($Event->Cause()) ?></span>
-        <span id="dataTime" title="<?php echo translate('Time') ?>"><?php echo strftime( STRF_FMT_DATETIME_SHORT, strtotime($Event->StartTime() ) ) ?></span>
+        <span id="dataTime" title="<?php echo translate('Time') ?>"><?php echo strftime(STRF_FMT_DATETIME_SHORT, strtotime($Event->StartTime())) ?></span>
         <span id="dataDuration" title="<?php echo translate('Duration') ?>"><?php echo $Event->Length().'s' ?></span>
         <span id="dataFrames" title="<?php echo translate('AttrFrames').'/'.translate('AttrAlarmFrames') ?>"><?php echo $Event->Frames() ?>/<?php echo $Event->AlarmFrames() ?></span>
         <span id="dataScore" title="<?php echo translate('AttrTotalScore').'/'.translate('AttrAvgScore').'/'.translate('AttrMaxScore') ?>"><?php echo $Event->TotScore() ?>/<?php echo $Event->AvgScore() ?>/<?php echo $Event->MaxScore() ?></span>
         <span id="Storage">
 <?php echo 
-  human_filesize($Event->DiskSpace(null)) . ' on ' . $Event->Storage()->Name().
-  ( $Event->SecondaryStorageId() ? ', ' . $Event->SecondaryStorage()->Name() :'' )
+  human_filesize($Event->DiskSpace(null)) . ' on ' . validHtmlStr($Event->Storage()->Name()).
+  ( $Event->SecondaryStorageId() ? ', '.validHtmlStr($Event->SecondaryStorage()->Name()) : '' )
 ?></span>
         <div id="closeWindow"><a href="#" onclick="<?php echo $popup ? 'window.close()' : 'window.history.back();return false;' ?>"><?php echo $popup ? translate('Close') : translate('Back') ?></a></div>
       </div>
@@ -193,9 +202,9 @@
 ?>
         <div id="videoFeed">
           <video id="videoobj" class="video-js vjs-default-skin"
-            style="transform: matrix(1, 0, 0, 1, 0, 0)"
-            width="<?php echo reScale($Event->Width(), $scale) ?>"
-            height="<?php echo reScale($Event->Height(), $scale) ?>"
+            style="transform: matrix(1, 0, 0, 1, 0, 0);"
+           <?php echo $scale ? 'width="'.reScale($Event->Width(), $scale).'"' : '' ?>
+           <?php echo $scale ? 'height="'.reScale($Event->Height(), $scale).'"' : '' ?>
             data-setup='{ "controls": true, "autoplay": true, "preload": "auto", "plugins": { "zoomrotate": { "zoom": "<?php echo $Zoom ?>"}}}'
           >
           <source src="<?php echo $Event->getStreamSrc(array('mode'=>'mpeg','format'=>'h264'),'&amp;'); ?>" type="video/mp4">
@@ -208,7 +217,7 @@
 ?>
       <div id="imageFeed">
 <?php
-if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT ) {
+if ( (ZM_WEB_STREAM_METHOD == 'mpeg') && ZM_MPEG_LIVE_FORMAT ) {
   $streamSrc = $Event->getStreamSrc(array('mode'=>'mpeg', 'scale'=>$scale, 'rate'=>$rate, 'bitrate'=>ZM_WEB_VIDEO_BITRATE, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'format'=>ZM_MPEG_REPLAY_FORMAT, 'replay'=>$replayMode),'&amp;');
   outputVideoStream('evtStream', $streamSrc, reScale( $Event->Width(), $scale ).'px', reScale( $Event->Height(), $scale ).'px', ZM_MPEG_LIVE_FORMAT );
 } else {
@@ -257,7 +266,12 @@
         </p>
         <div id="replayStatus">
           <span id="mode"><?php echo translate('Mode') ?>: <span id="modeValue">Replay</span></span>
-          <span id="rate"><?php echo translate('Rate') ?>: <span id="rateValue"><?php echo $rate/100 ?></span>x</span>
+          <span id="rate"><?php echo translate('Rate') ?>: 
+<?php 
+$rates = array( -800=>'-8x', -400=>'-4x', -200=>'-2x', -100=>'-1x', 0=>translate('Stop'), 100 => '1x', 200=>'2x', 400=>'4x', 800=>'8x' );
+echo htmlSelect('rate', $rates, intval($rate), array('id'=>'rateValue'));
+?>
+
           <span id="progress"><?php echo translate('Progress') ?>: <span id="progressValue">0</span>s</span>
           <span id="zoom"><?php echo translate('Zoom') ?>: <span id="zoomValue">1</span>x</span>
         </div>

zoneminder-1.34.8.tar.gz/web/skins/classic/views/events.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/events.php Changed

@@ -191,21 +191,25 @@
 ?>
             <tr<?php if ($event->Archived()) echo ' class="archived"' ?>>
               <td class="colId"><a href="?view=event&amp;eid=<?php echo $event->Id().$filterQuery.$sortQuery.'&amp;page=1">'.$event->Id().($event->Archived()?'*':'') ?></a></td>
-              <td class="colName"><a href="?view=event&amp;eid=<?php echo $event->Id().$filterQuery.$sortQuery.'&amp;page=1">'.validHtmlStr($event->Name()).($event->Archived()?'*':'') ?></a></td>
+              <td class="colName"><a href="?view=event&amp;eid=<?php echo $event->Id().$filterQuery.$sortQuery.'&amp;page=1">'.validHtmlStr($event->Name()).($event->Archived()?'*':'') ?></a><br/>
+<?php
+							if ( $event->Emailed() )
+								echo 'Emailed ';
+?>
+							</td>
               <td class="colMonitorName"><?php echo makePopupLink( '?view=monitor&amp;mid='.$event->MonitorId(), 'zmMonitor'.$event->MonitorId(), 'monitor', $event->MonitorName(), canEdit( 'Monitors' ) ) ?></td>
               <td class="colCause"><?php echo makePopupLink( '?view=eventdetail&amp;eid='.$event->Id(), 'zmEventDetail', 'eventdetail', validHtmlStr($event->Cause()), canEdit( 'Events' ), 'title="'.htmlspecialchars($event->Notes()).'"' ) ?>
 							<?php
 # display notes as small text
-							if ($event->Notes()) {
+							if ( $event->Notes() ) {
 # if notes include detection objects, then link it to objdetect.jpg
-								if (strpos($event->Notes(),'detected:')!== false){
+								if ( strpos($event->Notes(), 'detected:') !== false ) {
 # make a link
 									echo makePopupLink( '?view=image&amp;eid='.$event->Id().'&amp;fid=objdetect', 'zmImage',
 											array('image', reScale($event->Width(), $scale), reScale($event->Height(), $scale)),
-											"<div class=\"small text-nowrap text-muted\"><u>".$event->Notes()."</u></div>");
-								}
-								elseif ($event->Notes() != 'Forced Web: ') {
-									echo "<br/><div class=\"small text-nowrap text-muted\">".$event->Notes()."</div>";
+											'<div class="small text-nowrap text-muted"><u>'.$event->Notes().'</u></div>');
+								} else if ( $event->Notes() != 'Forced Web: ' ) {
+									echo '<br/><div class="small text-nowrap text-muted">'.$event->Notes().'</div>';
 								}
 							}
 ?>
@@ -254,7 +258,7 @@
       echo '<td class="colThumbnail">';
       $imgSrc = $event->getThumbnailSrc(array(),'&amp;');
       $streamSrc = $event->getStreamSrc(array(
-        'mode'=>'jpeg', 'scale'=>$scale, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'replay'=>'single'), '&amp;');
+        'mode'=>'jpeg', 'scale'=>$scale, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'replay'=>'single', 'rate'=>'400'), '&amp;');
 
       $imgHtml = '<img id="thumbnail'.$event->Id().'" src="'.$imgSrc.'" alt="'. validHtmlStr('Event '.$event->Id()) .'" style="width:'. validInt($event->ThumbnailWidth()) .'px;height:'. validInt($event->ThumbnailHeight()).'px;" stream_src="'.$streamSrc.'" still_src="'.$imgSrc.'"/>';
       echo '<a href="?view=event&amp;eid='. $event->Id().$filterQuery.$sortQuery.'&amp;page=1">'.$imgHtml.'</a>';

zoneminder-1.34.8.tar.gz/web/skins/classic/views/export.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/export.php Changed

@@ -101,7 +101,7 @@
     $eventsSql .= $_REQUEST['filter']['sql'];
   }
   $eventsSql .= " ORDER BY $sortColumn $sortOrder";
-  if ( isset($_REQUEST['filter']['Query']['limit']) ) 
+  if ( isset($_REQUEST['filter']['Query']['limit']) )
     $eventsSql .= ' LIMIT '.validInt($_REQUEST['filter']['Query']['limit']);
 } # end if filter
 
@@ -244,30 +244,28 @@
   </div>
   <button type="button" id="exportButton" name="exportButton" value="Export" disabled="disabled"><?php echo translate('Export') ?></button>
 </div>
-<?php
-?>
-  <h2 id="exportProgress" class="<?php
-    if ( isset($_REQUEST['generated']) ) {
-      if ( $_REQUEST['generated'] )
-        echo 'infoText';
-      else 
-        echo 'errorText';
-    } else {
-      echo 'hidden warnText';
-    }
-?>">
+          <h2 id="exportProgress" class="<?php
+            if ( isset($_REQUEST['generated']) ) {
+              if ( $_REQUEST['generated'] )
+                echo 'infoText';
+              else
+                echo 'errorText';
+            } else {
+              echo 'hidden warnText';
+            }
+        ?>">
             <span id="exportProgressText">
-              <?php 
+              <?php
                 if ( isset($_REQUEST['generated']) ) {
                   if ( $_REQUEST['generated'] )
                     echo translate('ExportSucceeded');
-                  else 
+                  else
                     echo translate('ExportFailed');
                 }
             ?></span>
             <span id="exportProgressTicker"></span>
           </h2>
-          <button type="button" data-on-click-this="startDownload" <?php echo empty($_REQUEST['generated'])? ' class="hidden"' : '' ?>><?php echo translate('Download') ?></button>
+          <button type="button" data-on-click-this="startDownload"<?php echo empty($_REQUEST['generated'])? ' class="hidden"' : '' ?>><?php echo translate('Download') ?></button>
           <input type="hidden" name="exportFile" value="<?php echo isset($_REQUEST['exportFile']) ? validHtmlStr($_REQUEST['exportFile']) : '' ?>"/>
           <input type="hidden" name="generated" value="<?php echo isset($_REQUEST['generated']) ? validHtmlStr($_REQUEST['generated']) : '' ?>"/>
         </form>

zoneminder-1.34.8.tar.gz/web/skins/classic/views/groups.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/groups.php Changed

zoneminder-1.34.8.tar.gz/web/skins/classic/views/js/console.js.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/js/console.js.php Changed

@@ -1,20 +1,24 @@
 var consoleRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_MAIN ?>;
 
 <?php
-if ( ZM_CHECK_FOR_UPDATES && canEdit('System') && ZM_DYN_LAST_VERSION && ( verNum(ZM_VERSION) < verNum(ZM_DYN_LAST_VERSION) ) && ( verNum(ZM_DYN_CURR_VERSION) < verNum(ZM_DYN_LAST_VERSION) ) && ( ZM_DYN_NEXT_REMINDER < time() ) ) {
-  $showVersionPopup = true;
-} elseif ( ZM_DYN_SHOW_DONATE_REMINDER ) {
-  if ( canEdit('System') ) {
+if ( canEdit('System') ) {
+  if ( ZM_CHECK_FOR_UPDATES && ZM_DYN_LAST_VERSION && ( verNum(ZM_VERSION) < verNum(ZM_DYN_LAST_VERSION) ) && ( verNum(ZM_DYN_CURR_VERSION) < verNum(ZM_DYN_LAST_VERSION) ) && ( ZM_DYN_NEXT_REMINDER < time() ) ) {
+    $showVersionPopup = true;
+    $nextReminder = time() + 60*60;
+    // limit popups to one per hour instead of on every console refresh.
+    dbQuery("UPDATE Config SET Value = '".$nextReminder."' WHERE Name = 'ZM_DYN_NEXT_REMINDER'");
+
+  } else if ( ZM_DYN_SHOW_DONATE_REMINDER ) {
     if ( ZM_DYN_DONATE_REMINDER_TIME > 0 ) {
       if ( ZM_DYN_DONATE_REMINDER_TIME < time() ) {
         $showDonatePopup = true;
       }
     } else {
       $nextReminder = time() + 30*24*60*60;
-      dbQuery( "update Config set Value = '".$nextReminder."' where Name = 'ZM_DYN_DONATE_REMINDER_TIME'" );
+      dbQuery("UPDATE Config SET Value = '".$nextReminder."' WHERE Name = 'ZM_DYN_DONATE_REMINDER_TIME'");
     }
   }
-}
+} // end if canEdit('System')
 ?>
 var showVersionPopup = <?php echo isset($showVersionPopup )?'true':'false' ?>;
 var showDonatePopup = <?php echo isset($showDonatePopup )?'true':'false' ?>;

zoneminder-1.34.8.tar.gz/web/skins/classic/views/js/cycle.js -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/js/cycle.js Changed

@@ -46,7 +46,7 @@
   // Scale the frame
   monitor_frame = $j('#imageFeed');
   if ( !monitor_frame ) {
-    console.log("Error finding frame");
+    console.log('Error finding frame');
     return;
   }
   if ( width ) {
@@ -92,14 +92,20 @@
   // Scale the frame
   monitor_frame = $j('#imageFeed');
   if ( !monitor_frame ) {
-    console.log("Error finding frame");
+    console.log('Error finding frame');
     return;
   }
-  if ( newWidth ) {
-    monitor_frame.css('width', newWidth+'px');
-  }
-  if ( newHeight ) {
-    monitor_frame.css('height', newHeight+'px');
+
+  if ( scale != '0' ) {
+    if ( newWidth ) {
+      monitor_frame.css('width', newWidth+'px');
+    }
+    if ( newHeight ) {
+      monitor_frame.css('height', newHeight+'px');
+    }
+  } else {
+    monitor_frame.css('width', '100%');
+    monitor_frame.css('height', 'auto');
   }
   /*Stream could be an applet so can't use moo tools*/
   var streamImg = $j('#liveStream'+monitorData[monIdx].id)[0];
@@ -110,12 +116,22 @@
 
       //src = src.replace(/rand=\d+/i,'rand='+Math.floor((Math.random() * 1000000) ));
       src = src.replace(/scale=[\.\d]+/i, 'scale='+scale);
-      src = src.replace(/width=[\.\d]+/i, 'width='+newWidth);
-      src = src.replace(/height=[\.\d]+/i, 'height='+newHeight);
+      if ( scale != '0' ) {
+        src = src.replace(/width=[\.\d]+/i, 'width='+newWidth);
+        src = src.replace(/height=[\.\d]+/i, 'height='+newHeight);
+      } else {
+        src = src.replace(/width=[\.\d]+/i, 'width='+monitorData[monIdx].width);
+        src = src.replace(/height=[\.\d]+/i, 'height='+monitorData[monIdx].height);
+      }
       streamImg.src = src;
     }
-    streamImg.style.width = newWidth + 'px';
-    streamImg.style.height = newHeight + 'px';
+    if ( scale != '0' ) {
+      streamImg.style.width = newWidth+'px';
+      streamImg.style.height = newHeight+'px';
+    } else {
+      streamImg.style.width = '100%';
+      streamImg.style.height = 'auto';
+    }
   } else {
     console.log("Did not find liveStream"+monitorData[monIdx].id);
   }

zoneminder-1.34.8.tar.gz/web/skins/classic/views/js/event.js -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/js/event.js Changed

@@ -1,4 +1,7 @@
 var vid = null;
+var spf = Math.round((eventData.Length / eventData.Frames)*1000000 )/1000000;//Seconds per frame for videojs frame by frame.
+var intervalRewind;
+var revSpeed = .5;
 
 // Function called when video.js hits the end of the video
 function vjsReplay() {
@@ -39,7 +42,7 @@
       streamNext(true);
       break;
   }
-}
+} // end function vjsReplay
 
 $j.ajaxSetup({timeout: AJAX_TIMEOUT}); //sets timeout for all getJSON.
 
@@ -67,14 +70,14 @@
   var spanTimeStart = 0;
   var spanTimeEnd = 0;
   var alarmed = 0;
-  var alarmHtml = "";
+  var alarmHtml = '';
   var pixSkew = 0;
   var skip = 0;
   var num_cueFrames = cueFrames.length;
   for ( var i = 0; i < num_cueFrames; i++ ) {
     skip = 0;
     frame = cueFrames[i];
-    if (frame.Type == "Alarm" && alarmed == 0) { //From nothing to alarm.  End nothing and start alarm.
+    if ( (frame.Type == 'Alarm') && (alarmed == 0) ) { //From nothing to alarm.  End nothing and start alarm.
       alarmed = 1;
       if (frame.Delta == 0) continue; //If event starts with an alarm or too few for a nonespan
       spanTimeEnd = frame.Delta * 100;
@@ -88,24 +91,24 @@
       }
       alarmHtml += '<span class="alarmCue noneCue" style="width: ' + pix + 'px;"></span>';
       spanTimeStart = spanTimeEnd;
-    } else if (frame.Type !== "Alarm" && alarmed == 1) { //from alarm to nothing.  End alarm and start nothing.
+    } else if ( (frame.Type !== 'Alarm') && (alarmed == 1) ) { //from alarm to nothing.  End alarm and start nothing.
       futNone = 0;
       indexPlus = i+1;
       if (((frame.Delta * 100) - spanTimeStart) < minAlarm && indexPlus < num_cueFrames) {
         //alarm is too short and there is more event
         continue;
       }
-      while (futNone < minAlarm) { //check ahead to see if there's enough for a nonespan
-        if (indexPlus >= cueFrames.length) break; //check if end of event.
+      while ( futNone < minAlarm ) { //check ahead to see if there's enough for a nonespan
+        if ( indexPlus >= cueFrames.length ) break; //check if end of event.
         futNone = (cueFrames[indexPlus].Delta *100) - (frame.Delta *100);
-        if (cueFrames[indexPlus].Type == "Alarm") {
+        if ( cueFrames[indexPlus].Type == 'Alarm' ) {
           i = --indexPlus;
           skip = 1;
           break;
         }
         indexPlus++;
       }
-      if (skip == 1) continue; //javascript doesn't support continue 2;
+      if ( skip == 1 ) continue; //javascript doesn't support continue 2;
       spanTimeEnd = frame.Delta *100;
       spanTime = spanTimeEnd - spanTimeStart;
       alarmed = 0;
@@ -118,7 +121,7 @@
       }
       alarmHtml += '<span class="alarmCue" style="width: ' + pix + 'px;"></span>';
       spanTimeStart = spanTimeEnd;
-    } else if (frame.Type == "Alarm" && alarmed == 1 && i + 1 >= cueFrames.length) { //event ends on an alarm
+    } else if ( (frame.Type == 'Alarm') && (alarmed == 1) && (i + 1 >= cueFrames.length) ) { //event ends on an alarm
       spanTimeEnd = frame.Delta * 100;
       spanTime = spanTimeEnd - spanTimeStart;
       alarmed = 0;
@@ -130,18 +133,6 @@
   return alarmHtml;
 }
 
-function setButtonState( element, butClass ) {
-  if ( element ) {
-    element.className = butClass;
-    if (butClass == 'unavail' || (butClass == 'active' && (element.id == 'pauseBtn' || element.id == 'playBtn'))) {
-      element.disabled = true;
-    } else {
-      element.disabled = false;
-    }
-  } else {
-    console.log('Element was null in setButtonState');
-  }
-}
 
 function changeCodec() {
   location.replace(thisUrl + '?view=event&eid=' + eventData.Id + filterQuery + sortQuery+'&codec='+$j('#codec').val());
@@ -155,12 +146,12 @@
   var eventViewer;
   var alarmCue = $j('div.alarmCue');
   var bottomEl = streamMode == 'stills' ? $j('#eventImageNav') : $j('#replayStatus');
-  if (streamMode == 'stills') {
+  if ( streamMode == 'stills' ) {
     eventViewer = $j('#eventThumbs');
   } else {
     eventViewer = $j(vid ? '#videoobj' : '#evtStream');
   }
-  if ( scale == "auto" ) {
+  if ( scale == '0' || scale == 'auto' ) {
     var newSize = scaleToFit(eventData.Width, eventData.Height, eventViewer, bottomEl);
     newWidth = newSize.width;
     newHeight = newSize.height;
@@ -172,10 +163,10 @@
   }
   if ( !(streamMode == 'stills') ) {
     eventViewer.width(newWidth);
-  } //stills handles its own width
+  } // stills handles its own width
   eventViewer.height(newHeight);
   if ( !vid ) { // zms needs extra sizing
-    streamScale(scale == "auto" ? autoScale : scale);
+    streamScale((scale == '0' || scale == 'auto' ) ? autoScale : scale);
     drawProgressBar();
   }
   if ( streamMode == 'stills' ) {
@@ -184,7 +175,7 @@
   } else {
     alarmCue.html(renderAlarmCues(eventViewer));//just re-render alarmCues.  skip ajax call
   }
-  if ( scale == "auto" ) {
+  if ( scale = '0' || scale == 'auto' ) {
     Cookie.write('zmEventScaleAuto', 'auto', {duration: 10*365});
   } else {
     Cookie.write('zmEventScale'+eventData.MonitorId, scale, {duration: 10*365});
@@ -200,6 +191,32 @@
   refreshWindow();
 }
 
+function changeRate() {
+  var rate = parseInt($j('select[name="rate"]').val());
+  if ( ! rate ) {
+    pauseClicked();
+  } else if ( rate < 0 ) {
+    if ( vid ) { //There is no reverse play with mp4.  Set the speed to 0 and manually set the time back.
+      revSpeed = rates[rates.indexOf(-1*rate)-1]/100;
+      clearInterval(intervalRewind);
+      intervalRewind = setInterval(function() {
+        if ( vid.currentTime() <= 0 ) {
+          clearInterval(intervalRewind);
+          vid.pause();
+        } else {
+          vid.playbackRate(0);
+          vid.currentTime(vid.currentTime() - (revSpeed/2)); //Half of reverse speed because our interval is 500ms.
+        }
+      }, 500); //500ms is a compromise between smooth reverse and realistic performance
+    } // end if vid
+  } else { // Forward rate
+    if ( vid ) {
+      vid.playbackRate(rate/100);
+    }
+  }
+  Cookie.write('zmEventRate', rate, {duration: 10*365});
+} // end function changeRate
+
 var streamParms = "view=request&request=stream&connkey="+connKey;
 if ( auth_hash ) {
   streamParms += '&auth='+auth_hash;
@@ -245,7 +262,8 @@
   if ( streamStatus.paused == true ) {
     streamPause( );
   } else {
-    $j('#rateValue').html(streamStatus.rate);
+    console.log('streamStatus.rate: ' + streamStatus.rate);
+    $j('select[name="rate"]').val(streamStatus.rate*100);
     Cookie.write('zmEventRate', streamStatus.rate*100, {duration: 10*365});
     streamPlay( );
   }
@@ -280,23 +298,18 @@
 
 function pauseClicked() {
   if ( vid ) {
+    if ( intervalRewind ) {
+      stopFastRev();
+    }
     vid.pause();
   } else {
     streamReq.send(streamParms+"&command="+CMD_PAUSE);
-    streamPause();
-  }
-}
-
-function vjsPause() {
-  if ( intervalRewind ) {
-    stopFastRev();
   }
   streamPause();
 }
 
-function streamPause( ) {
+function streamPause() {
   $j('#modeValue').html('Paused');
-  $j('#rateValue').html('0');
   setButtonState( $('pauseBtn'), 'active' );
   setButtonState( $('playBtn'), 'inactive' );
   setButtonState( $('fastFwdBtn'), 'unavail' );

zoneminder-1.34.8.tar.gz/web/skins/classic/views/js/event.js.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/js/event.js.php Changed

@@ -34,7 +34,7 @@
     StartTime: '<?php echo $Event->StartTime() ?>',
     EndTime: '<?php echo $Event->EndTime() ?>',
     Frames: '<?php echo $Event->Frames() ?>',
-    MonitorName: '<?php echo $Monitor->Name() ?>'
+    MonitorName: '<?php echo validJsStr($Monitor->Name()) ?>'
 };
 var monitorUrl = '<?php echo $Event->Storage()->Server()->UrlToIndex(); ?>';
 
@@ -46,7 +46,7 @@
 var scale = "<?php echo $scale ?>";
 var LabelFormat = "<?php echo validJsStr($Monitor->LabelFormat())?>";
 
-var canEditEvents = <?php echo canEdit( 'Events' )?'true':'false' ?>;
+var canEditEvents = <?php echo canEdit('Events')?'true':'false' ?>;
 var streamTimeout = <?php echo 1000*ZM_WEB_REFRESH_STATUS ?>;
 
 var canStreamNative = <?php echo canStreamNative()?'true':'false' ?>;
@@ -55,8 +55,8 @@
 //
 // Strings
 //
-var deleteString = "<?php echo translate('Delete') ?>";
-var causeString = "<?php echo translate('AttrCause') ?>";
+var deleteString = "<?php echo validJsStr(translate('Delete')) ?>";
+var causeString = "<?php echo validJsStr(translate('AttrCause')) ?>";
 var WEB_LIST_THUMB_WIDTH = '<?php echo ZM_WEB_LIST_THUMB_WIDTH ?>';
 var WEB_LIST_THUMB_HEIGHT = '<?php echo ZM_WEB_LIST_THUMB_HEIGHT ?>';
 var popup = '<?php echo $popup ?>';

zoneminder-1.34.8.tar.gz/web/skins/classic/views/js/export.js -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/js/export.js Changed

zoneminder-1.34.8.tar.gz/web/skins/classic/views/js/filter.js -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/js/filter.js Changed

@@ -141,6 +141,11 @@
     form.submit();
   }
 }
+var escape = document.createElement('textarea');
+function escapeHTML(html) {
+  escape.textContent = html;
+  return escape.innerHTML;
+}
 
 function parseRows(rows) {
   for ( var rowNum = 0; rowNum < rows.length; rowNum++ ) { //Each row is a term
@@ -221,8 +226,8 @@
       inputTds.eq(4).html(storageSelect).children().val(storageVal).chosen({width: "101%"});
     } else if ( attr == 'MonitorName' ) { //Monitor names
       var monitorSelect = $j('<select></select>').attr('name', queryPrefix + rowNum + '][val]').attr('id', queryPrefix + rowNum + '][val]');
-      for (var key in monitors) {
-        monitorSelect.append('<option value="' + key + '">' + monitors[key] + '</option>');
+      for ( var monitor_id in monitors ) {
+        monitorSelect.append('<option value="' + monitors[monitor_id].Name + '">' + escapeHTML(monitors[monitor_id].Name) + '</option>');
       }
       var monitorVal = inputTds.eq(4).children().val();
       inputTds.eq(4).html(monitorSelect).children().val(monitorVal);

zoneminder-1.34.8.tar.gz/web/skins/classic/views/js/groups.js -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/js/groups.js Changed

zoneminder-1.34.8.tar.gz/web/skins/classic/views/js/log.js -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/js/log.js Changed

zoneminder-1.34.8.tar.gz/web/skins/classic/views/js/monitor.js.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/js/monitor.js.php Changed

zoneminder-1.34.8.tar.gz/web/skins/classic/views/js/montage.js -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/js/montage.js Changed

@@ -13,6 +13,8 @@
   this.streamCmdParms = 'view=request&request=stream&connkey='+this.connKey;
   if ( auth_hash ) {
     this.streamCmdParms += '&auth='+auth_hash;
+  } else if ( auth_relay ) {
+    this.streamCmdParms += '&'+auth_relay;
   }
   this.streamCmdTimer = null;
   this.type = monitorData.type;
@@ -210,7 +212,8 @@
  * @param {*} element - the event data passed by onchange callback
  */
 function selectLayout(element) {
-  layout = $j(element).val();
+  var ddm = $j('#zmMontageLayout');
+  layout = ddm.val();
 
   if ( layout_id = parseInt(layout) ) {
     layout = layouts[layout];
@@ -229,6 +232,7 @@
       if ( layout.Positions['default'] ) {
         styles = layout.Positions['default'];
         for ( style in styles ) {
+          console.log("Applying " + style + ' ' + styles[style]);
           monitor_frame.css(style, styles[style]);
         }
       } else {
@@ -239,7 +243,6 @@
         styles = layout.Positions['mId'+monitor.id];
         for ( style in styles ) {
           monitor_frame.css(style, styles[style]);
-          console.log("Applying " + style + ' : ' + styles[style]);
         }
       } else {
         console.log("No Monitor styles to apply");
@@ -334,7 +337,7 @@
   Cookie.write('zmMontageScale', scale, {duration: 10*365});
   Cookie.write('zmMontageWidth', '', {duration: 10*365});
   Cookie.write('zmMontageHeight', '', {duration: 10*365});
-  if ( !scale ) {
+  if ( scale == '' ) {
     selectLayout('#zmMontageLayout');
     return;
   }
@@ -349,8 +352,12 @@
       console.log("Error finding frame for " + monitor.id);
       continue;
     }
-    if ( newWidth ) {
-      monitor_frame.css('width', newWidth);
+    if ( scale != '0' ) {
+      if ( newWidth ) {
+        monitor_frame.css('width', newWidth);
+      }
+    } else {
+      monitor_frame.css('width', '100%');
     }
     // We don't set the frame height because it has the status bar as well
     //if ( height ) {
@@ -364,13 +371,24 @@
         streamImg.src = '';
 
         //src = src.replace(/rand=\d+/i,'rand='+Math.floor((Math.random() * 1000000) ));
-        src = src.replace(/scale=[\.\d]+/i, 'scale='+scale);
-        src = src.replace(/width=[\.\d]+/i, 'width='+newWidth);
-        src = src.replace(/height=[\.\d]+/i, 'height='+newHeight);
+        if ( scale != '0' ) {
+          src = src.replace(/scale=[\.\d]+/i, 'scale='+scale);
+          src = src.replace(/width=[\.\d]+/i, 'width='+newWidth);
+          src = src.replace(/height=[\.\d]+/i, 'height='+newHeight);
+        } else {
+          src = src.replace(/scale=[\.\d]+/i, 'scale=100');
+          src = src.replace(/width=[\.\d]+/i, 'width='+monitorData[i].width);
+          src = src.replace(/height=[\.\d]+/i, 'height='+monitorData[i].height);
+        }
         streamImg.src = src;
       }
-      streamImg.style.width = newWidth + "px";
-      streamImg.style.height = newHeight + "px";
+      if ( scale != '0' ) {
+        streamImg.style.width = newWidth + "px";
+        streamImg.style.height = newHeight + "px";
+      } else {
+        streamImg.style.width = '100%';
+        streamImg.style.height = 'auto';
+      }
     }
   }
 }

zoneminder-1.34.8.tar.gz/web/skins/classic/views/js/montagereview.js -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/js/montagereview.js Changed

@@ -936,6 +936,10 @@
     }
   }
 
+  // Reloading can take a while, so stop interrupts to reduce load
+  clearInterval(timerObj);
+  timerObj = null;
+
   var uri = "?view=" + currentView + fitStr + minStr + maxStr + liveStr + zoomStr + "&scale=" + $j("#scaleslider")[0].value + "&speed=" + speeds[$j("#speedslider")[0].value];
   window.location = uri;
 }
@@ -967,6 +971,7 @@
         imagedone(this, this.monId, false);
       };
       loadImage2Monitor(monId, monitorImageURL[monId]);
+      monitorCanvasObj[monId].addEventListener('click', clickMonitor, false);
     }
   } // end foreach monitor
 
@@ -982,15 +987,6 @@
     ctx = canvas.getContext('2d');
     drawGraph();
   }
-  for ( i=0, len=monitorPtr.length; i < len; i += 1 ) {
-    var monitor_id = monitorPtr[i];
-    monitor_canvas = $('Monitor'+monitor_id);
-    if ( ! monitor_canvas ) {
-      console.log("No canvas found for monitor " + monitor_id);
-      continue;
-    }
-    monitor_canvas.addEventListener('click', clickMonitor, false);
-  }
   setSpeed(speedIndex);
   //setFit(fitMode);  // will redraw
   //setLive(liveMode);  // will redraw

zoneminder-1.34.8.tar.gz/web/skins/classic/views/js/montagereview.js.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/js/montagereview.js.php Changed

@@ -3,7 +3,7 @@
 $TimeZone = new DateTimeZone( ini_get('date.timezone') );
 $now = new DateTime('now', $TimeZone);
 $offset = $TimeZone->getOffset($now);
-echo $offset . '; // ' . floor($offset / 3600) . ' hours ';
+echo $offset.'; // '.floor($offset / 3600).' hours ';
 ?>
 
 var currentScale=<?php echo $defaultScale?>;
@@ -68,7 +68,7 @@
         $frame['NextFrameId'] = $next_frames[$frame['EventId']]['Id'];
       }
       $event['FramesById'] += array($frame['Id']=>$frame);
-      $next_frames[$frame['EventId']] = $frame;
+      $next_frames[$frame['EventId']] = &$event['FramesById'][$frame['Id']];
     }
   } // end if dbQuery
 
@@ -182,18 +182,18 @@
   echo "  monitorLoading["         . $m->Id() . "]=false;\n";
   echo "  monitorImageURL["        . $m->Id() . "]='".$m->getStreamSrc( array('mode'=>'single','scale'=>$defaultScale*100), '&' )."';\n";
   echo "  monitorLoadingStageURL[" . $m->Id() . "] = '';\n";
-  echo "  monitorColour["          . $m->Id() . "]=\"" . $m->WebColour() . "\";\n";
-  echo "  monitorWidth["           . $m->Id() . "]=" . $m->ViewWidth() . ";\n";
-  echo "  monitorHeight["          . $m->Id() . "]=" . $m->ViewHeight() . ";\n";
+  echo "  monitorColour["          . $m->Id() . "]=\"" . validHtmlStr($m->WebColour()) . "\";\n";
+  echo "  monitorWidth["           . $m->Id() . "]=" . validHtmlStr($m->ViewWidth()) . ";\n";
+  echo "  monitorHeight["          . $m->Id() . "]=" . validHtmlStr($m->ViewHeight()) . ";\n";
   echo "  monitorIndex["           . $m->Id() . "]=" . $numMonitors . ";\n";
   echo "  monitorServerId["        . $m->Id() . "]='" .($m->ServerId() ?  $m->ServerId() : '0'). "';\n";
-  echo "  monitorName["            . $m->Id() . "]=\"" . $m->Name() . "\";\n";
+  echo "  monitorName["            . $m->Id() . "]=\"" . validHtmlStr($m->Name()) . "\";\n";
   echo "  monitorLoadStartTimems[" . $m->Id() . "]=0;\n";
   echo "  monitorLoadEndTimems["   . $m->Id() . "]=0;\n";
   echo "  monitorNormalizeScale["  . $m->Id() . "]=" . sqrt($avgArea / ($m->Width() * $m->Height() )) . ";\n";
   $zoomScale=1.0;
-  if(isset($_REQUEST[ 'z' . $m->Id() ]) )
-      $zoomScale = floatval( validHtmlStr($_REQUEST[ 'z' . $m->Id() ]) );
+  if ( isset($_REQUEST['z'.$m->Id()]) )
+      $zoomScale = floatval(validHtmlStr($_REQUEST['z'.$m->Id()]));
   echo "  monitorZoomScale["       . $m->Id() . "]=" . $zoomScale . ";\n";
   echo "  monitorPtr["         . $numMonitors . "]=" . $m->Id() . ";\n";
   $numMonitors += 1;
@@ -205,14 +205,14 @@
 var minTime='$minTime';
 var maxTime='$maxTime';
 ";
-echo "var rangeTimeSecs="   . ( $maxTimeSecs - $minTimeSecs + 1) . ";\n";
-if(isset($defaultCurrentTime))
-  echo "var currentTimeSecs=parseInt(" . strtotime($defaultCurrentTime) . ");\n";
+echo 'var rangeTimeSecs='.($maxTimeSecs - $minTimeSecs + 1).";\n";
+if ( isset($defaultCurrentTime) )
+  echo 'var currentTimeSecs=parseInt('.strtotime($defaultCurrentTime).");\n";
 else
-  echo "var currentTimeSecs=parseInt(" . ($minTimeSecs + $maxTimeSecs)/2 . ");\n";
+  echo 'var currentTimeSecs=parseInt('.(($minTimeSecs + $maxTimeSecs)/2).");\n";
 
 echo 'var speeds=[';
-for ($i=0; $i<count($speeds); $i++)
+for ( $i=0; $i < count($speeds); $i++ )
   echo (($i>0)?', ':'') . $speeds[$i];
 echo "];\n";
 ?>

zoneminder-1.34.8.tar.gz/web/skins/classic/views/js/postlogin.js.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/js/postlogin.js.php Changed

zoneminder-1.34.8.tar.gz/web/skins/classic/views/js/timeline.js -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/js/timeline.js Changed

@@ -36,14 +36,14 @@
   return eventHtml;
 }
 
-function showEventDetail( eventHtml ) {
-  $('instruction').addClass( 'hidden' );
+function showEventDetail(eventHtml) {
+  $('instruction').addClass('hidden');
   $('eventData').empty();
-  $('eventData').adopt( eventHtml );
-  $('eventData').removeClass( 'hidden' );
+  $('eventData').adopt(eventHtml);
+  $('eventData').removeClass('hidden');
 }
 
-function eventDataResponse( respObj, respText ) {
+function eventDataResponse(respObj, respText) {
   var zm_event = respObj.event;
   if ( !zm_event ) {
     console.log('Null event');
@@ -179,7 +179,10 @@
   eventData.addEvent('click', showEvent.pass());
 }
 
-function tlZoomBounds( minTime, maxTime ) {
+function tlZoomBounds(event) {
+  var target = event.target;
+  var minTime = target.getAttribute('data-zoom-min-time');
+  var maxTime = target.getAttribute('data-zoom-max-time');
   location.replace('?view='+currentView+filterQuery+'&minTime='+minTime+'&maxTime='+maxTime);
 }
 
@@ -194,14 +197,20 @@
   location.replace('?view='+currentView+filterQuery+'&midTime='+maxTime+'&range='+range);
 }
 
-window.addEventListener("DOMContentLoaded", function() {
-  document.querySelectorAll("div.event").forEach(function(el) {
+window.addEventListener('DOMContentLoaded', function() {
+  // These look like the code in skin.js, but that code doesn't select for divs.
+  document.querySelectorAll('div.event').forEach(function(el) {
     el.onclick = window[el.getAttribute('data-on-click-this')].bind(el, el);
     el.onmouseover = window[el.getAttribute('data-on-mouseover-this')].bind(el, el);
   });
-  document.querySelectorAll("div.activity").forEach(function(el) {
+  document.querySelectorAll('div.activity').forEach(function(el) {
     el.onclick = window[el.getAttribute('data-on-click-this')].bind(el, el);
     el.onmouseover = window[el.getAttribute('data-on-mouseover-this')].bind(el, el);
   });
+  document.querySelectorAll('div.zoom').forEach(function(el) {
+    el.onclick = function(ev) {
+      window[el.getAttribute('data-on-click')](ev);
+    };
+  });
 });

zoneminder-1.34.8.tar.gz/web/skins/classic/views/js/video.js -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/js/video.js Changed

@@ -1,11 +1,11 @@
-function deleteVideo( e ) {
+function deleteVideo(e) {
   index = e.getAttribute('data-file-index');
-  window.location.replace( thisUrl+'?view='+currentView+'&eid='+eventId+'&deleteIndex='+index );
+  window.location.replace(thisUrl+'?view='+currentView+'&eid='+eventId+'&deleteIndex='+index);
 }
 
-function downloadVideo( e ) {
+function downloadVideo(e) {
   index = e.getAttribute('data-file-index');
-  window.location.replace( thisUrl+'?view='+currentView+'&eid='+eventId+'&downloadIndex='+index );
+  window.location.replace(thisUrl+'?view='+currentView+'&eid='+eventId+'&downloadIndex='+index);
 }
 
 var generateVideoTimer = null;
@@ -13,25 +13,25 @@
 function generateVideoProgress() {
   var tickerText = $('videoProgressTicker').get('text');
   if ( tickerText.length < 1 || tickerText.length > 4 ) {
-    $('videoProgressTicker').set( 'text', '.' );
+    $('videoProgressTicker').set('text', '.');
   } else {
-    $('videoProgressTicker').appendText( '.' );
+    $('videoProgressTicker').appendText('.');
   }
 }
 
 function generateVideoResponse( respObj, respText ) {
-  window.location.replace( thisUrl+'?view='+currentView+'&eid='+eventId+'&generated='+((respObj.result=='Ok')?1:0) );
+  window.location.replace(thisUrl+'?view='+currentView+'&eid='+eventId+'&generated='+((respObj.result=='Ok')?1:0));
 }
 
 function generateVideo() {
   form = $j('#contentForm')[0];
   var parms = 'view=request&request=event&action=video';
   parms += '&'+$(form).toQueryString();
-  var query = new Request.JSON( {url: thisUrl, method: 'post', data: parms, onSuccess: generateVideoResponse} );
+  var query = new Request.JSON({url: thisUrl, method: 'post', data: parms, onSuccess: generateVideoResponse});
   query.send();
-  $('videoProgress').removeClass( 'hidden' );
-  $('videoProgress').setProperty( 'class', 'warnText' );
-  $('videoProgressText').set( 'text', videoGenProgressString );
+  $('videoProgress').removeClass('hidden');
+  $('videoProgress').setProperty('class', 'warnText');
+  $('videoProgressText').set('text', videoGenProgressString);
   generateVideoProgress();
-  generateVideoTimer = generateVideoProgress.periodical( 500 );
+  generateVideoTimer = generateVideoProgress.periodical(500);
 }

zoneminder-1.34.8.tar.gz/web/skins/classic/views/js/watch.js -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/js/watch.js Changed

@@ -1,39 +1,33 @@
-function setButtonState(element, butClass) {
-  if ( element ) {
-    element.className = butClass;
-    element.disabled = (butClass != 'inactive');
-  }
-}
 
 function showEvents() {
-  $('ptzControls').addClass( 'hidden' );
-  $('events').removeClass( 'hidden' );
+  $('ptzControls').addClass('hidden');
+  $('events').removeClass('hidden');
   if ( $('eventsControl') ) {
     $('eventsControl').addClass('hidden');
   }
   if ( $('controlControl') ) {
     $('controlControl').removeClass('hidden');
   }
-  showMode = "events";
+  showMode = 'events';
 }
 
 function showPtzControls() {
-  $('events').addClass( 'hidden' );
-  $('ptzControls').removeClass( 'hidden' );
+  $('events').addClass('hidden');
+  $('ptzControls').removeClass('hidden');
   if ( $('eventsControl') ) {
     $('eventsControl').removeClass('hidden');
   }
   if ( $('controlControl') ) {
     $('controlControl').addClass('hidden');
   }
-  showMode = "control";
+  showMode = 'control';
 }
 
 function changeScale() {
   var scale = $('scale').get('value');
   var newWidth;
   var newHeight;
-  if (scale == "auto") {
+  if ( scale == '0' || scale == 'auto' ) {
     var newSize = scaleToFit(monitorWidth, monitorHeight, $j('#liveStream'+monitorId), $j('#replayStatus'));
     newWidth = newSize.width;
     newHeight = newSize.height;
@@ -87,7 +81,7 @@
     if ( SOUND_ON_ALARM ) {
       // Enable the alarm sound
       if ( !canPlayPauseAudio ) {
-        $('alarmSound').removeClass( 'hidden' );
+        $('alarmSound').removeClass('hidden');
       } else {
         $('MediaPlayer').Play();
       }
@@ -96,22 +90,20 @@
       window.focus();
     }
   }
-  if ( SOUND_ON_ALARM ) {
-    if ( oldAlarm ) {
+  if ( oldAlarm ) { // done with an event do a refresh
+    if ( SOUND_ON_ALARM ) {
       // Disable alarm sound
       if ( !canPlayPauseAudio ) {
-        $('alarmSound').addClass( 'hidden' );
+        $('alarmSound').addClass('hidden');
       } else {
         $('MediaPlayer').Stop();
       }
     }
-  }
-  if (oldAlarm) { // done with an event do a refresh
     eventCmdQuery();
   }
 
   lastAlarmState = alarmState;
-}
+} // end function setAlarmState( currentAlarmState )
 
 if ( monitorType != 'WebSite' ) {
   var streamCmdParms = 'view=request&request=stream&connkey='+connKey;
@@ -155,11 +147,11 @@
 
       $('levelValue').set('text', streamStatus.level);
       if ( streamStatus.level > 95 ) {
-        $('levelValue').className = "alarm";
+        $('levelValue').className = 'alarm';
       } else if ( streamStatus.level > 80 ) {
-        $('levelValue').className = "alert";
+        $('levelValue').className = 'alert';
       } else {
-        $('levelValue').className = "ok";
+        $('levelValue').className = 'ok';
       }
 
       var delayString = secsToTime(streamStatus.delay);
@@ -194,7 +186,7 @@
           }
         } // rate
       } else {
-        $('modeValue').set( 'text', "Live" );
+        $('modeValue').set( 'text', 'Live' );
         $('rate').addClass( 'hidden' );
         $('delay').addClass( 'hidden' );
         $('level').addClass( 'hidden' );
@@ -203,9 +195,9 @@
 
       $('zoomValue').set('text', streamStatus.zoom);
       if ( streamStatus.zoom == '1.0' ) {
-        setButtonState($('zoomOutBtn'), 'unavail');
+        setButtonState('zoomOutBtn', 'unavail');
       } else {
-        setButtonState($('zoomOutBtn'), 'inactive');
+        setButtonState('zoomOutBtn', 'inactive');
       }
 
       if ( canEditMonitors ) {
@@ -230,7 +222,6 @@
 
       if ( streamStatus.auth ) {
         auth_hash = streamStatus.auth;
-        console.log("Have a new auth hash" + streamStatus.auth);
         // Try to reload the image stream.
         var streamImg = $('liveStream');
         if ( streamImg ) {
@@ -243,7 +234,7 @@
       } // end if have a new auth hash
     } // end if respObj.status
   } else {
-    checkStreamForErrors("getStreamCmdResponse", respObj);//log them
+    checkStreamForErrors('getStreamCmdResponse', respObj);//log them
     // Try to reload the image stream.
     // If it's an auth error, we should reload the whole page.
     window.location.reload();
@@ -251,9 +242,9 @@
       var streamImg = $('liveStream'+monitorId);
       if ( streamImg ) {
         streamImg.src = streamImg.src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));
-        console.log("Changing livestream src to " + streamImg.src);
+        console.log('Changing livestream src to ' + streamImg.src);
       } else {
-        console.log("Unable to find streamImg liveStream");
+        console.log('Unable to find streamImg liveStream');
       }
     }
   }
@@ -262,132 +253,152 @@
   if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT ) {
     streamCmdTimeout = streamCmdTimeout/5;
   }
-  streamCmdTimer = streamCmdQuery.delay( streamCmdTimeout );
+  streamCmdTimer = streamCmdQuery.delay(streamCmdTimeout);
 }
 
 function streamCmdPause( action ) {
-  setButtonState( $('pauseBtn'), 'active' );
-  setButtonState( $('playBtn'), 'inactive' );
-  setButtonState( $('stopBtn'), 'inactive' );
-  setButtonState( $('fastFwdBtn'), 'inactive' );
-  setButtonState( $('slowFwdBtn'), 'inactive' );
-  setButtonState( $('slowRevBtn'), 'inactive' );
-  setButtonState( $('fastRevBtn'), 'inactive' );
+  setButtonState('pauseBtn', 'active');
+  setButtonState('playBtn', 'inactive');
+  setButtonState('stopBtn', 'inactive');
+  if ( monitorStreamReplayBuffer ) {
+    setButtonState('fastFwdBtn', 'inactive');
+    setButtonState('slowFwdBtn', 'inactive');
+    setButtonState('slowRevBtn', 'inactive');
+    setButtonState('fastRevBtn', 'inactive');
+  }
   if ( action ) {
-    streamCmdReq.send( streamCmdParms+"&command="+CMD_PAUSE );
+    streamCmdReq.send(streamCmdParms+"&command="+CMD_PAUSE);
   }
 }
 
 function streamCmdPlay( action ) {
-  setButtonState( $('pauseBtn'), 'inactive' );
-  setButtonState( $('playBtn'), 'active' );
+  setButtonState('pauseBtn', 'inactive');
+  setButtonState('playBtn', 'active');
   if ( streamStatus.delayed == true ) {
-    setButtonState( $('stopBtn'), 'inactive' );
-    setButtonState( $('fastFwdBtn'), 'inactive' );
-    setButtonState( $('slowFwdBtn'), 'inactive' );
-    setButtonState( $('slowRevBtn'), 'inactive' );
-    setButtonState( $('fastRevBtn'), 'inactive' );
+    setButtonState('stopBtn', 'inactive');
+    if ( monitorStreamReplayBuffer ) {
+      setButtonState('fastFwdBtn', 'inactive');
+      setButtonState('slowFwdBtn', 'inactive');
+      setButtonState('slowRevBtn', 'inactive');
+      setButtonState('fastRevBtn', 'inactive');
+    }
   } else {
-    setButtonState( $('stopBtn'), 'unavail' );
-    setButtonState( $('fastFwdBtn'), 'unavail' );

zoneminder-1.34.8.tar.gz/web/skins/classic/views/js/watch.js.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/js/watch.js.php Changed

zoneminder-1.34.8.tar.gz/web/skins/classic/views/login.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/login.php Changed

@@ -22,18 +22,17 @@
 	
 				<label for="inputPassword" class="sr-only"><?php echo translate('Password') ?></label>
 				<input type="password" id="inputPassword" name="password" class="form-control" placeholder="Password" required autocomplete="current-password"/>
-	
-				<?php
-				if (defined('ZM_OPT_USE_GOOG_RECAPTCHA') 
-				&& defined('ZM_OPT_GOOG_RECAPTCHA_SITEKEY') 
-				&& defined('ZM_OPT_GOOG_RECAPTCHA_SECRETKEY')
-				&& ZM_OPT_USE_GOOG_RECAPTCHA && ZM_OPT_GOOG_RECAPTCHA_SITEKEY && ZM_OPT_GOOG_RECAPTCHA_SECRETKEY)
-				{
-				echo '<div class="g-recaptcha" data-sitekey="'.ZM_OPT_GOOG_RECAPTCHA_SITEKEY.'"></div>';
-				} ?>
-	
+<?php
+if (
+  defined('ZM_OPT_USE_GOOG_RECAPTCHA') 
+  && defined('ZM_OPT_GOOG_RECAPTCHA_SITEKEY') 
+  && defined('ZM_OPT_GOOG_RECAPTCHA_SECRETKEY')
+  && ZM_OPT_USE_GOOG_RECAPTCHA && ZM_OPT_GOOG_RECAPTCHA_SITEKEY && ZM_OPT_GOOG_RECAPTCHA_SECRETKEY
+) {
+  echo '<div class="g-recaptcha" data-sitekey="'.ZM_OPT_GOOG_RECAPTCHA_SITEKEY.'"></div>
+    <script src="https://www.google.com/recaptcha/api.js" async defer></script>';
+} ?>
 				<button class="btn btn-lg btn-primary btn-block" type="submit"><?php echo translate('Login') ?></button>
-
 			</div>
 		</form>
 	</div>

zoneminder-1.34.8.tar.gz/web/skins/classic/views/monitor.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/monitor.php Changed

@@ -320,31 +320,31 @@
     );
 
 $deinterlaceopts = array(
-    'Disabled'                                            => 0x00000000,
-    'Four field motion adaptive - Soft'                   => 0x00001E04, /* 30 change */
-    'Four field motion adaptive - Medium'                 => 0x00001404, /* 20 change */
-    'Four field motion adaptive - Hard'                   => 0x00000A04, /* 10 change */
-    'Discard'                                             => 0x00000001,
-    'Linear'                                              => 0x00000002,
-    'Blend'                                               => 0x00000003,
-    'Blend (25%)'                                         => 0x00000205
-    );
+  0x00000000 => 'Disabled',
+  0x00001E04 => 'Four field motion adaptive - Soft', /* 30 change */
+  0x00001404 => 'Four field motion adaptive - Medium', /* 20 change */
+  0x00000A04 => 'Four field motion adaptive - Hard', /* 10 change */
+  0x00000001 => 'Discard',
+  0x00000002 => 'Linear',
+  0x00000003 => 'Blend',
+  0x00000205 => 'Blend (25%)',
+);
 
 $deinterlaceopts_v4l2 = array(
-    'Disabled'                                            => 0x00000000,
-    'Four field motion adaptive - Soft'                   => 0x00001E04, /* 30 change */
-    'Four field motion adaptive - Medium'                 => 0x00001404, /* 20 change */
-    'Four field motion adaptive - Hard'                   => 0x00000A04, /* 10 change */
-    'Discard'                                             => 0x00000001,
-    'Linear'                                              => 0x00000002,
-    'Blend'                                               => 0x00000003,
-    'Blend (25%)'                                         => 0x00000205,
-    'V4L2: Capture top field only'                        => 0x02000000,
-    'V4L2: Capture bottom field only'                     => 0x03000000,
-    'V4L2: Alternate fields (Bob)'                        => 0x07000000,
-    'V4L2: Progressive'                                   => 0x01000000,
-    'V4L2: Interlaced'                                    => 0x04000000
-    );
+  0x00000000 => 'Disabled',
+  0x00001E04 => 'Four field motion adaptive - Soft',   /* 30 change */
+  0x00001404 => 'Four field motion adaptive - Medium', /* 20 change */
+  0x00000A04 => 'Four field motion adaptive - Hard',   /* 10 change */
+  0x00000001 => 'Discard',
+  0x00000002 => 'Linear',
+  0x00000003 => 'Blend',
+  0x00000205 => 'Blend (25%)',
+  0x02000000 => 'V4L2: Capture top field only',
+  0x03000000 => 'V4L2: Capture bottom field only',
+  0x07000000 => 'V4L2: Alternate fields (Bob)',
+  0x01000000 => 'V4L2: Progressive',
+  0x04000000 => 'V4L2: Interlaced',
+);
 
 $fastblendopts = array(
     'No blending'                                         => 0,
@@ -367,8 +367,8 @@
     );
 
 $label_size = array(
-    'Default'                                             => 1,
-    'Large'                                               => 2
+    1 => translate('Default'),
+    2 => translate('Large'),
     );
 
 $codecs = array(
@@ -729,8 +729,8 @@
           continue;
         if ( $optCount && ($optCount%$breakCount == 0) )
           echo '</br>';
-        echo '<input type="checkbox" name="newMonitor[Triggers][]" value="'.$optTrigger.'"'. 
-          (( ('' !== $monitor->Triggers()) && in_array($optTrigger, $monitor->Triggers()) ) ? ' checked="checked"' : ''). '/> '. $optTrigger; 
+        echo '<input type="checkbox" name="newMonitor[Triggers][]" value="'.$optTrigger.'"'.
+          (( ('' !== $monitor->Triggers()) && in_array($optTrigger, $monitor->Triggers()) ) ? ' checked="checked"' : ''). '/> '. $optTrigger;
         $optCount ++;
       } # end foreach trigger option
       if ( !$optCount ) {
@@ -783,19 +783,22 @@
 ?>
           <tr><td><?php echo translate('RemoteProtocol') ?></td><td><?php echo htmlSelect( "newMonitor[Protocol]", $remoteProtocols, $monitor->Protocol(), "updateMethods( this );if(this.value=='rtsp'){\$('RTSPDescribe').setStyle('display','table-row');}else{\$('RTSPDescribe').hide();}" ); ?></td></tr>
 <?php
-        if ( !$monitor->Protocol() || $monitor->Protocol() == 'http' ) {
 ?>
-          <tr><td><?php echo translate('RemoteMethod') ?></td><td><?php echo htmlSelect( "newMonitor[Method]", $httpMethods, $monitor->Method() ); ?></td></tr>
+          <tr>
+            <td><?php echo translate('RemoteMethod') ?></td>
+            <td>
 <?php
+        if ( !$monitor->Protocol() || $monitor->Protocol() == 'http' ) {
+          echo htmlSelect('newMonitor[Method]', $httpMethods, $monitor->Method() );
         } else {
-?>
-          <tr><td><?php echo translate('RemoteMethod') ?></td><td><?php echo htmlSelect( "newMonitor[Method]", $rtspMethods, $monitor->Method() ); ?></td></tr>
-<?php
+          echo htmlSelect('newMonitor[Method]', $rtspMethods, $monitor->Method() );
         }
 ?>
-          <tr><td><?php echo translate('RemoteHostName') ?></td><td><input type="text" name="newMonitor[Host]" value="<?php echo validHtmlStr($monitor->Host()) ?>" size="36"/></td></tr>
+            </td>
+          </tr>
+          <tr><td><?php echo translate('RemoteHostName') ?></td><td><input type="text" name="newMonitor[Host]" value="<?php echo validHtmlStr($monitor->Host()) ?>"/></td></tr>
           <tr><td><?php echo translate('RemoteHostPort') ?></td><td><input type="number" name="newMonitor[Port]" value="<?php echo validHtmlStr($monitor->Port()) ?>" size="6"/></td></tr>
-          <tr><td><?php echo translate('RemoteHostPath') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path()) ?>" size="36"/></td></tr>
+          <tr><td><?php echo translate('RemoteHostPath') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path()) ?>"/></td></tr>
 <?php
       } else if ( $monitor->Type() == 'File' ) {
 ?>
@@ -803,23 +806,44 @@
 <?php
       } elseif ( $monitor->Type() == 'cURL' ) {
 ?>
-          <tr><td><?php echo 'URL' ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path()) ?>" size="36"/></td></tr>
-          <tr><td><?php echo 'Username' ?></td><td><input type="text" name="newMonitor[User]" value="<?php echo validHtmlStr($monitor->User()) ?>" size="12"/></td></tr>
-          <tr><td><?php echo 'Password' ?></td><td><input type="text" name="newMonitor[Pass]" value="<?php echo validHtmlStr($monitor->Pass()) ?>" size="12"/></td></tr>
+          <tr><td><?php echo 'URL' ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path()) ?>"/></td></tr>
+          <tr><td><?php echo 'Username' ?></td><td><input type="text" name="newMonitor[User]" value="<?php echo validHtmlStr($monitor->User()) ?>"/></td></tr>
+          <tr><td><?php echo 'Password' ?></td><td><input type="text" name="newMonitor[Pass]" value="<?php echo validHtmlStr($monitor->Pass()) ?>"/></td></tr>
 <?php
       } elseif ( $monitor->Type() == 'WebSite' ) {
 ?>
-          <tr><td><?php echo translate('WebSiteUrl') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path()) ?>" size="36"/></td></tr>
-          <tr><td><?php echo translate('Width') ?> (<?php echo translate('Pixels') ?>)</td><td><input type="text" name="newMonitor[Width]" value="<?php echo validHtmlStr($monitor->Width()) ?>" size="4";"/></td></tr>
-        <tr><td><?php echo translate('Height') ?> (<?php echo translate('Pixels') ?>)</td><td><input type="text" name="newMonitor[Height]" value="<?php echo validHtmlStr($monitor->Height()) ?>" size="4";"/></td></tr>
-        <tr><td><?php echo 'Web Site Refresh (Optional)' ?></td><td><input type="number" name="newMonitor[Refresh]" value="<?php echo validHtmlStr($monitor->Refresh()); ?>"/></td></tr>
+          <tr>
+            <td><?php echo translate('WebSiteUrl') ?></td>
+            <td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path()) ?>"/></td>
+          </tr>
+          <tr>
+            <td><?php echo translate('Width') ?> (<?php echo translate('Pixels') ?>)</td>
+            <td><input type="number" name="newMonitor[Width]" value="<?php echo validHtmlStr($monitor->Width()) ?>" size="4"/></td>
+          </tr>
+          <tr>
+            <td><?php echo translate('Height') ?> (<?php echo translate('Pixels') ?>)</td>
+            <td><input type="number" name="newMonitor[Height]" value="<?php echo validHtmlStr($monitor->Height()) ?>" size="4"/></td>
+          </tr>
+          <tr>
+            <td><?php echo 'Web Site Refresh (Optional)' ?></td>
+            <td><input type="number" name="newMonitor[Refresh]" value="<?php echo validHtmlStr($monitor->Refresh()) ?>"/></td>
+          </tr>
 <?php
-      } elseif ( $monitor->Type() == 'Ffmpeg' || $monitor->Type() == 'Libvlc' ) {
+      } else if ( $monitor->Type() == 'Ffmpeg' || $monitor->Type() == 'Libvlc' ) {
 ?>
-          <tr class="SourcePath"><td><?php echo translate('SourcePath') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path()) ?>" /></td></tr>
-          <tr><td><?php echo translate('RemoteMethod') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_RTSPTrans', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><?php echo htmlSelect( "newMonitor[Method]", $rtspFFMpegMethods, $monitor->Method() ); ?></td></tr>
+          <tr class="SourcePath">
+            <td><?php echo translate('SourcePath') ?></td>
+            <td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path()) ?>" /></td>
+          </tr>
+          <tr>
+            <td><?php
+ echo translate('RemoteMethod');
+ echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_RTSPTrans', 'zmOptionHelp', 'optionhelp', '?' );
+?>)</td>
+            <td><?php echo htmlSelect('newMonitor[Method]', $rtspFFMpegMethods, $monitor->Method()) ?></td>
+          </tr>
           <tr class="SourceOptions">
-            <td><?php echo translate('Options') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_'.strtoupper($monitor->Type()), 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td>
+            <td><?php echo translate('Options') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_'.strtoupper($monitor->Type()), 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td>
             <td><input type="text" name="newMonitor[Options]" value="<?php echo validHtmlStr($monitor->Options()) ?>"/></td>
           </tr>
 <?php
@@ -840,10 +864,12 @@
           </tr>
 <?php
       }
-if ( $monitor->Type() != 'NVSocket' && $monitor->Type() != 'WebSite' ) {
+      if ( $monitor->Type() != 'NVSocket' && $monitor->Type() != 'WebSite' ) {
 ?>
-        <tr><td><?php echo translate('TargetColorspace') ?></td><td><?php echo htmlSelect('newMonitor[Colours]', $Colours, $monitor->Colours() ); ?>
-</td></tr>
+        <tr>
+          <td><?php echo translate('TargetColorspace') ?></td>
+          <td><?php echo htmlSelect('newMonitor[Colours]', $Colours, $monitor->Colours()) ?></td>
+        </tr>
         <tr>
           <td><?php echo translate('CaptureResolution') ?> (<?php echo translate('Pixels') ?>)</td>
           <td>
@@ -884,18 +910,22 @@
           <td><?php echo htmlselect('newMonitor[Orientation]', $orientations, $monitor->Orientation());?></td>
         </tr>
 <?php
-}
-if ( $monitor->Type() == 'Local' ) {
+      }
+      if ( $monitor->Type() == 'Local' ) {
 ?>
-            <tr><td><?php echo translate('Deinterlacing') ?></td><td><select name="newMonitor[Deinterlacing]"><?php foreach ( $deinterlaceopts_v4l2 as $name => $value ) { ?><option value="<?php echo validHtmlStr($value); ?>"<?php if ( $value == $monitor->Deinterlacing()) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($name); ?></option><?php } ?></select></td></tr>
-            <?php
+            <tr>
+              <td><?php echo translate('Deinterlacing') ?></td>
+              <td><?php echo htmlselect('newMonitor[Deinterlacing]', $deinterlaceopts_v4l2, $monitor->Deinterlacing())?></td>
+            </tr>
+<?php
         } else if ( $monitor->Type() != 'WebSite' ) {
 ?>
-            <tr><td><?php echo translate('Deinterlacing') ?></td><td><select name="newMonitor[Deinterlacing]"><?php foreach ( $deinterlaceopts as $name => $value ) { ?><option value="<?php echo validHtmlStr($value); ?>"<?php if ( $value == $monitor->Deinterlacing()) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($name); ?></option><?php } ?></select></td></tr>
+            <tr>
+              <td><?php echo translate('Deinterlacing') ?></td>

zoneminder-1.34.8.tar.gz/web/skins/classic/views/monitorprobe.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/monitorprobe.php Changed

@@ -39,16 +39,18 @@
   }
 
   $monitors = array();
-  foreach ( dbFetchAll("SELECT Id, Name, Device,Channel FROM Monitors WHERE Type = 'Local' ORDER BY Device, Channel" ) as $monitor )
+  foreach ( dbFetchAll("SELECT Id, Name, Device, Channel FROM Monitors WHERE Type = 'Local' ORDER BY Device, Channel" ) as $monitor )
     $monitors[$monitor['Device'].':'.$monitor['Channel']] = $monitor;
 
   $devices = array();
   $preferredStandards = array('PAL', 'NTSC');
   $preferredFormats = array('BGR3', 'RGB3', 'YUYV', 'UYVY', 'JPEG', 'MJPG', '422P', 'YU12', 'GREY');
   foreach ( $output as $line ) {
-    if ( !preg_match('/^d:([^|]+).*S:([^|]*).*F:([^|]+).*I:(\d+)\|(.+)$/', $line, $deviceMatches) )
-      ZM\Fatal("Can't parse command output '$line'");
-    $standards = explode('/',$deviceMatches[2]);
+    if ( !preg_match('/^d:([^|]+).*S:([^|]*).*F:([^|]+).*I:(\d+)\|(.+)$/', $line, $deviceMatches) ) {
+      ZM\Error("Can't parse command output '$line'");
+      continue;
+    }
+    $standards = explode('/', $deviceMatches[2]);
     $preferredStandard = false;
     foreach ( $preferredStandards as $standard ) {
       if ( in_array( $standard, $standards ) ) {
@@ -56,7 +58,7 @@
         break;
       }
     }
-    $formats = explode('/',$deviceMatches[3]);
+    $formats = explode('/', $deviceMatches[3]);
     $preferredFormat = false;
     foreach ( $preferredFormats as $format ) {
       if ( in_array($format, $formats) ) {
@@ -73,8 +75,10 @@
     );
     $inputs = array();
     for ( $i = 0; $i < $deviceMatches[4]; $i++ ) {
-      if ( !preg_match('/i'.$i.':([^|]+)\|i'.$i.'T:([^|]+)\|/', $deviceMatches[5], $inputMatches) )
-        ZM\Fatal("Can't parse input '".$deviceMatches[5]."'");
+      if ( !preg_match('/i'.$i.':([^|]+)\|i'.$i.'T:([^|]+)\|/', $deviceMatches[5], $inputMatches) ) {
+        ZM\Error("Can't parse input '".$deviceMatches[5]."'");
+        continue;
+      }
       if ( $inputMatches[2] == 'Camera' ) {
         $input = array(
           'index' => $i,
@@ -101,7 +105,7 @@
           $inputMonitor['Colours'] = 1;
           $inputMonitor['SignalCheckColour'] = '#000023';
         }
-        $inputDesc = base64_encode(serialize($inputMonitor));
+        $inputDesc = base64_encode(json_encode($inputMonitor));
         $inputString = $deviceMatches[1].', chan '.$i.($input['free']?(' - '.translate('Available')):(' ('.$monitors[$input['id']]['Name'].')'));
         $inputs[] = $input;
         $cameras[$inputDesc] = $inputString;
@@ -288,7 +292,7 @@
     if ( isset($macBases[$macRoot]) ) {
       $macBase = $macBases[$macRoot];
       $camera = call_user_func($macBase['probeFunc'], $ip);
-      $sourceDesc = base64_encode(serialize($camera['monitor']));
+      $sourceDesc = base64_encode(json_encode($camera['monitor']));
       $sourceString = $camera['model'].' @ '.$host;
       if ( isset($monitors[$ip]) ) {
         $monitor = $monitors[$ip];
@@ -330,7 +334,7 @@
         </p>
         <p>
           <label for="probe"><?php echo translate('DetectedCameras') ?></label>
-          <?php echo buildSelect('probe', $cameras, 'configureButtons(this)'); ?>
+          <?php echo htmlSelect('probe', $cameras, null, array('data-on-change-this'=>'configureButtons(this)')); ?>
         </p>
         <div id="contentButtons">
         <button type="button" name="saveBtn" value="Save" data-on-click-this="submitCamera" disabled="disabled">

zoneminder-1.34.8.tar.gz/web/skins/classic/views/montage.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/montage.php Changed

@@ -57,9 +57,6 @@
   $scale = $_COOKIE['zmMontageScale'];
 }
 
-if ( ! $scale ) 
-  $scale = 100;
-
 $layouts = ZM\MontageLayout::find(NULL, array('order'=>"lower('Name')"));
 $layoutsById = array();
 foreach ( $layouts as $l ) {
@@ -78,10 +75,8 @@
 $layout_id = '';
 if ( isset($_COOKIE['zmMontageLayout']) ) {
   $layout_id = $_SESSION['zmMontageLayout'] = $_COOKIE['zmMontageLayout'];
-  ZM\Logger::Debug("Using layout $layout_id");
 } elseif ( isset($_SESSION['zmMontageLayout']) ) {
   $layout_id = $_SESSION['zmMontageLayout'];
-  ZM\Logger::Debug("Using layout $layout_id from session");
 }
 
 $options = array();
@@ -91,7 +86,7 @@
   $Layout = $layoutsById[$layout_id];
   $Positions = json_decode($Layout->Positions(), true);
 } else {
-  ZM\Logger::Debug("Layout not found");
+  ZM\Logger::Debug('Layout not found');
 }
 if ( $Layout and ( $Layout->Name() != 'Freeform' ) ) {
   // Use layout instead of other options
@@ -111,7 +106,7 @@
 else
   $options['height'] = '';
 
-if ( $scale ) 
+#if ( $scale ) 
   $options['scale'] = $scale;
 
 session_write_close();
@@ -127,7 +122,7 @@
     continue;
 
   $row['Scale'] = $scale;
-  $row['PopupScale'] = reScale( SCALE_BASE, $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE );
+  $row['PopupScale'] = reScale(SCALE_BASE, $row['DefaultScale'], ZM_WEB_DEFAULT_SCALE);
 
   if ( ZM_OPT_CONTROL && $row['ControlId'] && $row['Controllable'] )
     $showControl = true;
@@ -176,19 +171,19 @@
 
           <span id="widthControl">
             <label><?php echo translate('Width') ?></label>
-            <?php echo htmlSelect('width', $widths, $options['width'], 'changeSize(this);'); ?>
+            <?php echo htmlSelect('width', $widths, $options['width'], array('data-on-change-this'=>'changeSize')); ?>
           </span>
           <span id="heightControl">
             <label><?php echo translate('Height') ?></label>
-            <?php echo htmlSelect('height', $heights, $options['height'], 'changeSize(this);'); ?>
+            <?php echo htmlSelect('height', $heights, $options['height'], array('data-on-change-this'=>'changeSize')); ?>
           </span>
           <span id="scaleControl">
             <label><?php echo translate('Scale') ?></label>
-            <?php echo htmlSelect('scale', $scales, $scale, 'changeScale(this);'); ?>
+            <?php echo htmlSelect('scale', $scales, $scale, array('data-on-change-this'=>'changeScale')); ?>
           </span> 
           <span id="layoutControl">
             <label for="layout"><?php echo translate('Layout') ?></label>
-            <?php echo htmlSelect('zmMontageLayout', $layoutsById, $layout_id, array('onchange'=>'selectLayout(this);')); ?>
+            <?php echo htmlSelect('zmMontageLayout', $layoutsById, $layout_id, array('data-on-change'=>'selectLayout')); ?>
           </span>
           <input type="hidden" name="Positions"/>
           <button type="button" id="EditLayout" data-on-click-this="edit_layout"><?php echo translate('EditLayout') ?></button>
@@ -207,7 +202,12 @@
 foreach ( $monitors as $monitor ) {
   $connkey = $monitor->connKey(); // Minor hack
 ?>
-        <div id="monitorFrame<?php echo $monitor->Id() ?>" class="monitorFrame" title="<?php echo $monitor->Id() . ' ' .$monitor->Name() ?>" style="<?php echo $options['width'] ? 'width:'.$options['width'].';':''?>">
+        <div
+          id="monitorFrame<?php echo $monitor->Id() ?>"
+          class="monitorFrame"
+          title="<?php echo $monitor->Id() . ' ' .$monitor->Name() ?>"
+          style="<?php echo $options['width'] ? 'width:'.$options['width'].';':''?>"
+        >
           <div id="monitor<?php echo $monitor->Id() ?>" class="monitor idle">
             <div
               id="imageFeed<?php echo $monitor->Id() ?>"

zoneminder-1.34.8.tar.gz/web/skins/classic/views/montagereview.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/montagereview.php Changed

zoneminder-1.34.8.tar.gz/web/skins/classic/views/report_event_audit.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/report_event_audit.php Changed

@@ -25,12 +25,12 @@
 ob_end_clean();
 
 noCacheHeaders();
-xhtmlHeaders( __FILE__, translate('Console') );
+xhtmlHeaders( __FILE__, translate('Console'));
 
 if ( isset($_REQUEST['minTime']) ) {
   $minTime = validHtmlStr($_REQUEST['minTime']);
 } else {
-  $minTime = strftime('%FT%T',time() - (2*3600) );
+  $minTime = strftime('%FT%T', time() - (2*3600));
 }
 if ( isset($_REQUEST['maxTime']) ) {
   $maxTime = validHtmlStr($_REQUEST['maxTime']);
@@ -47,13 +47,13 @@
     ),
   );
 if ( count($selected_monitor_ids) ) {
-  $filter['Query']['terms'][] = (array('attr'=>'MonitorId', 'op'=>'IN', 'val'=>implode(',',$selected_monitor_ids), 'cnj'=>'and'));
+  $filter['Query']['terms'][] = (array('attr'=>'MonitorId', 'op'=>'IN', 'val'=>implode(',', $selected_monitor_ids), 'cnj'=>'and'));
 } else if ( ( $group_id != 0 || isset($_SESSION['ServerId']) || isset($_SESSION['StorageId']) || isset($_SESSION['Status']) ) ) {
 # this should be redundant
-  for ($i=0; $i < count($displayMonitors); $i++) {
-    if ($i == '0') {
+  for ( $i=0; $i < count($displayMonitors); $i++ ) {
+    if ( $i == 0 ) {
       $filter['Query']['terms'][] = array('attr'=>'MonitorId', 'op'=>'=', 'val'=>$displayMonitors[$i]['Id'], 'cnj'=>'and', 'obr'=>'1');
-    } else if ($i == (count($displayMonitors)-1)) {
+    } else if ( $i == count($displayMonitors)-1 ) {
       $filter['Query']['terms'][] = array('attr'=>'MonitorId', 'op'=>'=', 'val'=>$displayMonitors[$i]['Id'], 'cnj'=>'or', 'cbr'=>'1');
     } else {
       $filter['Query']['terms'][] = array('attr'=>'MonitorId', 'op'=>'=', 'val'=>$displayMonitors[$i]['Id'], 'cnj'=>'or');
@@ -70,11 +70,11 @@
   FROM Events AS E
   WHERE 1 > 0 
 ';
-if ( ! empty($user['MonitorIds']) ) {
+if ( !empty($user['MonitorIds']) ) {
   $eventsSql .= ' AND MonitorId IN ('.$user['MonitorIds'].')';
 }
 if ( count($selected_monitor_ids) ) {
-  $eventsSql .= ' AND MonitorId IN (' . implode(',',$selected_monitor_ids).')';
+  $eventsSql .= ' AND MonitorId IN ('.implode(',', $selected_monitor_ids).')';
 }
 if ( isset($minTime) && isset($maxTime) ) {
   $eventsSql .= " AND EndTime > '" . $minTime . "' AND StartTime < '" . $maxTime . "'";
@@ -87,10 +87,10 @@
   return;
 }
 $EventsByMonitor = array();
-while( $event = $result->fetch(PDO::FETCH_ASSOC) ) {
+while ( $event = $result->fetch(PDO::FETCH_ASSOC) ) {
   $Event = new ZM\Event($event);
   if ( ! isset($EventsByMonitor[$event['MonitorId']]) )
-    $EventsByMonitor[$event['MonitorId']] = array( 'Events'=>array(), 'MinGap'=>0, 'MaxGap'=>0, 'FileMissing'=>array(), 'ZeroSize'=>array() );
+    $EventsByMonitor[$event['MonitorId']] = array('Events'=>array(), 'MinGap'=>0, 'MaxGap'=>0, 'FileMissing'=>array(), 'ZeroSize'=>array());
 
   if ( count($EventsByMonitor[$event['MonitorId']]['Events']) ) {
     $last_event = end($EventsByMonitor[$event['MonitorId']]['Events']);
@@ -103,7 +103,7 @@
       $EventsByMonitor[$event['MonitorId']]['MaxGap'] = $gap;
 
   } # end if has previous events
-  if ( ! $Event->file_exists() ) {
+  if ( !$Event->file_exists() ) {
     $EventsByMonitor[$event['MonitorId']]['FileMissing'][] = $Event;
   } else if ( ! $Event->file_size() ) {
     $EventsByMonitor[$event['MonitorId']]['ZeroSize'][] = $Event;
@@ -122,8 +122,8 @@
       <?php echo $filterbar ?>
       <div id="DateTimeDiv">
         <label>Event Start Time</label>
-        <input type="text" name="minTime" id="minTime" value="<?php echo preg_replace('/T/', ' ', $minTime ) ?>" oninput="this.form.submit();"/> to 
-        <input type="text" name="maxTime" id="maxTime" value="<?php echo preg_replace('/T/', ' ', $maxTime ) ?>" oninput="this.form.submit();"/>
+        <input type="text" name="minTime" id="minTime" value="<?php echo preg_replace('/T/', ' ', $minTime) ?>" oninput="this.form.submit();"/> to 
+        <input type="text" name="maxTime" id="maxTime" value="<?php echo preg_replace('/T/', ' ', $maxTime) ?>" oninput="this.form.submit();"/>
       </div>
     </div>
 
@@ -145,10 +145,10 @@
         </thead>
         <tbody>
 <?php
-for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
+for ( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
   $monitor = $displayMonitors[$monitor_i];
   $Monitor = new ZM\Monitor($monitor);
-  $montagereview_link = "?view=montagereview&live=0&MonitorId=". $monitor['Id'] . '&minTime='.$minTime.'&maxTime='.$maxTime;
+  $montagereview_link = '?view=montagereview&live=0&MonitorId='.$monitor['Id'].'&minTime='.$minTime.'&maxTime='.$maxTime;
 
   $monitor_filter = addFilterTerm(
       $filter,
@@ -178,7 +178,7 @@
     $FileMissing_filter = array(
         'Query' => array(
           'terms' => array(
-            array('attr'=>'Id','op'=>'IN', 'val'=>implode(',',array_map(function($Event){return $Event->Id();},$FileMissing)))
+            array('attr'=>'Id', 'op'=>'IN', 'val'=>implode(',', array_map(function($Event){return $Event->Id();}, $FileMissing)))
             )
           )
         );
@@ -188,7 +188,7 @@
     $ZeroSize_filter = array(
         'Query' => array(
           'terms' => array(
-            array('attr'=>'Id','op'=>'IN', 'val'=>implode(',',array_map(function($Event){return $Event->Id();},$ZeroSize)))
+            array('attr'=>'Id', 'op'=>'IN', 'val'=>implode(',', array_map(function($Event){return $Event->Id();}, $ZeroSize)))
             )
           )
         );
@@ -198,27 +198,28 @@
           <tr id="<?php echo 'monitor_id-'.$monitor['Id'] ?>" title="<?php echo $monitor['Id'] ?>">
             <td class="colId"><a href="<?php echo $montagereview_link ?>"><?php echo $monitor['Id'] ?></a></td>
             <td class="colName">
-              <a href="<?php echo $montagereview_link ?>"><?php echo $monitor['Name'] ?></a><br/><div class="small text-nowrap text-muted">
+              <a href="<?php echo $montagereview_link ?>"><?php echo validHtmlStr($monitor['Name']) ?></a><br/>
+              <div class="small text-nowrap text-muted">
               <?php echo implode('<br/>',
                   array_map(function($group_id){
                     $Group = new ZM\Group($group_id);
                     $Groups = $Group->Parents();
                     array_push($Groups, $Group);
                     return implode(' &gt; ', array_map(function($Group){ return '<a href="?view=montagereview&GroupId='.$Group->Id().'">'.$Group->Name().'</a>'; }, $Groups ));
-                    }, $Monitor->GroupIds() ) ); 
+                    }, $Monitor->GroupIds())); 
 ?>
             </div></td>
-            <td class="colServer"><?php echo $Monitor->Server()->Name()?></td>
+            <td class="colServer"><?php echo validHtmlStr($Monitor->Server()->Name())?></td>
             <td class="colEvents"><a href="?view=<?php echo ZM_WEB_EVENTS_VIEW ?>&amp;page=1<?php echo $monitor_filter['query'] ?>"><?php echo isset($EventsByMonitor[$Monitor->Id()])?count($EventsByMonitor[$Monitor->Id()]['Events']):0 ?></a></td>
-            <td class="colFirstEvent"><?php echo $FirstEvent ? $FirstEvent->link_to($FirstEvent->Id().' at ' . $FirstEvent->StartTime()) : 'none'?></td>
-            <td class="colLastEvent"><?php echo $LastEvent ? $LastEvent->link_to($LastEvent->Id().' at ' . $LastEvent->StartTime()) : 'none'?></td>
+            <td class="colFirstEvent"><?php echo $FirstEvent ? $FirstEvent->link_to($FirstEvent->Id().' at '.$FirstEvent->StartTime()) : 'none'?></td>
+            <td class="colLastEvent"><?php echo $LastEvent ? $LastEvent->link_to($LastEvent->Id().' at '.$LastEvent->StartTime()) : 'none'?></td>
             <td class="colMinGap"><?php echo $MinGap ?></td>
             <td class="colMaxGap"><?php echo $MaxGap ?></td>
             <td class="colFileMissing<?php echo count($FileMissing) ? ' errorText' : ''?>">
-            <?php echo count($FileMissing) ?  '<a href="?view='.ZM_WEB_EVENTS_VIEW .'&amp;page=1'.$FileMissing_filter['query'].'">'.count($FileMissing).'</a>' : '0' ?>
+            <?php echo count($FileMissing) ? '<a href="?view='.ZM_WEB_EVENTS_VIEW.'&amp;page=1'.$FileMissing_filter['query'].'">'.count($FileMissing).'</a>' : '0' ?>
             </td>
             <td class="colZeroSize<?php echo count($ZeroSize) ? ' errorText' : ''?>">
-            <?php echo count($ZeroSize) ? '<a href="?view='.ZM_WEB_EVENTS_VIEW .'&amp;page=1'.$ZeroSize_filter['query'].'">'.count($ZeroSize).'</a>' : '0' ?>
+            <?php echo count($ZeroSize) ? '<a href="?view='.ZM_WEB_EVENTS_VIEW.'&amp;page=1'.$ZeroSize_filter['query'].'">'.count($ZeroSize).'</a>' : '0' ?>
             </td>
           </tr>
 <?php

zoneminder-1.34.8.tar.gz/web/skins/classic/views/timeline.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/timeline.php Changed

@@ -154,7 +154,7 @@
 if ( isset($_REQUEST['maxTime']) )
   $maxTime = validHtmlStr($_REQUEST['maxTime']);
 
-if ( isset($range) ) {
+if ( isset($range) and validInt($range) ) {
   $halfRange = (int)($range/2);
   if ( isset($midTime) ) {
     $midTimeT = strtotime($midTime);
@@ -616,7 +616,7 @@
           $zoomMinTime = strftime( STRF_FMT_DATETIME_DB, (int)($chart['data']['x']['lo'] + ($lastTick * $chart['data']['x']['density'])) );
           $zoomMaxTime = strftime( STRF_FMT_DATETIME_DB, (int)($chart['data']['x']['lo'] + ($i * $chart['data']['x']['density'])) );
 ?>
-            <div class="<?php echo $zoomClass ?>" style="left: <?php echo 100*($lastTick-1)/$chart['graph']['width'] ?>%; width: <?php echo round(100*($i-$lastTick)/$chart['graph']['width'],1) ?>%;" title="<?php echo translate('ZoomIn') ?>" onclick="tlZoomBounds( '<?php echo $zoomMinTime ?>', '<?php echo $zoomMaxTime ?>' )"></div>
+            <div class="<?php echo $zoomClass ?>" style="left: <?php echo 100*($lastTick-1)/$chart['graph']['width'] ?>%; width: <?php echo round(100*($i-$lastTick)/$chart['graph']['width'],1) ?>%;" title="<?php echo translate('ZoomIn') ?>" data-on-click="tlZoomBounds" data-zoom-min-time="<?php echo $zoomMinTime ?>" data-zoom-max-time="<?php echo $zoomMaxTime ?>"></div>
 <?php
         }
         $lastTick = $i;
@@ -629,7 +629,7 @@
     $zoomMinTime = strftime( STRF_FMT_DATETIME_DB, (int)($chart['data']['x']['lo'] + ($lastTick * $chart['data']['x']['density'])) );
     $zoomMaxTime = strftime( STRF_FMT_DATETIME_DB, (int)($chart['data']['x']['lo'] + ($i * $chart['data']['x']['density'])) );
 ?>
-            <div class="<?php echo $zoomClass ?>" style="left: <?php echo $lastTick-1 ?>px; width: <?php echo $i-$lastTick ?>px;" title="<?php echo translate('ZoomIn') ?>" onclick="tlZoomBounds( '<?php echo $zoomMinTime ?>', '<?php echo $zoomMaxTime ?>' )"></div>
+            <div class="<?php echo $zoomClass ?>" style="left: <?php echo $lastTick-1 ?>px; width: <?php echo $i-$lastTick ?>px;" title="<?php echo translate('ZoomIn') ?>" data-on-click="tlZoomBounds" data-zoom-min-time="<?php echo $zoomMinTime ?>" data-zoom-max-time="<?php echo $zoomMaxTime ?>"></div>
 <?php
   }
 ?>

zoneminder-1.34.8.tar.gz/web/skins/classic/views/version.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/version.php Changed

@@ -33,6 +33,7 @@
     'hour'   => translate('VersionRemindHour'),
     'day'    => translate('VersionRemindDay'),
     'week'   => translate('VersionRemindWeek'),
+    'month'  => translate('VersionRemindMonth'),
     'never'  => translate('VersionRemindNever')
   ) );
 }
@@ -64,16 +65,16 @@
 } else {
 ?>
       <form name="contentForm" id="contentForm" method="get" action="?">
-        <input type="hidden" name="view" value="none"/>
+        <input type="hidden" name="view" value="version"/>
         <input type="hidden" name="action" value="version"/>
         <p><?php echo translate('UpdateAvailable') ?></p>
         <p><?php echo sprintf( $CLANG['LatestRelease'], ZM_DYN_LAST_VERSION, ZM_VERSION ) ?></p>
-        <p><?php echo buildSelect( "option", $options ); ?></p>
+        <p><?php echo buildSelect('option', $options); ?></p>
         <div id="contentButtons">
 <?php
   if ( canEdit('System') ) {
 ?>
-          <button type="submit" data-on-click-this="submitForm" value="Apply"><?php echo translate('Apply') ?></button>
+          <button type="submit"><?php echo translate('Apply') ?></button>
 <?php
   }
 }

zoneminder-1.34.8.tar.gz/web/skins/classic/views/watch.php -> zoneminder-1.34.16.tar.gz/web/skins/classic/views/watch.php Changed

@@ -1,6 +1,6 @@
 <?php
 //
-// ZoneMinder web watch feed view file, $Date$, $Revision$
+// ZoneMinder web watch feed view file
 // Copyright (C) 2001-2008 Philip Coombes
 //
 // This program is free software; you can redistribute it and/or
@@ -46,24 +46,23 @@
 } else if ( isset($_COOKIE['zmWatchScale'.$mid]) ) {
   $scale = $_COOKIE['zmWatchScale'.$mid];
 } else {
-  $scale = reScale(SCALE_BASE, $monitor->DefaultScale(), ZM_WEB_DEFAULT_SCALE);
+  $scale = $monitor->DefaultScale();
 }
 
 $connkey = generateConnKey();
 
 $streamMode = getStreamMode();
 
-noCacheHeaders();
-
 $popup = ((isset($_REQUEST['popup'])) && ($_REQUEST['popup'] == 1));
 
+noCacheHeaders();
 xhtmlHeaders(__FILE__, $monitor->Name().' - '.translate('Feed'));
 ?>
 <body>
   <div id="page">
   <?php if ( !$popup ) echo getNavBarHTML() ?>
     <div id="header">
-        <div id="monitorName"><?php echo $monitor->Name() ?></div>
+        <div id="monitorName"><?php echo validHtmlStr($monitor->Name()) ?></div>
         <div id="menuControls">
 <?php
 if ( canView('Control') && $monitor->Type() == 'Local' ) {
@@ -72,12 +71,12 @@
 <?php
 }
 ?>
-          <div id="scaleControl"><?php echo translate('Scale') ?>: <?php echo htmlSelect('scale', $scales, $scale); ?></div>
+          <div id="scaleControl"><?php echo translate('Scale').': '.htmlSelect('scale', $scales, $scale); ?></div>
         </div>
         <div id="closeControl"><a href="#" data-on-click="<?php echo $popup ? 'closeWindow' : 'backWindow' ?>"><?php echo $popup ? translate('Close') : translate('Back') ?></a></div>
     </div>
 <?php
-if ( $monitor->Status() != 'Connected' ) {
+if ( $monitor->Status() != 'Connected' and $monitor->Type() != 'WebSite' ) {
   echo '<div class="warning">Monitor is not capturing. We will be unable to provide an image</div>';
 }
 ?>

zoneminder-1.34.8.tar.gz/web/views/archive.php -> zoneminder-1.34.16.tar.gz/web/views/archive.php Changed

@@ -1,6 +1,6 @@
 <?php
 //
-// ZoneMinder file view file, $Date: 2008-09-29 14:15:13 +0100 (Mon, 29 Sep 2008) $, $Revision: 2640 $
+// ZoneMinder file view file
 // Copyright (C) 2001-2008 Philip Coombes
 //
 // This program is free software; you can redistribute it and/or
@@ -23,11 +23,13 @@
   return;
 }
 
-$archivetype = $_REQUEST['type'];
-$connkey = isset($_REQUEST['connkey'])?$_REQUEST['connkey']:'';
+$archivetype = isset($_REQUEST['type']) ? $_REQUEST['type'] : '';
+if ( !$archivetype ) {
+  ZM\Error('No archive type given to archive.php. Please specify a tar or zip archive.');
+  return;
+}
 
-if ( $archivetype ) {
-  switch ($archivetype) {
+switch ($archivetype) {
   case 'tar.gz':
     $mimetype = 'gzip';
     $file_ext = 'tar.gz';
@@ -43,29 +45,29 @@
   default:
     $mimetype = NULL;
     $file_ext = NULL;
-  }
+}
+
+if ( !$mimetype ) {
+  ZM\Error('Unsupported archive type specified. Supported archives are tar and zip');
+  return;
+}
 
-  if ( $mimetype ) {
-    $filename = "zmExport_$connkey.$file_ext";
-    $filename_path = ZM_DIR_EXPORTS.'/'.$filename;
-    ZM\Logger::Debug("downloading archive from $filename_path");
-    if ( is_readable($filename_path) ) {
-      header("Content-type: application/$mimetype" );
-      header("Content-Disposition: inline; filename=$filename");
-      header('Content-Length: ' . filesize($filename_path) );
-      set_time_limit(0);
-      if ( ! @readfile($filename_path) ) {
-        ZM\Error("Error sending $filename_path");
-      }
-    } else {
-      ZM\Error("$filename_path does not exist or is not readable.");
-    }
-  } else {
-    ZM\Error("Unsupported archive type specified. Supported archives are tar and zip");
+$connkey = isset($_REQUEST['connkey'])?$_REQUEST['connkey']:'';
+$filename = "zmExport_$connkey.$file_ext";
+$filename_path = ZM_DIR_EXPORTS.'/'.$filename;
+ZM\Logger::Debug("downloading archive from $filename_path");
+if ( is_readable($filename_path) ) {
+  while (ob_get_level()) {
+    ob_end_clean();
+  }
+  header("Content-type: application/$mimetype");
+  header("Content-Disposition: inline; filename=$filename");
+  header('Content-Length: '.filesize($filename_path));
+  set_time_limit(0);
+  if ( !@readfile($filename_path) ) {
+    ZM\Error("Error sending $filename_path");
   }
 } else {
-  ZM\Error("No archive type given to archive.php. Please specify a tar or zip archive.");
+  ZM\Error($filename_path.' does not exist or is not readable.');
 }
-
 ?>
-

zoneminder-1.34.8.tar.gz/zmconfgen.pl.in -> zoneminder-1.34.16.tar.gz/zmconfgen.pl.in Changed

zoneminder-1.34.8.tar.gz/.git/objects/pack/pack-b11de77182b30310a3303dab3133f4e967fd4bd0.idx Deleted

zoneminder-1.34.8.tar.gz/.git/objects/pack/pack-b11de77182b30310a3303dab3133f4e967fd4bd0.pack Deleted

Changes of Revision 8