Merge branch 'master' of github.com:ZoneMinder/zoneminder

Author: connortechnology

.cirrus.yml

@@ -2,11 +2,11 @@ task:
   name: freebsd-build
   freebsd_instance:
     matrix:
-      - image_family: freebsd-12-3
-      - image_family: freebsd-13-0
+      - image_family: freebsd-14-0
+      - image_family: freebsd-13-3
 
   prepare_script:
-    - pkg install -yq git cmake pkgconf jpeg-turbo mysql80-client ffmpeg libvncserver libjwt catch p5-DBI p5-DBD-mysql p5-Date-Manip p5-Test-LWP-UserAgent p5-Sys-Mmap v4l_compat
+    - pkg install -yq git cmake pkgconf jpeg-turbo mysql80-client ffmpeg libvncserver libjwt catch2 p5-DBI p5-DBD-mysql p5-Date-Manip p5-Test-LWP-UserAgent p5-Sys-Mmap v4l_compat
 
   configure_script:
     - git submodule update --init --recursive

.eslintignore

@@ -4,19 +4,22 @@
 web/api/lib
 web/includes/csrf/
 web/js/videojs.zoomrotate.js
+web/js/fontfaceobserver.standalone.js
 web/skins/classic/js/bootstrap-4.5.0.js
 web/skins/classic/js/bootstrap.bundle.min.js
-web/skins/classic/js/bootstrap-table-1.21.1
+web/skins/classic/js/bootstrap-table-1.23.5
 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
+web/skins/classic/assets
 web/js/janus.js
 web/js/ajaxQueue.js
+web/js/hls.js
+web/js/dms.js
 
 # Cannot be parsed as JS
 web/skins/classic/includes/export_functions.php

.eslintrc.js

