915 changed files with 79734 additions and 126969 deletions
--- a/.cirrus.yml
+++ b/.cirrus.yml
@ -1,26 +0,0 @@
-task:
-  name: freebsd-build
-  freebsd_instance:
-    image_family: freebsd-12-2
-
-  prepare_script:
-    - pkg install -yq git cmake jpeg-turbo mysql80-client ffmpeg libvncserver libjwt catch p5-DBI p5-DBD-mysql p5-Date-Manip p5-Test-LWP-UserAgent p5-Sys-Mmap
-
-  configure_script:
-    - git submodule update --init --recursive
-    - mkdir build
-    - cd build
-    - cmake --version
-    - cmake ../ -DBUILD_MAN=0 -DBUILD_TEST_SUITE=1 -DENABLE_WERROR=1
-
-  build_script:
-    - cd build
-    - make -j3
-
-  install_script:
-    - cd build
-    - make install
-
-  test_script:
-    - cd build/tests
-    - ./tests "~[notCI]"
--- a/.eslintrc.js
+++ b/.eslintrc.js
@ -3,7 +3,6 @@
 module.exports = {
  "env": {
    "browser": true,
-    "es6": true,
  },
  "extends": ["google"],
  "overrides": [{
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@ -1,2 +0,0 @@
-# Reindent CMakeLists
-6c9983155c65848a3e67976445cd20fb4fbfe108
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@ -2,7 +2,7 @@

 github: [connortechnology,pliablepixels] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
 patreon: zoneminder # Replace with a single Patreon username
-open_collective: zoneminder # Replace with a single Open Collective username
+open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@ -1,5 +1,3 @@
-<!--
-
 **THIS FORUM IS FOR BUG REPORTS ONLY**

 Do not post feature or enhancement requests, general discussions, or support questions here.
@ -14,46 +12,35 @@ Docker related issues should be posted here: https://github.com/ZoneMinder/zmdoc
 In order to submit a bug report, please populate the fields below this line. This is required.

 ----------------------------------------------------------------------------------------------------
-->
+
 **Describe Your Environment**
-<!--
 - Version of ZoneMinder [release version, development version, or commit]
 - How you installed ZoneMinder [e.g. PPA, RPMFusion, from-source, etc]
 - Full name and version of OS
 - Browser name and version (if this is an issue with the web interface)
-->

 **If the issue concerns a camera**
-<!--
 - Make and Model
 - Frame rate
 - Resolution
 - ZoneMinder Source Type:
-->

 **Describe the bug**
-<!--
 A clear and concise description of what the bug is.
-->
+
 **To Reproduce**
-<!--
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
-->

 **Expected behavior**
-<!--
 A clear and concise description of what you expected to happen.
-->

 **Debug Logs**
 ```

-<!--
 <insert debug logs here, please make sure they are within the ``` quotes so they are formatted properly>
-->

 ```
--- a/.github/codeql/codeql-config.yml
+++ b/.github/codeql/codeql-config.yml
@ -1,2 +0,0 @@
-paths-ignore:
-  - dep/
--- a/.github/workflows/ci-xenial.yml
+++ b/.github/workflows/ci-xenial.yml
@ -1,25 +0,0 @@
-name: CI Xenial
-
-on:
-  push:
-    branches:
-      - '*'
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-    runs-on: zm-xenial-ci
-
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
-      - name: Install dependencies
-        run: sudo apt-get update && sudo apt-get install libavdevice-dev libcurl4-gnutls-dev libvlc-dev libvncserver-dev libdate-manip-perl libdbd-mysql-perl libsys-mmap-perl libpolkit-gobject-1-dev
-      - name: Prepare
-        run: mkdir build
-      - name: Configure
-        run: cd build && cmake --version && cmake .. -DBUILD_MAN=0 -DENABLE_WERROR=1
-      - name: Build
-        run: cd build && make -j3 | grep --line-buffered -Ev '^(cp lib\/|Installing.+\.pm)' && (exit ${PIPESTATUS[0]})
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@ -1,79 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-name: "CodeQL"
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [master]
-  schedule:
-    - cron: '0 3 * * 5'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        # Override automatic language detection by changing the below list
-        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
-        language: ['cpp', 'javascript']
-        # Learn more...
-        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        config-file: ./.github/codeql/codeql-config.yml
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file. 
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    - name: Clean install dependencies and build
-      run: |
-        git submodule init
-        git submodule update --init --recursive
-        sudo apt-get update
-        sudo apt-get install libavdevice-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev  libjwt-gnutls-dev
-        sudo apt-get install libbz2-dev libgcrypt20-dev libcurl4-gnutls-dev libjpeg-turbo8-dev libturbojpeg0-dev
-        sudo apt-get install default-libmysqlclient-dev libpcre3-dev libpolkit-gobject-1-dev libv4l-dev libvlc-dev
-        sudo apt-get install libdate-manip-perl libdbd-mysql-perl libphp-serialization-perl libsys-mmap-perl
-        sudo apt-get install libwww-perl libdata-uuid-perl libssl-dev libcrypt-eksblowfish-perl libdata-entropy-perl
-        
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl- 
-   
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
--- a/.gitignore
+++ b/.gitignore
@ -120,10 +120,15 @@ src/CMakeFiles/
 src/cmake_install.cmake
 src/libzm.a
 src/nph-zms
+src/zm_config.h
+src/zm_config_defines.h
+src/zma
 src/zmc
 src/zmf
 src/zms
 src/zmu
+src/zoneminder-zma.8
+src/zoneminder-zma.8.gz
 src/zoneminder-zmc.8
 src/zoneminder-zmc.8.gz
 src/zoneminder-zmf.8
@ -152,6 +157,4 @@ web/undef.log
 zm.conf
 zmconfgen.pl
 zmlinkcontent.sh
-zm_config_data.h
-zm_config_defines.h
 **/.DS_Store
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,17 +0,0 @@
-default:
-  image:
-    name: ubuntu:latest
-  before_script:
-    - apt-get update -yq
-    - DEBIAN_FRONTEND=noninteractive apt-get install -yq devscripts sudo
-
-deb:
-  stage: build
-  tags:
-    - docker
-  script:
-    - yes "" | ./utils/do_debian_package.sh --snapshot=stable --type=binary --interactive=no --dput=no --debbuild-extra=--no-sign || true
-  artifacts:
-    paths:
-      - '*.deb'
-    expire_in: 1 week
--- a/.gitmodules
+++ b/.gitmodules
@ -4,7 +4,4 @@
 	branch = 3.0
 [submodule "web/api/app/Plugin/CakePHP-Enum-Behavior"]
 	path = web/api/app/Plugin/CakePHP-Enum-Behavior
-	Url = https://github.com/ZoneMinder/CakePHP-Enum-Behavior.git
-[submodule "dep/RtspServer"]
-	path = dep/RtspServer
-	url = https://github.com/ZoneMinder/RtspServer
+	url = https://github.com/ZoneMinder/CakePHP-Enum-Behavior.git
--- a/.travis.yml
+++ b/.travis.yml
@ -1,6 +1,6 @@
 language: cpp
 sudo: required
-dist: bionic
+dist: xenial
 git:
  depth: 9999999
 notifications:
@ -32,8 +32,25 @@ install:
  - update-binfmts --enable qemu-arm

 env:
-  - SMPFLAGS=-j4 OS=eslint DIST=eslint
+  - SMPFLAGS=-j4 OS=el DIST=7
+  - SMPFLAGS=-j4 OS=el DIST=8 DOCKER_REPO=knnniggett/packpack
+  - SMPFLAGS=-j4 OS=fedora DIST=30
+  - SMPFLAGS=-j4 OS=fedora DIST=31
+  - SMPFLAGS=-j4 OS=ubuntu DIST=trusty DOCKER_REPO=iconzm/packpack
+  - SMPFLAGS=-j4 OS=ubuntu DIST=xenial DOCKER_REPO=iconzm/packpack
  - SMPFLAGS=-j4 OS=ubuntu DIST=bionic DOCKER_REPO=iconzm/packpack
+  - SMPFLAGS=-j4 OS=ubuntu DIST=disco DOCKER_REPO=iconzm/packpack
+  - SMPFLAGS=-j4 OS=ubuntu DIST=eoan DOCKER_REPO=iconzm/packpack
+  - SMPFLAGS=-j4 OS=ubuntu DIST=focal DOCKER_REPO=iconzm/packpack
+  - SMPFLAGS=-j4 OS=debian DIST=jessie DOCKER_REPO=iconzm/packpack
+  - SMPFLAGS=-j4 OS=debian DIST=stretch DOCKER_REPO=iconzm/packpack
+  - SMPFLAGS=-j4 OS=debian DIST=buster DOCKER_REPO=iconzm/packpack
+  - SMPFLAGS=-j4 OS=ubuntu DIST=trusty ARCH=i386
+  - SMPFLAGS=-j4 OS=ubuntu DIST=xenial ARCH=i386
+  - SMPFLAGS=-j4 OS=ubuntu DIST=disco ARCH=i386
+  - SMPFLAGS=-j4 OS=debian DIST=buster ARCH=i386
+  - SMPFLAGS=-j4 OS=debian DIST=stretch ARCH=i386
+  - SMPFLAGS=-j4 OS=eslint DIST=eslint

 compiler:
 - gcc
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/README.md
+++ b/README.md
@ -30,10 +30,10 @@ This is the recommended method to install ZoneMinder onto your system. ZoneMinde
 - Debian from their [default repository](https://packages.debian.org/search?searchon=names&keywords=zoneminder) 
 - RHEL/CentOS and clones via [RPM Fusion](http://rpmfusion.org)
 - Fedora via [RPM Fusion](http://rpmfusion.org)
- OpenSuse via [third party repository](https://wiki.zoneminder.com/Installing_using_ZoneMinder_RPMs_for_SuSE)
+- OpenSuse via [third party repository](http://www.zoneminder.com/wiki/index.php/Installing_using_ZoneMinder_RPMs_for_SuSE)
 - Mageia from their default repository
 - Arch via the [AUR](https://aur.archlinux.org/packages/zoneminder/)
- Gentoo via [Portage Overlays](http://gpo.zugaina.org/www-misc/zoneminder)
+- Gentoo from their [default repository](https://packages.gentoo.org/packages/www-misc/zoneminder)

 If a repository that hosts ZoneMinder packages is not available for your distro, then you are encouraged to build your own package, rather than build from source.  While each distro is different in ways that set it apart from all the others, they are often similar enough to allow you to adapt another distro's package building instructions to your own.

@ -70,19 +70,18 @@ Docker is a system to run applications inside isolated containers. ZoneMinder, a
 Dockerfile contained in this repository. However, there is still work needed to ensure that the main ZM features work 
 properly and are documented. 

-## Contribution Model and Development
+## Contribution Model and  Development

 * Source hosted at [GitHub](https://github.com/ZoneMinder/ZoneMinder/)
-* Report issues at [GitHub Issues](https://github.com/ZoneMinder/ZoneMinder/issues)
-* Questions/feature requests in [Slack](https://zoneminder-chat.slack.com/) or [forums](https://forums.zoneminder.com)
+* Report issues/questions/feature requests on [GitHub Issues](https://github.com/ZoneMinder/ZoneMinder/issues)

 Pull requests are very welcome!  If you would like to contribute, please follow
-the following steps.  While step 3 is optional, it is preferred.
+the following steps.

 1. Fork the repo
 2. Open an issue at our [GitHub Issues Tracker](https://github.com/ZoneMinder/ZoneMinder/issues).
-   Follow the issue template to describe the bug or security issue you found. Please note feature
-   requests or questions should be posted in our user forum or Slack channel.
+   Describe the bug that you've found, or the feature which you're asking for.
+   Jot down the issue number (e.g. 456)
 3. Create your feature branch (`git checkout -b 456-my-new-feature`)
 4. Commit your changes (`git commit -am 'Added some feature'`)
   It is preferred that you 'commit early and often' instead of bunching all
--- a/SECURITY.md
+++ b/SECURITY.md
@ -1,18 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Time and computers move on. We do not have the resources to support every ancient version of everything
-(unless you'd like to pay us to do so.)  We ONLY support the latest stable release and development releases.
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 1.34.x   | :white_check_mark: |
-| 1.35.x   | :white_check_mark: |
-| < 1.34.x   | :x:                |
-
-## Reporting a Vulnerability
-
-Since sometimes security vulnerabilities can be sensitive, you can just email me at isaac@zoneminder.com.
-If it's not such a big deal, by all means, create an issue here on github
-
--- a/cmake/Modules/CheckPlatform.cmake
+++ b/cmake/Modules/CheckPlatform.cmake
@ -1,44 +0,0 @@
-set(HOST_OS "")
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-  set(HOST_OS "linux")
-endif()
-if(${CMAKE_SYSTEM_NAME} MATCHES ".*(SunOS|Solaris).*")
-  set(HOST_OS "solaris")
-  set(SOLARIS 1)
-endif()
-if(${CMAKE_SYSTEM_NAME} MATCHES ".*BSD.*")
-  set(HOST_OS "BSD")
-  set(BSD 1)
-endif()
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-  set(HOST_OS "darwin")
-endif()
-if(NOT HOST_OS)
-  message(FATAL_ERROR
-    "ZoneMinder was unable to deterimine the host OS. Please report this.
-    Value of CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}")
-endif()
-
-if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" ZM_SYSTEM_PROC)
-  if((ZM_SYSTEM_PROC STREQUAL "") OR (ZM_SYSTEM_PROC STREQUAL "unknown"))
-    execute_process(COMMAND uname -m OUTPUT_VARIABLE ZM_SYSTEM_PROC ERROR_VARIABLE ZM_SYSTEM_PROC_ERR)
-
-    # maybe make the following error checks fatal
-    if(ZM_SYSTEM_PROC_ERR)
-      message(WARNING "\nAn error occurred while attempting to determine the system processor:\n${ZM_SYSTEM_PROC_ERR}")
-    endif()
-    if(NOT ZM_SYSTEM_PROC)
-      message(WARNING "\nUnable to determine the system processor. This may cause a build failure.\n")
-    endif()
-  endif()
-endif()
-
-message(STATUS "Detected compiler: ${CMAKE_C_COMPILER}")
-if(CMAKE_C_COMPILER MATCHES "gcc" OR CMAKE_C_COMPILER_ID STREQUAL "GNU")
-  include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake)
-elseif(CMAKE_C_COMPILER MATCHES "clang" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-  include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake)
-else()
-  message(FATAL_ERROR "No supported compiler found")
-endif()
--- a/cmake/Modules/ConfigureBaseTargets.cmake
+++ b/cmake/Modules/ConfigureBaseTargets.cmake
@ -1,50 +0,0 @@
-add_library(zm-compile-option-interface INTERFACE)
-
-# Use -std=c++11 instead of -std=gnu++11
-set(CMAKE_CXX_EXTENSIONS OFF)
-
-add_library(zm-feature-interface INTERFACE)
-
-# The cxx_std_* feature flags were only introduced in CMake 3.8
-# Use to old way to specify the required standard level for older CMake versions.
-# Remove this once we raise the required CMake version.
-if(${CMAKE_VERSION} VERSION_LESS 3.8.0)
-  set(CMAKE_CXX_STANDARD 11)
-else()
-  target_compile_features(zm-feature-interface
-    INTERFACE
-      cxx_std_11)
-endif()
-
-# Interface to set warning levels on targets.
-# It gets populated in the compiler specific script.
-add_library(zm-warning-interface INTERFACE)
-
-# Interface which disables all warnings on the target.
-add_library(zm-no-warning-interface INTERFACE)
-target_compile_options(zm-no-warning-interface
-  INTERFACE
-    -w)
-
-# An interface used by all other interfaces.
-add_library(zm-default-interface INTERFACE)
-target_link_libraries(zm-default-interface
-  INTERFACE
-    zm-compile-option-interface
-    zm-feature-interface)
-
-# An interface which provides the flags and definitions
-# used by the non-dependency targets.
-add_library(zm-core-interface INTERFACE)
-target_link_libraries(zm-core-interface
-  INTERFACE
-    zm-default-interface
-    zm-warning-interface)
-
-# An interface which provides the flags and definitions
-# used by the external dependency targets.
-add_library(zm-dependency-interface INTERFACE)
-target_link_libraries(zm-dependency-interface
-  INTERFACE
-    zm-default-interface
-    zm-no-warning-interface)
--- a/cmake/compiler/clang/settings.cmake
+++ b/cmake/compiler/clang/settings.cmake
@ -1,43 +0,0 @@
-target_compile_options(zm-warning-interface
-  INTERFACE
-    -Wall
-    -Wextra
-    -Wimplicit-fallthrough
-    -Wno-unused-parameter
-    -Wvla)
-
-if(ENABLE_WERROR)
-  target_compile_options(zm-warning-interface
-    INTERFACE
-      -Werror)
-endif()
-
-if(ASAN)
-  target_compile_options(zm-compile-option-interface
-    INTERFACE
-      -fno-omit-frame-pointer
-      -fsanitize=address
-      -fsanitize-recover=address
-      -fsanitize-address-use-after-scope)
-
-  target_link_options(zm-compile-option-interface
-    INTERFACE
-      -fno-omit-frame-pointer
-      -fsanitize=address
-      -fsanitize-recover=address
-      -fsanitize-address-use-after-scope)
-
-  message(STATUS "Clang: Enabled AddressSanitizer (ASan)")
-endif()
-
-if(TSAN)
-  target_compile_options(zm-compile-option-interface
-    INTERFACE
-      -fsanitize=thread)
-
-  target_link_options(zm-compile-option-interface
-    INTERFACE
-      -fsanitize=thread)
-
-  message(STATUS "Clang: Enabled ThreadSanitizer (TSan)")
-endif()
--- a/cmake/compiler/gcc/settings.cmake
+++ b/cmake/compiler/gcc/settings.cmake
@ -1,48 +0,0 @@
-target_compile_options(zm-warning-interface
-  INTERFACE
-    -Wall
-    $<$<VERSION_GREATER:$<CXX_COMPILER_VERSION>,5.0>:-Wconditionally-supported>
-    -Wextra
-    -Wformat-security
-    -Wno-cast-function-type
-    $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,11>:-Wno-clobbered>
-    -Wno-unused-parameter
-    -Woverloaded-virtual
-    -Wvla)
-
-if(ENABLE_WERROR)
-  target_compile_options(zm-warning-interface
-    INTERFACE
-      -Werror)
-endif()
-
-if(ASAN)
-  target_compile_options(zm-compile-option-interface
-    INTERFACE
-      -D_GLIBCXX_SANITIZE_VECTOR=1
-      -fno-omit-frame-pointer
-      -fsanitize=address
-      -fsanitize-recover=address
-      -fsanitize-address-use-after-scope)
-
-  target_link_options(zm-compile-option-interface
-    INTERFACE
-      -fno-omit-frame-pointer
-      -fsanitize=address
-      -fsanitize-recover=address
-      -fsanitize-address-use-after-scope)
-
-  message(STATUS "GCC: Enabled AddressSanitizer (ASan)")
-endif()
-
-if(TSAN)
-  target_compile_options(zm-compile-option-interface
-    INTERFACE
-      -fsanitize=thread)
-
-  target_link_options(zm-compile-option-interface
-    INTERFACE
-      -fsanitize=thread)
-
-  message(STATUS "GCC: Enabled ThreadSanitizer (TSan)")
-endif()
--- a/db/CMakeLists.txt
+++ b/db/CMakeLists.txt
@ -3,7 +3,6 @@
 # Create files from the .in files
 configure_file(zm_create.sql.in "${CMAKE_CURRENT_BINARY_DIR}/zm_create.sql" @ONLY)
 configure_file(zm_update-1.31.30.sql.in "${CMAKE_CURRENT_BINARY_DIR}/zm_update-1.31.30.sql" @ONLY)
-configure_file(zm_update-1.35.24.sql.in "${CMAKE_CURRENT_BINARY_DIR}/zm_update-1.35.24.sql" @ONLY)

 # Glob all database upgrade scripts
 file(GLOB dbfileslist RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "zm_update-*.sql")
@ -13,8 +12,6 @@ install(FILES ${dbfileslist} DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db

 # install zm_update-1.31.30.sql
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm_update-1.31.30.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
-# install zm_update-1.35.24.sql
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm_update-1.35.24.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")

 # install zm_create.sql
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm_create.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
--- a/db/triggers.sql
+++ b/db/triggers.sql
@ -3,10 +3,10 @@ delimiter //
 DROP TRIGGER IF EXISTS Events_Hour_delete_trigger//
 CREATE TRIGGER Events_Hour_delete_trigger BEFORE DELETE ON Events_Hour
 FOR EACH ROW BEGIN
-  UPDATE Event_Summaries SET
+  UPDATE Monitors SET
  HourEvents = GREATEST(COALESCE(HourEvents,1)-1,0),
  HourEventDiskSpace=GREATEST(COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Event_Summaries.MonitorId=OLD.MonitorId;
+  WHERE Id=OLD.MonitorId;
 END; 
 //

@ -20,10 +20,10 @@ FOR EACH ROW
    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
    IF ( diff ) THEN
      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Event_Summaries SET HourEventDiskSpace=GREATEST(COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Event_Summaries.MonitorId=OLD.MonitorId;
-        UPDATE Event_Summaries SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Event_Summaries.MonitorId=NEW.MonitorId;
+        UPDATE Monitors SET HourEventDiskSpace=GREATEST(COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Monitors.Id=OLD.MonitorId;
+        UPDATE Monitors SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Monitors.Id=NEW.MonitorId;
      ELSE
-        UPDATE Event_Summaries SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+diff WHERE Event_Summaries.MonitorId=NEW.MonitorId;
+        UPDATE Monitors SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
      END IF;
    END IF;
  END;
@ -32,10 +32,10 @@ FOR EACH ROW
 DROP TRIGGER IF EXISTS Events_Day_delete_trigger//
 CREATE TRIGGER Events_Day_delete_trigger BEFORE DELETE ON Events_Day
 FOR EACH ROW BEGIN
-  UPDATE Event_Summaries SET
+  UPDATE Monitors SET
  DayEvents = GREATEST(COALESCE(DayEvents,1)-1,0),
  DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Event_Summaries.MonitorId=OLD.MonitorId;
+  WHERE Id=OLD.MonitorId;
 END;
 //

@ -48,10 +48,10 @@ FOR EACH ROW
    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
    IF ( diff ) THEN
      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Event_Summaries SET DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Event_Summaries.MonitorId=OLD.MonitorId;
-        UPDATE Event_Summaries SET DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Event_Summaries.MonitorId=NEW.MonitorId;
+        UPDATE Monitors SET DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Monitors.Id=OLD.MonitorId;
+        UPDATE Monitors SET DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Monitors.Id=NEW.MonitorId;
      ELSE
-        UPDATE Event_Summaries SET DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)+diff,0) WHERE Event_Summaries.MonitorId=NEW.MonitorId;
+        UPDATE Monitors SET DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)+diff,0) WHERE Monitors.Id=NEW.MonitorId;
      END IF;
    END IF;
  END;
@ -61,10 +61,10 @@ FOR EACH ROW
 DROP TRIGGER IF EXISTS Events_Week_delete_trigger//
 CREATE TRIGGER Events_Week_delete_trigger BEFORE DELETE ON Events_Week
 FOR EACH ROW BEGIN
-  UPDATE Event_Summaries SET
+  UPDATE Monitors SET
  WeekEvents = GREATEST(COALESCE(WeekEvents,1)-1,0),
  WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Event_Summaries.MonitorId=OLD.MonitorId;
+  WHERE Id=OLD.MonitorId;
 END;
 //

@ -77,10 +77,10 @@ FOR EACH ROW
    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
    IF ( diff ) THEN
      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Event_Summaries SET WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Event_Summaries.MonitorId=OLD.MonitorId;
-        UPDATE Event_Summaries SET WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Event_Summaries.MonitorId=NEW.MonitorId;
+        UPDATE Monitors SET WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Monitors.Id=OLD.MonitorId;
+        UPDATE Monitors SET WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Monitors.Id=NEW.MonitorId;
      ELSE
-        UPDATE Event_Summaries SET WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)+diff,0) WHERE Event_Summaries.MonitorId=NEW.MonitorId;
+        UPDATE Monitors SET WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)+diff,0) WHERE Monitors.Id=NEW.MonitorId;
      END IF;
    END IF;
  END;
@ -89,10 +89,10 @@ FOR EACH ROW
 DROP TRIGGER IF EXISTS Events_Month_delete_trigger//
 CREATE TRIGGER Events_Month_delete_trigger BEFORE DELETE ON Events_Month
 FOR EACH ROW BEGIN
-  UPDATE Event_Summaries SET
+  UPDATE Monitors SET
  MonthEvents = GREATEST(COALESCE(MonthEvents,1)-1,0),
  MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Event_Summaries.MonitorId=OLD.MonitorId;
+  WHERE Id=OLD.MonitorId;
 END;
 //

@ -105,10 +105,10 @@ FOR EACH ROW
    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
    IF ( diff ) THEN
      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Event_Summaries SET MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace),0) WHERE Event_Summaries.MonitorId=OLD.MonitorId;
-        UPDATE Event_Summaries SET MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)+COALESCE(NEW.DiskSpace) WHERE Event_Summaries.MonitorId=NEW.MonitorId;
+        UPDATE Monitors SET MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace),0) WHERE Monitors.Id=OLD.MonitorId;
+        UPDATE Monitors SET MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)+COALESCE(NEW.DiskSpace) WHERE Monitors.Id=NEW.MonitorId;
      ELSE
-        UPDATE Event_Summaries SET MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)+diff,0) WHERE Event_Summaries.MonitorId=NEW.MonitorId;
+        UPDATE Monitors SET MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)+diff,0) WHERE Monitors.Id=NEW.MonitorId;
      END IF;
    END IF;
  END;
@ -126,14 +126,14 @@ BEGIN
  set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
  IF ( NEW.StorageId = OLD.StorageID ) THEN
    IF ( diff ) THEN
-      UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) + diff,0) WHERE Storage.Id = OLD.StorageId;
+      UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) + diff,0) WHERE Id = OLD.StorageId;
    END IF;
  ELSE
    IF ( NEW.DiskSpace ) THEN
-      UPDATE Storage SET DiskSpace = COALESCE(DiskSpace,0) + NEW.DiskSpace WHERE Storage.Id = NEW.StorageId;
+      UPDATE Storage SET DiskSpace = COALESCE(DiskSpace,0) + NEW.DiskSpace WHERE Id = NEW.StorageId;
    END IF;
    IF ( OLD.DiskSpace ) THEN
-      UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) - OLD.DiskSpace,0) WHERE Storage.Id = OLD.StorageId;
+      UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) - OLD.DiskSpace,0) WHERE Id = OLD.StorageId;
    END IF;
  END IF;

@ -145,21 +145,20 @@ BEGIN
  IF ( NEW.Archived != OLD.Archived ) THEN
    IF ( NEW.Archived ) THEN
      INSERT INTO Events_Archived (EventId,MonitorId,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.DiskSpace);
-      INSERT INTO Event_Summaries (MonitorId,ArchivedEvents,ArchivedEventDiskSpace) VALUES (NEW.MonitorId,1,NEW.DiskSpace) ON DUPLICATE KEY
-        UPDATE ArchivedEvents = COALESCE(ArchivedEvents,0)+1, ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) + COALESCE(NEW.DiskSpace,0);
+      UPDATE Monitors SET ArchivedEvents = COALESCE(ArchivedEvents,0)+1, ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) + COALESCE(NEW.DiskSpace,0) WHERE Id=NEW.MonitorId;
    ELSEIF ( OLD.Archived ) THEN
      DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-      UPDATE Event_Summaries
+      UPDATE Monitors
        SET
          ArchivedEvents = GREATEST(COALESCE(ArchivedEvents,0)-1,0),
          ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),0)
-        WHERE Event_Summaries.MonitorId=OLD.MonitorId;
+        WHERE Id=OLD.MonitorId;
    ELSE
      IF ( OLD.DiskSpace != NEW.DiskSpace ) THEN
        UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-        UPDATE Event_Summaries SET
+        UPDATE Monitors SET
          ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0),0)
-          WHERE Event_Summaries.MonitorId=OLD.MonitorId;
+          WHERE Id=OLD.MonitorId;
      END IF;
    END IF;
  ELSEIF ( NEW.Archived AND diff ) THEN
@ -167,10 +166,10 @@ BEGIN
  END IF;

  IF ( diff ) THEN
-    UPDATE Event_Summaries
+    UPDATE Monitors
      SET
        TotalEventDiskSpace = GREATEST(COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0),0)
-      WHERE Event_Summaries.MonitorId=OLD.MonitorId;
+      WHERE Id=OLD.MonitorId;
  END IF;

 END;
@ -186,17 +185,17 @@ CREATE TRIGGER event_insert_trigger AFTER INSERT ON Events
 FOR EACH ROW
  BEGIN

-  INSERT INTO Events_Hour (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
-  INSERT INTO Events_Day (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
-  INSERT INTO Events_Week (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
-  INSERT INTO Events_Month (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
-  INSERT INTO Event_Summaries (MonitorId,HourEvents,DayEvents,WeekEvents,MonthEvents,TotalEvents) VALUES (NEW.MonitorId,1,1,1,1,1) ON DUPLICATE KEY
-  UPDATE 
+  INSERT INTO Events_Hour (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
+  INSERT INTO Events_Day (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
+  INSERT INTO Events_Week (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
+  INSERT INTO Events_Month (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
+  UPDATE Monitors SET
  HourEvents = COALESCE(HourEvents,0)+1,
  DayEvents = COALESCE(DayEvents,0)+1,
  WeekEvents = COALESCE(WeekEvents,0)+1,
  MonthEvents = COALESCE(MonthEvents,0)+1,
-  TotalEvents = COALESCE(TotalEvents,0)+1;
+  TotalEvents = COALESCE(TotalEvents,0)+1
+  WHERE Id=NEW.MonitorId;
 END;
 //

@ -206,7 +205,7 @@ CREATE TRIGGER event_delete_trigger BEFORE DELETE ON Events
 FOR EACH ROW
 BEGIN
  IF ( OLD.DiskSpace ) THEN
-    UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) - COALESCE(OLD.DiskSpace,0),0) WHERE Storage.Id = OLD.StorageId;
+    UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) - COALESCE(OLD.DiskSpace,0),0) WHERE Id = OLD.StorageId;
  END IF;
  DELETE FROM Events_Hour WHERE EventId=OLD.Id;
  DELETE FROM Events_Day WHERE EventId=OLD.Id;
@ -214,17 +213,17 @@ BEGIN
  DELETE FROM Events_Month WHERE EventId=OLD.Id;
  IF ( OLD.Archived ) THEN
    DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-    UPDATE Event_Summaries SET
+    UPDATE Monitors SET
      ArchivedEvents = GREATEST(COALESCE(ArchivedEvents,1) - 1,0),
      ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),0),
      TotalEvents = GREATEST(COALESCE(TotalEvents,1) - 1,0),
      TotalEventDiskSpace = GREATEST(COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),0)
-      WHERE Event_Summaries.MonitorId=OLD.MonitorId;
+      WHERE Id=OLD.MonitorId;
  ELSE
-    UPDATE Event_Summaries SET
+    UPDATE Monitors SET
    TotalEvents = GREATEST(COALESCE(TotalEvents,1)-1,0),
    TotalEventDiskSpace=GREATEST(COALESCE(TotalEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-    WHERE Event_Summaries.MonitorId=OLD.MonitorId;
+    WHERE Id=OLD.MonitorId;
  END IF;
 END;

@ -234,14 +233,14 @@ DROP TRIGGER IF EXISTS Zone_Insert_Trigger//
 CREATE TRIGGER Zone_Insert_Trigger AFTER INSERT ON Zones
 FOR EACH ROW
  BEGIN
-    UPDATE Monitors SET ZoneCount=(SELECT COUNT(*) FROM Zones WHERE MonitorId=NEW.MonitorId) WHERE Monitors.Id=NEW.MonitorID;
+    UPDATE Monitors SET ZoneCount=(SELECT COUNT(*) FROM Zones WHERE MonitorId=NEW.MonitorId) WHERE Id=NEW.MonitorID;
  END
 //
 DROP TRIGGER IF EXISTS Zone_Delete_Trigger//
 CREATE TRIGGER Zone_Delete_Trigger AFTER DELETE ON Zones
 FOR EACH ROW
  BEGIN
-    UPDATE Monitors SET ZoneCount=(SELECT COUNT(*) FROM Zones WHERE MonitorId=OLD.MonitorId) WHERE Monitors.Id=OLD.MonitorID;
+    UPDATE Monitors SET ZoneCount=(SELECT COUNT(*) FROM Zones WHERE MonitorId=OLD.MonitorId) WHERE Id=OLD.MonitorID;
  END
 //

--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@ -63,7 +63,7 @@ DROP TABLE IF EXISTS `Controls`;
 CREATE TABLE `Controls` (
  `Id` int(10) unsigned NOT NULL auto_increment,
  `Name` varchar(64) NOT NULL default '',
-  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket','VNC') NOT NULL default 'Local',
+  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL default 'Local',
  `Protocol` varchar(64) default NULL,
  `CanWake` tinyint(3) unsigned NOT NULL default '0',
  `CanSleep` tinyint(3) unsigned NOT NULL default '0',
@ -189,8 +189,8 @@ CREATE TABLE `Events` (
  `SecondaryStorageId`	smallint(5) unsigned default 0,
  `Name` varchar(64) NOT NULL default '',
  `Cause` varchar(32) NOT NULL default '',
-  `StartDateTime` datetime default NULL,
-  `EndDateTime` datetime default NULL,
+  `StartTime` datetime default NULL,
+  `EndTime` datetime default NULL,
  `Width` smallint(5) unsigned NOT NULL default '0',
  `Height` smallint(5) unsigned NOT NULL default '0',
  `Length` decimal(10,2) NOT NULL default '0.00',
@ -216,52 +216,52 @@ CREATE TABLE `Events` (
  PRIMARY KEY (`Id`),
  KEY `Events_MonitorId_idx` (`MonitorId`),
  KEY `Events_StorageId_idx` (`StorageId`),
-  KEY `Events_StartDateTime_idx` (`StartDateTime`),
-  KEY `Events_EndDateTime_DiskSpace` (`EndDateTime`,`DiskSpace`)
+  KEY `Events_StartTime_idx` (`StartTime`),
+  KEY `Events_EndTime_DiskSpace` (`EndTime`,`DiskSpace`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;

 DROP TABLE IF EXISTS `Events_Hour`;
 CREATE TABLE `Events_Hour` (
  `EventId` BIGINT unsigned NOT NULL,
  `MonitorId` int(10) unsigned NOT NULL,
-  `StartDateTime` datetime default NULL,
+  `StartTime` datetime default NULL,
  `DiskSpace`   bigint default NULL,
  PRIMARY KEY (`EventId`),
  KEY `Events_Hour_MonitorId_idx` (`MonitorId`),
-  KEY `Events_Hour_StartDateTime_idx` (`StartDateTime`)
+  KEY `Events_Hour_StartTime_idx` (`StartTime`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;

 DROP TABLE IF EXISTS `Events_Day`;
 CREATE TABLE `Events_Day` (
  `EventId` BIGINT unsigned NOT NULL,
  `MonitorId` int(10) unsigned NOT NULL,
-  `StartDateTime` datetime default NULL,
+  `StartTime` datetime default NULL,
  `DiskSpace`   bigint default NULL,
  PRIMARY KEY (`EventId`),
  KEY `Events_Day_MonitorId_idx` (`MonitorId`),
-  KEY `Events_Day_StartDateTime_idx` (`StartDateTime`)
+  KEY `Events_Day_StartTime_idx` (`StartTime`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;

 DROP TABLE IF EXISTS `Events_Week`;
 CREATE TABLE `Events_Week` (
  `EventId` BIGINT unsigned NOT NULL,
  `MonitorId` int(10) unsigned NOT NULL,
-  `StartDateTime` datetime default NULL,
+  `StartTime` datetime default NULL,
  `DiskSpace`   bigint default NULL,
  PRIMARY KEY (`EventId`),
  KEY `Events_Week_MonitorId_idx` (`MonitorId`),
-  KEY `Events_Week_StartDateTime_idx` (`StartDateTime`)
+  KEY `Events_Week_StartTime_idx` (`StartTime`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;

 DROP TABLE IF EXISTS `Events_Month`;
 CREATE TABLE `Events_Month` (
  `EventId` BIGINT unsigned NOT NULL,
  `MonitorId` int(10) unsigned NOT NULL,
-  `StartDateTime` datetime default NULL,
+  `StartTime` datetime default NULL,
  `DiskSpace`   bigint default NULL,
  PRIMARY KEY (`EventId`),
  KEY `Events_Month_MonitorId_idx` (`MonitorId`),
-  KEY `Events_Month_StartDateTime_idx` (`StartDateTime`)
+  KEY `Events_Month_StartTime_idx` (`StartTime`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;


@ -282,16 +282,11 @@ DROP TABLE IF EXISTS `Filters`;
 CREATE TABLE `Filters` (
  `Id` int(10) unsigned NOT NULL auto_increment,
  `Name` varchar(64) NOT NULL default '',
-  `UserId`  int(10) unsigned,
  `Query_json` text NOT NULL,
  `AutoArchive` tinyint(3) unsigned NOT NULL default '0',
-  `AutoUnarchive` tinyint(3) unsigned NOT NULL default '0',
  `AutoVideo` tinyint(3) unsigned NOT NULL default '0',
  `AutoUpload` tinyint(3) unsigned NOT NULL default '0',
  `AutoEmail` tinyint(3) unsigned NOT NULL default '0',
-	`EmailTo`				TEXT,
-	`EmailSubject`	TEXT,
-	`EmailBody`			TEXT,
  `AutoMessage` tinyint(3) unsigned NOT NULL default '0',
  `AutoExecute` tinyint(3) unsigned NOT NULL default '0',
  `AutoExecuteCmd` tinytext,
@ -303,7 +298,6 @@ CREATE TABLE `Filters` (
  `UpdateDiskSpace` tinyint(3) unsigned NOT NULL default '0',
  `Background` tinyint(1) unsigned NOT NULL default '0',
  `Concurrent` tinyint(1) unsigned NOT NULL default '0',
-  `LockRows` tinyint(1) unsigned NOT NULL default '0',
  PRIMARY KEY (`Id`),
  KEY `Name` (`Name`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
@ -316,7 +310,6 @@ DROP TABLE IF EXISTS `Frames`;
 CREATE TABLE `Frames` (
  `Id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
  `EventId` BIGINT UNSIGNED NOT NULL default '0',
-  FOREIGN KEY (`EventId`) REFERENCES `Events` (`Id`) ON DELETE CASCADE,
  `FrameId` int(10) unsigned NOT NULL default '0',
  `Type` enum('Normal','Bulk','Alarm') NOT NULL default 'Normal',
  `TimeStamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
@ -337,7 +330,6 @@ CREATE TABLE `Groups` (
  `Id` int(10) unsigned NOT NULL auto_increment,
  `Name` varchar(64) NOT NULL default '',
  `ParentId` int(10) unsigned,
-  FOREIGN KEY (`ParentId`) REFERENCES `Groups` (`Id`) ON DELETE CASCADE,
  PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;

@ -349,9 +341,7 @@ DROP TABLE IF EXISTS `Groups_Monitors`;
 CREATE TABLE `Groups_Monitors` (
    `Id` INT(10) unsigned NOT NULL auto_increment,
    `GroupId` int(10) unsigned NOT NULL,
-    FOREIGN KEY (`GroupId`) REFERENCES `Groups` (`Id`) ON DELETE CASCADE,
    `MonitorId` int(10) unsigned NOT NULL,
-    FOREIGN KEY (`MonitorId`) REFERENCES `Monitors` (`Id`) ON DELETE CASCADE,
    PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;

@ -413,7 +403,7 @@ DROP TABLE IF EXISTS `MonitorPresets`;
 CREATE TABLE `MonitorPresets` (
  `Id` int(10) unsigned NOT NULL auto_increment,
  `Name` varchar(64) NOT NULL default '',
-  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket','VNC') NOT NULL default 'Local',
+  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL default 'Local',
  `Device` tinytext,
  `Channel` tinyint(3) unsigned default NULL,
  `Format` int(10) unsigned default NULL,
@ -447,16 +437,11 @@ CREATE TABLE `Monitors` (
  `Notes` TEXT,
  `ServerId` int(10) unsigned,
  `StorageId`	smallint(5) unsigned default 0,
-  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket','VNC') NOT NULL default 'Local',
+  `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL default 'Local',
  `Function` enum('None','Monitor','Modect','Record','Mocord','Nodect') NOT NULL default 'Monitor',
  `Enabled` tinyint(3) unsigned NOT NULL default '1',
-  `DecodingEnabled` tinyint(3) unsigned NOT NULL default '1',
  `LinkedMonitors` varchar(255),
  `Triggers` set('X10') NOT NULL default '',
-  `ONVIF_URL` VARCHAR(255) NOT NULL DEFAULT '',
-  `ONVIF_Username` VARCHAR(64) NOT NULL DEFAULT '',
-  `ONVIF_Password` VARCHAR(64) NOT NULL DEFAULT '',
-  `ONVIF_Options` VARCHAR(64) NOT NULL DEFAULT '',
  `Device` tinytext NOT NULL default '',
  `Channel` tinyint(3) unsigned NOT NULL default '0',
  `Format` int(10) unsigned NOT NULL default '0',
@ -468,7 +453,6 @@ CREATE TABLE `Monitors` (
  `Port` varchar(8) NOT NULL default '',
  `SubPath` varchar(64) NOT NULL default '',
  `Path` varchar(255),
-  `SecondPath` varchar(255),
  `Options` varchar(255),
  `User` varchar(64),
  `Pass` varchar(64),
@ -482,8 +466,7 @@ CREATE TABLE `Monitors` (
  `DecoderHWAccelDevice`  varchar(255),
  `SaveJPEGs` TINYINT NOT NULL DEFAULT '3' ,
  `VideoWriter` TINYINT NOT NULL DEFAULT '0',
-  `OutputCodec` int(10) unsigned NOT NULL default 0,
-  `Encoder`     varchar(32),
+  `OutputCodec`     enum('h264','mjpeg','mpeg1','mpeg2'),
  `OutputContainer` enum('auto','mp4','mkv'),
  `EncoderParameters` TEXT,
  `RecordAudio` TINYINT NOT NULL DEFAULT '0',
@ -497,12 +480,11 @@ CREATE TABLE `Monitors` (
  `LabelX` smallint(5) unsigned NOT NULL default '0',
  `LabelY` smallint(5) unsigned NOT NULL default '0',
  `LabelSize` smallint(5) unsigned NOT NULL DEFAULT '1',
-  `ImageBufferCount` smallint(5) unsigned NOT NULL default '3',
-  `MaxImageBufferCount` smallint(5) unsigned NOT NULL default '0',
-  `WarmupCount` smallint(5) unsigned NOT NULL default '0',
+  `ImageBufferCount` smallint(5) unsigned NOT NULL default '100',
+  `WarmupCount` smallint(5) unsigned NOT NULL default '25',
  `PreEventCount` smallint(5) unsigned NOT NULL default '10',
  `PostEventCount` smallint(5) unsigned NOT NULL default '10',
-  `StreamReplayBuffer` int(10) unsigned NOT NULL default '0',
+  `StreamReplayBuffer` int(10) unsigned NOT NULL default '1000',
  `AlarmFrameCount` smallint(5) unsigned NOT NULL default '1',
  `SectionLength` int(10) unsigned NOT NULL default '600',
  `MinSectionLength` int(10) unsigned NOT NULL default '10',
@ -524,7 +506,6 @@ CREATE TABLE `Monitors` (
  `TrackDelay` smallint(5) unsigned,
  `ReturnLocation` tinyint(3) NOT NULL default '-1',
  `ReturnDelay` smallint(5) unsigned,
-  `ModectDuringPTZ` tinyint(3) unsigned NOT NULL default '0',
  `DefaultRate` smallint(5) unsigned NOT NULL default '100',
  `DefaultScale` smallint(5) unsigned NOT NULL default '100',
  `DefaultCodec` enum('auto','MP4','MJPEG') NOT NULL default 'auto',
@ -533,13 +514,20 @@ CREATE TABLE `Monitors` (
  `WebColour` varchar(32) NOT NULL default 'red',
  `Exif` tinyint(1) unsigned NOT NULL default '0',
  `Sequence` smallint(5) unsigned default NULL,
+  `TotalEvents` int(10) default NULL,
+  `TotalEventDiskSpace` bigint default NULL,
+  `HourEvents` int(10) default NULL,
+  `HourEventDiskSpace` bigint default NULL,
+  `DayEvents` int(10) default NULL,
+  `DayEventDiskSpace` bigint default NULL,
+  `WeekEvents` int(10) default NULL,
+  `WeekEventDiskSpace` bigint default NULL,
+  `MonthEvents` int(10) default NULL,
+  `MonthEventDiskSpace` bigint default NULL,
+  `ArchivedEvents` int(10) default NULL,
+  `ArchivedEventDiskSpace` bigint default NULL,
  `ZoneCount` TINYINT NOT NULL DEFAULT 0,
  `Refresh` int(10) unsigned default NULL,
-  `Latitude`  DECIMAL(10,8),
-  `Longitude`  DECIMAL(11,8),
-  `RTSPServer`  BOOLEAN NOT NULL DEFAULT FALSE,
-  `RTSPStreamName`  varchar(255) NOT NULL default '',
-  `Importance`  enum('Normal','Less','Not') NOT NULL default 'Normal',
  PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;

@ -553,26 +541,7 @@ CREATE TABLE `Monitor_Status` (
  `AnalysisFPS`  DECIMAL(5,2) NOT NULL default 0,
  `CaptureBandwidth`  INT NOT NULL default 0,
  PRIMARY KEY (`MonitorId`)
-) ENGINE=@ZM_MYSQL_ENGINE@;
-
-DROP TABLE IF EXISTS `Event_Summaries`;
-CREATE TABLE `Event_Summaries` (
-  `MonitorId` int(10) unsigned NOT NULL,
-  `TotalEvents` int(10) default NULL,
-  `TotalEventDiskSpace` bigint default NULL,
-  `HourEvents` int(10) default NULL,
-  `HourEventDiskSpace` bigint default NULL,
-  `DayEvents` int(10) default NULL,
-  `DayEventDiskSpace` bigint default NULL,
-  `WeekEvents` int(10) default NULL,
-  `WeekEventDiskSpace` bigint default NULL,
-  `MonthEvents` int(10) default NULL,
-  `MonthEventDiskSpace` bigint default NULL,
-  `ArchivedEvents` int(10) default NULL,
-  `ArchivedEventDiskSpace` bigint default NULL,
-  PRIMARY KEY (`MonitorId`)
-) ENGINE=@ZM_MYSQL_ENGINE@;
-
+) ENGINE=MEMORY;
 --
 -- Table structure for table `States`
 -- PP - Added IsActive to track custom run states
@ -628,11 +597,8 @@ DROP TABLE IF EXISTS `Stats`;
 CREATE TABLE `Stats` (
  `Id` int(10) unsigned NOT NULL AUTO_INCREMENT,
  `MonitorId` int(10) unsigned NOT NULL default '0',
-  FOREIGN KEY (`MonitorId`) REFERENCES `Monitors` (`Id`) ON DELETE CASCADE,
  `ZoneId` int(10) unsigned NOT NULL default '0',
-  FOREIGN KEY (`ZoneId`) REFERENCES `Zones` (`Id`) ON DELETE CASCADE,
  `EventId` BIGINT UNSIGNED NOT NULL,
-  FOREIGN KEY (`EventId`) REFERENCES `Events` (`Id`) ON DELETE CASCADE,
  `FrameId` int(10) unsigned NOT NULL default '0',
  `PixelDiff` tinyint(3) unsigned NOT NULL default '0',
  `AlarmPixels` int(10) unsigned NOT NULL default '0',
@ -682,13 +648,11 @@ CREATE TABLE `Users` (
  `Monitors` enum('None','View','Edit') NOT NULL default 'None',
  `Groups` enum('None','View','Edit') NOT NULL default 'None',
  `Devices` enum('None','View','Edit') NOT NULL default 'None',
-  `Snapshots` enum('None','View','Edit') NOT NULL default 'None',
  `System` enum('None','View','Edit') NOT NULL default 'None',
  `MaxBandwidth` varchar(16),
  `MonitorIds` text,
  `TokenMinExpiry`   BIGINT UNSIGNED NOT NULL DEFAULT 0,
  `APIEnabled`  tinyint(3) UNSIGNED NOT NULL default 1,
-  `HomeView`  varchar(64) NOT NULL DEFAULT '',
  PRIMARY KEY (`Id`),
  UNIQUE KEY `UC_Username` (`Username`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
@ -729,7 +693,6 @@ DROP TABLE IF EXISTS `Zones`;
 CREATE TABLE `Zones` (
  `Id` int(10) unsigned NOT NULL auto_increment,
  `MonitorId` int(10) unsigned NOT NULL default '0',
-  FOREIGN KEY (`MonitorId`) REFERENCES `Monitors` (`Id`) ON DELETE CASCADE,
  `Name` varchar(64) NOT NULL default '',
  `Type` enum('Active','Inclusive','Exclusive','Preclusive','Inactive','Privacy') NOT NULL default 'Active',
  `Units` enum('Pixels','Percent') NOT NULL default 'Pixels',
@ -767,14 +730,13 @@ CREATE TABLE `Storage` (
  `Scheme`   enum('Deep','Medium','Shallow') NOT NULL default 'Medium',
  `ServerId` int(10) unsigned,
  `DoDelete`  BOOLEAN NOT NULL DEFAULT true,
-  `Enabled`  BOOLEAN NOT NULL DEFAULT true,
 	PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;

 --
 -- Create a default storage location
 --
-insert into Storage VALUES (NULL, '@ZM_DIR_EVENTS@', 'Default', 'local', NULL, NULL, 'Medium', 0, true, true );
+insert into Storage VALUES (NULL, '@ZM_DIR_EVENTS@', 'Default', 'local', NULL, NULL, 'Medium', 0, true );

 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
@ -791,158 +753,46 @@ insert into Storage VALUES (NULL, '@ZM_DIR_EVENTS@', 'Default', 'local', NULL, N
 --
 -- Create a default admin user.
 --
-INSERT INTO `Users` (
-  `Username`,
-  `Password`,
-  `Language`,
-  `Enabled`,
-  `Stream`,
-  `Events`,
-  `Control`,
-  `Monitors`,
-  `Groups`,
-  `Devices`,
-  `Snapshots`,
-  `System`,
-  `MaxBandwidth`,
-  `MonitorIds`,
-  `TokenMinExpiry`,
-  `APIEnabled`,
-  `HomeView`
-  ) VALUES (
-    'admin',
-    '$2b$12$NHZsm6AM2f2LQVROriz79ul3D6DnmFiZC.ZK5eqbF.ZWfwH9bqUJ6',
-    '' /* Language */,
-    1 /* Enabled */,
-    'View' /* Stream */,
-    'Edit' /* Events */,
-    'Edit' /* Control */,
-    'Edit' /* Monitors */,
-    'Edit' /* Groups */,
-    'Edit' /* Devices */,
-    'Edit' /* Snapshots */,
-    'Edit' /* System */,
-    '' /* Max Bandwidth */,
-    '' /* MonitorIds */,
-    0 /* TokenMinExpiry */,
-    0 /* Api Endabled */,
-    '' /* Homeview */);
+insert into Users VALUES (NULL,'admin','$2b$12$NHZsm6AM2f2LQVROriz79ul3D6DnmFiZC.ZK5eqbF.ZWfwH9bqUJ6','',1,'View','Edit','Edit','Edit','Edit','Edit','Edit','','',0,1);

 --
 -- Add a sample filter to purge the oldest 100 events when the disk is 95% full
 --

-INSERT INTO `Filters`
-  (
-    `Name`,
-    `Query_json`,
-    `AutoArchive`,
-    `AutoVideo`,
-    `AutoUpload`,
-    `AutoEmail`,
-    `EmailTo`,
-    `EmailSubject`,
-    `EmailBody`,
-    `AutoMessage`,
-    `AutoExecute`,
-    `AutoExecuteCmd`,
-    `AutoDelete`,
-    `AutoMove`,
-    `AutoMoveTo`,
-    `AutoCopy`,
-    `AutoCopyTo`,
-    `UpdateDiskSpace`,
-    `UserId`,
-    `Background`,
-    `Concurrent`
-  )
-  VALUES
-  (
-    'PurgeWhenFull',
-    '{"sort_field":"Id","terms":[{"val":0,"attr":"Archived","op":"="},{"cnj":"and","val":95,"attr":"DiskPercent","op":">="},{"cnj":"and","obr":"0","attr":"EndDateTime","op":"IS NOT","val":"NULL","cbr":"0"}],"limit":100,"sort_asc":1}',
-    0/*AutoArchive*/,
-    0/*AutoVideo*/,
-    0/*AutoUpload*/,
-    0/*AutoEmail*/,
-    ''/*EmailTo*/,
-    ''/*EmailSubject*/,
-    ''/*EmailBody*/,
-    0/*AutoMessage*/,
-    0/*AutoExecute*/,'',
-    1/*AutoDelete*/,
-    0/*AutoMove*/,0/*MoveTo*/,
-    0/*AutoCopy*/,0/*CopyTo*/,
-    0/*UpdateDiskSpace*/,
-    1/*UserId = admin*/,
-    1/*Background*/,
-    0/*Concurrent*/
-  );
-INSERT INTO `Filters`
-  (
-    `Name`,
-    `Query_json`,
-    `AutoArchive`,
-    `AutoVideo`,
-    `AutoUpload`,
-    `AutoEmail`,
-    `EmailTo`,
-    `EmailSubject`,
-    `EmailBody`,
-    `AutoMessage`,
-    `AutoExecute`,
-    `AutoExecuteCmd`,
-    `AutoDelete`,
-    `AutoMove`,
-    `AutoMoveTo`,
-    `AutoCopy`,
-    `AutoCopyTo`,
-    `UpdateDiskSpace`,
-    `UserId`,
-    `Background`,
-    `Concurrent`
-  )
-VALUES (
-  'Update DiskSpace',
-  '{"terms":[{"attr":"DiskSpace","op":"IS","val":"NULL"},{"cnj":"and","obr":"0","attr":"EndDateTime","op":"IS NOT","val":"NULL","cbr":"0"}]}',
+insert into Filters values (NULL,'PurgeWhenFull','{"sort_field":"Id","terms":[{"val":0,"attr":"Archived","op":"="},{"cnj":"and","val":95,"attr":"DiskPercent","op":">="}],"limit":100,"sort_asc":1}',
  0/*AutoArchive*/,
  0/*AutoVideo*/,
  0/*AutoUpload*/,
  0/*AutoEmail*/,
-  ''/*EmailTo*/,
-  ''/*EmailSubject*/,
-  ''/*EmailBody*/,
  0/*AutoMessage*/,
  0/*AutoExecute*/,'',
-  0/*AutoDelete*/,
+  1/*AutoDelete*/,
  0/*AutoMove*/,0/*MoveTo*/,
  0/*AutoCopy*/,0/*CopyTo*/,
-  1/*UpdateDiskSpace*/,
-  1/*UserId=admin*/,
-  1/*Background*/,
-  0/*Concurrent*/
-);
+  0/*UpdateDiskSpace*/,1/*Background*/,0/*Concurrent*/);
+insert into Filters values (NULL,'Update DiskSpace','{"terms":[{"attr":"DiskSpace","op":"IS","val":"NULL"}]}',0,0,0,0,0,0,'',0,0,0,0,0,1,1,0);

 --
 -- Add in some sample control protocol definitions
 --
-INSERT INTO `Controls` VALUES (NULL,'Pelco-D','Local','PelcoD',1,1,0,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 (NULL,'Pelco-P','Local','PelcoP',1,1,0,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 (NULL,'Sony VISCA','Local','Visca',1,1,0,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 (NULL,'Axis API v2','Remote','AxisV2',0,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 (NULL,'Panasonic IP','Remote','PanasonicIP',0,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 (NULL,'Neu-Fusion NCS370','Remote','Ncs370',0,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 (NULL,'AirLink SkyIPCam 7xx','Remote','SkyIPCam7xx',0,0,1,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,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 (NULL,'Pelco-D','Ffmpeg','PelcoD',1,1,0,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 (NULL,'Pelco-P','Ffmpeg','PelcoP',1,1,0,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 (NULL,'Foscam FI8620','Ffmpeg','FI8620_Y2k',0,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);
-INSERT INTO `Controls` VALUES (NULL,'Foscam FI8608W','Ffmpeg','FI8608W_Y2k',1,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,1,1,128,0,0,1,0,0,0,0,1,1,128,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Foscam FI8908W','Remote','FI8908W',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Foscam FI9821W','Ffmpeg','FI9821W_Y2k',1,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,100,1,1,0,0,1,0,100,0,100,1,0,100,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,100,0,100,1,0,100,1,16,0,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,1,0,4,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Loftek Sentinel','Remote','LoftekSentinel',0,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,255,16,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,6,1,1,0,0,0,1,10,0,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Toshiba IK-WB11A','Remote','Toshiba_IK_WB11A',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,10,0,1,1,0,1,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'WanscamPT','Remote','Wanscam',1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,16,0,0,0,0,0,1,16,1,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'3S Domo N5071', 'Remote', '3S', 0, 0, 1, 0,1, 0, 1, 1, 0, 0, 9999, 0, 9999, 0, 0, 0, 1, 1, 1, 1, 0, 0, 9999, 20, 9999, 0, 0, 0, 1, 1, 1, 1, 0, 0, 9999, 1, 9999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 64, 1, 0, 1, 1, 0, 0, 0, 0, 1, -180, 180, 40, 100, 1, 40, 100, 0, 0, 1, -180, 180, 40, 100, 1, 40, 100, 0, 0, 0, 0);
-INSERT INTO `Controls` VALUES (NULL,'ONVIF Camera','Ffmpeg','onvif',0,0,1,1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,255,16,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,6,1,1,0,0,0,1,10,1,1,1,1,1,0,1,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO Controls VALUES (NULL,'Pelco-D','Local','PelcoD',1,1,0,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 (NULL,'Pelco-P','Local','PelcoP',1,1,0,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 (NULL,'Sony VISCA','Local','Visca',1,1,0,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 (NULL,'Axis API v2','Remote','AxisV2',0,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 (NULL,'Panasonic IP','Remote','PanasonicIP',0,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 (NULL,'Neu-Fusion NCS370','Remote','Ncs370',0,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 (NULL,'AirLink SkyIPCam 7xx','Remote','SkyIPCam7xx',0,0,1,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,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 (NULL,'Pelco-D','Ffmpeg','PelcoD',1,1,0,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 (NULL,'Pelco-P','Ffmpeg','PelcoP',1,1,0,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 (NULL,'Foscam FI8620','Ffmpeg','FI8620_Y2k',0,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);
+INSERT INTO Controls VALUES (NULL,'Foscam FI8608W','Ffmpeg','FI8608W_Y2k',1,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,1,1,128,0,0,1,0,0,0,0,1,1,128,0,0,0,0);
+INSERT INTO Controls VALUES (NULL,'Foscam FI8908W','Remote','FI8908W',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO Controls VALUES (NULL,'Foscam FI9821W','Ffmpeg','FI9821W_Y2k',1,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,100,1,1,0,0,1,0,100,0,100,1,0,100,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,100,0,100,1,0,100,1,16,0,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,1,0,4,0,0,0,0);
+INSERT INTO Controls VALUES (NULL,'Loftek Sentinel','Remote','LoftekSentinel',0,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,255,16,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,6,1,1,0,0,0,1,10,0,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO Controls VALUES (NULL,'Toshiba IK-WB11A','Remote','Toshiba_IK_WB11A',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,10,0,1,1,0,1,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO Controls VALUES (NULL,'WanscamPT','Remote','Wanscam',1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,16,0,0,0,0,0,1,16,1,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO Controls VALUES (NULL,'3S Domo N5071', 'Remote', '3S', 0, 0, 1, 0,1, 0, 1, 1, 0, 0, 9999, 0, 9999, 0, 0, 0, 1, 1, 1, 1, 0, 0, 9999, 20, 9999, 0, 0, 0, 1, 1, 1, 1, 0, 0, 9999, 1, 9999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 64, 1, 0, 1, 1, 0, 0, 0, 0, 1, -180, 180, 40, 100, 1, 40, 100, 0, 0, 1, -180, 180, 40, 100, 1, 40, 100, 0, 0, 0, 0);
+INSERT INTO Controls VALUES (NULL,'ONVIF Camera','Ffmpeg','onvif',0,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,255,16,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,6,1,1,0,0,0,1,10,0,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'Foscam 9831W','Ffmpeg','FI9831W',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,16,1,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,0,0,0,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'Foscam FI8918W','Ffmpeg','FI8918W',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,8,0,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,1,0,4,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'SunEyes SP-P1802SWPTZ','Libvlc','SPP1802SWPTZ',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,8,0,1,1,0,0,0,0,1,1,0,0,0,0,1,0,64,0,0,1,0,0,0,0,1,0,64,0,0,0,0);
@ -970,9 +820,6 @@ INSERT INTO `Controls` VALUES (NULL,'Amcrest HTTP API','Ffmpeg','Amcrest_HTTP',0
 --
 -- Add some monitor preset values
 --
-
-INSERT into MonitorPresets VALUES (NULL,'Amcrest, IP8M-T2499EW 640x480, RTP/RTSP','Ffmpeg','rtsp',0,255,'rtsp','rtpRtsp','NULL',554,'rtsp://<username>:<password>@<ip-address>/cam/realmonitor?channel=1&subtype=1',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT into MonitorPresets VALUES (NULL,'Amcrest, IP8M-T2499EW 3840x2160, RTP/RTSP','Ffmpeg','rtsp',0,255,'rtsp','rtpRtsp','NULL',554,'rtsp://<username>:<password>@<ip-address>/cam/realmonitor?channel=1&subtype=0',NULL,3840,2160,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<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',0,0,'http','simple','<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',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
@ -1086,33 +933,6 @@ INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('3 Wide', '{ "default":{
 INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('4 Wide', '{ "default":{"float":"left", "width":"24.5%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
 INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('5 Wide', '{ "default":{"float":"left", "width":"19%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );

-CREATE TABLE Sessions (
-  id char(32) not null,
-  access INT(10) UNSIGNED DEFAULT NULL,
-  data text,
-  PRIMARY KEY(id)
-) ENGINE=InnoDB;
-
-CREATE TABLE Snapshots (
-  `Id` int(10) unsigned NOT NULL auto_increment,
-  `Name`  VARCHAR(64),
-  `Description` TEXT,
-  `CreatedBy`   int(10),
-  `CreatedOn`   datetime default NULL,
-  PRIMARY KEY(Id)
-) ENGINE=InnoDB;
-
-CREATE TABLE Snapshot_Events (
-  `Id` int(10) unsigned NOT NULL auto_increment,
-  `SnapshotId` int(10) unsigned NOT NULL,
-  FOREIGN KEY (`SnapshotId`) REFERENCES `Snapshots` (`Id`) ON DELETE CASCADE,
-  `EventId`    bigint unsigned NOT NULL,
-  FOREIGN KEY (`EventId`) REFERENCES `Events` (`Id`) ON DELETE CASCADE,
-  KEY `Snapshot_Events_SnapshotId_idx` (`SnapshotId`),
-  PRIMARY KEY(Id)
-) ENGINE=InnoDB;
-
-
 -- We generally don't alter triggers, we drop and re-create them, so let's keep them in a separate file that we can just source in update scripts.
 source @PKGDATADIR@/db/triggers.sql
 --
--- a/db/zm_update-1.27.99.0.sql
+++ b/db/zm_update-1.27.99.0.sql
@ -0,0 +1,206 @@
+--
+-- This updates a 1.27.0 database to 1.27.1
+--
+
+--
+-- Add Controls definition for Wanscam
+--
+INSERT INTO Controls 
+SELECT * FROM (SELECT NULL as Id,
+                     'WanscamPT' as Name,
+                     'Remote' as Type,
+                     'Wanscam' as Protocol,
+                     1 as CanWake,
+                     1 as CanSleep,
+                     1 as CanReset,
+                     0 as CanZoom,
+                     0 as CanAutoZoom,
+                     0 as CanZoomAbs,
+                     0 as CanZoomRel,
+                     0 as CanZoomCon,
+                     0 as MinZoomRange,
+                     0 as MaxZoomRange,
+                     0 as MinZoomStep,
+                     0 as MaxZoomStep,
+                     0 as HasZoomSpeed,
+                     0 as MinZoomSpeed,
+                     0 as MaxZoomSpeed,
+                     0 as CanFocus,
+                     0 as CanAutoFocus,
+                     0 as CanFocusAbs,
+                     0 as CanFocusRel,
+                     0 as CanFocusCon,
+                     0 as MinFocusRange,
+                     0 as MaxFocusRange,
+                     0 as MinFocusStep,
+                     0 as MaxFocusStep,
+                     0 as HasFocusSpeed,
+                     0 as MinFocusSpeed,
+                     0 as MaxFocusSpeed,
+                     1 as CanIris,
+                     0 as CanAutoIris,
+                     1 as CanIrisAbs,
+                     0 as CanIrisRel,
+                     0 as CanIrisCon,
+                     0 as MinIrisRange,
+                     16 as MaxIrisRange,
+                     0 as MinIrisStep,
+                     0 as MaxIrisStep,
+                     0 as HasIrisSpeed,
+                     0 as MinIrisSpeed,
+                     0 as MaxIrisSpeed,
+                     0 as CanGain,
+                     0 as CanAutoGain,
+                     0 as CanGainAbs,
+                     0 as CanGainRel,
+                     0 as CanGainCon,
+                     0 as MinGainRange,
+                     0 as MaxGainRange,
+                     0 as MinGainStep,
+                     0 as MaxGainStep,
+                     0 as HasGainSpeed,
+                     0 as MinGainSpeed,
+                     0 as MaxGainSpeed,
+                     1 as CanWhite,
+                     0 as CanAutoWhite,
+                     1 as CanWhiteAbs,
+                     0 as CanWhiteRel,
+                     0 as CanWhiteCon,
+                     0 as MinWhiteRange,
+                     16 as MaxWhiteRange,
+                     0 as MinWhiteStep,
+                     0 as MaxWhiteStep,
+                     0 as HasWhiteSpeed,
+                     0 as MinWhiteSpeed,
+                     0 as MaxWhiteSpeed,
+                     1 as HasPresets,
+                     16 as NumPresets,
+                     1 as HasHomePreset,
+                     1 as CanSetPresets,
+                     1 as CanMove,
+                     1 as CanMoveDiag,
+                     0 as CanMoveMap,
+                     0 as CanMoveAbs,
+                     0 as CanMoveRel,
+                     1 as CanMoveCon,
+                     1 as CanPan,
+                     0 as MinPanRange,
+                     0 as MaxPanRange,
+                     0 as MinPanStep,
+                     0 as MaxPanStep,
+                     0 as HasPanSpeed,
+                     0 as MinPanSpeed,
+                     0 as MaxPanSpeed,
+                     0 as HasTurboPan,
+                     0 as TurboPanSpeed,
+                     1 as CanTilt,
+                     0 as MinTiltRange,
+                     0 as MaxTiltRange,
+                     0 as MinTiltStep,
+                     0 as MaxTiltStep,
+                     0 as HasTiltSpeed,
+                     0 as MinTiltSpeed,
+                     0 as MaxTiltSpeed,
+                     0 as HasTurboTilt,
+                     0 as TurboTiltSpeed,
+                     0 as CanAutoScan,
+                     0 as NumScanPaths) AS tmp
+WHERE NOT EXISTS (
+    SELECT Name FROM Controls WHERE name = 'WanscamPT'
+) LIMIT 1;
+
+-- Add extend alarm frame count to zone definition and Presets
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Zones'
+	AND table_schema = DATABASE()
+	AND column_name = 'ExtendAlarmFrames'
+	) > 0,
+"SELECT 'Column ExtendAlarmFrames exists in Zones'",
+"ALTER TABLE `Zones` ADD `ExtendAlarmFrames` smallint(5) unsigned not null default 0 AFTER `OverloadFrames`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'ZonePresets'
+	AND table_schema = DATABASE()
+	AND column_name = 'ExtendAlarmFrames'
+	) > 0,
+"SELECT 'Column ExtendAlarmFrames exists in ZonePresets'",
+"ALTER TABLE `ZonePresets` ADD `ExtendAlarmFrames` smallint(5) unsigned not null default 0 AFTER `OverloadFrames`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+--
+-- Add MotionSkipFrame field for controlling how many frames motion detection should skip.
+--
+
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Monitors'
+	AND table_schema = DATABASE()
+	AND column_name = 'MotionFrameSkip'
+	) > 0,
+"SELECT 1",
+"ALTER TABLE `Monitors` ADD `MotionFrameSkip` smallint(5) unsigned NOT NULL default '0' AFTER `FrameSkip`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+--
+-- Add Monitor Options field; used for specifying Ffmpeg AVoptions like rtsp_transport http or libVLC options
+--
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Monitors'
+	AND table_schema = DATABASE()
+	AND column_name = 'Options'
+	) > 0,
+"SELECT 'Column Options already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `Options` varchar(255) not null default '' AFTER `Path`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+--
+-- Add V4LMultiBuffer and V4LCapturesPerFrame to Monitor
+--
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*)
+    FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE table_name = 'Monitors'
+    AND table_schema = DATABASE()
+    AND column_name = 'V4LMultiBuffer'
+    ) > 0,
+"SELECT 'Column V4LMultiBuffer exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `V4LMultiBuffer` tinyint(1) unsigned AFTER `Format`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*)
+    FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE table_name = 'Monitors'
+    AND table_schema = DATABASE()
+    AND column_name = 'V4LCapturesPerFrame'
+    ) > 0,
+"SELECT 'Column V4LCapturesPerFrame exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `V4LCapturesPerFrame` tinyint(3) unsigned AFTER `V4LMultiBuffer`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
--- a/db/zm_update-1.28.99.sql
+++ b/db/zm_update-1.28.99.sql
@ -7,146 +7,318 @@
 -- Add Controls definition for FI9831W
 -- Add Controls definition for FI8918W
 --
-SET @s = (SELECT IF( (SELECT COUNT(*) FROM Controls WHERE Name='ONVIF Camera') > 0,
-"SELECT 'ONVIF Camera Control already exists in Controls'",
-"INSERT INTO Controls (
-  Name,Type,Protocol,
-  CanWake,CanSleep,CanReset,
-  CanZoom,CanAutoZoom, CanZoomAbs,CanZoomRel,CanZoomCon,
-  MinZoomRange, MaxZoomRange, MinZoomStep,MaxZoomStep,HasZoomSpeed,MinZoomSpeed,MaxZoomSpeed,
-  CanFocus,CanAutoFocus,CanFocusAbs,CanFocusRel,CanFocusCon,
-  MinFocusRange,MaxFocusRange,MinFocusStep,MaxFocusStep,HasFocusSpeed,MinFocusSpeed,MaxFocusSpeed,
-  CanIris,CanAutoIris,CanIrisAbs,CanIrisRel,CanIrisCon,
-  MinIrisRange, MaxIrisRange, MinIrisStep, MaxIrisStep,HasIrisSpeed,MinIrisSpeed,MaxIrisSpeed,
-  CanGain,CanAutoGain, CanGainAbs,CanGainRel, CanGainCon,
-  MinGainRange,MaxGainRange,  MinGainStep, MaxGainStep, HasGainSpeed, MinGainSpeed,  MaxGainSpeed,
-  CanWhite, CanAutoWhite, CanWhiteAbs, CanWhiteRel, CanWhiteCon,
-  MinWhiteRange, MaxWhiteRange, MinWhiteStep, MaxWhiteStep, HasWhiteSpeed,MinWhiteSpeed,MaxWhiteSpeed,
-  HasPresets,  NumPresets, HasHomePreset, CanSetPresets,
-  CanMove,  CanMoveDiag, CanMoveMap, CanMoveAbs, CanMoveRel, CanMoveCon,
-  CanPan, MinPanRange, MaxPanRange, MinPanStep, MaxPanStep,
-  HasPanSpeed,MinPanSpeed,MaxPanSpeed,HasTurboPan,TurboPanSpeed,CanTilt, MinTiltRange,MaxTiltRange, MinTiltStep,MaxTiltStep,
-  HasTiltSpeed,MinTiltSpeed,MaxTiltSpeed, HasTurboTilt,TurboTiltSpeed,
-  CanAutoScan,NumScanPaths)
-  VALUES
-  ('ONVIF Camera', 'Ffmpeg', 'onvif',
-    0, /* as CanWake, */ 0, /* as CanSleep, */ 1, /* as CanReset, */
+INSERT INTO Controls 
+SELECT * FROM (SELECT NULL as Id,
+                     'ONVIF Camera' as Name,
+                     'Ffmpeg' as Type,
+                     'onvif' as Protocol,
+                     0 as CanWake,
+                     0 as CanSleep,
+                     1 as CanReset,
+                     1 as CanZoom,
+                     0 as CanAutoZoom,
+                     0 as CanZoomAbs,
+                     0 as CanZoomRel,
+                     1 as CanZoomCon,
+                     0 as MinZoomRange,
+                     0 as MaxZoomRange,
+                     0 as MinZoomStep,
+                     0 as MaxZoomStep,
+                     0 as HasZoomSpeed,
+                     0 as MinZoomSpeed,
+                     0 as MaxZoomSpeed,
+                     0 as CanFocus,
+                     0 as CanAutoFocus,
+                     0 as CanFocusAbs,
+                     0 as CanFocusRel,
+                     0 as CanFocusCon,
+                     0 as MinFocusRange,
+                     0 as MaxFocusRange,
+                     0 as MinFocusStep,
+                     0 as MaxFocusStep,
+                     0 as HasFocusSpeed,
+                     0 as MinFocusSpeed,
+                     0 as MaxFocusSpeed,
+                     1 as CanIris,
+                     0 as CanAutoIris,
+                     1 as CanIrisAbs,
+                     0 as CanIrisRel,
+                     0 as CanIrisCon,
+                     0 as MinIrisRange,
+                     255 as MaxIrisRange,
+                     16 as MinIrisStep,
+                     16 as MaxIrisStep,
+                     0 as HasIrisSpeed,
+                     0 as MinIrisSpeed,
+                     0 as MaxIrisSpeed,
+                     0 as CanGain,
+                     0 as CanAutoGain,
+                     0 as CanGainAbs,
+                     0 as CanGainRel,
+                     0 as CanGainCon,
+                     0 as MinGainRange,
+                     0 as MaxGainRange,
+                     0 as MinGainStep,
+                     0 as MaxGainStep,
+                     0 as HasGainSpeed,
+                     0 as MinGainSpeed,
+                     0 as MaxGainSpeed,
+                     1 as CanWhite,
+                     0 as CanAutoWhite,
+                     1 as CanWhiteAbs,
+                     0 as CanWhiteRel,
+                     0 as CanWhiteCon,
+                     0 as MinWhiteRange,
+                     6 as MaxWhiteRange,
+                     1 as MinWhiteStep,
+                     1 as MaxWhiteStep,
+                     0 as HasWhiteSpeed,
+                     0 as MinWhiteSpeed,
+                     0 as MaxWhiteSpeed,
+                     1 as HasPresets,
+                     10 as NumPresets,
+                     0 as HasHomePreset,
+                     1 as CanSetPresets,
+                     1 as CanMove,
+                     1 as CanMoveDiag,
+                     0 as CanMoveMap,
+                     0 as CanMoveAbs,
+                     0 as CanMoveRel,
+                     1 as CanMoveCon,
+                     1 as CanPan,
+                     0 as MinPanRange,
+                     0 as MaxPanRange,
+                     0 as MinPanStep,
+                     0 as MaxPanStep,
+                     0 as HasPanSpeed,
+                     0 as MinPanSpeed,
+                     0 as MaxPanSpeed,
+                     0 as HasTurboPan,
+                     0 as TurboPanSpeed,
+                     1 as CanTilt,
+                     0 as MinTiltRange,
+                     0 as MaxTiltRange,
+                     0 as MinTiltStep,
+                     0 as MaxTiltStep,
+                     0 as HasTiltSpeed,
+                     0 as MinTiltSpeed,
+                     0 as MaxTiltSpeed,
+                     0 as HasTurboTilt,
+                     0 as TurboTiltSpeed,
+                     0 as CanAutoScan,
+                     0 as NumScanPaths) AS tmp
+WHERE NOT EXISTS (
+    SELECT Name FROM Controls WHERE name = 'ONVIF Camera'
+) LIMIT 1;

-    1, /* as CanZoom, */ 0, /* as CanAutoZoom, */ 0, /* as CanZoomAbs, */ 0, /* as CanZoomRel, */ 1, /* as CanZoomCon, */
-    0, /* as MinZoomRange, */ 0, /* as MaxZoomRange, */ 0, /* as MinZoomStep, */ 0, /* as MaxZoomStep, */ 0, /* as HasZoomSpeed, */ 0, /* as MinZoomSpeed, */ 0, /* as MaxZoomSpeed, */
-    0, /* as CanFocus, */ 0, /* as CanAutoFocus, */ 0, /* as CanFocusAbs, */ 0, /* as CanFocusRel, */ 0, /* as CanFocusCon, */
-    0, /* as MinFocusRange, */ 0, /* as MaxFocusRange, */ 0, /* as MinFocusStep, */ 0, /* as MaxFocusStep, */ 0, /* as HasFocusSpeed, */ 0, /* as MinFocusSpeed, */ 0, /* as MaxFocusSpeed, */
-    1, /* as CanIris, */ 0, /* as CanAutoIris, */ 1, /* as CanIrisAbs, */ 0, /* as CanIrisRel, */ 0, /* as CanIrisCon, */
-    0, /* as MinIrisRange, */ 255, /* as MaxIrisRange, */ 16, /* as MinIrisStep, */ 16, /* as MaxIrisStep, */ 0, /* as HasIrisSpeed, */ 0, /* as MinIrisSpeed, */ 0, /* as MaxIrisSpeed, */
-    0, /* as CanGain, */ 0, /* as CanAutoGain, */ 0, /* as CanGainAbs, */ 0, /* as CanGainRel, */ 0, /* as CanGainCon, */
-    0, /* as MinGainRange, */ 0, /* as MaxGainRange, */ 0, /* as MinGainStep, */ 0, /* as MaxGainStep, */ 0, /* as HasGainSpeed, */ 0, /* as MinGainSpeed, */ 0, /* as MaxGainSpeed, */
-    1, /* as CanWhite, */ 0, /* as CanAutoWhite, */ 1, /* as CanWhiteAbs, */ 0, /* as CanWhiteRel, */ 0, /* as CanWhiteCon, */
-    0, /* as MinWhiteRange, */ 6, /* as MaxWhiteRange, */ 1, /* as MinWhiteStep, */ 1, /* as MaxWhiteStep, */ 0, /* as HasWhiteSpeed, */ 0, /* as MinWhiteSpeed, */ 0, /* as MaxWhiteSpeed, */
-    1, /* as HasPresets, */ 10, /* as NumPresets, */ 0, /* as HasHomePreset, */ 1, /* as CanSetPresets, */
-    1, /* as CanMove, */ 1, /* as CanMoveDiag, */ 0, /* as CanMoveMap, */ 0, /* as CanMoveAbs, */ 0, /* as CanMoveRel, */ 1, /* as CanMoveCon, */
-    1, /* as CanPan, */ 0, /* as MinPanRange, */ 0, /* as MaxPanRange, */ 0, /* as MinPanStep, */ 0, /* as MaxPanStep, */
-    0, /* as HasPanSpeed, */ 0, /* as MinPanSpeed, */ 0, /* as MaxPanSpeed, */ 0, /* as HasTurboPan, */ 0, /* as TurboPanSpeed, */
-    1, /* as CanTilt, */ 0, /* as MinTiltRange, */ 0, /* as MaxTiltRange, */ 0, /* as MinTiltStep, */ 0, /* as MaxTiltStep, */
-    0, /* as HasTiltSpeed, */ 0, /* as MinTiltSpeed, */ 0, /* as MaxTiltSpeed, */ 0, /* as HasTurboTilt, */ 0, /* as TurboTiltSpeed, */
-    0, /* as CanAutoScan, */
-    0 /* as NumScanPaths */
-  )"
-));
+INSERT INTO Controls 
+SELECT * FROM (SELECT NULL as Id,
+                     'Foscam 9831W' as Name,
+                     'Ffmpeg' as Type,
+                     'FI9831W' as Protocol,
+                     0 as CanWake,
+                     0 as CanSleep,
+                     1 as CanReset,
+                     0 as CanZoom,
+                     0 as CanAutoZoom,
+                     0 as CanZoomAbs,
+                     0 as CanZoomRel,
+                     0 as CanZoomCon,
+                     0 as MinZoomRange,
+                     0 as MaxZoomRange,
+                     0 as MinZoomStep,
+                     0 as MaxZoomStep,
+                     0 as HasZoomSpeed,
+                     0 as MinZoomSpeed,
+                     0 as MaxZoomSpeed,
+                     0 as CanFocus,
+                     0 as CanAutoFocus,
+                     0 as CanFocusAbs,
+                     0 as CanFocusRel,
+                     0 as CanFocusCon,
+                     0 as MinFocusRange,
+                     0 as MaxFocusRange,
+                     0 as MinFocusStep,
+                     0 as MaxFocusStep,
+                     0 as HasFocusSpeed,
+                     0 as MinFocusSpeed,
+                     0 as MaxFocusSpeed,
+                     0 as CanIris,
+                     0 as CanAutoIris,
+                     0 as CanIrisAbs,
+                     0 as CanIrisRel,
+                     0 as CanIrisCon,
+                     0 as MinIrisRange,
+                     0 as MaxIrisRange,
+                     0 as MinIrisStep,
+                     0 as MaxIrisStep,
+                     0 as HasIrisSpeed,
+                     0 as MinIrisSpeed,
+                     0 as MaxIrisSpeed,
+                     0 as CanGain,
+                     0 as CanAutoGain,
+                     0 as CanGainAbs,
+                     0 as CanGainRel,
+                     0 as CanGainCon,
+                     0 as MinGainRange,
+                     0 as MaxGainRange,
+                     0 as MinGainStep,
+                     0 as MaxGainStep,
+                     0 as HasGainSpeed,
+                     0 as MinGainSpeed,
+                     0 as MaxGainSpeed,
+                     0 as CanWhite,
+                     0 as CanAutoWhite,
+                     0 as CanWhiteAbs,
+                     0 as CanWhiteRel,
+                     0 as CanWhiteCon,
+                     0 as MinWhiteRange,
+                     0 as MaxWhiteRange,
+                     0 as MinWhiteStep,
+                     0 as MaxWhiteStep,
+                     0 as HasWhiteSpeed,
+                     0 as MinWhiteSpeed,
+                     0 as MaxWhiteSpeed,
+                     0 as HasPresets,
+                     16 as NumPresets,
+                     1 as HasHomePreset,
+                     1 as CanSetPresets,
+                     1 as CanMove,
+                     1 as CanMoveDiag,
+                     0 as CanMoveMap,
+                     0 as CanMoveAbs,
+                     0 as CanMoveRel,
+                     1 as CanMoveCon,
+                     1 as CanPan,
+                     0 as MinPanRange,
+                     360 as MaxPanRange,
+                     0 as MinPanStep,
+                     360 as MaxPanStep,
+                     1 as HasPanSpeed,
+                     0 as MinPanSpeed,
+                     4 as MaxPanSpeed,
+                     0 as HasTurboPan,
+                     0 as TurboPanSpeed,
+                     1 as CanTilt,
+                     0 as MinTiltRange,
+                     90 as MaxTiltRange,
+                     0 as MinTiltStep,
+                     90 as MaxTiltStep,
+                     0 as HasTiltSpeed,
+                     0 as MinTiltSpeed,
+                     0 as MaxTiltSpeed,
+                     0 as HasTurboTilt,
+                     0 as TurboTiltSpeed,
+                     0 as CanAutoScan,
+                     0 as NumScanPaths) AS tmp
+WHERE NOT EXISTS (
+    SELECT Name FROM Controls WHERE name = 'Foscam 9831W'
+) LIMIT 1;

-PREPARE stmt FROM @s;
-EXECUTE stmt;
+INSERT INTO Controls 
+SELECT * FROM (SELECT NULL as Id,
+                     'Foscam FI8918W' as Name,
+                     'Ffmpeg' as Type,
+                     'FI8918W' as Protocol,
+                     0 as CanWake,
+                     0 as CanSleep,
+                     1 as CanReset,
+                     0 as CanZoom,
+                     0 as CanAutoZoom,
+                     0 as CanZoomAbs,
+                     0 as CanZoomRel,
+                     0 as CanZoomCon,
+                     0 as MinZoomRange,
+                     0 as MaxZoomRange,
+                     0 as MinZoomStep,
+                     0 as MaxZoomStep,
+                     0 as HasZoomSpeed,
+                     0 as MinZoomSpeed,
+                     0 as MaxZoomSpeed,
+                     0 as CanFocus,
+                     0 as CanAutoFocus,
+                     0 as CanFocusAbs,
+                     0 as CanFocusRel,
+                     0 as CanFocusCon,
+                     0 as MinFocusRange,
+                     0 as MaxFocusRange,
+                     0 as MinFocusStep,
+                     0 as MaxFocusStep,
+                     0 as HasFocusSpeed,
+                     0 as MinFocusSpeed,
+                     0 as MaxFocusSpeed,
+                     0 as CanIris,
+                     0 as CanAutoIris,
+                     0 as CanIrisAbs,
+                     0 as CanIrisRel,
+                     0 as CanIrisCon,
+                     0 as MinIrisRange,
+                     0 as MaxIrisRange,
+                     0 as MinIrisStep,
+                     0 as MaxIrisStep,
+                     0 as HasIrisSpeed,
+                     0 as MinIrisSpeed,
+                     0 as MaxIrisSpeed,
+                     0 as CanGain,
+                     0 as CanAutoGain,
+                     0 as CanGainAbs,
+                     0 as CanGainRel,
+                     0 as CanGainCon,
+                     0 as MinGainRange,
+                     0 as MaxGainRange,
+                     0 as MinGainStep,
+                     0 as MaxGainStep,
+                     0 as HasGainSpeed,
+                     0 as MinGainSpeed,
+                     0 as MaxGainSpeed,
+                     0 as CanWhite,
+                     0 as CanAutoWhite,
+                     0 as CanWhiteAbs,
+                     0 as CanWhiteRel,
+                     0 as CanWhiteCon,
+                     0 as MinWhiteRange,
+                     0 as MaxWhiteRange,
+                     0 as MinWhiteStep,
+                     0 as MaxWhiteStep,
+                     0 as HasWhiteSpeed,
+                     0 as MinWhiteSpeed,
+                     0 as MaxWhiteSpeed,
+                     0 as HasPresets,
+                     8 as NumPresets,
+                     0 as HasHomePreset,
+                     1 as CanSetPresets,
+                     1 as CanMove,
+                     1 as CanMoveDiag,
+                     0 as CanMoveMap,
+                     0 as CanMoveAbs,
+                     0 as CanMoveRel,
+                     1 as CanMoveCon,
+                     1 as CanPan,
+                     0 as MinPanRange,
+                     360 as MaxPanRange,
+                     0 as MinPanStep,
+                     360 as MaxPanStep,
+                     1 as HasPanSpeed,
+                     0 as MinPanSpeed,
+                     4 as MaxPanSpeed,
+                     0 as HasTurboPan,
+                     0 as TurboPanSpeed,
+                     1 as CanTilt,
+                     0 as MinTiltRange,
+                     90 as MaxTiltRange,
+                     0 as MinTiltStep,
+                     90 as MaxTiltStep,
+                     0 as HasTiltSpeed,
+                     0 as MinTiltSpeed,
+                     0 as MaxTiltSpeed,
+                     0 as HasTurboTilt,
+                     0 as TurboTiltSpeed,
+                     0 as CanAutoScan,
+                     0 as NumScanPaths) AS tmp
+WHERE NOT EXISTS (
+    SELECT Name FROM Controls WHERE name = 'Foscam FI8918W'
+) LIMIT 1;

-SET @s = (SELECT IF( (SELECT COUNT(*) FROM Controls WHERE Name='Foscam 9831W') > 0,
-"SELECT 'Foscam 9831W Camera Control already exists in Controls'",
-"INSERT INTO Controls (
-  Name,Type,Protocol,
-  CanWake,CanSleep,CanReset,
-  CanZoom,CanAutoZoom, CanZoomAbs,CanZoomRel,CanZoomCon,
-  MinZoomRange, MaxZoomRange, MinZoomStep,MaxZoomStep,HasZoomSpeed,MinZoomSpeed,MaxZoomSpeed,
-  CanFocus,CanAutoFocus,CanFocusAbs,CanFocusRel,CanFocusCon,MinFocusRange,MaxFocusRange,MinFocusStep,MaxFocusStep,HasFocusSpeed,MinFocusSpeed,MaxFocusSpeed,
-  CanIris,CanAutoIris,CanIrisAbs,CanIrisRel,CanIrisCon,MinIrisRange, MaxIrisRange, MinIrisStep, MaxIrisStep,HasIrisSpeed,MinIrisSpeed,MaxIrisSpeed,
-  CanGain,CanAutoGain, CanGainAbs,CanGainRel, CanGainCon,
-  MinGainRange,MaxGainRange,  MinGainStep, MaxGainStep, HasGainSpeed, MinGainSpeed,  MaxGainSpeed,
-  CanWhite, CanAutoWhite, CanWhiteAbs, CanWhiteRel, CanWhiteCon,
-  MinWhiteRange, MaxWhiteRange, MinWhiteStep, MaxWhiteStep, HasWhiteSpeed,MinWhiteSpeed,MaxWhiteSpeed,
-  HasPresets,  NumPresets, HasHomePreset, CanSetPresets,
-  CanMove,  CanMoveDiag, CanMoveMap, CanMoveAbs, CanMoveRel, CanMoveCon,
-  CanPan, MinPanRange, MaxPanRange, MinPanStep, MaxPanStep,
-  HasPanSpeed,MinPanSpeed,MaxPanSpeed,HasTurboPan,TurboPanSpeed,CanTilt, MinTiltRange,MaxTiltRange, MinTiltStep,MaxTiltStep,
-  HasTiltSpeed,MinTiltSpeed,MaxTiltSpeed, HasTurboTilt,TurboTiltSpeed,
-  CanAutoScan,NumScanPaths)
-  VALUES
-  ('Foscam 9831W', 'Ffmpeg', 'FI9831W',
-    0, /* as CanWake, */ 0, /* as CanSleep, */ 1, /* as CanReset, */
-    0, /* as CanZoom, */ 0, /* as CanAutoZoom, */ 0, /* as CanZoomAbs, */ 0, /* as CanZoomRel, */ 0, /* as CanZoomCon, */
-    0, /* as MinZoomRange, */ 0, /* as MaxZoomRange, */ 0, /* as MinZoomStep, */ 0, /* as MaxZoomStep, */ 0, /* as HasZoomSpeed, */ 0, /* as MinZoomSpeed, */ 0, /* as MaxZoomSpeed, */
-    0, /* as CanFocus, */ 0, /* as CanAutoFocus, */ 0, /* as CanFocusAbs, */ 0, /* as CanFocusRel, */ 0, /* as CanFocusCon, */
-    0, /* as MinFocusRange, */ 0, /* as MaxFocusRange, */ 0, /* as MinFocusStep, */ 0, /* as MaxFocusStep, */ 0, /* as HasFocusSpeed, */ 0, /* as MinFocusSpeed, */ 0, /* as MaxFocusSpeed, */
-    0, /* as CanIris, */ 0, /* as CanAutoIris, */ 0, /* as CanIrisAbs, */ 0, /* as CanIrisRel, */ 0, /* as CanIrisCon, */
-    0, /* as MinIrisRange, */ 0, /* as MaxIrisRange, */ 0, /* as MinIrisStep, */ 0, /* as MaxIrisStep, */ 0, /* as HasIrisSpeed, */ 0, /* as MinIrisSpeed, */ 0, /* as MaxIrisSpeed, */
-    0, /* as CanGain, */ 0, /* as CanAutoGain, */ 0, /* as CanGainAbs, */ 0, /* as CanGainRel, */ 0, /* as CanGainCon, */
-    0, /* as MinGainRange, */ 0, /* as MaxGainRange, */ 0, /* as MinGainStep, */ 0, /* as MaxGainStep, */ 0, /* as HasGainSpeed, */ 0, /* as MinGainSpeed, */ 0, /* as MaxGainSpeed, */
-    0, /* as CanWhite, */ 0, /* as CanAutoWhite, */ 0, /* as CanWhiteAbs, */ 0, /* as CanWhiteRel, */ 0, /* as CanWhiteCon, */
-    0, /* as MinWhiteRange, */ 0, /* as MaxWhiteRange, */ 0, /* as MinWhiteStep, */ 0, /* as MaxWhiteStep, */ 0, /* as HasWhiteSpeed, */ 0, /* as MinWhiteSpeed, */ 0, /* as MaxWhiteSpeed, */
-    0, /* as HasPresets, */ 16, /* as NumPresets, */ 1, /* as HasHomePreset, */ 1, /* as CanSetPresets, */
-    1, /* as CanMove, */ 1, /* as CanMoveDiag, */ 0, /* as CanMoveMap, */ 0, /* as CanMoveAbs, */ 0, /* as CanMoveRel, */ 1, /* as CanMoveCon, */
-    1, /* as CanPan, */ 0, /* as MinPanRange, */ 360, /* as MaxPanRange, */ 0, /* as MinPanStep, */ 360, /* as MaxPanStep, */
-    1, /* as HasPanSpeed, */ 0, /* as MinPanSpeed, */ 4, /* as MaxPanSpeed, */ 0, /* as HasTurboPan, */ 0, /* as TurboPanSpeed, */
-    1, /* as CanTilt, */ 0, /* as MinTiltRange, */ 90, /* as MaxTiltRange, */ 0, /* as MinTiltStep, */ 90, /* as MaxTiltStep, */
-    0, /* as HasTiltSpeed, */ 0, /* as MinTiltSpeed, */ 0, /* as MaxTiltSpeed, */ 0, /* as HasTurboTilt, */ 0, /* as TurboTiltSpeed, */
-    0, /* as CanAutoScan, */
-    0 /* as NumScanPaths */
-  )"
-  ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF( (SELECT COUNT(*) FROM Controls WHERE Name='Foscam FI8918W') > 0,
-"SELECT 'Foscam 8918W Camera Control already exists in Controls'",
-"INSERT INTO Controls (
-  Name,Type,Protocol,
-  CanWake,CanSleep,CanReset,
-  CanZoom,CanAutoZoom, CanZoomAbs,CanZoomRel,CanZoomCon,
-  MinZoomRange, MaxZoomRange, MinZoomStep,MaxZoomStep,HasZoomSpeed,MinZoomSpeed,MaxZoomSpeed,
-  CanFocus,CanAutoFocus,CanFocusAbs,CanFocusRel,CanFocusCon,MinFocusRange,MaxFocusRange,MinFocusStep,MaxFocusStep,HasFocusSpeed,MinFocusSpeed,MaxFocusSpeed,
-  CanIris,CanAutoIris,CanIrisAbs,CanIrisRel,CanIrisCon,MinIrisRange, MaxIrisRange, MinIrisStep, MaxIrisStep,HasIrisSpeed,MinIrisSpeed,MaxIrisSpeed,
-  CanGain,CanAutoGain, CanGainAbs,CanGainRel, CanGainCon,
-  MinGainRange,MaxGainRange,  MinGainStep, MaxGainStep, HasGainSpeed, MinGainSpeed,  MaxGainSpeed,
-  CanWhite, CanAutoWhite, CanWhiteAbs, CanWhiteRel, CanWhiteCon,
-  MinWhiteRange, MaxWhiteRange, MinWhiteStep, MaxWhiteStep, HasWhiteSpeed,MinWhiteSpeed,MaxWhiteSpeed,
-  HasPresets,  NumPresets, HasHomePreset, CanSetPresets,
-  CanMove,  CanMoveDiag, CanMoveMap, CanMoveAbs, CanMoveRel, CanMoveCon,
-  CanPan, MinPanRange, MaxPanRange, MinPanStep, MaxPanStep,
-  HasPanSpeed,MinPanSpeed,MaxPanSpeed,HasTurboPan,TurboPanSpeed,CanTilt, MinTiltRange,MaxTiltRange, MinTiltStep,MaxTiltStep,
-  HasTiltSpeed,MinTiltSpeed,MaxTiltSpeed, HasTurboTilt,TurboTiltSpeed,
-  CanAutoScan,NumScanPaths)
-  VALUES
-  ('Foscam FI8918W', 'Ffmpeg', 'FI8918W',
-    0, /* as CanWake, */ 0, /* as CanSleep, */ 1, /* as CanReset, */
-    0, /* as CanZoom, */ 0, /* as CanAutoZoom, */ 0, /* as CanZoomAbs, */ 0, /* as CanZoomRel, */ 0, /* as CanZoomCon, */
-    0, /* as MinZoomRange, */ 0, /* as MaxZoomRange, */ 0, /* as MinZoomStep, */ 0, /* as MaxZoomStep, */ 0, /* as HasZoomSpeed, */ 0, /* as MinZoomSpeed, */ 0, /* as MaxZoomSpeed, */
-    0, /* as CanFocus, */ 0, /* as CanAutoFocus, */ 0, /* as CanFocusAbs, */ 0, /* as CanFocusRel, */ 0, /* as CanFocusCon, */
-    0, /* as MinFocusRange, */ 0, /* as MaxFocusRange, */ 0, /* as MinFocusStep, */ 0, /* as MaxFocusStep, */ 0, /* as HasFocusSpeed, */ 0, /* as MinFocusSpeed, */ 0, /* as MaxFocusSpeed, */
-    0, /* as CanIris, */ 0, /* as CanAutoIris, */ 0, /* as CanIrisAbs, */ 0, /* as CanIrisRel, */ 0, /* as CanIrisCon, */
-    0, /* as MinIrisRange, */ 0, /* as MaxIrisRange, */ 0, /* as MinIrisStep, */ 0, /* as MaxIrisStep, */ 0, /* as HasIrisSpeed, */ 0, /* as MinIrisSpeed, */ 0, /* as MaxIrisSpeed, */
-    0, /* as CanGain, */ 0, /* as CanAutoGain, */ 0, /* as CanGainAbs, */ 0, /* as CanGainRel, */ 0, /* as CanGainCon, */
-    0, /* as MinGainRange, */ 0, /* as MaxGainRange, */ 0, /* as MinGainStep, */ 0, /* as MaxGainStep, */ 0, /* as HasGainSpeed, */ 0, /* as MinGainSpeed, */ 0, /* as MaxGainSpeed, */
-    0, /* as CanWhite, */ 0, /* as CanAutoWhite, */ 0, /* as CanWhiteAbs, */ 0, /* as CanWhiteRel, */ 0, /* as CanWhiteCon, */
-    0, /* as MinWhiteRange, */ 0, /* as MaxWhiteRange, */ 0, /* as MinWhiteStep, */ 0, /* as MaxWhiteStep, */ 0, /* as HasWhiteSpeed, */ 0, /* as MinWhiteSpeed, */ 0, /* as MaxWhiteSpeed, */
-    0, /* as HasPresets, */ 8, /* as NumPresets, */ 0, /* as HasHomePreset, */ 1, /* as CanSetPresets, */
-    1, /* as CanMove, */ 1, /* as CanMoveDiag, */ 0, /* as CanMoveMap, */ 0, /* as CanMoveAbs, */ 0, /* as CanMoveRel, */ 1, /* as CanMoveCon, */
-    1, /* as CanPan, */ 0, /* as MinPanRange, */ 360, /* as MaxPanRange, */ 0, /* as MinPanStep, */ 360, /* as MaxPanStep, */
-    1, /* as HasPanSpeed, */ 0, /* as MinPanSpeed, */ 4, /* as MaxPanSpeed, */ 0, /* as HasTurboPan, */ 0, /* as TurboPanSpeed, */
-    1, /* as CanTilt, */ 0, /* as MinTiltRange, */ 90, /* as MaxTiltRange, */ 0, /* as MinTiltStep, */ 90, /* as MaxTiltStep, */
-    0, /* as HasTiltSpeed, */ 0, /* as MinTiltSpeed, */ 0, /* as MaxTiltSpeed, */ 0, /* as HasTurboTilt, */ 0, /* as TurboTiltSpeed, */
-    0, /* as CanAutoScan, */
-    0 /* as NumScanPaths */
-  )"
-  ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
 --
 -- Hide USE_DEEP_STORAGE from user to prevent accidental event loss
 --
--- a/db/zm_update-1.31.38.sql
+++ b/db/zm_update-1.31.38.sql
@ -176,10 +176,8 @@ BEGIN
          WHERE Id=OLD.MonitorId;
      END IF;
    END IF;
-  ELSE
-    IF ( NEW.Archived AND diff ) THEN
-      UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-    END IF;
+  ELSEIF ( NEW.Archived AND diff ) THEN
+    UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
  END IF;

  IF ( diff ) THEN
@ -187,6 +185,7 @@ BEGIN
  END IF;

 END;
+
 //

 delimiter ;
--- a/db/zm_update-1.31.40.sql
+++ b/db/zm_update-1.31.40.sql
@ -10,18 +10,3 @@ SET @s = (SELECT IF(

 PREPARE stmt FROM @s;
 EXECUTE stmt;
-
-
-ALTER TABLE `Monitors` MODIFY `OutputCodec`     INT UNSIGNED default 0;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'Encoder'
-    ) > 0,
-"SELECT 'Column Encoder already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `Encoder`     enum('auto','h264','h264_omx','mjpeg','mpeg1','mpeg2')  AFTER `OutputCodec`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
--- a/db/zm_update-1.35.0.sql
+++ b/db/zm_update-1.35.0.sql
@ -1,41 +0,0 @@
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Filters'
-     AND column_name = 'EmailTo'
-    ) > 0,
-"SELECT 'Column EmailTo already exists in Filters'",
-"ALTER TABLE `Filters` ADD `EmailTo` TEXT AFTER `AutoEmail`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-UPDATE Filters SET EmailTo=(SELECT Value FROM Config WHERE Name='ZM_EMAIL_ADDRESS') WHERE AutoEmail=1;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Filters'
-     AND column_name = 'EmailSubject'
-    ) > 0,
-"SELECT 'Column EmailSubject already exists in Filters'",
-"ALTER TABLE `Filters` ADD `EmailSubject` TEXT AFTER `EmailTo`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-UPDATE Filters SET EmailSubject=(SELECT Value FROM Config WHERE Name='ZM_EMAIL_SUBJECT') WHERE AutoEmail=1;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Filters'
-     AND column_name = 'EmailBody'
-    ) > 0,
-"SELECT 'Column EmailBody already exists in Filters'",
-"ALTER TABLE `Filters` ADD `EmailBody` TEXT AFTER `EmailSubject`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-UPDATE Filters SET EmailBody=(SELECT Value FROM Config WHERE Name='ZM_EMAIL_BODY') WHERE AutoEmail=1;
--- a/db/zm_update-1.35.1.sql
+++ b/db/zm_update-1.35.1.sql
@ -1,12 +0,0 @@
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Storage'
-     AND column_name = 'Enabled'
-    ) > 0,
-"SELECT 'Column Enabled already exists in Storage'",
-"ALTER TABLE `Storage` ADD `Enabled` BOOLEAN NOT NULL default true AFTER `DoDelete`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
--- a/db/zm_update-1.35.10.sql
+++ b/db/zm_update-1.35.10.sql
@ -1,15 +0,0 @@
--
-- Add AutoUnarchive action to Filters
--
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Filters'
-     AND column_name = 'AutoUnarchive'
-    ) > 0,
-"SELECT 'Column AutoUunarchive already exists in Filters'",
-"ALTER TABLE Filters ADD `AutoUnarchive` tinyint(3) unsigned NOT NULL default '0' AFTER `AutoArchive`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
--- a/db/zm_update-1.35.11.sql
+++ b/db/zm_update-1.35.11.sql
@ -1,92 +0,0 @@
-/* Change Id type to BIGINT. */
-set @exist := (SELECT count(*) FROM INFORMATION_SCHEMA.COLUMNS    WHERE table_name = 'Events' AND COLUMN_NAME = 'Id' and DATA_TYPE='bigint');
-
-set @sqlstmt := if( @exist = 0, "ALTER TABLE Events MODIFY Id bigint unsigned NOT NULL auto_increment", "SELECT 'Events.Id is already BIGINT'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-/* Add FOREIGN KEYS After deleting lost records */
-set @exist := (select count(*) FROM information_schema.key_column_usage where table_name='Frames' and column_name='EventId' and referenced_table_name='Events' and referenced_column_name='Id');
-
-set @sqlstmt := if( @exist > 1, "SELECT 'You have more than 1 FOREIGN KEY. Please do manual cleanup'", "SELECT 'Ok'");
-set @sqlstmt := if( @exist = 1, "SELECT 'FOREIGN KEY EventId in Frames already exists'", @sqlstmt);
-set @sqlstmt := if( @exist = 0, "SELECT 'Adding foreign key for EventId to Frames'", @sqlstmt);
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @sqlstmt := if( @exist = 0, "SELECT 'Deleting unlinked Frames'", "SELECT '.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-set @sqlstmt := if( @exist = 0, "DELETE FROM Frames WHERE EventId NOT IN (SELECT Id FROM Events)", "SELECT '.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-set @sqlstmt := if( @exist = 0, "ALTER TABLE Frames ADD FOREIGN KEY (EventId) REFERENCES Events (Id) ON DELETE CASCADE", "SELECT '.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-
-set @exist := (select count(*) FROM information_schema.key_column_usage where table_name='Stats' and column_name='EventId' and referenced_table_name='Events' and referenced_column_name='Id');
-set @sqlstmt := if( @exist > 1, "SELECT 'You have more than 1 FOREIGN KEY. Please do manual cleanup'", "SELECT 'Ok'");
-set @sqlstmt := if( @exist = 1, "SELECT 'FOREIGN KEY EventId in Stats already exists'", @sqlstmt);
-set @sqlstmt := if( @exist = 0, "SELECT 'Adding FOREIGN KEY for EventId to Stats'", @sqlstmt);
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @sqlstmt := if( @exist = 0, "SELECT 'Deleting unlinked Stats'", "SELECT '.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-set @sqlstmt := if( @exist = 0, "DELETE FROM Stats WHERE EventId NOT IN (SELECT Id FROM Events);", "SELECT '.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @sqlstmt := if( @exist = 0, "ALTER TABLE Stats ADD FOREIGN KEY (EventId) REFERENCES Events (Id) ON DELETE CASCADE", "SELECT '.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-
-set @exist := (select count(*) FROM information_schema.key_column_usage where table_name='Stats' and column_name='MonitorId' and referenced_table_name='Monitors' and referenced_column_name='Id');
-set @sqlstmt := if( @exist > 1, "SELECT 'You have more than 1 FOREIGN KEY. Please do manual cleanup'", "SELECT 'Ok'");
-set @sqlstmt := if( @exist = 1, "SELECT 'FOREIGN KEY for MonitorId in Stats already exists'", @sql_stmt);
-set @sqlstmt := if( @exist = 0, "SELECT 'Adding FOREIGN KEY for MonitorId to Stats'", @sqlstmt);
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @sqlstmt := if( @exist = 0, "SELECT 'Deleting unlinked Stats'", "SELECT '.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-set @sqlstmt := if( @exist = 0, "DELETE FROM Stats WHERE MonitorId NOT IN (SELECT Id FROM Monitors);", "SELECT '.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @sqlstmt := if( @exist = 0, "ALTER TABLE Stats ADD FOREIGN KEY (MonitorId) REFERENCES Monitors (Id) ON DELETE CASCADE", "SELECT '.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) FROM information_schema.key_column_usage where table_name='Stats' and column_name='ZoneId' and referenced_table_name='Zones' and referenced_column_name='Id');
-set @sqlstmt := if( @exist > 1, "SELECT 'You have more than 1 FOREIGN KEY. Please do manual cleanup'", "SELECT 'Ok'");
-set @sqlstmt := if( @exist = 1, "SELECT 'FOREIGN KEY for ZoneId in Stats already exists'", @sqlstmt);
-set @sqlstmt := if( @exist = 0, "SELECT 'Adding foreign key for ZoneId to Stats'", @sqlstmt);
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @sqlstmt := if( @exist = 0, "SELECT 'Deleting unlinked Stats'", "SELECT 'Ok'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-set @sqlstmt := if( @exist = 0, "DELETE FROM Stats WHERE ZoneId NOT IN (SELECT Id FROM Zones);", "SELECT '.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-set @sqlstmt := if( @exist = 0, "ALTER TABLE Stats ADD FOREIGN KEY (ZoneId) REFERENCES Zones (Id) ON DELETE CASCADE", "SELECT '.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-SELECT 'Adding foreign key for MonitorId to Zones';
-set @exist := (select count(*) FROM information_schema.key_column_usage where table_name='Zones' and column_name='MonitorId' and referenced_table_name='Monitors' and referenced_column_name='Id');
-set @sqlstmt := if( @exist > 1, "SELECT 'You have more than 1 FOREIGN KEY. Please do manual cleanup'", "SELECT 'Ok'");
-set @sqlstmt := if( @exist = 1, "SELECT 'FOREIGN KEY for MonitorId in Zones already exists'", @sqlstmnt);
-set @sqlstmt := if( @exist = 0, "SELECT 'Adding foreign key for MonitorId in Zones'", @sqlstmnt);
-
-/*"SELECT 'FOREIGN KEY for MonitorId in Zones does not already exist'");*/
-set @badzones := (select count(*) FROM Zones WHERE MonitorId NOT IN (SELECT Id FROM Monitors));
-set @sqlstmt := if ( @badzones > 0, "SELECT 'You have Zones with no Monitor record in the Monitors table. Please delete them manually'", "ALTER TABLE Zones ADD FOREIGN KEY (MonitorId) REFERENCES Monitors (Id)");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
--- a/db/zm_update-1.35.12.sql
+++ b/db/zm_update-1.35.12.sql
@ -1,18 +0,0 @@
--
-- Update Filters table to have a LockRows Column
--
-
-SELECT 'Checking for LockRows in Filters';
-SET @s = (SELECT IF(
-  (SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE table_name = 'Filters'
-  AND table_schema = DATABASE()
-  AND column_name = 'LockRows'
-  ) > 0,
-"SELECT 'Column LockRows already exists in Filters'",
-"ALTER TABLE Filters ADD COLUMN `LockRows` tinyint(1) unsigned NOT NULL default '0' AFTER `Concurrent`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
--- a/db/zm_update-1.35.13.sql
+++ b/db/zm_update-1.35.13.sql
@ -1,101 +0,0 @@
-/* DateTime is invalid and it being set here will cause warnings because it isn't in the dropdown set of values in Filter edit. */
-UPDATE Config SET Value='StartDateTime' WHERE Name='ZM_WEB_EVENT_SORT_FIELD' AND Value='DateTime';
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Events'
-     AND column_name = 'StartDateTime'
-    ) > 0,
-"SELECT 'Column StartDateTime already exists in Events'",
-"ALTER TABLE Events CHANGE StartTime StartDateTime datetime default NULL"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Events'
-    AND column_name = 'EndDateTime'
-    ) > 0,
-    "SELECT 'Column EndDateTime already exists in Events'",
-    "ALTER TABLE Events CHANGE EndTime EndDateTime datetime default NULL"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Events_Hour'
-    AND column_name = 'StartDateTime'
-    ) > 0,
-    "SELECT 'Column StartDateTime already exists in Events_Hour'",
-    "ALTER TABLE Events_Hour CHANGE StartTime StartDateTime datetime default NULL"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Events_Day'
-    AND column_name = 'StartDateTime'
-    ) > 0,
-    "SELECT 'Column StartDateTime already exists in Events_Day'",
-    "ALTER TABLE Events_Day CHANGE StartTime StartDateTime datetime default NULL"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Events_Week'
-    AND column_name = 'StartDateTime'
-    ) > 0,
-    "SELECT 'Column StartDateTime already exists in Events_Week'",
-    "ALTER TABLE Events_Week CHANGE StartTime StartDateTime datetime default NULL"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Events_Month'
-    AND column_name = 'StartDateTime'
-    ) > 0,
-    "SELECT 'Column StartDateTime already exists in Events_Month'",
-    "ALTER TABLE Events_Month CHANGE StartTime StartDateTime datetime default NULL"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-delimiter //
-
-DROP TRIGGER IF EXISTS event_insert_trigger//
-
-/* The assumption is that when an Event is inserted, it has no size yet, so don't bother updating the DiskSpace, just the count.
- * The DiskSpace will get update in the Event Update Trigger
- */
-CREATE TRIGGER event_insert_trigger AFTER INSERT ON Events
-FOR EACH ROW
-  BEGIN
-
-  INSERT INTO Events_Hour (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
-  INSERT INTO Events_Day (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
-  INSERT INTO Events_Week (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
-  INSERT INTO Events_Month (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
-  UPDATE Monitors SET
-  HourEvents = COALESCE(HourEvents,0)+1,
-  DayEvents = COALESCE(DayEvents,0)+1,
-  WeekEvents = COALESCE(WeekEvents,0)+1,
-  MonthEvents = COALESCE(MonthEvents,0)+1,
-  TotalEvents = COALESCE(TotalEvents,0)+1
-  WHERE Id=NEW.MonitorId;
-END;
-//
-
-delimiter ;
--- a/db/zm_update-1.35.14.sql
+++ b/db/zm_update-1.35.14.sql
@ -1,574 +0,0 @@
-SELECT 'This update may make changes that require SUPER privileges. If you see an error message saying:
-
-ERROR 1419 (HY000) at line 298: You do not have the SUPER privilege and binary logging is enabled (you *might* want to use the less safe log_bin_trust_function_creators variable)
-
-You will have to either run this update as root manually using something like (on ubuntu/debian)
-
-sudo mysql --defaults-file=/etc/mysql/debian.cnf zm < /usr/share/zoneminder/db/zm_update-1.35.14.sql
-
-OR
-
-sudo mysql --defaults-file=/etc/mysql/debian.cnf "set global log_bin_trust_function_creators=1;"
-sudo zmupdate.pl
-';
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'TotalEvents'
-    ) > 0,
-"SELECT 'Column TotalEvents already exists in Monitor_Status'",
-"ALTER TABLE `Monitor_Status` ADD `TotalEvents` INT(10) AFTER `CaptureBandwidth`"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'TotalEvents'
-    ) > 0,
-"ALTER TABLE `Monitors` DROP `TotalEvents`",
-"SELECT 'Column TotalEvents is already removed from Monitors'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'TotalEventDiskSpace'
-    ) > 0,
-"SELECT 'Column TotalEventDiskSpace already exists in Monitor_Status'",
-"ALTER TABLE `Monitor_Status` ADD `TotalEventDiskSpace` BIGINT AFTER `TotalEvents`"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'TotalEventDiskSpace'
-    ) > 0,
-"ALTER TABLE `Monitors` DROP `TotalEventDiskSpace`",
-"SELECT 'Column TotalEventDiskSpace is already removed from Monitors'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'HourEvents'
-    ) > 0,
-"SELECT 'Column HourEvents already exists in Monitors'",
-"ALTER TABLE `Monitor_Status` ADD `HourEvents` INT(10) AFTER `TotalEventDiskSpace`"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'HourEvents'
-    ) > 0,
-"ALTER TABLE `Monitors` DROP `HourEvents`",
-"SELECT 'Column HourEvents is already removed from Monitors'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'HourEventDiskSpace'
-    ) > 0,
-"SELECT 'Column HourEventDiskSpace already exists in Monitor_Status'",
-"ALTER TABLE `Monitor_Status` ADD `HourEventDiskSpace` BIGINT AFTER `HourEvents`"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'HourEventDiskSpace'
-    ) > 0,
-"ALTER TABLE `Monitors` DROP `HourEventDiskSpace`",
-"SELECT 'Column HourEventDiskSpace is already removed from Monitors'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'DayEvents'
-    ) > 0,
-"SELECT 'Column DayEvents already exists in Monitor_Status'",
-"ALTER TABLE `Monitor_Status` ADD `DayEvents` INT(10) AFTER `HourEventDiskSpace`"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'DayEvents'
-    ) > 0,
-"ALTER TABLE `Monitors` DROP `DayEvents`",
-"SELECT 'Column DayEvents is already removed from Monitors'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'DayEventDiskSpace'
-    ) > 0,
-"SELECT 'Column DayEventDiskSpace already exists in Monitor_Status'",
-"ALTER TABLE `Monitor_Status` ADD `DayEventDiskSpace` BIGINT AFTER `DayEvents`"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'DayEventDiskSpace'
-    ) > 0,
-"ALTER TABLE `Monitors` DROP `DayEventDiskSpace`",
-"SELECT 'Column DayEventDiskSpace is already removed from Monitors'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'WeekEvents'
-    ) > 0,
-"SELECT 'Column WeekEvents already exists in Monitor_Status'",
-"ALTER TABLE `Monitor_Status` ADD `WeekEvents` INT(10) AFTER `DayEventDiskSpace`"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'WeekEvents'
-    ) > 0,
-"ALTER TABLE `Monitors` DROP `WeekEvents`",
-"SELECT 'Column WeekEvents is already removed from Monitors'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'WeekEventDiskSpace'
-    ) > 0,
-"SELECT 'Column WeekEventDiskSpace already exists in Monitor_Status'",
-"ALTER TABLE `Monitor_Status` ADD `WeekEventDiskSpace` BIGINT AFTER `WeekEvents`"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'WeekEventDiskSpace'
-    ) > 0,
-"ALTER TABLE `Monitors` DROP `WeekEventDiskSpace`",
-"SELECT 'Column WeekEventDiskSpace is already removed from Monitors'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'MonthEvents'
-    ) > 0,
-"SELECT 'Column MonthEvents already exists in Monitor_Status'",
-"ALTER TABLE `Monitor_Status` ADD `MonthEvents` INT(10) AFTER `WeekEventDiskSpace`"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'MonthEvents'
-    ) > 0,
-"ALTER TABLE `Monitors` DROP `MonthEvents`",
-"SELECT 'Column MonthEvents is already removed from Monitors'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'MonthEventDiskSpace'
-    ) > 0,
-"SELECT 'Column MonthEventDiskSpace already exists in Monitor_Status'",
-"ALTER TABLE `Monitor_Status` ADD `MonthEventDiskSpace` BIGINT AFTER `MonthEvents`"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'MonthEventDiskSpace'
-    ) > 0,
-"ALTER TABLE `Monitors` DROP `MonthEventDiskSpace`",
-"SELECT 'Column MonthEventDiskSpace is already removed from Monitors'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'ArchivedEvents'
-    ) > 0,
-"SELECT 'Column ArchivedEvents already exists in Monitor_Status'",
-"ALTER TABLE `Monitor_Status` ADD `ArchivedEvents` INT(10) AFTER `MonthEventDiskSpace`"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'ArchivedEvents'
-    ) > 0,
-"ALTER TABLE `Monitors` DROP `ArchivedEvents`",
-"SELECT 'Column ArchivedEvents is already removed from Monitors'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'ArchivedEventDiskSpace'
-    ) > 0,
-"SELECT 'Column ArchivedEventDiskSpace already exists in Monitor_Status'",
-"ALTER TABLE `Monitor_Status` ADD `ArchivedEventDiskSpace` BIGINT AFTER `ArchivedEvents`"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'ArchivedEventDiskSpace'
-    ) > 0,
-"ALTER TABLE `Monitors` DROP `ArchivedEventDiskSpace`",
-"SELECT 'Column ArchivedEventDiskSpace is already removed from Monitors'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-UPDATE Monitor_Status INNER JOIN (
-  SELECT  MonitorId,
-    COUNT(Id) AS TotalEvents,
-    SUM(DiskSpace) AS TotalEventDiskSpace,
-    SUM(IF(Archived,1,0)) AS ArchivedEvents,
-    SUM(IF(Archived,DiskSpace,0)) AS ArchivedEventDiskSpace,
-    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 hour),1,0)) AS HourEvents,
-    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 hour),DiskSpace,0)) AS HourEventDiskSpace,
-    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 day),1,0)) AS DayEvents,
-    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 day),DiskSpace,0)) AS DayEventDiskSpace,
-    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 week),1,0)) AS WeekEvents,
-    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 week),DiskSpace,0)) AS WeekEventDiskSpace,
-    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 month),1,0)) AS MonthEvents,
-    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 month),DiskSpace,0)) AS MonthEventDiskSpace
-    FROM Events GROUP BY MonitorId
-    ) AS E ON E.MonitorId=Monitor_Status.MonitorId SET
-    Monitor_Status.TotalEvents = E.TotalEvents,
-    Monitor_Status.TotalEventDiskSpace = E.TotalEventDiskSpace,
-    Monitor_Status.ArchivedEvents = E.ArchivedEvents,
-    Monitor_Status.ArchivedEventDiskSpace = E.ArchivedEventDiskSpace,
-    Monitor_Status.HourEvents = E.HourEvents,
-    Monitor_Status.HourEventDiskSpace = E.HourEventDiskSpace,
-    Monitor_Status.DayEvents = E.DayEvents,
-    Monitor_Status.DayEventDiskSpace = E.DayEventDiskSpace,
-    Monitor_Status.WeekEvents = E.WeekEvents,
-    Monitor_Status.WeekEventDiskSpace = E.WeekEventDiskSpace,
-    Monitor_Status.MonthEvents = E.MonthEvents,
-    Monitor_Status.MonthEventDiskSpace = E.MonthEventDiskSpace;
-
-
-delimiter //
-DROP TRIGGER IF EXISTS Events_Hour_delete_trigger//
-CREATE TRIGGER Events_Hour_delete_trigger BEFORE DELETE ON Events_Hour
-FOR EACH ROW BEGIN
-  UPDATE Monitor_Status SET
-  HourEvents = GREATEST(COALESCE(HourEvents,1)-1,0),
-  HourEventDiskSpace=GREATEST(COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Monitor_Status.MonitorId=OLD.MonitorId;
-END; 
-//
-
-DROP TRIGGER IF EXISTS Events_Hour_update_trigger//
-
-CREATE TRIGGER Events_Hour_update_trigger AFTER UPDATE ON Events_Hour
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitor_Status SET HourEventDiskSpace=GREATEST(COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Monitor_Status.MonitorId=OLD.MonitorId;
-        UPDATE Monitor_Status SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Monitor_Status.MonitorId=NEW.MonitorId;
-      ELSE
-        UPDATE Monitor_Status SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+diff WHERE Monitor_Status.MonitorId=NEW.MonitorId;
-      END IF;
-    END IF;
-  END;
-//
-
-DROP TRIGGER IF EXISTS Events_Day_delete_trigger//
-CREATE TRIGGER Events_Day_delete_trigger BEFORE DELETE ON Events_Day
-FOR EACH ROW BEGIN
-  UPDATE Monitor_Status SET
-  DayEvents = GREATEST(COALESCE(DayEvents,1)-1,0),
-  DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Monitor_Status.MonitorId=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Day_update_trigger;
-CREATE TRIGGER Events_Day_update_trigger AFTER UPDATE ON Events_Day
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitor_Status SET DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Monitor_Status.MonitorId=OLD.MonitorId;
-        UPDATE Monitor_Status SET DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Monitor_Status.MonitorId=NEW.MonitorId;
-      ELSE
-        UPDATE Monitor_Status SET DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)+diff,0) WHERE Monitor_Status.MonitorId=NEW.MonitorId;
-      END IF;
-    END IF;
-  END;
-  //
-
-
-DROP TRIGGER IF EXISTS Events_Week_delete_trigger//
-CREATE TRIGGER Events_Week_delete_trigger BEFORE DELETE ON Events_Week
-FOR EACH ROW BEGIN
-  UPDATE Monitor_Status SET
-  WeekEvents = GREATEST(COALESCE(WeekEvents,1)-1,0),
-  WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Monitor_Status.MonitorId=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Week_update_trigger;
-CREATE TRIGGER Events_Week_update_trigger AFTER UPDATE ON Events_Week
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitor_Status SET WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Monitor_Status.MonitorId=OLD.MonitorId;
-        UPDATE Monitor_Status SET WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Monitor_Status.MonitorId=NEW.MonitorId;
-      ELSE
-        UPDATE Monitor_Status SET WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)+diff,0) WHERE Monitor_Status.MonitorId=NEW.MonitorId;
-      END IF;
-    END IF;
-  END;
-  //
-
-DROP TRIGGER IF EXISTS Events_Month_delete_trigger//
-CREATE TRIGGER Events_Month_delete_trigger BEFORE DELETE ON Events_Month
-FOR EACH ROW BEGIN
-  UPDATE Monitor_Status SET
-  MonthEvents = GREATEST(COALESCE(MonthEvents,1)-1,0),
-  MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Monitor_Status.MonitorId=OLD.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS Events_Month_update_trigger;
-CREATE TRIGGER Events_Month_update_trigger AFTER UPDATE ON Events_Month
-FOR EACH ROW
-  BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-    IF ( diff ) THEN
-      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitor_Status SET MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace),0) WHERE Monitor_Status.MonitorId=OLD.MonitorId;
-        UPDATE Monitor_Status SET MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)+COALESCE(NEW.DiskSpace) WHERE Monitor_Status.MonitorId=NEW.MonitorId;
-      ELSE
-        UPDATE Monitor_Status SET MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)+diff,0) WHERE Monitor_Status.MonitorId=NEW.MonitorId;
-      END IF;
-    END IF;
-  END;
-  //
-
-drop procedure if exists update_storage_stats//
-
-drop trigger if exists event_update_trigger//
-
-CREATE TRIGGER event_update_trigger AFTER UPDATE ON Events 
-FOR EACH ROW
-BEGIN
-  declare diff BIGINT default 0;
-
-  set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
-  IF ( NEW.StorageId = OLD.StorageID ) THEN
-    IF ( diff ) THEN
-      UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) + diff,0) WHERE Storage.Id = OLD.StorageId;
-    END IF;
-  ELSE
-    IF ( NEW.DiskSpace ) THEN
-      UPDATE Storage SET DiskSpace = COALESCE(DiskSpace,0) + NEW.DiskSpace WHERE Storage.Id = NEW.StorageId;
-    END IF;
-    IF ( OLD.DiskSpace ) THEN
-      UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) - OLD.DiskSpace,0) WHERE Storage.Id = OLD.StorageId;
-    END IF;
-  END IF;
-
-  UPDATE Events_Hour SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Day SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Week SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  UPDATE Events_Month SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-
-  IF ( NEW.Archived != OLD.Archived ) THEN
-    IF ( NEW.Archived ) THEN
-      INSERT INTO Events_Archived (EventId,MonitorId,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.DiskSpace);
-      UPDATE Monitor_Status SET ArchivedEvents = COALESCE(ArchivedEvents,0)+1, ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) + COALESCE(NEW.DiskSpace,0) WHERE Monitor_Status.MonitorId=NEW.MonitorId;
-    ELSEIF ( OLD.Archived ) THEN
-      DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-      UPDATE Monitor_Status
-        SET
-          ArchivedEvents = GREATEST(COALESCE(ArchivedEvents,0)-1,0),
-          ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),0)
-        WHERE Monitor_Status.MonitorId=OLD.MonitorId;
-    ELSE
-      IF ( OLD.DiskSpace != NEW.DiskSpace ) THEN
-        UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-        UPDATE Monitor_Status SET
-          ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0),0)
-          WHERE Monitor_Status.MonitorId=OLD.MonitorId;
-      END IF;
-    END IF;
-  ELSEIF ( NEW.Archived AND diff ) THEN
-    UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-  END IF;
-
-  IF ( diff ) THEN
-    UPDATE Monitor_Status
-      SET
-        TotalEventDiskSpace = GREATEST(COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0),0)
-      WHERE Monitor_Status.MonitorId=OLD.MonitorId;
-  END IF;
-
-END;
-
-//
-
-DROP TRIGGER IF EXISTS event_insert_trigger//
-
-/* The assumption is that when an Event is inserted, it has no size yet, so don't bother updating the DiskSpace, just the count.
- * The DiskSpace will get update in the Event Update Trigger
- */
-CREATE TRIGGER event_insert_trigger AFTER INSERT ON Events
-FOR EACH ROW
-  BEGIN
-
-  INSERT INTO Events_Hour (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
-  INSERT INTO Events_Day (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
-  INSERT INTO Events_Week (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
-  INSERT INTO Events_Month (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
-  UPDATE Monitor_Status SET
-  HourEvents = COALESCE(HourEvents,0)+1,
-  DayEvents = COALESCE(DayEvents,0)+1,
-  WeekEvents = COALESCE(WeekEvents,0)+1,
-  MonthEvents = COALESCE(MonthEvents,0)+1,
-  TotalEvents = COALESCE(TotalEvents,0)+1
-  WHERE Monitor_Status.MonitorId=NEW.MonitorId;
-END;
-//
-
-DROP TRIGGER IF EXISTS event_delete_trigger//
-
-CREATE TRIGGER event_delete_trigger BEFORE DELETE ON Events
-FOR EACH ROW
-BEGIN
-  IF ( OLD.DiskSpace ) THEN
-    UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) - COALESCE(OLD.DiskSpace,0),0) WHERE Storage.Id = OLD.StorageId;
-  END IF;
-  DELETE FROM Events_Hour WHERE EventId=OLD.Id;
-  DELETE FROM Events_Day WHERE EventId=OLD.Id;
-  DELETE FROM Events_Week WHERE EventId=OLD.Id;
-  DELETE FROM Events_Month WHERE EventId=OLD.Id;
-  IF ( OLD.Archived ) THEN
-    DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-    UPDATE Monitor_Status SET
-      ArchivedEvents = GREATEST(COALESCE(ArchivedEvents,1) - 1,0),
-      ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),0),
-      TotalEvents = GREATEST(COALESCE(TotalEvents,1) - 1,0),
-      TotalEventDiskSpace = GREATEST(COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),0)
-      WHERE Monitor_Status.MonitorId=OLD.MonitorId;
-  ELSE
-    UPDATE Monitor_Status SET
-    TotalEvents = GREATEST(COALESCE(TotalEvents,1)-1,0),
-    TotalEventDiskSpace=GREATEST(COALESCE(TotalEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-    WHERE Monitor_Status.MonitorId=OLD.MonitorId;
-  END IF;
-END;
-
-//
-
-DELIMITER ;
-
-REPLACE INTO Events_Hour SELECT Id,MonitorId,StartDateTime,DiskSpace FROM Events WHERE StartDateTime > DATE_SUB(NOW(),  INTERVAL 1 hour);
-REPLACE INTO Events_Day SELECT Id,MonitorId,StartDateTime,DiskSpace FROM Events WHERE StartDateTime > DATE_SUB(NOW(),  INTERVAL 1 day);
-REPLACE INTO Events_Week SELECT Id,MonitorId,StartDateTime,DiskSpace FROM Events WHERE StartDateTime > DATE_SUB(NOW(),  INTERVAL 1 week);
-REPLACE INTO Events_Month SELECT Id,MonitorId,StartDateTime,DiskSpace FROM Events WHERE StartDateTime > DATE_SUB(NOW(),  INTERVAL 1 month);
-REPLACE INTO Events_Archived SELECT Id,MonitorId,DiskSpace FROM Events WHERE Archived=1;
-
-UPDATE Monitor_Status INNER JOIN (
-  SELECT  MonitorId,
-    COUNT(Id) AS TotalEvents,
-    SUM(DiskSpace) AS TotalEventDiskSpace,
-    SUM(IF(Archived,1,0)) AS ArchivedEvents,
-    SUM(IF(Archived,DiskSpace,0)) AS ArchivedEventDiskSpace,
-    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 hour),1,0)) AS HourEvents,
-    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 hour),DiskSpace,0)) AS HourEventDiskSpace,
-    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 day),1,0)) AS DayEvents,
-    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 day),DiskSpace,0)) AS DayEventDiskSpace,
-    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 week),1,0)) AS WeekEvents,
-    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 week),DiskSpace,0)) AS WeekEventDiskSpace,
-    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 month),1,0)) AS MonthEvents,
-    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 month),DiskSpace,0)) AS MonthEventDiskSpace
-    FROM Events GROUP BY MonitorId
-    ) AS E ON E.MonitorId=Monitor_Status.MonitorId SET
-    Monitor_Status.TotalEvents = E.TotalEvents,
-    Monitor_Status.TotalEventDiskSpace = E.TotalEventDiskSpace,
-    Monitor_Status.ArchivedEvents = E.ArchivedEvents,
-    Monitor_Status.ArchivedEventDiskSpace = E.ArchivedEventDiskSpace,
-    Monitor_Status.HourEvents = E.HourEvents,
-    Monitor_Status.HourEventDiskSpace = E.HourEventDiskSpace,
-    Monitor_Status.DayEvents = E.DayEvents,
-    Monitor_Status.DayEventDiskSpace = E.DayEventDiskSpace,
-    Monitor_Status.WeekEvents = E.WeekEvents,
-    Monitor_Status.WeekEventDiskSpace = E.WeekEventDiskSpace,
-    Monitor_Status.MonthEvents = E.MonthEvents,
-    Monitor_Status.MonthEventDiskSpace = E.MonthEventDiskSpace;
--- a/db/zm_update-1.35.15.sql
+++ b/db/zm_update-1.35.15.sql
@ -1,70 +0,0 @@
-/*
-Add the EndTime IS NOT NULL term to the Update Disk Space Filter.
-This will only work if they havn't modified the stock filter 
- */
-UPDATE Filters SET Query_json='{"terms":[{"attr":"DiskSpace","op":"IS","val":"NULL"},{"cnj":"and","obr":"0","attr":"EndDateTime","op":"IS NOT","val":"NULL","cbr":"0"}]}' WHERE Query_json='{"terms":[{"attr":"DiskSpace","op":"IS","val":"NULL"}]}';
-
-/*
-Add the EndTime IS NOT NULL term to the Purge When Full Filter. 
-This will only work if they havn't modified the stock filter .
-This is important to prevent SQL Errors inserting into Frames table if PurgeWhenFull deletes in-progress events.
- */
-UPDATE Filters SET Query_json='{"sort_field":"Id","terms":[{"val":0,"attr":"Archived","op":"="},{"cnj":"and","val":95,"attr":"DiskPercent","op":">="},{"cnj":"and","obr":"0","attr":"EndDateTime","op":"IS NOT","val":"NULL","cbr":"0"}],"limit":100,"sort_asc":1}' WHERE Query_json='{"sort_field":"Id","terms":[{"val":0,"attr":"Archived","op":"="},{"cnj":"and","val":95,"attr":"DiskPercent","op":">="}],"limit":100,"sort_asc":1}';
-
-/* Add FOREIGN KEYS After deleting lost records */
-set @exist := (select count(*) FROM information_schema.key_column_usage where table_name='Groups_Monitors' and column_name='GroupId' and referenced_table_name='Groups' and referenced_column_name='Id');
-
-set @sqlstmt := if( @exist > 1, "SELECT 'You have more than 1 FOREIGN KEY. Please do manual cleanup'", "SELECT 'Ok'");
-set @sqlstmt := if( @exist = 1, "SELECT 'FOREIGN KEY GroupId in Groups_Monitors already exists'", @sqlstmt);
-set @sqlstmt := if( @exist = 0, "SELECT 'Adding foreign key for GroupId to Groups_Monitors'", @sqlstmt);
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @sqlstmt := if( @exist = 0, "SELECT 'Deleting unlinked Groups_Monitors'", "SELECT '.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-set @sqlstmt := if( @exist = 0, "DELETE FROM `Groups_Monitors` WHERE `GroupId` NOT IN (SELECT `Id` FROM `Groups`)", "SELECT '.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-set @sqlstmt := if( @exist = 0, "ALTER TABLE `Groups_Monitors` ADD FOREIGN KEY (`GroupId`) REFERENCES `Groups` (`Id`) ON DELETE CASCADE", "SELECT '.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-/* Add FOREIGN KEYS After deleting lost records */
-set @exist := (select count(*) FROM information_schema.key_column_usage where table_name='Groups_Monitors' and column_name='MonitorId' and referenced_table_name='Monitors' and referenced_column_name='Id');
-
-set @sqlstmt := if( @exist > 1, "SELECT 'You have more than 1 FOREIGN KEY. Please do manual cleanup'", "SELECT 'Ok'");
-set @sqlstmt := if( @exist = 1, "SELECT 'FOREIGN KEY MonitorId in Groups_Monitors already exists'", @sqlstmt);
-set @sqlstmt := if( @exist = 0, "SELECT 'Adding foreign key for MonitorId to Groups_Monitors'", @sqlstmt);
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @sqlstmt := if( @exist = 0, "SELECT 'Deleting unlinked Groups_Monitors'", "SELECT '.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-set @sqlstmt := if( @exist = 0, "DELETE FROM `Groups_Monitors` WHERE `MonitorId` NOT IN (SELECT `Id` FROM `Monitors`)", "SELECT '.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-set @sqlstmt := if( @exist = 0, "ALTER TABLE `Groups_Monitors` ADD FOREIGN KEY (`MonitorId`) REFERENCES `Monitors` (`Id`) ON DELETE CASCADE", "SELECT '.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-/* Add FOREIGN KEYS After deleting lost records */
-set @exist := (select count(*) FROM information_schema.key_column_usage where table_name='Groups' and column_name='ParentId' and referenced_table_name='Groups' and referenced_column_name='Id');
-
-set @sqlstmt := if( @exist > 1, "SELECT 'You have more than 1 FOREIGN KEY. Please do manual cleanup'", "SELECT 'Ok'");
-set @sqlstmt := if( @exist = 1, "SELECT 'FOREIGN KEY ParentId in Groups already exists'", @sqlstmt);
-set @sqlstmt := if( @exist = 0, "SELECT 'Adding foreign key for ParentId to Groups'", @sqlstmt);
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @sqlstmt := if( @exist = 0, "SELECT 'Deleting unlinked Groups'", "SELECT '.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-set @sqlstmt := if( @exist = 0, "UPDATE `Groups` SET `ParentId` = NULL WHERE (ParentId IS NOT NULL) and ParentId NOT IN (SELECT * FROM(SELECT Id FROM `Groups`)tblTmp)", "SELECT '.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-set @sqlstmt := if( @exist = 0, "ALTER TABLE `Groups` ADD FOREIGN KEY (ParentId) REFERENCES `Groups` (Id) ON DELETE CASCADE", "SELECT '.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
--- a/db/zm_update-1.35.16.sql
+++ b/db/zm_update-1.35.16.sql
@ -1,12 +0,0 @@
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Monitors'
-      AND column_name = 'DecodingEnabled'
-    ) > 0,
-    "SELECT 'Column DecodingEnabled already exists in Monitors'",
-    "ALTER TABLE Monitors ADD `DecodingEnabled` tinyint(3) unsigned NOT NULL default '1' AFTER `Enabled`"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
--- a/db/zm_update-1.35.17.sql
+++ b/db/zm_update-1.35.17.sql
@ -1,14 +0,0 @@
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'Encoder'
-    ) > 0,
-"SELECT 'Column Encoder already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `Encoder`     enum('auto','h264','libx264','h264_omx','h264_vaapi','mjpeg','mpeg1','mpeg2')  AFTER `OutputCodec`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-ALTER TABLE `Monitors` MODIFY `Encoder`     enum('auto','h264','libx264', 'h264_omx', 'h264_vaapi', 'mjpeg','mpeg1','mpeg2');
-
-ALTER TABLE `Monitors` MODIFY `OutputCodec`     INT UNSIGNED default 0;
--- a/db/zm_update-1.35.18.sql
+++ b/db/zm_update-1.35.18.sql
@ -1,11 +0,0 @@
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'RTSPServer'
-    ) > 0,
-"SELECT 'Column RTSPServer already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `RTSPServer`  BOOLEAN NOT NULL DEFAULT FALSE AFTER `Longitude`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
--- a/db/zm_update-1.35.19.sql
+++ b/db/zm_update-1.35.19.sql
@ -1,11 +0,0 @@
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'RTSPStreamName'
-    ) > 0,
-"SELECT 'Column RTSPStreamName already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `RTSPStreamName` varchar(255) NOT NULL default '' AFTER `RTSPServer`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
--- a/db/zm_update-1.35.2.sql
+++ b/db/zm_update-1.35.2.sql
@ -1 +0,0 @@
-ALTER TABLE Monitors MODIFY `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket','VNC') NOT NULL default 'Local';
--- a/db/zm_update-1.35.20.sql
+++ b/db/zm_update-1.35.20.sql
@ -1,15 +0,0 @@
--
-- Add SecondPath to Monitors
--
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'SecondPath'
-    ) > 0,
-"SELECT 'Column SecondPath already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `SecondPath` VARCHAR(255) AFTER `Path`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
--- a/db/zm_update-1.35.21.sql
+++ b/db/zm_update-1.35.21.sql
@ -1,56 +0,0 @@
--
-- Add HomeView to Users
--
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Users'
-     AND column_name = 'HomeView'
-    ) > 0,
-"SELECT 'Column HomeView already exists in Users'",
-"ALTER TABLE `Users` ADD `HomeView`  varchar(64) NOT NULL DEFAULT '' AFTER `APIEnabled`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-      FROM INFORMATION_SCHEMA.TABLES
-      WHERE table_name = 'Snapshots'
-      AND table_schema = DATABASE()
-    ) > 0,
-    "SELECT 'Snapshots table exists'",
-    "CREATE TABLE Snapshots (
-  `Id` int(10) unsigned NOT NULL auto_increment,
-  `Name`  VARCHAR(64),
-  `Description` TEXT,
-  `CreatedBy`   int(10),
-  `CreatedOn`   datetime default NULL,
-  PRIMARY KEY(Id)
-) ENGINE=InnoDB;"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-      FROM INFORMATION_SCHEMA.TABLES
-      WHERE table_name = 'Snapshot_Events'
-      AND table_schema = DATABASE()
-    ) > 0,
-    "SELECT 'Snapshot_Events table exists'",
-    "CREATE TABLE Snapshot_Events (
-  `Id` int(10) unsigned NOT NULL auto_increment,
-  `SnapshotId` int(10) unsigned NOT NULL,
-  FOREIGN KEY (`SnapshotId`) REFERENCES `Snapshots` (`Id`) ON DELETE CASCADE,
-  `EventId`    bigint unsigned NOT NULL,
-  FOREIGN KEY (`EventId`) REFERENCES `Events` (`Id`) ON DELETE CASCADE,
-  KEY `Snapshot_Events_SnapshotId_idx` (`SnapshotId`),
-  PRIMARY KEY(Id)
-) ENGINE=InnoDB;"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
--- a/db/zm_update-1.35.22.sql
+++ b/db/zm_update-1.35.22.sql
@ -1,19 +0,0 @@
--
-- Add MaxImageBufferCount, set it to ImageBufferCount if that was large and set ImageBufferCount to 3
--
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'MaxImageBufferCount'
-    ) > 0,
-"SELECT 'Column MaxImageBufferCount already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `MaxImageBufferCount` smallint(5) unsigned NOT NULL default '0' AFTER `ImageBufferCount`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-UPDATE `Monitors` SET MaxImageBufferCount=ImageBufferCount WHERE ImageBufferCount >= 20;
-UPDATE `Monitors` SET ImageBufferCount = 3;
-
--- a/db/zm_update-1.35.23.sql
+++ b/db/zm_update-1.35.23.sql
@ -1,2 +0,0 @@
-
-UPDATE `Controls` SET `Protocol`='FoscamCGI' where `Protocol`='onvif';
--- a/db/zm_update-1.35.24.sql.in
+++ b/db/zm_update-1.35.24.sql.in
@ -1,69 +0,0 @@
-SELECT 'This update may make changes that require SUPER privileges. If you see an error message saying:
-
-ERROR 1419 (HY000) at line 298: You do not have the SUPER privilege and binary logging is enabled (you *might* want to use the less safe log_bin_trust_function_creators variable)
-
-You will have to either run this update as root manually using something like (on ubuntu/debian)
-
-sudo mysql --defaults-file=/etc/mysql/debian.cnf zm < /usr/share/zoneminder/db/zm_update-1.35.24.sql
-
-OR
-
-sudo mysql --defaults-file=/etc/mysql/debian.cnf "set global log_bin_trust_function_creators=1;"
-sudo zmupdate.pl
-
-OR
-
-Turn off binary logging in your mysql server by adding this to your mysql config.
-[mysqld]
-skip-log-bin
-
-';
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Event_Summaries'
-    ) > 0
-    ,
-    "SELECT 'Event_Summaries Already exists'",
-    "
-    CREATE TABLE `Event_Summaries` (
-  `MonitorId` int(10) unsigned NOT NULL,
-  `TotalEvents` int(10) default NULL,
-  `TotalEventDiskSpace` bigint default NULL,
-  `HourEvents` int(10) default NULL,
-  `HourEventDiskSpace` bigint default NULL,
-  `DayEvents` int(10) default NULL,
-  `DayEventDiskSpace` bigint default NULL,
-  `WeekEvents` int(10) default NULL,
-  `WeekEventDiskSpace` bigint default NULL,
-  `MonthEvents` int(10) default NULL,
-  `MonthEventDiskSpace` bigint default NULL,
-  `ArchivedEvents` int(10) default NULL,
-  `ArchivedEventDiskSpace` bigint default NULL,
-  PRIMARY KEY (`MonitorId`)
-) ENGINE=InnoDb;
-"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-DELETE FROM Event_Summaries;
-
-REPLACE INTO Event_Summaries
-  SELECT  MonitorId,
-    COUNT(Id) AS TotalEvents,
-    SUM(DiskSpace) AS TotalEventDiskSpace,
-    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 hour),1,0)) AS HourEvents,
-    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 hour),DiskSpace,0)) AS HourEventDiskSpace,
-    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 day),1,0)) AS DayEvents,
-    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 day),DiskSpace,0)) AS DayEventDiskSpace,
-    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 week),1,0)) AS WeekEvents,
-    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 week),DiskSpace,0)) AS WeekEventDiskSpace,
-    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 month),1,0)) AS MonthEvents,
-    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 month),DiskSpace,0)) AS MonthEventDiskSpace,
-    SUM(IF(Archived,1,0)) AS ArchivedEvents,
-    SUM(IF(Archived,DiskSpace,0)) AS ArchivedEventDiskSpace
-    FROM Events GROUP BY MonitorId;
-   
-source @PKGDATADIR@/db/triggers.sql
--- a/db/zm_update-1.35.25.sql
+++ b/db/zm_update-1.35.25.sql
@ -1,144 +0,0 @@
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'TotalEvents'
-    ) > 0,
-"ALTER TABLE `Monitor_Status` DROP `TotalEvents`",
-"SELECT 'Column TotalEvents already removed from Monitor_Status'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'TotalEventDiskSpace'
-    ) > 0,
-"ALTER TABLE `Monitor_Status` DROP `TotalEventDiskSpace`",
-"SELECT 'Column TotalEventDiskSpace already removed from Monitor_Status'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'HourEvents'
-    ) > 0,
-"ALTER TABLE `Monitor_Status` DROP `HourEvents`",
-"SELECT 'Column HourEvents already removed from Monitor_Status'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'HourEventDiskSpace'
-    ) > 0,
-"ALTER TABLE `Monitor_Status` DROP `HourEventDiskSpace`",
-"SELECT 'Column HourEventDiskSpace already removed from Monitor_Status'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'DayEvents'
-    ) > 0,
-"ALTER TABLE `Monitor_Status` DROP `DayEvents`",
-"SELECT 'Column DayEvents already removed from Monitor_Status'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'DayEvents'
-    ) > 0,
-"ALTER TABLE `Monitor_Status` DROP `DayEventDiskSpace`",
-"SELECT 'Column DayEventDiskSpace already removed from Monitor_Status'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'WeekEvents'
-    ) > 0,
-"ALTER TABLE `Monitor_Status` DROP `WeekEvents`",
-"SELECT 'Column WeekEvents already removed from Monitor_Status'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'WeekEventDiskSpace'
-    ) > 0,
-"ALTER TABLE `Monitor_Status` DROP `WeekEventDiskSpace`",
-"SELECT 'Column WeekEventDiskSpace already removed from Monitor_Status'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'MonthEvents'
-    ) > 0,
-"ALTER TABLE `Monitor_Status` DROP `MonthEvents`",
-"SELECT 'Column MonthEvents already removed from Monitor_Status'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'MonthEventDiskSpace'
-    ) > 0,
-"ALTER TABLE `Monitor_Status` DROP `MonthEventDiskSpace`",
-"SELECT 'Column MonthEventDiskSpace already removed from Monitor_Status'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'ArchivedEvents'
-    ) > 0,
-"ALTER TABLE `Monitor_Status` DROP `ArchivedEvents`",
-"SELECT 'Column ArchivedEvents already removed from Monitor_Status'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitor_Status'
-     AND column_name = 'ArchivedEventDiskSpace'
-    ) > 0,
-"ALTER TABLE `Monitor_Status` DROP `ArchivedEventDiskSpace`",
-"SELECT 'Column ArchivedEventDiskSpace already removed from Monitor_Status'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'Importance'
-    ) > 0,
-"SELECT 'Column Importance already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `Importance`  enum('Not','Less','Normal') AFTER `RTSPStreamName`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
--- a/db/zm_update-1.35.26.sql
+++ b/db/zm_update-1.35.26.sql
@ -1,17 +0,0 @@
--
-- Add Snapshot permission to Users
--
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Users'
-     AND column_name = 'Snapshots'
-    ) > 0,
-"SELECT 'Column Snapshots already exists in Users'",
-"ALTER TABLE `Users` ADD `Snapshots` enum('None','View','Edit') NOT NULL default 'None' AFTER `Devices`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-UPDATE `Users` SET `Snapshots` = `Events`;
--- a/db/zm_update-1.35.27.sql
+++ b/db/zm_update-1.35.27.sql
@ -1,15 +0,0 @@
--
-- Add ModectDuringPTZ
--
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'ModectDuringPTZ'
-    ) > 0,
-"SELECT 'Column ModectDuringPTZ already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `ModectDuringPTZ` tinyint(3) unsigned NOT NULL default '0' AFTER `ReturnDelay`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
--- a/db/zm_update-1.35.28.sql
+++ b/db/zm_update-1.35.28.sql
@ -1 +0,0 @@
-ALTER TABLE `Monitors` MODIFY `Encoder`     varchar(32);
--- a/db/zm_update-1.35.3.sql
+++ b/db/zm_update-1.35.3.sql
@ -1,2 +0,0 @@
-SELECT 'ALTERING Frames.Id to a BIGINT.  This could take a long time.';
-ALTER TABLE Frames MODIFY Id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT;
--- a/db/zm_update-1.35.4.sql
+++ b/db/zm_update-1.35.4.sql
@ -1,60 +0,0 @@
--
-- This update adds ONVIF features
--
-
-SET @s = (SELECT IF(
-	(SELECT COUNT(*)
-	FROM INFORMATION_SCHEMA.COLUMNS
-	WHERE table_name = 'Monitors'
-	AND table_schema = DATABASE()
-	AND column_name = 'ONVIF_URL'
-	) > 0,
-"SELECT 'Column ONVIF_URL already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD COLUMN `ONVIF_URL` VARCHAR(255) NOT NULL DEFAULT '' AFTER `Triggers`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-	(SELECT COUNT(*)
-	FROM INFORMATION_SCHEMA.COLUMNS
-	WHERE table_name = 'Monitors'
-	AND table_schema = DATABASE()
-	AND column_name = 'ONVIF_Username'
-	) > 0,
-"SELECT 'Column ONVIF_Username already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD COLUMN `ONVIF_Username` VARCHAR(64) NOT NULL DEFAULT '' AFTER `ONVIF_URL`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-  (SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE table_name = 'Monitors'
-  AND table_schema = DATABASE()
-  AND column_name = 'ONVIF_Password'
-  ) > 0,
-"SELECT 'Column ONVIF_Password already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD COLUMN `ONVIF_Password` VARCHAR(64) NOT NULL DEFAULT '' AFTER `ONVIF_Username`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-  (SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE table_name = 'Monitors'
-  AND table_schema = DATABASE()
-  AND column_name = 'ONVIF_Options'
-  ) > 0,
-"SELECT 'Column ONVIF_Options already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD COLUMN `ONVIF_Options` VARCHAR(64) NOT NULL DEFAULT '' AFTER `ONVIF_Password`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
--- a/db/zm_update-1.35.5.sql
+++ b/db/zm_update-1.35.5.sql
@ -1,11 +0,0 @@
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Filters'
-     AND column_name = 'UserId'
-    ) > 0,
-"SELECT 'Column UserId already exists in Filters'",
-"ALTER TABLE `Filters` ADD `UserId`  int(10) unsigned AFTER `Name`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
--- a/db/zm_update-1.35.6.sql
+++ b/db/zm_update-1.35.6.sql
@ -1,2 +0,0 @@
-/* This was done in 1.31.0 but zm_create.sql.in wasn't updated to match. */
-ALTER TABLE Monitors MODIFY LinkedMonitors varchar(255);
--- a/db/zm_update-1.35.7.sql
+++ b/db/zm_update-1.35.7.sql
@ -1,23 +0,0 @@
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'Latitude'
-    ) > 0,
-"SELECT 'Column Latitude already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `Latitude`  DECIMAL(10,8) AFTER `Refresh`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'Longitude'
-    ) > 0,
-"SELECT 'Column Longitude already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `Longitude`  DECIMAL(10,8) AFTER `Latitude`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
--- a/db/zm_update-1.35.8.sql
+++ b/db/zm_update-1.35.8.sql
@ -1,12 +0,0 @@
-/* The MEMORY TABLE TYPE IS BAD! Switch to regular InnoDB */
-
-DROP TABLE IF EXISTS `Monitor_Status`;
-CREATE TABLE `Monitor_Status` (
-  `MonitorId` int(10) unsigned NOT NULL,
-  `Status`  enum('Unknown','NotRunning','Running','Connected','Signal') NOT NULL default 'Unknown',
-  `CaptureFPS`  DECIMAL(10,2) NOT NULL default 0,
-  `AnalysisFPS`  DECIMAL(5,2) NOT NULL default 0,
-  `CaptureBandwidth`  INT NOT NULL default 0,
-  PRIMARY KEY (`MonitorId`)
-) ENGINE=InnoDB;
-
--- a/db/zm_update-1.35.9.sql
+++ b/db/zm_update-1.35.9.sql
@ -1,21 +0,0 @@
--
-- This adds Sessions Table
--
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-      FROM INFORMATION_SCHEMA.TABLES
-      WHERE table_name = 'Sessions'
-      AND table_schema = DATABASE()
-    ) > 0,
-    "SELECT 'Sessions table exists'",
-    "CREATE TABLE Sessions (
-  id char(32) not null,
-  access INT(10) UNSIGNED DEFAULT NULL,
-  data text,
-  PRIMARY KEY(id)
-) ENGINE=InnoDB;"
-  ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
--- a/db/zm_update-1.36.6.sql
+++ b/db/zm_update-1.36.6.sql
@ -1 +0,0 @@
-ALTER TABLE `Monitors` MODIFY `Longitude`  DECIMAL(11,8);
--- a/db/zm_update-1.36.9.sql
+++ b/db/zm_update-1.36.9.sql
@ -1,2 +0,0 @@
-UPDATE Monitors set Importance = 'Normal' where Importance IS NULL;
-ALTER TABLE `Monitors` MODIFY `Importance`  enum('Normal','Less','Not') NOT NULL default 'Normal';
--- a/dep/CMakeLists.txt
+++ b/dep/CMakeLists.txt
@ -1,4 +0,0 @@
-add_subdirectory(jwt-cpp)
-add_subdirectory(libbcrypt)
-add_subdirectory(RtspServer)
-add_subdirectory(span-lite)
--- a/dep/RtspServer
+++ b/dep/RtspServer
@ -1 +0,0 @@
-Subproject commit cd7fd49becad6010a1b8466bfebbd93999a39878
--- a/dep/jwt-cpp/CMakeLists.txt
+++ b/dep/jwt-cpp/CMakeLists.txt
@ -1,6 +0,0 @@
-add_library(jwt-cpp INTERFACE)
-add_library(jwt-cpp::jwt-cpp ALIAS jwt-cpp)
-
-target_include_directories(jwt-cpp
-  INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}/include)
--- a/dep/jwt-cpp/README.md
+++ b/dep/jwt-cpp/README.md
@ -1,208 +0,0 @@
-# ![logo](https://raw.githubusercontent.com/Thalhammer/jwt-cpp/master/.github/logo.svg)
-
-[![License Badge](https://img.shields.io/github/license/Thalhammer/jwt-cpp)](https://github.com/Thalhammer/jwt-cpp/blob/master/LICENSE)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/5f7055e294744901991fd0a1620b231d)](https://app.codacy.com/app/Thalhammer/jwt-cpp?utm_source=github.com&utm_medium=referral&utm_content=Thalhammer/jwt-cpp&utm_campaign=Badge_Grade_Settings)
-[![Linux Badge][Linux]][Cross-Platform]
-[![MacOS Badge][MacOS]][Cross-Platform]
-[![Windows Badge][Windows]][Cross-Platform]
-[![Coverage Status](https://coveralls.io/repos/github/Thalhammer/jwt-cpp/badge.svg?branch=master)](https://coveralls.io/github/Thalhammer/jwt-cpp?branch=master)
-[![Documentation Badge](https://img.shields.io/badge/Documentation-master-blue)](https://thalhammer.github.io/jwt-cpp/)
-[![GitHub release (latest SemVer including pre-releases)](https://img.shields.io/github/v/release/Thalhammer/jwt-cpp?include_prereleases)](https://github.com/Thalhammer/jwt-cpp/releases)
-[![Stars Badge](https://img.shields.io/github/stars/Thalhammer/jwt-cpp)](https://github.com/Thalhammer/jwt-cpp/stargazers)
-
-[Linux]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/cross-platform/ubuntu-latest/shields.json
-[MacOS]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/cross-platform/macos-latest/shields.json
-[Windows]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/cross-platform/windows-latest/shields.json
-[Cross-Platform]: https://github.com/Thalhammer/jwt-cpp/actions?query=workflow%3A%22Cross-Platform+CI%22
-
-A header only library for creating and validating [JSON Web Tokens](https://tools.ietf.org/html/rfc7519) in C++11. For a great introduction, [read this](https://jwt.io/introduction/).
-
-## Signature algorithms
-
-jwt-cpp supports all the algorithms defined by the specifications. The modular design allows to easily add additional algorithms without any problems. If you need any feel free to create a pull request or [open an issue](https://github.com/Thalhammer/jwt-cpp/issues/new).
-
-For completeness, here is a list of all supported algorithms:
-
-| HMSC  | RSA   | ECDSA | PSS   | EdDSA   |
-| ----- | ----- | ----- | ----- | ------- |
-| HS256 | RS256 | ES256 | PS256 | Ed25519 |
-| HS384 | RS384 | ES384 | PS384 | Ed448   |
-| HS512 | RS512 | ES512 | PS512 |         |
-
-## SSL Compatibility
-
-In the name of flexibility and extensibility, jwt-cpp supports both [OpenSSL](https://github.com/openssl/openssl) and [LibreSSL](https://github.com/libressl-portable/portable). These are the version which are, or have been, tested:
-
-| OpenSSL        | LibreSSL        |
-| -------------- | --------------- |
-| [1.0.2][1.0.2] | ![3.1.5][3.1]   |
-| 1.1.0          | ![3.2.3][3.2]   |
-| [1.1.1][1.1.1] | ![3.3.1][3.3]   |
-
-[1.0.2]: https://travis-ci.com/github/Thalhammer/jwt-cpp
-[1.1.1]: https://github.com/Thalhammer/jwt-cpp/actions?query=workflow%3A%22Coverage+CI%22
-[3.1]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/libressl/3.1.5/shields.json
-[3.2]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/libressl/3.2.3/shields.json
-[3.3]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/libressl/3.3.1/shields.json
-
-## Overview
-
-There is no hard dependency on a JSON library. Instead, there's a generic `jwt::basic_claim` which is templated around type traits, which described the semantic [JSON types](https://json-schema.org/understanding-json-schema/reference/type.html) for a value, object, array, string, number, integer and boolean, as well as methods to translate between them.
-
-```cpp
-jwt::basic_claim<my_favorite_json_library_traits> claim(json::object({{"json", true},{"example", 0}}));
-```
-
-This allows for complete freedom when picking which libraries you want to use. For more information, [see below](#providing-your-own-json-traits-your-traits).
-
-In order to maintain compatibility, [picojson](https://github.com/kazuho/picojson) is still used to provide a specialized `jwt::claim` along with all helpers. Defining `JWT_DISABLE_PICOJSON` will remove this optional dependency.
-
-As for the base64 requirements of JWTs, this libary provides `base.h` with all the required implentation; However base64 implementations are very common, with varying degrees of performance. When providing your own base64 implementation, you can define `JWT_DISABLE_BASE64` to remove the jwt-cpp implementation.
-
-### Getting Started
-
-Simple example of decoding a token and printing all [claims](https://tools.ietf.org/html/rfc7519#section-4) ([try it out](https://github.com/Thalhammer/jwt-cpp/tree/master/example/print-claims.cpp)):
-
-```cpp
-#include <jwt-cpp/jwt.h>
-#include <iostream>
-
-int main() {
-    std::string token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXUyJ9.eyJpc3MiOiJhdXRoMCJ9.AbIJTDMFc7yUa5MhvcP03nJPyCPzZtQcGEp-zWfOkEE";
-    auto decoded = jwt::decode(token);
-
-    for(auto& e : decoded.get_payload_claims())
-        std::cout << e.first << " = " << e.second << std::endl;
-}
-```
-
-In order to verify a token you first build a verifier and use it to verify a decoded token.
-
-```cpp
-auto verifier = jwt::verify()
-    .allow_algorithm(jwt::algorithm::hs256{ "secret" })
-    .with_issuer("auth0");
-
-verifier.verify(decoded_token);
-```
-
-The created verifier is stateless so you can reuse it for different tokens.
-
-Creating a token (and signing) is equally as easy.
-
-```cpp
-auto token = jwt::create()
-    .set_issuer("auth0")
-    .set_type("JWS")
-    .set_payload_claim("sample", jwt::claim(std::string("test")))
-    .sign(jwt::algorithm::hs256{"secret"});
-```
-
-Here is a simple example of creating a token that will expire in one hour:
-
-```cpp
-auto token = jwt::create()
-    .set_issuer("auth0")
-    .set_issued_at(std::chrono::system_clock::now())
-    .set_expires_at(std::chrono::system_clock::now() + std::chrono::seconds{3600})
-    .sign(jwt::algorithm::hs256{"secret"});
-```
-
-> To see more examples working with RSA public and private keys, visit our [examples](https://github.com/Thalhammer/jwt-cpp/tree/master/example)!
-
-### Providing your own JSON Traits
-
-There are several key items that need to be provided to a `jwt::basic_claim` in order for it to be interoptable with you JSON library of choice.
-
-* type specifications
-* conversion from generic "value type" to a specific type
-* serialization and parsing
-
-If ever you are not sure, the traits are heavily checked against static asserts to make sure you provide everything that's required.
-
-> :warning: Not all JSON libraries are a like, you may need to extent certain types such that it can be used by jwt-cpp. See this [example](https://github.com/Thalhammer/jwt-cpp/blob/ac3de9e69bc698a464dacb256a1b50512843f092/tests/jsoncons/JsonconsTest.cpp).
-
-```cpp
-struct my_favorite_json_library_traits {
-    // Type Specifications
-    using value_type = json; // The generic "value type" implementation, most libraries have one
-    using object_type = json::object_t; // The "map type" string to value
-    using array_type = json::array_t; // The "list type" array of values
-    using string_type = std::string; // The "list of chars", must be a narrow char
-    using number_type = double; // The "percision type"
-    using integer_type = int64_t; // The "integral type"
-    using boolean_type = bool; // The "boolean type"
-
-    // Translation between the implementation notion of type, to the jwt::json::type equivilant
-    static jwt::json::type get_type(const value_type &val) {
-        using jwt::json::type;
-
-        if (val.type() == json::value_t::object)
-            return type::object;
-        if (val.type() == json::value_t::array)
-            return type::array;
-        if (val.type() == json::value_t::string)
-            return type::string;
-        if (val.type() == json::value_t::number_float)
-            return type::number;
-        if (val.type() == json::value_t::number_integer)
-            return type::integer;
-        if (val.type() == json::value_t::boolean)
-            return type::boolean;
-
-        throw std::logic_error("invalid type");
-    }
-
-    // Conversion from generic value to specific type
-    static object_type as_object(const value_type &val);
-    static array_type as_array(const value_type &val);
-    static string_type as_string(const value_type &val);
-    static number_type as_number(const value_type &val);
-    static integer_type as_int(const value_type &val);
-    static boolean_type as_bool(const value_type &val);
-
-    // serilization and parsing
-    static bool parse(value_type &val, string_type str);
-    static string_type serialize(const value_type &val); // with no extra whitespace, padding or indentation
-};
-```
-
-## Contributing
-
-If you have an improvement or found a bug feel free to [open an issue](https://github.com/Thalhammer/jwt-cpp/issues/new) or add the change and create a pull request. If you file a bug please make sure to include as much information about your environment (compiler version, etc.) as possible to help reproduce the issue. If you add a new feature please make sure to also include test cases for it.
-
-## Dependencies
-
-In order to use jwt-cpp you need the following tools.
-
-* libcrypto (openssl or compatible)
-* libssl-dev (for the header files)
-* a compiler supporting at least c++11
-* basic stl support
-
-In order to build the test cases you also need
-
-* gtest
-* pthread
-
-## Troubleshooting
-
-### Expired tokens
-
-If you are generating tokens that seem to immediately expire, you are likely not using UTC. Specifically,
-if you use `get_time` to get the current time, it likely uses localtime, while this library uses UTC,
-which may be why your token is immediately expiring. Please see example above on the right way to use current time.
-
-### Missing \_HMAC and \_EVP_sha256 symbols on Mac
-
-There seems to exists a problem with the included openssl library of MacOS. Make sure you link to one provided by brew.
-See [here](https://github.com/Thalhammer/jwt-cpp/issues/6) for more details.
-
-### Building on windows fails with syntax errors
-
-The header `<Windows.h>`, which is often included in windowsprojects, defines macros for MIN and MAX which screw up std::numeric_limits.
-See [here](https://github.com/Thalhammer/jwt-cpp/issues/5) for more details. To fix this do one of the following things:
-
-* define NOMINMAX, which suppresses this behaviour
-* include this library before you include windows.h
-* place `#undef max` and `#undef min` before you include this library
--- a/dep/jwt-cpp/include/jwt-cpp/base.h
+++ b/dep/jwt-cpp/include/jwt-cpp/base.h
@ -1,208 +0,0 @@
-#ifndef JWT_CPP_BASE_H
-#define JWT_CPP_BASE_H
-
-#include <array>
-#include <stdexcept>
-#include <string>
-
-#ifdef __has_cpp_attribute
-#if __has_cpp_attribute(fallthrough)
-#define JWT_FALLTHROUGH [[fallthrough]]
-#endif
-#endif
-
-#ifndef JWT_FALLTHROUGH
-#define JWT_FALLTHROUGH
-#endif
-
-namespace jwt {
-	/**
-	 * \brief character maps when encoding and decoding
-	 */
-	namespace alphabet {
-		/**
-		 * \brief valid list of characted when working with [Base64](https://tools.ietf.org/html/rfc3548)
-		 */
-		struct base64 {
-			static const std::array<char, 64>& data() {
-				static constexpr std::array<char, 64> data{
-					{'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
-					 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
-					 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
-					 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/'}};
-				return data;
-			}
-			static const std::string& fill() {
-				static std::string fill{"="};
-				return fill;
-			}
-		};
-		/**
-		 * \brief valid list of characted when working with [Base64URL](https://tools.ietf.org/html/rfc4648)
-		 */
-		struct base64url {
-			static const std::array<char, 64>& data() {
-				static constexpr std::array<char, 64> data{
-					{'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
-					 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
-					 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
-					 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '_'}};
-				return data;
-			}
-			static const std::string& fill() {
-				static std::string fill{"%3d"};
-				return fill;
-			}
-		};
-	} // namespace alphabet
-
-	/**
-	 * \brief Alphabet generic methods for working with encoding/decoding the base64 family
-	 */
-	class base {
-	public:
-		template<typename T>
-		static std::string encode(const std::string& bin) {
-			return encode(bin, T::data(), T::fill());
-		}
-		template<typename T>
-		static std::string decode(const std::string& base) {
-			return decode(base, T::data(), T::fill());
-		}
-		template<typename T>
-		static std::string pad(const std::string& base) {
-			return pad(base, T::fill());
-		}
-		template<typename T>
-		static std::string trim(const std::string& base) {
-			return trim(base, T::fill());
-		}
-
-	private:
-		static std::string encode(const std::string& bin, const std::array<char, 64>& alphabet,
-								  const std::string& fill) {
-			size_t size = bin.size();
-			std::string res;
-
-			// clear incomplete bytes
-			size_t fast_size = size - size % 3;
-			for (size_t i = 0; i < fast_size;) {
-				uint32_t octet_a = static_cast<unsigned char>(bin[i++]);
-				uint32_t octet_b = static_cast<unsigned char>(bin[i++]);
-				uint32_t octet_c = static_cast<unsigned char>(bin[i++]);
-
-				uint32_t triple = (octet_a << 0x10) + (octet_b << 0x08) + octet_c;
-
-				res += alphabet[(triple >> 3 * 6) & 0x3F];
-				res += alphabet[(triple >> 2 * 6) & 0x3F];
-				res += alphabet[(triple >> 1 * 6) & 0x3F];
-				res += alphabet[(triple >> 0 * 6) & 0x3F];
-			}
-
-			if (fast_size == size) return res;
-
-			size_t mod = size % 3;
-
-			uint32_t octet_a = fast_size < size ? static_cast<unsigned char>(bin[fast_size++]) : 0;
-			uint32_t octet_b = fast_size < size ? static_cast<unsigned char>(bin[fast_size++]) : 0;
-			uint32_t octet_c = fast_size < size ? static_cast<unsigned char>(bin[fast_size++]) : 0;
-
-			uint32_t triple = (octet_a << 0x10) + (octet_b << 0x08) + octet_c;
-
-			switch (mod) {
-			case 1:
-				res += alphabet[(triple >> 3 * 6) & 0x3F];
-				res += alphabet[(triple >> 2 * 6) & 0x3F];
-				res += fill;
-				res += fill;
-				break;
-			case 2:
-				res += alphabet[(triple >> 3 * 6) & 0x3F];
-				res += alphabet[(triple >> 2 * 6) & 0x3F];
-				res += alphabet[(triple >> 1 * 6) & 0x3F];
-				res += fill;
-				break;
-			default: break;
-			}
-
-			return res;
-		}
-
-		static std::string decode(const std::string& base, const std::array<char, 64>& alphabet,
-								  const std::string& fill) {
-			size_t size = base.size();
-
-			size_t fill_cnt = 0;
-			while (size > fill.size()) {
-				if (base.substr(size - fill.size(), fill.size()) == fill) {
-					fill_cnt++;
-					size -= fill.size();
-					if (fill_cnt > 2) throw std::runtime_error("Invalid input");
-				} else
-					break;
-			}
-
-			if ((size + fill_cnt) % 4 != 0) throw std::runtime_error("Invalid input");
-
-			size_t out_size = size / 4 * 3;
-			std::string res;
-			res.reserve(out_size);
-
-			auto get_sextet = [&](size_t offset) {
-				for (size_t i = 0; i < alphabet.size(); i++) {
-					if (alphabet[i] == base[offset]) return static_cast<uint32_t>(i);
-				}
-				throw std::runtime_error("Invalid input");
-			};
-
-			size_t fast_size = size - size % 4;
-			for (size_t i = 0; i < fast_size;) {
-				uint32_t sextet_a = get_sextet(i++);
-				uint32_t sextet_b = get_sextet(i++);
-				uint32_t sextet_c = get_sextet(i++);
-				uint32_t sextet_d = get_sextet(i++);
-
-				uint32_t triple = (sextet_a << 3 * 6) + (sextet_b << 2 * 6) + (sextet_c << 1 * 6) + (sextet_d << 0 * 6);
-
-				res += static_cast<char>((triple >> 2 * 8) & 0xFFU);
-				res += static_cast<char>((triple >> 1 * 8) & 0xFFU);
-				res += static_cast<char>((triple >> 0 * 8) & 0xFFU);
-			}
-
-			if (fill_cnt == 0) return res;
-
-			uint32_t triple = (get_sextet(fast_size) << 3 * 6) + (get_sextet(fast_size + 1) << 2 * 6);
-
-			switch (fill_cnt) {
-			case 1:
-				triple |= (get_sextet(fast_size + 2) << 1 * 6);
-				res += static_cast<char>((triple >> 2 * 8) & 0xFFU);
-				res += static_cast<char>((triple >> 1 * 8) & 0xFFU);
-				break;
-			case 2: res += static_cast<char>((triple >> 2 * 8) & 0xFFU); break;
-			default: break;
-			}
-
-			return res;
-		}
-
-		static std::string pad(const std::string& base, const std::string& fill) {
-			std::string padding;
-			switch (base.size() % 4) {
-			case 1: padding += fill; JWT_FALLTHROUGH;
-			case 2: padding += fill; JWT_FALLTHROUGH;
-			case 3: padding += fill; JWT_FALLTHROUGH;
-			default: break;
-			}
-
-			return base + padding;
-		}
-
-		static std::string trim(const std::string& base, const std::string& fill) {
-			auto pos = base.find(fill);
-			return base.substr(0, pos);
-		}
-	};
-} // namespace jwt
-
-#endif
--- a/dep/jwt-cpp/include/jwt-cpp/jwt.h
+++ b/dep/jwt-cpp/include/jwt-cpp/jwt.h
--- a/dep/jwt-cpp/include/nlohmann/json.hpp
+++ b/dep/jwt-cpp/include/nlohmann/json.hpp
--- a/dep/libbcrypt/CMakeLists.txt
+++ b/dep/libbcrypt/CMakeLists.txt
@ -1,25 +0,0 @@
-enable_language(ASM)
-
-set(BCRYPT_SOURCES
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/bcrypt.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/crypt_blowfish.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/crypt_gensalt.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/wrapper.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/x86.S)
-
-add_library(bcrypt STATIC ${BCRYPT_SOURCES})
-add_library(libbcrypt::bcrypt ALIAS bcrypt)
-
-target_include_directories(bcrypt
-  PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}/include/bcrypt)
-
-target_link_libraries(bcrypt
-  PRIVATE
-    zm-dependency-interface)
-
-if(BSD)
-  target_compile_definitions(bcrypt
-    PRIVATE
-      __SKIP_GNU)
-endif()
--- a/dep/span-lite/CMakeLists.txt
+++ b/dep/span-lite/CMakeLists.txt
@ -1,5 +0,0 @@
-add_library(span-lite INTERFACE)
-add_library(martinmoene::span-lite ALIAS span-lite)
-
-target_include_directories(span-lite INTERFACE
-  ${CMAKE_CURRENT_SOURCE_DIR}/include)
--- a/dep/span-lite/LICENSE.txt
+++ b/dep/span-lite/LICENSE.txt
@ -1,23 +0,0 @@
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--- a/dep/span-lite/README.md
+++ b/dep/span-lite/README.md
@ -1,514 +0,0 @@
-<a id="top"></a>
-# span lite: A single-file header-only version of a C++20-like span for C++98, C++11 and later
-
-[![Language](https://img.shields.io/badge/C%2B%2B-98/11/14/17/20-blue.svg)](https://en.wikipedia.org/wiki/C%2B%2B#Standardization) [![License](https://img.shields.io/badge/license-BSL-blue.svg)](https://opensource.org/licenses/BSL-1.0) [![Build Status](https://travis-ci.org/martinmoene/span-lite.svg?branch=master)](https://travis-ci.org/martinmoene/span-lite) [![Build status](https://ci.appveyor.com/api/projects/status/1ha3wnxtam547m8p?svg=true)](https://ci.appveyor.com/project/martinmoene/span-lite) [![Version](https://badge.fury.io/gh/martinmoene%2Fspan-lite.svg)](https://github.com/martinmoene/span-lite/releases) [![download](https://img.shields.io/badge/latest-download-blue.svg)](https://github.com/martinmoene/span-lite/blob/master/include/nonstd/span.hpp) [![Conan](https://img.shields.io/badge/on-conan-blue.svg)](https://conan.io/center/span-lite) [![Try it on wandbox](https://img.shields.io/badge/on-wandbox-blue.svg)](https://wandbox.org/permlink/venR3Ko2Q4tlvcVk) [![Try it on godbolt online](https://img.shields.io/badge/on-godbolt-blue.svg)](https://godbolt.org/z/htwpnb)
-
-**Contents**  
-
- [Example usage](#example-usage)
- [In a nutshell](#in-a-nutshell)
- [License](#license)
- [Dependencies](#dependencies)
- [Installation and use](#installation-and-use)
- [Synopsis](#synopsis)
- [Reported to work with](#reported-to-work-with)
- [Building the tests](#building-the-tests)
- [Other implementations of span](#other-implementations-of-span)
- [Notes and references](#notes-and-references)
- [Appendix](#appendix)
-
-## Example usage
-
-```cpp
-#include "nonstd/span.hpp"
-#include <array>
-#include <vector>
-#include <iostream>
-
-std::ptrdiff_t size( nonstd::span<const int> spn )
-{
-    return spn.size();
-}
-
-int main()
-{
-    int arr[] = { 1, };
-
-    std::cout << 
-        "C-array:" << size( arr ) <<
-        " array:"  << size( std::array <int, 2>{ 1, 2, } ) <<
-        " vector:" << size( std::vector<int   >{ 1, 2, 3, } );
-}
-```
-
-### Compile and run
-
-```bash
-prompt> g++ -std=c++11 -Wall -I../include -o 01-basic.exe 01-basic.cpp && 01-basic.exe
-C-array:1 array:2 vector:3
-```
-
-## In a nutshell
-
-**span lite** is a single-file header-only library to provide a bounds-safe view for sequences of objects. The library provides a [C++20-like span](http://en.cppreference.com/w/cpp/container/span) for use with C++98 and later. If available, `std::span` is used, unless [configured otherwise](#configuration). *span-lite* can detect the presence of [*byte-lite*](https://github.com/martinmoene/byte-lite) and if present, it provides `as_bytes()` and `as_writable_bytes()` also for C++14 and earlier. 
-
-**Features and properties of span lite** are ease of installation (single header), freedom of dependencies other than the standard library. To compensate for the class template argument deduction that is missing from pre-C++17 compilers, `nonstd::span` can provide `make_span` functions. See [configuration](#configuration).
-
-## License
-
-*span lite* is distributed under the [Boost Software License](https://github.com/martinmoene/span-lite/blob/master/LICENSE.txt).
-
-## Dependencies
-
-*span lite* has no other dependencies than the [C++ standard library](http://en.cppreference.com/w/cpp/header).
-
-## Installation and use
-
-*span lite* is a single-file header-only library. Put `span.hpp` in the [include](include) folder directly into the project source tree or somewhere reachable from your project.
-
-## Synopsis
-
-**Contents**  
-[Documentation of `std::span`](#documentation-of-stdspan)  
-[Later additions](#later-additions)  
-[Non-standard extensions](#non-standard-extensions)  
-[Configuration](#configuration)  
-
-## Documentation of `std::span`
-
-Depending on the compiler and C++-standard used, `nonstd::span` behaves less or more like `std::span`. To get an idea of the capabilities of `nonstd::span` with your configuration, look at the output of the [tests](test/span.t.cpp), issuing `span-main.t --pass @`. For `std::span`, see its [documentation at cppreference](http://en.cppreference.com/w/cpp/container/span).  
-
-## Later additions
-
-### `back()` and `front()`
-
-*span lite* can provide `back()` and `front()` member functions for element access. See the table below and section [configuration](#configuration).
-
-## Non-standard extensions
-
-### Construct from container
-
-To construct a span from a container with compilers that cannot constrain such a single-parameter constructor to containers, *span lite* provides a constructor that takes an additional parameter of type `with_container_t`. Use `with_container` as value for this parameter. See the table below and section [configuration](#configuration).
-
-### Construct from `std::array` with const data
-
-*span lite* can provide construction of a span from a `std::array` with const data. See the table below and section [configuration](#configuration).
-
-### `operator()`
-
-*span lite* can provide member function call `operator()` for element access. It is equivalent to `operator[]` and has been marked `[[deprecated]]`. Its main purpose is to provide a migration path. 
-
-### `at()`
-
-*span lite* can provide member function `at()` for element access. Unless exceptions have been disabled, `at()` throws std::out_of_range if the index falls outside the span. With exceptions disabled, `at(index_t)` delegates bounds checking to `operator[](index_t)`. See the table below and sections [configuration](#configuration) and [disable exceptions](#disable-exceptions).
-
-### `swap()`
-
-*span lite* can provide a `swap()`member function. See the table below and section [configuration](#configuration).
-
-### `operator==()` and other comparison functions
-
-*span lite* can provide functions to compare the content of two spans. However, C++20's span will not provide comparison and _span lite_ will omit comparison at default in the near future. See the table below and section [configuration](#configuration). See also [Revisiting Regular Types](#regtyp).
-
-### `same()`
-
-*span lite* can provide function `same()` to determine if two spans refer as identical spans to the same data via the same type. If `same()` is enabled, `operator==()` incorporates it in its comparison. See the table below and section [configuration](#configuration).
-
-### `first()`, `last()` and `subspan()`
-
-*span lite* can provide functions `first()`, `last()` and `subspan()` to avoid having to use the *dot template* syntax when the span is a dependent type. See the table below and section [configuration](#configuration).
-
-### `make_span()`
-
-*span lite* can provide `make_span()` creator functions to compensate for the class template argument deduction that is missing from pre-C++17 compilers. See the table below and section [configuration](#configuration).
-
-### `byte_span()`
-
-*span lite* can provide `byte_span()` creator functions to represent an object as a span of bytes. This requires the C++17 type `std::byte` to be available. See the table below and section [configuration](#configuration).
-
-| Kind               | std  | Function or method |
-|--------------------|------|--------------------|
-| **Macro**          |&nbsp;| macro **`span_FEATURE_WITH_CONTAINER`**<br>macro **`span_FEATURE_WITH_CONTAINER_TO_STD`** |
-| **Types**          |&nbsp;| **with_container_t** type to disambiguate below constructors |
-| **Objects**        |&nbsp;| **with_container** value to disambiguate below constructors |
-| **Constructors**   |&nbsp;| macro **`span_FEATURE_CONSTRUCTION_FROM_STDARRAY_ELEMENT_TYPE`**|
-| &nbsp;             |&nbsp;| template&lt;class Container><br>constexpr **span**(with_container_t, Container & cont) |
-| &nbsp;             |&nbsp;| template&lt;class Container><br>constexpr **span**(with_container_t, Container const & cont) |
-| &nbsp;             |&nbsp;| &nbsp; |
-| **Methods**        |&nbsp;| macro **`span_FEATURE_MEMBER_CALL_OPERATOR`** |
-| &nbsp;             |&nbsp;| constexpr reference **operator()**(index_t idx) const<br>Equivalent to **operator[]**(), marked `[[deprecated]]` |
-| &nbsp;             |&nbsp;| &nbsp; |
-| **Methods**        |&nbsp;| macro **`span_FEATURE_MEMBER_AT`** |
-| &nbsp;             |&nbsp;| constexpr reference **at**(index_t idx) const<br>May throw std::out_of_range exception |
-| &nbsp;             |&nbsp;| &nbsp; |
-| **Methods**        |&nbsp;| macro **`span_FEATURE_MEMBER_BACK_FRONT`** (on since v0.5.0) |
-| &nbsp;             |&nbsp;| constexpr reference **back()** const noexcept  |
-| &nbsp;             |&nbsp;| constexpr reference **front()** const noexcept |
-| &nbsp;             |&nbsp;| &nbsp; |
-| **Method**         |&nbsp;| macro **`span_FEATURE_MEMBER_SWAP`** |
-| &nbsp;             |&nbsp;| constexpr void **swap**(span & other) noexcept  |
-| &nbsp;             |&nbsp;| &nbsp; |
-| **Free functions** |&nbsp;| macro **`span_FEATURE_COMPARISON`** |
-|<br><br>== != < > <= >= |&nbsp;| template&lt;class T1, index_t E1, class T2, index_t E2><br>constexpr bool<br>**operator==**( span<T1,E1> const & l, span<T2,E2> const & r) noexcept |
-| &nbsp;             |&nbsp;| &nbsp; |
-| **Free function**  |&nbsp;| macro **`span_FEATURE_SAME`** |
-| &nbsp;             |&nbsp;| template&lt;class T1, index_t E1, class T2, index_t E2><br>constexpr bool<br>**same**( span<T1,E1> const & l, span<T2,E2> const & r) noexcept |
-| &nbsp;             |&nbsp;| &nbsp; |
-| **Free functions** |&nbsp;| macro **`span_FEATURE_NON_MEMBER_FIRST_LAST_SUB`** |
-| &nbsp; | >= C++11  | template&lt;extent_t Count, class T><br>constexpr auto<br>**first**(T & t) ->... |
-| &nbsp; | >= C++11  | template&lt;class T><br>constexpr auto<br>**first**(T & t, index_t count) ->... |
-| &nbsp; | >= C++11  | template&lt;extent_t Count, class T><br>constexpr auto<br>**last**(T & t) ->... |
-| &nbsp; | >= C++11  | template&lt;class T><br>constexpr auto<br>**last**(T & t, extent_t count) ->... |
-| &nbsp; | >= C++11  | template&lt;index_t Offset, extent_t Count = dynamic_extent, class T><br>constexpr auto<br>**subspan**(T & t) ->... |
-| &nbsp; | >= C++11  | template&lt;class T><br>constexpr auto<br>**subspan**(T & t, index_t offset, extent_t count = dynamic_extent) ->... |
-| &nbsp; | &nbsp;    | &nbsp; |
-| **Free functions** |&nbsp;| macro **`span_FEATURE_MAKE_SPAN`**<br>macro **`span_FEATURE_MAKE_SPAN_TO_STD`** |
-| &nbsp; | &nbsp;    | template&lt;class T><br>constexpr span&lt;T><br>**make_span**(T \* first, T \* last) noexcept |
-| &nbsp; | &nbsp;    | template&lt;class T><br>constexpr span&lt;T><br>**make_span**(T \* ptr, index_t count) noexcept |
-| &nbsp; | &nbsp;    | template&lt;class T, size_t N><br>constexpr span&lt;T,N><br>**make_span**(T (&arr)[N]) noexcept |
-| &nbsp; | >= C++11  | template&lt;class T, size_t N><br>constexpr span&lt;T,N><br>**make_span**(std::array&lt;T,N> & arr) noexcept |
-| &nbsp; | >= C++11  | template&lt;class T, size_t N><br>constexpr span&lt;const T,N><br>**make_span**(std::array&lt;T,N > const & arr) noexcept |
-| &nbsp; | >= C++11  | template&lt;class Container><br>constexpr auto<br>**make_span**(Container & cont) -><br>&emsp;span&lt;typename Container::value_type> noexcept |
-| &nbsp; | >= C++11  | template&lt;class Container><br>constexpr auto<br>**make_span**(Container const & cont) -><br>&emsp;span&lt;const typename Container::value_type> noexcept |
-| &nbsp; | &nbsp;    | template&lt;class Container><br>span&lt;typename Container::value_type><br>**make_span**( with_container_t, Container & cont ) |
-| &nbsp; | &nbsp;    | template&lt;class Container><br>span&lt;const typename Container::value_type><br>**make_span**( with_container_t, Container const & cont ) |
-| &nbsp; | < C++11   | template&lt;class T, Allocator><br>span&lt;T><br>**make_span**(std::vector&lt;T, Allocator> & cont) |
-| &nbsp; | < C++11   | template&lt;class T, Allocator><br>span&lt;const T><br>**make_span**(std::vector&lt;T, Allocator> const & cont) |
-| &nbsp; | &nbsp;    | &nbsp; |                                       
-| **Free functions** |&nbsp;| macro **`span_FEATURE_BYTE_SPAN`** |
-| &nbsp; | >= C++11  | template&lt;class T><br>span&lt;T, sizeof(T)><br>**byte_span**(T & t) |
-| &nbsp; | >= C++11  | template&lt;class T><br>span&lt;const T, sizeof(T)><br>**byte_span**(T const & t) |
-
-## Configuration
-
-### Tweak header
-
-If the compiler supports [`__has_include()`](https://en.cppreference.com/w/cpp/preprocessor/include), *span lite* supports the [tweak header](https://vector-of-bool.github.io/2020/10/04/lib-configuration.html) mechanism. Provide your *tweak header* as `nonstd/span.tweak.hpp` in a folder in the include-search-path. In the tweak header, provide definitions as documented below, like `#define span_CONFIG_NO_EXCEPTIONS 1`.
-
-### Standard selection macro
-
-\-D<b>span\_CPLUSPLUS</b>=199711L  
-Define this macro to override the auto-detection of the supported C++ standard, if your compiler does not set the `__cplusplus` macro correctly.
-
-### Select `std::span` or `nonstd::span`
-
-At default, *span lite* uses `std::span` if it is available and lets you use it via namespace `nonstd`. You can however override this default and explicitly request to use `std::span` or span lite's `nonstd::span` as `nonstd::span` via the following macros.
-
-D<b>span\_CONFIG\_SELECT\_SPAN</b>=span_SPAN_DEFAULT  
-Define this to `span_SPAN_STD` to select `std::span` as `nonstd::span`. Define this to `span_SPAN_NONSTD` to select `nonstd::span` as `nonstd::span`. Default is undefined, which has the same effect as defining to `span_SPAN_DEFAULT`.
-
-### Select extent type
-
-D<b>span_CONFIG_EXTENT_TYPE</b>=std::size_t  
-Define this to `std::ptrdiff_t` to use the signed type. The default is `std::size_t`, as in C++20 (since v0.7.0).
-
-### Select size type
-
-D<b>span_CONFIG_SIZE_TYPE</b>=std::size_t  
-Define this to `std::ptrdiff_t` to use the signed type. The default is `std::size_t`, as in C++20 (since v0.7.0). Note `span_CONFIG_SIZE_TYPE` replaces `span_CONFIG_INDEX_TYPE` which is deprecated.
-
-### Disable exceptions
-
-D<b>span_CONFIG_NO_EXCEPTIONS</b>=0  
-Define this to 1 if you want to compile without exceptions. If not defined, the header tries and detect if exceptions have been disabled (e.g. via `-fno-exceptions`). Disabling exceptions will force contract violation to use termination, see [contract violation macros](#contract-violation-response-macros). Default is undefined.
-
-### Provide construction using `with_container_t`
-
-D<b>span_FEATURE_WITH_CONTAINER</b>=0  
-Define this to 1 to enable constructing a span using `with_container_t`. Note that `span_FEATURE_WITH_CONTAINER` takes precedence over `span_FEATURE_WITH_CONTAINER_TO_STD`. Default is undefined.
-
-D<b>span_FEATURE_WITH_CONTAINER_TO_STD</b>=*n*  
-Define this to the highest C++ language version for which to enable constructing a span using `with_container_t`, like 98, 03, 11, 14, 17, 20. You can use 99 for inclusion with any standard, but prefer to use `span_FEATURE_WITH_CONTAINER` for this. Note that `span_FEATURE_WITH_CONTAINER` takes precedence over `span_FEATURE_WITH_CONTAINER_TO_STD`. Default is undefined.
-
-### Provide construction from `std::array` with const data
-
-D<b>span_FEATURE_CONSTRUCTION_FROM_STDARRAY_ELEMENT_TYPE</b>=0  
-Define this to 1 to enable constructing a span from a std::array with const data. Default is undefined.
-
-### Provide `operator()` member function
-
-D<b>span_FEATURE_MEMBER_CALL_OPERATOR</b>=0  
-Define this to 1 to provide member function `operator()`for element access. It is equivalent to `operator[]` and has been marked `[[deprecated]]`. Its main purpose is to provide a migration path. Default is undefined.
-
-### Provide `at()` member function
-
-D<b>span_FEATURE_MEMBER_AT</b>=0  
-Define this to 1 to provide member function `at()`. Define this to 2 to include index and size in message of std::out_of_range exception. Default is undefined.
-
-### Provide `back()` and `front()` member functions
-
-D<b>span_FEATURE_MEMBER_BACK_FRONT</b>=1  _(on since v0.5.0)_  
-Define this to 0 to omit member functions `back()` and `front()`. Default is undefined.
-
-### Provide `swap()` member function
-
-D<b>span_FEATURE_MEMBER_SWAP</b>=0  
-Define this to 1 to provide member function `swap()`. Default is undefined.
-
-### Provide `operator==()` and other comparison functions
-
-D<b>span_FEATURE_COMPARISON</b>=0  
-Define this to 1 to include the comparison functions to compare the content of two spans. C++20's span does not provide comparison and _span lite_ omits comparison from v0.7.0. Default is undefined.
-
-### Provide `same()` function
-
-D<b>span_FEATURE_SAME</b>=0  
-Define this to 1 to provide function `same()` to test if two spans refer as identical spans to the same data via the same type. If `same()` is enabled, `operator==()` incorporates it in its comparison. Default is undefined.
-
-### Provide `first()`, `last()` and `subspan()` functions
-
-D<b>span_FEATURE_NON_MEMBER_FIRST_LAST_SUB</b>=0  
-Define this to 1 to provide functions `first()`, `last()` and `subspan()`. This implies `span_FEATURE_MAKE_SPAN` to provide functions `make_span()` that are required for this feature. Default is undefined.
-
-### Provide `make_span()` functions
-
-D<b>span_FEATURE_MAKE_SPAN</b>=0  
-Define this to 1 to provide creator functions `nonstd::make_span()`. This feature is implied by using `span_FEATURE_NON_MEMBER_FIRST_LAST_SUB=1`. Note that `span_FEATURE_MAKE_SPAN` takes precedence over `span_FEATURE_MAKE_SPAN_TO_STD`. Default is undefined.
-
-D<b>span_FEATURE_MAKE_SPAN_TO_STD</b>=*n*  
-Define this to the highest C++ language version for which to provide creator functions `nonstd::make_span()`, like 98, 03, 11, 14, 17, 20. You can use 99 for inclusion with any standard, but prefer to use `span_FEATURE_MAKE_SPAN` for this. Note that `span_FEATURE_MAKE_SPAN` takes precedence over `span_FEATURE_MAKE_SPAN_TO_STD`. Default is undefined.
-
-### Provide `byte_span()` functions
-
-D<b>span_FEATURE_BYTE_SPAN</b>=0  
-Define this to 1 to provide creator functions `nonstd::byte_span()`. Default is undefined.
-
-### Contract violation response macros
-
-*span-lite* provides contract violation response control as suggested in proposal [N4415](http://wg21.link/n4415).
-
-\-D<b>span\_CONFIG\_CONTRACT\_LEVEL\_ON</b>  (*default*)  
-Define this macro to include both `span_EXPECTS` and `span_ENSURES` in the code. This is the default case.
-
-\-D<b>span\_CONFIG\_CONTRACT\_LEVEL\_OFF</b>  
-Define this macro to exclude both `span_EXPECTS` and `span_ENSURES` from the code.
-
-\-D<b>span\_CONFIG_CONTRACT\_LEVEL\_EXPECTS\_ONLY</b>  
-Define this macro to include `span_EXPECTS` in the code and exclude `span_ENSURES` from the code.
-
-\-D<b>span\_CONFIG\_CONTRACT\_LEVEL\_ENSURES\_ONLY</b>  
-Define this macro to exclude `span_EXPECTS` from the code and include `span_ENSURES` in the code.
-
-\-D<b>span\_CONFIG\_CONTRACT\_VIOLATION\_TERMINATES</b>  (*default*)  
-Define this macro to call `std::terminate()` on a contract violation in `span_EXPECTS`, `span_ENSURES`. This is the default case.
-
-\-D<b>span\_CONFIG\_CONTRACT\_VIOLATION\_THROWS</b>  
-Define this macro to throw an exception of implementation-defined type that is derived from `std::runtime_exception` instead of calling `std::terminate()` on a contract violation in `span_EXPECTS` and `span_ENSURES`. See also [disable exceptions](#disable-exceptions).
-
-Reported to work with
--------------------
-The table below mentions the compiler versions *span lite* is reported to work with.
-
-OS           | Compiler   | Where   | Versions |
------------:|:-----------|:--------|:---------|
-**GNU/Linux**| Clang/LLVM | Travis  | 3.5.0, 3.6.2, 3.7.1, 3.8.0, 3.9.1, 4.0.1  |
- &nbsp;      | GCC        | Travis  | 5.5.0, 6.4.0, 7.3.0 |
-**OS X**     | ?          | Local   | ?        |
-**Windows**  | Clang/LLVM | Local   | 6.0.0    |
-&nbsp;       | GCC        | Local   | 7.2.0    |
-&nbsp;       | Visual C++<br>(Visual Studio)| Local | 8 (2005), 10 (2010), 11 (2012),<br>12 (2013), 14 (2015), 15 (2017) |
-&nbsp;       | Visual C++<br>(Visual Studio)| AppVeyor | 10 (2010), 11 (2012),<br>12 (2013), 14 (2015), 15 (2017) |
-
-## Building the tests
-
-To build the tests you need:
-
- [CMake](http://cmake.org), version 3.0 or later to be installed and in your PATH.
- A [suitable compiler](#reported-to-work-with).
-
-The [*lest* test framework](https://github.com/martinmoene/lest) is included in the [test folder](test).
-
-The following steps assume that the [*span lite* source code](https://github.com/martinmoene/span-lite) has been cloned into a directory named `./span-lite`.
-
-1. Create a directory for the build outputs.
-
-        cd ./span-lite
-        md build && cd build
-
-2. Configure CMake to use the compiler of your choice (run `cmake --help` for a list).
-
-        cmake -G "Unix Makefiles" -DSPAN_LITE_OPT_BUILD_TESTS=ON ..
-
-3. Optional. You can control above configuration through the following options:
-
-    `-DSPAN_LITE_OPT_BUILD_TESTS=ON`: build the tests for span, default off  
-    `-DSPAN_LITE_OPT_BUILD_EXAMPLES=OFF`: build the examples, default off  
-
-4. Build the test suite.
-
-        cmake --build .
-
-5. Run the test suite.
-
-        ctest -V
-
-All tests should pass, indicating your platform is supported and you are ready to use *span lite*.
-
-## Other implementations of span
-
- *gsl-lite* [span](https://github.com/martinmoene/gsl-lite/blob/73c4f16f2b35fc174fc2f09d44d5ab13e5c638c3/include/gsl/gsl-lite.hpp#L1221).
- Microsoft GSL [span](https://github.com/Microsoft/GSL/blob/master/include/gsl/span).
- Google Abseil [span](https://github.com/abseil/abseil-cpp/blob/master/absl/types/span.h).
- Marshall Clow's [libc++ span snippet](https://github.com/mclow/snippets/blob/master/span.cpp).
- Tristan Brindle's [Implementation of C++20's std::span for older compilers](https://github.com/tcbrindle/span).
- [Search _span c++_ on GitHub](https://github.com/search?l=C%2B%2B&q=span+c%2B%2B&type=Repositories&utf8=%E2%9C%93).
-
-## Notes and references
-
-*Interface and specification*
-
- [span on cppreference](https://en.cppreference.com/w/cpp/container/span).
- [p0122 - C++20 Proposal](http://wg21.link/p0122).
- [span in C++20 Working Draft](http://eel.is/c++draft/views).
-
-*Presentations*
-
- TBD
-
-*Proposals*
-
- [p0122 - span: bounds-safe views for sequences of objects](http://wg21.link/p0122).
- [p1024 - Usability Enhancements for std::span](http://wg21.link/p1024).
- [p1419 - A SFINAE-friendly trait to determine the extent of statically sized containers](http://wg21.link/p1419).  
- [p0805 - Comparing Containers](http://wg21.link/p0805).
- [p1085 - Should Span be Regular?](http://wg21.link/p0805).
- [p0091 - Template argument deduction for class templates](http://wg21.link/p0091).
- [p0856 - Restrict Access Property for mdspan and span](http://wg21.link/p0856).
- [p1428 - Subscripts and sizes should be signed](http://wg21.link/p1428).
- [p1089 - Sizes Should Only span Unsigned](http://wg21.link/p1089).
- [p1227 - Signed size() functions](http://wg21.link/p1227).
- [p1872 - span should have size_type, not index_type](http://wg21.link/p1872).
- [lwg 3101 - span's Container constructors need another constraint](https://cplusplus.github.io/LWG/issue3101).
- [Reddit - 2018-06 Rapperswil ISO C++ Committee Trip Report](https://www.reddit.com/r/cpp/comments/8prqzm/2018_rapperswil_iso_c_committee_trip_report/)
- [Reddit - 2018-11 San Diego ISO C++ Committee Trip Report](https://www.reddit.com/r/cpp/comments/9vwvbz/2018_san_diego_iso_c_committee_trip_report_ranges/).
- [Reddit - 2019-02 Kona ISO C++ Committee Trip Report](https://www.reddit.com/r/cpp/comments/au0c4x/201902_kona_iso_c_committee_trip_report_c20/).
- [Reddit - 2019-07 Cologne ISO C++ Committee Trip Report](https://www.reddit.com/r/cpp/comments/cfk9de/201907_cologne_iso_c_committee_trip_report_the/)
- [Reddit - 2019-11 Belfast ISO C++ Committee Trip Report](https://www.reddit.com/r/cpp/comments/dtuov8/201911_belfast_iso_c_committee_trip_report/)
- <a id="regtyp"></a>Titus Winters. [Revisiting Regular Types](https://abseil.io/blog/20180531-regular-types). Abseil Blog. 31 May 2018.
-
-## Appendix
-
-### A.1 Compile-time information
-
-The version of *span lite* is available via tag `[.version]`. The following tags are available for information on the compiler and on the C++ standard library used: `[.compiler]`, `[.stdc++]`, `[.stdlanguage]` and `[.stdlibrary]`.
-
-### A.2 Span lite test specification
-
-<details>
-<summary>click to expand</summary>
-<p>
-
-```Text
-span<>: Terminates construction from a nullptr and a non-zero size (C++11)
-span<>: Terminates construction from two pointers in the wrong order
-span<>: Terminates construction from a null pointer and a non-zero size
-span<>: Terminates creation of a sub span of the first n elements for n exceeding the span
-span<>: Terminates creation of a sub span of the last n elements for n exceeding the span
-span<>: Terminates creation of a sub span outside the span
-span<>: Terminates access outside the span
-span<>: Throws  on access outside the span via at(): std::out_of_range [span_FEATURE_MEMBER_AT>0][span_CONFIG_NO_EXCEPTIONS=0]
-span<>: Termination throws std::logic_error-derived exception [span_CONFIG_CONTRACT_VIOLATION_THROWS=1]
-span<>: Allows to default-construct
-span<>: Allows to construct from a nullptr and a zero size (C++11)
-span<>: Allows to construct from two pointers
-span<>: Allows to construct from two iterators
-span<>: Allows to construct from two iterators - empty range
-span<>: Allows to construct from an iterator and a size
-span<>: Allows to construct from an iterator and a size - empty range
-span<>: Allows to construct from two pointers to const
-span<>: Allows to construct from a non-null pointer and a size
-span<>: Allows to construct from a non-null pointer to const and a size
-span<>: Allows to construct from a temporary pointer and a size
-span<>: Allows to construct from a temporary pointer to const and a size
-span<>: Allows to construct from any pointer and a zero size (C++98)
-span<>: Allows to construct from a pointer and a size via a deduction guide (C++17)
-span<>: Allows to construct from an iterator and a size via a deduction guide (C++17)
-span<>: Allows to construct from two iterators via a deduction guide (C++17)
-span<>: Allows to construct from a C-array
-span<>: Allows to construct from a C-array via a deduction guide (C++17)
-span<>: Allows to construct from a const C-array
-span<>: Allows to construct from a C-array with size via decay to pointer (potentially dangerous)
-span<>: Allows to construct from a const C-array with size via decay to pointer (potentially dangerous)
-span<>: Allows to construct from a std::initializer_list<> (C++11)
-span<>: Allows to construct from a std::array<> (C++11)
-span<>: Allows to construct from a std::array via a deduction guide (C++17)
-span<>: Allows to construct from a std::array<> with const data (C++11, span_FEATURE_CONSTR..._ELEMENT_TYPE=1)
-span<>: Allows to construct from an empty std::array<> (C++11)
-span<>: Allows to construct from a container (std::vector<>)
-span<>: Allows to construct from a container via a deduction guide (std::vector<>, C++17)
-span<>: Allows to tag-construct from a container (std::vector<>)
-span<>: Allows to tag-construct from a const container (std::vector<>)
-span<>: Allows to copy-construct from another span of the same type
-span<>: Allows to copy-construct from another span of a compatible type
-span<>: Allows to copy-construct from a temporary span of the same type (C++11)
-span<>: Allows to copy-assign from another span of the same type
-span<>: Allows to copy-assign from a temporary span of the same type (C++11)
-span<>: Allows to create a sub span of the first n elements
-span<>: Allows to create a sub span of the last n elements
-span<>: Allows to create a sub span starting at a given offset
-span<>: Allows to create a sub span starting at a given offset with a given length
-span<>: Allows to observe an element via array indexing
-span<>: Allows to observe an element via call indexing
-span<>: Allows to observe an element via at() [span_FEATURE_MEMBER_AT>0]
-span<>: Allows to observe an element via data()
-span<>: Allows to observe the first element via front() [span_FEATURE_MEMBER_BACK_FRONT=1]
-span<>: Allows to observe the last element via back() [span_FEATURE_MEMBER_BACK_FRONT=1]
-span<>: Allows to change an element via array indexing
-span<>: Allows to change an element via call indexing
-span<>: Allows to change an element via at() [span_FEATURE_MEMBER_AT>0]
-span<>: Allows to change an element via data()
-span<>: Allows to change the first element via front() [span_FEATURE_MEMBER_BACK_FRONT=1]
-span<>: Allows to change the last element via back() [span_FEATURE_MEMBER_BACK_FRONT=1]
-span<>: Allows to swap with another span [span_FEATURE_MEMBER_SWAP=1]
-span<>: Allows forward iteration
-span<>: Allows const forward iteration
-span<>: Allows reverse iteration
-span<>: Allows const reverse iteration
-span<>: Allows to identify if a span is the same as another span [span_FEATURE_SAME=1]
-span<>: Allows to compare equal to another span of the same type [span_FEATURE_COMPARISON=1]
-span<>: Allows to compare unequal to another span of the same type [span_FEATURE_COMPARISON=1]
-span<>: Allows to compare less than another span of the same type [span_FEATURE_COMPARISON=1]
-span<>: Allows to compare less than or equal to another span of the same type [span_FEATURE_COMPARISON=1]
-span<>: Allows to compare greater than another span of the same type [span_FEATURE_COMPARISON=1]
-span<>: Allows to compare greater than or equal to another span of the same type [span_FEATURE_COMPARISON=1]
-span<>: Allows to compare to another span of the same type and different cv-ness [span_FEATURE_SAME=0]
-span<>: Allows to compare empty spans as equal [span_FEATURE_COMPARISON=1]
-span<>: Allows to test for empty span via empty(), empty case
-span<>: Allows to test for empty span via empty(), non-empty case
-span<>: Allows to obtain the number of elements via size()
-span<>: Allows to obtain the number of elements via ssize()
-span<>: Allows to obtain the number of bytes via size_bytes()
-span<>: Allows to view the elements as read-only bytes
-span<>: Allows to view and change the elements as writable bytes
-make_span() [span_FEATURE_MAKE_SPAN_TO_STD=99]
-make_span(): Allows building from two pointers
-make_span(): Allows building from two const pointers
-make_span(): Allows building from a non-null pointer and a size
-make_span(): Allows building from a non-null const pointer and a size
-make_span(): Allows building from a C-array
-make_span(): Allows building from a const C-array
-make_span(): Allows building from a std::initializer_list<> (C++11)
-make_span(): Allows building from a std::array<> (C++11)
-make_span(): Allows building from a const std::array<> (C++11)
-make_span(): Allows building from a container (std::vector<>)
-make_span(): Allows building from a const container (std::vector<>)
-make_span(): Allows building from a container (with_container_t, std::vector<>)
-make_span(): Allows building from a const container (with_container_t, std::vector<>)
-byte_span() [span_FEATURE_BYTE_SPAN=1]
-byte_span(): Allows building a span of std::byte from a single object (C++17, byte-lite)
-byte_span(): Allows building a span of const std::byte from a single const object (C++17, byte-lite)
-first(), last(), subspan() [span_FEATURE_NON_MEMBER_FIRST_LAST_SUB=1]
-first(): Allows to create a sub span of the first n elements
-last(): Allows to create a sub span of the last n elements
-subspan(): Allows to create a sub span starting at a given offset
-size(): Allows to obtain the number of elements via size()
-ssize(): Allows to obtain the number of elements via ssize()
-tuple_size<>: Allows to obtain the number of elements via std::tuple_size<> (C++11)
-tuple_element<>: Allows to obtain an element via std::tuple_element<> (C++11)
-tuple_element<>: Allows to obtain an element via std::tuple_element_t<> (C++11)
-get<I>(spn): Allows to access an element via std::get<>()
-tweak header: reads tweak header if supported [tweak]
-```
-
-</p>
-</details>
--- a/dep/span-lite/include/span.hpp
+++ b/dep/span-lite/include/span.hpp
--- a/distros/beowulf/control
+++ b/distros/beowulf/control
@ -5,6 +5,7 @@ Maintainer: Isaac Connor <isaac@zoneminder.com>
 Uploaders: Isaac Connor <isaac@zoneminder.com>
 Build-Depends: debhelper, sphinx-doc, dh-linktree, dh-apache2
              ,cmake
+              ,libx264-dev, libmp4v2-dev
              ,libavdevice-dev
              ,libavcodec-dev
              ,libavformat-dev
@ -33,6 +34,7 @@ Build-Depends: debhelper, sphinx-doc, dh-linktree, dh-apache2
              ,libdata-entropy-perl
 # Unbundled (dh_linktree):
        ,libjs-jquery
+        ,libjs-mootools
 Standards-Version: 3.9.8
 Homepage: http://www.zoneminder.com/
 Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/zoneminder.git
@ -42,6 +44,7 @@ Package: zoneminder
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
        ,javascript-common
+        ,libmp4v2-2, libx264-155
        ,libswscale5
        ,libswresample3
        ,ffmpeg
--- a/distros/beowulf/copyright
+++ b/distros/beowulf/copyright
@ -9,6 +9,7 @@ Comment:
 <pjh@northern-ridge.com.au> on Fri, 8 Dec 2006 10:19:43 +1100
 Files-Excluded:
    web/skins/*/js/jquery-*
+    web/tools/mootools/*-yc.js

 Files: *
 Copyright: 2001-2014 Philip Coombes <philip.coombes@zoneminder.com>
@ -36,6 +37,11 @@ Comment:
 Includes Sizzle.js http://sizzlejs.com/
 Released under the MIT, BSD, and GPL Licenses.

+Files: web/tools/mootools/*.js
+Copyright: 2009      Marcelo Jorge Vieira (metal) <metal@alucinados.com>
+           2006-2010 Valerio Proietti (http://mad4milk.net/)
+License: Expat
+
 Files: web/api/*
 Copyright: 2005-2013 Cake Software Foundation, Inc. (http://cakefoundation.org)
 License: Expat
--- a/distros/beowulf/source/lintian-overrides
+++ b/distros/beowulf/source/lintian-overrides
@ -1,5 +1,9 @@
+## Actually sources are there: "*-nc.js".
+source-is-missing web/tools/mootools/mootools-*-yc.js
+
 ## We're using "libjs-jquery" instead.
-source-is-missing web/skins/*/js/jquery-3.5.1.min.js
+source-is-missing web/skins/*/js/jquery-1.4.2.min.js

 ## Acknowledged, will repack eventually.
-source-contains-prebuilt-javascript-object web/skins/*/js/jquery-3.5.1.min.js
+source-contains-prebuilt-javascript-object web/tools/mootools/mootools-*-yc.js
+source-contains-prebuilt-javascript-object web/skins/*/js/jquery-1.4.2.min.js
--- a/distros/beowulf/zoneminder.linktrees
+++ b/distros/beowulf/zoneminder.linktrees
@ -1,6 +1,14 @@
 ## cakephp
 #replace  /usr/share/php/Cake					/usr/share/zoneminder/www/api/lib/Cake

+## libjs-mootools
+replace  /usr/share/javascript/mootools/mootools.js		/usr/share/zoneminder/www/tools/mootools/mootools-core.js
+replace  /usr/share/javascript/mootools/mootools.js		/usr/share/zoneminder/www/tools/mootools/mootools-core-1.3.2-nc.js
+replace  /usr/share/javascript/mootools/mootools.js		/usr/share/zoneminder/www/tools/mootools/mootools-core-1.3.2-yc.js
+replace  /usr/share/javascript/mootools/mootools-more.js	/usr/share/zoneminder/www/tools/mootools/mootools-more.js
+replace  /usr/share/javascript/mootools/mootools-more.js	/usr/share/zoneminder/www/tools/mootools/mootools-more-1.3.2.1-nc.js
+replace  /usr/share/javascript/mootools/mootools-more.js	/usr/share/zoneminder/www/tools/mootools/mootools-more-1.3.2.1-yc.js
+
 ## libjs-jquery
-replace  /usr/share/javascript/jquery/jquery.min.js		/usr/share/zoneminder/www/skins/classic/js/jquery-3.5.1.min.js
-replace  /usr/share/javascript/jquery/jquery.min.js		/usr/share/zoneminder/www/skins/flat/js/jquery-3.5.1.min.js
+replace  /usr/share/javascript/jquery/jquery.min.js		/usr/share/zoneminder/www/skins/classic/js/jquery-1.4.2.min.js
+replace  /usr/share/javascript/jquery/jquery.min.js		/usr/share/zoneminder/www/skins/flat/js/jquery-1.4.2.min.js
--- a/distros/beowulf/zoneminder.postinst
+++ b/distros/beowulf/zoneminder.postinst
@ -39,9 +39,9 @@ if [ "$1" = "configure" ]; then
            exit 1;
          fi
          # This creates the user.
-          echo "grant lock tables, alter,drop,select,insert,update,delete,create,index,alter routine,create routine, trigger,execute, REFERENCES on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost identified by \"${ZM_DB_PASS}\";" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+          echo "grant lock tables, alter,drop,select,insert,update,delete,create,index,alter routine,create routine, trigger,execute on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost identified by \"${ZM_DB_PASS}\";" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
        else
-          echo "grant lock tables, alter,drop,select,insert,update,delete,create,index,alter routine,create routine, trigger,execute, REFERENCES on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost;" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+          echo "grant lock tables, alter,drop,select,insert,update,delete,create,index,alter routine,create routine, trigger,execute on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost;" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
        fi

        zmupdate.pl --nointeractive
--- a/distros/debian/changelog
+++ b/distros/debian/changelog
@ -40,7 +40,7 @@ zoneminder (1.27.99+1-testing-SNAPSHOT2014072901) testing; urgency=medium

 -- Isaac Connor <iconnor@connortechnology.com>  Tue, 29 Jul 2014 14:50:20 -0400

-zoneminder (1.27.0+1-trusty-v4ltomonitor-1) trusty; urgency=high
+zoneminder (1.27.0+1-testing-v4ltomonitor-1) testing; urgency=high

  * Snapshot release - 

--- a/distros/redhat/CMakeLists.txt
+++ b/distros/redhat/CMakeLists.txt
@ -7,12 +7,12 @@

 # Display a message to show the RHEL build options are being processed.
 if(ZM_TARGET_DISTRO MATCHES "^el")
-  message([STATUS] "Starting RHEL Build Options" ...)
+    message([STATUS] "Starting RHEL Build Options" ...)
 elseif(ZM_TARGET_DISTRO MATCHES "^fc")
-  message([STATUS] "Starting Fedora Build Options" ...)
-else()
-  message([WARNING] "Unknown Build Option Detected" ...)
-endif()
+    message([STATUS] "Starting Fedora Build Options" ...)
+else(ZM_TARGET_DISTRO MATCHES "^el")
+    message([WARNING] "Unknown Build Option Detected" ...)
+endif(ZM_TARGET_DISTRO MATCHES "^el")

 #
 # CONFIGURE STAGE
@ -21,7 +21,7 @@ endif()
 # Configure the common zoneminder files
 configure_file(common/zoneminder.logrotate.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.logrotate @ONLY)
 configure_file(common/zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY)
-file(MAKE_DIRECTORY sock swap zoneminder events temp)
+file(MAKE_DIRECTORY sock swap zoneminder zoneminder-upload events temp)

 # Configure the Apache zoneminder files
 configure_file(httpd/zm-httpd.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zm-httpd.conf @ONLY)
@ -51,6 +51,7 @@ install(DIRECTORY sock swap DESTINATION /var/lib/zoneminder DIRECTORY_PERMISSION
 install(DIRECTORY zoneminder DESTINATION /var/log DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(DIRECTORY zoneminder DESTINATION /var/run DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(DIRECTORY zoneminder DESTINATION /var/cache DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+install(DIRECTORY zoneminder-upload DESTINATION /var/spool DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(DIRECTORY events temp DESTINATION /var/lib/zoneminder DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)

 # Install the Apache zoneminder files
--- a/distros/redhat/common/zoneminder.service.in
+++ b/distros/redhat/common/zoneminder.service.in
@ -5,7 +5,6 @@
 Description=ZoneMinder CCTV recording and security system
 After=network.target mariadb.service
 Requires=mariadb.service
-BindsTo=mariadb.service

 [Service]
 Type=forking
--- a/distros/redhat/readme/README.httpd
+++ b/distros/redhat/readme/README.httpd
@ -15,11 +15,9 @@ NOTE: EL7 users should replace "dnf" with "yum" in the instructions below.
   set during the previous step, you will need to create the ZoneMinder
   database and configure a database account for ZoneMinder to use:

-     mysql -u root -p < /usr/share/zoneminder/db/zm_create.sql
-     mysql -u root -p -e "CREATE USER 'zmuser'@'localhost' \
-                          IDENTIFIED BY 'zmpass';"
-     mysql -u root -p -e "GRANT ALL PRIVILEGES ON zm.* TO \
-                         'zmuser'@localhost;"
+     mysql -uroot -p < /usr/share/zoneminder/db/zm_create.sql
+     mysql -uroot -p -e "grant all on zm.* to \
+                        'zmuser'@localhost identified by 'zmpass';"
     mysqladmin -uroot -p reload

   The database account credentials, zmuser/zmpass, are arbitrary. Set them to
--- a/distros/redhat/readme/README.nginx
+++ b/distros/redhat/readme/README.nginx
@ -13,11 +13,9 @@ New installs
   set during the previous step, you will need to create the ZoneMinder
   database and configure a database account for ZoneMinder to use:

-     mysql -u root -p < /usr/share/zoneminder/db/zm_create.sql
-     mysql -u root -p -e "CREATE USER 'zmuser'@'localhost' \
-                          IDENTIFIED BY 'zmpass';"
-     mysql -u root -p -e "GRANT ALL PRIVILEGES ON zm.* TO \
-                         'zmuser'@localhost;"
+     mysql -uroot -p < /usr/share/zoneminder/db/zm_create.sql
+     mysql -uroot -p -e "grant all on zm.* to \
+                        'zmuser'@localhost identified by 'zmpass';"
     mysqladmin -uroot -p reload

   The database account credentials, zmuser/zmpass, are arbitrary. Set them to
@ -46,7 +44,10 @@ New installs

 5. Disable SELinux 

-   SELinux must be disabled or put into permissive mode. This is not optional!
+   We currently do not have the resources to create and maintain an accurate
+   SELinux policy for ZoneMinder on Fedora. We will gladly accept pull
+   reqeusts from anyone who wishes to do the work. In the meantime, SELinux
+   will need to be disabled or put into permissive mode.
   
   To immediately disbale SELinux for the current seesion, issue the following
   from the command line:
@ -77,20 +78,11 @@ New installs
     sudo ln -sf /etc/zm/www/zoneminder.nginx.conf /etc/nginx/conf.d/
     sudo ln -sf /etc/zm/www/redirect.nginx.conf /etc/nginx/default.d/

-7. Configure and start fcgiwrap
-
-   Edit /etc/sysconfig/fcgiwrap and set DAEMON_PROCS to the maximum number of
+7. Edit /etc/sysconfig/fcgiwrap and set DAEMON_PROCS to the maximum number of
   simulatneous streams the server should support. Generally, a good minimum 
   value for this equals the total number of cameras you expect to view at the
   same time.

-   Enable the fcgiwrap *socket* in the following manner:
-
-     sudo systemctl enable --now fcgiwrap@nginx.socket
-
-   Do NOT try to start the fcgiwrap service! It must be triggered by the
-   socket to work properly.
-
 8. Now start the web server:

     sudo systemctl enable nginx
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@ -3,65 +3,51 @@
 %global zmgid_final apache

 # Crud is configured as a git submodule
-%global crud_version 3.2.0
+%global crud_version 3.1.0-zm

 # CakePHP-Enum-Behavior is configured as a git submodule
 %global ceb_version 1.0-zm

-# RtspServer is configured as a git submodule
-%global rtspserver_commit     cd7fd49becad6010a1b8466bfebbd93999a39878
-
 %global sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt
 %global sslkey %{_sysconfdir}/pki/tls/private/localhost.key

 # This will tell zoneminder's cmake process we are building against a known distro
 %global zmtargetdistro %{?rhel:el%{rhel}}%{!?rhel:fc%{fedora}}

+# Fedora needs apcu backwards compatibility module
+%if 0%{?fedora}
+%global with_apcu_bc 1
+%endif
+
 # Newer php's keep json functions in a subpackage
 %if 0%{?fedora} || 0%{?rhel} >= 8
 %global with_php_json 1
 %endif

-# el7 uses cmake3 package and macros
-%if 0%{?rhel} == 7
-%global cmake %{cmake3}
-%global cmake_build %{cmake3_build}
-%global cmake_install %{cmake3_install}
-%global cmake_pkg_name cmake3
-%else
-%global cmake_pkg_name cmake
-%endif
-
 # The default for everything but el7 these days
 %global _hardened_build 1

 Name: zoneminder
-Version: 1.36.12
+Version: 1.34.24
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
-# jQuery is under the MIT license: https://jquery.org/license/
+# Mootools is inder the MIT license: http://mootools.net/
 # CakePHP is under the MIT license: https://github.com/cakephp/cakephp
 # Crud is under the MIT license: https://github.com/FriendsOfCake/crud
 # CakePHP-Enum-Behavior is under the MIT license: https://github.com/asper/CakePHP-Enum-Behavior
-# Bootstrap is under the MIT license: https://getbootstrap.com/docs/4.5/about/license/
-# Bootstrap-table is under the MIT license: https://bootstrap-table.com/docs/about/license/
-# font-awesome is under CC-BY license: https://fontawesome.com/license/free
-# RtspServer is under the MIT license: https://github.com/PHZ76/RtspServer/blob/master/LICENSE
 License: GPLv2+ and LGPLv2+ and MIT
 URL: http://www.zoneminder.com/

 Source0: https://github.com/ZoneMinder/ZoneMinder/archive/%{version}.tar.gz#/zoneminder-%{version}.tar.gz
-Source1: https://github.com/FriendsOfCake/crud/archive/v%{crud_version}.tar.gz#/crud-%{crud_version}.tar.gz
+Source1: https://github.com/ZoneMinder/crud/archive/v%{crud_version}.tar.gz#/crud-%{crud_version}.tar.gz
 Source2: https://github.com/ZoneMinder/CakePHP-Enum-Behavior/archive/%{ceb_version}.tar.gz#/cakephp-enum-behavior-%{ceb_version}.tar.gz
-Source3: https://github.com/ZoneMinder/RtspServer/archive/%{rtspserver_commit}.tar.gz#/RtspServer-%{rtspserver_commit}.tar.gz

-%{?rhel:BuildRequires: epel-rpm-macros}
 BuildRequires: systemd-devel
 BuildRequires: mariadb-devel
 BuildRequires: perl-podlators
 BuildRequires: polkit-devel
-BuildRequires: %{cmake_pkg_name}
+BuildRequires: cmake3
 BuildRequires: gnutls-devel
 BuildRequires: bzip2-devel
 BuildRequires: pcre-devel 
@ -98,6 +84,10 @@ BuildRequires: zlib-devel
 BuildRequires: ffmpeg
 BuildRequires: ffmpeg-devel

+# Required for mp4 container support
+BuildRequires: libmp4v2-devel
+BuildRequires: x264-devel
+
 # Allow existing user base to seamlessly transition to sub-packages
 Requires: %{name}-common%{?_isa} = %{version}-%{release}
 Requires: %{name}-httpd%{?_isa} = %{version}-%{release}
@ -121,8 +111,8 @@ Requires: php-mysqli
 Requires: php-common
 Requires: php-gd
 %{?with_php_json:Requires: php-json}
-%{?fedora:Requires: php-pecl-memcached}
-%{?rhel:Requires: php-pecl-apcu}
+Requires: php-pecl-apcu
+%{?with_apcu_bc:Requires: php-pecl-apcu-bc}
 Requires: cambozola
 Requires: net-tools
 Requires: psmisc
@ -207,30 +197,25 @@ gzip -dc %{_sourcedir}/cakephp-enum-behavior-%{ceb_version}.tar.gz | tar -xvvf -
 rm -rf ./web/api/app/Plugin/CakePHP-Enum-Behavior
 mv -f CakePHP-Enum-Behavior-%{ceb_version} ./web/api/app/Plugin/CakePHP-Enum-Behavior

-gzip -dc %{_sourcedir}/RtspServer-%{rtspserver_commit}.tar.gz | tar -xvvf -
-rm -rf ./dep/RtspServer
-mv -f RtspServer-%{rtspserver_commit} ./dep/RtspServer
-
 # Change the following default values
 ./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes
+./utils/zmeditconfigdata.sh ZM_UPLOAD_FTP_LOC_DIR %{_localstatedir}/spool/zoneminder-upload
 ./utils/zmeditconfigdata.sh ZM_OPT_CONTROL yes
 ./utils/zmeditconfigdata.sh ZM_CHECK_FOR_UPDATES no
+./utils/zmeditconfigdata.sh ZM_DYN_SHOW_DONATE_REMINDER no
+./utils/zmeditconfigdata.sh ZM_OPT_FAST_DELETE no

 %build
-# Disable LTO due to top level asm
-# See https://fedoraproject.org/wiki/LTOByDefault
-%define _lto_cflags %{nil}
-
-%cmake \
+%cmake3 \
        -DZM_WEB_USER="%{zmuid_final}" \
        -DZM_WEB_GROUP="%{zmgid_final}" \
        -DZM_TARGET_DISTRO="%{zmtargetdistro}" \
        .

-%cmake_build
+%make_build

 %install
-%cmake_install
+%make_install

 desktop-file-install					\
 	--dir %{buildroot}%{_datadir}/applications	\
@ -270,32 +255,6 @@ fi
 echo -e "\nVERY IMPORTANT: Before starting ZoneMinder, you must read the README file\nto finish the installation or upgrade!"
 echo -e "\nThe README file is located here: %{_pkgdocdir}-common/README\n"

-# Neither the Apache nor Nginx packages create an SSL certificate anymore, so lets do that here
-if [ -f %{sslkey} -o -f %{sslcert} ]; then
-   exit 0
-fi
-
-umask 077
-%{_bindir}/openssl genrsa -rand /proc/cpuinfo:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/uptime 2048 > %{sslkey} 2> /dev/null
-
-FQDN=`hostname`
-# A >59 char FQDN means "root@FQDN" exceeds 64-char max length for emailAddress
-if [ "x${FQDN}" = "x" -o ${#FQDN} -gt 59 ]; then
-   FQDN=localhost.localdomain
-fi
-
-cat << EOF | %{_bindir}/openssl req -new -key %{sslkey} \
-         -x509 -sha256 -days 365 -set_serial $RANDOM -extensions v3_req \
-         -out %{sslcert} 2>/dev/null
--
-SomeState
-SomeCity
-SomeOrganization
-SomeOrganizationalUnit
-${FQDN}
-root@${FQDN}
-EOF
-
 %post httpd
 # For the case of changing from nginx <-> httpd, files in these folders must change ownership if they exist
 %{_bindir}/chown -R %{zmuid_final}:%{zmgid_final} %{_sharedstatedir}/php/session/* >/dev/null 2>&1 || :
@ -327,6 +286,32 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
 %{_bindir}/gpasswd -a nginx video >/dev/null 2>&1 || :
 %{_bindir}/gpasswd -a nginx dialout >/dev/null 2>&1 || :

+# Nginx does not create an SSL certificate like the apache package does so lets do that here
+if [ -f %{sslkey} -o -f %{sslcert} ]; then
+   exit 0
+fi
+
+umask 077
+%{_bindir}/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 2048 > %{sslkey} 2> /dev/null
+
+FQDN=`hostname`
+# A >59 char FQDN means "root@FQDN" exceeds 64-char max length for emailAddress
+if [ "x${FQDN}" = "x" -o ${#FQDN} -gt 59 ]; then
+   FQDN=localhost.localdomain
+fi
+
+cat << EOF | %{_bindir}/openssl req -new -key %{sslkey} \
+         -x509 -sha256 -days 365 -set_serial $RANDOM -extensions v3_req \
+         -out %{sslcert} 2>/dev/null
+--
+SomeState
+SomeCity
+SomeOrganization
+SomeOrganizationalUnit
+${FQDN}
+root@${FQDN}
+EOF
+
 %preun
 %systemd_preun %{name}.service

@ -355,6 +340,7 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
 %{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy
 %{_bindir}/zmsystemctl.pl

+%{_bindir}/zma
 %{_bindir}/zmaudit.pl
 %{_bindir}/zmc
 %{_bindir}/zmcontrol.pl
@ -371,10 +357,8 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
 %{_bindir}/zmtelemetry.pl
 %{_bindir}/zmx10.pl
 %{_bindir}/zmonvif-probe.pl
-%{_bindir}/zmonvif-trigger.pl
 %{_bindir}/zmstats.pl
 %{_bindir}/zmrecover.pl
-%{_bindir}/zm_rtsp_server

 %{perl_vendorlib}/ZoneMinder*
 %{perl_vendorlib}/ONVIF*
@ -405,6 +389,7 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_sharedstatedir}/zoneminder/temp
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/cache/zoneminder
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/log/zoneminder
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/spool/zoneminder-upload

 %files nginx
 %config(noreplace) %attr(640,root,nginx) %{_sysconfdir}/zm/zm.conf
@ -428,136 +413,9 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
 %dir %attr(755,nginx,nginx) %{_sharedstatedir}/zoneminder/temp
 %dir %attr(755,nginx,nginx) %{_localstatedir}/cache/zoneminder
 %dir %attr(755,nginx,nginx) %{_localstatedir}/log/zoneminder
+%dir %attr(755,nginx,nginx) %{_localstatedir}/spool/zoneminder-upload

 %changelog
-* Fri Dec 10 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.12-1
- 1.36.12 release
-
-* Wed Nov 17 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.11-1
- 1.36.11 release
-
-* Mon Oct 25 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.10-1
- 1.36.10 release
-
-* Tue Oct 19 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.9-1
- 1.36.9 release
-
-* Wed Oct 06 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.8-1
- 1.36.8 release
-
-* Mon Sep 13 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.7-1
- 1.36.7 release
-
-* Wed Sep 08 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.6-1
- 1.36.6 release
-
-* Tue Jun 22 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.5-1
- 1.36.5 release
-
-* Fri Jun 18 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.4-2
- apcu-bc deprecated on fedora, use memcached instead
- only refer to cmake3 when building on el7
-
-* Tue Jun 08 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.4-1
- 1.36.4 release
-
-* Sun May 30 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.3-1
- 1.36.3 release
-
-* Fri May 28 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.2-1
- 1.36.2 release
-
-* Fri May 21 2021  Andrew Bauer <zonexpertconsulting@outlook.com> - 1.36.1-1
- 1.36.1 release
- add rtspserver submodule
-
-* Wed Apr 21 2021 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.26-1
- 1.34.26 Release
-
-* Sun Apr 18 2021 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.24-1
- 1.34.24 Release
-
-* Thu Feb 04 2021 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1.34.23-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sun Jan 31 2021 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.23-1
- 1.34.23 Release
- create ssl cert in all cases, not just nginx
-
-* Fri Jan  1 2021 Leigh Scott <leigh123linux@gmail.com> - 1.34.22-3
- Rebuilt for new ffmpeg snapshot
-
-* Fri Nov 27 2020 Sérgio Basto <sergio@serjux.com> - 1.34.22-2
- Mass rebuild for x264-0.161
-
-* Mon Sep 28 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.22-1
- 1.34.22 Release
-
-* Mon Sep 28 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.21-1
- 1.34.21 Release
-
-* Sun Aug 23 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.20-1
- 1.34.20 Release
- Buildrequire epel-rpm-macros on rhel
- Update license references for js libraries
-
-* Wed Aug 19 2020 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1.34.18-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Aug 06 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.18-1
- 1.34.18 Release
-
-* Thu Aug 06 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.17-2
- Disable LTO due to top level asm
-
-* Wed Aug 05 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.17-1
- 1.34.17 Release
-
-* Tue Aug 04 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.16-4
- Use new cmake build macros for f33 compat
-
-* Tue Jul 07 2020 Sérgio Basto <sergio@serjux.com> - 1.34.16-3
- Mass rebuild for x264
-
-* Fri Jul 03 2020 Leigh Scott <leigh123linux@gmail.com> - 1.34.16-2
- Perl 5.32 rebuild
-
-* Fri Jun 05 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.16-1
- 1.34.16 Release
-
-* Fri May 15 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.14-1
- 1.34.14 Release
-
-* Thu May 14 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.13-1
- 1.34.13 Release
-
-* Sun May 10 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.12-1
- 1.34.12 Release
-
-* Sat May 2 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.11-1
- 1.34.11 Release
-
-* Sun Apr 26 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.10-1
- 1.34.10 Release
-
-* Mon Apr 6 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.9-1
- 1.34.9 Release
-
-* Sat Mar 28 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.7-1
- 1.34.7 Release
-
-* Mon Mar 23 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.6-1
- 1.34.6 Release
-
-* Sat Feb 29 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.5-1
- 1.34.5 Release
-
-* Sun Feb 23 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.3-1
- 1.34.3 Release
-
-* Sat Feb 22 2020 RPM Fusion Release Engineering <leigh123linux@googlemail.com> - 1.34.2-2
- Rebuild for ffmpeg-4.3 git
-
 * Tue Feb 04 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.2-1
 - 1.34.2 Release

--- a/distros/ubuntu2004/patches/series
+++ b/distros/ubuntu2004/patches/series
--- a/distros/ubuntu1204/README.Debian
+++ b/distros/ubuntu1204/README.Debian
@ -8,7 +8,7 @@ Initializing database
 OR
    cat /usr/share/zoneminder/db/zm_create.sql | sudo mysql --defaults-file=/etc/mysql/debian.cnf

-    echo 'grant lock tables,alter,create,index,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";'\
+    echo 'grant lock tables,alter,create,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";'\
    | sudo mysql --defaults-file=/etc/mysql/debian.cnf mysql

 Hint: generate secure password with `pwgen` and update "/etc/zm/zm.conf"
@ -23,7 +23,8 @@ configuration file:
 Upgrading database
 ------------------

-The database is updated automatically on installation. You should not need to take this step.
+Prior to 1.28.1 database upgrade was performed automatically.
+"zoneminder" service will refuse to start with outdated database.

 Assuming that database is on "localhost" then the following command can be
 used to upgrade "zm" database:
@ -44,11 +45,17 @@ The following command prints the current version of zoneminder database:
 Enabling service
 ----------------

-By default Zoneminder service is not automatically started and needs to be
-manually enabled once database is configured:
+By default Zoneminder service is not starting automatically and need to be
+manually activated once database is configured:
+
+On systemd:

    sudo systemctl enable zoneminder.service

+On SysV:
+
+    sudo update-rc.d zoneminder enable
+

 Web server set-up
 -----------------
@ -75,10 +82,10 @@ Common configuration steps for Apache2:

 ## nginx / fcgiwrap

-Nginx needs "php-fpm" package to support PHP and "fcgiwrap" package
+Nginx needs "php5-fpm" package to support PHP and "fcgiwrap" package
 for binary "cgi-bin" applications:

-    sudo apt-get install php-fpm fcgiwrap
+    sudo apt-get install php5-fpm fcgiwrap

 To enable a URL alias that makes Zoneminder available from

@ -112,9 +119,32 @@ site configuration.
 Changing the location for images and events
 -------------------------------------------

-ZoneMinder is now able to be configured to use an alternative location for storing
-events and images at compile time. This package makes use of that, so symlinks in
-/usr/share/zoneminder/www are no longer necessary.
+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*
 ---------------------
--- a/distros/ubuntu1204/TODO.Debian
+++ b/distros/ubuntu1204/TODO.Debian
--- a/distros/ubuntu1204/changelog
+++ b/distros/ubuntu1204/changelog
@ -0,0 +1,8 @@
+<<<<<<< HEAD
+zoneminder (1.31.0-trusty) trusty; urgency=medium
+
+  * placeholder
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Fri, 13 May 2016 09:45:49 -0400
+=======
+>>>>>>> master
--- a/distros/ubuntu1204/clean
+++ b/distros/ubuntu1204/clean
--- a/distros/ubuntu1204/compat
+++ b/distros/ubuntu1204/compat
@ -0,0 +1 @@
+9
--- a/distros/ubuntu1204/conf/apache2/zoneminder.conf
+++ b/distros/ubuntu1204/conf/apache2/zoneminder.conf
@ -6,8 +6,7 @@ ScriptAlias /zm/cgi-bin "/usr/lib/zoneminder/cgi-bin"
    Require all granted
 </Directory>

-
-# Order matters. This alias must come first.
+# Order matters. This Alias must come first
 Alias /zm/cache /var/cache/zoneminder/cache
 <Directory /var/cache/zoneminder/cache>
    Options -Indexes +FollowSymLinks
@ -16,10 +15,16 @@ Alias /zm/cache /var/cache/zoneminder/cache
        # Apache 2.4
        Require all granted
    </IfModule>
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
+        Order deny,allow
+        Allow from all
+    </IfModule>
 </Directory>

 Alias /zm /usr/share/zoneminder/www
 <Directory /usr/share/zoneminder/www>
+  php_flag register_globals off
  Options -Indexes +FollowSymLinks
  <IfModule mod_dir.c>
    DirectoryIndex index.php
--- a/distros/ubuntu1204/control
+++ b/distros/ubuntu1204/control
@ -2,52 +2,53 @@ Source: zoneminder
 Section: net
 Priority: optional
 Maintainer: Isaac Connor <isaac@zoneminder.com>
-Build-Depends: debhelper (>= 12), sphinx-doc, python3-sphinx, dh-linktree, dh-apache2
+Uploaders: Isaac Connor <isaac@zoneminder.com>
+Build-Depends: debhelper (>= 9), python-sphinx | python3-sphinx, apache2-dev, dh-linktree
              ,cmake
-              ,libavdevice-dev
-              ,libavcodec-dev
-              ,libavformat-dev
-              ,libavutil-dev
-              ,libswresample-dev
-              ,libswscale-dev
-              ,ffmpeg
-              ,net-tools
+              ,libx264-dev, libmp4v2-dev
+              ,libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libavdevice-dev
+              ,libavresample-dev
              ,libbz2-dev
-              ,libgcrypt20-dev
+              ,libgcrypt-dev
              ,libcurl4-gnutls-dev
-              ,libjpeg-turbo8-dev | libjpeg62-turbo-dev | libjpeg8-dev | libjpeg9-dev
-              ,libturbojpeg0-dev
-              ,default-libmysqlclient-dev | libmysqlclient-dev | libmariadbclient-dev-compat
+              ,libgnutls-openssl-dev
+              ,libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev, 
+              ,libmysqlclient-dev
              ,libpcre3-dev
              ,libpolkit-gobject-1-dev
-              ,libv4l-dev [!hurd-any]
+              ,libv4l-dev (>= 0.8.3) [!hurd-any]
              ,libvlc-dev
              ,libdate-manip-perl
              ,libdbd-mysql-perl
              ,libphp-serialization-perl
              ,libsys-mmap-perl [!hurd-any]
              ,libwww-perl
-              ,libdata-uuid-perl
+              ,libdata-uuid-perl 
              ,libssl-dev
              ,libcrypt-eksblowfish-perl
              ,libdata-entropy-perl
-              ,libvncserver-dev
-              ,libjwt-gnutls-dev|libjwt-dev
-Standards-Version: 4.5.0
-Homepage: https://www.zoneminder.com/
+# Unbundled (dh_linktree):
+        ,libjs-jquery
+        ,libjs-mootools
+Standards-Version: 3.9.4
+Homepage: http://www.zoneminder.com/
+Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/zoneminder.git
+Vcs-Git: git://anonscm.debian.org/collab-maint/zoneminder.git

 Package: zoneminder
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
        ,javascript-common
-        ,libswscale5
-        ,libswresample3
-        ,ffmpeg
-        ,libdate-manip-perl, libmime-lite-perl, libmime-tools-perl
+        ,libmp4v2-2, libx264-142
+        ,libav-tools|ffmpeg
+        ,libdate-manip-perl
        ,libdbd-mysql-perl
+        ,libmime-lite-perl
+        ,libmime-tools-perl
        ,libphp-serialization-perl
        ,libmodule-load-conditional-perl
        ,libnet-sftp-foreign-perl
+#       ,libzoneminder-perl (= ${source:Version})
        ,libarchive-zip-perl
        ,libdbd-mysql-perl
        ,libdevice-serialport-perl
@ -55,30 +56,26 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
        ,libjson-maybexs-perl
        ,libsys-mmap-perl [!hurd-any]
        ,liburi-encode-perl
-        ,libwww-perl, liburi-perl
-        ,libdata-dump-perl
+        ,libwww-perl
        ,libdatetime-perl
-        ,libclass-std-fast-perl
-        ,libsoap-wsdl-perl
-        ,libio-socket-multicast-perl
-        ,libdigest-sha-perl
-        ,libsys-cpu-perl, libsys-meminfo-perl
-        ,libdata-uuid-perl
+        ,libdata-uuid-perl 
        ,libnumber-bytes-human-perl
        ,libfile-slurp-perl
-        ,default-mysql-client | mariadb-client | virtual-mysql-client
-        ,php-mysql, php-gd, php-apcu, php-apc | php-apcu-bc, php-json
+        ,mysql-client | virtual-mysql-client
+        ,perl-modules
+        ,php5-mysql, php5-gd, php5-apcu, php-apc
        ,policykit-1
        ,rsyslog | system-log-daemon
        ,zip
-        ,libpcre3
+        ,libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl
+        ,libio-socket-multicast-perl, libdigest-sha-perl
+        ,libsys-cpu-perl, libsys-meminfo-perl
+        ,libssl | libssl1.0.0
        ,libcrypt-eksblowfish-perl
        ,libdata-entropy-perl
-        ,libvncclient1|libvncclient0
-        ,libjwt-gnutls0
 Recommends: ${misc:Recommends}
-           ,libapache2-mod-php | php-fpm
-           ,default-mysql-server | mariadb-server | virtual-mysql-server
+           ,libapache2-mod-php5 | php5-fpm
+           ,mysql-server | virtual-mysql-server
           ,zoneminder-doc (>= ${source:Version})
 Suggests: fcgiwrap, logrotate
 Description: video camera security and surveillance solution
@ -125,7 +122,7 @@ Package: zoneminder-doc
 Section: doc
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}, python-sphinx-rtd-theme | python3-sphinx-rtd-theme
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
 Suggests: www-browser
 Description: ZoneMinder documentation
 ZoneMinder is intended for use in single or multi-camera video security
@ -143,7 +140,7 @@ Description: ZoneMinder documentation

 Package: zoneminder-dbg
 Section: debug
-Priority: optional
+Priority: extra
 Architecture: any
 Depends: zoneminder (= ${binary:Version}), ${misc:Depends}
 Description: Zoneminder -- debugging symbols
--- a/distros/ubuntu1204/copyright
+++ b/distros/ubuntu1204/copyright
@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ZoneMinder
-Upstream-Contact: Isaac Connor <isaac@zoneminder.com>
+Upstream-Contact: Philip Coombes <philip.coombes@zoneminder.com>
 Source: https://github.com/ZoneMinder/ZoneMinder
 Comment:
 This package was originally debianized by matrix <matrix@cecilia>
@ -9,6 +9,7 @@ Comment:
 <pjh@northern-ridge.com.au> on Fri, 8 Dec 2006 10:19:43 +1100
 Files-Excluded:
    web/skins/*/js/jquery-*
+    web/tools/mootools/*-yc.js

 Files: *
 Copyright: 2001-2014 Philip Coombes <philip.coombes@zoneminder.com>
@ -36,6 +37,11 @@ Comment:
 Includes Sizzle.js http://sizzlejs.com/
 Released under the MIT, BSD, and GPL Licenses.

+Files: web/tools/mootools/*.js
+Copyright: 2009      Marcelo Jorge Vieira (metal) <metal@alucinados.com>
+           2006-2010 Valerio Proietti (http://mad4milk.net/)
+License: Expat
+
 Files: web/api/*
 Copyright: 2005-2013 Cake Software Foundation, Inc. (http://cakefoundation.org)
 License: Expat
--- a/distros/ubuntu1204/examples/nginx.conf
+++ b/distros/ubuntu1204/examples/nginx.conf
--- a/distros/ubuntu1204/gbp.conf
+++ b/distros/ubuntu1204/gbp.conf
--- a/distros/ubuntu1204/libzoneminder-perl.install
+++ b/distros/ubuntu1204/libzoneminder-perl.install
--- a/distros/ubuntu1204/patches/series
+++ b/distros/ubuntu1204/patches/series
--- a/distros/ubuntu1204/rules
+++ b/distros/ubuntu1204/rules
@ -1,4 +1,5 @@
 #!/usr/bin/make -f
+# -*- makefile -*-

 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@ -11,49 +12,33 @@ ARGS:= -DZM_NO_MMAP=ON
 endif

 %:
-	dh $@ --buildsystem=cmake --builddirectory=dbuild \
+	dh $@ --parallel --buildsystem=cmake --builddirectory=dbuild \
            --with sphinxdoc,apache2,linktree

 override_dh_auto_configure:
-	dh_auto_configure -- $(ARGS)                  \
-            -DCMAKE_VERBOSE_MAKEFILE=ON                \
-            -DCMAKE_BUILD_TYPE=Release                 \
-						-DBUILD_MAN=0 \
-            -DZM_CONFIG_DIR="/etc/zm"                  \
-            -DZM_CONFIG_SUBDIR="/etc/zm/conf.d"        \
-            -DZM_RUNDIR="/run/zm"                  \
-            -DZM_SOCKDIR="/run/zm"                 \
-            -DZM_TMPDIR="/var/tmp/zm"                      \
-            -DZM_CGIDIR="/usr/lib/zoneminder/cgi-bin"  \
-            -DZM_CACHEDIR="/var/cache/zoneminder/cache"  \
+	dh_auto_configure -- $(ARGS)                          \
+            -DCMAKE_VERBOSE_MAKEFILE=ON                       \
+            -DCMAKE_BUILD_TYPE=Release                        \
+            -DZM_CONFIG_DIR="/etc/zm"                         \
+            -DZM_CONFIG_SUBDIR="/etc/zm/conf.d"               \
+            -DZM_RUNDIR="/var/run/zm"                         \
+            -DZM_SOCKDIR="/var/run/zm"                        \
+            -DZM_TMPDIR="/tmp/zm"                             \
+            -DZM_CGIDIR="/usr/lib/zoneminder/cgi-bin"         \
+            -DZM_CACHEDIR="/var/cache/zoneminder/cache"       \
            -DZM_DIR_EVENTS="/var/cache/zoneminder/events"    \
-            -DZM_PATH_SHUTDOWN="/sbin/shutdown"        \
-            -DZM_PATH_ZMS="/zm/cgi-bin/nph-zms"
+            -DZM_PATH_SHUTDOWN="/sbin/shutdown"               \
+            -DZM_PATH_ZMS="/zm/cgi-bin/nph-zms"               

 override_dh_clean:
 	dh_clean $(MANPAGES1)
-	$(RM) -r docs/_build
+	$(RM) -r docs/_build docs/installationguide

-override_dh_auto_build-indep:
+build-indep:
+	#$(MAKE) -C docs text
 	$(MAKE) -C docs html
-	 dh_auto_build
-
-MANPAGES1 = \
-		dbuild/scripts/zmupdate.pl.1 \
-    dbuild/scripts/zmaudit.pl.1     \
-    dbuild/scripts/zmcamtool.pl.1   \
-    dbuild/scripts/zmcontrol.pl.1   \
-    dbuild/scripts/zmdc.pl.1        \
-    dbuild/scripts/zmfilter.pl.1    \
-    dbuild/scripts/zmpkg.pl.1       \
-    dbuild/scripts/zmsystemctl.pl.1 \
-    dbuild/scripts/zmtelemetry.pl.1 \
-    dbuild/scripts/zmtrack.pl.1     \
-    dbuild/scripts/zmtrigger.pl.1   \
-    dbuild/scripts/zmvideo.pl.1     \
-    dbuild/scripts/zmwatch.pl.1     \
-    dbuild/scripts/zmx10.pl.1

+MANPAGES1 = dbuild/scripts/zmupdate.pl.1
 $(MANPAGES1):
 	# generate man page(s):
 	pod2man -s1 --stderr --utf8 $(patsubst %.1, %, $@) $@
@ -66,7 +51,7 @@ override_dh_installman: $(MANPAGES1)
 	dh_installman --language=C $(MANPAGES1)

 override_dh_auto_install:
-	dh_auto_install --arch --destdir=$(CURDIR)/debian/tmp
+	dh_auto_install --destdir=$(CURDIR)/debian/tmp
 	# remove worthless files:
 	$(RM) -v $(CURDIR)/debian/tmp/usr/share/perl5/*/*/*/.packlist
 	$(RM) -v $(CURDIR)/debian/tmp/usr/share/perl5/*/*.in
@ -85,9 +70,6 @@ override_dh_fixperms:
 override_dh_installinit:
 	dh_installinit --no-start

-override_dh_installsystemd:
-	dh_installsystemd --no-enable --no-start
-
 override_dh_apache2:
 	dh_apache2 --noenable

@ -96,3 +78,16 @@ override_dh_strip:
        && dh_strip --dbg-package=zoneminder-dbg \
        || dh_strip

+#%:
+#	dh $@ --parallel --buildsystem=autoconf --with autoreconf
+#
+#override_dh_auto_configure:
+#	dh_auto_configure -- \
+#            --sysconfdir=/etc/zm \
+#            --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-mmap=yes
--- a/distros/ubuntu1204/source/format
+++ b/distros/ubuntu1204/source/format
--- a/distros/ubuntu1204/source/lintian-overrides
+++ b/distros/ubuntu1204/source/lintian-overrides
@ -0,0 +1,9 @@
+## Actually sources are there: "*-nc.js".
+source-is-missing web/tools/mootools/mootools-*-yc.js
+
+## We're using "libjs-jquery" instead.
+source-is-missing web/skins/*/js/jquery-1.4.2.min.js
+
+## Acknowledged, will repack eventually.
+source-contains-prebuilt-javascript-object web/tools/mootools/mootools-*-yc.js
+source-contains-prebuilt-javascript-object web/skins/*/js/jquery-1.4.2.min.js
--- a/distros/ubuntu1204/watch
+++ b/distros/ubuntu1204/watch
@ -0,0 +1,7 @@
+version=3
+
+opts=\
+repacksuffix=+dfsg,\
+dversionmangle=s{\+dfsg\d*}{},\
+ https://github.com/ZoneMinder/ZoneMinder/releases \
+  .*/ZoneMinder/archive/v(.*).tar.gz
--- a/distros/ubuntu1204/zoneminder-doc.doc-base
+++ b/distros/ubuntu1204/zoneminder-doc.doc-base
--- a/distros/ubuntu1204/zoneminder-doc.install
+++ b/distros/ubuntu1204/zoneminder-doc.install
--- a/distros/ubuntu1204/zoneminder-doc.links
+++ b/distros/ubuntu1204/zoneminder-doc.links
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				ALTER TABLE Monitors MODIFY `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket','VNC') NOT NULL default 'Local';
				`@ -1,2 +0,0 @@`

				UPDATE `Controls` SET `Protocol`='FoscamCGI' where `Protocol`='onvif';
				`@ -1 +0,0 @@`
				ALTER TABLE `Monitors` MODIFY `Encoder` varchar(32);
				`@ -1 +0,0 @@`
				ALTER TABLE `Monitors` MODIFY `Longitude` DECIMAL(11,8);
				`@ -1 +0,0 @@`
				`Subproject commit cd7fd49becad6010a1b8466bfebbd93999a39878`