Packman Build Service PMBS

ZoneMinder.changes Changed

ZoneMinder.spec Changed

checkout-diego.sh Changed

zoneminder-1.34.2.tar.gz/.git/objects/pack/pack-d7f0734d40e256354ec777eef908a5ec563d9518.idx Deleted

zoneminder-1.34.2.tar.gz/.git/objects/pack/pack-d7f0734d40e256354ec777eef908a5ec563d9518.pack Deleted

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

zoneminder-1.34.2.tar.gz/.git/hooks/fsmonitor-watchman.sample -> zoneminder-1.34.8.tar.gz/.git/hooks/fsmonitor-watchman.sample Changed

@@ -8,102 +8,166 @@
 # (https://facebook.github.io/watchman/) with git to speed up detecting
 # new and modified files.
 #
-# The hook is passed a version (currently 1) and a time in nanoseconds
-# formatted as a string and outputs to stdout all files that have been
-# modified since the given time. Paths must be relative to the root of
-# the working tree and separated by a single NUL.
+# The hook is passed a version (currently 2) and last update token
+# formatted as a string and outputs to stdout a new update token and
+# all files that have been modified since the update token. Paths must
+# be relative to the root of the working tree and separated by a single NUL.
 #
 # To enable this hook, rename this file to "query-watchman" and set
 # 'git config core.fsmonitor .git/hooks/query-watchman'
 #
-my ($version, $time) = @ARGV;
+my ($version, $last_update_token) = @ARGV;
 
-# Check the hook interface version
+# Uncomment for debugging
+# print STDERR "$0 $version $last_update_token\n";
 