@@ -3,7 +3,7 @@
 module.exports = {
   "env": {
     "browser": true,
-    "es2017": true,
+    "es2021": true,
   },
   "extends": ["google"],
   "overrides": [{
@@ -20,12 +20,13 @@ module.exports = {
     "php-markup",
   ],
   "rules": {
+    "no-invalid-this": "off",
     "camelcase": "off",
     "comma-dangle": "off",
     "guard-for-in": "off",
     "max-len": "off",
     "new-cap": ["error", {
-      capIsNewExceptions: ["Error", "Warning", "Debug", "Polygon_calcArea", "Play", "Stop"],
+      capIsNewExceptions: ["Error", "Warning", "Debug", "Polygon_calcArea", "Play", "Stop", "Panzoom"],
       newIsCapExceptionPattern: "^Asset\.."
     }],
     "no-array-constructor": "off",
@@ -47,5 +48,5 @@ module.exports = {
     "php/remove-whitespace": false,
     "php/remove-empty-line": false,
     "php/remove-php-lint": false
-  },
+  }
 };

.github/workflows/ci-buster.yml .github/workflows/ci-bookworm.yml.github/workflows/ci-buster.yml renamed to .github/workflows/ci-bookworm.yml

@@ -1,4 +1,4 @@
-name: CI Debian Buster
+name: CI Debian Bookworm
 
 on:
   push:
@@ -30,14 +30,14 @@ jobs:
           - crypto_backend: gnutls
             jwt_backend: jwt_cpp
     runs-on: ubuntu-latest
-    container: debian:buster
+    container: debian:bookworm
 
     steps:
       - name: Update packages
         run: apt-get -qq update && apt-get -qq upgrade
       - name: Install git
         run: apt-get -qq install git
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: Install dependencies
@@ -47,7 +47,7 @@ jobs:
           libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libavdevice-dev
           libcurl4-gnutls-dev libvlc-dev libvncserver-dev
           libdate-manip-perl libdbd-mysql-perl libsys-mmap-perl libwww-perl
-          libpolkit-gobject-1-dev
+          libpolkit-gobject-1-dev gsoap
           ${{ matrix.crypto_package }} ${{ matrix.jwt_package }}
       - name: Prepare
         run: mkdir build

.github/workflows/ci-bullseye.yml

@@ -37,7 +37,7 @@ jobs:
         run: apt-get -qq update && apt-get -qq upgrade
       - name: Install git
         run: apt-get -qq install git
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: Install dependencies
@@ -53,8 +53,8 @@ jobs:
       - name: Prepare
         run: mkdir build
       - name: Configure
-        run: cd build && cmake --version && cmake .. -DBUILD_MAN=0 -DBUILD_TEST_SUITE=1 -DENABLE_WERROR=1 -DZM_CRYPTO_BACKEND=${{ matrix.crypto_backend }} -DZM_JWT_BACKEND=${{ matrix.jwt_backend }}
+        run: cd build && cmake --version && cmake .. -DBUILD_MAN=0 -DBUILD_TEST_SUITE=0 -DENABLE_WERROR=1 -DZM_CRYPTO_BACKEND=${{ matrix.crypto_backend }} -DZM_JWT_BACKEND=${{ matrix.jwt_backend }}
       - name: Build
         run: cd build && make -j3 | grep --line-buffered -Ev '^(cp lib\/|Installing.+\.pm)' && (exit ${PIPESTATUS[0]})
-      - name: Run tests
-        run: cd build/tests && ./tests "~[notCI]"
+          #- name: Run tests
+          #run: cd build/tests && ./tests "~[notCI]"

.github/workflows/ci-centos-7.yml

@@ -29,16 +29,16 @@ jobs:
         run: yum -y install "dnf-command(config-manager)" https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && yum config-manager --set-enabled powertools
       - name: Install git
         run: yum -y install git
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: Install dependencies
         run: yum -y update && yum -y install make cmake gcc-c++ catch-devel mariadb-devel ffmpeg-devel libcurl-devel vlc-devel libvncserver-devel libjpeg-turbo-devel "perl(Date::Manip)" "perl(DBD::mysql)" "perl(ExtUtils::MakeMaker)" "perl(Sys::Mmap)" "perl(Sys::Syslog)" "perl(LWP::UserAgent)" polkit-devel libjwt-devel
       - name: Prepare
         run: mkdir build
       - name: Configure
-        run: cd build && cmake --version && cmake .. -DBUILD_MAN=0 -DBUILD_TEST_SUITE=1 -DENABLE_WERROR=1  -DZM_CRYPTO_BACKEND=${{ matrix.crypto_backend }} -DZM_JWT_BACKEND=${{ matrix.jwt_backend }}
+        run: cd build && cmake --version && cmake .. -DBUILD_MAN=0 -DBUILD_TEST_SUITE=0 -DENABLE_WERROR=1  -DZM_CRYPTO_BACKEND=${{ matrix.crypto_backend }} -DZM_JWT_BACKEND=${{ matrix.jwt_backend }}
       - name: Build
         run: cd build && make -j3 | grep --line-buffered -Ev '^(cp lib\/|Installing.+\.pm)' && (exit ${PIPESTATUS[0]})
-      - name: Run tests
-        run: cd build/tests && ./tests "~[notCI]"
+          #- name: Run tests
+          #run: cd build/tests && ./tests "~[notCI]"

.github/workflows/ci-centos-8.yml

@@ -15,10 +15,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: Install ESLint
         run: npm install [email protected] [email protected] [email protected] [email protected]
       - name: Run ESLint
-        run: npx eslint --ext .php,.js .
+        run: npx eslint --ext .js.php,.js .

.github/workflows/ci-eslint.yml

@@ -1,4 +1,4 @@
-name: CI Ubuntu Bionic (18.04)
+name: CI Ubuntu Focal (20.04)
 
 on:
   push:
@@ -24,7 +24,7 @@ jobs:
             crypto_package: libssl-dev
             jwt_package: libjwt-dev
     runs-on: ubuntu-latest
-    container: ubuntu:bionic
+    container: ubuntu:focal
 
     steps:
       - name: Update packages
@@ -34,7 +34,7 @@ jobs:
           add-apt-repository ppa:git-core/ppa
           apt-get -qq update
           apt-get -qq install git
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
       - name: Install dependencies

.github/workflows/ci-bionic.yml .github/workflows/ci-focal.yml.github/workflows/ci-bionic.yml renamed to .github/workflows/ci-focal.yml

@@ -37,15 +37,15 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       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@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         config-file: ./.github/codeql/codeql-config.yml
@@ -68,7 +68,7 @@ jobs:
     # 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@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl- 
@@ -83,4 +83,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3