remove deprecated column

Fix typo: Ineterval to Interval
Typo: AnalysisUpdateDelete to AnalysisUpdateDelay
2019-03-05 11:01:11 -05:00 · 2019-03-05 10:58:04 -05:00 · 2019-03-05 10:56:46 -05:00
1284 changed files with 90598 additions and 161507 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/.eslintignore
+++ b/.eslintignore
@ -1,19 +1,4 @@
-*.min.js
-
-# libraries
 web/api/lib
-web/includes/csrf/
-web/js/videojs.zoomrotate.js
-web/skins/classic/js/bootstrap.js
-web/skins/classic/js/chosen
-web/skins/classic/js/dateTimePicker
-web/skins/classic/js/jquery-*.js
-web/skins/classic/js/jquery-ui-*
+web/skins/classic/js/jquery-1.11.3.js
 web/skins/classic/js/jquery.js
-web/skins/classic/js/moment.js
-web/skins/classic/js/video.js
 web/tools/mootools
-
-# Cannot be parsed as JS
-web/skins/classic/includes/export_functions.php
-web/skins/classic/views/events.php
--- a/.eslintrc.js
+++ b/.eslintrc.js
@ -3,49 +3,27 @@
 module.exports = {
  "env": {
    "browser": true,
-    "es6": true,
  },
  "extends": ["google"],
-  "overrides": [{
-    // eslint-plugin-html handles eol-last slightly different - it applies to
-    // each set of script tags, so we turn it off here.
-    "files": "**/*.*php",
-    "rules": {
-      "eol-last": "off",
-      "indent": "off",
-    },
-  }],
-  "plugins": [
-    "html",
-    "php-markup",
-  ],
  "rules": {
+    "brace-style": "off",
    "camelcase": "off",
    "comma-dangle": "off",
-    "guard-for-in": "off",
+    "key-spacing": "off",
    "max-len": "off",
    "new-cap": ["error", {
      capIsNewExceptions: ["Error", "Warning", "Debug", "Polygon_calcArea", "Play", "Stop"],
      newIsCapExceptionPattern: "^Asset\.."
    }],
    "no-array-constructor": "off",
-    "no-unused-vars": ["error", {
-      "vars": "local",
-      "args": "none",
-      "ignoreRestSiblings": false
-    }],
+    "no-caller": "off",
+    "no-new-object": "off",
+    "no-unused-vars": "off",
    "no-var": "off",
+    "object-curly-spacing": "off",
    "prefer-rest-params": "off",
    "quotes": "off",
    "require-jsdoc": "off",
    "spaced-comment": "off",
  },
-  "settings": {
-    "php/php-extensions": [".php"],
-    "php/markup-replacement": {"php": "", "=": "0"},
-    "php/keep-eol": false,
-    "php/remove-whitespace": false,
-    "php/remove-empty-line": false,
-    "php/remove-php-lint": false
-  },
 };
--- 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
@ -1,12 +0,0 @@
-# These are supported funding model platforms
-
-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
-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
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@ -1,8 +1,6 @@
-<!--
-
 **THIS FORUM IS FOR BUG REPORTS ONLY**

-Do not post feature or enhancement requests, general discussions, or support questions here.
+Do not post feature or enhancement requests, general discussions or support questions here.

 Feature and enhancement requests, general discussions, and support questions should occur in one of the following areas:

@ -11,49 +9,35 @@ Feature and enhancement requests, general discussions, and support questions sho

 Docker related issues should be posted here: https://github.com/ZoneMinder/zmdockerfiles

-In order to submit a bug report, please populate the fields below this line. This is required.
+In order to submit a bug report, please populate the fields below. 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
+- 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/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -1,40 +0,0 @@
---
-name: Bug report
-about: Issues that do not follow the template will be closed
-title: ''
-labels: ''
-assignees: ''
-
---
-
-**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/issue-close-app.yml
+++ b/.github/issue-close-app.yml
@ -1,16 +0,0 @@
-# Comment that will be sent if an issue is judged to be closed
-comment: "This issue is closed because it does not meet our bug report issue template. Please read it."
-issueConfigs:
-# There can be several configs for different kind of issues.
- content:
-# Example 1: bug report
-  - "Describe Your Environment"
-  - "Describe the bug"
-  - "Expected behavior"
-# Optional configuration:
-#
-# whether the keywords are case-insensitive
-# default value is false, which means keywords are case-sensitive
-caseInsensitive: true
-# The issue is judged to be legal if it includes all keywords from any of these two configs.
-# Or it will be closed by the app.
--- a/.github/stale.yml
+++ b/.github/stale.yml
@ -1,17 +1,14 @@
 # Configuration for probot-stale - https://github.com/probot/stale

 # Number of days of inactivity before an issue becomes stale
-daysUntilStale: 180
+daysUntilStale: 60

 # Number of days of inactivity before a stale issue is closed
-daysUntilClose: 30
+daysUntilClose: 7

 # Issues with these labels will never be considered stale
 exemptLabels:
  - "Under Review"
-  - "Bounty"
-  - "bug"
-  - "Feature"

 # Set to true to ignore issues in a milestone (defaults to false)
 exemptMilestones: true