-if ($version == 1) {
-	# convert nanoseconds to seconds
-	# subtract one second to make sure watchman will return all changes
-	$time = int ($time / 1000000000) - 1;
-} else {
+# Check the hook interface version
+if ($version ne 2) {
 	die "Unsupported query-fsmonitor hook version '$version'.\n" .
 	    "Falling back to scanning...\n";
 }
 
-my $git_work_tree;
-if ($^O =~ 'msys' || $^O =~ 'cygwin') {
-	$git_work_tree = Win32::GetCwd();
-	$git_work_tree =~ tr/\\/\//;
-} else {
-	require Cwd;
-	$git_work_tree = Cwd::cwd();
-}
+my $git_work_tree = get_working_dir();
 
 my $retry = 1;
 
+my $json_pkg;
+eval {
+	require JSON::XS;
+	$json_pkg = "JSON::XS";
+	1;
+} or do {
+	require JSON::PP;
+	$json_pkg = "JSON::PP";
+};
+
 launch_watchman();
 
 sub launch_watchman {
+	my $o = watchman_query();
+	if (is_work_tree_watched($o)) {
+		output_result($o->{clock}, @{$o->{files}});
+	}
+}
+
+sub output_result {
+	my ($clockid, @files) = @_;
 
+	# Uncomment for debugging watchman output
+	# open (my $fh, ">", ".git/watchman-output.out");
+	# binmode $fh, ":utf8";
+	# print $fh "$clockid\n@files\n";
+	# close $fh;
+
+	binmode STDOUT, ":utf8";
+	print $clockid;
+	print "\0";
+	local $, = "\0";
+	print @files;
+}
+
+sub watchman_clock {
+	my $response = qx/watchman clock "$git_work_tree"/;
+	die "Failed to get clock id on '$git_work_tree'.\n" .
+		"Falling back to scanning...\n" if $? != 0;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub watchman_query {
 	my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
-	    or die "open2() failed: $!\n" .
-	    "Falling back to scanning...\n";
+	or die "open2() failed: $!\n" .
+	"Falling back to scanning...\n";
 
 	# In the query expression below we're asking for names of files that
-	# changed since $time but were not transient (ie created after
-	# $time but no longer exist).
+	# changed since $last_update_token but not from the .git folder.
 	#
 	# To accomplish this, we're using the "since" generator to use the
 	# recency index to select candidate nodes and "fields" to limit the
-	# output to file names only.
-
+	# output to file names only. Then we're using the "expression" term to
+	# further constrain the results.
+	if (substr($last_update_token, 0, 1) eq "c") {
+		$last_update_token = "\"$last_update_token\"";
+	}
 	my $query = <<"	END";
 		["query", "$git_work_tree", {
-			"since": $time,
-			"fields": ["name"]
+			"since": $last_update_token,
+			"fields": ["name"],
+			"expression": ["not", ["dirname", ".git"]]
 		}]
 	END
 
+	# Uncomment for debugging the watchman query
+	# open (my $fh, ">", ".git/watchman-query.json");
+	# print $fh $query;
+	# close $fh;
+
 	print CHLD_IN $query;
 	close CHLD_IN;
 	my $response = do {local $/; <CHLD_OUT>};
 
+	# Uncomment for debugging the watch response
+	# open ($fh, ">", ".git/watchman-response.json");
+	# print $fh $response;
+	# close $fh;
+
 	die "Watchman: command returned no output.\n" .
-	    "Falling back to scanning...\n" if $response eq "";
+	"Falling back to scanning...\n" if $response eq "";
 	die "Watchman: command returned invalid output: $response\n" .
-	    "Falling back to scanning...\n" unless $response =~ /^\{/;
-
-	my $json_pkg;
-	eval {
-		require JSON::XS;
-		$json_pkg = "JSON::XS";
-		1;
-	} or do {
-		require JSON::PP;
-		$json_pkg = "JSON::PP";
-	};
-
-	my $o = $json_pkg->new->utf8->decode($response);
-
-	if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) {
-		print STDERR "Adding '$git_work_tree' to watchman's watch list.\n";
+	"Falling back to scanning...\n" unless $response =~ /^\{/;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub is_work_tree_watched {
+	my ($output) = @_;
+	my $error = $output->{error};
+	if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) {
 		$retry--;
-		qx/watchman watch "$git_work_tree"/;
+		my $response = qx/watchman watch "$git_work_tree"/;
 		die "Failed to make watchman watch '$git_work_tree'.\n" .
 		    "Falling back to scanning...\n" if $? != 0;
+		$output = $json_pkg->new->utf8->decode($response);
+		$error = $output->{error};
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		# Uncomment for debugging watchman output
+		# open (my $fh, ">", ".git/watchman-output.out");
+		# close $fh;
 
 		# Watchman will always return all files on the first query so
 		# return the fast "everything is dirty" flag to git and do the
 		# Watchman query just to get it over with now so we won't pay
 		# the cost in git to look up each individual file.
-		print "/\0";
+		my $o = watchman_clock();
+		$error = $output->{error};
+
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		output_result($o->{clock}, ("/"));
+		$last_update_token = $o->{clock};
+
 		eval { launch_watchman() };
-		exit 0;
+		return 0;
 	}
 
-	die "Watchman: $o->{error}.\n" .
-	    "Falling back to scanning...\n" if $o->{error};
+	die "Watchman: $error.\n" .
+	"Falling back to scanning...\n" if $error;

zoneminder-1.34.2.tar.gz/.git/hooks/pre-commit.sample -> zoneminder-1.34.8.tar.gz/.git/hooks/pre-commit.sample Changed

zoneminder-1.34.2.tar.gz/.git/hooks/update.sample -> zoneminder-1.34.8.tar.gz/.git/hooks/update.sample Changed

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

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

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

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

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

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

@@ -6,14 +6,15 @@
 fcc507b93eed0a89ae6dee815b5c676777bb933e refs/remotes/origin/fix_zms_params
 b67450b8ae460eca2c331aa86d12c0fa979d6a24 refs/remotes/origin/fix_zmvideo
 b3d04f04ae48658e0cd44e6d30fbb9c91d348a2f refs/remotes/origin/gh-pages
-3717e6b702e751910747734078e4b964f71d98cf refs/remotes/origin/master
+ebac665d4d796a09ff52ee1236067c9cdf6db52f 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
-b7ad7ab1fc25dfaf626f12c97d3403ff0aab1b2e refs/remotes/origin/release-1.34
+a555e09cad328e9991b9245bad8409460ee69018 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
 573eb2d4d3c3a310d604456ca30b9220b5022305 refs/tags/1.30.1-rc.1
@@ -40,6 +41,12 @@
 840f8b91b7c29641ca84c92d1382b055071454a2 refs/tags/1.34.1
 ^fb5111ffe4de9b5f417150af14f9bca236d7b620
 b7ad7ab1fc25dfaf626f12c97d3403ff0aab1b2e refs/tags/1.34.2
+ea2eba4110af76376c1bff308290ab84ae371033 refs/tags/1.34.3
+e630550d0f1ef169aca011a6a0220c7db3d0268f refs/tags/1.34.4
+52cb2441f002c71643fddb89a3abed041636bc9f refs/tags/1.34.5
+6d787fd77e1281bdf9f2fc59538d6ac1addd30d0 refs/tags/1.34.6
+c880793fdc411558236e8d8c55ec29c455e6c416 refs/tags/1.34.7
+a555e09cad328e9991b9245bad8409460ee69018 refs/tags/1.34.8
 4d508d8be232a4f84aefe37327b0e737196f58d1 refs/tags/v1.25
 6c411b5c43b88bc292a65609c78e5b56dd85562a refs/tags/v1.26-beta.1
 0a911d9d27bc0adf6d8272f6db11a0816a422fb9 refs/tags/v1.26-beta.2

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

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

@@ -138,9 +138,9 @@
     "Location of temporary files, default: /tmp/zm")
 set(ZM_LOGDIR "/var/log/zm" CACHE PATH 
     "Location of generated log files, default: /var/log/zm")
-set(ZM_WEBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/zoneminder/www" CACHE PATH 
+set(ZM_WEBDIR "${CMAKE_INSTALL_FULL_DATADIR}/zoneminder/www" CACHE PATH 
     "Location of the web files, default: <prefix>/${CMAKE_INSTALL_DATADIR}/zoneminder/www")
-set(ZM_CGIDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin" CACHE PATH 
+set(ZM_CGIDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/zoneminder/cgi-bin" CACHE PATH 
     "Location of the cgi-bin files, default: <prefix>/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin")
 set(ZM_CACHEDIR "/var/cache/zoneminder" CACHE PATH 
     "Location of the web server cache busting files, default: /var/cache/zoneminder")
@@ -347,19 +347,48 @@
             "ZoneMinder requires jpeg but it was not found on your system")
 endif(JPEG_FOUND)
 
+# LIBJWT
+find_package(LibJWT)
+if(LIBJWT_FOUND)
+	set(HAVE_LIBJWT 1)
+	set(optlibsfound "${optlibsfound} LIBJWT")
+	list(APPEND ZM_BIN_LIBS "${LIBJWT_LIBRARY}")
+else(LIBJWT_FOUND)
+	set(optlibsnotfound "${optlibsnotfound} LIBJWT")
+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)
+
 # OpenSSL
-find_package(OpenSSL)
-if(OPENSSL_FOUND)
-	set(HAVE_LIBOPENSSL 1)
-	set(HAVE_LIBCRYPTO 1)
-	list(APPEND ZM_BIN_LIBS "${OPENSSL_LIBRARIES}")
-	include_directories("${OPENSSL_INCLUDE_DIR}")
-	set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
-	check_include_file("openssl/md5.h" HAVE_OPENSSL_MD5_H)
-	set(optlibsfound "${optlibsfound} OpenSSL")
-else(OPENSSL_FOUND)
-	set(optlibsnotfound "${optlibsnotfound} OpenSSL")
-endif(OPENSSL_FOUND)
+if(NOT HAVE_LIBGNUTLS OR NOT HAVE_LIBJWT)
+    find_package(OpenSSL)
+    if(OPENSSL_FOUND)
+        set(HAVE_LIBOPENSSL 1)
+        set(HAVE_LIBCRYPTO 1)
+        list(APPEND ZM_BIN_LIBS "${OPENSSL_LIBRARIES}")
+        include_directories("${OPENSSL_INCLUDE_DIR}")
+        set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
+        check_include_file("openssl/md5.h" HAVE_OPENSSL_MD5_H)
+        set(optlibsfound "${optlibsfound} OpenSSL")
+    else(OPENSSL_FOUND)
+        set(optlibsnotfound "${optlibsnotfound} OpenSSL")
+    endif(OPENSSL_FOUND)
+endif(NOT HAVE_LIBGNUTLS OR NOT HAVE_LIBJWT)
 
 # pthread (using find_library and find_path)
 find_library(PTHREAD_LIBRARIES pthread)
@@ -416,28 +445,6 @@
 	set(optlibsnotfound "${optlibsnotfound} GCrypt")
 endif(GCRYPT_LIBRARIES)
 
-# gnutls (using find_library and find_path)
-find_library(GNUTLS_LIBRARIES gnutls-openssl)
-if(NOT GNUTLS_LIBRARIES)
-    find_library(GNUTLS_LIBRARIES gnutls)
-endif(NOT GNUTLS_LIBRARIES)
-
-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/openssl.h" HAVE_GNUTLS_OPENSSL_H)
-	check_include_file("gnutls/gnutls.h" HAVE_GNUTLS_GNUTLS_H)
-	set(optlibsfound "${optlibsfound} GnuTLS")
-else(GNUTLS_LIBRARIES)
-	set(optlibsnotfound "${optlibsnotfound} GnuTLS")
-endif(GNUTLS_LIBRARIES)
-
 # mysqlclient (using find_library and find_path)
 find_library(MYSQLCLIENT_LIBRARIES mysqlclient PATH_SUFFIXES mysql)
 if(MYSQLCLIENT_LIBRARIES)
@@ -731,14 +738,6 @@
             "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_OPENSSL_H)
-	set(CMAKE_REQUIRED_LIBRARIES "${GNUTLS_LIBRARIES}")
-	set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
-	check_prototype_definition(
-            MD5 
-            "unsigned char *MD5 (const unsigned char *buf, unsigned long len, unsigned char *md)" "NULL" "gnutls/openssl.h" 
-            HAVE_MD5_GNUTLS)
-endif(HAVE_GNUTLS_OPENSSL_H)
 if(HAVE_GNUTLS_GNUTLS_H)
 	set(CMAKE_REQUIRED_LIBRARIES "${GNUTLS_LIBRARIES}")
 	set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
@@ -747,13 +746,13 @@
             "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 OR HAVE_MD5_GNUTLS)
+if(HAVE_MD5_OPENSSL)
 	set(HAVE_DECL_MD5 1)
-else(HAVE_MD5_OPENSSL OR HAVE_MD5_GNUTLS)
+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 OR HAVE_MD5_GNUTLS)
+endif(HAVE_MD5_OPENSSL)
 # 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)

zoneminder-1.34.2.tar.gz/README.md -> zoneminder-1.34.8.tar.gz/README.md Changed

@@ -22,12 +22,6 @@
 
 ## Installation Methods
 
-### Building from Source is Discouraged
-
-Historically, installing ZoneMinder onto your system required building from source code by issuing the traditional configure, make, make install commands.  To get ZoneMinder to build, all of its dependencies had to be determined and installed beforehand. Init and logrotate scripts had to be manually copied into place following the build.  Optional packages such as jscalendar and Cambozola had to be manually installed. Uninstalls could leave stale files around, which could cause problems during an upgrade.  Speaking of upgrades, when it comes time to upgrade all these manual steps must be repeated again.
-
-Better methods exist today that do much of this for you. The current development team, along with other volunteers, have taken great strides in providing the resources necessary to avoid building from source.  
-
 ### Install from a Package Repository
 
 This is the recommended method to install ZoneMinder onto your system. ZoneMinder packages are maintained for the following distros:
@@ -43,6 +37,13 @@
 
 If a repository that hosts ZoneMinder packages is not available for your distro, then you are encouraged to build your own package, rather than build from source.  While each distro is different in ways that set it apart from all the others, they are often similar enough to allow you to adapt another distro's package building instructions to your own.
 
+### Building from Source is Discouraged
+
+Historically, installing ZoneMinder onto your system required building from source code by issuing the traditional configure, make, make install commands.  To get ZoneMinder to build, all of its dependencies had to be determined and installed beforehand. Init and logrotate scripts had to be manually copied into place following the build.  Optional packages such as jscalendar and Cambozola had to be manually installed. Uninstalls could leave stale files around, which could cause problems during an upgrade.  Speaking of upgrades, when it comes time to upgrade all these manual steps must be repeated again.
+
+Better methods exist today that do much of this for you. The current development team, along with other volunteers, have taken great strides in providing the resources necessary to avoid building from source.  
+
+
 ### Building a ZoneMinder Package ###
 
 Building ZoneMinder into a package is not any harder than building from source.  As a matter of fact, if you have successfully built ZoneMinder from source in the past, then you may find these steps to be easier.

zoneminder-1.34.8.tar.gz/cmake/Modules/FindLibJWT.cmake Added

zoneminder-1.34.2.tar.gz/db/zm_create.sql.in -> zoneminder-1.34.8.tar.gz/db/zm_create.sql.in Changed

@@ -808,6 +808,7 @@
 INSERT INTO `Controls` VALUES (NULL,'Reolink RLC-411','Ffmpeg','Reolink',0,0,1,0,1,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'Reolink RLC-420','Ffmpeg','Reolink',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'D-LINK DCS-3415','Remote','DCS3415',0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'D-Link DCS-5020L','Remote','DCS5020L',1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,24,1,0,1,1,1,0,1,0,1,0,0,1,30,0,0,0,0,0,1,0,0,1,30,0,0,0,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'IOS Camera','Ffmpeg','IPCAMIOS',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,1,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'Dericam P2','Ffmpeg','DericamP2',0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,10,0,1,1,1,0,0,0,1,1,0,0,0,0,1,1,45,0,0,1,0,0,0,0,1,1,45,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'Trendnet','Remote','Trendnet',1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
@@ -842,6 +843,7 @@
 INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, RTP/RTSP','Remote','rtsp',0,255,'rtsp','rtpRtsp','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, RTP/RTSP/HTTP','Remote',NULL,NULL,NULL,'rtsp','rtpRtspHttp','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'D-link DCS-930L, 640x480, mjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/mjpeg.cgi',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'D-Link DCS-5020L, 640x480, mjpeg','Remote','http',0,0,'http','simple','<username>:<pwd>@<ip-address>','80','/video.cgi',NULL,640,480,0,NULL,1,'34',NULL,'<username>:<pwd>@<ip-address>',100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 320x240, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 320x240, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,5.0,0,NULL,NULL,NULL,100,100);

zoneminder-1.34.8.tar.gz/db/zm_update-1.34.3.sql Added

zoneminder-1.34.8.tar.gz/db/zm_update-1.34.4.sql Added

zoneminder-1.34.8.tar.gz/db/zm_update-1.34.5.sql Added

zoneminder-1.34.8.tar.gz/db/zm_update-1.34.6.sql Added

zoneminder-1.34.8.tar.gz/db/zm_update-1.34.7.sql Added

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

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

zoneminder-1.34.2.tar.gz/docs/userguide/gettingstarted.rst -> zoneminder-1.34.8.tar.gz/docs/userguide/gettingstarted.rst Changed

zoneminder-1.34.2.tar.gz/docs/userguide/options/options_system.rst -> zoneminder-1.34.8.tar.gz/docs/userguide/options/options_system.rst Changed

@@ -14,13 +14,13 @@
 
 OPT_USE_AUTH - ZoneMinder can run in two modes. The simplest is an entirely unauthenticated mode where anyone can access ZoneMinder and perform all tasks. This is most suitable for installations where the web server access is limited in other ways. The other mode enables user accounts with varying sets of permissions. Users must login or authenticate to access ZoneMinder and are limited by their defined permissions. Authenticated mode alone should not be relied up for securing Internet connected ZoneMinder.
 
-AUTH_TYPE - ZoneMinder can use two methods to authenticate users when running in authenticated mode. The first is a builtin method where ZoneMinder provides facilities for users to log in and maintains track of their identity. The second method allows interworking with other methods such as http basic authentication which passes an independently authentication 'remote' user via http. In this case ZoneMinder would use the supplied user without additional authentication provided such a user is configured ion ZoneMinder.
+AUTH_TYPE - ZoneMinder can use two methods to authenticate users when running in authenticated mode. The first is a builtin method where ZoneMinder provides facilities for users to log in and maintains track of their identity. The second method allows interworking with other methods such as http basic authentication which passes an independently authenticated 'remote' user via http. In this case ZoneMinder would use the supplied user without additional authentication provided such a user is configured in ZoneMinder.
 
 AUTH_RELAY - When ZoneMinder is running in authenticated mode it can pass user details between the web pages and the back end processes. There are two methods for doing this. This first is to use a time limited hashed string which contains no direct username or password details, the second method is to pass the username and passwords around in plaintext. This method is not recommend except where you do not have the md5 libraries available on your system or you have a completely isolated system with no external access. You can also switch off authentication relaying if your system is isolated in other ways.
 
-AUTH_HASH_SECRET - When ZoneMinder is running in hashed authenticated mode it is necessary to generate hashed strings containing encrypted sensitive information such as usernames and password. Although these string are reasonably secure the addition of a random secret increases security substantially. Note that if you are using the new token based APIs, then this field is mandatory with ZM 1.34 and above 
+AUTH_HASH_SECRET - When ZoneMinder is running in hashed authenticated mode it is necessary to generate hashed strings containing encrypted sensitive information such as usernames and passwords. Although these strings are reasonably secure the addition of a random secret increases security substantially. Note that if you are using the new token based APIs, then this field is mandatory with ZM 1.34 and above.
 
-AUTH_HASH_IPS - When ZoneMinder is running in hashed authenticated mode it can optionally include the requesting IP address in the resultant hash. This adds an extra level of security as only requests from that address may use that authentication key. However in some circumstances, such as access over mobile networks, the requesting address can change for each request which will cause most requests to fail. This option allows you to control whether IP addresses are included in the authentication hash on your system. If you experience intermitent problems with authentication, switching this option off may help. It is recommended you keep this off if you use mobile apps like zmNinja over mobile carrier networks - several APNs change the IP very frequently which may result in authentication failure.
+AUTH_HASH_IPS - When ZoneMinder is running in hashed authenticated mode it can optionally include the requesting IP address in the resultant hash. This adds an extra level of security as only requests from that address may use that authentication key. However in some circumstances, such as access over mobile networks, the requesting address can change for each request which will cause most requests to fail. This option allows you to control whether IP addresses are included in the authentication hash on your system. If you experience intermitent problems with authentication, switching this option off may help. It is recommended you keep this off if you use mobile apps like zmNinja over mobile carrier networks - several APNs change the IP very frequently which may result in authentication failures.
 
 AUTH_HASH_TTL - Time before ZM auth will expire (does not apply to API tokens). The default has traditionally been 2 hours. A new hash will automatically be regenerated at half this value.
 
@@ -34,11 +34,11 @@
 
 OPT_USE_LEGACY_AUTH - Starting version 1.34.0, ZoneMinder uses a more secure Authentication mechanism using JWT tokens. Older versions used a less secure MD5 based auth hash. It is recommended you turn this off after you are sure you don't need it. If you are using a 3rd party app that relies on the older API auth mechanisms, you will have to update that app if you turn this off. Note that zmNinja 1.3.057 onwards supports the new token system.
 
-OPT_USE_EVENT_NOTIFICATION - zmeventnotification is a 3rd party event notification server that is used to get notifications for alarms detected by ZoneMinder in real time. zmNinja requires this server for push notifications to mobile phones. This option only enables the server if its already installed. Please visit the `Event Notification Server project site <https://github.com/pliablepixels/zmeventserver>`__ for installation instructions.
+OPT_USE_EVENT_NOTIFICATION - zmeventnotification is a 3rd party event notification server that is used to get notifications for alarms detected by ZoneMinder in real time. zmNinja requires this server for push notifications to mobile phones. This option only enables the server if it is already installed. Please visit the `Event Notification Server project site <https://github.com/pliablepixels/zmeventserver>`__ for installation instructions.
 
-OPT_USE_GOOG_RECAPTCHA - This option allows you to include a google reCaptcha validation at login. This means in addition to providing a valid usernane and password, you will also have to pass the reCaptcha test. Please note that enabling this option results in the zoneminder login page reach out to google servers for captcha validation. Also please note that enabling this option may break 3rd party clients if they rely on web based logins (Note that zmNinja now uses the API based token method and will not be affected if reCAPTCHA is enabled). If you enable this, you also need to specify your site and secret key (please refer to context help in the ZoneMinder system screen)
+OPT_USE_GOOG_RECAPTCHA - This option allows you to include a google reCaptcha validation at login. This means in addition to providing a valid username and password, you will also have to pass the reCaptcha test. Please note that enabling this option results in the zoneminder login page reaching out to google servers for captcha validation. Also please note that enabling this option may break 3rd party clients if they rely on web based logins (Note that zmNinja now uses the API based token method and will not be affected if reCAPTCHA is enabled). If you enable this, you also need to specify your site and secret key (please refer to context help in the ZoneMinder system screen).
 
-SYSTEM_SHUTDOWN - this option decides if it is allowed to shutdown the full system via the ZM UI. The system will need to have sudo installed and the following added to /etc/sudoers:
+SYSTEM_SHUTDOWN - this option puts a poweroff icon in the header of the ZM UI for users with System privilege accessi. This icon will allow the user to shutdown the full system via the ZM UI. The system will need to have sudo installed and the following added to /etc/sudoers:
 
 :: 
   
@@ -46,9 +46,9 @@
 
 to perform the shutdown or reboot
 
-OPT_FAST_DELETE - Normally an event created as the result of an alarm consists of entries in one or more database tables plus the various files associated with it. When deleting events in the browser it can take a long time to remove all of this if your are trying to do a lot of events at once. **NOTE**: It is recommended that you keep this option OFF, unless you are running on an old or low-powered system.
+OPT_FAST_DELETE - Normally an event created as the result of an alarm consists of entries in one or more database tables plus the various files associated with it. When deleting events in the browser it can take a long time to remove all of this if youxr are trying to do a lot of events at once. **NOTE**: It is recommended that you keep this option OFF, unless you are running on an old or low-powered system.
 
-FILTER_RELOAD_DELAY - ZoneMinder allows you to save filters to the database which allow events that match certain criteria to be emailed, deleted or uploaded to a remote machine etc. The zmfilter daemon loads these and does the actual operation. This option determines how often in seconds the filters are reloaded from the database to get the latest versions or new filters. If you don't change filters very often this value can be set to a large value.
+FILTER_RELOAD_DELAY - ZoneMinder allows you to save filters to the database which allow events that match certain criteria to be emailed, deleted or uploaded to a remote machine etc. The zmfilter daemon loads these and does the actual operation. This option determines how often in seconds the filters are reloaded from the database to get the latest versions or new filters. If you don't change filters very often this value can be set to a large value. As of 1.34.0 filters should be automatically reloaded when saving a filter so this setting should have little effect.
 
 FILTER_EXECUTE_INTERVAL - ZoneMinder allows you to save filters to the database which allow events that match certain criteria to be emailed, deleted or uploaded to a remote machine etc. The zmfilter daemon loads these and does the actual operation. This option determines how often the filters are executed on the saved event in the database. If you want a rapid response to new events this should be a smaller value, however this may increase the overall load on the system and affect performance of other elements.
 
@@ -58,9 +58,9 @@
 
 WATCH_CHECK_INTERVAL - The zmwatch daemon checks the image capture performance of the capture daemons to ensure that they have not locked up (rarely a sync error may occur which blocks indefinitely). This option determines how often the daemons are checked.
 
-WATCH_MAX_DELAY - The zmwatch daemon checks the image capture performance of the capture daemons to ensure that they have not locked up (rarely a sync error may occur which blocks indefinitely). This option determines the maximum delay to allow since the last captured frame. The daemon will be restarted if it has not captured any images after this period though the actual restart may take slightly longer in conjunction with the check interval value above.
+WATCH_MAX_DELAY - The zmwatch daemon checks the image capture performance of the capture daemons to ensure that they have not locked up (rarely a sync error may occur which blocks indefinitely). This option determines the maximum delay to allow since the last captured frame. The daemon will be restarted if it has not captured any images after this period though the actual restart may take slightly longer in conjunction with the check interval value above.  Please note that some cameras can take up to 30 seconds to get a valid image, so this setting should be larger than that.
 
-RUN_AUDIT - The zmaudit daemon exists to check that the saved information in the database and on the filesystem match and are consistent with each other. If an error occurs or if you are using 'fast deletes' it may be that database records are deleted but files remain. In this case, and similar, zmaudit will remove redundant information to synchronise the two data stores. This option controls whether zmaudit is run in the background and performs these checks and fixes continuously. It is recommended you keep this **OFF** in most systems.
+RUN_AUDIT - The zmaudit daemon exists to check that the saved information in the database and on the filesystem match and are consistent with each other. If an error occurs or if you are using 'fast deletes' it may be that database records are deleted but files remain. In this case, and similar, zmaudit will remove redundant information to synchronise the two data stores. This option controls whether zmaudit is run in the background and performs these checks and fixes continuously. It is recommended you keep this **OFF** in most systems and run it manually if needed after a system crash.
 
 AUDIT_CHECK_INTERVAL - The zmaudit daemon exists to check that the saved information in the database and on the filesystem match and are consistent with each other. If an error occurs or if you are using 'fast deletes' it may be that database records are deleted but files remain. In this case, and similar, zmaudit will remove redundant information to synchronise the two data stores. The default check interval of 900 seconds (15 minutes) is fine for most systems however if you have a very large number of events the process of scanning the database and filesystem may take a long time and impact performance. In this case you may prefer to make this interval much larger to reduce the impact on your system. This option determines how often these checks are performed.
 
@@ -70,11 +70,11 @@
 
 OPT_TRIGGERS - ZoneMinder can interact with external systems which prompt or cancel alarms. This is done via the zmtrigger.pl script. This option indicates whether you want to use these external triggers. Most people will say no here.
 
-CHECK_FOR_UPDATES - From ZoneMinder version 1.17.0 onwards new versions are expected to be more frequent. To save checking manually for each new version ZoneMinder can check with the zoneminder.com website to determine the most recent release. These checks are infrequent, about once per week, and no personal or system information is transmitted other than your current version number. If you do not wish these checks to take place or your ZoneMinder system has no internet access you can switch these check off with this configuration variable
+CHECK_FOR_UPDATES - To save checking manually for each new version ZoneMinder can check with the zoneminder.com website to determine the most recent release. These checks are infrequent, about once per week, and no personal or system information is transmitted other than your current version number. If you do not wish these checks to take place or your ZoneMinder system has no internet access you can switch these check off with this configuration variable.
 
 TELEMETRY_DATA - Enable collection of usage information of the local system and send it to the ZoneMinder development team. This data will be used to determine things like who and where our customers are, how big their systems are, the underlying hardware and operating system, etc. This is being done for the sole purpose of creating a better product for our target audience. This script is intended to be completely transparent to the end user, and can be disabled from the web console under Options. For more details on what information we collect, please refer to Zoneminder's privacy statement (available in the contextual help of TELEMETRY_DATA on your installation).
 
-UPDATE_CHECK_PROXY - If you use a proxy to access the internet then ZoneMinder needs to know so it can access zoneminder.com to check for updates. If you do use a proxy enter the full proxy url here in the form of ``http://<proxy host>:<proxy port>/``
+UPDATE_CHECK_PROXY - If you use a proxy to access the internet then ZoneMinder needs to know so it can access zoneminder.com to check for updates. If you do use a proxy enter the full proxy url here in the form of ``http://<proxy host>:<proxy port>/``.
 
 SHM_KEY - ZoneMinder uses shared memory to speed up communication between modules. To identify the right area to use shared memory keys are used. This option controls what the base key is, each monitor will have it's Id or'ed with this to get the actual key used. You will not normally need to change this value unless it clashes with another instance of ZoneMinder on the same machine. Only the first four hex digits are used, the lower four will be masked out and ignored.

zoneminder-1.34.2.tar.gz/onvif/modules/lib/ONVIF/Client.pm -> zoneminder-1.34.8.tar.gz/onvif/modules/lib/ONVIF/Client.pm Changed

@@ -76,7 +76,7 @@
 
 sub service {
   my ($self, $serviceName, $attr) = @_;
-#print "service: " . $services_of{${$self}}{$serviceName}{$attr} . "\n";
+  #print "service: " . $services_of{${$self}}{$serviceName}{$attr} . "\n";
 # Please note that the Std::Class::Fast docs say not to use ident.
   $services_of{ident $self}{$serviceName}{$attr};
 }
@@ -114,18 +114,18 @@
 
   my $result = $self->service('device', 'ep')->GetServices( {
     IncludeCapability =>  'true', # boolean
-    },,
+    }
   );
   if ( $result ) {
-    foreach  my $svc ( @{ $result->get_Service() } ) {
+    foreach my $svc ( @{ $result->get_Service() } ) {
       my $short_name = $namespace_map{$svc->get_Namespace()};    
       my $url_svc = $svc->get_XAddr()->get_value();
-      if(defined $short_name && defined $url_svc) {
-#      print "Got $short_name service\n";
+      if ( defined $short_name && defined $url_svc ) {
+        #print "Got $short_name service\n";
         $self->set_service($short_name, 'url', $url_svc);
       }
     }
- # } else {
+    #} else {
     #print "No results from GetServices: $result\n";
   }
 
@@ -142,14 +142,14 @@
       if ( my $function = $capabilities->can( "get_$capability" ) ) {
         my $Services = $function->( $capabilities );
         if ( !$Services ) {
-          print "Nothing returned ffrom get_$capability\n";
+          #print "Nothing returned from get_$capability\n";
         } else {
           foreach my $svc ( @{ $Services } ) {
             # The capability versions don't have a namespace, so just lowercase them.
             my $short_name = lc $capability;
             my $url_svc = $svc->get_XAddr()->get_value();
-            if( defined $url_svc) {
-#      print "Got $short_name service\n";
+            if ( defined $url_svc ) {
+              #print "Got $short_name service\n";
               $self->set_service($short_name, 'url', $url_svc);
             }
           } # end foreach svr
@@ -202,10 +202,10 @@
 #   deserializer_args => { strict => 0 }
   });
 
-  $services_of{$ident}{'device'} = { url => $url_svc_device, ep => $svc_device };
+  $services_of{$ident}{device} = { url => $url_svc_device, ep => $svc_device };
 
   # Can't, don't have credentials yet
-  #$self->get_service_urls();
+  # $self->get_service_urls();
 }
 
 sub get_users {
@@ -260,7 +260,7 @@
 sub create_services {
   my ($self) = @_;
 
-  #$self->get_service_urls();
+  $self->get_service_urls();
 
   if ( defined $self->service('media', 'url') ) {
     $self->set_service('media', 'ep', ONVIF::Media::Interfaces::Media::MediaPort->new({

zoneminder-1.34.2.tar.gz/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in -> zoneminder-1.34.8.tar.gz/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in Changed

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

@@ -1,16 +1,6 @@
 # ==========================================================================
 #
-# ZoneMinder Amcrest HTTP API Control Protocol Module, 20180214, Rev 3.0
-#
-# Change Log
-#
-# Rev 3.0:
-#  - Fixes incorrect method names
-#  - Updates control sequences to Amcrest HTTP Protocol API v 2.12
-#  - Extends control features
-#
-# Rev 2.0:
-#  - Fixed installation instructions text, no changes to functionality.
+# ZoneMinder Amcrest HTTP API Control Protocol Module
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -39,6 +29,7 @@
 require ZoneMinder::Base;
 require ZoneMinder::Control;
 require LWP::UserAgent;
+use URI;
 
 our @ISA = qw(ZoneMinder::Control);
 
@@ -63,22 +54,28 @@
   my $self = shift;
 
   $self->loadMonitor();
-  my $username;
-  my $password;
-  my $realm = 'Login to ' . $self->{Monitor}->{ControlDevice};
-
-  if ( $self->{Monitor}->{ControlAddress} =~ /(.*):(.*)@(.*)/ ) {
-    $username = $1;
-    $password = $2;
-    $$self{address} = $3;
+  if ( $self->{Monitor}->{ControlAddress} !~ /^\w+:\/\// ) {
+    # Has no scheme at the beginning, so won't parse as a URI
+    $self->{Monitor}->{ControlAddress} = 'http://'.$self->{Monitor}->{ControlAddress};
   }
+  my $uri = URI->new($self->{Monitor}->{ControlAddress});
 
   $self->{ua} = LWP::UserAgent->new;
-  $self->{ua}->credentials($$self{address}, $realm, $username, $password);
   $self->{ua}->agent('ZoneMinder Control Agent/'.ZoneMinder::Base::ZM_VERSION);
+  my ( $username, $password );
+  my $realm = 'Login to ' . $self->{Monitor}->{ControlDevice};
+  if ( $self->{Monitor}->{ControlAddress} ) {
+    ( $username, $password ) = $uri->authority() =~ /^(.*):(.*)@(.*)$/;
+
+    $$self{address} = $uri->host_port();
+    $self->{ua}->credentials($uri->host_port(), $realm, $username, $password);
+    # Testing seems to show that we need the username/password in each url as well as credentials
+    $$self{base_url} = $uri->canonical();
+    Debug('Using initial credentials for '.$uri->host_port().", $realm, $username, $password, base_url: $$self{base_url} auth:".$uri->authority());
+  }
 
-  # Detect REALM
-  my $res = $self->{ua}->get($$self{address}.'/cgi-bin/ptz.cgi');
+  # Detect REALM, has to be /cgi-bin/ptz.cgi because just / accepts no auth
+  my $res = $self->{ua}->get($$self{base_url}.'cgi-bin/ptz.cgi');
 
   if ( $res->is_success ) {
     $self->{state} = 'open';
@@ -94,21 +91,26 @@
 
     if ( $$headers{'www-authenticate'} ) {
       my ( $auth, $tokens ) = $$headers{'www-authenticate'} =~ /^(\w+)\s+(.*)$/;
-      if ( $tokens =~ /\w+="([^"]+)"/i ) {
+      if ( $tokens =~ /realm="([^"]+)"/i ) {
         if ( $realm ne $1 ) {
           $realm = $1;
-          Debug("Changing REALM to $realm");
+          Debug("Changing REALM to ($realm)");
           $self->{ua}->credentials($$self{address}, $realm, $username, $password);
-          $res = $self->{ua}->get($$self{address}.'/cgi-bin/ptz.cgi');
+          $res = $self->{ua}->get($$self{base_url}.'cgi-bin/ptz.cgi');
           if ( $res->is_success() ) {
             $self->{state} = 'open';
             return;
+          } elsif ( $res->status_line eq '400 Bad Request' ) {
+          # In testing, this second request fails with Bad Request, I assume because we didn't actually give it a command.
+            $self->{state} = 'open';
+            return;
+          } else {
+            Error('Authentication still failed after updating REALM' . $res->status_line);
+            $headers = $res->headers();
+            foreach my $k ( keys %$headers ) {
+              Debug("Header $k => $$headers{$k}");
+            }  # end foreach
           }
-          Error('Authentication still failed after updating REALM' . $res->status_line);
-          $headers = $res->headers();
-          foreach my $k ( keys %$headers ) {
-            Debug("Initial Header $k => $$headers{$k}");
-          }  # end foreach
         } else {
           Error('Authentication failed, not a REALM problem');
         }
@@ -118,9 +120,12 @@
     } else {
       Debug('No headers line');
     } # end if headers
+  } else {
+    Error("Failed to get $$self{base_url}cgi-bin/ptz.cgi ".$res->status_line());
+
   } # end if $res->status_line() eq '401 Unauthorized'
 
-  $self->{state} = 'open';
+  $self->{state} = 'closed';
 }
 
 sub close {
@@ -135,16 +140,23 @@
 
   $self->printMsg($cmd, 'Tx');
 
-  my $req = HTTP::Request->new( GET=>"http://$$self{address}/$cmd" );
-  my $res = $self->{ua}->request($req);
+  my $res = $self->{ua}->get($$self{base_url}.$cmd);
 
   if ( $res->is_success ) {
     $result = !undef;
     # Command to camera appears successful, write Info item to log
-    Info('Camera control: \''.$res->status_line().'\' for URL '.$self->{Monitor}->{ControlAddress}.'/'.$cmd);
+    Info('Camera control: \''.$res->status_line().'\' for URL '.$$self{base_url}.$cmd);
     # TODO: Add code to retrieve $res->message_decode or some such. Then we could do things like check the camera status.
   } else {
-    Error('Camera control command FAILED: \''.$res->status_line().'\' for URL '.$self->{Monitor}->{ControlAddress}.'/'.$cmd);
+    # Try again
+    $res = $self->{ua}->get($$self{base_url}.$cmd);
+    if ( $res->is_success ) {
+      # Command to camera appears successful, write Info item to log
+      Info('Camera control 2: \''.$res->status_line().'\' for URL '.$$self{base_url}.$cmd);
+    } else {
+      Error('Camera control command FAILED: \''.$res->status_line().'\' for URL '.$$self{base_url}.$cmd);
+      $res = $self->{ua}->get('http://'.$self->{Monitor}->{ControlAddress}.'/'.$cmd);
+    }
   }
 
   return $result;

zoneminder-1.34.8.tar.gz/scripts/ZoneMinder/lib/ZoneMinder/Control/DCS5020L.pm Added

@@ -0,0 +1,356 @@
+# =========================================================================r
+#
+# ZoneMinder D-Link DCS-5020L IP Control Protocol Module, $Date: $, $Revision: $
+# Copyright (C) 2013 Art Scheel
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# ==========================================================================
+#
+# This module contains the implementation of the D-Link DCS-5020L IP camera control
+# protocol. 
+#
+package ZoneMinder::Control::DCS5020L;
+
+use 5.006;
+use strict;
+use warnings;
+
+require ZoneMinder::Base;
+require ZoneMinder::Control;
+
+our @ISA = qw(ZoneMinder::Control);
+
+our $VERSION = $ZoneMinder::Base::VERSION;
+
+# ==========================================================================
+#
+# D-Link DCS-5020L Control Protocol
+#
+# ==========================================================================
+
+use ZoneMinder::Logger qw(:all);
+use ZoneMinder::Config qw(:all);
+
+use Time::HiRes qw( usleep );
+
+sub new
+{
+    my $class = shift;
+    my $id = shift;
+    my $self = ZoneMinder::Control->new( $id );
+    bless( $self, $class );
+    srand( time() );
+    return $self;
+}
+
+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;
+
+    $self->loadMonitor();
+
+    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 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;
+
+    my $result = undef;
+
+    printMsg( $cmd, "Tx" );
+
+    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()."'" );
+    }
+
+    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 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 moveRelUp
+{
+    my $self = shift;
+    my $params = shift;
+    $self->moveRel( $params, 1 );
+}
+
+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 moveRelRight
+{
+    my $self = shift;
+    my $params = shift;
+    $self->moveRel( $params, 5 );
+}
+
+sub moveRelDownLeft
+{
+    my $self = shift;
+    my $params = shift;
+    $self->moveRel( $params, 6 );
+}
+
+sub moveRelDown
+{
+    my $self = shift;
+    my $params = shift;
+    $self->moveRel( $params, 7 );
+}
+
+sub moveRelDownRight
+{
+    my $self = shift;
+    my $params = shift;

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

@@ -95,9 +95,9 @@
   my $self = shift;
   my $cmd = shift;
   my $content = shift;
-  my $req = HTTP::Request->new(PUT => "$self->{BaseURL}/$cmd");
+  my $req = HTTP::Request->new(PUT => $self->{BaseURL}.'/'.$cmd);
   if ( defined($content) ) {
-    $req->content_type("application/x-www-form-urlencoded; charset=UTF-8");
+    $req->content_type('application/x-www-form-urlencoded; charset=UTF-8');
     $req->content('<?xml version="1.0" encoding="UTF-8"?>' . "\n" . $content);
   }
   my $res = $self->{UA}->request($req);
@@ -135,13 +135,13 @@
         # Check for username/password
         #
         if ( $self->{Monitor}{ControlAddress} =~ /.+:(.+)@.+/ ) {
-          Info("Check username/password is correct");
+          Info('Check username/password is correct');
         } elsif ( $self->{Monitor}{ControlAddress} =~ /^[^:]+@.+/ ) {
-          Info("No password in Control Address. Should there be one?");
+          Info('No password in Control Address. Should there be one?');
         } elsif ( $self->{Monitor}{ControlAddress} =~ /^:.+@.+/ ) {
-          Info("Password but no username in Control Address.");
+          Info('Password but no username in Control Address.');
         } else {
-          Info("Missing username and password in Control Address.");
+          Info('Missing username and password in Control Address.');
         }
         Fatal($res->status_line);
       }
@@ -382,7 +382,7 @@
 sub reset {
   my $self = shift;
 
-  $self->PutCmd("ISAPI/System/reboot");
+  $self->PutCmd('ISAPI/System/reboot');
 }
 
 1;

zoneminder-1.34.2.tar.gz/scripts/ZoneMinder/lib/ZoneMinder/ONVIF.pm.in -> zoneminder-1.34.8.tar.gz/scripts/ZoneMinder/lib/ZoneMinder/ONVIF.pm.in Changed

@@ -255,15 +255,15 @@
 sub profiles {
   my ( $client ) = @_;
 
-  my $endpoint = $client->get_endpoint('media');
-  if ( ! $endpoint ) {
-    print "No media enpoint for client.\n";
+  my $media = $client->get_endpoint('media');
+  if ( ! $media ) {
+    print "No media endpoint for client.\n";
     return;
   }
 
-  my $result = $endpoint->GetProfiles( { } ,, );
+  my $result = $media->GetProfiles( { } ,, );
   if ( ! $result ) {
-    print "No result from GetProfiles\n";
+    print "No result from GetProfiles.\n";
     return;
   }
   if ( $verbose ) {
@@ -272,48 +272,52 @@
 
   my $profiles = $result->get_Profiles();
 
-  foreach  my $profile ( @{ $profiles } ) {
+  foreach my $profile ( @{ $profiles } ) {
 
     my $token = $profile->attr()->get_token() ;
-    my $video_encoder_configuration = $profile->get_VideoEncoderConfiguration();
-    if ( ! $video_encoder_configuration ) {
-      print "Unknown profile $token " . $profile->get_Name()."\n";
+    my $Name = $profile->get_Name();
+
+    my $VideoEncoderConfiguration = $profile->get_VideoEncoderConfiguration();
+    if ( ! $VideoEncoderConfiguration ) {
+      print "Unknown profile $token $Name.\n";
       next;
     }
-    print $token . ", " .
-      $profile->get_Name() . ", " .
-      $profile->get_VideoEncoderConfiguration()->get_Encoding() . ", " .
-      $profile->get_VideoEncoderConfiguration()->get_Resolution()->get_Width() . ", " .
-      $profile->get_VideoEncoderConfiguration()->get_Resolution()->get_Height() . ", " .
-      $profile->get_VideoEncoderConfiguration()->get_RateControl()->get_FrameRateLimit() .
-      ", ";
 
 # Specification gives conflicting values for unicast stream types, try both.
 # http://www.onvif.org/onvif/ver10/media/wsdl/media.wsdl#op.GetStreamUri
-    foreach my $streamtype ( 'RTP_unicast', 'RTP-Unicast' ) {
-      $result = $client->get_endpoint('media')->GetStreamUri( {
+    foreach my $streamtype ( 'RTP_unicast', 'RTP-Unicast', 'RTP-multicast', 'RTP-Multicast' ) {
+      my $StreamUri = $media->GetStreamUri( {
           StreamSetup =>  { # ONVIF::Media::Types::StreamSetup
-          Stream => $streamtype, # StreamType
-          Transport =>  { # ONVIF::Media::Types::Transport
-          Protocol => 'RTSP', # TransportProtocol
-          },
+            Stream => $streamtype, # StreamType
+            Transport =>  { # ONVIF::Media::Types::Transport
+              Protocol => 'RTSP', # TransportProtocol
+            },
           },
           ProfileToken => $token, # ReferenceToken
-          } ,, );
-      last if $result;
-    }
-    die $result if not $result;
-#  print $result . "\n";
+          } );
+        next if ! ( $StreamUri and $StreamUri->can('get_MediaUri') );
+        my $MediaUri = $StreamUri->get_MediaUri();
+        next if ! $MediaUri;
+        my $Uri = $MediaUri->get_Uri();
+        next if ! $Uri;
+
+        print join(', ', $token,
+          $Name,
+          $VideoEncoderConfiguration->get_Encoding(),
+          $VideoEncoderConfiguration->get_Resolution()->get_Width(),
+          $VideoEncoderConfiguration->get_Resolution()->get_Height(),
+          $VideoEncoderConfiguration->get_RateControl()->get_FrameRateLimit(),
+          $Uri,
+        ) . "\n";
+    } # end foreach streamtype
 
-    print $result->get_MediaUri()->get_Uri() .
-      "\n";
   } # end foreach profile
 
 #
 # use message parser without schema validation ???
 #
 
-}
+} # end sub profiles
 
 sub move {
   my ($client, $dir) = @_;
@@ -326,13 +330,22 @@
 
 sub metadata {
   my ( $client ) = @_;
-  my $result = $client->get_endpoint('media')->GetMetadataConfigurations( { } ,, );
-  die $result if not $result;
-  print $result . "\n";
+  my $media = $client->get_endpoint('media');
+  die 'No media endpoint.' if !$media;
 
-  $result = $client->get_endpoint('media')->GetVideoAnalyticsConfigurations( { } ,, );
-  die $result if not $result;
-  print $result . "\n";
+  my $result = $media->GetMetadataConfigurations( { } ,, );
+  if ( ! $result ) {
+    print "No MetaDataConfigurations\n" if $verbose;
+  } else {
+    print $result . "\n";
+  }
+
+  $result = $media->GetVideoAnalyticsConfigurations( { } ,, );
+  if ( ! $result ) {
+    print "No VideoAnalyticsConfigurations\n" if $verbose;
+  } else {
+    print $result . "\n";
+  }
 
 #  $result = $client->get_endpoint('analytics')->GetServiceCapabilities( { } ,, );
 #  die $result if not $result;

zoneminder-1.34.2.tar.gz/scripts/zmaudit.pl.in -> zoneminder-1.34.8.tar.gz/scripts/zmaudit.pl.in Changed

@@ -420,15 +420,15 @@
       Debug("Checking for Medium Scheme Events under $$Storage{Path}/$monitor_dir");
       {
         my @event_dirs = glob("$monitor_dir/[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/*");
-        Debug(qq`glob("$monitor_dir/[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/*") returned ` . scalar @event_dirs . ' entries.' );
+        Debug('glob("'.$monitor_dir.'/[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]/*") returned '.(scalar @event_dirs).' entries.');
         foreach my $event_dir ( @event_dirs ) {
           if ( ! -d $event_dir ) {
-            Debug( "$event_dir is not a dir. Skipping" );
+            Debug("$event_dir is not a dir. Skipping");
             next;
           }
           my ( $date, $event_id ) = $event_dir =~ /^$monitor_dir\/(\d{4}\-\d{2}\-\d{2})\/(\d+)$/;
-          if ( ! $event_id ) {
-            Debug("Unable to parse date/event_id from $event_dir");
+          if ( !$event_id ) {
+            Debug('Unable to parse date/event_id from '.$event_dir);
             next;
           }
           my $Event = $fs_events->{$event_id} = new ZoneMinder::Event();
@@ -438,8 +438,9 @@
           $Event->MonitorId( $monitor_dir );
           $Event->StorageId( $Storage->Id() );
           $Event->Path();
+          $Event->age();
           Debug("Have event $$Event{Id} at $$Event{Path}");
-          $Event->StartTime( POSIX::strftime('%Y-%m-%d %H:%M:%S', gmtime(time_of_youngest_file($Event->Path())) ) );
+          $Event->StartTime(POSIX::strftime('%Y-%m-%d %H:%M:%S', gmtime(time_of_youngest_file($Event->Path()))));
         } # end foreach event
       }
 
@@ -466,13 +467,13 @@
         } # end foreach event
         chdir( $Storage->Path() );
       } # if USE_DEEP_STORAGE
-      Debug( 'Got '.int(keys(%$fs_events))." filesystem events for monitor $monitor_dir" );
+      Debug('Got '.int(keys(%$fs_events)).' filesystem events for monitor '.$monitor_dir);
 
       delete_empty_subdirs($$Storage{Path}.'/'.$monitor_dir);
     } # end foreach monitor
 
     if ( $cleaned ) {
-      Debug("First stage cleaning done.  Restarting.");
+      Debug('First stage cleaning done.  Restarting.');
       redo MAIN;
     }
 
@@ -484,7 +485,7 @@
           next;
         }
         my @event_ids = keys %$fs_events;
-        Debug('Have ' .scalar @event_ids . " events for monitor $monitor_id");
+        Debug('Have ' .scalar @event_ids . ' events for monitor '.$monitor_id);
 
         foreach my $fs_event_id ( sort { $a <=> $b } keys %$fs_events ) {
 
@@ -499,8 +500,8 @@
             }
             my $age = $Event->age();
 
-            if ( $age > $Config{ZM_AUDIT_MIN_AGE} ) {
-              aud_print( "Filesystem event $fs_event_id at $$Event{Path} does not exist in database and is $age seconds old" );
+            if ( $age and ($age > $Config{ZM_AUDIT_MIN_AGE}) ) {
+              aud_print("Filesystem event $fs_event_id at $$Event{Path} does not exist in database and is $age seconds old");
               if ( confirm() ) {
                 $Event->delete_files();
                 $cleaned = 1;
@@ -586,7 +587,7 @@
           } else {
             Debug("$$Event{Id} Not found at $path");
           }
-        }
+        } # end foreach Storage
         if ( $Event->Archived() ) {
           Warning("Event $$Event{Id} is Archived. Taking no further action on it.");
           next;
@@ -638,18 +639,13 @@
             Info("Updating storage area on event $$Event{Id} from $$Event{StorageId} to $$fs_events{$db_event}{StorageId}");
             $Event->StorageId($$fs_events{$db_event}->StorageId());
           }
-          if ( $$fs_events{$db_event}->StartTime() ne $Event->StartTime() ) {
+          if ( ! $Event->StartTime() ) {
             Info("Updating StartTime on event $$Event{Id} from $$Event{StartTime} to $$fs_events{$db_event}{StartTime}");
-            if ( $$Event{Scheme} eq 'Deep' ) {
-              $Event->StartTime($$fs_events{$db_event}->StartTime());
-            } else {
-              $Event->StartTime($$fs_events{$db_event}->StartTime());
-            }
-            $Event->save();
+            $Event->StartTime($$fs_events{$db_event}->StartTime());
           }
 
           $Event->save();
-        }
+        } # end if Event exists in db and not in filesystem
       } # end if ! in fs_events
     } # foreach db_event
   } # end foreach db_monitor

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

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

@@ -45,6 +45,7 @@
 
 my $help = 0;
 my $force = 0;
+my $show = 0;
 # Interval between version checks
 my $interval;
 my $version;
@@ -52,6 +53,7 @@
 GetOptions(
   force     => \$force,
   help      => \$help,
+  show      => \$show,
   interval  => \$interval,
   version   => \$version
 );
@@ -59,6 +61,14 @@
   print( ZoneMinder::Base::ZM_VERSION . "\n");
   exit(0);
 }
+if ($show) {
+  my %telemetry;
+  my $dbh = zmDbConnect();
+  collectData($dbh, \%telemetry);
+  my $result = jsonEncode(\%telemetry);
+  print ($result);
+  exit(0);
+}
 if ( $help ) {
   pod2usage(-exitstatus => -1);
 }
@@ -89,21 +99,9 @@
     my $dbh = zmDbConnect();
 # Build the telemetry hash
 # We should keep *BSD systems in mind when calling system commands
+    
     my %telemetry;
-    $telemetry{uuid} = getUUID($dbh);
-    @telemetry{qw(city region country latitude longitude)} = getGeo();
-    $telemetry{timestamp} = strftime('%Y-%m-%dT%H:%M:%S%z', localtime());
-    $telemetry{monitor_count} = countQuery($dbh,'Monitors');
-    $telemetry{event_count} = countQuery($dbh,'Events');
-    $telemetry{architecture} = runSysCmd('uname -p');
-    ($telemetry{kernel}, $telemetry{distro}, $telemetry{version}) = getDistro();
-    $telemetry{zm_version} = ZoneMinder::Base::ZM_VERSION;
-    $telemetry{system_memory} = totalmem();
-    $telemetry{processor_count} = cpu_count();
-    $telemetry{monitors} = getMonitorRef($dbh);
-
-    Info('Sending data to ZoneMinder Telemetry server.');
-
+    collectData($dbh,\%telemetry);
     my $result = jsonEncode(\%telemetry);
 
     if ( sendData($result) ) {
@@ -126,6 +124,24 @@
 # SUBROUTINES #
 ###############
 
+# collect data to send
+sub collectData {
+  my $dbh = shift;
+  my $telemetry = shift;
+  $telemetry->{uuid} = getUUID($dbh);
+  ($telemetry->{city},$telemetry->{region},$telemetry->{country},$telemetry->{latitude},$telemetry->{longitude})=getGeo();
+  $telemetry->{timestamp} = strftime('%Y-%m-%dT%H:%M:%S%z', localtime());
+  $telemetry->{monitor_count} = countQuery($dbh,'Monitors');
+  $telemetry->{event_count} = countQuery($dbh,'Events');
+  $telemetry->{architecture} = runSysCmd('uname -p');
+  ($telemetry->{kernel}, $telemetry->{distro}, $telemetry->{version}) = getDistro();
+  $telemetry->{zm_version} = ZoneMinder::Base::ZM_VERSION;
+  $telemetry->{system_memory} = totalmem();
+  $telemetry->{processor_count} = cpu_count();
+  $telemetry->{use_event_server} = $Config{ZM_OPT_USE_EVENTNOTIFICATION};
+  $telemetry->{monitors} = getMonitorRef($dbh);
+}
+
 # Find, verify, then run the supplied system command
 sub runSysCmd {
   my $msg = shift;
@@ -365,7 +381,7 @@
 
 =head1 SYNOPSIS
 
- zmtelemetry.pl [--force] [--help] [--interval=seconds] [--version]
+ zmtelemetry.pl [--force] [--help] [--show] [--interval=seconds] [--version]
 
 =head1 DESCRIPTION
 
@@ -382,6 +398,7 @@
  --force        Force the script to upload it's data instead of waiting
                 for the defined interval since last upload.
  --help         Display usage information
+ --show         Displays telemetry data that is sent to zoneminder
  --interval     Override the default configured interval since last upload. 
                 The value should be given in seconds, but can be an expression
                 such as 24*60*60.

zoneminder-1.34.8.tar.gz/src/jwt-cpp/include/jwt-cpp/jwt_cpp.h Changed

zoneminder-1.34.2.tar.gz/src/zm_crypt.cpp -> zoneminder-1.34.8.tar.gz/src/zm_crypt.cpp Changed

@@ -1,12 +1,81 @@
 #include "zm.h"
 #include "zm_crypt.h"
 #include "BCrypt.hpp"
-#include "jwt.h"
+#if HAVE_LIBJWT
+#include <jwt.h>
+#else
+#include "jwt_cpp.h"
+#endif
 #include <algorithm>
+#if HAVE_LIBCRYPTO
 #include <openssl/sha.h>
+#elif HAVE_GNUTLS_GNUTLS_H
+#include <gnutls/gnutls.h>
+#include <gnutls/crypto.h>
+#endif
 #include <string.h>
 
 // returns username if valid, "" if not
+#if HAVE_LIBJWT
+std::pair <std::string, unsigned int> verifyToken(std::string jwt_token_str, std::string key) {
+  std::string username = "";
+  unsigned int token_issued_at = 0;
+  int err = 0;
+  jwt_t *jwt = nullptr;
+
+  err = jwt_new(&jwt);
+  if( err ) {
+    Error("Unable to Allocate JWT object");
+    return std::make_pair("", 0);
+  }
+
+  err = jwt_set_alg(jwt, JWT_ALG_HS256, (const unsigned char*)key.c_str(), key.length());
+  if( err ) {
+    jwt_free(jwt);
+    Error("Error setting Algorithm for JWT decode");
+    return std::make_pair("", 0);
+  }
+  
+  err = jwt_decode(&jwt, jwt_token_str.c_str(), nullptr, 0);
+  if( err ) {
+    jwt_free(jwt);
+    Error("Could not decode JWT");
+    return std::make_pair("", 0);
+  }
+  
+  const char *c_type = jwt_get_grant(jwt, (const char*)"type");
+  if ( !c_type ) {
+    jwt_free(jwt);
+    Error("Missing token type. This should not happen");
+    return std::make_pair("", 0);
+  } else if ( std::string(c_type) != "access" ) {
+    jwt_free(jwt);
+    Error("Only access tokens are allowed. Please do not use refresh tokens");
+    return std::make_pair("", 0);
+  }
+
+  const char *c_username = jwt_get_grant(jwt, (const char*)"user");
+  if( !c_username ) {
+    jwt_free(jwt);
+    Error("User not found in claim");
+    return std::make_pair("", 0);
+  }
+
+  username = std::string(c_username);
+  Debug(1, "Got %s as user claim from token", username.c_str());
+  
+  token_issued_at = (unsigned int)jwt_get_grant_int(jwt, "iat");
+  if ( errno == ENOENT ) {
+    jwt_free(jwt);
+    Error("IAT not found in claim. This should not happen");
+    return std::make_pair("", 0);
+  }
+  
+  Debug(1, "Got IAT token=%u", token_issued_at);
+  jwt_free(jwt);
+  return std::make_pair(username, token_issued_at);
+}
+#else // HAVE_LIBJWT
 std::pair <std::string, unsigned int> verifyToken(std::string jwt_token_str, std::string key) {
   std::string username = "";
   unsigned int token_issued_at = 0;
@@ -58,6 +127,7 @@
   }
   return std::make_pair(username, token_issued_at);
 }
+#endif // HAVE_LIBJWT
 
 bool verifyPassword(const char *username, const char *input_password, const char *db_password_hash) {
   bool password_correct = false;
@@ -70,10 +140,16 @@
     // MYSQL PASSWORD
     Debug(1, "%s is using an MD5 encoded password", username);
     
-    SHA_CTX ctx1, ctx2;
+    #ifndef SHA_DIGEST_LENGTH
+      #define SHA_DIGEST_LENGTH 20
+    #endif
+  
     unsigned char digest_interim[SHA_DIGEST_LENGTH];
     unsigned char digest_final[SHA_DIGEST_LENGTH];
-
+    
+#if HAVE_LIBCRYPTO
+    SHA_CTX ctx1, ctx2;
+    
     //get first iteration
     SHA1_Init(&ctx1);
     SHA1_Update(&ctx1, input_password, strlen(input_password));
@@ -83,6 +159,15 @@
     SHA1_Init(&ctx2);
     SHA1_Update(&ctx2, digest_interim,SHA_DIGEST_LENGTH);
     SHA1_Final (digest_final, &ctx2);
+#elif HAVE_GNUTLS_GNUTLS_H
+    //get first iteration
+    gnutls_hash_fast(GNUTLS_DIG_SHA1, input_password, strlen(input_password), digest_interim);
+    //2nd iteration
+    gnutls_hash_fast(GNUTLS_DIG_SHA1, digest_interim, SHA_DIGEST_LENGTH, digest_final);
+#else
+    Error("Authentication Error. ZoneMinder not built with GnuTLS or Openssl");
+    return false;
+#endif
 
     char final_hash[SHA_DIGEST_LENGTH * 2 +2];
     final_hash[0] = '*';

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

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

@@ -76,7 +76,7 @@
     curr_frame_id = 1; // curr_frame_id is 1-based
     if ( event_time >= event_data->start_time ) {
       Debug(2, "event time is after event start");
-      for (unsigned int i = 0; i < event_data->frame_count; i++ ) {
+      for ( unsigned int i = 0; i < event_data->frame_count; i++ ) {
         //Info( "eft %d > et %d", event_data->frames[i].timestamp, event_time );
         if ( event_data->frames[i].timestamp >= event_time ) {
           curr_frame_id = i+1;
@@ -117,7 +117,7 @@
   snprintf(sql, sizeof(sql),
       "SELECT `MonitorId`, `StorageId`, `Frames`, unix_timestamp( `StartTime` ) AS StartTimestamp, "
       "(SELECT max(`Delta`)-min(`Delta`) FROM `Frames` WHERE `EventId`=`Events`.`Id`) AS Duration, "
-      "`DefaultVideo`, `Scheme`, `SaveJPEGs` FROM `Events` WHERE `Id` = %" PRIu64, event_id);
+      "`DefaultVideo`, `Scheme`, `SaveJPEGs`, `Orientation`+0 FROM `Events` WHERE `Id` = %" PRIu64, event_id);
 
   if ( mysql_query(&dbconn, sql) ) {
     Error("Can't run query: %s", mysql_error(&dbconn));
@@ -160,6 +160,7 @@
     event_data->scheme = Storage::SHALLOW;
   }
   event_data->SaveJPEGs = dbrow[7] == NULL ? 0 : atoi(dbrow[7]);
+  event_data->Orientation = (Monitor::Orientation)(dbrow[8] == NULL ? 0 : atoi(dbrow[8]));
   mysql_free_result(result);
 
   Storage * storage = new Storage(event_data->storage_id);
@@ -376,6 +377,8 @@
         paused = true;
         replay_rate = ZM_RATE_BASE;
         step = 1;
+        if ( (unsigned int)curr_frame_id < event_data->frame_count )
+          curr_frame_id += 1;
         break;
     case CMD_SLOWREV :
         Debug(1, "Got SLOW REV command");
@@ -703,6 +706,34 @@
           Error("Failed getting a frame.");
           return false;
         }
+
+        // when stored as an mp4, we just have the rotation as a flag in the headers
+        // so we need to rotate it before outputting
+        if (
+            (monitor->GetOptVideoWriter() == Monitor::H264PASSTHROUGH)
+            and
+            (event_data->Orientation != Monitor::ROTATE_0)
+            ) {
+          Debug(2, "Rotating image %d", event_data->Orientation);
+          switch ( event_data->Orientation ) {
+            case Monitor::ROTATE_0 :
+              // No action required
+              break;
+            case Monitor::ROTATE_90 :
+            case Monitor::ROTATE_180 :
+            case Monitor::ROTATE_270 :
+              image->Rotate((event_data->Orientation-1)*90);
+              break;
+            case Monitor::FLIP_HORI :
+            case Monitor::FLIP_VERT :
+              image->Flip(event_data->Orientation==Monitor::FLIP_HORI);
+              break;
+            default:
+              Error("Invalid Orientation: %d", event_data->Orientation);
+          }
+        } else {
+          Debug(2, "Not Rotating image %d", event_data->Orientation);
+        } // end if have rotation
       } else {
         Error("Unable to get a frame");
         return false;
@@ -816,20 +847,15 @@
       // commands may set send_frame to true
       while ( checkCommandQueue() && !zm_terminate ) {
         // The idea is to loop here processing all commands before proceeding.
-        Debug(1, "Have command queue");
       }
-      Debug(2, "Done command queue");
 
       // Update modified time of the socket .lock file so that we can tell which ones are stale.
       if ( now.tv_sec - last_comm_update.tv_sec > 3600 ) {
         touch(sock_path_lock);
         last_comm_update = now;
       }
-    } else {
-      Debug(2, "Not checking command queue");
     }
 
-
     // Get current frame data
     FrameData *frame_data = &event_data->frames[curr_frame_id-1];
 
@@ -985,7 +1011,8 @@
       curr_frame_id += step;
 
     // Detects when we hit end of event and will load the next event or previous event
-    checkEventLoaded();
+    if ( !paused )
+      checkEventLoaded();
   } // end while ! zm_terminate
 #if HAVE_LIBAVCODEC
   if ( type == STREAM_MPEG )

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

zoneminder-1.34.2.tar.gz/src/zm_rtsp_auth.cpp -> zoneminder-1.34.8.tar.gz/src/zm_rtsp_auth.cpp Changed

@@ -144,7 +144,7 @@
 #if HAVE_DECL_MD5
   MD5((unsigned char*)ha1Data.c_str(), ha1Data.length(), md5buf);
 #elif HAVE_DECL_GNUTLS_FINGERPRINT
-  gnutls_datum_t md5dataha1 = { (unsigned char*)ha1Data.c_str(), ha1Data.length() };
+  gnutls_datum_t md5dataha1 = { (unsigned char*)ha1Data.c_str(), (unsigned int)ha1Data.length() };
   gnutls_fingerprint( GNUTLS_DIG_MD5, &md5dataha1, md5buf, &md5len );
 #endif
   for ( unsigned int j = 0; j < md5len; j++ ) {
@@ -159,7 +159,7 @@
 #if HAVE_DECL_MD5
   MD5((unsigned char*)ha2Data.c_str(), ha2Data.length(), md5buf );
 #elif HAVE_DECL_GNUTLS_FINGERPRINT
-  gnutls_datum_t md5dataha2 = { (unsigned char*)ha2Data.c_str(), ha2Data.length() };
+  gnutls_datum_t md5dataha2 = { (unsigned char*)ha2Data.c_str(), (unsigned int)ha2Data.length() };
   gnutls_fingerprint( GNUTLS_DIG_MD5, &md5dataha2, md5buf, &md5len );
 #endif
   for ( unsigned int j = 0; j < md5len; j++ ) {
@@ -180,7 +180,7 @@
 #if HAVE_DECL_MD5
   MD5((unsigned char*)digestData.c_str(), digestData.length(), md5buf);
 #elif HAVE_DECL_GNUTLS_FINGERPRINT
-  gnutls_datum_t md5datadigest = { (unsigned char*)digestData.c_str(), digestData.length() };
+  gnutls_datum_t md5datadigest = { (unsigned char*)digestData.c_str(), (unsigned int)digestData.length() };
   gnutls_fingerprint( GNUTLS_DIG_MD5, &md5datadigest, md5buf, &md5len );
 #endif
   for ( unsigned int j = 0; j < md5len; j++ ) {

zoneminder-1.34.2.tar.gz/src/zm_rtsp_auth.h -> zoneminder-1.34.8.tar.gz/src/zm_rtsp_auth.h Changed

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

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

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

zoneminder-1.34.2.tar.gz/utils/do_debian_package.sh -> zoneminder-1.34.8.tar.gz/utils/do_debian_package.sh Changed

@@ -80,7 +80,7 @@
 
 if [ "$DISTROS" == "" ]; then
   if [ "$RELEASE" != "" ]; then
-    DISTROS="xenial,bionic,disco,eoan,trusty"
+    DISTROS="xenial,bionic,disco,eoan,focal,trusty"
   else
     DISTROS=`lsb_release -a 2>/dev/null | grep Codename | awk '{print $2}'`;
   fi;
@@ -128,14 +128,14 @@
   fi;
 fi
 
+IFS='.' read -r -a VERSION_PARTS <<< "$RELEASE"
 if [ "$PPA" == "" ]; then
   if [ "$RELEASE" != "" ]; then
     # We need to use our official tarball for the original source, so grab it and overwrite our generated one.
-    IFS='.' read -r -a VERSION <<< "$RELEASE"
-    if [ "${VERSION[0]}.${VERSION[1]}" == "1.30" ]; then
+    if [ "${VERSION_PARTS[0]}.${VERSION_PARTS[1]}" == "1.30" ]; then
       PPA="ppa:iconnor/zoneminder-stable"
     else
-      PPA="ppa:iconnor/zoneminder-${VERSION[0]}.${VERSION[1]}"
+      PPA="ppa:iconnor/zoneminder-${VERSION_PARTS[0]}.${VERSION_PARTS[1]}"
     fi;
   else
     if [ "$BRANCH" == "" ]; then
@@ -316,7 +316,7 @@
       read -p "Do you want to upload this binary to zmrepo? (y/N)"
       if [[ $REPLY == [yY] ]]; then
         if [ "$RELEASE" != "" ]; then
-          scp "zoneminder_${VERSION}-${DISTRO}"* "zoneminder-doc_${VERSION}-${DISTRO}"* "zoneminder-dbg_${VERSION}-${DISTRO}"* "zoneminder_${VERSION}.orig.tar.gz" "zmrepo@zmrepo.connortechnology.com:debian/stable/mini-dinstall/incoming/"
+          scp "zoneminder_${VERSION}-${DISTRO}"* "zoneminder-doc_${VERSION}-${DISTRO}"* "zoneminder-dbg_${VERSION}-${DISTRO}"* "zoneminder_${VERSION}.orig.tar.gz" "zmrepo@zmrepo.connortechnology.com:debian/release-${VERSION_PARTS[0]}.${VERSION_PARTS[1]}/mini-dinstall/incoming/"
         else
           if [ "$BRANCH" == "" ]; then
             scp "zoneminder_${VERSION}-${DISTRO}"* "zoneminder-doc_${VERSION}-${DISTRO}"* "zoneminder-dbg_${VERSION}-${DISTRO}"* "zoneminder_${VERSION}.orig.tar.gz" "zmrepo@zmrepo.connortechnology.com:debian/master/mini-dinstall/incoming/"

zoneminder-1.34.2.tar.gz/utils/packpack/rsync_xfer.sh -> zoneminder-1.34.8.tar.gz/utils/packpack/rsync_xfer.sh Changed

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

zoneminder-1.34.2.tar.gz/web/ajax/add_monitors.php -> zoneminder-1.34.8.tar.gz/web/ajax/add_monitors.php Changed

@@ -46,18 +46,18 @@
           SOL_SOCKET,  // socket level
           SO_SNDTIMEO, // timeout option
           array(
-            "sec"=>0, // Timeout in seconds
-            "usec"=>500  // I assume timeout in microseconds
+            'sec'=>0, // Timeout in seconds
+            'usec'=>500  // I assume timeout in microseconds
             )
           );
       $new_stream = null;
-Info("Testing connection to " . $url_bits['host'].':'.$port);
+      Info('Testing connection to '.$url_bits['host'].':'.$port);
       if ( socket_connect( $socket, $url_bits['host'], $port ) ) {
         $new_stream = $url_bits; // make a copy
         $new_stream['port'] = $port;
       } else {
         socket_close($socket); 
-        ZM\Info("No connection to ".$url_bits['host'] . " on port $port");
+        ZM\Info('No connection to '.$url_bits['host'].' on port '.$port);
         continue;
       }
       if ( $new_stream ) {
@@ -92,10 +92,10 @@
   }
   foreach ( $available_streams as &$stream ) {
     # check for existence in db.
-    $stream['url'] = unparse_url( $stream, array('path'=>'/','query'=>'action=stream') );
-    $monitors = ZM\Monitor::find( array('Path'=>$stream['url']) );
+    $stream['url'] = unparse_url($stream, array('path'=>'/','query'=>'action=stream'));
+    $monitors = ZM\Monitor::find(array('Path'=>$stream['url']));
     if ( count($monitors) ) {
-      ZM\Info("Found monitors matching " . $stream['url'] );
+      ZM\Info('Found monitors matching ' . $stream['url'] );
       $stream['Monitor'] = $monitors[0];
       if ( isset( $stream['Width'] ) and ( $stream['Monitor']->Width() != $stream['Width'] ) ) {
         $stream['Warning'] .= 'Monitor width ('.$stream['Monitor']->Width().') and stream width ('.$stream['Width'].") do not match!\n";
@@ -106,11 +106,11 @@
     } else {
       $stream['Monitor'] = clone $defaultMonitor;
       if ( isset($stream['Width']) ) {
-        $stream['Monitor']->Width( $stream['Width'] );
-        $stream['Monitor']->Height( $stream['Height'] );
+        $stream['Monitor']->Width($stream['Width']);
+        $stream['Monitor']->Height($stream['Height']);
       }
       if ( isset($stream['Name']) ) {
-        $stream['Monitor']->Name( $stream['Name'] );
+        $stream['Monitor']->Name($stream['Name']);
       }
     } // Monitor found or not
   } // end foreach Stream
@@ -121,16 +121,16 @@
   return $available_streams;
 } // end function probe
 
-if ( canEdit( 'Monitors' ) ) {
+if ( canEdit('Monitors') ) {
     switch ( $_REQUEST['action'] ) {
       case 'probe' :
         {
         $available_streams = array();
         $url_bits = null;
-        if ( preg_match('/(\d+)\.(\d+)\.(\d+)\.(\d+)/', $_REQUEST['url'] ) ) {
-          $url_bits = array( 'host'=>$_REQUEST['url'] );
+        if ( preg_match('/(\d+)\.(\d+)\.(\d+)\.(\d+)/', $_REQUEST['url']) ) {
+          $url_bits = array('host'=>$_REQUEST['url']);
         } else {
-          $url_bits = parse_url( $_REQUEST['url'] );
+          $url_bits = parse_url($_REQUEST['url']);
         }
 
 if ( 0 ) {
@@ -147,13 +147,13 @@
 }
 
         if ( ! $url_bits ) {
-          ajaxError("The given URL was too malformed to parse.");
+          ajaxError('The given URL was too malformed to parse.');
           return;
         }
 
-        $available_streams = probe( $url_bits );
+        $available_streams = probe($url_bits);
 
-        ajaxResponse( array('Streams'=>$available_streams) );
+        ajaxResponse(array('Streams'=>$available_streams));
         return;
       } // end case url_probe
       case 'import':
@@ -161,16 +161,16 @@
 
         $file = $_FILES['import_file'];
 
-        if ($file["error"] > 0) {
-          ajaxError($file["error"]);
+        if ( $file['error'] > 0 ) {
+          ajaxError($file['error']);
           return;
         } else {
-          $filename = $file["name"];
+          $filename = $file['name'];
 
-        $available_streams = array();
+          $available_streams = array();
           $row = 1;
-          if (($handle = fopen($file['tmp_name'], 'r')) !== FALSE) {
-            while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
+          if ( ($handle = fopen($file['tmp_name'], 'r')) !== FALSE ) {
+            while ( ($data = fgetcsv($handle, 1000, ',')) !== FALSE ) {
               $name = $data[0];
               $url = $data[1];
               $group = $data[2];
@@ -178,16 +178,16 @@
 
               $url_bits = null;
               if ( preg_match('/(\d+)\.(\d+)\.(\d+)\.(\d+)/', $url) ) {
-                $url_bits = array( 'host'=>$url, 'scheme'=>'http' );
+                $url_bits = array('host'=>$url, 'scheme'=>'http');
               } else {
-                $url_bits = parse_url( $url );
+                $url_bits = parse_url($url);
               }
               if ( ! $url_bits ) {
                 ZM\Info("Bad url, skipping line $name $url $group");
                 continue;
               }
 
-              $available_streams += probe( $url_bits );
+              $available_streams += probe($url_bits);
 
               //$url_bits['url'] = unparse_url( $url_bits );
               //$url_bits['Monitor'] = $defaultMonitor;
@@ -197,23 +197,19 @@
               
             } // end while rows
             fclose($handle);
-            ajaxResponse( array('Streams'=>$available_streams) );
+            ajaxResponse(array('Streams'=>$available_streams));
           } else {
-            ajaxError("Uploaded file does not exist");
+            ajaxError('Uploaded file does not exist');
             return;
           }
-
         }
       } // end case import
       default:
-      {
-        ZM\Warning("unknown action " . $_REQUEST['action'] );
-      } // end ddcase default
-    }
+        ZM\Warning('unknown action '.$_REQUEST['action']);
+    } // end switch action
 } else {
-  ZM\Warning("Cannot edit monitors" );
+  ZM\Warning('Cannot edit monitors');
 }
 
-ajaxError( 'Unrecognised action or insufficient permissions' );
-
+ajaxError('Unrecognised action '.$_REQUEST['action'].' or insufficient permissions for user ' . $user['Username']);
 ?>

zoneminder-1.34.2.tar.gz/web/ajax/console.php -> zoneminder-1.34.8.tar.gz/web/ajax/console.php Changed

@@ -1,35 +1,33 @@
 <?php
 if ( canEdit('Monitors') ) {
-    switch ( $_REQUEST['action'] ) {
-      case 'sort' :
-        {
-          $monitor_ids = $_POST['monitor_ids'];
-          # Two concurrent sorts could generate odd sortings... so lock the table.
-          global $dbConn;
-          $dbConn->beginTransaction();
-          $dbConn->exec('LOCK TABLES Monitors WRITE');
-          for ( $i = 0; $i < count($monitor_ids); $i += 1 ) {
-            $monitor_id = $monitor_ids[$i];
-            $monitor_id = preg_replace( '/^monitor_id-/', '', $monitor_id );
-            if ( ( ! $monitor_id ) or ! ( is_integer( $monitor_id ) or ctype_digit( $monitor_id ) ) ) {
-              Warning("Got $monitor_id from " . $monitor_ids[$i]);
-              continue;
-            }
-            dbQuery('UPDATE Monitors SET Sequence=? WHERE Id=?', array($i, $monitor_id));
-          } // end for each monitor_id
-          $dbConn->commit();
-          $dbConn->exec('UNLOCK TABLES');
-        
-          return;
-      } // end case sort
-      default:
-      {
-        ZM\Warning('unknown action ' . $_REQUEST['action']);
-      } // end ddcase default
-    }
+  switch ( $_REQUEST['action'] ) {
+  case 'sort' :
+  {
+    $monitor_ids = $_POST['monitor_ids'];
+    # Two concurrent sorts could generate odd sortings... so lock the table.
+    global $dbConn;
+    $dbConn->beginTransaction();
+    $dbConn->exec('LOCK TABLES Monitors WRITE');
+    for ( $i = 0; $i < count($monitor_ids); $i += 1 ) {
+      $monitor_id = $monitor_ids[$i];
+      $monitor_id = preg_replace('/^monitor_id-/', '', $monitor_id);
+      if ( ( !$monitor_id ) or ! ( is_integer($monitor_id) or ctype_digit($monitor_id) ) ) {
+        Warning('Got '.$monitor_id.' from '.$monitor_ids[$i]);
+        continue;
+      }
+      dbQuery('UPDATE Monitors SET Sequence=? WHERE Id=?', array($i, $monitor_id));
+    } // end for each monitor_id
+    $dbConn->commit();
+    $dbConn->exec('UNLOCK TABLES');
+
+    return;
+  } // end case sort
+  default:
+    ZM\Warning('unknown action '.$_REQUEST['action']);
+  }
 } else {
   ZM\Warning('Cannot edit monitors');
 }
 
-ajaxError('Unrecognised action or insufficient permissions');
+ajaxError('Unrecognised action '.$_REQUEST['action'].' or insufficient permissions for user ' . $user['Username']);
 ?>

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

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

zoneminder-1.34.2.tar.gz/web/ajax/stream.php -> zoneminder-1.34.8.tar.gz/web/ajax/stream.php Changed

@@ -86,10 +86,8 @@
   $numSockets = socket_select($rSockets, $wSockets, $eSockets, intval($timeout/1000), ($timeout%1000)*1000);
 
   if ( $numSockets === false ) {
-    ZM\Error('socket_select failed: ' . socket_strerror(socket_last_error()));
     ajaxError('socket_select failed: '.socket_strerror(socket_last_error()));
   } else if ( $numSockets < 0 ) {
-    ZM\Error("Socket closed $remSockFile");
     ajaxError("Socket closed $remSockFile");
   } else if ( $numSockets == 0 ) {
     ZM\Error("Timed out waiting for msg $remSockFile");
@@ -97,7 +95,6 @@
     #ajaxError("Timed out waiting for msg $remSockFile");
   } else if ( $numSockets > 0 ) {
     if ( count($rSockets) != 1 ) {
-      ZM\Error('Bogus return from select, '.count($rSockets).' sockets available');
       ajaxError('Bogus return from select, '.count($rSockets).' sockets available');
     }
   }
@@ -124,10 +121,12 @@
     $data['delay'] = round( $data['delay'], 2 );
     $data['zoom'] = round( $data['zoom']/SCALE_BASE, 1 );
     if ( ZM_OPT_USE_AUTH && (ZM_AUTH_RELAY == 'hashed') ) {
-      $time = time();
-      // Regenerate auth hash after half the lifetime of the hash
-      if ( (!isset($_SESSION['AuthHashGeneratedAt'])) or ( $_SESSION['AuthHashGeneratedAt'] < $time - (ZM_AUTH_HASH_TTL * 1800) ) ) {
-        $data['auth'] = generateAuthHash(ZM_AUTH_HASH_IPS);
+      $auth_hash = generateAuthHash(ZM_AUTH_HASH_IPS);
+      if ( isset($_REQUEST['auth']) and ($_REQUEST['auth'] != $auth_hash) ) {
+        $data['auth'] = $auth_hash;
+        ZM\Logger::Debug("including nw auth hash " . $data['auth']);
+      } else {
+        ZM\Logger::Debug('Not including nw auth hash becase it hashn\'t changed '.$auth_hash);
       } 
     }
     ajaxResponse(array('status'=>$data));
@@ -141,12 +140,11 @@
       $data = unpack('ltype/Qevent/iprogress/irate/izoom/Cpaused', $msg);
     }
     $data['rate'] /= RATE_BASE;
-    $data['zoom'] = round( $data['zoom']/SCALE_BASE, 1 );
+    $data['zoom'] = round($data['zoom']/SCALE_BASE, 1);
     if ( ZM_OPT_USE_AUTH && (ZM_AUTH_RELAY == 'hashed') ) {
-      $time = time();
-      // Regenerate auth hash after half the lifetime of the hash
-      if ( (!isset($_SESSION['AuthHashGeneratedAt'])) or ( $_SESSION['AuthHashGeneratedAt'] < $time - (ZM_AUTH_HASH_TTL * 1800) ) ) {
-        $data['auth'] = generateAuthHash(ZM_AUTH_HASH_IPS);
+      $auth_hash = generateAuthHash(ZM_AUTH_HASH_IPS);
+      if ( isset($_REQUEST['auth']) and ($_REQUEST['auth'] != $auth_hash) ) {
+        $data['auth'] = $auth_hash;
       } 
     }
     ajaxResponse(array('status'=>$data));

zoneminder-1.34.2.tar.gz/web/api/app/Controller/EventsController.php -> zoneminder-1.34.8.tar.gz/web/api/app/Controller/EventsController.php Changed

zoneminder-1.34.2.tar.gz/web/api/app/Controller/MonitorsController.php -> zoneminder-1.34.8.tar.gz/web/api/app/Controller/MonitorsController.php Changed

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

@@ -511,11 +511,12 @@
       if ( ZM_OPT_USE_AUTH ) {
         if ( ZM_AUTH_RELAY == 'hashed' ) {
           $url .= '?auth='.generateAuthHash( ZM_AUTH_HASH_IPS );
-        } elseif ( ZM_AUTH_RELAY == 'plain' ) {
-          $url = '?user='.$_SESSION['username'];
-          $url = '?pass='.$_SESSION['password'];
-        } elseif ( ZM_AUTH_RELAY == 'none' ) {
-          $url = '?user='.$_SESSION['username'];
+        } else if ( ZM_AUTH_RELAY == 'plain' ) {
+          $url .= '?user='.$_SESSION['username'];
+          $url .= '?pass='.$_SESSION['password'];
+        } else {
+          Error('Multi-Server requires AUTH_RELAY be either HASH or PLAIN');
+          return;
         }
       }
       Logger::Debug("sending command to $url");
@@ -557,12 +558,13 @@
       $url = $Server->UrlToApi() . '/events/'.$this->{'Id'}.'.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);
         } elseif ( ZM_AUTH_RELAY == 'plain' ) {
-          $url = '?user='.$_SESSION['username'];
-          $url = '?pass='.$_SESSION['password'];
-        } elseif ( ZM_AUTH_RELAY == 'none' ) {
-          $url = '?user='.$_SESSION['username'];
+          $url .= '?user='.$_SESSION['username'];
+          $url .= '?pass='.$_SESSION['password'];
+        } else {
+          Error('Multi-Server requires AUTH_RELAY be either HASH or PLAIN');
+          return;
         }
       }
       Logger::Debug("sending command to $url");

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

@@ -284,12 +284,13 @@
       $url = $Server->UrlToApi().'/monitors/daemonControl/'.$this->{'Id'}.'/'.$mode.'/zmc.json';
       if ( ZM_OPT_USE_AUTH ) {
         if ( ZM_AUTH_RELAY == 'hashed' ) {
-          $url .= '?auth='.generateAuthHash( ZM_AUTH_HASH_IPS );
-        } elseif ( ZM_AUTH_RELAY == 'plain' ) {
-          $url = '?user='.$_SESSION['username'];
-          $url = '?pass='.$_SESSION['password'];
-        } elseif ( ZM_AUTH_RELAY == 'none' ) {
-          $url = '?user='.$_SESSION['username'];
+          $url .= '?auth='.generateAuthHash(ZM_AUTH_HASH_IPS);
+        } else if ( ZM_AUTH_RELAY == 'plain' ) {
+          $url .= '?user='.$_SESSION['username'];
+          $url .= '?pass='.$_SESSION['password'];
+        } else {
+          Error('Multi-Server requires AUTH_RELAY be either HASH or PLAIN');
+          return;
         }
       }
       Logger::Debug("sending command to $url");
@@ -342,12 +343,13 @@
       $url = ZM_BASE_PROTOCOL . '://'.$Server->Hostname().'/zm/api/monitors/daemonControl/'.$this->{'Id'}.'/'.$mode.'/zma.json';
       if ( ZM_OPT_USE_AUTH ) {
         if ( ZM_AUTH_RELAY == 'hashed' ) {
-          $url .= '?auth='.generateAuthHash( ZM_AUTH_HASH_IPS );
-        } elseif ( ZM_AUTH_RELAY == 'plain' ) {
-          $url = '?user='.$_SESSION['username'];
-          $url = '?pass='.$_SESSION['password'];
-        } elseif ( ZM_AUTH_RELAY == 'none' ) {
-          $url = '?user='.$_SESSION['username'];
+          $url .= '?auth='.generateAuthHash(ZM_AUTH_HASH_IPS);
+        } else if ( ZM_AUTH_RELAY == 'plain' ) {
+          $url .= '?user='.$_SESSION['username'];
+          $url .= '?pass='.$_SESSION['password'];
+        } else {
+          Error('Multi-Server requires AUTH_RELAY be either HASH or PLAIN');
+          return;
         }
       }
       Logger::Debug("sending command to $url");
@@ -495,6 +497,10 @@
     if ( !count($options) ) {
       if ( $command == 'quit' ) {
         $options['command'] = 'quit';
+      } else if ( $command == 'start' ) {
+        $options['command'] = 'start';
+      } else if ( $command == 'stop' ) {
+        $options['command'] = 'stop';
       } else {
         Warning("No commands to send to zmcontrol from $command");
         return false;
@@ -529,7 +535,7 @@
     } else if ( $this->ServerId() ) {
       $Server = $this->Server();
 
-      $url = ZM_BASE_PROTOCOL . '://'.$Server->Hostname().'/zm/api/monitors/daemonControl/'.$this->{'Id'}.'/'.$mode.'/zmcontrol.json';
+      $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 );
@@ -545,12 +551,12 @@
       $context = stream_context_create();
       try {
         $result = file_get_contents($url, false, $context);
-        if ($result === FALSE) { /* Handle error */
-          Error("Error restarting zma using $url");
+        if ( $result === FALSE ) { /* Handle error */
+          Error("Error sending command using $url");
           return false;
         }
       } catch ( Exception $e ) {
-        Error("Except $e thrown trying to restart zma");
+        Error("Exception $e thrown trying to send command to $url");
         return false;
       }
     } else {

zoneminder-1.34.2.tar.gz/web/includes/actions/monitor.php -> zoneminder-1.34.8.tar.gz/web/includes/actions/monitor.php Changed

@@ -33,12 +33,11 @@
       if ( !$x10Monitor )
         $x10Monitor = array();
     }
-    if ( !canEdit('Monitors',$mid) ) {
+    if ( !canEdit('Monitors', $mid) ) {
       ZM\Warning('You do not have permission to edit this monitor');
       return;
     }
   } else {
-    #$monitor = array();
     if ( ZM_OPT_X10 ) {
       $x10Monitor = array();
     }
@@ -58,6 +57,7 @@
       'Enabled' => 0,
       'Exif' => 0,
       'RTSPDescribe' => 0,
+      'V4LMultiBuffer'  => '',
       'RecordAudio' => 0,
       'Method' => 'raw',
       'GroupIds'  =>  array(),
@@ -92,6 +92,9 @@
       if ( $monitor->Type() != 'WebSite' ) {
         $monitor->zmaControl('stop');
         $monitor->zmcControl('stop');
+        if ( $monitor->Controllable() ) {
+          $monitor->sendControlCommand('stop');
+        }
       }
 
       # These are used in updating zones
@@ -264,8 +267,7 @@
         $monitor->zmaControl('start');
 
       if ( $monitor->Controllable() ) {
-        require_once('includes/control_functions.php');
-        $monitor->sendControlCommand('quit');
+        $monitor->sendControlCommand('start');
       }
     }
     // really should thump zmwatch and maybe zmtrigger too.

zoneminder-1.34.2.tar.gz/web/includes/actions/montage.php -> zoneminder-1.34.8.tar.gz/web/includes/actions/montage.php Changed

zoneminder-1.34.2.tar.gz/web/includes/actions/user.php -> zoneminder-1.34.8.tar.gz/web/includes/actions/user.php Changed

@@ -45,8 +45,16 @@
       if ( !empty($_REQUEST['uid']) ) {
         dbQuery('UPDATE Users SET '.implode(', ', $changes).' WHERE Id = ?', array($_REQUEST['uid']));
         # If we are updating the logged in user, then update our session user data.
-        if ( $user and ( $dbUser['Username'] == $user['Username'] ) )
-          generateAuthHash(ZM_AUTH_HASH_IPS);
+        if ( $user and ( $dbUser['Username'] == $user['Username'] ) ) {
+          # We are the logged in user, need to update the $user object and generate a new auth_hash
+          $sql = 'SELECT * FROM Users WHERE Enabled=1 AND Id=?';
+          $user = dbFetchOne($sql, NULL, array($_REQUEST['uid']));
+
+          # Have to update auth hash in session
+          zm_session_start();
+          generateAuthHash(ZM_AUTH_HASH_IPS, true);
+          session_write_close();
+        }
       } else {
         dbQuery('INSERT INTO Users SET '.implode(', ', $changes));
       }
@@ -61,8 +69,8 @@
     $types = array();
     $changes = getFormChanges($dbUser, $_REQUEST['newUser'], $types);
 
-    if (function_exists ('password_hash')) {
-      $pass_hash = '"'.password_hash($pass, PASSWORD_BCRYPT).'"';
+    if ( function_exists('password_hash') ) {
+      $pass_hash = '"'.password_hash($_REQUEST['newUser']['Password'], PASSWORD_BCRYPT).'"';
     } else {
       $pass_hash = ' PASSWORD('.dbEscape($_REQUEST['newUser']['Password']).') ';
       ZM\Info ('Cannot use bcrypt as you are using PHP < 5.3');
@@ -75,8 +83,15 @@
     }
     if ( count($changes) ) {
       dbQuery('UPDATE Users SET '.implode(', ', $changes).' WHERE Id=?', array($uid));
+
+      # We are the logged in user, need to update the $user object and generate a new auth_hash
+      $sql = 'SELECT * FROM Users WHERE Enabled=1 AND Id=?';
+      $user = dbFetchOne($sql, NULL, array($uid));
+      
+      zm_session_start();
+      generateAuthHash(ZM_AUTH_HASH_IPS, true);
+      session_write_close();
       $refreshParent = true;
-      generateAuthHash(ZM_AUTH_HASH_IPS);
     }
     $view = 'none';
   }

zoneminder-1.34.2.tar.gz/web/includes/auth.php -> zoneminder-1.34.8.tar.gz/web/includes/auth.php Changed

@@ -123,12 +123,16 @@
 
   // convert from stdclass to array
   $jwt_payload = json_decode(json_encode($decoded_token), true);
-
-  $type = $jwt_payload['type'];
-  if ( $type != $allowed_token_type ) {
-    ZM\Error("Token type mismatch. Expected $allowed_token_type but got $type");
-    return array(false, 'Incorrect token type');
+  if ($allowed_token_type != 'any') {
+    $type = $jwt_payload['type'];
+    if ( $type != $allowed_token_type ) {
+      ZM\Error("Token type mismatch. Expected $allowed_token_type but got $type");
+      return array(false, 'Incorrect token type');
+    }
+  } else {
+    ZM\Logger::Debug('Not comparing token types as [any] was passed');
   }
+  
   $username = $jwt_payload['user'];
   $sql = 'SELECT * FROM Users WHERE Enabled=1 AND Username=?';
   $saved_user_details = dbFetchOne($sql, NULL, array($username));
@@ -258,13 +262,14 @@
 
 if ( ZM_OPT_USE_AUTH ) {
   if ( !empty($_REQUEST['token']) ) {
-    $ret = validateToken($_REQUEST['token'], 'access');
+    // we only need to get the username here
+    // don't know the token type. That will
+    // be checked later 
+    $ret = validateToken($_REQUEST['token'], 'any');
     $user = $ret[0];
   } else {
     // Non token based auth
 
-    $user = userFromSession();
-
     if ( ZM_AUTH_HASH_LOGINS && empty($user) && !empty($_REQUEST['auth']) ) {
       $user = getAuthUser($_REQUEST['auth']);
     } else if (
@@ -280,6 +285,12 @@
         return;
       }
       $user = $ret[0];
+    } else if ( (ZM_AUTH_TYPE == 'remote') and !empty($_SERVER['REMOTE_USER']) ) {
+      $sql = 'SELECT * FROM Users WHERE Enabled=1 AND Username=?';
+      // local user, shouldn't affect the global user
+      $user = dbFetchOne($sql, NULL, array($_SERVER['REMOTE_USER']));
+    } else {
+      $user = userFromSession();
     }
 
     if ( !empty($user) ) {

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

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

@@ -937,7 +937,7 @@
     $command .= ' -o';
   $command = escapeshellcmd($command);
   $result = exec($command, $output, $status);
-Logger::Debug("generating Video $command: result($result outptu:(".implode("\n", $output )." status($status");
+  ZM\Logger::Debug("generating Video $command: result($result outptu:(".implode("\n", $output )." status($status");
   return $status ? '' : rtrim($result);
 }
 
@@ -2282,9 +2282,14 @@
 
 function getStreamHTML($monitor, $options = array()) {
 
-  if ( isset($options['scale']) and $options['scale'] and ($options['scale'] != 100) ) {
-    $options['width'] = reScale($monitor->ViewWidth(), $options['scale']).'px';
-    $options['height'] = reScale($monitor->ViewHeight(), $options['scale']).'px';
+  if ( isset($options['scale']) ) {
+    if ( $options['scale'] != 'auto' ) {
+      $options['width'] = reScale($monitor->ViewWidth(), $options['scale']).'px';
+      $options['height'] = reScale($monitor->ViewHeight(), $options['scale']).'px';
+    } else {
+      $options['width'] = '100%';
+      $options['height'] = 'auto';
+    }
   } else {
     # scale is empty or 100
     # There may be a fixed width applied though, in which case we need to leave the height empty
@@ -2615,4 +2620,19 @@
     str_pad( dechex( mt_rand( 0, 255 ) ), 2, '0', STR_PAD_LEFT);
 }
 
+function zm_random_bytes($length = 32){
+  if ( !isset($length) || intval($length) <= 8 ) {
+    $length = 32;
+  }
+  if ( function_exists('random_bytes') ) {
+    return random_bytes($length);
+  }
+  if ( function_exists('mcrypt_create_iv') ) {
+    return mcrypt_create_iv($length, MCRYPT_DEV_URANDOM);
+  }
+  if ( function_exists('openssl_random_pseudo_bytes') ) {
+    return openssl_random_pseudo_bytes($length);
+  }
+  ZM\Error('No random_bytes function found.');
+}
 ?>

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

@@ -153,7 +153,6 @@
 }
 
 
-require_once('includes/lang.php');
 
 # Running is global but only do the daemonCheck if it is actually needed
 $running = null;
@@ -177,17 +176,21 @@
 
 
 # Add CSP Headers
-$cspNonce = bin2hex(openssl_random_pseudo_bytes(16));
+$cspNonce = bin2hex(zm_random_bytes(16));
 
 $request = null;
 if ( isset($_REQUEST['request']) )
   $request = detaintPath($_REQUEST['request']);
 
 require_once('includes/auth.php');
+
 # Only one request can open the session file at a time, so let's close the session here to improve concurrency.
 # Any file/page that sets session variables must re-open it.
 session_write_close();
 
+// lang references $user[Language] so must come after auth
+require_once('includes/lang.php');
+
 foreach ( getSkinIncludes('skin.php') as $includeFile ) {
   require_once $includeFile;
 }
@@ -202,7 +205,8 @@
 
 if ( (!$view and !$request) or ($view == 'console') ) {
   // Verify the system, php, and mysql timezones all match
-  date_default_timezone_set(ZM_TIMEZONE);
+  #if ( ZM_TIMEZONE )
+  #date_default_timezone_set(ZM_TIMEZONE);
   check_timezone();
 }

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

zoneminder-1.34.2.tar.gz/web/skins/classic/css/base/views/control.css -> zoneminder-1.34.8.tar.gz/web/skins/classic/css/base/views/control.css Changed

zoneminder-1.34.2.tar.gz/web/skins/classic/css/classic/views/control.css -> zoneminder-1.34.8.tar.gz/web/skins/classic/css/classic/views/control.css Changed

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

@@ -125,7 +125,7 @@
     <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 leftBtn<?php echo $hasPan?'':' invisible' ?>" onclick="controlCmd('<?php echo $cmds['MoveLeft'] ?>',event,-1,0)"></button>
 <?php if ( isset($cmds['Center']) ) { ?>
     <button type="button" class="arrowBtn centerBtn" onclick="controlCmd('<?php echo $cmds['Center'] ?>')"></button>
 <?php } else { ?>

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

@@ -99,10 +99,9 @@
 <link rel="stylesheet" href="skins/classic/js/chosen/chosen.min.css" type="text/css"/>
 <?php
   if ( $basename == 'watch' ) {
-    echo output_link_if_exists( array(
-      '/css/base/views/control.css',
-      '/css/'.$css.'/views/control.css'
-    ) );
+    echo output_link_if_exists(array('/css/base/views/control.css'));
+    if ( $css != 'base' )
+      echo output_link_if_exists(array('/css/'.$css.'/views/control.css'));
   }
 ?>
   <style type="text/css">
@@ -423,7 +422,14 @@
     $storage_areas = $storage_areas_with_no_server_id;
   if ( count($storage_areas) <= 4 )
     echo implode(', ', array_map($func, $storage_areas));
-  echo ' ' . ZM_PATH_MAP .': '. getDiskPercent(ZM_PATH_MAP).'%';
+  $shm_percent = getDiskPercent(ZM_PATH_MAP);
+  $class = '';
+  if ( $shm_percent > 98 ) {
+    $class = 'error';
+  } else if ( $shm_percent > 90 ) {
+    $class = 'warning';
+  }
+  echo ' <span class="'.$class.'">'.ZM_PATH_MAP.': '.$shm_percent.'%</span>';
 ?></li>
   </ul>
     <?php if ( defined('ZM_WEB_CONSOLE_BANNER') and ZM_WEB_CONSOLE_BANNER != '' ) { ?>

zoneminder-1.34.2.tar.gz/web/skins/classic/includes/timeline_functions.php -> zoneminder-1.34.8.tar.gz/web/skins/classic/includes/timeline_functions.php Changed

@@ -1,6 +1,6 @@
 <?php
 
-function getDateScale( $scales, $range, $minLines, $maxLines ) {
+function getDateScale($scales, $range, $minLines, $maxLines) {
 	foreach ( $scales as $scale ) {
 		$align = isset($scale['align'])?$scale['align']:1;
 		$scaleRange = (int)($range/($scale['factor']*$align));
@@ -18,10 +18,10 @@
 		$scale['divisor']++;
 	}
 	$scale['lines'] = (int)($scale['range']/$scale['divisor']);
-	return( $scale );
+	return $scale;
 }
 
-function getYScale( $range, $minLines, $maxLines ) {
+function getYScale($range, $minLines, $maxLines) {
 	$scale['range'] = $range;
 	$scale['divisor'] = 1;
 	while ( $scale['range']/$scale['divisor'] > $maxLines ) {
@@ -29,20 +29,21 @@
 	}
 	$scale['lines'] = (int)(($scale['range']-1)/$scale['divisor'])+1;
 
-	return( $scale );
+	return $scale;
 }
 
-function getSlotFrame( $slot ) {
+function getSlotFrame($slot) {
 	$slotFrame = isset($slot['frame'])?$slot['frame']['FrameId']:1;
+  # FIXME what's with this false?
 	if ( false && $slotFrame ) {
 		$slotFrame -= $monitor['PreEventCount'];
 		if ( $slotFrame < 1 )
 			$slotFrame = 1;
 	}
-	return( $slotFrame );
+	return $slotFrame;
 }
 
-function parseFilterToTree( $filter ) {
+function parseFilterToTree($filter) {
 	if ( count($filter['terms']) <= 0 ) {
 		return false;
 	}
@@ -68,73 +69,82 @@
 			'or' => 4,
 			);
 
-	for ( $i = 0; $i <= count($terms); $i++ ) {
-		if ( !empty($terms[$i]['cnj']) ) {
+	for ( $i = 0; $i < count($terms); $i++ ) {
+    $term = $terms[$i];
+		if ( !empty($term['cnj']) ) {
 			while( true ) {
 				if ( !count($postfixStack) ) {
-					$postfixStack[] = array('type'=>'cnj', 'value'=>$terms[$i]['cnj'], 'sqlValue'=>$terms[$i]['cnj']);
+					$postfixStack[] = array('type'=>'cnj', 'value'=>$term['cnj'], 'sqlValue'=>$term['cnj']);
 					break;
 				} elseif ( $postfixStack[count($postfixStack)-1]['type'] == 'obr' ) {
-					$postfixStack[] = array('type'=>'cnj', 'value'=>$terms[$i]['cnj'], 'sqlValue'=>$terms[$i]['cnj']);
+					$postfixStack[] = array('type'=>'cnj', 'value'=>$term['cnj'], 'sqlValue'=>$term['cnj']);
 					break;
-				} elseif ( $priorities[$terms[$i]['cnj']] < $priorities[$postfixStack[count($postfixStack)-1]['value']] ) {
-					$postfixStack[] = array('type'=>'cnj', 'value'=>$terms[$i]['cnj'], 'sqlValue'=>$terms[$i]['cnj']);
+				} elseif ( $priorities[$term['cnj']] < $priorities[$postfixStack[count($postfixStack)-1]['value']] ) {
+					$postfixStack[] = array('type'=>'cnj', 'value'=>$term['cnj'], 'sqlValue'=>$term['cnj']);
 					break;
 				} else {
 					$postfixExpr[] = array_pop($postfixStack);
 				}
 			}
-		}
-		if ( !empty($terms[$i]['obr']) ) {
-			for ( $j = 0; $j < $terms[$i]['obr']; $j++ ) {
-				$postfixStack[] = array('type'=>'obr', 'value'=>$terms[$i]['obr']);
+		} # end if ! empty cnj
+
+		if ( !empty($term['obr']) ) {
+			for ( $j = 0; $j < $term['obr']; $j++ ) {
+				$postfixStack[] = array('type'=>'obr', 'value'=>$term['obr']);
 			}
 		}
-		if ( !empty($terms[$i]['attr']) ) {
+		if ( !empty($term['attr']) ) {
 			$dtAttr = false;
-			switch ( $terms[$i]['attr']) {
+			switch ( $term['attr']) {
 				case 'MonitorName':
-					$sqlValue = 'M.'.preg_replace( '/^Monitor/', '', $terms[$i]['attr']);
+					$sqlValue = 'M.'.preg_replace( '/^Monitor/', '', $term['attr']);
 					break;
 				case 'ServerId':
 					$sqlValue .= 'M.ServerId';
-					break;
+          break;
+        case 'StorageServerId':
+          $sqlValue .= 'S.ServerId';
+          break;
+        case 'FilterServerId':
+          $sqlValue .= ZM_SERVER_ID;
+          break;
 				case 'DateTime':
 				case 'StartDateTime':
-					$sqlValue = "E.StartTime";
+					$sqlValue = 'E.StartTime';
 					$dtAttr = true;
 					break;
 				case 'Date':
 				case 'StartDate':
-					$sqlValue = "to_days( E.StartTime )";
+					$sqlValue = 'to_days(E.StartTime)';
 					$dtAttr = true;
 					break;
 				case 'Time':
 				case 'StartTime':
-					$sqlValue = "extract( hour_second from E.StartTime )";
+					$sqlValue = 'extract(hour_second from E.StartTime)';
 					break;
 				case 'Weekday':
 				case 'StartWeekday':
-					$sqlValue = "weekday( E.StartTime )";
+					$sqlValue = 'weekday(E.StartTime)';
 					break;
 				case 'EndDateTime':
-					$sqlValue = "E.EndTime";
+					$sqlValue = 'E.EndTime';
 					$dtAttr = true;
 					break;
 				case 'EndDate':
-					$sqlValue = "to_days( E.EndTime )";
+					$sqlValue = 'to_days(E.EndTime)';
 					$dtAttr = true;
 					break;
 				case 'EndTime':
-					$sqlValue = "extract( hour_second from E.EndTime )";
+					$sqlValue = 'extract(hour_second from E.EndTime)';
 					break;
 				case 'EndWeekday':
-					$sqlValue = "weekday( E.EndTime )";
+					$sqlValue = 'weekday(E.EndTime)';
 					break;
 				case 'Id':
 				case 'Name':
 				case 'MonitorId':
 				case 'StorageId':
+        case 'SecondaryStorageId':
 				case 'Length':
 				case 'Frames':
 				case 'AlarmFrames':
@@ -145,7 +155,7 @@
 				case 'Notes':
 				case 'StateId':
 				case 'Archived':
-					$sqlValue = "E.".$terms[$i]['attr'];
+					$sqlValue = 'E.'.$term['attr'];
 					break;
 				case 'DiskPercent':
 					// Need to specify a storage area, so need to look through other terms looking for a storage area, else we default to ZM_EVENTS_PATH
@@ -174,53 +184,66 @@
 					$sqlValue = getDiskBlocks($StorageArea);
 					break;
 				default :
-					$sqlValue = $terms[$i]['attr'];
+					$sqlValue = $term['attr'];
 					break;
 			}
 			if ( $dtAttr ) {
-				$postfixExpr[] = array('type'=>'attr', 'value'=>$terms[$i]['attr'], 'sqlValue'=>$sqlValue, 'dtAttr'=>true);
+				$postfixExpr[] = array('type'=>'attr', 'value'=>$term['attr'], 'sqlValue'=>$sqlValue, 'dtAttr'=>true);
 			} else {
-				$postfixExpr[] = array('type'=>'attr', 'value'=>$terms[$i]['attr'], 'sqlValue'=>$sqlValue);
+				$postfixExpr[] = array('type'=>'attr', 'value'=>$term['attr'], 'sqlValue'=>$sqlValue);
 			}
 		} # end if attr
 
-		if ( isset($terms[$i]['op']) ) {
-			if ( empty($terms[$i]['op']) ) {
-				$terms[$i]['op'] = '=';
+		if ( isset($term['op']) ) {
+			if ( empty($term['op']) ) {
+				$term['op'] = '=';
 			}
-			switch ( $terms[$i]['op']) {
+			switch ( $term['op']) {
 				case '=' :
 				case '!=' :
 				case '>=' :
 				case '>' :
 				case '<' :
 				case '<=' :
-					$sqlValue = $terms[$i]['op'];
+        case 'LIKE' :
+        case 'NOT LIKE':
+					$sqlValue = $term['op'];
 					break;
-				case '=~' :
+        case '=~' :

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

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

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

@@ -101,7 +101,7 @@
 $filterbar = ob_get_contents();
 ob_end_clean();
 
-$show_storage_areas = count($storage_areas) > 1 and canEdit( 'System' ) ? 1 : 0;
+$show_storage_areas = (count($storage_areas) > 1) and (canEdit('System') ? 1 : 0);
 $maxWidth = 0;
 $maxHeight = 0;
 $zoneCount = 0;
@@ -110,7 +110,7 @@
 $status_counts = array();
 for ( $i = 0; $i < count($displayMonitors); $i++ ) {
   $monitor = &$displayMonitors[$i];
-  if ( ! $monitor['Status'] ) {
+  if ( !$monitor['Status'] ) {
     if ( $monitor['Type'] == 'WebSite' )
      $monitor['Status'] = 'Running';
     else
@@ -121,8 +121,8 @@
   $status_counts[$monitor['Status']] += 1;
 
   if ( $monitor['Function'] != 'None' ) {
-    $scaleWidth = reScale( $monitor['Width'], $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE );
-    $scaleHeight = reScale( $monitor['Height'], $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE );
+    $scaleWidth = reScale($monitor['Width'], $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE);
+    $scaleHeight = reScale($monitor['Height'], $monitor['DefaultScale'], ZM_WEB_DEFAULT_SCALE);
     if ( $maxWidth < $scaleWidth ) $maxWidth = $scaleWidth;
     if ( $maxHeight < $scaleHeight ) $maxHeight = $scaleHeight;
   }
@@ -131,13 +131,13 @@
   $zoneCount += $monitor['ZoneCount'];
 
   $counts = array();
-  foreach ( array_keys( $eventCounts ) as $j ) {
+  foreach ( array_keys($eventCounts) as $j ) {
     $filter = addFilterTerm(
       $eventCounts[$j]['filter'],
       count($eventCounts[$j]['filter']['Query']['terms']),
-      array( 'cnj' => 'and', 'attr' => 'MonitorId', 'op' => '=', 'val' => $monitor['Id'] )
+      array('cnj'=>'and', 'attr'=>'MonitorId', 'op'=>'=', 'val'=>$monitor['Id'])
     );
-    parseFilter( $filter );
+    parseFilter($filter);
     #$counts[] = 'count(if(1'.$filter['sql'].",1,NULL)) AS EventCount$j, SUM(if(1".$filter['sql'].",DiskSpace,NULL)) As DiskSpace$j";
     $monitor['eventCounts'][$j]['filter'] = $filter;
     $eventCounts[$j]['totalevents'] += $monitor[$j.'Events'];
@@ -156,8 +156,7 @@
 if ( ZM_WEB_ID_ON_CONSOLE ) $left_columns += 1;
 if ( $show_storage_areas ) $left_columns += 1;
 
-
-xhtmlHeaders( __FILE__, translate('Console') );
+xhtmlHeaders(__FILE__, translate('Console'));
 getBodyTopHTML();
 ?>
   <form name="monitorForm" method="get" action="?">
@@ -364,14 +363,28 @@
             <td class="colStorage"></td>
 <?php
 }
-  foreach ( array_keys( $eventCounts ) as $i ) {
-    parseFilter( $eventCounts[$i]['filter'] );
+  foreach ( array_keys($eventCounts) as $i ) {
+    $filter = addFilterTerm(
+      $eventCounts[$i]['filter'],
+      count($eventCounts[$i]['filter']['Query']['terms']),
+      array(
+        'cnj'=>'and',
+        'attr'=>'MonitorId',
+        'op'=>'IN',
+        'val'=>implode(',',array_map(function($m){return $m['Id'];}, $displayMonitors))
+        )
+    );
+    parseFilter($filter);
 ?>
             <td class="colEvents">
-              <a <?php echo (canView('Events') ? 'href="?view='.ZM_WEB_EVENTS_VIEW.'&amp;page=1'.$eventCounts[$i]['filter']['query'].'">' : '') . 
-                  $eventCounts[$i]['totalevents'].'<br/></a>'.'<div class="small text-nowrap text-muted">'.human_filesize($eventCounts[$i]['totaldiskspace']) ?></div></td>
+              <a <?php echo
+              (canView('Events') ? 'href="?view='.ZM_WEB_EVENTS_VIEW.'&amp;page=1'.$filter['query'].'">' : '') . 
+              $eventCounts[$i]['totalevents'].'</a><br/>
+              <div class="small text-nowrap text-muted">'.human_filesize($eventCounts[$i]['totaldiskspace'])
+            ?></div>
+            </td>
 <?php
-      }
+      } // end foreach eventCounts
 ?>
             <td class="colZones"><?php echo $zoneCount ?></td>
 <?php if ( canEdit('Monitors') ) { ?>

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

@@ -158,18 +158,18 @@
     }
 
     var brackets = rows.length - 2;
-    if (brackets > 0) { //add bracket select to all rows
+    if ( brackets > 0 ) { // add bracket select to all rows
       var obrSelect = $j('<select></select>').attr('name', queryPrefix + rowNum + '][obr]').attr('id', queryPrefix + rowNum + '][obr]');
       var cbrSelect = $j('<select></select>').attr('name', queryPrefix + rowNum + '][cbr]').attr('id', queryPrefix + rowNum + '][cbr]');
       obrSelect.append('<option value="0"</option>');
       cbrSelect.append('<option value="0"</option>');
-      for (var i = 1; i <= brackets; i++) {//build bracket options
+      for ( var i = 1; i <= brackets; i++ ) { // build bracket options
         obrSelect.append('<option value="' + i + '">' + '('.repeat(i) + '</option>');
         cbrSelect.append('<option value="' + i + '">' + ')'.repeat(i) + '</option>');
       }
-      var obrVal = inputTds.eq(1).children().val() != undefined ? inputTds.eq(1).children().val() : 0; //Save currently selected bracket option
+      var obrVal = inputTds.eq(1).children().val() != undefined ? inputTds.eq(1).children().val() : 0; // Save currently selected bracket option
       var cbrVal = inputTds.eq(5).children().val() != undefined ? inputTds.eq(5).children().val() : 0;
-      inputTds.eq(1).html(obrSelect).children().val(obrVal); //Set bracket contents and assign saved value
+      inputTds.eq(1).html(obrSelect).children().val(obrVal); // Set bracket contents and assign saved value
       inputTds.eq(5).html(cbrSelect).children().val(cbrVal);
     } else {
       inputTds.eq(1).html('&nbsp'); // Blank if there aren't enough terms for brackets
@@ -177,14 +177,13 @@
     }
 
     if ( rows.length == 1 ) {
-      inputTds.eq(6).find('button[data-on-click-this="delTerm"]').prop('disabled', true); //enable/disable remove row button
+      inputTds.eq(6).find('button[data-on-click-this="delTerm"]').prop('disabled', true); // enable/disable remove row button
     } else {
       inputTds.eq(6).find('button[data-on-click-this="delTerm"]').prop('disabled', false);
     }
 
     var attr = inputTds.eq(2).children().val();
-
-    if ( attr == "Archived" ) { //Archived types
+    if ( attr == 'Archived' ) { // Archived types
       inputTds.eq(3).html('equal to<input type="hidden" name="filter[Query][terms][' + rowNum + '][op]" value="=">');
       var archiveSelect = $j('<select></select>').attr('name', queryPrefix + rowNum + '][val]').attr('id', queryPrefix + rowNum + '][val]');
       for (var i = 0; i < archiveTypes.length; i++) {
@@ -274,11 +273,16 @@
     this[0].selected = 'selected';
   }).chosen({width: '101%'});
   newRow.find('input[type="text"]').val('');
-  newRow[0].querySelectorAll("button[data-on-click-this]").forEach(function attachOnClick(el) {
+  newRow[0].querySelectorAll("button[data-on-click-this]").forEach(function(el) {
     var fnName = el.getAttribute("data-on-click-this");
     el.onclick = window[fnName].bind(el, el);
   });
 
+  newRow[0].querySelectorAll('select[data-on-change-this]').forEach(function(el) {
+    var fnName = el.getAttribute('data-on-change-this');
+    el.onchange = window[fnName].bind(el, el);
+  });
+
   var rows = $j(row).parent().children();
   parseRows(rows);
 }

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

@@ -210,7 +210,6 @@
  * @param {*} element - the event data passed by onchange callback
  */
 function selectLayout(element) {
-  console.log(element);
   layout = $j(element).val();
 
   if ( layout_id = parseInt(layout) ) {
@@ -221,8 +220,8 @@
       // Need to clear the current positioning, and apply the new
 
       monitor_frame = $j('#monitorFrame'+monitor.id);
-      if ( ! monitor_frame ) {
-        console.log("Error finding frame for " + monitor.id);
+      if ( !monitor_frame ) {
+        console.log('Error finding frame for ' + monitor.id);
         continue;
       }
 
@@ -262,6 +261,10 @@
         if ( streamImg.nodeName == 'IMG' ) {
           var src = streamImg.src;
           src = src.replace(/width=[\.\d]+/i, 'width=0' );
+          if ( $j('#height').val() == 'auto' ) {
+            src = src.replace(/height=[\.\d]+/i, 'height=0' );
+            streamImg.style.height = 'auto';
+          }
           if ( src != streamImg.src ) {
             streamImg.src = '';
             streamImg.src = src;

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

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

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

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

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

@@ -54,7 +54,7 @@
 
     streamImg.src = streamImg.src.replace(/scale=\d+/i, 'scale='+(scale== 'auto' ? autoScale : scale));
   } else {
-    console.error('No element found for liveStream.');
+    console.error('No element found for liveStream'+monitorId);
   }
 }
 
@@ -239,7 +239,6 @@
         streamCmdParms = streamCmdParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
         statusCmdParms = statusCmdParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
         eventCmdParms = eventCmdParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
-        actParms = actParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
         controlParms = controlParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
       } // end if have a new auth hash
     } // end if respObj.status
@@ -722,10 +721,14 @@
 
 function appletRefresh() {
   if ( streamStatus && (!streamStatus.paused && !streamStatus.delayed) ) {
-    var streamImg = $('liveStream');
-    var parent = streamImg.getParent();
-    streamImg.dispose();
-    streamImg.inject( parent );
+    var streamImg = $('liveStream'+monitorId);
+    if ( streamImg ) {
+      var parent = streamImg.getParent();
+      streamImg.dispose();
+      streamImg.inject( parent );
+    } else {
+      console.error("Nothing found for liveStream"+monitorId);
+    }
     if ( appletRefreshTime ) {
       appletRefresh.delay( appletRefreshTime*1000 );
     }
@@ -767,7 +770,7 @@
 
 function initPage() {
   if ( monitorType != 'WebSite' ) {
-    if ( streamMode == "single" ) {
+    if ( streamMode == 'single' ) {
       statusCmdTimer = statusCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout );
       watchdogCheck.pass('status').periodical(statusRefreshTimeout*2);
     } else {
@@ -778,20 +781,24 @@
     eventCmdTimer = eventCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout );
     watchdogCheck.pass('event').periodical(eventsRefreshTimeout*2);
 
-    if ( canStreamNative || streamMode == "single" ) {
+    if ( canStreamNative || (streamMode == 'single') ) {
       var streamImg = $('imageFeed').getElement('img');
       if ( !streamImg ) {
         streamImg = $('imageFeed').getElement('object');
       }
-      if ( streamMode == "single" ) {
-        streamImg.addEvent('click', fetchImage.pass(streamImg));
-        fetchImage.pass(streamImg).periodical(imageRefreshTimeout);
+      if ( !streamImg ) {
+        console.error('No streamImg found for imageFeed');
       } else {
-        streamImg.addEvent('click', function(event) {
-          handleClick(event);
-        });
-      }
-    }
+        if ( streamMode == 'single' ) {
+          streamImg.addEvent('click', fetchImage.pass(streamImg));
+          fetchImage.pass(streamImg).periodical(imageRefreshTimeout);
+        } else {
+          streamImg.addEvent('click', function(event) {
+            handleClick(event);
+          });
+        }
+      } // end if have streamImg
+    } // streamMode native or single
 
     if ( refreshApplet && appletRefreshTime ) {
       appletRefresh.delay(appletRefreshTime*1000);

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

@@ -724,22 +724,19 @@
       $breakCount = (int)(ceil(count($optTriggers)));
       $breakCount = min(3, $breakCount);
       $optCount = 0;
-      foreach( $optTriggers as $optTrigger ) {
-        if ( !ZM_OPT_X10 && $optTrigger == 'X10' )
+      foreach ( $optTriggers as $optTrigger ) {
+        if ( $optTrigger == 'X10' and !ZM_OPT_X10 )
           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; 
+        $optCount ++;
+      } # end foreach trigger option
+      if ( !$optCount ) {
+        echo '<em>'.translate('NoneAvailable').'</em>';
+      }
 ?>
-              <input type="checkbox" name="newMonitor[Triggers][]" value="<?php echo $optTrigger ?>"<?php if ( ( null !== $monitor->Triggers() ) && in_array( $optTrigger, $monitor->Triggers() ) ) { ?> checked="checked"<?php } ?>/>&nbsp;<?php echo $optTrigger ?>
-<?php
-          $optCount ++;
-        }
-        if ( !$optCount ) {
-        ?>
-          <em><?php echo translate('NoneAvailable') ?></em>
-          <?php
-        }
-      ?>
         </td></tr>
         <?php
         }
@@ -774,7 +771,7 @@
             <label for="newMonitor[V4LMultiBuffer]1">Yes</label>
             <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]0" value="0" <?php echo ( $monitor->V4LMultiBuffer() == '0' ? 'checked="checked"' : '' ) ?>/>
             <label for="newMonitor[V4LMultiBuffer]0">No</label>
-            <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]" value="" <?php echo ( $monitor->V4LMultiBuffer() ? 'checked="checked"' : '' ) ?>/>
+            <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]" value="" <?php echo ( $monitor->V4LMultiBuffer() == '' ? 'checked="checked"' : '' ) ?>/>
             <label for="newMonitor[V4LMultiBuffer]">Use Config Value</label>
           </td></tr>
           <tr><td><?php echo translate('V4LCapturesPerFrame') ?></td><td><input type="number" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo validHtmlStr($monitor->V4LCapturesPerFrame()); ?>"/></td></tr>

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

@@ -69,17 +69,19 @@
   }
 }
 foreach ( $layouts as $l ) {
-  if ( $l->Name() != "Freeform" )
+  if ( $l->Name() != 'Freeform' )
     $layoutsById[$l->Id()] = $l;
 }
 
-session_start();
+zm_session_start();
 
 $layout_id = '';
 if ( isset($_COOKIE['zmMontageLayout']) ) {
   $layout_id = $_SESSION['zmMontageLayout'] = $_COOKIE['zmMontageLayout'];
-#} elseif ( isset($_SESSION['zmMontageLayout']) ) {
-  #$layout_id = $_SESSION['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();
@@ -88,6 +90,8 @@
 if ( $layout_id and is_numeric($layout_id) and isset($layoutsById[$layout_id]) ) {
   $Layout = $layoutsById[$layout_id];
   $Positions = json_decode($Layout->Positions(), true);
+} else {
+  ZM\Logger::Debug("Layout not found");
 }
 if ( $Layout and ( $Layout->Name() != 'Freeform' ) ) {
   // Use layout instead of other options

zoneminder-1.34.2.tar.gz/web/skins/classic/views/options.php -> zoneminder-1.34.8.tar.gz/web/skins/classic/views/options.php Changed

@@ -393,41 +393,41 @@
         $configCats[$tab]['ZM_SKIN_DEFAULT']['Hint'] = join('|', array_map('basename', glob('skins/*',GLOB_ONLYDIR)));
         $configCats[$tab]['ZM_CSS_DEFAULT']['Hint'] = join('|', array_map ( 'basename', glob('skins/'.ZM_SKIN_DEFAULT.'/css/*',GLOB_ONLYDIR) ));
         $configCats[$tab]['ZM_BANDWIDTH_DEFAULT']['Hint'] = $bandwidth_options;
-        function timezone_list() {
-    static $timezones = null;
 
-    if ($timezones === null) {
-        $timezones = [];
-        $offsets = [];
-        $now = new DateTime('now', new DateTimeZone('UTC'));
+        function timezone_list() {
+          static $timezones = null;
 
-        foreach (DateTimeZone::listIdentifiers() as $timezone) {
-            $now->setTimezone(new DateTimeZone($timezone));
-            $offsets[] = $offset = $now->getOffset();
-            $timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone);
-        }
+          if ( $timezones === null ) {
+            $timezones = [];
+            $offsets = [];
+            $now = new DateTime('now', new DateTimeZone('UTC'));
 
-        array_multisort($offsets, $timezones);
-    }
+            foreach ( DateTimeZone::listIdentifiers() as $timezone ) {
+              $now->setTimezone(new DateTimeZone($timezone));
+              $offsets[] = $offset = $now->getOffset();
+              $timezones[$timezone] = '(' . format_GMT_offset($offset) . ') ' . format_timezone_name($timezone);
+            }
 
-    return $timezones;
-}
+            array_multisort($offsets, $timezones);
+          }
 
-function format_GMT_offset($offset) {
-    $hours = intval($offset / 3600);
-    $minutes = abs(intval($offset % 3600 / 60));
-    return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : '');
-}
+          return $timezones;
+        }
 
-function format_timezone_name($name) {
-    $name = str_replace('/', ', ', $name);
-    $name = str_replace('_', ' ', $name);
-    $name = str_replace('St ', 'St. ', $name);
-    return $name;
-}
-        $configCats[$tab]['ZM_TIMEZONE']['Hint'] = timezone_list();
+        function format_GMT_offset($offset) {
+          $hours = intval($offset / 3600);
+          $minutes = abs(intval($offset % 3600 / 60));
+          return 'GMT' . ($offset ? sprintf('%+03d:%02d', $hours, $minutes) : '');
+        }
 
-    }
+        function format_timezone_name($name) {
+          $name = str_replace('/', ', ', $name);
+          $name = str_replace('_', ' ', $name);
+          $name = str_replace('St ', 'St. ', $name);
+          return $name;
+        }
+        $configCats[$tab]['ZM_TIMEZONE']['Hint'] = array(''=> translate('TZUnset')) + timezone_list();
+    } # end if tab == system
 ?>
       <form name="optionsForm" class="form-horizontal" method="post" action="?">
         <input type="hidden" name="view" value="<?php echo $view ?>"/>

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

zoneminder-1.34.2.tar.gz/web/skins/classic/views/video.php -> zoneminder-1.34.8.tar.gz/web/skins/classic/views/video.php Changed

@@ -27,27 +27,25 @@
 
 $eid = validInt($_REQUEST['eid']);
 
-$sql = 'SELECT E.*,M.Name AS MonitorName,M.DefaultRate,M.DefaultScale FROM Events AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE E.Id = ?';
-$sql_values = array($eid);
+$event = new ZM\Event($eid);
 
-if ( $user['MonitorIds'] ) {
-  $monitor_ids = explode(',', $user['MonitorIds']);
-  $sql .= ' AND MonitorId IN ('.implode(',', array_fill(0,count($monitor_ids),'?')).')';
-  $sql_values = array_merge($sql_values, $monitor_ids);
+if ( ! canView('Monitors', $event->MonitorId() ) ) {
+  $view = 'error';
+  return;
 }
-$event = dbFetchOne($sql, NULL, $sql_values);
 
+$monitor = $event->Monitor();
 if ( isset($_REQUEST['rate']) )
   $rate = validInt($_REQUEST['rate']);
 else
-  $rate = reScale(RATE_BASE, $event['DefaultRate'], ZM_WEB_DEFAULT_RATE);
+  $rate = reScale(RATE_BASE, $monitor->DefaultRate(), ZM_WEB_DEFAULT_RATE);
+
 if ( isset($_REQUEST['scale']) )
   $scale = validInt($_REQUEST['scale']);
 else
-  $scale = reScale(SCALE_BASE, $event['DefaultScale'], ZM_WEB_DEFAULT_SCALE);
+  $scale = reScale(SCALE_BASE, $monitor->DefaultScale(), ZM_WEB_DEFAULT_SCALE);
 
-$Event = new ZM\Event($event['Id']);
-$eventPath = $Event->Path();
+$event_path = $event->Path();
 
 $videoFormats = array();
 $ffmpegFormats = preg_split('/\s+/', ZM_FFMPEG_FORMATS);
@@ -63,9 +61,9 @@
 }
 
 $videoFiles = array();
-if ( $dir = opendir($eventPath) ) {
+if ( $dir = opendir($event_path) ) {
   while ( ($file = readdir($dir)) !== false ) {
-    $file = $eventPath.'/'.$file;
+    $file = $event_path.'/'.$file;
     if ( is_file($file) ) {
       if ( preg_match('/\.(?:'.join('|', $videoFormats).')$/', $file) ) {
         $videoFiles[] = $file;
@@ -85,6 +83,7 @@
   // can't be output buffering, as this file might be large
   ob_end_clean();
   $downloadIndex = validInt($_REQUEST['downloadIndex']);
+  ZM\Error("Download $downloadIndex, file: " . $videoFiles[$downloadIndex]);
   header('Pragma: public');
   header('Expires: 0');
   header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
@@ -124,7 +123,7 @@
 } else {
 ?>
       <form name="contentForm" id="contentForm" method="post" action="?">
-        <input type="hidden" name="id" value="<?php echo $event['Id'] ?>"/>
+        <input type="hidden" name="id" value="<?php echo $event->Id() ?>"/>
         <table id="contentTable" class="minor">
           <tbody>
             <tr>
@@ -145,7 +144,9 @@
             </tr>
           </tbody>
         </table>
-        <input type="button" value="<?php echo translate('GenerateVideo') ?>" onclick="generateVideo(this.form);"<?php if ( !ZM_OPT_FFMPEG ) { ?> disabled="disabled"<?php } ?>/>
+        <button type="button" data-on-click="generateVideo"<?php if ( !ZM_OPT_FFMPEG ) { ?> disabled="disabled"<?php } ?>>
+        <?php echo translate('GenerateVideo') ?>
+        </button>
       </form>
 <?php
   if ( isset($_REQUEST['generated']) ) {
@@ -200,20 +201,27 @@
         } elseif ( preg_match('/^S(.+)$/', $matches[3], $temp_matches) ) {
           $scaleText = $temp_matches[1];
         }
-        $width = $scale?reScale($event['Width'], $scale):$event['Width'];
-        $height = $scale?reScale($event['Height'], $scale):$event['Height'];
+        $width = $scale?reScale($event->Width(), $scale):$event->Width();
+        $height = $scale?reScale($event->Height(), $scale):$event->Height();
 ?>
         <tr>
           <td><?php echo $matches[4] ?></td>
           <td><?php echo filesize($file) ?></td>
           <td><?php echo $rateText ?></td>
           <td><?php echo $scaleText ?></td>
-          <td><?php echo makePopupLink('?view='.$view.'&amp;eid='.$event['Id'].'&amp;width='.$width.'&amp;height='.$height.'&amp;showIndex='.$index, 'zmVideo'.$event['Id'].'-'.$scale, array( 'videoview', $width, $height ), translate('View') ); ?>&nbsp;/&nbsp;<a href="<?php echo substr( $file, strlen(ZM_DIR_EVENTS)+1 ) ?>" onclick="downloadVideo( <?php echo $index ?> ); return( false );"><?php echo translate('Download') ?></a>&nbsp;/&nbsp;<a href="#" onclick="deleteVideo( <?php echo $index ?> ); return( false );"><?php echo translate('Delete') ?></a></td>
+          <td>
+            <?php echo makePopupLink('?view='.$view.'&amp;eid='.$event->Id().'&amp;width='.$width.'&amp;height='.$height.'&amp;showIndex='.$index, 'zmVideo'.$event->Id().'-'.$scale, array('videoview', $width, $height), translate('View') ); ?>
+            &nbsp;/&nbsp;
+            <a href="#"
+ data-on-click-this="downloadVideo" data-file-index="<?php echo $index ?>"><?php echo translate('Download') ?></a>
+            &nbsp;/&nbsp;
+            <a href="#" data-on-click-this="deleteVideo" data-file-index="<?php echo $index ?>"><?php echo translate('Delete') ?></a>
+          </td>
         </tr>
 <?php
         $index++;
-      }
-    }
+      } # end if filesize
+    } # end foreach videoFile
 ?>
         </tbody>
       </table>

zoneminder-1.34.2.tar.gz/web/views/image.php -> zoneminder-1.34.8.tar.gz/web/views/image.php Changed

zoneminder-1.34.2.tar.gz/zoneminder-config.cmake -> zoneminder-1.34.8.tar.gz/zoneminder-config.cmake Changed

Changes of Revision 7