diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..af875fa07
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,12 @@
+configure
+config.h.in
+autom4te.cache
+aclocal.m4
+depcomp
+install-sh
+missing
+mkinstalldirs
+stamp-h1
+stamp-h.in
+scripts/ZoneMinder/blib
+Makefile.in
diff --git a/.travis.yml b/.travis.yml
index b138009f8..9e85b69ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,15 +9,19 @@ env:
     - LD_LIBRARY_PATH="/usr/local/lib:/opt/libjpeg-turbo/lib:$LD_LIBRARY_PATH"
     - DEB_HOST_GNU_TYPE=$(dpkg-architecture -qDEB_HOST_GNU_TYPE)
     - DEB_BUILD_GNU_TYPE=$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-    - CXXFLAGS=" -DZM_FFMPEG_CVS -DHAVE_LIBCRYPTO -msse2 -I/usr/local/include"
+    - CFLAGS="-DZM_FFMPEG_CVS -DHAVE_LIBCRYPTO -I/usr/local/include"
+    - CXXFLAGS="$CFLAGS"
+  matrix:
+    - ZM_BUILDMETHOD=cmake
+    - ZM_BUILDMETHOD=autotools
 compiler:
   - gcc
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get upgrade -y -qq
-  - sudo apt-get install -y -qq apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm subversion automake autoconf libjpeg-turbo8-dev libjpeg-turbo8 apache2-mpm-prefork libapache2-mod-php5 php5-cli libtheora-dev libvorbis-dev libvpx-dev libx264-dev
+  - sudo apt-get install -y -qq apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm subversion automake autoconf cmake libjpeg-turbo8-dev libjpeg-turbo8 apache2-mpm-prefork libapache2-mod-php5 php5-cli libtheora-dev libvorbis-dev libvpx-dev libx264-dev 2>&1 > /dev/null 
 install:
-  - git clone git://source.ffmpeg.org/ffmpeg.git 
+  - git clone --depth=10 --branch=master git://source.ffmpeg.org/ffmpeg.git 
   - cd ffmpeg 
   - ./configure --enable-shared --enable-swscale --enable-gpl  --enable-libx264 --enable-libvpx --enable-libvorbis --enable-libtheora 
   - make -j `grep processor /proc/cpuinfo|wc -l` 
@@ -25,13 +29,21 @@ install:
   - sudo make install-libs
 before_script:
   - cd $TRAVIS_BUILD_DIR
-  - libtoolize --force
-  - aclocal
-  - autoheader
-  - automake --force-missing --add-missing
-  - autoconf
-  - mysql -e 'create database zoneminder;'
+  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then libtoolize --force; fi
+  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then aclocal; fi
+  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then autoheader; fi
+  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then automake --force-missing --add-missing; fi
+  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then autoconf; fi
 script:
-  - CXXFLAGS="$CXXFLAGS" ./configure --with-libarch=lib/$DEB_HOST_GNU_TYPE --disable-debug --host=$DEB_HOST_GNU_TYPE --build=$DEB_BUILD_GNU_TYPE --with-mysql=/usr --with-webdir=/var/www/zm --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-crashtrace=no --enable-mmap=yes ZM_SSL_LIB=openssl ZM_DB_USER=travis ZM_DB_PASS= 
+  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then ./configure --prefix=/usr --with-libarch=lib/$DEB_HOST_GNU_TYPE --host=$DEB_HOST_GNU_TYPE --build=$DEB_BUILD_GNU_TYPE --with-mysql=/usr --with-ffmpeg=/usr --with-webdir=/usr/share/zoneminder/www --with-cgidir=/usr/libexec/zoneminder/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-crashtrace=yes --disable-debug --enable-mmap=yes ZM_SSL_LIB=openssl; fi
+  - if [ "$ZM_BUILDMETHOD" = "cmake" ]; then cmake -DCMAKE_INSTALL_PREFIX="/usr"; fi
   - make
-after_success: mysql -u travis < db/zm_create.sql
+  - sudo make install
+after_success:
+  - if [ "$ZM_BUILDMETHOD" = "cmake" ]; then sudo ./zmlinkcontent.sh; fi
+  - mysql -uroot -e "CREATE DATABASE IF NOT EXISTS zm"
+  - mysql -uroot -e "GRANT ALL ON zm.* TO 'zmuser'@'localhost' IDENTIFIED BY 'zmpass'";
+  - mysql -uroot -e "FLUSH PRIVILEGES"
+  - mysql -uzmuser -pzmpass < db/zm_create.sql
+  - mysql -uzmuser -pzmpass zm < db/test.monitor.sql
+  - sudo zmpkg.pl start
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 000000000..45a40fb77
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,361 @@
+# Main CMake file for the ZoneMinder project.
+# Created by mastertheknife (Kfir Itzhak)
+# The goal is to ease up the installation of zoneminder.
+# Our current installation method (using autotools) is outdated, slow and breaks now and then.
+# The CMake installation method will require no parameters at all, default should sufficient and reliable.
+# It will be still possible to install ZoneMinder using autotools, they don't conflict with each other. The cmake way is a complete re-write (different syntax) and aims to be identical to the autotools way,
+# by having options using the same name and leaving ZM totally unmodified, while providing exactly the same things that ZM expects (config.h, configuration in *.in files, etc).
+#
+# For more information and installation, see the INSTALL file
+#
+cmake_minimum_required (VERSION 2.6)
+project (ZoneMinder)
+# ZoneMinder version
+set(ZoneMinder_VERSION "1.26.3")
+# Default build type. To change the build type, use the CMAKE_BUILD_TYPE configuration option.
+if(NOT CMAKE_BUILD_TYPE)
+	set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type: Release or Debug" FORCE)
+endif(NOT CMAKE_BUILD_TYPE)
+
+# Can make finding problems easier when troubleshooting.
+#set(CMAKE_VERBOSE_MAKEFILE ON)
+#set(CMAKE_INSTALL_ALWAYS ON)
+
+# Default CLFAGS and CXXFLAGS:
+set(CMAKE_C_FLAGS_RELEASE "-Wall -D__STDC_CONSTANT_MACROS -O2")
+set(CMAKE_CXX_FLAGS_RELEASE "-Wall -D__STDC_CONSTANT_MACROS -O2")
+set(CMAKE_C_FLAGS_DEBUG "-Wall -D__STDC_CONSTANT_MACROS -g")
+set(CMAKE_CXX_FLAGS_DEBUG "-Wall -D__STDC_CONSTANT_MACROS -g")
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+# Modules that we need:
+include (GNUInstallDirs)
+include (CheckIncludeFile)
+include (CheckIncludeFiles)
+include (CheckFunctionExists)
+include (CheckPrototypeDefinition)
+include (CheckTypeSize)
+include (CheckStructHasMember)
+
+# Default variables for some configuration options
+mark_as_advanced(FORCE ZM_EXTRA_LIBS ZM_MYSQL_ENGINE ZM_NO_MMAP ZM_NO_CRASHTRACE CMAKE_INSTALL_FULL_BINDIR)
+set(ZM_RUNDIR "/var/run/zm" CACHE PATH "Location of transient process files, default: /var/run/zm")
+set(ZM_TMPDIR "/tmp/zm" CACHE PATH "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 "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 "Location of the cgi-bin files, default: <prefix>/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin")
+set(ZM_CONTENTDIR "/var/lib/zoneminder" CACHE PATH "Location of dynamic content (events and images), default: /var/lib/zoneminder")
+# This one is not needed anymore. we do automatic detection of whats available, let ZM know and have ZM decide
+#set(ZM_SSL_LIB "openssl" CACHE STRING "Library to use for ssl functions, default: openssl")
+set(ZM_DB_HOST "localhost" CACHE STRING "Hostname where ZoneMinder database located, default: localhost")
+set(ZM_DB_NAME "zm" CACHE STRING "Name of ZoneMinder database, default: zm")
+set(ZM_DB_USER "zmuser" CACHE STRING "Name of ZoneMinder database user, default: zmuser")
+set(ZM_DB_PASS "zmpass" CACHE STRING "Password of ZoneMinder database user, default: zmpass")
+set(ZM_WEB_USER "" CACHE STRING "The user apache or the local web server runs on. Leave empty for automatic detection. If that fails, you can use this variable to force")
+set(ZM_WEB_GROUP "" CACHE STRING "The group apache or the local web server runs on, Leave empty to be the same as the web user")
+# Advanced
+set(ZM_EXTRA_LIBS "" CACHE STRING "A list of optional libraries, separated by semicolons, e.g. ssl;theora")
+set(ZM_MYSQL_ENGINE "InnoDB" CACHE STRING "MySQL engine to use with database, default: InnoDB")
+set(ZM_NO_MMAP "OFF" CACHE BOOL "Set to ON to not use mmap shared memory. Shouldn't be enabled unless you experience problems with the shared memory. default: OFF")
+set(ZM_NO_CRASHTRACE "OFF" CACHE BOOL "Set to ON to skip crash trace code. Useful if zm_signal.cpp fails to compile. default: OFF")
+# Only required for cmakecacheimport:
+set(CMAKE_INSTALL_FULL_BINDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}" CACHE PATH "Override default binary directory")
+
+# Required for certain checks to work
+set(CMAKE_EXTRA_INCLUDE_FILES ${CMAKE_EXTRA_INCLUDE_FILES} stdio.h stdlib.h math.h signal.h)
+# Required for including headers from the this folder
+include_directories("${CMAKE_CURRENT_BINARY_DIR}")
+# This is required to enable searching in lib64 (if exists), do not change
+set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON)
+
+# Check for misc required stuff
+check_include_file("linux/videodev.h" HAVE_LINUX_VIDEODEV_H)
+check_include_file("linux/videodev2.h" HAVE_LINUX_VIDEODEV2_H)
+check_include_file("execinfo.h" HAVE_EXECINFO_H)
+check_include_file("sys/sendfile.h" HAVE_SYS_SENDFILE_H)
+check_include_file("sys/syscall.h" HAVE_SYS_SYSCALL_H)
+check_function_exists("syscall" HAVE_SYSCALL)
+check_function_exists("sendfile" HAVE_SENDFILE)
+check_function_exists("backtrace" HAVE_DECL_BACKTRACE)
+check_function_exists("posix_memalign" HAVE_POSIX_MEMALIGN)
+check_function_exists("strsignal" HAVE_STRSIGNAL)
+check_prototype_definition("round" "double round (double x)" "0.0" "math.h" HAVE_DECL_ROUND)
+check_type_size("siginfo_t" SIGINFO_T)
+check_type_size("ucontext_t" UCONTEXT_T)
+check_type_size("struct sigcontext" STRUCT_SIGCONTEXT)
+check_struct_has_member("struct sigcontext" eip signal.h HAVE_STRUCT_SIGCONTEXT_EIP)
+check_struct_has_member("struct sigcontext" rip signal.h HAVE_STRUCT_SIGCONTEXT_RIP)
+
+# *** LIBRARY CHECKS ***
+
+# zlib
+find_package(ZLIB)
+if(ZLIB_FOUND)
+	set(HAVE_LIBZLIB 1)
+	list(APPEND ZM_BIN_LIBS ${ZLIB_LIBRARIES})
+	include_directories(${ZLIB_INCLUDE_DIR})
+	check_include_file("zlib.h" HAVE_ZLIB_H)
+endif(ZLIB_FOUND)
+
+# jpeg
+find_package(JPEG)
+if(JPEG_FOUND)
+	set(HAVE_LIBJPEG 1)
+	list(APPEND ZM_BIN_LIBS ${JPEG_LIBRARIES})
+	include_directories(${JPEG_INCLUDE_DIR})
+	check_include_files("stdio.h;jpeglib.h" HAVE_JPEGLIB_H)
+	#link_directories(${JPEG_LIBRARY})
+else(JPEG_FOUND)
+	message(FATAL_ERROR "zm requires jpeg but it was not found on your system")
+endif(JPEG_FOUND)
+
+# OpenSSL
+find_package(OpenSSL)
+if(OPENSSL_FOUND)
+	set(HAVE_LIBOPENSSL 1)
+	list(APPEND ZM_BIN_LIBS ${OPENSSL_LIBRARIES})
+	include_directories(${OPENSSL_INCLUDE_DIR})
+	check_include_file("openssl/md5.h" HAVE_OPENSSL_MD5_H)
+endif(OPENSSL_FOUND)
+# crypto using find_library. 
+# This library should be a part of the OpenSSL package but just need to be sure
+# In any case, we still need to define HAVE_LIBCRYPTO for zm if its available
+find_library(CRYPTO_LIBRARIES crypto)
+if(CRYPTO_LIBRARIES)
+	set(HAVE_LIBCRYPTO 1)
+	list(APPEND ZM_BIN_LIBS ${CRYPTO_LIBRARIES})
+endif(CRYPTO_LIBRARIES)
+
+# pthread using find_library
+find_library(PTHREAD_LIBRARIES pthread)
+if(PTHREAD_LIBRARIES)
+	set(HAVE_LIBPTHREAD 1)
+	list(APPEND ZM_BIN_LIBS ${PTHREAD_LIBRARIES})
+	check_include_file("pthread.h" HAVE_PTHREAD_H)
+else(PTHREAD_LIBRARIES)
+	message(FATAL_ERROR "zm requires pthread but it was not found on your system")
+endif(PTHREAD_LIBRARIES)
+
+# pcre using find_library
+find_library(PCRE_LIBRARIES pcre)
+if(PCRE_LIBRARIES)
+	set(HAVE_LIBPCRE 1)
+	list(APPEND ZM_BIN_LIBS ${PCRE_LIBRARIES})
+	check_include_file("pcre.h" HAVE_PCRE_H)
+endif(PCRE_LIBRARIES)
+
+# gcrypt using find_library
+find_library(GCRYPT_LIBRARIES gcrypt)
+if(GCRYPT_LIBRARIES)
+	set(HAVE_LIBGCRYPT 1)
+	list(APPEND ZM_BIN_LIBS ${GCRYPT_LIBRARIES})
+	check_include_file("gcrypt.h" HAVE_GCRYPT_H)
+endif(GCRYPT_LIBRARIES)
+
+# gnutls using find_library
+find_library(GNUTLS_LIBRARIES gnutls)
+if(GNUTLS_LIBRARIES)
+	set(HAVE_LIBGNUTLS 1)
+	list(APPEND ZM_BIN_LIBS ${GNUTLS_LIBRARIES})
+	check_include_file("gnutls/openssl.h" HAVE_GNUTLS_OPENSSL_H)
+	check_include_file("gnutls/gnutls.h" HAVE_GNUTLS_GNUTLS_H)
+endif(GNUTLS_LIBRARIES)
+
+# mysqlclient using find_library
+find_library(MYSQLCLIENT_LIBRARIES mysqlclient PATH_SUFFIXES mysql)
+if(MYSQLCLIENT_LIBRARIES)
+	set(HAVE_LIBMYSQLCLIENT 1)
+	list(APPEND ZM_BIN_LIBS ${MYSQLCLIENT_LIBRARIES})	
+	check_include_file("mysql/mysql.h" HAVE_MYSQL_H)
+else(MYSQLCLIENT_LIBRARIES)
+	message(FATAL_ERROR "zm requires mysqlclient but it was not found on your system")
+endif(MYSQLCLIENT_LIBRARIES)
+
+# avformat using find_library
+find_library(AVFORMAT_LIBRARIES avformat)
+if(AVFORMAT_LIBRARIES)
+	set(HAVE_LIBAVFORMAT 1)
+	list(APPEND ZM_BIN_LIBS ${AVFORMAT_LIBRARIES})	
+	check_include_file("libavformat/avformat.h" HAVE_LIBAVFORMAT_AVFORMAT_H)
+endif(AVFORMAT_LIBRARIES)
+
+# avcodec using find_library
+find_library(AVCODEC_LIBRARIES avcodec)
+if(AVCODEC_LIBRARIES)
+	set(HAVE_LIBAVCODEC 1)
+	list(APPEND ZM_BIN_LIBS ${AVCODEC_LIBRARIES})	
+	check_include_file("libavcodec/avcodec.h" HAVE_LIBAVCODEC_AVCODEC_H)
+endif(AVCODEC_LIBRARIES)
+
+# avdevice using find_library
+find_library(AVDEVICE_LIBRARIES avdevice)
+if(AVDEVICE_LIBRARIES)
+	set(HAVE_LIBAVDEVICE 1)
+	list(APPEND ZM_BIN_LIBS ${AVDEVICE_LIBRARIES})	
+	check_include_file("libavdevice/avdevice.h" HAVE_LIBAVDEVICE_AVDEVICE_H)
+endif(AVDEVICE_LIBRARIES)
+
+# avutil using find_library
+find_library(AVUTIL_LIBRARIES avutil)
+if(AVUTIL_LIBRARIES)
+	set(HAVE_LIBAVUTIL 1)
+	list(APPEND ZM_BIN_LIBS ${AVUTIL_LIBRARIES})	
+	check_include_file("libavutil/avutil.h" HAVE_LIBAVUTIL_AVUTIL_H)
+	check_include_file("libavutil/mathematics.h" HAVE_LIBAVUTIL_MATHEMATICS_H)
+endif(AVUTIL_LIBRARIES)
+
+# swscale using find_library
+find_library(SWSCALE_LIBRARIES swscale)
+if(SWSCALE_LIBRARIES)
+	set(HAVE_LIBSWSCALE 1)
+	list(APPEND ZM_BIN_LIBS ${SWSCALE_LIBRARIES})	
+	check_include_file("libswscale/swscale.h" HAVE_LIBSWSCALE_SWSCALE_H)
+endif(SWSCALE_LIBRARIES)
+
+# *** END OF LIBRARY CHECKS ***
+
+# Check for gnutls or crypto
+if((NOT HAVE_LIBCRYPTO) AND (NOT HAVE_LIBGNUTLS))
+	message(FATAL_ERROR " zm requires crypto or gnutls but none were found on your system")
+endif((NOT HAVE_LIBCRYPTO) AND (NOT HAVE_LIBGNUTLS))
+
+# Check for absolutely required headers:
+if(NOT HAVE_MYSQL_H)
+	message(FATAL_ERROR "zm requires MySQL headers - check that MySQL development packages are installed")
+endif(NOT HAVE_MYSQL_H)
+if(NOT HAVE_JPEGLIB_H)
+	message(FATAL_ERROR " zm requires libjpeg headers - check that libjpeg development packages are installed")
+endif(NOT HAVE_JPEGLIB_H)
+if(NOT HAVE_PTHREAD_H)
+	message(FATAL_ERROR " zm requires pthread headers - check that pthread development packages are installed")
+endif(NOT HAVE_PTHREAD_H)
+
+# Check for V4L header files and enable ZM_HAS_V4L, ZM_HAS_V4L1, ZM_HAS_V4L2 accordingly
+# Setting to zeros first is required because ZM uses #define for these
+set(ZM_HAS_V4L 0)
+set(ZM_HAS_V4L1 0)
+set(ZM_HAS_V4L2 0)
+if(HAVE_LINUX_VIDEODEV_H)
+	set(ZM_HAS_V4L 1)
+	set(ZM_HAS_V4L1 1)
+endif(HAVE_LINUX_VIDEODEV_H)
+if(HAVE_LINUX_VIDEODEV2_H)
+	set(ZM_HAS_V4L 1)
+	set(ZM_HAS_V4L2 1)
+endif(HAVE_LINUX_VIDEODEV2_H)
+if((NOT HAVE_LINUX_VIDEODEV_H) AND (NOT HAVE_LINUX_VIDEODEV2_H))
+	message(AUTHOR_WARNING " Video 4 Linux headers weren't found - Analog and USB camera support will not be available")
+endif((NOT HAVE_LINUX_VIDEODEV_H) AND (NOT HAVE_LINUX_VIDEODEV2_H))
+# Check for PCRE and enable ZM_PCRE accordingly
+set(ZM_PCRE 0)
+if(HAVE_LIBPCRE AND HAVE_PCRE_H)
+	set(ZM_PCRE 1)
+endif(HAVE_LIBPCRE AND HAVE_PCRE_H)
+
+
+# Check for authenication functions
+if(HAVE_OPENSSL_MD5_H)
+	check_prototype_definition(MD5 "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)
+	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)
+	check_prototype_definition(gnutls_fingerprint "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)
+	set(HAVE_DECL_MD5 1)
+else(HAVE_MD5_OPENSSL OR HAVE_MD5_GNUTLS)
+	message(AUTHOR_WARNING " ZM 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)
+# 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)
+	set(HAVE_GCRYPT_H 0)
+	set(HAVE_GNUTLS_OPENSSL_H 0)
+endif(HAVE_LIBCRYPTO AND HAVE_OPENSSL_MD5_H AND HAVE_MD5_OPENSSL)
+
+# Disable backtrace if not available
+if((NOT ZM_NO_CRASHTRACE) AND ((NOT HAVE_DECL_BACKTRACE) OR (NOT HAVE_EXECINFO_H)))
+	message(AUTHOR_WARNING " Backtrace is not available. disabling")
+	set(ZM_NO_CRASHTRACE ON)
+	set(HAVE_EXECINFO_H 0)
+	set(HAVE_DECL_BACKTRACE 0)
+endif((NOT ZM_NO_CRASHTRACE) AND ((NOT HAVE_DECL_BACKTRACE) OR (NOT HAVE_EXECINFO_H)))
+
+
+if(NOT ZM_NO_MMAP)
+	set(ZM_MMAP_PERLPACKAGE "Sys::Mmap")
+endif(NOT ZM_NO_MMAP)
+# Check for Perl. Version checking is removed because its ignored before CMake 2.8.8 and it seems that Perl is being detected as 5.16. instead of 5.6.0 ??
+find_package(Perl)
+if(NOT PERL_FOUND)
+	message(FATAL_ERROR "zm requires Perl 5.6.0 or newer but it was not found on your system")
+endif(NOT PERL_FOUND)
+# Checking for perl modules requires FindPerlModules.cmake
+# Check all required modules at once
+# TODO: Add checking for the optional modules
+find_package(PerlModules COMPONENTS Sys::Syslog DBI DBD::mysql Getopt::Long Time::HiRes Date::Manip LWP::UserAgent ExtUtils::MakeMaker ${ZM_MMAP_PERLPACKAGE})
+if(NOT PERLMODULES_FOUND)
+	message(FATAL_ERROR "Not all required perl modules were found on your system")
+endif(NOT PERLMODULES_FOUND)
+
+# Attempt to check which user apache (or other web server) runs on by searching for a user beginning with apache or www and then cutting the user from the first matching user line
+if(ZM_WEB_USER STREQUAL "")
+	# Check for a user matching ^apache and cut the username from the userline in the first match
+	file(STRINGS "/etc/passwd" userline_apache REGEX "^apache")
+	file(STRINGS "/etc/passwd" userline_www REGEX "^www")
+	if(NOT (userline_apache STREQUAL ""))
+		execute_process(COMMAND echo ${userline_apache} COMMAND cut -d: -f1 OUTPUT_VARIABLE ZM_WEB_USER OUTPUT_STRIP_TRAILING_WHITESPACE)
+	elseif(NOT (userline_www STREQUAL ""))
+		execute_process(COMMAND echo ${userline_www} COMMAND cut -d: -f1 OUTPUT_VARIABLE ZM_WEB_USER OUTPUT_STRIP_TRAILING_WHITESPACE)
+	endif(NOT (userline_apache STREQUAL ""))
+	message(STATUS "Detected web server user: ${ZM_WEB_USER}")
+endif(ZM_WEB_USER STREQUAL "")
+# Check if webgroup contains anything. If not, use the web user as the web group
+if(NOT ZM_WEB_GROUP)
+	set(ZM_WEB_GROUP ${ZM_WEB_USER})
+endif(NOT ZM_WEB_GROUP)
+message(STATUS "Using web user: ${ZM_WEB_USER}")
+message(STATUS "Using web group: ${ZM_WEB_GROUP}")
+
+# Some variables that zm expects
+set(ZM_PID "${ZM_RUNDIR}/zm.pid")
+set(ZM_CONFIG "/${CMAKE_INSTALL_SYSCONFDIR}/zm.conf")
+set(VERSION "${ZoneMinder_VERSION}")
+set(PATH_BUILD "${PROJECT_SOURCE_DIR}")
+set(TIME_BUILD "1000000") # Don't have a solution for this one yet
+set(BINDIR "${CMAKE_INSTALL_FULL_BINDIR}")
+set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
+set(SYSCONFDIR "/${CMAKE_INSTALL_SYSCONFDIR}")
+set(WEB_PREFIX "${ZM_WEBDIR}")
+set(CGI_PREFIX "${ZM_CGIDIR}")
+set(WEB_USER "${ZM_WEB_USER}")
+set(WEB_GROUP "${ZM_WEB_GROUP}")
+set(EXTRA_PERL_LIB "use lib '${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/perl5';")
+
+# Generate files from the .in files
+configure_file(zoneminder-config.cmake config.h @ONLY)
+configure_file(zm.conf.in zm.conf @ONLY)
+configure_file(zmconfgen.pl.in zmconfgen.pl @ONLY)
+configure_file(zmlinkcontent.sh.in zmlinkcontent.sh @ONLY)
+
+# Process subdirectories
+add_subdirectory(src)
+add_subdirectory(scripts)
+add_subdirectory(db)
+add_subdirectory(misc)
+add_subdirectory(web)
+
+# Run ZM configuration generator
+message(STATUS "Running ZoneMinder configuration generator")
+execute_process(COMMAND perl ./zmconfgen.pl RESULT_VARIABLE zmconfgen_result)
+if(zmconfgen_result EQUAL 0)
+	message(STATUS "ZoneMinder configuration generator completed successfully")
+else(zmconfgen_result EQUAL 0)
+	message(FATAL_ERROR "ZoneMinder configuration generator failed. Exit code: ${zmconfgen_result}")
+endif(zmconfgen_result EQUAL 0)
+
+# Install zm.conf
+install(FILES zm.conf DESTINATION "/${CMAKE_INSTALL_SYSCONFDIR}")
+
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 000000000..90aa0b25b
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,112 @@
+Installing ZoneMinder with cmake
+--------------------------------
+Starting with ZoneMinder 1.26.4, ZoneMinder can now be installed using cmake. This requires cmake version 2.6 or newer.
+cmake is an alternative to the autotools collection (libtool, autoconf, automake, autoheader and such). Its more recent and has many advantages, including, but not limited to:
+* One program (cmake) instead of multiple. (libtool, autoconf, automake, etc)
+* One file per directory (CMakeLists.txt) instead of multiple. (configure.ac, Makefile.am and sometimes more)
+* One syntax (cmake's syntax) instead of multiple. (bash and m4)
+* Generation of makefiles for many platforms, including Windows.
+* Newer than autotools and is being actively developed.
+* Generates colored makefiles with progress indicator.
+* Slightly faster because its based on C and not bash.
+* Lots of documentation, unlike autotools: http://www.cmake.org/cmake/help/cmake2.6docs.html
+
+At this point, its still possible to use autotools for the ZoneMinder project. Choosing cmake or autotools is now a matter of preference.
+Hopefully in the future, cmake will become the default way to install ZoneMinder.
+
+Important differences
+---------------------
+* Unlike the autotools way, the cmake way does not require any options. It attempts to detect some things by its own (system directories, libarch, web user and group) and uses defaults for others (installation paths and such).
+* Unlike the autotools way, which links the binaries to a fixed list of libraries, the cmake way only links to libraries that it found on the system. If a library is not found, but required, a fatal error will be shown during the configuration step.
+* Unlike the autotools way, the cmake way does not modify the system in any way it shouldnt. It only does what its supposed to do: Install files to your system. Nothing else and nothing leaks out of the DESTDIR environment variable (if used). This means that depending on your configuration, there might be an extra required step after installation: to link WEB_PATH/events and WEB_PATH/images folders to the correct places.
+* Currently there is no "make uninstall" target for cmake. However, its possible to do this manually. The file install_manifest.txt contains the list of files installed to the system. This can be used in many ways to delete all files installed by cmake, such as: xargs rm < install_manifest.txt
+
+Configuration
+-------------
+cmake by default does not require any parameters, but its possible to override the defaults with the options below.
+
+Configuration can be done in 4 ways:
+1) As a command line parameter, e.g. cmake -DCMAKE_VERBOSE_MAKEFILE=ON .
+2) Using cmake-gui
+4) Providing cmake with an initial cache file with the -C option
+4) By editing the cache file CMakeCache.txt (after it has been generated) - Not recommended
+
+Possible configuration options: 
+	ZM_RUNDIR		Location of transient process files, default: /var/run/zm
+	ZM_TMPDIR		Location of temporary files, default: /tmp/zm
+	ZM_LOGDIR 		Location of generated log files, default: /var/log/zm
+	ZM_WEBDIR		Location of the web files, default: <prefix>/share/zoneminder/www
+	ZM_CGIDIR		Location of the cgi-bin files, default: <prefix>/libexec/zoneminder/cgi-bin
+	ZM_CONTENTDIR		Location of dynamic content (events and images), default: /var/lib/zoneminder
+	ZM_DB_HOST		Hostname where ZoneMinder database located, default: localhost
+	ZM_DB_NAME		Name of ZoneMinder database, default: zm
+	ZM_DB_USER		Name of ZoneMinder database user, default: zmuser
+	ZM_DB_PASS		Password of ZoneMinder database user, default: zmpass
+	ZM_WEB_USER		The user apache or the local web server runs on. Leave empty for automatic detection. If that fails, you can use this variable to force
+	ZM_WEB_GROUP		The group apache or the local web server runs on, Leave empty to be the same as the web user
+Advanced:
+	ZM_EXTRA_LIBS		A list of optional libraries, separated by semicolons, e.g. ssl;theora
+	ZM_MYSQL_ENGINE		MySQL engine to use with database, default: InnoDB
+	ZM_NO_MMAP		Set to ON to not use mmap shared memory. Shouldn't be enabled unless you experience problems with the shared memory. default: OFF
+	ZM_NO_CRASHTRACE	Set to ON to skip crash trace code. Useful if zm_signal.cpp fails to compile. default: OFF
+
+
+Useful configuration options provided by cmake:
+CMAKE_VERBOSE_MAKEFILE - Set this to ON (default OFF) to see what cmake is doing. Very useful for troubleshooting.
+CMAKE_BUILD_TYPE - Set this to Debug (default Release) to build ZoneMinder with debugging enabled.
+CMAKE_INSTALL_PREFIX - Use this to change the prefix (default /usr/local). This option behaves like --prefix from autoconf. Package maintainers will probably want to set this to "/usr".
+CMAKE_INCLUDE_PATH - Use this to change the include search path.
+CMAKE_LIBRARY_PATH - Use this to change the library search path.
+Also see CMAKE_PREFIX_PATH for overriding both and some others.
+
+CFLAGS, CPPFLAGS and other environment variables:
+To append to the CFLAGS and CXXFLAGS, please use the CFLAGS and CXXFLAGS environment variables.
+Or use the CMAKE_C_FLAGS and CMAKE_CXX_FLAGS configuration options.
+To replace the CFLAGS and CXXFLAGS entirely:
+*   For the Release build type: use CMAKE_C_FLAGS_RELEASE for the CFLAGS and CMAKE_CXX_FLAGS_RELEASE for the CXXFLAGS
+*   For the Debug build type: use CMAKE_C_FLAGS_DEBUG for the CFLAGS and CMAKE_CXX_FLAGS_DEBUG for the CXXFLAGS
+Other important environment variables (such as LDFLAGS) are also supported.
+
+The DESTDIR environment variable is also supported.
+For more information about DESTDIR, see:
+*   http://www.gnu.org/prep/standards/html_node/DESTDIR.html
+
+Basic steps for installing ZoneMinder on a fresh system
+-------------------------------------------------------
+1) After installing all the required dependencies, in the project directory, run "cmake [extra options] ."
+This behaves like ./configure. It is also possible to supply configuration options, e.g. cmake -DZM_DB_PASS="mypass" .
+2) Run "make" to compile ZoneMinder
+3) Run "make install" (as root, or use sudo) to install ZoneMinder to your system.
+4) Create a directory for the content and the necessary symlinks by running zmlinkcontent.sh with the directory you want to use. e.g. ./zmlinkcontent.sh /nfs/zm
+5) Create a database for zoneminder, called "zm".
+6) Create a user for the zoneminder database, called zmuser with password and full privileges to the "zm" database.
+NOTE: The database server, database name, user and password can be different and adjusted during configuration step with the options in this file, or by editing /etc/zm.conf
+7) Populate the zoneminder database using the script zm_create.sql. This should be found in <prefix>/share/zoneminder/db or in the project/db directory.
+
+8) Create an apache virtual host for ZoneMinder. Make sure to use the same paths as ZM_WEBDIR and ZM_CGIDIR in /etc/zm.conf
+9) Create other config if desired (e.g. rsyslog, logrotate and such). Some of this can be found in <prefix>/share/zoneminder/misc or project/misc directory
+10) Setup an init script for your system. Its also possible to use "zmpkg.pl start" and "zmpkg.pl stop" if you can't find a one.
+
+Basic steps for upgrading ZoneMinder
+------------------------------------
+1) If you wish to use the same paths and configuration as the currently installed ZoneMinder, you need to provide cmake with options that match your current installation.
+You can provide those options in the command line to cmake, e.g. cmake -DZM_DB_PASS="blah" -DZM_WEBDIR="/usr/local/share/zoneminder/www" -DCMAKE_INSTALL_FULL_BINDIR="/usr/bin" .
+Or alternatively, for convenience, use the cmakecacheimport.sh script. This reads a zoneminder configuration file (zm.conf) and creates a cmake initial cache file called zm_conf.cmake, which you can then provide to cmake.
+For example:
+./cmakecacheimport.sh /etc/zm.conf
+cmake -C zm_conf.cmake [extra options] .
+
+2) Run "make" to compile ZoneMinder
+3) Run "make install" (as root, or use sudo) to install ZoneMinder to your system.
+4) Depending on your configuration: If the DIR_EVENTS and DIR_IMAGES options are set to default (pointing to web directory/events and web directory/images), You will need to update the symlinks in the web directory to the correct folders. e.g. web directory/events should point to the real events directory, and likewise for the images directory.
+You can use the zmlinkcontent.sh script for this. For example, if /var/lib/zoneminder is the folder that contains the "images" and "events" directories, you can use:
+./zmlinkcontent.sh /var/lib/zoneminder
+By default, the content directory for new installations is /var/lib/zoneminder. This can be overridden in cmake with the ZM_CONTENTDIR option. e.g. cmake -DZM_CONTENTDIR="/some/big/storage/zm" .
+
+5) Run zmupdate.pl to update the database layout to the new version.
+
+Contributions:
+--------------
+Please visit our GitHub at http://github.com/ZoneMinder/ZoneMinder
+
+
diff --git a/Makefile.am b/Makefile.am
index df4ea3d4d..d78fd42d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,12 +20,11 @@ EXTRA_DIST = \
 # Yes, you are correct. This is a HACK!
 install-data-hook:
 	( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )
-	( if ! test -e $(ZM_RUNDIR); then mkdir -p $(ZM_RUNDIR); fi; if test "$(ZM_RUNDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR); fi )
-	( if ! test -e $(ZM_TMPDIR); then mkdir -m 700 -p $(ZM_TMPDIR); fi; if test "$(ZM_TMPDIR)" != "/tmp"; then chown $(webuser):$(webgroup) $(ZM_TMPDIR); chmod u+w $(ZM_TMPDIR); fi )
-	( if ! test -e $(ZM_LOGDIR); then mkdir -p $(ZM_LOGDIR); fi; if test "$(ZM_LOGDIR)" != "/var/log"; then chown $(webuser):$(webgroup) $(ZM_LOGDIR); chmod u+w $(ZM_LOGDIR); fi )
+	( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir -p $(DESTDIR)$(ZM_RUNDIR); fi; if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_RUNDIR); chmod u+w $(DESTDIR)$(ZM_RUNDIR); fi )
+	( if ! test -e $(DESTDIR)$(ZM_TMPDIR); then mkdir -m 700 -p $(DESTDIR)$(ZM_TMPDIR); fi; if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_TMPDIR); chmod u+w $(DESTDIR)$(ZM_TMPDIR); fi )
 
 uninstall-hook:
 	@-( cd $(DESTDIR)$(webdir); rm -rf events graphics images sounds temp )
-	@-( if test "$(ZM_RUNDIR)" != "/var/run"; then rm -rf $(ZM_RUNDIR); fi )
-	@-( if test "$(ZM_TMPDIR)" != "/tmp"; then rm -rf $(ZM_TMPDIR); fi )
-	@-( if test "$(ZM_LOGDIR)" != "/var/log"; then rm -rf $(ZM_LOGDIR); fi )
+	@-( if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then rm -rf $(DESTDIR)$(ZM_RUNDIR); fi )
+	@-( if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp"; then rm -rf $(DESTDIR)$(ZM_TMPDIR); fi )
+	@-( if test "$(DESTDIR)$(ZM_LOGDIR)" != "/var/log"; then rm -rf $(DESTDIR)$(ZM_LOGDIR); fi )
diff --git a/README.md b/README.md
index 924898b8d..95b7bcde4 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 ZoneMinder
 ==========
 
+[![Build Status](https://travis-ci.org/ZoneMinder/ZoneMinder.png)](https://travis-ci.org/ZoneMinder/ZoneMinder)
+
 All documentation for ZoneMinder is now online at http://www.zoneminder.com/wiki/index.php/Documentation
 
 ## Overview
diff --git a/ZoneMinder b/ZoneMinder
deleted file mode 160000
index 4d508d8be..000000000
--- a/ZoneMinder
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4d508d8be232a4f84aefe37327b0e737196f58d1
diff --git a/cmake/Modules/CheckPrototypeDefinition.c.in b/cmake/Modules/CheckPrototypeDefinition.c.in
new file mode 100644
index 000000000..a97344ac3
--- /dev/null
+++ b/cmake/Modules/CheckPrototypeDefinition.c.in
@@ -0,0 +1,29 @@
+@CHECK_PROTOTYPE_DEFINITION_HEADER@
+
+static void cmakeRequireSymbol(int dummy, ...) {
+  (void) dummy;
+}
+
+static void checkSymbol(void) {
+#ifndef @CHECK_PROTOTYPE_DEFINITION_SYMBOL@
+  cmakeRequireSymbol(0, &@CHECK_PROTOTYPE_DEFINITION_SYMBOL@);
+#endif
+}
+
+@CHECK_PROTOTYPE_DEFINITION_PROTO@ {
+  return @CHECK_PROTOTYPE_DEFINITION_RETURN@;
+}
+
+#ifdef __CLASSIC_C__
+int main() {
+  int ac;
+  char*av[];
+#else
+int main(int ac, char *av[]) {
+#endif
+  checkSymbol();
+  if (ac > 1000) {
+    return *av[0];
+  }
+  return 0;
+}
diff --git a/cmake/Modules/CheckPrototypeDefinition.cmake b/cmake/Modules/CheckPrototypeDefinition.cmake
new file mode 100644
index 000000000..2342b3c4f
--- /dev/null
+++ b/cmake/Modules/CheckPrototypeDefinition.cmake
@@ -0,0 +1,98 @@
+# - Check if the protoype we expect is correct.
+# check_prototype_definition(FUNCTION PROTOTYPE RETURN HEADER VARIABLE)
+#  FUNCTION - The name of the function (used to check if prototype exists)
+#  PROTOTYPE- The prototype to check.
+#  RETURN - The return value of the function.
+#  HEADER - The header files required.
+#  VARIABLE - The variable to store the result.
+# Example:
+#  check_prototype_definition(getpwent_r
+#   "struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)"
+#   "NULL"
+#   "unistd.h;pwd.h"
+#   SOLARIS_GETPWENT_R)
+# The following variables may be set before calling this macro to
+# modify the way the check is run:
+#
+#  CMAKE_REQUIRED_FLAGS = string of compile command line flags
+#  CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
+#  CMAKE_REQUIRED_INCLUDES = list of include directories
+#  CMAKE_REQUIRED_LIBRARIES = list of libraries to link
+
+#=============================================================================
+# Copyright 2005-2009 Kitware, Inc.
+# Copyright 2010-2011 Andreas Schneider <asn@cryptomilk.org>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+#
+
+
+get_filename_component(__check_proto_def_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
+
+
+function(CHECK_PROTOTYPE_DEFINITION _FUNCTION _PROTOTYPE _RETURN _HEADER _VARIABLE)
+
+  if ("${_VARIABLE}" MATCHES "^${_VARIABLE}$")
+    set(CHECK_PROTOTYPE_DEFINITION_CONTENT "/* */\n")
+
+    set(CHECK_PROTOTYPE_DEFINITION_FLAGS ${CMAKE_REQUIRED_FLAGS})
+    if (CMAKE_REQUIRED_LIBRARIES)
+      set(CHECK_PROTOTYPE_DEFINITION_LIBS
+        LINK_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
+    else()
+      set(CHECK_PROTOTYPE_DEFINITION_LIBS)
+    endif()
+    if (CMAKE_REQUIRED_INCLUDES)
+      set(CMAKE_SYMBOL_EXISTS_INCLUDES
+        "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}")
+    else()
+      set(CMAKE_SYMBOL_EXISTS_INCLUDES)
+    endif()
+
+    foreach(_FILE ${_HEADER})
+      set(CHECK_PROTOTYPE_DEFINITION_HEADER
+        "${CHECK_PROTOTYPE_DEFINITION_HEADER}#include <${_FILE}>\n")
+    endforeach()
+
+    set(CHECK_PROTOTYPE_DEFINITION_SYMBOL ${_FUNCTION})
+    set(CHECK_PROTOTYPE_DEFINITION_PROTO ${_PROTOTYPE})
+    set(CHECK_PROTOTYPE_DEFINITION_RETURN ${_RETURN})
+
+    configure_file("${__check_proto_def_dir}/CheckPrototypeDefinition.c.in"
+      "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckPrototypeDefinition.c" @ONLY)
+
+    file(READ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckPrototypeDefinition.c _SOURCE)
+
+    try_compile(${_VARIABLE}
+      ${CMAKE_BINARY_DIR}
+      ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/CheckPrototypeDefinition.c
+      COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
+      ${CHECK_PROTOTYPE_DEFINITION_LIBS}
+      CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${CHECK_PROTOTYPE_DEFINITION_FLAGS}
+      "${CMAKE_SYMBOL_EXISTS_INCLUDES}"
+      OUTPUT_VARIABLE OUTPUT)
+
+    if (${_VARIABLE})
+      set(${_VARIABLE} 1 CACHE INTERNAL "Have correct prototype for ${_FUNCTION}")
+      message(STATUS "Checking prototype ${_FUNCTION} for ${_VARIABLE} - True")
+      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+        "Determining if the prototype ${_FUNCTION} exists for ${_VARIABLE} passed with the following output:\n"
+        "${OUTPUT}\n\n")
+    else ()
+      message(STATUS "Checking prototype ${_FUNCTION} for ${_VARIABLE} - False")
+      set(${_VARIABLE} 0 CACHE INTERNAL "Have correct prototype for ${_FUNCTION}")
+      file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+        "Determining if the prototype ${_FUNCTION} exists for ${_VARIABLE} failed with the following output:\n"
+        "${OUTPUT}\n\n${_SOURCE}\n\n")
+    endif ()
+  endif()
+
+endfunction()
diff --git a/cmake/Modules/FindPerlModules.cmake b/cmake/Modules/FindPerlModules.cmake
new file mode 100644
index 000000000..f09ff851d
--- /dev/null
+++ b/cmake/Modules/FindPerlModules.cmake
@@ -0,0 +1,78 @@
+# - try to find perl modules, passed as COMPONENTS
+#
+# Non-cache variable you might use in your CMakeLists.txt:
+#  PERLMODULES_FOUND
+#
+# Requires these CMake modules:
+#  FindPackageHandleStandardArgs (known included with CMake >=2.6.2)
+#
+# Original Author:
+# 2012 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
+# http://academic.cleardefinition.com
+# Iowa State University HCI Graduate Program/VRAC
+#
+# Copyright Iowa State University 2012.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+if(NOT PERL_FOUND)
+	find_package(Perl QUIET)
+endif()
+
+set(_deps_check)
+if(PERL_FOUND)
+	foreach(module ${PerlModules_FIND_COMPONENTS})
+		string(REPLACE "::" "/" modfilename "${module}.pm")
+		string(REPLACE "::" "_" modvarname "PERLMODULES_${module}_MODULE")
+		string(TOUPPER "${modvarname}" modvarname)
+		list(APPEND _deps_check ${modvarname})
+		if(NOT ${modvarname})
+			if(NOT PerlModules_FIND_QUIETLY)
+				message(STATUS "Checking for perl module ${module}")
+			endif()
+			execute_process(COMMAND
+				"${PERL_EXECUTABLE}"
+				"-e"
+				"use ${module}; print \$INC{\"${modfilename}\"}"
+				RESULT_VARIABLE result_code
+				OUTPUT_VARIABLE filename
+				ERROR_VARIABLE error_info
+				OUTPUT_STRIP_TRAILING_WHITESPACE)
+			if(result_code EQUAL 0)
+				if(NOT PerlModules_FIND_QUIETLY)
+					message(STATUS
+						"Checking for perl module ${module} - found at ${filename}")
+				endif()
+				set(${modvarname}
+					"${filename}"
+					CACHE
+					FILEPATH
+					"Location found for module ${module}"
+					FORCE)
+				mark_as_advanced(${modvarname})
+			else()
+				if(NOT PerlModules_FIND_QUIETLY)
+					message(STATUS "Checking for perl module ${module} - failed")
+				endif()
+				set(${modvarname}
+					"NOTFOUND"
+					CACHE
+					FILEPATH
+					"No location found for module ${module}"
+					FORCE)
+				file(APPEND
+					${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log
+					"Determining if the Perl module ${module} exists failed with the following error output:\n"
+					"${error_info}\n\n")
+			endif()
+		endif()
+	endforeach()
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(PerlModules
+	DEFAULT_MSG
+	PERL_FOUND
+	${_deps_check})
+
diff --git a/cmake/Modules/GNUInstallDirs.cmake b/cmake/Modules/GNUInstallDirs.cmake
new file mode 100644
index 000000000..0302e4bef
--- /dev/null
+++ b/cmake/Modules/GNUInstallDirs.cmake
@@ -0,0 +1,188 @@
+# - Define GNU standard installation directories
+# Provides install directory variables as defined for GNU software:
+#  http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+# Inclusion of this module defines the following variables:
+#  CMAKE_INSTALL_<dir>      - destination for files of a given type
+#  CMAKE_INSTALL_FULL_<dir> - corresponding absolute path
+# where <dir> is one of:
+#  BINDIR           - user executables (bin)
+#  SBINDIR          - system admin executables (sbin)
+#  LIBEXECDIR       - program executables (libexec)
+#  SYSCONFDIR       - read-only single-machine data (etc)
+#  SHAREDSTATEDIR   - modifiable architecture-independent data (com)
+#  LOCALSTATEDIR    - modifiable single-machine data (var)
+#  LIBDIR           - object code libraries (lib or lib64 or lib/<multiarch-tuple> on Debian)
+#  INCLUDEDIR       - C header files (include)
+#  OLDINCLUDEDIR    - C header files for non-gcc (/usr/include)
+#  DATAROOTDIR      - read-only architecture-independent data root (share)
+#  DATADIR          - read-only architecture-independent data (DATAROOTDIR)
+#  INFODIR          - info documentation (DATAROOTDIR/info)
+#  LOCALEDIR        - locale-dependent data (DATAROOTDIR/locale)
+#  MANDIR           - man documentation (DATAROOTDIR/man)
+#  DOCDIR           - documentation root (DATAROOTDIR/doc/PROJECT_NAME)
+# Each CMAKE_INSTALL_<dir> value may be passed to the DESTINATION options of
+# install() commands for the corresponding file type.  If the includer does
+# not define a value the above-shown default will be used and the value will
+# appear in the cache for editing by the user.
+# Each CMAKE_INSTALL_FULL_<dir> value contains an absolute path constructed
+# from the corresponding destination by prepending (if necessary) the value
+# of CMAKE_INSTALL_PREFIX.
+
+#=============================================================================
+# Copyright 2011 Nikita Krupen'ko <krnekit@gmail.com>
+# Copyright 2011 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+# Installation directories
+#
+if(NOT DEFINED CMAKE_INSTALL_BINDIR)
+  set(CMAKE_INSTALL_BINDIR "bin" CACHE PATH "user executables (bin)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_SBINDIR)
+  set(CMAKE_INSTALL_SBINDIR "sbin" CACHE PATH "system admin executables (sbin)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_LIBEXECDIR)
+  set(CMAKE_INSTALL_LIBEXECDIR "libexec" CACHE PATH "program executables (libexec)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_SYSCONFDIR)
+  set(CMAKE_INSTALL_SYSCONFDIR "etc" CACHE PATH "read-only single-machine data (etc)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_SHAREDSTATEDIR)
+  set(CMAKE_INSTALL_SHAREDSTATEDIR "com" CACHE PATH "modifiable architecture-independent data (com)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_LOCALSTATEDIR)
+  set(CMAKE_INSTALL_LOCALSTATEDIR "var" CACHE PATH "modifiable single-machine data (var)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+  set(_LIBDIR_DEFAULT "lib")
+  # Override this default 'lib' with 'lib64' iff:
+  #  - we are on Linux system but NOT cross-compiling
+  #  - we are NOT on debian
+  #  - we are on a 64 bits system
+  # reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
+  # For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
+  # CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
+  # See http://wiki.debian.org/Multiarch
+  if(CMAKE_SYSTEM_NAME MATCHES "Linux"
+      AND NOT CMAKE_CROSSCOMPILING)
+    if (EXISTS "/etc/debian_version") # is this a debian system ?
+       if(CMAKE_LIBRARY_ARCHITECTURE)
+         set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+       endif()
+    else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
+      if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
+        message(AUTHOR_WARNING
+          "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
+          "Please enable at least one language before including GNUInstallDirs.")
+      else()
+        if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+          set(_LIBDIR_DEFAULT "lib64")
+        endif()
+      endif()
+    endif()
+  endif()
+  set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
+  set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE PATH "C header files (include)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_OLDINCLUDEDIR)
+  set(CMAKE_INSTALL_OLDINCLUDEDIR "/usr/include" CACHE PATH "C header files for non-gcc (/usr/include)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_DATAROOTDIR)
+  set(CMAKE_INSTALL_DATAROOTDIR "share" CACHE PATH "read-only architecture-independent data root (share)")
+endif()
+
+#-----------------------------------------------------------------------------
+# Values whose defaults are relative to DATAROOTDIR.  Store empty values in
+# the cache and store the defaults in local variables if the cache values are
+# not set explicitly.  This auto-updates the defaults as DATAROOTDIR changes.
+
+if(NOT CMAKE_INSTALL_DATADIR)
+  set(CMAKE_INSTALL_DATADIR "" CACHE PATH "read-only architecture-independent data (DATAROOTDIR)")
+  set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}")
+endif()
+
+if(NOT CMAKE_INSTALL_INFODIR)
+  set(CMAKE_INSTALL_INFODIR "" CACHE PATH "info documentation (DATAROOTDIR/info)")
+  set(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info")
+endif()
+
+if(NOT CMAKE_INSTALL_LOCALEDIR)
+  set(CMAKE_INSTALL_LOCALEDIR "" CACHE PATH "locale-dependent data (DATAROOTDIR/locale)")
+  set(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_DATAROOTDIR}/locale")
+endif()
+
+if(NOT CMAKE_INSTALL_MANDIR)
+  set(CMAKE_INSTALL_MANDIR "" CACHE PATH "man documentation (DATAROOTDIR/man)")
+  set(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_DATAROOTDIR}/man")
+endif()
+
+if(NOT CMAKE_INSTALL_DOCDIR)
+  set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/PROJECT_NAME)")
+  set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}")
+endif()
+
+#-----------------------------------------------------------------------------
+
+mark_as_advanced(
+  CMAKE_INSTALL_BINDIR
+  CMAKE_INSTALL_SBINDIR
+  CMAKE_INSTALL_LIBEXECDIR
+  CMAKE_INSTALL_SYSCONFDIR
+  CMAKE_INSTALL_SHAREDSTATEDIR
+  CMAKE_INSTALL_LOCALSTATEDIR
+  CMAKE_INSTALL_LIBDIR
+  CMAKE_INSTALL_INCLUDEDIR
+  CMAKE_INSTALL_OLDINCLUDEDIR
+  CMAKE_INSTALL_DATAROOTDIR
+  CMAKE_INSTALL_DATADIR
+  CMAKE_INSTALL_INFODIR
+  CMAKE_INSTALL_LOCALEDIR
+  CMAKE_INSTALL_MANDIR
+  CMAKE_INSTALL_DOCDIR
+  )
+
+# Result directories
+#
+foreach(dir
+    BINDIR
+    SBINDIR
+    LIBEXECDIR
+    SYSCONFDIR
+    SHAREDSTATEDIR
+    LOCALSTATEDIR
+    LIBDIR
+    INCLUDEDIR
+    OLDINCLUDEDIR
+    DATAROOTDIR
+    DATADIR
+    INFODIR
+    LOCALEDIR
+    MANDIR
+    DOCDIR
+    )
+  if(NOT IS_ABSOLUTE ${CMAKE_INSTALL_${dir}})
+    set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_${dir}}")
+  else()
+    set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_${dir}}")
+  endif()
+endforeach()
diff --git a/cmakecacheimport.sh b/cmakecacheimport.sh
new file mode 100755
index 000000000..4ae5fa49c
--- /dev/null
+++ b/cmakecacheimport.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+# The purpose of this file is to add entries from zm.conf to cmake's cache.
+
+echo "*** This bash script imports configuration from zm.conf into cmake initial cache file"
+echo "*** The file can be used with cmake like so: cmake -C zm_conf.cmake [extra cmake options] ."
+echo "*** Usage: ./cmakecacheimport.sh [PATH TO ZM.CONF]"
+echo ""
+
+# Check for too many prameters
+if [[ "$#" -gt "0" && "$#" -ne "1" ]]; then
+       echo "Error: Too many parameters!"
+       exit 50
+fi
+
+# Check if zm.conf was supplied as an argument and that it exists
+if [ "$#" -eq "1" ]; then
+	ZM_CONFIG="$1"
+	if [ ! -f "$ZM_CONFIG" ]; then
+		echo "The zoneminder configuration file $ZM_CONFIG does not exist!"
+		exit 40
+	fi
+fi
+
+# Load zm.conf
+if [ -n "$ZM_CONFIG" ]; then
+	echo "Using custom zm.conf $ZM_CONFIG"
+	source "$ZM_CONFIG"
+elif [ -f "/etc/zm.conf" ]; then
+	echo "Using system zm.conf"
+	source "/etc/zm.conf"
+elif [ -f "zm.conf" ]; then
+	echo "Using local zm.conf"
+	source "zm.conf"
+else
+	echo "Failed locating zoneminder configuration file (zm.conf)\nPlease specify the full path to the zoneminder configuration file"
+	exit 45
+fi
+
+# Create the file
+touch "zm_conf.cmake"
+if [ "$?" != "0" ]; then
+	echo "Failed creating zm_conf.cmake in the current directory"
+	exit 10
+fi
+
+# Print some information
+echo "Executables directory      : $ZM_PATH_BIN"
+#echo "Libraries directory        : $ZM_PATH_LIB"
+#echo "System config directory    : $ZM_PATH_CONF"
+echo "Web directory              : $ZM_PATH_WEB"
+echo "CGI directory              : $ZM_PATH_CGI"
+echo "Web user                   : $ZM_WEB_USER"
+echo "Web group                  : $ZM_WEB_GROUP"
+echo "Database host              : $ZM_DB_HOST"
+echo "Database name              : $ZM_DB_NAME"
+echo "Database user              : $ZM_DB_USER"
+echo "Database password          : Not shown"
+
+
+CMPATH="CACHE PATH \"Imported by cmakecacheimport.sh\" FORCE"
+CMSTRING="CACHE STRING \"Imported by cmakecacheimport.sh\" FORCE"
+# Write
+echo "# Generated by cmakecacheimport.sh">zm_conf.cmake
+echo "set(CMAKE_INSTALL_FULL_BINDIR \"$ZM_PATH_BIN\" $CMPATH)">>zm_conf.cmake
+#echo "set(CMAKE_INSTALL_FULL_LIBDIR \"$ZM_PATH_LIB\" $CMPATH)">>zm_conf.cmake
+#echo "set(CMAKE_INSTALL_FULL_SYSCONFDIR \"$ZM_PATH_CONF\" $CMPATH)">>zm_conf.cmake
+echo "set(ZM_WEBDIR \"$ZM_PATH_WEB\" $CMPATH)">>zm_conf.cmake
+echo "set(ZM_CGIDIR \"$ZM_PATH_CGI\" $CMPATH)">>zm_conf.cmake
+echo "set(ZM_WEB_USER \"$ZM_WEB_USER\" $CMSTRING)">>zm_conf.cmake
+echo "set(ZM_WEB_GROUP \"$ZM_WEB_GROUP\" $CMSTRING)">>zm_conf.cmake
+echo "set(ZM_DB_HOST \"$ZM_DB_HOST\" $CMSTRING)">>zm_conf.cmake
+echo "set(ZM_DB_NAME \"$ZM_DB_NAME\" $CMSTRING)">>zm_conf.cmake
+echo "set(ZM_DB_USER \"$ZM_DB_USER\" $CMSTRING)">>zm_conf.cmake
+echo "set(ZM_DB_PASS \"$ZM_DB_PASS\" $CMSTRING)">>zm_conf.cmake
+
+echo ""
+echo "Wrote zm_conf.cmake"
+echo ""
+echo "All done"
diff --git a/configure.ac b/configure.ac
index 1132f5d9a..211d2ae95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT(zm,1.26.3,[http://www.zoneminder.com/forums/ - Please check FAQ first],ZoneMinder,http://www.zoneminder.com/downloads.html)
+AC_INIT(zm,1.26.4,[http://www.zoneminder.com/forums/ - Please check FAQ first],ZoneMinder,http://www.zoneminder.com/downloads.html)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR(src/zm.h)
 AC_CONFIG_HEADERS(config.h)
@@ -302,7 +302,7 @@ AC_HEADER_STDC
 AC_CHECK_HEADERS([fcntl.h limits.h memory.h stddef.h stdlib.h string.h strings.h sys/param.h sys/time.h syslog.h unistd.h values.h])
 AC_CHECK_HEADERS([netdb.h netinet/in.h arpa/inet.h sys/ioctl.h sys/socket.h sys/un.h glob.h sys/sendfile.h])
 AC_CHECK_HEADERS(execinfo.h,,,)
-AC_CHECK_HEADERS(syscall.h,,,)
+AC_CHECK_HEADERS(sys/syscall.h,,,)
 AC_CHECK_HEADERS(pthread.h,,,)
 AC_CHECK_HEADERS(linux/videodev.h,AC_SUBST(ZM_HAS_V4L1,1),AC_SUBST(ZM_HAS_V4L1,0),)
 AC_CHECK_HEADERS(linux/videodev2.h,AC_SUBST(ZM_HAS_V4L2,1),AC_SUBST(ZM_HAS_V4L2,0),)
diff --git a/db/CMakeLists.txt b/db/CMakeLists.txt
new file mode 100644
index 000000000..5e53e8efc
--- /dev/null
+++ b/db/CMakeLists.txt
@@ -0,0 +1,11 @@
+# CMakeLists.txt for the ZoneMinder database scripts
+
+# Create files from the .in files
+configure_file(zm_create.sql.in ${CMAKE_CURRENT_SOURCE_DIR}/zm_create.sql @ONLY)
+
+# Glob all files matching zm*.sql (to exclude *.in files and autotools's files)
+file(GLOB dbfileslist RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "zm*.sql")
+
+# Install the database scripts, exclude makefiles and cmake stuff
+install(FILES ${dbfileslist} DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
+
diff --git a/db/test.monitor.sql b/db/test.monitor.sql
new file mode 100644
index 000000000..084a6ebcb
--- /dev/null
+++ b/db/test.monitor.sql
@@ -0,0 +1 @@
+INSERT INTO Monitors (Name, Type, Function, Enabled, Format, Protocol, Method, Host, Port, Path, Width, Height, Colours, Palette, Orientation, Deinterlacing, Brightness, Contrast, Hue, Colour, RefBlendPerc) VALUES ('travis_test','Remote','Modect',1,255,'http','simple','50.79.143.149','21146','/mjpg/video.mjpg',1280,800,3,0,'0',0,-1,-1,-1,-1,12);
diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index c4680accb..20e28d591 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -1,8 +1,8 @@
--- MySQL dump 10.9
+-- MySQL dump 10.13  Distrib 5.6.13, for Linux (i686)
 --
 -- Host: localhost    Database: @ZM_DB_NAME@
 -- ------------------------------------------------------
--- Server version	4.1.16-log
+-- Server version       5.6.13
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -31,7 +31,7 @@ CREATE TABLE `Config` (
   `Name` varchar(32) NOT NULL default '',
   `Value` text NOT NULL,
   `Type` tinytext NOT NULL,
-  `DefaultValue` tinytext,
+  `DefaultValue` text,
   `Hint` tinytext,
   `Pattern` tinytext,
   `Format` tinytext,
@@ -268,7 +268,7 @@ CREATE TABLE `Logs` (
   `Pid` smallint(6) DEFAULT NULL,
   `Level` tinyint(3) NOT NULL,
   `Code` char(3) NOT NULL,
-  `Message` varchar(255) NOT NULL,
+  `Message` text NOT NULL,
   `File` varchar(255) DEFAULT NULL,
   `Line` smallint(5) unsigned DEFAULT NULL,
   KEY `TimeKey` (`TimeKey`)
@@ -284,7 +284,7 @@ CREATE TABLE `MonitorPresets` (
   `Name` varchar(64) NOT NULL default '',
   `Type` enum('Local','Remote','File','Ffmpeg') NOT NULL default 'Local',
   `Device` tinytext,
-  `Channel` tinyint(3) unsigned default NULL,
+  `Channel` tinytext,
   `Format` int(10) unsigned default NULL,
   `Protocol` varchar(16) default NULL,
   `Method` varchar(16) default NULL,
@@ -520,7 +520,7 @@ CREATE TABLE `Zones` (
 --
 -- Create a default admin user.
 --
-insert into Users values ('','admin',password('admin'),'',1,'View','Edit','Edit','Edit','Edit','Edit','','');
+insert into Users VALUES (NULL,'admin',password('admin'),'',1,'View','Edit','Edit','Edit','Edit','Edit','','');
 
 --
 -- Add a sample filter to purge the oldest 5 events when the disk is 95% full, delete is disabled though
@@ -535,8 +535,8 @@ insert into Controls values (2,'Pelco-P','Local','PelcoP',1,1,0,1,1,0,0,1,NULL,N
 insert into Controls values (3,'Sony VISCA','Local','Visca',1,1,0,1,0,0,0,1,0,16384,10,4000,1,1,6,1,1,1,0,1,0,1536,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,3,1,1,1,1,0,1,1,0,1,-15578,15578,100,10000,1,1,50,1,254,1,-7789,7789,100,5000,1,1,50,1,254,0,0);
 INSERT INTO Controls VALUES (4,'Axis API v2','Remote','AxisV2',0,0,0,1,0,0,1,0,0,9999,10,2500,0,NULL,NULL,1,1,0,1,0,0,9999,10,2500,0,NULL,NULL,1,1,0,1,0,0,9999,10,2500,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,12,1,1,1,1,1,0,1,0,1,-360,360,1,90,0,NULL,NULL,0,NULL,1,-360,360,1,90,0,NULL,NULL,0,NULL,0,0);
 insert into Controls values (5,'Panasonic IP','Remote','PanasonicIP',0,0,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,8,1,1,1,0,1,0,0,1,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
-insert into Controls values (6,'Neu-Fusion NCS370','Remote','Ncs370',0,0,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,24,1,0,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0); 
-insert into Controls values (7,'AirLink SkyIPCam 7xx','Remote','SkyIPCam7xx',0,0,1,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,8,1,1,1,0,1,0,1,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0); 
+insert into Controls values (6,'Neu-Fusion NCS370','Remote','Ncs370',0,0,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,24,1,0,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
+insert into Controls values (7,'AirLink SkyIPCam 7xx','Remote','SkyIPCam7xx',0,0,1,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,8,1,1,1,0,1,0,1,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
 insert into Controls values (8,'Pelco-D','Ffmpeg','PelcoD',1,1,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
 insert into Controls values (9,'Pelco-P','Ffmpeg','PelcoP',1,1,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
 INSERT INTO Controls VALUES (10,'Foscam FI8620','Ffmpeg','FI8620_Y2k',0,0,0,1,0,0,0,1,1,10,1,10,1,1,63,1,1,0,0,1,1,63,1,63,1,1,63,1,1,0,0,1,0,0,0,0,1,0,255,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,255,1,8,0,1,1,1,0,0,0,1,1,1,360,1,360,1,1,63,0,0,1,1,90,1,90,1,1,63,0,0,0,0);
@@ -547,73 +547,73 @@ INSERT INTO Controls VALUES (13,'Loftek Sentinel','Remote','LoftekSentinel',0,0,
 --
 -- Add some monitor preset values
 --
-INSERT INTO MonitorPresets VALUES ('','Axis IP, 320x240, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Axis IP, 320x240, mpjpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&req_fps=5',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Axis IP, 320x240, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Axis IP, 320x240, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Axis IP, 640x480, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Axis IP, 640x480, mpjpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&req_fps=5',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Axis IP, 640x480, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Axis IP, 640x480, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Axis IP, 320x240, mpjpeg, B&W','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&color=0',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Axis IP, 640x480, mpjpeg, B&W','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&color=0',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Axis IP PTZ, 320x240, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES ('','Axis IP PTZ, 320x240, mpjpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&req_fps=5',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES ('','Axis IP PTZ, 320x240, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES ('','Axis IP PTZ, 320x240, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,5.0,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES ('','Axis IP PTZ, 640x480, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES ('','Axis IP PTZ, 640x480, mpjpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&req_fps=5',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES ('','Axis IP PTZ, 640x480, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES ('','Axis IP PTZ, 640x480, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,5.0,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT into MonitorPresets VALUES ('','Axis IP, mpeg4, unicast','Remote',NULL,NULL,NULL,'rtsp','rtpUni','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT into MonitorPresets VALUES ('','Axis IP, mpeg4, multicast','Remote',NULL,NULL,NULL,'rtsp','rtpMulti','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT into MonitorPresets VALUES ('','Axis IP, mpeg4, RTP/RTSP','Remote',NULL,NULL,NULL,'rtsp','rtpRtsp','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT into MonitorPresets VALUES ('','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 ('','Panasonic IP, 320x240, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/nphMotionJpeg?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Panasonic IP, 320x240, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Panasonic IP, 320x240, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Panasonic IP, 640x480, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/nphMotionJpeg?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Panasonic IP, 640x480, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Panasonic IP, 640x480, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Panasonic IP PTZ, 320x240, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/nphMotionJpeg?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES ('','Panasonic IP PTZ, 320x240, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES ('','Panasonic IP PTZ, 320x240, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,5.0,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES ('','Panasonic IP PTZ, 640x480, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/nphMotionJpeg?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES ('','Panasonic IP PTZ, 640x480, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES ('','Panasonic IP PTZ, 640x480, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,5.0,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES ('','Gadspot IP, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Gadspot IP, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Gadspot IP, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/GetData.cgi',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Gadspot IP, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','VEO Observer, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Blue Net Video Server, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/cgi-bin/image.cgi?control=0&id=admin&passwd=admin',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT into MonitorPresets VALUES ('','ACTi IP, mpeg4, unicast','Remote',NULL,NULL,NULL,'rtsp','rtpUni','<ip-address>',7070,'','/track',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Axis FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://<host/address>/axis-media/media.amp?videocodec=h264',NULL,NULL,NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Vivotek FFMPEG','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://<host/address>:554/live.sdp',NULL,NULL,NULL,352,240,NULL,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Axis FFMPEG','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://<host/address>/axis-media/media.amp',NULL,NULL,NULL,640,480,NULL,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','ACTi TCM FFMPEG','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://admin:123456@<host/address>:7070',NULL,NULL,NULL,320,240,NULL,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L2), PAL, 320x240','Local','/dev/video<?>','<?>',255,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L2), PAL, 320x240, max 5 FPS','Local','/dev/video<?>','<?>',255,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L2), PAL, 640x480','Local','/dev/video<?>','<?>',255,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L2), PAL, 640x480, max 5 FPS','Local','/dev/video<?>','<?>',255,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L2), NTSC, 320x240','Local','/dev/video<?>','<?>',45056,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L2), NTSC, 320x240, max 5 FPS','Local','/dev/video<?>','<?>',45056,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L2), NTSC, 640x480','Local','/dev/video<?>','<?>',45056,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L2), NTSC, 640x480, max 5 FPS','Local','/dev/video<?>','<?>',45056,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L1), PAL, 320x240','Local','/dev/video<?>','<?>',0,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L1), PAL, 320x240, max 5 FPS','Local','/dev/video<?>','<?>',0,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L1), PAL, 640x480','Local','/dev/video<?>','<?>',0,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L1), PAL, 640x480, max 5 FPS','Local','/dev/video<?>','<?>',0,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L1), NTSC, 320x240','Local','/dev/video<?>','<?>',1,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L1), NTSC, 320x240, max 5 FPS','Local','/dev/video<?>','<?>',1,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L1), NTSC, 640x480','Local','/dev/video<?>','<?>',1,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','BTTV Video (V4L1), NTSC, 640x480, max 5 FPS','Local','/dev/video<?>','<?>',1,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Remote ZoneMinder','Remote',NULL,NULL,NULL,'http','simple','<ip-address>',80,'/cgi-bin/nph-zms?mode=jpeg&monitor=<monitor-id>&scale=100&maxfps=5&buffer=0',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES ('','Foscam FI8620 FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,'','','','rtsp://<username>:<pwd>@<ip-address>:554/11',NULL,704,576,0,NULL,1,'10','<admin_pwd>','<ip-address>',100,100);
-INSERT INTO MonitorPresets VALUES ('','Foscam FI8608W FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,'','','','rtsp://<username>:<pwd>@<ip-address>:554/11',NULL,640,480,0,NULL,1,'11','<admin_pwd>','<ip-address>',100,100);
-INSERT INTO MonitorPresets VALUES ('','Foscam FI9821W FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,'','','','rtsp://<username>:<pwd>@<ip-address>:88/videoMain',NULL,1280,720,0,NULL,1,'12','<admin_pwd>','<ip-address>',100,100);
-INSERT INTO MonitorPresets VALUES ('','Loftek Sentinel PTZ, 640x480, mjpeg','Remote','http',0,0,NULL,NULL,'<ip-address>','80','/videostream.cgi?user=<username>&pwd=<password>&resolution=32&rate=11',NULL,640,480,4,NULL,1,'13','','<username>:<pwd>@<ip-address>',100,100);
-INSERT INTO MonitorPresets VALUES ('','Airlink 777W PTZ, 640x480, mjpeg','Remote','http',0,0,NULL,NULL,'<username>:<password>@<ip-address>','80','/cgi/mjpg/mjpg.cgi',NULL,640,480,4,NULL,1,'7','','<username>:<pwd>@<ip-address>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, mpjpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&req_fps=5',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, mpjpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&req_fps=5',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, mpjpeg, B&W','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&color=0',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, mpjpeg, B&W','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&color=0',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, mpjpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&req_fps=5',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,5.0,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, mpjpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&req_fps=5',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,5.0,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, unicast','Remote','rtsp','rtpUni',NULL,NULL,NULL,'<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, multicast','Remote','rtsp','rtpMulti',NULL,NULL,NULL,'<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','Remote','rtsp','rtpRtsp',NULL,NULL,NULL,'<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,'Panasonic IP, 320x240, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<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','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 640x480, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/nphMotionJpeg?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 640x480, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 640x480, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 320x240, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/nphMotionJpeg?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 320x240, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 320x240, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,5.0,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 640x480, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/nphMotionJpeg?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 640x480, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 640x480, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,5.0,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/GetData.cgi',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'VEO Observer, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Blue Net Video Server, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/cgi-bin/image.cgi?control=0&id=admin&passwd=admin',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT into MonitorPresets VALUES (NULL,'ACTi IP, mpeg4, unicast','Remote',NULL,NULL,NULL,'rtsp','rtpUni','<ip-address>',7070,'','/track',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://<host/address>/axis-media/media.amp?videocodec=h264',NULL,NULL,NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Vivotek FFMPEG','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://<host/address>:554/live.sdp',NULL,NULL,NULL,352,240,NULL,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis FFMPEG','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://<host/address>/axis-media/media.amp',NULL,NULL,NULL,640,480,NULL,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'ACTi TCM FFMPEG','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://admin:123456@<host/address>:7070',NULL,NULL,NULL,320,240,NULL,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 320x240','Local','/dev/video<?>','<?>',255,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 320x240, max 5 FPS','Local','/dev/video<?>','<?>',255,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 640x480','Local','/dev/video<?>','<?>',255,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 640x480, max 5 FPS','Local','/dev/video<?>','<?>',255,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 320x240','Local','/dev/video<?>','<?>',45056,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 320x240, max 5 FPS','Local','/dev/video<?>','<?>',45056,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 640x480','Local','/dev/video<?>','<?>',45056,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 640x480, max 5 FPS','Local','/dev/video<?>','<?>',45056,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 320x240','Local','/dev/video<?>','<?>',0,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 320x240, max 5 FPS','Local','/dev/video<?>','<?>',0,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 640x480','Local','/dev/video<?>','<?>',0,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 640x480, max 5 FPS','Local','/dev/video<?>','<?>',0,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 320x240','Local','/dev/video<?>','<?>',1,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 320x240, max 5 FPS','Local','/dev/video<?>','<?>',1,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 640x480','Local','/dev/video<?>','<?>',1,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 640x480, max 5 FPS','Local','/dev/video<?>','<?>',1,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Remote ZoneMinder','Remote',NULL,NULL,NULL,'http','simple','<ip-address>',80,'/cgi-bin/nph-zms?mode=jpeg&monitor=<monitor-id>&scale=100&maxfps=5&buffer=0',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Foscam FI8620 FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,'','','','rtsp://<username>:<pwd>@<ip-address>:554/11',NULL,704,576,0,NULL,1,'10','<admin_pwd>','<ip-address>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Foscam FI8608W FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,'','','','rtsp://<username>:<pwd>@<ip-address>:554/11',NULL,640,480,0,NULL,1,'11','<admin_pwd>','<ip-address>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Foscam FI9821W FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,'','','','rtsp://<username>:<pwd>@<ip-address>:88/videoMain',NULL,1280,720,0,NULL,1,'12','<admin_pwd>','<ip-address>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Loftek Sentinel PTZ, 640x480, mjpeg','Remote','http',0,0,NULL,NULL,'<ip-address>','80','/videostream.cgi?user=<username>&pwd=<password>&resolution=32&rate=11',NULL,640,480,4,NULL,1,'13','','<username>:<pwd>@<ip-address>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Airlink 777W PTZ, 640x480, mjpeg','Remote','http',0,0,NULL,NULL,'<username>:<password>@<ip-address>','80','/cgi/mjpg/mjpg.cgi',NULL,640,480,4,NULL,1,'7','','<username>:<pwd>@<ip-address>',100,100);
 
 --
 -- Add some zone preset values
diff --git a/distros/debian/changelog b/distros/debian/changelog
index 028fc4de2..fbdacd988 100644
--- a/distros/debian/changelog
+++ b/distros/debian/changelog
@@ -1,3 +1,15 @@
+zoneminder (1.26.4-1) unstable; urgency=low
+
+  * improvements to zmupdate.pl, cleanups
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Thu, 03 Oct 2013 11:40:32 -0400
+
+zoneminder (1.26.3-1) unstable; urgency=low
+
+  * A 'minor' release focusing on performance improvement and bug fixes.
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Sun, 22 Sep 2013 09:36:42 +0800
+
 zoneminder (1.25.1-1) unstable; urgency=low
 
   * Initial Version.
diff --git a/distros/debian/control b/distros/debian/control
index f6eaa5700..06bc6801e 100644
--- a/distros/debian/control
+++ b/distros/debian/control
@@ -2,12 +2,12 @@ Source: zoneminder
 Section: net
 Priority: optional
 Maintainer: Isaac Connor <iconnor@connortechnology.com>
-Build-Depends: debhelper (>= 5), autoconf, automake, dpatch, libphp-serialization-perl, libgnutls-dev, libmysqlclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg8-dev, libpcre3-dev, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libv4l-dev (>= 0.8.3), libbz2-dev, libtool, libsys-mmap-perl, ffmpeg, libnetpbm10-dev, libavdevice-dev, libdevice-serialport-perl, libpcre3, libarchive-zip-perl, libmime-lite-perl, libjpeg-turbo8, dh-autoreconf
+Build-Depends: debhelper (>= 5), autoconf, automake, dpatch, libphp-serialization-perl, libgnutls-dev, libmysqlclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg8-dev, libpcre3-dev, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libv4l-dev (>= 0.8.3), libbz2-dev, libtool, libsys-mmap-perl, ffmpeg, libnetpbm10-dev, libavdevice-dev, libdevice-serialport-perl, libpcre3, libarchive-zip-perl, libmime-lite-perl, libjpeg8, dh-autoreconf
 Standards-Version: 3.9.2
 
 Package: zoneminder
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5, php5, php5-mysql, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-lite-perl, mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53, libjpeg-turbo8, zip, libnet-sftp-foreign-perl
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5, php5, php5-mysql, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-lite-perl, mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53, libjpeg8, zip, libnet-sftp-foreign-perl
 Description: Linux video camera security and surveillance solution
  ZoneMinder is intended for use in single or multi-camera video security 
  applications, including commercial or home CCTV, theft prevention and child
diff --git a/distros/debian/docs b/distros/debian/docs
index e845566c0..b43bf86b5 100644
--- a/distros/debian/docs
+++ b/distros/debian/docs
@@ -1 +1 @@
-README
+README.md
diff --git a/distros/debian/init.d b/distros/debian/init.d
index 430462ced..757003132 100644
--- a/distros/debian/init.d
+++ b/distros/debian/init.d
@@ -18,11 +18,13 @@
 prog=ZoneMinder
 ZM_PATH_BIN="/usr/bin"
 RUNDIR=/var/run/zm
+TMPDIR=/tmp/zm
 command="$ZM_PATH_BIN/zmpkg.pl"
 
 start() {
 	echo -n "Starting $prog: "
-	mkdir -p $RUNDIR
+	mkdir -p $RUNDIR && chown www-data:www-data $RUNDIR
+	mkdir -p $TMPDIR && chown www-data:www-data $TMPDIR
     zmfix -a
 	$command start
 	RETVAL=$?
diff --git a/distros/debian/postinst b/distros/debian/postinst
index 65f9bf351..716c475e6 100644
--- a/distros/debian/postinst
+++ b/distros/debian/postinst
@@ -2,7 +2,51 @@
 
 set -e
 
-VERSION=1.26.3
+VERSION=1.26.4
+
+if [ "$1" = "configure" ]; then
+                #
+                # Get mysql started if it isn't
+                #
+                if ! $(/etc/init.d/mysql status >/dev/null 2>&1); then
+                        invoke-rc.d mysql start
+                fi
+                if $(/etc/init.d/mysql status >/dev/null 2>&1); then
+                        mysqladmin --defaults-file=/etc/mysql/debian.cnf -f reload
+                        # test if database if already present...
+                        if ! $(echo quit | mysql --defaults-file=/etc/mysql/debian.cnf zm > /dev/null 2> /dev/null) ; then
+                            cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
+                            echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+                        fi
+
+                        # get old version from upgrade...
+                        OLD_ZM_VERSION=${2%-*}
+                        if [ -z "$OLD_ZM_VERSION" ]; then
+                                # fall back to getting version from database itself, which may not necessarily be accurate?
+                                OLD_ZM_VERSION=$(echo 'select Value from Config where Name = "ZM_DYN_CURR_VERSION";' | mysql --defaults-file=/etc/mysql/debian.cnf --skip-column-names zm )
+                        fi
+                        if [ -n "$OLD_ZM_VERSION" ] && [ "$OLD_ZM_VERSION" != "$VERSION" ] ; then
+                                echo 'grant lock tables, create, alter on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+                                # stop zoneminder before performing database upgrade.
+                                invoke-rc.d zoneminder stop || true
+                                zmupdate.pl --nointeractive --version $OLD_ZM_VERSION
+                        fi
+
+                else
+                        echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'
+                fi
+                chown www-data:www-data /var/log/zm
+                chown www-data:www-data /var/lib/zm/
+                if [ -z "$2" ]; then
+                        chown www-data:www-data -R /var/cache/zoneminder
+                fi
+fi
+# Ensure zoneminder is stopped...
+if [ -x "/etc/init.d/zoneminder" ]; then
+        if invoke-rc.d zoneminder status ; then
+                invoke-rc.d zoneminder stop || exit $?
+        fi
+fi
 
 if [ "$1" = "configure" ]; then
 	if [ -z "$2" ]; then
diff --git a/distros/redhat/README.Fedora b/distros/fedora/README.Fedora
similarity index 52%
rename from distros/redhat/README.Fedora
rename to distros/fedora/README.Fedora
index a72bee883..cfc4d98d5 100644
--- a/distros/redhat/README.Fedora
+++ b/distros/fedora/README.Fedora
@@ -4,18 +4,18 @@ New installs
 1. Unless you are already using the MySQL server or you are running it
    remotely you will need to ensure that the server is installed and secured:
 
-     yum install mysql-community or
+	yum install mysql-community-server
+	--OR--
+	yum install mariadb-server
 
-	 yum install mysql (Mariadb)
+	sudo systemctl enable mysqld
 
-     sudo systemctl mysqld enable
-
-	 sudo system mysqld start
+	sudo system start mysqld
      
-     mysql_secure_installation
+	mysql_secure_installation
 
-2. You will need to create the ZoneMinder database. These commands should do
-   the trick, assuming your database server is local:
+2. Using the password for the root account set during the previous step, you
+   will need to create the ZoneMinder database, assuming your database server is local:
 
      mysql -u root -p < /usr/share/zoneminder/db/zm_create.sql
      mysqladmin reload
@@ -24,7 +24,7 @@ New installs
    introduce an obvious security issue.  The following should set this up:
 
      mysql -u root -p
-     grant select,insert,update,delete on zm.* to 'zmuser'@localhost identified by 'zmpass';
+     grant select,insert,update,delete,alter on zm.* to 'zmuser'@localhost identified by 'zmpass';
 
    Obviously, change at least zmpass to an actual, secure password or
    passphrase.  You can change zmuser as well if you like.
@@ -48,18 +48,34 @@ New installs
 
    for testing, and edit /etc/sysconfig/selinux to disable it at boot time.
 
-7. The zoneminder.service file fails at present but the zmpkg.pl script
-   can be run as root to start zoneminder.
+7. IMPORTANT: Edit /etc/httpd/conf.d/zoneminder.conf and/or /etc/httpd/conf.
 
-	sudo zmpkg.pl start
+   The httpd.conf file included with this version of Fedora processes the conf.d
+   folder after the default ScriptAlias directive in the httpd.conf file.
+   Previously, the conf.d folder was processed before the default ScriptAlias
+   directive. This causes a ScriptAlias overlap and breaks Zoneminder's streaming
+   abilities.
 
-8. The ZoneMinder web interface is disabled by default (which makes it rather
-   useless but also secure by default), you will need to edit
-   /etc/httpd/conf.d/zoneminder.conf to enable it.  Afterwards, you can start
-   the web server:
+   Reference: http://httpd.apache.org/docs/2.4/mod/mod_alias.html#order
+   Bug Report: https://bugzilla.redhat.com/show_bug.cgi?id=973067
 
-     sudo systemctl enable httpd.service
-     sudo systemctl start httpd.service
+   WORKAROUND #1
+   If you are running zoneminder on a dedicated server then the simplest solution
+   may be to simply comment out the line in httpd.conf that reads:
+
+	ScriptAlias /cgi-bin/ "/var/www/cgi-bin/"
+
+   WORKAROUND #2
+   If you need both the default cgi-bin folder & the zoneminder cgi-bin folder then
+   a solution might be to move the following line before the default ScriptAlias
+   directive in the httpd.conf file:
+
+	IncludeOptional conf.d/*.conf
+
+8. Now start the web server:
+
+	sudo systemctl enable httpd.service
+	sudo systemctl start httpd.service
 
 9. You should immediately visit http://localhost/zm and secure the system if
    it is network facing.  To do this:
@@ -71,7 +87,19 @@ New installs
    e) You should be prompted to log in; the default username/password is admin/admin.
    f) Open Options again, choose the newly visible Users tab.
    g) click the admin user and set a password.
+   h) enable OPT_CONTROL on the Ssytem tab to enable ptz camera control.
 
+10. The zoneminder.service file fails at present but the zmpkg.pl script
+    can be run as root to start zoneminder.
+
+	sudo zmpkg.pl start
+
+    To start zoneminder automatically, create /etc/rc.d/rc.local and place the 
+    following inside it:
+	#!/bin/sh
+	/usr/bin/zmpkg.pl start 
+
+    The rc.local file must be made executable.
 
 Upgrades
 ========
@@ -83,4 +111,4 @@ Upgrades
 2. You will need to upgrade the ZoneMinder database as described in the
    manual. This command should be sufficient when run as root:
 
-     zmupdate.pl --user=root --pass={mysql_root_pwd} --version=<from version>
+     zmupdate.pl --user=root --pass=<mysql_root_pwd> --version=<from version>
diff --git a/distros/fedora/redalart.wav b/distros/fedora/redalart.wav
new file mode 120000
index 000000000..eec3dce64
--- /dev/null
+++ b/distros/fedora/redalart.wav
@@ -0,0 +1 @@
+../redhat/redalert.wav
\ No newline at end of file
diff --git a/distros/fedora/zoneminder-1.24.3-runlevel.patch b/distros/fedora/zoneminder-1.24.3-runlevel.patch
new file mode 100644
index 000000000..de7b49b0b
--- /dev/null
+++ b/distros/fedora/zoneminder-1.24.3-runlevel.patch
@@ -0,0 +1,11 @@
+diff -up ./scripts/zm.in.runlevel ./scripts/zm.in
+--- ./scripts/zm.in.runlevel	2010-11-28 15:22:05.000000000 -0600
++++ ./scripts/zm.in	2011-03-24 21:39:01.973010160 -0500
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ # description: ZoneMinder is the top Linux video camera security and surveillance solution. ZoneMinder is intended for use in single or multi-camera video security applications.Copyright: Philip Coombes, Corey DeLasaux 2003-2008
+-# chkconfig: 2345 99 00
++# chkconfig: - 99 00
+ # processname: zmpkg.pl
+ 
+ # Source function library.
diff --git a/distros/fedora/zoneminder-1.24.4-installfix.patch b/distros/fedora/zoneminder-1.24.4-installfix.patch
new file mode 100644
index 000000000..8831d597a
--- /dev/null
+++ b/distros/fedora/zoneminder-1.24.4-installfix.patch
@@ -0,0 +1,22 @@
+diff -up ./Makefile.am.installfix ./Makefile.am
+--- ./Makefile.am.installfix	2011-06-19 15:51:14.000000000 -0500
++++ ./Makefile.am	2011-08-13 20:33:30.288587436 -0500
+@@ -21,12 +21,12 @@ EXTRA_DIST = \
+ # Yes, you are correct. This is a HACK!
+ install-data-hook:
+ 	( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )
+-	( if ! test -e $(ZM_RUNDIR); then mkdir -p $(ZM_RUNDIR); fi; if test "$(ZM_RUNDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR); fi )
+-	( if ! test -e $(ZM_TMPDIR); then mkdir -m 700 -p $(ZM_TMPDIR); fi; if test "$(ZM_TMPDIR)" != "/tmp"; then chown $(webuser):$(webgroup) $(ZM_TMPDIR); chmod u+w $(ZM_TMPDIR); fi )
+-	( if ! test -e $(ZM_LOGDIR); then mkdir -p $(ZM_LOGDIR); fi; if test "$(ZM_LOGDIR)" != "/var/log"; then chown $(webuser):$(webgroup) $(ZM_LOGDIR); chmod u+w $(ZM_LOGDIR); fi )
++	( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir -p $(DESTDIR)$(ZM_RUNDIR); fi; if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_RUNDIR); chmod u+w $(DESTDIR)$(ZM_RUNDIR); fi )
++	( if ! test -e $(DESTDIR)$(ZM_TMPDIR); then mkdir -m 700 -p $(DESTDIR)$(ZM_TMPDIR); fi; if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_TMPDIR); chmod u+w $(DESTDIR)$(ZM_TMPDIR); fi )
++	( if ! test -e $(DESTDIR)$(ZM_LOGDIR); then mkdir -p $(DESTDIR)$(ZM_LOGDIR); fi; if test "$(DESTDIR)$(ZM_LOGDIR)" != "/var/log"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_LOGDIR); chmod u+w $(DESTDIR)$(ZM_LOGDIR); fi )
+ 
+ uninstall-hook:
+ 	@-( cd $(DESTDIR)$(webdir); rm -rf events graphics images sounds temp )
+-	@-( if test "$(ZM_RUNDIR)" != "/var/run"; then rm -rf $(ZM_RUNDIR); fi )
+-	@-( if test "$(ZM_TMPDIR)" != "/tmp"; then rm -rf $(ZM_TMPDIR); fi )
+-	@-( if test "$(ZM_LOGDIR)" != "/var/log"; then rm -rf $(ZM_LOGDIR); fi )
++	@-( if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then rm -rf $(DESTDIR)$(ZM_RUNDIR); fi )
++	@-( if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp"; then rm -rf $(DESTDIR)$(ZM_TMPDIR); fi )
++	@-( if test "$(DESTDIR)$(ZM_LOGDIR)" != "/var/log"; then rm -rf $(DESTDIR)$(ZM_LOGDIR); fi )
diff --git a/distros/fedora/zoneminder-1.26.3-dbinstall.patch b/distros/fedora/zoneminder-1.26.3-dbinstall.patch
new file mode 100644
index 000000000..04af9e8b2
--- /dev/null
+++ b/distros/fedora/zoneminder-1.26.3-dbinstall.patch
@@ -0,0 +1,72 @@
+--- configure.ac	2013-09-05 10:33:08.000000000 -0500
++++ configure.ac.dbinstall	2013-09-05 17:23:28.555553447 -0500
+@@ -1,13 +1,11 @@
+ AC_PREREQ(2.59)
+-AC_INIT(zm,1.26.3,[http://www.zoneminder.com/forums/ - Please check FAQ first],ZoneMinder,http://www.zoneminder.com/downloads.html)
++AC_INIT(zm,1.26.3,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
+ AM_INIT_AUTOMAKE
+ AC_CONFIG_SRCDIR(src/zm.h)
+ AC_CONFIG_HEADERS(config.h)
+ 
+ AC_SUBST([AM_CXXFLAGS], [-D__STDC_CONSTANT_MACROS])
+ 
+-PATH_BUILD=`pwd`
+-AC_SUBST(PATH_BUILD)
+ TIME_BUILD=`date +'%s'`
+ AC_SUBST(TIME_BUILD)
+
+@@ -354,6 +352,8 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC
+ 
+ AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory])
+ AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory])
++AC_DEFINE_DIR([DATADIR],[datadir],[Expanded data directory])
++AC_SUBST(PKGDATADIR,"$DATADIR/$PACKAGE")
+ AC_SUBST(ZM_PID,"$ZM_RUNDIR/zm.pid")
+ AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
+ AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf")
+diff -up ./db/Makefile.am.dbinstall ./db/Makefile.am
+--- ./db/Makefile.am.dbinstall	2009-10-14 04:42:46.000000000 -0500
++++ ./db/Makefile.am	2011-03-24 22:50:14.173912137 -0500
+@@ -1,7 +1,16 @@
+ AUTOMAKE_OPTIONS = gnu
+ 
++zmdbdatadir = $(pkgdatadir)/db
++
+ EXTRA_DIST = \
+ 	zm_create.sql.in \
++	$(dbupgrade_scripts)
++
++dist_zmdbdata_DATA = \
++	zm_create.sql \
++	$(dbupgrade_scripts)
++
++dbupgrade_scripts = \
+ 	zm_update-0.0.1.sql \
+ 	zm_update-0.9.7.sql \
+ 	zm_update-0.9.8.sql \
+diff -up ./scripts/zmupdate.pl.in.dbinstall ./scripts/zmupdate.pl.in
+--- ./scripts/zmupdate.pl.in.dbinstall	2011-08-27 15:44:05.335602405 -0500
++++ ./scripts/zmupdate.pl.in	2011-08-26 02:51:37.000000000 -0500
+@@ -424,7 +424,7 @@ if ( $version )
+         }
+         else
+         {
+-            $command .= ZM_PATH_BUILD."/db";
++            $command .= ZM_PATH_DATA."/db";
+         }
+         $command .= "/zm_update-".$version.".sql";
+
+diff -up ./zm.conf.in.dbinstall ./zm.conf.in
+--- ./zm.conf.in.dbinstall	2008-07-25 04:48:16.000000000 -0500
++++ ./zm.conf.in	2011-03-24 22:50:14.175912077 -0500
+@@ -12,8 +12,8 @@
+ # Current version of ZoneMinder
+ ZM_VERSION=@VERSION@
+ 
+-# Path to build directory, used mostly for finding DB upgrade scripts
+-ZM_PATH_BUILD=@PATH_BUILD@
++# Path to installed data directory, used mostly for finding DB upgrade scripts
++ZM_PATH_DATA=@PKGDATADIR@
+ 
+ # Build time, used to record when to trigger various checks
+ ZM_TIME_BUILD=@TIME_BUILD@
diff --git a/distros/fedora/zoneminder-1.26.3-noffmpeg.patch b/distros/fedora/zoneminder-1.26.3-noffmpeg.patch
new file mode 100644
index 000000000..e8e8d4b3e
--- /dev/null
+++ b/distros/fedora/zoneminder-1.26.3-noffmpeg.patch
@@ -0,0 +1,26 @@
+--- configure.ac	2013-09-10 12:42:56.000000000 -0500
++++ configure.ac.noffmpeg	2013-09-14 17:25:41.988388970 -0500
+@@ -284,15 +284,15 @@
+ AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
+ AC_CHECK_LIB(z,zlibVersion)
+ AC_CHECK_LIB(x264,x264_predict_16x16_init)
+-AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
++dnl AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
+ # Don't bother to warn about this one
+-AC_CHECK_LIB(avcore,av_image_copy,,)
+-AC_CHECK_LIB(avcodec,avcodec_version,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
+-AC_CHECK_LIB(avformat,avformat_version,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
+-#AC_CHECK_LIB(avcodec,avcodec_open,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
+-#AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
+-AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
+-AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
++dnl AC_CHECK_LIB(avcore,av_image_copy,,)
++dnl AC_CHECK_LIB(avcodec,avcodec_version,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
++dnl AC_CHECK_LIB(avformat,avformat_version,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
++dnl AC_CHECK_LIB(avcodec,avcodec_open,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
++dnl AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
++dnl AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
++dnl AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
+ AC_CHECK_LIB(bz2,BZ2_bzCompress,,AC_MSG_WARN(zm requires libbz2.a for recent versions of ffmpeg))
+ AC_CHECK_LIB(z,compress,,)
+ 
diff --git a/distros/fedora/zoneminder.conf b/distros/fedora/zoneminder.conf
new file mode 100644
index 000000000..597ea2bd2
--- /dev/null
+++ b/distros/fedora/zoneminder.conf
@@ -0,0 +1,45 @@
+# The Zoneminder web interface has been disabled by default due to a small
+# security issue in the default install.
+#
+# When using Zoneminder's own authentication, recorded CCTV images are
+# accessible from the web directly without passing the authentication. This
+# means any attacker could see your CCTV images without a password. In order
+# to avoid this you can disable Zoneminder's authentication and configure
+# standard Apache authentication (see the Apache documentation for details on
+# this).
+#
+# If you still wish to use Zoneminder's own authentication, or have an
+# internal site which needs no authentication, you need to delete the line
+# marked below and restart Apache.
+
+Alias /zm "/usr/share/zoneminder/www"
+<Directory "/usr/share/zoneminder/www">
+    Options -Indexes +MultiViews +FollowSymLinks
+    AllowOverride All
+    <IfModule mod_authz_core.c>
+       # Apache 2.4
+       Require all granted
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
+        Order deny,allow
+        Allow from all
+    </IfModule>
+    # The code unfortunately uses short tags in many places
+    php_value short_open_tag 1
+</Directory>
+
+ScriptAlias /cgi-bin/zm "/usr/libexec/zoneminder/cgi-bin"
+<Directory "/usr/libexec/zoneminder/cgi-bin">
+    AllowOverride All
+    Options ExecCGI
+    <IfModule mod_authz_core.c>
+       # Apache 2.4
+       Require all granted
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
+        Order deny,allow
+        Allow from all
+    </IfModule>
+</Directory>
diff --git a/distros/fedora/zoneminder.f19.spec b/distros/fedora/zoneminder.f19.spec
new file mode 100644
index 000000000..c10d41c7c
--- /dev/null
+++ b/distros/fedora/zoneminder.f19.spec
@@ -0,0 +1,463 @@
+%define zmuid $(id -un)
+%define zmgid $(id -gn)
+%define zmuid_final apache
+%define zmgid_final apache
+
+Name:       zoneminder
+Version:    1.26.3
+Release:    1%{?dist}
+Summary:    A camera monitoring and analysis tool
+Group:      System Environment/Daemons
+# jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
+# Mootools is inder the MIT license: http://mootools.net/
+License:    GPLv2+ and LGPLv2+ and MIT 
+URL:        http://www.zoneminder.com/
+
+#Source:     http://www2.zoneminder.com/downloads/ZoneMinder-%{version}.tar.gz
+Source:     ZoneMinder-%{version}.tar.gz
+Source2:    zoneminder.conf
+Source3:    redalert.wav
+Source4:    README.Fedora
+Source5:    http://downloads.sourceforge.net/jscalendar/jscalendar-1.0.zip
+Source6:    zoneminder.service
+Source7:    zoneminder.logrotate
+# Need to unravel the proper mootools files to grab from upstream, since the
+# number of them keeps multiplying.  In the meantime, rely on the ones bundled
+# with zoneminder.  As these are javascript, there is no guideline violation
+# here.
+#Source8:    http://mootools.net/download/get/mootools-1.2.3-core-yc.js
+Patch1:     zoneminder-1.26.3-dbinstall.patch
+Patch2:     zoneminder-1.24.3-runlevel.patch
+#Patch3:     zoneminder-1.26.3-noffmpeg.patch
+Patch10:    zoneminder-1.24.4-installfix.patch
+Patch11:    zoneminder-1.26.3-gcc48.patch
+#Patch12:    zoneminder-1.25.0-gcrypt.patch
+#Patch13:    zoneminder-1.25.0-kernel35.patch
+#Patch14:    zoneminder-1.26.3-ffmpeg.patch
+
+BuildRequires:  automake gnutls-devel systemd-units
+BuildRequires:  libtool bzip2-devel
+BuildRequires:  mysql-devel pcre-devel libjpeg-devel
+BuildRequires:  perl(Archive::Tar) perl(Archive::Zip)
+BuildRequires:  perl(Date::Manip) perl(DBD::mysql)
+BuildRequires:  perl(ExtUtils::MakeMaker) perl(LWP::UserAgent)
+BuildRequires:  perl(MIME::Entity) perl(MIME::Lite)
+BuildRequires:  perl(PHP::Serialization) perl(Sys::Mmap)
+BuildRequires:  perl(Time::HiRes) perl(Net::SFTP::Foreign)
+BuildRequires:  perl(Expect) 
+BuildRequires:  gcc gcc-c++ ffmpeg-devel
+BuildRequires:  autoconf autoconf-archive
+# Uncomment for X10 support
+#BuildRequires:  perl(X10::ActiveHome) perl(Astro::SunTime)
+
+Requires:   httpd php php-mysql cambozola
+Requires:   libjpeg-turbo ffmpeg
+Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:   perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip)
+Requires:   perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP)
+Requires:   perl(LWP::Protocol::https)
+
+Requires(post): systemd-units systemd-sysv
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+
+
+%description
+ZoneMinder is a set of applications which is intended to provide a complete
+solution allowing you to capture, analyse, record and monitor any cameras you
+have attached to a Linux based machine. It is designed to run on kernels which
+support the Video For Linux (V4L) interface and has been tested with cameras
+attached to BTTV cards, various USB cameras and IP network cameras. It is
+designed to support as many cameras as you can attach to your computer without
+too much degradation of performance.
+
+
+%prep
+%setup -q -n ZoneMinder-%{version}
+
+# Unpack jscalendar and move some files around
+%setup -q -D -T -a 5 -n ZoneMinder-%{version}
+mkdir jscalendar-doc
+pushd jscalendar-1.0
+mv *html *php doc/* README ../jscalendar-doc
+rmdir doc
+popd
+
+%patch1 -p0 -b .dbinstall
+%patch2 -p0 -b .runlevel
+#%patch3 -p0 -b .noffmpeg
+%patch10 -p0 -b .installfix
+%patch11 -p0 -b .gcc47
+#%patch12 -p0 -b .gcrypt
+#%patch13 -p0 -b .kernel35
+#%patch14 -p0 -b .ffmpeg
+cp %{SOURCE4} README.Fedora
+chmod -x src/zm_event.cpp src/zm_user.h
+
+
+%build
+libtoolize --force
+aclocal
+autoheader
+automake --force-missing --add-missing
+autoconf
+#autoreconf
+
+OPTS=""
+#%ifnarch %{ix86} x86_64
+#    OPTS="$OPTS --disable-crashtrace"
+#%endif
+
+export ZM_RUNDIR=/var/run/zoneminder
+export ZM_TMPDIR=/var/lib/zoneminder/temp
+%configure \
+    --disable-crashtrace \
+    --with-libarch=%{_lib} \
+    --with-mysql=%{_prefix} \
+    --with-ffmpeg=%{_prefix} \
+    --with-webdir=%{_datadir}/%{name}/www \
+    --with-cgidir=%{_libexecdir}/%{name}/cgi-bin \
+    --with-webuser=%{zmuid} \
+    --with-webgroup=%{zmgid} \
+    --enable-mmap=yes \
+    --disable-debug \
+    --with-webhost=zm.local \
+    ZM_SSL_LIB="gnutls" \
+    ZM_RUNDIR=/var/run/zoneminder \
+    ZM_TMPDIR=/var/lib/zoneminder/temp \
+    CXXFLAGS="-D__STDC_CONSTANT_MACROS -msse2" \
+    --with-extralibs="" \
+    $OPTS
+
+# Have to do this now because the configure script wipes out modifications made to this file
+cat <<EOF >> db/zm_create.sql
+# Fedora change:
+# Alter some default paths to match the default URL and selinux expectations
+update Config set Value = '/cgi-bin/zm/nph-zms' where Name = 'ZM_PATH_ZMS';
+update Config set Value = '/var/log/zoneminder' where Name = 'ZM_PATH_LOGS';
+update Config set Value = '/var/log/zoneminder/zm_debug_log+' where Name = 'ZM_EXTRA_DEBUG_LOG';
+update Config set Value = '/var/log/zoneminder/zm_xml.log' where Name = 'ZM_EYEZM_LOG_FILE';
+update Config set Value = '/var/lib/zoneminder/sock' where Name = 'ZM_PATH_SOCKS';
+update Config set Value = '/var/lib/zoneminder/swap' where Name = 'ZM_PATH_SWAP';
+update Config set Value = '/var/spool/zoneminder-upload' where Name = 'ZM_UPLOAD_FTP_LOC_DIR';
+EOF
+
+make %{?_smp_mflags}
+%{__perl} -pi -e 's/(ZM_WEB_USER=).*$/${1}%{zmuid_final}/;' \
+          -e 's/(ZM_WEB_GROUP=).*$/${1}%{zmgid_final}/;' zm.conf
+
+
+%install
+install -d %{buildroot}/%{_localstatedir}/run
+make install DESTDIR=%{buildroot} \
+    INSTALLDIRS=vendor
+rm -rf %{buildroot}/%{perl_vendorarch} %{buildroot}/%{perl_archlib}
+rm -f %{buildroot}/%{_bindir}/zmx10.pl
+
+install -m 755 -d %{buildroot}/var/log/zoneminder
+for dir in events images temp
+do
+    install -m 755 -d %{buildroot}/var/lib/zoneminder/$dir
+    rmdir %{buildroot}/%{_datadir}/zoneminder/www/$dir
+    ln -sf ../../../../var/lib/zoneminder/$dir %{buildroot}/%{_datadir}/zoneminder/www/$dir
+done
+install -m 755 -d %{buildroot}/var/lib/zoneminder/sock
+install -m 755 -d %{buildroot}/var/lib/zoneminder/swap
+install -m 755 -d %{buildroot}/var/spool/zoneminder-upload
+
+install -D -m 644 %{SOURCE2} %{buildroot}/etc/httpd/conf.d/zoneminder.conf
+install -D -m 755 %{SOURCE3} %{buildroot}/%{_datadir}/zoneminder/www/sounds/redalert.wav
+install -D -m 644 %{SOURCE6} %{buildroot}/%{_unitdir}/zoneminder.service
+install -D -m 644 %{SOURCE7} %{buildroot}/etc/logrotate.d/zoneminder
+
+# Install jscalendar - this really should be in its own package
+install -d -m 755 %{buildroot}/%{_datadir}/%{name}/www/jscalendar
+cp -rp jscalendar-1.0/* %{buildroot}/%{_datadir}/zoneminder/www/jscalendar
+
+# Set up cambozola
+pushd %{buildroot}/%{_datadir}/zoneminder/www
+ln -s ../../java/cambozola.jar
+popd
+
+install -d -m 755 %{buildroot}/etc/tmpfiles.d
+cat > %{buildroot}/etc/tmpfiles.d/zoneminder.conf <<EOF
+d   /run/zoneminder     0755    %{zmuid_final}  %{zmgid_final}
+EOF
+install -m 755 -d %{buildroot}/run/zoneminder
+
+
+%post
+if [ $1 -eq 1 ] ; then
+    # Initial installation 
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+
+%preun
+if [ $1 -eq 0 ] ; then
+    # Package removal, not upgrade
+    /bin/systemctl --no-reload disable zoneminder.service > /dev/null 2>&1 || :
+    /bin/systemctl stop zoneminder.service > /dev/null 2>&1 || :
+fi
+
+%postun
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+    # Package upgrade, not uninstall
+    /bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || :
+fi
+
+%triggerun -- zoneminder < 1.25.0-4
+# Save the current service runlevel info
+# User must manually run systemd-sysv-convert --apply zoneminder
+# to migrate them to systemd targets
+/usr/bin/systemd-sysv-convert --save zoneminder >/dev/null 2>&1 ||:
+
+# Run these because the SysV package being removed won't do them
+/sbin/chkconfig --del zoneminder >/dev/null 2>&1 || :
+/bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README.md README.Fedora jscalendar-doc
+%config(noreplace) %attr(640,root,%{zmgid_final}) /etc/zm.conf
+%config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf
+%config(noreplace) /etc/tmpfiles.d/zoneminder.conf
+%config(noreplace) /etc/logrotate.d/zoneminder
+
+%{_unitdir}/zoneminder.service
+
+%{_bindir}/zma
+%{_bindir}/zmaudit.pl
+%{_bindir}/zmc
+%{_bindir}/zmcontrol.pl
+%{_bindir}/zmdc.pl
+%{_bindir}/zmf
+%{_bindir}/zmfilter.pl
+%attr(4755,root,root) %{_bindir}/zmfix
+%{_bindir}/zmpkg.pl
+%{_bindir}/zmstreamer
+%{_bindir}/zmtrack.pl
+%{_bindir}/zmtrigger.pl
+%{_bindir}/zmu
+%{_bindir}/zmupdate.pl
+%{_bindir}/zmvideo.pl
+%{_bindir}/zmwatch.pl
+#%{_bindir}/zmx10.pl
+
+%{perl_vendorlib}/ZoneMinder*
+%{_mandir}/man*/*
+%dir %{_libexecdir}/zoneminder
+%{_libexecdir}/zoneminder/cgi-bin
+%dir %{_datadir}/zoneminder
+%{_datadir}/zoneminder/db
+%{_datadir}/zoneminder/www
+
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/events
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/images
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/sock
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/swap
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/temp
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/log/zoneminder
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/spool/zoneminder-upload
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /run/zoneminder
+
+
+%changelog
+* Sat Sep 21 2013 Andrew Bauer <knnniggett@users.sourceforge.net> - 1.26.3
+- Initial rebuild for ZoneMinder 1.26.3 release.  
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.25.0-12
+- rebuild due to "jpeg8-ABI" feature drop
+
+* Mon Jan  7 2013 Remi Collet <rcollet@redhat.com> - 1.25.0-11
+- fix configuration file for httpd 2.4, #871502
+
+* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.25.0-10
+- rebuild against new libjpeg
+
+* Thu Aug 09 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-9
+- Add patch to work around v4l2 api breakage in 3.5 kernel.
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jun 23 2012 Petr Pisar <ppisar@redhat.com> - 1.25.0-7
+- Perl 5.16 rebuild
+
+* Wed Mar 21 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-6
+- Fix stupid thinko in sql modifications.
+
+* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-5
+- Clean up macro usage.
+
+* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-4
+- Convert to systemd.
+- Add tmpfiles.d configuration since the initscript isn't around to create
+  /run/zoneminder.
+- Remove some pointless executable permissions.
+- Add logrotate file.
+
+* Wed Feb 22 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-3
+- Update README.Fedora to reference systemctl and mention timezone info in
+  php.ini.
+- Add proper default for EYEZM_LOG_TO_FILE.
+
+
+* Thu Feb 09 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-2
+- Rebuild for new pcre.
+
+* Thu Jan 19 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-1
+- Update to 1.25.0
+- Fix gcc4.7 build problems.
+- Drop gcc4.4 build fixes; for whatever reason they now break the build.
+- Clean up old patches.
+- Force setting of ZM_TMPDIR and ZM_RUNDIR.
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-3
+- Re-add the dist-tag that somehow got lost.
+
+* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-2
+- Add patch for bug 711780 - fix syntax issue in Mapped.pm.
+- Undo that patch, and undo another which was the cause of the whole mess.
+- Fix up other patches so ZM_PATH_BUILD is both defined and useful.
+- Make sure database creation mods actually take.
+- Update Fedora-specific docs with some additional info.
+- Use bundled mootools (javascript, so no guideline violation).
+- Update download location.
+- Update the gcrypt patch to actually work.
+- Upstream changed the tarball without changing the version to patch a
+  vulnerability, so redownload.
+
+* Sun Aug 14 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-1
+- Initial attempt to upgrade to 1.24.4.
+- Add patch from BZ 460310 to build against libgcrypt instead of requiring the
+  gnutls openssl libs.
+
+* Thu Jul 21 2011 Petr Sabata <contyk@redhat.com> - 1.24.3-7.20110324svn3310
+- Perl mass rebuild
+
+* Wed Jul 20 2011 Petr Sabata <contyk@redhat.com> - 1.24.3-6.20110324svn3310
+- Perl mass rebuild
+
+* Mon May 09 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-5.20110324svn3310
+- Bump for gnutls update.
+
+* Thu Mar 24 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-4.20110324svn3310
+- Update to latest 1.24.3 subversion.  Turns out that what upstream was calling
+  1.24.3 is really just an occasionally updated devel snapshot.
+- Rebase various patches.
+
+* Wed Mar 23 2011 Dan Horák <dan@danny.cz> - 1.24.3-3
+- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Jan 25 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-1
+- Update to latest upstream version.
+- Rebase patches.
+- Initial incomplete attempt to disable v4l1 support.
+
+* Fri Jan 21 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-6
+- Unbundle cambozola; instead link to the separately pacakged copy.
+- Remove BuildRoot:, %%clean and buildroot cleaning in %%install.
+- Git rid of mixed space/tab usage by removing all tabs.
+- Remove unnecessary Conflicts: line.
+- Attempt to force short_open_tag on for the code directories.
+- Move default location of sockets, swaps, logfiles and some temporary files to
+  make more sense and allow things to work better with a future selinux policy.
+- Fix errors in README.Fedora.
+
+* Wed Jun 02 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.24.2-5
+- Mass rebuild with perl-5.12.0
+
+* Fri Dec  4 2009 Stepan Kasal <skasal@redhat.com> - 1.24.2-4
+- rebuild against perl 5.10.1
+- use Perl vendorarch and archlib variables correctly
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-2
+- Bump release since 1.24.2-1 was mistakenly tagged a few months ago.
+
+* Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-1
+- Initial update to 1.24.2.
+- Rebase patches.
+- Update mootools download location.
+- Update to mootools 1.2.3.
+- Add additional dependencies for some optional features.
+
+* Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-3
+- Remove unused Sys::Mmap perl dependency RPM is finding
+
+* Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-2
+- Update gcc44 patch to disable -frepo, seems to be broken with gcc44
+- Added noffmpeg patch to make building outside mock easier
+
+* Sat Mar 21 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-1
+- Patch for gcc 4.4 compilation errors
+- Upgrade to 1.24.1
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Jan 24 2009 Caolán McNamara <caolanm@redhat.com> - 1.23.3-3
+- rebuild for dependencies
+
+* Mon Dec 15 2008 Martin Ebourne <martin@zepler.org> - 1.23.3-2
+- Fix permissions on zm.conf
+
+* Fri Jul 11 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.23.3-1
+- Initial attempt at packaging 1.23.
+
+* Tue Jul  1 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-15
+- Add perl module compat dependency, bz #453590
+
+* Tue May  6 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-14
+- Remove default runlevel, bz #441315
+
+* Mon Apr 28 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.22.3-13
+- Backport patch for CVE-2008-1381 from 1.23.3 to 1.22.3.
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.22.3-12
+- Autorebuild for GCC 4.3
+
+* Thu Jan  3 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-11
+- Fix compilation on gcc 4.3
+
+* Thu Dec  6 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-10
+- Rebuild for new openssl
+
+* Thu Aug  2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-8
+- Fix licence tag
+
+* Thu Jul 12 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-7
+- Fixes from testing by Jitz including missing dependencies and database creation
+
+* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-6
+- Disable crashtrace on ppc
+
+* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-5
+- Fix uid for directories in /var/lib/zoneminder
+
+* Tue Jun 26 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-4
+- Added perl Archive::Tar dependency
+- Disabled web interface due to lack of access control on the event images
+
+* Sun Jun 10 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-3
+- Changes recommended in review by Jason Tibbitts
+
+* Mon Apr  2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-2
+- Standardised on package name of zoneminder
+
+* Thu Dec 28 2006 Martin Ebourne <martin@zepler.org> - 1.22.3-1
+- First version. Uses some parts from zm-1.20.1 by Corey DeLasaux and Serg Oskin
diff --git a/distros/fedora/zoneminder.logrotate b/distros/fedora/zoneminder.logrotate
new file mode 100644
index 000000000..7bd1d189b
--- /dev/null
+++ b/distros/fedora/zoneminder.logrotate
@@ -0,0 +1,8 @@
+/var/log/zoneminder/*.log {
+    missingok
+    notifempty
+    sharedscripts
+    postrotate
+        /usr/bin/zmpkg.pl logrot 2> /dev/null > /dev/null || :
+    endscript
+}
diff --git a/distros/fedora/zoneminder.service b/distros/fedora/zoneminder.service
new file mode 100644
index 000000000..d59fc6796
--- /dev/null
+++ b/distros/fedora/zoneminder.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Video security and surveillance system
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/zmpkg.pl start
+ExecReload=/usr/bin/zmpkg.pl reload
+PIDFile=/run/zoneminder/zm.pid
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/distros/redhat/README.CentOS b/distros/redhat/README.CentOS
index 319b8a7ab..991269057 100644
--- a/distros/redhat/README.CentOS
+++ b/distros/redhat/README.CentOS
@@ -15,7 +15,7 @@
 
      mysql -uroot -p
 	mysql> create database zm;
-	mysql> grant select,insert,update,delete on zm.* to
+	mysql> grant select,insert,update,delete,alter on zm.* to
                'zmuser'@localhost identified by 'zmpass';
 	mysql> exit;
      mysql -uroot -p < /usr/share/zoneminder/db/zm_create.sql
diff --git a/distros/redhat/README.SuSE b/distros/redhat/README.SuSE
deleted file mode 100644
index ff7f64f95..000000000
--- a/distros/redhat/README.SuSE
+++ /dev/null
@@ -1,17 +0,0 @@
-After install run "zm_database_init" to create
-the database and the zm database user (zm_admin).
-The config file is automaticly adjusted with the
-entered password for zm_admin.
-
-If you want to use X10 thwn install the the required
-perl module with cpan.
-
-information:
-during the run of zm_database_init a .my.cnf will
-be created/updated (in the home directory of root)
-so that root can access the database without password.
-It Does not delete the .my.cnf when it exists, but checks
-whether it has an entry for the mysql client [client] which
-contains as username root. When the entry not exist or
-the username is not root the .my.cnf will be modified
-to fit the above requirements.
\ No newline at end of file
diff --git a/distros/ubuntu1204/README.Debian b/distros/ubuntu1204/README.Debian
new file mode 100644
index 000000000..b8ea413e3
--- /dev/null
+++ b/distros/ubuntu1204/README.Debian
@@ -0,0 +1,51 @@
+zoneminder for Debian
+---------------------
+
+There is one manual step to get the web interface working.
+You need to link /etc/zm/apache.conf to /etc/apache2/conf.d/zoneminder.conf,
+then reload the apache config (i.e. /etc/init.d/apache2 reload)
+
+Changing the location for images and events
+-------------------------------------------
+
+Zoneminder, in its upstream form, stores data in /usr/share/zoneminder/.  This
+package modifies that by changing /usr/share/zoneminder/images and
+/usr/share/zoneminder/events to symlinks to directories under
+/var/cache/zoneminder.
+
+There are numerous places these could be put and ways to do it.  But, at the
+moment, if you change this, an upgrade will fail with a warning about these
+locations having changed (the reason for this was that previously, an  upgrade
+would silently revert the changes and cause event loss - refer
+bug #608793).
+
+If you do want to change the location, here are a couple of suggestions.
+(thanks to vagrant@freegeek.org):
+
+These lines in fstab could allow you to bind-mount an alternate location
+
+         /dev/sdX1 /otherdrive ext3 defaults 0 2
+         /otherdrive/zoneminder/images /var/cache/zoneminder/images bind defaults 0 2
+         /otherdrive/zoneminder/events /var/cache/zoneminder/events bind defaults 0 2
+
+        or if you have a separate partition for each:
+
+         /dev/sdX1 /var/cache/zoneminder/images ext3 defaults 0 2
+         /dev/sdX2 /var/cache/zoneminder/events ext3 defaults 0 2
+
+
+
+ -- Peter Howard <pjh@northern-ridge.com.au>, Sun, 16 Jan 2010 01:35:51 +1100
+
+Access to /dev/video*
+---------------------
+
+For cameras which require access to /dev/video*, zoneminder may need the 
+www-data user added to the video group in order to see those cameras:
+
+  adduser www-data video
+
+Note that all web applications running on the zoneminder server will then have 
+access to all video devices on the system.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Sun, 27 Mar 2011 13:06:56 -0700
diff --git a/distros/ubuntu1204/apache.conf b/distros/ubuntu1204/apache.conf
new file mode 100644
index 000000000..92a2b6414
--- /dev/null
+++ b/distros/ubuntu1204/apache.conf
@@ -0,0 +1,9 @@
+Alias /zm /usr/share/zoneminder
+
+<Directory /usr/share/zoneminder>
+  php_flag register_globals off
+  Options Indexes FollowSymLinks
+  <IfModule mod_dir.c>
+    DirectoryIndex index.php
+  </IfModule>
+</Directory>
diff --git a/distros/ubuntu1204/changelog b/distros/ubuntu1204/changelog
new file mode 100644
index 000000000..567177bc3
--- /dev/null
+++ b/distros/ubuntu1204/changelog
@@ -0,0 +1,18 @@
+zoneminder (1.26.4-2) precise; urgency=high
+
+  * improvements to zmupdate.pl, cleanups
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Thu, 03 Oct 2013 11:40:32 -0400
+
+zoneminder (1.26.3-1) unstable; urgency=low
+
+  * A 'minor' release focusing on performance improvement and bug fixes.
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Sun, 22 Sep 2013 09:36:42 +0800
+
+zoneminder (1.25.1-1) unstable; urgency=low
+
+  * Initial Version.
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Mon, 29 Apr 2013 12:38:00 -0400
+
diff --git a/distros/ubuntu1204/compat b/distros/ubuntu1204/compat
new file mode 100644
index 000000000..ec635144f
--- /dev/null
+++ b/distros/ubuntu1204/compat
@@ -0,0 +1 @@
+9
diff --git a/distros/ubuntu1204/control b/distros/ubuntu1204/control
new file mode 100644
index 000000000..06bc6801e
--- /dev/null
+++ b/distros/ubuntu1204/control
@@ -0,0 +1,21 @@
+Source: zoneminder
+Section: net
+Priority: optional
+Maintainer: Isaac Connor <iconnor@connortechnology.com>
+Build-Depends: debhelper (>= 5), autoconf, automake, dpatch, libphp-serialization-perl, libgnutls-dev, libmysqlclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg8-dev, libpcre3-dev, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libv4l-dev (>= 0.8.3), libbz2-dev, libtool, libsys-mmap-perl, ffmpeg, libnetpbm10-dev, libavdevice-dev, libdevice-serialport-perl, libpcre3, libarchive-zip-perl, libmime-lite-perl, libjpeg8, dh-autoreconf
+Standards-Version: 3.9.2
+
+Package: zoneminder
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5, php5, php5-mysql, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-lite-perl, mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53, libjpeg8, zip, libnet-sftp-foreign-perl
+Description: Linux video camera security and surveillance solution
+ ZoneMinder is intended for use in single or multi-camera video security 
+ applications, including commercial or home CCTV, theft prevention and child
+ or family member or home monitoring and other care scenarios. It
+ supports capture, analysis, recording, and monitoring of video data coming
+ from one or more video or network cameras attached to a Linux system.
+ ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
+ cameras using a variety of protocols. It is suitable for use as a home
+ video security system and for commercial or professional video security
+ and surveillance. It can also be integrated into a home automation system
+ via X.10 or other protocols.
diff --git a/distros/ubuntu1204/copyright b/distros/ubuntu1204/copyright
new file mode 100644
index 000000000..a177502a0
--- /dev/null
+++ b/distros/ubuntu1204/copyright
@@ -0,0 +1,22 @@
+Copyright:
+
+Copyright 2002 Philip Coombes <philip.coombes@zoneminder.com>
+
+License:
+
+This package 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 package 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 package; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian GNU/Linux systems, the text of the GPL can be found in
+/usr/share/common-licenses/GPL.
diff --git a/distros/ubuntu1204/dirs b/distros/ubuntu1204/dirs
new file mode 100644
index 000000000..4178482c1
--- /dev/null
+++ b/distros/ubuntu1204/dirs
@@ -0,0 +1,6 @@
+var/log/zm
+var/lib/zm
+var/cache/zoneminder/events
+var/cache/zoneminder/images
+var/cache/zoneminder/temp
+usr/share/zoneminder/db
diff --git a/distros/ubuntu1204/docs b/distros/ubuntu1204/docs
new file mode 100644
index 000000000..b43bf86b5
--- /dev/null
+++ b/distros/ubuntu1204/docs
@@ -0,0 +1 @@
+README.md
diff --git a/distros/ubuntu1204/init.d b/distros/ubuntu1204/init.d
new file mode 100644
index 000000000..757003132
--- /dev/null
+++ b/distros/ubuntu1204/init.d
@@ -0,0 +1,91 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          zoneminder
+# Required-Start:    $network $remote_fs $syslog
+# Required-Stop:     $network $remote_fs $syslog
+# Should-Start:      mysql
+# Should-Stop:       mysql
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description:  Control ZoneMinder as a Service
+### END INIT INFO
+# description: Control ZoneMinder as a Service
+# chkconfig: 2345 20 20
+
+# Source function library.
+#. /etc/rc.d/init.d/functions
+
+prog=ZoneMinder
+ZM_PATH_BIN="/usr/bin"
+RUNDIR=/var/run/zm
+TMPDIR=/tmp/zm
+command="$ZM_PATH_BIN/zmpkg.pl"
+
+start() {
+	echo -n "Starting $prog: "
+	mkdir -p $RUNDIR && chown www-data:www-data $RUNDIR
+	mkdir -p $TMPDIR && chown www-data:www-data $TMPDIR
+    zmfix -a
+	$command start
+	RETVAL=$?
+	[ $RETVAL = 0 ] && echo success
+	[ $RETVAL != 0 ] && echo failure
+	echo
+	[ $RETVAL = 0 ] && touch /var/lock/zm
+	return $RETVAL
+}
+stop() {
+	echo -n "Stopping $prog: "
+	#
+	# Why is this status check being done?
+	# as $command stop returns 1 if zoneminder 
+	# is stopped, which will result in 
+	# this returning 1, which will stuff 
+	# dpkg when it tries to stop zoneminder before
+	# uninstalling . . . 
+	#
+	result=`$command status`
+	if [ ! "$result" = "running" ]; then
+		echo "Zoneminder already stopped"
+		echo
+		RETVAL=0
+	else
+		$command stop
+		RETVAL=$?
+		[ $RETVAL = 0 ] && echo success
+		[ $RETVAL != 0 ] && echo failure
+		echo
+		[ $RETVAL = 0 ] && rm -f /var/lock/zm
+	fi
+}
+status() {
+	result=`$command status`
+	if [ "$result" = "running" ]; then
+		echo "ZoneMinder is running"
+		RETVAL=0
+	else
+		echo "ZoneMinder is stopped"
+		RETVAL=1
+	fi
+}
+
+case "$1" in
+'start')
+	start
+	;;
+'stop')
+	stop
+	;;
+'restart' | 'force-reload')
+	stop
+	start
+	;;
+'status')
+	status
+	;;
+*)
+	echo "Usage: $0 { start | stop | restart | status }"
+	RETVAL=1
+	;;
+esac
+exit $RETVAL
diff --git a/distros/ubuntu1204/postinst b/distros/ubuntu1204/postinst
new file mode 100644
index 000000000..716c475e6
--- /dev/null
+++ b/distros/ubuntu1204/postinst
@@ -0,0 +1,64 @@
+#! /bin/sh
+
+set -e
+
+VERSION=1.26.4
+
+if [ "$1" = "configure" ]; then
+                #
+                # Get mysql started if it isn't
+                #
+                if ! $(/etc/init.d/mysql status >/dev/null 2>&1); then
+                        invoke-rc.d mysql start
+                fi
+                if $(/etc/init.d/mysql status >/dev/null 2>&1); then
+                        mysqladmin --defaults-file=/etc/mysql/debian.cnf -f reload
+                        # test if database if already present...
+                        if ! $(echo quit | mysql --defaults-file=/etc/mysql/debian.cnf zm > /dev/null 2> /dev/null) ; then
+                            cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
+                            echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+                        fi
+
+                        # get old version from upgrade...
+                        OLD_ZM_VERSION=${2%-*}
+                        if [ -z "$OLD_ZM_VERSION" ]; then
+                                # fall back to getting version from database itself, which may not necessarily be accurate?
+                                OLD_ZM_VERSION=$(echo 'select Value from Config where Name = "ZM_DYN_CURR_VERSION";' | mysql --defaults-file=/etc/mysql/debian.cnf --skip-column-names zm )
+                        fi
+                        if [ -n "$OLD_ZM_VERSION" ] && [ "$OLD_ZM_VERSION" != "$VERSION" ] ; then
+                                echo 'grant lock tables, create, alter on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+                                # stop zoneminder before performing database upgrade.
+                                invoke-rc.d zoneminder stop || true
+                                zmupdate.pl --nointeractive --version $OLD_ZM_VERSION
+                        fi
+
+                else
+                        echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'
+                fi
+                chown www-data:www-data /var/log/zm
+                chown www-data:www-data /var/lib/zm/
+                if [ -z "$2" ]; then
+                        chown www-data:www-data -R /var/cache/zoneminder
+                fi
+fi
+# Ensure zoneminder is stopped...
+if [ -x "/etc/init.d/zoneminder" ]; then
+        if invoke-rc.d zoneminder status ; then
+                invoke-rc.d zoneminder stop || exit $?
+        fi
+fi
+
+if [ "$1" = "configure" ]; then
+	if [ -z "$2" ]; then
+		chown www-data:www-data /var/log/zm
+		chown www-data:www-data /var/lib/zm/
+		chown www-data:www-data -R /var/cache/zoneminder
+    else
+		chown www-data:www-data /var/log/zm
+        OLD_ZM_VERSION=${2%-*}
+        if [ "$OLD_ZM_VERSION" != "$VERSION" ] ; then
+            zmupdate.pl --version $OLD_ZM_VERSION 
+        fi
+	fi
+fi
+#DEBHELPER#
diff --git a/distros/ubuntu1204/postrm b/distros/ubuntu1204/postrm
new file mode 100644
index 000000000..28a00a7a0
--- /dev/null
+++ b/distros/ubuntu1204/postrm
@@ -0,0 +1,9 @@
+#! /bin/sh
+# set -e # to be reinstated later
+
+if [ "$1" = "purge" ]; then
+    echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+    echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+    mysqladmin --defaults-file=/etc/mysql/debian.cnf -f drop zm
+fi
+#DEBHELPER#
diff --git a/distros/ubuntu1204/preinst b/distros/ubuntu1204/preinst
new file mode 100755
index 000000000..6cd01ba55
--- /dev/null
+++ b/distros/ubuntu1204/preinst
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+abort=false
+if [ -L /usr/share/zoneminder/events ]; then
+    l=$(readlink /usr/share/zoneminder/events)
+    if [ "$l" != "/var/cache/zoneminder/events" ]; then
+        abort=true
+    fi
+fi
+if [ -L /usr/share/zoneminder/images ]; then
+    l=$(readlink /usr/share/zoneminder/images )
+    if [ "$l" != "/var/cache/zoneminder/images" ]; then
+        abort=true
+    fi
+fi
+
+if [ "$abort" = "true" ]; then
+    cat >&2 << EOF 
+Aborting installation of zoneminder due to non-default symlinks in
+/usr/share/zoneminder for the images and/or events directory, which could
+result in loss of data. Please move your data in each of these directories to
+/var/cache/zoneminder before installing zoneminder from the package.
+EOF
+    exit 1
+
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/distros/ubuntu1204/rules b/distros/ubuntu1204/rules
new file mode 100755
index 000000000..601dcf62a
--- /dev/null
+++ b/distros/ubuntu1204/rules
@@ -0,0 +1,73 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -d - -f 1)
+POSTINST_VERSION := $(shell egrep ^VERSION= debian/postinst | cut -d = -f 2)
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+CFLAGS = -Wall -g
+CPPFLAGS = -D__STDC_CONSTANT_MACROS
+CXXFLAGS = -DHAVE_LIBCRYPTO
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+%:
+	dh $@ --with autoreconf
+
+override_dh_auto_configure:
+	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --sysconfdir=/etc/zm --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-mysql=/usr  --with-webdir=/usr/share/zoneminder --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-crashtrace=no --enable-mmap=yes
+
+override_dh_clean:
+	# check to make sure that postinst contains the correct upstream version
+	[ $(UPSTREAM_VERSION) = $(POSTINST_VERSION) ]
+
+	# Add here commands to clean up after the build process.
+	[ ! -f Makefile ] || $(MAKE) distclean
+	dh_clean
+
+override_dh_install:
+	# Add here commands to install the package into debian/zm.
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/zoneminder RUNDIR=$(CURDIR)/debian/zoneminder/var/run ZM_RUNDIR=$(CURDIR)/debian/zoneminder/var/run
+	install -D -m 0644 db/zm_create.sql		$(CURDIR)/debian/zoneminder/usr/share/zoneminder/db
+	install -D -m 0644 db/zm_update-*.sql $(CURDIR)/debian/zoneminder/usr/share/zoneminder/db
+	install -D -m 0644 debian/apache.conf  $(CURDIR)/debian/zoneminder/etc/zm
+	#
+	# NOTE: This is a short-term kludge; hopefully changes in the next
+	# upstream version will render this unnecessary.
+	rm -rf debian/zoneminder/usr/share/zoneminder/events
+	rm -rf debian/zoneminder/usr/share/zoneminder/images
+	rm -rf debian/zoneminder/usr/share/zoneminder/temp
+	ln -s /var/cache/zoneminder/events debian/zoneminder/usr/share/zoneminder/
+	ln -s /var/cache/zoneminder/images debian/zoneminder/usr/share/zoneminder/
+	ln -s /var/cache/zoneminder/temp debian/zoneminder/usr/share/zoneminder/
+
+	#
+	# This is a slightly lesser kludge; moving the cgi stuff to 
+	# /usr/share/zoneminder/cgi-bin breaks one set of behavior,
+	# having it just in /usr/lib/cgi-bin breaks another bit of 
+	# behavior.
+	#
+	ln -s /usr/lib/cgi-bin debian/zoneminder/usr/share/zoneminder/
+
+override_dh_fixperms:
+	dh_fixperms
+	chown root:root debian/zoneminder/etc/zm/zm.conf
+
+override_dh_auto_test:
+	# do not run tests...
diff --git a/distros/ubuntu1204/watch b/distros/ubuntu1204/watch
new file mode 100644
index 000000000..5a8a9c4d7
--- /dev/null
+++ b/distros/ubuntu1204/watch
@@ -0,0 +1,3 @@
+version=3
+http://www.zoneminder.com/downloads.html \
+  .*/ZoneMinder-(.*).tar.gz
diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt
new file mode 100644
index 000000000..c9e5e82a3
--- /dev/null
+++ b/misc/CMakeLists.txt
@@ -0,0 +1,10 @@
+# CMakeLists.txt for the ZoneMinder misc files
+
+# Create files from the .in files
+configure_file(apache.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/apache.conf @ONLY)
+configure_file(logrotate.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/logrotate.conf @ONLY)
+configure_file(syslog.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/syslog.conf @ONLY)
+
+# Install the misc files
+install(FILES apache.conf logrotate.conf syslog.conf DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/misc")
+
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
new file mode 100644
index 000000000..c0798fdf5
--- /dev/null
+++ b/scripts/CMakeLists.txt
@@ -0,0 +1,24 @@
+# CMakeLists.txt for the ZoneMinder perl scripts.
+
+# Process the perl modules subdirectory
+add_subdirectory(ZoneMinder ZoneMinder)
+
+# Create files from the .in files
+configure_file(zmaudit.pl.in ${CMAKE_CURRENT_SOURCE_DIR}/zmaudit.pl @ONLY)
+configure_file(zmcontrol.pl.in ${CMAKE_CURRENT_SOURCE_DIR}/zmcontrol.pl @ONLY)
+configure_file(zmdc.pl.in ${CMAKE_CURRENT_SOURCE_DIR}/zmdc.pl @ONLY)
+configure_file(zmfilter.pl.in ${CMAKE_CURRENT_SOURCE_DIR}/zmfilter.pl @ONLY)
+configure_file(zmpkg.pl.in ${CMAKE_CURRENT_SOURCE_DIR}/zmpkg.pl @ONLY)
+configure_file(zmtrack.pl.in ${CMAKE_CURRENT_SOURCE_DIR}/zmtrack.pl @ONLY)
+configure_file(zmtrigger.pl.in ${CMAKE_CURRENT_SOURCE_DIR}/zmtrigger.pl @ONLY)
+configure_file(zmupdate.pl.in ${CMAKE_CURRENT_SOURCE_DIR}/zmupdate.pl @ONLY)
+configure_file(zmvideo.pl.in ${CMAKE_CURRENT_SOURCE_DIR}/zmvideo.pl @ONLY)
+configure_file(zmwatch.pl.in ${CMAKE_CURRENT_SOURCE_DIR}/zmwatch.pl @ONLY)
+configure_file(zmx10.pl.in ${CMAKE_CURRENT_SOURCE_DIR}/zmx10.pl @ONLY)
+#configure_file(zmdbbackup.in ${CMAKE_CURRENT_SOURCE_DIR}/zmdbbackup @ONLY)
+#configure_file(zmdbrestore.in ${CMAKE_CURRENT_SOURCE_DIR}/zmdbrestore @ONLY)
+#configure_file(zm.in ${CMAKE_CURRENT_SOURCE_DIR}/zm @ONLY)
+#configure_file(zmeventdump.in ${CMAKE_CURRENT_SOURCE_DIR}/zmeventdump @ONLY)
+
+# Install the perl scripts
+install(FILES zmaudit.pl zmcontrol.pl zmdc.pl zmfilter.pl zmpkg.pl zmtrack.pl zmtrigger.pl zmupdate.pl zmvideo.pl zmwatch.pl zmx10.pl DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
diff --git a/scripts/ZoneMinder/CMakeLists.txt b/scripts/ZoneMinder/CMakeLists.txt
new file mode 100644
index 000000000..6b66bea8c
--- /dev/null
+++ b/scripts/ZoneMinder/CMakeLists.txt
@@ -0,0 +1,19 @@
+# CMakeLists.txt for the ZoneMinder perl module.
+
+# Create files from the .in files
+configure_file(lib/ZoneMinder/Base.pm.in ${CMAKE_CURRENT_SOURCE_DIR}/lib/ZoneMinder/Base.pm @ONLY)
+configure_file(lib/ZoneMinder/Config.pm.in ${CMAKE_CURRENT_SOURCE_DIR}/lib/ZoneMinder/Config.pm @ONLY)
+configure_file(lib/ZoneMinder/Memory.pm.in ${CMAKE_CURRENT_SOURCE_DIR}/lib/ZoneMinder/Memory.pm @ONLY)
+configure_file(lib/ZoneMinder/ConfigData.pm.in ${CMAKE_CURRENT_SOURCE_DIR}/lib/ZoneMinder/ConfigData.pm @ONLY)
+
+# Add build target for the perl modules
+add_custom_target(zmperlmodules ALL perl Makefile.PL FIRST_MAKEFILE="${CMAKE_CURRENT_SOURCE_DIR}/MakefilePerl" INSTALL_BASE="${CMAKE_CURRENT_SOURCE_DIR}/output" INSTALLPRIVLIB="${CMAKE_CURRENT_SOURCE_DIR}/output/${CMAKE_INSTALL_LIBDIR}/perl5" INSTALLARCHLIB="${CMAKE_CURRENT_SOURCE_DIR}/optout/${CMAKE_INSTALL_LIBDIR}/perl5/arch" INSTALLSITELIB="${CMAKE_CURRENT_SOURCE_DIR}/output/${CMAKE_INSTALL_LIBDIR}/perl5" INSTALLSITEARCH="${CMAKE_CURRENT_SOURCE_DIR}/optout/${CMAKE_INSTALL_LIBDIR}/perl5/arch" COMMAND make --makefile=MakefilePerl COMMAND make --makefile=MakefilePerl pure_install COMMENT "Building ZoneMinder perl modules")
+
+# Add install target for the perl modules
+install(DIRECTORY output/ DESTINATION "${CMAKE_INSTALL_PREFIX}")
+
+
+
+
+
+
diff --git a/scripts/ZoneMinder/MYMETA.yml b/scripts/ZoneMinder/MYMETA.yml
deleted file mode 100644
index 8d77ebdf2..000000000
--- a/scripts/ZoneMinder/MYMETA.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-abstract: 'Container module for common ZoneMinder modules'
-author:
-  - 'Philip Coombes <philip.coombes@zoneminder.com>'
-build_requires:
-  ExtUtils::MakeMaker: 0
-configure_requires:
-  ExtUtils::MakeMaker: 0
-distribution_type: module
-dynamic_config: 0
-generated_by: 'ExtUtils::MakeMaker version 6.57_05'
-license: unknown
-meta-spec:
-  url: http://module-build.sourceforge.net/META-spec-v1.4.html
-  version: 1.4
-name: ZoneMinder
-no_index:
-  directory:
-    - t
-    - inc
-requires: {}
-version: 1.25.0
diff --git a/scripts/ZoneMinder/blib/arch/.exists b/scripts/ZoneMinder/blib/arch/.exists
deleted file mode 100644
index e69de29bb..000000000
diff --git a/scripts/ZoneMinder/blib/arch/auto/ZoneMinder/.exists b/scripts/ZoneMinder/blib/arch/auto/ZoneMinder/.exists
deleted file mode 100644
index e69de29bb..000000000
diff --git a/scripts/ZoneMinder/blib/bin/.exists b/scripts/ZoneMinder/blib/bin/.exists
deleted file mode 100644
index e69de29bb..000000000
diff --git a/scripts/ZoneMinder/blib/lib/.exists b/scripts/ZoneMinder/blib/lib/.exists
deleted file mode 100644
index e69de29bb..000000000
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder.pm
deleted file mode 100644
index 41c972650..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder.pm
+++ /dev/null
@@ -1,130 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Common Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the common definitions and functions used by the rest 
-# of the ZoneMinder scripts
-#
-package ZoneMinder;
-
-use 5.006;
-use strict;
-use warnings;
-
-require Exporter;
-use ZoneMinder::Base qw(:all);
-use ZoneMinder::Config qw(:all);
-use ZoneMinder::Logger qw(:all);
-use ZoneMinder::General qw(:all);
-use ZoneMinder::Database qw(:all);
-use ZoneMinder::Memory qw(:all);
-
-our @ISA = qw(Exporter ZoneMinder::Base ZoneMinder::Config ZoneMinder::Logger ZoneMinder::General ZoneMinder::Database ZoneMinder::Memory);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration	use ZoneMinder ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our %EXPORT_TAGS = (
-	'base' => [ 
-		@ZoneMinder::Base::EXPORT_OK
-	],
-	'config' => [ 
-		@ZoneMinder::Config::EXPORT_OK
-	],
-	'debug' => [ 
-		@ZoneMinder::Logger::EXPORT_OK
-	],
-	'general' => [ 
-		@ZoneMinder::General::EXPORT_OK
-	],
-	'database' => [ 
-		@ZoneMinder::Database::EXPORT_OK
-	],
-	'memory' => [ 
-		@ZoneMinder::Memory::EXPORT_OK
-	],
-);
-push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
-
-our @EXPORT_OK = @{ $EXPORT_TAGS{'all'} };
-
-our @EXPORT = ( @EXPORT_OK );
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-1;
-__END__
-
-=head1 NAME
-
-ZoneMinder - Container module for common ZoneMinder modules
-
-=head1 SYNOPSIS
-
-  use ZoneMinder;
-
-=head1 DESCRIPTION
-
-This module is a convenience container module that uses the
-ZoneMinder::Base, ZoneMinder::Common, ZoneMinder::Logger,
-ZoneMinder::Database and ZoneMinder::Memory modules. It also
-exports by default all symbols provided by the 'all' tag of 
-each of the modules.
-
-Thus 'use'ing this module is equivalent to the following 
-
-  use ZoneMinder::Base qw(:all);
-  use ZoneMinder::Config qw(:all);
-  use ZoneMinder::Logger qw(:all);
-  use ZoneMinder::Database qw(:all);
-  use ZoneMinder::Memory qw(:all);
-
-but is somewhat easier.
-
-=head2 EXPORT
-
-All symbols exported by the 'all' tag of each of the included
-modules.
-
-=head1 SEE ALSO
-
-ZoneMinder::Base, ZoneMinder::Common, ZoneMinder::Logger,
-ZoneMinder::Database, ZoneMinder::Memory
-
-http://www.zoneminder.com
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2005 by Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/Base.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/Base.pm
deleted file mode 100644
index 095ddc37b..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Base.pm
+++ /dev/null
@@ -1,86 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Base Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the common definitions and functions used by the rest 
-# of the ZoneMinder scripts
-#
-package ZoneMinder::Base;
-
-use 5.006;
-use strict;
-use warnings;
-
-require Exporter;
-
-our @ISA = qw(Exporter);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration	use ZoneMinder ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our %EXPORT_TAGS = ( 'all' => [ qw() ] );
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
-
-our @EXPORT = qw();
-
-our $VERSION = "1.25.0";
-
-1;
-__END__
-
-=head1 NAME
-
-ZoneMinder::Base - Base perl module for ZoneMinder
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Base;
-
-=head1 DESCRIPTION
-
-This module is the base module for the rest of the ZoneMinder modules. It is included by each of the other modules but serves no purpose other than to propagate the perl module version amongst the other modules. You will never need to use this module directly but if you write new ZoneMinder modules they should include it.
-
-=head2 EXPORT
-
-None by default.
-
-=head1 SEE ALSO
-
-http://www.zoneminder.com
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/Config.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/Config.pm
deleted file mode 100644
index e447f86f9..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Config.pm
+++ /dev/null
@@ -1,145 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Config Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the common definitions and functions used by the rest 
-# of the ZoneMinder scripts
-#
-package ZoneMinder::Config;
-
-use 5.006;
-use strict;
-use warnings;
-
-require Exporter;
-require ZoneMinder::Base;
-
-our @ISA = qw(Exporter ZoneMinder::Base);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration	use ZoneMinder ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our @EXPORT_CONFIG; # Get populated by BEGIN
-
-our %EXPORT_TAGS = (
-	'constants' => [ qw(
-		ZM_PID
-	) ]
-);
-push( @{$EXPORT_TAGS{config}}, @EXPORT_CONFIG );
-push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
-
-our @EXPORT = qw();
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-use constant ZM_PID => "/var/run/zm/zm.pid"; # Path to the ZoneMinder run pid file
-use constant ZM_CONFIG => "/etc/zm/zm.conf"; # Path to the ZoneMinder config file
-
-use Carp;
-
-# Load the config from the database into the symbol table
-BEGIN
-{
-	no strict 'refs';
-
-	my $config_file = ZM_CONFIG;
-	( my $local_config_file = $config_file ) =~ s|^.*/|./|;
-	if ( -s $local_config_file && -r $local_config_file )
-	{
-		print( STDERR "Warning, overriding installed $local_config_file file with local copy\n" );
-		$config_file = $local_config_file;
-	}
-	open( CONFIG, "<".$config_file ) or croak( "Can't open config file '$config_file': $!" );
-	foreach my $str ( <CONFIG> )
-	{
-		next if ( $str =~ /^\s*$/ );
-		next if ( $str =~ /^\s*#/ );
-        my ( $name, $value ) = $str =~ /^\s*([^=\s]+)\s*=\s*(.+?)\s*$/;
-		$name =~ tr/a-z/A-Z/;
-		*{$name} = sub { $value };
-		push( @EXPORT_CONFIG, $name );
-	}
-	close( CONFIG );
-
-	use DBI;
-	my $dbh = DBI->connect( "DBI:mysql:database=".&ZM_DB_NAME.";host=".&ZM_DB_HOST, &ZM_DB_USER, &ZM_DB_PASS );
-	my $sql = "select * from Config";
-	my $sth = $dbh->prepare_cached( $sql ) or croak( "Can't prepare '$sql': ".$dbh->errstr() );
-	my $res = $sth->execute() or croak( "Can't execute: ".$sth->errstr() );
-	while( my $config = $sth->fetchrow_hashref() )
-	{
-		*{$config->{Name}} = sub { $config->{Value} };
-		push( @EXPORT_CONFIG, $config->{Name} );
-	}
-	$sth->finish();
-	$dbh->disconnect();
-}
-
-1;
-__END__
-
-=head1 NAME
-
-ZoneMinder::Config - ZoneMinder configuration module.
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Config qw(:all);
-
-=head1 DESCRIPTION
-
-The ZoneMinder::Config module is used to import the ZoneMinder configuration from the database. It will do this at compile time in a BEGIN block and require access to the zm.conf file either in the current directory or in its defined location in order to determine database access details, configuration from this file will also be included. If the :all or :config tags are used then this configuration is exported into the namespace of the calling program or module.
-
-Once the configuration has been imported then configuration variables are defined as constants and can be accessed directory by name, e.g.
-
- $lang = ZM_LANG_DEFAULT;
-
-=head2 EXPORT
-
-None by default.
-The :constants tag will export the ZM_PID constant which details the location of the zm.pid file
-The :config tag will export all configuration from the database as well as any from the zm.conf file
-The :all tag will export all above symbols.
-
-=head1 SEE ALSO
-
-http://www.zoneminder.com
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/ConfigAdmin.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/ConfigAdmin.pm
deleted file mode 100644
index 8ee1ec82b..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/ConfigAdmin.pm
+++ /dev/null
@@ -1,213 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Config Admin Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the debug definitions and functions used by the rest 
-# of the ZoneMinder scripts
-#
-package ZoneMinder::ConfigAdmin;
-
-use 5.006;
-use strict;
-use warnings;
-
-require Exporter;
-require ZoneMinder::Base;
-
-our @ISA = qw(Exporter ZoneMinder::Base);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration	use ZoneMinder ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our %EXPORT_TAGS = (
-	'functions' => [ qw(
-		loadConfigFromDB
-		saveConfigToDB
-	) ]
-);
-push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'functions'} } );
-
-our @EXPORT = qw();
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Configuration Administration
-#
-# ==========================================================================
-
-use ZoneMinder::Config qw(:all);
-use ZoneMinder::ConfigData qw(:all);
-
-use Carp;
-
-sub loadConfigFromDB
-{
-	print( "Loading config from DB\n" );
-	my $dbh = DBI->connect( "DBI:mysql:database=".ZM_DB_NAME.";host=".ZM_DB_HOST, ZM_DB_USER, ZM_DB_PASS );
-	
-	if ( !$dbh )
-	{
-		print( "Error: unable to load options from database: $DBI::errstr\n" );
-		return( 0 );
-	}
-	my $sql = "select * from Config";
-	my $sth = $dbh->prepare_cached( $sql ) or croak( "Can't prepare '$sql': ".$dbh->errstr() );
-	my $res = $sth->execute() or croak( "Can't execute: ".$sth->errstr() );
-	my $option_count = 0;
-	while( my $config = $sth->fetchrow_hashref() )
-	{
-		my ( $name, $value ) = ( $config->{Name}, $config->{Value} );
-		#print( "Name = '$name'\n" );
-		my $option = $options_hash{$name};
-		if ( !$option )
-		{
-			warn( "No option '$name' found, removing" );
-			next;
-		}
-		#next if ( $option->{category} eq 'hidden' );
-		if ( defined($value) )
-		{
-			if ( $option->{type} == $types{boolean} )
-			{
-				$option->{value} = $value?"yes":"no";
-			}
-			else
-			{
-				$option->{value} = $value;
-			}
-		}
-		$option_count++;;
-	}
-	$sth->finish();
-	$dbh->disconnect();
-	return( $option_count );
-}
-
-sub saveConfigToDB
-{
-	print( "Saving config to DB\n" );
-	my $dbh = DBI->connect( "DBI:mysql:database=".ZM_DB_NAME.";host=".ZM_DB_HOST, ZM_DB_USER, ZM_DB_PASS );
-
-	if ( !$dbh )
-	{
-		print( "Error: unable to save options to database: $DBI::errstr\n" );
-		return( 0 );
-	}
-	my $sql = "delete from Config";
-	my $res = $dbh->do( $sql ) or croak( "Can't do '$sql': ".$dbh->errstr() );
-
-	$sql = "replace into Config set Id = ?, Name = ?, Value = ?, Type = ?, DefaultValue = ?, Hint = ?, Pattern = ?, Format = ?, Prompt = ?, Help = ?, Category = ?, Readonly = ?, Requires = ?";
-	my $sth = $dbh->prepare_cached( $sql ) or croak( "Can't prepare '$sql': ".$dbh->errstr() );
-	foreach my $option ( @options )
-	{
-		#next if ( $option->{category} eq 'hidden' );
-		#print( $option->{name}."\n" ) if ( !$option->{category} );
-		$option->{db_type} = $option->{type}->{db_type};
-		$option->{db_hint} = $option->{type}->{hint};
-		$option->{db_pattern} = $option->{type}->{pattern};
-		$option->{db_format} = $option->{type}->{format};
-		if ( $option->{db_type} eq "boolean" )
-		{
-			$option->{db_value} = ($option->{value} eq "yes")?"1":"0";
-		}
-		else
-		{
-			$option->{db_value} = $option->{value};
-		}
-		if ( my $requires = $option->{requires} )
-		{
-			$option->{db_requires} = join( ";", map { my $value = $_->{value}; $value = ($value eq "yes")?1:0 if ( $options_hash{$_->{name}}->{db_type} eq "boolean" ); ( "$_->{name}=$value" ) } @$requires );
-		}
-		else
-		{
-		}
-		my $res = $sth->execute( $option->{id}, $option->{name}, $option->{db_value}, $option->{db_type}, $option->{default}, $option->{db_hint}, $option->{db_pattern}, $option->{db_format}, $option->{description}, $option->{help}, $option->{category}, $option->{readonly}?1:0, $option->{db_requires} ) or croak( "Can't execute: ".$sth->errstr() );
-	}
-	$sth->finish();
-	$dbh->disconnect();
-}
-
-1;
-__END__
-
-=head1 NAME
-
-ZoneMinder::ConfigAdmin - ZoneMinder Configuration Administration module
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::ConfigAdmin;
-  use ZoneMinder::ConfigAdmin qw(:all);
-
-  loadConfigFromDB();
-  saveConfigToDB();
-
-=head1 DESCRIPTION
-
-The ZoneMinder:ConfigAdmin module contains the master definition of the ZoneMinder configuration options as well as helper methods. This module is intended for specialist confguration management and would not normally be used by end users.
-
-The configuration held in this module, which was previously in zmconfig.pl, includes the name, default value, description, help text, type and category for each option, as well as a number of additional fields in a small number of cases.
-
-=head1 METHODS
-
-=over 4
-
-=item loadConfigFromDB ();
-
-Loads existing configuration from the database (if any) and merges it with the definitions held in this module. This results in the merging of any new configuration and the removal of any deprecated configuration while preserving the existing values of every else.
-
-=item saveConfigToDB ();
-
-Saves configuration held in memory to the database. The act of loading and saving configuration is a convenient way to ensure that the configuration held in the database corresponds with the most recent definitions and that all components are using the same set of configuration.
-
-=head2 EXPORT
-
-None by default.
-The :data tag will export the various configuration data structures
-The :functions tag will export the helper functions.
-The :all tag will export all above symbols.
-
-
-=head1 SEE ALSO
-
-http://www.zoneminder.com
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/ConfigData.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/ConfigData.pm
deleted file mode 100644
index 87adca18a..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/ConfigData.pm
+++ /dev/null
@@ -1,2015 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Config Data Module, $Date: 2011-01-20 18:49:42 +0000 (Thu, 20 Jan 2011) $, $Revision: 3230 $
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the debug definitions and functions used by the rest 
-# of the ZoneMinder scripts
-#
-package ZoneMinder::ConfigData;
-
-use 5.006;
-use strict;
-use warnings;
-
-require Exporter;
-require ZoneMinder::Base;
-
-our @ISA = qw(Exporter ZoneMinder::Base);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration	use ZoneMinder ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our %EXPORT_TAGS = (
-	'data' => [ qw(
-		%types
-		@options
-		%options_hash
-	) ]
-);
-push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'data'} } );
-
-our @EXPORT = qw();
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Configuration Data
-#
-# ==========================================================================
-
-use Carp;
-
-our $configInitialised = 0;
-
-sub INIT
-{
-    initialiseConfig();
-}
-
-# Types
-our %types =
-(
-	string => { db_type=>"string", hint=>"string", pattern=>qr|^(.+)$|, format=>q( $1 ) },
-	alphanum => { db_type=>"string", hint=>"alphanumeric", pattern=>qr|^([a-zA-Z0-9-_]+)$|, format=>q( $1 ) },
-	text => { db_type=>"text", hint=>"free text", pattern=>qr|^(.+)$|, format=>q( $1 ) },
-	boolean => { db_type=>"boolean", hint=>"yes|no", pattern=>qr|^([yn])|i, check=>q( $1 ), format=>q( ($1 =~ /^y/) ? "yes" : "no" ) },
-	integer => { db_type=>"integer", hint=>"integer", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-	decimal => { db_type=>"decimal", hint=>"decimal", pattern=>qr|^(\d+(?:\.\d+)?)$|, format=>q( $1 ) },
-	hexadecimal => { db_type=>"hexadecimal", hint=>"hexadecimal", pattern=>qr|^(?:0x)?([0-9a-f]{1,8})$|, format=>q( "0x".$1 ) },
-	tristate => { db_type=>"string", hint=>"auto|yes|no", pattern=>qr|^([ayn])|i, check=>q( $1 ), format=>q( ($1 =~ /^y/) ? "yes" : ($1 =~ /^n/ ? "no" : "auto" ) ) },
-	abs_path => { db_type=>"string", hint=>"/absolute/path/to/somewhere", pattern=>qr|^((?:/[^/]*)+?)/?$|, format=>q( $1 ) },
-	rel_path => { db_type=>"string", hint=>"relative/path/to/somewhere", pattern=>qr|^((?:[^/].*)?)/?$|, format=>q( $1 ) },
-	directory => { db_type=>"string", hint=>"directory", pattern=>qr|^([a-zA-Z0-9-_.]+)$|, format=>q( $1 ) },
-	file => { db_type=>"string", hint=>"filename", pattern=>qr|^([a-zA-Z0-9-_.]+)$|, format=>q( $1 ) },
-	hostname => { db_type=>"string", hint=>"host.your.domain", pattern=>qr|^([a-zA-Z0-9_.-]+)$|, format=>q( $1 ) },
-	url => { db_type=>"string", hint=>"http://host.your.domain/", pattern=>qr|^(?:http://)?(.+)$|, format=>q( "http://".$1 ) },
-	email => { db_type=>"string", hint=>"your.name\@your.domain", pattern=>qr|^([a-zA-Z0-9_.-]+)\@([a-zA-Z0-9_.-]+)$|, format=>q( $1\@$2 ) },
-);
-
-our @options =
-(
-	{
-		name => "ZM_LANG_DEFAULT",
-		default => "en_gb",
-		description => "Default language used by web interface",
-		help => "ZoneMinder allows the web interface to use languages other than English if the appropriate language file has been created and is present. This option allows you to change the default language that is used from the shipped language, British English, to another language",
-		type => $types{string},
-		category => "system",
-	},
-	{
-		name => "ZM_OPT_USE_AUTH",
-		default => "no",
-		description => "Authenticate user logins to ZoneMinder",
-		help => "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.",
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-		name => "ZM_AUTH_TYPE",
-		default => "builtin",
-		description => "What is used to authenticate ZoneMinder users",
-		help => "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.",
-		requires => [ { name=>"ZM_OPT_USE_AUTH", value=>"yes" } ],
-		type => { db_type=>"string", hint=>"builtin|remote", pattern=>qr|^([br])|i, format=>q( $1 =~ /^b/ ? "builtin" : "remote" ) },
-		category => "system",
-	},
-	{
-		name => "ZM_AUTH_RELAY",
-		default => "hashed",
-		description => "Method used to relay authentication information",
-		help => "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.",
-		requires => [ { name=>"ZM_OPT_USE_AUTH", value=>"yes" } ],
-		type => { db_type=>"string", hint=>"hashed|plain|none", pattern=>qr|^([hpn])|i, format=>q( ($1 =~ /^h/) ? "hashed" : ($1 =~ /^p/ ? "plain" : "none" ) ) },
-		category => "system",
-	},
-	{
-		name => "ZM_AUTH_HASH_SECRET",
-		default => "...Change me to something unique...",
-		description => "Secret for encoding hashed authentication information",
-		help => "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.",
-		requires => [ { name=>"ZM_OPT_USE_AUTH", value=>"yes" }, { name=>"ZM_AUTH_RELAY", value=>"hashed" } ],
-		type => $types{string},
-		category => "system",
-	},
-	{
-		name => "ZM_AUTH_HASH_IPS",
-		default => "yes",
-		description => "Include IP addresses in the authentication hash",
-		help => "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.",
-		requires => [ { name=>"ZM_OPT_USE_AUTH", value=>"yes" }, { name=>"ZM_AUTH_RELAY", value=>"hashed" } ],
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-		name => "ZM_AUTH_HASH_LOGINS",
-		default => "no",
-		description => "Allow login by authentication hash",
-		help => "The normal process for logging into ZoneMinder is via the login screen with username and password. In some circumstances it may be desirable to allow access directly to one or more pages, for instance from a third party application. If this option is enabled then adding an 'auth' parameter to any request will include a shortcut login bypassing the login screen, if not already logged in. As authentication hashes are time and, optionally, IP limited this can allow short-term access to ZoneMinder screens from other web pages etc. In order to use this the calling application will hae to generate the authentication hash itself and ensure it is valid. If you use this option you should ensure that you have modified the ZM_AUTH_HASH_SECRET to somethign unique to your system.",
-		requires => [ { name=>"ZM_OPT_USE_AUTH", value=>"yes" }, { name=>"ZM_AUTH_RELAY", value=>"hashed" } ],
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-		name => "ZM_DIR_EVENTS",
-		default => "events",
-		description => "Directory where events are stored",
-		help => "This is the path to the events directory where all the event images and other miscellaneous files are stored. It is normally given as a subdirectory of the web directory you have specified earlier however if disk space is tight it can reside on another partition in which case you should create a link from that area to the path you give here.",
-		type => $types{directory},
-		category => "paths",
-	},
-	{
-		name => "ZM_USE_DEEP_STORAGE",
-		default => "yes",
-		description => "Use a deep filesystem hierarchy for events",
-		help => "Traditionally ZoneMinder stores all events for a monitor in one directory for that monitor. This is simple and efficient except when you have very large amounts of events. Some filesystems are unable to store more than 32k files in one directory and even without this limitation, large numbers of files in a directory can slow creation and deletion of files. This option allows you to select an alternate method of storing events by year/month/day/hour/min/second which has the effect of separating events out into more directories, resulting in less per directory, and also making it easier to manually navigate to any events that may have happened at a particular time or date.",
-		type => $types{boolean},
-		category => "paths",
-	},
-	{
-		name => "ZM_DIR_IMAGES",
-		default => "images",
-		description => "Directory where the images that the ZoneMinder client generates are stored",
-		help => "ZoneMinder generates a myriad of images, mosty of which are associated with events. For those that aren't this is where they go.",
-		type => $types{directory},
-		category => "paths",
-	},
-	{
-		name => "ZM_DIR_SOUNDS",
-		default => "sounds",
-		description => "Directory to the sounds that the ZoneMinder client can use",
-		help => "ZoneMinder can optionally play a sound file when an alarm is detected. This indicates where (relative to the web root) to look for this file.",
-		type => $types{directory},
-		category => "paths",
-	},
-	{
-		name => "ZM_PATH_ZMS",
-		default => "/cgi-bin/nph-zms",
-		description => "Web path to zms streaming server",
-		help => "The ZoneMinder streaming server is required to send streamed images to your browser. It will be installed into the cgi-bin path given at configuration time. This option determines what the web path to the server is rather than the local path on your machine. Ordinarily the streaming server runs in parser-header mode however if you experience problems with streaming you can change this to non-parsed-header (nph) mode by changing 'zms' to 'nph-zms'.",
-		type => $types{rel_path},
-		category => "paths",
-	},
-	{
-		name => "ZM_COLOUR_JPEG_FILES",
-		default => "yes",
-		description => "Colourise greyscale JPEG files",
-		help => "Cameras that capture in greyscale can write their captured images to jpeg files with a corresponding greyscale colour space. This saves a small amount of disk space over colour ones. However some tools such as ffmpeg either fail to work with this colour space or have to convert it beforehand. Setting this option to yes uses up a little more space but makes creation of MPEG files much faster.",
-		type => $types{boolean},
-		category => "images",
-	},
-	{
-		name => "ZM_ADD_JPEG_COMMENTS",
-		default => "no",
-		description => "Add jpeg timestamp annotations as file header comments",
-		help => "JPEG files may have a number of extra fields added to the file header. The comment field may have any kind of text added. This options allows you to have the same text that is used to annotate the image additionally included as a file header comment. If you archive event images to other locations this may help you locate images for particular events or times if you use software that can read comment headers.",
-		type => $types{boolean},
-		category => "images",
-	},
-	{
-		name => "ZM_JPEG_FILE_QUALITY",
-		default => "70",
-		description => "Set the JPEG quality setting for the saved event files (1-100)",
-		help => "When ZoneMinder detects an event it will save the images associated with that event to files. These files are in the JPEG format and can be viewed or streamed later. This option specifies what image quality should be used to save these files. A higher number means better quality but less compression so will take up more disk space and take longer to view over a slow connection. By contrast a low number means smaller, quicker to view, files but at the price of lower quality images. This setting applies to all images written except if the capture image has caused an alarm and the alarm file quality option is set at a higher value when that is used instead.",
-		type => $types{integer},
-		category => "images",
-	},
-	{
-		name => "ZM_JPEG_ALARM_FILE_QUALITY",
-		default => "0",
-		description => "Set the JPEG quality setting for the saved event files during an alarm (1-100)",
-		help => "This value is equivalent to the regular jpeg file quality setting above except that it only applies to images saved while in an alarm state and then only if this value is set to a higher quality setting than the ordinary file setting. If set to a lower value then it is ignored. Thus leaving it at the default of 0 effectively means to use the regular file quality setting for all saved images. This is to prevent acccidentally saving important images at a worse quality setting.",
-		type => $types{integer},
-		category => "images",
-	},
-    # Deprecated, now stream quality
-	{
-		name => "ZM_JPEG_IMAGE_QUALITY",
-		default => "70",
-		description => "Set the JPEG quality setting for the streamed 'live' images (1-100)",
-		help => "When viewing a 'live' stream for a monitor ZoneMinder will grab an image from the buffer and encode it into JPEG format before sending it. This option specifies what image quality should be used to encode these images. A higher number means better quality but less compression so will take longer to view over a slow connection. By contrast a low number means quicker to view images but at the price of lower quality images. This option does not apply when viewing events or still images as these are usually just read from disk and so will be encoded at the quality specified by the previous options.",
-		type => $types{integer},
-		category => "hidden",
-	},
-	{
-		name => "ZM_JPEG_STREAM_QUALITY",
-		default => "70",
-		description => "Set the JPEG quality setting for the streamed 'live' images (1-100)",
-		help => "When viewing a 'live' stream for a monitor ZoneMinder will grab an image from the buffer and encode it into JPEG format before sending it. This option specifies what image quality should be used to encode these images. A higher number means better quality but less compression so will take longer to view over a slow connection. By contrast a low number means quicker to view images but at the price of lower quality images. This option does not apply when viewing events or still images as these are usually just read from disk and so will be encoded at the quality specified by the previous options.",
-		type => $types{integer},
-		category => "images",
-	},
-	{
-		name => "ZM_MPEG_TIMED_FRAMES",
-		default => "yes",
-		description => "Tag video frames with a timestamp for more realistic streaming",
-		help => "When using streamed MPEG based video, either for live monitor streams or events, ZoneMinder can send the streams in two ways. If this option is selected then the timestamp for each frame, taken from it's capture time, is included in the stream. This means that where the frame rate varies, for instance around an alarm, the stream will still maintain it's 'real' timing. If this option is not selected then an approximate frame rate is calculated and that is used to schedule frames instead. This option should be selected unless you encounter problems with your preferred streaming method.",
-		type => $types{boolean},
-		category => "images",
-	},
-	{
-		name => "ZM_MPEG_LIVE_FORMAT",
-		default => "swf",
-		description => "What format 'live' video streams are played in",
-		help => "When using MPEG mode ZoneMinder can output live video. However what formats are handled by the browser varies greatly between machines. This option allows you to specify a video format using a file extension format, so you would just enter the extension of the file type you would like and the rest is determined from that. The default of 'asf' works well under Windows with Windows Media Player but I'm currently not sure what, if anything, works on a Linux platform. If you find out please let me know! If this option is left blank then live streams will revert to being in motion jpeg format",
-		type => $types{string},
-		category => "images",
-	},
-	{
-		name => "ZM_MPEG_REPLAY_FORMAT",
-		default => "swf",
-		description => "What format 'replay' video streams are played in",
-		help => "When using MPEG mode ZoneMinder can replay events in encoded video format. However what formats are handled by the browser varies greatly between machines. This option allows you to specify a video format using a file extension format, so you would just enter the extension of the file type you would like and the rest is determined from that. The default of 'asf' works well under Windows with Windows Media Player and 'mpg', or 'avi' etc should work under Linux. If you know any more then please let me know! If this option is left blank then live streams will revert to being in motion jpeg format",
-		type => $types{string},
-		category => "images",
-	},
-	{
-		name => "ZM_RAND_STREAM",
-		default => "yes",
-		description => "Add a random string to prevent caching of streams",
-		help => "Some browsers can cache the streams used by ZoneMinder. In order to prevent his a harmless random string can be appended to the url to make each invocation of the stream appear unique.",
-		type => $types{boolean},
-		category => "images",
-	},
-	{
-		name => "ZM_OPT_CAMBOZOLA",
-		default => "no",
-		description => "Is the (optional) cambozola java streaming client installed",
-		help => "Cambozola is a handy low fat cheese flavoured Java applet that ZoneMinder uses to view image streams on browsers such as Internet Explorer that don't natively support this format. If you use this browser it is highly recommended to install this from http://www.charliemouse.com/code/cambozola/  however if it is not installed still images at a lower refresh rate can still be viewed.",
-		type => $types{boolean},
-		category => "images",
-	},
-	{
-		name => "ZM_PATH_CAMBOZOLA",
-		default => "cambozola.jar",
-		description => "Web path to (optional) cambozola java streaming client",
-		help => "Cambozola is a handy low fat cheese flavoured Java applet that ZoneMinder uses to view image streams on browsers such as Internet Explorer that don't natively support this format. If you use this browser it is highly recommended to install this from http://www.charliemouse.com/code/cambozola/  however if it is not installed still images at a lower refresh rate can still be viewed. Leave this as 'cambozola.jar' if cambozola is installed in the same directory as the ZoneMinder web client files.",
-		requires => [ { name=>"ZM_OPT_CAMBOZOLA", value=>"yes" } ],
-		type => $types{rel_path},
-		category => "images",
-	},
-	{
-		name => "ZM_RELOAD_CAMBOZOLA",
-		default => "0",
-		description => "After how many seconds should Cambozola be reloaded in live view",
-		help => "Cambozola allows for the viewing of streaming MJPEG however it caches the entire stream into cache space on the computer, setting this to a number > 0 will cause it to automatically reload after that many seconds to avoid filling up a hard drive.",
-		type => $types{integer},
-		category => "images",
-	},
-	{
-		name => "ZM_TIMESTAMP_ON_CAPTURE",
-		default => "yes",
-		description => "Timestamp images as soon as they are captured",
-		help => "ZoneMinder can add a timestamp to images in two ways. The default method, when this option is set, is that each image is timestamped immediately when captured and so the image held in memory is marked right away. The second method does not timestamp the images until they are either saved as part of an event or accessed over the web. The timestamp used in both methods will contain the same time as this is preserved along with the image. The first method ensures that an image is timestamped regardless of any other circumstances but will result in all images being timestamped even those never saved or viewed. The second method necessitates that saved images are copied before being saved otherwise two timestamps perhaps at different scales may be applied. This has the (perhaps) desirable side effect that the timestamp is always applied at the same resolution so an image that has scaling applied will still have a legible and correctly scaled timestamp.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_CPU_EXTENSIONS",
-		default => "yes",
-		description => "Use advanced CPU extensions to increase performance",
-		help => "When advanced processor extensions such as SSE2 or SSSE3 are available, ZoneMinder can use them, which should increase performance and reduce system load. Enabling this option on processors that do not support the advanced processors extensions used by ZoneMinder is harmless and will have no effect.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_FAST_IMAGE_BLENDS",
-		default => "yes",
-		description => "Use a fast algorithm to blend the reference image",
-		help => "To detect alarms ZoneMinder needs to blend the captured image with the stored reference image to update it for comparison with the next image. The reference blend percentage specified for the monitor controls how much the new image affects the reference image. There are two methods that are available for this. If this option is set then fast calculation which does not use any multiplication or division is used. This calculation is extremely fast, however it limits the possible blend percentages to 50%, 25%, 12.5%, 6.25%, 3.25% and 1.5%. Any other blend percentage will be rounded to the nearest possible one. The alternative is to switch this option off and use standard blending instead, which is slower.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_OPT_ADAPTIVE_SKIP",
-		default => "yes",
-		description => "Should frame analysis try and be efficient in skipping frames",
-		help => "In previous versions of ZoneMinder the analysis daemon would attempt to keep up with the capture daemon by processing the last captured frame on each pass. This would sometimes have the undesirable side-effect of missing a chunk of the initial activity that caused the alarm because the pre-alarm frames would all have to be written to disk and the database before processing the next frame, leading to some delay between the first and second event frames. Setting this option enables a newer adaptive algorithm where the analysis daemon attempts to process as many captured frames as possible, only skipping frames when in danger of the capture daemon overwriting yet to be processed frames. This skip is variable depending on the size of the ring buffer and the amount of space left in it. Enabling this option will give you much better coverage of the beginning of alarms whilst biasing out any skipped frames towards the middle or end of the event. However you should be aware that this will have the effect of making the analysis daemon run somewhat behind the capture daemon during events and for particularly fast rates of capture it is possible for the adaptive algorithm to be overwhelmed and not have time to react to a rapid build up of pending frames and thus for a buffer overrun condition to occur.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_BLEND_ALARMED_IMAGES",
-		default => "yes",
-		description => "Blend alarmed images to update the reference image",
-		help => "To detect alarms ZoneMinder compares an image with a reference image which is formed from a composite of the previous images. This option determines whether images that cause events are included in this process. Doing so may increase the precision of the alarmed region but can cause problems if wholescale lighting changes cause alarms as this would not get fed back into the image and an alarm may persist indefinately. A better way to achive the same effect in most cases is to lower substantially the reference blend percentage in specific monitors.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_MAX_SUSPEND_TIME",
-		default => "30",
-		description => "Maximum time that a monitor may have motion detection suspended",
-		help => "ZoneMinder allows monitors to have motion detection to be suspended, for instance while panning a camera. Ordinarily this relies on the operator resuming motion detection afterwards as failure to do so can leave a monitor in a permanently suspended state. This setting allows you to set a maximum time which a camera may be suspended for before it automatically resumes motion detection. This time can be extended by subsequent suspend indications after the first so continuous camera movement will also occur while the monitor is suspended.",
-		type => $types{integer},
-		category => "config",
-	},
-    # Deprecated, really no longer necessary
-	{
-		name => "ZM_OPT_REMOTE_CAMERAS",
-		default => "no",
-		description => "Are you going to use remote/networked cameras",
-		help => "ZoneMinder can work with both local cameras, ie. those attached physically to your computer and remote or network cameras. If you will be using networked cameras select this option.",
-		type => $types{boolean},
-		category => "hidden",
-	},
-    # Deprecated, now set on a per monitor basis using the Method field
-	{
-		name => "ZM_NETCAM_REGEXPS",
-		default => "yes",
-		description => "Use regular expression matching with network cameras",
-		help => "Traditionally ZoneMinder has used complex regular regular expressions to handle the multitude of formats that network cameras produce. In versions from 1.21.1 the default is to use a simpler and faster built in pattern matching methodology. This works well with most networks cameras but if you have problems you can try the older, but more flexible, regular expression based method by selecting this option. Note, to use this method you must have libpcre installed on your system.",
-		requires => [ { name => "ZM_OPT_REMOTE_CAMERAS", value => "yes" } ],
-		type => $types{boolean},
-		category => "hidden",
-	},
-	{
-		name => "ZM_HTTP_VERSION",
-		default => "1.1",
-		description => "The version of HTTP that ZoneMinder will use to connect",
-		help => "ZoneMinder can communicate with network cameras using either of the HTTP/1.1 or HTTP/1.0 standard. A server will normally fall back to the version it supports iwht no problem so this should usually by left at the default. However it can be changed to HTTP/1.0 if necessary to resolve particular issues.",
-		type => { db_type=>"string", hint=>"1.1|1.0", pattern=>qr|^(1\.[01])$|, format=>q( $1?$1:"" ) },
-		category => "network",
-	},
-	{
-		name => "ZM_HTTP_UA",
-		default => "ZoneMinder",
-		description => "The user agent that ZoneMinder uses to identify itself",
-		help => "When ZoneMinder communicates with remote cameras it will identify itself using this string and it's version number. This is normally sufficient, however if a particular cameras expects only to communicate with certain browsers then this can be changed to a different string identifying ZoneMinder as Internet Explorer or Netscape etc.",
-		type => $types{string},
-		category => "network",
-	},
-	{
-		name => "ZM_HTTP_TIMEOUT",
-		default => "2500",
-		description => "How long ZoneMinder waits before giving up on images (milliseconds)",
-		help => "When retrieving remote images ZoneMinder will wait for this length of time before deciding that an image is not going to arrive and taking steps to retry. This timeout is in milliseconds (1000 per second) and will apply to each part of an image if it is not sent in one whole chunk.",
-		type => $types{integer},
-		category => "network",
-	},
-    {
-		name => "ZM_MIN_RTP_PORT",
-		default => "40200",
-		description => "Minimum port that ZoneMinder will listen for RTP traffic on",
-		help => "When ZoneMinder communicates with MPEG4 capable cameras using RTP with the unicast method it must open ports for the camera to connect back to for control and streaming purposes. This setting specifies the minimum port number that ZoneMinder will use. Ordinarily two adjacent ports are used for each camera, one for control packets and one for data packets. This port should be set to an even number, you may also need to open up a hole in your firewall to allow cameras to connect back if you wish to use unicasting.",
-		type => $types{integer},
-		category => "network",
-	},
-	{
-		name => "ZM_MAX_RTP_PORT",
-		default => "40499",
-		description => "Maximum port that ZoneMinder will listen for RTP traffic on",
-		help => "When ZoneMinder communicates with MPEG4 capable cameras using RTP with the unicast method it must open ports for the camera to connect back to for control and streaming purposes. This setting specifies the maximum port number that ZoneMinder will use. Ordinarily two adjacent ports are used for each camera, one for control packets and one for data packets. This port should be set to an even number, you may also need to open up a hole in your firewall to allow cameras to connect back if you wish to use unicasting. You should also ensure that you have opened up at least two ports for each monitor that will be connecting to unicasting network cameras.",
-		type => $types{integer},
-		category => "network",
-	},
-	{
-		name => "ZM_OPT_FFMPEG",
-		default => "yes",
-		description => "Is the ffmpeg video encoder/decoder installed",
-		help => "ZoneMinder can optionally encode a series of video images into an MPEG encoded movie file for viewing, downloading or storage. This option allows you to specify whether you have the ffmpeg tools installed. Note that creating MPEG files can be fairly CPU and disk intensive and is not a required option as events can still be reviewed as video streams without it.",
-		type => $types{boolean},
-		category => "images",
-	},
-	{
-		name => "ZM_PATH_FFMPEG",
-		default => "/usr/bin/ffmpeg",
-		description => "Path to (optional) ffmpeg mpeg encoder",
-		help => "This path should point to where ffmpeg has been installed.",
-		requires => [ { name=>"ZM_OPT_FFMPEG", value=>"yes" } ],
-		type => $types{abs_path},
-		category => "images",
-	},
-	{
-		name => "ZM_FFMPEG_INPUT_OPTIONS",
-		default => "",
-		description => "Additional input options to ffmpeg",
-		help => "Ffmpeg can take many options on the command line to control the quality of video produced. This option allows you to specify your own set that apply to the input to ffmpeg (options that are given before the -i option). Check the ffmpeg documentation for a full list of options which may be used here.",
-		requires => [ { name=>"ZM_OPT_FFMPEG", value=>"yes" } ],
-		type => $types{string},
-		category => "images",
-	},
-	{
-		name => "ZM_FFMPEG_OUTPUT_OPTIONS",
-		default => "-r 25",
-		description => "Additional output options to ffmpeg",
-		help => "Ffmpeg can take many options on the command line to control the quality of video produced. This option allows you to specify your own set that apply to the output from ffmpeg (options that are given after the -i option). Check the ffmpeg documentation for a full list of options which may be used here. The most common one will often be to force an output frame rate supported by the video encoder.",
-		requires => [ { name=>"ZM_OPT_FFMPEG", value=>"yes" } ],
-		type => $types{string},
-		category => "images",
-	},
-	{
-		name => "ZM_FFMPEG_FORMATS",
-		default => "mpg mpeg wmv asf avi* mov swf 3gp**",
-		description => "Formats to allow for ffmpeg video generation",
-		help => "Ffmpeg can generate video in many different formats. This option allows you to list the ones you want to be able to select. As new formats are supported by ffmpeg you can add them here and be able to use them immediately. Adding a '*' after a format indicates that this will be the default format used for web video, adding '**' defines the default format for phone video.",
-		requires => [ { name=>"ZM_OPT_FFMPEG", value=>"yes" } ],
-		type => $types{string},
-		category => "images",
-	},
-	{
-		name => "ZM_LOG_LEVEL_SYSLOG",
-		default => "0",
-		description => "Save logging output to the system log",
-		help => "ZoneMinder logging is now more more integrated between components and allows you to specify the destination for logging output and the individual levels for each. This option lets you control the level of logging output that goes to the system log. ZoneMinder binaries have always logged to the system log but now scripts and web logging is also included. To preserve the previous behaviour you should ensure this value is set to Info or Warning. This option controls the maximum level of logging that will be written, so Info includes Warnings and Errors etc. To disable entirely, set this option to None. You should use caution when setting this option to Debug as it can affect severely affect system performance. If you want debug you will also need to set a level and component below",
-		type => { db_type=>"integer", hint=>"None=-5|Panic=-4|Fatal=-3|Error=-2|Warning=-1|Info=0|Debug=1", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_LEVEL_FILE",
-		default => "-5",
-		description => "Save logging output to component files",
-		help => "ZoneMinder logging is now more more integrated between components and allows you to specify the destination for logging output and the individual levels for each. This option lets you control the level of logging output that goes to individual log files written by specific components. This is how logging worked previously and although useful for tracking down issues in specific components it also resulted in many disparate log files. To preserve this behaviour you should ensure this value is set to Info or Warning. This option controls the maximum level of logging that will be written, so Info includes Warnings and Errors etc. To disable entirely, set this option to None. You should use caution when setting this option to Debug as it can affect severely affect system performance though file output has less impact than the other options. If you want debug you will also need to set a level and component below",
-		type => { db_type=>"integer", hint=>"None=-5|Panic=-4|Fatal=-3|Error=-2|Warning=-1|Info=0|Debug=1", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_LEVEL_WEBLOG",
-		default => "-5",
-		description => "Save logging output to the weblog",
-		help => "ZoneMinder logging is now more more integrated between components and allows you to specify the destination for logging output and the individual levels for each. This option lets you control the level of logging output from the web interface that goes to the httpd error log. Note that only web logging from PHP and JavaScript files is included and so this option is really only useful for investigating specific issues with those components. This option controls the maximum level of logging that will be written, so Info includes Warnings and Errors etc. To disable entirely, set this option to None. You should use caution when setting this option to Debug as it can affect severely affect system performance. If you want debug you will also need to set a level and component below",
-		type => { db_type=>"integer", hint=>"None=-5|Panic=-4|Fatal=-3|Error=-2|Warning=-1|Info=0|Debug=1", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_LEVEL_DATABASE",
-		default => "0",
-		description => "Save logging output to the database",
-		help => "ZoneMinder logging is now more more integrated between components and allows you to specify the destination for logging output and the individual levels for each. This option lets you control the level of logging output that is written to the database. This is a new option which can make viewing logging output easier and more intuitive and also makes it easier to get an overall impression of how the system is performing. If you have a large or very busy system then it is possible that use of this option may slow your system down if the table becomes very large. Ensure you use the LOG_DATABASE_LIMIT option to keep the table to a manageable size. This option controls the maximum level of logging that will be written, so Info includes Warnings and Errors etc. To disable entirely, set this option to None. You should use caution when setting this option to Debug as it can affect severely affect system performance. If you want debug you will also need to set a level and component below",
-		type => { db_type=>"integer", hint=>"None=-5|Panic=-4|Fatal=-3|Error=-2|Warning=-1|Info=0|Debug=1", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_DATABASE_LIMIT",
-		default => "7 day",
-		description => "Maximum number of log entries to retain",
-		help => "If you are using database logging then it is possible to quickly build up a large number of entries in the Logs table. This option allows you to specify how many of these entries are kept. If you set this option to a number greater than zero then that number is used to determine the maximum number of rows, less than or equal to zero indicates no limit and is not recommended. You can also set this value to time values such as '<n> day' which will limit the log entries to those newer than that time. You can specify 'hour', 'day', 'week', 'month' and 'year', note that the values should be singular (no 's' at the end). The Logs table is pruned periodically so it is possible for more than the expected number of rows to be present briefly in the meantime.",
-		type => $types{string},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_DEBUG",
-		default => "no",
-		description => "Switch debugging on",
-		help => "ZoneMinder components usually support debug logging available to help with diagnosing problems. Binary components have several levels of debug whereas more other components have only one. Normally this is disabled to minimise performance penalties and avoid filling logs too quickly. This option lets you switch on other options that allow you to configure additional debug information to be output. Components will pick up this instruction when they are restarted.",
-		type => $types{boolean},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_DEBUG_TARGET",
-		default => "",
-		description => "What components should have extra debug enabled",
-		help => "There are three scopes of debug available. Leaving this option blank means that all components will use extra debug (not recommended). Setting this option to '_<component>', e.g. _zmc, will limit extra debug to that component only. Setting this option to '_<component>_<identity>', e.g. '_zmc_m1' will limit extra debug to that instance of the component only. This is ordinarily what you probably want to do. To debug scripts use their names without the .pl extension, e.g. '_zmvideo' and to debug issues with the web interface use '_web'. You can specify multiple targets by separating them with '|' characters.",
-		requires => [ { name => "ZM_LOG_DEBUG", value => "yes" } ],
-		type => $types{string},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_DEBUG_LEVEL",
-		default => 1,
-		description => "What level of extra debug should be enabled",
-		help => "There are 9 levels of debug available, with higher numbers being more debug and level 0 being no debug. However not all levels are used by all components. Also if there is debug at a high level it is usually likely to be output at such a volume that it may obstruct normal operation. For this reason you should set the level carefully and cautiously until the degree of debug you wish to see is present. Scripts and the web interface only have one level so this is an on/off type option for them.",
-		requires => [ { name => "ZM_LOG_DEBUG", value => "yes" } ],
-		type => { db_type=>"integer", hint=>"1|2|3|4|5|6|7|8|9", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_DEBUG_FILE",
-		default => "/tmp/zm/zm_debug.log+",
-		description => "Where extra debug is output to",
-		help => "This option allows you to specify a different target for debug output. All components have a default log file which will norally be in /tmp or /var/log and this is where debug will be written to if this value is empty. Adding a path here will temporarily redirect debug, and other logging output, to this file. This option is a simple filename and you are debugging several components then they will all try and write to the same file with undesirable consequences. Appending a '+' to the filename will cause the file to be created with a '.<pid>' suffix containing your process id. In this way debug from each run of a component is kept separate. This is the recommended setting as it will also prevent subsequent runs from overwriting the same log. You should ensure that permissions are set up to allow writing to the file and directory specified here.",
-		requires => [ { name => "ZM_LOG_DEBUG", value => "yes" } ],
-		type => $types{string},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_CHECK_PERIOD",
-		default => "900",
-		description => "Time period used when calculating overall system health",
-		help => "When ZoneMinder is logging events to the database it can retrospectively examine the number of warnings and errors that have occurred to calculate an overall state of system health. This option allows you to indicate what period of historical events are used in this calculation. This value is expressed in seconds and is ignored if LOG_LEVEL_DATABASE is set to None.",
-		type => $types{integer},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_ALERT_WAR_COUNT",
-		default => "1",
-		description => "Number of warnings indicating system alert state",
-		help => "When ZoneMinder is logging events to the database it can retrospectively examine the number of warnings and errors that have occurred to calculate an overall state of system health. This option allows you to specify how many warnings must have occurred within the defined time period to generate an overall system alert state. A value of zero means warnings are not considered. This value is ignored if LOG_LEVEL_DATABASE is set to None.",
-		type => $types{integer},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_ALERT_ERR_COUNT",
-		default => "1",
-		description => "Number of errors indicating system alert state",
-		help => "When ZoneMinder is logging events to the database it can retrospectively examine the number of warnings and errors that have occurred to calculate an overall state of system health. This option allows you to specify how many errors must have occurred within the defined time period to generate an overall system alert state. A value of zero means errors are not considered. This value is ignored if LOG_LEVEL_DATABASE is set to None.",
-		type => $types{integer},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_ALERT_FAT_COUNT",
-		default => "0",
-		description => "Number of fatal error indicating system alert state",
-		help => "When ZoneMinder is logging events to the database it can retrospectively examine the number of warnings and errors that have occurred to calculate an overall state of system health. This option allows you to specify how many fatal errors (including panics) must have occurred within the defined time period to generate an overall system alert state. A value of zero means fatal errors are not considered. This value is ignored if LOG_LEVEL_DATABASE is set to None.",
-		type => $types{integer},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_ALARM_WAR_COUNT",
-		default => "100",
-		description => "Number of warnings indicating system alarm state",
-		help => "When ZoneMinder is logging events to the database it can retrospectively examine the number of warnings and errors that have occurred to calculate an overall state of system health. This option allows you to specify how many warnings must have occurred within the defined time period to generate an overall system alarm state. A value of zero means warnings are not considered. This value is ignored if LOG_LEVEL_DATABASE is set to None.",
-		type => $types{integer},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_ALARM_ERR_COUNT",
-		default => "10",
-		description => "Number of errors indicating system alarm state",
-		help => "When ZoneMinder is logging events to the database it can retrospectively examine the number of warnings and errors that have occurred to calculate an overall state of system health. This option allows you to specify how many errors must have occurred within the defined time period to generate an overall system alarm state. A value of zero means errors are not considered. This value is ignored if LOG_LEVEL_DATABASE is set to None.",
-		type => $types{integer},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_ALARM_FAT_COUNT",
-		default => "1",
-		description => "Number of fatal error indicating system alarm state",
-		help => "When ZoneMinder is logging events to the database it can retrospectively examine the number of warnings and errors that have occurred to calculate an overall state of system health. This option allows you to specify how many fatal errors (including panics) must have occurred within the defined time period to generate an overall system alarm state. A value of zero means fatal errors are not considered. This value is ignored if LOG_LEVEL_DATABASE is set to None.",
-		type => $types{integer},
-		category => "logging",
-	},
-	{
-		name => "ZM_RECORD_EVENT_STATS",
-		default => "yes",
-		description => "Record event statistical information, switch off if too slow",
-		help => "This version of ZoneMinder records detailed information about events in the Stats table. This can help in profiling what the optimum settings are for Zones though this is tricky at present. However in future releases this will be done more easily and intuitively, especially with a large sample of events. The default option of 'yes' allows this information to be collected now in readiness for this but if you are concerned about performance you can switch this off in which case no Stats information will be saved.",
-		type => $types{boolean},
-		category => "logging",
-	},
-	{
-		name => "ZM_RECORD_DIAG_IMAGES",
-		default => "no",
-		description => "Record intermediate alarm diagnostic images, can be very slow",
-		help => "In addition to recording event statistics you can also record the intermediate diagnostic images that display the results of the various checks and processing that occur when trying to determine if an alarm event has taken place. There are several of these images generated for each frame and zone for each alarm or alert frame so this can have a massive impact on performance. Only switch this setting on for debug or analysis purposes and remember to switch it off again once no longer required.",
-		type => $types{boolean},
-		category => "logging",
-	},
-	{
-		name => "ZM_DUMP_CORES",
-		default => "no",
-		description => "Create core files on unexpected process failure.",
-		help => "When an unrecoverable error occurs in a ZoneMinder binary process is has traditionally been trapped and the details written to logs to aid in remote analysis. However in some cases it is easier to diagnose the error if a core file, which is a memory dump of the process at the time of the error, is created. This can be interactively analysed in the debugger and may reveal more or better information than that available from the logs. This option is recommended for advanced users only otherwise leave at the default. Note using this option to trigger core files will mean that there will be no indication in the binary logs that a process has died, they will just stop, however the zmdc log will still contain an entry. Also note that you may have to explicitly enable core file creation on your system via the 'ulimit -c' command or other means otherwise no file will be created regardless of the value of this option.",
-		type => $types{boolean},
-		category => "logging",
-	},
-	{
-		name => "ZM_PATH_MAP",
-		default => "/dev/shm",
-		description => "Path to the mapped memory files that that ZoneMinder can use",
-		help => "ZoneMinder has historically used IPC shared memory for shared data between processes. This has it's advantages and limitations. This version of ZoneMinder can use an alternate method, mapped memory, instead with can be enabled with the --enable--mmap directive to configure. This requires less system configuration and is generally more flexible. However it requires each shared data segment to map onto a filesystem file. This option indicates where those mapped files go. You should ensure that this location has sufficient space for these files and for the best performance it should be a tmpfs file system or ramdisk otherwise disk access may render this method slower than the regular shared memory one.",
-		type => $types{abs_path},
-		category => "paths",
-	},
-	{
-		name => "ZM_PATH_SOCKS",
-		default => "/tmp/zm",
-		description => "Path to the various Unix domain socket files that ZoneMinder uses",
-		help => "ZoneMinder generally uses Unix domain sockets where possible. This reduces the need for port assignments and prevents external applications from possibly compromising the daemons. However each Unix socket requires a .sock file to be created. This option indicates where those socket files go.",
-		type => $types{abs_path},
-		category => "paths",
-	},
-	{
-		name => "ZM_PATH_LOGS",
-		default => "/var/log/zm",
-		description => "Path to the various logs that the ZoneMinder daemons generate",
-		help => "There are various daemons that are used by ZoneMinder to perform various tasks. Most generate helpful log files and this is where they go. They can be deleted if not required for debugging.",
-		type => $types{abs_path},
-		category => "paths",
-	},
-	{
-		name => "ZM_PATH_SWAP",
-		default => "/tmp/zm",
-		description => "Path to location for temporary swap images used in streaming",
-		help => "Buffered playback requires temporary swap images to be stored for each instance of the streaming daemons. This option determines where these images will be stored. The images will actually be stored in sub directories beneath this location and will be automatically cleaned up after a period of time.",
-		type => $types{abs_path},
-		category => "paths",
-	},
-	{
-		name => "ZM_WEB_TITLE_PREFIX",
-		default => "ZM",
-		description => "The title prefix displayed on each window",
-		help => "If you have more than one installation of ZoneMinder it can be helpful to display different titles for each one. Changing this option allows you to customise the window titles to include further information to aid identification.",
-		type => $types{string},
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_RESIZE_CONSOLE",
-		default => "yes",
-		description => "Should the console window resize itself to fit",
-		help => "Traditionally the main ZoneMinder web console window has resized itself to shrink to a size small enough to list only the monitors that are actually present. This is intended to make the window more unobtrusize but may not be to everyones tastes, especially if opened in a tab in browsers which support this kind if layout. Switch this option off to have the console window size left to the users preference",
-		type => $types{boolean},
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_POPUP_ON_ALARM",
-		default => "yes",
-		description => "Should the monitor window jump to the top if an alarm occurs",
-		help => "When viewing a live monitor stream you can specify whether you want the window to pop to the front if an alarm occurs when the window is minimised or behind another window. This is most useful if your monitors are over doors for example when they can pop up if someone comes to the doorway.",
-		type => $types{boolean},
-		category => "web",
-	},
-	{
-		name => "ZM_OPT_X10",
-		default => "no",
-		description => "Support interfacing with X10 devices",
-		help => "If you have an X10 Home Automation setup in your home you can use ZoneMinder to initiate or react to X10 signals if your computer has the appropriate interface controller. This option indicates whether X10 options will be available in the browser client.",
-		type => $types{boolean},
-		category => "x10",
-	},
-	{
-		name => "ZM_X10_DEVICE",
-		default => "/dev/ttyS0",
-		description => "What device is your X10 controller connected on",
-		requires => [ { name => "ZM_OPT_X10", value => "yes" } ],
-		help => "If you have an X10 controller device (e.g. XM10U) connected to your computer this option details which port it is conected on, the default of /dev/ttyS0 maps to serial or com port 1.",
-		type => $types{abs_path},
-		category => "x10",
-	},
-	{
-		name => "ZM_X10_HOUSE_CODE",
-		default => "A",
-		description => "What X10 house code should be used",
-		requires => [ { name => "ZM_OPT_X10", value => "yes" } ],
-		help => "X10 devices are grouped together by identifying them as all belonging to one House Code. This option details what that is. It should be a single letter between A and P.",
-		type => { db_type=>"string", hint=>"A-P", pattern=>qr|^([A-P])|i, format=>q( uc($1) ) },
-		category => "x10",
-	},
-	{
-		name => "ZM_X10_DB_RELOAD_INTERVAL",
-		default => "60",
-		description => "How often (in seconds) the X10 daemon reloads the monitors from the database",
-		requires => [ { name => "ZM_OPT_X10", value => "yes" } ],
-		help => "The zmx10 daemon periodically checks the database to find out what X10 events trigger, or result from, alarms. This option determines how frequently this check occurs, unless you change this area frequently this can be a fairly large value.",
-		type => $types{integer},
-		category => "x10",
-	},
-	{
-		name => "ZM_WEB_SOUND_ON_ALARM",
-		default => "no",
-		description => "Should the monitor window play a sound if an alarm occurs",
-		help => "When viewing a live monitor stream you can specify whether you want the window to play a sound to alert you if an alarm occurs.",
-		type => $types{boolean},
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_ALARM_SOUND",
-		default => "",
-		description => "The sound to play on alarm, put this in the sounds directory",
-		help => "You can specify a sound file to play if an alarm occurs whilst you are watching a live monitor stream. So long as your browser understands the format it does not need to be any particular type. This file should be placed in the sounds directory defined earlier.",
-		type => $types{file},
-		requires => [ { name => "ZM_WEB_SOUND_ON_ALARM", value => "yes" } ],
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_COMPACT_MONTAGE",
-		default => "no",
-		description => "Compact the montage view by removing extra detail",
-		help => "The montage view shows the output of all of your active monitors in one window. This include a small menu and status information for each one. This can increase the web traffic and make the window larger than may be desired. Setting this option on removes all this extraneous information and just displays the images.",
-		type => $types{boolean},
-		category => "web",
-	},
-	{
-		name => "ZM_OPT_FAST_DELETE",
-		default => "yes",
-		description => "Delete only event database records for speed",
-		help => "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. It is recommended that you set this option which means that the browser client only deletes the key entries in the events table, which means the events will no longer appear in the listing, and leaves the zmaudit daemon to clear up the rest later.",
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-		name => "ZM_STRICT_VIDEO_CONFIG",
-		default => "yes",
-		description => "Allow errors in setting video config to be fatal",
-		help => "With some video devices errors can be reported in setting the various video attributes when in fact the operation was successful. Switching this option off will still allow these errors to be reported but will not cause them to kill the video capture daemon. Note however that doing this will cause all errors to be ignored including those which are genuine and which may cause the video capture to not function correctly. Use this option with caution.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_SIGNAL_CHECK_POINTS",
-		default => "10",
-		description => "How many points in a captured image to check for signal loss",
-		help => "For locally attached video cameras ZoneMinder can check for signal loss by looking at a number of random points on each captured image. If all of these points are set to the same fixed colour then the camera is assumed to have lost signal. When this happens any open events are closed and a short one frame signal loss event is generated, as is another when the signal returns. This option defines how many points on each image to check. Note that this is a maximum, any points found to not have the check colour will abort any further checks so in most cases on a couple of points will actually be checked. Network and file based cameras are never checked.",
-		type => $types{integer},
-		category => "config",
-	},
-	{
-		name => "ZM_V4L_MULTI_BUFFER",
-		default => "yes",
-		description => "Use more than one buffer for Video 4 Linux devices",
-		help => "Performance when using Video 4 Linux devices is usually best if multiple buffers are used allowing the next image to be captured while the previous one is being processed. If you have multiple devices on a card sharing one input that requires switching then this approach can sometimes cause frames from one source to be mixed up with frames from another. Switching this option off prevents multi buffering resulting in slower but more stable image capture. This option is ignored for non-local cameras or if only one input is present on a capture chip. This option addresses a similar problem to the ZM_CAPTURES_PER_FRAME option and you should normally change the value of only one of the options at a time.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_CAPTURES_PER_FRAME",
-		default => "1",
-		description => "How many images are captured per returned frame, for shared local cameras",
-		help => "If you are using cameras attached to a video capture card which forces multiple inputs to share one capture chip, it can sometimes produce images with interlaced frames reversed resulting in poor image quality and a distinctive comb edge appearance. Increasing this setting allows you to force additional image captures before one is selected as the captured frame. This allows the capture hardware to 'settle down' and produce better quality images at the price of lesser capture rates. This option has no effect on (a) network cameras, or (b) where multiple inputs do not share a capture chip. This option addresses a similar problem to the ZM_V4L_MULTI_BUFFER option and you should normally change the value of only one of the options at a time.",
-		type => $types{integer},
-		category => "config",
-	},
-	{
-		name => "ZM_FILTER_RELOAD_DELAY",
-		default => "300",
-		description => "How often (in seconds) filters are reloaded in zmfilter",
-		help => "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 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.",
-		type => $types{integer},
-		category => "system",
-	},
-	{
-		name => "ZM_FILTER_EXECUTE_INTERVAL",
-		default => "60",
-		description => "How often (in seconds) to run automatic saved filters",
-		help => "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.",
-		type => $types{integer},
-		category => "system",
-	},
-	{
-		name => "ZM_OPT_UPLOAD",
-		default => "no",
-		description => "Should ZoneMinder support uploading events from filters",
-		help => "In ZoneMinder you can create event filters that specify whether events that match certain criteria should be uploaded to a remote server for archiving. This option specifies whether this functionality should be available",
-		type => $types{boolean},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_ARCH_FORMAT",
-		default => "tar",
-		description => "What format the uploaded events should be created in.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		help => "Uploaded events may be stored in either .tar or .zip format, this option specifies which. Note that to use this you will need to have the Archive::Tar and/or Archive::Zip perl modules installed.",
-		type => { db_type=>"string", hint=>"tar|zip", pattern=>qr|^([tz])|i, format=>q( $1 =~ /^t/ ? "tar" : "zip" ) },
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_ARCH_COMPRESS",
-		default => "no",
-		description => "Should archive files be compressed",
-		help => "When the archive files are created they can be compressed. However in general since the images are compressed already this saves only a minimal amount of space versus utilising more CPU in their creation. Only enable if you have CPU to waste and are limited in disk space on your remote server or bandwidth.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{boolean},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_ARCH_ANALYSE",
-		default => "no",
-		description => "Include the analysis files in the archive",
-		help => "When the archive files are created they can contain either just the captured frames or both the captured frames and, for frames that caused an alarm, the analysed image with the changed area highlighted. This option controls files are included. Only include analysed frames if you have a high bandwidth connection to the remote server or if you need help in figuring out what caused an alarm in the first place as archives with these files in can be considerably larger.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{boolean},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_PROTOCOL",
-		default => "ftp",
-		description => "What protocol to use to upload events",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		help => "ZoneMinder can upload events to a remote server using either FTP or SFTP. Regular FTP is widely supported but not necessarily very secure whereas SFTP (Secure FTP) runs over an ssh connection and so is encrypted and uses regular ssh ports. Note that to use this you will need to have the appropriate perl module, either Net::FTP or Net::SFTP installed depending on your choice.",
-		type => { db_type=>"string", hint=>"ftp|sftp", pattern=>qr|^([tz])|i, format=>q( $1 =~ /^f/ ? "ftp" : "sftp" ) },
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_FTP_HOST",
-		default => "",
-		description => "The remote server to upload to",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote ftp server. This option indicates the name, or ip address, of the server to use.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{hostname},
-		category => "hidden",
-	},
-	{
-		name => "ZM_UPLOAD_HOST",
-		default => "",
-		description => "The remote server to upload events to",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote server. This option indicates the name, or ip address, of the server to use.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{hostname},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_PORT",
-		default => "",
-		description => "The port on the remote upload server, if not the default (SFTP only)",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote server. If you are using the SFTP protocol then this option allows you to specify a particular port to use for connection. If this option is left blank then the default, port 22, is used. This option is ignored for FTP uploads.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{integer},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_FTP_USER",
-		default => "",
-		description => "Your ftp username",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote ftp server. This option indicates the username that ZoneMinder should use to log in for ftp transfer.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{alphanum},
-		category => "hidden",
-	},
-	{
-		name => "ZM_UPLOAD_USER",
-		default => "",
-		description => "Remote server username",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote server. This option indicates the username that ZoneMinder should use to log in for transfer.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{alphanum},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_FTP_PASS",
-		default => "",
-		description => "Your ftp password",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote ftp server. This option indicates the password that ZoneMinder should use to log in for ftp transfer.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{string},
-		category => "hidden",
-	},
-	{
-		name => "ZM_UPLOAD_PASS",
-		default => "",
-		description => "Remote server password",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote server. This option indicates the password that ZoneMinder should use to log in for transfer. If you are using certicate based logins for SFTP servers you can leave this option blank.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{string},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_FTP_LOC_DIR",
-		default => "/tmp/zm",
-		description => "The local directory in which to create upload files",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote ftp server. This option indicates the local directory that ZoneMinder should use for temporary upload files. These are files that are created from events, uploaded and then deleted.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{abs_path},
-		category => "hidden",
-	},
-	{
-		name => "ZM_UPLOAD_LOC_DIR",
-		default => "/tmp/zm",
-		description => "The local directory in which to create upload files",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote server. This option indicates the local directory that ZoneMinder should use for temporary upload files. These are files that are created from events, uploaded and then deleted.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{abs_path},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_FTP_REM_DIR",
-		default => "",
-		description => "The remote directory to upload to",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote ftp server. This option indicates the remote directory that ZoneMinder should use to upload event files to.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{rel_path},
-		category => "hidden",
-	},
-	{
-		name => "ZM_UPLOAD_REM_DIR",
-		default => "",
-		description => "The remote directory to upload to",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote server. This option indicates the remote directory that ZoneMinder should use to upload event files to.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{rel_path},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_FTP_TIMEOUT",
-		default => "120",
-		description => "How long to allow the transfer to take for each file",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote ftp server. This option indicates the maximum ftp inactivity timeout (in seconds) that should be tolerated before ZoneMinder determines that the transfer has failed and closes down the connection.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{integer},
-		category => "hidden",
-	},
-	{
-		name => "ZM_UPLOAD_TIMEOUT",
-		default => "120",
-		description => "How long to allow the transfer to take for each file",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote server. This option indicates the maximum inactivity timeout (in seconds) that should be tolerated before ZoneMinder determines that the transfer has failed and closes down the connection.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{integer},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_FTP_PASSIVE",
-		default => "yes",
-		description => "Use passive ftp when uploading",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote ftp server. This option indicates that ftp transfers should be done in passive mode. This uses a single connection for all ftp activity and, whilst slower than active transfers, is more robust and likely to work from behind filewalls. This option is ignored for SFTP transfers.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		help => "If your computer is behind a firewall or proxy you may need to set FTP to passive mode. In fact for simple transfers it makes little sense to do otherwise anyway but you can set this to 'No' if you wish.",
-		type => $types{boolean},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_FTP_DEBUG",
-		default => "no",
-		description => "Switch ftp debugging on",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote ftp server. If you are having (or expecting) troubles with uploading events then setting this to 'yes' permits additional information to be included in the zmfilter log file.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{boolean},
-		category => "hidden",
-	},
-	{
-		name => "ZM_UPLOAD_DEBUG",
-		default => "no",
-		description => "Switch upload debugging on",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote server. If you are having (or expecting) troubles with uploading events then setting this to 'yes' permits additional information to be generated by the underlying transfer modules and included in the logs.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{boolean},
-		category => "upload",
-	},
-	{
-		name => "ZM_OPT_EMAIL",
-		default => "no",
-		description => "Should ZoneMinder email you details of events that match corresponding filters",
-		help => "In ZoneMinder you can create event filters that specify whether events that match certain criteria should have their details emailed to you at a designated email address. This will allow you to be notified of events as soon as they occur and also to quickly view the events directly. This option specifies whether this functionality should be available. The email created with this option can be any size and is intended to be sent to a regular email reader rather than a mobile device.",
-		type => $types{boolean},
-		category => "mail",
-	},
-	{
-		name => "ZM_EMAIL_ADDRESS",
-		default => "",
-		description => "The email address to send matching event details to",
-		requires => [ { name => "ZM_OPT_EMAIL", value => "yes" } ],
-		help => "This option is used to define the email address that any events that match the appropriate filters will be sent to.",
-		type => $types{email},
-		category => "mail",
-	},
-	{
-		name => "ZM_EMAIL_TEXT",
-		default => 'subject = "ZoneMinder: Alarm - %MN%-%EI% (%ESM% - %ESA% %EFA%)"
-body = "
-Hello,
-
-An alarm has been detected on your installation of the ZoneMinder.
-
-The details are as follows :-
-
-  Monitor  : %MN%
-  Event Id : %EI%
-  Length   : %EL%
-  Frames   : %EF% (%EFA%)
-  Scores   : t%EST% m%ESM% a%ESA%
-
-This alarm was matched by the %FN% filter and can be viewed at %EPS%
-
-ZoneMinder"',
-		description => "The text of the email used to send matching event details",
-		requires => [ { name => "ZM_OPT_EMAIL", value => "yes" } ],
-		help => "This option is used to define the content of the email that is sent for any events that match the appropriate filters.",
-		type => $types{text},
-		category => "hidden",
-	},
-	{
-		name => "ZM_EMAIL_SUBJECT",
-		default => "ZoneMinder: Alarm - %MN%-%EI% (%ESM% - %ESA% %EFA%)",
-		description => "The subject of the email used to send matching event details",
-		requires => [ { name => "ZM_OPT_EMAIL", value => "yes" } ],
-		help => "This option is used to define the subject of the email that is sent for any events that match the appropriate filters.",
-		type => $types{string},
-		category => "mail",
-	},
-	{
-		name => "ZM_EMAIL_BODY",
-		default => "
-Hello,
-
-An alarm has been detected on your installation of the ZoneMinder.
-
-The details are as follows :-
-
-  Monitor  : %MN%
-  Event Id : %EI%
-  Length   : %EL%
-  Frames   : %EF% (%EFA%)
-  Scores   : t%EST% m%ESM% a%ESA%
-
-This alarm was matched by the %FN% filter and can be viewed at %EPS%
-
-ZoneMinder",
-		description => "The body of the email used to send matching event details",
-		requires => [ { name => "ZM_OPT_EMAIL", value => "yes" } ],
-		help => "This option is used to define the content of the email that is sent for any events that match the appropriate filters.",
-		type => $types{text},
-		category => "mail",
-	},
-	{
-		name => "ZM_OPT_MESSAGE",
-		default => "no",
-		description => "Should ZoneMinder message you with details of events that match corresponding filters",
-		help => "In ZoneMinder you can create event filters that specify whether events that match certain criteria should have their details sent to you at a designated short message email address. This will allow you to be notified of events as soon as they occur. This option specifies whether this functionality should be available. The email created by this option will be brief and is intended to be sent to an SMS gateway or a minimal mail reader such as a mobile device or phone rather than a regular email reader.",
-		type => $types{boolean},
-		category => "mail",
-	},
-	{
-		name => "ZM_MESSAGE_ADDRESS",
-		default => "",
-		description => "The email address to send matching event details to",
-		requires => [ { name => "ZM_OPT_MESSAGE", value => "yes" } ],
-		help => "This option is used to define the short message email address that any events that match the appropriate filters will be sent to.",
-		type => $types{email},
-		category => "mail",
-	},
-	{
-		name => "ZM_MESSAGE_TEXT",
-		default => 'subject = "ZoneMinder: Alarm - %MN%-%EI%"
-body = "ZM alarm detected - %EL% secs, %EF%/%EFA% frames, t%EST%/m%ESM%/a%ESA% score."',
-		description => "The text of the message used to send matching event details",
-		requires => [ { name => "ZM_OPT_MESSAGE", value => "yes" } ],
-		help => "This option is used to define the content of the message that is sent for any events that match the appropriate filters.",
-		type => $types{text},
-		category => "hidden",
-	},
-	{
-		name => "ZM_MESSAGE_SUBJECT",
-		default => "ZoneMinder: Alarm - %MN%-%EI%",
-		description => "The subject of the message used to send matching event details",
-		requires => [ { name => "ZM_OPT_MESSAGE", value => "yes" } ],
-		help => "This option is used to define the subject of the message that is sent for any events that match the appropriate filters.",
-		type => $types{string},
-		category => "mail",
-	},
-	{
-		name => "ZM_MESSAGE_BODY",
-		default => "ZM alarm detected - %EL% secs, %EF%/%EFA% frames, t%EST%/m%ESM%/a%ESA% score.",
-		description => "The body of the message used to send matching event details",
-		requires => [ { name => "ZM_OPT_MESSAGE", value => "yes" } ],
-		help => "This option is used to define the content of the message that is sent for any events that match the appropriate filters.",
-		type => $types{text},
-		category => "mail",
-	},
-	{
-		name => "ZM_NEW_MAIL_MODULES",
-		default => "no",
-		description => "Use a newer perl method to send emails",
-		requires => [ { name => "ZM_OPT_EMAIL", value => "yes" }, { name => "ZM_OPT_MESSAGE", value => "yes" } ],
-		help => "Traditionally ZoneMinder has used the MIME::Entity perl module to construct and send notification emails and messages. Some people have reported problems with this module not being present at all or flexible enough for their needs. If you are one of those people this option allows you to select a new mailing method using MIME::Lite and Net::SMTP instead. This method was contributed by Ross Melin and should work for everyone but has not been extensively tested so currently is not selected by default.",
-		type => $types{boolean},
-		category => "mail",
-	},
-	{
-		name => "ZM_EMAIL_HOST",
-		default => "localhost",
-		description => "The host address of your SMTP mail server",
-		requires => [ { name => "ZM_OPT_EMAIL", value => "yes" }, { name => "ZM_OPT_MESSAGE", value => "yes" } ],
-		help => "If you have chosen SMTP as the method by which to send notification emails or messages then this option allows you to choose which SMTP server to use to send them. The default of localhost may work if you have the sendmail, exim or a similar daemon running however you may wish to enter your ISP's SMTP mail server here.",
-		type => $types{hostname},
-		category => "mail",
-	},
-	{
-		name => "ZM_FROM_EMAIL",
-		default => "",
-		description => "The email address you wish your event notifications to originate from",
-		requires => [ { name => "ZM_OPT_EMAIL", value => "yes" }, { name => "ZM_OPT_MESSAGE", value => "yes" } ],
-		help => "The emails or messages that will be sent to you informing you of events can appear to come from a designated email address to help you with mail filtering etc. An address of something like ZoneMinder\@your.domain is recommended.",
-		type => $types{email},
-		category => "mail",
-	},
-	{
-		name => "ZM_URL",
-		default => "",
-		description => "The URL of your ZoneMinder installation",
-		requires => [ { name => "ZM_OPT_EMAIL", value => "yes" }, { name => "ZM_OPT_MESSAGE", value => "yes" } ],
-		help => "The emails or messages that will be sent to you informing you of events can include a link to the events themselves for easy viewing. If you intend to use this feature then set this option to the url of your installation as it would appear from where you read your email, e.g. http://host.your.domain/zm.php.",
-		type => $types{url},
-		category => "mail",
-	},
-	{
-		name => "ZM_MAX_RESTART_DELAY",
-		default => "600",
-		description => "Maximum delay (in seconds) for daemon restart attempts.",
-		help => "The zmdc (zm daemon control) process controls when processeses are started or stopped and will attempt to restart any that fail. If a daemon fails frequently then a delay is introduced between each restart attempt. If the daemon stills fails then this delay is increased to prevent extra load being placed on the system by continual restarts. This option controls what this maximum delay is.",
-		type => $types{integer},
-		category => "system",
-	},
-	{
-		name => "ZM_WATCH_CHECK_INTERVAL",
-		default => "10",
-		description => "How often to check the capture daemons have not locked up",
-		help => "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 indefinately). This option determines how often the daemons are checked.",
-		type => $types{integer},
-		category => "system",
-	},
-	{
-		name => "ZM_WATCH_MAX_DELAY",
-		default => "5",
-		description => "The maximum delay allowed since the last captured image",
-		help => "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 indefinately). 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.",
-		type => $types{decimal},
-		category => "system",
-	},
-	{
-
-		name => "ZM_RUN_AUDIT",
-		default => "yes",
-		description => "Run zmaudit to check data consistency",
-		help => "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. This is recommended 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 not have zmaudit running unconditionally and schedule occasional checks at other, more convenient, times.",
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-
-		name => "ZM_AUDIT_CHECK_INTERVAL",
-		default => "900",
-		description => "How often to check database and filesystem consistency",
-		help => "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.",
-		type => $types{integer},
-		category => "system",
-	},
-	{
-		name => "ZM_FORCED_ALARM_SCORE",
-		default => "255",
-		description => "Score to give forced alarms",
-		help => "The 'zmu' utility can be used to force an alarm on a monitor rather than rely on the motion detection algorithms. This option determines what score to give these alarms to distinguish them from regular ones. It must be 255 or less.",
-		type => $types{integer},
-		category => "config",
-	},
-	{
-		name => "ZM_BULK_FRAME_INTERVAL",
-		default => "100",
-		description => "How often a bulk frame should be written to the database",
-		help => "Traditionally ZoneMinder writes an entry into the Frames database table for each frame that is captured and saved. This works well in motion detection scenarios but when in a DVR situation ('Record' or 'Mocord' mode) this results in a huge number of frame writes and a lot of database and disk bandwidth for very little additional information. Setting this to a non-zero value will enabled ZoneMinder to group these non-alarm frames into one 'bulk' frame entry which saves a lot of bandwidth and space. The only disadvantage of this is that timing information for individual frames is lost but in constant frame rate situations this is usually not significant. This setting is ignored in Modect mode and individual frames are still written if an alarm occurs in Mocord mode also.",
-		type => $types{integer},
-		category => "config",
-	},
-	{
-		name => "ZM_EVENT_CLOSE_MODE",
-		default => "idle",
-		description => "When continuous events are closed.",
-		help => "When a monitor is running in a continuous recording mode (Record or Mocord) events are usually closed after a fixed period of time (the section length). However in Mocord mode it is possible that motion detection may occur near the end of a section. This option controls what happens when an alarm occurs in Mocord mode. The 'time' setting means that the event will be closed at the end of the section regardless of alarm activity. The 'idle' setting means that the event will be closed at the end of the section if there is no alarm activity occuring at the time otherwise it will be closed once the alarm is over meaning the event may end up being longer than the normal section length. The 'alarm' setting means that if an alarm occurs during the event, the event will be closed once the alarm is over regardless of when this occurs. This has the effect of limiting the number of alarms to one per event and the events will be shorter than the section length if an alarm has occurred.",
-		type => $types{boolean},
-		type => { db_type=>"string", hint=>"time|idle|alarm", pattern=>qr|^([tia])|i, format=>q( ($1 =~ /^t/) ? "time" : ($1 =~ /^i/ ? "idle" : "time" ) ) },
-		category => "config",
-	},
-    # Deprecated, superseded by event close mode
-	{
-		name => "ZM_FORCE_CLOSE_EVENTS",
-		default => "no",
-		description => "Close events at section ends.",
-		help => "When a monitor is running in a continuous recording mode (Record or Mocord) events are usually closed after a fixed period of time (the section length). However in Mocord mode it is possible that motion detection may occur near the end of a section and ordinarily this will prevent the event being closed until the motion has ceased. Switching this option on will force the event closed at the specified time regardless of any motion activity.",
-		type => $types{boolean},
-		category => "hidden",
-	},
-	{
-		name => "ZM_CREATE_ANALYSIS_IMAGES",
-		default => "yes",
-		description => "Create analysed alarm images with motion outlined",
-		help => "By default during an alarm ZoneMinder records both the raw captured image and one that has been analysed and had areas where motion was detected outlined. This can be very useful during zone configuration or in analysing why events occured. However it also incurs some overhead and in a stable system may no longer be necessary. This parameter allows you to switch the generation of these images off.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_WEIGHTED_ALARM_CENTRES",
-		default => "no",
-		description => "Use a weighted algorithm to calculate the centre of an alarm",
-		help => "ZoneMinder will always calculate the centre point of an alarm in a zone to give some indication of where on the screen it is. This can be used by the experimental motion tracking feature or your own custom extensions. In the alarmed or filtered pixels mode this is a simple midpoint between the extents of the detected pxiesl. However in the blob method this can instead be calculated using weighted pixel locations to give more accurate positioning for irregularly shaped blobs. This method, while more precise is also slower and so is turned off by default.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_EVENT_IMAGE_DIGITS",
-		default => "3",
-		description => "How many significant digits are used in event image numbering",
-		help => "As event images are captured they are stored to the filesystem with a numerical index. By default this index has three digits so the numbers start 001, 002 etc. This works works for most scenarios as events with more than 999 frames are rarely captured. However if you have extremely long events and use external applications then you may wish to increase this to ensure correct sorting of images in listings etc. Warning, increasing this value on a live system may render existing events unviewable as the event will have been saved with the previous scheme. Decreasing this value should have no ill effects.",
-		type => $types{integer},
-		category => "config",
-	},
-	{
-		name => "ZM_DEFAULT_ASPECT_RATIO",
-		default => "4:3",
-		description => "The default width:height aspect ratio used in monitors",
-		help => "When specifying the dimensions of monitors you can click a checkbox to ensure that the width stays in the correct ratio to the height, or vice versa. This setting allows you to indicate what the ratio of these settings should be. This should be specified in the format <width value>:<height value> and the default of 4:3 normally be acceptable but 11:9 is another common setting. If the checkbox is not clicked when specifying monitor dimensions this setting has no effect.",
-		type => $types{string},
-		category => "config",
-	},
-	{
-		name => "ZM_USER_SELF_EDIT",
-		default => "no",
-		description => "Allow unprivileged users to change their details",
-		help => "Ordinarily only users with system edit privilege are able to change users details. Switching this option on allows ordinary users to change their passwords and their language settings",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_OPT_FRAME_SERVER",
-		default => "no",
-		description => "Should analysis farm out the writing of images to disk",
-		#requires => [ { name => "ZM_OPT_ADAPTIVE_SKIP", value => "yes" } ],
-		help => "In some circumstances it is possible for a slow disk to take so long writing images to disk that it causes the analysis daemon to fall behind especially during high frame rate events. Setting this option to yes enables a frame server daemon (zmf) which will be sent the images from the analysis daemon and will do the actual writing of images itself freeing up the analysis daemon to get on with other things. Should this transmission fail or other permanent or transient error occur, this function will fall back to the analysis daemon.",
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-		name => "ZM_FRAME_SOCKET_SIZE",
-		default => "0",
-		description => "Specify the frame server socket buffer size if non-standard",
-		requires => [ { name => "ZM_OPT_FRAME_SERVER", value => "yes" } ],
-		help => "For large captured images it is possible for the writes from the analysis daemon to the frame server to fail as the amount to be written exceeds the default buffer size. While the images are then written by the analysis daemon so no data is lost, it defeats the object of the frame server daemon in the first place. You can use this option to indicate that a larger buffer size should be used. Note that you may have to change the existing maximum socket buffer size on your system via sysctl (or in /proc/sys/net/core/wmem_max) to allow this new size to be set. Alternatively you can change the default buffer size on your system in the same way in which case that will be used with no change necessary in this option",
-		type => $types{integer},
-		category => "system",
-	},
-	{
-		name => "ZM_OPT_CONTROL",
-		default => "no",
-		description => "Support controllable (e.g. PTZ) cameras",
-		help => "ZoneMinder includes limited support for controllable cameras. A number of sample protocols are included and others can easily be added. If you wish to control your cameras via ZoneMinder then select this option otherwise if you only have static cameras or use other control methods then leave this option off.",
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-		name => "ZM_OPT_TRIGGERS",
-		default => "no",
-		description => "Interface external event triggers via socket or device files",
-		help => "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.",
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-		name => "ZM_CHECK_FOR_UPDATES",
-		default => "yes",
-		description => "Check with zoneminder.com for updated versions",
-		help => "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",
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-		name => "ZM_UPDATE_CHECK_PROXY",
-		default => "",
-		description => "Proxy url if required to access zoneminder.com",
-		help => "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>/",
-		type => $types{string},
-		category => "system",
-	},
-	{
-		name => "ZM_SHM_KEY",
-		default => "0x7a6d0000",
-		description => "Shared memory root key to use",
-		help => "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.",
-		type => $types{hexadecimal},
-		category => "system",
-	},
-    # Deprecated, really no longer necessary
-	{
-		name => "ZM_WEB_REFRESH_METHOD",
-		default => "javascript",
-		description => "What method windows should use to refresh themselves",
-		help => "Many windows in Javascript need to refresh themselves to keep their information current. This option determines what method they should use to do this. Choosing 'javascript' means that each window will have a short JavaScript statement in with a timer to prompt the refresh. This is the most compatible method. Choosing 'http' means the refresh instruction is put in the HTTP header. This is a cleaner method but refreshes are interrupted or cancelled when a link in the window is clicked meaning that the window will no longer refresh and this would have to be done manually.",
-		type => { db_type=>"string", hint=>"javascript|http", pattern=>qr|^([jh])|i, format=>q( $1 =~ /^j/ ? "javascript" : "http" ) },
-		category => "hidden",
-	},
-	{
-		name => "ZM_WEB_EVENT_SORT_FIELD",
-		default => "DateTime",
-		description => "Default field the event lists are sorted by",
-		help => "Events in lists can be initially ordered in any way you want. This option controls what field is used to sort them. You can modify this ordering from filters or by clicking on headings in the lists themselves. Bear in mind however that the 'Prev' and 'Next' links, when scrolling through events, relate to the ordering in the lists and so not always to time based ordering.",
-		type => { db_type=>"string", hint=>"Id|Name|Cause|MonitorName|DateTime|Length|Frames|AlarmFrames|TotScore|AvgScore|MaxScore", pattern=>qr|.|, format=>q( $1 ) },
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_EVENT_SORT_ORDER",
-		default => "asc",
-		description => "Default order the event lists are sorted by",
-		help => "Events in lists can be initially ordered in any way you want. This option controls what order (ascending or descending) is used to sort them. You can modify this ordering from filters or by clicking on headings in the lists themselves. Bear in mind however that the 'Prev' and 'Next' links, when scrolling through events, relate to the ordering in the lists and so not always to time based ordering.",
-		type => { db_type=>"string", hint=>"asc|desc", pattern=>qr|^([ad])|i, format=>q( $1 =~ /^a/i ? "asc" : "desc" ) },
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_EVENTS_PER_PAGE",
-		default => "25",
-		description => "How many events to list per page in paged mode",
-		help => "In the event list view you can either list all events or just a page at a time. This option controls how many events are listed per page in paged mode and how often to repeat the column headers in non-paged mode.",
-		type => $types{integer},
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_LIST_THUMBS",
-		default => "no",
-		description => "Display mini-thumbnails of event images in event lists",
-		help => "Ordinarily the event lists just display text details of the events to save space and time. By switching this option on you can also display small thumbnails to help you identify events of interest. The size of these thumbnails is controlled by the following two options.",
-		type => $types{boolean},
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_LIST_THUMB_WIDTH",
-		default => "48",
-		description => "The width of the thumbnails that appear in the event lists",
-		help => "This options controls the width of the thumbnail images that appear in the event lists. It should be fairly small to fit in with the rest of the table. If you prefer you can specify a height instead in the next option but you should only use one of the width or height and the other option should be set to zero. If both width and height are specified then width will be used and height ignored.",
-		type => $types{integer},
-		requires => [ { name => "ZM_WEB_LIST_THUMBS", value => "yes" } ],
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_LIST_THUMB_HEIGHT",
-		default => "0",
-		description => "The height of the thumbnails that appear in the event lists",
-		help => "This options controls the height of the thumbnail images that appear in the event lists. It should be fairly small to fit in with the rest of the table. If you prefer you can specify a width instead in the previous option but you should only use one of the width or height and the other option should be set to zero. If both width and height are specified then width will be used and height ignored.",
-		type => $types{integer},
-		requires => [ { name => "ZM_WEB_LIST_THUMBS", value => "yes" } ],
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_USE_OBJECT_TAGS",
-		default => "yes",
-		description => "Wrap embed in object tags for media content",
-		help => "There are two methods of including media content in web pages. The most common way is use the EMBED tag which is able to give some indication of the type of content. However this is not a standard part of HTML. The official method is to use OBJECT tags which are able to give more information allowing the correct media viewers etc to be loaded. However these are less widely supported and content may be specifically tailored to a particular platform or player. This option controls whether media content is enclosed in EMBED tags only or whether, where appropriate, it is additionally wrapped in OBJECT tags. Currently OBJECT tags are only used in a limited number of circumstances but they may become more widespread in the future. It is suggested that you leave this option on unless you encounter problems playing some content.",
-		type => $types{boolean},
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_H_REFRESH_MAIN",
-		default => "300",
-		introduction => "There are now a number of options that are grouped into bandwidth categories, this allows you to configure the ZoneMinder client to work optimally over the various access methods you might to access the client.\n\nThe next few options control what happens when the client is running in 'high' bandwidth mode. You should set these options for when accessing the ZoneMinder client over a local network or high speed link. In most cases the default values will be suitable as a starting point.",
-		description => "How often (in seconds) the main console window should refresh itself",
-		help => "The main console window lists a general status and the event totals for all monitors. This is not a trivial task and should not be repeated too frequently or it may affect the performance of the rest of the system.",
-		type => $types{integer},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_REFRESH_CYCLE",
-		default => "10",
-		description => "How often (in seconds) the cycle watch window swaps to the next monitor",
-		help => "The cycle watch window is a method of continuously cycling between images from all of your monitors. This option determines how often to refresh with a new image.",
-		type => $types{integer},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_REFRESH_IMAGE",
-		default => "5",
-		description => "How often (in seconds) the watched image is refreshed (if not streaming)",
-		help => "The live images from a monitor can be viewed in either streamed or stills mode. This option determines how often a stills image is refreshed, it has no effect if streaming is selected.",
-		type => $types{integer},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_REFRESH_STATUS",
-		default => "3",
-		description => "How often (in seconds) the status refreshes itself in the watch window",
-		help => "The monitor window is actually made from several frames. The one in the middle merely contains a monitor status which needs to refresh fairly frequently to give a true indication. This option determines that frequency.",
-		type => $types{integer},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_REFRESH_EVENTS",
-		default => "30",
-		description => "How often (in seconds) the event listing is refreshed in the watch window",
-		help => "The monitor window is actually made from several frames. The lower framme contains a listing of the last few events for easy access. This option determines how often this is refreshed.",
-		type => $types{integer},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_CAN_STREAM",
-		default => "auto",
-		description => "Override the automatic detection of browser streaming capability",
-		help => "If you know that your browser can handle image streams of the type 'multipart/x-mixed-replace' but ZoneMinder does not detect this correctly you can set this option to ensure that the stream is delivered with or without the use of the Cambozola plugin. Selecting 'yes' will tell ZoneMinder that your browser can handle the streams natively, 'no' means that it can't and so the plugin will be used while 'auto' lets ZoneMinder decide.",
-		type => $types{tristate},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_STREAM_METHOD",
-		default => "jpeg",
-		description => "Which method should be used to send video streams to your browser.",
-		help => "ZoneMinder can be configured to use either mpeg encoded video or a series or still jpeg images when sending video streams. This option defines which is used. If you choose mpeg you should ensure that you have the appropriate plugins available on your browser whereas choosing jpeg will work natively on Mozilla and related browsers and with a Java applet on Internet Explorer",
-		type => { db_type=>"string", hint=>"mpeg|jpeg", pattern=>qr|^([mj])|i, format=>q( $1 =~ /^m/ ? "mpeg" : "jpeg" ) },
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_DEFAULT_SCALE",
-		default => "100",
-		description => "What the default scaling factor applied to 'live' or 'event' views is (%)",
-		help => "Normally ZoneMinder will display 'live' or 'event' streams in their native size. However if you have monitors with large dimensions or a slow link you may prefer to reduce this size, alternatively for small monitors you can enlarge it. This options lets you specify what the default scaling factor will be. It is expressed as a percentage so 100 is normal size, 200 is double size etc.",
-		type => { db_type=>"integer", hint=>"25|33|50|75|100|150|200|300|400", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_DEFAULT_RATE",
-		default => "100",
-		description => "What the default replay rate factor applied to 'event' views is (%)",
-		help => "Normally ZoneMinder will display 'event' streams at their native rate, i.e. as close to real-time as possible. However if you have long events it is often convenient to replay them at a faster rate for review. This option lets you specify what the default replay rate will be. It is expressed as a percentage so 100 is normal rate, 200 is double speed etc.",
-		type => { db_type=>"integer", hint=>"25|50|100|150|200|400|1000|2500|5000|10000", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_VIDEO_BITRATE",
-		default => "150000",
-		description => "What the bitrate of the video encoded stream should be set to",
-		help => "When encoding real video via the ffmpeg library a bit rate can be specified which roughly corresponds to the available bandwidth used for the stream. This setting effectively corresponds to a 'quality' setting for the video. A low value will result in a blocky image whereas a high value will produce a clearer view. Note that this setting does not control the frame rate of the video however the quality of the video produced is affected both by this setting and the frame rate that the video is produced at. A higher frame rate at a particular bit rate result in individual frames being at a lower quality.",
-		type => $types{integer},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_VIDEO_MAXFPS",
-		default => "15",
-		description => "What the maximum frame rate for streamed video should be",
-		help => "When using streamed video the main control is the bitrate which determines how much data can be transmitted. However a lower bitrate at high frame rates results in a lower quality image. This option allows you to limit the maximum frame rate to ensure that video quality is maintained. An additional advantage is that encoding video at high frame rates is a processor intensive task when for the most part a very high frame rate offers little perceptible improvement over one that has a more manageable resource requirement. Note, this option is implemented as a cap beyond which binary reduction takes place. So if you have a device capturing at 15fps and set this option to 10fps then the video is not produced at 10fps, but rather at 7.5fps (15 divided by 2) as the final frame rate must be the original divided by a power of 2.",
-		type => $types{integer},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_SCALE_THUMBS",
-		default => "no",
-		description => "Scale thumbnails in events, bandwidth versus cpu in rescaling",
-		help => "If unset, this option sends the whole image to the browser which resizes it in the window. If set the image is scaled down on the server before sending a reduced size image to the browser to conserve bandwidth at the cost of cpu on the server. Note that ZM can only perform the resizing if the appropriate PHP graphics functionality is installed. This is usually available in the php-gd package.",
-		type => $types{boolean},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_EVENTS_VIEW",
-		default => "events",
-		description => "What the default view of multiple events should be.",
-		help => "Stored events can be viewed in either an events list format or in a timeline based one. This option sets the default view that will be used. Choosing one view here does not prevent the other view being used as it will always be selectable from whichever view is currently being used.",
-		type => { db_type=>"string", hint=>"events|timeline", pattern=>qr|^([lt])|i, format=>q( $1 =~ /^e/ ? "events" : "timeline" ) },
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_SHOW_PROGRESS",
-		default => "yes",
-		description => "Show the progress of replay in event view.",
-		help => "When viewing events an event navigation panel and progress bar is shown below the event itself. This allows you to jump to specific points in the event, but can can also dynamically update to display the current progress of the event replay itself. This progress is calculated from the actual event duration and is not directly linked to the replay itself, so on limited bandwidth connections may be out of step with the replay. This option allows you to turn off the progress display, whilst still keeping the navigation aspect, where bandwidth prevents it functioning effectively.",
-		type => $types{boolean},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_AJAX_TIMEOUT",
-		default => "3000",
-		description => "How long to wait for Ajax request responses (ms)",
-		help => "The newer versions of the live feed and event views use Ajax to request information from the server and populate the views dynamically. This option allows you to specify a timeout if required after which requests are abandoned. A timeout may be necessary if requests would overwise hang such as on a slow connection. This would tend to consume a lot of browser memory and make the interface unresponsive. Ordinarily no requests should timeout so this setting should be set to a value greater than the slowest expected response. This value is in milliseconds but if set to zero then no timeout will be used.",
-		type => $types{integer},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_M_REFRESH_MAIN",
-		default => "300",
-		description => "How often (in seconds) the main console window should refresh itself",
-		help => "The main console window lists a general status and the event totals for all monitors. This is not a trivial task and should not be repeated too frequently or it may affect the performance of the rest of the system.",
-		type => $types{integer},
-		introduction => "The next few options control what happens when the client is running in 'medium' bandwidth mode. You should set these options for when accessing the ZoneMinder client over a slower cable or DSL link. In most cases the default values will be suitable as a starting point.",
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_REFRESH_CYCLE",
-		default => "20",
-		description => "How often (in seconds) the cycle watch window swaps to the next monitor",
-		help => "The cycle watch window is a method of continuously cycling between images from all of your monitors. This option determines how often to refresh with a new image.",
-		type => $types{integer},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_REFRESH_IMAGE",
-		default => "10",
-		description => "How often (in seconds) the watched image is refreshed (if not streaming)",
-		help => "The live images from a monitor can be viewed in either streamed or stills mode. This option determines how often a stills image is refreshed, it has no effect if streaming is selected.",
-		type => $types{integer},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_REFRESH_STATUS",
-		default => "5",
-		description => "How often (in seconds) the status refreshes itself in the watch window",
-		help => "The monitor window is actually made from several frames. The one in the middle merely contains a monitor status which needs to refresh fairly frequently to give a true indication. This option determines that frequency.",
-		type => $types{integer},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_REFRESH_EVENTS",
-		default => "60",
-		description => "How often (in seconds) the event listing is refreshed in the watch window",
-		help => "The monitor window is actually made from several frames. The lower framme contains a listing of the last few events for easy access. This option determines how often this is refreshed.",
-		type => $types{integer},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_CAN_STREAM",
-		default => "auto",
-		description => "Override the automatic detection of browser streaming capability",
-		help => "If you know that your browser can handle image streams of the type 'multipart/x-mixed-replace' but ZoneMinder does not detect this correctly you can set this option to ensure that the stream is delivered with or without the use of the Cambozola plugin. Selecting 'yes' will tell ZoneMinder that your browser can handle the streams natively, 'no' means that it can't and so the plugin will be used while 'auto' lets ZoneMinder decide.",
-		type => $types{tristate},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_STREAM_METHOD",
-		default => "jpeg",
-		description => "Which method should be used to send video streams to your browser.",
-		help => "ZoneMinder can be configured to use either mpeg encoded video or a series or still jpeg images when sending video streams. This option defines which is used. If you choose mpeg you should ensure that you have the appropriate plugins available on your browser whereas choosing jpeg will work natively on Mozilla and related browsers and with a Java applet on Internet Explorer",
-		type => { db_type=>"string", hint=>"mpeg|jpeg", pattern=>qr|^([mj])|i, format=>q( $1 =~ /^m/ ? "mpeg" : "jpeg" ) },
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_DEFAULT_SCALE",
-		default => "100",
-		description => "What the default scaling factor applied to 'live' or 'event' views is (%)",
-		help => "Normally ZoneMinder will display 'live' or 'event' streams in their native size. However if you have monitors with large dimensions or a slow link you may prefer to reduce this size, alternatively for small monitors you can enlarge it. This options lets you specify what the default scaling factor will be. It is expressed as a percentage so 100 is normal size, 200 is double size etc.",
-		type => { db_type=>"integer", hint=>"25|33|50|75|100|150|200|300|400", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_DEFAULT_RATE",
-		default => "100",
-		description => "What the default replay rate factor applied to 'event' views is (%)",
-		help => "Normally ZoneMinder will display 'event' streams at their native rate, i.e. as close to real-time as possible. However if you have long events it is often convenient to replay them at a faster rate for review. This option lets you specify what the default replay rate will be. It is expressed as a percentage so 100 is normal rate, 200 is double speed etc.",
-		type => { db_type=>"integer", hint=>"25|50|100|150|200|400|1000|2500|5000|10000", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_VIDEO_BITRATE",
-		default => "75000",
-		description => "What the bitrate of the video encoded stream should be set to",
-		help => "When encoding real video via the ffmpeg library a bit rate can be specified which roughly corresponds to the available bandwidth used for the stream. This setting effectively corresponds to a 'quality' setting for the video. A low value will result in a blocky image whereas a high value will produce a clearer view. Note that this setting does not control the frame rate of the video however the quality of the video produced is affected both by this setting and the frame rate that the video is produced at. A higher frame rate at a particular bit rate result in individual frames being at a lower quality.",
-		type => $types{integer},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_VIDEO_MAXFPS",
-		default => "10",
-		description => "What the maximum frame rate for streamed video should be",
-		help => "When using streamed video the main control is the bitrate which determines how much data can be transmitted. However a lower bitrate at high frame rates results in a lower quality image. This option allows you to limit the maximum frame rate to ensure that video quality is maintained. An additional advantage is that encoding video at high frame rates is a processor intensive task when for the most part a very high frame rate offers little perceptible improvement over one that has a more manageable resource requirement. Note, this option is implemented as a cap beyond which binary reduction takes place. So if you have a device capturing at 15fps and set this option to 10fps then the video is not produced at 10fps, but rather at 7.5fps (15 divided by 2) as the final frame rate must be the original divided by a power of 2.",
-		type => $types{integer},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_SCALE_THUMBS",
-		default => "yes",
-		description => "Scale thumbnails in events, bandwidth versus cpu in rescaling",
-		help => "If unset, this option sends the whole image to the browser which resizes it in the window. If set the image is scaled down on the server before sending a reduced size image to the browser to conserve bandwidth at the cost of cpu on the server. Note that ZM can only perform the resizing if the appropriate PHP graphics functionality is installed. This is usually available in the php-gd package.",
-		type => $types{boolean},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_EVENTS_VIEW",
-		default => "events",
-		description => "What the default view of multiple events should be.",
-		help => "Stored events can be viewed in either an events list format or in a timeline based one. This option sets the default view that will be used. Choosing one view here does not prevent the other view being used as it will always be selectable from whichever view is currently being used.",
-		type => { db_type=>"string", hint=>"events|timeline", pattern=>qr|^([lt])|i, format=>q( $1 =~ /^e/ ? "events" : "timeline" ) },
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_SHOW_PROGRESS",
-		default => "yes",
-		description => "Show the progress of replay in event view.",
-		help => "When viewing events an event navigation panel and progress bar is shown below the event itself. This allows you to jump to specific points in the event, but can can also dynamically update to display the current progress of the event replay itself. This progress is calculated from the actual event duration and is not directly linked to the replay itself, so on limited bandwidth connections may be out of step with the replay. This option allows you to turn off the progress display, whilst still keeping the navigation aspect, where bandwidth prevents it functioning effectively.",
-		type => $types{boolean},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_AJAX_TIMEOUT",
-		default => "5000",
-		description => "How long to wait for Ajax request responses (ms)",
-		help => "The newer versions of the live feed and event views use Ajax to request information from the server and populate the views dynamically. This option allows you to specify a timeout if required after which requests are abandoned. A timeout may be necessary if requests would overwise hang such as on a slow connection. This would tend to consume a lot of browser memory and make the interface unresponsive. Ordinarily no requests should timeout so this setting should be set to a value greater than the slowest expected response. This value is in milliseconds but if set to zero then no timeout will be used.",
-		type => $types{integer},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_L_REFRESH_MAIN",
-		default => "300",
-		description => "How often (in seconds) the main console window should refresh itself",
-		introduction => "The next few options control what happens when the client is running in 'low' bandwidth mode. You should set these options for when accessing the ZoneMinder client over a modem or slow link. In most cases the default values will be suitable as a starting point.",
-		help => "The main console window lists a general status and the event totals for all monitors. This is not a trivial task and should not be repeated too frequently or it may affect the performance of the rest of the system.",
-		type => $types{integer},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_REFRESH_CYCLE",
-		default => "30",
-		description => "How often (in seconds) the cycle watch window swaps to the next monitor",
-		help => "The cycle watch window is a method of continuously cycling between images from all of your monitors. This option determines how often to refresh with a new image.",
-		type => $types{integer},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_REFRESH_IMAGE",
-		default => "15",
-		description => "How often (in seconds) the watched image is refreshed (if not streaming)",
-		help => "The live images from a monitor can be viewed in either streamed or stills mode. This option determines how often a stills image is refreshed, it has no effect if streaming is selected.",
-		type => $types{integer},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_REFRESH_STATUS",
-		default => "10",
-		description => "How often (in seconds) the status refreshes itself in the watch window",
-		help => "The monitor window is actually made from several frames. The one in the middle merely contains a monitor status which needs to refresh fairly frequently to give a true indication. This option determines that frequency.",
-		type => $types{integer},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_REFRESH_EVENTS",
-		default => "180",
-		description => "How often (in seconds) the event listing is refreshed in the watch window",
-		help => "The monitor window is actually made from several frames. The lower framme contains a listing of the last few events for easy access. This option determines how often this is refreshed.",
-		type => $types{integer},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_CAN_STREAM",
-		default => "auto",
-		description => "Override the automatic detection of browser streaming capability",
-		help => "If you know that your browser can handle image streams of the type 'multipart/x-mixed-replace' but ZoneMinder does not detect this correctly you can set this option to ensure that the stream is delivered with or without the use of the Cambozola plugin. Selecting 'yes' will tell ZoneMinder that your browser can handle the streams natively, 'no' means that it can't and so the plugin will be used while 'auto' lets ZoneMinder decide.",
-		type => $types{tristate},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_STREAM_METHOD",
-		default => "jpeg",
-		description => "Which method should be used to send video streams to your browser.",
-		help => "ZoneMinder can be configured to use either mpeg encoded video or a series or still jpeg images when sending video streams. This option defines which is used. If you choose mpeg you should ensure that you have the appropriate plugins available on your browser whereas choosing jpeg will work natively on Mozilla and related browsers and with a Java applet on Internet Explorer",
-		type => { db_type=>"string", hint=>"mpeg|jpeg", pattern=>qr|^([mj])|i, format=>q( $1 =~ /^m/ ? "mpeg" : "jpeg" ) },
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_DEFAULT_SCALE",
-		default => "100",
-		description => "What the default scaling factor applied to 'live' or 'event' views is (%)",
-		help => "Normally ZoneMinder will display 'live' or 'event' streams in their native size. However if you have monitors with large dimensions or a slow link you may prefer to reduce this size, alternatively for small monitors you can enlarge it. This options lets you specify what the default scaling factor will be. It is expressed as a percentage so 100 is normal size, 200 is double size etc.",
-		type => { db_type=>"integer", hint=>"25|33|50|75|100|150|200|300|400", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_DEFAULT_RATE",
-		default => "100",
-		description => "What the default replay rate factor applied to 'event' views is (%)",
-		help => "Normally ZoneMinder will display 'event' streams at their native rate, i.e. as close to real-time as possible. However if you have long events it is often convenient to replay them at a faster rate for review. This option lets you specify what the default replay rate will be. It is expressed as a percentage so 100 is normal rate, 200 is double speed etc.",
-		type => { db_type=>"integer", hint=>"25|50|100|150|200|400|1000|2500|5000|10000", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_VIDEO_BITRATE",
-		default => "25000",
-		description => "What the bitrate of the video encoded stream should be set to",
-		help => "When encoding real video via the ffmpeg library a bit rate can be specified which roughly corresponds to the available bandwidth used for the stream. This setting effectively corresponds to a 'quality' setting for the video. A low value will result in a blocky image whereas a high value will produce a clearer view. Note that this setting does not control the frame rate of the video however the quality of the video produced is affected both by this setting and the frame rate that the video is produced at. A higher frame rate at a particular bit rate result in individual frames being at a lower quality.",
-		type => $types{integer},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_VIDEO_MAXFPS",
-		default => "5",
-		description => "What the maximum frame rate for streamed video should be",
-		help => "When using streamed video the main control is the bitrate which determines how much data can be transmitted. However a lower bitrate at high frame rates results in a lower quality image. This option allows you to limit the maximum frame rate to ensure that video quality is maintained. An additional advantage is that encoding video at high frame rates is a processor intensive task when for the most part a very high frame rate offers little perceptible improvement over one that has a more manageable resource requirement. Note, this option is implemented as a cap beyond which binary reduction takes place. So if you have a device capturing at 15fps and set this option to 10fps then the video is not produced at 10fps, but rather at 7.5fps (15 divided by 2) as the final frame rate must be the original divided by a power of 2.",
-		type => $types{integer},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_SCALE_THUMBS",
-		default => "yes",
-		description => "Scale thumbnails in events, bandwidth versus cpu in rescaling",
-		help => "If unset, this option sends the whole image to the browser which resizes it in the window. If set the image is scaled down on the server before sending a reduced size image to the browser to conserve bandwidth at the cost of cpu on the server. Note that ZM can only perform the resizing if the appropriate PHP graphics functionality is installed. This is usually available in the php-gd package.",
-		type => $types{boolean},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_EVENTS_VIEW",
-		default => "events",
-		description => "What the default view of multiple events should be.",
-		help => "Stored events can be viewed in either an events list format or in a timeline based one. This option sets the default view that will be used. Choosing one view here does not prevent the other view being used as it will always be selectable from whichever view is currently being used.",
-		type => { db_type=>"string", hint=>"events|timeline", pattern=>qr|^([lt])|i, format=>q( $1 =~ /^e/ ? "events" : "timeline" ) },
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_SHOW_PROGRESS",
-		default => "no",
-		description => "Show the progress of replay in event view.",
-		help => "When viewing events an event navigation panel and progress bar is shown below the event itself. This allows you to jump to specific points in the event, but can can also dynamically update to display the current progress of the event replay itself. This progress is calculated from the actual event duration and is not directly linked to the replay itself, so on limited bandwidth connections may be out of step with the replay. This option allows you to turn off the progress display, whilst still keeping the navigation aspect, where bandwidth prevents it functioning effectively.",
-		type => $types{boolean},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_AJAX_TIMEOUT",
-		default => "10000",
-		description => "How long to wait for Ajax request responses (ms)",
-		help => "The newer versions of the live feed and event views use Ajax to request information from the server and populate the views dynamically. This option allows you to specify a timeout if required after which requests are abandoned. A timeout may be necessary if requests would overwise hang such as on a slow connection. This would tend to consume a lot of browser memory and make the interface unresponsive. Ordinarily no requests should timeout so this setting should be set to a value greater than the slowest expected response. This value is in milliseconds but if set to zero then no timeout will be used.",
-		type => $types{integer},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_P_CAN_STREAM",
-		default => "auto",
-		description => "Override the automatic detection of browser streaming capability",
-		help => "If you know that your browser can handle image streams of the type 'multipart/x-mixed-replace' but ZoneMinder does not detect this correctly you can set this option to ensure that the stream is delivered with or without the use of the Cambozola plugin. Selecting 'yes' will tell ZoneMinder that your browser can handle the streams natively, 'no' means that it can't and so the plugin will be used while 'auto' lets ZoneMinder decide.",
-		type => $types{tristate},
-		category => "phoneband",
-	},
-	{
-		name => "ZM_WEB_P_STREAM_METHOD",
-		default => "jpeg",
-		description => "Which method should be used to send video streams to your browser.",
-		help => "ZoneMinder can be configured to use either mpeg encoded video or a series or still jpeg images when sending video streams. This option defines which is used. If you choose mpeg you should ensure that you have the appropriate plugins available on your browser whereas choosing jpeg will work natively on Mozilla and related browsers and with a Java applet on Internet Explorer",
-		type => { db_type=>"string", hint=>"mpeg|jpeg", pattern=>qr|^([mj])|i, format=>q( $1 =~ /^m/ ? "mpeg" : "jpeg" ) },
-		category => "phoneband",
-	},
-	{
-		name => "ZM_WEB_P_DEFAULT_SCALE",
-		default => "100",
-		description => "What the default scaling factor applied to 'live' or 'event' views is (%)",
-		help => "Normally ZoneMinder will display 'live' or 'event' streams in their native size. However if you have monitors with large dimensions or a slow link you may prefer to reduce this size, alternatively for small monitors you can enlarge it. This options lets you specify what the default scaling factor will be. It is expressed as a percentage so 100 is normal size, 200 is double size etc.",
-		type => { db_type=>"integer", hint=>"25|33|50|75|100|150|200|300|400", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "phoneband",
-	},
-	{
-		name => "ZM_WEB_P_DEFAULT_RATE",
-		default => "100",
-		description => "What the default replay rate factor applied to 'event' views is (%)",
-		help => "Normally ZoneMinder will display 'event' streams at their native rate, i.e. as close to real-time as possible. However if you have long events it is often convenient to replay them at a faster rate for review. This option lets you specify what the default replay rate will be. It is expressed as a percentage so 100 is normal rate, 200 is double speed etc.",
-		type => { db_type=>"integer", hint=>"25|50|100|150|200|400|1000|2500|5000|10000", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "phoneband",
-	},
-	{
-		name => "ZM_WEB_P_VIDEO_BITRATE",
-		default => "8000",
-		description => "What the bitrate of the video encoded stream should be set to",
-		help => "When encoding real video via the ffmpeg library a bit rate can be specified which roughly corresponds to the available bandwidth used for the stream. This setting effectively corresponds to a 'quality' setting for the video. A low value will result in a blocky image whereas a high value will produce a clearer view. Note that this setting does not control the frame rate of the video however the quality of the video produced is affected both by this setting and the frame rate that the video is produced at. A higher frame rate at a particular bit rate result in individual frames being at a lower quality.",
-		type => $types{integer},
-		category => "phoneband",
-	},
-	{
-		name => "ZM_WEB_P_VIDEO_MAXFPS",
-		default => "5",
-		description => "What the maximum frame rate for streamed video should be",
-		help => "When using streamed video the main control is the bitrate which determines how much data can be transmitted. However a lower bitrate at high frame rates results in a lower quality image. This option allows you to limit the maximum frame rate to ensure that video quality is maintained. An additional advantage is that encoding video at high frame rates is a processor intensive task when for the most part a very high frame rate offers little perceptible improvement over one that has a more manageable resource requirement. Note, this option is implemented as a cap beyond which binary reduction takes place. So if you have a device capturing at 15fps and set this option to 10fps then the video is not produced at 10fps, but rather at 7.5fps (15 divided by 2) as the final frame rate must be the original divided by a power of 2.",
-		type => $types{integer},
-		category => "phoneband",
-	},
-	{
-		name => "ZM_WEB_P_SCALE_THUMBS",
-		default => "yes",
-		description => "Scale thumbnails in events, bandwidth versus cpu in rescaling",
-		help => "If unset, this option sends the whole image to the browser which resizes it in the window. If set the image is scaled down on the server before sending a reduced size image to the browser to conserve bandwidth at the cost of cpu on the server. Note that ZM can only perform the resizing if the appropriate PHP graphics functionality is installed. This is usually available in the php-gd package.",
-		type => $types{boolean},
-		category => "phoneband",
-	},
-	{
-		name => "ZM_WEB_P_AJAX_TIMEOUT",
-		default => "10000",
-		description => "How long to wait for Ajax request responses (ms)",
-		help => "The newer versions of the live feed and event views use Ajax to request information from the server and populate the views dynamically. This option allows you to specify a timeout if required after which requests are abandoned. A timeout may be necessary if requests would overwise hang such as on a slow connection. This would tend to consume a lot of browser memory and make the interface unresponsive. Ordinarily no requests should timeout so this setting should be set to a value greater than the slowest expected response. This value is in milliseconds but if set to zero then no timeout will be used.",
-		type => $types{integer},
-		category => "phoneband",
-	},
-	{
-		name => "ZM_DYN_LAST_VERSION",
-		default => "",
-		description => "What the last version of ZoneMinder recorded from zoneminder.com is",
-		help => "",
-		type => $types{string},
-		readonly => 1,
-		category => "dynamic",
-	},
-	{
-		name => "ZM_DYN_CURR_VERSION",
-		default => "1.25.0",
-		description => "What the effective current version of ZoneMinder is, might be different from actual if versions ignored",
-		help => "",
-		type => $types{string},
-		readonly => 1,
-		category => "dynamic",
-	},
-	{
-		name => "ZM_DYN_DB_VERSION",
-		default => "1.25.0",
-		description => "What the version of the database is, from zmupdate",
-		help => "",
-		type => $types{string},
-		readonly => 1,
-		category => "dynamic",
-	},
-	{
-		name => "ZM_DYN_LAST_CHECK",
-		default => "",
-		description => "When the last check for version from zoneminder.com was",
-		help => "",
-		type => $types{integer},
-		readonly => 1,
-		category => "dynamic",
-	},
-	{
-		name => "ZM_DYN_NEXT_REMINDER",
-		default => "",
-		description => "When the earliest time to remind about versions will be",
-		help => "",
-		type => $types{string},
-		readonly => 1,
-		category => "dynamic",
-	},
-	{
-		name => "ZM_DYN_DONATE_REMINDER_TIME",
-		default => 0,
-		description => "When the earliest time to remind about donations will be",
-		help => "",
-		type => $types{integer},
-		readonly => 1,
-		category => "dynamic",
-	},
-	{
-		name => "ZM_DYN_SHOW_DONATE_REMINDER",
-		default => "yes",
-		description => "Remind about donations or not",
-		help => "",
-		type => $types{boolean},
-		readonly => 1,
-		category => "dynamic",
-	},
-	{
-		name => "ZM_EYEZM_DEBUG",
-		default => "no",
-		description => "Switch additional debugging on for eyeZm Plugin",
-		help => "Enable or Disable extra debugging from the eyeZm Plugin. Extra debugging information will be displayed in it's own file (EYEZM_LOG_TO_FILE is set), or your Apache error log",
-		type => $types{boolean},
-		category => "eyeZm",
-	},
-	{
-		name => "ZM_EYEZM_LOG_TO_FILE",
-		default => "yes",
-		description => "When eyeZm Debugging is enabled, enabling this logs output to it's own file",
-		help => "When EYEZM_DEBUG is on and EYEZM_LOG_TO_FILE is on, output generated from the eyeZm Plugin will go to it's own file. Otherwise it will go to the apache error log.",
-		type => $types{boolean},
-		category => "eyeZm",
-	},
-	{
-		name => "ZM_EYEZM_LOG_FILE",
-		default => "/var/log/zm/zm_xml.log",
-		description => "Default filename to use when logging eyeZm Output and EYEZM_LOG_TO_FILE is enabled", 
-		help => "This file will contain it's own output from the eyeZm Plugin when EYEZM_LOG_TO_FILE and EYEZM_DEBUG are both enabled",
-		type => $types{string},
-		category => "eyeZm",
-	},
-	{
-		name => "ZM_EYEZM_EVENT_VCODEC",
-		default => "mpeg4",
-		description => "Default video-codec to use for encoding events",
-		help => "The eyeZm Plugin calls FFMPEG externally to encode the captured images. If your FFMPEG is not built with support for H264, change this to MPEG-4. If using H264, please check http://www.eyezm.com for H264 requirements and that your eyeZm version supports H264 (v1.2+).",
-		type => { db_type=>"string", hint=>"mpeg4|h264", pattern=>qr|^([mh])|i, format=>q( $1 =~ /^m/ ? "mpeg4" : "h264" ) },
-		category => "eyeZm",
-	},
-	{
-		name => "ZM_EYEZM_FEED_VCODEC",
-		default => "mjpeg",
-		description => "Default video-codec to use for streaming the live feed",
-		help => "Determines whether the live stream is generated using native MJPEG streaming with ZoneMinder, or H264 using FFMPEG and HTML-5 streaming. If using H264, please check http://www.eyezm.com for H264 requirements and that your eyeZm version supports H264 (v1.2+). This is just a default parameter, and can be overridden with eyeZm.",
-		type => { db_type=>"string", hint=>"mjpeg|h264", pattern=>qr|^([mh])|i, format=>q( $1 =~ /^m/ ? "mjpeg" : "h264" ) },
-		category => "eyeZm",
-	},
-	{
-		name => "ZM_EYEZM_H264_DEFAULT_BR",
-		default => "96k",
-		description => "Default bit-rate to use with FFMPEG for H264 streaming",
-		help => "When using the eyeZm Plugin to stream H264 data, FFMPEG requires a bitrate to control the quality and bandwidth of the video. This should be specified in a format acceptable to FFMPEG. The default value is sufficient for most installations. This is just a default parameter, and can be overridden with eyeZm.",
-		type => $types{string},
-		category => "eyeZm",
-	},
-	{
-		name => "ZM_EYEZM_H264_DEFAULT_EVBR",
-		default => "128k",
-		description => "Default bit-rate to use with FFMPEG for H264 event viewing",
-		help => "When using the eyeZm Plugin to view events in H264, FFMPEG requires a bitrate to control the quality and bandwidth of the video. This should be specified in a format acceptable to FFMPEG. The default value is sufficient for most installations. This is just a default parameter, and can be overridden with eyeZm.",
-		type => $types{string},
-		category => "eyeZm",
-	},
-	{
-		name => "ZM_EYEZM_H264_TIMEOUT",
-		default => "20",
-		description => "Timeout (sec) to wait for H264 stream to start before terminating",
-		help => "The eyeZm Plugin will attempt to spawn an H264 stream when requested, and require that it complete within the timeout specified. If you have a slow system or find through the logs that the H264 stream is not starting because the timeout is expiring, even though FFMPEG is running, try increasing this value. If you have a fast system, decreasing this value can improve the responsiveness when there are issues starting H264 streams",
-		type => $types{string},
-		category => "eyeZm",
-	},
-	{
-		name => "ZM_EYEZM_SEG_DURATION",
-		default => "3",
-		description => "Segment duration used for streaming using HTTP-5 Streaming protocol",
-		help => "The HTTP-5 Live Streaming Protocol segments the input video stream into small chunks of a duration specified by this parameter. Increasing the segment duration will help with choppy connections on the other end, but will increase the latency in starting a stream.",
-		type => $types{string},
-		category => "eyeZm",
-	},
-);
-
-our %options_hash = map { ( $_->{name}, $_ ) } @options;
-
-# This function should never need to be called explicitly, except if 
-# this module is 'require'd rather than 'use'd. See zmconfgen.pl.
-sub initialiseConfig
-{
-    return if ( $configInitialised );
-
-	# Do some initial data munging to finish the data structures
-	# Create option ids
-	my $option_id = 0;
-	foreach my $option ( @options )
-	{
-		if ( defined($option->{default}) )
-		{
-			$option->{value} = $option->{default}
-		}
-		else
-		{
-			$option->{value} = '';
-		}
-		#next if ( $option->{category} eq 'hidden' );
-		$option->{id} = $option_id++;
-	}
-    $configInitialised = 1;
-}
-
-1;
-__END__
-
-=head1 NAME
-
-ZoneMinder::ConfigData - ZoneMinder Configuration Data module
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::ConfigData;
-  use ZoneMinder::ConfigData qw(:all);
-
-  loadConfigFromDB();
-  saveConfigToDB();
-
-=head1 DESCRIPTION
-
-The ZoneMinder:ConfigData module contains the master definition of the ZoneMinder configuration options as well as helper methods. This module is intended for specialist confguration management and would not normally be used by end users.
-
-The configuration held in this module, which was previously in zmconfig.pl, includes the name, default value, description, help text, type and category for each option, as well as a number of additional fields in a small number of cases.
-
-=head1 METHODS
-
-=over 4
-
-=item loadConfigFromDB ();
-
-Loads existing configuration from the database (if any) and merges it with the definitions held in this module. This results in the merging of any new configuration and the removal of any deprecated configuration while preserving the existing values of every else.
-
-=item saveConfigToDB ();
-
-Saves configuration held in memory to the database. The act of loading and saving configuration is a convenient way to ensure that the configuration held in the database corresponds with the most recent definitions and that all components are using the same set of configuration.
-
-=head2 EXPORT
-
-None by default.
-The :data tag will export the various configuration data structures
-The :functions tag will export the helper functions.
-The :all tag will export all above symbols.
-
-
-=head1 SEE ALSO
-
-http://www.zoneminder.com
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/Control.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/Control.pm
deleted file mode 100644
index 2a646772d..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Control.pm
+++ /dev/null
@@ -1,205 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Base Control Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the base class definitions for the camera control 
-# protocol implementations
-#
-package ZoneMinder::Control;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Base connection class
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-use ZoneMinder::Database qw(:all);
-
-our $AUTOLOAD;
-
-sub new
-{
-	my $class = shift;
-	my $id = shift;
-	my $self = {};
-	$self->{name} = "PelcoD";
-    if ( !defined($id) )
-    {
-        Fatal( "No monitor defined when invoking protocol ".$self->{name} );
-    }
-	$self->{id} = $id;
-	bless( $self, $class );
-	return $self;
-}
-
-sub DESTROY
-{
-}
-
-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} );
-	}
-	croak( "Can't access $name member of object of class $class" );
-}
-
-sub getKey()
-{
-	my $self = shift;
-    return( $self->{id} );
-}
-
-sub open
-{
-	my $self = shift;
-    Fatal( "No open method defined for protocol ".$self->{name} );
-}
-
-sub close
-{
-	my $self = shift;
-    Fatal( "No close method defined for protocol ".$self->{name} );
-}
-
-sub loadMonitor
-{
-    my $self = shift;
-    if ( !$self->{Monitor} )
-    {
-        if ( !($self->{Monitor} = zmDbGetMonitor( $self->{id} )) )
-        {
-            Fatal( "Monitor id ".$self->{id}." not found or not controllable" );
-        }
-        if ( defined($self->{Monitor}->{AutoStopTimeout}) )
-        {
-            # Convert to microseconds.
-            $self->{Monitor}->{AutoStopTimeout} = int(1000000*$self->{Monitor}->{AutoStopTimeout});
-        }
-    }
-}
-
-sub getParam
-{
-    my $self = shift;
-    my $params = shift;
-    my $name = shift;
-    my $default = shift;
-
-    if ( defined($params->{$name}) )
-    {
-        return( $params->{$name} );
-    }
-    elsif ( defined($default) )
-    {
-        return( $default );
-    }
-    Fatal( "Missing mandatory parameter '$name'" );
-}
-
-sub executeCommand
-{
-    my $self = shift;
-    my $params = shift;
-
-    $self->loadMonitor();
-
-    my $command = $params->{command};
-    delete $params->{command};
-
-    #if ( !defined($self->{$command}) )
-    #{
-        #Fatal( "Unsupported command '$command'" );
-    #}
-    &{$self->{$command}}( $self, $params );
-}
-
-sub printMsg()
-{
-	my $self = shift;
-    Fatal( "No printMsg method defined for protocol ".$self->{name} );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/AxisV2.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/AxisV2.pm
deleted file mode 100644
index e5a5882b9..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/AxisV2.pm
+++ /dev/null
@@ -1,475 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Axis version 2 API Control Protocol Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the implementation of the Axis V2 API camera control
-# protocol
-#
-package ZoneMinder::Control::AxisV2;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Control;
-
-our @ISA = qw(ZoneMinder::Control);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Axis V2 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/".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 $result = undef;
-
-    printMsg( $cmd, "Tx" );
-
-    #print( "http://$address/$cmd\n" );
-    my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/$cmd" );
-    my $res = $self->{ua}->request($req);
-
-    if ( $res->is_success )
-    {
-        $result = !undef;
-    }
-    else
-    {
-        Error( "Error check failed: '".$res->status_line()."'" );
-    }
-
-    return( $result );
-}
-
-sub cameraReset
-{
-    my $self = shift;
-    Debug( "Camera Reset" );
-    my $cmd = "/axis-cgi/admin/restart.cgi";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConUp
-{
-    my $self = shift;
-    Debug( "Move Up" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=up";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConDown
-{
-    my $self = shift;
-    Debug( "Move Down" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=down";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConLeft
-{
-    my $self = shift;
-    Debug( "Move Left" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=left";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConRight
-{
-    my $self = shift;
-    Debug( "Move Right" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=right";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConUpRight
-{
-    my $self = shift;
-    Debug( "Move Up/Right" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=upright";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConUpLeft
-{
-    my $self = shift;
-    Debug( "Move Up/Left" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=upleft";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConDownRight
-{
-    my $self = shift;
-    Debug( "Move Down/Right" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=downright";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConDownLeft
-{
-    my $self = shift;
-    Debug( "Move Down/Left" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=downleft";
-    $self->sendCmd( $cmd );
-}
-
-sub moveMap
-{
-    my $self = shift;
-    my $params = shift;
-    my $xcoord = $self->getParam( $params, 'xcoord' );
-    my $ycoord = $self->getParam( $params, 'ycoord' );
-    Debug( "Move Map to $xcoord,$ycoord" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?center=$xcoord,$ycoord&imagewidth=".$self->{Monitor}->{Width}."&imageheight=".$self->{Monitor}->{Height};
-    $self->sendCmd( $cmd );
-}
-
-sub moveRelUp
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'tiltstep' );
-    Debug( "Step Up $step" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rtilt=$step";
-    $self->sendCmd( $cmd );
-}
-
-sub moveRelDown
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'tiltstep' );
-    Debug( "Step Down $step" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rtilt=-$step";
-    $self->sendCmd( $cmd );
-}
-
-sub moveRelLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'panstep' );
-    Debug( "Step Left $step" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rpan=-$step";
-    $self->sendCmd( $cmd );
-}
-
-sub moveRelRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'panstep' );
-    Debug( "Step Right $step" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rpan=$step";
-    $self->sendCmd( $cmd );
-}
-
-sub moveRelUpRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $panstep = $self->getParam( $params, 'panstep' );
-    my $tiltstep = $self->getParam( $params, 'tiltstep' );
-    Debug( "Step Up/Right $tiltstep/$panstep" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rpan=$panstep&rtilt=$tiltstep";
-    $self->sendCmd( $cmd );
-}
-
-sub moveRelUpLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $panstep = $self->getParam( $params, 'panstep' );
-    my $tiltstep = $self->getParam( $params, 'tiltstep' );
-    Debug( "Step Up/Left $tiltstep/$panstep" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rpan=-$panstep&rtilt=$tiltstep";
-    $self->sendCmd( $cmd );
-}
-
-sub moveRelDownRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $panstep = $self->getParam( $params, 'panstep' );
-    my $tiltstep = $self->getParam( $params, 'tiltstep' );
-    Debug( "Step Down/Right $tiltstep/$panstep" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rpan=$panstep&rtilt=-$tiltstep";
-    $self->sendCmd( $cmd );
-}
-
-sub moveRelDownLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $panstep = $self->getParam( $params, 'panstep' );
-    my $tiltstep = $self->getParam( $params, 'tiltstep' );
-    Debug( "Step Down/Left $tiltstep/$panstep" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rpan=-$panstep&rtilt=-$tiltstep";
-    $self->sendCmd( $cmd );
-}
-
-sub zoomRelTele
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Zoom Tele" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rzoom=$step";
-    $self->sendCmd( $cmd );
-}
-
-sub zoomRelWide
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Zoom Wide" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rzoom=-$step";
-    $self->sendCmd( $cmd );
-}
-
-sub focusRelNear
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Focus Near" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rfocus=-$step";
-    $self->sendCmd( $cmd );
-}
-
-sub focusRelFar
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Focus Far" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?rfocus=$step";
-    $self->sendCmd( $cmd );
-}
-
-sub focusAuto
-{
-    my $self = shift;
-    Debug( "Focus Auto" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?autofocus=on";
-    $self->sendCmd( $cmd );
-}
-
-sub focusMan
-{
-    my $self = shift;
-    Debug( "Focus Manual" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?autofocus=off";
-    $self->sendCmd( $cmd );
-}
-
-sub irisRelOpen
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Iris Open" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?riris=$step";
-    $self->sendCmd( $cmd );
-}
-
-sub irisRelClose
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Iris Close" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?riris=-$step";
-    $self->sendCmd( $cmd );
-}
-
-sub irisAuto
-{
-    my $self = shift;
-    Debug( "Iris Auto" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?autoiris=on";
-    $self->sendCmd( $cmd );
-}
-
-sub irisMan
-{
-    my $self = shift;
-    Debug( "Iris Manual" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?autoiris=off";
-    $self->sendCmd( $cmd );
-}
-
-sub presetClear
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset' );
-    Debug( "Clear Preset $preset" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?removeserverpresetno=$preset";
-    $self->sendCmd( $cmd );
-}
-
-sub presetSet
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset' );
-    Debug( "Set Preset $preset" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?setserverpresetno=$preset";
-    $self->sendCmd( $cmd );
-}
-
-sub presetGoto
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset' );
-    Debug( "Goto Preset $preset" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?gotoserverpresetno=$preset";
-    $self->sendCmd( $cmd );
-}
-
-sub presetHome
-{
-    my $self = shift;
-    Debug( "Home Preset" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?move=home";
-    $self->sendCmd( $cmd );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/Ncs370.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/Ncs370.pm
deleted file mode 100644
index 358aecb2b..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/Ncs370.pm
+++ /dev/null
@@ -1,241 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Neu-Fusion Control Protocol Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the implementation of the Neu-Fusion NCS370 IP camera
-# control protocol
-#
-package ZoneMinder::Control::Ncs370;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Control;
-
-our @ISA = qw(ZoneMinder::Control);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Ncs370 IP 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/".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 $result = undef;
-
-    printMsg( $cmd, "Tx" );
-
-    my $req = HTTP::Request->new( POST=>"http://".$self->{Monitor}->{ControlAddress}."/PANTILTCONTROL.CGI" );
-    my $res = $self->{ua}->request($req);
-
-    if ( $res->is_success )
-    {
-        $result = !undef;
-    }
-    else
-    {
-        Error( "Error check failed: '".$res->status_line()."'" );
-    }
-
-    return( $result );
-}
-
-sub moveConUp
-{
-    my $self = shift;
-    Debug( "Move Up" );
-    my $cmd = "PanSingleMoveDegree=1\nTiltSingleMoveDegree=1\nPanTiltSingleMove=1";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConDown
-{
-    my $self = shift;
-    Debug( "Move Down" );
-    my $cmd = "PanSingleMoveDegree=1\nTiltSingleMoveDegree=1\nPanTiltSingleMove=7";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConLeft
-{
-    my $self = shift;
-    Debug( "Move Left" );
-    my $cmd = "PanSingleMoveDegree=1\nTiltSingleMoveDegree=1\nPanTiltSingleMove=3";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConRight
-{
-    my $self = shift;
-    Debug( "Move Right" );
-    my $cmd = "PanSingleMoveDegree=1\nTiltSingleMoveDegree=1\nPanTiltSingleMove=5";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConUpRight
-{
-    moveConUp();
-    moveConRight();
-}
-
-sub moveConUpLeft
-{
-    moveConUp();
-    moveConLeft();
-}
-
-sub moveConDownRight
-{
-    moveConDown();
-    moveConRight();
-}
-
-sub moveConDownLeft
-{
-    moveConDown();
-    moveConLeft();
-}
-
-sub presetHome
-{
-    my $self = shift;
-    Debug( "Home Preset" );
-    my $cmd = "PanSingleMoveDegree=1\nTiltSingleMoveDegree=1\nPanTiltSingleMove=4";
-    $self->sendCmd( $cmd );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/PanasonicIP.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/PanasonicIP.pm
deleted file mode 100644
index 643765e9f..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/PanasonicIP.pm
+++ /dev/null
@@ -1,322 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Panasonic IP Control Protocol Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the implementation of the Panasonic IP camera control
-# protocol
-#
-package ZoneMinder::Control::PanasonicIP;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Control;
-
-our @ISA = qw(ZoneMinder::Control);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Panasonic IP 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/".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 $result = undef;
-
-    printMsg( $cmd, "Tx" );
-
-    my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/$cmd" );
-    my $res = $self->{ua}->request($req);
-
-    if ( $res->is_success )
-    {
-        $result = !undef;
-    }
-    else
-    {
-        Error( "Error check failed: '".$res->status_line()."'" );
-    }
-
-    return( $result );
-}
-
-sub cameraReset
-{
-    my $self = shift;
-    Debug( "Camera Reset" );
-    my $cmd = "nphRestart?PAGE=Restart&Restart=OK";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConUp
-{
-    my $self = shift;
-    Debug( "Move Up" );
-    my $cmd = "nphControlCamera?Direction=TiltUp";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConDown
-{
-    my $self = shift;
-    Debug( "Move Down" );
-    my $cmd = "nphControlCamera?Direction=TiltDown";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConLeft
-{
-    my $self = shift;
-    Debug( "Move Left" );
-    my $cmd = "nphControlCamera?Direction=PanLeft";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConRight
-{
-    my $self = shift;
-    Debug( "Move Right" );
-    my $cmd = "nphControlCamera?Direction=PanRight";
-    $self->sendCmd( $cmd );
-}
-
-sub moveMap
-{
-    my $self = shift;
-    my $params = shift;
-    my $xcoord = $self->getParam( $params, 'xcoord' );
-    my $ycoord = $self->getParam( $params, 'ycoord' );
-    Debug( "Move Map to $xcoord,$ycoord" );
-    my $cmd = "nphControlCamera?Direction=Direct&NewPosition.x=$xcoord&NewPosition.y=$ycoord&Width=".$self->{Monitor}->{Width}."&Height=".$self->{Monitor}->{Height};
-    $self->sendCmd( $cmd );
-}
-
-sub zoomConTele
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Zoom Tele" );
-    my $cmd = "nphControlCamera?Direction=ZoomTele";
-    $self->sendCmd( $cmd );
-}
-
-sub zoomConWide
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Zoom Wide" );
-    my $cmd = "nphControlCamera?Direction=ZoomWide";
-    $self->sendCmd( $cmd );
-}
-
-sub focusConNear
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Focus Near" );
-    my $cmd = "nphControlCamera?Direction=FocusNear";
-    $self->sendCmd( $cmd );
-}
-
-sub focusConFar
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'step' );
-    Debug( "Focus Far" );
-    my $cmd = "nphControlCamera?Direction=FocusFar";
-    $self->sendCmd( $cmd );
-}
-
-sub focusAuto
-{
-    my $self = shift;
-    Debug( "Focus Auto" );
-    my $cmd = "nphControlCamera?Direction=FocusAuto";
-    $self->sendCmd( $cmd );
-}
-
-sub focusMan
-{
-    my $self = shift;
-    Debug( "Focus Manual" );
-    my $cmd = "/axis-cgi/com/ptz.cgi?autofocus=off";
-    $self->sendCmd( $cmd );
-}
-
-sub presetClear
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset' );
-    Debug( "Clear Preset $preset" );
-    my $cmd = "nphPresetNameCheck?Data=$preset";
-    $self->sendCmd( $cmd );
-}
-
-sub presetSet
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset' );
-    Debug( "Set Preset $preset" );
-    my $cmd = "nphPresetNameCheck?PresetName=$preset&Data=$preset";
-    $self->sendCmd( $cmd );
-}
-
-sub presetGoto
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset' );
-    Debug( "Goto Preset $preset" );
-    my $cmd = "nphControlCamera?Direction=Preset&PresetOperation=Move&Data=$preset";
-    $self->sendCmd( $cmd );
-}
-
-sub presetHome
-{
-    my $self = shift;
-    Debug( "Home Preset" );
-    my $cmd = "nphControlCamera?Direction=HomePosition";
-    $self->sendCmd( $cmd );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/PelcoD.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/PelcoD.pm
deleted file mode 100644
index 6c507bd1a..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/PelcoD.pm
+++ /dev/null
@@ -1,735 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Pelco-D Control Protocol Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the implementation of the Pelco-D camera control
-# protocol
-#
-package ZoneMinder::Control::PelcoD;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Control;
-
-our @ISA = qw(ZoneMinder::Control);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Pelco-D Control Protocol
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-
-use Time::HiRes qw( usleep );
-
-use constant SYNC => 0xff;
-use constant COMMAND_GAP => 100000; # In ms
-
-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 Device::SerialPort;
-    $self->{port} = new Device::SerialPort( $self->{Monitor}->{ControlDevice} );
-    $self->{port}->baudrate(2400);
-    $self->{port}->databits(8);
-    $self->{port}->parity('none');
-    $self->{port}->stopbits(1);
-    $self->{port}->handshake('none');
-
-    $self->{port}->read_const_time(50);
-    $self->{port}->read_char_time(10);
-
-    $self->{state} = 'open';
-}
-
-sub close
-{
-    my $self = shift;
-    $self->{state} = 'closed';
-    $self->{port}->close();
-}
-
-sub printMsg
-{
-    if ( logDebugging() )
-    {
-        my $self = shift;
-        my $msg = shift;
-        my $prefix = shift || "";
-        $prefix = $prefix.": " if ( $prefix );
-
-        my $line_length = 16;
-        my $msg_len = int(@$msg);
-
-        my $msg_str = $prefix;
-        for ( my $i = 0; $i < $msg_len; $i++ )
-        {
-            if ( ($i > 0) && ($i%$line_length == 0) && ($i != ($msg_len-1)) )
-            {
-                $msg_str .= sprintf( "\n%*s", length($prefix), "" );
-            }
-            $msg_str .= sprintf( "%02x ", $msg->[$i] );
-        }
-        $msg_str .= "[".$msg_len."]";
-        Debug( $msg_str );
-    }
-}
-
-sub sendCmd
-{
-    my $self = shift;
-    my $cmd = shift;
-    my $ack = shift || 0;
-
-    my $result = undef;
-
-    my $checksum = 0x00;
-    for ( my $i = 1; $i < int(@$cmd); $i++ )
-    {
-        $checksum += $cmd->[$i];
-        $checksum &= 0xff;
-    }
-    push( @$cmd, $checksum );
-
-    $self->printMsg( $cmd, "Tx" );
-    my $id = $cmd->[0] & 0xf;
-
-    my $tx_msg = pack( "C*", @$cmd );
-
-    #print( "Tx: ".length( $tx_msg )." bytes\n" );
-    my $n_bytes = $self->{port}->write( $tx_msg );
-    if ( !$n_bytes )
-    {
-        Error( "Write failed: $!" );
-    }
-    if ( $n_bytes != length($tx_msg) )
-    {
-        Error( "Incomplete write, only ".$n_bytes." of ".length($tx_msg)." written: $!" );
-    }
-
-    if ( $ack )
-    {
-        Debug( "Waiting for ack" );
-        my $max_wait = 3;
-        my $now = time();
-        while( 1 )
-        {
-            my ( $count, $rx_msg ) = $self->{port}->read(4);
-
-            if ( $count )
-            {
-                #print( "Rx1: ".$count." bytes\n" );
-                my @resp = unpack( "C*", $rx_msg );
-                printMsg( \@resp, "Rx" );
-
-                if ( $resp[0] = 0x80 + ($id<<4) )
-                {
-                    if ( ($resp[1] & 0xf0) == 0x40 )
-                    {
-                        my $socket = $resp[1] & 0x0f;
-                        Debug( "Got ack for socket $socket" );
-                        $result = !undef;
-                    }
-                    else
-                    {
-                        Error( "Got bogus response" );
-                    }
-                    last;
-                }
-                else
-                {
-                    Error( "Got message for camera ".(($resp[0]-0x80)>>4) );
-                }
-            }
-            if ( (time() - $now) > $max_wait )
-            {
-                Warning( "Response timeout" );
-                last;
-            }
-        }
-    }
-}
-
-sub remoteReset
-{
-    my $self = shift;
-    Debug( "Remote Reset" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x0f, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-}
-
-sub resetDefaults
-{
-    my $self = shift;
-    Debug( "Reset Defaults" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x29, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-}
-
-sub cameraOff
-{
-    my $self = shift;
-    Debug( "Camera Off" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x08, 0x00, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-}
-
-sub cameraOn
-{
-    my $self = shift;
-    Debug( "Camera On" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x88, 0x00, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-}
-
-sub autoScan
-{
-    my $self = shift;
-    Debug( "Auto Scan" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x90, 0x00, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-}
-
-sub manScan
-{
-    my $self = shift;
-    Debug( "Manual Scan" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x10, 0x00, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-}
-
-sub stop
-{
-    my $self = shift;
-    Debug( "Stop" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x00, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-}
-
-sub moveConUp
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'tiltspeed' );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Up" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x08, 0x00, $speed );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop( $params );
-    }
-}
-
-sub moveConDown
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'tiltspeed' );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Down" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x10, 0x00, $speed );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop();
-    }
-}
-
-sub moveConLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'panspeed' );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Left" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x04, $speed, 0x00 );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop();
-    }
-}
-
-sub moveConRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'panspeed' );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Right" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x02, $speed, 0x00 );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop();
-    }
-}
-
-sub moveConUpLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $panspeed = $self->getParam( $params, 'panspeed', 0x3f );
-    my $tiltspeed = $self->getParam( $params, 'tiltspeed', 0x3f );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Up/Left" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x0c, $panspeed, $tiltspeed );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop();
-    }
-}
-
-sub moveConUpRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $panspeed = $self->getParam( $params, 'panspeed', 0x3f );
-    my $tiltspeed = $self->getParam( $params, 'tiltspeed', 0x3f );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Up/Right" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x0a, $panspeed, $tiltspeed );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop();
-    }
-}
-
-sub moveConDownLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $panspeed = $self->getParam( $params, 'panspeed', 0x3f );
-    my $tiltspeed = $self->getParam( $params, 'tiltspeed', 0x3f );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Down/Left" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x14, $panspeed, $tiltspeed );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop();
-    }
-}
-
-sub moveConDownRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $panspeed = $self->getParam( $params, 'panspeed', 0x3f );
-    my $tiltspeed = $self->getParam( $params, 'tiltspeed', 0x3f );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Down/Right" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x12, $panspeed, $tiltspeed );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop();
-    }
-}
-
-sub moveStop
-{
-    my $self = shift;
-    Debug( "Move Stop" );
-    $self->stop();
-}
-
-sub flip180
-{
-    my $self = shift;
-    Debug( "Flip 180" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x07, 0x00, 0x21 );
-    $self->sendCmd( \@msg );
-}
-
-sub zeroPan
-{
-    my $self = shift;
-    Debug( "Zero Pan" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x07, 0x00, 0x22 );
-    $self->sendCmd( \@msg );
-}
-
-sub _setZoomSpeed
-{
-    my $self = shift;
-    my $speed = shift;
-    Debug( "Set Zoom Speed $speed" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x25, 0x00, $speed );
-    $self->sendCmd( \@msg );
-}
-
-sub zoomStop
-{
-    my $self = shift;
-    Debug( "Zoom Stop" );
-    $self->stop();
-    $self->_setZoomSpeed( 0 );
-}
-
-sub zoomConTele
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'speed', 0x01 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Zoom Tele" );
-    $self->_setZoomSpeed( $speed );
-    usleep( COMMAND_GAP );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x20, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->zoomStop();
-    }
-}
-
-sub zoomConWide
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'speed', 0x01 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Zoom Wide" );
-    $self->_setZoomSpeed( $speed );
-    usleep( COMMAND_GAP );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x40, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->zoomStop();
-    }
-}
-
-sub _setFocusSpeed
-{
-    my $self = shift;
-    my $speed = shift;
-    Debug( "Set Focus Speed $speed" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x27, 0x00, $speed );
-    $self->sendCmd( \@msg );
-}
-
-sub focusConNear
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'speed', 0x03 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Focus Near" );
-    $self->_setFocusSpeed( $speed );
-    usleep( COMMAND_GAP );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x01, 0x00, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->_setFocusSpeed( 0 );
-    }
-}
-
-sub focusConFar
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'speed', 0x03 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Focus Far" );
-    $self->_setFocusSpeed( $speed );
-    usleep( COMMAND_GAP );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x80, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->_setFocusSpeed( 0 );
-    }
-}
-
-sub focusStop
-{
-    my $self = shift;
-    Debug( "Focus Stop" );
-    $self->stop();
-    $self->_setFocusSpeed( 0 );
-}
-
-sub focusAuto
-{
-    my $self = shift;
-    Debug( "Focus Auto" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x2b, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-}
-
-sub focusMan
-{
-    my $self = shift;
-    Debug( "Focus Man" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x2b, 0x00, 0x02 );
-    $self->sendCmd( \@msg );
-}
-
-sub _setIrisSpeed
-{
-    my $self = shift;
-    my $speed = shift;
-    Debug( "Set Iris Speed $speed" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x27, 0x00, $speed );
-    $self->sendCmd( \@msg );
-}
-
-sub irisConClose
-{
-    my $self = shift;
-    my $params = shift;
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Iris Close" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x04, 0x00, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->_setIrisSpeed( 0 );
-    }
-}
-
-sub irisConOpen
-{
-    my $self = shift;
-    my $params = shift;
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Iris Open" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x02, 0x80, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->_setIrisSpeed( 0 );
-    }
-}
-
-sub irisStop
-{
-    my $self = shift;
-    Debug( "Iris Stop" );
-    $self->stop();
-    $self->_setIrisSpeed( 0 );
-}
-
-sub irisAuto
-{
-    my $self = shift;
-    Debug( "Iris Auto" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x2d, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-}
-
-sub irisMan
-{
-    my $self = shift;
-    Debug( "Iris Man" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x2d, 0x00, 0x02 );
-    $self->sendCmd( \@msg );
-}
-
-sub writeScreen
-{
-    my $self = shift;
-    my $params = shift;
-    my $string = $self->getParam( $params, 'string' );
-    Debug( "Writing '$string' to screen" );
-    
-    my @chars = unpack( "C*", $string );
-    for ( my $i = 0; $i < length($string); $i++ )
-    {
-        my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x15, $i, $chars[$i] );
-        $self->sendCmd( \@msg );
-        usleep( COMMAND_GAP );
-    }
-}
-
-sub clearScreen
-{
-    my $self = shift;
-    Debug( "Clear Screen" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x17, 0x00, 0x00 );
-    $self->sendCmd( \@msg );
-}
-
-sub clearPreset
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset', 1 );
-    Debug( "Clear Preset $preset" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x05, 0x00, $preset );
-    $self->sendCmd( \@msg );
-}
-
-sub presetSet
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset', 1 );
-    Debug( "Set Preset $preset" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x03, 0x00, $preset );
-    $self->sendCmd( \@msg );
-}
-
-sub presetGoto
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset', 1 );
-    Debug( "Goto Preset $preset" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x07, 0x00, $preset );
-    $self->sendCmd( \@msg );
-}
-
-sub presetHome
-{
-    my $self = shift;
-    Debug( "Home Preset" );
-    my @msg = ( SYNC, $self->{Monitor}->{ControlAddress}, 0x00, 0x07, 0x00, 0x22 );
-    $self->sendCmd( \@msg );
-}
-
-sub reset
-{
-    my $self = shift;
-    Debug( "Reset" );
-    $self->remoteReset();
-    $self->resetDefaults();
-}
-
-sub wake
-{
-    my $self = shift;
-    Debug( "Wake" );
-    $self->cameraOn();
-}
-
-sub sleep
-{
-    my $self = shift;
-    Debug( "Sleep" );
-    $self->cameraOff();
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/Visca.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/Visca.pm
deleted file mode 100644
index 37f30dc09..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/Visca.pm
+++ /dev/null
@@ -1,668 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Visca Control Protocol Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the implementation of the Visca camera control
-# protocol
-#
-package ZoneMinder::Control::Visca;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Control;
-
-our @ISA = qw(ZoneMinder::Control);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Visca Control Protocol
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-
-use Time::HiRes qw( usleep );
-
-use constant SYNC => 0xff;
-use constant COMMAND_GAP => 100000; # In ms
-
-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 Device::SerialPort;
-    $self->{port} = new Device::SerialPort( $self->{Monitor}->{ControlDevice} );
-    $self->{port}->baudrate(9600);
-    $self->{port}->databits(8);
-    $self->{port}->parity('none');
-    $self->{port}->stopbits(1);
-    $self->{port}->handshake('rts');
-    $self->{port}->stty_echo(0);
-
-    #$self->{port}->read_const_time(250);
-    $self->{port}->read_char_time(2);
-
-    $self->{state} = 'open';
-}
-
-sub close
-{
-    my $self = shift;
-    $self->{state} = 'closed';
-    $self->{port}->close();
-}
-
-sub printMsg
-{
-    if ( logDebugging() )
-    {
-        my $self = shift;
-        my $msg = shift;
-        my $prefix = shift || "";
-        $prefix = $prefix.": " if ( $prefix );
-
-        my $line_length = 16;
-        my $msg_len = int(@$msg);
-
-        my $msg_str = $prefix;
-        for ( my $i = 0; $i < $msg_len; $i++ )
-        {
-            if ( ($i > 0) && ($i%$line_length == 0) && ($i != ($msg_len-1)) )
-            {
-                $msg_str .= sprintf( "\n%*s", length($prefix), "" );
-            }
-            $msg_str .= sprintf( "%02x ", $msg->[$i] );
-        }
-        $msg_str .= "[".$msg_len."]";
-        Debug( $msg_str );
-    }
-}
-
-sub sendCmd
-{
-    my $self = shift;
-    my $cmd = shift;
-    my $ack = shift || 0;
-    my $cmp = shift || 0;
-
-    my $result = undef;
-
-    $self->printMsg( $cmd, "Tx" );
-    my $id = $cmd->[0] & 0xf;
-
-    my $tx_msg = pack( "C*", @$cmd );
-
-    #print( "Tx: ".length( $tx_msg )." bytes\n" );
-    my $n_bytes = $self->{port}->write( $tx_msg );
-    if ( !$n_bytes )
-    {
-        Error( "Write failed: $!" );
-    }
-    if ( $n_bytes != length($tx_msg) )
-    {
-        Error( "Incomplete write, only ".$n_bytes." of ".length($tx_msg)." written: $!" );
-    }
-
-    if ( $ack )
-    {
-        Debug( "Waiting for ack" );
-        my $max_wait = 3;
-        my $now = time();
-        while( 1 )
-        {
-            my ( $count, $rx_msg ) = $self->{port}->read(4);
-
-            if ( $count )
-            {
-                #print( "Rx1: ".$count." bytes\n" );
-                my @resp = unpack( "C*", $rx_msg );
-                $self->printMsg( \@resp, "Rx" );
-
-                if ( $resp[0] = 0x80 + ($id<<4) )
-                {
-                    if ( ($resp[1] & 0xf0) == 0x40 )
-                    {
-                        my $socket = $resp[1] & 0x0f;
-                        Debug( "Got ack for socket $socket" );
-                        $result = !undef;
-                    }
-                    else
-                    {
-                        Error( "Got bogus response" );
-                    }
-                    last;
-                }
-                else
-                {
-                    Error( "Got message for camera ".(($resp[0]-0x80)>>4) );
-                }
-            }
-            if ( (time() - $now) > $max_wait )
-            {
-                last;
-            }
-        }
-    }
-
-    if ( $cmp )
-    {
-        Debug( "Waiting for command complete" );
-        my $max_wait = 10;
-        my $now = time();
-        while( 1 )
-        {
-            #print( "Waiting\n" );
-            my ( $count, $rx_msg ) = $self->{port}->read(16);
-
-            if ( $count )
-            {
-                #print( "Rx1: ".$count." bytes\n" );
-                my @resp = unpack( "C*", $rx_msg );
-                $self->printMsg( \@resp, "Rx" );
-
-                if ( $resp[0] = 0x80 + ($id<<4) )
-                {
-                    if ( ($resp[1] & 0xf0) == 0x50 )
-                    {
-                        Debug( "Got command complete" );
-                        $result = !undef;
-                    }
-                    else
-                    {
-                        Error( "Got bogus response" );
-                    }
-                    last;
-                }
-                else
-                {
-                    Error( "Got message for camera ".(($resp[0]-0x80)>>4) );
-                }
-            }
-            if ( (time() - $now) > $max_wait )
-            {
-                last;
-            }
-        }
-    }
-    return( $result );
-}
-
-sub cameraOff
-{
-    my $self = shift;
-    Debug( "Camera Off\n" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x00, 0x0, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub cameraOn
-{
-    my $self = shift;
-    Debug( "Camera On\n" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x00, 0x2, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub stop
-{
-    my $self = shift;
-    Debug( "Stop\n" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x01, 0x00, 0x00, 0x03, 0x03, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub moveConUp
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'tiltspeed', 0x40 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Up" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x01, 0x00, $speed, 0x03, 0x01, SYNC );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop( $params );
-    }
-}
-
-sub moveConDown
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'tiltspeed', 0x40 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Down" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x01, 0x00, $speed, 0x03, 0x02, SYNC );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop( $params );
-    }
-}
-
-sub movConLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'panspeed', 0x40 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Left" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x01, $speed, 0x00, 0x01, 0x03, SYNC );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop( $params );
-    }
-}
-
-sub moveConRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'panspeed', 0x40 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Right" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x01, $speed, 0x00, 0x02, 0x03, SYNC );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop( $params );
-    }
-}
-
-sub moveUpLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $panspeed = $self->getParam( $params, 'panspeed', 0x40 );
-    my $tiltspeed = $self->getParam( $params, 'tiltspeed', 0x40 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Up/Left" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x01, $panspeed, $tiltspeed, 0x01, 0x01, SYNC );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop( $params );
-    }
-}
-
-sub moveUpRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $panspeed = $self->getParam( $params, 'panspeed', 0x40 );
-    my $tiltspeed = $self->getParam( $params, 'tiltspeed', 0x40 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Up/Right" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x01, $panspeed, $tiltspeed, 0x02, 0x01, SYNC );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop( $params );
-    }
-}
-
-sub moveDownLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $panspeed = $self->getParam( $params, 'panspeed', 0x40 );
-    my $tiltspeed = $self->getParam( $params, 'tiltspeed', 0x40 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Down/Left" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x01, $panspeed, $tiltspeed, 0x01, 0x02, SYNC );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop( $params );
-    }
-}
-
-sub moveDownRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $panspeed = $self->getParam( $params, 'panspeed', 0x40 );
-    my $tiltspeed = $self->getParam( $params, 'tiltspeed', 0x40 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Move Down/Right" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x01, $panspeed, $tiltspeed, 0x02, 0x02, SYNC );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->stop( $params );
-    }
-}
-
-sub moveRelUp
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'tiltstep' );
-    my $speed = $self->getParam( $params, 'tiltspeed', 0x40 );
-    Debug( "Step Up" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x03, 0x00, $speed, 0x00, 0x00, 0x00, 0x00, ($step&0xf000)>>12, ($step&0x0f00)>>8, ($step&0x00f0)>>4, ($step&0x000f)>>0, SYNC );
-
-    $self->sendCmd( \@msg );
-}
-
-sub moveRelDown
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = -$self->getParam( $params, 'tiltstep' );
-    my $speed = $self->getParam( $params, 'tiltspeed', 0x40 );
-    Debug( "Step Down" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x03, 0x00, $speed, 0x00, 0x00, 0x00, 0x00, ($step&0xf000)>>12, ($step&0x0f00)>>8, ($step&0x00f0)>>4, ($step&0x000f)>>0, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub moveRelLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = -$self->getParam( $params, 'panstep' );
-    my $speed = $self->getParam( $params, 'panspeed', 0x40 );
-    Debug( "Step Left" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x03, $speed, 0x00, ($step&0xf000)>>12, ($step&0x0f00)>>8, ($step&0x00f0)>>4, ($step&0x000f)>>0, 0x00, 0x00, 0x00, 0x00, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub moveRelRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $step = $self->getParam( $params, 'panstep' );
-    my $speed = $self->getParam( $params, 'panspeed', 0x40 );
-    Debug( "Step Right" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x03, $speed, 0x00, ($step&0xf000)>>12, ($step&0x0f00)>>8, ($step&0x00f0)>>4, ($step&0x000f)>>0, 0x00, 0x00, 0x00, 0x00, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub moveRelUpLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $panstep = -$self->getParam( $params, 'panstep' );
-    my $tiltstep = $self->getParam( $params, 'tiltstep' );
-    my $panspeed = $self->getParam( $params, 'panspeed', 0x40 );
-    my $tiltspeed = $self->getParam( $params, 'tiltspeed', 0x40 );
-    Debug( "Step Up/Left" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x03, $panspeed, $tiltspeed, ($panstep&0xf000)>>12, ($panstep&0x0f00)>>8, ($panstep&0x00f0)>>4, ($panstep&0x000f)>>0, ($tiltstep&0xf000)>>12, ($tiltstep&0x0f00)>>8, ($tiltstep&0x00f0)>>4, ($tiltstep&0x000f)>>0, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub moveRelUpRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $panstep = $self->getParam( $params, 'panstep' );
-    my $tiltstep = $self->getParam( $params, 'tiltstep' );
-    my $panspeed = $self->getParam( $params, 'panspeed', 0x40 );
-    my $tiltspeed = $self->getParam( $params, 'tiltspeed', 0x40 );
-    Debug( "Step Up/Right" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x03, $panspeed, $tiltspeed, ($panstep&0xf000)>>12, ($panstep&0x0f00)>>8, ($panstep&0x00f0)>>4, ($panstep&0x000f)>>0, ($tiltstep&0xf000)>>12, ($tiltstep&0x0f00)>>8, ($tiltstep&0x00f0)>>4, ($tiltstep&0x000f)>>0, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub moveRelDownLeft
-{
-    my $self = shift;
-    my $params = shift;
-    my $panstep = -$self->getParam( $params, 'panstep' );
-    my $tiltstep = -$self->getParam( $params, 'tiltstep' );
-    my $panspeed = $self->getParam( $params, 'panspeed', 0x40 );
-    my $tiltspeed = $self->getParam( $params, 'tiltspeed', 0x40 );
-    Debug( "Step Down/Left" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x03, $panspeed, $tiltspeed, ($panstep&0xf000)>>12, ($panstep&0x0f00)>>8, ($panstep&0x00f0)>>4, ($panstep&0x000f)>>0, ($tiltstep&0xf000)>>12, ($tiltstep&0x0f00)>>8, ($tiltstep&0x00f0)>>4, ($tiltstep&0x000f)>>0, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub moveRelDownRight
-{
-    my $self = shift;
-    my $params = shift;
-    my $panstep = $self->getParam( $params, 'panstep' );
-    my $tiltstep = -$self->getParam( $params, 'tiltstep' );
-    my $panspeed = $self->getParam( $params, 'panspeed', 0x40 );
-    my $tiltspeed = $self->getParam( $params, 'tiltspeed', 0x40 );
-    Debug( "Step Down/Right" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x03, $panspeed, $tiltspeed, ($panstep&0xf000)>>12, ($panstep&0x0f00)>>8, ($panstep&0x00f0)>>4, ($panstep&0x000f)>>0, ($tiltstep&0xf000)>>12, ($tiltstep&0x0f00)>>8, ($tiltstep&0x00f0)>>4, ($tiltstep&0x000f)>>0, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub zoomConTele
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'speed', 0x06 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Zoom Tele" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x07, 0x20|$speed, SYNC );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->zoomStop();
-    }
-}
-
-sub zoomWide
-{
-    my $self = shift;
-    my $params = shift;
-    my $speed = $self->getParam( $params, 'speed', 0x06 );
-    my $autostop = $self->getParam( $params, 'autostop', 0 );
-    Debug( "Zoom Wide" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x07, 0x30|$speed, SYNC );
-    $self->sendCmd( \@msg );
-    if( $autostop && $self->{Monitor}->{AutoStopTimeout} )
-    {
-        usleep( $self->{Monitor}->{AutoStopTimeout} );
-        $self->zoomStop();
-    }
-}
-
-sub zoomStop
-{
-    my $self = shift;
-    my $params = shift;
-    Debug( "Zoom Stop" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x07, 0x00, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub focusConNear
-{
-    my $self = shift;
-    my $params = shift;
-    Debug( "Focus Near" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x08, 0x03, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub focusConFar
-{
-    my $self = shift;
-    my $params = shift;
-    Debug( "Focus Far" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x08, 0x02, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub focusStop
-{
-    my $self = shift;
-    my $params = shift;
-    Debug( "Focus Stop" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x08, 0x00, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub focusAuto
-{
-    my $self = shift;
-    my $params = shift;
-    Debug( "Focus Auto" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x38, 0x02, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub focusMan
-{
-    my $self = shift;
-    my $params = shift;
-    Debug( "Focus Man" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x38, 0x03, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub presetClear
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset', 1 );
-    Debug( "Clear Preset $preset" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x3f, 0x00, $preset, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub presetSet
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset', 1 );
-    Debug( "Set Preset $preset" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x3f, 0x01, $preset, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub presetGoto
-{
-    my $self = shift;
-    my $params = shift;
-    my $preset = $self->getParam( $params, 'preset', 1 );
-    Debug( "Goto Preset $preset" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x04, 0x3f, 0x02, $preset, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-sub presetHome
-{
-    my $self = shift;
-    my $params = shift;
-    Debug( "Home Preset" );
-    my @msg = ( 0x80|$self->{Monitor}->{ControlAddress}, 0x01, 0x06, 0x04, SYNC );
-    $self->sendCmd( \@msg );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/mjpgStreamer.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/mjpgStreamer.pm
deleted file mode 100644
index 33a15cba1..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Control/mjpgStreamer.pm
+++ /dev/null
@@ -1,252 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder mjpg STreamer Control Protocol Module, $Date: 2007-11-04 17:30:29 +0000 (Sun, 04 Nov 2007) $, $Revision: 2229 $
-# Copyright (C) 2003, 2004, 2005, 2006  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the implementation of the mjpg streamer camera control
-# protocol
-#
-package ZoneMinder::Control::mjpgStreamer;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Control;
-
-our @ISA = qw(ZoneMinder::Control);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# mjpgSTreamer 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 );
-    Debug( "Camera New" );
-    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;
-    Debug( "Camera 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();
-    Debug( "Camera open" );
-    use LWP::UserAgent;
-    $self->{ua} = LWP::UserAgent->new;
-    $self->{ua}->agent( "ZoneMinder Control Agent/".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 $result = undef;
-
-    printMsg( $cmd, "Tx" );
-
-    my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/$cmd" );
-    my $res = $self->{ua}->request($req);
-
-    if ( $res->is_success )
-    {
-        $result = !undef;
-    }
-    else
-    {
-        Error( "Error check failed: '".$res->status_line()."'" );
-    }
-
-    return( $result );
-}
-
-sub Up
-{
-   my $self = shift;
-   $self->moveConUp();	
-}
-
-sub Down
-{
-   my $self = shift;
-   $self->moveConDown();	
-}
-
-sub Left
-{
-   my $self = shift;
-   $self->moveConLeft();	
-}
-
-sub Right
-{
-   my $self = shift;
-   $self->moveConRight();	
-}
-
-
-sub reset
-{
-   my $self = shift;
-   $self->cameraReset();	
-}
-
-
-
-sub cameraReset
-{
-    my $self = shift;
-    Debug( "Camera Reset" );
-    my $cmd = "?action=command&command=reset_pan_tilt";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConUp
-{
-    my $self = shift;
-    Debug( "Move Up" );
-    my $cmd = "?action=command&command=tilt_minus";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConDown
-{
-    my $self = shift;
-    Debug( "Move Down" );
-    my $cmd = "?action=command&command=tilt_plus";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConLeft
-{
-    my $self = shift;
-    Debug( "Move Left" );
-    my $cmd = "?action=command&command=pan_plus";
-    $self->sendCmd( $cmd );
-}
-
-sub moveConRight
-{
-    my $self = shift;
-    Debug( "Move Right" );
-    my $cmd = "?action=command&command=pan_minus";
-    $self->sendCmd( $cmd );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2005 by Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/Database.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/Database.pm
deleted file mode 100644
index d0bae5dde..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Database.pm
+++ /dev/null
@@ -1,238 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Database Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the common definitions and functions used by the rest 
-# of the ZoneMinder scripts
-#
-package ZoneMinder::Database;
-
-use 5.006;
-use strict;
-use warnings;
-
-require Exporter;
-require ZoneMinder::Base;
-
-our @ISA = qw(Exporter ZoneMinder::Base);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration	use ZoneMinder ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our %EXPORT_TAGS = (
-    'functions' => [ qw(
-		zmDbConnect
-		zmDbDisconnect
-		zmDbGetMonitors
-		zmDbGetMonitor
-		zmDbGetMonitorAndControl
-	) ]
-);
-push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
-
-our @EXPORT = qw();
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Database Access
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-use ZoneMinder::Config qw(:all);
-
-use Carp;
-
-our $dbh = undef;
-
-sub zmDbConnect( ;$ )
-{
-	my $force = shift;
-	if ( $force )
-	{
-		 zmDbDisconnect();
-	}
-	if ( !defined( $dbh ) )
-	{
-        my ( $host, $port ) = ( ZM_DB_HOST =~ /^([^:]+)(?::(.+))?$/ );
-
-        if ( defined($port) )
-        {
-		    $dbh = DBI->connect( "DBI:mysql:database=".ZM_DB_NAME.";host=".$host.";port=".$port, ZM_DB_USER, ZM_DB_PASS );
-        }
-        else
-        {
-		    $dbh = DBI->connect( "DBI:mysql:database=".ZM_DB_NAME.";host=".ZM_DB_HOST, ZM_DB_USER, ZM_DB_PASS );
-        }
-        $dbh->trace( 0 );
-	}
-	return( $dbh );
-}
-
-sub zmDbDisconnect()
-{
-	if ( defined( $dbh ) )
-	{
-		$dbh->disconnect();
-		$dbh = undef;
-	}
-}
-
-use constant DB_MON_ALL => 0; # All monitors
-use constant DB_MON_CAPT => 1; # All monitors that are capturing
-use constant DB_MON_ACTIVE => 2; # All monitors that are active
-use constant DB_MON_MOTION => 3; # All monitors that are doing motion detection
-use constant DB_MON_RECORD => 4; # All monitors that are doing unconditional recording
-use constant DB_MON_PASSIVE => 5; # All monitors that are in nodect state
-
-sub zmDbGetMonitors( ;$ )
-{
-	zmDbConnect();
-
-	my $function = shift || DB_MON_ALL;
-	my $sql = "select * from Monitors";
-
-	if ( $function )
-	{
-		if ( $function == DB_MON_CAPT )
-		{
-			$sql .= " where Function >= 'Monitor'";
-		}
-		elsif ( $function == DB_MON_ACTIVE )
-		{
-			$sql .= " where Function > 'Monitor'";
-		}
-		elsif ( $function == DB_MON_MOTION )
-		{
-			$sql .= " where Function = 'Modect' or Function = 'Mocord'";
-		}
-		elsif ( $function == DB_MON_RECORD )
-		{
-			$sql .= " where Function = 'Record' or Function = 'Mocord'";
-		}
-		elsif ( $function == DB_MON_PASSIVE )
-		{
-			$sql .= " where Function = 'Nodect'";
-		}
-	}
-	my $sth = $dbh->prepare_cached( $sql ) or croak( "Can't prepare '$sql': ".$dbh->errstr() );
-	my $res = $sth->execute() or croak( "Can't execute '$sql': ".$sth->errstr() );
-
-	my @monitors;
-    while( my $monitor = $sth->fetchrow_hashref() )
-    {
-		push( @monitors, $monitor );
-	}
-	$sth->finish();
-	return( \@monitors );
-}
-
-sub zmDbGetMonitor( $ )
-{
-	zmDbConnect();
-
-	my $id = shift;
-
-	return( undef ) if ( !defined($id) );
-
-	my $sql = "select * from Monitors where Id = ?";
-	my $sth = $dbh->prepare_cached( $sql ) or croak( "Can't prepare '$sql': ".$dbh->errstr() );
-	my $res = $sth->execute( $id ) or croak( "Can't execute '$sql': ".$sth->errstr() );
-    my $monitor = $sth->fetchrow_hashref();
-
-	return( $monitor );
-}
-
-sub zmDbGetMonitorAndControl( $ )
-{
-	zmDbConnect();
-
-	my $id = shift;
-
-	return( undef ) if ( !defined($id) );
-
-    my $sql = "select C.*,M.*,C.Protocol from Monitors as M inner join Controls as C on (M.ControlId = C.Id) where M.Id = ?";
-	my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-	my $res = $sth->execute( $id ) or Fatal( "Can't execute '$sql': ".$sth->errstr() );
-    my $monitor = $sth->fetchrow_hashref();
-
-	return( $monitor );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/General.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/General.pm
deleted file mode 100644
index 5af7150a8..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/General.pm
+++ /dev/null
@@ -1,768 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder General Utility Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the common definitions and functions used by the rest 
-# of the ZoneMinder scripts
-#
-package ZoneMinder::General;
-
-use 5.006;
-use strict;
-use warnings;
-
-require Exporter;
-require ZoneMinder::Base;
-
-our @ISA = qw(Exporter ZoneMinder::Base);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration   use ZoneMinder ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our %EXPORT_TAGS = (
-    'functions' => [ qw(
-        executeShellCommand
-        getCmdFormat
-        runCommand
-        setFileOwner
-        getEventPath
-        createEventPath
-        createEvent
-        deleteEventFiles
-        makePath
-        jsonEncode
-        jsonDecode
-    ) ]
-);
-push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
-
-our @EXPORT = qw();
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# General Utility Functions
-#
-# ==========================================================================
-
-use ZoneMinder::Config qw(:all);
-use ZoneMinder::Logger qw(:all);
-use ZoneMinder::Database qw(:all);
-
-use POSIX;
-
-# For running general shell commands
-sub executeShellCommand( $ )
-{
-    my $command = shift;
-    my $output = qx( $command );
-    my $status = $? >> 8;
-    if ( $status || logDebugging() )
-    {
-        Debug( "Command: $command\n" );
-        chomp( $output );
-        Debug( "Output: $output\n" );
-    }
-    return( $status );
-}
-
-sub getCmdFormat()
-{
-    Debug( "Testing valid shell syntax\n" );
-
-    my ( $name ) = getpwuid( $> );
-    if ( $name eq ZM_WEB_USER )
-    {
-        Debug( "Running as '$name', su commands not needed\n" );
-        return( "" );
-    }
-
-    my $null_command = "true";
-
-    my $prefix = "sudo -u ".ZM_WEB_USER." ";
-    my $suffix = "";
-    my $command = $prefix.$null_command.$suffix;
-    Debug( "Testing \"$command\"\n" );
-    $command .= " > /dev/null 2>&1"; 
-    my $output = qx($command);
-    my $status = $? >> 8;
-    if ( !$status )
-    {
-        Debug( "Test ok, using format \"$prefix<command>$suffix\"\n" );
-        return( $prefix, $suffix );
-    }
-    else
-    {
-        chomp( $output );
-        Debug( "Test failed, '$output'\n" );
-
-        $prefix = "su ".ZM_WEB_USER." --shell=/bin/sh --command='";
-        $suffix = "'";
-        $command = $prefix.$null_command.$suffix;
-        Debug( "Testing \"$command\"\n" );
-        my $output = qx($command);
-        my $status = $? >> 8;
-        if ( !$status )
-        {
-            Debug( "Test ok, using format \"$prefix<command>$suffix\"\n" );
-            return( $prefix, $suffix );
-        }
-        else
-        {
-            chomp( $output );
-            Debug( "Test failed, '$output'\n" );
-
-            $prefix = "su ".ZM_WEB_USER." -c '";
-            $suffix = "'";
-            $command = $prefix.$null_command.$suffix;
-            Debug( "Testing \"$command\"\n" );
-            $output = qx($command);
-            $status = $? >> 8;
-            if ( !$status )
-            {
-                Debug( "Test ok, using format \"$prefix<command>$suffix\"\n" );
-                return( $prefix, $suffix );
-            }
-            else
-            {
-                chomp( $output );
-                Debug( "Test failed, '$output'\n" );
-            }
-        }
-    }
-    Error( "Unable to find valid 'su' syntax\n" );
-    exit( -1 );
-}
-
-our $testedShellSyntax = 0;
-our ( $cmdPrefix, $cmdSuffix );
-
-# For running ZM daemons etc
-sub runCommand( $ )
-{
-    if ( !$testedShellSyntax )
-    {
-        # Determine the appropriate syntax for the su command
-        ( $cmdPrefix, $cmdSuffix ) = getCmdFormat();
-        $testedShellSyntax = !undef;
-    }
-
-    my $command = shift;
-    $command = ZM_PATH_BIN."/".$command;
-    if ( $cmdPrefix )
-    {
-        $command = $cmdPrefix.$command.$cmdSuffix;
-    }
-    Debug( "Command: $command\n" );
-    my $output = qx($command);
-    my $status = $? >> 8;
-    chomp( $output );
-    if ( $status || logDebugging() )
-    {
-        if ( $status )
-        {
-            Error( "Unable to run \"$command\", output is \"$output\"\n" );
-            exit( -1 );
-        }
-        else
-        {
-            Debug( "Output: $output\n" );
-        }
-    }
-    return( $output );
-}
-
-sub getEventPath( $ )
-{
-    my $event = shift;
-
-    my $event_path = "";
-    if ( ZM_USE_DEEP_STORAGE )
-    {
-        $event_path = ZM_DIR_EVENTS.'/'.$event->{MonitorId}.'/'.strftime( "%y/%m/%d/%H/%M/%S", localtime($event->{Time}) );
-    }
-    else
-    {
-        $event_path = ZM_DIR_EVENTS.'/'.$event->{MonitorId}.'/'.$event->{Id};
-    }
-    $event_path = ZM_PATH_WEB.'/'.$event_path if ( index(ZM_DIR_EVENTS,'/') != 0 );
-    return( $event_path );
-}
-
-sub createEventPath( $ )
-{
-    #
-    # WARNING assumes running from events directory
-    #
-    my $event = shift;
-    my $eventRootPath = (ZM_DIR_EVENTS=~m|/|)?ZM_DIR_EVENTS:(ZM_PATH_WEB.'/'.ZM_DIR_EVENTS);
-    my $eventPath = $eventRootPath.'/'.$event->{MonitorId};
-
-    if ( ZM_USE_DEEP_STORAGE )
-    {
-        my @startTime = localtime( $event->{StartTime} );
-
-        my @datetimeParts = ();
-        $datetimeParts[0] = sprintf( "%02d", $startTime[5]-100 );
-        $datetimeParts[1] = sprintf( "%02d", $startTime[4]+1 );
-        $datetimeParts[2] = sprintf( "%02d", $startTime[3] );
-        $datetimeParts[3] = sprintf( "%02d", $startTime[2] );
-        $datetimeParts[4] = sprintf( "%02d", $startTime[1] );
-        $datetimeParts[5] = sprintf( "%02d", $startTime[0] );
-
-        my $datePath = join('/',@datetimeParts[0..2]);
-        my $timePath = join('/',@datetimeParts[3..5]);
-
-        makePath( $datePath, $eventPath );
-        $eventPath .= '/'.$datePath;
-
-        # Create event id symlink
-        my $idFile = sprintf( "%s/.%d", $eventPath, $event->{Id} );
-        symlink( $timePath, $idFile ) or Fatal( "Can't symlink $idFile -> $eventPath: $!" );
-
-        makePath( $timePath, $eventPath );
-        $eventPath .= '/'.$timePath;
-        setFileOwner( $idFile ); # Must come after directory has been created
-
-        # Create empty id tag file
-        $idFile = sprintf( "%s/.%d", $eventPath, $event->{Id} );
-        open( ID_FP, ">$idFile" ) or Fatal( "Can't open $idFile: $!" );
-        close( ID_FP );
-        setFileOwner( $idFile );
-    }
-    else
-    {
-        makePath( $event->{Id}, $eventPath );
-        $eventPath .= '/'.$event->{Id};
-
-        my $idFile = sprintf( "%s/.%d", $eventPath, $event->{Id} );
-        open( ID_FP, ">$idFile" ) or Fatal( "Can't open $idFile: $!" );
-        close( ID_FP );
-        setFileOwner( $idFile );
-    }
-    return( $eventPath );
-}
-
-use Data::Dumper;
-
-our $_setFileOwner = undef;
-our ( $_ownerUid, $_ownerGid );
-
-sub _checkProcessOwner()
-{
-    if ( !defined($_setFileOwner) )
-    {
-        my ( $processOwner ) = getpwuid( $> );
-        if ( $processOwner ne ZM_WEB_USER )
-        {
-            # Not running as web user, so should be root in whch case chown the temporary directory
-            ( my $ownerName, my $ownerPass, $_ownerUid, $_ownerGid ) = getpwnam( ZM_WEB_USER ) or Fatal( "Can't get user details for web user '".ZM_WEB_USER."': $!" );
-            $_setFileOwner = 1;
-        }
-        else
-        {
-            $_setFileOwner = 0;
-        }
-    }
-    return( $_setFileOwner );
-}
-
-sub setFileOwner( $ )
-{
-    my $file = shift;
-
-    if ( _checkProcessOwner() )
-    {
-        chown( $_ownerUid, $_ownerGid, $file ) or Fatal( "Can't change ownership of file '$file' to '".ZM_WEB_USER.":".ZM_WEB_GROUP."': $!" );
-    }
-}
-
-our $_hasImageInfo = undef;
-
-sub _checkForImageInfo()
-{
-    if ( !defined($_hasImageInfo) )
-    {
-        my $result = eval
-        {
-            require Image::Info;
-            Image::Info->import();
-        };
-        $_hasImageInfo = $@?0:1;
-    }
-    return( $_hasImageInfo );
-}
-
-sub createEvent( $;$ )
-{
-    my $event = shift;
-
-    Debug( "Creating event" );
-    #print( Dumper( $event )."\n" );
-
-    _checkForImageInfo();
-
-    my $dbh = zmDbConnect();
-
-    if ( $event->{monitor} )
-    {
-        $event->{MonitorId} = $event->{monitor}->{Id};
-    }
-    elsif ( $event->{MonitorId} )
-    {
-        my $sql = "select * from Monitors where Id = ?";
-        my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare sql '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute( $event->{MonitorId} ) or Fatal( "Can't execute sql '$sql': ".$sth->errstr() );
-        $event->{monitor} = $sth->fetchrow_hashref() or Fatal( "Unable to create event, can't load monitor with id '".$event->{MonitorId}."'" );
-        $sth->finish();
-    }
-    else
-    {
-        Fatal( "Unable to create event, no monitor or monitor id supplied" );
-    }
-    $event->{Name} = "New Event" unless( $event->{Name} );
-    $event->{Frames} = int(@{$event->{frames}});
-    $event->{TotScore} = $event->{MaxScore} = 0;
-
-    my $lastTimestamp = 0.0;
-    foreach my $frame ( @{$event->{frames}} )
-    {
-        if ( !$event->{Width} )
-        {
-            if ( $_hasImageInfo )
-            {
-                my $imageInfo = Image::Info::image_info( $frame->{imagePath} );
-                if ( $imageInfo->{error} )
-                {
-                    Error( "Unable to extract image info from '".$frame->{imagePath}."': ".$imageInfo->{error} );
-                }
-                else
-                {
-                    ( $event->{Width}, $event->{Height} ) = Image::Info::dim( $imageInfo );
-                }
-            }
-        }
-        $frame->{Type} = $frame->{Score}>0?'Alarm':'Normal' unless( $frame->{Type} );
-        $frame->{Delta} = $lastTimestamp?($frame->{TimeStamp}-$lastTimestamp):0.0;
-        $event->{StartTime} = $frame->{TimeStamp} unless ( $event->{StartTime} );
-        $event->{TotScore} += $frame->{Score};
-        $event->{MaxScore} = $frame->{Score} if ( $frame->{Score} > $event->{MaxScore} );
-        $event->{AlarmFrames}++ if ( $frame->{Type} eq 'Alarm' );
-        $event->{EndTime} = $frame->{TimeStamp};
-        $lastTimestamp = $frame->{TimeStamp};
-    }
-    $event->{Width} = $event->{monitor}->{Width} unless( $event->{Width} );
-    $event->{Height} = $event->{monitor}->{Height} unless( $event->{Height} );
-    $event->{AvgScore} = $event->{TotScore}/int($event->{AlarmFrames});
-    $event->{Length} = $event->{EndTime} - $event->{StartTime};
-
-    my %formats = (
-        StartTime => 'from_unixtime(?)',
-        EndTime => 'from_unixtime(?)',
-    );
-
-    my ( @fields, @formats, @values );
-    while ( my ( $field, $value ) = each( %$event ) )
-    {
-        next unless $field =~ /^[A-Z]/;
-        push( @fields, $field );
-        push( @formats, ($formats{$field} or '?') );
-        push( @values, $event->{$field} );
-    }
-
-    my $sql = "insert into Events (".join(',',@fields).") values (".join(',',@formats).")";
-    my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare sql '$sql': ".$dbh->errstr() );
-    my $res = $sth->execute( @values ) or Fatal( "Can't execute sql '$sql': ".$sth->errstr() );
-    $event->{Id} = $dbh->{mysql_insertid};
-    Info( "Created event ".$event->{Id} );
-
-    if ( $event->{EndTime} )
-    {
-        $event->{Name} = $event->{monitor}->{EventPrefix}.$event->{Id} if ( $event->{Name} eq 'New Event' );
-        my $sql = "update Events set Name = ? where Id = ?";
-        my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare sql '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute( $event->{Name}, $event->{Id} ) or Fatal( "Can't execute sql '$sql': ".$sth->errstr() );
-    }
-
-    my $eventPath = createEventPath( $event );
-
-    my %frameFormats = (
-        TimeStamp => 'from_unixtime(?)',
-    );
-    my $frameId = 1;
-    foreach my $frame ( @{$event->{frames}} )
-    {
-        $frame->{EventId} = $event->{Id};
-        $frame->{FrameId} = $frameId++;
-
-        my ( @fields, @formats, @values );
-        while ( my ( $field, $value ) = each( %$frame ) )
-        {
-            next unless $field =~ /^[A-Z]/;
-            push( @fields, $field );
-            push( @formats, ($frameFormats{$field} or '?') );
-            push( @values, $frame->{$field} );
-        }
-
-        my $sql = "insert into Frames (".join(',',@fields).") values (".join(',',@formats).")";
-        my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare sql '$sql': ".$dbh->errstr() );
-        my $res = $sth->execute( @values ) or Fatal( "Can't execute sql '$sql': ".$sth->errstr() );
-        #$frame->{FrameId} = $dbh->{mysql_insertid};
-        if ( $frame->{imagePath} )
-        {
-            $frame->{capturePath} = sprintf( "%s/%0".ZM_EVENT_IMAGE_DIGITS."d-capture.jpg", $eventPath, $frame->{FrameId} );
-            rename( $frame->{imagePath}, $frame->{capturePath} ) or Fatal( "Can't copy ".$frame->{imagePath}." to ".$frame->{capturePath}.": $!" );
-            setFileOwner( $frame->{capturePath} );
-            if ( 0 && ZM_CREATE_ANALYSIS_IMAGES )
-            {
-                $frame->{analysePath} = sprintf( "%s/%0".ZM_EVENT_IMAGE_DIGITS."d-analyse.jpg", $eventPath, $frame->{FrameId} );
-                link( $frame->{capturePath}, $frame->{analysePath} ) or Fatal( "Can't link ".$frame->{capturePath}." to ".$frame->{analysePath}.": $!" );
-                setFileOwner( $frame->{analysePath} );
-            }
-        }
-    }
-}
-
-sub addEventImage( $$ )
-{
-    my $event = shift;
-    my $frame = shift;
-
-    # TBD
-}
-
-sub updateEvent( $ )
-{
-    my $event = shift;
-
-    if ( !$event->{EventId} )
-    {
-        Error( "Unable to update event, no event id supplied" );
-        return( 0 );
-    }
-
-    my $dbh = zmDbConnect();
-
-    $event->{Name} = $event->{monitor}->{EventPrefix}.$event->{Id} if ( $event->{Name} eq 'New Event' );
-
-    my %formats = (
-        StartTime => 'from_unixtime(?)',
-        EndTime => 'from_unixtime(?)',
-    );
-
-    my ( @values, @sets );
-    while ( my ( $field, $value ) = each( %$event ) )
-    {
-        next if ( $field eq 'Id' );
-        push( @values, $event->{$field} );
-        push( @sets, $field." = ".($formats{$field} or '?') );
-    }
-    my $sql = "update Events set ".join(',',@sets)." where Id = ?";
-    push( @values, $event->{Id} );
-
-    my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare sql '$sql': ".$dbh->errstr() );
-    my $res = $sth->execute( @values ) or Fatal( "Can't execute sql '$sql': ".$sth->errstr() );
-}
-
-sub deleteEventFiles( $;$ )
-{
-    #
-    # WARNING assumes running from events directory
-    #
-    my $event_id = shift;
-    my $monitor_id = shift;
-    $monitor_id = '*' if ( !defined($monitor_id) );
-
-    if ( ZM_USE_DEEP_STORAGE )
-    {
-        my $link_path = $monitor_id."/*/*/*/.".$event_id;
-        #Debug( "LP1:$link_path" );
-        my @links = glob($link_path);
-        #Debug( "L:".$links[0].": $!" );
-        if ( @links )
-        {
-            ( $link_path ) = ( $links[0] =~ /^(.*)$/ ); # De-taint
-            #Debug( "LP2:$link_path" );
-
-            ( my $day_path = $link_path ) =~ s/\.\d+//;
-            #Debug( "DP:$day_path" );
-            my $event_path = $day_path.readlink( $link_path );
-            ( $event_path ) = ( $event_path =~ /^(.*)$/ ); # De-taint
-            #Debug( "EP:$event_path" );
-            my $command = "/bin/rm -rf ".$event_path;
-            #Debug( "C:$command" );
-            executeShellCommand( $command );
-
-            unlink( $link_path ) or Error( "Unable to unlink '$link_path': $!" );
-            my @path_parts = split( /\//, $event_path );
-            for ( my $i = int(@path_parts)-2; $i >= 1; $i-- )
-            {
-                my $delete_path = join( '/', @path_parts[0..$i] );
-                #Debug( "DP$i:$delete_path" );
-                my @has_files = glob( $delete_path."/*" );
-                #Debug( "HF1:".$has_files[0] ) if ( @has_files );
-                last if ( @has_files );
-                @has_files = glob( $delete_path."/.[0-9]*" );
-                #Debug( "HF2:".$has_files[0] ) if ( @has_files );
-                last if ( @has_files );
-                my $command = "/bin/rm -rf ".$delete_path;
-                executeShellCommand( $command );
-            }
-        }
-    }
-    else
-    {
-        my $command = "/bin/rm -rf $monitor_id/$event_id";
-        executeShellCommand( $command );
-    }
-}
-
-sub makePath( $;$ )
-{
-    my $path = shift;
-    my $root = shift;
-    $root = (( $path =~ m|^/| )?'':'.' ) unless( $root );
-
-    Debug( "Creating path '$path' in $root'\n" );
-    my @parts = split( '/', $path );
-    my $fullPath = $root;
-    foreach my $dir ( @parts )
-    {
-        $fullPath .= '/'.$dir;
-        if ( !-d $fullPath )
-        {
-            if ( -e $fullPath )
-            {
-                Fatal( "Can't create '$fullPath', already exists as non directory" );
-            }
-            else
-            {
-                Debug( "Creating '$fullPath'\n" );
-                mkdir( $fullPath, 0755 ) or Fatal( "Can't mkdir '$fullPath': $!" );
-                setFileOwner( $fullPath );
-            }
-        }
-    }
-    return( $fullPath );
-}
-
-our $testedJSON = 0;
-our $hasJSONAny = 0;
-
-sub _testJSON
-{
-    return if ( $testedJSON );
-    my $result = eval
-    {
-        require JSON::Any;
-        JSON::Any->import();
-    };
-    $testedJSON = 1;
-    $hasJSONAny = 1 if ( $result );
-}
-
-sub _getJSONType( $ )
-{
-    my $value = shift;
-    return( 'null' ) unless( defined($value) );
-    return( 'integer' ) if ( $value =~ /^\d+$/ );
-    return( 'double' ) if ( $value =~ /^\d+$/ );
-    return( 'hash' ) if ( ref($value) eq 'HASH' );
-    return( 'array' ) if ( ref($value) eq 'ARRAY' );
-    return( 'string' );
-}
-
-sub jsonEncode( $ );
-
-sub jsonEncode( $ )
-{
-    my $value = shift;
-
-    _testJSON();
-    if ( $hasJSONAny )
-    {
-        my $string = eval { JSON::Any->objToJson( $value ) };
-        Fatal( "Unable to encode object to JSON: $@" ) unless( $string );
-        return( $string );
-    }
-
-    my $type = _getJSONType($value);
-    if ( $type eq 'integer' || $type eq 'double' )
-    {
-        return( $value );
-    }
-    elsif ( $type eq 'boolean' )
-    {
-        return( $value?'true':'false' );
-    }
-    elsif ( $type eq 'string' )
-    {
-        $value =~ s|(["\\/])|\\$1|g;
-        $value =~ s|\r?\n|\n|g;
-        return( '"'.$value.'"' );
-    }
-    elsif ( $type eq 'null' )
-    {
-        return( 'null' );
-    }
-    elsif ( $type eq 'array' )
-    {
-        return( '['.join( ',', map { jsonEncode( $_ ) } @$value ).']' );
-    }
-    elsif ( $type eq 'hash' )
-    {
-        my $result = '{';
-        while ( my ( $subKey=>$subValue ) = each( %$value ) )
-        {
-            $result .= ',' if ( $result ne '{' );
-            $result .= '"'.$subKey.'":'.jsonEncode( $subValue );
-        }
-        return( $result.'}' );
-    }
-    else
-    {
-        Fatal( "Unexpected type '$type'" );
-    }
-}
-
-sub jsonDecode( $ )
-{
-    my $value = shift;
-
-    _testJSON();
-    if ( $hasJSONAny )
-    {
-        my $object = eval { JSON::Any->jsonToObj( $value ) };
-        Fatal( "Unable to decode JSON string '$value': $@" ) unless( $object );
-        return( $object );
-    }
-
-    my $comment = 0;
-    my $unescape = 0;
-    my $out = '';
-    my @chars = split( //, $value );
-    for ( my $i = 0; $i < @chars; $i++ )
-    {
-        if ( !$comment )
-        {
-            if ( $chars[$i] eq ':' )
-            {
-                $out .= '=>';
-            }
-            else
-            {
-                $out .= $chars[$i];         
-            }
-        }
-        elsif ( !$unescape )
-        {
-            if ( $chars[$i] eq '\\' )
-            {
-                $unescape = 1;
-            }
-            else
-            {
-                $out .= $chars[$i];
-            }
-        }
-        else
-        {
-            if ( $chars[$i] ne '/' )
-            {
-                $out .= '\\';
-            }
-            $out .= $chars[$i];
-            $unescape = 0;
-        }
-        if ( $chars[$i] eq '"' )
-        {
-            $comment = !$comment;
-        }
-    }
-    $out =~ s/=>true/=>1/g;
-    $out =~ s/=>false/=>0/g;
-    $out =~ s/=>null/=>undef/g;
-    $out =~ s/`/'/g;
-    $out =~ s/qx/qq/g;
-    ( $out ) = $out =~ m/^({.+})$/; # Detaint and check it's a valid object syntax
-    my $result = eval $out;
-    Fatal( $@ ) if ( $@ );
-    return( $result );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/Logger.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/Logger.pm
deleted file mode 100644
index 46095be2e..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Logger.pm
+++ /dev/null
@@ -1,861 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Logger Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the debug definitions and functions used by the rest 
-# of the ZoneMinder scripts
-#
-package ZoneMinder::Logger;
-
-use 5.006;
-use strict;
-use warnings;
-
-require Exporter;
-require ZoneMinder::Base;
-
-our @ISA = qw(Exporter ZoneMinder::Base);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration   use ZoneMinder ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our %EXPORT_TAGS = (
-    'constants' => [ qw(
-        DEBUG
-        INFO
-        WARNING
-        ERROR
-        FATAL
-        PANIC
-        NOLOG
-    ) ],
-    'functions' => [ qw(
-        logInit
-        logReinit
-        logTerm
-        logSetSignal
-        logClearSignal
-        logDebugging
-        logLevel
-        logTermLevel
-        logDatabaseLevel
-        logFileLevel
-        logSyslogLevel
-        Mark
-        Dump
-        Debug
-        Info
-        Warning
-        Error
-        Fatal
-        Panic
-    ) ]
-);
-push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
-
-our @EXPORT = qw();
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Logger Facilities
-#
-# ==========================================================================
-
-use ZoneMinder::Config qw(:all);
-
-use DBI;
-use Carp;
-use POSIX;
-use IO::Handle;
-use Data::Dumper;
-use Time::HiRes qw/gettimeofday/;
-use Sys::Syslog;
-
-use constant {
-    DEBUG => 1,
-    INFO => 0,
-    WARNING => -1,
-    ERROR => -2,
-    FATAL => -3,
-    PANIC => -4,
-    NOLOG => -5
-};
-
-our %codes = (
-    &DEBUG => "DBG",
-    &INFO => "INF",
-    &WARNING => "WAR",
-    &ERROR => "ERR",
-    &FATAL => "FAT",
-    &PANIC => "PNC",
-    &NOLOG => "OFF"
-);
-
-our %priorities = (
-    &DEBUG => "debug",
-    &INFO => "info",
-    &WARNING => "warning",
-    &ERROR => "err",
-    &FATAL => "err",
-    &PANIC => "err"
-);
-
-our $logger;
-
-sub new
-{
-    my $class = shift;
-    my $this = {};
-
-    $this->{initialised} = undef;
-
-    #$this->{id} = "zmundef";
-    ( $this->{id} ) = $0 =~ m|^(?:.*/)?([^/]+?)(?:\.[^/.]+)?$|;
-    $this->{idRoot} = $this->{id};
-    $this->{idArgs} = "";
-
-    $this->{level} = INFO;
-    $this->{termLevel} = NOLOG;
-    $this->{databaseLevel} = NOLOG;
-    $this->{fileLevel} = NOLOG;
-    $this->{syslogLevel} = NOLOG;
-    $this->{effectiveLevel} = INFO;
-
-    $this->{autoFlush} = 1;
-    $this->{hasTerm} = -t STDERR;
-
-    ( $this->{fileName} = $0 ) =~ s|^.*/||;
-    $this->{logPath} = ZM_PATH_LOGS;
-    $this->{logFile} = $this->{logPath}."/".$this->{id}.".log";
-
-    $this->{trace} = 0;
-
-    bless( $this, $class );
-    return $this;
-}
-
-sub BEGIN
-{
-    # Fake the config variables that are used in case they are not defined yet
-    # Only really necessary to support upgrade from previous version
-    if ( !eval('defined(ZM_LOG_DEBUG)') )
-    {
-        no strict 'subs';
-        no strict 'refs';
-        my %dbgConfig = (
-            ZM_LOG_LEVEL_DATABASE => 0,
-            ZM_LOG_LEVEL_FILE => 0,
-            ZM_LOG_LEVEL_SYSLOG => 0,
-            ZM_LOG_DEBUG => 0,
-            ZM_LOG_DEBUG_TARGET => "",
-            ZM_LOG_DEBUG_LEVEL => 1,
-            ZM_LOG_DEBUG_FILE => "" 
-        );
-        while ( my ( $name, $value ) = each( %dbgConfig ) )
-        {
-            *{$name} = sub { $value };
-        }
-        use strict 'subs';
-        use strict 'refs';
-    }
-}
-
-sub DESTROY
-{
-    my $this = shift;
-    $this->terminate();
-}
-
-sub initialise( @ )
-{
-    my $this = shift;
-    my %options = @_;
-
-    $this->{id} = $options{id} if ( defined($options{id}) );
-
-    $this->{logPath} = $options{logPath} if ( defined($options{logPath}) );
-
-    my $tempLogFile;
-    $tempLogFile = $this->{logPath}."/".$this->{id}.".log";
-    $tempLogFile = $options{logFile} if ( defined($options{logFile}) );
-    if ( my $logFile = $this->getTargettedEnv('LOG_FILE') )
-    {
-        $tempLogFile = $logFile;
-    }
-
-    my $tempLevel = INFO;
-    my $tempTermLevel = $this->{termLevel};
-    my $tempDatabaseLevel = $this->{databaseLevel};
-    my $tempFileLevel = $this->{fileLevel};
-    my $tempSyslogLevel = $this->{syslogLevel};
-
-    $tempTermLevel = $options{termLevel} if ( defined($options{termLevel}) );
-    if ( defined($options{databaseLevel}) )
-    {
-        $tempDatabaseLevel = $options{databaseLevel};
-    }
-    else
-    {
-        $tempDatabaseLevel = ZM_LOG_LEVEL_DATABASE;
-    }
-    if ( defined($options{fileLevel}) )
-    {
-        $tempFileLevel = $options{fileLevel};
-    }
-    else
-    {
-        $tempFileLevel = ZM_LOG_LEVEL_FILE;
-    }
-    if ( defined($options{syslogLevel}) )
-    {
-        $tempSyslogLevel = $options{syslogLevel};
-    }
-    else
-    {
-        $tempSyslogLevel = ZM_LOG_LEVEL_SYSLOG;
-    }
-
-    if ( defined($ENV{'LOG_PRINT'}) )
-    {
-        $tempTermLevel = $ENV{'LOG_PRINT'}? DEBUG : NOLOG;
-    }
-
-    my $level;
-    $tempLevel = $level if ( defined($level = $this->getTargettedEnv('LOG_LEVEL')) );
-
-    $tempTermLevel = $level if ( defined($level = $this->getTargettedEnv('LOG_LEVEL_TERM')) );
-    $tempDatabaseLevel = $level if ( defined($level = $this->getTargettedEnv('LOG_LEVEL_DATABASE')) );
-    $tempFileLevel = $level if ( defined($level = $this->getTargettedEnv('LOG_LEVEL_FILE')) );
-    $tempSyslogLevel = $level if ( defined($level = $this->getTargettedEnv('LOG_LEVEL_SYSLOG')) );
-
-    if ( ZM_LOG_DEBUG )
-    {
-        foreach my $target ( split( /\|/, ZM_LOG_DEBUG_TARGET ) )
-        {
-            if ( $target eq $this->{id} || $target eq "_".$this->{id} || $target eq $this->{idRoot} || $target eq "_".$this->{idRoot} || $target eq "" )
-            {
-                if ( ZM_LOG_DEBUG_LEVEL > NOLOG )
-                {
-                    $tempLevel = $this->limit( ZM_LOG_DEBUG_LEVEL );
-                    if ( ZM_LOG_DEBUG_FILE ne "" )
-                    {
-                        $tempLogFile = ZM_LOG_DEBUG_FILE;
-                        $tempFileLevel = $tempLevel;
-                    }
-                }
-            }
-        }
-    }
-
-    $this->logFile( $tempLogFile );
-
-    $this->termLevel( $tempTermLevel );
-    $this->databaseLevel( $tempDatabaseLevel );
-    $this->fileLevel( $tempFileLevel );
-    $this->syslogLevel( $tempSyslogLevel );
-
-    $this->level( $tempLevel );
-
-    $this->{trace} = $options{trace} if ( defined($options{trace}) );
-
-    $this->{autoFlush} = $ENV{'LOG_FLUSH'}?1:0 if ( defined($ENV{'LOG_FLUSH'}) );
-
-    $this->{initialised} = !undef;
-    
-    Debug( "LogOpts: level=".$codes{$this->{level}}."/".$codes{$this->{effectiveLevel}}.", screen=".$codes{$this->{termLevel}}.", database=".$codes{$this->{databaseLevel}}.", logfile=".$codes{$this->{fileLevel}}."->".$this->{logFile}.", syslog=".$codes{$this->{syslogLevel}} );
-}
-
-sub terminate()
-{
-    my $this = shift;
-    return unless ( $this->{initialised} );
-    $this->syslogLevel( NOLOG );
-    $this->fileLevel( NOLOG );
-    $this->databaseLevel( NOLOG );
-    $this->termLevel( NOLOG );
-}
-
-sub reinitialise()
-{
-    my $this = shift;
-
-    return unless ( $this->{initialised} );
-
-    # Bit of a nasty hack to reopen connections to log files and the DB
-    my $syslogLevel = $this->syslogLevel();
-    $this->syslogLevel( NOLOG );
-    my $logfileLevel = $this->fileLevel();
-    $this->fileLevel( NOLOG );
-    my $databaseLevel = $this->databaseLevel();
-    $this->databaseLevel( NOLOG );
-    my $screenLevel = $this->termLevel();
-    $this->termLevel( NOLOG );
-
-    $this->syslogLevel( $syslogLevel ) if ( $syslogLevel > NOLOG );
-    $this->fileLevel( $logfileLevel ) if ( $logfileLevel > NOLOG );
-    $this->databaseLevel( $databaseLevel ) if ( $databaseLevel > NOLOG );
-    $this->databaseLevel( $databaseLevel ) if ( $databaseLevel > NOLOG );
-}
-
-sub limit( $ )
-{
-    my $this = shift;
-    my $level = shift;
-    return( DEBUG ) if ( $level > DEBUG );
-    return( NOLOG ) if ( $level < NOLOG );
-    return( $level );
-}
-
-sub getTargettedEnv( $ )
-{
-    my $this = shift;
-    my $name = shift;
-    my $envName = $name."_".$this->{id};
-    my $value;
-    $value = $ENV{$envName} if ( defined($ENV{$envName}) );
-    if ( !defined($value) && $this->{id} ne $this->{idRoot} )
-    {
-        $envName = $name."_".$this->{idRoot};
-        $value = $ENV{$envName} if ( defined($ENV{$envName}) );
-    }
-    if ( !defined($value) )
-    {
-        $value = $ENV{$name} if ( defined($ENV{$name}) );
-    }
-    if ( defined($value) )
-    {
-        ( $value ) = $value =~ m/(.*)/;
-    }
-    return( $value );
-}
-
-sub fetch()
-{
-    if ( !$logger )
-    {
-        $logger = ZoneMinder::Logger->new();
-        $logger->initialise( 'syslogLevel'=>INFO, 'databaseLevel'=>INFO );
-    }
-    return( $logger );
-}
-
-sub id( ;$ )
-{
-    my $this = shift;
-    my $id = shift;
-    if ( defined($id) && $this->{id} ne $id )
-    {
-        # Remove whitespace
-        $id =~ s/\S//g;
-        # Replace non-alphanum with underscore
-        $id =~ s/[^a-zA-Z_]/_/g;
-
-        if ( $this->{id} ne $id )
-        {
-            $this->{id} = $this->{idRoot} = $id;
-            if ( $id =~ /^([^_]+)_(.+)$/ )
-            {
-                $this->{idRoot} = $1;
-                $this->{idArgs} = $2;
-            }
-        }
-    }
-    return( $this->{id} );
-}
-
-sub level( ;$ )
-{
-    my $this = shift;
-    my $level = shift;
-    if ( defined($level) )
-    {
-        $this->{level} = $this->limit( $level );
-        $this->{effectiveLevel} = NOLOG;
-        $this->{effectiveLevel} = $this->{termLevel} if ( $this->{termLevel} > $this->{effectiveLevel} );
-        $this->{effectiveLevel} = $this->{databaseLevel} if ( $this->{databaseLevel} > $this->{effectiveLevel} );
-        $this->{effectiveLevel} = $this->{fileLevel} if ( $this->{fileLevel} > $this->{effectiveLevel} );
-        $this->{effectiveLevel} = $this->{syslogLevel} if ( $this->{syslogLevel} > $this->{level} );
-        $this->{effectiveLevel} = $this->{level} if ( $this->{effectiveLevel} > $this->{level} );
-    }
-    return( $this->{level} );
-}
-
-sub debugOn()
-{
-    my $this = shift;
-    return( $this->{effectiveLevel} >= DEBUG );
-}
-
-sub trace( ;$ )
-{
-    my $this = shift;
-    $this->{trace} = $_[0] if ( @_ );
-    return( $this->{trace} );
-}
-
-sub termLevel( ;$ )
-{
-    my $this = shift;
-    my $termLevel = shift;
-    if ( defined($termLevel) )
-    {
-        $termLevel = NOLOG if ( !$this->{hasTerm} );
-        $termLevel = $this->limit( $termLevel );
-        if ( $this->{termLevel} != $termLevel )
-        {
-            $this->{termLevel} = $termLevel;
-        }
-    }
-    return( $this->{termLevel} );
-}
-
-sub databaseLevel( ;$ )
-{
-    my $this = shift;
-    my $databaseLevel = shift;
-    if ( defined($databaseLevel) )
-    {
-        $databaseLevel = $this->limit( $databaseLevel );
-        if ( $this->{databaseLevel} != $databaseLevel )
-        {
-            if ( $databaseLevel > NOLOG && $this->{databaseLevel} <= NOLOG )
-            {
-                if ( !$this->{dbh} )
-                {
-                    my ( $host, $port ) = ( ZM_DB_HOST =~ /^([^:]+)(?::(.+))?$/ );
-
-                    if ( defined($port) )
-                    {
-                        $this->{dbh} = DBI->connect( "DBI:mysql:database=".ZM_DB_NAME.";host=".$host.";port=".$port, ZM_DB_USER, ZM_DB_PASS );
-                    }
-                    else
-                    {
-                        $this->{dbh} = DBI->connect( "DBI:mysql:database=".ZM_DB_NAME.";host=".ZM_DB_HOST, ZM_DB_USER, ZM_DB_PASS );
-                    }
-                    if ( !$this->{dbh} )
-                    {
-                        $databaseLevel = NOLOG;
-                        Error( "Unable to write log entries to DB, can't connect to database '".ZM_DB_NAME."' on host '".ZM_DB_HOST."'" );
-                    }
-                    else
-                    {
-                        $this->{dbh}->{AutoCommit} = 1;
-                        Fatal( "Can't set AutoCommit on in database connection" ) unless( $this->{dbh}->{AutoCommit} );
-                        $this->{dbh}->{mysql_auto_reconnect} = 1;
-                        Fatal( "Can't set mysql_auto_reconnect on in database connection" ) unless( $this->{dbh}->{mysql_auto_reconnect} );
-                        $this->{dbh}->trace( 0 );
-                    }
-                }
-            }
-            elsif ( $databaseLevel <= NOLOG && $this->{databaseLevel} > NOLOG )
-            {
-                if ( $this->{dbh} )
-                {
-                    $this->{dbh}->disconnect();
-                    undef($this->{dbh});
-                }
-            }
-            $this->{databaseLevel} = $databaseLevel;
-        }
-    }
-    return( $this->{databaseLevel} );
-}
-
-sub fileLevel( ;$ )
-{
-    my $this = shift;
-    my $fileLevel = shift;
-    if ( defined($fileLevel) )
-    {
-        $fileLevel = $this->limit($fileLevel);
-        if ( $this->{fileLevel} != $fileLevel )
-        {
-            $this->closeFile() if ( $this->{fileLevel} > NOLOG );
-            $this->{fileLevel} = $fileLevel;
-            $this->openFile() if ( $this->{fileLevel} > NOLOG );
-        }
-    }
-    return( $this->{fileLevel} );
-}
-
-sub syslogLevel( ;$ )
-{
-    my $this = shift;
-    my $syslogLevel = shift;
-    if ( defined($syslogLevel) )
-    {
-        $syslogLevel = $this->limit($syslogLevel);
-        if ( $this->{syslogLevel} != $syslogLevel )
-        {
-            $this->closeSyslog() if ( $syslogLevel <= NOLOG && $this->{syslogLevel} > NOLOG );
-            $this->openSyslog() if ( $syslogLevel > NOLOG && $this->{syslogLevel} <= NOLOG );
-            $this->{syslogLevel} = $syslogLevel;
-        }
-    }
-    return( $this->{syslogLevel} );
-}
-
-sub openSyslog()
-{
-    my $this = shift;
-    openlog( $this->{id}, "pid", "local1" );
-}
-
-sub closeSyslog()
-{
-    my $this = shift;
-    #closelog();
-}
-
-sub logFile( $ )
-{
-    my $this = shift;
-    my $logFile = shift;
-    if ( $logFile =~ /^(.+)\+$/ )
-    {
-        $this->{logFile} = $1.'.'.$$;
-    }
-    else
-    {
-        $this->{logFile} = $logFile;
-    }
-}
-
-sub openFile()
-{
-    my $this = shift;
-    if ( open( LOGFILE, ">>".$this->{logFile} ) )
-    {
-        LOGFILE->autoflush() if ( $this->{autoFlush} );
-
-        my $webUid = (getpwnam( ZM_WEB_USER ))[2];
-        my $webGid = (getgrnam( ZM_WEB_GROUP ))[2];
-        if ( $> == 0 )
-        {
-            chown( $webUid, $webGid, $this->{logFile} ) or Fatal( "Can't change permissions on log file '".$this->{logFile}."': $!" )
-        }
-    }
-    else
-    {
-        $this->fileLevel( NOLOG );
-        Error( "Can't open log file '".$this->{logFile}."': $!" );
-    }
-}
-
-sub closeFile()
-{
-    my $this = shift;
-    close( LOGFILE ) if ( fileno(LOGFILE) );
-}
-
-sub logPrint( $;$ )
-{
-    my $this = shift;
-    my $level = shift;
-    my $string = shift;
-
-    if ( $level <= $this->{effectiveLevel} )
-    {
-        $string =~ s/[\r\n]+$//g;
-
-        my $code = $codes{$level};
-
-        my ($seconds, $microseconds) = gettimeofday();
-        my $message = sprintf( "%s.%06d %s[%d].%s [%s]", strftime( "%x %H:%M:%S", localtime( $seconds ) ), $microseconds, $this->{id}, $$, $code, $string );
-        if ( $this->{trace} )
-        {
-            $message = Carp::shortmess( $message );
-        }
-        else
-        {
-            $message = $message."\n";
-        }
-        syslog( $priorities{$level}, $code." [%s]", $string ) if ( $level <= $this->{syslogLevel} );
-        print( LOGFILE $message ) if ( $level <= $this->{fileLevel} );
-        if ( $level <= $this->{databaseLevel} )
-        {
-            my $sql = "insert into Logs ( TimeKey, Component, Pid, Level, Code, Message, File, Line ) values ( ?, ?, ?, ?, ?, ?, ?, NULL )";
-            $this->{sth} = $this->{dbh}->prepare_cached( $sql );
-            if ( !$this->{sth} )
-            {
-                $this->{databaseLevel} = NOLOG;
-                Fatal( "Can't prepare log entry '$sql': ".$this->{dbh}->errstr() );
-            }
-            my $res = $this->{sth}->execute( $seconds+($microseconds/1000000.0), $this->{id}, $$, $level, $code, $string, $this->{fileName} );
-            if ( !$res )
-            {
-                $this->{databaseLevel} = NOLOG;
-                Fatal( "Can't execute log entry '$sql': ".$this->{sth}->errstr() );
-            }
-        }
-        print( STDERR $message ) if ( $level <= $this->{termLevel} );
-    }
-}
-
-sub logInit( ;@ )
-{
-    my %options = @_ ? @_ : ();
-    $logger = ZoneMinder::Logger->new() if ( !$logger );
-    $logger->initialise( %options );
-}
-
-sub logReinit()
-{
-    fetch()->reinitialise();
-}
-
-sub logTerm
-{
-    return unless ( $logger );
-    $logger->terminate();
-    $logger = undef;
-}
-
-sub logHupHandler()
-{
-    my $savedErrno = $!;
-    return unless( $logger );
-    fetch()->reinitialise();
-    logSetSignal();
-    $! = $savedErrno;
-}
-
-sub logSetSignal()
-{
-    $SIG{HUP} = \&logHupHandler;
-}
-
-sub logClearSignal()
-{
-    $SIG{HUP} = 'DEFAULT';
-}
-
-sub logLevel( ;$ )
-{
-    return( fetch()->level( @_ ) );
-}
-
-sub logDebugging()
-{
-    return( fetch()->debugOn() );
-}
-
-sub logTermLevel( ;$ )
-{
-    return( fetch()->termLevel( @_ ) );
-}
-
-sub logDatabaseLevel( ;$ )
-{
-    return( fetch()->databaseLevel( @_ ) );
-}
-
-sub logFileLevel( ;$ )
-{
-    return( fetch()->fileLevel( @_ ) );
-}
-
-sub logSyslogLevel( ;$ )
-{
-    return( fetch()->syslogLevel( @_ ) );
-}
-
-sub Mark( ;$$ )
-{
-    my $level = shift;
-    $level = DEBUG unless( defined($level) );
-    my $tag = "Mark";
-    fetch()->logPrint( $level, $tag );
-}
-
-sub Dump( \$;$ )
-{
-    my $var = shift;
-    my $label = shift;
-    $label = "VAR" unless( defined($label) );
-    fetch()->logPrint( DEBUG, Data::Dumper->Dump( [ $var ], [ $label ] ) );
-}
-
-sub Debug( @ )
-{
-    fetch()->logPrint( DEBUG, @_ );
-}
-
-sub Info( @ )
-{
-    fetch()->logPrint( INFO, @_ );
-}
-
-sub Warning( @ )
-{
-    fetch()->logPrint( WARNING, @_ );
-}
-
-sub Error( @ )
-{
-    fetch()->logPrint( ERROR, @_ );
-}
-
-sub Fatal( @ )
-{
-    fetch()->logPrint( FATAL, @_ );
-    exit( -1 );
-}
-
-sub Panic( @ )
-{
-    fetch()->logPrint( PANIC, @_ );
-    confess( $_[0] );
-}
-
-1;
-__END__
-
-=head1 NAME
-
-ZoneMinder::Logger - ZoneMinder Logger module
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Logger;
-  use ZoneMinder::Logger qw(:all);
-
-  logInit( "myproc", DEBUG );
-
-  Debug( "This is what is happening" );
-  Info( "Something interesting is happening" );
-  Warning( "Something might be going wrong." );
-  Error( "Something has gone wrong!!" );
-  Fatal( "Something has gone badly wrong, gotta stop!!" );
-  Panic( "Something fundamental has gone wrong, die with stack trace );
-
-=head1 DESCRIPTION
-
-The ZoneMinder:Logger module contains the common debug and error reporting routines used by the ZoneMinder scripts.
-
-To use debug in your scripts you need to include this module, and call logInit. Thereafter you can sprinkle Debug or Error calls etc throughout the code safe in the knowledge that they will be reported to your error log, and possibly the syslogger, in a meaningful and consistent format.
-
-Debug is discussed in terms of levels where 1 and above (currently only 1 for scripts) is considered debug, 0 is considered as informational, -1 is a warning, -2 is an error and -3 is a fatal error or panic. Where levels are mentioned below as thresholds the value given and anything with a lower level (ie. more serious) will be included.
-
-=head1 METHODS
-
-=over 4
-
-=item logInit ( $id, %options );
-
-Initialises the debug and prepares the logging for forthcoming operations. If not called explicitly it will be called by the first debug call in your script, but with default (and probably meaningless) options. The only compulsory arguments are $id which must be a string that will identify debug coming from this script in mixed logs. Other options may be provided as below,
-
- Option        Default        Description
- ---------     ---------      -----------
- level         INFO       The initial debug level which defines which statements are output and which are ignored
- trace         0          Whether to use the Carp::shortmess format in debug statements to identify where the debug was emitted from
- termLevel     NOLOG      At what level debug is written to terminal standard error, 0 is no, 1 is yes, 2 is write only if terminal
- databaseLevel INFO       At what level debug is written to the Log table in the database;
- fileLevel     NOLOG      At what level debug is written to a log file of the format of <id>.log in the standard log directory.
- syslogLevel   INFO       At what level debug is written to syslog.
- 
-To disable any of these action entirely set to NOLOG
-
-=item logTerm ();
-
-Used to end the debug session and close any logs etc. Not usually necessary.
-
-=item $id            = logId ( [$id] );
-
-=item $level         = logLevel ( [$level] );
-
-=item $trace         = logTrace ( [$trace] );
-
-=item $level         = logLevel ( [$level] );
-
-=item $termLevel     = logTermLevel ( [$termLevel] );
-
-=item $databaseLevel = logDatabaseLevel ( [$databaseLevel] );
-
-=item $fileLevel     = logFileLevel ( [$fileLevel] );
-
-=item $syslogLevel   = logSyslogLevel ( [$syslogLevel] );
-
-These methods can be used to get and set the current settings as defined in logInit.
-
-=item Debug( $string );
-
-This method will output a debug message if the current debug level permits it, otherwise does nothing. This message will be tagged with the DBG string in the logs.
-
-=item Info( $string );
-
-This method will output an informational message if the current debug level permits it, otherwise does nothing. This message will be tagged with the INF string in the logs.
-
-=item Warning( $string );
-
-This method will output a warning message if the current debug level permits it, otherwise does nothing. This message will be tagged with the WAR string in the logs.
-
-=item Error( $string );
-
-This method will output an error message if the current debug level permits it, otherwise does nothing. This message will be tagged with the ERR string in the logs.
-
-=item Fatal( $string );
-
-This method will output a fatal error message and then die if the current debug level permits it, otherwise does nothing. This message will be tagged with the FAT string in the logs.
-
-=item Panic( $string );
-
-This method will output a panic error message and then die with a stack trace if the current debug level permits it, otherwise does nothing. This message will be tagged with the PNC string in the logs.
-
-=head2 EXPORT
-
-None by default.
-The :constants tag will export the debug constants which define the various levels of debug
-The :variables tag will export variables containing the current debug id and level
-The :functions tag will export the debug functions. This or :all is what you would normally use.
-The :all tag will export all above symbols.
-
-
-=head1 SEE ALSO
-
-Carp
-Sys::Syslog
-
-The ZoneMinder README file Troubleshooting section for an extended discussion on the use and configuration of syslog with ZoneMinder.
-
-http://www.zoneminder.com
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/Memory.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/Memory.pm
deleted file mode 100644
index 86037713d..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Memory.pm
+++ /dev/null
@@ -1,873 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Memory Access Module, $Date: 2008-02-25 10:13:13 +0000 (Mon, 25 Feb 2008) $, $Revision: 2323 $
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the common definitions and functions used by the rest 
-# of the ZoneMinder scripts
-#
-package ZoneMinder::Memory;
-
-use 5.006;
-use strict;
-use warnings;
-
-require Exporter;
-require ZoneMinder::Base;
-
-our @ISA = qw(Exporter ZoneMinder::Base);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration	use ZoneMinder ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our %EXPORT_TAGS = (
-	'constants' => [ qw(
-		STATE_IDLE
-		STATE_PREALARM
-		STATE_ALARM
-		STATE_ALERT
-		STATE_TAPE
-		ACTION_GET
-		ACTION_SET
-		ACTION_RELOAD
-		ACTION_SUSPEND
-		ACTION_RESUME
-		TRIGGER_CANCEL
-		TRIGGER_ON
-		TRIGGER_OFF 
-	) ],
-	'functions' => [ qw(
-		zmMemVerify
-		zmMemInvalidate
-		zmMemRead
-		zmMemWrite
-		zmMemTidy
-		zmGetMonitorState
-		zmGetAlarmLocation
-		zmIsAlarmed
-		zmInAlarm
-		zmHasAlarmed
-		zmGetLastEvent
-		zmGetLastWriteTime
-		zmGetLastReadTime
-		zmMonitorEnable
-		zmMonitorDisable
-		zmMonitorSuspend
-		zmMonitorResume
-		zmTriggerEventOn
-		zmTriggerEventOff
-		zmTriggerEventCancel
-		zmTriggerShowtext
-	) ],
-);
-push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
-
-our @EXPORT = qw();
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Shared Memory Facilities
-#
-# ==========================================================================
-
-use ZoneMinder::Config qw(:all);
-use ZoneMinder::Logger qw(:all);
-
-use constant STATE_IDLE     => 0;
-use constant STATE_PREALARM => 1;
-use constant STATE_ALARM    => 2;
-use constant STATE_ALERT    => 3;
-use constant STATE_TAPE     => 4;
-
-use constant ACTION_GET     => 1;
-use constant ACTION_SET     => 2;
-use constant ACTION_RELOAD  => 4;
-use constant ACTION_SUSPEND => 16;
-use constant ACTION_RESUME  => 32;
-
-use constant TRIGGER_CANCEL => 0;
-use constant TRIGGER_ON     => 1;
-use constant TRIGGER_OFF    => 2;
-
-use Storable qw( freeze thaw );
-
-if ( "yes" eq 'yes' ) # 'yes' if memory is mmapped
-{
-    require ZoneMinder::Memory::Mapped;
-    ZoneMinder::Memory::Mapped->import();
-}
-else
-{
-    require ZoneMinder::Memory::Shared;
-    ZoneMinder::Memory::Shared->import();
-}
-
-# Native architecture
-our $arch = int(3.2*length(~0));
-our $native = $arch/8;
-our $mem_seq = 0;
-
-our $mem_data =
-{
-	"shared_data" => { "type"=>"SharedData", "seq"=>$mem_seq++, "contents"=> {
-		"size"             => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"last_write_index" => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"last_read_index"  => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"state"            => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"last_event"       => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"action"           => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"brightness"       => { "type"=>"int32", "seq"=>$mem_seq++ },
-		"hue"              => { "type"=>"int32", "seq"=>$mem_seq++ },
-		"colour"           => { "type"=>"int32", "seq"=>$mem_seq++ },
-		"contrast"         => { "type"=>"int32", "seq"=>$mem_seq++ },
-		"alarm_x"          => { "type"=>"int32", "seq"=>$mem_seq++ },
-		"alarm_y"          => { "type"=>"int32", "seq"=>$mem_seq++ },
-		"valid"            => { "type"=>"uint8", "seq"=>$mem_seq++ },
-		"active"           => { "type"=>"uint8", "seq"=>$mem_seq++ },
-		"signal"           => { "type"=>"uint8", "seq"=>$mem_seq++ },
-		"format"           => { "type"=>"uint8", "seq"=>$mem_seq++ },
-		"imagesize"        => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"epadding1"        => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"epadding2"        => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"last_write_time"  => { "type"=>"time_t64", "seq"=>$mem_seq++ },
-		"last_read_time"   => { "type"=>"time_t64", "seq"=>$mem_seq++ },
-		"control_state"    => { "type"=>"uint8[256]", "seq"=>$mem_seq++ },
-		}
-	},
-	"trigger_data" => { "type"=>"TriggerData", "seq"=>$mem_seq++, "contents"=> {
-		"size"             => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"trigger_state"    => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"trigger_score"    => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"padding"          => { "type"=>"uint32", "seq"=>$mem_seq++ },
-		"trigger_cause"    => { "type"=>"int8[32]", "seq"=>$mem_seq++ },
-		"trigger_text"     => { "type"=>"int8[256]", "seq"=>$mem_seq++ },
-		"trigger_showtext" => { "type"=>"int8[256]", "seq"=>$mem_seq++ },
-		}
-	},
-	"end" => { "seq"=>$mem_seq++, "size"=> 0 }
-};
-
-our $mem_size = 0;
-our $mem_verified = {};
-
-sub zmMemInit
-{
-	my $offset = 0;
-
-	foreach my $section_data ( sort { $a->{seq} <=> $b->{seq} } values( %$mem_data ) )
-	{
-		$section_data->{offset} = $offset;
-		$section_data->{align} = 0;
-
-		if ( $section_data->{align} > 1 )
-		{
-			my $rem = $offset % $section_data->{align};
-			if ( $rem > 0 )
-			{
-				$offset += ($section_data->{align} - $rem);
-			}
-		}
-		foreach my $member_data ( sort { $a->{seq} <=> $b->{seq} } values( %{$section_data->{contents}} ) )
-		{
-			if ( $member_data->{type} eq "long" || $member_data->{type} eq "ulong" || $member_data->{type} eq "size_t")
-			{
-				$member_data->{size} = $member_data->{align} = $native;
-			}
-			elsif( $member_data->{type} eq "int64" || $member_data->{type} eq "uint64" || $member_data->{type} eq "time_t64")
-			{
-				$member_data->{size} = $member_data->{align} = 8;
-			}
-			elsif ( $member_data->{type} eq "int32" || $member_data->{type} eq "uint32" || $member_data->{type} eq "bool4" )
-			{
-				$member_data->{size} = $member_data->{align} = 4;
-			}
-			elsif ($member_data->{type} eq "int16" || $member_data->{type} eq "uint16")
-			{
-				$member_data->{size} = $member_data->{align} = 2;
-			}
-			elsif ( $member_data->{type} eq "int8" || $member_data->{type} eq "uint8" || $member_data->{type} eq "bool1" )
-			{
-				$member_data->{size} = $member_data->{align} = 1;
-			}
-			elsif ( $member_data->{type} =~ /^u?int8\[(\d+)\]$/ )
-			{
-				$member_data->{size} = $1;
-				$member_data->{align} = 1;
-			}
-			else
-			{
-				Fatal( "Unexpected type '".$member_data->{type}."' found in shared data definition." );
-			}
-
-			if ( $member_data->{align} > 1 && ($offset%$member_data->{align}) > 0 )
-			{
-				$offset += ($member_data->{align} - ($offset%$member_data->{align}));
-			}
-			$member_data->{offset} = $offset;
-			$offset += $member_data->{size}
-		}
-		$section_data->{size} = $offset - $section_data->{offset};
-	}
-
-	$mem_size = $offset;
-}
-
-&zmMemInit();
-
-sub zmMemVerify( $ )
-{
-	my $monitor = shift;
-	if ( !zmMemAttach( $monitor, $mem_size ) )
-	{
-		return( undef );
-	}
-
-    my $mem_key = zmMemKey( $monitor );
-	if ( !defined($mem_verified->{$mem_key}) )
-	{
-		my $sd_size = zmMemRead( $monitor, "shared_data:size", 1 );
-		if ( $sd_size != $mem_data->{shared_data}->{size} )
-		{
-			if ( $sd_size )
-			{
-				Error( "Shared data size conflict in shared_data for monitor ".$monitor->{Name}.", expected ".$mem_data->{shared_data}->{size}.", got ".$sd_size );
-			}
-			else
-			{
-				Debug( "Shared data size conflict in shared_data for monitor ".$monitor->{Name}.", expected ".$mem_data->{shared_data}->{size}.", got ".$sd_size );
-			}
-			return( undef );
-		}
-		my $td_size = zmMemRead( $monitor, "trigger_data:size", 1 );
-		if ( $td_size != $mem_data->{trigger_data}->{size} )
-		{
-			if ( $td_size )
-			{
-				Error( "Shared data size conflict in trigger_data for monitor ".$monitor->{Name}.", expected ".$mem_data->{triggger_data}->{size}.", got ".$td_size );
-			}
-			else
-			{
-				Debug( "Shared data size conflict in trigger_data for monitor ".$monitor->{Name}.", expected ".$mem_data->{triggger_data}->{size}.", got ".$td_size );
-			}
-			return( undef );
-		}
-		$mem_verified->{$mem_key} = !undef;
-	}
-	return( !undef );
-}
-
-sub zmMemRead( $$;$ )
-{
-	my $monitor = shift;
-	my $fields = shift;
-	my $nocheck = shift;
-
-	if ( !($nocheck || zmMemVerify( $monitor )) )
-	{
-		return( undef );
-	}
-
-	if ( !ref($fields) )
-	{
-		$fields = [ $fields ];
-	}
-	my @values;
-	foreach my $field ( @$fields )
-	{
-		my ( $section, $element ) = split( /[\/:.]/, $field );
-		Fatal( "Invalid shared data selector '$field'" ) if ( !$section || !$element );
-
-		my $offset = $mem_data->{$section}->{contents}->{$element}->{offset};
-		my $type = $mem_data->{$section}->{contents}->{$element}->{type};
-		my $size = $mem_data->{$section}->{contents}->{$element}->{size};
-
-		my $data = zmMemGet( $monitor, $offset, $size );
-        if ( !defined($data) )
-        {
-            Error( "Unable to read '$field' from memory for monitor ".$monitor->{Id} );
-            zmMemInvalidate( $monitor );
-            return( undef );
-        }
-		my $value;
-		if ( $type eq "long" )
-		{
-			( $value ) = unpack( "l!", $data );
-		}
-		elsif ( $type eq "ulong" || $type eq "size_t" )
-		{
-			( $value ) = unpack( "L!", $data );
-		}
-		elsif ( $type eq "int64" || $type eq "time_t64" )
-		{
-			# The "q" type is only available on 64bit platforms, so use native.
-			( $value ) = unpack( "l!", $data );
-		}
-		elsif ( $type eq "uint64" )
-		{
-			# The "q" type is only available on 64bit platforms, so use native.
-			( $value ) = unpack( "L!", $data );
-		}
-		elsif ( $type eq "int32" )
-		{
-			( $value ) = unpack( "l", $data );
-		}
-		elsif ( $type eq "uint32" || $type eq "bool4" )
-		{
-			( $value ) = unpack( "L", $data );
-		}
-		elsif ( $type eq "int16" )
-		{
-			( $value ) = unpack( "s", $data );
-		}
-		elsif ( $type eq "uint16" )
-		{
-			( $value ) = unpack( "S", $data );
-		}
-		elsif ( $type eq "int8" )
-		{
-			( $value ) = unpack( "c", $data );
-		}
-		elsif ( $type eq "uint8" || $type eq "bool1" )
-		{
-			( $value ) = unpack( "C", $data );
-		}
-		elsif ( $type =~ /^int8\[\d+\]$/ )
-		{
-			( $value ) = unpack( "Z".$size, $data );
-		} 
-		elsif ( $type =~ /^uint8\[\d+\]$/ )
-		{
-			( $value ) = unpack( "C".$size, $data );
-		} 
-		else
-		{
-			Fatal( "Unexpected type '".$type."' found for '".$field."'" );
-		}
-		push( @values, $value );
-	}
-	if ( wantarray() )
-	{
-		return( @values )
-	}
-	return( $values[0] );
-}
-
-sub zmMemInvalidate( $ )
-{
-	my $monitor = shift;
-    my $mem_key = zmMemKey($monitor);
-    if ( $mem_key )
-    {
-        delete $mem_verified->{$mem_key};
-        zmMemDetach( $monitor );
-    }
-}
-
-sub zmMemTidy()
-{
-    zmMemClean();
-}
-
-sub zmMemWrite( $$;$ )
-{
-	my $monitor = shift;
-	my $field_values = shift;
-	my $nocheck = shift;
-
-	if ( !($nocheck || zmMemVerify( $monitor )) )
-	{
-		return( undef );
-	}
-
-	while ( my ( $field, $value ) = each( %$field_values ) )
-	{
-		my ( $section, $element ) = split( /[\/:.]/, $field );
-		Fatal( "Invalid shared data selector '$field'" ) if ( !$section || !$element );
-
-		my $offset = $mem_data->{$section}->{contents}->{$element}->{offset};
-		my $type = $mem_data->{$section}->{contents}->{$element}->{type};
-		my $size = $mem_data->{$section}->{contents}->{$element}->{size};
-
-		my $data;
-		if ( $type eq "long" )
-		{
-			$data = pack( "l!", $value );
-		}
-		elsif ( $type eq "ulong" || $type eq "size_t" )
-		{
-			$data = pack( "L!", $value );
-		}
-		elsif ( $type eq "int64" || $type eq "time_t64" )
-		{
-			# The "q" type is only available on 64bit platforms, so use native.
-			$data = pack( "l!", $value );
-		}
-		elsif ( $type eq "uint64" )
-		{
-			# The "q" type is only available on 64bit platforms, so use native.
-			$data = pack( "L!", $value );
-		}
-		elsif ( $type eq "int32" )
-		{
-			$data = pack( "l", $value );
-		}
-		elsif ( $type eq "uint32" || $type eq "bool4" )
-		{
-			$data = pack( "L", $value );
-		}
-		elsif ( $type eq "int16" )
-		{
-			$data = pack( "s", $value );
-		}
-		elsif ( $type eq "uint16" )
-		{
-			$data = pack( "S", $value );
-		}
-		elsif ( $type eq "int8" )
-		{
-			$data = pack( "c", $value );
-		}
-		elsif ( $type eq "uint8" || $type eq "bool1" )
-		{
-			$data = pack( "C", $value );
-		}
-		elsif ( $type =~ /^int8\[\d+\]$/ )
-		{
-			$data = pack( "Z".$size, $value );
-		} 
-		elsif ( $type =~ /^uint8\[\d+\]$/ )
-		{
-			$data = pack( "C".$size, $value );
-		} 
-		else
-		{
-			Fatal( "Unexpected type '".$type."' found for '".$field."'" );
-		}
-
-        if ( !zmMemPut( $monitor, $offset, $size, $data ) )
-        {
-            Error( "Unable to write '$value' to '$field' in memory for monitor ".$monitor->{Id} );
-            zmMemInvalidate( $monitor );
-            return( undef );
-        }
-	}
-	return( !undef );
-}
-
-sub zmGetMonitorState( $ )
-{
-	my $monitor = shift;
-
-	return( zmMemRead( $monitor, "shared_data:state" ) );
-}
-
-sub zmGetAlarmLocation( $ )
-{
-	my $monitor = shift;
-
-	return( zmMemRead( $monitor, [ "shared_data:alarm_x", "shared_data:alarm_y" ] ) );
-}
-
-sub zmSetControlState( $$ )
-{
-	my $monitor = shift;
-	my $control_state = shift;
-
-	zmMemWrite( $monitor, { "shared_data:control_state" => $control_state } );
-}
-
-sub zmGetControlState( $ )
-{
-	my $monitor = shift;
-
-	return( zmMemRead( $monitor, "shared_data:control_state" ) );
-}
-
-sub zmSaveControlState( $$ )
-{
-	my $monitor = shift;
-	my $control_state = shift;
-
-	zmSetControlState( $monitor, freeze( $control_state ) );
-}
-
-sub zmRestoreControlState( $ )
-{
-	my $monitor = shift;
-
-	return( thaw( zmGetControlState( $monitor ) ) );
-}
-
-sub zmIsAlarmed( $ )
-{
-	my $monitor = shift;
-
-	my $state = zmGetMonitorState( $monitor );
-
-	return( $state == STATE_ALARM );
-}
-
-sub zmInAlarm( $ )
-{
-	my $monitor = shift;
-
-	my $state = zmGetMonitorState( $monitor );
-
-	return( $state == STATE_ALARM || $state == STATE_ALERT );
-}
-
-sub zmHasAlarmed( $$ )
-{
-	my $monitor = shift;
-	my $last_event_id = shift;
-
-	my ( $state, $last_event ) = zmMemRead( $monitor, [ "shared_data:state", "shared_data:last_event" ] );
-
-	if ( $state == STATE_ALARM || $state == STATE_ALERT )
-	{
-		return( $last_event );
-	}
-	elsif( $last_event != $last_event_id )
-	{
-		return( $last_event );
-	}
-	return( undef );
-}
-
-sub zmGetLastEvent( $ )
-{
-	my $monitor = shift;
-
-	return( zmMemRead( $monitor, "shared_data:last_event" ) );
-}
-
-sub zmGetLastWriteTime( $ )
-{
-	my $monitor = shift;
-
-	return( zmMemRead( $monitor, "shared_data:last_write_time" ) );
-}
-
-sub zmGetLastReadTime( $ )
-{
-	my $monitor = shift;
-
-	return( zmMemRead( $monitor, "shared_data:last_read_time" ) );
-}
-
-sub zmGetMonitorActions( $ )
-{
-	my $monitor = shift;
-
-	return( zmMemRead( $monitor, "shared_data:action" ) );
-}
-
-sub zmMonitorEnable( $ )
-{
-	my $monitor = shift;
-
-	my $action = zmMemRead( $monitor, "shared_data:action" );
-	$action |= ACTION_SUSPEND;
-	zmMemWrite( $monitor, { "shared_data:action" => $action } );
-}
-
-sub zmMonitorDisable( $ )
-{
-	my $monitor = shift;
-
-	my $action = zmMemRead( $monitor, "shared_data:action" );
-	$action |= ACTION_RESUME;
-	zmMemWrite( $monitor, { "shared_data:action" => $action } );
-}
-
-sub zmMonitorSuspend( $ )
-{
-	my $monitor = shift;
-
-	my $action = zmMemRead( $monitor, "shared_data:action" );
-	$action |= ACTION_SUSPEND;
-	zmMemWrite( $monitor, { "shared_data:action" => $action } );
-}
-
-sub zmMonitorResume( $ )
-{
-	my $monitor = shift;
-
-	my $action = zmMemRead( $monitor, "shared_data:action" );
-	$action |= ACTION_RESUME;
-	zmMemWrite( $monitor, { "shared_data:action" => $action } );
-}
-
-sub zmGetTriggerState( $ )
-{
-	my $monitor = shift;
-
-	return( zmMemRead( $monitor, "trigger_data:trigger_state" ) );
-}
-
-sub zmTriggerEventOn( $$$;$$ )
-{
-	my $monitor = shift;
-	my $score = shift;
-	my $cause = shift;
-	my $text = shift;
-	my $showtext = shift;
-
-	my $values = {
-		"trigger_data:trigger_score" => $score,
-		"trigger_data:trigger_cause" => $cause,
-	};
-	$values->{"trigger_data:trigger_text"} = $text if ( defined($text) );
-	$values->{"trigger_data:trigger_showtext"} = $showtext if ( defined($showtext) );
-	$values->{"trigger_data:trigger_state"} = TRIGGER_ON; # Write state last so event not read incomplete
-
-	zmMemWrite( $monitor, $values );
-}
-
-sub zmTriggerEventOff( $ )
-{
-	my $monitor = shift;
-
-	my $values = {
-		"trigger_data:trigger_state"    => TRIGGER_OFF,
-		"trigger_data:trigger_score"    => 0,
-		"trigger_data:trigger_cause"    => "",
-		"trigger_data:trigger_text"     => "",
-		"trigger_data:trigger_showtext" => "",
-	};
-
-	zmMemWrite( $monitor, $values );
-}
-
-sub zmTriggerEventCancel( $ )
-{
-	my $monitor = shift;
-
-	my $values = {
-		"trigger_data:trigger_state"    => TRIGGER_CANCEL,
-		"trigger_data:trigger_score"    => 0,
-		"trigger_data:trigger_cause"    => "",
-		"trigger_data:trigger_text"     => "",
-		"trigger_data:trigger_showtext" => "",
-	};
-
-	zmMemWrite( $monitor, $values );
-}
-
-sub zmTriggerShowtext( $$ )
-{
-	my $monitor = shift;
-	my $showtext = shift;
-
-	my $values = {
-		"trigger_data:trigger_showtext" => $showtext,
-	};
-
-	zmMemWrite( $monitor, $values );
-}
-
-1;
-__END__
-
-=head1 NAME
-
-ZoneMinder::MappedMem - ZoneMinder Mapped Memory access module
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::MappedMem;
-  use ZoneMinder::MappedMem qw(:all);
-
-  if ( zmMemVerify( $monitor ) )
-  {
-    $state = zmGetMonitorState( $monitor );
-    if ( $state == STATE_ALARM )
-    {
-      ...
-    }
-  }
-
-  ( $lri, $lwi ) = zmMemRead( $monitor, [ "shared_data:last_read_index", "shared_data:last_write_index" ] );
-  zmMemWrite( $monitor, { "trigger_data:trigger_showtext" => "Some Text" } );
-
-=head1 DESCRIPTION
-
-The ZoneMinder:MappedMem module contains methods for accessing and writing to mapped memory as well as helper methods for common operations.
-
-The core elements of ZoneMinder used mapped memory to allow multiple access to resources. Although ZoneMinder scripts have used this information before, up until now it was difficult to access and prone to errors. This module introduces a common API for mapped memory access (both reading and writing) making it a lot easier to customise scripts or even create your own.
-
-All the methods listed below require a 'monitor' parameter. This must be a reference to a hash with at least the 'Id' field set to the monitor id of the mapped memory you wish to access. Using database methods to select the monitor details will also return this kind of data. Some of the mapped memory methods will add and amend new fields to this hash.
-
-=over 4
-
-=head1 METHODS
-
-=item zmMemVerify ( $monitor );
-
-Verify that the mapped memory of the monitor given exists and is valid. It will return an undefined value if it is not valid. You should generally call this method first before using any of the other methods, but most of the remaining methods will also do so if the memory has not already been verified.
-
-=item zmMemInvalidate ( $monitor );
-
-Following an error, reset the mapped memory ids and attempt to reverify on the next operation. This is mostly used when a mapped memory segment has gone away and been recreated with a different id.
-
-=item zmMemRead ( $monitor, $readspec );
-
-This method is used to read data from mapped memory attached to the given monitor. The mapped memory will be verified if it has not already been. The 'readspec' must either be a string of the form "<section>:<field>" or a reference to an array of strings of the same format. In the first case a single value is returned, in the latter case a list of values is return. Errors will cause undefined to be returned. The allowable sections and field names are described below.
-
-=item zmMemWrite ( $monitor, $writespec );
-
-This method is used to write data to mapped memory attached to the given monitor. The mapped memory will be verified if it has not already been. The 'writespec' must be a reference to a hash with keys of the form "<section>:<field>" and values as the data to be written. Errors will cause undefined to be returned, otherwise a non-undefined value will be returned. The allowable sections and field names are described below.
-
-=item $state = zmGetMonitorState ( $monitor );
-
-Return the current state of the given monitor. This is an integer value and can be compared with the STATE constants given below.
-
-=item $event_id = zmGetLastEvent ( $monitor );
-
-Return the event id of the last event that the monitor generated, or 0 if no event has been generated by the current monitor process.
-
-=item zmIsAlarmed ( $monitor );
-
-Return 1 if the monitor given is currently in an alarm state, 0 otherwise.
-
-=item zmInAlarm ( $monitor );
-
-Return 1 if the monitor given is currently in an alarm or alerted state, 0 otherwise.
-
-=item zmHasAlarmed ( $monitor );
-
-Return 1 if the given monitor is in an alarm state, or has been in an alarm state since the last call to this method.
-
-=item ( $x, $y ) = zmGetAlarmLocation ( $monitor );
-
-Return an x,y pair indicating the image co-ordinates of the centre of the last motion event generated by the given monitor. If no event has been generated by the current monitor process, or the alarm was not motion related, returns -1,-1.
-
-=item zmGetLastWriteTime ( $monitor );
-
-Returns the time (in utc seconds) since the last image was captured by the given monitor and written to shared memory, or 0 otherwise.
-
-=item zmGetLastReadTime ( $monitor );
-
-Returns the time (in utc seconds) since the last image was read from shared memory by the analysis daemon of the given monitor, or 0 otherwise or if the monitor is in monitor only mode.
-
-=item zmMonitorSuspend ( $monitor );
-
-Suspend the given monitor from generating events caused by motion. This method can be used to prevent camera actions such as panning or zooming from causing events. If configured to do so, the monitor may automatically resume after a defined period.
-
-=item zmMonitorResume ( $monitor );
-
-Allow the given monitor to resume generating events caused by motion.
-
-=item zmTriggerEventOn ( $monitor, $score, $cause [, $text, $showtext ] );
-
-Trigger the given monitor to generate an event. You must supply an event score and a cause string indicating the reason for the event. You may also supply a text string containing further details about the event and a showtext string which may be included in the timestamp annotation on any images captured during the event, if configured to do so.
-
-=item zmTriggerEventOff ( $monitor );
-
-Trigger the given monitor to not generate any events. This method does not cancel zmTriggerEventOn, but is exclusive to it. This method is intended to allow external triggers to prevent normal events being generated by monitors in the same way as zmMonitorSuspend but applies to all events and not just motion, and is intended for longer timescales than are appropriate for suspension.
-
-=item zmTriggerEventCancel ( $monitor );
-
-Cancel any previous trigger on or off requests. This stops a triggered alarm if it exists from a previous 'on' and allows events to be generated once more following a previous 'off'.
-
-=item zmTriggerShowtext ( $monitor, $showtest );
-
-Indicate that the given text should be displayed in the timestamp annotation on any images captured, if the format of the annotation string defined for the monitor permits.
-
-=head1 DATA
-
-The data fields in mapped memory that may be accessed are as follows. There are two main sections, shared_data which is general data and trigger_data which is used for event triggering. Whilst reading from these fields is harmless, extreme care must be taken when writing to mapped memory, especially in the shared_data section as this is normally written to only by monitor capture and analysis processes.
-
-  shared_data         The general mapped memory section
-    size              The size, in bytes, of this section
-    valid             Flag indicating whether this section has been initialised
-    active            Flag indicating whether this monitor is active (enabled/disabled)
-    signal            Flag indicating whether this monitor is reciving a valid signal
-    state             The current monitor state, see the STATE constants below
-    last_write_index  The last index, in the image buffer, that an image has been saved to
-    last_read_index   The last index, in the image buffer, that an image has been analysed from
-    last_write_time   The time (in utc seconds) when the last image was captured
-    last_read_time    The time (in utc seconds) when the last image was analysed
-    last_event        The id of the last event generated by the monitor analysis process, 0 if none
-    action            The monitor actions bitmask, see the ACTION constants below
-    brightness        Read/write location for the current monitor brightness
-    hue               Read/write location for the current monitor hue
-    colour            Read/write location for the current monitor colour
-    contrast          Read/write location for the current monitor contrast
-    alarm_x           Image x co-ordinate (from left) of the centre of the last motion event, -1 if none
-    alarm_y           Image y co-ordinate (from top) of the centre of the last motion event, -1 if none
-
-  trigger_data        The triggered event mapped memory section
-    size              The size, in bytes of this section
-    trigger_state     The current trigger state, see the TRIGGER constants below
-    trigger_score     The current triggered event score
-    trigger_cause     The current triggered event cause string
-    trigger_text      The current triggered event descriptive text string
-    trigger_showtext  The triggered text that will be displayed on captured image timestamps
-
-=head1 CONSTANTS
-
-The following constants are used by the methods above, but can also be used by user scripts if required.
-
-=item STATE_IDLE STATE_PREALARM STATE_ALARM STATE_ALERT STATE_TAPE
-
-These constants define the state of the monitor with respect to alarms and events. They are used in the shared_data:state field.
-
-=item ACTION_GET ACTION_SET ACTION_RELOAD ACTION_SUSPEND ACTION_RESUME
-
-These constants defines the various values that can exist in the shared_data:action field. This is a bitmask which when non-zero defines an action that an executing monitor process should take. ACTION_GET requires that the current values of brightness, contrast, colour and hue are taken from the camera and written to the equivalent mapped memory fields. ACTION_SET implies the reverse, that the values in mapped memory should be written to the camera. ACTION_RELOAD signal that the monitor process should reload itself from the database in case any settings have changed there. ACTION_SUSPEND signals that a monitor should stop exaiming images for motion, though other alarms may still occur. ACTION_RESUME sigansl that a monitor should resume motion detectiom.
-
-=item TRIGGER_CANCEL TRIGGER_ON TRIGGER_OFF 
-
-These constants are used in the definition of external triggers. TRIGGER_CANCEL is used to indicated that any previous trigger settings should be cancelled, TRIGGER_ON signals that an alarm should be created (or continued)) as a result of the current trigger and TRIGGER_OFF signals that the trigger should prevent any alarms from being generated. See the trigger methods above for further details.
-
-=head1 EXPORT
-
-None by default.
-The :constants tag will export the mapped memory constants which mostly define enumerations for the variables held in memory
-The :functions tag will export the mapped memory access functions.
-The :all tag will export all above symbols.
-
-
-=head1 SEE ALSO
-
-http://www.zoneminder.com
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/Memory/Mapped.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/Memory/Mapped.pm
deleted file mode 100644
index b8745d835..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Memory/Mapped.pm
+++ /dev/null
@@ -1,169 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Mapped Memory Access Module, $Date: 2008-02-25 10:13:13 +0000 (Mon, 25 Feb 2008) $, $Revision: 2323 $
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the definitions and functions used when accessing mapped memory
-#
-package ZoneMinder::Memory::Mapped;
-
-use 5.006;
-use strict;
-use warnings;
-
-require Exporter;
-require ZoneMinder::Base;
-
-our @ISA = qw(Exporter ZoneMinder::Base);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration	use ZoneMinder ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our %EXPORT_TAGS = (
-	'functions' => [ qw(
-		zmMemKey
-		zmMemAttach
-		zmMemDetach
-		zmMemGet
-		zmMemPut
-		zmMemClean
-	) ],
-);
-push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
-
-our @EXPORT = @EXPORT_OK;
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Mapped Memory Facilities
-#
-# ==========================================================================
-
-use ZoneMinder::Config qw(:all);
-use ZoneMinder::Logger qw(:all);
-
-use Sys::Mmap;
-
-sub zmMemKey( $ )
-{
-	my $monitor = shift;
-    return( defined($monitor->{MMapAddr})?$monitor->{MMapAddr}:undef );
-}
-
-sub zmMemAttach( $$ )
-{
-	my $monitor = shift;
-	my $size = shift;
-	if ( !defined($monitor->{MMapAddr}) )
-	{
-        my $mmap_file = ZM_PATH_MAP."/zm.mmap.".$monitor->{Id};
-        if ( !open( MMAP, "+<".$mmap_file ) )
-        {
-    		Error( sprintf( "Can't open memory map file '%s': $!\n", $mmap_file ) );
-			return( undef );
-        }
-        my $mmap = undef;
-        my $mmap_addr = mmap( $mmap, $size, PROT_READ|PROT_WRITE, MAP_SHARED, \*MMAP );
-        if ( !$mmap_addr || !$mmap )
-        {
-    		Error( sprintf( "Can't mmap to file '%s': $!\n", $mmap_file ) );
-			return( undef );
-        }
-		$monitor->{MMapHandle} = \*MMAP;
-		$monitor->{MMapAddr} = $mmap_addr;
-		$monitor->{MMap} = \$mmap;
-	}
-	return( !undef );
-}
-
-sub zmMemDetach( $ )
-{
-	my $monitor = shift;
-
-    if ( $monitor->{MMap} )
-    {
-        munmap( ${$monitor->{MMap}} );
-	    delete $monitor->{MMap};
-    }
-    if ( $monitor->{MMapAddr} )
-    {
-	    delete $monitor->{MMapAddr};
-    }
-    if ( $monitor->{MMapHandle} )
-    {
-        close( $monitor->{MMapHandle} );
-	    delete $monitor->{MMapHandle};
-    }
-}
-
-sub zmMemGet( $$$ )
-{
-	my $monitor = shift;
-	my $offset = shift;
-	my $size = shift;
-
-	my $mmap = $monitor->{MMap};
-    if ( !$mmap || !$$mmap )
-    {
-        Error( sprintf( "Can't read from mapped memory for monitor '%d', gone away?", $monitor->{Id} ) );
-        return( undef );
-    }
-	my $data = substr( $$mmap, $offset, $size );
-    return( $data );
-}
-
-sub zmMemPut( $$$$ )
-{
-	my $monitor = shift;
-	my $offset = shift;
-	my $size = shift;
-	my $data = shift;
-
-	my $mmap = $monitor->{MMap};
-    if ( !$mmap || !$$mmap )
-    {
-        Error( sprintf( "Can't write mapped memory for monitor '%d', gone away?", $monitor->{Id} ) );
-        return( undef );
-    }
-	substr( $$mmap, $offset, $size ) = $data;
-	return( !undef );
-}
-
-sub zmMemClean
-{
-	Debug( "Removing memory map files\n" );
-    my $mapPath = ZM_PATH_MAP."/zm.mmap.*";
-    foreach my $mapFile( glob( $mapPath ) )
-    {
-        ( $mapFile ) = $mapFile =~ /^(.+)$/;
-	    Debug( "Removing memory map file '$mapFile'\n" );
-        unlink( $mapFile );
-    }
-}
-
-1;
-__END__
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/Memory/Shared.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/Memory/Shared.pm
deleted file mode 100644
index c04e4f413..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Memory/Shared.pm
+++ /dev/null
@@ -1,161 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Shared Memory Access Module, $Date: 2007-08-29 19:11:09 +0100 (Wed, 29 Aug 2007) $, $Revision: 2175 $
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the common definitions and functions used by the rest 
-# of the ZoneMinder scripts
-#
-package ZoneMinder::Memory::Shared;
-
-use 5.006;
-use strict;
-use warnings;
-
-require Exporter;
-require ZoneMinder::Base;
-
-our @ISA = qw(Exporter ZoneMinder::Base);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration	use ZoneMinder ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our %EXPORT_TAGS = (
-	'functions' => [ qw(
-        zmMemKey
-        zmMemAttach
-        zmMemDetach
-        zmMemGet
-        zmMemPut
-        zmMemClean
-	) ],
-);
-push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
-
-our @EXPORT = @EXPORT_OK;
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Shared Memory Facilities
-#
-# ==========================================================================
-
-use ZoneMinder::Config qw(:all);
-use ZoneMinder::Logger qw(:all);
-
-sub zmMemKey( $ )
-{
-	my $monitor = shift;
-	return( defined($monitor->{ShmKey})?$monitor->{ShmKey}:undef );
-}
-
-sub zmMemAttach( $$ )
-{
-	my $monitor = shift;
-	my $size = shift;
-	if ( !defined($monitor->{ShmId}) )
-	{
-		my $shm_key = (hex(ZM_SHM_KEY)&0xffff0000)|$monitor->{Id};
-		my $shm_id = shmget( $shm_key, $size, 0 );
-		if ( !defined($shm_id) )
-		{
-    		Error( sprintf( "Can't get shared memory id '%x', %d: $!\n", $shm_key, $monitor->{Id} ) );
-			return( undef );
-		}
-		$monitor->{ShmKey} = $shm_key;
-		$monitor->{ShmId} = $shm_id;
-	}
-	return( !undef );
-}
-
-sub zmMemDetach( $ )
-{
-	my $monitor = shift;
-
-	delete $monitor->{ShmId};
-}
-
-sub zmMemGet( $$$ )
-{
-	my $monitor = shift;
-	my $offset = shift;
-	my $size = shift;
-
-	my $shm_key = $monitor->{ShmKey};
-	my $shm_id = $monitor->{ShmId};
-	
-    my $data;
-    if ( !shmread( $shm_id, $data, $offset, $size ) )
-    {
-        Error( sprintf( "Can't read from shared memory '%x/%d': $!", $shm_key, $shm_id ) );
-        return( undef );
-    }
-	return( $data );
-}
-
-sub zmMemPut( $$$$ )
-{
-	my $monitor = shift;
-	my $offset = shift;
-	my $size = shift;
-	my $data = shift;
-
-	my $shm_key = $monitor->{ShmKey};
-	my $shm_id = $monitor->{ShmId};
-	
-    if ( !shmwrite( $shm_id, $data, $offset, $size ) )
-    {
-        Error( sprintf( "Can't write to shared memory '%x/%d': $!", $shm_key, $shm_id ) );
-        return( undef );
-    }
-	return( !undef );
-}
-
-sub zmMemClean
-{
-    Debug( "Removing shared memory\n" );
-    # Find ZoneMinder shared memory
-    my $command = "ipcs -m | grep '^".substr( sprintf( "0x%x", hex(ZM_SHM_KEY) ), 0, -2 )."'";
-    Debug( "Checking for shared memory with '$command'\n" );
-    open( CMD, "$command |" ) or Fatal( "Can't execute '$command': $!" );
-    while( <CMD> )
-    {
-        chomp;
-        my ( $key, $id ) = split( /\s+/ );
-        if ( $id =~ /^(\d+)/ )
-        {
-            $id = $1;
-            $command = "ipcrm shm $id";
-            Debug( "Removing shared memory with '$command'\n" );
-            qx( $command );
-        }
-    }
-    close( CMD );
-}
-
-1;
-__END__
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel.pm
deleted file mode 100644
index 0344e6d94..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel.pm
+++ /dev/null
@@ -1,166 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Trigger Channel Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the base class definition of the trigger channel
-# class tree
-#
-package ZoneMinder::Trigger::Channel;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Database Access
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-
-use Carp;
-
-our $AUTOLOAD;
-
-sub new
-{
-	my $class = shift;
-	my $self = {};
-	$self->{readable} = !undef;
-	$self->{writeable} = !undef;
-	$self->{selectable} = undef;
-	$self->{state} = 'closed';
-	bless( $self, $class );
-	return $self;
-}
-
-sub clone
-{
-	my $self = shift;
-	my $clone = { %$self };
-	bless $clone, ref $self;
-}
-
-sub open()
-{
-	my $self = shift;
-	my $class = ref($self) or croak( "Can't get class for non object $self" );
-	croak( "Abstract base class method called for object of class $class" );
-}
-
-sub close()
-{
-	my $self = shift;
-	my $class = ref($self) or croak( "Can't get class for non object $self" );
-	croak( "Abstract base class method called for object of class $class" );
-}
-
-sub getState()
-{
-	my $self = shift;
-	return( $self->{state} );
-}
-
-sub isOpen()
-{
-	my $self = shift;
-	return( $self->{state} eq "open" );
-}
-
-sub isConnected()
-{
-	my $self = shift;
-	return( $self->{state} eq "connected" );
-}
-
-sub DESTROY
-{
-}
-
-sub AUTOLOAD
-{
-	my $self = shift;
-	my $class = ref($self) || croak( "$self not object" );
-	my $name = $AUTOLOAD;
-	$name =~ s/.*://;
-	if ( !exists($self->{$name}) )
-	{
-		croak( "Can't access $name member of object of class $class" );
-	}
-	return( $self->{$name} );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/File.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/File.pm
deleted file mode 100644
index 234dae3d7..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/File.pm
+++ /dev/null
@@ -1,121 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Trigger Channel Handle Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the class definition of the simple file based trigger
-# channel class
-#
-package ZoneMinder::Trigger::Channel::File;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Trigger::Channel::Handle;
-
-our @ISA = qw(ZoneMinder::Trigger::Channel::Handle);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Simple file based trigger channel
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-
-use Carp;
-use Fcntl;
-
-sub new
-{
-	my $class = shift;
-	my %params = @_;
-	my $self = ZoneMinder::Trigger::Channel::Handle->new;
-	$self->{path} = $params{path};
-	bless( $self, $class );
-	return $self;
-}
-
-sub open()
-{
-	my $self = shift;
-	local *sfh;
-	#sysopen( *sfh, $conn->{path}, O_NONBLOCK|O_RDONLY ) or croak( "Can't sysopen: $!" );
-	#open( *sfh, "<".$conn->{path} ) or croak( "Can't open: $!" );
-	open( *sfh, "+<".$self->{path} ) or croak( "Can't open: $!" );
-	$self->{state} = 'open';
-	$self->{handle} = *sfh;
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Handle.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Handle.pm
deleted file mode 100644
index 356bb5aea..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Handle.pm
+++ /dev/null
@@ -1,154 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Trigger Channel Handle Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the class definition of the handle based trigger channel
-# class
-#
-package ZoneMinder::Trigger::Channel::Handle;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Trigger::Channel;
-
-our @ISA = qw(ZoneMinder::Trigger::Channel);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Base class for handle based trigger channels
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-use POSIX;
-
-sub new
-{
-	my $class = shift;
-	my $port = shift;
-	my $self = ZoneMinder::Trigger::Channel->new();
-	$self->{handle} = undef;
-	bless( $self, $class );
-	return $self;
-}
-
-sub spawns
-{
-    return( undef );
-}
-
-sub close()
-{
-	my $self = shift;
-	close( $self->{handle} );
-	$self->{state} = 'closed';
-	$self->{handle} = undef;
-}
-
-sub read()
-{
-	my $self = shift;
-	my $buffer;
-	my $nbytes = sysread( $self->{handle}, $buffer, POSIX::BUFSIZ );
-	if ( !$nbytes )
-	{
-		return( undef );
-	}
-	Debug( "Read '$buffer' ($nbytes bytes)\n" );
-	return( $buffer );
-}
-
-sub write()
-{
-	my $self = shift;
-	my $buffer = shift;
-	my $nbytes = syswrite( $self->{handle}, $buffer );
-	if ( !defined( $nbytes) || $nbytes < length($buffer) )
-	{
-		Error( "Unable to write buffer '".$buffer.", expected ".length($buffer)." bytes, sent ".$nbytes.": $!\n" );
-		return( undef );
-	}
-	Debug( "Wrote '$buffer' ($nbytes bytes)\n" );
-	return( !undef );
-}
-
-sub fileno()
-{
-	my $self = shift;
-	return( defined($self->{handle})?fileno($self->{handle}):-1 );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Inet.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Inet.pm
deleted file mode 100644
index 68df0980f..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Inet.pm
+++ /dev/null
@@ -1,142 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Trigger Channel Handle Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the class definition of the tcp socket based trigger
-# channel class
-#
-package ZoneMinder::Trigger::Channel::Inet;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Trigger::Channel::Spawning;
-
-our @ISA = qw(ZoneMinder::Trigger::Channel::Spawning);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Internet (TCP) based trigger channel
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-
-use Carp;
-use Socket;
-
-sub new
-{
-	my $class = shift;
-	my %params = @_;
-	my $self = ZoneMinder::Trigger::Channel::Spawning->new();
-	$self->{selectable} = !undef;
-	$self->{port} = $params{port};
-	bless( $self, $class );
-	return $self;
-}
-
-sub open()
-{
-	my $self = shift;
-	local *sfh;
-	my $saddr = sockaddr_in( $self->{port}, INADDR_ANY );
-	socket( *sfh, PF_INET, SOCK_STREAM, getprotobyname('tcp') ) or croak( "Can't open socket: $!" );
-	setsockopt( *sfh, SOL_SOCKET, SO_REUSEADDR, 1 );
-	bind( *sfh, $saddr ) or croak( "Can't bind: $!" );
-	listen( *sfh, SOMAXCONN ) or croak( "Can't listen: $!" );
-	$self->{state} = 'open';
-	$self->{handle} = *sfh;
-}
-
-sub _spawn( $ )
-{
-	my $self = shift;
-	my $new_handle = shift;
-	my $clone = $self->clone();
-	$clone->{handle} = $new_handle;
-	$clone->{state} = 'connected';
-	return( $clone );
-}
-
-sub accept()
-{
-	my $self = shift;
-	local *cfh;
-	my $paddr = accept( *cfh, $self->{handle} );
-	return( $self->_spawn( *cfh ) );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Serial.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Serial.pm
deleted file mode 100644
index 7e4ad4730..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Serial.pm
+++ /dev/null
@@ -1,160 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Trigger Channel Handle Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the class definition of the serial port trigger channel
-# class
-#
-package ZoneMinder::Trigger::Channel::Serial;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Trigger::Channel;
-
-our @ISA = qw(ZoneMinder::Trigger::Channel);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Serial access trigger channel
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-use Device::SerialPort;
-
-sub new
-{
-	my $class = shift;
-	my %params = @_;
-	my $self = ZoneMinder::Trigger::Channel->new;
-	$self->{path} = $params{path};
-	bless( $self, $class );
-	return $self;
-}
-
-sub open()
-{
-	my $self = shift;
-	my $device = new Device::SerialPort( $self->{path} );
-	$device->baudrate(9600);
-	$device->databits(8);
-	$device->parity('none');
-	$device->stopbits(1);
-	$device->handshake('none');
-
-	$device->read_const_time(50);
-	$device->read_char_time(10);
-
-	$self->{device} = $device;
-	$self->{state} = 'open';
-	$self->{state} = 'connected';
-}
-
-sub close()
-{
-	my $self = shift;
-	$self->{device}->close();
-	$self->{state} = 'closed';
-}
-
-sub read()
-{
-	my $self = shift;
-	my $buffer = $self->{device}->lookfor();
-	if ( !$buffer || !length($buffer) )
-	{
-		return( undef );
-	}
-	Debug( "Read '$buffer' (".length($buffer)." bytes)\n" );
-	return( $buffer );
-}
-
-sub write()
-{
-	my $self = shift;
-	my $buffer = shift;
-	my $nbytes = $self->{device}->write( $buffer );
-	$self->{device}->write_drain();
-	if ( !defined( $nbytes) || $nbytes < length($buffer) )
-	{
-		Error( "Unable to write buffer '".$buffer.", expected ".length($buffer)." bytes, sent ".$nbytes.": $!\n" );
-		return( undef );
-	}
-	Debug( "Wrote '$buffer' ($nbytes bytes)\n" );
-	return( !undef );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Spawning.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Spawning.pm
deleted file mode 100644
index ff726ac38..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Spawning.pm
+++ /dev/null
@@ -1,112 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Trigger Channel Handle Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the class definition of the handle based trigger channel
-# classes that spawn new connections when connected.
-#
-package ZoneMinder::Trigger::Channel::Spawning;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Trigger::Channel::Handle;
-
-our @ISA = qw(ZoneMinder::Trigger::Channel::Handle);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Base class for handle based triggers that spawn new connections
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-
-sub new
-{
-	my $class = shift;
-	my $port = shift;
-	my $self = ZoneMinder::Trigger::Channel::Handle->new();
-	$self->{spawns} = !undef;
-	bless( $self, $class );
-	return $self;
-}
-
-sub spawns
-{
-    return( !undef );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Unix.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Unix.pm
deleted file mode 100644
index a671ccd66..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Channel/Unix.pm
+++ /dev/null
@@ -1,141 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Trigger Channel Handle Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the class definition of the unix socket based trigger
-# channel class
-#
-package ZoneMinder::Trigger::Channel::Unix;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Trigger::Channel::Spawning;
-
-our @ISA = qw(ZoneMinder::Trigger::Channel::Spawning);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Unix socket based trigger channel
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-
-use Carp;
-use Socket;
-
-sub new
-{
-	my $class = shift;
-	my %params = @_;
-	my $self = ZoneMinder::Trigger::Channel->new;
-	$self->{selectable} = !undef;
-	$self->{path} = $params{path};
-	bless( $self, $class );
-	return $self;
-}
-
-sub open()
-{
-	my $self = shift;
-	local *sfh;
-	unlink( $self->{path} );
-	my $saddr = sockaddr_un( $self->{path} );
-	socket( *sfh, PF_UNIX, SOCK_STREAM, 0 ) or croak( "Can't open socket: $!" );
-	bind( *sfh, $saddr ) or croak( "Can't bind: $!" );
-	listen( *sfh, SOMAXCONN ) or croak( "Can't listen: $!" );
-	$self->{handle} = *sfh;
-}
-
-sub _spawn( $ )
-{
-    my $self = shift;
-    my $new_handle = shift;
-    my $clone = $self->clone();
-    $clone->{handle} = $new_handle;
-    $clone->{state} = 'connected';
-    return( $clone );
-}
-
-sub accept()
-{
-    my $self = shift;
-    local *cfh;
-    my $paddr = accept( *cfh, $self->{handle} );
-    return( $self->_spawn( *cfh ) );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Connection.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Connection.pm
deleted file mode 100644
index 41b332d46..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Connection.pm
+++ /dev/null
@@ -1,239 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Trigger Connection Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the base class definition of the trigger connection
-# class tree
-#
-package ZoneMinder::Trigger::Connection;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Base connection class
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-
-use Carp;
-
-our $AUTOLOAD;
-
-sub new
-{
-	my $class = shift;
-	my %params = @_;
-	my $self = {};
-	$self->{name} = $params{name};
-	$self->{channel} = $params{channel};
-	$self->{input} = $params{mode} =~ /r/i;
-	$self->{output} = $params{mode} =~ /w/i;
-	bless( $self, $class );
-	return $self;
-}
-
-sub clone
-{
-	my $self = shift;
-	my $clone = { %$self };
-	bless $clone, ref $self;
-	return( $clone );
-}
-
-sub spawns
-{
-	my $self = shift;
-    return( $self->{channel}->spawns() );
-}
-
-sub _spawn( $ )
-{
-	my $self = shift;
-	my $new_channel = shift;
-	my $clone = $self->clone();
-	$clone->{channel} = $new_channel;
-	return( $clone );
-}
-
-sub accept()
-{
-	my $self = shift;
-	my $new_channel = $self->{channel}->accept();
-	return( $self->_spawn( $new_channel ) );
-}
-
-sub open()
-{
-	my $self = shift;
-	return( $self->{channel}->open() );
-}
-
-sub close()
-{
-	my $self = shift;
-	return( $self->{channel}->close() );
-}
-
-sub fileno()
-{
-	my $self = shift;
-	return( $self->{channel}->fileno() );
-}
-
-sub isOpen()
-{
-	my $self = shift;
-	return( $self->{channel}->isOpen() );
-}
-
-sub isConnected()
-{
-	my $self = shift;
-	return( $self->{channel}->isConnected() );
-}
-
-sub canRead()
-{
-	my $self = shift;
-	return( $self->{input} && $self->isConnected() );
-}
-
-sub canWrite()
-{
-	my $self = shift;
-	return( $self->{output} && $self->isConnected() );
-}
-
-sub getMessages
-{
-	my $self = shift;
-	my $buffer = $self->{channel}->read();
-
-	return( undef ) if ( !defined($buffer) );
-
-	my @messages = split( /\r?\n/, $buffer );
-	return( \@messages );
-}
-
-sub putMessages
-{
-	my $self = shift;
-	my $messages = shift;
-
-	if ( @$messages )
-	{
-		my $buffer = join( "\n", @$messages );
-		$buffer .= "\n";
-		if ( !$self->{channel}->write( $buffer ) )
-		{
-			Error( "Unable to write buffer '".$buffer." to connection ".$self->{name}." (".$self->fileno().")\n" );
-		}
-	}
-	return( undef );
-}
-
-sub timedActions
-{
-}
-
-sub DESTROY
-{
-}
-
-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} );
-	}
-	elsif ( defined($self->{channel}) )
-	{
-		if ( exists($self->{channel}->{$name}) )
-		{
-			return( $self->{channel}->{$name} );
-		}
-	}
-	croak( "Can't access $name member of object of class $class" );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Connection/Example.pm b/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Connection/Example.pm
deleted file mode 100644
index 3bed2b351..000000000
--- a/scripts/ZoneMinder/blib/lib/ZoneMinder/Trigger/Connection/Example.pm
+++ /dev/null
@@ -1,134 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Trigger Channel Handle Module, $Date$, $Revision$
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains an example overriden trigger connection class
-#
-package ZoneMinder::Trigger::Connection::Example;
-
-use 5.006;
-use strict;
-use warnings;
-
-require ZoneMinder::Base;
-require ZoneMinder::Trigger::Connection;
-
-our @ISA = qw(ZoneMinder::Trigger::Connection);
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Example overridden connection class
-#
-# ==========================================================================
-
-use ZoneMinder::Logger qw(:all);
-
-sub new
-{
-	my $class = shift;
-	my $path = shift;
-	my $self = ZoneMinder::Trigger::Connection->new( @_ );
-	bless( $self, $class );
-	return $self;
-}
-
-sub getMessages
-{
-	my $self = shift;
-	my $buffer = $self->{channel}->read();
-
-	return( undef ) if ( !defined($buffer) );
-
-	Debug( "Handling buffer '$buffer'\n" );
-	my @messages = grep { s/-/|/g; 1; } split( /\r?\n/, $buffer );
-	return( \@messages );
-}
-
-sub putMessages
-{
-	my $self = shift;
-	my $messages = shift;
-
-	if ( @$messages )
-	{
-		my $buffer = join( "\n", grep{ s/\|/-/; 1; } @$messages );
-		$buffer .= "\n";
-		if ( !$self->{channel}->write( $buffer ) )
-		{
-			Error( "Unable to write buffer '".$buffer." to connection ".$self->{name}." (".$self->fileno().")\n" );
-		}
-	}
-	return( undef );
-}
-
-1;
-__END__
-# Below is stub documentation for your module. You'd better edit it!
-
-=head1 NAME
-
-ZoneMinder::Database - Perl extension for blah blah blah
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::Database;
-  blah blah blah
-
-=head1 DESCRIPTION
-
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-=head2 EXPORT
-
-None by default.
-
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/blib/lib/auto/ZoneMinder/.exists b/scripts/ZoneMinder/blib/lib/auto/ZoneMinder/.exists
deleted file mode 100644
index e69de29bb..000000000
diff --git a/scripts/ZoneMinder/blib/man1/.exists b/scripts/ZoneMinder/blib/man1/.exists
deleted file mode 100644
index e69de29bb..000000000
diff --git a/scripts/ZoneMinder/blib/man3/.exists b/scripts/ZoneMinder/blib/man3/.exists
deleted file mode 100644
index e69de29bb..000000000
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder.3pm
deleted file mode 100644
index 166dbf786..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder.3pm
+++ /dev/null
@@ -1,177 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder 3pm"
-.TH ZoneMinder 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder \- Container module for common ZoneMinder modules
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 1
-\&  use ZoneMinder;
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-This module is a convenience container module that uses the
-ZoneMinder::Base, ZoneMinder::Common, ZoneMinder::Logger,
-ZoneMinder::Database and ZoneMinder::Memory modules. It also
-exports by default all symbols provided by the 'all' tag of 
-each of the modules.
-.PP
-Thus 'use'ing this module is equivalent to the following
-.PP
-.Vb 5
-\&  use ZoneMinder::Base qw(:all);
-\&  use ZoneMinder::Config qw(:all);
-\&  use ZoneMinder::Logger qw(:all);
-\&  use ZoneMinder::Database qw(:all);
-\&  use ZoneMinder::Memory qw(:all);
-.Ve
-.PP
-but is somewhat easier.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-All symbols exported by the 'all' tag of each of the included
-modules.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-ZoneMinder::Base, ZoneMinder::Common, ZoneMinder::Logger,
-ZoneMinder::Database, ZoneMinder::Memory
-.PP
-http://www.zoneminder.com
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2005 by Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder::Base.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder::Base.3pm
deleted file mode 100644
index 060aca327..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Base.3pm
+++ /dev/null
@@ -1,157 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Base 3pm"
-.TH ZoneMinder::Base 3pm "2012-09-11" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Base \- Base perl module for ZoneMinder
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 1
-\&  use ZoneMinder::Base;
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-This module is the base module for the rest of the ZoneMinder modules. It is included by each of the other modules but serves no purpose other than to propagate the perl module version amongst the other modules. You will never need to use this module directly but if you write new ZoneMinder modules they should include it.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-http://www.zoneminder.com
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder::Config.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder::Config.3pm
deleted file mode 100644
index cafbc873f..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Config.3pm
+++ /dev/null
@@ -1,166 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Config 3pm"
-.TH ZoneMinder::Config 3pm "2012-09-11" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Config \- ZoneMinder configuration module.
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 1
-\&  use ZoneMinder::Config qw(:all);
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-The ZoneMinder::Config module is used to import the ZoneMinder configuration from the database. It will do this at compile time in a \s-1BEGIN\s0 block and require access to the zm.conf file either in the current directory or in its defined location in order to determine database access details, configuration from this file will also be included. If the :all or :config tags are used then this configuration is exported into the namespace of the calling program or module.
-.PP
-Once the configuration has been imported then configuration variables are defined as constants and can be accessed directory by name, e.g.
-.PP
-.Vb 1
-\& $lang = ZM_LANG_DEFAULT;
-.Ve
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-The :constants tag will export the \s-1ZM_PID\s0 constant which details the location of the zm.pid file
-The :config tag will export all configuration from the database as well as any from the zm.conf file
-The :all tag will export all above symbols.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-http://www.zoneminder.com
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder::ConfigAdmin.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder::ConfigAdmin.3pm
deleted file mode 100644
index 9a29077ac..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::ConfigAdmin.3pm
+++ /dev/null
@@ -1,180 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::ConfigAdmin 3pm"
-.TH ZoneMinder::ConfigAdmin 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::ConfigAdmin \- ZoneMinder Configuration Administration module
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::ConfigAdmin;
-\&  use ZoneMinder::ConfigAdmin qw(:all);
-\&
-\&  loadConfigFromDB();
-\&  saveConfigToDB();
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-The ZoneMinder:ConfigAdmin module contains the master definition of the ZoneMinder configuration options as well as helper methods. This module is intended for specialist confguration management and would not normally be used by end users.
-.PP
-The configuration held in this module, which was previously in zmconfig.pl, includes the name, default value, description, help text, type and category for each option, as well as a number of additional fields in a small number of cases.
-.SH "METHODS"
-.IX Header "METHODS"
-.IP "loadConfigFromDB ();" 4
-.IX Item "loadConfigFromDB ();"
-Loads existing configuration from the database (if any) and merges it with the definitions held in this module. This results in the merging of any new configuration and the removal of any deprecated configuration while preserving the existing values of every else.
-.IP "saveConfigToDB ();" 4
-.IX Item "saveConfigToDB ();"
-Saves configuration held in memory to the database. The act of loading and saving configuration is a convenient way to ensure that the configuration held in the database corresponds with the most recent definitions and that all components are using the same set of configuration.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-The :data tag will export the various configuration data structures
-The :functions tag will export the helper functions.
-The :all tag will export all above symbols.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-http://www.zoneminder.com
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-.SH "POD ERRORS"
-.IX Header "POD ERRORS"
-Hey! \fBThe above document had some coding errors, which are explained below:\fR
-.IP "Around line 188:" 4
-.IX Item "Around line 188:"
-You forgot a '=back' before '=head2'
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder::ConfigData.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder::ConfigData.3pm
deleted file mode 100644
index 38c7e4c2d..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::ConfigData.3pm
+++ /dev/null
@@ -1,180 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::ConfigData 3pm"
-.TH ZoneMinder::ConfigData 3pm "2012-09-11" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::ConfigData \- ZoneMinder Configuration Data module
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::ConfigData;
-\&  use ZoneMinder::ConfigData qw(:all);
-\&
-\&  loadConfigFromDB();
-\&  saveConfigToDB();
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-The ZoneMinder:ConfigData module contains the master definition of the ZoneMinder configuration options as well as helper methods. This module is intended for specialist confguration management and would not normally be used by end users.
-.PP
-The configuration held in this module, which was previously in zmconfig.pl, includes the name, default value, description, help text, type and category for each option, as well as a number of additional fields in a small number of cases.
-.SH "METHODS"
-.IX Header "METHODS"
-.IP "loadConfigFromDB ();" 4
-.IX Item "loadConfigFromDB ();"
-Loads existing configuration from the database (if any) and merges it with the definitions held in this module. This results in the merging of any new configuration and the removal of any deprecated configuration while preserving the existing values of every else.
-.IP "saveConfigToDB ();" 4
-.IX Item "saveConfigToDB ();"
-Saves configuration held in memory to the database. The act of loading and saving configuration is a convenient way to ensure that the configuration held in the database corresponds with the most recent definitions and that all components are using the same set of configuration.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-The :data tag will export the various configuration data structures
-The :functions tag will export the helper functions.
-The :all tag will export all above symbols.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-http://www.zoneminder.com
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-.SH "POD ERRORS"
-.IX Header "POD ERRORS"
-Hey! \fBThe above document had some coding errors, which are explained below:\fR
-.IP "Around line 2031:" 4
-.IX Item "Around line 2031:"
-You forgot a '=back' before '=head2'
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder::Control.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder::Control.3pm
deleted file mode 100644
index d94097341..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Control.3pm
+++ /dev/null
@@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Control 3pm"
-.TH ZoneMinder::Control 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::AxisV2.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::AxisV2.3pm
deleted file mode 100644
index a4d4e2970..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::AxisV2.3pm
+++ /dev/null
@@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Control::AxisV2 3pm"
-.TH ZoneMinder::Control::AxisV2 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::Ncs370.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::Ncs370.3pm
deleted file mode 100644
index 9d7f662c8..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::Ncs370.3pm
+++ /dev/null
@@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Control::Ncs370 3pm"
-.TH ZoneMinder::Control::Ncs370 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::PanasonicIP.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::PanasonicIP.3pm
deleted file mode 100644
index 1e87ff0b2..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::PanasonicIP.3pm
+++ /dev/null
@@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Control::PanasonicIP 3pm"
-.TH ZoneMinder::Control::PanasonicIP 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::PelcoD.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::PelcoD.3pm
deleted file mode 100644
index 29378242f..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::PelcoD.3pm
+++ /dev/null
@@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Control::PelcoD 3pm"
-.TH ZoneMinder::Control::PelcoD 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::Visca.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::Visca.3pm
deleted file mode 100644
index 3a1950937..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::Visca.3pm
+++ /dev/null
@@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Control::Visca 3pm"
-.TH ZoneMinder::Control::Visca 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::mjpgStreamer.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::mjpgStreamer.3pm
deleted file mode 100644
index 87abf286e..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Control::mjpgStreamer.3pm
+++ /dev/null
@@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Control::mjpgStreamer 3pm"
-.TH ZoneMinder::Control::mjpgStreamer 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2005 by Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder::Database.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder::Database.3pm
deleted file mode 100644
index 72c7b141a..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Database.3pm
+++ /dev/null
@@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Database 3pm"
-.TH ZoneMinder::Database 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder::General.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder::General.3pm
deleted file mode 100644
index 8040b6b33..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::General.3pm
+++ /dev/null
@@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::General 3pm"
-.TH ZoneMinder::General 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder::Logger.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder::Logger.3pm
deleted file mode 100644
index 48aec4433..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Logger.3pm
+++ /dev/null
@@ -1,259 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Logger 3pm"
-.TH ZoneMinder::Logger 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Logger \- ZoneMinder Logger module
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Logger;
-\&  use ZoneMinder::Logger qw(:all);
-\&
-\&  logInit( "myproc", DEBUG );
-\&
-\&  Debug( "This is what is happening" );
-\&  Info( "Something interesting is happening" );
-\&  Warning( "Something might be going wrong." );
-\&  Error( "Something has gone wrong!!" );
-\&  Fatal( "Something has gone badly wrong, gotta stop!!" );
-\&  Panic( "Something fundamental has gone wrong, die with stack trace );
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-The ZoneMinder:Logger module contains the common debug and error reporting routines used by the ZoneMinder scripts.
-.PP
-To use debug in your scripts you need to include this module, and call logInit. Thereafter you can sprinkle Debug or Error calls etc throughout the code safe in the knowledge that they will be reported to your error log, and possibly the syslogger, in a meaningful and consistent format.
-.PP
-Debug is discussed in terms of levels where 1 and above (currently only 1 for scripts) is considered debug, 0 is considered as informational, \-1 is a warning, \-2 is an error and \-3 is a fatal error or panic. Where levels are mentioned below as thresholds the value given and anything with a lower level (ie. more serious) will be included.
-.SH "METHODS"
-.IX Header "METHODS"
-.ie n .IP "logInit ( $id, %options );" 4
-.el .IP "logInit ( \f(CW$id\fR, \f(CW%options\fR );" 4
-.IX Item "logInit ( $id, %options );"
-Initialises the debug and prepares the logging for forthcoming operations. If not called explicitly it will be called by the first debug call in your script, but with default (and probably meaningless) options. The only compulsory arguments are \f(CW$id\fR which must be a string that will identify debug coming from this script in mixed logs. Other options may be provided as below,
-.Sp
-.Vb 8
-\& Option        Default        Description
-\& \-\-\-\-\-\-\-\-\-     \-\-\-\-\-\-\-\-\-      \-\-\-\-\-\-\-\-\-\-\-
-\& level         INFO       The initial debug level which defines which statements are output and which are ignored
-\& trace         0          Whether to use the Carp::shortmess format in debug statements to identify where the debug was emitted from
-\& termLevel     NOLOG      At what level debug is written to terminal standard error, 0 is no, 1 is yes, 2 is write only if terminal
-\& databaseLevel INFO       At what level debug is written to the Log table in the database;
-\& fileLevel     NOLOG      At what level debug is written to a log file of the format of <id>.log in the standard log directory.
-\& syslogLevel   INFO       At what level debug is written to syslog.
-.Ve
-.Sp
-To disable any of these action entirely set to \s-1NOLOG\s0
-.IP "logTerm ();" 4
-.IX Item "logTerm ();"
-Used to end the debug session and close any logs etc. Not usually necessary.
-.ie n .IP "$id            = logId ( [$id] );" 4
-.el .IP "\f(CW$id\fR            = logId ( [$id] );" 4
-.IX Item "$id            = logId ( [$id] );"
-.PD 0
-.ie n .IP "$level         = logLevel ( [$level] );" 4
-.el .IP "\f(CW$level\fR         = logLevel ( [$level] );" 4
-.IX Item "$level         = logLevel ( [$level] );"
-.ie n .IP "$trace         = logTrace ( [$trace] );" 4
-.el .IP "\f(CW$trace\fR         = logTrace ( [$trace] );" 4
-.IX Item "$trace         = logTrace ( [$trace] );"
-.ie n .IP "$level         = logLevel ( [$level] );" 4
-.el .IP "\f(CW$level\fR         = logLevel ( [$level] );" 4
-.IX Item "$level         = logLevel ( [$level] );"
-.ie n .IP "$termLevel     = logTermLevel ( [$termLevel] );" 4
-.el .IP "\f(CW$termLevel\fR     = logTermLevel ( [$termLevel] );" 4
-.IX Item "$termLevel     = logTermLevel ( [$termLevel] );"
-.ie n .IP "$databaseLevel = logDatabaseLevel ( [$databaseLevel] );" 4
-.el .IP "\f(CW$databaseLevel\fR = logDatabaseLevel ( [$databaseLevel] );" 4
-.IX Item "$databaseLevel = logDatabaseLevel ( [$databaseLevel] );"
-.ie n .IP "$fileLevel     = logFileLevel ( [$fileLevel] );" 4
-.el .IP "\f(CW$fileLevel\fR     = logFileLevel ( [$fileLevel] );" 4
-.IX Item "$fileLevel     = logFileLevel ( [$fileLevel] );"
-.ie n .IP "$syslogLevel   = logSyslogLevel ( [$syslogLevel] );" 4
-.el .IP "\f(CW$syslogLevel\fR   = logSyslogLevel ( [$syslogLevel] );" 4
-.IX Item "$syslogLevel   = logSyslogLevel ( [$syslogLevel] );"
-.PD
-These methods can be used to get and set the current settings as defined in logInit.
-.ie n .IP "Debug( $string );" 4
-.el .IP "Debug( \f(CW$string\fR );" 4
-.IX Item "Debug( $string );"
-This method will output a debug message if the current debug level permits it, otherwise does nothing. This message will be tagged with the \s-1DBG\s0 string in the logs.
-.ie n .IP "Info( $string );" 4
-.el .IP "Info( \f(CW$string\fR );" 4
-.IX Item "Info( $string );"
-This method will output an informational message if the current debug level permits it, otherwise does nothing. This message will be tagged with the \s-1INF\s0 string in the logs.
-.ie n .IP "Warning( $string );" 4
-.el .IP "Warning( \f(CW$string\fR );" 4
-.IX Item "Warning( $string );"
-This method will output a warning message if the current debug level permits it, otherwise does nothing. This message will be tagged with the \s-1WAR\s0 string in the logs.
-.ie n .IP "Error( $string );" 4
-.el .IP "Error( \f(CW$string\fR );" 4
-.IX Item "Error( $string );"
-This method will output an error message if the current debug level permits it, otherwise does nothing. This message will be tagged with the \s-1ERR\s0 string in the logs.
-.ie n .IP "Fatal( $string );" 4
-.el .IP "Fatal( \f(CW$string\fR );" 4
-.IX Item "Fatal( $string );"
-This method will output a fatal error message and then die if the current debug level permits it, otherwise does nothing. This message will be tagged with the \s-1FAT\s0 string in the logs.
-.ie n .IP "Panic( $string );" 4
-.el .IP "Panic( \f(CW$string\fR );" 4
-.IX Item "Panic( $string );"
-This method will output a panic error message and then die with a stack trace if the current debug level permits it, otherwise does nothing. This message will be tagged with the \s-1PNC\s0 string in the logs.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-The :constants tag will export the debug constants which define the various levels of debug
-The :variables tag will export variables containing the current debug id and level
-The :functions tag will export the debug functions. This or :all is what you would normally use.
-The :all tag will export all above symbols.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Carp
-Sys::Syslog
-.PP
-The ZoneMinder \s-1README\s0 file Troubleshooting section for an extended discussion on the use and configuration of syslog with ZoneMinder.
-.PP
-http://www.zoneminder.com
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-.SH "POD ERRORS"
-.IX Header "POD ERRORS"
-Hey! \fBThe above document had some coding errors, which are explained below:\fR
-.IP "Around line 830:" 4
-.IX Item "Around line 830:"
-You forgot a '=back' before '=head2'
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder::Memory.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder::Memory.3pm
deleted file mode 100644
index 048b11fcd..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Memory.3pm
+++ /dev/null
@@ -1,313 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Memory 3pm"
-.TH ZoneMinder::Memory 3pm "2012-09-11" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::MappedMem \- ZoneMinder Mapped Memory access module
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::MappedMem;
-\&  use ZoneMinder::MappedMem qw(:all);
-\&
-\&  if ( zmMemVerify( $monitor ) )
-\&  {
-\&    $state = zmGetMonitorState( $monitor );
-\&    if ( $state == STATE_ALARM )
-\&    {
-\&      ...
-\&    }
-\&  }
-\&
-\&  ( $lri, $lwi ) = zmMemRead( $monitor, [ "shared_data:last_read_index", "shared_data:last_write_index" ] );
-\&  zmMemWrite( $monitor, { "trigger_data:trigger_showtext" => "Some Text" } );
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-The ZoneMinder:MappedMem module contains methods for accessing and writing to mapped memory as well as helper methods for common operations.
-.PP
-The core elements of ZoneMinder used mapped memory to allow multiple access to resources. Although ZoneMinder scripts have used this information before, up until now it was difficult to access and prone to errors. This module introduces a common \s-1API\s0 for mapped memory access (both reading and writing) making it a lot easier to customise scripts or even create your own.
-.PP
-All the methods listed below require a 'monitor' parameter. This must be a reference to a hash with at least the 'Id' field set to the monitor id of the mapped memory you wish to access. Using database methods to select the monitor details will also return this kind of data. Some of the mapped memory methods will add and amend new fields to this hash.
-.SH "METHODS"
-.IX Header "METHODS"
-.ie n .IP "zmMemVerify ( $monitor );" 4
-.el .IP "zmMemVerify ( \f(CW$monitor\fR );" 4
-.IX Item "zmMemVerify ( $monitor );"
-Verify that the mapped memory of the monitor given exists and is valid. It will return an undefined value if it is not valid. You should generally call this method first before using any of the other methods, but most of the remaining methods will also do so if the memory has not already been verified.
-.ie n .IP "zmMemInvalidate ( $monitor );" 4
-.el .IP "zmMemInvalidate ( \f(CW$monitor\fR );" 4
-.IX Item "zmMemInvalidate ( $monitor );"
-Following an error, reset the mapped memory ids and attempt to reverify on the next operation. This is mostly used when a mapped memory segment has gone away and been recreated with a different id.
-.ie n .IP "zmMemRead ( $monitor, $readspec );" 4
-.el .IP "zmMemRead ( \f(CW$monitor\fR, \f(CW$readspec\fR );" 4
-.IX Item "zmMemRead ( $monitor, $readspec );"
-This method is used to read data from mapped memory attached to the given monitor. The mapped memory will be verified if it has not already been. The 'readspec' must either be a string of the form \*(L"<section>:<field>\*(R" or a reference to an array of strings of the same format. In the first case a single value is returned, in the latter case a list of values is return. Errors will cause undefined to be returned. The allowable sections and field names are described below.
-.ie n .IP "zmMemWrite ( $monitor, $writespec );" 4
-.el .IP "zmMemWrite ( \f(CW$monitor\fR, \f(CW$writespec\fR );" 4
-.IX Item "zmMemWrite ( $monitor, $writespec );"
-This method is used to write data to mapped memory attached to the given monitor. The mapped memory will be verified if it has not already been. The 'writespec' must be a reference to a hash with keys of the form \*(L"<section>:<field>\*(R" and values as the data to be written. Errors will cause undefined to be returned, otherwise a non-undefined value will be returned. The allowable sections and field names are described below.
-.ie n .IP "$state = zmGetMonitorState ( $monitor );" 4
-.el .IP "\f(CW$state\fR = zmGetMonitorState ( \f(CW$monitor\fR );" 4
-.IX Item "$state = zmGetMonitorState ( $monitor );"
-Return the current state of the given monitor. This is an integer value and can be compared with the \s-1STATE\s0 constants given below.
-.ie n .IP "$event_id = zmGetLastEvent ( $monitor );" 4
-.el .IP "\f(CW$event_id\fR = zmGetLastEvent ( \f(CW$monitor\fR );" 4
-.IX Item "$event_id = zmGetLastEvent ( $monitor );"
-Return the event id of the last event that the monitor generated, or 0 if no event has been generated by the current monitor process.
-.ie n .IP "zmIsAlarmed ( $monitor );" 4
-.el .IP "zmIsAlarmed ( \f(CW$monitor\fR );" 4
-.IX Item "zmIsAlarmed ( $monitor );"
-Return 1 if the monitor given is currently in an alarm state, 0 otherwise.
-.ie n .IP "zmInAlarm ( $monitor );" 4
-.el .IP "zmInAlarm ( \f(CW$monitor\fR );" 4
-.IX Item "zmInAlarm ( $monitor );"
-Return 1 if the monitor given is currently in an alarm or alerted state, 0 otherwise.
-.ie n .IP "zmHasAlarmed ( $monitor );" 4
-.el .IP "zmHasAlarmed ( \f(CW$monitor\fR );" 4
-.IX Item "zmHasAlarmed ( $monitor );"
-Return 1 if the given monitor is in an alarm state, or has been in an alarm state since the last call to this method.
-.ie n .IP "( $x, $y ) = zmGetAlarmLocation ( $monitor );" 4
-.el .IP "( \f(CW$x\fR, \f(CW$y\fR ) = zmGetAlarmLocation ( \f(CW$monitor\fR );" 4
-.IX Item "( $x, $y ) = zmGetAlarmLocation ( $monitor );"
-Return an x,y pair indicating the image co-ordinates of the centre of the last motion event generated by the given monitor. If no event has been generated by the current monitor process, or the alarm was not motion related, returns \-1,\-1.
-.ie n .IP "zmGetLastWriteTime ( $monitor );" 4
-.el .IP "zmGetLastWriteTime ( \f(CW$monitor\fR );" 4
-.IX Item "zmGetLastWriteTime ( $monitor );"
-Returns the time (in utc seconds) since the last image was captured by the given monitor and written to shared memory, or 0 otherwise.
-.ie n .IP "zmGetLastReadTime ( $monitor );" 4
-.el .IP "zmGetLastReadTime ( \f(CW$monitor\fR );" 4
-.IX Item "zmGetLastReadTime ( $monitor );"
-Returns the time (in utc seconds) since the last image was read from shared memory by the analysis daemon of the given monitor, or 0 otherwise or if the monitor is in monitor only mode.
-.ie n .IP "zmMonitorSuspend ( $monitor );" 4
-.el .IP "zmMonitorSuspend ( \f(CW$monitor\fR );" 4
-.IX Item "zmMonitorSuspend ( $monitor );"
-Suspend the given monitor from generating events caused by motion. This method can be used to prevent camera actions such as panning or zooming from causing events. If configured to do so, the monitor may automatically resume after a defined period.
-.ie n .IP "zmMonitorResume ( $monitor );" 4
-.el .IP "zmMonitorResume ( \f(CW$monitor\fR );" 4
-.IX Item "zmMonitorResume ( $monitor );"
-Allow the given monitor to resume generating events caused by motion.
-.ie n .IP "zmTriggerEventOn ( $monitor, $score, $cause [, $text, $showtext ] );" 4
-.el .IP "zmTriggerEventOn ( \f(CW$monitor\fR, \f(CW$score\fR, \f(CW$cause\fR [, \f(CW$text\fR, \f(CW$showtext\fR ] );" 4
-.IX Item "zmTriggerEventOn ( $monitor, $score, $cause [, $text, $showtext ] );"
-Trigger the given monitor to generate an event. You must supply an event score and a cause string indicating the reason for the event. You may also supply a text string containing further details about the event and a showtext string which may be included in the timestamp annotation on any images captured during the event, if configured to do so.
-.ie n .IP "zmTriggerEventOff ( $monitor );" 4
-.el .IP "zmTriggerEventOff ( \f(CW$monitor\fR );" 4
-.IX Item "zmTriggerEventOff ( $monitor );"
-Trigger the given monitor to not generate any events. This method does not cancel zmTriggerEventOn, but is exclusive to it. This method is intended to allow external triggers to prevent normal events being generated by monitors in the same way as zmMonitorSuspend but applies to all events and not just motion, and is intended for longer timescales than are appropriate for suspension.
-.ie n .IP "zmTriggerEventCancel ( $monitor );" 4
-.el .IP "zmTriggerEventCancel ( \f(CW$monitor\fR );" 4
-.IX Item "zmTriggerEventCancel ( $monitor );"
-Cancel any previous trigger on or off requests. This stops a triggered alarm if it exists from a previous 'on' and allows events to be generated once more following a previous 'off'.
-.ie n .IP "zmTriggerShowtext ( $monitor, $showtest );" 4
-.el .IP "zmTriggerShowtext ( \f(CW$monitor\fR, \f(CW$showtest\fR );" 4
-.IX Item "zmTriggerShowtext ( $monitor, $showtest );"
-Indicate that the given text should be displayed in the timestamp annotation on any images captured, if the format of the annotation string defined for the monitor permits.
-.SH "DATA"
-.IX Header "DATA"
-The data fields in mapped memory that may be accessed are as follows. There are two main sections, shared_data which is general data and trigger_data which is used for event triggering. Whilst reading from these fields is harmless, extreme care must be taken when writing to mapped memory, especially in the shared_data section as this is normally written to only by monitor capture and analysis processes.
-.PP
-.Vb 10
-\&  shared_data         The general mapped memory section
-\&    size              The size, in bytes, of this section
-\&    valid             Flag indicating whether this section has been initialised
-\&    active            Flag indicating whether this monitor is active (enabled/disabled)
-\&    signal            Flag indicating whether this monitor is reciving a valid signal
-\&    state             The current monitor state, see the STATE constants below
-\&    last_write_index  The last index, in the image buffer, that an image has been saved to
-\&    last_read_index   The last index, in the image buffer, that an image has been analysed from
-\&    last_write_time   The time (in utc seconds) when the last image was captured
-\&    last_read_time    The time (in utc seconds) when the last image was analysed
-\&    last_event        The id of the last event generated by the monitor analysis process, 0 if none
-\&    action            The monitor actions bitmask, see the ACTION constants below
-\&    brightness        Read/write location for the current monitor brightness
-\&    hue               Read/write location for the current monitor hue
-\&    colour            Read/write location for the current monitor colour
-\&    contrast          Read/write location for the current monitor contrast
-\&    alarm_x           Image x co\-ordinate (from left) of the centre of the last motion event, \-1 if none
-\&    alarm_y           Image y co\-ordinate (from top) of the centre of the last motion event, \-1 if none
-\&
-\&  trigger_data        The triggered event mapped memory section
-\&    size              The size, in bytes of this section
-\&    trigger_state     The current trigger state, see the TRIGGER constants below
-\&    trigger_score     The current triggered event score
-\&    trigger_cause     The current triggered event cause string
-\&    trigger_text      The current triggered event descriptive text string
-\&    trigger_showtext  The triggered text that will be displayed on captured image timestamps
-.Ve
-.SH "CONSTANTS"
-.IX Header "CONSTANTS"
-The following constants are used by the methods above, but can also be used by user scripts if required.
-.IP "\s-1STATE_IDLE\s0 \s-1STATE_PREALARM\s0 \s-1STATE_ALARM\s0 \s-1STATE_ALERT\s0 \s-1STATE_TAPE\s0" 4
-.IX Item "STATE_IDLE STATE_PREALARM STATE_ALARM STATE_ALERT STATE_TAPE"
-These constants define the state of the monitor with respect to alarms and events. They are used in the shared_data:state field.
-.IP "\s-1ACTION_GET\s0 \s-1ACTION_SET\s0 \s-1ACTION_RELOAD\s0 \s-1ACTION_SUSPEND\s0 \s-1ACTION_RESUME\s0" 4
-.IX Item "ACTION_GET ACTION_SET ACTION_RELOAD ACTION_SUSPEND ACTION_RESUME"
-These constants defines the various values that can exist in the shared_data:action field. This is a bitmask which when non-zero defines an action that an executing monitor process should take. \s-1ACTION_GET\s0 requires that the current values of brightness, contrast, colour and hue are taken from the camera and written to the equivalent mapped memory fields. \s-1ACTION_SET\s0 implies the reverse, that the values in mapped memory should be written to the camera. \s-1ACTION_RELOAD\s0 signal that the monitor process should reload itself from the database in case any settings have changed there. \s-1ACTION_SUSPEND\s0 signals that a monitor should stop exaiming images for motion, though other alarms may still occur. \s-1ACTION_RESUME\s0 sigansl that a monitor should resume motion detectiom.
-.IP "\s-1TRIGGER_CANCEL\s0 \s-1TRIGGER_ON\s0 \s-1TRIGGER_OFF\s0" 4
-.IX Item "TRIGGER_CANCEL TRIGGER_ON TRIGGER_OFF"
-These constants are used in the definition of external triggers. \s-1TRIGGER_CANCEL\s0 is used to indicated that any previous trigger settings should be cancelled, \s-1TRIGGER_ON\s0 signals that an alarm should be created (or continued)) as a result of the current trigger and \s-1TRIGGER_OFF\s0 signals that the trigger should prevent any alarms from being generated. See the trigger methods above for further details.
-.SH "EXPORT"
-.IX Header "EXPORT"
-None by default.
-The :constants tag will export the mapped memory constants which mostly define enumerations for the variables held in memory
-The :functions tag will export the mapped memory access functions.
-The :all tag will export all above symbols.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-http://www.zoneminder.com
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-.SH "POD ERRORS"
-.IX Header "POD ERRORS"
-Hey! \fBThe above document had some coding errors, which are explained below:\fR
-.IP "Around line 727:" 4
-.IX Item "Around line 727:"
-You forgot a '=back' before '=head1'
-.IP "Around line 729:" 4
-.IX Item "Around line 729:"
-\&'=item' outside of any '=over'
-.IP "Around line 801:" 4
-.IX Item "Around line 801:"
-You forgot a '=back' before '=head1'
-.IP "Around line 836:" 4
-.IX Item "Around line 836:"
-\&'=item' outside of any '=over'
-.IP "Around line 848:" 4
-.IX Item "Around line 848:"
-You forgot a '=back' before '=head1'
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Channel.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Channel.3pm
deleted file mode 100644
index 02f6655b1..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Channel.3pm
+++ /dev/null
@@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Trigger::Channel 3pm"
-.TH ZoneMinder::Trigger::Channel 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Channel::File.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Channel::File.3pm
deleted file mode 100644
index 21489277f..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Channel::File.3pm
+++ /dev/null
@@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Trigger::Channel::File 3pm"
-.TH ZoneMinder::Trigger::Channel::File 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Channel::Handle.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Channel::Handle.3pm
deleted file mode 100644
index b951b38cc..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Channel::Handle.3pm
+++ /dev/null
@@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Trigger::Channel::Handle 3pm"
-.TH ZoneMinder::Trigger::Channel::Handle 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Channel::Inet.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Channel::Inet.3pm
deleted file mode 100644
index 8b0507d3a..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Channel::Inet.3pm
+++ /dev/null
@@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Trigger::Channel::Inet 3pm"
-.TH ZoneMinder::Trigger::Channel::Inet 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Channel::Serial.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Channel::Serial.3pm
deleted file mode 100644
index cdbfb2c1f..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Channel::Serial.3pm
+++ /dev/null
@@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Trigger::Channel::Serial 3pm"
-.TH ZoneMinder::Trigger::Channel::Serial 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Channel::Spawning.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Channel::Spawning.3pm
deleted file mode 100644
index 413e5262b..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Channel::Spawning.3pm
+++ /dev/null
@@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Trigger::Channel::Spawning 3pm"
-.TH ZoneMinder::Trigger::Channel::Spawning 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Channel::Unix.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Channel::Unix.3pm
deleted file mode 100644
index de4bb999a..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Channel::Unix.3pm
+++ /dev/null
@@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Trigger::Channel::Unix 3pm"
-.TH ZoneMinder::Trigger::Channel::Unix 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Connection.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Connection.3pm
deleted file mode 100644
index 019306786..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Connection.3pm
+++ /dev/null
@@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Trigger::Connection 3pm"
-.TH ZoneMinder::Trigger::Connection 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
diff --git a/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Connection::Example.3pm b/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Connection::Example.3pm
deleted file mode 100644
index 49aaf4a4d..000000000
--- a/scripts/ZoneMinder/blib/man3/ZoneMinder::Trigger::Connection::Example.3pm
+++ /dev/null
@@ -1,169 +0,0 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
-.\"
-.\" Standard preamble:
-.\" ========================================================================
-.de Sp \" Vertical space (when we can't use .PP)
-.if t .sp .5v
-.if n .sp
-..
-.de Vb \" Begin verbatim text
-.ft CW
-.nf
-.ne \\$1
-..
-.de Ve \" End verbatim text
-.ft R
-.fi
-..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
-.ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
-.    ds C` ""
-.    ds C' ""
-'br\}
-.el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
-'br\}
-.\"
-.\" Escape single quotes in literal strings from groff's Unicode transform.
-.ie \n(.g .ds Aq \(aq
-.el       .ds Aq '
-.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
-.\" entries marked with X<> in POD.  Of course, you'll have to process the
-.\" output yourself in some meaningful fashion.
-.ie \nF \{\
-.    de IX
-.    tm Index:\\$1\t\\n%\t"\\$2"
-..
-.    nr % 0
-.    rr F
-.\}
-.el \{\
-.    de IX
-..
-.\}
-.\"
-.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
-.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
-.    \" fudge factors for nroff and troff
-.if n \{\
-.    ds #H 0
-.    ds #V .8m
-.    ds #F .3m
-.    ds #[ \f1
-.    ds #] \fP
-.\}
-.if t \{\
-.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
-.    ds #V .6m
-.    ds #F 0
-.    ds #[ \&
-.    ds #] \&
-.\}
-.    \" simple accents for nroff and troff
-.if n \{\
-.    ds ' \&
-.    ds ` \&
-.    ds ^ \&
-.    ds , \&
-.    ds ~ ~
-.    ds /
-.\}
-.if t \{\
-.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
-.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
-.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
-.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
-.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
-.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
-.\}
-.    \" troff and (daisy-wheel) nroff accents
-.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
-.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
-.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
-.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
-.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
-.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
-.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
-.ds ae a\h'-(\w'a'u*4/10)'e
-.ds Ae A\h'-(\w'A'u*4/10)'E
-.    \" corrections for vroff
-.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
-.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
-.    \" for low resolution devices (crt and lpr)
-.if \n(.H>23 .if \n(.V>19 \
-\{\
-.    ds : e
-.    ds 8 ss
-.    ds o a
-.    ds d- d\h'-1'\(ga
-.    ds D- D\h'-1'\(hy
-.    ds th \o'bp'
-.    ds Th \o'LP'
-.    ds ae ae
-.    ds Ae AE
-.\}
-.rm #[ #] #H #V #F C
-.\" ========================================================================
-.\"
-.IX Title "ZoneMinder::Trigger::Connection::Example 3pm"
-.TH ZoneMinder::Trigger::Connection::Example 3pm "2012-07-17" "perl v5.14.2" "User Contributed Perl Documentation"
-.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
-.\" way too many mistakes in technical documents.
-.if n .ad l
-.nh
-.SH "NAME"
-ZoneMinder::Database \- Perl extension for blah blah blah
-.SH "SYNOPSIS"
-.IX Header "SYNOPSIS"
-.Vb 2
-\&  use ZoneMinder::Database;
-\&  blah blah blah
-.Ve
-.SH "DESCRIPTION"
-.IX Header "DESCRIPTION"
-Stub documentation for ZoneMinder, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-.PP
-Blah blah blah.
-.SS "\s-1EXPORT\s0"
-.IX Subsection "EXPORT"
-None by default.
-.SH "SEE ALSO"
-.IX Header "SEE ALSO"
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in \s-1UNIX\s0), or any relevant external documentation such as RFCs or
-standards.
-.PP
-If you have a mailing list set up for your module, mention it here.
-.PP
-If you have a web site set up for your module, mention it here.
-.SH "AUTHOR"
-.IX Header "AUTHOR"
-Philip Coombes, <philip.coombes@zoneminder.com>
-.SH "COPYRIGHT AND LICENSE"
-.IX Header "COPYRIGHT AND LICENSE"
-Copyright (C) 2001\-2008  Philip Coombes
-.PP
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
diff --git a/scripts/ZoneMinder/blib/script/.exists b/scripts/ZoneMinder/blib/script/.exists
deleted file mode 100644
index e69de29bb..000000000
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm
deleted file mode 100644
index 87adca18a..000000000
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm
+++ /dev/null
@@ -1,2015 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Config Data Module, $Date: 2011-01-20 18:49:42 +0000 (Thu, 20 Jan 2011) $, $Revision: 3230 $
-# Copyright (C) 2001-2008  Philip Coombes
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-# ==========================================================================
-#
-# This module contains the debug definitions and functions used by the rest 
-# of the ZoneMinder scripts
-#
-package ZoneMinder::ConfigData;
-
-use 5.006;
-use strict;
-use warnings;
-
-require Exporter;
-require ZoneMinder::Base;
-
-our @ISA = qw(Exporter ZoneMinder::Base);
-
-# Items to export into callers namespace by default. Note: do not export
-# names by default without a very good reason. Use EXPORT_OK instead.
-# Do not simply export all your public functions/methods/constants.
-
-# This allows declaration	use ZoneMinder ':all';
-# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
-# will save memory.
-our %EXPORT_TAGS = (
-	'data' => [ qw(
-		%types
-		@options
-		%options_hash
-	) ]
-);
-push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
-
-our @EXPORT_OK = ( @{ $EXPORT_TAGS{'data'} } );
-
-our @EXPORT = qw();
-
-our $VERSION = $ZoneMinder::Base::VERSION;
-
-# ==========================================================================
-#
-# Configuration Data
-#
-# ==========================================================================
-
-use Carp;
-
-our $configInitialised = 0;
-
-sub INIT
-{
-    initialiseConfig();
-}
-
-# Types
-our %types =
-(
-	string => { db_type=>"string", hint=>"string", pattern=>qr|^(.+)$|, format=>q( $1 ) },
-	alphanum => { db_type=>"string", hint=>"alphanumeric", pattern=>qr|^([a-zA-Z0-9-_]+)$|, format=>q( $1 ) },
-	text => { db_type=>"text", hint=>"free text", pattern=>qr|^(.+)$|, format=>q( $1 ) },
-	boolean => { db_type=>"boolean", hint=>"yes|no", pattern=>qr|^([yn])|i, check=>q( $1 ), format=>q( ($1 =~ /^y/) ? "yes" : "no" ) },
-	integer => { db_type=>"integer", hint=>"integer", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-	decimal => { db_type=>"decimal", hint=>"decimal", pattern=>qr|^(\d+(?:\.\d+)?)$|, format=>q( $1 ) },
-	hexadecimal => { db_type=>"hexadecimal", hint=>"hexadecimal", pattern=>qr|^(?:0x)?([0-9a-f]{1,8})$|, format=>q( "0x".$1 ) },
-	tristate => { db_type=>"string", hint=>"auto|yes|no", pattern=>qr|^([ayn])|i, check=>q( $1 ), format=>q( ($1 =~ /^y/) ? "yes" : ($1 =~ /^n/ ? "no" : "auto" ) ) },
-	abs_path => { db_type=>"string", hint=>"/absolute/path/to/somewhere", pattern=>qr|^((?:/[^/]*)+?)/?$|, format=>q( $1 ) },
-	rel_path => { db_type=>"string", hint=>"relative/path/to/somewhere", pattern=>qr|^((?:[^/].*)?)/?$|, format=>q( $1 ) },
-	directory => { db_type=>"string", hint=>"directory", pattern=>qr|^([a-zA-Z0-9-_.]+)$|, format=>q( $1 ) },
-	file => { db_type=>"string", hint=>"filename", pattern=>qr|^([a-zA-Z0-9-_.]+)$|, format=>q( $1 ) },
-	hostname => { db_type=>"string", hint=>"host.your.domain", pattern=>qr|^([a-zA-Z0-9_.-]+)$|, format=>q( $1 ) },
-	url => { db_type=>"string", hint=>"http://host.your.domain/", pattern=>qr|^(?:http://)?(.+)$|, format=>q( "http://".$1 ) },
-	email => { db_type=>"string", hint=>"your.name\@your.domain", pattern=>qr|^([a-zA-Z0-9_.-]+)\@([a-zA-Z0-9_.-]+)$|, format=>q( $1\@$2 ) },
-);
-
-our @options =
-(
-	{
-		name => "ZM_LANG_DEFAULT",
-		default => "en_gb",
-		description => "Default language used by web interface",
-		help => "ZoneMinder allows the web interface to use languages other than English if the appropriate language file has been created and is present. This option allows you to change the default language that is used from the shipped language, British English, to another language",
-		type => $types{string},
-		category => "system",
-	},
-	{
-		name => "ZM_OPT_USE_AUTH",
-		default => "no",
-		description => "Authenticate user logins to ZoneMinder",
-		help => "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.",
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-		name => "ZM_AUTH_TYPE",
-		default => "builtin",
-		description => "What is used to authenticate ZoneMinder users",
-		help => "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.",
-		requires => [ { name=>"ZM_OPT_USE_AUTH", value=>"yes" } ],
-		type => { db_type=>"string", hint=>"builtin|remote", pattern=>qr|^([br])|i, format=>q( $1 =~ /^b/ ? "builtin" : "remote" ) },
-		category => "system",
-	},
-	{
-		name => "ZM_AUTH_RELAY",
-		default => "hashed",
-		description => "Method used to relay authentication information",
-		help => "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.",
-		requires => [ { name=>"ZM_OPT_USE_AUTH", value=>"yes" } ],
-		type => { db_type=>"string", hint=>"hashed|plain|none", pattern=>qr|^([hpn])|i, format=>q( ($1 =~ /^h/) ? "hashed" : ($1 =~ /^p/ ? "plain" : "none" ) ) },
-		category => "system",
-	},
-	{
-		name => "ZM_AUTH_HASH_SECRET",
-		default => "...Change me to something unique...",
-		description => "Secret for encoding hashed authentication information",
-		help => "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.",
-		requires => [ { name=>"ZM_OPT_USE_AUTH", value=>"yes" }, { name=>"ZM_AUTH_RELAY", value=>"hashed" } ],
-		type => $types{string},
-		category => "system",
-	},
-	{
-		name => "ZM_AUTH_HASH_IPS",
-		default => "yes",
-		description => "Include IP addresses in the authentication hash",
-		help => "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.",
-		requires => [ { name=>"ZM_OPT_USE_AUTH", value=>"yes" }, { name=>"ZM_AUTH_RELAY", value=>"hashed" } ],
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-		name => "ZM_AUTH_HASH_LOGINS",
-		default => "no",
-		description => "Allow login by authentication hash",
-		help => "The normal process for logging into ZoneMinder is via the login screen with username and password. In some circumstances it may be desirable to allow access directly to one or more pages, for instance from a third party application. If this option is enabled then adding an 'auth' parameter to any request will include a shortcut login bypassing the login screen, if not already logged in. As authentication hashes are time and, optionally, IP limited this can allow short-term access to ZoneMinder screens from other web pages etc. In order to use this the calling application will hae to generate the authentication hash itself and ensure it is valid. If you use this option you should ensure that you have modified the ZM_AUTH_HASH_SECRET to somethign unique to your system.",
-		requires => [ { name=>"ZM_OPT_USE_AUTH", value=>"yes" }, { name=>"ZM_AUTH_RELAY", value=>"hashed" } ],
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-		name => "ZM_DIR_EVENTS",
-		default => "events",
-		description => "Directory where events are stored",
-		help => "This is the path to the events directory where all the event images and other miscellaneous files are stored. It is normally given as a subdirectory of the web directory you have specified earlier however if disk space is tight it can reside on another partition in which case you should create a link from that area to the path you give here.",
-		type => $types{directory},
-		category => "paths",
-	},
-	{
-		name => "ZM_USE_DEEP_STORAGE",
-		default => "yes",
-		description => "Use a deep filesystem hierarchy for events",
-		help => "Traditionally ZoneMinder stores all events for a monitor in one directory for that monitor. This is simple and efficient except when you have very large amounts of events. Some filesystems are unable to store more than 32k files in one directory and even without this limitation, large numbers of files in a directory can slow creation and deletion of files. This option allows you to select an alternate method of storing events by year/month/day/hour/min/second which has the effect of separating events out into more directories, resulting in less per directory, and also making it easier to manually navigate to any events that may have happened at a particular time or date.",
-		type => $types{boolean},
-		category => "paths",
-	},
-	{
-		name => "ZM_DIR_IMAGES",
-		default => "images",
-		description => "Directory where the images that the ZoneMinder client generates are stored",
-		help => "ZoneMinder generates a myriad of images, mosty of which are associated with events. For those that aren't this is where they go.",
-		type => $types{directory},
-		category => "paths",
-	},
-	{
-		name => "ZM_DIR_SOUNDS",
-		default => "sounds",
-		description => "Directory to the sounds that the ZoneMinder client can use",
-		help => "ZoneMinder can optionally play a sound file when an alarm is detected. This indicates where (relative to the web root) to look for this file.",
-		type => $types{directory},
-		category => "paths",
-	},
-	{
-		name => "ZM_PATH_ZMS",
-		default => "/cgi-bin/nph-zms",
-		description => "Web path to zms streaming server",
-		help => "The ZoneMinder streaming server is required to send streamed images to your browser. It will be installed into the cgi-bin path given at configuration time. This option determines what the web path to the server is rather than the local path on your machine. Ordinarily the streaming server runs in parser-header mode however if you experience problems with streaming you can change this to non-parsed-header (nph) mode by changing 'zms' to 'nph-zms'.",
-		type => $types{rel_path},
-		category => "paths",
-	},
-	{
-		name => "ZM_COLOUR_JPEG_FILES",
-		default => "yes",
-		description => "Colourise greyscale JPEG files",
-		help => "Cameras that capture in greyscale can write their captured images to jpeg files with a corresponding greyscale colour space. This saves a small amount of disk space over colour ones. However some tools such as ffmpeg either fail to work with this colour space or have to convert it beforehand. Setting this option to yes uses up a little more space but makes creation of MPEG files much faster.",
-		type => $types{boolean},
-		category => "images",
-	},
-	{
-		name => "ZM_ADD_JPEG_COMMENTS",
-		default => "no",
-		description => "Add jpeg timestamp annotations as file header comments",
-		help => "JPEG files may have a number of extra fields added to the file header. The comment field may have any kind of text added. This options allows you to have the same text that is used to annotate the image additionally included as a file header comment. If you archive event images to other locations this may help you locate images for particular events or times if you use software that can read comment headers.",
-		type => $types{boolean},
-		category => "images",
-	},
-	{
-		name => "ZM_JPEG_FILE_QUALITY",
-		default => "70",
-		description => "Set the JPEG quality setting for the saved event files (1-100)",
-		help => "When ZoneMinder detects an event it will save the images associated with that event to files. These files are in the JPEG format and can be viewed or streamed later. This option specifies what image quality should be used to save these files. A higher number means better quality but less compression so will take up more disk space and take longer to view over a slow connection. By contrast a low number means smaller, quicker to view, files but at the price of lower quality images. This setting applies to all images written except if the capture image has caused an alarm and the alarm file quality option is set at a higher value when that is used instead.",
-		type => $types{integer},
-		category => "images",
-	},
-	{
-		name => "ZM_JPEG_ALARM_FILE_QUALITY",
-		default => "0",
-		description => "Set the JPEG quality setting for the saved event files during an alarm (1-100)",
-		help => "This value is equivalent to the regular jpeg file quality setting above except that it only applies to images saved while in an alarm state and then only if this value is set to a higher quality setting than the ordinary file setting. If set to a lower value then it is ignored. Thus leaving it at the default of 0 effectively means to use the regular file quality setting for all saved images. This is to prevent acccidentally saving important images at a worse quality setting.",
-		type => $types{integer},
-		category => "images",
-	},
-    # Deprecated, now stream quality
-	{
-		name => "ZM_JPEG_IMAGE_QUALITY",
-		default => "70",
-		description => "Set the JPEG quality setting for the streamed 'live' images (1-100)",
-		help => "When viewing a 'live' stream for a monitor ZoneMinder will grab an image from the buffer and encode it into JPEG format before sending it. This option specifies what image quality should be used to encode these images. A higher number means better quality but less compression so will take longer to view over a slow connection. By contrast a low number means quicker to view images but at the price of lower quality images. This option does not apply when viewing events or still images as these are usually just read from disk and so will be encoded at the quality specified by the previous options.",
-		type => $types{integer},
-		category => "hidden",
-	},
-	{
-		name => "ZM_JPEG_STREAM_QUALITY",
-		default => "70",
-		description => "Set the JPEG quality setting for the streamed 'live' images (1-100)",
-		help => "When viewing a 'live' stream for a monitor ZoneMinder will grab an image from the buffer and encode it into JPEG format before sending it. This option specifies what image quality should be used to encode these images. A higher number means better quality but less compression so will take longer to view over a slow connection. By contrast a low number means quicker to view images but at the price of lower quality images. This option does not apply when viewing events or still images as these are usually just read from disk and so will be encoded at the quality specified by the previous options.",
-		type => $types{integer},
-		category => "images",
-	},
-	{
-		name => "ZM_MPEG_TIMED_FRAMES",
-		default => "yes",
-		description => "Tag video frames with a timestamp for more realistic streaming",
-		help => "When using streamed MPEG based video, either for live monitor streams or events, ZoneMinder can send the streams in two ways. If this option is selected then the timestamp for each frame, taken from it's capture time, is included in the stream. This means that where the frame rate varies, for instance around an alarm, the stream will still maintain it's 'real' timing. If this option is not selected then an approximate frame rate is calculated and that is used to schedule frames instead. This option should be selected unless you encounter problems with your preferred streaming method.",
-		type => $types{boolean},
-		category => "images",
-	},
-	{
-		name => "ZM_MPEG_LIVE_FORMAT",
-		default => "swf",
-		description => "What format 'live' video streams are played in",
-		help => "When using MPEG mode ZoneMinder can output live video. However what formats are handled by the browser varies greatly between machines. This option allows you to specify a video format using a file extension format, so you would just enter the extension of the file type you would like and the rest is determined from that. The default of 'asf' works well under Windows with Windows Media Player but I'm currently not sure what, if anything, works on a Linux platform. If you find out please let me know! If this option is left blank then live streams will revert to being in motion jpeg format",
-		type => $types{string},
-		category => "images",
-	},
-	{
-		name => "ZM_MPEG_REPLAY_FORMAT",
-		default => "swf",
-		description => "What format 'replay' video streams are played in",
-		help => "When using MPEG mode ZoneMinder can replay events in encoded video format. However what formats are handled by the browser varies greatly between machines. This option allows you to specify a video format using a file extension format, so you would just enter the extension of the file type you would like and the rest is determined from that. The default of 'asf' works well under Windows with Windows Media Player and 'mpg', or 'avi' etc should work under Linux. If you know any more then please let me know! If this option is left blank then live streams will revert to being in motion jpeg format",
-		type => $types{string},
-		category => "images",
-	},
-	{
-		name => "ZM_RAND_STREAM",
-		default => "yes",
-		description => "Add a random string to prevent caching of streams",
-		help => "Some browsers can cache the streams used by ZoneMinder. In order to prevent his a harmless random string can be appended to the url to make each invocation of the stream appear unique.",
-		type => $types{boolean},
-		category => "images",
-	},
-	{
-		name => "ZM_OPT_CAMBOZOLA",
-		default => "no",
-		description => "Is the (optional) cambozola java streaming client installed",
-		help => "Cambozola is a handy low fat cheese flavoured Java applet that ZoneMinder uses to view image streams on browsers such as Internet Explorer that don't natively support this format. If you use this browser it is highly recommended to install this from http://www.charliemouse.com/code/cambozola/  however if it is not installed still images at a lower refresh rate can still be viewed.",
-		type => $types{boolean},
-		category => "images",
-	},
-	{
-		name => "ZM_PATH_CAMBOZOLA",
-		default => "cambozola.jar",
-		description => "Web path to (optional) cambozola java streaming client",
-		help => "Cambozola is a handy low fat cheese flavoured Java applet that ZoneMinder uses to view image streams on browsers such as Internet Explorer that don't natively support this format. If you use this browser it is highly recommended to install this from http://www.charliemouse.com/code/cambozola/  however if it is not installed still images at a lower refresh rate can still be viewed. Leave this as 'cambozola.jar' if cambozola is installed in the same directory as the ZoneMinder web client files.",
-		requires => [ { name=>"ZM_OPT_CAMBOZOLA", value=>"yes" } ],
-		type => $types{rel_path},
-		category => "images",
-	},
-	{
-		name => "ZM_RELOAD_CAMBOZOLA",
-		default => "0",
-		description => "After how many seconds should Cambozola be reloaded in live view",
-		help => "Cambozola allows for the viewing of streaming MJPEG however it caches the entire stream into cache space on the computer, setting this to a number > 0 will cause it to automatically reload after that many seconds to avoid filling up a hard drive.",
-		type => $types{integer},
-		category => "images",
-	},
-	{
-		name => "ZM_TIMESTAMP_ON_CAPTURE",
-		default => "yes",
-		description => "Timestamp images as soon as they are captured",
-		help => "ZoneMinder can add a timestamp to images in two ways. The default method, when this option is set, is that each image is timestamped immediately when captured and so the image held in memory is marked right away. The second method does not timestamp the images until they are either saved as part of an event or accessed over the web. The timestamp used in both methods will contain the same time as this is preserved along with the image. The first method ensures that an image is timestamped regardless of any other circumstances but will result in all images being timestamped even those never saved or viewed. The second method necessitates that saved images are copied before being saved otherwise two timestamps perhaps at different scales may be applied. This has the (perhaps) desirable side effect that the timestamp is always applied at the same resolution so an image that has scaling applied will still have a legible and correctly scaled timestamp.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_CPU_EXTENSIONS",
-		default => "yes",
-		description => "Use advanced CPU extensions to increase performance",
-		help => "When advanced processor extensions such as SSE2 or SSSE3 are available, ZoneMinder can use them, which should increase performance and reduce system load. Enabling this option on processors that do not support the advanced processors extensions used by ZoneMinder is harmless and will have no effect.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_FAST_IMAGE_BLENDS",
-		default => "yes",
-		description => "Use a fast algorithm to blend the reference image",
-		help => "To detect alarms ZoneMinder needs to blend the captured image with the stored reference image to update it for comparison with the next image. The reference blend percentage specified for the monitor controls how much the new image affects the reference image. There are two methods that are available for this. If this option is set then fast calculation which does not use any multiplication or division is used. This calculation is extremely fast, however it limits the possible blend percentages to 50%, 25%, 12.5%, 6.25%, 3.25% and 1.5%. Any other blend percentage will be rounded to the nearest possible one. The alternative is to switch this option off and use standard blending instead, which is slower.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_OPT_ADAPTIVE_SKIP",
-		default => "yes",
-		description => "Should frame analysis try and be efficient in skipping frames",
-		help => "In previous versions of ZoneMinder the analysis daemon would attempt to keep up with the capture daemon by processing the last captured frame on each pass. This would sometimes have the undesirable side-effect of missing a chunk of the initial activity that caused the alarm because the pre-alarm frames would all have to be written to disk and the database before processing the next frame, leading to some delay between the first and second event frames. Setting this option enables a newer adaptive algorithm where the analysis daemon attempts to process as many captured frames as possible, only skipping frames when in danger of the capture daemon overwriting yet to be processed frames. This skip is variable depending on the size of the ring buffer and the amount of space left in it. Enabling this option will give you much better coverage of the beginning of alarms whilst biasing out any skipped frames towards the middle or end of the event. However you should be aware that this will have the effect of making the analysis daemon run somewhat behind the capture daemon during events and for particularly fast rates of capture it is possible for the adaptive algorithm to be overwhelmed and not have time to react to a rapid build up of pending frames and thus for a buffer overrun condition to occur.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_BLEND_ALARMED_IMAGES",
-		default => "yes",
-		description => "Blend alarmed images to update the reference image",
-		help => "To detect alarms ZoneMinder compares an image with a reference image which is formed from a composite of the previous images. This option determines whether images that cause events are included in this process. Doing so may increase the precision of the alarmed region but can cause problems if wholescale lighting changes cause alarms as this would not get fed back into the image and an alarm may persist indefinately. A better way to achive the same effect in most cases is to lower substantially the reference blend percentage in specific monitors.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_MAX_SUSPEND_TIME",
-		default => "30",
-		description => "Maximum time that a monitor may have motion detection suspended",
-		help => "ZoneMinder allows monitors to have motion detection to be suspended, for instance while panning a camera. Ordinarily this relies on the operator resuming motion detection afterwards as failure to do so can leave a monitor in a permanently suspended state. This setting allows you to set a maximum time which a camera may be suspended for before it automatically resumes motion detection. This time can be extended by subsequent suspend indications after the first so continuous camera movement will also occur while the monitor is suspended.",
-		type => $types{integer},
-		category => "config",
-	},
-    # Deprecated, really no longer necessary
-	{
-		name => "ZM_OPT_REMOTE_CAMERAS",
-		default => "no",
-		description => "Are you going to use remote/networked cameras",
-		help => "ZoneMinder can work with both local cameras, ie. those attached physically to your computer and remote or network cameras. If you will be using networked cameras select this option.",
-		type => $types{boolean},
-		category => "hidden",
-	},
-    # Deprecated, now set on a per monitor basis using the Method field
-	{
-		name => "ZM_NETCAM_REGEXPS",
-		default => "yes",
-		description => "Use regular expression matching with network cameras",
-		help => "Traditionally ZoneMinder has used complex regular regular expressions to handle the multitude of formats that network cameras produce. In versions from 1.21.1 the default is to use a simpler and faster built in pattern matching methodology. This works well with most networks cameras but if you have problems you can try the older, but more flexible, regular expression based method by selecting this option. Note, to use this method you must have libpcre installed on your system.",
-		requires => [ { name => "ZM_OPT_REMOTE_CAMERAS", value => "yes" } ],
-		type => $types{boolean},
-		category => "hidden",
-	},
-	{
-		name => "ZM_HTTP_VERSION",
-		default => "1.1",
-		description => "The version of HTTP that ZoneMinder will use to connect",
-		help => "ZoneMinder can communicate with network cameras using either of the HTTP/1.1 or HTTP/1.0 standard. A server will normally fall back to the version it supports iwht no problem so this should usually by left at the default. However it can be changed to HTTP/1.0 if necessary to resolve particular issues.",
-		type => { db_type=>"string", hint=>"1.1|1.0", pattern=>qr|^(1\.[01])$|, format=>q( $1?$1:"" ) },
-		category => "network",
-	},
-	{
-		name => "ZM_HTTP_UA",
-		default => "ZoneMinder",
-		description => "The user agent that ZoneMinder uses to identify itself",
-		help => "When ZoneMinder communicates with remote cameras it will identify itself using this string and it's version number. This is normally sufficient, however if a particular cameras expects only to communicate with certain browsers then this can be changed to a different string identifying ZoneMinder as Internet Explorer or Netscape etc.",
-		type => $types{string},
-		category => "network",
-	},
-	{
-		name => "ZM_HTTP_TIMEOUT",
-		default => "2500",
-		description => "How long ZoneMinder waits before giving up on images (milliseconds)",
-		help => "When retrieving remote images ZoneMinder will wait for this length of time before deciding that an image is not going to arrive and taking steps to retry. This timeout is in milliseconds (1000 per second) and will apply to each part of an image if it is not sent in one whole chunk.",
-		type => $types{integer},
-		category => "network",
-	},
-    {
-		name => "ZM_MIN_RTP_PORT",
-		default => "40200",
-		description => "Minimum port that ZoneMinder will listen for RTP traffic on",
-		help => "When ZoneMinder communicates with MPEG4 capable cameras using RTP with the unicast method it must open ports for the camera to connect back to for control and streaming purposes. This setting specifies the minimum port number that ZoneMinder will use. Ordinarily two adjacent ports are used for each camera, one for control packets and one for data packets. This port should be set to an even number, you may also need to open up a hole in your firewall to allow cameras to connect back if you wish to use unicasting.",
-		type => $types{integer},
-		category => "network",
-	},
-	{
-		name => "ZM_MAX_RTP_PORT",
-		default => "40499",
-		description => "Maximum port that ZoneMinder will listen for RTP traffic on",
-		help => "When ZoneMinder communicates with MPEG4 capable cameras using RTP with the unicast method it must open ports for the camera to connect back to for control and streaming purposes. This setting specifies the maximum port number that ZoneMinder will use. Ordinarily two adjacent ports are used for each camera, one for control packets and one for data packets. This port should be set to an even number, you may also need to open up a hole in your firewall to allow cameras to connect back if you wish to use unicasting. You should also ensure that you have opened up at least two ports for each monitor that will be connecting to unicasting network cameras.",
-		type => $types{integer},
-		category => "network",
-	},
-	{
-		name => "ZM_OPT_FFMPEG",
-		default => "yes",
-		description => "Is the ffmpeg video encoder/decoder installed",
-		help => "ZoneMinder can optionally encode a series of video images into an MPEG encoded movie file for viewing, downloading or storage. This option allows you to specify whether you have the ffmpeg tools installed. Note that creating MPEG files can be fairly CPU and disk intensive and is not a required option as events can still be reviewed as video streams without it.",
-		type => $types{boolean},
-		category => "images",
-	},
-	{
-		name => "ZM_PATH_FFMPEG",
-		default => "/usr/bin/ffmpeg",
-		description => "Path to (optional) ffmpeg mpeg encoder",
-		help => "This path should point to where ffmpeg has been installed.",
-		requires => [ { name=>"ZM_OPT_FFMPEG", value=>"yes" } ],
-		type => $types{abs_path},
-		category => "images",
-	},
-	{
-		name => "ZM_FFMPEG_INPUT_OPTIONS",
-		default => "",
-		description => "Additional input options to ffmpeg",
-		help => "Ffmpeg can take many options on the command line to control the quality of video produced. This option allows you to specify your own set that apply to the input to ffmpeg (options that are given before the -i option). Check the ffmpeg documentation for a full list of options which may be used here.",
-		requires => [ { name=>"ZM_OPT_FFMPEG", value=>"yes" } ],
-		type => $types{string},
-		category => "images",
-	},
-	{
-		name => "ZM_FFMPEG_OUTPUT_OPTIONS",
-		default => "-r 25",
-		description => "Additional output options to ffmpeg",
-		help => "Ffmpeg can take many options on the command line to control the quality of video produced. This option allows you to specify your own set that apply to the output from ffmpeg (options that are given after the -i option). Check the ffmpeg documentation for a full list of options which may be used here. The most common one will often be to force an output frame rate supported by the video encoder.",
-		requires => [ { name=>"ZM_OPT_FFMPEG", value=>"yes" } ],
-		type => $types{string},
-		category => "images",
-	},
-	{
-		name => "ZM_FFMPEG_FORMATS",
-		default => "mpg mpeg wmv asf avi* mov swf 3gp**",
-		description => "Formats to allow for ffmpeg video generation",
-		help => "Ffmpeg can generate video in many different formats. This option allows you to list the ones you want to be able to select. As new formats are supported by ffmpeg you can add them here and be able to use them immediately. Adding a '*' after a format indicates that this will be the default format used for web video, adding '**' defines the default format for phone video.",
-		requires => [ { name=>"ZM_OPT_FFMPEG", value=>"yes" } ],
-		type => $types{string},
-		category => "images",
-	},
-	{
-		name => "ZM_LOG_LEVEL_SYSLOG",
-		default => "0",
-		description => "Save logging output to the system log",
-		help => "ZoneMinder logging is now more more integrated between components and allows you to specify the destination for logging output and the individual levels for each. This option lets you control the level of logging output that goes to the system log. ZoneMinder binaries have always logged to the system log but now scripts and web logging is also included. To preserve the previous behaviour you should ensure this value is set to Info or Warning. This option controls the maximum level of logging that will be written, so Info includes Warnings and Errors etc. To disable entirely, set this option to None. You should use caution when setting this option to Debug as it can affect severely affect system performance. If you want debug you will also need to set a level and component below",
-		type => { db_type=>"integer", hint=>"None=-5|Panic=-4|Fatal=-3|Error=-2|Warning=-1|Info=0|Debug=1", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_LEVEL_FILE",
-		default => "-5",
-		description => "Save logging output to component files",
-		help => "ZoneMinder logging is now more more integrated between components and allows you to specify the destination for logging output and the individual levels for each. This option lets you control the level of logging output that goes to individual log files written by specific components. This is how logging worked previously and although useful for tracking down issues in specific components it also resulted in many disparate log files. To preserve this behaviour you should ensure this value is set to Info or Warning. This option controls the maximum level of logging that will be written, so Info includes Warnings and Errors etc. To disable entirely, set this option to None. You should use caution when setting this option to Debug as it can affect severely affect system performance though file output has less impact than the other options. If you want debug you will also need to set a level and component below",
-		type => { db_type=>"integer", hint=>"None=-5|Panic=-4|Fatal=-3|Error=-2|Warning=-1|Info=0|Debug=1", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_LEVEL_WEBLOG",
-		default => "-5",
-		description => "Save logging output to the weblog",
-		help => "ZoneMinder logging is now more more integrated between components and allows you to specify the destination for logging output and the individual levels for each. This option lets you control the level of logging output from the web interface that goes to the httpd error log. Note that only web logging from PHP and JavaScript files is included and so this option is really only useful for investigating specific issues with those components. This option controls the maximum level of logging that will be written, so Info includes Warnings and Errors etc. To disable entirely, set this option to None. You should use caution when setting this option to Debug as it can affect severely affect system performance. If you want debug you will also need to set a level and component below",
-		type => { db_type=>"integer", hint=>"None=-5|Panic=-4|Fatal=-3|Error=-2|Warning=-1|Info=0|Debug=1", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_LEVEL_DATABASE",
-		default => "0",
-		description => "Save logging output to the database",
-		help => "ZoneMinder logging is now more more integrated between components and allows you to specify the destination for logging output and the individual levels for each. This option lets you control the level of logging output that is written to the database. This is a new option which can make viewing logging output easier and more intuitive and also makes it easier to get an overall impression of how the system is performing. If you have a large or very busy system then it is possible that use of this option may slow your system down if the table becomes very large. Ensure you use the LOG_DATABASE_LIMIT option to keep the table to a manageable size. This option controls the maximum level of logging that will be written, so Info includes Warnings and Errors etc. To disable entirely, set this option to None. You should use caution when setting this option to Debug as it can affect severely affect system performance. If you want debug you will also need to set a level and component below",
-		type => { db_type=>"integer", hint=>"None=-5|Panic=-4|Fatal=-3|Error=-2|Warning=-1|Info=0|Debug=1", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_DATABASE_LIMIT",
-		default => "7 day",
-		description => "Maximum number of log entries to retain",
-		help => "If you are using database logging then it is possible to quickly build up a large number of entries in the Logs table. This option allows you to specify how many of these entries are kept. If you set this option to a number greater than zero then that number is used to determine the maximum number of rows, less than or equal to zero indicates no limit and is not recommended. You can also set this value to time values such as '<n> day' which will limit the log entries to those newer than that time. You can specify 'hour', 'day', 'week', 'month' and 'year', note that the values should be singular (no 's' at the end). The Logs table is pruned periodically so it is possible for more than the expected number of rows to be present briefly in the meantime.",
-		type => $types{string},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_DEBUG",
-		default => "no",
-		description => "Switch debugging on",
-		help => "ZoneMinder components usually support debug logging available to help with diagnosing problems. Binary components have several levels of debug whereas more other components have only one. Normally this is disabled to minimise performance penalties and avoid filling logs too quickly. This option lets you switch on other options that allow you to configure additional debug information to be output. Components will pick up this instruction when they are restarted.",
-		type => $types{boolean},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_DEBUG_TARGET",
-		default => "",
-		description => "What components should have extra debug enabled",
-		help => "There are three scopes of debug available. Leaving this option blank means that all components will use extra debug (not recommended). Setting this option to '_<component>', e.g. _zmc, will limit extra debug to that component only. Setting this option to '_<component>_<identity>', e.g. '_zmc_m1' will limit extra debug to that instance of the component only. This is ordinarily what you probably want to do. To debug scripts use their names without the .pl extension, e.g. '_zmvideo' and to debug issues with the web interface use '_web'. You can specify multiple targets by separating them with '|' characters.",
-		requires => [ { name => "ZM_LOG_DEBUG", value => "yes" } ],
-		type => $types{string},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_DEBUG_LEVEL",
-		default => 1,
-		description => "What level of extra debug should be enabled",
-		help => "There are 9 levels of debug available, with higher numbers being more debug and level 0 being no debug. However not all levels are used by all components. Also if there is debug at a high level it is usually likely to be output at such a volume that it may obstruct normal operation. For this reason you should set the level carefully and cautiously until the degree of debug you wish to see is present. Scripts and the web interface only have one level so this is an on/off type option for them.",
-		requires => [ { name => "ZM_LOG_DEBUG", value => "yes" } ],
-		type => { db_type=>"integer", hint=>"1|2|3|4|5|6|7|8|9", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_DEBUG_FILE",
-		default => "/tmp/zm/zm_debug.log+",
-		description => "Where extra debug is output to",
-		help => "This option allows you to specify a different target for debug output. All components have a default log file which will norally be in /tmp or /var/log and this is where debug will be written to if this value is empty. Adding a path here will temporarily redirect debug, and other logging output, to this file. This option is a simple filename and you are debugging several components then they will all try and write to the same file with undesirable consequences. Appending a '+' to the filename will cause the file to be created with a '.<pid>' suffix containing your process id. In this way debug from each run of a component is kept separate. This is the recommended setting as it will also prevent subsequent runs from overwriting the same log. You should ensure that permissions are set up to allow writing to the file and directory specified here.",
-		requires => [ { name => "ZM_LOG_DEBUG", value => "yes" } ],
-		type => $types{string},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_CHECK_PERIOD",
-		default => "900",
-		description => "Time period used when calculating overall system health",
-		help => "When ZoneMinder is logging events to the database it can retrospectively examine the number of warnings and errors that have occurred to calculate an overall state of system health. This option allows you to indicate what period of historical events are used in this calculation. This value is expressed in seconds and is ignored if LOG_LEVEL_DATABASE is set to None.",
-		type => $types{integer},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_ALERT_WAR_COUNT",
-		default => "1",
-		description => "Number of warnings indicating system alert state",
-		help => "When ZoneMinder is logging events to the database it can retrospectively examine the number of warnings and errors that have occurred to calculate an overall state of system health. This option allows you to specify how many warnings must have occurred within the defined time period to generate an overall system alert state. A value of zero means warnings are not considered. This value is ignored if LOG_LEVEL_DATABASE is set to None.",
-		type => $types{integer},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_ALERT_ERR_COUNT",
-		default => "1",
-		description => "Number of errors indicating system alert state",
-		help => "When ZoneMinder is logging events to the database it can retrospectively examine the number of warnings and errors that have occurred to calculate an overall state of system health. This option allows you to specify how many errors must have occurred within the defined time period to generate an overall system alert state. A value of zero means errors are not considered. This value is ignored if LOG_LEVEL_DATABASE is set to None.",
-		type => $types{integer},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_ALERT_FAT_COUNT",
-		default => "0",
-		description => "Number of fatal error indicating system alert state",
-		help => "When ZoneMinder is logging events to the database it can retrospectively examine the number of warnings and errors that have occurred to calculate an overall state of system health. This option allows you to specify how many fatal errors (including panics) must have occurred within the defined time period to generate an overall system alert state. A value of zero means fatal errors are not considered. This value is ignored if LOG_LEVEL_DATABASE is set to None.",
-		type => $types{integer},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_ALARM_WAR_COUNT",
-		default => "100",
-		description => "Number of warnings indicating system alarm state",
-		help => "When ZoneMinder is logging events to the database it can retrospectively examine the number of warnings and errors that have occurred to calculate an overall state of system health. This option allows you to specify how many warnings must have occurred within the defined time period to generate an overall system alarm state. A value of zero means warnings are not considered. This value is ignored if LOG_LEVEL_DATABASE is set to None.",
-		type => $types{integer},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_ALARM_ERR_COUNT",
-		default => "10",
-		description => "Number of errors indicating system alarm state",
-		help => "When ZoneMinder is logging events to the database it can retrospectively examine the number of warnings and errors that have occurred to calculate an overall state of system health. This option allows you to specify how many errors must have occurred within the defined time period to generate an overall system alarm state. A value of zero means errors are not considered. This value is ignored if LOG_LEVEL_DATABASE is set to None.",
-		type => $types{integer},
-		category => "logging",
-	},
-	{
-		name => "ZM_LOG_ALARM_FAT_COUNT",
-		default => "1",
-		description => "Number of fatal error indicating system alarm state",
-		help => "When ZoneMinder is logging events to the database it can retrospectively examine the number of warnings and errors that have occurred to calculate an overall state of system health. This option allows you to specify how many fatal errors (including panics) must have occurred within the defined time period to generate an overall system alarm state. A value of zero means fatal errors are not considered. This value is ignored if LOG_LEVEL_DATABASE is set to None.",
-		type => $types{integer},
-		category => "logging",
-	},
-	{
-		name => "ZM_RECORD_EVENT_STATS",
-		default => "yes",
-		description => "Record event statistical information, switch off if too slow",
-		help => "This version of ZoneMinder records detailed information about events in the Stats table. This can help in profiling what the optimum settings are for Zones though this is tricky at present. However in future releases this will be done more easily and intuitively, especially with a large sample of events. The default option of 'yes' allows this information to be collected now in readiness for this but if you are concerned about performance you can switch this off in which case no Stats information will be saved.",
-		type => $types{boolean},
-		category => "logging",
-	},
-	{
-		name => "ZM_RECORD_DIAG_IMAGES",
-		default => "no",
-		description => "Record intermediate alarm diagnostic images, can be very slow",
-		help => "In addition to recording event statistics you can also record the intermediate diagnostic images that display the results of the various checks and processing that occur when trying to determine if an alarm event has taken place. There are several of these images generated for each frame and zone for each alarm or alert frame so this can have a massive impact on performance. Only switch this setting on for debug or analysis purposes and remember to switch it off again once no longer required.",
-		type => $types{boolean},
-		category => "logging",
-	},
-	{
-		name => "ZM_DUMP_CORES",
-		default => "no",
-		description => "Create core files on unexpected process failure.",
-		help => "When an unrecoverable error occurs in a ZoneMinder binary process is has traditionally been trapped and the details written to logs to aid in remote analysis. However in some cases it is easier to diagnose the error if a core file, which is a memory dump of the process at the time of the error, is created. This can be interactively analysed in the debugger and may reveal more or better information than that available from the logs. This option is recommended for advanced users only otherwise leave at the default. Note using this option to trigger core files will mean that there will be no indication in the binary logs that a process has died, they will just stop, however the zmdc log will still contain an entry. Also note that you may have to explicitly enable core file creation on your system via the 'ulimit -c' command or other means otherwise no file will be created regardless of the value of this option.",
-		type => $types{boolean},
-		category => "logging",
-	},
-	{
-		name => "ZM_PATH_MAP",
-		default => "/dev/shm",
-		description => "Path to the mapped memory files that that ZoneMinder can use",
-		help => "ZoneMinder has historically used IPC shared memory for shared data between processes. This has it's advantages and limitations. This version of ZoneMinder can use an alternate method, mapped memory, instead with can be enabled with the --enable--mmap directive to configure. This requires less system configuration and is generally more flexible. However it requires each shared data segment to map onto a filesystem file. This option indicates where those mapped files go. You should ensure that this location has sufficient space for these files and for the best performance it should be a tmpfs file system or ramdisk otherwise disk access may render this method slower than the regular shared memory one.",
-		type => $types{abs_path},
-		category => "paths",
-	},
-	{
-		name => "ZM_PATH_SOCKS",
-		default => "/tmp/zm",
-		description => "Path to the various Unix domain socket files that ZoneMinder uses",
-		help => "ZoneMinder generally uses Unix domain sockets where possible. This reduces the need for port assignments and prevents external applications from possibly compromising the daemons. However each Unix socket requires a .sock file to be created. This option indicates where those socket files go.",
-		type => $types{abs_path},
-		category => "paths",
-	},
-	{
-		name => "ZM_PATH_LOGS",
-		default => "/var/log/zm",
-		description => "Path to the various logs that the ZoneMinder daemons generate",
-		help => "There are various daemons that are used by ZoneMinder to perform various tasks. Most generate helpful log files and this is where they go. They can be deleted if not required for debugging.",
-		type => $types{abs_path},
-		category => "paths",
-	},
-	{
-		name => "ZM_PATH_SWAP",
-		default => "/tmp/zm",
-		description => "Path to location for temporary swap images used in streaming",
-		help => "Buffered playback requires temporary swap images to be stored for each instance of the streaming daemons. This option determines where these images will be stored. The images will actually be stored in sub directories beneath this location and will be automatically cleaned up after a period of time.",
-		type => $types{abs_path},
-		category => "paths",
-	},
-	{
-		name => "ZM_WEB_TITLE_PREFIX",
-		default => "ZM",
-		description => "The title prefix displayed on each window",
-		help => "If you have more than one installation of ZoneMinder it can be helpful to display different titles for each one. Changing this option allows you to customise the window titles to include further information to aid identification.",
-		type => $types{string},
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_RESIZE_CONSOLE",
-		default => "yes",
-		description => "Should the console window resize itself to fit",
-		help => "Traditionally the main ZoneMinder web console window has resized itself to shrink to a size small enough to list only the monitors that are actually present. This is intended to make the window more unobtrusize but may not be to everyones tastes, especially if opened in a tab in browsers which support this kind if layout. Switch this option off to have the console window size left to the users preference",
-		type => $types{boolean},
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_POPUP_ON_ALARM",
-		default => "yes",
-		description => "Should the monitor window jump to the top if an alarm occurs",
-		help => "When viewing a live monitor stream you can specify whether you want the window to pop to the front if an alarm occurs when the window is minimised or behind another window. This is most useful if your monitors are over doors for example when they can pop up if someone comes to the doorway.",
-		type => $types{boolean},
-		category => "web",
-	},
-	{
-		name => "ZM_OPT_X10",
-		default => "no",
-		description => "Support interfacing with X10 devices",
-		help => "If you have an X10 Home Automation setup in your home you can use ZoneMinder to initiate or react to X10 signals if your computer has the appropriate interface controller. This option indicates whether X10 options will be available in the browser client.",
-		type => $types{boolean},
-		category => "x10",
-	},
-	{
-		name => "ZM_X10_DEVICE",
-		default => "/dev/ttyS0",
-		description => "What device is your X10 controller connected on",
-		requires => [ { name => "ZM_OPT_X10", value => "yes" } ],
-		help => "If you have an X10 controller device (e.g. XM10U) connected to your computer this option details which port it is conected on, the default of /dev/ttyS0 maps to serial or com port 1.",
-		type => $types{abs_path},
-		category => "x10",
-	},
-	{
-		name => "ZM_X10_HOUSE_CODE",
-		default => "A",
-		description => "What X10 house code should be used",
-		requires => [ { name => "ZM_OPT_X10", value => "yes" } ],
-		help => "X10 devices are grouped together by identifying them as all belonging to one House Code. This option details what that is. It should be a single letter between A and P.",
-		type => { db_type=>"string", hint=>"A-P", pattern=>qr|^([A-P])|i, format=>q( uc($1) ) },
-		category => "x10",
-	},
-	{
-		name => "ZM_X10_DB_RELOAD_INTERVAL",
-		default => "60",
-		description => "How often (in seconds) the X10 daemon reloads the monitors from the database",
-		requires => [ { name => "ZM_OPT_X10", value => "yes" } ],
-		help => "The zmx10 daemon periodically checks the database to find out what X10 events trigger, or result from, alarms. This option determines how frequently this check occurs, unless you change this area frequently this can be a fairly large value.",
-		type => $types{integer},
-		category => "x10",
-	},
-	{
-		name => "ZM_WEB_SOUND_ON_ALARM",
-		default => "no",
-		description => "Should the monitor window play a sound if an alarm occurs",
-		help => "When viewing a live monitor stream you can specify whether you want the window to play a sound to alert you if an alarm occurs.",
-		type => $types{boolean},
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_ALARM_SOUND",
-		default => "",
-		description => "The sound to play on alarm, put this in the sounds directory",
-		help => "You can specify a sound file to play if an alarm occurs whilst you are watching a live monitor stream. So long as your browser understands the format it does not need to be any particular type. This file should be placed in the sounds directory defined earlier.",
-		type => $types{file},
-		requires => [ { name => "ZM_WEB_SOUND_ON_ALARM", value => "yes" } ],
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_COMPACT_MONTAGE",
-		default => "no",
-		description => "Compact the montage view by removing extra detail",
-		help => "The montage view shows the output of all of your active monitors in one window. This include a small menu and status information for each one. This can increase the web traffic and make the window larger than may be desired. Setting this option on removes all this extraneous information and just displays the images.",
-		type => $types{boolean},
-		category => "web",
-	},
-	{
-		name => "ZM_OPT_FAST_DELETE",
-		default => "yes",
-		description => "Delete only event database records for speed",
-		help => "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. It is recommended that you set this option which means that the browser client only deletes the key entries in the events table, which means the events will no longer appear in the listing, and leaves the zmaudit daemon to clear up the rest later.",
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-		name => "ZM_STRICT_VIDEO_CONFIG",
-		default => "yes",
-		description => "Allow errors in setting video config to be fatal",
-		help => "With some video devices errors can be reported in setting the various video attributes when in fact the operation was successful. Switching this option off will still allow these errors to be reported but will not cause them to kill the video capture daemon. Note however that doing this will cause all errors to be ignored including those which are genuine and which may cause the video capture to not function correctly. Use this option with caution.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_SIGNAL_CHECK_POINTS",
-		default => "10",
-		description => "How many points in a captured image to check for signal loss",
-		help => "For locally attached video cameras ZoneMinder can check for signal loss by looking at a number of random points on each captured image. If all of these points are set to the same fixed colour then the camera is assumed to have lost signal. When this happens any open events are closed and a short one frame signal loss event is generated, as is another when the signal returns. This option defines how many points on each image to check. Note that this is a maximum, any points found to not have the check colour will abort any further checks so in most cases on a couple of points will actually be checked. Network and file based cameras are never checked.",
-		type => $types{integer},
-		category => "config",
-	},
-	{
-		name => "ZM_V4L_MULTI_BUFFER",
-		default => "yes",
-		description => "Use more than one buffer for Video 4 Linux devices",
-		help => "Performance when using Video 4 Linux devices is usually best if multiple buffers are used allowing the next image to be captured while the previous one is being processed. If you have multiple devices on a card sharing one input that requires switching then this approach can sometimes cause frames from one source to be mixed up with frames from another. Switching this option off prevents multi buffering resulting in slower but more stable image capture. This option is ignored for non-local cameras or if only one input is present on a capture chip. This option addresses a similar problem to the ZM_CAPTURES_PER_FRAME option and you should normally change the value of only one of the options at a time.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_CAPTURES_PER_FRAME",
-		default => "1",
-		description => "How many images are captured per returned frame, for shared local cameras",
-		help => "If you are using cameras attached to a video capture card which forces multiple inputs to share one capture chip, it can sometimes produce images with interlaced frames reversed resulting in poor image quality and a distinctive comb edge appearance. Increasing this setting allows you to force additional image captures before one is selected as the captured frame. This allows the capture hardware to 'settle down' and produce better quality images at the price of lesser capture rates. This option has no effect on (a) network cameras, or (b) where multiple inputs do not share a capture chip. This option addresses a similar problem to the ZM_V4L_MULTI_BUFFER option and you should normally change the value of only one of the options at a time.",
-		type => $types{integer},
-		category => "config",
-	},
-	{
-		name => "ZM_FILTER_RELOAD_DELAY",
-		default => "300",
-		description => "How often (in seconds) filters are reloaded in zmfilter",
-		help => "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 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.",
-		type => $types{integer},
-		category => "system",
-	},
-	{
-		name => "ZM_FILTER_EXECUTE_INTERVAL",
-		default => "60",
-		description => "How often (in seconds) to run automatic saved filters",
-		help => "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.",
-		type => $types{integer},
-		category => "system",
-	},
-	{
-		name => "ZM_OPT_UPLOAD",
-		default => "no",
-		description => "Should ZoneMinder support uploading events from filters",
-		help => "In ZoneMinder you can create event filters that specify whether events that match certain criteria should be uploaded to a remote server for archiving. This option specifies whether this functionality should be available",
-		type => $types{boolean},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_ARCH_FORMAT",
-		default => "tar",
-		description => "What format the uploaded events should be created in.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		help => "Uploaded events may be stored in either .tar or .zip format, this option specifies which. Note that to use this you will need to have the Archive::Tar and/or Archive::Zip perl modules installed.",
-		type => { db_type=>"string", hint=>"tar|zip", pattern=>qr|^([tz])|i, format=>q( $1 =~ /^t/ ? "tar" : "zip" ) },
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_ARCH_COMPRESS",
-		default => "no",
-		description => "Should archive files be compressed",
-		help => "When the archive files are created they can be compressed. However in general since the images are compressed already this saves only a minimal amount of space versus utilising more CPU in their creation. Only enable if you have CPU to waste and are limited in disk space on your remote server or bandwidth.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{boolean},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_ARCH_ANALYSE",
-		default => "no",
-		description => "Include the analysis files in the archive",
-		help => "When the archive files are created they can contain either just the captured frames or both the captured frames and, for frames that caused an alarm, the analysed image with the changed area highlighted. This option controls files are included. Only include analysed frames if you have a high bandwidth connection to the remote server or if you need help in figuring out what caused an alarm in the first place as archives with these files in can be considerably larger.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{boolean},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_PROTOCOL",
-		default => "ftp",
-		description => "What protocol to use to upload events",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		help => "ZoneMinder can upload events to a remote server using either FTP or SFTP. Regular FTP is widely supported but not necessarily very secure whereas SFTP (Secure FTP) runs over an ssh connection and so is encrypted and uses regular ssh ports. Note that to use this you will need to have the appropriate perl module, either Net::FTP or Net::SFTP installed depending on your choice.",
-		type => { db_type=>"string", hint=>"ftp|sftp", pattern=>qr|^([tz])|i, format=>q( $1 =~ /^f/ ? "ftp" : "sftp" ) },
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_FTP_HOST",
-		default => "",
-		description => "The remote server to upload to",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote ftp server. This option indicates the name, or ip address, of the server to use.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{hostname},
-		category => "hidden",
-	},
-	{
-		name => "ZM_UPLOAD_HOST",
-		default => "",
-		description => "The remote server to upload events to",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote server. This option indicates the name, or ip address, of the server to use.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{hostname},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_PORT",
-		default => "",
-		description => "The port on the remote upload server, if not the default (SFTP only)",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote server. If you are using the SFTP protocol then this option allows you to specify a particular port to use for connection. If this option is left blank then the default, port 22, is used. This option is ignored for FTP uploads.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{integer},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_FTP_USER",
-		default => "",
-		description => "Your ftp username",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote ftp server. This option indicates the username that ZoneMinder should use to log in for ftp transfer.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{alphanum},
-		category => "hidden",
-	},
-	{
-		name => "ZM_UPLOAD_USER",
-		default => "",
-		description => "Remote server username",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote server. This option indicates the username that ZoneMinder should use to log in for transfer.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{alphanum},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_FTP_PASS",
-		default => "",
-		description => "Your ftp password",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote ftp server. This option indicates the password that ZoneMinder should use to log in for ftp transfer.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{string},
-		category => "hidden",
-	},
-	{
-		name => "ZM_UPLOAD_PASS",
-		default => "",
-		description => "Remote server password",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote server. This option indicates the password that ZoneMinder should use to log in for transfer. If you are using certicate based logins for SFTP servers you can leave this option blank.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{string},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_FTP_LOC_DIR",
-		default => "/tmp/zm",
-		description => "The local directory in which to create upload files",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote ftp server. This option indicates the local directory that ZoneMinder should use for temporary upload files. These are files that are created from events, uploaded and then deleted.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{abs_path},
-		category => "hidden",
-	},
-	{
-		name => "ZM_UPLOAD_LOC_DIR",
-		default => "/tmp/zm",
-		description => "The local directory in which to create upload files",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote server. This option indicates the local directory that ZoneMinder should use for temporary upload files. These are files that are created from events, uploaded and then deleted.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{abs_path},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_FTP_REM_DIR",
-		default => "",
-		description => "The remote directory to upload to",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote ftp server. This option indicates the remote directory that ZoneMinder should use to upload event files to.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{rel_path},
-		category => "hidden",
-	},
-	{
-		name => "ZM_UPLOAD_REM_DIR",
-		default => "",
-		description => "The remote directory to upload to",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote server. This option indicates the remote directory that ZoneMinder should use to upload event files to.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{rel_path},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_FTP_TIMEOUT",
-		default => "120",
-		description => "How long to allow the transfer to take for each file",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote ftp server. This option indicates the maximum ftp inactivity timeout (in seconds) that should be tolerated before ZoneMinder determines that the transfer has failed and closes down the connection.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{integer},
-		category => "hidden",
-	},
-	{
-		name => "ZM_UPLOAD_TIMEOUT",
-		default => "120",
-		description => "How long to allow the transfer to take for each file",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote server. This option indicates the maximum inactivity timeout (in seconds) that should be tolerated before ZoneMinder determines that the transfer has failed and closes down the connection.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{integer},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_FTP_PASSIVE",
-		default => "yes",
-		description => "Use passive ftp when uploading",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote ftp server. This option indicates that ftp transfers should be done in passive mode. This uses a single connection for all ftp activity and, whilst slower than active transfers, is more robust and likely to work from behind filewalls. This option is ignored for SFTP transfers.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		help => "If your computer is behind a firewall or proxy you may need to set FTP to passive mode. In fact for simple transfers it makes little sense to do otherwise anyway but you can set this to 'No' if you wish.",
-		type => $types{boolean},
-		category => "upload",
-	},
-	{
-		name => "ZM_UPLOAD_FTP_DEBUG",
-		default => "no",
-		description => "Switch ftp debugging on",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote ftp server. If you are having (or expecting) troubles with uploading events then setting this to 'yes' permits additional information to be included in the zmfilter log file.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{boolean},
-		category => "hidden",
-	},
-	{
-		name => "ZM_UPLOAD_DEBUG",
-		default => "no",
-		description => "Switch upload debugging on",
-		help => "You can use filters to instruct ZoneMinder to upload events to a remote server. If you are having (or expecting) troubles with uploading events then setting this to 'yes' permits additional information to be generated by the underlying transfer modules and included in the logs.",
-		requires => [ { name => "ZM_OPT_UPLOAD", value => "yes" } ],
-		type => $types{boolean},
-		category => "upload",
-	},
-	{
-		name => "ZM_OPT_EMAIL",
-		default => "no",
-		description => "Should ZoneMinder email you details of events that match corresponding filters",
-		help => "In ZoneMinder you can create event filters that specify whether events that match certain criteria should have their details emailed to you at a designated email address. This will allow you to be notified of events as soon as they occur and also to quickly view the events directly. This option specifies whether this functionality should be available. The email created with this option can be any size and is intended to be sent to a regular email reader rather than a mobile device.",
-		type => $types{boolean},
-		category => "mail",
-	},
-	{
-		name => "ZM_EMAIL_ADDRESS",
-		default => "",
-		description => "The email address to send matching event details to",
-		requires => [ { name => "ZM_OPT_EMAIL", value => "yes" } ],
-		help => "This option is used to define the email address that any events that match the appropriate filters will be sent to.",
-		type => $types{email},
-		category => "mail",
-	},
-	{
-		name => "ZM_EMAIL_TEXT",
-		default => 'subject = "ZoneMinder: Alarm - %MN%-%EI% (%ESM% - %ESA% %EFA%)"
-body = "
-Hello,
-
-An alarm has been detected on your installation of the ZoneMinder.
-
-The details are as follows :-
-
-  Monitor  : %MN%
-  Event Id : %EI%
-  Length   : %EL%
-  Frames   : %EF% (%EFA%)
-  Scores   : t%EST% m%ESM% a%ESA%
-
-This alarm was matched by the %FN% filter and can be viewed at %EPS%
-
-ZoneMinder"',
-		description => "The text of the email used to send matching event details",
-		requires => [ { name => "ZM_OPT_EMAIL", value => "yes" } ],
-		help => "This option is used to define the content of the email that is sent for any events that match the appropriate filters.",
-		type => $types{text},
-		category => "hidden",
-	},
-	{
-		name => "ZM_EMAIL_SUBJECT",
-		default => "ZoneMinder: Alarm - %MN%-%EI% (%ESM% - %ESA% %EFA%)",
-		description => "The subject of the email used to send matching event details",
-		requires => [ { name => "ZM_OPT_EMAIL", value => "yes" } ],
-		help => "This option is used to define the subject of the email that is sent for any events that match the appropriate filters.",
-		type => $types{string},
-		category => "mail",
-	},
-	{
-		name => "ZM_EMAIL_BODY",
-		default => "
-Hello,
-
-An alarm has been detected on your installation of the ZoneMinder.
-
-The details are as follows :-
-
-  Monitor  : %MN%
-  Event Id : %EI%
-  Length   : %EL%
-  Frames   : %EF% (%EFA%)
-  Scores   : t%EST% m%ESM% a%ESA%
-
-This alarm was matched by the %FN% filter and can be viewed at %EPS%
-
-ZoneMinder",
-		description => "The body of the email used to send matching event details",
-		requires => [ { name => "ZM_OPT_EMAIL", value => "yes" } ],
-		help => "This option is used to define the content of the email that is sent for any events that match the appropriate filters.",
-		type => $types{text},
-		category => "mail",
-	},
-	{
-		name => "ZM_OPT_MESSAGE",
-		default => "no",
-		description => "Should ZoneMinder message you with details of events that match corresponding filters",
-		help => "In ZoneMinder you can create event filters that specify whether events that match certain criteria should have their details sent to you at a designated short message email address. This will allow you to be notified of events as soon as they occur. This option specifies whether this functionality should be available. The email created by this option will be brief and is intended to be sent to an SMS gateway or a minimal mail reader such as a mobile device or phone rather than a regular email reader.",
-		type => $types{boolean},
-		category => "mail",
-	},
-	{
-		name => "ZM_MESSAGE_ADDRESS",
-		default => "",
-		description => "The email address to send matching event details to",
-		requires => [ { name => "ZM_OPT_MESSAGE", value => "yes" } ],
-		help => "This option is used to define the short message email address that any events that match the appropriate filters will be sent to.",
-		type => $types{email},
-		category => "mail",
-	},
-	{
-		name => "ZM_MESSAGE_TEXT",
-		default => 'subject = "ZoneMinder: Alarm - %MN%-%EI%"
-body = "ZM alarm detected - %EL% secs, %EF%/%EFA% frames, t%EST%/m%ESM%/a%ESA% score."',
-		description => "The text of the message used to send matching event details",
-		requires => [ { name => "ZM_OPT_MESSAGE", value => "yes" } ],
-		help => "This option is used to define the content of the message that is sent for any events that match the appropriate filters.",
-		type => $types{text},
-		category => "hidden",
-	},
-	{
-		name => "ZM_MESSAGE_SUBJECT",
-		default => "ZoneMinder: Alarm - %MN%-%EI%",
-		description => "The subject of the message used to send matching event details",
-		requires => [ { name => "ZM_OPT_MESSAGE", value => "yes" } ],
-		help => "This option is used to define the subject of the message that is sent for any events that match the appropriate filters.",
-		type => $types{string},
-		category => "mail",
-	},
-	{
-		name => "ZM_MESSAGE_BODY",
-		default => "ZM alarm detected - %EL% secs, %EF%/%EFA% frames, t%EST%/m%ESM%/a%ESA% score.",
-		description => "The body of the message used to send matching event details",
-		requires => [ { name => "ZM_OPT_MESSAGE", value => "yes" } ],
-		help => "This option is used to define the content of the message that is sent for any events that match the appropriate filters.",
-		type => $types{text},
-		category => "mail",
-	},
-	{
-		name => "ZM_NEW_MAIL_MODULES",
-		default => "no",
-		description => "Use a newer perl method to send emails",
-		requires => [ { name => "ZM_OPT_EMAIL", value => "yes" }, { name => "ZM_OPT_MESSAGE", value => "yes" } ],
-		help => "Traditionally ZoneMinder has used the MIME::Entity perl module to construct and send notification emails and messages. Some people have reported problems with this module not being present at all or flexible enough for their needs. If you are one of those people this option allows you to select a new mailing method using MIME::Lite and Net::SMTP instead. This method was contributed by Ross Melin and should work for everyone but has not been extensively tested so currently is not selected by default.",
-		type => $types{boolean},
-		category => "mail",
-	},
-	{
-		name => "ZM_EMAIL_HOST",
-		default => "localhost",
-		description => "The host address of your SMTP mail server",
-		requires => [ { name => "ZM_OPT_EMAIL", value => "yes" }, { name => "ZM_OPT_MESSAGE", value => "yes" } ],
-		help => "If you have chosen SMTP as the method by which to send notification emails or messages then this option allows you to choose which SMTP server to use to send them. The default of localhost may work if you have the sendmail, exim or a similar daemon running however you may wish to enter your ISP's SMTP mail server here.",
-		type => $types{hostname},
-		category => "mail",
-	},
-	{
-		name => "ZM_FROM_EMAIL",
-		default => "",
-		description => "The email address you wish your event notifications to originate from",
-		requires => [ { name => "ZM_OPT_EMAIL", value => "yes" }, { name => "ZM_OPT_MESSAGE", value => "yes" } ],
-		help => "The emails or messages that will be sent to you informing you of events can appear to come from a designated email address to help you with mail filtering etc. An address of something like ZoneMinder\@your.domain is recommended.",
-		type => $types{email},
-		category => "mail",
-	},
-	{
-		name => "ZM_URL",
-		default => "",
-		description => "The URL of your ZoneMinder installation",
-		requires => [ { name => "ZM_OPT_EMAIL", value => "yes" }, { name => "ZM_OPT_MESSAGE", value => "yes" } ],
-		help => "The emails or messages that will be sent to you informing you of events can include a link to the events themselves for easy viewing. If you intend to use this feature then set this option to the url of your installation as it would appear from where you read your email, e.g. http://host.your.domain/zm.php.",
-		type => $types{url},
-		category => "mail",
-	},
-	{
-		name => "ZM_MAX_RESTART_DELAY",
-		default => "600",
-		description => "Maximum delay (in seconds) for daemon restart attempts.",
-		help => "The zmdc (zm daemon control) process controls when processeses are started or stopped and will attempt to restart any that fail. If a daemon fails frequently then a delay is introduced between each restart attempt. If the daemon stills fails then this delay is increased to prevent extra load being placed on the system by continual restarts. This option controls what this maximum delay is.",
-		type => $types{integer},
-		category => "system",
-	},
-	{
-		name => "ZM_WATCH_CHECK_INTERVAL",
-		default => "10",
-		description => "How often to check the capture daemons have not locked up",
-		help => "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 indefinately). This option determines how often the daemons are checked.",
-		type => $types{integer},
-		category => "system",
-	},
-	{
-		name => "ZM_WATCH_MAX_DELAY",
-		default => "5",
-		description => "The maximum delay allowed since the last captured image",
-		help => "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 indefinately). 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.",
-		type => $types{decimal},
-		category => "system",
-	},
-	{
-
-		name => "ZM_RUN_AUDIT",
-		default => "yes",
-		description => "Run zmaudit to check data consistency",
-		help => "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. This is recommended 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 not have zmaudit running unconditionally and schedule occasional checks at other, more convenient, times.",
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-
-		name => "ZM_AUDIT_CHECK_INTERVAL",
-		default => "900",
-		description => "How often to check database and filesystem consistency",
-		help => "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.",
-		type => $types{integer},
-		category => "system",
-	},
-	{
-		name => "ZM_FORCED_ALARM_SCORE",
-		default => "255",
-		description => "Score to give forced alarms",
-		help => "The 'zmu' utility can be used to force an alarm on a monitor rather than rely on the motion detection algorithms. This option determines what score to give these alarms to distinguish them from regular ones. It must be 255 or less.",
-		type => $types{integer},
-		category => "config",
-	},
-	{
-		name => "ZM_BULK_FRAME_INTERVAL",
-		default => "100",
-		description => "How often a bulk frame should be written to the database",
-		help => "Traditionally ZoneMinder writes an entry into the Frames database table for each frame that is captured and saved. This works well in motion detection scenarios but when in a DVR situation ('Record' or 'Mocord' mode) this results in a huge number of frame writes and a lot of database and disk bandwidth for very little additional information. Setting this to a non-zero value will enabled ZoneMinder to group these non-alarm frames into one 'bulk' frame entry which saves a lot of bandwidth and space. The only disadvantage of this is that timing information for individual frames is lost but in constant frame rate situations this is usually not significant. This setting is ignored in Modect mode and individual frames are still written if an alarm occurs in Mocord mode also.",
-		type => $types{integer},
-		category => "config",
-	},
-	{
-		name => "ZM_EVENT_CLOSE_MODE",
-		default => "idle",
-		description => "When continuous events are closed.",
-		help => "When a monitor is running in a continuous recording mode (Record or Mocord) events are usually closed after a fixed period of time (the section length). However in Mocord mode it is possible that motion detection may occur near the end of a section. This option controls what happens when an alarm occurs in Mocord mode. The 'time' setting means that the event will be closed at the end of the section regardless of alarm activity. The 'idle' setting means that the event will be closed at the end of the section if there is no alarm activity occuring at the time otherwise it will be closed once the alarm is over meaning the event may end up being longer than the normal section length. The 'alarm' setting means that if an alarm occurs during the event, the event will be closed once the alarm is over regardless of when this occurs. This has the effect of limiting the number of alarms to one per event and the events will be shorter than the section length if an alarm has occurred.",
-		type => $types{boolean},
-		type => { db_type=>"string", hint=>"time|idle|alarm", pattern=>qr|^([tia])|i, format=>q( ($1 =~ /^t/) ? "time" : ($1 =~ /^i/ ? "idle" : "time" ) ) },
-		category => "config",
-	},
-    # Deprecated, superseded by event close mode
-	{
-		name => "ZM_FORCE_CLOSE_EVENTS",
-		default => "no",
-		description => "Close events at section ends.",
-		help => "When a monitor is running in a continuous recording mode (Record or Mocord) events are usually closed after a fixed period of time (the section length). However in Mocord mode it is possible that motion detection may occur near the end of a section and ordinarily this will prevent the event being closed until the motion has ceased. Switching this option on will force the event closed at the specified time regardless of any motion activity.",
-		type => $types{boolean},
-		category => "hidden",
-	},
-	{
-		name => "ZM_CREATE_ANALYSIS_IMAGES",
-		default => "yes",
-		description => "Create analysed alarm images with motion outlined",
-		help => "By default during an alarm ZoneMinder records both the raw captured image and one that has been analysed and had areas where motion was detected outlined. This can be very useful during zone configuration or in analysing why events occured. However it also incurs some overhead and in a stable system may no longer be necessary. This parameter allows you to switch the generation of these images off.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_WEIGHTED_ALARM_CENTRES",
-		default => "no",
-		description => "Use a weighted algorithm to calculate the centre of an alarm",
-		help => "ZoneMinder will always calculate the centre point of an alarm in a zone to give some indication of where on the screen it is. This can be used by the experimental motion tracking feature or your own custom extensions. In the alarmed or filtered pixels mode this is a simple midpoint between the extents of the detected pxiesl. However in the blob method this can instead be calculated using weighted pixel locations to give more accurate positioning for irregularly shaped blobs. This method, while more precise is also slower and so is turned off by default.",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_EVENT_IMAGE_DIGITS",
-		default => "3",
-		description => "How many significant digits are used in event image numbering",
-		help => "As event images are captured they are stored to the filesystem with a numerical index. By default this index has three digits so the numbers start 001, 002 etc. This works works for most scenarios as events with more than 999 frames are rarely captured. However if you have extremely long events and use external applications then you may wish to increase this to ensure correct sorting of images in listings etc. Warning, increasing this value on a live system may render existing events unviewable as the event will have been saved with the previous scheme. Decreasing this value should have no ill effects.",
-		type => $types{integer},
-		category => "config",
-	},
-	{
-		name => "ZM_DEFAULT_ASPECT_RATIO",
-		default => "4:3",
-		description => "The default width:height aspect ratio used in monitors",
-		help => "When specifying the dimensions of monitors you can click a checkbox to ensure that the width stays in the correct ratio to the height, or vice versa. This setting allows you to indicate what the ratio of these settings should be. This should be specified in the format <width value>:<height value> and the default of 4:3 normally be acceptable but 11:9 is another common setting. If the checkbox is not clicked when specifying monitor dimensions this setting has no effect.",
-		type => $types{string},
-		category => "config",
-	},
-	{
-		name => "ZM_USER_SELF_EDIT",
-		default => "no",
-		description => "Allow unprivileged users to change their details",
-		help => "Ordinarily only users with system edit privilege are able to change users details. Switching this option on allows ordinary users to change their passwords and their language settings",
-		type => $types{boolean},
-		category => "config",
-	},
-	{
-		name => "ZM_OPT_FRAME_SERVER",
-		default => "no",
-		description => "Should analysis farm out the writing of images to disk",
-		#requires => [ { name => "ZM_OPT_ADAPTIVE_SKIP", value => "yes" } ],
-		help => "In some circumstances it is possible for a slow disk to take so long writing images to disk that it causes the analysis daemon to fall behind especially during high frame rate events. Setting this option to yes enables a frame server daemon (zmf) which will be sent the images from the analysis daemon and will do the actual writing of images itself freeing up the analysis daemon to get on with other things. Should this transmission fail or other permanent or transient error occur, this function will fall back to the analysis daemon.",
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-		name => "ZM_FRAME_SOCKET_SIZE",
-		default => "0",
-		description => "Specify the frame server socket buffer size if non-standard",
-		requires => [ { name => "ZM_OPT_FRAME_SERVER", value => "yes" } ],
-		help => "For large captured images it is possible for the writes from the analysis daemon to the frame server to fail as the amount to be written exceeds the default buffer size. While the images are then written by the analysis daemon so no data is lost, it defeats the object of the frame server daemon in the first place. You can use this option to indicate that a larger buffer size should be used. Note that you may have to change the existing maximum socket buffer size on your system via sysctl (or in /proc/sys/net/core/wmem_max) to allow this new size to be set. Alternatively you can change the default buffer size on your system in the same way in which case that will be used with no change necessary in this option",
-		type => $types{integer},
-		category => "system",
-	},
-	{
-		name => "ZM_OPT_CONTROL",
-		default => "no",
-		description => "Support controllable (e.g. PTZ) cameras",
-		help => "ZoneMinder includes limited support for controllable cameras. A number of sample protocols are included and others can easily be added. If you wish to control your cameras via ZoneMinder then select this option otherwise if you only have static cameras or use other control methods then leave this option off.",
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-		name => "ZM_OPT_TRIGGERS",
-		default => "no",
-		description => "Interface external event triggers via socket or device files",
-		help => "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.",
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-		name => "ZM_CHECK_FOR_UPDATES",
-		default => "yes",
-		description => "Check with zoneminder.com for updated versions",
-		help => "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",
-		type => $types{boolean},
-		category => "system",
-	},
-	{
-		name => "ZM_UPDATE_CHECK_PROXY",
-		default => "",
-		description => "Proxy url if required to access zoneminder.com",
-		help => "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>/",
-		type => $types{string},
-		category => "system",
-	},
-	{
-		name => "ZM_SHM_KEY",
-		default => "0x7a6d0000",
-		description => "Shared memory root key to use",
-		help => "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.",
-		type => $types{hexadecimal},
-		category => "system",
-	},
-    # Deprecated, really no longer necessary
-	{
-		name => "ZM_WEB_REFRESH_METHOD",
-		default => "javascript",
-		description => "What method windows should use to refresh themselves",
-		help => "Many windows in Javascript need to refresh themselves to keep their information current. This option determines what method they should use to do this. Choosing 'javascript' means that each window will have a short JavaScript statement in with a timer to prompt the refresh. This is the most compatible method. Choosing 'http' means the refresh instruction is put in the HTTP header. This is a cleaner method but refreshes are interrupted or cancelled when a link in the window is clicked meaning that the window will no longer refresh and this would have to be done manually.",
-		type => { db_type=>"string", hint=>"javascript|http", pattern=>qr|^([jh])|i, format=>q( $1 =~ /^j/ ? "javascript" : "http" ) },
-		category => "hidden",
-	},
-	{
-		name => "ZM_WEB_EVENT_SORT_FIELD",
-		default => "DateTime",
-		description => "Default field the event lists are sorted by",
-		help => "Events in lists can be initially ordered in any way you want. This option controls what field is used to sort them. You can modify this ordering from filters or by clicking on headings in the lists themselves. Bear in mind however that the 'Prev' and 'Next' links, when scrolling through events, relate to the ordering in the lists and so not always to time based ordering.",
-		type => { db_type=>"string", hint=>"Id|Name|Cause|MonitorName|DateTime|Length|Frames|AlarmFrames|TotScore|AvgScore|MaxScore", pattern=>qr|.|, format=>q( $1 ) },
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_EVENT_SORT_ORDER",
-		default => "asc",
-		description => "Default order the event lists are sorted by",
-		help => "Events in lists can be initially ordered in any way you want. This option controls what order (ascending or descending) is used to sort them. You can modify this ordering from filters or by clicking on headings in the lists themselves. Bear in mind however that the 'Prev' and 'Next' links, when scrolling through events, relate to the ordering in the lists and so not always to time based ordering.",
-		type => { db_type=>"string", hint=>"asc|desc", pattern=>qr|^([ad])|i, format=>q( $1 =~ /^a/i ? "asc" : "desc" ) },
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_EVENTS_PER_PAGE",
-		default => "25",
-		description => "How many events to list per page in paged mode",
-		help => "In the event list view you can either list all events or just a page at a time. This option controls how many events are listed per page in paged mode and how often to repeat the column headers in non-paged mode.",
-		type => $types{integer},
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_LIST_THUMBS",
-		default => "no",
-		description => "Display mini-thumbnails of event images in event lists",
-		help => "Ordinarily the event lists just display text details of the events to save space and time. By switching this option on you can also display small thumbnails to help you identify events of interest. The size of these thumbnails is controlled by the following two options.",
-		type => $types{boolean},
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_LIST_THUMB_WIDTH",
-		default => "48",
-		description => "The width of the thumbnails that appear in the event lists",
-		help => "This options controls the width of the thumbnail images that appear in the event lists. It should be fairly small to fit in with the rest of the table. If you prefer you can specify a height instead in the next option but you should only use one of the width or height and the other option should be set to zero. If both width and height are specified then width will be used and height ignored.",
-		type => $types{integer},
-		requires => [ { name => "ZM_WEB_LIST_THUMBS", value => "yes" } ],
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_LIST_THUMB_HEIGHT",
-		default => "0",
-		description => "The height of the thumbnails that appear in the event lists",
-		help => "This options controls the height of the thumbnail images that appear in the event lists. It should be fairly small to fit in with the rest of the table. If you prefer you can specify a width instead in the previous option but you should only use one of the width or height and the other option should be set to zero. If both width and height are specified then width will be used and height ignored.",
-		type => $types{integer},
-		requires => [ { name => "ZM_WEB_LIST_THUMBS", value => "yes" } ],
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_USE_OBJECT_TAGS",
-		default => "yes",
-		description => "Wrap embed in object tags for media content",
-		help => "There are two methods of including media content in web pages. The most common way is use the EMBED tag which is able to give some indication of the type of content. However this is not a standard part of HTML. The official method is to use OBJECT tags which are able to give more information allowing the correct media viewers etc to be loaded. However these are less widely supported and content may be specifically tailored to a particular platform or player. This option controls whether media content is enclosed in EMBED tags only or whether, where appropriate, it is additionally wrapped in OBJECT tags. Currently OBJECT tags are only used in a limited number of circumstances but they may become more widespread in the future. It is suggested that you leave this option on unless you encounter problems playing some content.",
-		type => $types{boolean},
-		category => "web",
-	},
-	{
-		name => "ZM_WEB_H_REFRESH_MAIN",
-		default => "300",
-		introduction => "There are now a number of options that are grouped into bandwidth categories, this allows you to configure the ZoneMinder client to work optimally over the various access methods you might to access the client.\n\nThe next few options control what happens when the client is running in 'high' bandwidth mode. You should set these options for when accessing the ZoneMinder client over a local network or high speed link. In most cases the default values will be suitable as a starting point.",
-		description => "How often (in seconds) the main console window should refresh itself",
-		help => "The main console window lists a general status and the event totals for all monitors. This is not a trivial task and should not be repeated too frequently or it may affect the performance of the rest of the system.",
-		type => $types{integer},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_REFRESH_CYCLE",
-		default => "10",
-		description => "How often (in seconds) the cycle watch window swaps to the next monitor",
-		help => "The cycle watch window is a method of continuously cycling between images from all of your monitors. This option determines how often to refresh with a new image.",
-		type => $types{integer},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_REFRESH_IMAGE",
-		default => "5",
-		description => "How often (in seconds) the watched image is refreshed (if not streaming)",
-		help => "The live images from a monitor can be viewed in either streamed or stills mode. This option determines how often a stills image is refreshed, it has no effect if streaming is selected.",
-		type => $types{integer},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_REFRESH_STATUS",
-		default => "3",
-		description => "How often (in seconds) the status refreshes itself in the watch window",
-		help => "The monitor window is actually made from several frames. The one in the middle merely contains a monitor status which needs to refresh fairly frequently to give a true indication. This option determines that frequency.",
-		type => $types{integer},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_REFRESH_EVENTS",
-		default => "30",
-		description => "How often (in seconds) the event listing is refreshed in the watch window",
-		help => "The monitor window is actually made from several frames. The lower framme contains a listing of the last few events for easy access. This option determines how often this is refreshed.",
-		type => $types{integer},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_CAN_STREAM",
-		default => "auto",
-		description => "Override the automatic detection of browser streaming capability",
-		help => "If you know that your browser can handle image streams of the type 'multipart/x-mixed-replace' but ZoneMinder does not detect this correctly you can set this option to ensure that the stream is delivered with or without the use of the Cambozola plugin. Selecting 'yes' will tell ZoneMinder that your browser can handle the streams natively, 'no' means that it can't and so the plugin will be used while 'auto' lets ZoneMinder decide.",
-		type => $types{tristate},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_STREAM_METHOD",
-		default => "jpeg",
-		description => "Which method should be used to send video streams to your browser.",
-		help => "ZoneMinder can be configured to use either mpeg encoded video or a series or still jpeg images when sending video streams. This option defines which is used. If you choose mpeg you should ensure that you have the appropriate plugins available on your browser whereas choosing jpeg will work natively on Mozilla and related browsers and with a Java applet on Internet Explorer",
-		type => { db_type=>"string", hint=>"mpeg|jpeg", pattern=>qr|^([mj])|i, format=>q( $1 =~ /^m/ ? "mpeg" : "jpeg" ) },
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_DEFAULT_SCALE",
-		default => "100",
-		description => "What the default scaling factor applied to 'live' or 'event' views is (%)",
-		help => "Normally ZoneMinder will display 'live' or 'event' streams in their native size. However if you have monitors with large dimensions or a slow link you may prefer to reduce this size, alternatively for small monitors you can enlarge it. This options lets you specify what the default scaling factor will be. It is expressed as a percentage so 100 is normal size, 200 is double size etc.",
-		type => { db_type=>"integer", hint=>"25|33|50|75|100|150|200|300|400", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_DEFAULT_RATE",
-		default => "100",
-		description => "What the default replay rate factor applied to 'event' views is (%)",
-		help => "Normally ZoneMinder will display 'event' streams at their native rate, i.e. as close to real-time as possible. However if you have long events it is often convenient to replay them at a faster rate for review. This option lets you specify what the default replay rate will be. It is expressed as a percentage so 100 is normal rate, 200 is double speed etc.",
-		type => { db_type=>"integer", hint=>"25|50|100|150|200|400|1000|2500|5000|10000", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_VIDEO_BITRATE",
-		default => "150000",
-		description => "What the bitrate of the video encoded stream should be set to",
-		help => "When encoding real video via the ffmpeg library a bit rate can be specified which roughly corresponds to the available bandwidth used for the stream. This setting effectively corresponds to a 'quality' setting for the video. A low value will result in a blocky image whereas a high value will produce a clearer view. Note that this setting does not control the frame rate of the video however the quality of the video produced is affected both by this setting and the frame rate that the video is produced at. A higher frame rate at a particular bit rate result in individual frames being at a lower quality.",
-		type => $types{integer},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_VIDEO_MAXFPS",
-		default => "15",
-		description => "What the maximum frame rate for streamed video should be",
-		help => "When using streamed video the main control is the bitrate which determines how much data can be transmitted. However a lower bitrate at high frame rates results in a lower quality image. This option allows you to limit the maximum frame rate to ensure that video quality is maintained. An additional advantage is that encoding video at high frame rates is a processor intensive task when for the most part a very high frame rate offers little perceptible improvement over one that has a more manageable resource requirement. Note, this option is implemented as a cap beyond which binary reduction takes place. So if you have a device capturing at 15fps and set this option to 10fps then the video is not produced at 10fps, but rather at 7.5fps (15 divided by 2) as the final frame rate must be the original divided by a power of 2.",
-		type => $types{integer},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_SCALE_THUMBS",
-		default => "no",
-		description => "Scale thumbnails in events, bandwidth versus cpu in rescaling",
-		help => "If unset, this option sends the whole image to the browser which resizes it in the window. If set the image is scaled down on the server before sending a reduced size image to the browser to conserve bandwidth at the cost of cpu on the server. Note that ZM can only perform the resizing if the appropriate PHP graphics functionality is installed. This is usually available in the php-gd package.",
-		type => $types{boolean},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_EVENTS_VIEW",
-		default => "events",
-		description => "What the default view of multiple events should be.",
-		help => "Stored events can be viewed in either an events list format or in a timeline based one. This option sets the default view that will be used. Choosing one view here does not prevent the other view being used as it will always be selectable from whichever view is currently being used.",
-		type => { db_type=>"string", hint=>"events|timeline", pattern=>qr|^([lt])|i, format=>q( $1 =~ /^e/ ? "events" : "timeline" ) },
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_SHOW_PROGRESS",
-		default => "yes",
-		description => "Show the progress of replay in event view.",
-		help => "When viewing events an event navigation panel and progress bar is shown below the event itself. This allows you to jump to specific points in the event, but can can also dynamically update to display the current progress of the event replay itself. This progress is calculated from the actual event duration and is not directly linked to the replay itself, so on limited bandwidth connections may be out of step with the replay. This option allows you to turn off the progress display, whilst still keeping the navigation aspect, where bandwidth prevents it functioning effectively.",
-		type => $types{boolean},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_H_AJAX_TIMEOUT",
-		default => "3000",
-		description => "How long to wait for Ajax request responses (ms)",
-		help => "The newer versions of the live feed and event views use Ajax to request information from the server and populate the views dynamically. This option allows you to specify a timeout if required after which requests are abandoned. A timeout may be necessary if requests would overwise hang such as on a slow connection. This would tend to consume a lot of browser memory and make the interface unresponsive. Ordinarily no requests should timeout so this setting should be set to a value greater than the slowest expected response. This value is in milliseconds but if set to zero then no timeout will be used.",
-		type => $types{integer},
-		category => "highband",
-	},
-	{
-		name => "ZM_WEB_M_REFRESH_MAIN",
-		default => "300",
-		description => "How often (in seconds) the main console window should refresh itself",
-		help => "The main console window lists a general status and the event totals for all monitors. This is not a trivial task and should not be repeated too frequently or it may affect the performance of the rest of the system.",
-		type => $types{integer},
-		introduction => "The next few options control what happens when the client is running in 'medium' bandwidth mode. You should set these options for when accessing the ZoneMinder client over a slower cable or DSL link. In most cases the default values will be suitable as a starting point.",
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_REFRESH_CYCLE",
-		default => "20",
-		description => "How often (in seconds) the cycle watch window swaps to the next monitor",
-		help => "The cycle watch window is a method of continuously cycling between images from all of your monitors. This option determines how often to refresh with a new image.",
-		type => $types{integer},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_REFRESH_IMAGE",
-		default => "10",
-		description => "How often (in seconds) the watched image is refreshed (if not streaming)",
-		help => "The live images from a monitor can be viewed in either streamed or stills mode. This option determines how often a stills image is refreshed, it has no effect if streaming is selected.",
-		type => $types{integer},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_REFRESH_STATUS",
-		default => "5",
-		description => "How often (in seconds) the status refreshes itself in the watch window",
-		help => "The monitor window is actually made from several frames. The one in the middle merely contains a monitor status which needs to refresh fairly frequently to give a true indication. This option determines that frequency.",
-		type => $types{integer},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_REFRESH_EVENTS",
-		default => "60",
-		description => "How often (in seconds) the event listing is refreshed in the watch window",
-		help => "The monitor window is actually made from several frames. The lower framme contains a listing of the last few events for easy access. This option determines how often this is refreshed.",
-		type => $types{integer},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_CAN_STREAM",
-		default => "auto",
-		description => "Override the automatic detection of browser streaming capability",
-		help => "If you know that your browser can handle image streams of the type 'multipart/x-mixed-replace' but ZoneMinder does not detect this correctly you can set this option to ensure that the stream is delivered with or without the use of the Cambozola plugin. Selecting 'yes' will tell ZoneMinder that your browser can handle the streams natively, 'no' means that it can't and so the plugin will be used while 'auto' lets ZoneMinder decide.",
-		type => $types{tristate},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_STREAM_METHOD",
-		default => "jpeg",
-		description => "Which method should be used to send video streams to your browser.",
-		help => "ZoneMinder can be configured to use either mpeg encoded video or a series or still jpeg images when sending video streams. This option defines which is used. If you choose mpeg you should ensure that you have the appropriate plugins available on your browser whereas choosing jpeg will work natively on Mozilla and related browsers and with a Java applet on Internet Explorer",
-		type => { db_type=>"string", hint=>"mpeg|jpeg", pattern=>qr|^([mj])|i, format=>q( $1 =~ /^m/ ? "mpeg" : "jpeg" ) },
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_DEFAULT_SCALE",
-		default => "100",
-		description => "What the default scaling factor applied to 'live' or 'event' views is (%)",
-		help => "Normally ZoneMinder will display 'live' or 'event' streams in their native size. However if you have monitors with large dimensions or a slow link you may prefer to reduce this size, alternatively for small monitors you can enlarge it. This options lets you specify what the default scaling factor will be. It is expressed as a percentage so 100 is normal size, 200 is double size etc.",
-		type => { db_type=>"integer", hint=>"25|33|50|75|100|150|200|300|400", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_DEFAULT_RATE",
-		default => "100",
-		description => "What the default replay rate factor applied to 'event' views is (%)",
-		help => "Normally ZoneMinder will display 'event' streams at their native rate, i.e. as close to real-time as possible. However if you have long events it is often convenient to replay them at a faster rate for review. This option lets you specify what the default replay rate will be. It is expressed as a percentage so 100 is normal rate, 200 is double speed etc.",
-		type => { db_type=>"integer", hint=>"25|50|100|150|200|400|1000|2500|5000|10000", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_VIDEO_BITRATE",
-		default => "75000",
-		description => "What the bitrate of the video encoded stream should be set to",
-		help => "When encoding real video via the ffmpeg library a bit rate can be specified which roughly corresponds to the available bandwidth used for the stream. This setting effectively corresponds to a 'quality' setting for the video. A low value will result in a blocky image whereas a high value will produce a clearer view. Note that this setting does not control the frame rate of the video however the quality of the video produced is affected both by this setting and the frame rate that the video is produced at. A higher frame rate at a particular bit rate result in individual frames being at a lower quality.",
-		type => $types{integer},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_VIDEO_MAXFPS",
-		default => "10",
-		description => "What the maximum frame rate for streamed video should be",
-		help => "When using streamed video the main control is the bitrate which determines how much data can be transmitted. However a lower bitrate at high frame rates results in a lower quality image. This option allows you to limit the maximum frame rate to ensure that video quality is maintained. An additional advantage is that encoding video at high frame rates is a processor intensive task when for the most part a very high frame rate offers little perceptible improvement over one that has a more manageable resource requirement. Note, this option is implemented as a cap beyond which binary reduction takes place. So if you have a device capturing at 15fps and set this option to 10fps then the video is not produced at 10fps, but rather at 7.5fps (15 divided by 2) as the final frame rate must be the original divided by a power of 2.",
-		type => $types{integer},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_SCALE_THUMBS",
-		default => "yes",
-		description => "Scale thumbnails in events, bandwidth versus cpu in rescaling",
-		help => "If unset, this option sends the whole image to the browser which resizes it in the window. If set the image is scaled down on the server before sending a reduced size image to the browser to conserve bandwidth at the cost of cpu on the server. Note that ZM can only perform the resizing if the appropriate PHP graphics functionality is installed. This is usually available in the php-gd package.",
-		type => $types{boolean},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_EVENTS_VIEW",
-		default => "events",
-		description => "What the default view of multiple events should be.",
-		help => "Stored events can be viewed in either an events list format or in a timeline based one. This option sets the default view that will be used. Choosing one view here does not prevent the other view being used as it will always be selectable from whichever view is currently being used.",
-		type => { db_type=>"string", hint=>"events|timeline", pattern=>qr|^([lt])|i, format=>q( $1 =~ /^e/ ? "events" : "timeline" ) },
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_SHOW_PROGRESS",
-		default => "yes",
-		description => "Show the progress of replay in event view.",
-		help => "When viewing events an event navigation panel and progress bar is shown below the event itself. This allows you to jump to specific points in the event, but can can also dynamically update to display the current progress of the event replay itself. This progress is calculated from the actual event duration and is not directly linked to the replay itself, so on limited bandwidth connections may be out of step with the replay. This option allows you to turn off the progress display, whilst still keeping the navigation aspect, where bandwidth prevents it functioning effectively.",
-		type => $types{boolean},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_M_AJAX_TIMEOUT",
-		default => "5000",
-		description => "How long to wait for Ajax request responses (ms)",
-		help => "The newer versions of the live feed and event views use Ajax to request information from the server and populate the views dynamically. This option allows you to specify a timeout if required after which requests are abandoned. A timeout may be necessary if requests would overwise hang such as on a slow connection. This would tend to consume a lot of browser memory and make the interface unresponsive. Ordinarily no requests should timeout so this setting should be set to a value greater than the slowest expected response. This value is in milliseconds but if set to zero then no timeout will be used.",
-		type => $types{integer},
-		category => "medband",
-	},
-	{
-		name => "ZM_WEB_L_REFRESH_MAIN",
-		default => "300",
-		description => "How often (in seconds) the main console window should refresh itself",
-		introduction => "The next few options control what happens when the client is running in 'low' bandwidth mode. You should set these options for when accessing the ZoneMinder client over a modem or slow link. In most cases the default values will be suitable as a starting point.",
-		help => "The main console window lists a general status and the event totals for all monitors. This is not a trivial task and should not be repeated too frequently or it may affect the performance of the rest of the system.",
-		type => $types{integer},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_REFRESH_CYCLE",
-		default => "30",
-		description => "How often (in seconds) the cycle watch window swaps to the next monitor",
-		help => "The cycle watch window is a method of continuously cycling between images from all of your monitors. This option determines how often to refresh with a new image.",
-		type => $types{integer},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_REFRESH_IMAGE",
-		default => "15",
-		description => "How often (in seconds) the watched image is refreshed (if not streaming)",
-		help => "The live images from a monitor can be viewed in either streamed or stills mode. This option determines how often a stills image is refreshed, it has no effect if streaming is selected.",
-		type => $types{integer},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_REFRESH_STATUS",
-		default => "10",
-		description => "How often (in seconds) the status refreshes itself in the watch window",
-		help => "The monitor window is actually made from several frames. The one in the middle merely contains a monitor status which needs to refresh fairly frequently to give a true indication. This option determines that frequency.",
-		type => $types{integer},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_REFRESH_EVENTS",
-		default => "180",
-		description => "How often (in seconds) the event listing is refreshed in the watch window",
-		help => "The monitor window is actually made from several frames. The lower framme contains a listing of the last few events for easy access. This option determines how often this is refreshed.",
-		type => $types{integer},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_CAN_STREAM",
-		default => "auto",
-		description => "Override the automatic detection of browser streaming capability",
-		help => "If you know that your browser can handle image streams of the type 'multipart/x-mixed-replace' but ZoneMinder does not detect this correctly you can set this option to ensure that the stream is delivered with or without the use of the Cambozola plugin. Selecting 'yes' will tell ZoneMinder that your browser can handle the streams natively, 'no' means that it can't and so the plugin will be used while 'auto' lets ZoneMinder decide.",
-		type => $types{tristate},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_STREAM_METHOD",
-		default => "jpeg",
-		description => "Which method should be used to send video streams to your browser.",
-		help => "ZoneMinder can be configured to use either mpeg encoded video or a series or still jpeg images when sending video streams. This option defines which is used. If you choose mpeg you should ensure that you have the appropriate plugins available on your browser whereas choosing jpeg will work natively on Mozilla and related browsers and with a Java applet on Internet Explorer",
-		type => { db_type=>"string", hint=>"mpeg|jpeg", pattern=>qr|^([mj])|i, format=>q( $1 =~ /^m/ ? "mpeg" : "jpeg" ) },
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_DEFAULT_SCALE",
-		default => "100",
-		description => "What the default scaling factor applied to 'live' or 'event' views is (%)",
-		help => "Normally ZoneMinder will display 'live' or 'event' streams in their native size. However if you have monitors with large dimensions or a slow link you may prefer to reduce this size, alternatively for small monitors you can enlarge it. This options lets you specify what the default scaling factor will be. It is expressed as a percentage so 100 is normal size, 200 is double size etc.",
-		type => { db_type=>"integer", hint=>"25|33|50|75|100|150|200|300|400", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_DEFAULT_RATE",
-		default => "100",
-		description => "What the default replay rate factor applied to 'event' views is (%)",
-		help => "Normally ZoneMinder will display 'event' streams at their native rate, i.e. as close to real-time as possible. However if you have long events it is often convenient to replay them at a faster rate for review. This option lets you specify what the default replay rate will be. It is expressed as a percentage so 100 is normal rate, 200 is double speed etc.",
-		type => { db_type=>"integer", hint=>"25|50|100|150|200|400|1000|2500|5000|10000", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_VIDEO_BITRATE",
-		default => "25000",
-		description => "What the bitrate of the video encoded stream should be set to",
-		help => "When encoding real video via the ffmpeg library a bit rate can be specified which roughly corresponds to the available bandwidth used for the stream. This setting effectively corresponds to a 'quality' setting for the video. A low value will result in a blocky image whereas a high value will produce a clearer view. Note that this setting does not control the frame rate of the video however the quality of the video produced is affected both by this setting and the frame rate that the video is produced at. A higher frame rate at a particular bit rate result in individual frames being at a lower quality.",
-		type => $types{integer},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_VIDEO_MAXFPS",
-		default => "5",
-		description => "What the maximum frame rate for streamed video should be",
-		help => "When using streamed video the main control is the bitrate which determines how much data can be transmitted. However a lower bitrate at high frame rates results in a lower quality image. This option allows you to limit the maximum frame rate to ensure that video quality is maintained. An additional advantage is that encoding video at high frame rates is a processor intensive task when for the most part a very high frame rate offers little perceptible improvement over one that has a more manageable resource requirement. Note, this option is implemented as a cap beyond which binary reduction takes place. So if you have a device capturing at 15fps and set this option to 10fps then the video is not produced at 10fps, but rather at 7.5fps (15 divided by 2) as the final frame rate must be the original divided by a power of 2.",
-		type => $types{integer},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_SCALE_THUMBS",
-		default => "yes",
-		description => "Scale thumbnails in events, bandwidth versus cpu in rescaling",
-		help => "If unset, this option sends the whole image to the browser which resizes it in the window. If set the image is scaled down on the server before sending a reduced size image to the browser to conserve bandwidth at the cost of cpu on the server. Note that ZM can only perform the resizing if the appropriate PHP graphics functionality is installed. This is usually available in the php-gd package.",
-		type => $types{boolean},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_EVENTS_VIEW",
-		default => "events",
-		description => "What the default view of multiple events should be.",
-		help => "Stored events can be viewed in either an events list format or in a timeline based one. This option sets the default view that will be used. Choosing one view here does not prevent the other view being used as it will always be selectable from whichever view is currently being used.",
-		type => { db_type=>"string", hint=>"events|timeline", pattern=>qr|^([lt])|i, format=>q( $1 =~ /^e/ ? "events" : "timeline" ) },
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_SHOW_PROGRESS",
-		default => "no",
-		description => "Show the progress of replay in event view.",
-		help => "When viewing events an event navigation panel and progress bar is shown below the event itself. This allows you to jump to specific points in the event, but can can also dynamically update to display the current progress of the event replay itself. This progress is calculated from the actual event duration and is not directly linked to the replay itself, so on limited bandwidth connections may be out of step with the replay. This option allows you to turn off the progress display, whilst still keeping the navigation aspect, where bandwidth prevents it functioning effectively.",
-		type => $types{boolean},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_L_AJAX_TIMEOUT",
-		default => "10000",
-		description => "How long to wait for Ajax request responses (ms)",
-		help => "The newer versions of the live feed and event views use Ajax to request information from the server and populate the views dynamically. This option allows you to specify a timeout if required after which requests are abandoned. A timeout may be necessary if requests would overwise hang such as on a slow connection. This would tend to consume a lot of browser memory and make the interface unresponsive. Ordinarily no requests should timeout so this setting should be set to a value greater than the slowest expected response. This value is in milliseconds but if set to zero then no timeout will be used.",
-		type => $types{integer},
-		category => "lowband",
-	},
-	{
-		name => "ZM_WEB_P_CAN_STREAM",
-		default => "auto",
-		description => "Override the automatic detection of browser streaming capability",
-		help => "If you know that your browser can handle image streams of the type 'multipart/x-mixed-replace' but ZoneMinder does not detect this correctly you can set this option to ensure that the stream is delivered with or without the use of the Cambozola plugin. Selecting 'yes' will tell ZoneMinder that your browser can handle the streams natively, 'no' means that it can't and so the plugin will be used while 'auto' lets ZoneMinder decide.",
-		type => $types{tristate},
-		category => "phoneband",
-	},
-	{
-		name => "ZM_WEB_P_STREAM_METHOD",
-		default => "jpeg",
-		description => "Which method should be used to send video streams to your browser.",
-		help => "ZoneMinder can be configured to use either mpeg encoded video or a series or still jpeg images when sending video streams. This option defines which is used. If you choose mpeg you should ensure that you have the appropriate plugins available on your browser whereas choosing jpeg will work natively on Mozilla and related browsers and with a Java applet on Internet Explorer",
-		type => { db_type=>"string", hint=>"mpeg|jpeg", pattern=>qr|^([mj])|i, format=>q( $1 =~ /^m/ ? "mpeg" : "jpeg" ) },
-		category => "phoneband",
-	},
-	{
-		name => "ZM_WEB_P_DEFAULT_SCALE",
-		default => "100",
-		description => "What the default scaling factor applied to 'live' or 'event' views is (%)",
-		help => "Normally ZoneMinder will display 'live' or 'event' streams in their native size. However if you have monitors with large dimensions or a slow link you may prefer to reduce this size, alternatively for small monitors you can enlarge it. This options lets you specify what the default scaling factor will be. It is expressed as a percentage so 100 is normal size, 200 is double size etc.",
-		type => { db_type=>"integer", hint=>"25|33|50|75|100|150|200|300|400", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "phoneband",
-	},
-	{
-		name => "ZM_WEB_P_DEFAULT_RATE",
-		default => "100",
-		description => "What the default replay rate factor applied to 'event' views is (%)",
-		help => "Normally ZoneMinder will display 'event' streams at their native rate, i.e. as close to real-time as possible. However if you have long events it is often convenient to replay them at a faster rate for review. This option lets you specify what the default replay rate will be. It is expressed as a percentage so 100 is normal rate, 200 is double speed etc.",
-		type => { db_type=>"integer", hint=>"25|50|100|150|200|400|1000|2500|5000|10000", pattern=>qr|^(\d+)$|, format=>q( $1 ) },
-		category => "phoneband",
-	},
-	{
-		name => "ZM_WEB_P_VIDEO_BITRATE",
-		default => "8000",
-		description => "What the bitrate of the video encoded stream should be set to",
-		help => "When encoding real video via the ffmpeg library a bit rate can be specified which roughly corresponds to the available bandwidth used for the stream. This setting effectively corresponds to a 'quality' setting for the video. A low value will result in a blocky image whereas a high value will produce a clearer view. Note that this setting does not control the frame rate of the video however the quality of the video produced is affected both by this setting and the frame rate that the video is produced at. A higher frame rate at a particular bit rate result in individual frames being at a lower quality.",
-		type => $types{integer},
-		category => "phoneband",
-	},
-	{
-		name => "ZM_WEB_P_VIDEO_MAXFPS",
-		default => "5",
-		description => "What the maximum frame rate for streamed video should be",
-		help => "When using streamed video the main control is the bitrate which determines how much data can be transmitted. However a lower bitrate at high frame rates results in a lower quality image. This option allows you to limit the maximum frame rate to ensure that video quality is maintained. An additional advantage is that encoding video at high frame rates is a processor intensive task when for the most part a very high frame rate offers little perceptible improvement over one that has a more manageable resource requirement. Note, this option is implemented as a cap beyond which binary reduction takes place. So if you have a device capturing at 15fps and set this option to 10fps then the video is not produced at 10fps, but rather at 7.5fps (15 divided by 2) as the final frame rate must be the original divided by a power of 2.",
-		type => $types{integer},
-		category => "phoneband",
-	},
-	{
-		name => "ZM_WEB_P_SCALE_THUMBS",
-		default => "yes",
-		description => "Scale thumbnails in events, bandwidth versus cpu in rescaling",
-		help => "If unset, this option sends the whole image to the browser which resizes it in the window. If set the image is scaled down on the server before sending a reduced size image to the browser to conserve bandwidth at the cost of cpu on the server. Note that ZM can only perform the resizing if the appropriate PHP graphics functionality is installed. This is usually available in the php-gd package.",
-		type => $types{boolean},
-		category => "phoneband",
-	},
-	{
-		name => "ZM_WEB_P_AJAX_TIMEOUT",
-		default => "10000",
-		description => "How long to wait for Ajax request responses (ms)",
-		help => "The newer versions of the live feed and event views use Ajax to request information from the server and populate the views dynamically. This option allows you to specify a timeout if required after which requests are abandoned. A timeout may be necessary if requests would overwise hang such as on a slow connection. This would tend to consume a lot of browser memory and make the interface unresponsive. Ordinarily no requests should timeout so this setting should be set to a value greater than the slowest expected response. This value is in milliseconds but if set to zero then no timeout will be used.",
-		type => $types{integer},
-		category => "phoneband",
-	},
-	{
-		name => "ZM_DYN_LAST_VERSION",
-		default => "",
-		description => "What the last version of ZoneMinder recorded from zoneminder.com is",
-		help => "",
-		type => $types{string},
-		readonly => 1,
-		category => "dynamic",
-	},
-	{
-		name => "ZM_DYN_CURR_VERSION",
-		default => "1.25.0",
-		description => "What the effective current version of ZoneMinder is, might be different from actual if versions ignored",
-		help => "",
-		type => $types{string},
-		readonly => 1,
-		category => "dynamic",
-	},
-	{
-		name => "ZM_DYN_DB_VERSION",
-		default => "1.25.0",
-		description => "What the version of the database is, from zmupdate",
-		help => "",
-		type => $types{string},
-		readonly => 1,
-		category => "dynamic",
-	},
-	{
-		name => "ZM_DYN_LAST_CHECK",
-		default => "",
-		description => "When the last check for version from zoneminder.com was",
-		help => "",
-		type => $types{integer},
-		readonly => 1,
-		category => "dynamic",
-	},
-	{
-		name => "ZM_DYN_NEXT_REMINDER",
-		default => "",
-		description => "When the earliest time to remind about versions will be",
-		help => "",
-		type => $types{string},
-		readonly => 1,
-		category => "dynamic",
-	},
-	{
-		name => "ZM_DYN_DONATE_REMINDER_TIME",
-		default => 0,
-		description => "When the earliest time to remind about donations will be",
-		help => "",
-		type => $types{integer},
-		readonly => 1,
-		category => "dynamic",
-	},
-	{
-		name => "ZM_DYN_SHOW_DONATE_REMINDER",
-		default => "yes",
-		description => "Remind about donations or not",
-		help => "",
-		type => $types{boolean},
-		readonly => 1,
-		category => "dynamic",
-	},
-	{
-		name => "ZM_EYEZM_DEBUG",
-		default => "no",
-		description => "Switch additional debugging on for eyeZm Plugin",
-		help => "Enable or Disable extra debugging from the eyeZm Plugin. Extra debugging information will be displayed in it's own file (EYEZM_LOG_TO_FILE is set), or your Apache error log",
-		type => $types{boolean},
-		category => "eyeZm",
-	},
-	{
-		name => "ZM_EYEZM_LOG_TO_FILE",
-		default => "yes",
-		description => "When eyeZm Debugging is enabled, enabling this logs output to it's own file",
-		help => "When EYEZM_DEBUG is on and EYEZM_LOG_TO_FILE is on, output generated from the eyeZm Plugin will go to it's own file. Otherwise it will go to the apache error log.",
-		type => $types{boolean},
-		category => "eyeZm",
-	},
-	{
-		name => "ZM_EYEZM_LOG_FILE",
-		default => "/var/log/zm/zm_xml.log",
-		description => "Default filename to use when logging eyeZm Output and EYEZM_LOG_TO_FILE is enabled", 
-		help => "This file will contain it's own output from the eyeZm Plugin when EYEZM_LOG_TO_FILE and EYEZM_DEBUG are both enabled",
-		type => $types{string},
-		category => "eyeZm",
-	},
-	{
-		name => "ZM_EYEZM_EVENT_VCODEC",
-		default => "mpeg4",
-		description => "Default video-codec to use for encoding events",
-		help => "The eyeZm Plugin calls FFMPEG externally to encode the captured images. If your FFMPEG is not built with support for H264, change this to MPEG-4. If using H264, please check http://www.eyezm.com for H264 requirements and that your eyeZm version supports H264 (v1.2+).",
-		type => { db_type=>"string", hint=>"mpeg4|h264", pattern=>qr|^([mh])|i, format=>q( $1 =~ /^m/ ? "mpeg4" : "h264" ) },
-		category => "eyeZm",
-	},
-	{
-		name => "ZM_EYEZM_FEED_VCODEC",
-		default => "mjpeg",
-		description => "Default video-codec to use for streaming the live feed",
-		help => "Determines whether the live stream is generated using native MJPEG streaming with ZoneMinder, or H264 using FFMPEG and HTML-5 streaming. If using H264, please check http://www.eyezm.com for H264 requirements and that your eyeZm version supports H264 (v1.2+). This is just a default parameter, and can be overridden with eyeZm.",
-		type => { db_type=>"string", hint=>"mjpeg|h264", pattern=>qr|^([mh])|i, format=>q( $1 =~ /^m/ ? "mjpeg" : "h264" ) },
-		category => "eyeZm",
-	},
-	{
-		name => "ZM_EYEZM_H264_DEFAULT_BR",
-		default => "96k",
-		description => "Default bit-rate to use with FFMPEG for H264 streaming",
-		help => "When using the eyeZm Plugin to stream H264 data, FFMPEG requires a bitrate to control the quality and bandwidth of the video. This should be specified in a format acceptable to FFMPEG. The default value is sufficient for most installations. This is just a default parameter, and can be overridden with eyeZm.",
-		type => $types{string},
-		category => "eyeZm",
-	},
-	{
-		name => "ZM_EYEZM_H264_DEFAULT_EVBR",
-		default => "128k",
-		description => "Default bit-rate to use with FFMPEG for H264 event viewing",
-		help => "When using the eyeZm Plugin to view events in H264, FFMPEG requires a bitrate to control the quality and bandwidth of the video. This should be specified in a format acceptable to FFMPEG. The default value is sufficient for most installations. This is just a default parameter, and can be overridden with eyeZm.",
-		type => $types{string},
-		category => "eyeZm",
-	},
-	{
-		name => "ZM_EYEZM_H264_TIMEOUT",
-		default => "20",
-		description => "Timeout (sec) to wait for H264 stream to start before terminating",
-		help => "The eyeZm Plugin will attempt to spawn an H264 stream when requested, and require that it complete within the timeout specified. If you have a slow system or find through the logs that the H264 stream is not starting because the timeout is expiring, even though FFMPEG is running, try increasing this value. If you have a fast system, decreasing this value can improve the responsiveness when there are issues starting H264 streams",
-		type => $types{string},
-		category => "eyeZm",
-	},
-	{
-		name => "ZM_EYEZM_SEG_DURATION",
-		default => "3",
-		description => "Segment duration used for streaming using HTTP-5 Streaming protocol",
-		help => "The HTTP-5 Live Streaming Protocol segments the input video stream into small chunks of a duration specified by this parameter. Increasing the segment duration will help with choppy connections on the other end, but will increase the latency in starting a stream.",
-		type => $types{string},
-		category => "eyeZm",
-	},
-);
-
-our %options_hash = map { ( $_->{name}, $_ ) } @options;
-
-# This function should never need to be called explicitly, except if 
-# this module is 'require'd rather than 'use'd. See zmconfgen.pl.
-sub initialiseConfig
-{
-    return if ( $configInitialised );
-
-	# Do some initial data munging to finish the data structures
-	# Create option ids
-	my $option_id = 0;
-	foreach my $option ( @options )
-	{
-		if ( defined($option->{default}) )
-		{
-			$option->{value} = $option->{default}
-		}
-		else
-		{
-			$option->{value} = '';
-		}
-		#next if ( $option->{category} eq 'hidden' );
-		$option->{id} = $option_id++;
-	}
-    $configInitialised = 1;
-}
-
-1;
-__END__
-
-=head1 NAME
-
-ZoneMinder::ConfigData - ZoneMinder Configuration Data module
-
-=head1 SYNOPSIS
-
-  use ZoneMinder::ConfigData;
-  use ZoneMinder::ConfigData qw(:all);
-
-  loadConfigFromDB();
-  saveConfigToDB();
-
-=head1 DESCRIPTION
-
-The ZoneMinder:ConfigData module contains the master definition of the ZoneMinder configuration options as well as helper methods. This module is intended for specialist confguration management and would not normally be used by end users.
-
-The configuration held in this module, which was previously in zmconfig.pl, includes the name, default value, description, help text, type and category for each option, as well as a number of additional fields in a small number of cases.
-
-=head1 METHODS
-
-=over 4
-
-=item loadConfigFromDB ();
-
-Loads existing configuration from the database (if any) and merges it with the definitions held in this module. This results in the merging of any new configuration and the removal of any deprecated configuration while preserving the existing values of every else.
-
-=item saveConfigToDB ();
-
-Saves configuration held in memory to the database. The act of loading and saving configuration is a convenient way to ensure that the configuration held in the database corresponds with the most recent definitions and that all components are using the same set of configuration.
-
-=head2 EXPORT
-
-None by default.
-The :data tag will export the various configuration data structures
-The :functions tag will export the helper functions.
-The :all tag will export all above symbols.
-
-
-=head1 SEE ALSO
-
-http://www.zoneminder.com
-
-=head1 AUTHOR
-
-Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
-
-=head1 COPYRIGHT AND LICENSE
-
-Copyright (C) 2001-2008  Philip Coombes
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.8.3 or,
-at your option, any later version of Perl 5 you may have available.
-
-
-=cut
diff --git a/scripts/ZoneMinder/pm_to_blib b/scripts/ZoneMinder/pm_to_blib
deleted file mode 100644
index e69de29bb..000000000
diff --git a/scripts/zm b/scripts/zm
deleted file mode 100644
index 52d4aacf0..000000000
--- a/scripts/zm
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/sh
-# description: ZoneMinder is the top Linux video camera security and surveillance solution. ZoneMinder is intended for use in single or multi-camera video security applications.Copyright: Philip Coombes, Corey DeLasaux 2003-2008
-# chkconfig: 2345 99 00
-# processname: zmpkg.pl
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-prog=ZoneMinder
-ZM_CONFIG="/etc/zm/zm.conf"
-pidfile="/var/run/zm"
-LOCKFILE=/var/lock/subsys/zm
-
-loadconf()
-{
-	if [ -f $ZM_CONFIG ]; then
-		. $ZM_CONFIG
-	else
-		echo "ERROR: $ZM_CONFIG not found."
-		return 1
-	fi
-}
-
-loadconf
-command="$ZM_PATH_BIN/zmpkg.pl"
-
-start()
-{
-	zmupdate || return $?
-	loadconf || return $?
-	#Make sure the directory for our PID folder exists or create one.
-	[ ! -d $pidfile ] \
-		&& mkdir -m 774 $pidfile \
-		&& chown $ZM_WEB_USER:$ZM_WEB_GROUP $pidfile
-	#Make sure the folder for the socks file exists or create one
-	GetPath="select Value from Config where Name='ZM_PATH_SOCKS'"
-    dbHost=`echo $ZM_DB_HOST | cut -d: -f1`
-    dbPort=`echo $ZM_DB_HOST | cut -d: -s -f2`
-    if [ "$dbPort" = "" ]
-    then
-	    ZM_PATH_SOCK=`echo $GetPath | mysql -B -h$ZM_DB_HOST -u$ZM_DB_USER -p$ZM_DB_PASS $ZM_DB_NAME | grep -v '^Value'`
-    else
-	    ZM_PATH_SOCK=`echo $GetPath | mysql -B -h$dbHost -P$dbPort -u$ZM_DB_USER -p$ZM_DB_PASS $ZM_DB_NAME | grep -v '^Value'`
-    fi 
-	[ ! -d $ZM_PATH_SOCK ] \
-		&& mkdir -m 774 $ZM_PATH_SOCK \
-		&& chown $ZM_WEB_USER:$ZM_WEB_GROUP $ZM_PATH_SOCK
-	echo -n $"Starting $prog: "
-	$command start
-	RETVAL=$?
-	[ $RETVAL = 0 ] && success || failure
-	echo
-	[ $RETVAL = 0 ] && touch $LOCKFILE
-	return $RETVAL
-}
-
-stop()
-{
-	loadconf
-	echo -n $"Stopping $prog: "
-	$command stop
-	RETVAL=$?
-	[ $RETVAL = 0 ] && success || failure
-	echo
-	[ $RETVAL = 0 ] && rm -f $LOCKFILE
-}
-
-zmstatus()
-{
-	loadconf
-	result=`$command status`
-	if [ "$result" = "running" ]; then
-		echo "ZoneMinder is running"
-		$ZM_PATH_BIN/zmu -l
-		RETVAL=0
-	else
-		echo "ZoneMinder is stopped"
-		RETVAL=1
-	fi
-}
-
-zmupdate()
-{
-	if [ -x $ZM_PATH_BIN/zm_update ]; then
-		$ZM_PATH_BIN/zm_update -f
-	fi
-}
-
-
-case "$1" in
-	'start')
-		start
-		;;
-	'stop')
-		stop
-		;;
-	'restart')
-		stop
-		start
-		;;
-	'condrestart')
-		loadconf
-		result=`$ZM_PATH_BIN/zmdc.pl check`
-		if [ "$result" = "running" ]; then
-			$ZM_PATH_BIN/zmdc.pl shutdown > /dev/null
-			rm -f $LOCKFILE
-			start
-		fi
-		;;
-	'status')
-		status httpd
-		status mysqld
-		zmstatus
-		;;
-	*)
-		echo "Usage: $0 { start | stop | restart | condrestart | status }"
-		RETVAL=1
-		;;
-esac
-exit $RETVAL
diff --git a/scripts/zmtrack.pl.in b/scripts/zmtrack.pl.in
index c80277005..6822f6677 100644
--- a/scripts/zmtrack.pl.in
+++ b/scripts/zmtrack.pl.in
@@ -41,6 +41,7 @@ use constant SLEEP_TIME => 10000; # In microseconds
 #
 # ==========================================================================
 
+@EXTRA_PERL_LIB@
 use ZoneMinder;
 use DBI;
 use POSIX;
diff --git a/scripts/zmupdate.pl.in b/scripts/zmupdate.pl.in
index 115d8138a..ba3b808d8 100644
--- a/scripts/zmupdate.pl.in
+++ b/scripts/zmupdate.pl.in
@@ -1024,27 +1024,35 @@ if ( $version )
         	}
 
 		$cascade = !undef;
+		$version = '1.26.0';
 	}
-    if ( $cascade || $version le "1.26.1" )
-    {
-        # Patch the database
-        patchDB( $dbh, "1.26.1" );
-        $cascade = !undef;
-    }
 
-    if ( $cascade || $version le "1.26.2" )
-    {
-        # Patch the database
-        patchDB( $dbh, "1.26.2" );
-        $cascade = !undef;
-    }
+	if ( $version ge '1.26.0' ) {
 
-    if ( $cascade || $version le "1.26.3" )
-    {
-        # Patch the database
-        patchDB( $dbh, "1.26.3" );
-        $cascade = !undef;
-    }
+		my @files;
+		$updateDir = ZM_PATH_BUILD."/db" if ! $updateDir;
+		opendir( my $dh, $updateDir ) || die "Can't open updateDir $!";
+		@files = sort grep { (!/^\./) && /^zm_update\-[\d\.]+\.sql$/ && -f "$updateDir/$_" } readdir($dh);
+		closedir $dh;
+        if ( ! @files ) {
+            die "Should have found upgrade scripts at $updateDir\n";
+        } # end if
+		
+		$dbh->{'AutoCommit'} = 0;
+		foreach my $patch ( @files ) {
+			my ( $v ) = $patch =~ /^zm_update\-([\d\.]+)\.sql$/;
+			if ( $v gt $version ) {
+				print( "Upgrading DB to $v from $version\n" );
+				patchDB( $dbh, $v );
+				if ( $dbh->errstr() ) {
+					$dbh->rollback();
+					die "Error: " . $dbh->errstr(). ".  Rolled back.\n";		
+				} # end if error
+			} # end if
+		} # end foreach patchfile
+		$dbh->{'AutoCommit'} = 1;
+		$cascade = !undef;
+	} # end if
 
     if ( $cascade )
     {
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 000000000..ed42140ec
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,33 @@
+# CMakeLists.txt for the ZoneMinder binaries
+
+# Create files from the .in files
+configure_file(zm_config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/zm_config.h @ONLY)
+
+# Group together all the source files that are used by all the binaries (zmc, zma, zmu, zms etc)
+set(ZM_BIN_SRC_FILES zm_box.cpp zm_buffer.cpp zm_camera.cpp zm_comms.cpp zm_config.cpp zm_coord.cpp zm.cpp zm_db.cpp zm_logger.cpp zm_event.cpp zm_exception.cpp zm_file_camera.cpp zm_ffmpeg_camera.cpp  zm_image.cpp zm_jpeg.cpp zm_local_camera.cpp zm_monitor.cpp zm_ffmpeg.cpp zm_mpeg.cpp zm_poly.cpp zm_regexp.cpp zm_remote_camera.cpp zm_remote_camera_http.cpp zm_remote_camera_rtsp.cpp zm_rtp.cpp  zm_rtp_ctrl.cpp zm_rtp_data.cpp zm_rtp_source.cpp zm_rtsp.cpp zm_sdp.cpp zm_signal.cpp zm_stream.cpp zm_thread.cpp zm_time.cpp zm_timer.cpp zm_user.cpp zm_utils.cpp zm_zone.cpp)
+
+# A fix for cmake recompiling the source files for every target.
+add_library(zm STATIC ${ZM_BIN_SRC_FILES})
+
+add_executable(zmc zmc.cpp)
+add_executable(zma zma.cpp)
+add_executable(zmu zmu.cpp)
+add_executable(zmf zmf.cpp)
+add_executable(zms zms.cpp)
+add_executable(nph-zms zms.cpp)
+add_executable(zmstreamer zmstreamer.cpp)
+add_executable(zmfix zmfix.cpp zm_config.cpp zm_regexp.cpp zm_logger.cpp zm_utils.cpp zm_db.cpp zm.cpp)
+
+target_link_libraries(zmc zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
+target_link_libraries(zma zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
+target_link_libraries(zmu zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
+target_link_libraries(zmf zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
+target_link_libraries(zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
+target_link_libraries(nph-zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
+target_link_libraries(zmstreamer zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
+target_link_libraries(zmfix ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
+
+install(TARGETS zmc zma zmu zmf zmstreamer zmfix RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+install(TARGETS zms nph-zms RUNTIME DESTINATION "${ZM_CGIDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+
+
diff --git a/src/zm_config.h b/src/zm_config.h
deleted file mode 100644
index 10928a82e..000000000
--- a/src/zm_config.h
+++ /dev/null
@@ -1,135 +0,0 @@
-//
-// ZoneMinder Configuration, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-// 
-
-#ifndef ZM_CONFIG_H
-#define ZM_CONFIG_H
-
-#include "config.h"
-#include "zm_config_defines.h"
-
-#include <string>
-
-#define ZM_CONFIG				"/etc/zm/zm.conf"	// Path to config file
-#define ZM_VERSION				"1.25.0"	// ZoneMinder Version
-
-#define ZM_HAS_V4L1             0
-#define ZM_HAS_V4L2             1
-#define ZM_HAS_V4L              1
-
-#ifdef HAVE_LIBAVFORMAT
-#define ZM_HAS_FFMPEG           1
-#endif // HAVE_LIBAVFORMAT
-
-#define ZM_MAX_IMAGE_WIDTH		2048				// The largest image we imagine ever handling
-#define ZM_MAX_IMAGE_HEIGHT		1536				// The largest image we imagine ever handling
-#define ZM_MAX_IMAGE_COLOURS		4				// The largest image we imagine ever handling
-#define ZM_MAX_IMAGE_DIM		(ZM_MAX_IMAGE_WIDTH*ZM_MAX_IMAGE_HEIGHT)
-#define ZM_MAX_IMAGE_SIZE		(ZM_MAX_IMAGE_DIM*ZM_MAX_IMAGE_COLOURS)
-
-#define ZM_SCALE_BASE			100					// The factor by which we bump up 'scale' to simulate FP
-#define ZM_RATE_BASE			100					// The factor by which we bump up 'rate' to simulate FP
-
-#define ZM_SQL_SML_BUFSIZ       256                 // Size of SQL buffer
-#define ZM_SQL_MED_BUFSIZ       1024                // Size of SQL buffer
-#define ZM_SQL_LGE_BUFSIZ       8192                // Size of SQL buffer
-
-#define ZM_NETWORK_BUFSIZ       32768               // Size of network buffer
-
-#define ZM_MAX_FPS              30                  // The maximum frame rate we expect to handle
-#define ZM_SAMPLE_RATE          int(1000000/ZM_MAX_FPS) // A general nyquist sample frequency for delays etc
-#define ZM_SUSPENDED_RATE       int(1000000/4) // A slower rate for when disabled etc
-
-extern void zmLoadConfig();
-
-struct StaticConfig
-{
-    std::string DB_HOST;
-    std::string DB_NAME;
-    std::string DB_USER;
-    std::string DB_PASS;
-    std::string PATH_WEB;
-};
-
-extern StaticConfig staticConfig;
-
-class ConfigItem
-{
-private:
-	char *name;
-	char *value;
-	char *type;
-
-	mutable enum { CFG_BOOLEAN, CFG_INTEGER, CFG_DECIMAL, CFG_STRING } cfg_type;
-	mutable union
-	{
-		bool boolean_value;
-		int integer_value;
-		double decimal_value;
-		char *string_value;
-	} cfg_value;
-	mutable bool accessed;
-
-public:
-	ConfigItem( const char *p_name, const char *p_value, const char *const p_type );
-	~ConfigItem();
-	void ConvertValue() const;
-	bool BooleanValue() const;
-	int IntegerValue() const;
-	double DecimalValue() const;
-	const char *StringValue() const;
-
-	inline operator bool() const
-	{
-		return( BooleanValue() );
-	}
-	inline operator int() const
-	{
-		return( IntegerValue() );
-	}
-	inline operator double() const
-	{
-		return( DecimalValue() );
-	}
-	inline operator const char *() const
-	{
-		return( StringValue() );
-	}
-};
-
-class Config
-{
-public:
-	ZM_CFG_DECLARE_LIST
-
-private:
-	int n_items;
-	ConfigItem **items;
-
-public:
-	Config();
-	~Config();
-
-	void Load();
-	void Assign();
-	const ConfigItem &Item( int id );
-};
-
-extern Config config;
-
-#endif // ZM_CONFIG_H
diff --git a/src/zm_config_defines.h b/src/zm_config_defines.h
index 420d67c02..572ee589f 100644
--- a/src/zm_config_defines.h
+++ b/src/zm_config_defines.h
@@ -219,7 +219,7 @@
 #define ZM_EYEZM_SEG_DURATION 215
 
 
-#define ZM_MAX_CFG_ID 220
+#define ZM_MAX_CFG_ID 215
 
 #define ZM_CFG_DECLARE_LIST \
 	const char *lang_default;\
diff --git a/src/zm_ffmpeg.h b/src/zm_ffmpeg.h
index 059f88b39..d88e560a1 100644
--- a/src/zm_ffmpeg.h
+++ b/src/zm_ffmpeg.h
@@ -19,7 +19,7 @@
 
 #ifndef ZM_FFMPEG_H
 #define ZM_FFMPEG_H
-
+#include <stdint.h>
 #if HAVE_LIBAVCODEC
 
 #ifdef __cplusplus
@@ -27,17 +27,35 @@ extern "C" {
 #endif
 #if HAVE_LIBAVUTIL_AVUTIL_H
 #include <libavutil/avutil.h>
+#include <libavutil/base64.h>
+#elif HAVE_FFMPEG_AVUTIL_H
+#include <ffmpeg/avutil.h>
+#include <ffmpeg/base64.h>
+/*#else
+#error "No location for avutils.h found"*/
 #endif
 #if HAVE_LIBAVCODEC_AVCODEC_H
 #include <libavcodec/avcodec.h>
+#elif HAVE_FFMPEG_AVCODEC_H
+#include <ffmpeg/avcodec.h>
+/*#else
+#error "No location for avcodec.h found"*/
 #endif
 #if HAVE_LIBAVFORMAT_AVFORMAT_H
 #include <libavformat/avformat.h>
+#elif HAVE_FFMPEG_AVFORMAT_H
+#include <ffmpeg/avformat.h>
+/*#else
+#error "No location for avformat.h found"*/
 #endif
 #if HAVE_LIBSWSCALE
 #if HAVE_LIBSWSCALE_SWSCALE_H
 #include <libswscale/swscale.h>
-#include <libavutil/mathematics.h> // this is a fix for error: ‘av_rescale_q’ was not declared in this scope
+#include <libavutil/mathematics.h> // this is a fix for error: 'av_rescale_q' was not declared in this scope
+#elif HAVE_FFMPEG_SWSCALE_H
+#include <ffmpeg/swscale.h>
+/*#else
+#error "No location for swscale.h found"*/
 #endif
 #endif // HAVE_LIBSWSCALE
 #ifdef __cplusplus
@@ -72,3 +90,4 @@ extern "C" {
 #endif // HAVE_LIBAVCODEC
 
 #endif // ZM_FFMPEG_H
+
diff --git a/src/zm_image.cpp b/src/zm_image.cpp
index b252f9387..82440aae6 100644
--- a/src/zm_image.cpp
+++ b/src/zm_image.cpp
@@ -682,7 +682,7 @@ bool Image::ReadJpeg( const char *filename, unsigned int p_colours, unsigned int
 
 	if ( width != new_width || height != new_height )
 	{
-		Error("Image dimensions differ. Old: %ux%u New: %ux%u",width,height,new_width,new_height);
+		Debug(9,"Image dimensions differ. Old: %ux%u New: %ux%u",width,height,new_width,new_height);
 	}
 	
 	switch(p_colours) {
@@ -926,7 +926,7 @@ bool Image::DecodeJpeg( const JOCTET *inbuffer, int inbuffer_size, unsigned int
 
 	if ( width != new_width || height != new_height )
 	{
-		Error("Image dimensions differ. Old: %ux%u New: %ux%u",width,height,new_width,new_height);
+		Debug(9,"Image dimensions differ. Old: %ux%u New: %ux%u",width,height,new_width,new_height);
 	}
 	
 	switch(p_colours) {
diff --git a/src/zm_logger.cpp b/src/zm_logger.cpp
index 6507191cd..19886ef1c 100644
--- a/src/zm_logger.cpp
+++ b/src/zm_logger.cpp
@@ -28,9 +28,6 @@
 #include <string.h>
 #include <sys/time.h>
 #include <syslog.h>
-#ifdef HAVE_SYSCALL_H
-#include <syscall.h>
-#endif // HAVE_SYSCALL_H
 #include <signal.h>
 #include <stdarg.h>
 #include <errno.h>
diff --git a/src/zm_logger.h b/src/zm_logger.h
index 188aed518..50dce970c 100644
--- a/src/zm_logger.h
+++ b/src/zm_logger.h
@@ -20,9 +20,14 @@
 #ifndef ZM_LOGGER_H
 #define ZM_LOGGER_H
 
+#include "zm_config.h"
+#include <stdint.h>
 #include <unistd.h>
 #include <string>
 #include <map>
+#ifdef HAVE_SYS_SYSCALL_H
+#include <sys/syscall.h>
+#endif // HAVE_SYS_SYSCALL_H
 #include <mysql/mysql.h>
 
 class Logger
diff --git a/src/zm_remote_camera_rtsp.cpp b/src/zm_remote_camera_rtsp.cpp
index e352589f6..cffb91cce 100644
--- a/src/zm_remote_camera_rtsp.cpp
+++ b/src/zm_remote_camera_rtsp.cpp
@@ -203,7 +203,7 @@ int RemoteCameraRtsp::PrimeCapture()
 	if( (unsigned int)pSize != imagesize) {
 		Fatal("Image size mismatch. Required: %d Available: %d",pSize,imagesize);
 	}
-	
+/*	
 #if HAVE_LIBSWSCALE
 	if(!sws_isSupportedInput(mCodecContext->pix_fmt)) {
 		Fatal("swscale does not support the codec format: %c%c%c%c",(mCodecContext->pix_fmt)&0xff,((mCodecContext->pix_fmt>>8)&0xff),((mCodecContext->pix_fmt>>16)&0xff),((mCodecContext->pix_fmt>>24)&0xff));
@@ -216,7 +216,7 @@ int RemoteCameraRtsp::PrimeCapture()
 #else // HAVE_LIBSWSCALE
     Fatal( "You must compile ffmpeg with the --enable-swscale option to use RTSP cameras" );
 #endif // HAVE_LIBSWSCALE
-
+*/
 
     return( 0 );
 }
diff --git a/src/zm_rtp_source.cpp b/src/zm_rtp_source.cpp
index 4f53327df..92c4f3d34 100644
--- a/src/zm_rtp_source.cpp
+++ b/src/zm_rtp_source.cpp
@@ -253,15 +253,57 @@ bool RtpSource::handlePacket( const unsigned char *packet, size_t packetLen )
 {
     const RtpDataHeader *rtpHeader;
     rtpHeader = (RtpDataHeader *)packet;
+    bool fragmentEnd = false;
+
+    // Each RTP packet delivers only one NAL. It can be either the Single NAL
+    // ( in that case it must be in one packet ) or the Fragmentation NALs
+    // that delivers large single NAL...  
 
     if ( updateSeq( ntohs(rtpHeader->seqN) ) )
     {
         Hexdump( 4, packet+sizeof(RtpDataHeader), 16 );
+        if ( ((packet[sizeof(RtpDataHeader)] & 0x1f) == 28 && 
+              (packet[sizeof(RtpDataHeader)+1] & 0x80)) ||
+             ((packet[sizeof(RtpDataHeader)] & 0x1f) != 28 && 
+              prevM && rtpHeader->m) )
+	    mFrameGood = true; // This means that if packet is in sequence
+			       // and is single NAL with mark set (and prev packet
+			       // was NAL with mark set or it is Fragmentation NAL with
+			       // Start bit set then we assume that sequence
+			       // was restored and we can handle packet
         if ( mFrameGood )
+        {
+    	    // check if there fragmentation NAL
+    	    if ( (packet[sizeof(RtpDataHeader)] & 0x1f) == 28 )
+    	    {
+    		// is this NAL the first NAL in fragmentation sequence
+    		if ( packet[sizeof(RtpDataHeader)+1] & 0x80 )
+    		{
+    		    // if there is any data in frame then we must
+    		    // discard it because that frame was incomplete
+    		    if ( mFrame.size() )
+    			mFrame.clear();
+    		    // Now we will form new header of frame
+    		    mFrame.append("\x0\x0\x1\x0",4);
+    		    *(mFrame+3) = (packet[sizeof(RtpDataHeader)+1] & 0x1f) |
+    		                  (packet[sizeof(RtpDataHeader)] & 0x60);
+    		}
+    		else
+    		    if ( packet[sizeof(RtpDataHeader)+1] & 0x40 )
+    			fragmentEnd = true;
+		mFrame.append(packet+sizeof(RtpDataHeader)+2, packetLen-sizeof(RtpDataHeader)-2);
+    	    }
+    	    else
+    	    {
+//    		mframe.clear();
+    		if ( !mFrame.size() )
+    		    mFrame.append("\x0\x0\x1",3);
             mFrame.append( packet+sizeof(RtpDataHeader), packetLen-sizeof(RtpDataHeader) ); 
+	    }
+        }
         Hexdump( 4, mFrame.head(), 16 );
 
-        if ( rtpHeader->m )
+        if ( rtpHeader->m || fragmentEnd )
         {
             if ( mFrameGood )
             {
@@ -297,10 +339,13 @@ bool RtpSource::handlePacket( const unsigned char *packet, size_t packetLen )
         mFrameGood = false;
         mFrame.clear();
     }
-    if ( rtpHeader->m )
+    if ( rtpHeader->m || fragmentEnd )
     {
         mFrameGood = true;
+        prevM = true;
     }
+    else
+		prevM = false;
 
     updateJitter( rtpHeader );
 
diff --git a/src/zm_rtp_source.h b/src/zm_rtp_source.h
index 7d4143697..4ffd6e101 100644
--- a/src/zm_rtp_source.h
+++ b/src/zm_rtp_source.h
@@ -84,6 +84,7 @@ private:
     Buffer mFrame;
     int mFrameCount;
     bool mFrameGood;
+    bool prevM;
     ThreadData<bool> mFrameReady;
     ThreadData<bool> mFrameProcessed;
 
diff --git a/src/zm_rtsp.cpp b/src/zm_rtsp.cpp
index a86c8bbb0..3d82e7f35 100644
--- a/src/zm_rtsp.cpp
+++ b/src/zm_rtsp.cpp
@@ -576,13 +576,15 @@ int RtspThread::run()
                 {
                     if ( buffer[0] == '$' )
                     {
+                	if ( buffer.size() < 4 )
+                	    break;
                         unsigned char channel = buffer[1];
                         unsigned short len = ntohs( *((unsigned short *)(buffer+2)) );
 
                         Debug( 4, "Got %d bytes left, expecting %d byte packet on channel %d", buffer.size(), len, channel );
                         if ( (unsigned short)buffer.size() < (len+4) )
                         {
-                            Debug( 4, "Missing %zd bytes, rereading", (len+4)-nBytes );
+                            Debug( 4, "Missing %d bytes, rereading", (len+4)-buffer.size() );
                             break;
                         }
                         if ( channel == remoteChannels[0] )
@@ -594,8 +596,10 @@ int RtspThread::run()
                         }
                         else if ( channel == remoteChannels[1] )
                         {
-                            len = ntohs( *((unsigned short *)(buffer+2)) );
-                            Debug( 4, "Got %zd bytes on control channel %d", nBytes, channel );
+//                            len = ntohs( *((unsigned short *)(buffer+2)) );
+//                            Debug( 4, "Got %d bytes on control channel %d", nBytes, channel );
+                            Debug( 4, "Got %d bytes on control channel %d, packet length is %d", buffer.size(), channel, len );
+                            Hexdump( 4, (char *)buffer, 16 );
                             rtpCtrlThread.recvPackets( buffer+4, len );
                         }
                         else
diff --git a/src/zm_sdp.cpp b/src/zm_sdp.cpp
index aa33206c5..6b596bfe5 100644
--- a/src/zm_sdp.cpp
+++ b/src/zm_sdp.cpp
@@ -144,6 +144,7 @@ SessionDescriptor::MediaDescriptor::MediaDescriptor( const std::string &type, in
     mClock( 0 ),
     mWidth( 0 ),
     mHeight( 0 ),
+    mSprops( "" ),
     mConnInfo( 0 )
 {
 }
@@ -273,6 +274,20 @@ SessionDescriptor::SessionDescriptor( const std::string &url, const std::string
                                 else if ( attr3Tokens[0] == "config" )
                                 {
                                 }
+                                else if ( attr3Tokens[0] == "sprop-parameter-sets" )
+                                {
+                              		size_t t = attr2Tokens[i].find("=");
+                              		char *c = (char *)attr2Tokens[i].c_str() + t + 1;
+                              		Debug(4, "sprop-parameter-sets value %s", c);
+                            		currMedia->setSprops(std::string(c));
+                                }
+                                else if ( attr3Tokens[0] == "sprop-parameter-sets" )
+                                {
+                              		size_t t = attr2Tokens[i].find("=");
+                              		char *c = (char *)attr2Tokens[i].c_str() + t + 1;
+                              		Debug(4, "sprop-parameter-sets value %s", c);
+                            		currMedia->setSprops(std::string(c));
+                                }
                                 else 
                                 {
                                     Debug( 3, "Ignoring SDP fmtp attribute '%s' for media '%s'", attr3Tokens[0].c_str(), currMedia->getType().c_str() )
@@ -329,7 +344,12 @@ AVFormatContext *SessionDescriptor::generateFormatContext() const
     AVFormatContext *formatContext = avformat_alloc_context();
 
     strncpy( formatContext->filename, mUrl.c_str(), sizeof(formatContext->filename) );
-
+/*
+    if ( mName.length() )
+        strncpy( formatContext->title, mName.c_str(), sizeof(formatContext->title) );
+    if ( mInfo.length() )
+        strncpy( formatContext->comment, mInfo.c_str(), sizeof(formatContext->comment) );
+*/
     //formatContext->nb_streams = mMediaList.size();
     for ( unsigned int i = 0; i < mMediaList.size(); i++ )
     {
@@ -395,6 +415,58 @@ AVFormatContext *SessionDescriptor::generateFormatContext() const
             stream->codec->width = mediaDesc->getWidth();
         if ( mediaDesc->getHeight() )
             stream->codec->height = mediaDesc->getHeight();
+        if ( stream->codec->codec_id == CODEC_ID_H264 && mediaDesc->getSprops().size())
+        {
+    	    uint8_t start_sequence[]= { 0, 0, 1 };
+    	    stream->codec->extradata_size= 0;
+    	    stream->codec->extradata= NULL;
+    	    char pvalue[1024], *value = pvalue;
+	    
+			strcpy(pvalue, mediaDesc->getSprops().c_str());
+	    
+    	    while (*value) {
+        		char base64packet[1024];
+        		uint8_t decoded_packet[1024];
+        		uint32_t packet_size;
+        		char *dst = base64packet;
+
+        		while (*value && *value != ','
+            	       && (dst - base64packet) < sizeof(base64packet) - 1) {
+            	      *dst++ = *value++;
+        		}
+        		*dst++ = '\0';
+
+        		if (*value == ',')
+            	    value++;
+
+        		packet_size= av_base64_decode(decoded_packet, (const char *)base64packet, (int)sizeof(decoded_packet));
+        		Hexdump(4, (char *)decoded_packet, packet_size);
+        		if (packet_size) {
+            		uint8_t *dest = 
+            		(uint8_t *)av_malloc(packet_size + sizeof(start_sequence) +
+                  		                 stream->codec->extradata_size +
+                      		             FF_INPUT_BUFFER_PADDING_SIZE);
+            		if(dest) {
+              			if(stream->codec->extradata_size) {
+                  			// av_realloc?
+                			memcpy(dest, stream->codec->extradata, stream->codec->extradata_size);
+                  			av_free(stream->codec->extradata);
+              			}
+
+              			memcpy(dest+stream->codec->extradata_size, start_sequence, sizeof(start_sequence));
+              			memcpy(dest+stream->codec->extradata_size+sizeof(start_sequence), decoded_packet, packet_size);
+              			memset(dest+stream->codec->extradata_size+sizeof(start_sequence)+
+                  	  		   packet_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+
+              			stream->codec->extradata= dest;
+              			stream->codec->extradata_size+= sizeof(start_sequence)+packet_size;
+//            		} else {
+//              		av_log(codec, AV_LOG_ERROR, "Unable to allocate memory for extradata!");
+//                		return AVERROR(ENOMEM);
+            		}
+        		}
+    	    }
+        }
     }
 
     return( formatContext );
diff --git a/src/zm_sdp.h b/src/zm_sdp.h
index ba4652aea..bfaa52ad7 100644
--- a/src/zm_sdp.h
+++ b/src/zm_sdp.h
@@ -103,6 +103,7 @@ public:
         int mClock;
         int mWidth;
         int mHeight;
+        std::string mSprops;
 
         ConnInfo *mConnInfo;
 
@@ -171,6 +172,14 @@ public:
             return( mHeight );
         }
 
+	void setSprops(const std::string props)
+	{
+		mSprops = props;
+	}
+	const std::string getSprops() const
+	{
+		return ( mSprops );
+	}
         const double getFrameRate() const
         {
             return( mFrameRate );
diff --git a/src/zm_signal.cpp b/src/zm_signal.cpp
index 5bb000f0b..dc6144afe 100644
--- a/src/zm_signal.cpp
+++ b/src/zm_signal.cpp
@@ -110,7 +110,7 @@ RETSIGTYPE zm_die_handler( int signal )
 	char **messages = backtrace_symbols( trace, trace_size );
     if ( size_t offset = strcspn( messages[trace_size-1], " " ) )
     {
-        snprintf( cmd_ptr, sizeof(cmd)-(cmd_ptr-cmd), messages[trace_size-1] );
+        snprintf( cmd_ptr, sizeof(cmd)-(cmd_ptr-cmd), "%s", messages[trace_size-1] );
         cmd_ptr += offset;
     }
     else
diff --git a/src/zm_stream.cpp b/src/zm_stream.cpp
index 2cea2f10b..41e75768f 100644
--- a/src/zm_stream.cpp
+++ b/src/zm_stream.cpp
@@ -27,6 +27,13 @@
 
 StreamBase::~StreamBase()
 {
+#if HAVE_LIBAVCODEC
+    if ( vid_stream )
+    {
+	delete vid_stream;
+	vid_stream = NULL;
+    }
+#endif
     closeComms();
 }
 
diff --git a/src/zm_stream.h b/src/zm_stream.h
index 22f8b153d..ef442ab8e 100644
--- a/src/zm_stream.h
+++ b/src/zm_stream.h
@@ -57,7 +57,7 @@ protected:
     } DataMsg;
 
     typedef enum { MSG_CMD=1, MSG_DATA_WATCH, MSG_DATA_EVENT } MsgType;
-    typedef enum { CMD_NONE=0, CMD_PAUSE, CMD_PLAY, CMD_STOP, CMD_FASTFWD, CMD_SLOWFWD, CMD_SLOWREV, CMD_FASTREV, CMD_ZOOMIN, CMD_ZOOMOUT, CMD_PAN, CMD_SCALE, CMD_PREV, CMD_NEXT, CMD_SEEK, CMD_VARPLAY, CMD_QUERY=99 } MsgCommand;
+    typedef enum { CMD_NONE=0, CMD_PAUSE, CMD_PLAY, CMD_STOP, CMD_FASTFWD, CMD_SLOWFWD, CMD_SLOWREV, CMD_FASTREV, CMD_ZOOMIN, CMD_ZOOMOUT, CMD_PAN, CMD_SCALE, CMD_PREV, CMD_NEXT, CMD_SEEK, CMD_VARPLAY, CMD_GET_IMAGE, CMD_QUERY=99 } MsgCommand;
 
 protected:
     Monitor *monitor;
diff --git a/src/zm_thread.h b/src/zm_thread.h
index 5a635298c..6a0d169f0 100644
--- a/src/zm_thread.h
+++ b/src/zm_thread.h
@@ -23,13 +23,16 @@
 #include <unistd.h>
 #include <pthread.h>
 #include <unistd.h>
+#ifdef HAVE_SYS_SYSCALL_H
+#include <sys/syscall.h>
+#endif // HAVE_SYS_SYSCALL_H
 #include "zm_exception.h"
 #include "zm_utils.h"
 
 class ThreadException : public Exception
 {
 public:
-    ThreadException( const std::string &message ) : Exception( stringtf( "(%d) "+message, (long int)syscall(224) ) )
+    ThreadException( const std::string &message ) : Exception( stringtf( "(%d) "+message, (long int)syscall(SYS_gettid) ) )
     {
     }
 };
@@ -202,7 +205,7 @@ protected:
 
     pid_t id() const
     {
-        return( (pid_t)syscall(224) );
+        return( (pid_t)syscall(SYS_gettid) );
     }
     void exit( int status = 0 )
     {
diff --git a/src/zm_timer.h b/src/zm_timer.h
index f1aa54706..6c7663b87 100644
--- a/src/zm_timer.h
+++ b/src/zm_timer.h
@@ -20,6 +20,9 @@
 #ifndef ZM_TIMER_H
 #define ZM_TIMER_H
 
+#ifdef HAVE_SYS_SYSCALL_H
+#include <sys/syscall.h>
+#endif // HAVE_SYS_SYSCALL_H
 #include "zm_thread.h"
 
 #include "zm_exception.h"
@@ -30,7 +33,7 @@ private:
     class TimerException : public Exception
     {
     public:
-        TimerException( const std::string &message ) : Exception( stringtf( "(%d) "+message, (long int)syscall(224) ) )
+        TimerException( const std::string &message ) : Exception( stringtf( "(%d) "+message, (long int)syscall(SYS_gettid) ) )
         {
         }
     };
diff --git a/src/zm_zone.cpp b/src/zm_zone.cpp
index 1c6bfb69b..51853a0b9 100644
--- a/src/zm_zone.cpp
+++ b/src/zm_zone.cpp
@@ -909,7 +909,7 @@ bool Zone::ParseZoneString( const char *zone_string, int &zone_id, int &colour,
 int Zone::Load( Monitor *monitor, Zone **&zones )
 {
    static char sql[ZM_SQL_MED_BUFSIZ];
-	snprintf( sql, sizeof(sql), "select Id,Name,Type+0,Units,NumCoords,Coords,AlarmRGB,CheckMethod+0,MinPixelThreshold,MaxPixelThreshold,MinAlarmPixels,MaxAlarmPixels,FilterX,FilterY,MinFilterPixels,MaxFilterPixels,MinBlobPixels,MaxBlobPixels,MinBlobs,MaxBlobs,OverloadFrames from Zones where MonitorId = %d order by Type, Id", monitor->Id() );
+	snprintf( sql, sizeof(sql), "select Id,Name,Type+0,Units,Coords,AlarmRGB,CheckMethod+0,MinPixelThreshold,MaxPixelThreshold,MinAlarmPixels,MaxAlarmPixels,FilterX,FilterY,MinFilterPixels,MaxFilterPixels,MinBlobPixels,MaxBlobPixels,MinBlobs,MaxBlobs,OverloadFrames from Zones where MonitorId = %d order by Type, Id", monitor->Id() );
 	if ( mysql_query( &dbconn, sql ) )
 	{
 		Error( "Can't run query: %s", mysql_error( &dbconn ) );
@@ -934,7 +934,6 @@ int Zone::Load( Monitor *monitor, Zone **&zones )
 		const char *Name = dbrow[col++];
 		int Type = atoi(dbrow[col++]);
 		const char *Units = dbrow[col++];
-		/* int NumCoords = */ atoi(dbrow[col++]);
 		const char *Coords = dbrow[col++];
 		int AlarmRGB = dbrow[col]?atoi(dbrow[col]):0; col++;
 		int CheckMethod = atoi(dbrow[col++]);
diff --git a/version b/version
index f8f738140..ea0928ced 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.26.3
+1.26.4
diff --git a/web/CMakeLists.txt b/web/CMakeLists.txt
new file mode 100644
index 000000000..3ead70703
--- /dev/null
+++ b/web/CMakeLists.txt
@@ -0,0 +1,11 @@
+# CMakeLists.txt for the ZoneMinder web files
+
+# Process the tools/mootools subdirectory
+add_subdirectory(tools/mootools tools/mootools)
+
+# Create files from the .in files
+configure_file(includes/config.php.in ${CMAKE_CURRENT_SOURCE_DIR}/includes/config.php @ONLY)
+
+# Install the web files
+install(DIRECTORY ajax css graphics includes js lang skins tools views DESTINATION "${ZM_WEBDIR}" PATTERN "*.in" EXCLUDE PATTERN "*Make*" EXCLUDE)
+install(FILES index.php README.md DESTINATION "${ZM_WEBDIR}")
diff --git a/zmlinkcontent.sh.in b/zmlinkcontent.sh.in
new file mode 100755
index 000000000..8cffef4e5
--- /dev/null
+++ b/zmlinkcontent.sh.in
@@ -0,0 +1,266 @@
+#!/bin/bash
+# The purpose of this file is to create the symlinks in the web folder to the content folder. It can use an existing content folder or create a new one.
+
+# Set the content dir default to be the one supplied to cmake
+ZM_PATH_CONTENT="@ZM_CONTENTDIR@"
+
+echo "*** This bash script creates the nessecary symlinks for the zoneminder content"
+echo "*** It can use an existing content folder or create a new one"
+echo "*** For usage: use -h"
+echo "*** The default content directory is: $ZM_PATH_CONTENT"
+echo ""
+
+usage()
+{
+cat <<EOF
+Usage: $0 [-q] [-z zm.conf] [-w WEB DIRECTORY] [CONTENT DIRECTORY]
+
+OPTIONS:
+   -h      Show this message and quit
+   -z      ZoneMinder configuration file
+   -w      Override the web directory from zm.conf
+   -q      Quick mode. Do not change ownership recursively.
+
+If the -w option is not used to specify the path to the web directory,
+the script will use the path from zoneminder's configuration file.
+If the -z option is used, the argument will be used instead of zm.conf
+Otherwise, it will attempt to read zm.conf from the local directory.
+If that fails, it will try from /etc/zm.conf
+
+EOF
+}
+
+while getopts "hz:w:q" OPTION
+do
+     case $OPTION in
+         h)
+             usage
+             exit 50
+             ;;
+         z)
+             ZM_CONFIG=$OPTARG
+             ;;
+         w)
+             ZM_PATH_WEB_FORCE=$OPTARG
+             ;;
+         q)
+             QUICK=1
+             ;;
+     esac
+done
+shift $(( OPTIND - 1 ))
+
+# Lets check that we are root
+if [ "$(id -u)" != "0" ]; then
+	echo "Error: This script needs to run as root."
+	exit 1
+fi
+
+# Check if zm.conf was supplied as an argument and that it exists
+if [[ -n "$ZM_CONFIG" && ! -f "$ZM_CONFIG" ]]; then
+	echo "The zoneminder configuration file $ZM_CONFIG does not exist!"
+	exit 40
+fi
+
+# Load zm.conf
+if [ -n "$ZM_CONFIG" ]; then
+	echo "Using custom zm.conf $ZM_CONFIG"
+	source "$ZM_CONFIG"
+elif [ -f "zm.conf" ]; then
+	echo "Using local zm.conf"
+	source "zm.conf"
+elif [ -f "/etc/zm.conf"]; then
+	echo "Using system zm.conf"
+	source "/etc/zm.conf"
+else
+	echo "Failed locating zoneminder configuration file (zm.conf)\nUse the -z option to specify the full path to the zoneminder configuration file"
+	exit 45
+fi
+
+# Override the web directory path from zm.conf
+if [ -n "$ZM_PATH_WEB_FORCE" ]; then
+	ZM_PATH_WEB="$(readlink -f $ZM_PATH_WEB_FORCE)"
+fi
+
+# Override the default content path
+if [[ -n "$@" ]]; then
+	ZM_PATH_CONTENT="$(readlink -f $@)"
+fi
+
+# Print some information
+echo "Web folder       : $ZM_PATH_WEB"
+echo "Content folder   : $ZM_PATH_CONTENT"
+echo ""
+
+# Verify the web folder is a real directory
+echo -n "Verifying the web folder is a directory... "
+if [ -d "$ZM_PATH_WEB" ]; then
+	echo "OK"
+else
+	echo "Failed"
+	exit 3
+fi
+
+# Check if the content folder exists, and if not, create it
+echo -n "Checking if the content folder exists... "
+if [ -d "$ZM_PATH_CONTENT" ]; then
+	echo "Yes"
+else
+	echo "No"
+	echo -n "Creating the content folder... "
+	mkdir "$ZM_PATH_CONTENT"
+	if [ "$?" = "0" ]; then
+		echo "OK"
+	else
+		echo "Failed"
+		exit 4
+	fi
+fi
+# Check if the content/images folder exists, and if not, create it
+echo -n "Checking if the images folder exists inside the content folder... "
+if [ -d "$ZM_PATH_CONTENT/images" ]; then
+	echo "Yes"
+else
+	echo "No"
+	echo -n "Creating the images folder inside the content folder... "
+	mkdir "$ZM_PATH_CONTENT/images"
+	if [ "$?" = "0" ]; then
+		echo "OK"
+	else
+		echo "Failed"
+		exit 6
+	fi
+fi
+# Check if the content/events folder exists, and if not, create it
+echo -n "Checking if the events folder exists inside the content folder... "
+if [ -d "$ZM_PATH_CONTENT/events" ]; then
+	echo "Yes"
+else
+	echo "No"
+	echo -n "Creating the events folder inside the content folder... "
+	mkdir "$ZM_PATH_CONTENT/events"
+	if [ "$?" = "0" ]; then
+		echo "OK"
+	else
+		echo "Failed"
+		exit 7
+	fi
+fi
+
+if [ -d "$ZM_PATH_WEB/images" ]; then
+	if [ -L "$ZM_PATH_WEB/images" ]; then
+		echo -n "Unlinking current symlink for the images folder... "
+		unlink "$ZM_PATH_WEB/images"
+		if [ "$?" = "0" ]; then
+			echo "OK"
+		else
+			echo "Failed"
+			exit 35
+		fi
+	else
+		echo "Existing $ZM_PATH_WEB/images is not a symlink. Aborting to prevent data loss"
+		exit 10
+	fi
+fi
+
+if [ -d "$ZM_PATH_WEB/events" ]; then
+	if [ -L "$ZM_PATH_WEB/events" ]; then
+		echo -n "Unlinking current symlink for the events folder... "
+		unlink "$ZM_PATH_WEB/events"
+		if [ "$?" = "0" ]; then
+			echo "OK"
+		else
+			echo "Failed"
+			exit 36
+		fi
+	else
+		echo "Existing $ZM_PATH_WEB/events is not a symlink. Aborting to prevent data loss"
+		exit 11
+	fi
+fi
+
+# Create the symlink for the images folder
+echo -n "Creating the symlink for the images folder... " 
+ln -s -f "$ZM_PATH_CONTENT/images" "$ZM_PATH_WEB/images"
+if [ "$?" = "0" ]; then
+	echo "OK"
+else
+	echo "Failed"
+	exit 15
+fi
+	
+# Create the symlink for the events folder
+echo -n "Creating the symlink for the events folder... " 
+ln -s -f "$ZM_PATH_CONTENT/events" "$ZM_PATH_WEB/events"
+if [ "$?" = "0" ]; then
+	echo "OK"
+else
+	echo "Failed"
+	exit 16
+fi
+
+# change ownership for the images folder. do it recursively unless -q is used
+if [ -n "$QUICK" ]; then
+	echo -n "Changing ownership of the images folder to ${ZM_WEB_USER} ${ZM_WEB_GROUP}... "
+	chown ${ZM_WEB_USER}:${ZM_WEB_GROUP} "$ZM_PATH_WEB/images"
+	if [ "$?" = "0" ]; then
+		echo "OK"
+	else
+		echo "Failed"
+		exit 20
+	fi
+else
+	echo -n "Changing ownership of the images folder recursively to ${ZM_WEB_USER} ${ZM_WEB_GROUP}... "
+	chown -R ${ZM_WEB_USER}:${ZM_WEB_GROUP} "$ZM_PATH_WEB/images"
+	if [ "$?" = "0" ]; then
+		echo "OK"
+	else
+		echo "Failed"
+		exit 21
+	fi
+fi
+
+# change ownership for the events folder. do it recursively unless -q is used
+if [ -n "$QUICK" ]; then
+	echo -n "Changing ownership of the events folder to ${ZM_WEB_USER} ${ZM_WEB_GROUP}... "
+	chown ${ZM_WEB_USER}:${ZM_WEB_GROUP} "$ZM_PATH_WEB/events"
+	if [ "$?" = "0" ]; then
+		echo "OK"
+	else
+		echo "Failed"
+		exit 25
+	fi
+else
+	echo -n "Changing ownership of the events folder recursively to ${ZM_WEB_USER} ${ZM_WEB_GROUP}... "
+	chown -R ${ZM_WEB_USER}:${ZM_WEB_GROUP} "$ZM_PATH_WEB/events"
+	if [ "$?" = "0" ]; then
+		echo "OK"
+	else
+		echo "Failed"
+		exit 26
+	fi
+fi
+
+# Change directory permissions for the images folder
+echo -n "Changing permissions of the images folder to 775... "
+chmod 775 "$ZM_PATH_WEB/images"
+if [ "$?" = "0" ]; then
+	echo "OK"
+else
+	echo "Failed"
+	exit 30
+fi
+
+
+# Change directory permissions for the events folder
+echo -n "Changing permissions of the events folder to 775... "
+chmod 775 "$ZM_PATH_WEB/events"
+if [ "$?" = "0" ]; then
+	echo "OK"
+else
+	echo "Failed"
+	exit 31
+fi
+
+echo ""
+echo "All done"
diff --git a/zoneminder-config.cmake b/zoneminder-config.cmake
new file mode 100644
index 000000000..3464d14a0
--- /dev/null
+++ b/zoneminder-config.cmake
@@ -0,0 +1,64 @@
+#ifndef ZM_CMAKE_CONFIG_H
+#define ZM_CMAKE_CONFIG_H
+
+/* This file is used by cmake to create config.h for ZM */
+
+/* General system checks */
+#cmakedefine HAVE_LINUX_VIDEODEV_H 1
+#cmakedefine HAVE_LINUX_VIDEODEV2_H 1
+#cmakedefine HAVE_EXECINFO_H 1
+#cmakedefine HAVE_SYS_SENDFILE_H 1
+#cmakedefine HAVE_SYS_SYSCALL_H 1
+#cmakedefine HAVE_SYSCALL 1
+#cmakedefine HAVE_SENDFILE 1
+#cmakedefine HAVE_DECL_BACKTRACE 1
+#cmakedefine HAVE_POSIX_MEMALIGN 1
+#cmakedefine HAVE_STRSIGNAL 1
+#cmakedefine HAVE_DECL_ROUND 1
+#cmakedefine HAVE_SIGINFO_T 1
+#cmakedefine HAVE_UCONTEXT_T 1
+#cmakedefine HAVE_STRUCT_SIGCONTEXT 1
+#cmakedefine HAVE_STRUCT_SIGCONTEXT_EIP 1
+#cmakedefine HAVE_STRUCT_SIGCONTEXT_RIP 1
+
+/* Library checks and their header files */
+#cmakedefine HAVE_LIBZLIB 1
+#cmakedefine HAVE_ZLIB_H 1
+#cmakedefine HAVE_LIBJPEG 1
+#cmakedefine HAVE_JPEGLIB_H 1
+#cmakedefine HAVE_LIBOPENSSL 1
+#cmakedefine HAVE_OPENSSL_MD5_H 1
+#cmakedefine HAVE_LIBCRYPTO 1
+#cmakedefine HAVE_LIBPTHREAD 1
+#cmakedefine HAVE_PTHREAD_H
+#cmakedefine HAVE_LIBPCRE 1
+#cmakedefine HAVE_PCRE_H 1
+#cmakedefine HAVE_LIBGCRYPT 1
+#cmakedefine HAVE_GCRYPT_H 1
+#cmakedefine HAVE_LIBGNUTLS 1
+#cmakedefine HAVE_GNUTLS_OPENSSL_H 1
+#cmakedefine HAVE_GNUTLS_GNUTLS_H 1
+#cmakedefine HAVE_LIBMYSQLCLIENT 1
+#cmakedefine HAVE_MYSQL_H 1
+#cmakedefine HAVE_LIBAVFORMAT 1
+#cmakedefine HAVE_LIBAVFORMAT_AVFORMAT_H 1
+#cmakedefine HAVE_LIBAVCODEC 1
+#cmakedefine HAVE_LIBAVCODEC_AVCODEC_H 1
+#cmakedefine HAVE_LIBAVDEVICE 1
+#cmakedefine HAVE_LIBAVDEVICE_AVDEVICE_H
+#cmakedefine HAVE_LIBAVUTIL 1
+#cmakedefine HAVE_LIBAVUTIL_AVUTIL_H 1
+#cmakedefine HAVE_LIBAVUTIL_MATHEMATICS_H 1
+#cmakedefine HAVE_LIBSWSCALE 1
+#cmakedefine HAVE_LIBSWSCALE_SWSCALE_H 1
+
+/* Authenication checks */
+#cmakedefine HAVE_MD5_OPENSSL 1
+#cmakedefine HAVE_MD5_GNUTLS 1
+#cmakedefine HAVE_DECL_MD5 1
+#cmakedefine HAVE_DECL_GNUTLS_FINGERPRINT 1
+
+/* Its safe to assume that signal return type is void. This is a fix for zm_signal.h */
+#define RETSIGTYPE void
+
+#endif