--- a/.github/support.yml
+++ b/.github/support.yml
@ -1,29 +0,0 @@
-# Configuration for support-requests - https://github.com/dessant/support-requests
-
-# Label used to mark issues as support requests
-supportLabel: support
-
-# Comment to post on issues marked as support requests, `{issue-author}` is an
-# optional placeholder. Set to `false` to disable
-supportComment: >
-  :wave: @{issue-author}, we use the issue tracker exclusively for bug reports.
-  However, this issue appears to be a support request, a feature request, or
-  attempts to ask a question.
-  
-  Please use our support channels to get help with or discuss this project:
-  
-  - The [ZoneMinder-Chat Slack channel](https://zoneminder-chat.herokuapp.com/)
-  
-  - The [ZoneMinder USer Forum](https://forums.zoneminder.com/)
-
-# Close issues marked as support requests
-close: true
-
-# Lock issues marked as support requests
-lock: true
-
-# Assign `off-topic` as the reason for locking. Set to `false` to disable
-setLockReason: true
-
-# Repository to extend settings from
-# _extends: repo
--- 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,3 @@ 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
@ -1,10 +1,7 @@
 [submodule "web/api/app/Plugin/Crud"]
 	path = web/api/app/Plugin/Crud
-	url = https://github.com/FriendsOfCake/crud.git
+	url = https://github.com/ZoneMinder/crud.git
 	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: trusty
 git:
  depth: 9999999
 notifications:
@ -13,7 +13,7 @@ addons:
  ssh_known_hosts: zmrepo.zoneminder.com
  apt:
    sources:
-    - sourceline: ppa:iconnor/zoneminder-master
+    - sourceline: ppa:iconnor/zoneminder
    - key_url: http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0x4D0BF748776FFB04
    packages:
    - gdebi
@ -32,15 +32,24 @@ install:
  - update-binfmts --enable qemu-arm

 env:
-  - SMPFLAGS=-j4 OS=eslint DIST=eslint
-  - SMPFLAGS=-j4 OS=ubuntu DIST=bionic DOCKER_REPO=iconzm/packpack
+  global:
+  - SMPFLAGS=-j4
+  matrix:
+  - OS=el DIST=7
+  - OS=fedora DIST=27 DOCKER_REPO=knnniggett/packpack
+  - OS=fedora DIST=28 DOCKER_REPO=knnniggett/packpack
+  - OS=fedora DIST=29 DOCKER_REPO=knnniggett/packpack
+  - OS=ubuntu DIST=trusty
+  - OS=ubuntu DIST=xenial
+  - OS=ubuntu DIST=trusty ARCH=i386
+  - OS=ubuntu DIST=xenial ARCH=i386
+  - OS=raspbian DIST=stretch ARCH=armhf DOCKER_REPO=knnniggett/packpack

 compiler:
 - gcc
 services:
 - mysql
 - docker
-
 script:
 - utils/packpack/startpackpack.sh

@ -56,3 +65,4 @@ deploy:
  script: utils/packpack/rsync_xfer.sh
  on:
    branch: master
+
--- a/10
+++ b/10
@ -0,0 +1,10 @@
+ZoneMinder - A Linux based camera monitoring and analysis tool.
+
+This project was imagined and created by Philip Coombes in
+September 2002, shortly after being burglarised of his power tools.
+He can be contacted at philip.coombes@zoneminder.com
+
+In early 2013 after nearly two years of no development,
+the community reached out to Phil in an attempt to open up the
+project.  With Phil's blessing, the code was migrated to github,
+and the community took over the project.
--- a/1
+++ b/1
@ -0,0 +1 @@
+Please see https://github.com/ZoneMinder/ZoneMinder/issues?state=open
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -2,7 +2,7 @@
 # Created by mastertheknife (Kfir Itzhak)
 # For more information and installation, see the INSTALL file
 #
-cmake_minimum_required(VERSION 3.5.0)
+cmake_minimum_required (VERSION 2.8.7)
 project (zoneminder)
 file (STRINGS "version" zoneminder_VERSION)
 # make API version a minor of ZM version
@ -10,59 +10,99 @@ set(zoneminder_API_VERSION "${zoneminder_VERSION}.1")

 # Make sure the submodules are there
 if( NOT EXISTS "${CMAKE_SOURCE_DIR}/web/api/app/Plugin/Crud/Lib/CrudControllerTrait.php" )
-  message(SEND_ERROR "The git submodules are not available. Please run git submodule update --init --recursive")
-endif()
+message( SEND_ERROR "The git submodules are not available. Please run
+git submodule update --init --recursive")
+endif( NOT EXISTS "${CMAKE_SOURCE_DIR}/web/api/app/Plugin/Crud/Lib/CrudControllerTrait.php" )

 # CMake does not allow out-of-source build if CMakeCache.exists 
 # in the source folder. Abort and notify the user
-if((NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)) AND (EXISTS "${CMAKE_SOURCE_DIR}/CMakeCache.txt"))
+if(
+    (NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)) 
+    AND (EXISTS "${CMAKE_SOURCE_DIR}/CMakeCache.txt"))
        message(FATAL_ERROR " You are attempting to do an out-of-source build, 
            but a cmake cache file for an in-source build exists. Please delete 
            the file CMakeCache.txt from the source folder to proceed.")
-endif()
+endif(
+    (NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)) 
+    AND (EXISTS "${CMAKE_SOURCE_DIR}/CMakeCache.txt"))

 # Default build type. To change the build type, 
 # use the CMAKE_BUILD_TYPE configuration option.
 if(NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type: Release or Debug" FORCE)
-endif()
+	set(CMAKE_BUILD_TYPE 
+            Release CACHE STRING "Build type: Release or Debug" FORCE)
+endif(NOT CMAKE_BUILD_TYPE)

 # Can assist in troubleshooting
 #set(CMAKE_VERBOSE_MAKEFILE ON)
 #set(CMAKE_INSTALL_ALWAYS ON)

+# Host OS Check
+set(HOST_OS "")
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+	set(HOST_OS "linux")
+endif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+if(${CMAKE_SYSTEM_NAME} MATCHES ".*(SunOS|Solaris).*")
+	set(HOST_OS "solaris")
+	set(SOLARIS 1)
+endif(${CMAKE_SYSTEM_NAME} MATCHES ".*(SunOS|Solaris).*")
+if(${CMAKE_SYSTEM_NAME} MATCHES ".*BSD.*")
+	set(HOST_OS "BSD")
+	set(BSD 1)
+endif(${CMAKE_SYSTEM_NAME} MATCHES ".*BSD.*")
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+	set(HOST_OS "darwin")
+endif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+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(NOT HOST_OS)
+
+set (CMAKE_CXX_STANDARD 11)
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 # Default CLFAGS and CXXFLAGS:
-set(CMAKE_C_FLAGS_RELEASE "-O2")
-set(CMAKE_CXX_FLAGS_RELEASE "-O2")
-set(CMAKE_C_FLAGS_DEBUG "-g")
-set(CMAKE_CXX_FLAGS_DEBUG "-g")
-set(CMAKE_C_FLAGS_OPTIMISED "-O3")
-set(CMAKE_CXX_FLAGS_OPTIMISED "-O3")
+set(CMAKE_C_FLAGS_RELEASE "-Wall -D__STDC_CONSTANT_MACROS -O2")
+set(CMAKE_CXX_FLAGS_RELEASE "-Wall -D__STDC_CONSTANT_MACROS -O2")
+set(CMAKE_C_FLAGS_DEBUG "-Wall -D__STDC_CONSTANT_MACROS -g")
+set(CMAKE_CXX_FLAGS_DEBUG "-Wall -D__STDC_CONSTANT_MACROS -g")
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")

-include(ConfigureBaseTargets)
-include(CheckPlatform)
-
 # GCC below 6.0 doesn't support __target__("fpu=neon") attribute, required for compiling ARM Neon code, otherwise compilation fails.
 # Must use -mfpu=neon compiler flag instead, but only do that for processors that support neon, otherwise strip the neon code alltogether,
 # because passing -fmpu=neon is unsafe to processors that don't support neon

 # Arm neon support only tested on Linux. If your arm hardware is running a non-Linux distro and is using gcc then contact us.
-if(ZM_SYSTEM_PROC MATCHES "^arm")
-  if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
-    exec_program(grep ARGS " neon " "/proc/cpuinfo" OUTPUT_VARIABLE neonoutput RETURN_VALUE neonresult)
-    if(neonresult EQUAL 0)
+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(ZM_SYSTEM_PROC_ERR)
+        IF(NOT ZM_SYSTEM_PROC)
+           message(WARNING "\nUnable to determine the system processor. This may cause a build failure.\n")
+        ENDIF(ZM_SYSTEM_PROC)
+
+    ENDIF((ZM_SYSTEM_PROC STREQUAL "") OR (ZM_SYSTEM_PROC STREQUAL "unknown"))
+
+    IF(ZM_SYSTEM_PROC MATCHES "^arm")
+	    IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
+                EXEC_PROGRAM(grep ARGS " neon " "/proc/cpuinfo" OUTPUT_VARIABLE neonoutput RETURN_VALUE neonresult)
+		    IF(neonresult EQUAL 0)
                        set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpu=neon")
                        set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpu=neon")
                        set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -mfpu=neon")
                        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -mfpu=neon")
-    else()
+		    ELSE(neonresult EQUAL 0)
                        add_definitions(-DZM_STRIP_NEON=1)
                        message(STATUS "ARM Neon is not available on this processor. Neon functions will be absent")
-    endif()
-  endif()
-endif()
+                    ENDIF(neonresult EQUAL 0)
+            ENDIF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
+    ENDIF(ZM_SYSTEM_PROC MATCHES "^arm")
+ENDIF (CMAKE_SYSTEM_NAME MATCHES "Linux")

 # Modules that we need:
 include (GNUInstallDirs)
@ -87,18 +127,7 @@ mark_as_advanced(
    ZM_PATH_ARP 
    ZM_CONFIG_DIR
    ZM_CONFIG_SUBDIR
-  ZM_SYSTEMD
-  ZM_MANPAGE_DEST_PREFIX)
-
-option(ENABLE_WERROR "Fail the build if a compiler warning is emitted" 0)
-option(BUILD_TEST_SUITE "Build the test suite" 0)
-option(BUILD_MAN "Build man pages" 1)
-option(ASAN "DEBUGGING: Build with AddressSanitizer (ASan) support" 0)
-option(TSAN "DEBUGGING: Build with ThreadSanitizer (TSan) support" 0)
-
-if(ASAN AND TSAN)
-  message(FATAL_ERROR "ASAN and TSAN options are mutually exclusive")
-endif()
+    ZM_SYSTEMD)

 set(ZM_RUNDIR "/var/run/zm" CACHE PATH 
    "Location of transient process files, default: /var/run/zm")
@ -108,17 +137,14 @@ set(ZM_TMPDIR "/var/tmp/zm" CACHE PATH
    "Location of temporary files, default: /tmp/zm")
 set(ZM_LOGDIR "/var/log/zm" CACHE PATH 
    "Location of generated log files, default: /var/log/zm")
-set(ZM_WEBDIR "${CMAKE_INSTALL_FULL_DATADIR}/zoneminder/www" CACHE PATH
+set(ZM_WEBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/zoneminder/www" CACHE PATH 
    "Location of the web files, default: <prefix>/${CMAKE_INSTALL_DATADIR}/zoneminder/www")
-set(ZM_CGIDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/zoneminder/cgi-bin" CACHE PATH
+set(ZM_CGIDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin" CACHE PATH 
    "Location of the cgi-bin files, default: <prefix>/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin")
 set(ZM_CACHEDIR "/var/cache/zoneminder" CACHE PATH 
    "Location of the web server cache busting files, default: /var/cache/zoneminder")
 set(ZM_CONTENTDIR "/var/lib/zoneminder" CACHE PATH 
    "Location of dynamic content (events and images), default: /var/lib/zoneminder")
-set(ZM_FONTDIR "${CMAKE_INSTALL_FULL_DATADIR}/zoneminder/fonts" CACHE PATH
-  "Location of the font files used for timestamping, default: <prefix>/${CMAKE_INSTALL_DATADIR}/zoneminder/fonts")
-
 set(ZM_DB_HOST "localhost" CACHE STRING 
    "Hostname where ZoneMinder database located, default: localhost")
 set(ZM_DB_NAME "zm" CACHE STRING 
@ -135,12 +161,13 @@ set(ZM_WEB_GROUP "" CACHE STRING
    Leave empty to be the same as the web user")
 set(ZM_DIR_EVENTS "${ZM_CONTENTDIR}/events" CACHE PATH 
    "Location where events are recorded to, default: ZM_CONTENTDIR/events")
+set(ZM_DIR_IMAGES "${ZM_CONTENTDIR}/images" CACHE PATH
+    "Location where images, not directly associated with events,
+     are recorded to, default: ZM_CONTENTDIR/images")
 set(ZM_DIR_SOUNDS "sounds" CACHE PATH
    "Location to look for optional sound files, default: sounds")
 set(ZM_PATH_ZMS "/cgi-bin/nph-zms" CACHE PATH
    "Web url to zms streaming server, default: /cgi-bin/nph-zms")
-set(ZM_PATH_SHUTDOWN "/sbin/shutdown" CACHE PATH
-  "Path to shutdown binary, default: /sbin/shutdown")

 # Advanced
 set(ZM_PATH_MAP "/dev/shm" CACHE PATH
@ -158,10 +185,10 @@ set(ZM_MYSQL_ENGINE "InnoDB" CACHE STRING
 set(ZM_NO_MMAP "OFF" CACHE BOOL 
    "Set to ON to not use mmap shared memory. Shouldn't be enabled unless you 
    experience problems with the shared memory. default: OFF")
+set(ZM_NO_FFMPEG "OFF" CACHE BOOL 
+    "Set to ON to skip ffmpeg checks and force building ZM without ffmpeg. default: OFF")
 set(ZM_NO_LIBVLC "OFF" CACHE BOOL 
 "Set to ON to skip libvlc checks and force building ZM without libvlc. default: OFF")
-set(ZM_NO_LIBVNC "OFF" CACHE BOOL
-  "Set to ON to skip libvnc checks and force building ZM without libvnc. default: OFF")
 set(ZM_NO_CURL "OFF" CACHE BOOL 
    "Set to ON to skip cURL checks and force building ZM without cURL. default: OFF")
 set(ZM_NO_X10 "OFF" CACHE BOOL 
@ -169,8 +196,6 @@ set(ZM_NO_X10 "OFF" CACHE BOOL
 set(ZM_ONVIF "ON" CACHE BOOL 
    "Set to ON to enable basic ONVIF support. This is EXPERIMENTAL and may not 
    work with all cameras claiming to be ONVIF compliant. default: ON")
-set(ZM_NO_RTSPSERVER "OFF" CACHE BOOL
-  "Set to ON to skip building ZM with rtsp server support. default: OFF")
 set(ZM_PERL_MM_PARMS INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 CACHE STRING 
 	"By default, ZoneMinder's Perl modules are installed into the Vendor folders, 
 	as defined by your installation of Perl. You can change that here. Consult Perl's 
@ -185,18 +210,8 @@ set(ZM_TARGET_DISTRO "" CACHE STRING
    "Build ZoneMinder for a specific distribution.  Currently, valid names are: fc27, fc26, el7, OS13, FreeBSD")
 set(ZM_SYSTEMD "OFF" CACHE BOOL 
    "Set to ON to force building ZM with systemd support. default: OFF")
-set(ZM_MANPAGE_DEST_PREFIX "share/man" CACHE PATH
-  "Relative path used to install ZoneMinder's Man pages into a
-    non-standard folder. Most Linux users will not need to change this.
-    BSD users may need to set this.")
-set(ZM_CAKEPHP_CACHE "Apc" CACHE STRING
-  "Set the CakePHP cache engine, default: Apc")

 # Reassign some variables if a target distro has been specified
-if(ZM_TARGET_DISTRO MATCHES "^fc")
-  set(ZM_CAKEPHP_CACHE "Memcached")
-endif()
-
 if((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))
 	set(ZM_RUNDIR "/var/run/zoneminder")
 	set(ZM_SOCKDIR "/var/lib/zoneminder/sock")
@ -207,6 +222,7 @@ if((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))
 	set(ZM_WEBDIR "/usr/share/zoneminder/www")
 	set(ZM_CGIDIR "/usr/libexec/zoneminder/cgi-bin")
 	set(ZM_DIR_EVENTS "/var/lib/zoneminder/events")
+	set(ZM_DIR_IMAGES "/var/lib/zoneminder/images")
 	set(ZM_PATH_ZMS "/cgi-bin-zm/nph-zms")
 elseif(ZM_TARGET_DISTRO STREQUAL "OS13")
 	set(ZM_RUNDIR "/var/run/zoneminder")
@ -229,33 +245,27 @@ elseif(ZM_TARGET_DISTRO STREQUAL "FreeBSD")
        set(ZM_WEBDIR "/usr/local/share/zoneminder/www")
        set(ZM_CGIDIR "/usr/local/libexec/zoneminder/cgi-bin")
        set(ZM_PERL_MM_PARMS "INSTALLDIRS=site")
-endif()
-
-if(BUILD_MAN)
-  message(STATUS "Building man pages: Yes (default)")
-  set(ZM_PERL_MM_PARMS_FULL ${ZM_PERL_MM_PARMS})
-else()
-  message(STATUS "Building man pages: No")
-  list(APPEND ZM_PERL_MM_PARMS_FULL ${ZM_PERL_MM_PARMS}
-    "INSTALLMAN1DIR=none"
-    "INSTALLMAN3DIR=none")
-endif()
+endif((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))

 # Required for certain checks to work
-set(CMAKE_EXTRA_INCLUDE_FILES ${CMAKE_EXTRA_INCLUDE_FILES} stdio.h stdlib.h math.h signal.h)
+set(CMAKE_EXTRA_INCLUDE_FILES 
+    ${CMAKE_EXTRA_INCLUDE_FILES} stdio.h stdlib.h math.h signal.h
+    )
+# Required for including headers from the this folder
+include_directories("${CMAKE_BINARY_DIR}")
 # This is required to enable searching in lib64 (if exists), do not change
 set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON)

 # Set the systemd flag if systemd is autodetected or ZM_SYSTEMD has been set
 if(ZM_SYSTEMD OR (IS_DIRECTORY /usr/lib/systemd/system) OR (IS_DIRECTORY /lib/systemd/system))
    set(WITH_SYSTEMD 1)
-endif()
+endif(ZM_SYSTEMD OR (IS_DIRECTORY /usr/lib/systemd/system) OR (IS_DIRECTORY /lib/systemd/system))

 # System checks
 check_include_file("libv4l1-videodev.h" HAVE_LIBV4L1_VIDEODEV_H)
 if(NOT HAVE_LIBV4L1_VIDEODEV_H)
 	check_include_file("linux/videodev.h" HAVE_LINUX_VIDEODEV_H)
-endif()
+endif(NOT HAVE_LIBV4L1_VIDEODEV_H)
 check_include_file("linux/videodev2.h" HAVE_LINUX_VIDEODEV2_H)
 check_include_file("execinfo.h" HAVE_EXECINFO_H)
 if (HAVE_EXECINFO_H)
@ -264,10 +274,10 @@ if(HAVE_EXECINFO_H)
    find_library (EXECINFO_LIBRARY NAMES execinfo)
    if (EXECINFO_LIBRARY)
        list(APPEND ZM_BIN_LIBS "-lexecinfo")
-    endif()
-  endif()
+    endif (EXECINFO_LIBRARY)
+  endif (NOT HAVE_DECL_BACKTRACE)
  check_function_exists("backtrace_symbols" HAVE_DECL_BACKTRACE_SYMBOLS)
-endif()
+endif (HAVE_EXECINFO_H)
 check_include_file("ucontext.h" HAVE_UCONTEXT_H)
 check_include_file("sys/sendfile.h" HAVE_SYS_SENDFILE_H)
 check_include_file("sys/syscall.h" HAVE_SYS_SYSCALL_H)
@ -284,10 +294,10 @@ if(UNIX)
    CHECK_LIBRARY_EXISTS(rt clock_gettime "time.h" HAVE_CLOCK_GETTIME)
    if(NOT HAVE_CLOCK_GETTIME)
        message(FATAL_ERROR "clock_gettime not found")
-  else()
+    else(NOT HAVE_CLOCK_GETTIME)
        list(APPEND ZM_BIN_LIBS "-lrt")
-  endif()
-endif()
+    endif(NOT HAVE_CLOCK_GETTIME)
+endif(UNIX)

 # zlib
 find_package(ZLIB)
@ -298,9 +308,9 @@ if(ZLIB_FOUND)
 	set(CMAKE_REQUIRED_INCLUDES "${ZLIB_INCLUDE_DIR}")
 	check_include_file("zlib.h" HAVE_ZLIB_H)
 	set(optlibsfound "${optlibsfound} zlib")
-else()
+else(ZLIB_FOUND)
 	set(optlibsnotfound "${optlibsnotfound} zlib")
-endif()
+endif(ZLIB_FOUND)

 # Do not check for cURL if ZM_NO_CURL is on
 if(NOT ZM_NO_CURL)
@ -308,15 +318,15 @@ if(NOT ZM_NO_CURL)
 	find_package(CURL)
 	if(CURL_FOUND)
 		set(HAVE_LIBCURL 1)
-    #list(APPEND ZM_BIN_LIBS ${CURL_LIBRARIES})
+		list(APPEND ZM_BIN_LIBS ${CURL_LIBRARIES})
 		include_directories(${CURL_INCLUDE_DIRS})
 		set(CMAKE_REQUIRED_INCLUDES ${CURL_INCLUDE_DIRS})
 		check_include_file("curl/curl.h" HAVE_CURL_CURL_H)
 		set(optlibsfound "${optlibsfound} cURL")
-  else()
+	else(CURL_FOUND)
 		set(optlibsnotfound "${optlibsnotfound} cURL")
-  endif()
-endif()
+	endif(CURL_FOUND)
+endif(NOT ZM_NO_CURL)

 # jpeg
 find_package(JPEG)
@ -330,43 +340,13 @@ if(JPEG_FOUND)
 	if(NOT HAVE_JPEGLIB_H)
 		message(FATAL_ERROR 
                    "ZoneMinder requires libjpeg headers - check that libjpeg development packages are installed")
-  endif()
-else()
+	endif(NOT HAVE_JPEGLIB_H)
+else(JPEG_FOUND)
 	message(FATAL_ERROR 
            "ZoneMinder requires jpeg but it was not found on your system")
-endif()
-
-# LIBJWT
-find_package(LibJWT)
-if(LIBJWT_FOUND)
-  set(HAVE_LIBJWT 1)
-  set(optlibsfound "${optlibsfound} LIBJWT")
-  list(APPEND ZM_BIN_LIBS "${LIBJWT_LIBRARY}")
-else()
-  set(optlibsnotfound "${optlibsnotfound} LIBJWT")
-endif()
-
-# gnutls (using find_library and find_path)
-if(HAVE_LIBJWT)
-  find_library(GNUTLS_LIBRARIES gnutls)
-  if(GNUTLS_LIBRARIES)
-    set(HAVE_LIBGNUTLS 1)
-    list(APPEND ZM_BIN_LIBS "${GNUTLS_LIBRARIES}")
-    find_path(GNUTLS_INCLUDE_DIR gnutls/gnutls.h)
-    if(GNUTLS_INCLUDE_DIR)
-      include_directories("${GNUTLS_INCLUDE_DIR}")
-      set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
-    endif()
-    mark_as_advanced(FORCE GNUTLS_LIBRARIES GNUTLS_INCLUDE_DIR)
-    check_include_file("gnutls/gnutls.h" HAVE_GNUTLS_GNUTLS_H)
-    set(optlibsfound "${optlibsfound} GnuTLS")
-  else()
-    set(optlibsnotfound "${optlibsnotfound} GnuTLS")
-  endif()
-endif()
+endif(JPEG_FOUND)

 # OpenSSL
-if(NOT HAVE_LIBGNUTLS OR NOT HAVE_LIBJWT)
 find_package(OpenSSL)
 if(OPENSSL_FOUND)
 	set(HAVE_LIBOPENSSL 1)
@ -376,10 +356,9 @@ if(NOT HAVE_LIBGNUTLS OR NOT HAVE_LIBJWT)
 	set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
 	check_include_file("openssl/md5.h" HAVE_OPENSSL_MD5_H)
 	set(optlibsfound "${optlibsfound} OpenSSL")
-  else()
+else(OPENSSL_FOUND)
 	set(optlibsnotfound "${optlibsnotfound} OpenSSL")
-  endif()
-endif()
+endif(OPENSSL_FOUND)

 # pthread (using find_library and find_path)
 find_library(PTHREAD_LIBRARIES pthread)
@ -390,15 +369,17 @@ if(PTHREAD_LIBRARIES)
 	if(PTHREAD_INCLUDE_DIR)
 		include_directories("${PTHREAD_INCLUDE_DIR}")
 		set(CMAKE_REQUIRED_INCLUDES "${PTHREAD_INCLUDE_DIR}")
-  endif()
+	endif(PTHREAD_INCLUDE_DIR)
 	mark_as_advanced(FORCE PTHREAD_LIBRARIES PTHREAD_INCLUDE_DIR)
 	check_include_file("pthread.h" HAVE_PTHREAD_H)
 	if(NOT HAVE_PTHREAD_H)
-    message(FATAL_ERROR "ZoneMinder requires pthread headers - check that pthread development packages are installed")
-  endif()
-else()
-  message(FATAL_ERROR "ZoneMinder requires pthread but it was not found on your system")
-endif()
+		message(FATAL_ERROR 
+                    "ZoneMinder requires pthread headers - check that pthread development packages are installed")
+	endif(NOT HAVE_PTHREAD_H)
+else(PTHREAD_LIBRARIES)
+	message(FATAL_ERROR 
+            "ZoneMinder requires pthread but it was not found on your system")
+endif(PTHREAD_LIBRARIES)

 # pcre (using find_library and find_path)
 find_library(PCRE_LIBRARIES pcre)
@ -409,13 +390,13 @@ if(PCRE_LIBRARIES)
 	if(PCRE_INCLUDE_DIR)
 		include_directories("${PCRE_INCLUDE_DIR}")
 		set(CMAKE_REQUIRED_INCLUDES "${PCRE_INCLUDE_DIR}")
-  endif()
+	endif(PCRE_INCLUDE_DIR)
 	mark_as_advanced(FORCE PCRE_LIBRARIES PCRE_INCLUDE_DIR)
 	check_include_file("pcre.h" HAVE_PCRE_H)
 	set(optlibsfound "${optlibsfound} PCRE")
-else()
+else(PCRE_LIBRARIES)
 	set(optlibsnotfound "${optlibsnotfound} PCRE")
-endif()
+endif(PCRE_LIBRARIES)

 # gcrypt (using find_library and find_path)
 find_library(GCRYPT_LIBRARIES gcrypt)
@ -426,13 +407,35 @@ if(GCRYPT_LIBRARIES)
 	if(GCRYPT_INCLUDE_DIR)
 		include_directories("${GCRYPT_INCLUDE_DIR}")
 		set(CMAKE_REQUIRED_INCLUDES "${GCRYPT_INCLUDE_DIR}")
-  endif()
+	endif(GCRYPT_INCLUDE_DIR)
 	mark_as_advanced(FORCE GCRYPT_LIBRARIES GCRYPT_INCLUDE_DIR)
 	check_include_file("gcrypt.h" HAVE_GCRYPT_H)
 	set(optlibsfound "${optlibsfound} GCrypt")
-else()
+else(GCRYPT_LIBRARIES)
 	set(optlibsnotfound "${optlibsnotfound} GCrypt")
-endif()
+endif(GCRYPT_LIBRARIES)
+
+# gnutls (using find_library and find_path)
+find_library(GNUTLS_LIBRARIES gnutls-openssl)
+if(NOT GNUTLS_LIBRARIES)
+    find_library(GNUTLS_LIBRARIES gnutls)
+endif(NOT GNUTLS_LIBRARIES)
+
+if(GNUTLS_LIBRARIES)
+	set(HAVE_LIBGNUTLS 1)
+	list(APPEND ZM_BIN_LIBS "${GNUTLS_LIBRARIES}")
+	find_path(GNUTLS_INCLUDE_DIR gnutls/gnutls.h)
+	if(GNUTLS_INCLUDE_DIR)
+		include_directories("${GNUTLS_INCLUDE_DIR}")
+		set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
+	endif(GNUTLS_INCLUDE_DIR)
+	mark_as_advanced(FORCE GNUTLS_LIBRARIES GNUTLS_INCLUDE_DIR)
+	check_include_file("gnutls/openssl.h" HAVE_GNUTLS_OPENSSL_H)
+	check_include_file("gnutls/gnutls.h" HAVE_GNUTLS_GNUTLS_H)
+	set(optlibsfound "${optlibsfound} GnuTLS")
+else(GNUTLS_LIBRARIES)
+	set(optlibsnotfound "${optlibsnotfound} GnuTLS")
+endif(GNUTLS_LIBRARIES)

 # mysqlclient (using find_library and find_path)
 find_library(MYSQLCLIENT_LIBRARIES mysqlclient PATH_SUFFIXES mysql)
@ -443,18 +446,75 @@ if(MYSQLCLIENT_LIBRARIES)
 	if(MYSQLCLIENT_INCLUDE_DIR)
 		include_directories("${MYSQLCLIENT_INCLUDE_DIR}")
 		set(CMAKE_REQUIRED_INCLUDES "${MYSQLCLIENT_INCLUDE_DIR}")
-  endif()
+	endif(MYSQLCLIENT_INCLUDE_DIR)
 	mark_as_advanced(FORCE MYSQLCLIENT_LIBRARIES MYSQLCLIENT_INCLUDE_DIR)
 	check_include_file("mysql.h" HAVE_MYSQL_H)
 	if(NOT HAVE_MYSQL_H)
-    message(FATAL_ERROR "ZoneMinder requires MySQL headers - check that MySQL development packages are installed")
-  endif()
-else()
-  message(FATAL_ERROR "ZoneMinder requires mysqlclient but it was not found on your system")
-endif()
+		message(FATAL_ERROR 
+                    "ZoneMinder requires MySQL headers - check that MySQL development packages are installed")
+	endif(NOT HAVE_MYSQL_H)
+else(MYSQLCLIENT_LIBRARIES)
+	message(FATAL_ERROR 
+            "ZoneMinder requires mysqlclient but it was not found on your system")
+endif(MYSQLCLIENT_LIBRARIES)
+
+# x264 (using find_library and find_path)
+find_library(X264_LIBRARIES x264)
+if(X264_LIBRARIES)
+	set(HAVE_LIBX264 1)
+	list(APPEND ZM_BIN_LIBS "${X264_LIBRARIES}")
+	find_path(X264_INCLUDE_DIR x264.h)
+	if(X264_INCLUDE_DIR)
+		include_directories("${X264_INCLUDE_DIR}")
+		set(CMAKE_REQUIRED_INCLUDES "${X264_INCLUDE_DIR}")
+	endif(X264_INCLUDE_DIR)
+	mark_as_advanced(FORCE X264_LIBRARIES X264_INCLUDE_DIR)
+	check_include_files("stdint.h;x264.h" HAVE_X264_H)
+	set(optlibsfound "${optlibsfound} x264")
+else(X264_LIBRARIES)
+	set(optlibsnotfound "${optlibsnotfound} x264")
+endif(X264_LIBRARIES)
+
+# mp4v2 (using find_library and find_path)
+find_library(MP4V2_LIBRARIES mp4v2)
+if(MP4V2_LIBRARIES)
+	set(HAVE_LIBMP4V2 1)
+	list(APPEND ZM_BIN_LIBS "${MP4V2_LIBRARIES}")
+
+        # mp4v2/mp4v2.h
+	find_path(MP4V2_INCLUDE_DIR mp4v2/mp4v2.h)
+	if(MP4V2_INCLUDE_DIR)
+		include_directories("${MP4V2_INCLUDE_DIR}")
+		set(CMAKE_REQUIRED_INCLUDES "${MP4V2_INCLUDE_DIR}")
+		check_include_file("mp4v2/mp4v2.h" HAVE_MP4V2_MP4V2_H)
+	endif(MP4V2_INCLUDE_DIR)
+
+        # mp4v2.h
+	find_path(MP4V2_INCLUDE_DIR mp4v2.h)
+	if(MP4V2_INCLUDE_DIR)
+		include_directories("${MP4V2_INCLUDE_DIR}")
+		set(CMAKE_REQUIRED_INCLUDES "${MP4V2_INCLUDE_DIR}")
+		check_include_file("mp4v2.h" HAVE_MP4V2_H)
+	endif(MP4V2_INCLUDE_DIR)
+
+	# mp4.h
+	find_path(MP4V2_INCLUDE_DIR mp4.h)
+	if(MP4V2_INCLUDE_DIR)
+		include_directories("${MP4V2_INCLUDE_DIR}")
+		set(CMAKE_REQUIRED_INCLUDES "${MP4V2_INCLUDE_DIR}")
+		check_include_file("mp4.h" HAVE_MP4_H)
+	endif(MP4V2_INCLUDE_DIR)
+
+	mark_as_advanced(FORCE MP4V2_LIBRARIES MP4V2_INCLUDE_DIR)
+	set(optlibsfound "${optlibsfound} mp4v2")
+else(MP4V2_LIBRARIES)
+	set(optlibsnotfound "${optlibsnotfound} mp4v2")
+endif(MP4V2_LIBRARIES)

 set(PATH_FFMPEG "")
 set(OPT_FFMPEG "no")
+# Do not check for ffmpeg if ZM_NO_FFMPEG is on
+if(NOT ZM_NO_FFMPEG)
 	# avformat (using find_library and find_path)
 	find_library(AVFORMAT_LIBRARIES avformat)
 	if(AVFORMAT_LIBRARIES)
@ -464,13 +524,13 @@ if(AVFORMAT_LIBRARIES)
 		if(AVFORMAT_INCLUDE_DIR)
 			include_directories("${AVFORMAT_INCLUDE_DIR}")
 			set(CMAKE_REQUIRED_INCLUDES "${AVFORMAT_INCLUDE_DIR}")
-  endif()
+		endif(AVFORMAT_INCLUDE_DIR)
 		mark_as_advanced(FORCE AVFORMAT_LIBRARIES AVFORMAT_INCLUDE_DIR)
 		check_include_file("libavformat/avformat.h" HAVE_LIBAVFORMAT_AVFORMAT_H)
 		set(optlibsfound "${optlibsfound} AVFormat")
-else()
+	else(AVFORMAT_LIBRARIES)
 		set(optlibsnotfound "${optlibsnotfound} AVFormat")
-endif()
+	endif(AVFORMAT_LIBRARIES)

 	# avcodec (using find_library and find_path)
 	find_library(AVCODEC_LIBRARIES avcodec)
@ -481,14 +541,13 @@ if(AVCODEC_LIBRARIES)
 		if(AVCODEC_INCLUDE_DIR)
 			include_directories("${AVCODEC_INCLUDE_DIR}")
 			set(CMAKE_REQUIRED_INCLUDES "${AVCODEC_INCLUDE_DIR}")
-  endif()
+		endif(AVCODEC_INCLUDE_DIR)
 		mark_as_advanced(FORCE AVCODEC_LIBRARIES AVCODEC_INCLUDE_DIR)
 		check_include_file("libavcodec/avcodec.h" HAVE_LIBAVCODEC_AVCODEC_H)
 		set(optlibsfound "${optlibsfound} AVCodec")
-else()
-  message(WARNING "\nWhile it should be possible to build ZM without AVCODEC the result will pretty useless.")
+	else(AVCODEC_LIBRARIES)
 		set(optlibsnotfound "${optlibsnotfound} AVCodec")
-endif()
+	endif(AVCODEC_LIBRARIES)

 	# avdevice (using find_library and find_path)
 	find_library(AVDEVICE_LIBRARIES avdevice)
@ -499,13 +558,13 @@ if(AVDEVICE_LIBRARIES)
 		if(AVDEVICE_INCLUDE_DIR)
 			include_directories("${AVDEVICE_INCLUDE_DIR}")
 			set(CMAKE_REQUIRED_INCLUDES "${AVDEVICE_INCLUDE_DIR}")
-  endif()
+		endif(AVDEVICE_INCLUDE_DIR)
 		mark_as_advanced(FORCE AVDEVICE_LIBRARIES AVDEVICE_INCLUDE_DIR)
 		check_include_file("libavdevice/avdevice.h" HAVE_LIBAVDEVICE_AVDEVICE_H)
 		set(optlibsfound "${optlibsfound} AVDevice")
-else()
+	else(AVDEVICE_LIBRARIES)
 		set(optlibsnotfound "${optlibsnotfound} AVDevice")
-endif()
+	endif(AVDEVICE_LIBRARIES)

 	# avutil (using find_library and find_path)
 	find_library(AVUTIL_LIBRARIES avutil)
@ -516,15 +575,15 @@ if(AVUTIL_LIBRARIES)
 		if(AVUTIL_INCLUDE_DIR)
 			include_directories("${AVUTIL_INCLUDE_DIR}")
 			set(CMAKE_REQUIRED_INCLUDES "${AVUTIL_INCLUDE_DIR}")
-  endif()
+		endif(AVUTIL_INCLUDE_DIR)
 		mark_as_advanced(FORCE AVUTIL_LIBRARIES AVUTIL_INCLUDE_DIR)
 		check_include_file("libavutil/avutil.h" HAVE_LIBAVUTIL_AVUTIL_H)
 		check_include_file("libavutil/mathematics.h" HAVE_LIBAVUTIL_MATHEMATICS_H)
 		check_include_file("libavutil/hwcontext.h" HAVE_LIBAVUTIL_HWCONTEXT_H)
 		set(optlibsfound "${optlibsfound} AVUtil")
-else()
+	else(AVUTIL_LIBRARIES)
 		set(optlibsnotfound "${optlibsnotfound} AVUtil")
-endif()
+	endif(AVUTIL_LIBRARIES)

 	# swscale (using find_library and find_path)
 	find_library(SWSCALE_LIBRARIES swscale)
@ -535,31 +594,15 @@ if(SWSCALE_LIBRARIES)
 		if(SWSCALE_INCLUDE_DIR)
 			include_directories("${SWSCALE_INCLUDE_DIR}")
 			set(CMAKE_REQUIRED_INCLUDES "${SWSCALE_INCLUDE_DIR}")
-  endif()
+		endif(SWSCALE_INCLUDE_DIR)
 		mark_as_advanced(FORCE SWSCALE_LIBRARIES SWSCALE_INCLUDE_DIR)
 		check_include_file("libswscale/swscale.h" HAVE_LIBSWSCALE_SWSCALE_H)
 		set(optlibsfound "${optlibsfound} SWScale")
-else()
+	else(SWSCALE_LIBRARIES)
 		set(optlibsnotfound "${optlibsnotfound} SWScale")
-endif()
+	endif(SWSCALE_LIBRARIES)

-# SWresample (using find_library and find_path)
-find_library(SWRESAMPLE_LIBRARIES swresample)
-if(SWRESAMPLE_LIBRARIES)
-  set(HAVE_LIBSWRESAMPLE 1)
-  list(APPEND ZM_BIN_LIBS "${SWRESAMPLE_LIBRARIES}")
-  find_path(SWRESAMPLE_INCLUDE_DIR "libswresample/swresample.h" /usr/include/ffmpeg)
-  if(SWRESAMPLE_INCLUDE_DIR)
-    include_directories("${SWRESAMPLE_INCLUDE_DIR}")
-    set(CMAKE_REQUIRED_INCLUDES "${SWRESAMPLE_INCLUDE_DIR}")
-  endif()
-  mark_as_advanced(FORCE SWRESAMPLE_LIBRARIES SWRESAMPLE_INCLUDE_DIR)
-  check_include_file("libswresample/swresample.h" HAVE_LIBSWRESAMPLE_SWRESAMPLE_H)
-  set(optlibsfound "${optlibsfound} SWResample")
-else()
-  set(optlibsnotfound "${optlibsnotfound} SWResample")
-
-  # AVresample (using find_library and find_path)
+	# rescale (using find_library and find_path)
 	find_library(AVRESAMPLE_LIBRARIES avresample)
 	if(AVRESAMPLE_LIBRARIES)
 		set(HAVE_LIBAVRESAMPLE 1)
@ -568,14 +611,13 @@ else()
 		if(AVRESAMPLE_INCLUDE_DIR)
 			include_directories("${AVRESAMPLE_INCLUDE_DIR}")
 			set(CMAKE_REQUIRED_INCLUDES "${AVRESAMPLE_INCLUDE_DIR}")
-    endif()
+		endif(AVRESAMPLE_INCLUDE_DIR)
 		mark_as_advanced(FORCE AVRESAMPLE_LIBRARIES AVRESAMPLE_INCLUDE_DIR)
 		check_include_file("libavresample/avresample.h" HAVE_LIBAVRESAMPLE_AVRESAMPLE_H)
 		set(optlibsfound "${optlibsfound} AVResample")
-  else()
+	else(AVRESAMPLE_LIBRARIES)
 		set(optlibsnotfound "${optlibsnotfound} AVResample")
-  endif()
-endif()
+	endif(AVRESAMPLE_LIBRARIES)

 	# Find the path to the ffmpeg executable
 	find_program(FFMPEG_EXECUTABLE 
@ -585,7 +627,9 @@ if(FFMPEG_EXECUTABLE)
 		set(PATH_FFMPEG "${FFMPEG_EXECUTABLE}")
 		set(OPT_FFMPEG "yes")
 		mark_as_advanced(FFMPEG_EXECUTABLE)
-endif()
+	endif(FFMPEG_EXECUTABLE)
+
+endif(NOT ZM_NO_FFMPEG)

 # Do not check for libvlc if ZM_NO_LIBVLC is on
 if(NOT ZM_NO_LIBVLC)
@ -593,38 +637,19 @@ if(NOT ZM_NO_LIBVLC)
 	find_library(LIBVLC_LIBRARIES vlc)
 	if(LIBVLC_LIBRARIES)
 		set(HAVE_LIBVLC 1)
-    #list(APPEND ZM_BIN_LIBS "${LIBVLC_LIBRARIES}")
+		list(APPEND ZM_BIN_LIBS "${LIBVLC_LIBRARIES}")
 		find_path(LIBVLC_INCLUDE_DIR "vlc/vlc.h")
 		if(LIBVLC_INCLUDE_DIR)
 			include_directories("${LIBVLC_INCLUDE_DIR}")
 			set(CMAKE_REQUIRED_INCLUDES "${LIBVLC_INCLUDE_DIR}")
-    endif()
+		endif(LIBVLC_INCLUDE_DIR)
 		mark_as_advanced(FORCE LIBVLC_LIBRARIES LIBVLC_INCLUDE_DIR)
 		check_include_file("vlc/vlc.h" HAVE_VLC_VLC_H)
 		set(optlibsfound "${optlibsfound} libVLC")
-  else()
+	else(LIBVLC_LIBRARIES)
 		set(optlibsnotfound "${optlibsnotfound} libVLC")
-  endif()
-endif()
-
-if(NOT ZM_NO_LIBVNC)
-  # libvncclient (using find_library and find_path)
-  find_library(LIBVNC_LIBRARIES vncclient)
-  if(LIBVNC_LIBRARIES)
-    set(HAVE_LIBVNC 1)
-    #list(APPEND ZM_BIN_LIBS "${LIBVNC_LIBRARIES}")
-    find_path(LIBVNC_INCLUDE_DIR "rfb/rfb.h")
-    if(LIBVNC_INCLUDE_DIR)
-      include_directories("${LIBVNC_INCLUDE_DIR}")
-      set(CMAKE_REQUIRED_INCLUDES "${LIBVNC_INCLUDE_DIR}")
-    endif()
-    mark_as_advanced(FORCE LIBVNC_LIBRARIES LIBVNC_INCLUDE_DIR)
-    check_include_file("rfb/rfb.h" HAVE_RFB_RFB_H)
-    set(optlibsfound "${optlibsfound} libVNC")
-  else()
-    set(optlibsnotfound "${optlibsnotfound} libVNC")
-  endif()
-endif()
+	endif(LIBVLC_LIBRARIES)
+endif(NOT ZM_NO_LIBVLC)

 #find_package(Boost 1.36.0)
 #if(Boost_FOUND)
@ -632,20 +657,14 @@ endif()
  ##set(CMAKE_REQUIRED_INCLUDES "${Boost_INCLUDE_DIRS}")
  #list(APPEND ZM_BIN_LIBS "${Boost_LIBRARIES}")
 #endif()
-
-if(NOT ZM_NO_RTSPSERVER)
-  set(HAVE_RTSP_SERVER 1)
-else()
-  set(HAVE_RTSP_SERVER 0)
-endif()
-
 #
 # *** END OF LIBRARY CHECKS ***

 # Check for gnutls or crypto
 if((NOT HAVE_LIBCRYPTO) AND (NOT HAVE_LIBGNUTLS))
-  message(FATAL_ERROR "ZoneMinder requires crypto or gnutls but none were found on your system")
-endif()
+	message(FATAL_ERROR 
+            "ZoneMinder requires crypto or gnutls but none were found on your system")
+endif((NOT HAVE_LIBCRYPTO) AND (NOT HAVE_LIBGNUTLS))

 # Check for V4L header files and enable ZM_HAS_V4L, ZM_HAS_V4L1, ZM_HAS_V4L2 accordingly
 # Setting to zeros first is required because ZM uses #define for these
@ -655,21 +674,24 @@ set(ZM_HAS_V4L2 0)
 if(HAVE_LINUX_VIDEODEV_H OR HAVE_LIBV4L1_VIDEODEV_H)
 	set(ZM_HAS_V4L 1)
 	set(ZM_HAS_V4L1 1)
-endif()
+endif(HAVE_LINUX_VIDEODEV_H OR HAVE_LIBV4L1_VIDEODEV_H)
 if(HAVE_LINUX_VIDEODEV2_H)
 	set(ZM_HAS_V4L 1)
 	set(ZM_HAS_V4L2 1)
-endif()
+endif(HAVE_LINUX_VIDEODEV2_H)
 if((NOT HAVE_LINUX_VIDEODEV_H) 
    AND (NOT HAVE_LIBV4L1_VIDEODEV_H) 
    AND (NOT HAVE_LINUX_VIDEODEV2_H))
-  message(AUTHOR_WARNING "Video 4 Linux headers weren't found - Analog and USB camera support will not be available")
-endif()
+	message(AUTHOR_WARNING 
+            "Video 4 Linux headers weren't found - Analog and USB camera support will not be available")
+endif((NOT HAVE_LINUX_VIDEODEV_H) 
+    AND (NOT HAVE_LIBV4L1_VIDEODEV_H) 
+    AND (NOT HAVE_LINUX_VIDEODEV2_H))
 # Check for PCRE and enable ZM_PCRE accordingly
 set(ZM_PCRE 0)
 if(HAVE_LIBPCRE AND HAVE_PCRE_H)
 	set(ZM_PCRE 1)
-endif()
+endif(HAVE_LIBPCRE AND HAVE_PCRE_H)
 # Check for mmap and enable in all components
 set(ZM_MEM_MAPPED 0)
 set(ENABLE_MMAP no)
@ -677,13 +699,13 @@ if(NOT ZM_NO_MMAP)
 	set(ZM_MEM_MAPPED 1)
 	set(ENABLE_MMAP yes)
 	set(ZM_MMAP_PERLPACKAGE "Sys::Mmap")
-endif()
+endif(NOT ZM_NO_MMAP)

 # Check for the ONVIF flag and enable ZM_HAS_ONVIF accordingly
 set(ZM_HAS_ONVIF 0)
 if(ZM_ONVIF)
 	set(ZM_HAS_ONVIF 1)
-endif()
+endif(ZM_ONVIF)

 # Check for authentication functions
 if(HAVE_OPENSSL_MD5_H)
@ -693,8 +715,15 @@ if(HAVE_OPENSSL_MD5_H)
            MD5 
            "unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md)" "NULL" "openssl/md5.h" 
            HAVE_MD5_OPENSSL)
-endif()
-
+endif(HAVE_OPENSSL_MD5_H)
+if(HAVE_GNUTLS_OPENSSL_H)
+	set(CMAKE_REQUIRED_LIBRARIES "${GNUTLS_LIBRARIES}")
+	set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
+	check_prototype_definition(
+            MD5 
+            "unsigned char *MD5 (const unsigned char *buf, unsigned long len, unsigned char *md)" "NULL" "gnutls/openssl.h" 
+            HAVE_MD5_GNUTLS)
+endif(HAVE_GNUTLS_OPENSSL_H)
 if(HAVE_GNUTLS_GNUTLS_H)
 	set(CMAKE_REQUIRED_LIBRARIES "${GNUTLS_LIBRARIES}")
 	set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
@ -702,30 +731,27 @@ if(HAVE_GNUTLS_GNUTLS_H)
            gnutls_fingerprint 
            "int gnutls_fingerprint (gnutls_digest_algorithm_t algo, const gnutls_datum_t * data, void *result, size_t * result_size)" "0" "stdlib.h;gnutls/gnutls.h" 
            HAVE_DECL_GNUTLS_FINGERPRINT)
-endif()
-
-if(NOT HAVE_DECL_GNUTLS_FINGERPRINT AND HAVE_MD5_OPENSSL)
+endif(HAVE_GNUTLS_GNUTLS_H)
+if(HAVE_MD5_OPENSSL OR HAVE_MD5_GNUTLS)
 	set(HAVE_DECL_MD5 1)
-endif()
-
-if((NOT HAVE_MD5_OPENSSL) AND (NOT HAVE_DECL_GNUTLS_FINGERPRINT))
+else(HAVE_MD5_OPENSSL OR HAVE_MD5_GNUTLS)
 	message(AUTHOR_WARNING 
-    "ZoneMinder requires a working MD5 function for hashed authentication but
-     none were found - hashed authentication will not be available")
-endif()
-
+        "ZoneMinder requires a working MD5 function for hashed authenication but 
+        none were found - hashed authenication will not be available")
+endif(HAVE_MD5_OPENSSL OR HAVE_MD5_GNUTLS)
 # Dirty fix for zm_user only using openssl's md5 if gnutls and gcrypt are not available.
 # This needs to be fixed in zm_user.[h,cpp] but such fix will also require changes to configure.ac
 if(HAVE_LIBCRYPTO AND HAVE_OPENSSL_MD5_H AND HAVE_MD5_OPENSSL)
 	set(HAVE_GCRYPT_H 0)
 	set(HAVE_GNUTLS_OPENSSL_H 0)
-endif()
+endif(HAVE_LIBCRYPTO AND HAVE_OPENSSL_MD5_H AND HAVE_MD5_OPENSSL)

 # Check for Perl
 find_package(Perl)
 if(NOT PERL_FOUND)
-  message(FATAL_ERROR "ZoneMinder requires Perl 5.6.0 or newer but it was not found on your system")
-endif()
+	message(FATAL_ERROR 
+            "ZoneMinder requires Perl 5.6.0 or newer but it was not found on your system")
+endif(NOT PERL_FOUND)

 # Checking for perl modules requires FindPerlModules.cmake
 # Check all required modules at once
@ -735,8 +761,9 @@ find_package(
    Getopt::Long Time::HiRes Date::Manip LWP::UserAgent 
    ExtUtils::MakeMaker ${ZM_MMAP_PERLPACKAGE})
 if(NOT PERLMODULES_FOUND)
-  message(WARNING "Not all required perl modules were found on your system")
-endif()
+	message(FATAL_ERROR 
+            "Not all required perl modules were found on your system")
+endif(NOT PERLMODULES_FOUND)

 # Attempt to check which user apache (or other web server) runs on by 
 # searching for a user beginning with apache or www and then cutting the user 
@ -756,13 +783,13 @@ if(ZM_WEB_USER STREQUAL "")
                    COMMAND echo ${userline_www} 
                    COMMAND cut -d: -f1 OUTPUT_VARIABLE ZM_WEB_USER 
                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-  endif()
+	endif(NOT (userline_apache STREQUAL ""))
 	message(STATUS "Detected web server user: ${ZM_WEB_USER}")
-endif()
+endif(ZM_WEB_USER STREQUAL "")
 # Check if webgroup contains anything. If not, use the web user as the web group
 if(NOT ZM_WEB_GROUP)
 	set(ZM_WEB_GROUP ${ZM_WEB_USER})
-endif()
+endif(NOT ZM_WEB_GROUP)
 message(STATUS "Using web user: ${ZM_WEB_USER}")
 message(STATUS "Using web group: ${ZM_WEB_GROUP}")

@ -770,9 +797,10 @@ if(WITH_SYSTEMD)
    # Check for polkit
    find_package(Polkit)
    if(NOT POLKIT_FOUND)
-    message(WARNING "Running ZoneMinder requires polkit. Building ZoneMinder requires the polkit development package.")
-  endif()
-endif()
+	    message(FATAL_ERROR 
+                "Running ZoneMinder requires polkit. Building ZoneMinder requires the polkit development package.")
+    endif(NOT POLKIT_FOUND)
+endif(WITH_SYSTEMD)

 # Find the path to an arp compatible executable
 if(ZM_PATH_ARP STREQUAL "")
@ -780,17 +808,17 @@ if(ZM_PATH_ARP STREQUAL "")
    if(ARP_EXECUTABLE)
        set(ZM_PATH_ARP "${ARP_EXECUTABLE}")
        mark_as_advanced(ARP_EXECUTABLE)
-  else()
+    else(ARP_EXECUTABLE)
        find_program(ARP_EXECUTABLE ip)
            if(ARP_EXECUTABLE)
                set(ZM_PATH_ARP "${ARP_EXECUTABLE} neigh")
                mark_as_advanced(ARP_EXECUTABLE)
-    endif()
-  endif()
+            endif(ARP_EXECUTABLE)
+    endif(ARP_EXECUTABLE)
    if(ARP_EXECUTABLE-NOTFOUND)
        message(WARNING "Unable to find a compatible arp binary. Monitor probe will not function." )
-  endif()
-endif()
+    endif(ARP_EXECUTABLE-NOTFOUND)
+endif(ZM_PATH_ARP STREQUAL "")

 # Some variables that zm expects
 set(ZM_PID "${ZM_RUNDIR}/zm.pid")
@ -808,14 +836,14 @@ set(WEB_GROUP "${ZM_WEB_GROUP}")
 set(ZM_DB_TYPE "mysql")
 if(ZM_PERL_SEARCH_PATH)
 	set(EXTRA_PERL_LIB "use lib '${ZM_PERL_SEARCH_PATH}'; # Include custom perl install path")
-else()
+else(ZM_PERL_SEARCH_PATH)
 	set(EXTRA_PERL_LIB "# Include from system perl paths only")
-endif()
+endif(ZM_PERL_SEARCH_PATH)

 # If this is an out-of-source build, copy the files we need to the binary directory
 if(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
 	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/conf.d" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" PATTERN "*.in" EXCLUDE)
-endif()
+endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))

 # Generate files from the .in files
 configure_file(zm.conf.in "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" @ONLY)
@ -826,33 +854,26 @@ configure_file(zmlinkcontent.sh.in "${CMAKE_CURRENT_BINARY_DIR}/zmlinkcontent.sh

 # Create a target for man pages
 include(Pod2Man)
+ADD_MANPAGE_TARGET()

 # Process subdirectories
-add_subdirectory(dep)
 add_subdirectory(src)
 add_subdirectory(scripts)
 add_subdirectory(db)
-add_subdirectory(fonts)
 add_subdirectory(web)
 add_subdirectory(misc)
+
+# Enable ONVIF support
+if(ZM_ONVIF)
 	add_subdirectory(onvif)
-
-if(BUILD_TEST_SUITE)
-  message("Building unit tests: Yes")
-  find_package(Catch2 REQUIRED)
-
-  include(CTest)
-  add_subdirectory(tests)
-else()
-  message("Building unit tests: No (default)")
-endif()
+endif(ZM_ONVIF)

 # Process distro subdirectories
 if((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))
 	add_subdirectory(distros/redhat)
-elseif()
+elseif(ZM_TARGET_DISTRO STREQUAL "OS13")
 	add_subdirectory(distros/opensuse)
-endif()
+endif((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))

 # Print optional libraries detection status
 message(STATUS "Optional libraries found:${optlibsfound}")
@ -860,12 +881,14 @@ message(STATUS "Optional libraries not found:${optlibsnotfound}")

 # Run ZM configuration generator
 message(STATUS "Running ZoneMinder configuration generator")
-execute_process(COMMAND perl ${CMAKE_CURRENT_BINARY_DIR}/zmconfgen.pl RESULT_VARIABLE ZMCONFGEN_RESULT)
-if(ZMCONFGEN_RESULT EQUAL 0)
-  message(STATUS "ZoneMinder configuration generator completed successfully")
-else()
-  message(FATAL_ERROR "ZoneMinder configuration generator failed. Exit code: ${zmconfgen_result}")
-endif()
+execute_process(COMMAND perl ./zmconfgen.pl RESULT_VARIABLE zmconfgen_result)
+if(zmconfgen_result EQUAL 0)
+	message(STATUS 
+            "ZoneMinder configuration generator completed successfully")
+else(zmconfgen_result EQUAL 0)
+	message(FATAL_ERROR 
+            "ZoneMinder configuration generator failed. Exit code: ${zmconfgen_result}")
+endif(zmconfgen_result EQUAL 0)

 # Install zm.conf
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" DESTINATION "${ZM_CONFIG_DIR}")
@ -884,6 +907,6 @@ find_program(CCACHE_FOUND ccache)
 if(CCACHE_FOUND)
        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
        set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-endif()
+endif(CCACHE_FOUND)

 install(DIRECTORY icons DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/")
--- a/1
+++ b/1
@ -0,0 +1 @@
+This is too hard to maintain.  See https://github.com/ZoneMinder/ZoneMinder/commits/master
--- a/149
+++ b/149
@ -0,0 +1,149 @@
+Installing ZoneMinder with cmake
+--------------------------------
+Starting with ZoneMinder 1.26.4, ZoneMinder can now be installed using cmake. This requires cmake version 2.6 or newer.
+cmake is an alternative to the autotools collection (libtool, autoconf, automake, autoheader and such). Its more recent and has many advantages, including, but not limited to:
+* One program (cmake) instead of multiple. (libtool, autoconf, automake, etc)
+* One file per directory (CMakeLists.txt) instead of multiple. (configure.ac, Makefile.am and sometimes more)
+* One syntax (cmake's syntax) instead of multiple. (bash and m4)
+* Generation of makefiles for many platforms, including Windows.
+* Newer than autotools and is being actively developed.
+* Generates colored makefiles with progress indicator.
+* Slightly faster because its based on C and not bash.
+* Lots of documentation, unlike autotools: http://www.cmake.org/cmake/help/cmake2.6docs.html
+
+At this point, its still possible to use autotools for the ZoneMinder project. Choosing cmake or autotools is now a matter of preference.
+Hopefully in the future, cmake will become the default way to install ZoneMinder.
+
+Important differences
+---------------------
+* Unlike the autotools way, the cmake way does not require any options. It attempts to detect some things by its own (system directories, libarch, web user and group) and uses defaults for others (installation paths and such).
+* Unlike the autotools way, which links the binaries to a fixed list of libraries, the cmake way only links to libraries that it found on the system. If a library is not found, but required, a fatal error will be shown during the configuration step.
+* Unlike the autotools way, the cmake way does not modify the system in any way it shouldn't. It only does what its supposed to do: Install files to your system. Nothing else and nothing leaks out of the DESTDIR environment variable (if used). This means that depending on your configuration, there might be an extra required step after installation: to link WEB_PATH/events and WEB_PATH/images folders to the correct places.
+
+Configuration
+-------------
+cmake by default does not require any parameters, but its possible to override the defaults with the options below.
+
+Configuration can be done in 4 ways:
+1) As a command line parameter, e.g. cmake -DCMAKE_VERBOSE_MAKEFILE=ON .
+2) Using cmake-gui
+3) Providing cmake with an initial cache file with the -C option
+   IMPORTANT: Do not use the -C option if any major part of your system, excluding the version of zoneminder, has changed.
+   For example, do not use this option if: you have upgraded your distro to a new version, have gone from 32 to 64 bits,
+   or have migrated from one machine to another.
+4) By editing the cache file CMakeCache.txt (after it has been generated) - Not recommended
+
+Possible configuration options: 
+	ZM_RUNDIR		Location of transient process files, default: /var/run/zm
+	ZM_SOCKDIR		Location of Unix domain socket files, default /var/run/zm
+	ZM_TMPDIR		Location of temporary files, default: /tmp/zm
+	ZM_LOGDIR 		Location of generated log files, default: /var/log/zm
+	ZM_WEBDIR		Location of the web files, default: <prefix>/share/zoneminder/www
+	ZM_CGIDIR		Location of the cgi-bin files, default: <prefix>/libexec/zoneminder/cgi-bin
+	ZM_CONTENTDIR		Location of dynamic content (events and images), default: /var/lib/zoneminder
+	ZM_DB_HOST		Hostname where ZoneMinder database located, default: localhost
+	ZM_DB_NAME		Name of ZoneMinder database, default: zm
+	ZM_DB_USER		Name of ZoneMinder database user, default: zmuser
+	ZM_DB_PASS		Password of ZoneMinder database user, default: zmpass
+	ZM_DB_SSL_CA_CERT	Path to SSL CA certificate, default: empty; SSL not enabled
+	ZM_DB_SSL_CLIENT_KEY	Path to SSL client key, default: empty; SSL not enabled
+	ZM_DB_SSL_CLIENT_CERT	Path to SSL client certificate, default: empty; SSL not enabled
+	ZM_WEB_USER		The user apache or the local web server runs on. Leave empty for automatic detection. If that fails, you can use this variable to force
+	ZM_WEB_GROUP		The group apache or the local web server runs on, Leave empty to be the same as the web user
+        ZM_DIR_EVENTS           Location where events are recorded to, default: ZM_CONTENTDIR/events
+        ZM_DIR_IMAGES           Location where images, not directly associated with events, are recorded to, default: ZM_CONTENTDIR/images
+        ZM_DIR_SOUNDS           Location to look for optional sound files, default: sounds
+        ZM_PATH_ZMS             Web url to zms streaming server, default: /cgi-bin/nph-zms
+Advanced:
+        ZM_PATH_MAP             Location to save mapped memory files, default: /dev/shm
+        ZM_PATH_ARP             Full path to compatible arp binary. Leave empty for automatic detection.
+        ZM_CONFIG_DIR           Location of the main ZoneMinder config file, zm.conf. default: /etc/zm
+        ZM_CONFIG_SUBDIR        Location of custom config files. default: ZM_CONFIG_DIR/conf.d
+	ZM_EXTRA_LIBS		A list of optional libraries, separated by semicolons, e.g. ssl;theora
+	ZM_MYSQL_ENGINE		MySQL engine to use with database, default: InnoDB
+	ZM_NO_MMAP		Set to ON to not use mmap shared memory. Shouldn't be enabled unless you experience problems with the shared memory. default: OFF
+	ZM_NO_FFMPEG		Set to ON to skip ffmpeg checks and force building ZM without ffmpeg. default: OFF
+	ZM_NO_X10		Set to ON to build ZoneMinder without X10 support. default: OFF
+	ZM_PERL_MM_PARMS	By default, ZoneMinder's Perl modules are installed into the Vendor folders, as defined by your installation of Perl. You can change that here. Consult Perl's MakeMaker documentation for a definition of acceptable parameters. If you set this to something that causes the modules to be installed outside Perl's normal serach path, then you will also need to set ZM_PERL_SEARCH_PATH accordingly. default: "INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1"
+	ZM_PERL_SEARCH_PATH	Use to add a folder to your Perl's search path. This will need to be set in cases where ZM_PERL_MM_PARMS has been modified such that ZoneMinder's Perl modules are installed outside Perl's default search path. default: ""
+
+Useful configuration options provided by cmake:
+CMAKE_VERBOSE_MAKEFILE - Set this to ON (default OFF) to see what cmake is doing. Very useful for troubleshooting.
+CMAKE_BUILD_TYPE - Set this to Debug (default Release) to build ZoneMinder with debugging enabled.
+CMAKE_INSTALL_PREFIX - Use this to change the prefix (default /usr/local). This option behaves like --prefix from autoconf. Package maintainers will probably want to set this to "/usr".
+
+Useful environment variables provided by cmake:
+CMAKE_INCLUDE_PATH - Use this to add to the include search path.
+CMAKE_LIBRARY_PATH - Use this to add to the library search path.
+CMAKE_PREFIX_PATH - Use this to add to both include and library search paths. <path>/include will be added to the include search path and <path>/lib to the library search path. Multiple paths can be specified, separated by a : character. For example: export CMAKE_PREFIX_PATH="/opt/libjpeg-turbo:/opt/ffmpeg-from-git"
+
+CFLAGS, CPPFLAGS and other environment variables:
+To append to the CFLAGS and CXXFLAGS, please use the CFLAGS and CXXFLAGS environment variables.
+Or use the CMAKE_C_FLAGS and CMAKE_CXX_FLAGS configuration options.
+To replace the CFLAGS and CXXFLAGS entirely:
+*   For the Release build type: use CMAKE_C_FLAGS_RELEASE for the CFLAGS and CMAKE_CXX_FLAGS_RELEASE for the CXXFLAGS
+*   For the Debug build type: use CMAKE_C_FLAGS_DEBUG for the CFLAGS and CMAKE_CXX_FLAGS_DEBUG for the CXXFLAGS
+Other important environment variables (such as LDFLAGS) are also supported.
+
+The DESTDIR environment variable is also supported, however it needs to be set before invoking make install. For example: DESTDIR=mydestdir make install
+For more information about DESTDIR, see:
+*   http://www.gnu.org/prep/standards/html_node/DESTDIR.html
+
+Basic steps for installing ZoneMinder on a fresh system
+-------------------------------------------------------
+1) After installing all the required dependencies, in the project directory, run "cmake [extra options] ."
+This behaves like ./configure. It is also possible to supply configuration options, e.g. cmake -DZM_DB_PASS="mypass" .
+IMPORTANT: Don't forget the dot "." at the end.
+2) Run "make" to compile ZoneMinder
+3) Run "make install" (as root, or use sudo) to install ZoneMinder to your system.
+4) Create a directory for the content and the necessary symlinks by running zmlinkcontent.sh with the directory you want to use. e.g. ./zmlinkcontent.sh /nfs/zm
+5) Create a database for zoneminder, called "zm".
+6) Create a user for the zoneminder database, called zmuser with password and full privileges to the "zm" database.
+NOTE: The database server, database name, user and password can be different and adjusted during configuration step with the options in this file, or by editing /etc/zm.conf
+7) Populate the zoneminder database using the script zm_create.sql. This should be found in <prefix>/share/zoneminder/db or in the project/db directory.
+
+8) Create an apache virtual host for ZoneMinder. Make sure to use the same paths as ZM_WEBDIR and ZM_CGIDIR in /etc/zm.conf
+9) Verify date.timezone is set to your timezone. This parameter is often found inside the system php.ini file. Consult your distribution's documentation for the proper way to set this value.
+10) Create other config if desired (e.g. rsyslog, logrotate and such). Some of this can be found in <prefix>/share/zoneminder/misc or project/misc directory
+11) Setup an appropriate startup script for your system. Two generic startup scripts have been provided, a legacy Sys V Init script and a Systemd service file.
+
+*Sys V Init Setup*
+- Copy the sys v init script /scripts/zm from the build folder to /etc/init. 
+- Inspect the contents to make sure they apply to your distro.
+
+*SystemD Setup*
+- Copy the zoneminder systemd service file /misc/zoneminder.service from the build folder to the systemd service file location. 
+  For Redhat based distros, that folder is /usr/lib/systemd/system.
+- Inspect the contents to make sure they apply to your distro.
+- Tell systemd to load the new service file: "sudo systemctl daemon-reload".
+- Copy /misc/zoneminder-tmpfiles.conf to /etc/tmpfiles.d
+- Tell systemd to process this file: "sudo /usr/bin/systemd-tmpfiles --create /etc/tmpfiles.d/zoneminder.conf".
+
+Basic steps for upgrading ZoneMinder
+------------------------------------
+1) If you wish to use the same paths and configuration as the currently installed ZoneMinder, you need to provide cmake with options that match your current installation.
+You can provide those options in the command line to cmake, e.g. cmake -DZM_DB_PASS="blah" -DZM_WEBDIR="/usr/local/share/zoneminder/www" -DCMAKE_INSTALL_FULL_BINDIR="/usr/bin" .
+Or alternatively, for convenience, use the cmakecacheimport.sh script. This reads a zoneminder configuration file (zm.conf) and creates a cmake initial cache file called zm_conf.cmake, which you can then provide to cmake.
+For example:
+./cmakecacheimport.sh /etc/zm.conf
+cmake -C zm_conf.cmake [extra options] .
+
+2) Run "make" to compile ZoneMinder
+3) Run "make install" (as root, or use sudo) to install ZoneMinder to your system.
+4) Depending on your configuration: If the DIR_EVENTS and DIR_IMAGES options are set to default (pointing to web directory/events and web directory/images), You will need to update the symlinks in the web directory to the correct folders. e.g. web directory/events should point to the real events directory, and likewise for the images directory.
+You can use the zmlinkcontent.sh script for this. For example, if /var/lib/zoneminder is the folder that contains the "images" and "events" directories, you can use:
+./zmlinkcontent.sh /var/lib/zoneminder
+By default, the content directory for new installations is /var/lib/zoneminder. This can be overridden in cmake with the ZM_CONTENTDIR option. e.g. cmake -DZM_CONTENTDIR="/some/big/storage/zm" .
+
+5) Run zmupdate.pl to update the database layout to the new version.
+
+Uninstallation:
+---------------
+By default, cmake does not have an uninstall target, however we have added a one. Simply run make uninstall (or DESTDIR=mydestdir make uninstall if a DESTDIR was used) and it will remove all the files that cmake installed.
+It's also possible to do this manually. The file install_manifest.txt contains the list of files installed to the system. This can be used in many ways to delete all files installed by cmake, such as: xargs rm < install_manifest.txt
+
+Contributions:
+--------------
+Please visit our GitHub at http://github.com/ZoneMinder/ZoneMinder
+
+
--- a/1
+++ b/1
@ -0,0 +1 @@
+Please see README file.
--- a/README.md
+++ b/README.md
@ -1,10 +1,9 @@
 ZoneMinder
 ==========

