Merge pull request #877 from pliablepixels/799-api-improvements

799 api improvements

.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]"

.dockerignore

@@ -1 +0,0 @@
-.git

.eslintignore

@@ -1,19 +0,0 @@
-*.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.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

.eslintrc.js

@@ -1,51 +0,0 @@
-"use strict";
-
-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": {
-    "camelcase": "off",
-    "comma-dangle": "off",
-    "guard-for-in": "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-var": "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
-  },
-};

.git-blame-ignore-revs

@@ -1,2 +0,0 @@
-# Reindent CMakeLists
-6c9983155c65848a3e67976445cd20fb4fbfe108

.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']

.github/ISSUE_TEMPLATE.md

@@ -1,59 +0,0 @@
-<!--
-
-**THIS FORUM IS FOR BUG REPORTS ONLY**
-
-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:
-
-- The [ZoneMinder-Chat Slack channel](https://zoneminder-chat.herokuapp.com/)
-- The [ZoneMinder Forum](https://forums.zoneminder.com/)
-
-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.
-
-----------------------------------------------------------------------------------------------------
--->
-**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>
--->
-
-```

.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>
-
-```

.github/codeql/codeql-config.yml

@@ -1,2 +0,0 @@
-paths-ignore:
-  - dep/

.github/config.yml

@@ -1,21 +0,0 @@
-# Configuration for welcome - https://github.com/behaviorbot/welcome
-
-# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome
-
-# Comment to be posted to on first time issues
-newIssueWelcomeComment: >
-  Thanks for opening your first issue here! Just a reminder, this forum is for Bug Reports only. Be sure to follow the issue template!
-
-# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
-
-# Comment to be posted to on PRs from first time contributors in your repository
-#newPRWelcomeComment: >
-#  Thanks for opening this pull request! Please check out our contributing guidelines.
-
-# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge
-
-# Comment to be posted to on pull requests merged by a first time user
-#firstPRMergeComment: >
-#  Congrats on merging your first pull request! We here at behaviorbot are proud of you! 
-
-# It is recommend to include as many gifs and emojis as possible

.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.

.github/no-response.yml

@@ -1,13 +0,0 @@
-# Configuration for probot-no-response - https://github.com/probot/no-response
-
-# Number of days of inactivity before an Issue is closed for lack of response
-daysUntilClose: 7
-# Label requiring a response
-responseRequiredLabel: more-information-needed
-# Comment to post when closing an Issue for lack of response. Set to `false` to disable
-closeComment: >
-  This issue has been automatically closed because there has been no response
-  to our request for more information from the original author. With only the
-  information that is currently in the issue, we don't have enough information
-  to take action. Please reach out if you have or find the answers we need so
-  that we can investigate further.

.github/stale.yml

@@ -1,29 +0,0 @@
-# Configuration for probot-stale - https://github.com/probot/stale
-
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 180
-
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 30
-
-# 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
-
-# Label to use when marking an issue as stale
-staleLabel: stale
-
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false

.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

.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]})

.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

.gitignore

@@ -1,72 +1,35 @@
-# If you are adding to this file, please ensure sorting is maintained. If using vim, you can use :%sort u
-CMakeCache.txt
-CMakeFiles/
-Makefile
-Makefile.in
-aclocal.m4
+configure
+config.h.in
 autom4te.cache
-cmake/cmake_uninstall.cmake
-cmake_install.cmake
-compile
+aclocal.m4
+depcomp
+install-sh
+missing
+mkinstalldirs
+stamp-h1
+stamp-h.in
+scripts/ZoneMinder/blib
+Makefile.in
+Makefile
+docs/_build
+
 config.guess
 config.h
-config.h.in
-config.h.in~
 config.log
 config.status
 config.sub
-configure
-db/CMakeFiles/
-db/cmake_install.cmake
 db/zm_create.sql
-depcomp
-docs/_build
-install-sh
-install_manifest.txt
-misc/CMakeFiles/
 misc/apache.conf
-misc/cmake_install.cmake
 misc/com.zoneminder.systemctl.policy
 misc/com.zoneminder.systemctl.rules
 misc/logrotate.conf
 misc/syslog.conf
-misc/zoneminder-tmpfiles.conf
-misc/zoneminder.service
-missing
-mkinstalldirs
-onvif/CMakeFiles/
-onvif/cmake_install.cmake
-onvif/modules/CMakeFiles/
-onvif/modules/MYMETA.json
-onvif/modules/MYMETA.yml
-onvif/modules/MakefilePerl
-onvif/modules/cmake_install.cmake
-onvif/modules/output/
-onvif/modules/pm_to_blib
-onvif/proxy/CMakeFiles/
-onvif/proxy/MYMETA.json
-onvif/proxy/MYMETA.yml
-onvif/proxy/MakefilePerl
-onvif/proxy/cmake_install.cmake
-onvif/proxy/output/
-onvif/proxy/pm_to_blib
-onvif/scripts/CMakeFiles/
-onvif/scripts/cmake_install.cmake
-scripts/CMakeFiles/
-scripts/ZoneMinder/CMakeFiles/
-scripts/ZoneMinder/MYMETA.json
 scripts/ZoneMinder/MYMETA.yml
-scripts/ZoneMinder/Makefile.old
-scripts/ZoneMinder/MakefilePerl
-scripts/ZoneMinder/blib
-scripts/ZoneMinder/cmake_install.cmake
 scripts/ZoneMinder/lib/ZoneMinder/Base.pm
 scripts/ZoneMinder/lib/ZoneMinder/Config.pm
 scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm
 scripts/ZoneMinder/lib/ZoneMinder/Memory.pm
-scripts/ZoneMinder/output/
 scripts/ZoneMinder/pm_to_blib
-scripts/cmake_install.cmake
 scripts/zm
 scripts/zmaudit.pl
 scripts/zmcamtool.pl
@@ -79,79 +42,55 @@ scripts/zmfilter.pl
 scripts/zmlogrotate.conf
 scripts/zmpkg.pl
 scripts/zmsystemctl.pl
-scripts/zmtelemetry.pl
 scripts/zmtrack.pl
 scripts/zmtrigger.pl
 scripts/zmupdate.pl
 scripts/zmvideo.pl
 scripts/zmwatch.pl
 scripts/zmx10.pl
-scripts/zoneminder-zmaudit.pl.8
-scripts/zoneminder-zmaudit.pl.8.gz
-scripts/zoneminder-zmcamtool.pl.8
-scripts/zoneminder-zmcamtool.pl.8.gz
-scripts/zoneminder-zmcontrol.pl.8
-scripts/zoneminder-zmcontrol.pl.8.gz
-scripts/zoneminder-zmdc.pl.8
-scripts/zoneminder-zmdc.pl.8.gz
-scripts/zoneminder-zmfilter.pl.8
-scripts/zoneminder-zmfilter.pl.8.gz
-scripts/zoneminder-zmpkg.pl.8
-scripts/zoneminder-zmpkg.pl.8.gz
-scripts/zoneminder-zmsystemctl.pl.8
-scripts/zoneminder-zmsystemctl.pl.8.gz
-scripts/zoneminder-zmtelemetry.pl.8
-scripts/zoneminder-zmtelemetry.pl.8.gz
-scripts/zoneminder-zmtrack.pl.8
-scripts/zoneminder-zmtrack.pl.8.gz
-scripts/zoneminder-zmtrigger.pl.8
-scripts/zoneminder-zmtrigger.pl.8.gz
-scripts/zoneminder-zmupdate.pl.8
-scripts/zoneminder-zmupdate.pl.8.gz
-scripts/zoneminder-zmvideo.pl.8
-scripts/zoneminder-zmvideo.pl.8.gz
-scripts/zoneminder-zmwatch.pl.8
-scripts/zoneminder-zmwatch.pl.8.gz
-scripts/zoneminder-zmx10.pl.8
-scripts/zoneminder-zmx10.pl.8.gz
-src/*.o
 src/.deps/
+src/*.o
+src/zm_config.h
+src/zm_config_defines.h
+src/zma
+src/zmc
+src/zmf
+src/zms
+src/zmstreamer
+src/zmu
+web/includes/config.php
+zm.conf
+zmconfgen.pl
+
+CMakeCache.txt
+CMakeFiles/
+cmake/cmake_uninstall.cmake
+cmake_install.cmake
+db/CMakeFiles/
+db/cmake_install.cmake
+install_manifest.txt
+misc/CMakeFiles/
+misc/cmake_install.cmake
+misc/zoneminder.service
+scripts/CMakeFiles/
+scripts/ZoneMinder/CMakeFiles/
+scripts/ZoneMinder/MakefilePerl
+scripts/ZoneMinder/cmake_install.cmake
+scripts/ZoneMinder/output/
+scripts/cmake_install.cmake
 src/CMakeFiles/
 src/cmake_install.cmake
 src/libzm.a
 src/nph-zms
-src/zmc
-src/zmf
-src/zms
-src/zmu
-src/zoneminder-zmc.8
-src/zoneminder-zmc.8.gz
-src/zoneminder-zmf.8
-src/zoneminder-zmf.8.gz
-src/zoneminder-zmstreamer.8
-src/zoneminder-zmstreamer.8.gz
-src/zoneminder-zmu.8
-src/zoneminder-zmu.8.gz
-stamp-h.in
-stamp-h1
 web/CMakeFiles/
 web/api/CMakeFiles/
-web/api/app/Config/bootstrap.php
 web/api/app/Config/core.php
 web/api/cmake_install.cmake
-web/cgi-bin/
 web/cmake_install.cmake
-web/events/
-web/images/
-web/includes/config.php
 web/tools/mootools/CMakeFiles/
 web/tools/mootools/cmake_install.cmake
 web/tools/mootools/mootools-core.js
 web/tools/mootools/mootools-more.js
-web/undef.log
-zm.conf
-zmconfgen.pl
 zmlinkcontent.sh
-zm_config_data.h
-zm_config_defines.h
-**/.DS_Store
+web/events
+web/images

.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

.gitmodules

@@ -1,10 +1,4 @@
 [submodule "web/api/app/Plugin/Crud"]
 	path = web/api/app/Plugin/Crud
-	url = https://github.com/FriendsOfCake/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 = git://github.com/FriendsOfCake/crud.git
+	branch = master

.travis.yml

@@ -1,58 +1,48 @@
 language: cpp
-sudo: required
-dist: bionic
-git:
-  depth: 9999999
 notifications:
-  irc: chat.freenode.net#zoneminder-dev
+  irc: "chat.freenode.net#zoneminder-dev"
 branches:
   except:
-  - modern
-cache: ccache
-addons:
-  ssh_known_hosts: zmrepo.zoneminder.com
-  apt:
-    sources:
-    - sourceline: ppa:iconnor/zoneminder-master
-    - key_url: http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0x4D0BF748776FFB04
-    packages:
-    - gdebi
-    - yum-utils
-    - patch
-    - git
-    - curl
-    - sshfs
-    - sed
-    - binfmt-support
-    - qemu
-    - qemu-user-static
-    - dnsutils
-    - traceroute
-install:
-  - update-binfmts --enable qemu-arm
-
+    - modern
 env:
-  - SMPFLAGS=-j4 OS=eslint DIST=eslint
-  - SMPFLAGS=-j4 OS=ubuntu DIST=bionic DOCKER_REPO=iconzm/packpack
-
+  global:
+    - LD_LIBRARY_PATH="/usr/local/lib:/opt/libjpeg-turbo/lib:$LD_LIBRARY_PATH"
+    - DEB_HOST_GNU_TYPE=$(dpkg-architecture -qDEB_HOST_GNU_TYPE)
+    - DEB_BUILD_GNU_TYPE=$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+    - CFLAGS="-DZM_FFMPEG_CVS -DHAVE_LIBCRYPTO -I/usr/local/include"
+    - CXXFLAGS="$CFLAGS"
+  matrix:
+    - ZM_BUILDMETHOD=cmake
+    - ZM_BUILDMETHOD=autotools
 compiler:
-- gcc
-services:
-- mysql
-- docker
-
+  - gcc
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -y -qq libpolkit-gobject-1-dev zlib1g-dev apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf cmake libjpeg-turbo8-dev apache2-mpm-prefork libapache2-mod-php5 php5-cli libtheora-dev libvorbis-dev libvpx-dev libx264-dev libvlccore-dev libvlc-dev libvlccore5 libvlc5 2>&1 > /dev/null 
+install:
+  - git clone -b n2.4.2 --depth=1 git://source.ffmpeg.org/ffmpeg.git
+  - cd ffmpeg
+  - ./configure --enable-shared --enable-swscale --enable-gpl  --enable-libx264 --enable-libvpx --enable-libvorbis --enable-libtheora 
+  - make -j `grep processor /proc/cpuinfo|wc -l` 
+  - sudo make install 
+  - sudo make install-libs
+before_script:
+  - cd $TRAVIS_BUILD_DIR
+  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then libtoolize --force; fi
+  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then aclocal; fi
+  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then autoheader; fi
+  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then automake --force-missing --add-missing; fi
+  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then autoconf; fi
+  - mysql -uroot -e "CREATE DATABASE IF NOT EXISTS zm"
+  - mysql -uroot -e "GRANT ALL ON zm.* TO 'zmuser'@'localhost' IDENTIFIED BY 'zmpass'";
+  - mysql -uroot -e "FLUSH PRIVILEGES"
 script:
-- utils/packpack/startpackpack.sh
-
-before_deploy:
-- openssl aes-256-cbc -K $encrypted_62a62750aa73_key -iv $encrypted_62a62750aa73_iv -in ./utils/packpack/deploy_rsa.enc -out /tmp/deploy_rsa -d
-- eval "$(ssh-agent -s)"
-- chmod 600 /tmp/deploy_rsa
-- ssh-add /tmp/deploy_rsa
-
-deploy:
-  provider: script
-  skip_cleanup: true
-  script: utils/packpack/rsync_xfer.sh
-  on:
-    branch: master
+  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then ./configure --prefix=/usr --with-libarch=lib/$DEB_HOST_GNU_TYPE --host=$DEB_HOST_GNU_TYPE --build=$DEB_BUILD_GNU_TYPE --with-mysql=/usr --with-ffmpeg=/usr --with-webdir=/usr/share/zoneminder/www --with-cgidir=/usr/libexec/zoneminder/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-crashtrace=yes --disable-debug --enable-mmap=yes ZM_SSL_LIB=openssl; fi
+  - if [ "$ZM_BUILDMETHOD" = "cmake" ]; then cmake -DCMAKE_INSTALL_PREFIX="/usr"; fi
+  - make
+  - sudo make install
+  - if [ "$ZM_BUILDMETHOD" = "cmake" ]; then sudo ./zmlinkcontent.sh; fi
+  - mysql -uzmuser -pzmpass < db/zm_create.sql
+  - mysql -uzmuser -pzmpass zm < db/test.monitor.sql
+  - sudo zmpkg.pl start
+  - sudo zmfilter.pl -f purgewhenfull

AUTHORS

@@ -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.

BUGS

@@ -0,0 +1 @@
+Please see https://github.com/ZoneMinder/ZoneMinder/issues?state=open

CHANGELOG.md