-[![Build Status](https://travis-ci.org/ZoneMinder/zoneminder.png)](https://travis-ci.org/ZoneMinder/zoneminder)
-[![Bounty Source](https://api.bountysource.com/badge/team?team_id=204&style=bounties_received)](https://www.bountysource.com/teams/zoneminder/issues?utm_source=ZoneMinder&utm_medium=shield&utm_campaign=bounties_received)
-[![Join Slack](https://github.com/ozonesecurity/ozonebase/blob/master/img/slacksm.png?raw=true)](https://join.slack.com/t/zoneminder-chat/shared_invite/enQtNTU0NDkxMDM5NDQwLTdhZmQ5Y2M2NWQyN2JkYTBiN2ZkMzIzZGQ0MDliMTRmM2FjZWRlYzUwYTQ2MjMwMTVjMzQ1NjYxOTdmMjE2MTE)
-[![IRC Network](https://img.shields.io/badge/irc-%23zoneminder-blue.svg "IRC Freenode")](https://webchat.freenode.net/?channels=zoneminder)
+[![Build Status](https://travis-ci.org/ZoneMinder/zoneminder.png)](https://travis-ci.org/ZoneMinder/zoneminder) [![Bountysource](https://api.bountysource.com/badge/team?team_id=204&style=bounties_received)](https://www.bountysource.com/teams/zoneminder/issues?utm_source=ZoneMinder&utm_medium=shield&utm_campaign=bounties_received)
+
+[![Join Slack](https://github.com/ozonesecurity/ozonebase/blob/master/img/slacksm.png?raw=true)](https://zoneminder-chat.herokuapp.com)

 All documentation for ZoneMinder is now online at https://zoneminder.readthedocs.org

@ -22,27 +21,26 @@ https://github.com/ZoneMinder/zmdockerfiles

 ## Installation Methods

-### Install from a Package Repository
-
-This is the recommended method to install ZoneMinder onto your system. ZoneMinder packages are maintained for the following distros:
-
- Ubuntu via [Iconnor's PPA](https://launchpad.net/~iconnor)
- 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)
- 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)
-
-If a repository that hosts ZoneMinder packages is not available for your distro, then you are encouraged to build your own package, rather than build from source.  While each distro is different in ways that set it apart from all the others, they are often similar enough to allow you to adapt another distro's package building instructions to your own.
-
 ### Building from Source is Discouraged

 Historically, installing ZoneMinder onto your system required building from source code by issuing the traditional configure, make, make install commands.  To get ZoneMinder to build, all of its dependencies had to be determined and installed beforehand. Init and logrotate scripts had to be manually copied into place following the build.  Optional packages such as jscalendar and Cambozola had to be manually installed. Uninstalls could leave stale files around, which could cause problems during an upgrade.  Speaking of upgrades, when it comes time to upgrade all these manual steps must be repeated again.

 Better methods exist today that do much of this for you. The current development team, along with other volunteers, have taken great strides in providing the resources necessary to avoid building from source.  

+### Install from a Package Repository
+
+This is the recommended method to install ZoneMinder onto your system. ZoneMinder packages are maintained for the following distros:
+
+- Ubuntu via [Iconnor's PPA](https://launchpad.net/~iconnor/+archive/ubuntu/zoneminder)
+- 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](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 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.

 ### Building a ZoneMinder Package ###

@ -73,16 +71,15 @@ properly and are documented.
 ## 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/2
+++ b/2
@ -0,0 +1,2 @@
+Please see README.md file.
+
--- 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/Modules/FindLibJWT.cmake
+++ b/cmake/Modules/FindLibJWT.cmake
@ -1,28 +0,0 @@
-include(FindPackageHandleStandardArgs)
-
-find_package(PkgConfig QUIET)
-pkg_check_modules(PC_LIBJWT QUIET libjwt)
-
-find_path(LIBJWT_INCLUDE_DIR
-  NAMES jwt.h
-  HINTS ${PC_LIBJWT_INCLUDEDIR} ${PC_LIBJWT_INCLUDE_DIRS}
-  )
-
-find_library(LIBJWT_LIBRARY
-  NAMES jwt-gnutls libjwt-gnutls liblibjwt-gnutls
-  HINTS ${PC_LIBJWT_LIBDIR} ${PC_LIBJWT_LIBRARY_DIR}
-  )
-
-find_package_handle_standard_args(LibJWT
-  REQUIRED_VARS LIBJWT_INCLUDE_DIR LIBJWT_LIBRARY
-  )
-
-if(LIBJWT_FOUND)
-  add_library(libjwt STATIC IMPORTED GLOBAL)
-  set_target_properties(libjwt PROPERTIES
-    IMPORTED_LOCATION "${LIBJWT_LIBRARY}"
-    INTERFACE_INCLUDE_DIRECTORIES "${LIBJWT_INCLUDE_DIR}"
-    )
-endif()
-
-mark_as_advanced(LIBJWT_INCLUDE_DIR LIBJWT_LIBRARY)
--- a/cmake/Modules/Pod2Man.cmake
+++ b/cmake/Modules/Pod2Man.cmake
@ -21,7 +21,7 @@
 # To use it, include this file in CMakeLists.txt and
 # invoke POD2MAN(<podfile> <manfile> <section>)

-MACRO(POD2MAN PODFILE MANFILE SECTION MANPAGE_DEST_PREFIX)
+MACRO(POD2MAN PODFILE MANFILE SECTION)
 	FIND_PROGRAM(POD2MAN pod2man)
 	FIND_PROGRAM(GZIP gzip)

@ -53,13 +53,14 @@ MACRO(POD2MAN PODFILE MANFILE SECTION MANPAGE_DEST_PREFIX)

 	SET(MANPAGE_TARGET "man-${MANFILE}")

-	ADD_CUSTOM_TARGET(${MANPAGE_TARGET} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz)
+	ADD_CUSTOM_TARGET(${MANPAGE_TARGET} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz)
+	ADD_DEPENDENCIES(man ${MANPAGE_TARGET})

 	INSTALL(
 		FILES ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz
-		DESTINATION ${MANPAGE_DEST_PREFIX}/man${SECTION}
+		DESTINATION share/man/man${SECTION}
    	)
-ENDMACRO(POD2MAN PODFILE MANFILE SECTION MANPAGE_DEST_PREFIX)
+ENDMACRO(POD2MAN PODFILE MANFILE SECTION)

 MACRO(ADD_MANPAGE_TARGET)
 	# It is not possible add a dependency to target 'install'
--- 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/conf.d/01-system-paths.conf.in
+++ b/conf.d/01-system-paths.conf.in
@ -16,6 +16,11 @@
 # The web account user must have full read/write permission to this folder.
 ZM_DIR_EVENTS=@ZM_DIR_EVENTS@

+# Full path to the folder images, not directly associated with events,
+# are recorded to.
+# The web account user must have full read/write permission to this folder.
+ZM_DIR_IMAGES=@ZM_DIR_IMAGES@
+
 # Foldername under the webroot where ZoneMinder looks for optional sound files
 # to play when an alarm is detected.
 ZM_DIR_SOUNDS=@ZM_DIR_SOUNDS@
@ -46,6 +51,3 @@ ZM_PATH_SWAP=@ZM_TMPDIR@
 # Full path to optional arp binary
 # ZoneMinder will find the arp binary automatically on most systems
 ZM_PATH_ARP="@ZM_PATH_ARP@"
-
-#Full path to shutdown binary
-ZM_PATH_SHUTDOWN="@ZM_PATH_SHUTDOWN@"
--- 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
-  HourEvents = GREATEST(COALESCE(HourEvents,1)-1,0),
-  HourEventDiskSpace=GREATEST(COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Event_Summaries.MonitorId=OLD.MonitorId;
+  UPDATE Monitors SET
+  HourEvents = COALESCE(HourEvents,1)-1,
+  HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
+  WHERE Id=OLD.MonitorId;
 END; 
 //

@ -20,22 +20,24 @@ 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=COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,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;
 //
+DELIMITER ;

+delimiter //
 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
-  DayEvents = GREATEST(COALESCE(DayEvents,1)-1,0),
-  DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Event_Summaries.MonitorId=OLD.MonitorId;
+  UPDATE Monitors SET
+  DayEvents = COALESCE(DayEvents,1)-1,
+  DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
+  WHERE Id=OLD.MonitorId;
 END;
 //

@ -48,10 +50,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=COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,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=COALESCE(DayEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
      END IF;
    END IF;
  END;
@ -61,10 +63,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
-  WeekEvents = GREATEST(COALESCE(WeekEvents,1)-1,0),
-  WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Event_Summaries.MonitorId=OLD.MonitorId;
+  UPDATE Monitors SET
+  WeekEvents = COALESCE(WeekEvents,1)-1,
+  WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
+  WHERE Id=OLD.MonitorId;
 END;
 //

@ -77,10 +79,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=COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,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=COALESCE(WeekEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
      END IF;
    END IF;
  END;
@ -89,10 +91,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
-  MonthEvents = GREATEST(COALESCE(MonthEvents,1)-1,0),
-  MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Event_Summaries.MonitorId=OLD.MonitorId;
+  UPDATE Monitors SET
+  MonthEvents = COALESCE(MonthEvents,1)-1,
+  MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
+  WHERE Id=OLD.MonitorId;
 END;
 //

@ -105,10 +107,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=COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace) 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=COALESCE(MonthEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
      END IF;
    END IF;
  END;
@ -126,14 +128,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 = COALESCE(DiskSpace,0) + diff 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 = COALESCE(DiskSpace,0) - OLD.DiskSpace WHERE Id = OLD.StorageId;
    END IF;
  END IF;

@ -145,21 +147,16 @@ 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
-        SET
-          ArchivedEvents = GREATEST(COALESCE(ArchivedEvents,0)-1,0),
-          ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),0)
-        WHERE Event_Summaries.MonitorId=OLD.MonitorId;
+      UPDATE Monitors SET ArchivedEvents = COALESCE(ArchivedEvents,0)-1, ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) 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
-          ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0),0)
-          WHERE Event_Summaries.MonitorId=OLD.MonitorId;
+        UPDATE Monitors SET
+          ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0)
+          WHERE Id=OLD.MonitorId;
      END IF;
    END IF;
  ELSEIF ( NEW.Archived AND diff ) THEN
@ -167,18 +164,18 @@ BEGIN
  END IF;

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

 END;

 //

-DROP TRIGGER IF EXISTS event_insert_trigger//
+delimiter ;

+DROP TRIGGER IF EXISTS event_insert_trigger;
+
+delimiter //
 /* 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
 */
@ -186,17 +183,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 +203,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 = COALESCE(DiskSpace,0) - CAST(OLD.DiskSpace AS SIGNED) WHERE Id = OLD.StorageId;
  END IF;
  DELETE FROM Events_Hour WHERE EventId=OLD.Id;
  DELETE FROM Events_Day WHERE EventId=OLD.Id;
@ -214,17 +211,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
-      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;
+    UPDATE Monitors SET
+      ArchivedEvents = COALESCE(ArchivedEvents,1) - 1,
+      ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),
+      TotalEvents = COALESCE(TotalEvents,1) - 1,
+      TotalEventDiskSpace = COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0)
+      WHERE Id=OLD.MonitorId;
  ELSE
-    UPDATE Event_Summaries SET
-    TotalEvents = GREATEST(COALESCE(TotalEvents,1)-1,0),
-    TotalEventDiskSpace=GREATEST(COALESCE(TotalEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-    WHERE Event_Summaries.MonitorId=OLD.MonitorId;
+    UPDATE Monitors SET
+    TotalEvents = COALESCE(TotalEvents,1)-1,
+    TotalEventDiskSpace=COALESCE(TotalEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0)
+    WHERE Id=OLD.MonitorId;
  END IF;
 END;

@ -234,14 +231,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,12 +63,11 @@ 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','Ffmpeg','Libvlc','cURL','WebSite') 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',
  `CanReset` tinyint(3) unsigned NOT NULL default '0',
-  `CanReboot` tinyint(3) unsigned NOT NULL default '0',
  `CanZoom` tinyint(3) unsigned NOT NULL default '0',
  `CanAutoZoom` tinyint(3) unsigned NOT NULL default '0',
  `CanZoomAbs` tinyint(3) unsigned NOT NULL default '0',
@ -186,11 +185,10 @@ CREATE TABLE `Events` (
  `Id` bigint unsigned NOT NULL auto_increment,
  `MonitorId` int(10) unsigned NOT NULL default '0',
  `StorageId`	smallint(5) unsigned default 0,
-  `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',
@ -209,59 +207,59 @@ CREATE TABLE `Events` (
  `Executed` tinyint(3) unsigned NOT NULL default '0',
  `Notes` text,
  `StateId` int(10) unsigned NOT NULL,
-  `Orientation` enum('ROTATE_0','ROTATE_90','ROTATE_180','ROTATE_270','FLIP_HORI','FLIP_VERT') NOT NULL default 'ROTATE_0',
+  `Orientation` enum('0','90','180','270','hori','vert') NOT NULL default '0',
  `DiskSpace`   bigint unsigned default NULL,
  `Scheme`   enum('Deep','Medium','Shallow') NOT NULL default 'Medium',
  `Locked`    BOOLEAN NOT NULL DEFAULT False,
  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,
-  `DiskSpace`   bigint default NULL,
+  `StartTime` datetime default NULL,
+  `DiskSpace`   bigint unsigned 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,
-  `DiskSpace`   bigint default NULL,
+  `StartTime` datetime default NULL,
+  `DiskSpace`   bigint unsigned 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,
-  `DiskSpace`   bigint default NULL,
+  `StartTime` datetime default NULL,
+  `DiskSpace`   bigint unsigned 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,
-  `DiskSpace`   bigint default NULL,
+  `StartTime` datetime default NULL,
+  `DiskSpace`   bigint unsigned 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@;


@ -269,7 +267,7 @@ DROP TABLE IF EXISTS `Events_Archived`;
 CREATE TABLE `Events_Archived` (
  `EventId` BIGINT unsigned NOT NULL,
  `MonitorId` int(10) unsigned NOT NULL,
-  `DiskSpace`   bigint default NULL,
+  `DiskSpace`   bigint unsigned default NULL,
  PRIMARY KEY (`EventId`),
  KEY `Events_Archived_MonitorId_idx` (`MonitorId`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
@ -282,28 +280,20 @@ 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,
+  `Query` 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,
  `AutoDelete` tinyint(3) unsigned NOT NULL default '0',
  `AutoMove` tinyint(3) unsigned NOT NULL default '0',
  `AutoMoveTo`	smallint(5) unsigned NOT NULL default 0,
-  `AutoCopy` tinyint(3) unsigned NOT NULL default '0',
-  `AutoCopyTo`	smallint(5) unsigned NOT NULL default 0,
  `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 +306,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 +326,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 +337,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@;

@ -364,7 +350,6 @@ CREATE INDEX `Groups_Monitors_MonitorId_idx` ON `Groups_Monitors` (`MonitorId`);

 DROP TABLE IF EXISTS `Logs`;
 CREATE TABLE `Logs` (
-  `Id` int(10) unsigned NOT NULL AUTO_INCREMENT,
  `TimeKey` decimal(16,6) NOT NULL,
  `Component` varchar(32) NOT NULL,
  `ServerId` int(10) unsigned,
@ -374,7 +359,6 @@ CREATE TABLE `Logs` (
  `Message` text NOT NULL,
  `File` varchar(255) DEFAULT NULL,
  `Line` smallint(5) unsigned DEFAULT NULL,
-  PRIMARY KEY (`Id`),
  KEY `TimeKey` (`TimeKey`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;

@ -413,7 +397,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','NVSocket') NOT NULL default 'Local',
  `Device` tinytext,
  `Channel` tinyint(3) unsigned default NULL,
  `Format` int(10) unsigned default NULL,
@ -426,7 +410,7 @@ CREATE TABLE `MonitorPresets` (
  `Width` smallint(5) unsigned default NULL,
  `Height` smallint(5) unsigned default NULL,
  `Palette` int(10) unsigned default NULL,
-  `MaxFPS` decimal(5,3) default NULL,
+  `MaxFPS` decimal(5,2) default NULL,
  `Controllable` tinyint(3) unsigned NOT NULL default '0',
  `ControlId` varchar(16) default NULL,
  `ControlDevice` varchar(255) default NULL,
@ -444,19 +428,13 @@ DROP TABLE IF EXISTS `Monitors`;
 CREATE TABLE `Monitors` (
  `Id` int(10) unsigned NOT NULL auto_increment,
  `Name` varchar(64) NOT NULL default '',
-  `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') 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 +446,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),
@ -476,14 +453,11 @@ CREATE TABLE `Monitors` (
  `Height` smallint(5) unsigned NOT NULL default '0',
  `Colours` tinyint(3) unsigned NOT NULL default '1',
  `Palette` int(10) unsigned NOT NULL default '0',
-  `Orientation` enum('ROTATE_0','ROTATE_90','ROTATE_180','ROTATE_270','FLIP_HORI','FLIP_VERT') NOT NULL default 'ROTATE_0',
+  `Orientation` enum('0','90','180','270','hori','vert') NOT NULL default '0',
  `Deinterlacing` int(10) unsigned NOT NULL default '0',
-  `DecoderHWAccelName`  varchar(64),
-  `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',
@ -493,19 +467,17 @@ CREATE TABLE `Monitors` (
  `Hue` mediumint(7) NOT NULL default '-1',
  `Colour` mediumint(7) NOT NULL default '-1',
  `EventPrefix` varchar(32) NOT NULL default 'Event-',
-  `LabelFormat` varchar(64),
+  `LabelFormat` varchar(64) default '%N - %y/%m/%d %H:%M:%S',
  `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',
  `FrameSkip` smallint(5) unsigned NOT NULL default '0',
  `MotionFrameSkip` smallint(5) unsigned NOT NULL default '0',
  `AnalysisFPSLimit` decimal(5,2) default NULL,
@ -524,22 +496,28 @@ 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',
+  `DefaultView` enum('Events','Control') NOT NULL default 'Events',
  `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',
  `SignalCheckPoints` INT UNSIGNED NOT NULL default '0',
  `SignalCheckColour` varchar(32) NOT NULL default '#0000BE',
  `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 +531,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
@ -614,7 +573,6 @@ CREATE TABLE `Servers` (
  `zmstats`  BOOLEAN NOT NULL DEFAULT FALSE,
  `zmaudit`  BOOLEAN NOT NULL DEFAULT FALSE,
  `zmtrigger`  BOOLEAN NOT NULL DEFAULT FALSE,
-  `zmeventnotification`  BOOLEAN NOT NULL DEFAULT FALSE,
  PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;

@ -626,13 +584,9 @@ CREATE INDEX `Servers_Name_idx` ON `Servers` (`Name`);

 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',
@ -646,7 +600,6 @@ CREATE TABLE `Stats` (
  `MinY` smallint(5) unsigned NOT NULL default '0',
  `MaxY` smallint(5) unsigned NOT NULL default '0',
  `Score` smallint(5) unsigned NOT NULL default '0',
-  PRIMARY KEY (`Id`),
  KEY `EventId` (`EventId`),
  KEY `MonitorId` (`MonitorId`),
  KEY `ZoneId` (`ZoneId`)
@ -682,13 +635,9 @@ 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 '',
+  `MonitorIds` tinytext,
  PRIMARY KEY (`Id`),
  UNIQUE KEY `UC_Username` (`Username`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
@ -729,7 +678,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 +715,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,188 +738,60 @@ 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',password('admin'),'',1,'View','Edit','Edit','Edit','Edit','Edit','Edit','','');

 --
 -- 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"}]}',
-  0/*AutoArchive*/,
-  0/*AutoVideo*/,
-  0/*AutoUpload*/,
-  0/*AutoEmail*/,
-  ''/*EmailTo*/,
-  ''/*EmailSubject*/,
-  ''/*EmailBody*/,
-  0/*AutoMessage*/,
-  0/*AutoExecute*/,'',
-  0/*AutoDelete*/,
-  0/*AutoMove*/,0/*MoveTo*/,
-  0/*AutoCopy*/,0/*CopyTo*/,
-  1/*UpdateDiskSpace*/,
-  1/*UserId=admin*/,
-  1/*Background*/,
-  0/*Concurrent*/
-);
+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*/,0/*AutoMessage*/,0/*AutoExecute*/,'',1/*AutoDelete*/,0/*AutoMove*/,0/*MoveTo*/,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,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,'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);
-INSERT INTO `Controls` VALUES (NULL,'Wanscam HW0025','Libvlc','WanscamHW0025', 1, 1, 1, 0,1, 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, 1, 16, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 350, 0, 0, 1, 0, 10, 0, 0, 1, 0, 0, 0, 0, 1, 0, 10, 0, 0, 0, 0);
-INSERT INTO `Controls` VALUES (NULL,'IPCC 7210W','Remote','IPCC7210W', 1, 1, 1, 0,1, 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, 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,'Vivotek ePTZ','Remote','Vivotek_ePTZ',0,0,1,0,1,0,0,0,1,0,0,0,0,1,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,1,0,0,0,0,1,0,5,0,0,1,0,0,0,0,1,0,5,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Netcat ONVIF','Ffmpeg','Netcat',0,0,1,0,1,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,100,5,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,100,5,5,0,0,0,1,255,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,'Keekoon','Remote','Keekoon', 0, 0, 0, 0,0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 6, 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,'HikVision','Local','',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,20,1,1,1,1,0,0,0,1,1,0,0,0,0,1,1,100,0,0,1,0,0,0,0,1,1,100,1,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Maginon Supra IPC','cURL','MaginonIPC',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,4,0,1,1,1,0,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,'Floureon 1080P','Ffmpeg','Floureon',0,0,0,0,1,0,0,0,1,1,18,1,1,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,1,1,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,1,20,0,1,1,1,0,0,0,1,1,0,0,0,0,1,1,8,0,0,1,0,0,0,0,1,1,8,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Reolink RLC-423','Ffmpeg','Reolink',0,0,1,0,1,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,64,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,'Reolink RLC-411','Ffmpeg','Reolink',0,0,1,0,1,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Reolink RLC-420','Ffmpeg','Reolink',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'D-LINK DCS-3415','Remote','DCS3415',0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'D-Link DCS-5020L','Remote','DCS5020L',1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,24,1,0,1,1,1,0,1,0,1,0,0,1,30,0,0,0,0,0,1,0,0,1,30,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'IOS Camera','Ffmpeg','IPCAMIOS',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,1,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Dericam P2','Ffmpeg','DericamP2',0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,10,0,1,1,1,0,0,0,1,1,0,0,0,0,1,1,45,0,0,1,0,0,0,0,1,1,45,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Trendnet','Remote','Trendnet',1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'PSIA','Remote','PSIA',0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,20,0,1,1,1,0,0,1,0,1,0,0,0,0,1,-100,100,0,0,1,0,0,0,0,1,-100,100,0,0,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Dahua','Ffmpeg','Dahua',0,0,1,1,1,0,0,1,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,1,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,1,20,1,1,1,1,0,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,'FOSCAMR2C','Libvlc','FOSCAMR2C',1,1,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,12,0,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,4,0,NULL,1,NULL,NULL,NULL,NULL,1,0,4,0,NULL,0,0);
-INSERT INTO `Controls` VALUES (NULL,'Amcrest HTTP API','Ffmpeg','Amcrest_HTTP',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,0,0,0,0,0,0,0,0,0,0,0,0,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,5,0,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,5);
+INSERT INTO Controls VALUES (NULL,'Pelco-D','Local','PelcoD',1,1,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
+INSERT INTO Controls VALUES (NULL,'Pelco-P','Local','PelcoP',1,1,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
+INSERT INTO Controls VALUES (NULL,'Sony VISCA','Local','Visca',1,1,0,1,0,0,0,1,0,16384,10,4000,1,1,6,1,1,1,0,1,0,1536,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,3,1,1,1,1,0,1,1,0,1,-15578,15578,100,10000,1,1,50,1,254,1,-7789,7789,100,5000,1,1,50,1,254,0,0);
+INSERT INTO Controls VALUES (NULL,'Axis API v2','Remote','AxisV2',0,0,0,1,0,0,1,0,0,9999,10,2500,0,NULL,NULL,1,1,0,1,0,0,9999,10,2500,0,NULL,NULL,1,1,0,1,0,0,9999,10,2500,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,12,1,1,1,1,1,0,1,0,1,-360,360,1,90,0,NULL,NULL,0,NULL,1,-360,360,1,90,0,NULL,NULL,0,NULL,0,0);
+INSERT INTO Controls VALUES (NULL,'Panasonic IP','Remote','PanasonicIP',0,0,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,8,1,1,1,0,1,0,0,1,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
+INSERT INTO Controls VALUES (NULL,'Neu-Fusion NCS370','Remote','Ncs370',0,0,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,24,1,0,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
+INSERT INTO Controls VALUES (NULL,'AirLink SkyIPCam 7xx','Remote','SkyIPCam7xx',0,0,1,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,8,1,1,1,0,1,0,1,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
+INSERT INTO Controls VALUES (NULL,'Pelco-D','Ffmpeg','PelcoD',1,1,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
+INSERT INTO Controls VALUES (NULL,'Pelco-P','Ffmpeg','PelcoP',1,1,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
+INSERT INTO Controls VALUES (NULL,'Foscam FI8620','Ffmpeg','FI8620_Y2k',0,0,0,1,0,0,0,1,1,10,1,10,1,1,63,1,1,0,0,1,1,63,1,63,1,1,63,1,1,0,0,1,0,0,0,0,1,0,255,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,255,1,8,0,1,1,1,0,0,0,1,1,1,360,1,360,1,1,63,0,0,1,1,90,1,90,1,1,63,0,0,0,0);
+INSERT INTO Controls VALUES (NULL,'Foscam FI8608W','Ffmpeg','FI8608W_Y2k',1,0,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,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,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,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,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,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,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, 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,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,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,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,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);
+INSERT INTO `Controls` VALUES (NULL,'Wanscam HW0025','Libvlc','WanscamHW0025', 1, 1, 1, 1, 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, 1, 16, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 350, 0, 0, 1, 0, 10, 0, 0, 1, 0, 0, 0, 0, 1, 0, 10, 0, 0, 0, 0);
+INSERT INTO `Controls` VALUES (NULL,'IPCC 7210W','Remote','IPCC7210W', 1, 1, 1, 1, 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, 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,'Vivotek ePTZ','Remote','Vivotek_ePTZ',0,0,1,1,0,0,0,1,0,0,0,0,1,0,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,1,0,0,0,0,1,0,5,0,0,1,0,0,0,0,1,0,5,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Netcat ONVIF','Ffmpeg','Netcat',0,0,1,1,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,100,5,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,100,5,5,0,0,0,1,255,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,'Keekoon','Remote','Keekoon', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 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, 6, 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,'HikVision','Local','',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,1,20,1,1,1,1,0,0,0,1,1,0,0,0,0,1,1,100,0,0,1,0,0,0,0,1,1,100,1,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Maginon Supra IPC','cURL','MaginonIPC',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,4,0,1,1,1,0,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,'Floureon 1080P','Ffmpeg','Floureon',0,0,0,1,0,0,0,1,1,18,1,1,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,1,1,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,1,20,0,1,1,1,0,0,0,1,1,0,0,0,0,1,1,8,0,0,1,0,0,0,0,1,1,8,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Reolink RLC-423','Ffmpeg','Reolink',0,0,1,1,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,64,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,'Reolink RLC-411','Ffmpeg','Reolink',0,0,1,1,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Reolink RLC-420','Ffmpeg','Reolink',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'D-LINK DCS-3415','Remote','DCS3415',0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'IOS Camera','Ffmpeg','IPCAMIOS',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,1,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Dericam P2','Ffmpeg','DericamP2',0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,10,0,1,1,1,0,0,0,1,1,0,0,0,0,1,1,45,0,0,1,0,0,0,0,1,1,45,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Trendnet','Remote','Trendnet',1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'PSIA','Remote','PSIA',0,0,0,1,0,0,1,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,20,0,1,1,1,0,0,1,0,1,0,0,0,0,1,-100,100,0,0,1,0,0,0,0,1,-100,100,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Dahua','Remote','Dahua',0,0,0,1,0,0,1,0,0,0,0,0,0,0,8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,20,0,1,1,1,0,0,1,0,1,0,0,0,0,1,1,8,0,0,1,0,0,0,0,1,1,8,0,0,0,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);
@ -996,7 +815,6 @@ INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, multicast','Remote','rt
 INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, RTP/RTSP','Remote','rtsp',0,255,'rtsp','rtpRtsp','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, RTP/RTSP/HTTP','Remote',NULL,NULL,NULL,'rtsp','rtpRtspHttp','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'D-link DCS-930L, 640x480, mjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/mjpeg.cgi',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'D-Link DCS-5020L, 640x480, mjpeg','Remote','http',0,0,'http','simple','<username>:<pwd>@<ip-address>','80','/video.cgi',NULL,640,480,0,NULL,1,'34',NULL,'<username>:<pwd>@<ip-address>',100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 320x240, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 320x240, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,5.0,0,NULL,NULL,NULL,100,100);
@ -1086,33 +904,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,150 +7,322 @@
 -- 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
 --
-UPDATE Config SET Category='hidden' WHERE Name='ZM_USE_DEEP_STORAGE';
+UPDATE `zm`.`Config` SET `Category`='hidden' WHERE `Name`='ZM_USE_DEEP_STORAGE';

 --
 -- Add Id column to State
--- a/db/zm_update-1.31.13.sql
+++ b/db/zm_update-1.31.13.sql
@ -13,8 +13,6 @@ SET @s = (SELECT IF(
 PREPARE stmt FROM @s;
 EXECUTE stmt;

-UPDATE `Events` SET `SaveJPEGs`=(SELECT `SaveJPEGs` FROM `Monitors` WHERE Monitors.Id = MonitorId)  WHERE `SaveJPEGs` IS NULL;
-
 SET @s = (SELECT IF(
    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
     AND table_name = 'Storage'
--- a/db/zm_update-1.31.38.sql
+++ b/db/zm_update-1.31.38.sql
@ -176,17 +176,16 @@ BEGIN
          WHERE Id=OLD.MonitorId;
      END IF;
    END IF;
-  ELSE
-    IF ( NEW.Archived AND diff ) THEN
+  ELSEIF ( NEW.Archived AND diff ) THEN
    UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
  END IF;
-  END IF;

  IF ( diff ) THEN
    UPDATE Monitors SET TotalEventDiskSpace = COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0) WHERE Id=OLD.MonitorId;
  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.31.5.sql
+++ b/db/zm_update-1.31.5.sql
@ -10,7 +10,7 @@ SET @s = (SELECT IF(
    AND column_name = 'ParentId'
    ) > 0,
 "SELECT 'Column GroupId exists in Groups'",
-"ALTER TABLE `Groups` ADD `ParentId` int(10) unsigned AFTER `Name`"
+"ALTER TABLE Groups ADD `ParentId` int(10) unsigned AFTER `Name`"
 ));

 PREPARE stmt FROM @s;
--- a/db/zm_update-1.31.7.sql
+++ b/db/zm_update-1.31.7.sql
@ -3,7 +3,7 @@ SET @s = (SELECT IF(
      AND table_name = 'Groups'
      AND column_name = 'MonitorIds'
    ) > 0,
-    "ALTER TABLE `Groups` MODIFY `MonitorIds` text NOT NULL",
+    "ALTER TABLE Groups MODIFY `MonitorIds` text NOT NULL",
    "SELECT 'Groups no longer has MonitorIds'"
    ));

--- a/db/zm_update-1.33.0.sql
+++ b/db/zm_update-1.33.0.sql
@ -1,21 +0,0 @@
--
-- This updates a 1.32.3 database to 1.33.0
--
--
-- Remove DefaultView from Monitors table.
--
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-    FROM INFORMATION_SCHEMA.COLUMNS
-    WHERE table_name = 'Monitors'
-    AND table_schema = DATABASE()
-    AND column_name = 'DefaultView'
-    ) > 0,
-"ALTER TABLE Monitors DROP COLUMN DefaultView",
-"SELECT 'Column DefaultView no longer exists in Monitors'"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
--- a/db/zm_update-1.33.1.sql
+++ b/db/zm_update-1.33.1.sql
@ -1,16 +0,0 @@
--
-- This updates a 1.33.0 database to 1.33.1
--
-- Add WebSite enum to Monitor.Type
-- Add Refresh column to Monitors table
--
-
-ALTER TABLE `Monitors` 
-CHANGE COLUMN `Type` `Type` ENUM('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL DEFAULT 'Local' ;
-
-ALTER TABLE `MonitorPresets` 
-CHANGE COLUMN `Type` `Type` ENUM('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL DEFAULT 'Local' ;
-
-ALTER TABLE `Controls` 
-CHANGE COLUMN `Type` `Type` ENUM('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket') NOT NULL DEFAULT 'Local' ;
-
--- a/db/zm_update-1.33.10.sql
+++ b/db/zm_update-1.33.10.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 = 'MinSectionLength'
-    ) > 0,
-    "SELECT 'Column MinSectionLength already exists in Monitors'",
-    "ALTER TABLE Monitors ADD `MinSectionLength` int(10) unsigned NOT NULL default '10' AFTER SectionLength"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
--- a/db/zm_update-1.33.11.sql
+++ b/db/zm_update-1.33.11.sql
@ -1,24 +0,0 @@
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Monitors'
-      AND column_name = 'DecoderHWAccelName'
-    ) > 0,
-    "SELECT 'Column DecoderHWAccelName already exists in Monitors'",
-    "ALTER TABLE Monitors ADD `DecoderHWAccelName`  varchar(64) AFTER `Deinterlacing`"
-    ));
-
-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 = 'DecoderHWAccelDevice'
-    ) > 0,
-    "SELECT 'Column DecoderHWAccelDevice already exists in Monitors'",
-    "ALTER TABLE Monitors ADD `DecoderHWAccelDevice` varchar(255) AFTER `DecoderHWAccelName`"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
--- a/db/zm_update-1.33.12.sql
+++ b/db/zm_update-1.33.12.sql
@ -1,27 +0,0 @@
--
-- Add primary keys for Logs and Stats tables
--
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Logs'
-     AND column_name = 'Id'
-    ) > 0,
-"SELECT 'Column Id already exists in Logs'",
-"ALTER TABLE `Logs` ADD COLUMN `Id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT FIRST, ADD PRIMARY KEY (`Id`)"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Stats'
-     AND column_name = 'Id'
-    ) > 0,
-"SELECT 'Column Id already exists in Stats'",
-"ALTER TABLE `Stats` ADD COLUMN `Id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT FIRST, ADD PRIMARY KEY (`Id`)"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
--- a/db/zm_update-1.33.13.sql
+++ b/db/zm_update-1.33.13.sql
@ -1,6 +0,0 @@
--
-- Add primary keys for Logs and Stats tables
--
-
-SELECT "Modifying Monitors MaxFPS to DECIMAL(5,3)";
-ALTER TABLE `Monitors` MODIFY `MaxFPS` decimal(5,3) default NULL;
--- a/db/zm_update-1.33.14.sql
+++ b/db/zm_update-1.33.14.sql
@ -1,51 +0,0 @@
--
-- Add CopyTo action to Filters
--
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Filters'
-     AND column_name = 'AutoCopy'
-    ) > 0,
-"SELECT 'Column AutoCopy already exists in Filters'",
-"ALTER TABLE Filters ADD `AutoCopy` tinyint(3) unsigned NOT NULL default '0' AFTER `AutoMove`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Filters'
-     AND column_name = 'AutoCopyTo'
-    ) > 0,
-"SELECT 'Column AutoCopyTo already exists in Filters'",
-"ALTER TABLE Filters ADD `AutoCopyTo` smallint(5) unsigned NOT NULL default '0' AFTER `AutoCopy`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Filters'
-     AND column_name = 'Query_json'
-    ) > 0,
-"SELECT 'Column Query_json already exists in Filters'",
-"ALTER TABLE `Filters` Change `Query` `Query_json` text NOT 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 = 'SecondaryStorageId'
-    ) > 0,
-"SELECT 'Column SecondaryStorageId already exists in Events'",
-"ALTER TABLE `Events` ADD `SecondaryStorageId`  smallint(5) unsigned default 0 AFTER `StorageId`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
--- a/db/zm_update-1.33.15.sql
+++ b/db/zm_update-1.33.15.sql
@ -1,19 +0,0 @@
-ALTER TABLE Events MODIFY `Orientation` enum('0','90','180','270','hori','vert','ROTATE_0','ROTATE_90','ROTATE_180','ROTATE_270','FLIP_HORI','FLIP_VERT') NOT NULL default 'ROTATE_0';
-UPDATE Events SET Orientation='ROTATE_0' WHERE Orientation='0';
-UPDATE Events SET Orientation='ROTATE_90' WHERE Orientation='90';
-UPDATE Events SET Orientation='ROTATE_180' WHERE Orientation='180';
-UPDATE Events SET Orientation='ROTATE_270' WHERE Orientation='270';
-UPDATE Events SET Orientation='FLIP_HORI' WHERE Orientation='hori';
-UPDATE Events SET Orientation='FLIP_VERT' WHERE Orientation='vert';
-
-ALTER TABLE Events MODIFY `Orientation` enum('ROTATE_0','ROTATE_90','ROTATE_180','ROTATE_270','FLIP_HORI','FLIP_VERT') NOT NULL default 'ROTATE_0';
-
-ALTER TABLE Monitors MODIFY `Orientation` enum('0','90','180','270','hori','vert','ROTATE_0','ROTATE_90','ROTATE_180','ROTATE_270','FLIP_HORI','FLIP_VERT') NOT NULL default 'ROTATE_0';
-UPDATE Monitors SET Orientation='ROTATE_0' WHERE Orientation='0';
-UPDATE Monitors SET Orientation='ROTATE_90' WHERE Orientation='90';
-UPDATE Monitors SET Orientation='ROTATE_180' WHERE Orientation='180';
-UPDATE Monitors SET Orientation='ROTATE_270' WHERE Orientation='270';
-UPDATE Monitors SET Orientation='FLIP_HORI' WHERE Orientation='hori';
-UPDATE Monitors SET Orientation='FLIP_VERT' WHERE Orientation='vert';
-
-ALTER TABLE Monitors MODIFY `Orientation` enum('ROTATE_0','ROTATE_90','ROTATE_180','ROTATE_270','FLIP_HORI','FLIP_VERT') NOT NULL default 'ROTATE_0';
--- a/db/zm_update-1.33.16.sql
+++ b/db/zm_update-1.33.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 = 'Notes'
-    ) > 0,
-    "SELECT 'Column Notes already exists in Monitors'",
-    "ALTER TABLE `Monitors` ADD `Notes` TEXT AFTER `Name`"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
--- a/db/zm_update-1.33.2.sql
+++ b/db/zm_update-1.33.2.sql
@ -1,13 +0,0 @@
--
-- This updates a 1.33.0 database to 1.33.1
--
-- Add WebSite enum to Monitor.Type
-- Add Refresh column to Monitors table
--
-
-ALTER TABLE `Events_Hour` MODIFY DiskSpace BIGINT default NULL;
-ALTER TABLE `Events_Day` MODIFY DiskSpace BIGINT default NULL;
-ALTER TABLE `Events_Week` MODIFY DiskSpace BIGINT default NULL;
-ALTER TABLE `Events_Month` MODIFY DiskSpace BIGINT default NULL;
-ALTER TABLE `Events_Archived` MODIFY DiskSpace BIGINT default NULL;
-
--- a/db/zm_update-1.33.3.sql
+++ b/db/zm_update-1.33.3.sql
@ -1,12 +0,0 @@
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmeventnotification'
-    ) > 0,
-    "SELECT 'Column zmeventnotification already exists in Servers'",
-    "ALTER TABLE Servers ADD `zmeventnotification` BOOLEAN NOT NULL DEFAULT FALSE AFTER `zmtrigger`"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
--- a/db/zm_update-1.33.4.sql
+++ b/db/zm_update-1.33.4.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 = 'DefaultCodec'
-    ) > 0,
-    "SELECT 'Column DefaultCodec already exists in Monitors'",
-    "ALTER TABLE Monitors ADD `DefaultCodec` enum('auto','MP4','MJPEG') NOT NULL default 'auto' AFTER `DefaultScale`"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
--- a/db/zm_update-1.33.5.sql
+++ b/db/zm_update-1.33.5.sql
@ -1,12 +0,0 @@
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Controls'
-      AND column_name = 'CanReboot'
-    ) > 0,
-    "SELECT 'Column CanReboot already exists in Controls'",
-    "ALTER TABLE Controls ADD `CanReboot` tinyint(3) unsigned NOT NULL default '0' AFTER `CanReset`"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
--- a/db/zm_update-1.33.6.sql
+++ b/db/zm_update-1.33.6.sql
@ -1 +0,0 @@
-ALTER TABLE Users MODIFY MonitorIds text;
--- a/db/zm_update-1.33.7.sql
+++ b/db/zm_update-1.33.7.sql
@ -1,283 +0,0 @@
-
-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 Monitors SET
-  HourEvents = COALESCE(HourEvents,1)-1,
-  HourEventDiskSpace=GREATEST(COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Id=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 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 Monitors SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+diff WHERE Monitors.Id=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 Monitors SET
-  DayEvents = GREATEST(COALESCE(DayEvents,1)-1,0),
-  DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Id=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 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 Monitors SET DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)+diff,0) WHERE Monitors.Id=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 Monitors SET
-  WeekEvents = COALESCE(WeekEvents,1)-1,
-  WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Id=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 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 Monitors SET WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)+diff,0) WHERE Monitors.Id=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 Monitors SET
-  MonthEvents = COALESCE(MonthEvents,1)-1,
-  MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Id=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 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 Monitors SET MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)+diff,0) WHERE Monitors.Id=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 Id = OLD.StorageId;
-    END IF;
-  ELSE
-    IF ( NEW.DiskSpace ) THEN
-      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 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 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 Monitors
-        SET
-          ArchivedEvents = GREATEST(COALESCE(ArchivedEvents,0)-1,0),
-          ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),0)
-        WHERE Id=OLD.MonitorId;
-    ELSE
-      IF ( OLD.DiskSpace != NEW.DiskSpace ) THEN
-        UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-        UPDATE Monitors SET
-          ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0),0)
-          WHERE Id=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 Monitors
-      SET
-        TotalEventDiskSpace = GREATEST(COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0),0)
-      WHERE Id=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,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
-  WHERE Id=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 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 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 Id=OLD.MonitorId;
-  ELSE
-    UPDATE Monitors SET
-    TotalEvents = GREATEST(COALESCE(TotalEvents,1)-1,0),
-    TotalEventDiskSpace=GREATEST(COALESCE(TotalEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-    WHERE Id=OLD.MonitorId;
-  END IF;
-END;
-
-//
-
-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 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 Id=OLD.MonitorID;
-  END
-//
-
-DELIMITER ;
-
-REPLACE INTO Events_Hour SELECT Id,MonitorId,StartTime,DiskSpace FROM Events WHERE StartTime > DATE_SUB(NOW(),  INTERVAL 1 hour);
-REPLACE INTO Events_Day SELECT Id,MonitorId,StartTime,DiskSpace FROM Events WHERE StartTime > DATE_SUB(NOW(),  INTERVAL 1 day);
-REPLACE INTO Events_Week SELECT Id,MonitorId,StartTime,DiskSpace FROM Events WHERE StartTime > DATE_SUB(NOW(),  INTERVAL 1 week);
-REPLACE INTO Events_Month SELECT Id,MonitorId,StartTime,DiskSpace FROM Events WHERE StartTime > DATE_SUB(NOW(),  INTERVAL 1 month);
-REPLACE INTO Events_Archived SELECT Id,MonitorId,DiskSpace FROM Events WHERE Archived=1;
-
-UPDATE Monitors 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(StartTime > DATE_SUB(NOW(), INTERVAL 1 hour),1,0)) AS HourEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 hour),DiskSpace,0)) AS HourEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 day),1,0)) AS DayEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 day),DiskSpace,0)) AS DayEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 week),1,0)) AS WeekEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 week),DiskSpace,0)) AS WeekEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 month),1,0)) AS MonthEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 month),DiskSpace,0)) AS MonthEventDiskSpace
-    FROM Events GROUP BY MonitorId
-    ) AS E ON E.MonitorId=Monitors.Id SET
-    Monitors.TotalEvents = E.TotalEvents,
-    Monitors.TotalEventDiskSpace = E.TotalEventDiskSpace,
-    Monitors.ArchivedEvents = E.ArchivedEvents,
-    Monitors.ArchivedEventDiskSpace = E.ArchivedEventDiskSpace,
-    Monitors.HourEvents = E.HourEvents,
-    Monitors.HourEventDiskSpace = E.HourEventDiskSpace,
-    Monitors.DayEvents = E.DayEvents,
-    Monitors.DayEventDiskSpace = E.DayEventDiskSpace,
-    Monitors.WeekEvents = E.WeekEvents,
-    Monitors.WeekEventDiskSpace = E.WeekEventDiskSpace,
-    Monitors.MonthEvents = E.MonthEvents,
-    Monitors.MonthEventDiskSpace = E.MonthEventDiskSpace;
-
--- a/db/zm_update-1.33.8.sql
+++ b/db/zm_update-1.33.8.sql
@ -1,283 +0,0 @@
-
-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 Monitors SET
-  HourEvents = GREATEST(COALESCE(HourEvents,1)-1,0),
-  HourEventDiskSpace=GREATEST(COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Id=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 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 Monitors SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+diff WHERE Monitors.Id=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 Monitors SET
-  DayEvents = GREATEST(COALESCE(DayEvents,1)-1,0),
-  DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Id=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 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 Monitors SET DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)+diff,0) WHERE Monitors.Id=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 Monitors SET
-  WeekEvents = GREATEST(COALESCE(WeekEvents,1)-1,0),
-  WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Id=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 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 Monitors SET WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)+diff,0) WHERE Monitors.Id=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 Monitors SET
-  MonthEvents = GREATEST(COALESCE(MonthEvents,1)-1,0),
-  MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Id=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 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 Monitors SET MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)+diff,0) WHERE Monitors.Id=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 Id = OLD.StorageId;
-    END IF;
-  ELSE
-    IF ( NEW.DiskSpace ) THEN
-      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 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 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 Monitors
-        SET
-          ArchivedEvents = GREATEST(COALESCE(ArchivedEvents,0)-1,0),
-          ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),0)
-        WHERE Id=OLD.MonitorId;
-    ELSE
-      IF ( OLD.DiskSpace != NEW.DiskSpace ) THEN
-        UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-        UPDATE Monitors SET
-          ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0),0)
-          WHERE Id=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 Monitors
-      SET
-        TotalEventDiskSpace = GREATEST(COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0),0)
-      WHERE Id=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,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
-  WHERE Id=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 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 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 Id=OLD.MonitorId;
-  ELSE
-    UPDATE Monitors SET
-    TotalEvents = GREATEST(COALESCE(TotalEvents,1)-1,0),
-    TotalEventDiskSpace=GREATEST(COALESCE(TotalEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-    WHERE Id=OLD.MonitorId;
-  END IF;
-END;
-
-//
-
-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 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 Id=OLD.MonitorID;
-  END
-//
-
-DELIMITER ;
-
-REPLACE INTO Events_Hour SELECT Id,MonitorId,StartTime,DiskSpace FROM Events WHERE StartTime > DATE_SUB(NOW(),  INTERVAL 1 hour);
-REPLACE INTO Events_Day SELECT Id,MonitorId,StartTime,DiskSpace FROM Events WHERE StartTime > DATE_SUB(NOW(),  INTERVAL 1 day);
-REPLACE INTO Events_Week SELECT Id,MonitorId,StartTime,DiskSpace FROM Events WHERE StartTime > DATE_SUB(NOW(),  INTERVAL 1 week);
-REPLACE INTO Events_Month SELECT Id,MonitorId,StartTime,DiskSpace FROM Events WHERE StartTime > DATE_SUB(NOW(),  INTERVAL 1 month);
-REPLACE INTO Events_Archived SELECT Id,MonitorId,DiskSpace FROM Events WHERE Archived=1;
-
-UPDATE Monitors 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(StartTime > DATE_SUB(NOW(), INTERVAL 1 hour),1,0)) AS HourEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 hour),DiskSpace,0)) AS HourEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 day),1,0)) AS DayEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 day),DiskSpace,0)) AS DayEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 week),1,0)) AS WeekEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 week),DiskSpace,0)) AS WeekEventDiskSpace,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 month),1,0)) AS MonthEvents,
-    SUM(IF(StartTime > DATE_SUB(NOW(), INTERVAL 1 month),DiskSpace,0)) AS MonthEventDiskSpace
-    FROM Events GROUP BY MonitorId
-    ) AS E ON E.MonitorId=Monitors.Id SET
-    Monitors.TotalEvents = E.TotalEvents,
-    Monitors.TotalEventDiskSpace = E.TotalEventDiskSpace,
-    Monitors.ArchivedEvents = E.ArchivedEvents,
-    Monitors.ArchivedEventDiskSpace = E.ArchivedEventDiskSpace,
-    Monitors.HourEvents = E.HourEvents,
-    Monitors.HourEventDiskSpace = E.HourEventDiskSpace,
-    Monitors.DayEvents = E.DayEvents,
-    Monitors.DayEventDiskSpace = E.DayEventDiskSpace,
-    Monitors.WeekEvents = E.WeekEvents,
-    Monitors.WeekEventDiskSpace = E.WeekEventDiskSpace,
-    Monitors.MonthEvents = E.MonthEvents,
-    Monitors.MonthEventDiskSpace = E.MonthEventDiskSpace;
-
--- a/db/zm_update-1.33.9.sql
+++ b/db/zm_update-1.33.9.sql
@ -1,27 +0,0 @@
--
-- Add per user API enable/disable and ability to set a minimum issued time for tokens
--
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Users'
-     AND column_name = 'TokenMinExpiry'
-    ) > 0,
-"SELECT 'Column TokenMinExpiry already exists in Users'",
-"ALTER TABLE Users ADD `TokenMinExpiry` BIGINT UNSIGNED NOT NULL DEFAULT 0 AFTER `MonitorIds`"  
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Users'
-     AND column_name = 'APIEnabled'
-    ) > 0,
-"SELECT 'Column APIEnabled already exists in Users'",
-"ALTER TABLE Users ADD `APIEnabled` tinyint(3) UNSIGNED NOT NULL default 1 AFTER `TokenMinExpiry`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
--- a/db/zm_update-1.34.0.sql
+++ b/db/zm_update-1.34.0.sql
@ -1,5 +0,0 @@
--
-- This updates a 1.33.16 database to 1.34.0
--
-- No changes required
--
--- a/db/zm_update-1.34.1.sql
+++ b/db/zm_update-1.34.1.sql
@ -1,5 +0,0 @@
--
-- This updates a 1.34.0 database to 1.34.1
--
-- No changes required
--
--- a/db/zm_update-1.34.2.sql
+++ b/db/zm_update-1.34.2.sql
@ -1,5 +0,0 @@
--
-- This updates a 1.34.1 database to 1.34.2
--
-- No changes required
--
--- a/db/zm_update-1.34.20.sql
+++ b/db/zm_update-1.34.20.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.34.3.sql
+++ b/db/zm_update-1.34.3.sql
@ -1,5 +0,0 @@
--
-- This updates a 1.34.2 database to 1.34.3
--
-- No changes required
--
--- a/db/zm_update-1.34.4.sql
+++ b/db/zm_update-1.34.4.sql
@ -1,5 +0,0 @@
--
-- This updates a 1.34.3 database to 1.34.4
--
-- No changes required
--
--- a/db/zm_update-1.34.5.sql
+++ b/db/zm_update-1.34.5.sql
@ -1,5 +0,0 @@
--
-- This updates a 1.34.4 database to 1.34.5
--
-- No changes required
--
--- a/db/zm_update-1.34.6.sql
+++ b/db/zm_update-1.34.6.sql
@ -1,5 +0,0 @@
--
-- This updates a 1.34.5 database to 1.34.6
--
-- No changes required
--
--- a/db/zm_update-1.34.7.sql
+++ b/db/zm_update-1.34.7.sql
@ -1,5 +0,0 @@
--
-- This updates a 1.34.6 database to 1.34.7
--
-- No changes required
--
--- 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/Show More
+++ b/Show More
Author	SHA1	Message	Date
Isaac Connor	32b91df395	remove deprecated column	2019-03-05 11:01:11 -05:00
Isaac Connor	4aefb6ed04	Fix typo: Ineterval to Interval	2019-03-05 10:58:04 -05:00
Isaac Connor	b98028e128	Typo: AnalysisUpdateDelete to AnalysisUpdateDelay	2019-03-05 10:56:46 -05:00
				`@ -0,0 +1 @@`
				`Please see https://github.com/ZoneMinder/ZoneMinder/issues?state=open`
				`@ -0,0 +1 @@`
				`This is too hard to maintain. See https://github.com/ZoneMinder/ZoneMinder/commits/master`
				`@ -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);