@@ -1,487 +0,0 @@
-# Change Log
-
-## [v1.29.0](https://github.com/ZoneMinder/ZoneMinder/tree/v1.29.0) (2016-02-03)
-[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.29.0-rc2...v1.29.0)
-
-**Merged pull requests:**
-
-- 1253 zms quit cmd [\#1254](https://github.com/ZoneMinder/ZoneMinder/pull/1254) ([pliablepixels](https://github.com/pliablepixels))
-- Add Debug/Info lines reporting multi-server status [\#1252](https://github.com/ZoneMinder/ZoneMinder/pull/1252) ([connortechnology](https://github.com/connortechnology))
-- Do debian package mods [\#1244](https://github.com/ZoneMinder/ZoneMinder/pull/1244) ([pliablepixels](https://github.com/pliablepixels))
-- zmtrigger - process off+time delay condition [\#1240](https://github.com/ZoneMinder/ZoneMinder/pull/1240) ([knnniggett](https://github.com/knnniggett))
-- Multi server [\#1233](https://github.com/ZoneMinder/ZoneMinder/pull/1233) ([connortechnology](https://github.com/connortechnology))
-- remove Google open Sans external import [\#1232](https://github.com/ZoneMinder/ZoneMinder/pull/1232) ([connortechnology](https://github.com/connortechnology))
-- PTZ - Added autostop to Down command on FI8918W [\#1189](https://github.com/ZoneMinder/ZoneMinder/pull/1189) ([marcolino7](https://github.com/marcolino7))
-
-## [v1.29.0-rc2](https://github.com/ZoneMinder/ZoneMinder/tree/v1.29.0-rc2) (2016-01-05)
-[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.29.0-rc1...v1.29.0-rc2)
-
-**Merged pull requests:**
-
-- Multi server [\#1223](https://github.com/ZoneMinder/ZoneMinder/pull/1223) ([connortechnology](https://github.com/connortechnology))
-- Multi server [\#1222](https://github.com/ZoneMinder/ZoneMinder/pull/1222) ([connortechnology](https://github.com/connortechnology))
-- Multi server [\#1217](https://github.com/ZoneMinder/ZoneMinder/pull/1217) ([connortechnology](https://github.com/connortechnology))
-- Multi server [\#1215](https://github.com/ZoneMinder/ZoneMinder/pull/1215) ([connortechnology](https://github.com/connortechnology))
-- Change log updates [\#1172](https://github.com/ZoneMinder/ZoneMinder/pull/1172) ([SteveGilvarry](https://github.com/SteveGilvarry))
-
-## [v1.29.0-rc1](https://github.com/ZoneMinder/ZoneMinder/tree/v1.29.0-rc1) (2016-01-01)
-[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.28.1...v1.29.0-rc1)
-
-**Merged pull requests:**
-
-- Bump version to 1.29.0 [\#1213](https://github.com/ZoneMinder/ZoneMinder/pull/1213) ([knnniggett](https://github.com/knnniggett))
-- Missing rtd theme [\#1202](https://github.com/ZoneMinder/ZoneMinder/pull/1202) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Skip directories that have non-digits in them [\#1201](https://github.com/ZoneMinder/ZoneMinder/pull/1201) ([connortechnology](https://github.com/connortechnology))
-- updated mobile app info [\#1200](https://github.com/ZoneMinder/ZoneMinder/pull/1200) ([pliablepixels](https://github.com/pliablepixels))
-- Api more security [\#1196](https://github.com/ZoneMinder/ZoneMinder/pull/1196) ([pliablepixels](https://github.com/pliablepixels))
-- Documentation [\#1194](https://github.com/ZoneMinder/ZoneMinder/pull/1194) ([pliablepixels](https://github.com/pliablepixels))
-- Documentation updated for ubuntu [\#1193](https://github.com/ZoneMinder/ZoneMinder/pull/1193) ([pliablepixels](https://github.com/pliablepixels))
-- Fixes \#1179 Libvlc Live555 Segmentation Fault [\#1190](https://github.com/ZoneMinder/ZoneMinder/pull/1190) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Add code to detect the change in REALM from older to newer firmware [\#1184](https://github.com/ZoneMinder/ZoneMinder/pull/1184) ([connortechnology](https://github.com/connortechnology))
-- add a 1/8th scale option, which is useful for 1920x1080 streams [\#1182](https://github.com/ZoneMinder/ZoneMinder/pull/1182) ([connortechnology](https://github.com/connortechnology))
-- Zms socket lock [\#1180](https://github.com/ZoneMinder/ZoneMinder/pull/1180) ([connortechnology](https://github.com/connortechnology))
-- Check for the presence of CrudControllerTrait.php instead of .git [\#1178](https://github.com/ZoneMinder/ZoneMinder/pull/1178) ([knnniggett](https://github.com/knnniggett))
-- Partial fix for \#1167 [\#1176](https://github.com/ZoneMinder/ZoneMinder/pull/1176) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Error on missing submodules [\#1173](https://github.com/ZoneMinder/ZoneMinder/pull/1173) ([knnniggett](https://github.com/knnniggett))
-- fix mem alloc fault in zm\_monitor.cpp [\#1168](https://github.com/ZoneMinder/ZoneMinder/pull/1168) ([knnniggett](https://github.com/knnniggett))
-- compat for php 5.4 [\#1164](https://github.com/ZoneMinder/ZoneMinder/pull/1164) ([abishai](https://github.com/abishai))
-- remove comment at end of line [\#1157](https://github.com/ZoneMinder/ZoneMinder/pull/1157) ([connortechnology](https://github.com/connortechnology))
-- Reorder RTSPDescribe to avoid -wreorder warnings [\#1147](https://github.com/ZoneMinder/ZoneMinder/pull/1147) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Update to \#1137 for backward compatibility. [\#1142](https://github.com/ZoneMinder/ZoneMinder/pull/1142) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Update Travis to ffmpeg 2.8.1 for testing [\#1139](https://github.com/ZoneMinder/ZoneMinder/pull/1139) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Replace deprecated FFmpeg API [\#1137](https://github.com/ZoneMinder/ZoneMinder/pull/1137) ([onlyjob](https://github.com/onlyjob))
-- added prev/next event ids [\#1136](https://github.com/ZoneMinder/ZoneMinder/pull/1136) ([pliablepixels](https://github.com/pliablepixels))
-- Install nph-zms with FILES so it is listed in install\_manifest.txt [\#1124](https://github.com/ZoneMinder/ZoneMinder/pull/1124) ([baffo32](https://github.com/baffo32))
-- Stray semicolon causes SQL error [\#1123](https://github.com/ZoneMinder/ZoneMinder/pull/1123) ([baffo32](https://github.com/baffo32))
-- Use relative URL's instead of absolute [\#1121](https://github.com/ZoneMinder/ZoneMinder/pull/1121) ([knnniggett](https://github.com/knnniggett))
-- Update version check URL [\#1120](https://github.com/ZoneMinder/ZoneMinder/pull/1120) ([kylejohnson](https://github.com/kylejohnson))
-- Add index to frames [\#1116](https://github.com/ZoneMinder/ZoneMinder/pull/1116) ([kylejohnson](https://github.com/kylejohnson))
-- Fatal if content dirs are unwritable [\#1113](https://github.com/ZoneMinder/ZoneMinder/pull/1113) ([baffo32](https://github.com/baffo32))
-- Fatal error if date.timezone is unset [\#1111](https://github.com/ZoneMinder/ZoneMinder/pull/1111) ([baffo32](https://github.com/baffo32))
-- Fix faulty zm.conf.new install line [\#1107](https://github.com/ZoneMinder/ZoneMinder/pull/1107) ([baffo32](https://github.com/baffo32))
-- Update preinst [\#1103](https://github.com/ZoneMinder/ZoneMinder/pull/1103) ([seebaer1976](https://github.com/seebaer1976))
-- Update apache.conf [\#1102](https://github.com/ZoneMinder/ZoneMinder/pull/1102) ([seebaer1976](https://github.com/seebaer1976))
-- Update rules [\#1101](https://github.com/ZoneMinder/ZoneMinder/pull/1101) ([seebaer1976](https://github.com/seebaer1976))
-- Update links [\#1100](https://github.com/ZoneMinder/ZoneMinder/pull/1100) ([seebaer1976](https://github.com/seebaer1976))
-- Update preinst [\#1099](https://github.com/ZoneMinder/ZoneMinder/pull/1099) ([seebaer1976](https://github.com/seebaer1976))
-- Fix zmaudit [\#1095](https://github.com/ZoneMinder/ZoneMinder/pull/1095) ([connortechnology](https://github.com/connortechnology))
-- fixed version compare logic [\#1094](https://github.com/ZoneMinder/ZoneMinder/pull/1094) ([pliablepixels](https://github.com/pliablepixels))
-- Don't install zm.conf if it already exists [\#1090](https://github.com/ZoneMinder/ZoneMinder/pull/1090) ([connortechnology](https://github.com/connortechnology))
-- change types and move things around to remove compile warnings [\#1089](https://github.com/ZoneMinder/ZoneMinder/pull/1089) ([connortechnology](https://github.com/connortechnology))
-- Tz [\#1084](https://github.com/ZoneMinder/ZoneMinder/pull/1084) ([connortechnology](https://github.com/connortechnology))
-- fixed orange display for monitor mode [\#1083](https://github.com/ZoneMinder/ZoneMinder/pull/1083) ([pliablepixels](https://github.com/pliablepixels))
-- use deleteAll\(\) vs. delete\(\) when deleting an Event's Frames [\#1080](https://github.com/ZoneMinder/ZoneMinder/pull/1080) ([kylejohnson](https://github.com/kylejohnson))
-- Added control script for SunEyes SP-P1802SWPTZ [\#1079](https://github.com/ZoneMinder/ZoneMinder/pull/1079) ([bofhdk](https://github.com/bofhdk))
-- Use the 3.0 branch of crud, compatible with cakephp 2.x [\#1078](https://github.com/ZoneMinder/ZoneMinder/pull/1078) ([kylejohnson](https://github.com/kylejohnson))
-- 663 frames primary key [\#1075](https://github.com/ZoneMinder/ZoneMinder/pull/1075) ([kylejohnson](https://github.com/kylejohnson))
-- Delete fixes for Events [\#1073](https://github.com/ZoneMinder/ZoneMinder/pull/1073) ([pliablepixels](https://github.com/pliablepixels))
-- restart monitor when edited via APIs [\#1070](https://github.com/ZoneMinder/ZoneMinder/pull/1070) ([pliablepixels](https://github.com/pliablepixels))
-- add debug statements for when LastWriteTime is not defined. [\#1067](https://github.com/ZoneMinder/ZoneMinder/pull/1067) ([connortechnology](https://github.com/connortechnology))
-- fixed recaptcha showing up pre DB update [\#1066](https://github.com/ZoneMinder/ZoneMinder/pull/1066) ([pliablepixels](https://github.com/pliablepixels))
-- fixed security instructions for curl [\#1062](https://github.com/ZoneMinder/ZoneMinder/pull/1062) ([pliablepixels](https://github.com/pliablepixels))
-- header typo corrections [\#1058](https://github.com/ZoneMinder/ZoneMinder/pull/1058) ([onlyjob](https://github.com/onlyjob))
-- quick fix for \#1055: make sure our mmap fd is \> 2 [\#1057](https://github.com/ZoneMinder/ZoneMinder/pull/1057) ([connortechnology](https://github.com/connortechnology))
-- Fix sgfault caused by the privacy mask stuff [\#1056](https://github.com/ZoneMinder/ZoneMinder/pull/1056) ([connortechnology](https://github.com/connortechnology))
-- link to cambozola package, rather than download during build [\#1054](https://github.com/ZoneMinder/ZoneMinder/pull/1054) ([knnniggett](https://github.com/knnniggett))
-- redhat rpm packaging modifications [\#1052](https://github.com/ZoneMinder/ZoneMinder/pull/1052) ([knnniggett](https://github.com/knnniggett))
-- remove core.php, modify core.php.default [\#1049](https://github.com/ZoneMinder/ZoneMinder/pull/1049) ([knnniggett](https://github.com/knnniggett))
-- Google recaptcha [\#1048](https://github.com/ZoneMinder/ZoneMinder/pull/1048) ([pliablepixels](https://github.com/pliablepixels))
-- enable/disable RTSP Describe Header [\#1045](https://github.com/ZoneMinder/ZoneMinder/pull/1045) ([knnniggett](https://github.com/knnniggett))
-- Add Documentation for Privacy zones [\#1044](https://github.com/ZoneMinder/ZoneMinder/pull/1044) ([schrorg](https://github.com/schrorg))
-- added note about potential Perl and PHP time translation conflict wit… [\#1043](https://github.com/ZoneMinder/ZoneMinder/pull/1043) ([pliablepixels](https://github.com/pliablepixels))
-- Multi server [\#1040](https://github.com/ZoneMinder/ZoneMinder/pull/1040) ([connortechnology](https://github.com/connortechnology))
-- 1038 fixing state mgmt 1030 is active fix [\#1039](https://github.com/ZoneMinder/ZoneMinder/pull/1039) ([pliablepixels](https://github.com/pliablepixels))
-- Grey color for disabled buttons [\#1037](https://github.com/ZoneMinder/ZoneMinder/pull/1037) ([pliablepixels](https://github.com/pliablepixels))
-- Update filterevents.rst [\#1035](https://github.com/ZoneMinder/ZoneMinder/pull/1035) ([tikismoke](https://github.com/tikismoke))
-- add warning and help text for maxfps fields [\#1033](https://github.com/ZoneMinder/ZoneMinder/pull/1033) ([knnniggett](https://github.com/knnniggett))
-- update doc [\#1032](https://github.com/ZoneMinder/ZoneMinder/pull/1032) ([tikismoke](https://github.com/tikismoke))
-- Remove full path from Logger filename [\#1029](https://github.com/ZoneMinder/ZoneMinder/pull/1029) ([knnniggett](https://github.com/knnniggett))
-- Typo in README.md [\#1027](https://github.com/ZoneMinder/ZoneMinder/pull/1027) ([tikismoke](https://github.com/tikismoke))
-- Add new zone type - privacy zones [\#1026](https://github.com/ZoneMinder/ZoneMinder/pull/1026) ([schrorg](https://github.com/schrorg))
-- Send login activity to the zoneminder event log [\#1021](https://github.com/ZoneMinder/ZoneMinder/pull/1021) ([knnniggett](https://github.com/knnniggett))
-- Small dark CSS fixes in frames and timeline view [\#1019](https://github.com/ZoneMinder/ZoneMinder/pull/1019) ([schrorg](https://github.com/schrorg))
-- New User Permission "Groups" [\#1018](https://github.com/ZoneMinder/ZoneMinder/pull/1018) ([knnniggett](https://github.com/knnniggett))
-- 1013 document migration [\#1017](https://github.com/ZoneMinder/ZoneMinder/pull/1017) ([pliablepixels](https://github.com/pliablepixels))
-- Fix issue with score values less than 0 [\#1016](https://github.com/ZoneMinder/ZoneMinder/pull/1016) ([knnniggett](https://github.com/knnniggett))
-- Explained a caveat  with using relative times [\#1012](https://github.com/ZoneMinder/ZoneMinder/pull/1012) ([pliablepixels](https://github.com/pliablepixels))
-- Included logic to not enforce authentication in API layer if ZM auth is off [\#1008](https://github.com/ZoneMinder/ZoneMinder/pull/1008) ([pliablepixels](https://github.com/pliablepixels))
-- Update to ffmpeg 2.7.2 in travis build [\#1007](https://github.com/ZoneMinder/ZoneMinder/pull/1007) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- I was using the wrong field to check for portal authentication [\#1006](https://github.com/ZoneMinder/ZoneMinder/pull/1006) ([pliablepixels](https://github.com/pliablepixels))
-- Demote user auth info message to debug [\#1003](https://github.com/ZoneMinder/ZoneMinder/pull/1003) ([Linwood-F](https://github.com/Linwood-F))
-- Add scale as optional feature to image.php [\#1001](https://github.com/ZoneMinder/ZoneMinder/pull/1001) ([Linwood-F](https://github.com/Linwood-F))
-- 995 events count per api \(bumps up \# of events reported per API call\) [\#996](https://github.com/ZoneMinder/ZoneMinder/pull/996) ([pliablepixels](https://github.com/pliablepixels))
-- APIs will be served only if user is logged into the ZM portal [\#994](https://github.com/ZoneMinder/ZoneMinder/pull/994) ([pliablepixels](https://github.com/pliablepixels))
-- Add option to make TimeStamp larger [\#992](https://github.com/ZoneMinder/ZoneMinder/pull/992) ([schrorg](https://github.com/schrorg))
-- Implemented \#989 \(highlight current row in tables\) for dark CSS [\#990](https://github.com/ZoneMinder/ZoneMinder/pull/990) ([schrorg](https://github.com/schrorg))
-- CSS\[skins/classic\]: highlight current row in tables. [\#989](https://github.com/ZoneMinder/ZoneMinder/pull/989) ([onlyjob](https://github.com/onlyjob))
-- quiet error when no Servers in Servers table [\#986](https://github.com/ZoneMinder/ZoneMinder/pull/986) ([connortechnology](https://github.com/connortechnology))
-- fix \#948 1 [\#985](https://github.com/ZoneMinder/ZoneMinder/pull/985) ([connortechnology](https://github.com/connortechnology))
-- Remove shared data warning for purpose query only [\#984](https://github.com/ZoneMinder/ZoneMinder/pull/984) ([Linwood-F](https://github.com/Linwood-F))
-- Change from info to debug [\#983](https://github.com/ZoneMinder/ZoneMinder/pull/983) ([Linwood-F](https://github.com/Linwood-F))
-- Fix image dimensions check [\#980](https://github.com/ZoneMinder/ZoneMinder/pull/980) ([connortechnology](https://github.com/connortechnology))
-- Apache.conf modifications [\#968](https://github.com/ZoneMinder/ZoneMinder/pull/968) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Dark CSS for classic theme [\#967](https://github.com/ZoneMinder/ZoneMinder/pull/967) ([schrorg](https://github.com/schrorg))
-- Auto generated changelog [\#966](https://github.com/ZoneMinder/ZoneMinder/pull/966) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- 959 add exif date time to images [\#962](https://github.com/ZoneMinder/ZoneMinder/pull/962) ([Linwood-F](https://github.com/Linwood-F))
-- Add analysis interval parameter to monitors settings [\#956](https://github.com/ZoneMinder/ZoneMinder/pull/956) ([manupap1](https://github.com/manupap1))
-- Fixed Configs API to return all values [\#955](https://github.com/ZoneMinder/ZoneMinder/pull/955) ([pliablepixels](https://github.com/pliablepixels))
-- Change encoding of german language file to UTF-8 [\#952](https://github.com/ZoneMinder/ZoneMinder/pull/952) ([schrorg](https://github.com/schrorg))
-- Show correct part of URL \(hostname\) for ffmpeg sources in console [\#951](https://github.com/ZoneMinder/ZoneMinder/pull/951) ([schrorg](https://github.com/schrorg))
-- add php-gd to list of dependencies for debian and ubuntu builds [\#944](https://github.com/ZoneMinder/ZoneMinder/pull/944) ([connortechnology](https://github.com/connortechnology))
-- rpm packaging - require php-gd [\#943](https://github.com/ZoneMinder/ZoneMinder/pull/943) ([knnniggett](https://github.com/knnniggett))
-- add some utility db functions [\#942](https://github.com/ZoneMinder/ZoneMinder/pull/942) ([connortechnology](https://github.com/connortechnology))
-- add space instead of + to handle old Axis cameras [\#941](https://github.com/ZoneMinder/ZoneMinder/pull/941) ([connortechnology](https://github.com/connortechnology))
-- zmtrigger: POD documentation [\#938](https://github.com/ZoneMinder/ZoneMinder/pull/938) ([onlyjob](https://github.com/onlyjob))
-- improve log [\#937](https://github.com/ZoneMinder/ZoneMinder/pull/937) ([connortechnology](https://github.com/connortechnology))
-- add error handling on failure to open serial port [\#936](https://github.com/ZoneMinder/ZoneMinder/pull/936) ([connortechnology](https://github.com/connortechnology))
-- fix utf8 ' characters [\#934](https://github.com/ZoneMinder/ZoneMinder/pull/934) ([connortechnology](https://github.com/connortechnology))
-- roudn up when calculating buffer size for scaled image. Fixes \#932 [\#933](https://github.com/ZoneMinder/ZoneMinder/pull/933) ([connortechnology](https://github.com/connortechnology))
-- Added API routing [\#931](https://github.com/ZoneMinder/ZoneMinder/pull/931) ([pliablepixels](https://github.com/pliablepixels))
-- don't include .cpp in man [\#930](https://github.com/ZoneMinder/ZoneMinder/pull/930) ([connortechnology](https://github.com/connortechnology))
-- fix pod2man generation for out-of-source builds [\#928](https://github.com/ZoneMinder/ZoneMinder/pull/928) ([knnniggett](https://github.com/knnniggett))
-- Version to 1.28.99 [\#926](https://github.com/ZoneMinder/ZoneMinder/pull/926) ([connortechnology](https://github.com/connortechnology))
-- Introduce a read\_into function in the Buffer.  [\#923](https://github.com/ZoneMinder/ZoneMinder/pull/923) ([connortechnology](https://github.com/connortechnology))
-- Added "RewriteBase /zm/api" for API routing [\#921](https://github.com/ZoneMinder/ZoneMinder/pull/921) ([pliablepixels](https://github.com/pliablepixels))
-- Zms no crash [\#920](https://github.com/ZoneMinder/ZoneMinder/pull/920) ([connortechnology](https://github.com/connortechnology))
-- add check for gettime in librt, needed for building on pi [\#919](https://github.com/ZoneMinder/ZoneMinder/pull/919) ([connortechnology](https://github.com/connortechnology))
-- Add ServerId to Monitors [\#918](https://github.com/ZoneMinder/ZoneMinder/pull/918) ([connortechnology](https://github.com/connortechnology))
-- Dumb down Crud from 4.0 -\> 3.0.10 [\#915](https://github.com/ZoneMinder/ZoneMinder/pull/915) ([knnniggett](https://github.com/knnniggett))
-- Add Servers Table and add Id PRIMARY KEY to States [\#910](https://github.com/ZoneMinder/ZoneMinder/pull/910) ([connortechnology](https://github.com/connortechnology))
-- fix montage view issue in mobile skin [\#909](https://github.com/ZoneMinder/ZoneMinder/pull/909) ([knnniggett](https://github.com/knnniggett))
-- Solaris cmake [\#906](https://github.com/ZoneMinder/ZoneMinder/pull/906) ([knnniggett](https://github.com/knnniggett))
-- Fix el7 build [\#902](https://github.com/ZoneMinder/ZoneMinder/pull/902) ([bill-mcgonigle](https://github.com/bill-mcgonigle))
-- 898 is running states [\#899](https://github.com/ZoneMinder/ZoneMinder/pull/899) ([pliablepixels](https://github.com/pliablepixels))
-- Fixed events API to remove thumbnail code [\#897](https://github.com/ZoneMinder/ZoneMinder/pull/897) ([pliablepixels](https://github.com/pliablepixels))
-- Generate man pages for perl scripts & C Binaries in the bin folder [\#896](https://github.com/ZoneMinder/ZoneMinder/pull/896) ([knnniggett](https://github.com/knnniggett))
-- 893 foscam 9831 w and other foscams [\#895](https://github.com/ZoneMinder/ZoneMinder/pull/895) ([pliablepixels](https://github.com/pliablepixels))
-- 893 foscam 9831 w and other foscams [\#894](https://github.com/ZoneMinder/ZoneMinder/pull/894) ([pliablepixels](https://github.com/pliablepixels))
-- Zmwatch cleanup2 [\#891](https://github.com/ZoneMinder/ZoneMinder/pull/891) ([connortechnology](https://github.com/connortechnology))
-- reverse the if statement to reduce indenting [\#890](https://github.com/ZoneMinder/ZoneMinder/pull/890) ([connortechnology](https://github.com/connortechnology))
-- Updated API document  [\#886](https://github.com/ZoneMinder/ZoneMinder/pull/886) ([pliablepixels](https://github.com/pliablepixels))
-- Use avconv as alternative to ffmpeg executable [\#884](https://github.com/ZoneMinder/ZoneMinder/pull/884) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- 881 bootstrap loading config [\#883](https://github.com/ZoneMinder/ZoneMinder/pull/883) ([pliablepixels](https://github.com/pliablepixels))
-- Merged Angular UI branch API to master [\#882](https://github.com/ZoneMinder/ZoneMinder/pull/882) ([pliablepixels](https://github.com/pliablepixels))
-- Add version to the startup log line [\#875](https://github.com/ZoneMinder/ZoneMinder/pull/875) ([connortechnology](https://github.com/connortechnology))
-- German translation update [\#874](https://github.com/ZoneMinder/ZoneMinder/pull/874) ([seeebek](https://github.com/seeebek))
-- reduce the wait to 2/10ths instead of a whole second [\#873](https://github.com/ZoneMinder/ZoneMinder/pull/873) ([connortechnology](https://github.com/connortechnology))
-- alter the logic of ReadData. New behaviour is documented.   [\#870](https://github.com/ZoneMinder/ZoneMinder/pull/870) ([connortechnology](https://github.com/connortechnology))
-- analysis optimisations [\#867](https://github.com/ZoneMinder/ZoneMinder/pull/867) ([connortechnology](https://github.com/connortechnology))
-- Don't die if db goes away during logging [\#866](https://github.com/ZoneMinder/ZoneMinder/pull/866) ([connortechnology](https://github.com/connortechnology))
-- Move iostream inclusion in zm.h and declare explicitly the namespace [\#859](https://github.com/ZoneMinder/ZoneMinder/pull/859) ([manupap1](https://github.com/manupap1))
-- Fix detection of deprecated libav / ffmpeg functions [\#858](https://github.com/ZoneMinder/ZoneMinder/pull/858) ([manupap1](https://github.com/manupap1))
-- Correct bareword config entries with newer {} style [\#856](https://github.com/ZoneMinder/ZoneMinder/pull/856) ([connortechnology](https://github.com/connortechnology))
-- update german translation [\#854](https://github.com/ZoneMinder/ZoneMinder/pull/854) ([seeebek](https://github.com/seeebek))
-- ubuntu 15.04 [\#850](https://github.com/ZoneMinder/ZoneMinder/pull/850) ([seeebek](https://github.com/seeebek))
-- faster shutdown [\#847](https://github.com/ZoneMinder/ZoneMinder/pull/847) ([connortechnology](https://github.com/connortechnology))
-- Additional SLANG changes  [\#845](https://github.com/ZoneMinder/ZoneMinder/pull/845) ([knnniggett](https://github.com/knnniggett))
-- Cmake hostos [\#844](https://github.com/ZoneMinder/ZoneMinder/pull/844) ([knnniggett](https://github.com/knnniggett))
-- Port to OmniOS/Solaris [\#842](https://github.com/ZoneMinder/ZoneMinder/pull/842) ([whorfin](https://github.com/whorfin))
-- Zmaudit update1: Make MIN\_AGE Configurable [\#838](https://github.com/ZoneMinder/ZoneMinder/pull/838) ([connortechnology](https://github.com/connortechnology))
-- Update to FI982821W\_Y2k [\#836](https://github.com/ZoneMinder/ZoneMinder/pull/836) ([connortechnology](https://github.com/connortechnology))
-- add translate function [\#833](https://github.com/ZoneMinder/ZoneMinder/pull/833) ([knnniggett](https://github.com/knnniggett))
-- Separate css window sizes [\#829](https://github.com/ZoneMinder/ZoneMinder/pull/829) ([connortechnology](https://github.com/connortechnology))
-- Fix fast forward/reverse in event playback \(\#688\) [\#825](https://github.com/ZoneMinder/ZoneMinder/pull/825) ([rwg0](https://github.com/rwg0))
-- Fix: typo in options\_libvlc [\#824](https://github.com/ZoneMinder/ZoneMinder/pull/824) ([Lihis](https://github.com/Lihis))
-- close the session before requiring the page contents to fix the concurre... [\#823](https://github.com/ZoneMinder/ZoneMinder/pull/823) ([connortechnology](https://github.com/connortechnology))
-- Fix build issues on kFreeBSD. Fixes \#771 [\#822](https://github.com/ZoneMinder/ZoneMinder/pull/822) ([connortechnology](https://github.com/connortechnology))
-- beautifying \*.pm [\#821](https://github.com/ZoneMinder/ZoneMinder/pull/821) ([onlyjob](https://github.com/onlyjob))
-- Remove hardcoded localized strings in php files and update lang files [\#820](https://github.com/ZoneMinder/ZoneMinder/pull/820) ([manupap1](https://github.com/manupap1))
-- Fix french lang file [\#818](https://github.com/ZoneMinder/ZoneMinder/pull/818) ([manupap1](https://github.com/manupap1))
-- more perlcritic/PBP corrections [\#816](https://github.com/ZoneMinder/ZoneMinder/pull/816) ([onlyjob](https://github.com/onlyjob))
-- last batch of POD and readability conversions for \*.pl scripts [\#815](https://github.com/ZoneMinder/ZoneMinder/pull/815) ([onlyjob](https://github.com/onlyjob))
-- Fixes \#760 in part Clean up CMakeLists.txt [\#812](https://github.com/ZoneMinder/ZoneMinder/pull/812) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- upgrade bundled jQuery \(Closes: \#785\) [\#809](https://github.com/ZoneMinder/ZoneMinder/pull/809) ([onlyjob](https://github.com/onlyjob))
-- Update Mootools [\#803](https://github.com/ZoneMinder/ZoneMinder/pull/803) ([knnniggett](https://github.com/knnniggett))
-- hide USE\_DEEP\_STORAGE [\#802](https://github.com/ZoneMinder/ZoneMinder/pull/802) ([knnniggett](https://github.com/knnniggett))
-- link zms to nph-zms, rather than build identical [\#801](https://github.com/ZoneMinder/ZoneMinder/pull/801) ([knnniggett](https://github.com/knnniggett))
-- \* use pthread\_join instead of pthread\_tryjoin\_np [\#800](https://github.com/ZoneMinder/ZoneMinder/pull/800) ([Sune1337](https://github.com/Sune1337))
-- zmcontrol.pl, zmfilter.pl: pod2usage + readability improvements. [\#798](https://github.com/ZoneMinder/ZoneMinder/pull/798) ([onlyjob](https://github.com/onlyjob))
-- one small fix for a log line where the 4th parameter wasn't included.  T... [\#796](https://github.com/ZoneMinder/ZoneMinder/pull/796) ([connortechnology](https://github.com/connortechnology))
-- zmaudit.pl, zmcamtool.pl: pod2usage, PBP/5 + readability [\#795](https://github.com/ZoneMinder/ZoneMinder/pull/795) ([onlyjob](https://github.com/onlyjob))
-- as discussed... [\#794](https://github.com/ZoneMinder/ZoneMinder/pull/794) ([onlyjob](https://github.com/onlyjob))
-- Leftover short open tags [\#793](https://github.com/ZoneMinder/ZoneMinder/pull/793) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- cmake - use perl INSTALLDIRS [\#792](https://github.com/ZoneMinder/ZoneMinder/pull/792) ([knnniggett](https://github.com/knnniggett))
-- \#783 - related corrections [\#791](https://github.com/ZoneMinder/ZoneMinder/pull/791) ([onlyjob](https://github.com/onlyjob))
-- skins/classic: fix HTML export with USE\_DEEP\_STORAGE \(Closes: \#506\). [\#782](https://github.com/ZoneMinder/ZoneMinder/pull/782) ([onlyjob](https://github.com/onlyjob))
-- Check for libv4l1-videodev headers [\#781](https://github.com/ZoneMinder/ZoneMinder/pull/781) ([knnniggett](https://github.com/knnniggett))
-- build: add PATH\_MAX definitions \(needed on GNU Hurd\) [\#778](https://github.com/ZoneMinder/ZoneMinder/pull/778) ([onlyjob](https://github.com/onlyjob))
-- Freebsd fixes [\#775](https://github.com/ZoneMinder/ZoneMinder/pull/775) ([connortechnology](https://github.com/connortechnology))
-- Use tmpfiles.d to manage tmpdir and sockdir [\#774](https://github.com/ZoneMinder/ZoneMinder/pull/774) ([knnniggett](https://github.com/knnniggett))
-- Don't trigger linked cameras on new events [\#772](https://github.com/ZoneMinder/ZoneMinder/pull/772) ([balr0g](https://github.com/balr0g))
-- POD: zmupdate.pl converted to "pod2usage" [\#763](https://github.com/ZoneMinder/ZoneMinder/pull/763) ([onlyjob](https://github.com/onlyjob))
-- build: fix FTBFS with format-hardening \(please review\) [\#761](https://github.com/ZoneMinder/ZoneMinder/pull/761) ([onlyjob](https://github.com/onlyjob))
-- fixing POD errors [\#759](https://github.com/ZoneMinder/ZoneMinder/pull/759) ([onlyjob](https://github.com/onlyjob))
-- Ignore autogenerated files in git [\#746](https://github.com/ZoneMinder/ZoneMinder/pull/746) ([manupap1](https://github.com/manupap1))
-- when auth is needed, try command again before dying. [\#739](https://github.com/ZoneMinder/ZoneMinder/pull/739) ([connortechnology](https://github.com/connortechnology))
-- remove NETPBM dependency from autotools [\#737](https://github.com/ZoneMinder/ZoneMinder/pull/737) ([knnniggett](https://github.com/knnniggett))
-- fix extra slash when adding trackurl to controlurl [\#732](https://github.com/ZoneMinder/ZoneMinder/pull/732) ([connortechnology](https://github.com/connortechnology))
-- Fix image and css import paths for style/skin named "flat" [\#730](https://github.com/ZoneMinder/ZoneMinder/pull/730) ([ljack](https://github.com/ljack))
-- Update control.css [\#729](https://github.com/ZoneMinder/ZoneMinder/pull/729) ([ljack](https://github.com/ljack))
-- Fix event view [\#728](https://github.com/ZoneMinder/ZoneMinder/pull/728) ([connortechnology](https://github.com/connortechnology))
-- User selectable arp tool [\#723](https://github.com/ZoneMinder/ZoneMinder/pull/723) ([knnniggett](https://github.com/knnniggett))
-- remove unneeded files [\#722](https://github.com/ZoneMinder/ZoneMinder/pull/722) ([knnniggett](https://github.com/knnniggett))
-- add onvif ptz control into update script [\#721](https://github.com/ZoneMinder/ZoneMinder/pull/721) ([knnniggett](https://github.com/knnniggett))
-- Don't show ONVIf probe link when ONVIF support is not enabled [\#720](https://github.com/ZoneMinder/ZoneMinder/pull/720) ([knnniggett](https://github.com/knnniggett))
-- Allow zm to build w/o ffmpeg [\#719](https://github.com/ZoneMinder/ZoneMinder/pull/719) ([knnniggett](https://github.com/knnniggett))
-- Removed el6 from endif arguments [\#718](https://github.com/ZoneMinder/ZoneMinder/pull/718) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Update fr\_fr.php [\#714](https://github.com/ZoneMinder/ZoneMinder/pull/714) ([Jypy](https://github.com/Jypy))
-- Check to make sure that skin and css are valid. [\#713](https://github.com/ZoneMinder/ZoneMinder/pull/713) ([connortechnology](https://github.com/connortechnology))
-- Fixes \#710 Added libavformat version check around free context functions [\#711](https://github.com/ZoneMinder/ZoneMinder/pull/711) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- try harder to find arp. [\#709](https://github.com/ZoneMinder/ZoneMinder/pull/709) ([connortechnology](https://github.com/connortechnology))
-- Make el6 and el7 build process a little more automated [\#704](https://github.com/ZoneMinder/ZoneMinder/pull/704) ([clipo1979](https://github.com/clipo1979))
-- small improvements: [\#702](https://github.com/ZoneMinder/ZoneMinder/pull/702) ([connortechnology](https://github.com/connortechnology))
-- Centos 7 rpm packaging [\#700](https://github.com/ZoneMinder/ZoneMinder/pull/700) ([knnniggett](https://github.com/knnniggett))
-- tmpfile.conf for systemd [\#699](https://github.com/ZoneMinder/ZoneMinder/pull/699) ([clipo1979](https://github.com/clipo1979))
-- Improve delete event [\#696](https://github.com/ZoneMinder/ZoneMinder/pull/696) ([connortechnology](https://github.com/connortechnology))
-- process RTSP DESCRIBE response header [\#687](https://github.com/ZoneMinder/ZoneMinder/pull/687) ([knnniggett](https://github.com/knnniggett))
-
-## [v1.28.1](https://github.com/ZoneMinder/ZoneMinder/tree/v1.28.1) (2015-02-05)
-[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.28.0...v1.28.1)
-
-**Merged pull requests:**
-
-- fix content-type parsing when there are options on it [\#692](https://github.com/ZoneMinder/ZoneMinder/pull/692) ([connortechnology](https://github.com/connortechnology))
-- this fixes Digest Auth for the mjpeg stream on a TV-IP302PI [\#691](https://github.com/ZoneMinder/ZoneMinder/pull/691) ([connortechnology](https://github.com/connortechnology))
-- small performance improvement when streaming. [\#675](https://github.com/ZoneMinder/ZoneMinder/pull/675) ([connortechnology](https://github.com/connortechnology))
-- Kill zmcontrol [\#666](https://github.com/ZoneMinder/ZoneMinder/pull/666) ([connortechnology](https://github.com/connortechnology))
-- Don't fail if an unexpected rtp packet type is received [\#665](https://github.com/ZoneMinder/ZoneMinder/pull/665) ([knnniggett](https://github.com/knnniggett))
-- Versions command line args [\#664](https://github.com/ZoneMinder/ZoneMinder/pull/664) ([connortechnology](https://github.com/connortechnology))
-- Update et\_ee.php [\#662](https://github.com/ZoneMinder/ZoneMinder/pull/662) ([hanzese](https://github.com/hanzese))
-- \#658 Fix error message for finding arp path [\#660](https://github.com/ZoneMinder/ZoneMinder/pull/660) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Make the log export use ZM\_PATH\_SWAP and report the full path on error [\#657](https://github.com/ZoneMinder/ZoneMinder/pull/657) ([connortechnology](https://github.com/connortechnology))
-- replace getLoad\(\) / getDiskPercent\(\) with PHP native functions [\#654](https://github.com/ZoneMinder/ZoneMinder/pull/654) ([lifeofguenter](https://github.com/lifeofguenter))
-- Modified zmfilter.pl.in to fix \#652, crashing while processing backgroun... [\#653](https://github.com/ZoneMinder/ZoneMinder/pull/653) ([thebostik](https://github.com/thebostik))
-- Remove no longer needed patch because applied to master [\#651](https://github.com/ZoneMinder/ZoneMinder/pull/651) ([manupap1](https://github.com/manupap1))
-- Don't check for zmdc.pl when stopping via systemd [\#647](https://github.com/ZoneMinder/ZoneMinder/pull/647) ([ariscop](https://github.com/ariscop))
-- Split the debian package into several packages [\#646](https://github.com/ZoneMinder/ZoneMinder/pull/646) ([manupap1](https://github.com/manupap1))
-- Skin css default [\#645](https://github.com/ZoneMinder/ZoneMinder/pull/645) ([connortechnology](https://github.com/connortechnology))
-- Offer login prompt instead of throwing error [\#640](https://github.com/ZoneMinder/ZoneMinder/pull/640) ([jrd288](https://github.com/jrd288))
-- zmfilter: Send message for events that are still ongoing [\#638](https://github.com/ZoneMinder/ZoneMinder/pull/638) ([KristofRobot](https://github.com/KristofRobot))
-- Some fixes to the debian folder [\#636](https://github.com/ZoneMinder/ZoneMinder/pull/636) ([manupap1](https://github.com/manupap1))
-- Improve zmcontrol.pl [\#635](https://github.com/ZoneMinder/ZoneMinder/pull/635) ([connortechnology](https://github.com/connortechnology))
-- Add debconf / dbconfig support to debian8 folder [\#634](https://github.com/ZoneMinder/ZoneMinder/pull/634) ([manupap1](https://github.com/manupap1))
-- better fix for the view=console security flaw. [\#632](https://github.com/ZoneMinder/ZoneMinder/pull/632) ([connortechnology](https://github.com/connortechnology))
-- add check to see if user has rights to view this monitor [\#631](https://github.com/ZoneMinder/ZoneMinder/pull/631) ([connortechnology](https://github.com/connortechnology))
-- fix auth requirement on view=console by checking for user when AUTH is on [\#628](https://github.com/ZoneMinder/ZoneMinder/pull/628) ([connortechnology](https://github.com/connortechnology))
-- Output to stderror when zmu can't read zm.conf [\#627](https://github.com/ZoneMinder/ZoneMinder/pull/627) ([knnniggett](https://github.com/knnniggett))
-- Add missing dependency to policykit-1 [\#621](https://github.com/ZoneMinder/ZoneMinder/pull/621) ([manupap1](https://github.com/manupap1))
-- Replace PHP Short Open Tags - Fixes \#11 [\#620](https://github.com/ZoneMinder/ZoneMinder/pull/620) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Rtsp [\#615](https://github.com/ZoneMinder/ZoneMinder/pull/615) ([knnniggett](https://github.com/knnniggett))
-- Merge flat css to classic [\#614](https://github.com/ZoneMinder/ZoneMinder/pull/614) ([connortechnology](https://github.com/connortechnology))
-- echo the URL to the RTSP device during the OPTIONS directive [\#608](https://github.com/ZoneMinder/ZoneMinder/pull/608) ([knnniggett](https://github.com/knnniggett))
-- Fix some memory leaks in zma [\#607](https://github.com/ZoneMinder/ZoneMinder/pull/607) ([manupap1](https://github.com/manupap1))
-- Fix a mismatched free in zmc binary [\#606](https://github.com/ZoneMinder/ZoneMinder/pull/606) ([manupap1](https://github.com/manupap1))
-- New debian folder for jessie release [\#605](https://github.com/ZoneMinder/ZoneMinder/pull/605) ([manupap1](https://github.com/manupap1))
-- Css skins for classic [\#602](https://github.com/ZoneMinder/ZoneMinder/pull/602) ([connortechnology](https://github.com/connortechnology))
-- Fix package dependency on debian jessie [\#596](https://github.com/ZoneMinder/ZoneMinder/pull/596) ([manupap1](https://github.com/manupap1))
-- updated local\_zoneminder type extension file [\#594](https://github.com/ZoneMinder/ZoneMinder/pull/594) ([ndobbs](https://github.com/ndobbs))
-- Creating options documentation fixes \#568 [\#591](https://github.com/ZoneMinder/ZoneMinder/pull/591) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Convert french lang file to UTF-8 [\#589](https://github.com/ZoneMinder/ZoneMinder/pull/589) ([manupap1](https://github.com/manupap1))
-- Digest auth [\#588](https://github.com/ZoneMinder/ZoneMinder/pull/588) ([connortechnology](https://github.com/connortechnology))
-- Zmupdatefixes [\#584](https://github.com/ZoneMinder/ZoneMinder/pull/584) ([connortechnology](https://github.com/connortechnology))
-- Update et\_ee.php [\#582](https://github.com/ZoneMinder/ZoneMinder/pull/582) ([hanzese](https://github.com/hanzese))
-- Add zmeditconfigdata.sh script to source [\#577](https://github.com/ZoneMinder/ZoneMinder/pull/577) ([knnniggett](https://github.com/knnniggett))
-- Close logger and database on exit [\#575](https://github.com/ZoneMinder/ZoneMinder/pull/575) ([manupap1](https://github.com/manupap1))
-- Fix memory leaks with rtsp and a bug [\#574](https://github.com/ZoneMinder/ZoneMinder/pull/574) ([manupap1](https://github.com/manupap1))
-- Fix a bug when closing RTSP session over TCP [\#573](https://github.com/ZoneMinder/ZoneMinder/pull/573) ([manupap1](https://github.com/manupap1))
-- remove the case for level \>= 2.  Since level is a bool, this code can ne... [\#572](https://github.com/ZoneMinder/ZoneMinder/pull/572) ([connortechnology](https://github.com/connortechnology))
-- Add Control 3S N5071 Dome Ptz Camera [\#570](https://github.com/ZoneMinder/ZoneMinder/pull/570) ([jmcastro2014](https://github.com/jmcastro2014))
-- Add the ability to specify the zm configdir at build time. [\#567](https://github.com/ZoneMinder/ZoneMinder/pull/567) ([knnniggett](https://github.com/knnniggett))
-- Debian package migration to CMake and some improves with lintian help [\#565](https://github.com/ZoneMinder/ZoneMinder/pull/565) ([cosmedd](https://github.com/cosmedd))
-- Use gnutls-openssl instead of gnutls to fix build with CMake. [\#564](https://github.com/ZoneMinder/ZoneMinder/pull/564) ([cosmedd](https://github.com/cosmedd))
-- Use our own SSRC when sending packets on the RTP control stream [\#561](https://github.com/ZoneMinder/ZoneMinder/pull/561) ([manupap1](https://github.com/manupap1))
-- Send keepalive messages if the rtsp server supports this feature [\#560](https://github.com/ZoneMinder/ZoneMinder/pull/560) ([manupap1](https://github.com/manupap1))
-- Fixed bug in rtsp streaming caused by a bad string concatenation [\#557](https://github.com/ZoneMinder/ZoneMinder/pull/557) ([manupap1](https://github.com/manupap1))
-- Add a stringVector join function for future use [\#556](https://github.com/ZoneMinder/ZoneMinder/pull/556) ([connortechnology](https://github.com/connortechnology))
-- Fixed bug in rtsp streaming caused by a signed - unsigned conversion. [\#555](https://github.com/ZoneMinder/ZoneMinder/pull/555) ([manupap1](https://github.com/manupap1))
-- Update Ubuntu install instructions [\#550](https://github.com/ZoneMinder/ZoneMinder/pull/550) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Ignore more files and initial travis framework [\#544](https://github.com/ZoneMinder/ZoneMinder/pull/544) ([kylejohnson](https://github.com/kylejohnson))
-- Update Travis to ffmpeg 2.4.2 [\#539](https://github.com/ZoneMinder/ZoneMinder/pull/539) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Add libvlc to Travis [\#535](https://github.com/ZoneMinder/ZoneMinder/pull/535) ([knnniggett](https://github.com/knnniggett))
-- 351-Rebase Attempt for ffmpeg stability fixes [\#531](https://github.com/ZoneMinder/ZoneMinder/pull/531) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- 478 Basic ONVIF Support [\#479](https://github.com/ZoneMinder/ZoneMinder/pull/479) ([altaroca](https://github.com/altaroca))
-
-## [v1.28.0](https://github.com/ZoneMinder/ZoneMinder/tree/v1.28.0) (2014-10-18)
-[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.27.0...v1.28.0)
-
-**Merged pull requests:**
-
-- fixes ftbs with no ffmpeg support [\#530](https://github.com/ZoneMinder/ZoneMinder/pull/530) ([knnniggett](https://github.com/knnniggett))
-- 498-Docker-Container-Broken [\#527](https://github.com/ZoneMinder/ZoneMinder/pull/527) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Changes to handling of tmpdir & related variables [\#524](https://github.com/ZoneMinder/ZoneMinder/pull/524) ([knnniggett](https://github.com/knnniggett))
-- Fixes 520 travis build ffmpeg failure [\#521](https://github.com/ZoneMinder/ZoneMinder/pull/521) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- full systemd support [\#502](https://github.com/ZoneMinder/ZoneMinder/pull/502) ([knnniggett](https://github.com/knnniggett))
-- Minor corrections to README.OpenSuse [\#501](https://github.com/ZoneMinder/ZoneMinder/pull/501) ([PX03AFK](https://github.com/PX03AFK))
-- Allow use other webservers than apache. [\#493](https://github.com/ZoneMinder/ZoneMinder/pull/493) ([cosmedd](https://github.com/cosmedd))
-- Initial attempt to migrate wiki to readthedocs \#434 [\#492](https://github.com/ZoneMinder/ZoneMinder/pull/492) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Update FI9821W\_Y2k.pm [\#485](https://github.com/ZoneMinder/ZoneMinder/pull/485) ([florian-asche](https://github.com/florian-asche))
-- V4l to monitor [\#480](https://github.com/ZoneMinder/ZoneMinder/pull/480) ([connortechnology](https://github.com/connortechnology))
-- Modified zmlinkcontent to chown and chmod content folder. Fixes \#463 [\#465](https://github.com/ZoneMinder/ZoneMinder/pull/465) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Fix for shared data size conflict [\#462](https://github.com/ZoneMinder/ZoneMinder/pull/462) ([knnniggett](https://github.com/knnniggett))
-- Update rules [\#459](https://github.com/ZoneMinder/ZoneMinder/pull/459) ([whopperg](https://github.com/whopperg))
-- Determine full path to arp [\#458](https://github.com/ZoneMinder/ZoneMinder/pull/458) ([knnniggett](https://github.com/knnniggett))
-- Fixes errors when opening Filters \(issue \#34\) [\#457](https://github.com/ZoneMinder/ZoneMinder/pull/457) ([knnniggett](https://github.com/knnniggett))
-- Fixed missing $ on ARRAY\(event\[id\]\). Fixes \#455 [\#456](https://github.com/ZoneMinder/ZoneMinder/pull/456) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- Wrap sort order. Fixes \#450 [\#451](https://github.com/ZoneMinder/ZoneMinder/pull/451) ([SteveGilvarry](https://github.com/SteveGilvarry))
-- scripts: BusyBox compatibility [\#445](https://github.com/ZoneMinder/ZoneMinder/pull/445) ([clandmeter](https://github.com/clandmeter))
-- Fixed issue DateTime handling in filter queries that broke timeline view... [\#442](https://github.com/ZoneMinder/ZoneMinder/pull/442) ([Tim-Craig](https://github.com/Tim-Craig))
-- Cleaning up the Contribution section of the README [\#440](https://github.com/ZoneMinder/ZoneMinder/pull/440) ([kylejohnson](https://github.com/kylejohnson))
-- Add Bountysource badge to README [\#438](https://github.com/ZoneMinder/ZoneMinder/pull/438) ([bountysource-support](https://github.com/bountysource-support))
-- Add new colums to zm\_create.sql.in [\#426](https://github.com/ZoneMinder/ZoneMinder/pull/426) ([m-bene](https://github.com/m-bene))
-- Ffmpegoptions [\#421](https://github.com/ZoneMinder/ZoneMinder/pull/421) ([m-bene](https://github.com/m-bene))
-- Update zm\_jpeg.cpp [\#418](https://github.com/ZoneMinder/ZoneMinder/pull/418) ([ghost](https://github.com/ghost))
-- Added an FAQ for AlarmCheckMethod [\#416](https://github.com/ZoneMinder/ZoneMinder/pull/416) ([kylejohnson](https://github.com/kylejohnson))
-- make skin selection persistent [\#415](https://github.com/ZoneMinder/ZoneMinder/pull/415) ([m-bene](https://github.com/m-bene))
-- Added a doc for contributing to the project [\#413](https://github.com/ZoneMinder/ZoneMinder/pull/413) ([kylejohnson](https://github.com/kylejohnson))
-- Update zmtrigger.pl.in [\#411](https://github.com/ZoneMinder/ZoneMinder/pull/411) ([martin67](https://github.com/martin67))
-- Add the web/api folder to cmake [\#409](https://github.com/ZoneMinder/ZoneMinder/pull/409) ([mastertheknife](https://github.com/mastertheknife))
-- Move API to under web dir [\#408](https://github.com/ZoneMinder/ZoneMinder/pull/408) ([kylejohnson](https://github.com/kylejohnson))
-- Rtsp digest [\#407](https://github.com/ZoneMinder/ZoneMinder/pull/407) ([m-bene](https://github.com/m-bene))
-- focus popup windows [\#406](https://github.com/ZoneMinder/ZoneMinder/pull/406) ([m-bene](https://github.com/m-bene))
-- remove call of undefined "fixDevices" function [\#405](https://github.com/ZoneMinder/ZoneMinder/pull/405) ([m-bene](https://github.com/m-bene))
-- Zms/videostream improvements [\#404](https://github.com/ZoneMinder/ZoneMinder/pull/404) ([Sune1337](https://github.com/Sune1337))
-- RESTful API in CakePHP, and docs [\#403](https://github.com/ZoneMinder/ZoneMinder/pull/403) ([kylejohnson](https://github.com/kylejohnson))
-- Remove SVN install from Travis CI [\#395](https://github.com/ZoneMinder/ZoneMinder/pull/395) ([hamiltont](https://github.com/hamiltont))
-- Remove Subversion from prerequesite lists [\#393](https://github.com/ZoneMinder/ZoneMinder/pull/393) ([hamiltont](https://github.com/hamiltont))
-- Dockerfile works properly, documentation updated [\#392](https://github.com/ZoneMinder/ZoneMinder/pull/392) ([hamiltont](https://github.com/hamiltont))
-- Remove apt-get upgrade [\#390](https://github.com/ZoneMinder/ZoneMinder/pull/390) ([hamiltont](https://github.com/hamiltont))
-- Update README.OpenSuse [\#389](https://github.com/ZoneMinder/ZoneMinder/pull/389) ([PX03AFK](https://github.com/PX03AFK))
-- Update CMakeLists.txt [\#388](https://github.com/ZoneMinder/ZoneMinder/pull/388) ([PX03AFK](https://github.com/PX03AFK))
-- Update zoneminder.cmake.OS13.spec - minor corrections [\#387](https://github.com/ZoneMinder/ZoneMinder/pull/387) ([PX03AFK](https://github.com/PX03AFK))
-- fix sql error which prevents remote login from working [\#385](https://github.com/ZoneMinder/ZoneMinder/pull/385) ([maciekczwa](https://github.com/maciekczwa))
-- Fix window sizes and input field sizes for flat skin [\#381](https://github.com/ZoneMinder/ZoneMinder/pull/381) ([m-bene](https://github.com/m-bene))
-- Fix reload loop on switching skins [\#380](https://github.com/ZoneMinder/ZoneMinder/pull/380) ([m-bene](https://github.com/m-bene))
-- Ability to skip frames in motion detection. [\#377](https://github.com/ZoneMinder/ZoneMinder/pull/377) ([Sune1337](https://github.com/Sune1337))
-- same dvr controls in event as in monitor [\#375](https://github.com/ZoneMinder/ZoneMinder/pull/375) ([m-bene](https://github.com/m-bene))
-- do not quote column names in parse filter [\#374](https://github.com/ZoneMinder/ZoneMinder/pull/374) ([m-bene](https://github.com/m-bene))
-- Fix 'Undefined index: filter' php warnings for filter view when [\#373](https://github.com/ZoneMinder/ZoneMinder/pull/373) ([m-bene](https://github.com/m-bene))
-- Reduce window size to exclude task bar area [\#371](https://github.com/ZoneMinder/ZoneMinder/pull/371) ([m-bene](https://github.com/m-bene))
-- Update zoneminder.tmpfiles [\#367](https://github.com/ZoneMinder/ZoneMinder/pull/367) ([PX03AFK](https://github.com/PX03AFK))
-- Update zoneminder.cmake.OS13.spec [\#362](https://github.com/ZoneMinder/ZoneMinder/pull/362) ([PX03AFK](https://github.com/PX03AFK))
-- Update README.OpenSuse [\#361](https://github.com/ZoneMinder/ZoneMinder/pull/361) ([PX03AFK](https://github.com/PX03AFK))
-- fix eyezm authentication issue [\#359](https://github.com/ZoneMinder/ZoneMinder/pull/359) ([knnniggett](https://github.com/knnniggett))
-- Fix prev button while in gapless mode.  All buttons tested and working. [\#358](https://github.com/ZoneMinder/ZoneMinder/pull/358) ([knnniggett](https://github.com/knnniggett))
-- Update zmupdate.pl.in [\#353](https://github.com/ZoneMinder/ZoneMinder/pull/353) ([barjac](https://github.com/barjac))
-- make curl header check case insensitive [\#352](https://github.com/ZoneMinder/ZoneMinder/pull/352) ([m-bene](https://github.com/m-bene))
-- tie distro/opensuse folder into cmake build process [\#349](https://github.com/ZoneMinder/ZoneMinder/pull/349) ([knnniggett](https://github.com/knnniggett))
-- Initial upload for opensuse rpm [\#348](https://github.com/ZoneMinder/ZoneMinder/pull/348) ([PX03AFK](https://github.com/PX03AFK))
-- Patch for Debian bug 736516 - FTBFS on powerpc arch. [\#346](https://github.com/ZoneMinder/ZoneMinder/pull/346) ([knnniggett](https://github.com/knnniggett))
-- Nagyrobi [\#342](https://github.com/ZoneMinder/ZoneMinder/pull/342) ([knnniggett](https://github.com/knnniggett))
-- add feature to extend preclusive zone alarm state by x frames [\#338](https://github.com/ZoneMinder/ZoneMinder/pull/338) ([m-bene](https://github.com/m-bene))
-- Support building with new libavcodec versions. [\#325](https://github.com/ZoneMinder/ZoneMinder/pull/325) ([elenril](https://github.com/elenril))
-- Mysql2 pdo [\#231](https://github.com/ZoneMinder/ZoneMinder/pull/231) ([connortechnology](https://github.com/connortechnology))
-
-## [v1.27.0](https://github.com/ZoneMinder/ZoneMinder/tree/v1.27.0) (2014-03-15)
-[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26.5...v1.27.0)
-
-**Merged pull requests:**
-
-- zmcamtool.pl - import and export ptz camera controls & camera presets [\#318](https://github.com/ZoneMinder/ZoneMinder/pull/318) ([kylejohnson](https://github.com/kylejohnson))
-- Example script to react to monitor alarms [\#317](https://github.com/ZoneMinder/ZoneMinder/pull/317) ([kylejohnson](https://github.com/kylejohnson))
-- Change comments for many Camera subclasses [\#316](https://github.com/ZoneMinder/ZoneMinder/pull/316) ([nereocystis](https://github.com/nereocystis))
-- Enable universe in the Docker container \[ci skip\] [\#310](https://github.com/ZoneMinder/ZoneMinder/pull/310) ([kylejohnson](https://github.com/kylejohnson))
-- Add wget to Dockerfile prereq [\#309](https://github.com/ZoneMinder/ZoneMinder/pull/309) ([kylejohnson](https://github.com/kylejohnson))
-- Add paths to flat skin in configure.ac and Makefile.am [\#308](https://github.com/ZoneMinder/ZoneMinder/pull/308) ([kylejohnson](https://github.com/kylejohnson))
-- Zoneminder - flat theme. [\#303](https://github.com/ZoneMinder/ZoneMinder/pull/303) ([justinlawrence](https://github.com/justinlawrence))
-- Additional compile guards to allow compilation on non-x86 archs [\#302](https://github.com/ZoneMinder/ZoneMinder/pull/302) ([pjhacnau](https://github.com/pjhacnau))
-- Adding PTZ module for Toshiba IK-WB11A [\#300](https://github.com/ZoneMinder/ZoneMinder/pull/300) ([Tim-Craig](https://github.com/Tim-Craig))
-- Add cURL source type [\#297](https://github.com/ZoneMinder/ZoneMinder/pull/297) ([mastertheknife](https://github.com/mastertheknife))
-- glob ptz scripts under control folder [\#294](https://github.com/ZoneMinder/ZoneMinder/pull/294) ([knnniggett](https://github.com/knnniggett))
-- Enclose value of the Notes attribute with quotes. [\#293](https://github.com/ZoneMinder/ZoneMinder/pull/293) ([hankintosh](https://github.com/hankintosh))
-- Fix for few problems in Debian packaging [\#290](https://github.com/ZoneMinder/ZoneMinder/pull/290) ([dmak](https://github.com/dmak))
-- Foscam IP cameras control script [\#289](https://github.com/ZoneMinder/ZoneMinder/pull/289) ([dmak](https://github.com/dmak))
-- Specfile changes related to zmfix [\#284](https://github.com/ZoneMinder/ZoneMinder/pull/284) ([knnniggett](https://github.com/knnniggett))
-- Remove references to zmfix in /distros [\#283](https://github.com/ZoneMinder/ZoneMinder/pull/283) ([nkwood](https://github.com/nkwood))
-- Add zmMontageScale so montage scale is also 'saved' [\#282](https://github.com/ZoneMinder/ZoneMinder/pull/282) ([scottgrobinson](https://github.com/scottgrobinson))
-- In the web/includes/functions.php there were some html formatting errors... [\#281](https://github.com/ZoneMinder/ZoneMinder/pull/281) ([martonmiklos](https://github.com/martonmiklos))
-- Remove zmfix [\#280](https://github.com/ZoneMinder/ZoneMinder/pull/280) ([mastertheknife](https://github.com/mastertheknife))
-- Add libVLC monitor type [\#277](https://github.com/ZoneMinder/ZoneMinder/pull/277) ([ebarnard](https://github.com/ebarnard))
-- Disables non-POSIX warning when using gnu wildcard [\#276](https://github.com/ZoneMinder/ZoneMinder/pull/276) ([knnniggett](https://github.com/knnniggett))
-- remove embedded jquery. \(fixes \#274\) [\#275](https://github.com/ZoneMinder/ZoneMinder/pull/275) ([kylejohnson](https://github.com/kylejohnson))
-- Fixes \#313, initial commit of 'working' dockerfile [\#314](https://github.com/ZoneMinder/ZoneMinder/pull/314) ([kylejohnson](https://github.com/kylejohnson))
-
-## [v1.26.5](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26.5) (2013-12-16)
-[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26.4...v1.26.5)
-
-**Merged pull requests:**
-
-- Add reference to zm\_update-1.26.5.sql in Makefile.am [\#269](https://github.com/ZoneMinder/ZoneMinder/pull/269) ([knnniggett](https://github.com/knnniggett))
-- Detection Support for WansView Cams [\#268](https://github.com/ZoneMinder/ZoneMinder/pull/268) ([Phhere](https://github.com/Phhere))
-- use proper DBI parameter passing to improve security [\#264](https://github.com/ZoneMinder/ZoneMinder/pull/264) ([connortechnology](https://github.com/connortechnology))
-- Fix RTSP decoding errors in 1.26.4 \(addresses \#221\) [\#259](https://github.com/ZoneMinder/ZoneMinder/pull/259) ([ebarnard](https://github.com/ebarnard))
-- Network Detection Support for Wansview [\#257](https://github.com/ZoneMinder/ZoneMinder/pull/257) ([Phhere](https://github.com/Phhere))
-- Fix checkJsonError messages [\#256](https://github.com/ZoneMinder/ZoneMinder/pull/256) ([Phhere](https://github.com/Phhere))
-- Update README.md [\#255](https://github.com/ZoneMinder/ZoneMinder/pull/255) ([zdanek](https://github.com/zdanek))
-- ipv6 support [\#252](https://github.com/ZoneMinder/ZoneMinder/pull/252) ([guotie](https://github.com/guotie))
-- Better inno d bupdate [\#251](https://github.com/ZoneMinder/ZoneMinder/pull/251) ([connortechnology](https://github.com/connortechnology))
-- Fix shared memory errors on centos 6.4 [\#250](https://github.com/ZoneMinder/ZoneMinder/pull/250) ([insidenothing](https://github.com/insidenothing))
-- Update zoneminder.service [\#246](https://github.com/ZoneMinder/ZoneMinder/pull/246) ([dtmf](https://github.com/dtmf))
-- remove extra stuff that I don't think we need because we are the source.  Opinions? [\#240](https://github.com/ZoneMinder/ZoneMinder/pull/240) ([connortechnology](https://github.com/connortechnology))
-- Cast content\_length to signed int for error-check comparison [\#232](https://github.com/ZoneMinder/ZoneMinder/pull/232) ([josephevans](https://github.com/josephevans))
-- Apply INSERTs in Event::AddFrames in batches to fix issue \#222 [\#223](https://github.com/ZoneMinder/ZoneMinder/pull/223) ([fastolfe](https://github.com/fastolfe))
-- ffmpeg detection improvements [\#218](https://github.com/ZoneMinder/ZoneMinder/pull/218) ([mastertheknife](https://github.com/mastertheknife))
-- ZoneMinder Dutch Translation updates by Alco \(a.k. nightcrawler\) [\#211](https://github.com/ZoneMinder/ZoneMinder/pull/211) ([kylejohnson](https://github.com/kylejohnson))
-- Change Prev Button functionality [\#207](https://github.com/ZoneMinder/ZoneMinder/pull/207) ([knnniggett](https://github.com/knnniggett))
-- Delete PATH\_BUILD and TIME\_BUILD from zm.conf and fix ZM\_DB\_TYPE [\#243](https://github.com/ZoneMinder/ZoneMinder/pull/243) ([mastertheknife](https://github.com/mastertheknife))
-- Removeversionnumberfromzm.conf [\#242](https://github.com/ZoneMinder/ZoneMinder/pull/242) ([connortechnology](https://github.com/connortechnology))
-- Add alarm reference image blend percentage option and replace the text field if fast blends are enabled [\#241](https://github.com/ZoneMinder/ZoneMinder/pull/241) ([mastertheknife](https://github.com/mastertheknife))
-- Fix marker-out-of-bounds crash when defining zone points [\#233](https://github.com/ZoneMinder/ZoneMinder/pull/233) ([fastolfe](https://github.com/fastolfe))
-
-## [v1.26.4](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26.4) (2013-10-08)
-[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26.3...v1.26.4)
-
-**Merged pull requests:**
-
-- Change frameserver warnings to debug level 2 [\#205](https://github.com/ZoneMinder/ZoneMinder/pull/205) ([knnniggett](https://github.com/knnniggett))
-- Create pkgdatadir in make [\#203](https://github.com/ZoneMinder/ZoneMinder/pull/203) ([knnniggett](https://github.com/knnniggett))
-- Signal improvements and fixes [\#201](https://github.com/ZoneMinder/ZoneMinder/pull/201) ([mastertheknife](https://github.com/mastertheknife))
-- Create ZM\_PATH\_DATA and point zmupdate to ZM\_PATH\_DATA/db [\#200](https://github.com/ZoneMinder/ZoneMinder/pull/200) ([knnniggett](https://github.com/knnniggett))
-- remove ${CMAKE\_CURRENT\_SOURCE\_DIR} from add\_custom\_target [\#199](https://github.com/ZoneMinder/ZoneMinder/pull/199) ([knnniggett](https://github.com/knnniggett))
-- Added missing word in readme [\#194](https://github.com/ZoneMinder/ZoneMinder/pull/194) ([WDKevin](https://github.com/WDKevin))
-- Add cmake to ZoneMinder [\#178](https://github.com/ZoneMinder/ZoneMinder/pull/178) ([mastertheknife](https://github.com/mastertheknife))
-- Rtsp updates [\#174](https://github.com/ZoneMinder/ZoneMinder/pull/174) ([POKKAHOH](https://github.com/POKKAHOH))
-- Solution for Issue \#170 [\#172](https://github.com/ZoneMinder/ZoneMinder/pull/172) ([raulcaj](https://github.com/raulcaj))
-- Fixing debian build files including automated database setup [\#164](https://github.com/ZoneMinder/ZoneMinder/pull/164) ([jaydio](https://github.com/jaydio))
-- Add fedora rpm development files to zoneminder source tree [\#163](https://github.com/ZoneMinder/ZoneMinder/pull/163) ([knnniggett](https://github.com/knnniggett))
-- Improve Chrome browser support & log streaming events [\#162](https://github.com/ZoneMinder/ZoneMinder/pull/162) ([knnniggett](https://github.com/knnniggett))
-- Can't seem to catch a break tonight.  Moving debian files into correct folder [\#149](https://github.com/ZoneMinder/ZoneMinder/pull/149) ([knnniggett](https://github.com/knnniggett))
-- Move debian folder under distros [\#148](https://github.com/ZoneMinder/ZoneMinder/pull/148) ([knnniggett](https://github.com/knnniggett))
-- Removing the redhat folder from the root for real this time [\#141](https://github.com/ZoneMinder/ZoneMinder/pull/141) ([knnniggett](https://github.com/knnniggett))
-- Redhat [\#136](https://github.com/ZoneMinder/ZoneMinder/pull/136) ([knnniggett](https://github.com/knnniggett))
-- Error correction in database creation script [\#122](https://github.com/ZoneMinder/ZoneMinder/pull/122) ([dukess](https://github.com/dukess))
-- Rewritten the query to allow mysql to use indexes [\#121](https://github.com/ZoneMinder/ZoneMinder/pull/121) ([rkojedzinszky](https://github.com/rkojedzinszky))
-- Update zmupdate.pl.in for 1.26.3 release [\#119](https://github.com/ZoneMinder/ZoneMinder/pull/119) ([knnniggett](https://github.com/knnniggett))
-
-## [v1.26.3](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26.3) (2013-09-10)
-[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26.2...v1.26.3)
-
-**Merged pull requests:**
-
-- Add 1.26.1 and 1.26.2 releases to zmupdate [\#116](https://github.com/ZoneMinder/ZoneMinder/pull/116) ([knnniggett](https://github.com/knnniggett))
-
-## [v1.26.2](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26.2) (2013-09-06)
-[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26.1...v1.26.2)
-
-**Merged pull requests:**
-
-- Use GitHub repo for version check [\#111](https://github.com/ZoneMinder/ZoneMinder/pull/111) ([chriswiggins](https://github.com/chriswiggins))
-
-## [v1.26.1](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26.1) (2013-09-06)
-[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26.0...v1.26.1)
-
-## [v1.26.0](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26.0) (2013-09-05)
-[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26-beta.3...v1.26.0)
-
-## [v1.26-beta.3](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26-beta.3) (2013-08-28)
-[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26-beta.2...v1.26-beta.3)
-
-## [v1.26-beta.2](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26-beta.2) (2013-08-15)
-[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.26-beta.1...v1.26-beta.2)
-
-## [v1.26-beta.1](https://github.com/ZoneMinder/ZoneMinder/tree/v1.26-beta.1) (2013-08-13)
-[Full Changelog](https://github.com/ZoneMinder/ZoneMinder/compare/v1.25...v1.26-beta.1)
-
-## [v1.25](https://github.com/ZoneMinder/ZoneMinder/tree/v1.25) (2013-04-12)
-
-
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

CONTRIBUTING.md

@@ -1,17 +0,0 @@
-# Contributing
-
-The ZoneMinder project was originally written by Philip Coombes in 2001. It has since moved to Github and is maintained by just a few who volunteer their spare time.  
-
-Over the years, ZoneMinder has accumulated a rather large user base. This presents a challenge to the development team when it comes to managing communications. Welcome to the world of software development, right?
-
-In order to keep the kinds of issues, which require changes to the source code, separate from all other questions and comments, our methods of communication are organized in the following manner:
-
-- The ZoneMinder Github forum is intended for bug reports and serious feature requests only
-- The ZoneMinder user forum is intended for general questions and tech support
-- The ZoneMinder IRC channel is intended for general questions and tech support
-
-More details can be found in our [Github Posting Rules](https://github.com/ZoneMinder/ZoneMinder/wiki/Github-Posting-Rules). Please read this before creating an issue in our Github forum.
-
-Knowledge of Github is a necessary first step to contribute to the project. To contribute, one must generate a pull request. For those just starting out, [this guide](https://github.com/ZoneMinder/ZoneMinder/wiki/Understanding-Github-and-Pull-Requests) will step you through the process. 
-
-Note that pasting code into our Github forum, with the expectation we will do the work for you, is not acceptable.

COPYING

@@ -1,12 +1,12 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-                            Preamble
+			    Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+the GNU Library General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
+
+		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-                            NO WARRANTY
+			    NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -303,16 +303,17 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision version 69, Copyright (C) year  name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -335,5 +336,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
+library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.

ChangeLog

@@ -0,0 +1 @@
+This is too hard to maintain.  See https://github.com/ZoneMinder/ZoneMinder/commits/master

Dockerfile

@@ -0,0 +1,56 @@
+# ZoneMinder
+
+FROM ubuntu:precise
+MAINTAINER Kyle Johnson <kjohnson@gnulnx.net>
+
+# Let the container know that there is no tty
+ENV DEBIAN_FRONTEND noninteractive
+
+# Resynchronize the package index files 
+RUN apt-get update && apt-get install -y \
+	libpolkit-gobject-1-dev build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev \
+	libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 \
+	libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf libjpeg-turbo8-dev \
+	libjpeg-turbo8 libtheora-dev libvorbis-dev libvpx-dev libx264-dev libmp4v2-dev ffmpeg mysql-client \
+	apache2 php5 php5-mysql apache2-mpm-prefork libapache2-mod-php5 php5-cli openssh-server \
+	mysql-server libvlc-dev libvlc5 libvlccore-dev libvlccore5 vlc-data vlc libcurl4-openssl-dev
+
+# Copy local code into our container
+ADD . /ZoneMinder
+
+# Change into the ZoneMinder directory
+WORKDIR /ZoneMinder
+
+# Setup the ZoneMinder build environment
+RUN aclocal && autoheader && automake --force-missing --add-missing && autoconf
+
+# Configure ZoneMinder
+RUN ./configure --with-libarch=lib/$DEB_HOST_GNU_TYPE --disable-debug --host=$DEB_HOST_GNU_TYPE --build=$DEB_BUILD_GNU_TYPE --with-mysql=/usr  --with-webdir=/var/www/zm --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-mmap=yes ZM_SSL_LIB=openssl ZM_DB_USER=zm ZM_DB_PASS=zm
+
+# Build ZoneMinder
+RUN make
+
+# Install ZoneMinder
+RUN make install
+
+# Adding the start script
+ADD utils/docker/start.sh /tmp/start.sh
+
+# Ensure we can run this
+# TODO - Files ADD'ed have 755 already...why do we need this?
+RUN chmod 755 /tmp/start.sh
+
+# Creating SSH privledge escalation dir
+RUN mkdir /var/run/sshd
+
+# Adding apache virtual hosts file
+ADD utils/docker/apache-vhost /etc/apache2/sites-enabled/000-default
+
+# Set the root passwd
+RUN echo 'root:root' | chpasswd
+
+# Expose ssh and http ports
+EXPOSE 80
+EXPOSE 22
+
+CMD "/tmp/start.sh"

INSTALL

@@ -0,0 +1,121 @@
+Installing ZoneMinder with cmake
+--------------------------------
+Starting with ZoneMinder 1.26.4, ZoneMinder can now be installed using cmake. This requires cmake version 2.6 or newer.
+cmake is an alternative to the autotools collection (libtool, autoconf, automake, autoheader and such). Its more recent and has many advantages, including, but not limited to:
+* One program (cmake) instead of multiple. (libtool, autoconf, automake, etc)
+* One file per directory (CMakeLists.txt) instead of multiple. (configure.ac, Makefile.am and sometimes more)
+* One syntax (cmake's syntax) instead of multiple. (bash and m4)
+* Generation of makefiles for many platforms, including Windows.
+* Newer than autotools and is being actively developed.
+* Generates colored makefiles with progress indicator.
+* Slightly faster because its based on C and not bash.
+* Lots of documentation, unlike autotools: http://www.cmake.org/cmake/help/cmake2.6docs.html
+
+At this point, its still possible to use autotools for the ZoneMinder project. Choosing cmake or autotools is now a matter of preference.
+Hopefully in the future, cmake will become the default way to install ZoneMinder.
+
+Important differences
+---------------------
+* Unlike the autotools way, the cmake way does not require any options. It attempts to detect some things by its own (system directories, libarch, web user and group) and uses defaults for others (installation paths and such).
+* Unlike the autotools way, which links the binaries to a fixed list of libraries, the cmake way only links to libraries that it found on the system. If a library is not found, but required, a fatal error will be shown during the configuration step.
+* Unlike the autotools way, the cmake way does not modify the system in any way it shouldnt. It only does what its supposed to do: Install files to your system. Nothing else and nothing leaks out of the DESTDIR environment variable (if used). This means that depending on your configuration, there might be an extra required step after installation: to link WEB_PATH/events and WEB_PATH/images folders to the correct places.
+
+Configuration
+-------------
+cmake by default does not require any parameters, but its possible to override the defaults with the options below.
+
+Configuration can be done in 4 ways:
+1) As a command line parameter, e.g. cmake -DCMAKE_VERBOSE_MAKEFILE=ON .
+2) Using cmake-gui
+4) Providing cmake with an initial cache file with the -C option
+4) By editing the cache file CMakeCache.txt (after it has been generated) - Not recommended
+
+Possible configuration options: 
+	ZM_RUNDIR		Location of transient process files, default: /var/run/zm
+	ZM_TMPDIR		Location of temporary files, default: /tmp/zm
+	ZM_LOGDIR 		Location of generated log files, default: /var/log/zm
+	ZM_WEBDIR		Location of the web files, default: <prefix>/share/zoneminder/www
+	ZM_CGIDIR		Location of the cgi-bin files, default: <prefix>/libexec/zoneminder/cgi-bin
+	ZM_CONTENTDIR		Location of dynamic content (events and images), default: /var/lib/zoneminder
+	ZM_DB_HOST		Hostname where ZoneMinder database located, default: localhost
+	ZM_DB_NAME		Name of ZoneMinder database, default: zm
+	ZM_DB_USER		Name of ZoneMinder database user, default: zmuser
+	ZM_DB_PASS		Password of ZoneMinder database user, default: zmpass
+	ZM_WEB_USER		The user apache or the local web server runs on. Leave empty for automatic detection. If that fails, you can use this variable to force
+	ZM_WEB_GROUP		The group apache or the local web server runs on, Leave empty to be the same as the web user
+Advanced:
+	ZM_EXTRA_LIBS		A list of optional libraries, separated by semicolons, e.g. ssl;theora
+	ZM_MYSQL_ENGINE		MySQL engine to use with database, default: InnoDB
+	ZM_NO_MMAP		Set to ON to not use mmap shared memory. Shouldn't be enabled unless you experience problems with the shared memory. default: OFF
+	ZM_NO_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_SUBPREFIX	Use a different directory for the zm perl modules. NOTE: This is a subprefix, e.g. lib will be turned into <prefix>/lib, default: <libarch>/perl5
+	ZM_PERL_USE_PATH	Override the include path for zm perl modules. Useful if you are moving the perl modules without using the ZM_PERL_SUBPREFIX option. default: <prefix>/<zmperlsubprefix>
+
+
+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" .
+2) Run "make" to compile ZoneMinder
+3) Run "make install" (as root, or use sudo) to install ZoneMinder to your system.
+4) Create a directory for the content and the necessary symlinks by running zmlinkcontent.sh with the directory you want to use. e.g. ./zmlinkcontent.sh /nfs/zm
+5) Create a database for zoneminder, called "zm".
+6) Create a user for the zoneminder database, called zmuser with password and full privileges to the "zm" database.
+NOTE: The database server, database name, user and password can be different and adjusted during configuration step with the options in this file, or by editing /etc/zm.conf
+7) Populate the zoneminder database using the script zm_create.sql. This should be found in <prefix>/share/zoneminder/db or in the project/db directory.
+
+8) Create an apache virtual host for ZoneMinder. Make sure to use the same paths as ZM_WEBDIR and ZM_CGIDIR in /etc/zm.conf
+9) Create other config if desired (e.g. rsyslog, logrotate and such). Some of this can be found in <prefix>/share/zoneminder/misc or project/misc directory
+10) Setup an init script for your system. Its also possible to use "zmpkg.pl start" and "zmpkg.pl stop" if you can't find a one.
+
+Basic steps for upgrading ZoneMinder
+------------------------------------
+1) If you wish to use the same paths and configuration as the currently installed ZoneMinder, you need to provide cmake with options that match your current installation.
+You can provide those options in the command line to cmake, e.g. cmake -DZM_DB_PASS="blah" -DZM_WEBDIR="/usr/local/share/zoneminder/www" -DCMAKE_INSTALL_FULL_BINDIR="/usr/bin" .
+Or alternatively, for convenience, use the cmakecacheimport.sh script. This reads a zoneminder configuration file (zm.conf) and creates a cmake initial cache file called zm_conf.cmake, which you can then provide to cmake.
+For example:
+./cmakecacheimport.sh /etc/zm.conf
+cmake -C zm_conf.cmake [extra options] .
+
+2) Run "make" to compile ZoneMinder
+3) Run "make install" (as root, or use sudo) to install ZoneMinder to your system.
+4) Depending on your configuration: If the DIR_EVENTS and DIR_IMAGES options are set to default (pointing to web directory/events and web directory/images), You will need to update the symlinks in the web directory to the correct folders. e.g. web directory/events should point to the real events directory, and likewise for the images directory.
+You can use the zmlinkcontent.sh script for this. For example, if /var/lib/zoneminder is the folder that contains the "images" and "events" directories, you can use:
+./zmlinkcontent.sh /var/lib/zoneminder
+By default, the content directory for new installations is /var/lib/zoneminder. This can be overridden in cmake with the ZM_CONTENTDIR option. e.g. cmake -DZM_CONTENTDIR="/some/big/storage/zm" .
+
+5) Run zmupdate.pl to update the database layout to the new version.
+
+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
+
+

Makefile.am

@@ -0,0 +1,33 @@
+AUTOMAKE_OPTIONS = foreign
+
+# And these to the user and group of your webserver
+webuser = @WEB_USER@
+webgroup = @WEB_GROUP@
+
+sysconf_DATA = \
+	zm.conf
+
+SUBDIRS = \
+	src \
+	web \
+	scripts \
+	db \
+	misc
+
+EXTRA_DIST = \
+	zm.conf.in \
+	zmconfgen.pl.in
+
+# Yes, you are correct. This is a HACK!
+install-data-hook:
+	( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )
+	( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir -p $(DESTDIR)$(ZM_RUNDIR); fi; if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_RUNDIR); chmod u+w $(DESTDIR)$(ZM_RUNDIR); fi )
+	( if ! test -e $(DESTDIR)$(ZM_SOCKDIR); then mkdir -p $(DESTDIR)$(ZM_SOCKDIR); fi; if test "$(DESTDIR)$(ZM_SOCKDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_SOCKDIR); chmod u+w $(DESTDIR)$(ZM_SOCKDIR); fi )
+	( if ! test -e $(DESTDIR)$(ZM_TMPDIR); then mkdir -m 700 -p $(DESTDIR)$(ZM_TMPDIR); fi; if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp" && test "$(DESTDIR)$(ZM_TMPDIR)" != "/var/tmp"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_TMPDIR); chmod u+w $(DESTDIR)$(ZM_TMPDIR); fi )
+
+uninstall-hook:
+	@-( cd $(DESTDIR)$(webdir); rm -rf events graphics images sounds temp )
+	@-( if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then rm -rf $(DESTDIR)$(ZM_RUNDIR); fi )
+	@-( if test "$(DESTDIR)$(ZM_SOCKDIR)" != "/var/run"; then rm -rf $(DESTDIR)$(ZM_SOCKDIR); fi )
+	@-( if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp" && test "$(DESTDIR)$(ZM_TMPDIR)" != "/var/tmp"; then rm -rf $(DESTDIR)$(ZM_TMPDIR); fi )
+	@-( if test "$(DESTDIR)$(ZM_LOGDIR)" != "/var/log"; then rm -rf $(DESTDIR)$(ZM_LOGDIR); fi )

NEWS

@@ -0,0 +1 @@
+Please see README file.

README.md

@@ -1,68 +1,142 @@
 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)
 
-All documentation for ZoneMinder is now online at https://zoneminder.readthedocs.org
+All documentation for ZoneMinder is now online at http://www.zoneminder.com/wiki/index.php/Documentation
 
 ## Overview
 
 ZoneMinder is an integrated set of applications which provide a complete surveillance solution allowing capture, analysis, recording and monitoring of any CCTV or security cameras attached to a Linux based machine. It is designed to run on distributions which support the Video For Linux (V4L) interface and has been tested with video cameras attached to BTTV cards, various USB cameras and also supports most IP network cameras. 
 
-## Contacting the Development Team
-Before creating an issue in our github forum, please read our posting rules:
-https://github.com/ZoneMinder/ZoneMinder/wiki/Github-Posting-Rules
+## Requirements
 
-## Our Dockerfile has moved
-Please file issues against the ZoneMinder Dockerfile here: 
-https://github.com/ZoneMinder/zmdockerfiles
+If you are installing ZoneMinder from a package, that package should provide all of the needed core components.
 
-## Installation Methods
+### Packages
 
-### Install from a Package Repository
+If you are compiling ZoneMinder from source, the below list contains the packages needed to get ZoneMinder built:
 
-This is the recommended method to install ZoneMinder onto your system. ZoneMinder packages are maintained for the following distros:
+#### Ubuntu
 
-- 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)
+A fresh build based on master branch running Ubuntu 1204 LTS.  Will likely work for other versions as well.
 
-If a repository that hosts ZoneMinder packages is not available for your distro, then you are encouraged to build your own package, rather than build from source.  While each distro is different in ways that set it apart from all the others, they are often similar enough to allow you to adapt another distro's package building instructions to your own.
-
-### Building from Source is Discouraged
-
-Historically, installing ZoneMinder onto your system required building from source code by issuing the traditional configure, make, make install commands.  To get ZoneMinder to build, all of its dependencies had to be determined and installed beforehand. Init and logrotate scripts had to be manually copied into place following the build.  Optional packages such as jscalendar and Cambozola had to be manually installed. Uninstalls could leave stale files around, which could cause problems during an upgrade.  Speaking of upgrades, when it comes time to upgrade all these manual steps must be repeated again.
-
-Better methods exist today that do much of this for you. The current development team, along with other volunteers, have taken great strides in providing the resources necessary to avoid building from source.  
-
-
-### Building a ZoneMinder Package ###
-
-Building ZoneMinder into a package is not any harder than building from source.  As a matter of fact, if you have successfully built ZoneMinder from source in the past, then you may find these steps to be easier. 
-
-When building a package, it is best to do this work in a separate environment, dedicated to development purposes. This could be as simple as creating a virtual machine, using Docker, or using mock.  All it takes is one “Oops” to regret doing this work on your production server.
-
-Lastly, if you desire to build a development snapshot from the master branch, it is recommended you first build your package using an official release of ZoneMinder. This will help identify whether any problems you may encounter are caused by the build process or is a new issue in the master branch.
-
-Please visit our [ReadtheDocs site](https://zoneminder.readthedocs.org/en/stable/installationguide/index.html) for distro specific instructions.
-
-### Package Maintainers
-Many of the ZoneMinder configuration variable default values are not configurable at build time through autotools or cmake.  A new tool called *zmeditconfigdata.sh* has been added to allow package maintainers to manipulate any variable stored in ConfigData.pm without patching the source. 
-
-For example, let's say I have created a new ZoneMinder package that contains the cambozola javascript file.  However, by default cambozola support is turned off.  To fix that, add this to the packaging script:
 ```bash
-./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes
+root@host:~# aptitude install -y apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf libjpeg8-dev libjpeg8 apache2-mpm-prefork libapache2-mod-php5 php5-cli libphp-serialization-perl libgnutls-dev libjpeg8-dev libavcodec-dev libavformat-dev libswscale-dev libavutil-dev libv4l-dev libtool ffmpeg libnetpbm10-dev libavdevice-dev libmime-lite-perl dh-autoreconf dpatch;
+
+root@host:~# git clone https://github.com/ZoneMinder/ZoneMinder.git zoneminder;
+root@host:~# cd zoneminder;
+root@host:~# ln -s distros/ubuntu1204 debian;
+root@host:~# dpkg-checkbuilddeps;
+root@host:~# dpkg-buildpackage;
 ```
 
-Note that zmeditconfigdata.sh is intended to be called, from the root build folder, prior to running cmake or configure.
+One level above you'll now find a deb package matching the architecture of the build host:
+
+```bash
+root@host:~# ls -1 ~/zoneminder*;
+/root/zoneminder_1.26.4-1_amd64.changes
+/root/zoneminder_1.26.4-1_amd64.deb
+/root/zoneminder_1.26.4-1.dsc
+/root/zoneminder_1.26.4-1.tar.gz
+```
+
+The dpkg command itself does not resolve dependencies. That's what high-level interfaces like aptitude and apt-get are normally for. Unfortunately, unlike RPM, there's no easy way to install a separate deb package not contained with any repository.
+
+To overcome this "limitation" we'll use dpkg only to install the zoneminder package and apt-get to fetch all needed dependencies afterwards. Running dpkg-reconfigure in the end will ensure that the setup scripts e.g. for database provisioning were executed.
+
+```bash
+root@host:~# dpkg -i /root/zoneminder_1.26.4-1_amd64.deb; apt-get install -f;
+root@host:~# dpkg-reconfigure zoneminder;
+```
+Alternatively you may also use gdebi to automatically resolve dependencies during installation:
+
+```bash
+root@host:~# aptitude install -y gdebi;
+root@host:~# gdebi /root/zoneminder_1.26.4-1_amd64.deb;
+```
+```bash
+sudo apt-get install apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev \
+libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 \
+libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf libjpeg-turbo8-dev libjpeg-turbo8 \
+apache2-mpm-prefork libapache2-mod-php5 php5-cli
+```
+
+#### Debian
+
+A fresh build based on master branch running Debian 7 (wheezy):
+
+```bash
+root@host:~# aptitude install -y apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf libjpeg8-dev libjpeg8 apache2-mpm-prefork libapache2-mod-php5 php5-cli libphp-serialization-perl libgnutls-dev libjpeg8-dev libavcodec-dev libavformat-dev libswscale-dev libavutil-dev libv4l-dev libtool ffmpeg libnetpbm10-dev libavdevice-dev libmime-lite-perl dh-autoreconf dpatch;
+
+root@host:~# git clone https://github.com/ZoneMinder/ZoneMinder.git zoneminder;
+root@host:~# cd zoneminder;
+root@host:~# ln -s distros/debian;
+root@host:~# dpkg-checkbuilddeps;
+root@host:~# dpkg-buildpackage;
+```
+
+One level above you'll now find a deb package matching the architecture of the build host:
+
+```bash
+root@host:~# ls -1 ~/zoneminder*;
+/root/zoneminder_1.26.4-1_amd64.changes
+/root/zoneminder_1.26.4-1_amd64.deb
+/root/zoneminder_1.26.4-1.dsc
+/root/zoneminder_1.26.4-1.tar.gz
+```
+
+The dpkg command itself does not resolve dependencies. That's what high-level interfaces like aptitude and apt-get are normally for. Unfortunately, unlike RPM, there's no easy way to install a separate deb package not contained with any repository.
+
+To overcome this "limitation" we'll use dpkg only to install the zoneminder package and apt-get to fetch all needed dependencies afterwards. Running dpkg-reconfigure in the end will ensure that the setup scripts e.g. for database provisioning were executed.
+
+```bash
+root@host:~# dpkg -i /root/zoneminder_1.26.4-1_amd64.deb; apt-get install -f;
+root@host:~# dpkg-reconfigure zoneminder;
+```
+Alternatively you may also use gdebi to automatically resolve dependencies during installation:
+
+```bash
+root@host:~# aptitude install -y gdebi;
+root@host:~# gdebi /root/zoneminder_1.26.4-1_amd64.deb;
+```
+
+#### CentOS / RHEL
+
+Additional repositories must be added before one can build zoneminder on CentOS or RHEL:
+
+1. Zmrepo [ZoneMinder WiKi](http://www.zoneminder.com/wiki/index.php/CentOS#Zmrepo_-_A_ZoneMinder_repository_for_RPM_based_distros)
+2. EPEL https://fedoraproject.org/wiki/EPEL
+3. RPMFusion: http://rpmfusion.org/
+
+When adding third party repositories, it is highly recommended that the user also install and configure yum priorities as documented in the [CentOS WiKi](http://wiki.centos.org/PackageManagement/Yum/Priorities)
+
+Prioritize the repositories:
+
+1. Base
+2. EPEL
+3. RPMFusion
+4. Zmrepo
+
+Once your repos are in order, install the following:
+```bash
+sudo yum install cmake bzip2-devel ffmpeg ffmpeg-devel gnutls-devel httpd libjpeg-turbo libjpeg-turbo-devel mysql-devel mysql-server pcre-devel \
+perl-Archive-Tar perl-Archive-Zip perl-Convert-BinHex perl-Date-Manip perl-DBD-MySQL perl-DBI perl-Device-SerialPort perl-Email-Date-Format perl-IO-stringy \
+perl-IO-Zlib perl-MailTools perl-MIME-Lite perl-MIME-tools perl-MIME-Types perl-Module-Load perl-Package-Constants perl-Sys-Mmap perl-Time-HiRes \
+perl-TimeDate perl-YAML-Syck perl-X10 perl-URI-Encode php php-cli php-mysql x264 vlc-devel vlc-core \
+libcurl libcurl-devel polkit-devel git
+```
+
+To build from the master branch:
+```bash
+git clone https://github.com/ZoneMinder/ZoneMinder.git
+cd ZoneMinder
+cmake .
+make
+sudo make install
+```
+
+IMPORTANT: Don't forget the trailing "." when calling cmake
 
 #### Docker
 
@@ -70,19 +144,23 @@ Docker is a system to run applications inside isolated containers. ZoneMinder, a
 Dockerfile contained in this repository. However, there is still work needed to ensure that the main ZM features work 
 properly and are documented. 
 
-## Contribution Model and Development
+### ffmpeg
+
+This release of ZoneMinder has been tested on and works with ffmpeg version N-55540-g93f4277.
+
+
+## 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
@@ -91,4 +169,14 @@ the following steps.  While step 3 is optional, it is preferred.
 6. Create new Pull Request
 7. The team will then review, discuss and hopefully merge your changes.
 
+### Package Maintainters
+Many of the ZoneMinder configration variable default values are not configurable at build time through autotools or cmake.  A new tool called *zmeditconfigdata.sh* has been added to allow package maintainers to manipulate any variable stored in ConfigData.pm without patching the source. 
+
+For example, let's say I have created a new ZoneMinder package that contains the cambolzola javascript file.  However, by default cambozola support is turned off.  To fix that, add this to the pacakging script:
+```bash
+./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes
+```
+
+Note that zmeditconfigdata.sh is intended to be called, from the root build folder, prior to running cmake or configure.
+
 [![Analytics](https://ga-beacon.appspot.com/UA-15147273-6/ZoneMinder/README.md)](https://github.com/igrigorik/ga-beacon)

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
-

TODO

@@ -0,0 +1,2 @@
+Please see README.md file.
+

acinclude.m4

@@ -0,0 +1,74 @@
+AC_DEFUN([AC_DEFINE_DIR], [
+  prefix_NONE=
+  exec_prefix_NONE=
+  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
+  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
+dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
+dnl refers to ${prefix}.  Thus we have to use `eval' twice.
+  eval ac_define_dir="\"[$]$2\""
+  eval ac_define_dir="\"$ac_define_dir\""
+  AC_SUBST($1, "$ac_define_dir")
+  AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
+  test "$prefix_NONE" && prefix=NONE
+  test "$exec_prefix_NONE" && exec_prefix=NONE
+])
+
+AC_DEFUN([AC_PROG_PERL_VERSION],[dnl
+# Make sure we have perl
+if test -z "$PERL"; then
+AC_CHECK_PROG(PERL,perl,perl)
+fi
+
+# Check if version of Perl is sufficient
+ac_perl_version="$1"
+
+if test "x$PERL" != "x"; then
+  AC_MSG_CHECKING(for perl version greater than or equal to $ac_perl_version)
+  # NB: It would be nice to log the error if there is one, but we cannot rely
+  # on autoconf internals
+  $PERL -e "use $ac_perl_version;" > /dev/null 2>&1
+  if test $? -ne 0; then
+    AC_MSG_RESULT(no);
+    $3
+  else
+    AC_MSG_RESULT(ok);
+    $2
+  fi
+else
+  AC_MSG_WARN(could not find perl)
+fi
+])dnl
+
+AC_DEFUN([AC_PROG_PERL_MODULES],[dnl
+ac_perl_modules="$1"
+# Make sure we have perl
+if test -z "$PERL"; then
+AC_CHECK_PROG(PERL,perl,perl)
+fi
+
+if test "x$PERL" != x; then
+  ac_perl_modules_failed=0
+  for ac_perl_module in $ac_perl_modules; do
+    AC_MSG_CHECKING(for perl module $ac_perl_module)
+
+    # Would be nice to log result here, but can't rely on autoconf internals
+    $PERL "-M$ac_perl_module" -e exit > /dev/null 2>&1
+    if test $? -ne 0; then
+      AC_MSG_RESULT(no);
+      ac_perl_modules_failed=1
+   else
+      AC_MSG_RESULT(ok);
+    fi
+  done
+
+  # Run optional shell commands
+  if test "$ac_perl_modules_failed" = 0; then
+    :
+    $2
+  else
+    :
+    $3
+  fi
+else
+  AC_MSG_WARN(could not find perl)
+fi])dnl

bootstrap.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+aclocal
+autoheader
+automake --add-missing
+autoconf

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()

cmake/Modules/CheckSendfile.cmake

@@ -1,58 +0,0 @@
-# Check whether sendfile() is supported and what prototype it has
-include(CheckCSourceCompiles)
-if (UNIX OR MINGW)
-SET(CMAKE_REQUIRED_DEFINITIONS -Werror-implicit-function-declaration)
-endif()
-check_c_source_compiles("#include <sys/sendfile.h>
-#include <stdio.h>
-int main()
-{
-sendfile(1, 1, NULL, 0);
-return 0;
-}" HAVE_SENDFILE4_SUPPORT)
-if(HAVE_SENDFILE4_SUPPORT)
-add_definitions(-DHAVE_SENDFILE4_SUPPORT=1)
-unset(CMAKE_REQUIRED_DEFINITIONS)
-message(STATUS "Sendfile support: Linux/Solaris sendfile()")
-return()
-endif()
-find_library(SENDFILE_LIBRARIES NAMES sendfile)
-if(SENDFILE_LIBRARIES)
-include(CheckLibraryExists)
-check_library_exists(sendfile sendfile ${SENDFILE_LIBRARIES} HAVE_SENDFILE4_SUPPORT)
-if(HAVE_SENDFILE4_SUPPORT)
-add_definitions(-DHAVE_SENDFILE4_SUPPORT=1)
-unset(CMAKE_REQUIRED_DEFINITIONS)
-message(STATUS "Sendfile support: Solaris sendfile()")
-return()
-endif()
-endif()
-set(SENDFILE_LIBRARIES "")
-check_c_source_compiles("#include <sys/socket.h>
-#include <stdio.h>
-int main()
-{
-sendfile(1, 1, 0, 0, NULL, NULL, 0);
-return 0;
-}" HAVE_SENDFILE7_SUPPORT)
-if(HAVE_SENDFILE7_SUPPORT)
-add_definitions(-DHAVE_SENDFILE7_SUPPORT=1)
-unset(CMAKE_REQUIRED_DEFINITIONS)
-message(STATUS "Sendfile support: FreeBSD sendfile()")
-return()
-endif()
-check_c_source_compiles("#include <sys/socket.h>
-#include <stdio.h>
-#include <sys/uio.h>
-int main()
-{
-sendfile(1, 1, 0, NULL, NULL, 0);
-return 0;
-}" HAVE_SENDFILE6_SUPPORT)
-if(HAVE_SENDFILE6_SUPPORT)
-add_definitions(-DHAVE_SENDFILE6_SUPPORT=1)
-unset(CMAKE_REQUIRED_DEFINITIONS)
-message(STATUS "Sendfile support: MacOS sendfile()")
-return()
-endif()
-

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)

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)

cmake/Modules/FindPolkit.cmake

@@ -19,7 +19,7 @@
     # use pkg-config to get the directories and then use these values
     # in the FIND_PATH() and FIND_LIBRARY() calls
     find_package(PkgConfig)
-    pkg_search_module(PC_POLKIT polkit-gobject-1 polkit)
+    pkg_check_modules(PC_POLKIT polkit-gobject-1)
     #pkg_check_modules(PC_POLKIT_AGENT polkit-agent-1)
     set(POLKIT_DEFINITIONS ${PC_POLKIT_CFLAGS_OTHER})
     endif (NOT WIN32)
@@ -31,8 +31,8 @@
     HINTS ${PC_POLKIT_INCLUDE_DIRS}
     )
     find_path( POLKIT_INCLUDE_DIR
-    NAMES polkit/polkit.h libpolkit/libpolkit.h
-    PATH_SUFFIXES polkit-1 polkit
+    NAMES polkit/polkit.h
+    PATH_SUFFIXES polkit-1
     HINTS ${PC_POLKIT_INCLUDE_DIRS}
     )
     #find_path( POLKIT_AGENT_INCLUDE_DIR
@@ -43,7 +43,7 @@
     #set(POLKIT_INCLUDE_DIRS ${GLIB2_INCLUDE_DIR} ${_POLKIT_INCLUDE_DIR})
     #set(POLKIT_AGENT_INCLUDE_DIRS ${GLIB2_INCLUDE_DIR} ${_POLKIT_AGENT_INCLUDE_DIR})
     find_library( POLKIT_LIBRARIES
-    NAMES polkit-gobject-1 polkit
+    NAMES polkit-gobject-1
     HINTS ${PC_POLKIT_LIBDIR}
     )
     #find_library( POLKIT_AGENT_LIBRARY

cmake/Modules/Pod2Man.cmake

@@ -1,70 +0,0 @@
-#
-# Copyright (C) 2012	Emmanuel Roullit <emmanuel.roullit@gmail.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or (at
-# your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin St, Fifth Floor, Boston, MA 02110, USA
-#
-
-# Generate man pages of the project by using the
-# POD header written in the tool source code.
-# To use it, include this file in CMakeLists.txt and
-# invoke POD2MAN(<podfile> <manfile> <section>)
-
-MACRO(POD2MAN PODFILE MANFILE SECTION MANPAGE_DEST_PREFIX)
-	FIND_PROGRAM(POD2MAN pod2man)
-	FIND_PROGRAM(GZIP gzip)
-
-	IF(NOT POD2MAN)
-		MESSAGE(FATAL ERROR "Need pod2man installed to generate man page")
-	ENDIF(NOT POD2MAN)
-
-	IF(NOT GZIP)
-		MESSAGE(FATAL ERROR "Need gzip installed to compress man page")
-	ENDIF(NOT GZIP)
-
-	IF(NOT EXISTS ${PODFILE})
-		MESSAGE(FATAL ERROR "Could not find pod file ${PODFILE} to generate man page")
-	ENDIF(NOT EXISTS ${PODFILE})
-
-	ADD_CUSTOM_COMMAND(
-		OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}
-		DEPENDS ${PODFILE}
-		COMMAND ${POD2MAN}
-		ARGS --section ${SECTION} --center ${CMAKE_PROJECT_NAME} --release --stderr --name ${MANFILE}
-		${PODFILE} > ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}
-	)
-
-	ADD_CUSTOM_COMMAND(
-		OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz
-		COMMAND ${GZIP} --best -c ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION} > ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz
-		DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}
-	)
-
-	SET(MANPAGE_TARGET "man-${MANFILE}")
-
-	ADD_CUSTOM_TARGET(${MANPAGE_TARGET} ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz)
-
-	INSTALL(
-		FILES ${CMAKE_CURRENT_BINARY_DIR}/${MANFILE}.${SECTION}.gz
-		DESTINATION ${MANPAGE_DEST_PREFIX}/man${SECTION}
-    	)
-ENDMACRO(POD2MAN PODFILE MANFILE SECTION MANPAGE_DEST_PREFIX)
-
-MACRO(ADD_MANPAGE_TARGET)
-	# It is not possible add a dependency to target 'install'
-	# Run hard-coded 'make man' when 'make install' is invoked
-	INSTALL(CODE "EXECUTE_PROCESS(COMMAND make man)")
-	ADD_CUSTOM_TARGET(man)
-ENDMACRO(ADD_MANPAGE_TARGET)
-

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()

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()

cmakecacheimport.sh

@@ -55,9 +55,6 @@ echo "Database host              : $ZM_DB_HOST"
 echo "Database name              : $ZM_DB_NAME"
 echo "Database user              : $ZM_DB_USER"
 echo "Database password          : Not shown"
-echo "Database SSL CA Cert       : $ZM_DB_SSL_CA_CERT"
-echo "Database SSL Client Key    : $ZM_DB_SSL_CLIENT_KEY"
-echo "Database SSL Client Cert   : $ZM_DB_SSL_CLIENT_CERT"
 
 
 CMPATH="CACHE PATH \"Imported by cmakecacheimport.sh\" FORCE"
@@ -75,9 +72,6 @@ echo "set(ZM_DB_HOST \"$ZM_DB_HOST\" $CMSTRING)">>zm_conf.cmake
 echo "set(ZM_DB_NAME \"$ZM_DB_NAME\" $CMSTRING)">>zm_conf.cmake
 echo "set(ZM_DB_USER \"$ZM_DB_USER\" $CMSTRING)">>zm_conf.cmake
 echo "set(ZM_DB_PASS \"$ZM_DB_PASS\" $CMSTRING)">>zm_conf.cmake
-echo "set(ZM_DB_SSL_CA_CERT \"$ZM_DB_SSL_CA_CERT\" $CMSTRING)">>zm_conf.cmake
-echo "set(ZM_DB_SSL_CLIENT_KEY \"$ZM_DB_SSL_CLIENT_KEY\" $CMSTRING)">>zm_conf.cmake
-echo "set(ZM_DB_SSL_CLIENT_CERT \"$ZM_DB_SSL_CLIENT_CERT\" $CMSTRING)">>zm_conf.cmake
 
 echo ""
 echo "Wrote zm_conf.cmake"

code_of_conduct.md

@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at abuse@zoneminder.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

conf.d/01-system-paths.conf.in

@@ -1,51 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder System Paths Configuration
-#
-# ==========================================================================
-#
-# This config file contains the variables previously found under Options -> Paths
-#
-# *** DO NOT EDIT THIS FILE ***
-#
-# To make custom changes to the variables below, create a new configuration
-# file, with an extention of .conf, containing your desired modifications.
-#
-
-# Full path to the folder events are recorded to.
-# The web account user must have full read/write permission to this folder.
-ZM_DIR_EVENTS=@ZM_DIR_EVENTS@
-
-# Foldername under the webroot where ZoneMinder looks for optional sound files
-# to play when an alarm is detected.
-ZM_DIR_SOUNDS=@ZM_DIR_SOUNDS@
-
-# Full path to the folder where exported archives are stored
-# The web account user must have full read/write permission to this folder.
-ZM_DIR_EXPORTS=@ZM_TMPDIR@
-
-# ZoneMinder url path to the zms streaming server
-ZM_PATH_ZMS=@ZM_PATH_ZMS@
-
-# Full Path to ZoneMinder's mapped memory files 
-# The web account user must have full read/write permission to this folder.
-ZM_PATH_MAP=@ZM_PATH_MAP@
-
-# Full Path to ZoneMinder's socket folder
-# The web account user must have full read/write permission to this folder.
-ZM_PATH_SOCKS=@ZM_SOCKDIR@
-
-# Full path to ZoneMinder's log folder
-# The web account user must have full read/write permission to this folder.
-ZM_PATH_LOGS=@ZM_LOGDIR@
-
-# Full path to ZoneMinder's swap folder
-# The web account user must have full read/write permission to this folder.
-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@"

conf.d/02-multiserver.conf

@@ -1,12 +0,0 @@
-# ==========================================================================
-#
-# ZoneMinder Multiserver Configuration
-#
-# ==========================================================================
-# Do NOT set ZM_SERVER_HOST if you are not using Multi-Server
-# You have been warned
-#
-# The name specified here must have a corresponding entry
-# in the Servers tab under Options
-#ZM_SERVER_HOST=
-

conf.d/README

@@ -1,19 +0,0 @@
-conf.d/README
-
-Any changes to ZoneMinder's configuration should be made here in this folder,
-rather than directly editing the default zm.conf file.
-
-ZoneMinder will process each file in this folder with a ".conf" extension.
-Each "Var = Value" pair, in each config file, will be loaded into ZoneMinder's
-running configuration, overriding any variables with the same name found in the 
-default zm.conf file.
-
-After creating a custom config file, don't forget to set the proper file and
-owner permission on it. For example, this is typically what you should do after
-saving the config file to disk:
-
-    sudo chown root:apache *.conf
-    sudo chmod 640 *.conf
-
-Substitute "apache" with the name of the web server user account on your system.
-

configure.ac

@@ -0,0 +1,456 @@
+AC_PREREQ(2.59)
+AC_INIT(zm,1.28.0,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
+AM_INIT_AUTOMAKE
+AC_CONFIG_SRCDIR(src/zm.h)
+AC_CONFIG_HEADERS(config.h)
+
+AC_SUBST([AM_CXXFLAGS], [-D__STDC_CONSTANT_MACROS])
+
+AC_SUBST(VERSION)
+#
+# Platform specific setup
+#
+#############################
+AC_CANONICAL_HOST
+# Check for which host we are on and setup a few things
+# specifically based on the host
+case $host_os in
+  darwin* )
+        # Do something specific for mac
+		HOST_OS='darwin'
+        ;;
+  linux*)
+        # Do something specific for linux
+		HOST_OS='linux'
+        ;;
+   *BSD*)
+        # Do something specific for BSD
+		HOST_OS='BSD'
+        ;;
+    *)
+        #Default Case
+        AC_MSG_ERROR([Your platform is not currently supported])
+        ;;
+esac
+
+AC_SUBST(HOST_OS)
+
+AC_ARG_VAR(ZM_DB_TYPE,[Type of the ZoneMinder database, default mysql])
+AC_ARG_VAR(ZM_DB_HOST,[Hostname where ZoneMinder database located, default localhost])
+AC_ARG_VAR(ZM_DB_NAME,[Name of ZoneMinder database, default zm])
+AC_ARG_VAR(ZM_DB_USER,[Name of ZoneMinder database user, default zmuser])
+AC_ARG_VAR(ZM_DB_PASS,[Password of ZoneMinder database user, default zmpass])
+AC_ARG_VAR(ZM_SSL_LIB,[Library to use for ssl functions, default gnutls])
+AC_ARG_VAR(ZM_MYSQL_ENGINE,[MySQL engine to use with database, default InnoDB])
+AC_ARG_VAR(ZM_RUNDIR,[Location of transient process files, default /var/run/zm])
+AC_ARG_VAR(ZM_SOCKDIR,[Location of Unix domain socket files, default /var/run/zm])
+AC_ARG_VAR(ZM_TMPDIR,[Location of temporary files, default /var/tmp/zm])
+AC_ARG_VAR(ZM_LOGDIR,[Location of generated log files, default /var/log/zm])
+
+if test "$ZM_DB_TYPE" == ""; then
+	AC_SUBST(ZM_DB_TYPE,[mysql])
+fi
+if test "$ZM_DB_HOST" == ""; then
+	AC_SUBST(ZM_DB_HOST,[localhost])
+fi
+if test "$ZM_DB_NAME" == ""; then
+	AC_SUBST(ZM_DB_NAME,[zm])
+fi
+if test "$ZM_DB_USER" == ""; then
+	AC_SUBST(ZM_DB_USER,[zmuser])
+fi
+if test "$ZM_DB_PASS" == ""; then
+	AC_SUBST(ZM_DB_PASS,[zmpass])
+fi
+if test "$ZM_SSL_LIB" == ""; then
+	AC_SUBST(ZM_SSL_LIB,gnutls)
+fi
+if test "$ZM_MYSQL_ENGINE" == ""; then
+	AC_SUBST(ZM_MYSQL_ENGINE,InnoDB)
+fi
+if test "$ZM_RUNDIR" == ""; then
+	AC_SUBST(ZM_RUNDIR,[/var/run/zm])
+fi
+if test "$ZM_SOCKDIR" == ""; then
+	AC_SUBST(ZM_SOCKDIR,[/var/run/zm])
+fi
+if test "$ZM_TMPDIR" == ""; then
+	AC_SUBST(ZM_TMPDIR,[/tmp/zm])
+fi
+if test "$ZM_LOGDIR" == ""; then
+	AC_SUBST(ZM_LOGDIR,[/var/log/zm])
+fi
+
+LIB_ARCH=lib
+AC_ARG_WITH(libarch,
+    [  --with-libarch=<lib>       architecture library path to use, default lib],
+    [LIB_ARCH=$with_libarch],
+    AC_MSG_WARN([You can call configure with the --with-libarch option.
+    This tells configure where to find architecture specific libraries.
+    The default of 'lib' is usually ok but 64 bit machines may require lib64.
+    e.g. --with-libarch=lib or --with-libarch=lib64])
+)
+AC_SUBST(LIB_ARCH)
+
+LDFLAGS="-L/usr/lib/${build_alias} ${LDFLAGS}"
+
+MYSQL_PREFIX=/usr
+AC_ARG_WITH(mysql,
+    [  --with-mysql=<path>        prefix of MySQL installation, default /usr],
+    [MYSQL_PREFIX=$with_mysql],
+    AC_MSG_WARN([You can call configure with the --with-mysql option.
+    This tells configure where to find the MySql C library and headers if configure cannot
+    locate them automatically.
+    e.g. --with-mysql=/usr/local or --with-mysql=/usr])
+)
+AC_SUBST(MYSQL_PREFIX)
+MYSQL_LIBS="-L${MYSQL_PREFIX}/${LIB_ARCH}/mysql"
+MYSQL_CFLAGS="-I${MYSQL_PREFIX}/include"
+AC_SUBST(MYSQL_LIBS)
+AC_SUBST(MYSQL_CFLAGS)
+LDFLAGS="$LDFLAGS ${MYSQL_LIBS}"
+
+
+MARIADB_PREFIX=/usr
+AC_ARG_WITH(mariadb,
+    [  --with-mariadb=<path>        prefix of MariaDB installation, default /usr],
+    [MYSQL_PREFIX=$with_mariadb],
+    AC_MSG_WARN([You can call configure with the --with-mariadb option.
+    This tells configure where to find the mariaDB C library and headers if configure cannot
+    locate them automatically.
+    e.g. --with-mariadb=/usr/local or --with-mariadb=/usr])
+)
+AC_SUBST(MARIADB_PREFIX)
+MARIADB_LIBS="-L${MARIADB_PREFIX}/${LIB_ARCH}/mariadb"
+MARIADB_CFLAGS="-I${MARIADB_PREFIX}/include"
+AC_SUBST(MARIADB_LIBS)
+AC_SUBST(MARIADB_CFLAGS)
+LDFLAGS="$LDFLAGS ${MARIADB_LIBS}"
+
+POLKIT_PREFIX=/usr
+AC_ARG_WITH(polkit,
+[ --with-polkit=<path> prefix of polkit root directory, default /usr],
+[POLKIT_PREFIX=$with_polkit],
+AC_MSG_WARN([You can call configure with the --with-polkit option.
+This tells configure where to place the polkit policy files.])
+)
+AC_SUBST(POLKIT_PREFIX)
+PKG_CHECK_MODULES(POLKIT, polkit-gobject-1)
+
+FFMPEG_PREFIX=/usr
+AC_ARG_WITH(ffmpeg,
+    [  --with-ffmpeg=<path>       prefix of ffmpeg root directory for libavcodec etc, default /usr],
+    [FFMPEG_PREFIX=$with_ffmpeg],
+    AC_MSG_WARN([You can call configure with the --with-ffmpeg option.
+    This tells configure where to find the ffmpeg root directory within which are the libavcodec 
+    and libavformat files that can be used to build true MPEG streaming into ZoneMinder. Ensure that
+    your copy of ffmpeg has installed libraries as well as binaries (use 'make installlib'). If you
+    are using a local install of ffmpeg you may have to remove or rename a previous real installation
+    as the headers and libraries from that will probably be picked up before your local copy.
+    e.g. --with-ffmpeg=/usr/local])
+)
+AC_SUBST(FFMPEG_PREFIX)
+FFMPEG_LIBS="-L${FFMPEG_PREFIX}/${LIB_ARCH}"
+FFMPEG_CFLAGS="-I${FFMPEG_PREFIX}/include -D__STDC_CONSTANT_MACROS"
+AC_SUBST(FFMPEG_LIBS)
+AC_SUBST(FFMPEG_CFLAGS)
+
+LDFLAGS="${FFMPEG_LIBS} $LDFLAGS"
+CFLAGS="${FFMPEG_CFLAGS} $CFLAGS"
+CPPFLAGS="${FFMPEG_CFLAGS} $CPPFLAGS"
+
+EXTRA_LIBS=
+AC_ARG_WITH(extralibs,
+    [  --with-extralibs="<libs>"  string containing extra libraries to pass to link, default empty],
+    [EXTRA_LIBS=$with_extralibs],
+    AC_MSG_WARN([You can call configure with the --with-extralibs option.
+    Ordinarily you will need to use this option only when your copy of ffmpeg has been built
+    with support for additional formats and you would use this option to detail which additional
+    libraries ffmpeg was built with so that it is able to link successfully with ZoneMinder.
+    You will need to wrap this option in quotes if it contains any spaces.
+    e.g. --with-extralibs="-lmp3lame"])
+)
+AC_SUBST(EXTRA_LIBS)
+
+LDFLAGS="$LDFLAGS ${EXTRA_LIBS}"
+
+AC_ARG_WITH(webdir,
+    [  --with-webdir=<path>       prefix of web directory],
+    [WEB_PREFIX=$with_webdir],
+    AC_MSG_ERROR([You must call configure with the --with-webdir option.
+    This tells configure where to install PHP and web files and scripts.
+    e.g. --with-webdir=/var/www/html or --with-webdir=/www/vhtdocs/<site>])
+)
+AC_SUBST(WEB_PREFIX)
+
+AC_ARG_WITH(cgidir,
+    [  --with-cgidir=<path>       prefix of cgi directory],
+    [CGI_PREFIX=$with_cgidir],
+    AC_MSG_ERROR([You must call configure with the --with-cgidir option.
+    This tells configure where to install cgi files and scripts.
+    e.g. --with-cgidir=/var/www/cgi-bin or --with-webdir=/www/vhtdocs/<site>/cgi-bin])
+)
+AC_SUBST(CGI_PREFIX)
+
+WEB_USER=apache
+AC_ARG_WITH(webuser,
+    [  --with-webuser=<user>      name of web user, default apache],
+    [WEB_USER=$with_webuser],
+    AC_MSG_WARN([You can call configure with the --with-webuser option.
+    This tells configure what the user name of the web user is if it is not the default of 'apache'.
+    e.g. --with-webuser=apache or --with-webuser=web])
+)
+AC_SUBST(WEB_USER)
+
+WEB_GROUP=apache
+AC_ARG_WITH(webgroup,
+    [  --with-webgroup=<group>    name of web group, default apache],
+    [WEB_GROUP=$with_webgroup],
+    AC_MSG_WARN([You can call configure with the --with-webgroup option.
+    This tells configure what the group name of the web group is if it is not the default of 'apache'.
+    e.g. --with-webgroup=apache or --with-webgroup=web])
+)
+AC_SUBST(WEB_GROUP)
+
+WEB_HOST=zm.local
+AC_ARG_WITH(webhost,
+    [  --with-webhost=<hostname>    name of web hostname, default zm.local],
+    [WEB_HOST=$with_webhost],
+    AC_MSG_WARN([You can call configure with the --with-webhost option.
+    This tells configure what the host name is for name based virtual hosting. This is only used to populate the sample web/zmHttpd.conf file.
+    e.g. --with-webhost=zm.localdomain])
+)
+AC_SUBST(WEB_HOST)
+
+ENABLE_DEBUG=yes
+AC_ARG_ENABLE(debug,
+    [  --enable-debug=<yes|no>    enable or disable debug, default enabled],
+    [ENABLE_DEBUG=$enable_debug],
+    AC_MSG_WARN([You can call configure with the --enable-debug=<yes|no> or --disable-debug option.
+    This tells configure whether to compile ZoneMinder with debug included. Although debug is included
+    by default it is not output unless explicitly switched on elsewhere. These checks may induce a
+    small penalty on performance and if you are after squeezing the maximum possible performance out
+    of ZoneMinder you may use this switch to prevent debug from being compiled in.
+    e.g. --enable-debug=yes or --disable-debug])
+)
+if test "$ENABLE_DEBUG" != "yes"; then
+  AC_DEFINE(ZM_DBG_OFF,1,"Whether debug is switched off and compiled out")
+fi
+
+ENABLE_MMAP=yes
+AC_ARG_ENABLE(mmap,
+    [  --enable-mmap=<yes|no> enable or disabled mapped memory versus shared memory, default mapped],
+    [ENABLE_MMAP=$enable_mmap],
+    AC_MSG_WARN([You can call configure with the --enable-mmap=<yes|no> or --disable-mmap option.
+    This tells configure whether to compile ZoneMinder with mmap support rather than IPC shared
+    memory. This is a feature that uses memory mapped into files which all processes can share.
+    Memory mapping requires less configuration and is more flexible than shared memory but may
+    slow down your system unless the mapped files are configured to reside on a fast or RAM based
+    filesystem which will normally be the case by default.
+    e.g. --enable-mmap=yes or --disable-mmap])
+)
+if test "$ENABLE_MMAP" == "yes"; then
+  AC_DEFINE(ZM_MEM_MAPPED,1,"Whether to use mapped rather than shared memory")
+else
+  AC_DEFINE(ZM_MEM_MAPPED,0,"Whether to use mapped rather than shared memory")
+fi
+AC_SUBST(ENABLE_MMAP)
+
+# Compiler
+AC_LANG_CPLUSPLUS
+
+# Checks for programs.
+AC_PROG_CXX
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_RANLIB
+AC_PROG_MAKE_SET
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_HEADER_STDBOOL
+AC_C_CONST
+AC_TYPE_UID_T
+AC_C_INLINE
+AC_TYPE_MODE_T
+AC_TYPE_SIZE_T
+AC_HEADER_TIME
+AC_STRUCT_TM
+AC_TYPE_SIGNAL
+
+AC_CHECK_TYPES(siginfo_t,,,[#include <signal.h>])
+AC_CHECK_TYPES(ucontext_t,,,[#include <signal.h>])
+
+# Checks for library functions.
+AC_PROG_GCC_TRADITIONAL
+AC_FUNC_MALLOC
+AC_FUNC_MMAP
+AC_FUNC_SELECT_ARGTYPES
+AC_FUNC_STAT
+AC_FUNC_STRFTIME
+AC_FUNC_STRTOD
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS([gethostbyname gethostname gettimeofday memmove memset mkdir munmap posix_memalign putenv select sendfile socket sqrt strcasecmp strchr strcspn strerror strncasecmp strrchr strspn strstr strtol strtoull])
+AC_CHECK_FUNCS([syscall sleep usleep ioctl ioctlsocket sigaction])
+
+# Other programs
+AC_CHECK_PROG(OPT_FFMPEG,ffmpeg,yes,no)
+AC_PATH_PROG(PATH_FFMPEG,ffmpeg)
+AC_CHECK_PROG(OPT_NETPBM,pnmscale,yes,no)
+AC_PATH_PROG(PATH_NETPBM,pnmscale)
+if test "$OPT_NETPBM" == "yes"; then
+PATH_NETPBM=`dirname $PATH_NETPBM`
+fi
+
+# Checks for libraries.
+AC_SEARCH_LIBS(mysql_init,[mysqlclient mariadbclient],,AC_MSG_ERROR(zm requires libmysqlclient.a or libmariadbclient.a))
+AC_CHECK_LIB(jpeg,jpeg_start_compress,,AC_MSG_ERROR(zm requires libjpeg.a))
+AC_CHECK_LIB(pthread,pthread_create,,AC_MSG_ERROR(zm requires libpthread.a))
+AC_CHECK_LIB(dl,dlsym,,AC_MSG_ERROR(zm requires libdl.a))
+if test "$ZM_SSL_LIB" == "openssl"; then
+AC_CHECK_HEADERS(openssl/md5.h,,AC_MSG_WARN(zm requires openssl/md5.h header to be installed for openssl),)
+AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select gnutls instead]))
+else
+AC_CHECK_HEADERS(gnutls/openssl.h,AC_SUBST(ZM_HAS_GNUTLS_OPENSSL,1),AC_SUBST(ZM_HAS_GNUTLS_OPENSSL,0),)
+AC_CHECK_HEADERS(gnutls/gnutls.h,AC_SUBST(ZM_HAS_GNUTLS,1),AC_SUBST(ZM_HAS_GNUTLS,0),)
+if test "$ZM_HAS_GNUTLS_OPENSSL" == "0" && test "$ZM_HAS_GNUTLS" == "0"; then
+AC_MSG_WARN(gnutls is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead)
+fi
+AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed for gnutls),)
+AC_CHECK_LIB(gcrypt,gcry_check_version,,AC_MSG_WARN([libgcrypt.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+AC_CHECK_LIB(gnutls,gnutls_fingerprint,,AC_MSG_WARN([libgnutls.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+if test "$ZM_HAS_GNUTLS_OPENSSL" == "1"; then
+AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([libgnutls.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+fi
+fi
+AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
+AC_CHECK_LIB(z,zlibVersion)
+AC_CHECK_LIB(x264,x264_predict_16x16_init)
+AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
+# Don't bother to warn about this one
+AC_CHECK_LIB(avcore,av_image_copy,,)
+AC_CHECK_LIB(avcodec,avcodec_version,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
+AC_CHECK_LIB(avformat,avformat_version,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
+#AC_CHECK_LIB(avcodec,avcodec_open,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
+#AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
+AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
+AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
+AC_CHECK_LIB(vlc,libvlc_new,,AC_MSG_WARN(libvlc.a may be required for streaming))
+AC_CHECK_LIB(bz2,BZ2_bzCompress,,AC_MSG_WARN(zm requires libbz2.a for recent versions of ffmpeg))
+AC_CHECK_LIB(z,compress,,)
+AC_CHECK_LIB(curl,curl_global_init,,)
+
+# Checks for header files.
+AC_FUNC_ALLOCA
+AC_HEADER_STDC
+AC_CHECK_HEADERS([fcntl.h limits.h memory.h stddef.h stdlib.h string.h strings.h sys/param.h sys/time.h syslog.h unistd.h values.h])
+AC_CHECK_HEADERS([netdb.h netinet/in.h arpa/inet.h sys/ioctl.h sys/socket.h sys/un.h glob.h sys/sendfile.h])
+AC_CHECK_HEADERS(execinfo.h,,,)
+AC_CHECK_HEADERS(ucontext.h,,,)
+AC_CHECK_HEADERS(sys/syscall.h,,,)
+AC_CHECK_HEADERS(pthread.h,,,)
+AC_CHECK_HEADERS(linux/videodev.h,AC_SUBST(ZM_HAS_V4L1,1),AC_SUBST(ZM_HAS_V4L1,0),)
+AC_CHECK_HEADERS(linux/videodev2.h,AC_SUBST(ZM_HAS_V4L2,1),AC_SUBST(ZM_HAS_V4L2,0),)
+if test "$ZM_HAS_V4L1" == "1" || test "$ZM_HAS_V4L2" == "1"; then
+AC_SUBST(ZM_HAS_V4L,1)
+else
+AC_SUBST(ZM_HAS_V4L,0)
+AC_MSG_WARN(zm requires Video4Linux or Video4Linux2 to be installed for analog or USB camera support)
+fi
+AC_CHECK_HEADERS(jpeglib.h,,AC_MSG_ERROR(zm requires libjpeg headers to be installed),)
+AC_CHECK_HEADERS(mysql/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)
+AC_LANG_PUSH([C])
+AC_CHECK_HEADERS(libavutil/avutil.h,,,)
+AC_CHECK_HEADERS(libavcodec/avcodec.h,,,)
+AC_CHECK_HEADERS(libavformat/avformat.h,,,)
+AC_CHECK_HEADERS(libswscale/swscale.h,,,)
+AC_LANG_POP([C])
+AC_CHECK_HEADERS(pcre/pcre.h,AC_SUBST(ZM_PCRE,"1"),,)
+AC_CHECK_HEADERS(pcre.h,AC_SUBST(ZM_PCRE,"1"),,)
+if test "$ENABLE_MMAP" == "yes"; then
+AC_CHECK_HEADERS(sys/mman.h,,,)
+AC_CHECK_HEADERS(fcntl.h,,,)
+else
+AC_CHECK_HEADERS(sys/ipc.h,,,)
+AC_CHECK_HEADERS(sys/shm.h,,,)
+fi
+AC_CHECK_HEADERS(zlib.h,,,)
+AC_CHECK_HEADERS(vlc/vlc.h,,,)
+AC_CHECK_HEADERS(curl/curl.h,,,)
+
+if test "$ZM_SSL_LIB" == "openssl"; then
+AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires openssl/md5.h - use ZM_SSL_LIB option to select gnutls instead]),[#include <stdlib.h>
+#include <openssl/md5.h>])
+else
+if test "$ZM_HAS_GNUTLS_OPENSSL" == "1"; then
+AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires gnutls/openssl.h - use ZM_SSL_LIB option to select openssl instead]),[#include <stdlib.h>
+#include <gnutls/openssl.h>])
+else
+AC_CHECK_DECLS(gnutls_fingerprint,,AC_MSG_ERROR([zm requires gnutls/gnutls.h - use ZM_SSL_LIB option to select openssl instead]),[#include <stdlib.h>
+#include <gnutls/gnutls.h>])
+fi
+fi
+AC_CHECK_DECLS(backtrace,,,[#include <execinfo.h>])
+AC_CHECK_DECLS(backtrace_symbols,,,[#include <execinfo.h>])
+
+AC_SUBST(LDFLAGS)
+
+AC_PROG_PERL_VERSION(5.6.0)
+
+# Compulsory perl modules
+AC_PROG_PERL_MODULES(Sys::Syslog,,AC_MSG_ERROR(zm requires SYS:Syslog))
+AC_PROG_PERL_MODULES(DBI,,AC_MSG_ERROR(zm requires DBI))
+AC_PROG_PERL_MODULES(DBD::mysql,,AC_MSG_ERROR(zm requires DBD::mysql))
+AC_PROG_PERL_MODULES(Getopt::Long,,AC_MSG_ERROR(zm requires Getopt::Long))
+AC_PROG_PERL_MODULES(Time::HiRes,,AC_MSG_ERROR(zm requires Time::HiRes))
+AC_PROG_PERL_MODULES(Date::Manip,,AC_MSG_ERROR(zm requires Date::Manip))
+AC_PROG_PERL_MODULES(LWP::UserAgent,,AC_MSG_ERROR(zm requires LWP::UserAgent))
+AC_PROG_PERL_MODULES(ExtUtils::MakeMaker,,AC_MSG_ERROR(zm requires ExtUtils::MakeMaker))
+if test "$ENABLE_MMAP" == "yes"; then
+AC_PROG_PERL_MODULES(Sys::Mmap,,AC_MSG_ERROR(zm requires Sys::Mmap for mapped memory - set --enable-mmap=no to use IPC shared memory instead))
+fi
+
+# Optional perl modules
+AC_PROG_PERL_MODULES(Module::Load,,AC_MSG_WARN(Module::Load is required for PTZ camera control))
+AC_PROG_PERL_MODULES(Device::SerialPort,,AC_MSG_WARN(Device::SerialPort is required for RS232/RS485 PTZ camera control))
+AC_PROG_PERL_MODULES(Net::FTP,,AC_MSG_WARN(Net::FTP is required for automatic event uploading using ftp))
+AC_PROG_PERL_MODULES(Net::SFTP::Foreign,,AC_MSG_WARN(Net::SFTP::Foreign is required for automatic event uploading using sftp))
+AC_PROG_PERL_MODULES(Expect,,AC_MSG_WARN(Expect is required for automatic event uploading using sftp))
+AC_PROG_PERL_MODULES(Archive::Tar,,AC_MSG_WARN(Archive::Tar may be required for automatic event uploading))
+AC_PROG_PERL_MODULES(Archive::Zip,,AC_MSG_WARN(Archive::Zip may be required for automatic event uploading))
+AC_PROG_PERL_MODULES(Net::SMTP,,AC_MSG_WARN(Net::SMTP may be required for automatic event email notification))
+AC_PROG_PERL_MODULES(MIME::Lite,,AC_MSG_WARN(MIME::Lite may be required for automatic event email notification))
+AC_PROG_PERL_MODULES(MIME::Entity,,AC_MSG_WARN(MIME::Entity may be required for automatic event email notification))
+AC_PROG_PERL_MODULES(X10::ActiveHome,,AC_MSG_WARN(X10::ActiveHome is required for X.10 support))
+
+AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory])
+AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory])
+AC_DEFINE_DIR([DATADIR],[datadir],[Expanded data directory])
+AC_SUBST(PKGDATADIR,"$DATADIR/$PACKAGE")
+AC_SUBST(ZM_PID,"$ZM_RUNDIR/zm.pid")
+AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
+AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf")
+
+# Slight hack for non-standard perl install paths
+if test "$prefix" != "NONE"; then
+    PERL_SITE_PREFIX=`perl -V:siteprefix | sed -e "s/.*='\(.*\)';/\1/"`
+    PERL_SITE_LIB=`perl -V:installsitelib | sed -e "s/.*='\(.*\)';/\1/"`
+    PERL_LIB_PATH=`echo $PERL_SITE_LIB | sed -e "s|^$PERL_SITE_PREFIX||"`
+    EXTRA_PERL_LIB="use lib '$prefix$PERL_LIB_PATH'; # Include custom perl install path"
+    PERL_MM_PARMS="PREFIX=$prefix"
+else
+    EXTRA_PERL_LIB="# Include from system perl paths only"
+    PERL_MM_PARMS=
+fi
+AC_SUBST(PERL_MM_PARMS)
+AC_SUBST(EXTRA_PERL_LIB)
+
+
+AC_CONFIG_FILES([Makefile zm.conf zmconfgen.pl db/Makefile db/zm_create.sql misc/Makefile misc/apache.conf misc/logrotate.conf misc/syslog.conf misc/com.zoneminder.systemctl.policy misc/com.zoneminder.systemctl.rules scripts/Makefile scripts/zm scripts/zmaudit.pl scripts/zmcontrol.pl scripts/zmdc.pl scripts/zmfilter.pl scripts/zmpkg.pl scripts/zmtrack.pl scripts/zmcamtool.pl scripts/zmsystemctl.pl scripts/zmtrigger.pl scripts/zmupdate.pl scripts/zmvideo.pl scripts/zmwatch.pl scripts/zmx10.pl scripts/zmdbbackup scripts/zmdbrestore scripts/zmeventdump scripts/zmlogrotate.conf scripts/ZoneMinder/lib/ZoneMinder/Base.pm scripts/ZoneMinder/lib/ZoneMinder/Config.pm scripts/ZoneMinder/lib/ZoneMinder/Memory.pm scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm src/Makefile src/zm_config.h web/Makefile web/ajax/Makefile web/css/Makefile web/graphics/Makefile web/includes/Makefile web/includes/config.php web/js/Makefile web/lang/Makefile web/skins/Makefile web/skins/classic/Makefile web/skins/classic/ajax/Makefile web/skins/classic/css/Makefile web/skins/classic/graphics/Makefile web/skins/classic/includes/Makefile web/skins/classic/js/Makefile web/skins/classic/lang/Makefile web/skins/classic/views/Makefile web/skins/classic/views/css/Makefile web/skins/classic/views/js/Makefile web/skins/mobile/Makefile web/skins/mobile/ajax/Makefile web/skins/mobile/css/Makefile web/skins/mobile/graphics/Makefile web/skins/mobile/includes/Makefile web/skins/mobile/lang/Makefile web/skins/mobile/views/Makefile web/skins/mobile/views/css/Makefile web/tools/Makefile web/tools/mootools/Makefile web/views/Makefile web/skins/xml/Makefile web/skins/xml/views/Makefile web/skins/xml/includes/Makefile web/skins/flat/Makefile web/skins/flat/ajax/Makefile web/skins/flat/css/Makefile web/skins/flat/graphics/Makefile web/skins/flat/includes/Makefile web/skins/flat/js/Makefile web/skins/flat/lang/Makefile web/skins/flat/views/Makefile web/skins/flat/views/css/Makefile web/skins/flat/views/js/Makefile])
+
+# Create the definitions for compilation and defaults for the database
+AC_CONFIG_COMMANDS([src/zm_config_defines.h],[perl ./zmconfgen.pl])
+# Manually generate the perl Makefile maker
+AC_CONFIG_COMMANDS([scripts/ZoneMinder/Makefile],[(cd scripts/ZoneMinder; echo "perl Makefile.PL $PERL_MM_PARMS"; perl Makefile.PL $PERL_MM_PARMS)],[PERL_MM_PARMS=$PERL_MM_PARMS])
+
+AC_OUTPUT

db/CMakeLists.txt

@@ -2,8 +2,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")
@@ -11,14 +9,5 @@ file(GLOB dbfileslist RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "zm_update-*.sql")
 # Install the database upgrade scripts
 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")
-
-# install triggers.sql
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/triggers.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
-

db/Makefile.am

@@ -0,0 +1,14 @@
+AUTOMAKE_OPTIONS = foreign
+
+zmdbdatadir = $(pkgdatadir)/db
+
+EXTRA_DIST = \
+	zm_create.sql.in \
+	$(dbupgrade_scripts)
+
+dist_zmdbdata_DATA = \
+	zm_create.sql \
+	$(dbupgrade_scripts)
+
+dbupgrade_scripts = $(wildcard zm_update-*.sql)
+

db/triggers.sql

@@ -1,248 +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 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;
-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 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;
-      ELSE
-        UPDATE Event_Summaries SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+diff WHERE Event_Summaries.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 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;
-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 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;
-      ELSE
-        UPDATE Event_Summaries SET DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)+diff,0) WHERE Event_Summaries.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 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;
-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 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;
-      ELSE
-        UPDATE Event_Summaries SET WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)+diff,0) WHERE Event_Summaries.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 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;
-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 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;
-      ELSE
-        UPDATE Event_Summaries SET MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)+diff,0) WHERE Event_Summaries.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);
-      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);
-    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;
-    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;
-      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 Event_Summaries
-      SET
-        TotalEventDiskSpace = GREATEST(COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0),0)
-      WHERE Event_Summaries.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);
-  INSERT INTO Event_Summaries (MonitorId,HourEvents,DayEvents,WeekEvents,MonthEvents,TotalEvents) VALUES (NEW.MonitorId,1,1,1,1,1) ON DUPLICATE KEY
-  UPDATE 
-  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;
-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 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;
-  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;
-  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 Monitors.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;
-  END
-//
-
-DELIMITER ;

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') 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',
@@ -183,21 +182,17 @@ CREATE TABLE `Devices` (
 
 DROP TABLE IF EXISTS `Events`;
 CREATE TABLE `Events` (
-  `Id` bigint unsigned NOT NULL auto_increment,
+  `Id` int(10) 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',
   `Frames` int(10) unsigned default NULL,
   `AlarmFrames` int(10) unsigned default NULL,
-  `DefaultVideo` VARCHAR( 64 ) DEFAULT '' NOT NULL,
-  `SaveJPEGs` TINYINT,
   `TotScore` int(10) unsigned NOT NULL default '0',
   `AvgScore` smallint(5) unsigned default '0',
   `MaxScore` smallint(5) unsigned default '0',
@@ -208,70 +203,11 @@ CREATE TABLE `Events` (
   `Messaged` tinyint(3) unsigned NOT NULL default '0',
   `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',
-  `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`)
-) 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,
-  PRIMARY KEY (`EventId`),
-  KEY `Events_Hour_MonitorId_idx` (`MonitorId`),
-  KEY `Events_Hour_StartDateTime_idx` (`StartDateTime`)
-) 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,
-  PRIMARY KEY (`EventId`),
-  KEY `Events_Day_MonitorId_idx` (`MonitorId`),
-  KEY `Events_Day_StartDateTime_idx` (`StartDateTime`)
-) 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,
-  PRIMARY KEY (`EventId`),
-  KEY `Events_Week_MonitorId_idx` (`MonitorId`),
-  KEY `Events_Week_StartDateTime_idx` (`StartDateTime`)
-) 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,
-  PRIMARY KEY (`EventId`),
-  KEY `Events_Month_MonitorId_idx` (`MonitorId`),
-  KEY `Events_Month_StartDateTime_idx` (`StartDateTime`)
-) ENGINE=@ZM_MYSQL_ENGINE@;
-
-
-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,
-  PRIMARY KEY (`EventId`),
-  KEY `Events_Archived_MonitorId_idx` (`MonitorId`)
+  PRIMARY KEY (`Id`,`MonitorId`),
+  KEY `MonitorId` (`MonitorId`),
+  KEY `StartTime` (`StartTime`),
+  KEY `Frames` (`Frames`),
+  KEY `Archived` (`Archived`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
 --
@@ -280,32 +216,18 @@ CREATE TABLE `Events_Archived` (
 
 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`)
+  PRIMARY KEY (`Name`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
 --
@@ -314,16 +236,13 @@ CREATE TABLE `Filters` (
 
 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,
+  `EventId` int(10) unsigned NOT NULL default '0',
   `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,
   `Delta` decimal(8,2) NOT NULL default '0.00',
   `Score` smallint(5) unsigned NOT NULL default '0',
-  PRIMARY KEY (`Id`),
-  INDEX `EventId_idx` (`EventId`),
+  PRIMARY KEY (`EventId`,`FrameId`),
   KEY `Type` (`Type`),
   KEY `TimeStamp` (`TimeStamp`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
@@ -336,75 +255,27 @@ DROP TABLE IF EXISTS `Groups`;
 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,
+  `MonitorIds` tinytext NOT NULL,
   PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
---
--- Table structure for table `Groups_Monitors`
---
-
-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@;
-
-CREATE INDEX `Groups_Monitors_GroupId_idx` ON `Groups_Monitors` (`GroupId`);
-CREATE INDEX `Groups_Monitors_MonitorId_idx` ON `Groups_Monitors` (`MonitorId`);
-
 --
 -- Table structure for table `Logs`
 --
 
 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,
-  `Pid` int(10) DEFAULT NULL,
+  `Pid` smallint(6) DEFAULT NULL,
   `Level` tinyint(3) NOT NULL,
   `Code` char(3) NOT NULL,
   `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@;
 
-CREATE INDEX `Logs_TimeKey_idx` ON `Logs` (`TimeKey`);
-CREATE INDEX `Logs_Level_idx` ON `Logs` (`Level`);
---
--- Table structure for table `Manufacturers`
---
-
-DROP TABLE IF EXISTS `Manufacturers`;
-CREATE TABLE `Manufacturers` (
-  `Id` int(10) unsigned NOT NULL auto_increment,
-  `Name`  varchar(64) NOT NULL,
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY (`Name`)
-) ENGINE=@ZM_MYSQL_ENGINE@;
-
---
--- Table structure for table `Models`
---
-
-DROP TABLE IF EXISTS `Models`;
-CREATE TABLE `Models` (
-  `Id` int(10) unsigned NOT NULL auto_increment,
-  `Name`  varchar(64) NOT NULL,
-  `ManufacturerId` int(10),
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY (`ManufacturerId`,`Name`)
-) ENGINE=@ZM_MYSQL_ENGINE@;
-
 --
 -- Table structure for table `MonitorPresets`
 --
@@ -413,9 +284,9 @@ 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') NOT NULL default 'Local',
   `Device` tinytext,
-  `Channel` tinyint(3) unsigned default NULL,
+  `Channel` tinytext,
   `Format` int(10) unsigned default NULL,
   `Protocol` varchar(16) default NULL,
   `Method` varchar(16) default NULL,
@@ -426,7 +297,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,181 +315,81 @@ 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),
+  `LinkedMonitors` varchar(255) NOT NULL default '',
   `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 '',
+  `Device` varchar(64) NOT NULL default '',
   `Channel` tinyint(3) unsigned NOT NULL default '0',
   `Format` int(10) unsigned NOT NULL default '0',
   `V4LMultiBuffer`	tinyint(1) unsigned,
   `V4LCapturesPerFrame`	tinyint(3) unsigned,
-  `Protocol` varchar(16),
-  `Method` varchar(16) default '',
-  `Host` varchar(64),
+  `Protocol` varchar(16) NOT NULL default '',
+  `Method` varchar(16) NOT NULL default '',
+  `Host` varchar(64) NOT NULL default '',
   `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),
+  `Path` varchar(255) NOT NULL default '',
+  `Options` varchar(255) not null default '',
+  `User` varchar(64) NOT NULL default '',
+  `Pass` varchar(64) NOT NULL default '',
   `Width` smallint(5) unsigned NOT NULL default '0',
   `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),
-  `OutputContainer` enum('auto','mp4','mkv'),
-  `EncoderParameters` TEXT,
-  `RecordAudio` TINYINT NOT NULL DEFAULT '0',
-  `RTSPDescribe` tinyint(1) unsigned,
   `Brightness` mediumint(7) NOT NULL default '-1',
   `Contrast` mediumint(7) NOT NULL default '-1',
   `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) NOT NULL 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,
-  `AnalysisUpdateDelay` smallint(5) unsigned NOT NULL default '0',
   `MaxFPS` decimal(5,2) default NULL,
   `AlarmMaxFPS` decimal(5,2) default NULL,
   `FPSReportInterval` smallint(5) unsigned NOT NULL default '250',
   `RefBlendPerc` tinyint(3) unsigned NOT NULL default '6',
   `AlarmRefBlendPerc` tinyint(3) unsigned NOT NULL default '6',
   `Controllable` tinyint(3) unsigned NOT NULL default '0',
-  `ControlId` int(10) unsigned,
+  `ControlId` int(10) unsigned NOT NULL default '0',
   `ControlDevice` varchar(255) default NULL,
   `ControlAddress` varchar(255) default NULL,
   `AutoStopTimeout` decimal(5,2) default NULL,
   `TrackMotion` tinyint(3) unsigned NOT NULL default '0',
-  `TrackDelay` smallint(5) unsigned,
+  `TrackDelay` smallint(5) unsigned NOT NULL default '0',
   `ReturnLocation` tinyint(3) NOT NULL default '-1',
-  `ReturnDelay` smallint(5) unsigned,
-  `ModectDuringPTZ` tinyint(3) unsigned NOT NULL default '0',
+  `ReturnDelay` smallint(5) 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,
-  `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@;
 
-CREATE INDEX `Monitors_ServerId_idx` ON `Monitors` (`ServerId`);
-
-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=@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@;
-
 --
 -- Table structure for table `States`
--- PP - Added IsActive to track custom run states
--- Also made sure Name is unique
+--
 
 DROP TABLE IF EXISTS `States`;
 CREATE TABLE `States` (
-  `Id` int(10) unsigned NOT NULL auto_increment,
   `Name` varchar(64) NOT NULL default '',
   `Definition` text NOT NULL,
-  `IsActive` tinyint(3) unsigned NOT NULL default '0',
-  PRIMARY KEY (`Id`),
-  UNIQUE KEY (`Name`)
+  PRIMARY KEY (`Name`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
-INSERT INTO States (Name,Definition,IsActive) VALUES ('default','','1');
-
-
---
--- Table structure for table `Servers`
---
-
-DROP TABLE IF EXISTS `Servers`;
-CREATE TABLE `Servers` (
-  `Id` int(10) unsigned NOT NULL auto_increment,
-  `Protocol`  TEXT,
-  `Hostname` TEXT,
-  `Port`      INTEGER UNSIGNED,
-  `PathToIndex`  TEXT,
-  `PathToZMS`  TEXT,
-  `PathToApi`  TEXT,
-  `Name` varchar(64) NOT NULL default '',
-  `State_Id`	int(10) unsigned,
-  `Status` enum('Unknown','NotRunning','Running') NOT NULL default 'Unknown',
-  `CpuLoad` DECIMAL(5,1) default NULL,
-  `TotalMem` bigint unsigned default null,
-  `FreeMem` bigint unsigned default null,
-  `TotalSwap` bigint  unsigned default null,
-  `FreeSwap` bigint unsigned default null, 
-  `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@;
-
-CREATE INDEX `Servers_Name_idx` ON `Servers` (`Name`);
 
 --
 -- Table structure for table `Stats`
@@ -626,13 +397,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,
+  `EventId` int(10) unsigned NOT NULL default '0',
   `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 +413,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`)
@@ -674,21 +440,16 @@ CREATE TABLE `Users` (
   `Id` int(10) unsigned NOT NULL auto_increment,
   `Username` varchar(32) character set latin1 collate latin1_bin NOT NULL default '',
   `Password` varchar(64) NOT NULL default '',
-  `Language` varchar(8),
+  `Language` varchar(8) NOT NULL default '',
   `Enabled` tinyint(3) unsigned NOT NULL default '1',
   `Stream` enum('None','View') NOT NULL default 'None',
   `Events` enum('None','View','Edit') NOT NULL default 'None',
   `Control` enum('None','View','Edit') NOT NULL default 'None',
   `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 '',
+  `MaxBandwidth` varchar(16) NOT NULL default '',
+  `MonitorIds` tinytext NOT NULL,
   PRIMARY KEY (`Id`),
   UNIQUE KEY `UC_Username` (`Username`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
@@ -701,7 +462,7 @@ DROP TABLE IF EXISTS `ZonePresets`;
 CREATE TABLE `ZonePresets` (
   `Id` int(10) unsigned NOT NULL auto_increment,
   `Name` varchar(64) NOT NULL default '',
-  `Type` enum('Active','Inclusive','Exclusive','Preclusive','Inactive','Privacy') NOT NULL default 'Active',
+  `Type` enum('Active','Inclusive','Exclusive','Preclusive','Inactive') NOT NULL default 'Active',
   `Units` enum('Pixels','Percent') NOT NULL default 'Pixels',
   `CheckMethod` enum('AlarmedPixels','FilteredPixels','Blobs') NOT NULL default 'Blobs',
   `MinPixelThreshold` smallint(5) unsigned default NULL,
@@ -729,9 +490,8 @@ 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',
+  `Type` enum('Active','Inclusive','Exclusive','Preclusive','Inactive') NOT NULL default 'Active',
   `Units` enum('Pixels','Percent') NOT NULL default 'Pixels',
   `NumCoords` tinyint(3) unsigned NOT NULL default '0',
   `Coords` tinytext NOT NULL,
@@ -756,26 +516,6 @@ CREATE TABLE `Zones` (
   KEY `MonitorId` (`MonitorId`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
-DROP TABLE IF EXISTS `Storage`;
-CREATE TABLE `Storage` (
-	`Id`	smallint(5) unsigned NOT NULL auto_increment,
-	`Path`	varchar(64)	NOT NULL default '',
-	`Name`	varchar(64) NOT NULL default '',
-	`Type`	enum('local','s3fs') NOT NULL default 'local',
-  `Url` varchar(255) default NULL,
-  `DiskSpace`   bigint default NULL,
-  `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 );
-
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
 /*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
@@ -791,261 +531,103 @@ 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','','');
 
 --
 -- 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 ('PurgeWhenFull','{"sort_field":"Id","terms":[{"val":0,"attr":"Archived","op":"="},{"cnj":"and","val":95,"attr":"DiskPercent","op":">="}],"limit":100,"sort_asc":1}',0,0,0,0,0,0,'',1,1);
 
 --
 -- 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);
 --
 -- 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);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, mpjpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&req_fps=5',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, mpjpeg, B&W','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&color=0',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, mpjpeg, B&W','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&color=0',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, mpjpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&req_fps=5',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,5.0,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, mpjpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&req_fps=5',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,5.0,1,4,NULL,'<ip-address>:<port>',100,100);
-INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, unicast','Remote','rtsp',0,255,'rtsp','rtpUni','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, multicast','Remote','rtsp',0,255,'rtsp','rtpMulti','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, RTP/RTSP','Remote','rtsp',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, 320x240, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, mpjpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&req_fps=5',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, mpjpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&req_fps=5',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 320x240, mpjpeg, B&W','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&color=0',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP, 640x480, mpjpeg, B&W','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&color=0',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, mpjpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=320x240&req_fps=5',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 320x240, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=320x240',NULL,320,240,3,5.0,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, mpjpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/mjpg/video.cgi?resolution=640x480&req_fps=5',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,NULL,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Axis IP PTZ, 640x480, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/axis-cgi/jpg/image.cgi?resolution=640x480',NULL,640,480,3,5.0,1,4,NULL,'<ip-address>:<port>',100,100);
+INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, unicast','Remote','rtsp','rtpUni',NULL,NULL,NULL,'<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, multicast','Remote','rtsp','rtpMulti',NULL,NULL,NULL,'<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, RTP/RTSP','Remote','rtsp','rtpRtsp',NULL,NULL,NULL,'<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT into MonitorPresets VALUES (NULL,'Axis IP, mpeg4, RTP/RTSP/HTTP','Remote',NULL,NULL,NULL,'rtsp','rtpRtspHttp','<ip-address>',554,'/mpeg4/media.amp','/trackID=',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'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);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 640x480, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 640x480, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 640x480, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 320x240, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 320x240, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 320x240, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,5.0,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 640x480, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/nphMotionJpeg?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 640x480, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 640x480, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,5.0,1,5,NULL,'<ip-address>:<port>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, jpeg, max 5 FPS','Remote','http',0,0,'http','simple','<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/GetData.cgi',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, mpjpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'IP Webcam by Pavel Khlebovich 1920x1080','Remote','/dev/video<?>','0',255,'http','simple','<ip-address>','8080','/video','',1920,1080,0,NULL,0,'0','','',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'VEO Observer, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Blue Net Video Server, jpeg','Remote','http',0,0,'http','simple','<ip-address>',80,'/cgi-bin/image.cgi?control=0&id=admin&passwd=admin',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 320x240, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/nphMotionJpeg?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 320x240, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 320x240, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 640x480, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/nphMotionJpeg?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 640x480, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP, 640x480, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 320x240, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/nphMotionJpeg?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 320x240, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 320x240, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=320x240&Quality=Standard',NULL,320,240,3,5.0,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 640x480, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/nphMotionJpeg?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 640x480, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,NULL,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Panasonic IP PTZ, 640x480, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/SnapshotJPEG?Resolution=640x480&Quality=Standard',NULL,640,480,3,5.0,1,5,NULL,'<ip-address>:<port>',100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, jpeg, max 5 FPS','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/GetData.cgi',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Gadspot IP, mpjpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'VEO Observer, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/Jpeg/CamImg.jpg',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'Blue Net Video Server, jpeg','Remote','http','simple',NULL,NULL,NULL,'<ip-address>',80,'/cgi-bin/image.cgi?control=0&id=admin&passwd=admin',NULL,320,240,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT into MonitorPresets VALUES (NULL,'ACTi IP, mpeg4, unicast','Remote',NULL,NULL,NULL,'rtsp','rtpUni','<ip-address>',7070,'','/track',NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Axis FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://<host/address>/axis-media/media.amp?videocodec=h264',NULL,NULL,NULL,640,480,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Vivotek FFMPEG','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://<host/address>:554/live.sdp',NULL,NULL,NULL,352,240,NULL,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Axis FFMPEG','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://<host/address>/axis-media/media.amp',NULL,NULL,NULL,640,480,NULL,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'ACTi TCM FFMPEG','Ffmpeg',NULL,NULL,NULL,NULL,NULL,'rtsp://admin:123456@<host/address>:7070',NULL,NULL,NULL,320,240,NULL,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 320x240','Local','/dev/video<?>',0,255,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 320x240, max 5 FPS','Local','/dev/video<?>',0,255,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 640x480','Local','/dev/video<?>',0,255,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 640x480, max 5 FPS','Local','/dev/video<?>',0,255,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 320x240','Local','/dev/video<?>',0,45056,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 320x240, max 5 FPS','Local','/dev/video<?>',0,45056,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 640x480','Local','/dev/video<?>',0,45056,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 640x480, max 5 FPS','Local','/dev/video<?>',0,45056,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 320x240','Local','/dev/video<?>',0,0,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 320x240, max 5 FPS','Local','/dev/video<?>',0,0,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 640x480','Local','/dev/video<?>',0,0,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 640x480, max 5 FPS','Local','/dev/video<?>',0,0,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 320x240','Local','/dev/video<?>',0,1,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 320x240, max 5 FPS','Local','/dev/video<?>',0,1,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,5.0,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 640x480','Local','/dev/video<?>',0,1,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 640x480, max 5 FPS','Local','/dev/video<?>',0,1,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 320x240','Local','/dev/video<?>','<?>',255,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 320x240, max 5 FPS','Local','/dev/video<?>','<?>',255,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 640x480','Local','/dev/video<?>','<?>',255,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), PAL, 640x480, max 5 FPS','Local','/dev/video<?>','<?>',255,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 320x240','Local','/dev/video<?>','<?>',45056,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 320x240, max 5 FPS','Local','/dev/video<?>','<?>',45056,NULL,'v4l2',NULL,NULL,NULL,NULL,320,240,1345466932,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 640x480','Local','/dev/video<?>','<?>',45056,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L2), NTSC, 640x480, max 5 FPS','Local','/dev/video<?>','<?>',45056,NULL,'v4l2',NULL,NULL,NULL,NULL,640,480,1345466932,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 320x240','Local','/dev/video<?>','<?>',0,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 320x240, max 5 FPS','Local','/dev/video<?>','<?>',0,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 640x480','Local','/dev/video<?>','<?>',0,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), PAL, 640x480, max 5 FPS','Local','/dev/video<?>','<?>',0,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 320x240','Local','/dev/video<?>','<?>',1,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 320x240, max 5 FPS','Local','/dev/video<?>','<?>',1,NULL,'v4l1',NULL,NULL,NULL,NULL,320,240,13,5.0,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 640x480','Local','/dev/video<?>','<?>',1,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,NULL,0,NULL,NULL,NULL,100,100);
+INSERT INTO MonitorPresets VALUES (NULL,'BTTV Video (V4L1), NTSC, 640x480, max 5 FPS','Local','/dev/video<?>','<?>',1,NULL,'v4l1',NULL,NULL,NULL,NULL,640,480,13,5.0,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Remote ZoneMinder','Remote',NULL,NULL,NULL,'http','simple','<ip-address>',80,'/cgi-bin/nph-zms?mode=jpeg&monitor=<monitor-id>&scale=100&maxfps=5&buffer=0',NULL,NULL,NULL,3,NULL,0,NULL,NULL,NULL,100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Foscam FI8620 FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,'','','','rtsp://<username>:<pwd>@<ip-address>:554/11',NULL,704,576,0,NULL,1,'10','<admin_pwd>','<ip-address>',100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Foscam FI8608W FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,'','','','rtsp://<username>:<pwd>@<ip-address>:554/11',NULL,640,480,0,NULL,1,'11','<admin_pwd>','<ip-address>',100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Foscam FI9821W FFMPEG H.264','Ffmpeg',NULL,NULL,NULL,NULL,'','','','rtsp://<username>:<pwd>@<ip-address>:88/videoMain',NULL,1280,720,0,NULL,1,'12','<admin_pwd>','<ip-address>',100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Loftek Sentinel PTZ, 640x480, mjpeg','Remote','http',0,0,NULL,NULL,'<ip-address>','80','/videostream.cgi?user=<username>&pwd=<password>&resolution=32&rate=11',NULL,640,480,4,NULL,1,'13','','<username>:<pwd>@<ip-address>',100,100);
 INSERT INTO MonitorPresets VALUES (NULL,'Airlink 777W PTZ, 640x480, mjpeg','Remote','http',0,0,NULL,NULL,'<username>:<password>@<ip-address>','80','/cgi/mjpg/mjpg.cgi',NULL,640,480,4,NULL,1,'7','','<username>:<pwd>@<ip-address>',100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'SunEyes SP-P1802SWPTZ','Libvlc','/dev/video<?>','0',255,'','rtpMulti','','80','rtsp://<ip-address>:554/11','',1920,1080,0,0.00,1,'16','-speed=64','<ip-address>:<port>',100,33);
-INSERT INTO MonitorPresets VALUES (NULL,'Qihan IP, 1280x720, RTP/RTSP','Ffmpeg','rtsp',0,255,'rtsp','rtpRtsp',NULL,554,'rtsp://<ip-address>/tcp_live/ch0_0',NULL,1280,720,3,NULL,0,NULL,NULL,NULL,100,100);
-INSERT INTO MonitorPresets VALUES (NULL,'Qihan IP, 1920x1080, RTP/RTSP','Ffmpeg','rtsp',0,255,'rtsp','rtpRtsp',NULL,554,'rtsp://<ip-address>/tcp_live/ch0_0',NULL,1920,1080,3,NULL,0,NULL,NULL,NULL,100,100);
 
 --
 -- Add some zone preset values
@@ -1058,63 +640,6 @@ INSERT INTO ZonePresets VALUES (5,'Best, low sensitivity','Active','Percent','Bl
 INSERT INTO ZonePresets VALUES (6,'Best, medium sensitivity','Active','Percent','Blobs',40,NULL,16,NULL,5,5,12,NULL,10,NULL,1,NULL,0,0);
 INSERT INTO ZonePresets VALUES (7,'Best, high sensitivity','Active','Percent','Blobs',20,NULL,8,NULL,3,3,6,NULL,5,NULL,1,NULL,0,0);
 
-DROP TABLE IF EXISTS Maps;
-
-CREATE TABLE Maps (
-  `Id` int(10) unsigned NOT NULL auto_increment,
-  `Name`      VARCHAR(64) NOT NULL,
-  `Filename`  VARCHAR(64) NOT NULL default '',
-  `NumCoords` tinyint(3) unsigned NOT NULL default '0',
-  `Coords` tinytext NOT NULL,
-  `ParentId`   int(1) unsigned,
-  PRIMARY KEY (`Id`)
-);
-
-DROP TABLE IF EXISTS MontageLayouts;
-
-CREATE TABLE MontageLayouts (
-  `Id` int(10) unsigned NOT NULL auto_increment,
-  `Name`    TEXT  NOT NULL,
-  `Positions` LONGTEXT,
-  /*`Positions` JSON,*/
-  PRIMARY KEY (`Id`)
-);
-
-INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('Freeform', '{ "default":{"float":"left","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
-INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('2 Wide', '{ "default":{"float":"left", "width":"49%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
-INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('3 Wide', '{ "default":{"float":"left", "width":"33%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
-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
 --
 -- Apply the initial configuration
 --

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;

db/zm_update-1.28.1.sql

@@ -1 +0,0 @@
-ALTER TABLE Monitors MODIFY Device tinytext;

db/zm_update-1.28.100.sql

@@ -1,22 +0,0 @@
---
--- This updates a 1.28.99 database to 1.28.100
---
-
---
--- Add ServerId column to Monitors
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-    FROM INFORMATION_SCHEMA.COLUMNS
-    WHERE table_name = 'Monitors'
-    AND table_schema = DATABASE()
-    AND column_name = 'ServerId'
-    ) > 0,
-"SELECT 'Column ServerId exists in Monitors'",
-"ALTER TABLE Monitors ADD `ServerId` int(10) unsigned AFTER `Name`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-

db/zm_update-1.28.101.sql

@@ -1,22 +0,0 @@
---
--- This updates a 1.28.100 database to 1.28.101
---
-
---
--- Add Groups column to Users
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-    FROM INFORMATION_SCHEMA.COLUMNS
-    WHERE table_name = 'Users'
-    AND table_schema = DATABASE()
-    AND column_name = 'Groups'
-    ) > 0,
-"SELECT 'Column Groups exists in Users'",
-"ALTER TABLE Users ADD COLUMN `Groups` ENUM('None','View','Edit') NOT NULL DEFAULT 'None' AFTER `Monitors`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-

db/zm_update-1.28.102.sql

@@ -1,17 +0,0 @@
---
--- Add Monitor Exif field
--- Used to enable or disable processing of the remote camera RTSP DESCRIBE response header
---
-SET @s = (SELECT IF(
-	(SELECT COUNT(*)
-	FROM INFORMATION_SCHEMA.COLUMNS
-	WHERE table_name = 'Monitors'
-	AND table_schema = DATABASE()
-	AND column_name = 'Exif'
-	) > 0,
-"SELECT 'Column Exif already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `Exif` tinyint(1) unsigned NOT NULL default '0' AFTER `WebColour`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.28.103.sql

@@ -1,22 +0,0 @@
---
--- This updates a 1.28.102 database to 1.28.103
---
-
---
--- Add LabelSize column to Monitors
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-    FROM INFORMATION_SCHEMA.COLUMNS
-    WHERE table_name = 'Monitors'
-    AND table_schema = DATABASE()
-    AND column_name = 'LabelSize'
-    ) > 0,
-"SELECT 'Column LabelSize exists in Monitors'",
-"ALTER TABLE Monitors ADD `LabelSize` smallint(5) unsigned NOT NULL DEFAULT '1' AFTER `LabelY`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-

db/zm_update-1.28.104.sql

@@ -1,40 +0,0 @@
---
--- This updates a 1.28.103 database to 1.28.104
---
-
---
--- Add AnalysisFPS column to Monitors
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-    FROM INFORMATION_SCHEMA.COLUMNS
-    WHERE table_name = 'Monitors'
-    AND table_schema = DATABASE()
-    AND column_name = 'AnalysisFPS'
-    ) > 0,
-"SELECT 'Column AnalysisFPS exists in Monitors'",
-"ALTER TABLE Monitors ADD `AnalysisFPS` decimal(5,2) default NULL AFTER `MotionFrameSkip`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
---
--- Add AnalysisUpdateDelay column to Monitors
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-    FROM INFORMATION_SCHEMA.COLUMNS
-    WHERE table_name = 'Monitors'
-    AND table_schema = DATABASE()
-    AND column_name = 'AnalysisUpdateDelay'
-    ) > 0,
-"SELECT 'Column AnalysisUpdateDelay exists in Monitors'",
-"ALTER TABLE Monitors ADD `AnalysisUpdateDelay` smallint(5) unsigned not null default 0 AFTER `AnalysisFPS`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-

db/zm_update-1.28.105.sql

@@ -1,10 +0,0 @@
---
--- This updates a 1.28.104 database to 1.28.105
---
-
---
--- Add Privacy type to Zone Types
---
-
-alter table Zones       modify Type enum('Active','Inclusive','Exclusive','Preclusive','Inactive','Privacy') NOT NULL DEFAULT 'Active';
-alter table ZonePresets modify Type enum('Active','Inclusive','Exclusive','Preclusive','Inactive','Privacy') NOT NULL DEFAULT 'Active';

db/zm_update-1.28.106.sql

@@ -1,21 +0,0 @@
---
--- This updates a 1.28.105 database to 1.28.106
---
-
---
--- Add Monitor RTSPDescribe field
--- Used to enable or disable processing of the remote camera RTSP DESCRIBE response header
---
-SET @s = (SELECT IF(
-	(SELECT COUNT(*)
-	FROM INFORMATION_SCHEMA.COLUMNS
-	WHERE table_name = 'Monitors'
-	AND table_schema = DATABASE()
-	AND column_name = 'RTSPDescribe'
-	) > 0,
-"SELECT 'Column RTSPDescribe already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `RTSPDescribe` tinyint(1) unsigned NOT NULL default '0' AFTER `Deinterlacing`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.28.107.sql

@@ -1,21 +0,0 @@
---
--- This updates a 1.28.106 database to 1.28.107
---
-
---
--- Update Frame table to have a PrimaryKey of ID, insetad of a Composite Primary Key
--- Used primarially for compatibility with CakePHP
---
-SET @s = (SELECT IF(
-	(SELECT COUNT(*)
-	FROM INFORMATION_SCHEMA.COLUMNS
-	WHERE table_name = 'Frames'
-	AND table_schema = DATABASE()
-	AND column_name = 'Id'
-	) > 0,
-"SELECT 'Column ID already exists in Frames'",
-"ALTER TABLE `Frames` ADD COLUMN `Id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT FIRST, DROP PRIMARY KEY, ADD PRIMARY KEY(`Id`)"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.28.108.sql

@@ -1,22 +0,0 @@
---
--- This updates a 1.28.107 database to 1.28.108
---
-
---
--- Update Frame table to have an Index on EventId, per the change made in 1.28.107
---
-SET @s = (SELECT IF(
-	(SELECT COUNT(*)
-	FROM INFORMATION_SCHEMA.STATISTICS
-	WHERE table_name = 'Frames'
-	AND table_schema = DATABASE()
-	AND index_name = 'EventId_idx'
-	) > 0,
-"SELECT 'EventId Index already exists on Frames table'",
-"CREATE INDEX `EventId_idx` ON `Frames` (`EventId`)"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-

db/zm_update-1.28.109.sql

@@ -1,21 +0,0 @@
---
--- This updates a 1.28.108 database to 1.28.109
---
-
---
--- Update Frame table to have a PrimaryKey of ID, insetad of a Composite Primary Key
--- Used primarially for compatibility with CakePHP
---
-SET @s = (SELECT IF(
-	(SELECT COUNT(*)
-	FROM INFORMATION_SCHEMA.COLUMNS
-	WHERE table_name = 'Servers'
-	AND table_schema = DATABASE()
-	AND column_name = 'Hostname'
-	) > 0,
-"SELECT 'Column Hostname already exists in Servers'",
-"ALTER TABLE `Servers` ADD COLUMN `Hostname` TEXT AFTER Name"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.28.110.sql

@@ -1,17 +0,0 @@
---
--- This updates a 1.28.109 database to 1.28.110
---
-
-SET @s = (SELECT IF(
-	(SELECT COUNT(*)
-	FROM INFORMATION_SCHEMA.COLUMNS
-	WHERE table_name = 'Logs'
-	AND table_schema = DATABASE()
-	AND column_name = 'ServerId'
-	) > 0,
-"SELECT 'Column ServerId already exists in Logs'",
-"ALTER TABLE `Logs` ADD COLUMN `ServerId`  int(10) unsigned AFTER Component"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.28.99.sql

@@ -1,223 +0,0 @@
---
--- This updates a 1.28.10 database to 1.28.99
---
-
---
--- Add Controls definition for ONVIF
--- 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, */
-
-    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 */
-  )"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-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';
-
---
--- Add Id column to State
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-    FROM INFORMATION_SCHEMA.COLUMNS
-    WHERE table_name = 'States'
-    AND table_schema = DATABASE()
-    AND column_name = 'Id'
-    ) > 0,
-"SELECT 'Column Id exists in States'",
-"ALTER TABLE States DROP PRIMARY KEY, ADD `Id` int(10) unsigned auto_increment NOT NULL PRIMARY KEY FIRST"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
--- PP:The States table will be updated to have a new column called IsActive
--- used to keep track of which custom state is active (if any)
-SET @s = (SELECT IF(
-	(SELECT COUNT(*)
-	FROM INFORMATION_SCHEMA.COLUMNS
-	WHERE table_name = 'States'
-	AND table_schema = DATABASE()
-	AND column_name = 'IsActive'
-	) > 0,
-"SELECT 'Column IsActive  exists in States'",
-"ALTER TABLE `States` ADD `IsActive` tinyint(3) unsigned not null default 0 AFTER `Definition`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
--- PP:If default state does not exist, create it and set its IsActive to 1
-INSERT INTO States (Name,Definition,IsActive) 
-	SELECT * FROM (SELECT 'default', '', '1') AS tmp
-	WHERE NOT EXISTS (
-		SELECT Name FROM States WHERE Name = 'default'
-	) LIMIT 1;
-
--- PP:Start with a sane isActive state
-UPDATE States SET IsActive = '0';
-UPDATE States SET IsActive = '1' WHERE Name = 'default'; 
-
--- PP:Finally convert States to make sure Names are unique
--- If duplicate states existed while upgrading, that is
--- very likely an error that ZM allowed earlier, so
--- we are picking up the first one and deleting the others
-ALTER TABLE States ADD UNIQUE (Name);
-
-SET @s = (SELECT IF( 
-    (SELECT COUNT(*)
-    FROM INFORMATION_SCHEMA.TABLES
-    WHERE table_name = 'Servers'
-    AND table_schema = DATABASE()
-    ) > 0,
-"SELECT 'Servers table exists'",
-"CREATE TABLE `Servers` (
-  `Id` int(10) unsigned NOT NULL auto_increment,
-  `Name` varchar(64) NOT NULL default '',
-  `State_Id`    int(10) unsigned,
-  PRIMARY KEY (`Id`)
-)"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-

db/zm_update-1.29.0.sql

@@ -1,5 +0,0 @@
---
--- This updates a 1.28.110 database to 1.29.0
---
--- No changes required
---

db/zm_update-1.30.0.sql

@@ -1,5 +0,0 @@
---
--- This updates a 1.29.1 database to 1.30.0
---
--- No changes required
---

db/zm_update-1.30.1.sql

@@ -1,110 +0,0 @@
---
--- This updates a 1.28.108 database to 1.28.109
---
-
---
--- Add Controls definition for Vivotek ePTZ
---
-INSERT INTO Controls 
-SELECT * FROM (SELECT NULL as Id,
-                    'Vivotek ePTZ' as Name,
-                    'Remote' as Type,
-                    'Vivotek_ePTZ' 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,
-                    1 as HasZoomSpeed,
-                    0 as MinZoomSpeed,
-                    5 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,
-                    0 as NumPresets,
-                    0 as HasHomePreset,
-                    0 as CanSetPresets,
-                    1 as CanMove,
-                    0 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,
-                    1 as HasPanSpeed,
-                    0 as MinPanSpeed,
-                    5 as MaxPanSpeed,
-                    0 as HasTurboPan,
-                    0 as TurboPanSpeed,
-                    1 as CanTilt,
-                    0 as MinTiltRange,
-                    0 as MaxTiltRange,
-                    0 as MinTiltStep,
-                    0 as MaxTiltStep,
-                    1 as HasTiltSpeed,
-                    0 as MinTiltSpeed,
-                    5 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 = 'Vivotek ePTZ'
-) LIMIT 1;

db/zm_update-1.30.2.sql

@@ -1,5 +0,0 @@
---
--- This updates a 1.30.1 database to 1.30.2
---
-
-ALTER TABLE Users MODIFY MonitorIds TEXT NOT NULL;

db/zm_update-1.30.3.sql

@@ -1,5 +0,0 @@
---
--- This updates a 1.30.2 database to 1.30.3
---
--- No changes required
---

db/zm_update-1.30.4.sql

@@ -1,5 +0,0 @@
---
--- This updates a 1.30.3 database to 1.30.4
---
--- No changes required
---

db/zm_update-1.31.0.sql

@@ -1,101 +0,0 @@
---
--- This updates a 1.29.0 database to 1.30.0
---
-SELECT 'Checking for SaveJPEGs in Monitors';
-SET @s = (SELECT IF(
-	(SELECT COUNT(*)
-	FROM INFORMATION_SCHEMA.COLUMNS
-	WHERE table_name = 'Monitors'
-	AND table_schema = DATABASE()
-	AND column_name = 'SaveJPEGs'
-	) > 0,
-"SELECT 'Column SaveJPEGs exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `SaveJPEGs` TINYINT NOT NULL DEFAULT '3' AFTER `Deinterlacing`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SELECT 'Checking for VideoWriter in Monitors';
-SET @s = (SELECT IF(
-	(SELECT COUNT(*)
-	FROM INFORMATION_SCHEMA.COLUMNS
-	WHERE table_name = 'Monitors'
-	AND table_schema = DATABASE()
-	AND column_name = 'VideoWriter'
-	) > 0,
-"SELECT 'Column VideoWriter exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `VideoWriter` TINYINT NOT NULL DEFAULT '0' AFTER `SaveJPEGs`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SELECT 'Checking for EncoderParameters in Monitors';
-SET @s = (SELECT IF(
-	(SELECT COUNT(*)
-	FROM INFORMATION_SCHEMA.COLUMNS
-	WHERE table_name = 'Monitors'
-	AND table_schema = DATABASE()
-	AND column_name = 'EncoderParameters'
-	) > 0,
-"SELECT 'Column EncoderParameters exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `EncoderParameters` TEXT NOT NULL AFTER `VideoWriter`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SELECT 'Checking for DefaultVideo in Events';
-SET @s = (SELECT IF(
-	(SELECT COUNT(*)
-	FROM INFORMATION_SCHEMA.COLUMNS
-	WHERE table_name = 'Events'
-	AND table_schema = DATABASE()
-	AND column_name = 'DefaultVideo'
-	) > 0,
-"SELECT 'Column DefaultVideo exists in Events'",
-"ALTER TABLE `Events` ADD `DefaultVideo` VARCHAR( 64 ) NOT NULL default '' AFTER `AlarmFrames`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SELECT 'Checking for RecordAudio in Monitors';
-SET @s = (SELECT IF(
-	(SELECT COUNT(*)
-	FROM INFORMATION_SCHEMA.COLUMNS
-	WHERE table_name = 'Monitors'
-	AND table_schema = DATABASE()
-	AND column_name = 'RecordAudio'
-	) > 0,
-"SELECT 'Column RecordAudio exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `RecordAudio` TINYINT NOT NULL DEFAULT '0' AFTER `EncoderParameters`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
---
--- The following alters various columns to allow NULLs
---
-
-ALTER TABLE Monitors MODIFY Host varchar(64);
-ALTER TABLE Monitors MODIFY LabelFormat varchar(64);
-ALTER TABLE Monitors MODIFY LinkedMonitors varchar(255);
-ALTER TABLE Monitors MODIFY Options varchar(255);
-ALTER TABLE Monitors MODIFY Protocol varchar(16);
-ALTER TABLE Monitors MODIFY User varchar(64);
-ALTER TABLE Monitors MODIFY Pass varchar(64);
-ALTER TABLE Monitors MODIFY RTSPDescribe tinyint(1) unsigned;
-ALTER TABLE Monitors MODIFY ControlId int(10) unsigned;
-ALTER TABLE Monitors MODIFY TrackDelay smallint(5) unsigned;
-ALTER TABLE Monitors MODIFY ReturnDelay smallint(5) unsigned;
-ALTER TABLE Monitors MODIFY EncoderParameters TEXT;
-ALTER TABLE Monitors MODIFY Path varchar(255);
-ALTER TABLE Monitors MODIFY V4LMultiBuffer tinyint(1) unsigned;
-
-ALTER TABLE Users MODIFY MonitorIds tinytext;
-ALTER TABLE Users MODIFY Language varchar(8);
-ALTER TABLE Users MODIFY MaxBandwidth varchar(16);
-

db/zm_update-1.31.1.sql

@@ -1,21 +0,0 @@
---
--- This updates a 1.30.0 database to 1.30.1
---
--- Add StateId Column to Events.
---
-SELECT 'Checkfor StateId IN Events';
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-    FROM INFORMATION_SCHEMA.COLUMNS
-    WHERE table_name = 'Events'
-    AND table_schema = DATABASE()
-    AND column_name = 'StateId'
-    ) > 0,
-"SELECT 'Column StateId exists in Events'",
-"ALTER TABLE Events ADD `StateId` int(10) unsigned default NULL AFTER `Notes`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-

db/zm_update-1.31.10.sql

@@ -1,122 +0,0 @@
---
--- Add Type column to Storage 
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Servers'
-     AND column_name = 'Status'
-    ) > 0,
-"SELECT 'Column Status already exists in Servers'",
-"ALTER TABLE Servers ADD `Status`  enum('Unknown','NotRunning','Running') NOT NULL default 'Unknown' AFTER `State_Id`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Servers'
-     AND column_name = 'CpuLoad'
-    ) > 0,
-"SELECT 'Column CpuLoad already exists in Servers'",
-"ALTER TABLE Servers ADD `CpuLoad` DECIMAL(5,1) default NULL AFTER `Status`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Servers'
-     AND column_name = 'TotalMem'
-    ) > 0,
-"SELECT 'Column TotalMem already exists in Servers'",
-"ALTER TABLE Servers ADD `TotalMem` bigint unsigned default null AFTER `CpuLoad`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Servers'
-     AND column_name = 'FreeMem'
-    ) > 0,
-"SELECT 'Column FreeMem already exists in Servers'",
-"ALTER TABLE Servers ADD `FreeMem` bigint unsigned default null AFTER `TotalMem`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Servers'
-     AND column_name = 'TotalSwap'
-    ) > 0,
-"SELECT 'Column TotalSwap already exists in Servers'",
-"ALTER TABLE Servers ADD `TotalSwap` bigint unsigned default null AFTER `FreeMem`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Servers'
-     AND column_name = 'FreeSwap'
-    ) > 0,
-"SELECT 'Column FreeSwap already exists in Servers'",
-"ALTER TABLE Servers ADD `FreeSwap` bigint unsigned default null AFTER `TotalSwap`"
-));
-
-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 = 'Status'
-    ) > 0,
-"SELECT 'Column Status already exists in Monitors'",
-"ALTER TABLE Monitors ADD `Status`  enum('Unknown','NotRunning','Running','NoSignal','Signal') NOT NULL default 'Unknown' AFTER `Sequence`"
-));
-
-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 = 'CaptureFPS'
-    ) > 0,
-"SELECT 'Column CaptureFPS already exists in Monitors'",
-"ALTER TABLE Monitors ADD `CaptureFPS`  DECIMAL(10,2) NOT NULL default 0 AFTER `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 = 'AnalysisFPSLimit'
-    ) > 0,
-"SELECT 'Column AnalysisFPSLimit already exists in Monitors'",
-"ALTER TABLE Monitors CHANGE COLUMN `AnalysisFPS` `AnalysisFPSLimit` DECIMAL(5,2) 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 = 'Monitors'
-     AND column_name = 'AnalysisFPS'
-    ) > 0,
-"SELECT 'Column AnalysisFPS already exists in Monitors'",
-"ALTER TABLE Monitors ADD `AnalysisFPS`  DECIMAL(5,2) NOT NULL default 0 AFTER `CaptureFPS`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.11.sql

@@ -1,70 +0,0 @@
---
--- Add UpdateDiskSpace action to Filters
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Filters'
-     AND column_name = 'UpdateDiskSpace'
-    ) > 0,
-"SELECT 'Column UpdateDiskSpace already exists in Filters'",
-"ALTER TABLE Filters ADD `UpdateDiskSpace` tinyint(3) unsigned NOT NULL default '0' AFTER `AutoDelete`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
---
--- Update Logs table to have some Indexes
---
-SET @s = (SELECT IF(
-  (SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.STATISTICS
-  WHERE table_name = 'Logs'
-  AND table_schema = DATABASE()
-  AND index_name = 'Logs_TimeKey_idx'
-  ) > 0,
-"SELECT 'Logs_TimeKey_idx already exists on Logs table'",
-"CREATE INDEX `Logs_TimeKey_idx` ON `Logs` (`TimeKey`)"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-  (SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.STATISTICS
-  WHERE table_name = 'Logs'
-  AND table_schema = DATABASE()
-  AND index_name = 'Logs_Level_idx'
-  ) > 0,
-"SELECT 'Logs_Level_idx already exists on Logs table'",
-"CREATE INDEX `Logs_Level_idx` ON `Logs` (`Level`)"
-));
-
-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 = 'OutputCodec'
-    ) > 0,
-"SELECT 'Column OutputCodec already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `OutputCodec`     enum('h264','mjpeg') AFTER `VideoWriter`"
-));
-
-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 = 'OutputContainer'
-    ) > 0,
-"SELECT 'Column OutputContainer already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `OutputContainer` enum('mp4','mkv') AFTER `OutputCodec`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-

db/zm_update-1.31.12.sql

@@ -1,67 +0,0 @@
---
--- This adds Manufacturers and Models
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-      FROM INFORMATION_SCHEMA.TABLES
-      WHERE table_name = 'MontageLayouts'
-      AND table_schema = DATABASE()
-    ) > 0,
-    "SELECT 'MontageLayouts table exists'",
-    "
- CREATE TABLE MontageLayouts (
-  `Id` int(10) unsigned NOT NULL auto_increment,
-  `Name`    TEXT  NOT NULL,
-  `Positions` LONGTEXT,
-  PRIMARY KEY (`Id`)
-);
-"
-  ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-DELETE FROM MontageLayouts WHERE Name IN ('Freeform','2 Wide','3 Wide','4 Wide','5 Wide');
-
-SET @s = ( SELECT IF(
-    (SELECT COUNT(*) FROM MontageLayouts WHERE Name='Freeform') > 0,
-      "SELECT 'Freeform already in layouts'",
-'INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES (\'Freeform\', \'{"default":{"float":"left","position":"relative","left":"0px","right":"0px","top":"0px","bottom":"0px"}}\');' 
-) );
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = ( SELECT IF(
-    (SELECT COUNT(*) FROM MontageLayouts WHERE Name='2 Wide') > 0,
-"SELECT '2 Wide already in layouts'",
-'INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES (\'2 Wide\', \'{"default":{"float":"left","position":"relative","width":"49%","left":"0px","right":"0px","top":"0px","bottom":"0px"}}\');'
-) );
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = ( SELECT IF(
-    (SELECT COUNT(*) FROM MontageLayouts WHERE Name='3 Wide') > 0,
-      "SELECT '3 Wide already in layouts'",
-'INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES (\'3 Wide\', \'{"default":{"float":"left","position":"relative","width":"33%","left":"0px","right":"0px","top":"0px","bottom":"0px"}}\');'
-) );
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = ( SELECT IF(
-    (SELECT COUNT(*) FROM MontageLayouts WHERE Name='4 Wide') > 0,
-      "SELECT '4 Wide already in layouts'",
-'INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES (\'4 Wide\', \'{"default":{"float":"left","position":"relative","width":"24.5%","left":"0px","right":"0px","top":"0px","bottom":"0px"}}\');'
-) );
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = ( SELECT IF(
-    (SELECT COUNT(*) FROM MontageLayouts WHERE Name='5 Wide') > 0,
-      "SELECT '5 Wide already in layouts'",
-      'INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES (\'5 Wide\', \'{"default":{"float":"left","position":"relative","width":"19%"}}\' );'
-) );
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.13.sql

@@ -1,28 +0,0 @@
-ALTER TABLE `Monitors` MODIFY `OutputCodec` enum('h264','mjpeg','mpeg1','mpeg2') default 'h264';
-ALTER TABLE `Monitors` MODIFY `OutputContainer` enum('auto','mp4','mkv') default 'auto';
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Events'
-     AND column_name = 'SaveJPEGs'
-    ) > 0,
-"SELECT 'Column SaveJPEGs already exists in Events'",
-"ALTER TABLE `Events` ADD `SaveJPEGs` TINYINT AFTER `DefaultVideo`"
-));
-
-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'
-     AND column_name = 'DiskSpace'
-    ) > 0,
-"SELECT 'Column DiskSpace already exists in Events'",
-"ALTER TABLE `Storage` ADD `DiskSpace`   bigint unsigned default NULL AFTER `Type`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.14.sql

@@ -1,148 +0,0 @@
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'TotalEvents'
-    ) > 0,
-"SELECT 'Column TotalEvents already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `TotalEvents` INT(10) AFTER `AnalysisFPS`"
-));
-
-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,
-"SELECT 'Column TotalEventDiskSpace already exists in Monitors'",
-"ALTER TABLE `Monitors` 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 = 'HourEvents'
-    ) > 0,
-"SELECT 'Column HourEvents already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `HourEvents` INT(10) 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 = 'HourEventDiskSpace'
-    ) > 0,
-"SELECT 'Column HourEventDiskSpace already exists in Monitors'",
-"ALTER TABLE `Monitors` 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 = 'DayEvents'
-    ) > 0,
-"SELECT 'Column DayEvents already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `DayEvents` INT(10) 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 = 'DayEventDiskSpace'
-    ) > 0,
-"SELECT 'Column DayEventDiskSpace already exists in Monitors'",
-"ALTER TABLE `Monitors` 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 = 'WeekEvents'
-    ) > 0,
-"SELECT 'Column WeekEvents already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `WeekEvents` INT(10) 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 = 'WeekEventDiskSpace'
-    ) > 0,
-"SELECT 'Column WeekEventDiskSpace already exists in Monitors'",
-"ALTER TABLE `Monitors` 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 = 'MonthEvents'
-    ) > 0,
-"SELECT 'Column MonthEvents already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `MonthEvents` INT(10) 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 = 'MonthEventDiskSpace'
-    ) > 0,
-"SELECT 'Column MonthEventDiskSpace already exists in Monitors'",
-"ALTER TABLE `Monitors` 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 = 'ArchivedEvents'
-    ) > 0,
-"SELECT 'Column ArchivedEvents already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `ArchivedEvents` INT(10) 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 = 'ArchivedEventDiskSpace'
-    ) > 0,
-"SELECT 'Column ArchivedEventDiskSpace already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `ArchivedEventDiskSpace` BIGINT AFTER `ArchivedEvents`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.15.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 = 'ZoneCount'
-    ) > 0,
-"SELECT 'Column ZoneCount already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `ZoneCount` TINYINT NOT NULL DEFAULT 0 AFTER `ArchivedEventDiskSpace`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-UPDATE Monitors SET ZoneCount=(SELECT COUNT(Id) FROM Zones WHERE MonitorId=Monitors.Id);

db/zm_update-1.31.16.sql

@@ -1,94 +0,0 @@
---
--- Add UpdateDiskSpace action to Filters
---
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Filters'
-     AND column_name = 'AutoMove'
-    ) > 0,
-"SELECT 'Column AutoMove already exists in Filters'",
-"ALTER TABLE Filters ADD `AutoMove` tinyint(3) unsigned NOT NULL default '0' AFTER `AutoDelete`"
-));
-
-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 = 'AutoMoveTo'
-    ) > 0,
-"SELECT 'Column AutoMoveTo already exists in Filters'",
-"ALTER TABLE Filters ADD `AutoMoveTo` smallint(5) unsigned NOT NULL default '0' AFTER `AutoMove`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-      FROM INFORMATION_SCHEMA.TABLES
-      WHERE table_name = 'Groups_Monitors'
-      AND table_schema = DATABASE()
-    ) > 0,
-    "SELECT 'Groups_Monitors table exists'",
-    "CREATE TABLE `Groups_Monitors` (
-      `Id` INT(10) unsigned NOT NULL auto_increment,
-      `GroupId` int(10) unsigned NOT NULL,
-      `MonitorId` int(10) unsigned NOT NULL,
-      PRIMARY KEY (`Id`)
-    )"
-  ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-      FROM INFORMATION_SCHEMA.STATISTICS
-      WHERE table_name = 'Groups_Monitors'
-      AND table_schema = DATABASE()
-      AND index_name = 'Groups_Monitors_GroupId_idx'
-    ) > 0,
-    "SELECT 'Groups_Monitors_GroupId_idx already exists on Groups table'",
-    "CREATE INDEX `Groups_Monitors_GroupId_idx` ON `Groups_Monitors` (`GroupId`)"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-      FROM INFORMATION_SCHEMA.STATISTICS
-      WHERE table_name = 'Groups_Monitors'
-      AND table_schema = DATABASE()
-      AND index_name = 'Groups_Monitors_MonitorId_idx'
-    ) > 0,
-    "SELECT 'Groups_Monitors_MonitorId_idx already exists on Groups table'",
-    "CREATE INDEX `Groups_Monitors_MonitorId_idx` ON `Groups_Monitors` (`MonitorId`)"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Groups'
-     AND column_name = 'MonitorIds'
-    ) > 0,
-    "REPLACE INTO Groups_Monitors (GroupId,MonitorId) SELECT Id,SUBSTRING_INDEX(SUBSTRING_INDEX(t.MonitorIds, ',', n.n), ',', -1) value   FROM Groups t CROSS JOIN  (    SELECT a.N + b.N * 10 + 1 n      FROM      (SELECT 0 AS N UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) a    ,(SELECT 0 AS N UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) b     ORDER BY n ) n  WHERE t.MonitorIds != '' AND n.n <= 1 + (LENGTH(t.MonitorIds) - LENGTH(REPLACE(t.MonitorIds, ',', '')))  ORDER BY value;",
-    "SELECT 'MonitorIds has already been removed.'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Groups'
-     AND column_name = 'MonitorIds'
-    ) > 0,
-"ALTER TABLE Groups DROP MonitorIds",
-"SELECT 'MonitorIds has already been removed.'"
-));
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.17.sql

@@ -1,40 +0,0 @@
-alter table Events modify Id int(10) unsigned;
-alter table Events DROP Primary key;
-alter table Events Add Primary key(Id);
-alter table Events modify Id int(10) unsigned auto_increment;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Storage'
-      AND column_name = 'DiskSpace'
-    ) > 0,
-    "SELECT 'Column DiskSpace already exists in Storage'",
-    "ALTER TABLE Storage ADD `DiskSpace`  BIGINT default null AFTER `Type`"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Storage'
-      AND column_name = 'Scheme'
-    ) > 0,
-    "SELECT 'Column Scheme already exists in Storage'",
-    "ALTER TABLE Storage ADD `Scheme`   enum('Deep','Medium','Shallow') NOT NULL default 'Medium' AFTER `DiskSpace`"
-    ));
-
-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 = 'Scheme'
-    ) > 0,
-    "SELECT 'Column Scheme already exists in Events'",
-    "ALTER TABLE Events ADD `Scheme`   enum('Deep','Medium','Shallow') NOT NULL default 'Deep' AFTER `DiskSpace`"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.18.sql

@@ -1,23 +0,0 @@
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Storage'
-      AND column_name = 'ServerId'
-    ) > 0,
-    "SELECT 'Column ServerId already exists in Storage'",
-    "ALTER TABLE Storage ADD `ServerId` int(10) unsigned AFTER `Scheme`"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM Filters WHERE Name = 'Update DiskSpace'
-      AND Query = '{"terms":[{"attr":"DiskSpace","op":"IS","val":"NULL"}]}'
-    ) > 0,
-    "SELECT 'Update Disk Space Filter already exists.'",
-    "INSERT INTO Filters (Name,Query,UpdateDiskSpace,Background) values ('Update DiskSpace','{\"terms\":[{\"attr\":\"DiskSpace\",\"op\":\"IS\",\"val\":\"NULL\"}]}',1,1)"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.19.sql

@@ -1,123 +0,0 @@
-drop procedure if exists update_storage_stats;
-
-delimiter //
-
-create procedure update_storage_stats(IN StorageId smallint(5), IN space BIGINT)
-
-sql security invoker
-
-deterministic
-
-begin
-
-  update Storage set DiskSpace = DiskSpace + space where Id = StorageId;
-
-end;
-
-//
-
-delimiter ;
-
-drop trigger if exists event_update_trigger;
-
-delimiter //
-
-create trigger event_update_trigger
-
-after update
-
-on Events
-
-for each row
-
-begin
-    declare diff BIGINT default 0;
-
-    set diff = NEW.DiskSpace - OLD.DiskSpace;
-  IF ( NEW.StorageId = OLD.StorageID ) THEN
-
-    IF ( diff ) THEN
-    call update_storage_stats(OLD.StorageId, diff);
-    END IF;
-  ELSE
-    IF ( NEW.DiskSpace ) THEN
-    call update_storage_stats(NEW.StorageId, NEW.DiskSpace);
-    END IF;
-    IF ( OLD.DiskSpace ) THEN
-    call update_storage_stats(OLD.StorageId, -OLD.DiskSpace);
-    END IF;
-  END IF;
-
-end;
-
-//
-
-delimiter ;
-
-drop trigger if exists event_insert_trigger;
-
-delimiter //
-/*
-create trigger event_insert_trigger
-
-after insert
-
-on Events
-
-for each row
-
-begin
-
-  call update_storage_stats(NEW.StorageId, NEW.DiskSpace);
-
-end;
-*/
-//
-
-delimiter ;
-
-
-drop trigger if exists event_delete_trigger;
-
-delimiter //
-
-create trigger event_delete_trigger
-
-before delete
-
-on Events
-
-for each row
-
-begin
-
-  call update_storage_stats(OLD.StorageId, -OLD.DiskSpace);
-
-end;
-
-//
-
-delimiter ;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events' and index_name = 'Archived' and table_schema = database());
-set @sqlstmt := if( @exist > 0, 'DROP INDEX Archived ON Events', "SELECT 'Archived INDEX is already removed.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events' and index_name = 'Frames' and table_schema = database());
-set @sqlstmt := if( @exist > 0, 'DROP INDEX Frames ON Events', "SELECT 'Frames INDEX is already removed.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events' and index_name = 'Events_StorageId_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, "SELECT 'Index Events_StorageId_idx already exists.'", 'CREATE INDEX Events_StorageId_idx on Events (StorageId)');
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events' and index_name = 'Events_EndTime_DiskSpace_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, "SELECT 'Index Events_EndTime_DiskSpace_idx already exists.'", 'CREATE INDEX Events_EndTime_DiskSpace_idx on Events (EndTime, DiskSpace)');
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-UPDATE Storage SET DiskSpace=(SELECT SUM(DiskSpace) FROM Events WHERE StorageId=Storage.Id);
-

db/zm_update-1.31.2.sql

@@ -1,18 +0,0 @@
---
--- Update Filters table to have a Concurrent Column
---
-
-SELECT 'Checking for Concurrent in Filters';
-SET @s = (SELECT IF(
-  (SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE table_name = 'Filters'
-  AND table_schema = DATABASE()
-  AND column_name = 'Concurrent'
-  ) > 0,
-"SELECT 'Column Concurrent already exists in Filters'",
-"ALTER TABLE Filters ADD COLUMN `Concurrent` tinyint(1) unsigned NOT NULL default '0' AFTER Background"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.20.sql

@@ -1,275 +0,0 @@
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-      FROM INFORMATION_SCHEMA.TABLES
-      WHERE table_name = 'Events_Hour'
-      AND table_schema = DATABASE()
-    ) > 0,
-    "SELECT 'Events_Hour table exists'",
-    "
-CREATE TABLE `Events_Hour` (
-  `EventId` int(10) unsigned NOT NULL,
-  `MonitorId` int(10) unsigned NOT NULL,
-  `StartTime` datetime default NULL,
-  `DiskSpace`   bigint unsigned default NULL,
-  PRIMARY KEY (`EventId`),
-  KEY `Events_Hour_MonitorId_StartTime_idx` (`MonitorId`,`StartTime`)
-);
-"
-  ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-      FROM INFORMATION_SCHEMA.TABLES
-      WHERE table_name = 'Events_Day'
-      AND table_schema = DATABASE()
-    ) > 0,
-    "SELECT 'Events_Day table exists'",
-    "
-CREATE TABLE `Events_Day` (
-  `EventId` int(10) unsigned NOT NULL,
-  `MonitorId` int(10) unsigned NOT NULL,
-  `StartTime` datetime default NULL,
-  `DiskSpace`   bigint unsigned default NULL,
-  PRIMARY KEY (`EventId`),
-  KEY `Events_Day_MonitorId_StartTime_idx` (`MonitorId`,`StartTime`)
-);
-"));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-      FROM INFORMATION_SCHEMA.TABLES
-      WHERE table_name = 'Events_Week'
-      AND table_schema = DATABASE()
-    ) > 0,
-    "SELECT 'Events_Week table exists'",
-    "
-CREATE TABLE `Events_Week` (
-  `EventId` int(10) unsigned NOT NULL,
-  `MonitorId` int(10) unsigned NOT NULL,
-  `StartTime` datetime default NULL,
-  `DiskSpace`   bigint unsigned default NULL,
-  PRIMARY KEY (`EventId`),
-  KEY `Events_Week_MonitorId_StartTime_idx` (`MonitorId`,`StartTime`)
-);
-"));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-      FROM INFORMATION_SCHEMA.TABLES
-      WHERE table_name = 'Events_Month'
-      AND table_schema = DATABASE()
-    ) > 0,
-    "SELECT 'Events_Month table exists'",
-    "
-CREATE TABLE `Events_Month` (
-  `EventId` int(10) unsigned NOT NULL,
-  `MonitorId` int(10) unsigned NOT NULL,
-  `StartTime` datetime default NULL,
-  `DiskSpace`   bigint unsigned default NULL,
-  PRIMARY KEY (`EventId`),
-  KEY `Events_Month_MonitorId_StartTime_idx` (`MonitorId`,`StartTime`)
-);
-"));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-      FROM INFORMATION_SCHEMA.TABLES
-      WHERE table_name = 'Events_Archived'
-      AND table_schema = DATABASE()
-    ) > 0,
-    "SELECT 'Events_Archived table exists'",
-    "
-CREATE TABLE `Events_Archived` (
-  `EventId` int(10) unsigned NOT NULL,
-  `MonitorId` int(10) unsigned NOT NULL,
-  `DiskSpace`   bigint unsigned default NULL,
-  PRIMARY KEY (`EventId`),
-  KEY `Events_Month_MonitorId_idx` (`MonitorId`)
-);
-"));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-drop trigger if exists event_update_trigger;
-
-delimiter //
-
-CREATE TRIGGER event_update_trigger AFTER UPDATE ON Events 
-FOR EACH ROW
-BEGIN
-    declare diff BIGINT default 0;
-
-    set diff = NEW.DiskSpace - OLD.DiskSpace;
-  IF ( NEW.StorageId = OLD.StorageID ) THEN
-    IF ( diff ) THEN
-      call update_storage_stats(OLD.StorageId, diff);
-    END IF;
-  ELSE
-    IF ( NEW.DiskSpace ) THEN
-      call update_storage_stats(NEW.StorageId, NEW.DiskSpace);
-    END IF;
-    IF ( OLD.DiskSpace ) THEN
-      call update_storage_stats(OLD.StorageId, -OLD.DiskSpace);
-    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 = ArchivedEvents+1, ArchivedEventDiskSpace = ArchivedEventDiskSpace + NEW.DiskSpace WHERE Id=NEW.MonitorId;
-    ELSEIF ( OLD.Archived ) THEN
-      DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-      UPDATE Monitors SET ArchivedEvents =ArchivedEvents-1, ArchivedEventDiskSpace = ArchivedEventDiskSpace - OLD.DiskSpace 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 = ArchivedEventDiskSpace - OLD.DiskSpace + NEW.DiskSpace
-          WHERE Id=OLD.MonitorId;
-      END IF;
-    END IF;
-  END IF;
-
-  IF ( OLD.DiskSpace != NEW.DiskSpace ) THEN
-    UPDATE Monitors SET TotalEventDiskSpace = TotalEventDiskSpace - OLD.DiskSpace + NEW.DiskSpace WHERE Id=OLD.MonitorId;
-  END IF;
-
-END;
-
-//
-
-delimiter ;
-
-DROP TRIGGER IF EXISTS event_insert_trigger;
-
-delimiter //
-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);
-end;
-//
-
-delimiter ;
-
-
-drop trigger if exists event_delete_trigger;
-
-delimiter //
-
-CREATE TRIGGER event_delete_trigger BEFORE DELETe on Events
-
-FOR EACH ROW
-BEGIN
-  call update_storage_stats(OLD.StorageId, -OLD.DiskSpace);
-  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 = ArchivedEvents - 1,
-      ArchivedEventDiskSpace = ArchivedEventDiskSpace - OLD.DiskSpace,
-      TotalEvents = TotalEvents - 1,
-      TotalEventDiskSpace = TotalEventDiskSpace - OLD.DiskSpace
-      WHERE Id=OLD.MonitorId;
-  ELSE
-    UPDATE Monitors SET
-    TotalEvents = TotalEvents-1,
-    TotalEventDiskSpace=TotalEventDiskSpace-OLD.DiskSpace
-    WHERE Id=OLD.MonitorId;
-  END IF;
-END;
-
-//
-
-delimiter ;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmstats.pl'
-    ) > 0,
-    "SELECT 'Column zmstats.pl already exists in Servers'",
-    "ALTER TABLE Servers ADD `zmstats.pl` BOOLEAN NOT NULL DEFAULT FALSE AFTER `FreeSwap`"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmaudit.pl'
-    ) > 0,
-    "SELECT 'Column zmaudit.pl already exists in Servers'",
-    "ALTER TABLE Servers ADD `zmaudit.pl` BOOLEAN NOT NULL DEFAULT FALSE AFTER `zmstats.pl`"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmtrigger.pl'
-    ) > 0,
-    "SELECT 'Column zmtrigger.pl already exists in Servers'",
-    "ALTER TABLE Servers ADD `zmtrigger.pl` BOOLEAN NOT NULL DEFAULT FALSE AFTER `zmaudit.pl`"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-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;

db/zm_update-1.31.21.sql

@@ -1,150 +0,0 @@
-delimiter //
-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
-//
-
-UPDATE Monitors SET ZoneCount=(SELECT COUNT(Id) FROM Zones WHERE MonitorId=Monitors.Id)//
-
-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 = NEW.DiskSpace - OLD.DiskSpace;
-  IF ( NEW.StorageId = OLD.StorageID ) THEN
-    IF ( diff ) THEN
-      call update_storage_stats(OLD.StorageId, diff);
-    END IF;
-  ELSE
-    IF ( NEW.DiskSpace ) THEN
-      call update_storage_stats(NEW.StorageId, NEW.DiskSpace);
-    END IF;
-    IF ( OLD.DiskSpace ) THEN
-      call update_storage_stats(OLD.StorageId, -OLD.DiskSpace);
-    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 = ArchivedEvents+1, ArchivedEventDiskSpace = ArchivedEventDiskSpace + NEW.DiskSpace WHERE Id=NEW.MonitorId;
-    ELSEIF ( OLD.Archived ) THEN
-      DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-      UPDATE Monitors SET ArchivedEvents =ArchivedEvents-1, ArchivedEventDiskSpace = ArchivedEventDiskSpace - OLD.DiskSpace 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 = ArchivedEventDiskSpace - OLD.DiskSpace + NEW.DiskSpace
-          WHERE Id=OLD.MonitorId;
-      END IF;
-    END IF;
-  END IF;
-
-  IF ( OLD.DiskSpace != NEW.DiskSpace ) THEN
-    UPDATE Monitors SET TotalEventDiskSpace = TotalEventDiskSpace - OLD.DiskSpace + NEW.DiskSpace WHERE Id=OLD.MonitorId;
-  END IF;
-
-END;
-
-//
-
-delimiter ;
-
-DROP TRIGGER IF EXISTS event_insert_trigger;
-
-delimiter //
-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);
-end;
-//
-
-delimiter ;
-
-
-drop trigger if exists event_delete_trigger;
-
-delimiter //
-
-CREATE TRIGGER event_delete_trigger BEFORE DELETe on Events
-
-FOR EACH ROW
-BEGIN
-  call update_storage_stats(OLD.StorageId, -OLD.DiskSpace);
-  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 = ArchivedEvents - 1,
-      ArchivedEventDiskSpace = ArchivedEventDiskSpace - OLD.DiskSpace,
-      TotalEvents = TotalEvents - 1,
-      TotalEventDiskSpace = TotalEventDiskSpace - OLD.DiskSpace
-      WHERE Id=OLD.MonitorId;
-  ELSE
-    UPDATE Monitors SET
-    TotalEvents = TotalEvents-1,
-    TotalEventDiskSpace=TotalEventDiskSpace-OLD.DiskSpace
-    WHERE Id=OLD.MonitorId;
-  END IF;
-END;
-
-//
-
-delimiter ;
-
-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;
-

db/zm_update-1.31.22.sql

@@ -1,19 +0,0 @@
-delimiter //
-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
-//
-
-UPDATE Monitors SET ZoneCount=(SELECT COUNT(Id) FROM Zones WHERE MonitorId=Monitors.Id)//
-UPDATE Storage SET DiskSpace=(SELECT SUM(DiskSpace) FROM Events WHERE StorageId=Storage.Id);

db/zm_update-1.31.23.sql

@@ -1,88 +0,0 @@
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmstats.pl'
-    ) > 0 AND ( SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmstats'
-    ) = 0
-    ,
-    "ALTER TABLE Servers CHANGE COLUMN `zmstats.pl` `zmstats` BOOLEAN NOT NULL DEFAULT FALSE",
-    "SELECT 'zmstats.pl has already been changed to zmstats'"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmstats.pl'
-    ) > 0,
-    "ALTER TABLE Servers DROP COLUMN `zmstats.pl`",
-    "SELECT 'zmstats.pl has already been removed'"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmaudit.pl'
-    ) > 0
-    AND 
-    ( SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmaudit'
-    ) = 0
-    ,
-    "ALTER TABLE Servers CHANGE COLUMN `zmaudit.pl` `zmaudit` BOOLEAN NOT NULL DEFAULT FALSE",
-    "SELECT 'zmaudit.pl has already been changed to zmaudit'"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmaudit.pl'
-    ) > 0,
-    "ALTER TABLE Servers DROP COLUMN `zmaudit.pl`",
-    "SELECT 'zmaudit.pl has already been removed'"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmtrigger.pl'
-    ) > 0
-    AND 
-    ( SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmtrigger'
-    ) = 0
-    ,
-    "ALTER TABLE Servers CHANGE COLUMN `zmtrigger.pl` `zmtrigger` BOOLEAN NOT NULL DEFAULT FALSE",
-    "SELECT 'zmtrigger.pl has already been changed to zmtrigger'"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Servers'
-      AND column_name = 'zmtrigger.pl'
-    ) > 0,
-    "ALTER TABLE Servers DROP COLUMN `zmtrigger.pl`",
-    "SELECT 'zmtrigger.pl has already been removed'"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.24.sql

@@ -1,61 +0,0 @@
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events_Hour' and index_name = 'Events_Hour_MonitorId_StartTime_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, 'DROP INDEX Events_Hour_MonitorId_StartTime_idx ON Events_Hour', "SELECT 'Events_Hour_MonitorId_StartTime_idx INDEX is already removed.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events_Hour' and index_name = 'Events_Hour_MonitorId_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, "SELECT 'Events_Hour_MonitorId_idx INDEX already exists.'", "CREATE INDEX `Events_Hour_MonitorId_idx` ON `Events_Hour` (`MonitorId`)");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events_Hour' and index_name = 'Events_Hour_StartTime_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, "SELECT 'Events_Hour_StartTime_idx INDEX already exists.'", "CREATE INDEX `Events_Hour_StartTime_idx` ON `Events_Hour` (`StartTime`)");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events_Day' and index_name = 'Events_Day_MonitorId_StartTime_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, 'DROP INDEX Events_Day_MonitorId_StartTime_idx ON Events_Day', "SELECT 'Events_Day_MonitorId_StartTime_idx INDEX is already removed.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events_Day' and index_name = 'Events_Day_MonitorId_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, "SELECT 'Events_Day_MonitorId_idx INDEX already exists.'", "CREATE INDEX `Events_Day_MonitorId_idx` ON `Events_Day` (`MonitorId`)");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events_Day' and index_name = 'Events_Day_StartTime_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, "SELECT 'Events_Day_StartTime_idx INDEX already exists.'", "CREATE INDEX `Events_Day_StartTime_idx` ON `Events_Day` (`StartTime`)");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events_Week' and index_name = 'Events_Week_MonitorId_StartTime_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, 'DROP INDEX Events_Week_MonitorId_StartTime_idx ON Events_Week', "SELECT 'Events_Week_MonitorId_StartTime_idx INDEX is already removed.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events_Week' and index_name = 'Events_Week_MonitorId_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, "SELECT 'Events_Week_MonitorId_idx INDEX already exists.'", "CREATE INDEX `Events_Week_MonitorId_idx` ON `Events_Week` (`MonitorId`)");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events_Week' and index_name = 'Events_Week_StartTime_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, "SELECT 'Events_Week_StartTime_idx INDEX already exists.'", "CREATE INDEX `Events_Week_StartTime_idx` ON `Events_Week` (`StartTime`)");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events_Month' and index_name = 'Events_Month_MonitorId_StartTime_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, 'DROP INDEX Events_Month_MonitorId_StartTime_idx ON Events_Month', "SELECT 'Events_Month_MonitorId_StartTime_idx INDEX is already removed.'");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events_Month' and index_name = 'Events_Month_MonitorId_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, "SELECT 'Events_Month_MonitorId_idx INDEX already exists.'", "CREATE INDEX `Events_Month_MonitorId_idx` ON `Events_Month` (`MonitorId`)");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;
-
-set @exist := (select count(*) from information_schema.statistics where table_name = 'Events_Month' and index_name = 'Events_Month_StartTime_idx' and table_schema = database());
-set @sqlstmt := if( @exist > 0, "SELECT 'Events_Month_StartTime_idx INDEX already exists.'", "CREATE INDEX `Events_Month_StartTime_idx` ON `Events_Month` (`StartTime`)");
-PREPARE stmt FROM @sqlstmt;
-EXECUTE stmt;

db/zm_update-1.31.25.sql

@@ -1,45 +0,0 @@
-delimiter //
-
-DROP TRIGGER IF EXISTS event_insert_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 TotalEvents = TotalEvents+1 WHERE Id=NEW.MonitorId;
-end;
-//
-
-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//
-

db/zm_update-1.31.26.sql

@@ -1,95 +0,0 @@
-delimiter //
-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 = NEW.DiskSpace - OLD.DiskSpace;
-  IF ( NEW.StorageId = OLD.StorageID ) THEN
-    IF ( diff ) THEN
-      call update_storage_stats(OLD.StorageId, diff);
-    END IF;
-  ELSE
-    IF ( NEW.DiskSpace ) THEN
-      call update_storage_stats(NEW.StorageId, NEW.DiskSpace);
-    END IF;
-    IF ( OLD.DiskSpace ) THEN
-      call update_storage_stats(OLD.StorageId, -OLD.DiskSpace);
-    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 = 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 Monitors SET
-          ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0)
-          WHERE Id=OLD.MonitorId;
-      END IF;
-    END IF;
-  END IF;
-
-  IF ( OLD.DiskSpace != NEW.DiskSpace ) THEN
-    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;
-
-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 TotalEvents = COALESCE(TotalEvents,0)+1 WHERE Id=NEW.MonitorId;
-end;
-//
-
-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//
-
-

db/zm_update-1.31.27.sql

@@ -1,100 +0,0 @@
-delimiter //
-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 = NEW.DiskSpace - OLD.DiskSpace;
-  IF ( NEW.StorageId = OLD.StorageID ) THEN
-    IF ( diff ) THEN
-      call update_storage_stats(OLD.StorageId, diff);
-    END IF;
-  ELSE
-    IF ( NEW.DiskSpace ) THEN
-      call update_storage_stats(NEW.StorageId, NEW.DiskSpace);
-    END IF;
-    IF ( OLD.DiskSpace ) THEN
-      call update_storage_stats(OLD.StorageId, -OLD.DiskSpace);
-    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 = 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 Monitors SET
-          ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0)
-          WHERE Id=OLD.MonitorId;
-      END IF;
-    END IF;
-  END IF;
-
-  IF ( 
-    ( (OLD.DiskSpace IS NOT NULL) AND (NEW.DiskSpace IS NULL) )
-    OR
-    ( (OLD.DiskSpace IS NULL) AND (NEW.DiskSpace IS NOT NULL) )
-    OR ( OLD.DiskSpace != NEW.DiskSpace ) 
-    ) THEN
-    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;
-
-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 TotalEvents = COALESCE(TotalEvents,0)+1 WHERE Id=NEW.MonitorId;
-end;
-//
-
-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//
-
-

db/zm_update-1.31.28.sql

@@ -1,57 +0,0 @@
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-      AND table_name = 'Monitor_Status'
-    ) > 0
-    ,
-    "SELECT 'Monitor_Status Already exists'",
-    "
-CREATE TABLE `Monitor_Status` (
-  `Id` int(10) unsigned NOT NULL,
-  `Status`  enum('Unknown','NotRunning','Running','NoSignal','Signal') NOT NULL default 'Unknown',
-  `CaptureFPS`  DECIMAL(10,2) NOT NULL default 0,
-  `AnalysisFPS`  DECIMAL(5,2) NOT NULL default 0,
-  PRIMARY KEY (`Id`)
-) ENGINE=MEMORY"
-    ));
-
-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 = 'Status'
-    ) > 0
-    ,
-    "ALTER TABLE Monitors DROP COLUMN Status",
-    "SELECT 'Monitor Status already removed.'"
-    ));
-
-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 = 'CaptureFPS'
-    ) > 0
-    ,
-    "ALTER TABLE Monitors DROP COLUMN CaptureFPS",
-    "SELECT 'Monitor CaptureFPS already removed.'"
-    ));
-
-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 = 'AnalysisFPS'
-    ) > 0
-    ,
-    "ALTER TABLE Monitors DROP COLUMN AnalysisFPS",
-    "SELECT 'Monitor AnalysisFPS already removed.'"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.29.sql

@@ -1,8 +0,0 @@
-DROP TABLE IF EXISTS `Monitor_Status`;
-CREATE TABLE `Monitor_Status` (
-  `MonitorId` int(10) unsigned NOT NULL,
-  `Status`  enum('Unknown','NotRunning','Running','NoSignal','Signal') NOT NULL default 'Unknown',
-  `CaptureFPS`  DECIMAL(10,2) NOT NULL default 0,
-  `AnalysisFPS`  DECIMAL(5,2) NOT NULL default 0,
-  PRIMARY KEY (`MonitorId`)
-) ENGINE=MEMORY;

db/zm_update-1.31.3.sql

@@ -1,146 +0,0 @@
---
--- This adds StorageAreas
---
-
-SELECT 'Checking For Storage Table';
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-    FROM INFORMATION_SCHEMA.TABLES
-    WHERE table_name = 'Storage'
-    AND table_schema = DATABASE()
-    ) > 0,
-"SELECT 'Storage table exists'",
-"CREATE TABLE `Storage` (
-    `Id`    smallint(5) unsigned NOT NULL auto_increment,
-    `Path`  varchar(64) NOT NULL default '',
-    `Name`  varchar(64) NOT NULL default '',
-    PRIMARY KEY (`Id`)
-)"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
---
--- Add StorageId column to Monitors
---
-
-SELECT 'Checking For StorageId in Monitors';
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-    FROM INFORMATION_SCHEMA.COLUMNS
-    WHERE table_name = 'Monitors'
-    AND table_schema = DATABASE()
-    AND column_name = 'StorageId'
-    ) > 0,
-"SELECT 'Column StorageId exists in Monitors'",
-"ALTER TABLE Monitors ADD `StorageId` smallint(5) unsigned NOT NULL default 0 AFTER `ServerId`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
---
--- Add StorageId column to Eventss
---
-
-SELECT 'Checking For StorageId in Events';
-SET @s = (SELECT IF(
-    (SELECT COUNT(*)
-    FROM INFORMATION_SCHEMA.COLUMNS
-    WHERE table_name = 'Events'
-    AND table_schema = DATABASE()
-    AND column_name = 'StorageId'
-    ) > 0,
-"SELECT 'Column StorageId exists in Events'",
-"ALTER TABLE Events ADD `StorageId` smallint(5) unsigned NOT NULL default 0 AFTER `MonitorId`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SELECT 'Updating Monitors SETTING StorageId to default';
-UPDATE Monitors SET StorageId = 0 WHERE StorageId IS NULL;
-ALTER TABLE Monitors MODIFY `StorageId`	smallint(5) unsigned NOT NULL default 0;
-UPDATE Events SET StorageId = 0 WHERE StorageId IS NULL;
-ALTER TABLE Events MODIFY `StorageId`	smallint(5) unsigned NOT NULL default 0;
-
-SET @s = (SELECT IF(
-  (SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE table_name = 'Events'
-  AND table_schema = DATABASE()
-  AND column_name = 'Orientation'
-  ) > 0,
-"SELECT 'Column Orientation exists in Events'",
-"ALTER TABLE `Events` ADD `Orientation`  enum('0','90','180','270','hori','vert') NOT NULL default '0' AFTER `Notes`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
---
--- Update Monitors table to have an Index on ServerId
---
-SELECT 'Create Index For ServerId on Monitors';
-SET @s = (SELECT IF(
-  (SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.STATISTICS
-  WHERE table_name = 'Monitors'
-  AND table_schema = DATABASE()
-  AND index_name = 'Monitors_ServerId_idx'
-  ) > 0,
-"SELECT 'Monitors_ServerId Index already exists on Monitors table'",
-"CREATE INDEX `Monitors_ServerId_idx` ON `Monitors` (`ServerId`)"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-
---
--- Update Server table to have an Index on Name
---
-SELECT 'Create Index FOR Name on Servers';
-SET @s = (SELECT IF(
-  (SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.STATISTICS
-  WHERE table_name = 'Servers'
-  AND table_schema = DATABASE()
-  AND index_name = 'Servers_Name_idx'
-  ) > 0,
-"SELECT 'Servers_Name Index already exists on Servers table'",
-"CREATE INDEX `Servers_Name_idx` ON `Servers` (`Name`)"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-
-SELECT 'ALTER TABLE Logs MODIFY Message TEXT NOT NULL';
--- ALTER TABLE Logs ALTER  Message DROP DEFAULT;
-ALTER TABLE Logs MODIFY Message TEXT NOT NULL;
-
-SELECT 'ALTER TABLE Config MODIFY DefaultValue TEXT';
-ALTER TABLE Config MODIFY DefaultValue TEXT;
-
-
--- 
--- Add an Id column and make it the primary key of the Filters table
---
-
-SELECT 'Check for Id column in Filter';
-SET @s = (SELECT IF(
-  (SELECT COUNT(*)
-  FROM INFORMATION_SCHEMA.COLUMNS
-  WHERE table_name = 'Filters'
-  AND table_schema = DATABASE()
-  AND column_name = 'Id'
-  ) > 0,
-"SELECT 'Column Id exists in Filters'",
-"ALTER TABLE `Filters` DROP PRIMARY KEY, ADD `Id` int(10) unsigned NOT NULL auto_increment PRIMARY KEY FIRST, ADD KEY `Name` (`Name`);"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-

db/zm_update-1.31.30.sql.in

@@ -1,20 +0,0 @@
-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,
-  PRIMARY KEY (`MonitorId`)
-) ENGINE=MEMORY;
-
-SET SESSION sql_mode='NO_AUTO_VALUE_ON_ZERO';
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM Storage WHERE Name = 'Default' AND Id=0 AND Path='@ZM_DIR_EVENTS@'
-    ) > 0,
-    "SELECT 'Default Storage Area already exists.'",
-    "INSERT INTO Storage (Id,Name,Path,Scheme,ServerId) VALUES (0,'Default','@ZM_DIR_EVENTS@','Medium',NULL)"
-    ));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;

db/zm_update-1.31.31.sql

@@ -1 +0,0 @@
-ALTER TABLE Storage MODIFY DiskSpace BIGINT default NULL;