From f4e8e7fc8e3f5adca96f583ecf1a8243661e7586 Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Wed, 8 Jul 2026 19:45:38 +0300 Subject: [PATCH 01/43] Modified the hlsDestroy() function and cleared video._fallbackTimer before executing fallbackToMjpeg() --- web/skins/classic/js/skin.js | 75 ++++++++++++++++++++++++++---------- 1 file changed, 55 insertions(+), 20 deletions(-) diff --git a/web/skins/classic/js/skin.js b/web/skins/classic/js/skin.js index 88115a245..4afb16411 100644 --- a/web/skins/classic/js/skin.js +++ b/web/skins/classic/js/skin.js @@ -1579,6 +1579,15 @@ function createRtsp2webStream(container, img, monitorId, fallbackToMjpeg, eventS container.appendChild(video); video.streamType = 'rtsp2web'; + // Fallback after 5s if video hasn't loaded + video._fallbackTimer = setTimeout(function() { + if (video.readyState < 2) { + hlsDestroy(video); + video.remove(); + fallbackToMjpeg(); + } + }, 5000); + if (Hls.isSupported()) { const hls = new Hls(); video._hls = hls; @@ -1607,7 +1616,7 @@ function createRtsp2webStream(container, img, monitorId, fallbackToMjpeg, eventS hls.on(Hls.Events.ERROR, function(event, data) { console.warn("HLS Event = ERROR", "\n", "event:", event, "\n", "errorType:", data.type, "\n", "errorDetails:", data.details, "\n", "errorFatal:", data.fatal); if (!data || !data.fatal) return; - hlsDestroy(hls); + hlsDestroy(video); clearTimeout(video._fallbackTimer); video.remove(); fallbackToMjpeg(); @@ -1618,39 +1627,65 @@ function createRtsp2webStream(container, img, monitorId, fallbackToMjpeg, eventS thumbnailVideoPlay(video, 'RTSP2Web', eventStart, statusBar); video.addEventListener('error', function() { video.remove(); + clearTimeout(video._fallbackTimer); fallbackToMjpeg(); return; }); } else { video.remove(); + clearTimeout(video._fallbackTimer); fallbackToMjpeg(); return; } - - // Fallback after 5s if video hasn't loaded - video._fallbackTimer = setTimeout(function() { - if (video.readyState < 2) { - if (video._hls) hlsDestroy(video._hls); - video.remove(); - fallbackToMjpeg(); - } - }, 5000); }).catch(function(e) { console.error(e); fallbackToMjpeg(); }); } -const hlsDestroy = function(hls) { - if (hls && Hls) { - Object.keys(Hls.Events).forEach(function(eventName) { - hls.off(Hls.Events[eventName], function(event, data) { - }); - }); +/* +* obj - can be either an HLS instance or an object containing an HLS instance in its property. +*/ +const hlsDestroy = function(obj) { + if (typeof Hls === 'undefined') { + console.warn("The hls.js library is not loaded."); + return; + } + if (!obj) { + console.warn("No object was passed as an argument to the hlsDestroy() function."); + return; + } + let hls = null; + let propertyName = null; + if (obj instanceof Hls) { + hls = obj; + } else if ('hls' in obj) { + hls = obj.hls; + propertyName = 'hls'; + } else if ('_hls' in obj) { + hls = obj._hls; + propertyName = '_hls'; + } + + if (!hls || !(obj.hls instanceof Hls)) { + for (const key of Object.keys(obj)) { + const value = obj[key]; + if (value instanceof Hls) { + hls = value; + propertyName = key; + break; + } + } + } + + if (hls) { + hls.off(); hls.destroy(); hls = null; + // If propertyName is null, it means an HLS instance was passed to the function. + if (propertyName) obj[propertyName] = null; } else { - console.warn("Hls cannot be destroyed because it is not loaded."); + console.warn(`Hls for object`, obj, `cannot be destroyed because it is not loaded.`); } }; @@ -1811,8 +1846,8 @@ function playEventHLS(container, img, monitorId, fallbackToMjpeg, statusBar, eve video._fallbackTimer = setTimeout(function() { // If the index.m3u8 manifest is bad, playback may not start, although there will be no errors. if (video.readyState < 2) { + hlsDestroy(video); video.remove(); - hlsDestroy(hls); tryPlayMp4(container, img, monitorId, fallbackToMjpeg, statusBar); } }, 2000); @@ -1832,8 +1867,8 @@ function playEventHLS(container, img, monitorId, fallbackToMjpeg, statusBar, eve hls.on(Hls.Events.ERROR, function(event, data) { console.warn("HLS Event = ERROR", "\n", "event:", event, "\n", "errorType:", data.type, "\n", "errorDetails:", data.details, "\n", "errorFatal:", data.fatal); if (!data || !data.fatal) return; + hlsDestroy(video); video.remove(); - hlsDestroy(hls); clearTimeout(video._fallbackTimer); tryPlayMp4(container, img, monitorId, fallbackToMjpeg, statusBar); }); @@ -1910,7 +1945,7 @@ function cleanupVideoElement(video) { if (!video) return; if (video._fallbackTimer) clearTimeout(video._fallbackTimer); clearInterval(video._fallbackTimerTime); - if (video._hls) hlsDestroy(video._hls); + if (video._hls) hlsDestroy(video); video.pause(); video.src = ''; video.load(); From dbc48493a0f918bd7358e7f1dc7493726bb54db6 Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Wed, 8 Jul 2026 20:03:53 +0300 Subject: [PATCH 02/43] In hlsDestroy(), we pass an object containing an HLS instance as an argument. --- web/js/MonitorStream.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js index e77567c82..b6f0244ea 100644 --- a/web/js/MonitorStream.js +++ b/web/js/MonitorStream.js @@ -743,9 +743,8 @@ function MonitorStream(monitorData) { stream.srcObject = null; this.webrtc = null; } - if (this.hls) { - hlsDestroy(this.hls); - } + if (this.hls) hlsDestroy(this); + if (-1 !== this.activePlayer.indexOf('mse')) { this.stopMse(); } @@ -1812,7 +1811,7 @@ function MonitorStream(monitorData) { // PCM, G.711A, G.711Mu, G.726, G.723 - no audio track this.updateStreamInfo('', `Error. AAC codec "${data.audio.codec}" is not supported.`); //HLS this.streamErrorRegistration(); - hlsDestroy(this.hls); + hlsDestroy(this); this.restart(this.currentChannelStream); } }, this); @@ -1824,7 +1823,7 @@ function MonitorStream(monitorData) { if (!data || !data.fatal) return; this.updateStreamInfo('', 'Error'); //HLS this.streamErrorRegistration(); - hlsDestroy(this.hls); + hlsDestroy(this); this.restart(this.currentChannelStream); }, this); this.hls.loadSource(hlsUrl.href); From 54785d704f373bf67c8fa9e76a9875ce0dbe0396 Mon Sep 17 00:00:00 2001 From: IgorA100 Date: Sat, 11 Jul 2026 11:57:22 +0300 Subject: [PATCH 03/43] Update skin.js --- web/skins/classic/js/skin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/js/skin.js b/web/skins/classic/js/skin.js index 4afb16411..95c7dcb7f 100644 --- a/web/skins/classic/js/skin.js +++ b/web/skins/classic/js/skin.js @@ -1667,7 +1667,7 @@ const hlsDestroy = function(obj) { propertyName = '_hls'; } - if (!hls || !(obj.hls instanceof Hls)) { + if (!hls || !(hls instanceof Hls)) { for (const key of Object.keys(obj)) { const value = obj[key]; if (value instanceof Hls) { From 7e90a40cbed02c63d428b824b4e10f2b19542bfb Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 14 Jul 2026 17:50:26 -0400 Subject: [PATCH 04/43] fix: keep console Columns dropdown inside the viewport in short windows #monitorList and its .bootstrap-table are overflow:hidden so the table body scrolls independently of the toolbar. That container starts below the filter bar, so anything Popper positions above the toolbar is clipped away. In a short window Popper did exactly that. It flipped the Columns menu to top-end placement, and once flipping was disabled it still shifted the menu up to fit all 300px of it inside the viewport. Either way the menu's top crossed the container edge and the first entries (Id, Thumbnail) became invisible. Pin the menu below the toggle with data-flip=false and set its max-height to the space actually available beneath the button, so Popper never needs to move it upward. The menu keeps bootstrap-table's overflow:auto, so every column stays reachable by scrolling. Size it on show and again on resize, since Popper repositions an open menu but keeps the height it was given when it opened. Bind to the toggle's parent rather than .columns: bootstrap-table puts the menu and the show class on an inner .keep-open element, so .columns never carries it and the open check would never have matched. Deliberately no minimum height. A floor taller than the room available makes Popper shove the menu back up over the clipped area, which is the truncation being fixed here; a short menu still reaches every column by scrolling. Verified in Chromium against a live console, resizing an open menu between 700px and 180px: placement stays bottom-end, max-height tracks the space available, and the first entry stays visible with no clipping throughout. Below ~160px the sticky header plus toolbar exceed the window and the toggle itself falls outside the viewport, which is a console-wide layout limit rather than a dropdown one. --- web/skins/classic/views/js/console.js | 45 +++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/web/skins/classic/views/js/console.js b/web/skins/classic/views/js/console.js index 98beb56a4..ab598e171 100644 --- a/web/skins/classic/views/js/console.js +++ b/web/skins/classic/views/js/console.js @@ -1,5 +1,11 @@ "use strict"; const table = $j('#consoleTable'); +// Upper bound for the Columns dropdown height, matching bootstrap-table's own +// stylesheet. There is deliberately no lower bound: the menu scrolls, so a short +// one is still usable, whereas forcing a minimum taller than the room available +// makes Popper shove the menu back up over the clipped area. +const MAX_COLUMNS_MENU_HEIGHT = 300; +const COLUMNS_MENU_GAP = 10; var ajax = null; var monitors = {}; // Store monitors by ID for function modal var lastFooter = null; // Cached footer payload for re-applying after column toggles @@ -615,8 +621,47 @@ function initPage() { inner.html('' + text + ''); } }); + + constrainColumnsDropdown(); } // end function initPage +// #monitorList and its .bootstrap-table are overflow:hidden so the table body +// scrolls on its own, which means anything Popper moves above the toolbar gets +// clipped. In a short window Popper would flip the Columns menu up, or shift it +// up to keep its full 300px inside the viewport, hiding the first entries. Keep +// it anchored below the button and only ever as tall as the room beneath it. +function constrainColumnsDropdown() { + var toggle = $j('#monitorList .fixed-table-toolbar .columns button.dropdown-toggle'); + if (!toggle.length) return; + + toggle.attr('data-flip', 'false'); + + // The show class lands on .keep-open, the toggle's parent, not on .columns. + toggle.parent().on('show.bs.dropdown', function() { + sizeColumnsMenu(toggle); + }); + + // Popper repositions an open menu on resize but keeps the max-height it was + // given when it opened, so a window dragged shorter pulls the menu back over + // the clipped area. Re-measure whenever the menu is open as the window changes. + $j(window).on('resize', function() { + if (!toggle.parent().hasClass('show')) return; + sizeColumnsMenu(toggle); + }); +} + +function sizeColumnsMenu(toggle) { + var menu = toggle.parent().find('.dropdown-menu'); + if (!menu.length) return; + // Leave a small gap so the menu never sits flush against the window edge. + var available = window.innerHeight - toggle[0].getBoundingClientRect().bottom - COLUMNS_MENU_GAP; + menu.css('max-height', Math.max(0, Math.min(MAX_COLUMNS_MENU_HEIGHT, available)) + 'px'); + // Let Popper re-place the menu against the height we just set. On first open + // Popper does not exist yet, and positions itself correctly straight after. + var dropdown = toggle.data('bs.dropdown'); + if (dropdown && dropdown._popper) dropdown._popper.scheduleUpdate(); +} + function sortMonitors(button) { if (button.classList.contains('btn-success')) { $j( "#consoleTableBody" ).sortable('disable'); From 6fb03348a70c609d363d8f01945d6e36cb71bacb Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 14 Jul 2026 19:01:12 -0400 Subject: [PATCH 05/43] Upgrade bootstrap-table to 1.27.3 --- web/skins/classic/assets/bootstrap-table | 2 +- .../bootstrap-table-vue.js | 1664 --- .../bootstrap-table-vue.umd.js | 5 - .../bootstrap-table.min.js | 10 - .../bootstrap-table-1.27.1/config/index.js | 9071 ----------------- .../config/index.min.js | 10 - .../bootstrap-table-filter-control.min.js | 10 - .../mobile/bootstrap-table-mobile.min.js | 10 - .../bootstrap-table-reorder-columns.min.js | 10 - .../bootstrap-table/bootstrap-table.min.css | 10 - .../bootstrap-table-locale-all.js | 0 .../bootstrap-table-locale-all.min.js | 2 +- .../bootstrap-table-vue.js | 88 + .../bootstrap-table-vue.umd.js | 1 + .../bootstrap-table.css | 18 +- .../bootstrap-table.js | 254 +- .../bootstrap-table.min.css | 4 +- .../bootstrap-table.min.js | 10 + .../addrbar/bootstrap-table-addrbar.js | 0 .../addrbar/bootstrap-table-addrbar.min.js | 2 +- .../bootstrap-table-auto-refresh.js | 0 .../bootstrap-table-auto-refresh.min.js | 2 +- .../cookie/bootstrap-table-cookie.js | 6 +- .../cookie/bootstrap-table-cookie.min.js | 4 +- .../copy-rows/bootstrap-table-copy-rows.js | 0 .../bootstrap-table-copy-rows.min.js | 2 +- .../bootstrap-table-custom-view.js | 0 .../bootstrap-table-custom-view.min.js | 2 +- .../defer-url/bootstrap-table-defer-url.js | 0 .../bootstrap-table-defer-url.min.js | 2 +- .../editable/bootstrap-table-editable.js | 0 .../editable/bootstrap-table-editable.min.js | 2 +- .../export/bootstrap-table-export.js | 17 +- .../export/bootstrap-table-export.min.js | 4 +- .../bootstrap-table-filter-control.css | 0 .../bootstrap-table-filter-control.js | 24 +- .../bootstrap-table-filter-control.min.css | 2 +- .../bootstrap-table-filter-control.min.js | 10 + .../extensions/filter-control/utils.js | 14 +- .../extensions/filter-control/utils.min.js | 4 +- .../bootstrap-table-fixed-columns.css | 6 + .../bootstrap-table-fixed-columns.js | 33 +- .../bootstrap-table-fixed-columns.min.css | 4 +- .../bootstrap-table-fixed-columns.min.js | 4 +- .../group-by-v2/bootstrap-table-group-by.css | 0 .../group-by-v2/bootstrap-table-group-by.js | 0 .../bootstrap-table-group-by.min.css | 2 +- .../bootstrap-table-group-by.min.js | 2 +- .../bootstrap-table-i18n-enhance.js | 0 .../bootstrap-table-i18n-enhance.min.js | 2 +- .../key-events/bootstrap-table-key-events.js | 0 .../bootstrap-table-key-events.min.js | 2 +- .../mobile/bootstrap-table-mobile.js | 864 +- .../mobile/bootstrap-table-mobile.min.js | 10 + .../bootstrap-table-multiple-sort.js | 0 .../bootstrap-table-multiple-sort.min.js | 2 +- .../bootstrap-table-page-jump-to.css | 0 .../bootstrap-table-page-jump-to.js | 0 .../bootstrap-table-page-jump-to.min.css | 2 +- .../bootstrap-table-page-jump-to.min.js | 2 +- .../pipeline/bootstrap-table-pipeline.js | 0 .../pipeline/bootstrap-table-pipeline.min.js | 2 +- .../extensions/print/bootstrap-table-print.js | 0 .../print/bootstrap-table-print.min.js | 2 +- .../bootstrap-table-reorder-columns.js | 508 +- .../bootstrap-table-reorder-columns.min.js | 10 + .../bootstrap-table-reorder-rows.css | 0 .../bootstrap-table-reorder-rows.js | 0 .../bootstrap-table-reorder-rows.min.css | 2 +- .../bootstrap-table-reorder-rows.min.js | 2 +- .../resizable/bootstrap-table-resizable.js | 0 .../bootstrap-table-resizable.min.js | 2 +- .../bootstrap-table-sticky-header.css | 0 .../bootstrap-table-sticky-header.js | 7 +- .../bootstrap-table-sticky-header.min.css | 2 +- .../bootstrap-table-sticky-header.min.js | 4 +- .../toolbar/bootstrap-table-toolbar.js | 0 .../toolbar/bootstrap-table-toolbar.min.js | 2 +- .../treegrid/bootstrap-table-treegrid.js | 0 .../treegrid/bootstrap-table-treegrid.min.js | 2 +- .../locale/bootstrap-table-af-ZA.js | 0 .../locale/bootstrap-table-af-ZA.min.js | 2 +- .../locale/bootstrap-table-ar-SA.js | 0 .../locale/bootstrap-table-ar-SA.min.js | 2 +- .../locale/bootstrap-table-bg-BG.js | 0 .../locale/bootstrap-table-bg-BG.min.js | 2 +- .../locale/bootstrap-table-ca-ES.js | 0 .../locale/bootstrap-table-ca-ES.min.js | 2 +- .../locale/bootstrap-table-cs-CZ.js | 0 .../locale/bootstrap-table-cs-CZ.min.js | 2 +- .../locale/bootstrap-table-da-DK.js | 0 .../locale/bootstrap-table-da-DK.min.js | 2 +- .../locale/bootstrap-table-de-DE.js | 0 .../locale/bootstrap-table-de-DE.min.js | 2 +- .../locale/bootstrap-table-el-GR.js | 0 .../locale/bootstrap-table-el-GR.min.js | 2 +- .../locale/bootstrap-table-en-US.js | 0 .../locale/bootstrap-table-en-US.min.js | 2 +- .../locale/bootstrap-table-es-AR.js | 0 .../locale/bootstrap-table-es-AR.min.js | 2 +- .../locale/bootstrap-table-es-CL.js | 0 .../locale/bootstrap-table-es-CL.min.js | 2 +- .../locale/bootstrap-table-es-CR.js | 0 .../locale/bootstrap-table-es-CR.min.js | 2 +- .../locale/bootstrap-table-es-ES.js | 0 .../locale/bootstrap-table-es-ES.min.js | 2 +- .../locale/bootstrap-table-es-MX.js | 0 .../locale/bootstrap-table-es-MX.min.js | 2 +- .../locale/bootstrap-table-es-NI.js | 0 .../locale/bootstrap-table-es-NI.min.js | 2 +- .../locale/bootstrap-table-es-SP.js | 0 .../locale/bootstrap-table-es-SP.min.js | 2 +- .../locale/bootstrap-table-et-EE.js | 0 .../locale/bootstrap-table-et-EE.min.js | 2 +- .../locale/bootstrap-table-eu-EU.js | 0 .../locale/bootstrap-table-eu-EU.min.js | 2 +- .../locale/bootstrap-table-fa-IR.js | 0 .../locale/bootstrap-table-fa-IR.min.js | 2 +- .../locale/bootstrap-table-fi-FI.js | 0 .../locale/bootstrap-table-fi-FI.min.js | 2 +- .../locale/bootstrap-table-fr-BE.js | 0 .../locale/bootstrap-table-fr-BE.min.js | 2 +- .../locale/bootstrap-table-fr-CH.js | 0 .../locale/bootstrap-table-fr-CH.min.js | 2 +- .../locale/bootstrap-table-fr-FR.js | 0 .../locale/bootstrap-table-fr-FR.min.js | 2 +- .../locale/bootstrap-table-fr-LU.js | 0 .../locale/bootstrap-table-fr-LU.min.js | 2 +- .../locale/bootstrap-table-he-IL.js | 0 .../locale/bootstrap-table-he-IL.min.js | 2 +- .../locale/bootstrap-table-hi-IN.js | 0 .../locale/bootstrap-table-hi-IN.min.js | 2 +- .../locale/bootstrap-table-hr-HR.js | 0 .../locale/bootstrap-table-hr-HR.min.js | 2 +- .../locale/bootstrap-table-hu-HU.js | 0 .../locale/bootstrap-table-hu-HU.min.js | 2 +- .../locale/bootstrap-table-id-ID.js | 0 .../locale/bootstrap-table-id-ID.min.js | 2 +- .../locale/bootstrap-table-it-IT.js | 0 .../locale/bootstrap-table-it-IT.min.js | 2 +- .../locale/bootstrap-table-ja-JP.js | 0 .../locale/bootstrap-table-ja-JP.min.js | 2 +- .../locale/bootstrap-table-ka-GE.js | 0 .../locale/bootstrap-table-ka-GE.min.js | 2 +- .../locale/bootstrap-table-ko-KR.js | 0 .../locale/bootstrap-table-ko-KR.min.js | 2 +- .../locale/bootstrap-table-lb-LU.js | 0 .../locale/bootstrap-table-lb-LU.min.js | 2 +- .../locale/bootstrap-table-lt-LT.js | 0 .../locale/bootstrap-table-lt-LT.min.js | 2 +- .../locale/bootstrap-table-ms-MY.js | 0 .../locale/bootstrap-table-ms-MY.min.js | 2 +- .../locale/bootstrap-table-nb-NO.js | 0 .../locale/bootstrap-table-nb-NO.min.js | 2 +- .../locale/bootstrap-table-nl-BE.js | 0 .../locale/bootstrap-table-nl-BE.min.js | 2 +- .../locale/bootstrap-table-nl-NL.js | 0 .../locale/bootstrap-table-nl-NL.min.js | 2 +- .../locale/bootstrap-table-pl-PL.js | 0 .../locale/bootstrap-table-pl-PL.min.js | 2 +- .../locale/bootstrap-table-pt-BR.js | 0 .../locale/bootstrap-table-pt-BR.min.js | 2 +- .../locale/bootstrap-table-pt-PT.js | 0 .../locale/bootstrap-table-pt-PT.min.js | 2 +- .../locale/bootstrap-table-ro-RO.js | 0 .../locale/bootstrap-table-ro-RO.min.js | 2 +- .../locale/bootstrap-table-ru-RU.js | 0 .../locale/bootstrap-table-ru-RU.min.js | 2 +- .../locale/bootstrap-table-sk-SK.js | 0 .../locale/bootstrap-table-sk-SK.min.js | 2 +- .../locale/bootstrap-table-sl-SI.js | 0 .../locale/bootstrap-table-sl-SI.min.js | 2 +- .../locale/bootstrap-table-sr-Cyrl-RS.js | 0 .../locale/bootstrap-table-sr-Cyrl-RS.min.js | 2 +- .../locale/bootstrap-table-sr-Latn-RS.js | 0 .../locale/bootstrap-table-sr-Latn-RS.min.js | 2 +- .../locale/bootstrap-table-sv-SE.js | 0 .../locale/bootstrap-table-sv-SE.min.js | 2 +- .../locale/bootstrap-table-th-TH.js | 0 .../locale/bootstrap-table-th-TH.min.js | 2 +- .../locale/bootstrap-table-tr-TR.js | 0 .../locale/bootstrap-table-tr-TR.min.js | 2 +- .../locale/bootstrap-table-uk-UA.js | 0 .../locale/bootstrap-table-uk-UA.min.js | 2 +- .../locale/bootstrap-table-ur-PK.js | 0 .../locale/bootstrap-table-ur-PK.min.js | 2 +- .../locale/bootstrap-table-uz-Latn-UZ.js | 0 .../locale/bootstrap-table-uz-Latn-UZ.min.js | 2 +- .../locale/bootstrap-table-vi-VN.js | 0 .../locale/bootstrap-table-vi-VN.min.js | 2 +- .../locale/bootstrap-table-zh-CN.js | 0 .../locale/bootstrap-table-zh-CN.min.js | 2 +- .../locale/bootstrap-table-zh-TW.js | 0 .../locale/bootstrap-table-zh-TW.min.js | 2 +- .../bootstrap-table/bootstrap-table.css | 16 +- .../themes/bootstrap-table/bootstrap-table.js | 0 .../bootstrap-table/bootstrap-table.min.css | 10 + .../bootstrap-table/bootstrap-table.min.js | 2 +- .../bootstrap-table/fonts/bootstrap-table.eot | Bin .../bootstrap-table/fonts/bootstrap-table.svg | 0 .../bootstrap-table/fonts/bootstrap-table.ttf | Bin .../fonts/bootstrap-table.woff | Bin .../themes/bulma/bootstrap-table-bulma.css | 16 +- .../themes/bulma/bootstrap-table-bulma.js | 0 .../bulma/bootstrap-table-bulma.min.css | 4 +- .../themes/bulma/bootstrap-table-bulma.min.js | 2 +- .../foundation/bootstrap-table-foundation.css | 16 +- .../foundation/bootstrap-table-foundation.js | 0 .../bootstrap-table-foundation.min.css | 4 +- .../bootstrap-table-foundation.min.js | 2 +- .../bootstrap-table-materialize.css | 16 +- .../bootstrap-table-materialize.js | 0 .../bootstrap-table-materialize.min.css | 4 +- .../bootstrap-table-materialize.min.js | 2 +- .../semantic/bootstrap-table-semantic.css | 16 +- .../semantic/bootstrap-table-semantic.js | 0 .../semantic/bootstrap-table-semantic.min.css | 4 +- .../semantic/bootstrap-table-semantic.min.js | 2 +- 218 files changed, 1369 insertions(+), 11617 deletions(-) delete mode 100644 web/skins/classic/assets/bootstrap-table-1.27.1/bootstrap-table-vue.js delete mode 100644 web/skins/classic/assets/bootstrap-table-1.27.1/bootstrap-table-vue.umd.js delete mode 100644 web/skins/classic/assets/bootstrap-table-1.27.1/bootstrap-table.min.js delete mode 100644 web/skins/classic/assets/bootstrap-table-1.27.1/config/index.js delete mode 100644 web/skins/classic/assets/bootstrap-table-1.27.1/config/index.min.js delete mode 100644 web/skins/classic/assets/bootstrap-table-1.27.1/extensions/filter-control/bootstrap-table-filter-control.min.js delete mode 100644 web/skins/classic/assets/bootstrap-table-1.27.1/extensions/mobile/bootstrap-table-mobile.min.js delete mode 100644 web/skins/classic/assets/bootstrap-table-1.27.1/extensions/reorder-columns/bootstrap-table-reorder-columns.min.js delete mode 100644 web/skins/classic/assets/bootstrap-table-1.27.1/themes/bootstrap-table/bootstrap-table.min.css rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/bootstrap-table-locale-all.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/bootstrap-table-locale-all.min.js (99%) create mode 100644 web/skins/classic/assets/bootstrap-table-1.27.3/bootstrap-table-vue.js create mode 100644 web/skins/classic/assets/bootstrap-table-1.27.3/bootstrap-table-vue.umd.js rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/bootstrap-table.css (96%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/bootstrap-table.js (98%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/bootstrap-table.min.css (66%) create mode 100644 web/skins/classic/assets/bootstrap-table-1.27.3/bootstrap-table.min.js rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/addrbar/bootstrap-table-addrbar.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/addrbar/bootstrap-table-addrbar.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/auto-refresh/bootstrap-table-auto-refresh.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/auto-refresh/bootstrap-table-auto-refresh.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/cookie/bootstrap-table-cookie.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/cookie/bootstrap-table-cookie.min.js (86%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/copy-rows/bootstrap-table-copy-rows.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/copy-rows/bootstrap-table-copy-rows.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/custom-view/bootstrap-table-custom-view.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/custom-view/bootstrap-table-custom-view.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/defer-url/bootstrap-table-defer-url.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/defer-url/bootstrap-table-defer-url.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/editable/bootstrap-table-editable.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/editable/bootstrap-table-editable.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/export/bootstrap-table-export.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/export/bootstrap-table-export.min.js (93%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/filter-control/bootstrap-table-filter-control.css (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/filter-control/bootstrap-table-filter-control.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/filter-control/bootstrap-table-filter-control.min.css (95%) create mode 100644 web/skins/classic/assets/bootstrap-table-1.27.3/extensions/filter-control/bootstrap-table-filter-control.min.js rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/filter-control/utils.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/filter-control/utils.min.js (65%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/fixed-columns/bootstrap-table-fixed-columns.css (59%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/fixed-columns/bootstrap-table-fixed-columns.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/fixed-columns/bootstrap-table-fixed-columns.min.css (65%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/fixed-columns/bootstrap-table-fixed-columns.min.js (84%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/group-by-v2/bootstrap-table-group-by.css (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/group-by-v2/bootstrap-table-group-by.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/group-by-v2/bootstrap-table-group-by.min.css (95%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/group-by-v2/bootstrap-table-group-by.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/i18n-enhance/bootstrap-table-i18n-enhance.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/i18n-enhance/bootstrap-table-i18n-enhance.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/key-events/bootstrap-table-key-events.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/key-events/bootstrap-table-key-events.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/mobile/bootstrap-table-mobile.js (94%) create mode 100644 web/skins/classic/assets/bootstrap-table-1.27.3/extensions/mobile/bootstrap-table-mobile.min.js rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/multiple-sort/bootstrap-table-multiple-sort.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/page-jump-to/bootstrap-table-page-jump-to.css (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/page-jump-to/bootstrap-table-page-jump-to.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/page-jump-to/bootstrap-table-page-jump-to.min.css (96%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/page-jump-to/bootstrap-table-page-jump-to.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/pipeline/bootstrap-table-pipeline.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/pipeline/bootstrap-table-pipeline.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/print/bootstrap-table-print.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/print/bootstrap-table-print.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/reorder-columns/bootstrap-table-reorder-columns.js (87%) create mode 100644 web/skins/classic/assets/bootstrap-table-1.27.3/extensions/reorder-columns/bootstrap-table-reorder-columns.min.js rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/reorder-rows/bootstrap-table-reorder-rows.css (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/reorder-rows/bootstrap-table-reorder-rows.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/reorder-rows/bootstrap-table-reorder-rows.min.css (97%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/reorder-rows/bootstrap-table-reorder-rows.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/resizable/bootstrap-table-resizable.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/resizable/bootstrap-table-resizable.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/sticky-header/bootstrap-table-sticky-header.css (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/sticky-header/bootstrap-table-sticky-header.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/sticky-header/bootstrap-table-sticky-header.min.css (96%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/sticky-header/bootstrap-table-sticky-header.min.js (70%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/toolbar/bootstrap-table-toolbar.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/toolbar/bootstrap-table-toolbar.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/treegrid/bootstrap-table-treegrid.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/extensions/treegrid/bootstrap-table-treegrid.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-af-ZA.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-af-ZA.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-ar-SA.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-ar-SA.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-bg-BG.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-bg-BG.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-ca-ES.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-ca-ES.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-cs-CZ.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-cs-CZ.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-da-DK.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-da-DK.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-de-DE.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-de-DE.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-el-GR.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-el-GR.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-en-US.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-en-US.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-es-AR.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-es-AR.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-es-CL.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-es-CL.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-es-CR.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-es-CR.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-es-ES.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-es-ES.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-es-MX.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-es-MX.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-es-NI.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-es-NI.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-es-SP.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-es-SP.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-et-EE.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-et-EE.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-eu-EU.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-eu-EU.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-fa-IR.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-fa-IR.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-fi-FI.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-fi-FI.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-fr-BE.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-fr-BE.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-fr-CH.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-fr-CH.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-fr-FR.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-fr-FR.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-fr-LU.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-fr-LU.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-he-IL.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-he-IL.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-hi-IN.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-hi-IN.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-hr-HR.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-hr-HR.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-hu-HU.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-hu-HU.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-id-ID.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-id-ID.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-it-IT.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-it-IT.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-ja-JP.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-ja-JP.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-ka-GE.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-ka-GE.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-ko-KR.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-ko-KR.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-lb-LU.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-lb-LU.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-lt-LT.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-lt-LT.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-ms-MY.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-ms-MY.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-nb-NO.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-nb-NO.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-nl-BE.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-nl-BE.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-nl-NL.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-nl-NL.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-pl-PL.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-pl-PL.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-pt-BR.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-pt-BR.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-pt-PT.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-pt-PT.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-ro-RO.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-ro-RO.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-ru-RU.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-ru-RU.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-sk-SK.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-sk-SK.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-sl-SI.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-sl-SI.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-sr-Cyrl-RS.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-sr-Cyrl-RS.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-sr-Latn-RS.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-sr-Latn-RS.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-sv-SE.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-sv-SE.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-th-TH.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-th-TH.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-tr-TR.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-tr-TR.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-uk-UA.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-uk-UA.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-ur-PK.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-ur-PK.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-uz-Latn-UZ.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-uz-Latn-UZ.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-vi-VN.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-vi-VN.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-zh-CN.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-zh-CN.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-zh-TW.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/locale/bootstrap-table-zh-TW.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/themes/bootstrap-table/bootstrap-table.css (98%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/themes/bootstrap-table/bootstrap-table.js (100%) create mode 100644 web/skins/classic/assets/bootstrap-table-1.27.3/themes/bootstrap-table/bootstrap-table.min.css rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/themes/bootstrap-table/bootstrap-table.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/themes/bootstrap-table/fonts/bootstrap-table.eot (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/themes/bootstrap-table/fonts/bootstrap-table.svg (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/themes/bootstrap-table/fonts/bootstrap-table.ttf (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/themes/bootstrap-table/fonts/bootstrap-table.woff (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/themes/bulma/bootstrap-table-bulma.css (97%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/themes/bulma/bootstrap-table-bulma.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/themes/bulma/bootstrap-table-bulma.min.css (60%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/themes/bulma/bootstrap-table-bulma.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/themes/foundation/bootstrap-table-foundation.css (97%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/themes/foundation/bootstrap-table-foundation.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/themes/foundation/bootstrap-table-foundation.min.css (61%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/themes/foundation/bootstrap-table-foundation.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/themes/materialize/bootstrap-table-materialize.css (97%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/themes/materialize/bootstrap-table-materialize.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/themes/materialize/bootstrap-table-materialize.min.css (61%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/themes/materialize/bootstrap-table-materialize.min.js (99%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/themes/semantic/bootstrap-table-semantic.css (97%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/themes/semantic/bootstrap-table-semantic.js (100%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/themes/semantic/bootstrap-table-semantic.min.css (60%) rename web/skins/classic/assets/{bootstrap-table-1.27.1 => bootstrap-table-1.27.3}/themes/semantic/bootstrap-table-semantic.min.js (99%) diff --git a/web/skins/classic/assets/bootstrap-table b/web/skins/classic/assets/bootstrap-table index a7e5f1d08..e7718abf7 120000 --- a/web/skins/classic/assets/bootstrap-table +++ b/web/skins/classic/assets/bootstrap-table @@ -1 +1 @@ -bootstrap-table-1.27.1/ \ No newline at end of file +bootstrap-table-1.27.3/ \ No newline at end of file diff --git a/web/skins/classic/assets/bootstrap-table-1.27.1/bootstrap-table-vue.js b/web/skins/classic/assets/bootstrap-table-1.27.1/bootstrap-table-vue.js deleted file mode 100644 index 4e42c4baf..000000000 --- a/web/skins/classic/assets/bootstrap-table-1.27.1/bootstrap-table-vue.js +++ /dev/null @@ -1,1664 +0,0 @@ -//#region node_modules/@vue/shared/dist/shared.esm-bundler.js -/* @__NO_SIDE_EFFECTS__ */ -function e(e) { - let t = /* @__PURE__ */ Object.create(null); - for (let n of e.split(",")) t[n] = 1; - return (e) => e in t; -} -var t = process.env.NODE_ENV === "production" ? {} : Object.freeze({}), n = process.env.NODE_ENV === "production" ? [] : Object.freeze([]), r = () => {}, i = (e) => e.charCodeAt(0) === 111 && e.charCodeAt(1) === 110 && (e.charCodeAt(2) > 122 || e.charCodeAt(2) < 97), a = Object.assign, o = (e, t) => { - let n = e.indexOf(t); - n > -1 && e.splice(n, 1); -}, s = Object.prototype.hasOwnProperty, c = (e, t) => s.call(e, t), l = Array.isArray, u = (e) => v(e) === "[object Map]", d = (e) => v(e) === "[object Set]", f = (e) => typeof e == "function", p = (e) => typeof e == "string", m = (e) => typeof e == "symbol", h = (e) => typeof e == "object" && !!e, g = (e) => (h(e) || f(e)) && f(e.then) && f(e.catch), _ = Object.prototype.toString, v = (e) => _.call(e), y = (e) => v(e).slice(8, -1), ee = (e) => v(e) === "[object Object]", b = (e) => p(e) && e !== "NaN" && e[0] !== "-" && "" + parseInt(e, 10) === e, te = ((e) => { - let t = /* @__PURE__ */ Object.create(null); - return ((n) => t[n] || (t[n] = e(n))); -})((e) => e.charAt(0).toUpperCase() + e.slice(1)), x = (e, t) => !Object.is(e, t), S = (e, t, n, r = !1) => { - Object.defineProperty(e, t, { - configurable: !0, - enumerable: !1, - writable: r, - value: n - }); -}, C, w = () => C ||= typeof globalThis < "u" ? globalThis : typeof self < "u" ? self : typeof window < "u" ? window : typeof global < "u" ? global : {}; -function ne(e) { - if (l(e)) { - let t = {}; - for (let n = 0; n < e.length; n++) { - let r = e[n], i = p(r) ? oe(r) : ne(r); - if (i) for (let e in i) t[e] = i[e]; - } - return t; - } else if (p(e) || h(e)) return e; -} -var re = /;(?![^(]*\))/g, ie = /:([^]+)/, ae = /\/\*[^]*?\*\//g; -function oe(e) { - let t = {}; - return e.replace(ae, "").split(re).forEach((e) => { - if (e) { - let n = e.split(ie); - n.length > 1 && (t[n[0].trim()] = n[1].trim()); - } - }), t; -} -function se(e) { - let t = ""; - if (p(e)) t = e; - else if (l(e)) for (let n = 0; n < e.length; n++) { - let r = se(e[n]); - r && (t += r + " "); - } - else if (h(e)) for (let n in e) e[n] && (t += n + " "); - return t.trim(); -} -//#endregion -//#region node_modules/@vue/reactivity/dist/reactivity.esm-bundler.js -function T(e, ...t) { - console.warn(`[Vue warn] ${e}`, ...t); -} -var ce; -function le() { - return ce; -} -var E, ue = /* @__PURE__ */ new WeakSet(), de = class { - constructor(e) { - this.fn = e, this.deps = void 0, this.depsTail = void 0, this.flags = 5, this.next = void 0, this.cleanup = void 0, this.scheduler = void 0, ce && ce.active && ce.effects.push(this); - } - pause() { - this.flags |= 64; - } - resume() { - this.flags & 64 && (this.flags &= -65, ue.has(this) && (ue.delete(this), this.trigger())); - } - notify() { - this.flags & 2 && !(this.flags & 32) || this.flags & 8 || he(this); - } - run() { - if (!(this.flags & 1)) return this.fn(); - this.flags |= 2, Ee(this), ve(this); - let e = E, t = D; - E = this, D = !0; - try { - return this.fn(); - } finally { - process.env.NODE_ENV !== "production" && E !== this && T("Active effect was not restored correctly - this is likely a Vue internal bug."), ye(this), E = e, D = t, this.flags &= -3; - } - } - stop() { - if (this.flags & 1) { - for (let e = this.deps; e; e = e.nextDep) Se(e); - this.deps = this.depsTail = void 0, Ee(this), this.onStop && this.onStop(), this.flags &= -2; - } - } - trigger() { - this.flags & 64 ? ue.add(this) : this.scheduler ? this.scheduler() : this.runIfDirty(); - } - runIfDirty() { - be(this) && this.run(); - } - get dirty() { - return be(this); - } -}, fe = 0, pe, me; -function he(e, t = !1) { - if (e.flags |= 8, t) { - e.next = me, me = e; - return; - } - e.next = pe, pe = e; -} -function ge() { - fe++; -} -function _e() { - if (--fe > 0) return; - if (me) { - let e = me; - for (me = void 0; e;) { - let t = e.next; - e.next = void 0, e.flags &= -9, e = t; - } - } - let e; - for (; pe;) { - let t = pe; - for (pe = void 0; t;) { - let n = t.next; - if (t.next = void 0, t.flags &= -9, t.flags & 1) try { - t.trigger(); - } catch (t) { - e ||= t; - } - t = n; - } - } - if (e) throw e; -} -function ve(e) { - for (let t = e.deps; t; t = t.nextDep) t.version = -1, t.prevActiveLink = t.dep.activeLink, t.dep.activeLink = t; -} -function ye(e) { - let t, n = e.depsTail, r = n; - for (; r;) { - let e = r.prevDep; - r.version === -1 ? (r === n && (n = e), Se(r), Ce(r)) : t = r, r.dep.activeLink = r.prevActiveLink, r.prevActiveLink = void 0, r = e; - } - e.deps = t, e.depsTail = n; -} -function be(e) { - for (let t = e.deps; t; t = t.nextDep) if (t.dep.version !== t.version || t.dep.computed && (xe(t.dep.computed) || t.dep.version !== t.version)) return !0; - return !!e._dirty; -} -function xe(e) { - if (e.flags & 4 && !(e.flags & 16) || (e.flags &= -17, e.globalVersion === De) || (e.globalVersion = De, !e.isSSR && e.flags & 128 && (!e.deps && !e._dirty || !be(e)))) return; - e.flags |= 2; - let t = e.dep, n = E, r = D; - E = e, D = !0; - try { - ve(e); - let n = e.fn(e._value); - (t.version === 0 || x(n, e._value)) && (e.flags |= 128, e._value = n, t.version++); - } catch (e) { - throw t.version++, e; - } finally { - E = n, D = r, ye(e), e.flags &= -3; - } -} -function Se(e, t = !1) { - let { dep: n, prevSub: r, nextSub: i } = e; - if (r && (r.nextSub = i, e.prevSub = void 0), i && (i.prevSub = r, e.nextSub = void 0), process.env.NODE_ENV !== "production" && n.subsHead === e && (n.subsHead = i), n.subs === e && (n.subs = r, !r && n.computed)) { - n.computed.flags &= -5; - for (let e = n.computed.deps; e; e = e.nextDep) Se(e, !0); - } - !t && !--n.sc && n.map && n.map.delete(n.key); -} -function Ce(e) { - let { prevDep: t, nextDep: n } = e; - t && (t.nextDep = n, e.prevDep = void 0), n && (n.prevDep = t, e.nextDep = void 0); -} -var D = !0, we = []; -function Te() { - we.push(D), D = !1; -} -function O() { - let e = we.pop(); - D = e === void 0 ? !0 : e; -} -function Ee(e) { - let { cleanup: t } = e; - if (e.cleanup = void 0, t) { - let e = E; - E = void 0; - try { - t(); - } finally { - E = e; - } - } -} -var De = 0, Oe = class { - constructor(e, t) { - this.sub = e, this.dep = t, this.version = t.version, this.nextDep = this.prevDep = this.nextSub = this.prevSub = this.prevActiveLink = void 0; - } -}, ke = class { - constructor(e) { - this.computed = e, this.version = 0, this.activeLink = void 0, this.subs = void 0, this.map = void 0, this.key = void 0, this.sc = 0, this.__v_skip = !0, process.env.NODE_ENV !== "production" && (this.subsHead = void 0); - } - track(e) { - if (!E || !D || E === this.computed) return; - let t = this.activeLink; - if (t === void 0 || t.sub !== E) t = this.activeLink = new Oe(E, this), E.deps ? (t.prevDep = E.depsTail, E.depsTail.nextDep = t, E.depsTail = t) : E.deps = E.depsTail = t, Ae(t); - else if (t.version === -1 && (t.version = this.version, t.nextDep)) { - let e = t.nextDep; - e.prevDep = t.prevDep, t.prevDep && (t.prevDep.nextDep = e), t.prevDep = E.depsTail, t.nextDep = void 0, E.depsTail.nextDep = t, E.depsTail = t, E.deps === t && (E.deps = e); - } - return process.env.NODE_ENV !== "production" && E.onTrack && E.onTrack(a({ effect: E }, e)), t; - } - trigger(e) { - this.version++, De++, this.notify(e); - } - notify(e) { - ge(); - try { - if (process.env.NODE_ENV !== "production") for (let t = this.subsHead; t; t = t.nextSub) t.sub.onTrigger && !(t.sub.flags & 8) && t.sub.onTrigger(a({ effect: t.sub }, e)); - for (let e = this.subs; e; e = e.prevSub) e.sub.notify() && e.sub.dep.notify(); - } finally { - _e(); - } - } -}; -function Ae(e) { - if (e.dep.sc++, e.sub.flags & 4) { - let t = e.dep.computed; - if (t && !e.dep.subs) { - t.flags |= 20; - for (let e = t.deps; e; e = e.nextDep) Ae(e); - } - let n = e.dep.subs; - n !== e && (e.prevSub = n, n && (n.nextSub = e)), process.env.NODE_ENV !== "production" && e.dep.subsHead === void 0 && (e.dep.subsHead = e), e.dep.subs = e; - } -} -var je = /* @__PURE__ */ new WeakMap(), k = /* @__PURE__ */ Symbol(process.env.NODE_ENV === "production" ? "" : "Object iterate"), Me = /* @__PURE__ */ Symbol(process.env.NODE_ENV === "production" ? "" : "Map keys iterate"), A = /* @__PURE__ */ Symbol(process.env.NODE_ENV === "production" ? "" : "Array iterate"); -function j(e, t, n) { - if (D && E) { - let r = je.get(e); - r || je.set(e, r = /* @__PURE__ */ new Map()); - let i = r.get(n); - i || (r.set(n, i = new ke()), i.map = r, i.key = n), process.env.NODE_ENV === "production" ? i.track() : i.track({ - target: e, - type: t, - key: n - }); - } -} -function M(e, t, n, r, i, a) { - let o = je.get(e); - if (!o) { - De++; - return; - } - let s = (o) => { - o && (process.env.NODE_ENV === "production" ? o.trigger() : o.trigger({ - target: e, - type: t, - key: n, - newValue: r, - oldValue: i, - oldTarget: a - })); - }; - if (ge(), t === "clear") o.forEach(s); - else { - let i = l(e), a = i && b(n); - if (i && n === "length") { - let e = Number(r); - o.forEach((t, n) => { - (n === "length" || n === A || !m(n) && n >= e) && s(t); - }); - } else switch ((n !== void 0 || o.has(void 0)) && s(o.get(n)), a && s(o.get(A)), t) { - case "add": - i ? a && s(o.get("length")) : (s(o.get(k)), u(e) && s(o.get(Me))); - break; - case "delete": - i || (s(o.get(k)), u(e) && s(o.get(Me))); - break; - case "set": - u(e) && s(o.get(k)); - break; - } - } - _e(); -} -function N(e) { - let t = /* @__PURE__ */ z(e); - return t === e ? t : (j(t, "iterate", A), /* @__PURE__ */ R(e) ? t : t.map(B)); -} -function Ne(e) { - return j(e = /* @__PURE__ */ z(e), "iterate", A), e; -} -function P(e, t) { - return /* @__PURE__ */ L(e) ? _t(/* @__PURE__ */ I(e) ? B(t) : t) : B(t); -} -var Pe = { - __proto__: null, - [Symbol.iterator]() { - return Fe(this, Symbol.iterator, (e) => P(this, e)); - }, - concat(...e) { - return N(this).concat(...e.map((e) => l(e) ? N(e) : e)); - }, - entries() { - return Fe(this, "entries", (e) => (e[1] = P(this, e[1]), e)); - }, - every(e, t) { - return F(this, "every", e, t, void 0, arguments); - }, - filter(e, t) { - return F(this, "filter", e, t, (e) => e.map((e) => P(this, e)), arguments); - }, - find(e, t) { - return F(this, "find", e, t, (e) => P(this, e), arguments); - }, - findIndex(e, t) { - return F(this, "findIndex", e, t, void 0, arguments); - }, - findLast(e, t) { - return F(this, "findLast", e, t, (e) => P(this, e), arguments); - }, - findLastIndex(e, t) { - return F(this, "findLastIndex", e, t, void 0, arguments); - }, - forEach(e, t) { - return F(this, "forEach", e, t, void 0, arguments); - }, - includes(...e) { - return Re(this, "includes", e); - }, - indexOf(...e) { - return Re(this, "indexOf", e); - }, - join(e) { - return N(this).join(e); - }, - lastIndexOf(...e) { - return Re(this, "lastIndexOf", e); - }, - map(e, t) { - return F(this, "map", e, t, void 0, arguments); - }, - pop() { - return ze(this, "pop"); - }, - push(...e) { - return ze(this, "push", e); - }, - reduce(e, ...t) { - return Le(this, "reduce", e, t); - }, - reduceRight(e, ...t) { - return Le(this, "reduceRight", e, t); - }, - shift() { - return ze(this, "shift"); - }, - some(e, t) { - return F(this, "some", e, t, void 0, arguments); - }, - splice(...e) { - return ze(this, "splice", e); - }, - toReversed() { - return N(this).toReversed(); - }, - toSorted(e) { - return N(this).toSorted(e); - }, - toSpliced(...e) { - return N(this).toSpliced(...e); - }, - unshift(...e) { - return ze(this, "unshift", e); - }, - values() { - return Fe(this, "values", (e) => P(this, e)); - } -}; -function Fe(e, t, n) { - let r = Ne(e), i = r[t](); - return r !== e && !/* @__PURE__ */ R(e) && (i._next = i.next, i.next = () => { - let e = i._next(); - return e.done || (e.value = n(e.value)), e; - }), i; -} -var Ie = Array.prototype; -function F(e, t, n, r, i, a) { - let o = Ne(e), s = o !== e && !/* @__PURE__ */ R(e), c = o[t]; - if (c !== Ie[t]) { - let t = c.apply(e, a); - return s ? B(t) : t; - } - let l = n; - o !== e && (s ? l = function(t, r) { - return n.call(this, P(e, t), r, e); - } : n.length > 2 && (l = function(t, r) { - return n.call(this, t, r, e); - })); - let u = c.call(o, l, r); - return s && i ? i(u) : u; -} -function Le(e, t, n, r) { - let i = Ne(e), a = i !== e && !/* @__PURE__ */ R(e), o = n, s = !1; - i !== e && (a ? (s = r.length === 0, o = function(t, r, i) { - return s && (s = !1, t = P(e, t)), n.call(this, t, P(e, r), i, e); - }) : n.length > 3 && (o = function(t, r, i) { - return n.call(this, t, r, i, e); - })); - let c = i[t](o, ...r); - return s ? P(e, c) : c; -} -function Re(e, t, n) { - let r = /* @__PURE__ */ z(e); - j(r, "iterate", A); - let i = r[t](...n); - return (i === -1 || i === !1) && /* @__PURE__ */ ht(n[0]) ? (n[0] = /* @__PURE__ */ z(n[0]), r[t](...n)) : i; -} -function ze(e, t, n = []) { - Te(), ge(); - let r = (/* @__PURE__ */ z(e))[t].apply(e, n); - return _e(), O(), r; -} -var Be = /* @__PURE__ */ e("__proto__,__v_isRef,__isVue"), Ve = new Set(/* @__PURE__ */ Object.getOwnPropertyNames(Symbol).filter((e) => e !== "arguments" && e !== "caller").map((e) => Symbol[e]).filter(m)); -function He(e) { - m(e) || (e = String(e)); - let t = /* @__PURE__ */ z(this); - return j(t, "has", e), t.hasOwnProperty(e); -} -var Ue = class { - constructor(e = !1, t = !1) { - this._isReadonly = e, this._isShallow = t; - } - get(e, t, n) { - if (t === "__v_skip") return e.__v_skip; - let r = this._isReadonly, i = this._isShallow; - if (t === "__v_isReactive") return !r; - if (t === "__v_isReadonly") return r; - if (t === "__v_isShallow") return i; - if (t === "__v_raw") return n === (r ? i ? ct : st : i ? ot : at).get(e) || Object.getPrototypeOf(e) === Object.getPrototypeOf(n) ? e : void 0; - let a = l(e); - if (!r) { - let e; - if (a && (e = Pe[t])) return e; - if (t === "hasOwnProperty") return He; - } - let o = Reflect.get(e, t, /* @__PURE__ */ V(e) ? e : n); - if ((m(t) ? Ve.has(t) : Be(t)) || (r || j(e, "get", t), i)) return o; - if (/* @__PURE__ */ V(o)) { - let e = a && b(t) ? o : o.value; - return r && h(e) ? /* @__PURE__ */ ft(e) : e; - } - return h(o) ? r ? /* @__PURE__ */ ft(o) : /* @__PURE__ */ dt(o) : o; - } -}, We = class extends Ue { - constructor(e = !1) { - super(!1, e); - } - set(e, t, n, r) { - let i = e[t], a = l(e) && b(t); - if (!this._isShallow) { - let r = /* @__PURE__ */ L(i); - if (!/* @__PURE__ */ R(n) && !/* @__PURE__ */ L(n) && (i = /* @__PURE__ */ z(i), n = /* @__PURE__ */ z(n)), !a && /* @__PURE__ */ V(i) && !/* @__PURE__ */ V(n)) return r ? (process.env.NODE_ENV !== "production" && T(`Set operation on key "${String(t)}" failed: target is readonly.`, e[t]), !0) : (i.value = n, !0); - } - let o = a ? Number(t) < e.length : c(e, t), s = Reflect.set(e, t, n, /* @__PURE__ */ V(e) ? e : r); - return e === /* @__PURE__ */ z(r) && (o ? x(n, i) && M(e, "set", t, n, i) : M(e, "add", t, n)), s; - } - deleteProperty(e, t) { - let n = c(e, t), r = e[t], i = Reflect.deleteProperty(e, t); - return i && n && M(e, "delete", t, void 0, r), i; - } - has(e, t) { - let n = Reflect.has(e, t); - return (!m(t) || !Ve.has(t)) && j(e, "has", t), n; - } - ownKeys(e) { - return j(e, "iterate", l(e) ? "length" : k), Reflect.ownKeys(e); - } -}, Ge = class extends Ue { - constructor(e = !1) { - super(!0, e); - } - set(e, t) { - return process.env.NODE_ENV !== "production" && T(`Set operation on key "${String(t)}" failed: target is readonly.`, e), !0; - } - deleteProperty(e, t) { - return process.env.NODE_ENV !== "production" && T(`Delete operation on key "${String(t)}" failed: target is readonly.`, e), !0; - } -}, Ke = /* @__PURE__ */ new We(), qe = /* @__PURE__ */ new Ge(), Je = /* @__PURE__ */ new Ge(!0), Ye = (e) => e, Xe = (e) => Reflect.getPrototypeOf(e); -function Ze(e, t, n) { - return function(...r) { - let i = this.__v_raw, o = /* @__PURE__ */ z(i), s = u(o), c = e === "entries" || e === Symbol.iterator && s, l = e === "keys" && s, d = i[e](...r), f = n ? Ye : t ? _t : B; - return !t && j(o, "iterate", l ? Me : k), a(Object.create(d), { next() { - let { value: e, done: t } = d.next(); - return t ? { - value: e, - done: t - } : { - value: c ? [f(e[0]), f(e[1])] : f(e), - done: t - }; - } }); - }; -} -function Qe(e) { - return function(...t) { - if (process.env.NODE_ENV !== "production") { - let n = t[0] ? `on key "${t[0]}" ` : ""; - T(`${te(e)} operation ${n}failed: target is readonly.`, /* @__PURE__ */ z(this)); - } - return e === "delete" ? !1 : e === "clear" ? void 0 : this; - }; -} -function $e(e, t) { - let n = { - get(n) { - let r = this.__v_raw, i = /* @__PURE__ */ z(r), a = /* @__PURE__ */ z(n); - e || (x(n, a) && j(i, "get", n), j(i, "get", a)); - let { has: o } = Xe(i), s = t ? Ye : e ? _t : B; - if (o.call(i, n)) return s(r.get(n)); - if (o.call(i, a)) return s(r.get(a)); - r !== i && r.get(n); - }, - get size() { - let t = this.__v_raw; - return !e && j(/* @__PURE__ */ z(t), "iterate", k), t.size; - }, - has(t) { - let n = this.__v_raw, r = /* @__PURE__ */ z(n), i = /* @__PURE__ */ z(t); - return e || (x(t, i) && j(r, "has", t), j(r, "has", i)), t === i ? n.has(t) : n.has(t) || n.has(i); - }, - forEach(n, r) { - let i = this, a = i.__v_raw, o = /* @__PURE__ */ z(a), s = t ? Ye : e ? _t : B; - return !e && j(o, "iterate", k), a.forEach((e, t) => n.call(r, s(e), s(t), i)); - } - }; - return a(n, e ? { - add: Qe("add"), - set: Qe("set"), - delete: Qe("delete"), - clear: Qe("clear") - } : { - add(e) { - let n = /* @__PURE__ */ z(this), r = Xe(n), i = /* @__PURE__ */ z(e), a = !t && !/* @__PURE__ */ R(e) && !/* @__PURE__ */ L(e) ? i : e; - return r.has.call(n, a) || x(e, a) && r.has.call(n, e) || x(i, a) && r.has.call(n, i) || (n.add(a), M(n, "add", a, a)), this; - }, - set(e, n) { - !t && !/* @__PURE__ */ R(n) && !/* @__PURE__ */ L(n) && (n = /* @__PURE__ */ z(n)); - let r = /* @__PURE__ */ z(this), { has: i, get: a } = Xe(r), o = i.call(r, e); - o ? process.env.NODE_ENV !== "production" && it(r, i, e) : (e = /* @__PURE__ */ z(e), o = i.call(r, e)); - let s = a.call(r, e); - return r.set(e, n), o ? x(n, s) && M(r, "set", e, n, s) : M(r, "add", e, n), this; - }, - delete(e) { - let t = /* @__PURE__ */ z(this), { has: n, get: r } = Xe(t), i = n.call(t, e); - i ? process.env.NODE_ENV !== "production" && it(t, n, e) : (e = /* @__PURE__ */ z(e), i = n.call(t, e)); - let a = r ? r.call(t, e) : void 0, o = t.delete(e); - return i && M(t, "delete", e, void 0, a), o; - }, - clear() { - let e = /* @__PURE__ */ z(this), t = e.size !== 0, n = process.env.NODE_ENV === "production" ? void 0 : u(e) ? new Map(e) : new Set(e), r = e.clear(); - return t && M(e, "clear", void 0, void 0, n), r; - } - }), [ - "keys", - "values", - "entries", - Symbol.iterator - ].forEach((r) => { - n[r] = Ze(r, e, t); - }), n; -} -function et(e, t) { - let n = $e(e, t); - return (t, r, i) => r === "__v_isReactive" ? !e : r === "__v_isReadonly" ? e : r === "__v_raw" ? t : Reflect.get(c(n, r) && r in t ? n : t, r, i); -} -var tt = { get: /* @__PURE__ */ et(!1, !1) }, nt = { get: /* @__PURE__ */ et(!0, !1) }, rt = { get: /* @__PURE__ */ et(!0, !0) }; -function it(e, t, n) { - let r = /* @__PURE__ */ z(n); - if (r !== n && t.call(e, r)) { - let t = y(e); - T(`Reactive ${t} contains both the raw and reactive versions of the same object${t === "Map" ? " as keys" : ""}, which can lead to inconsistencies. Avoid differentiating between the raw and reactive versions of an object and only use the reactive version if possible.`); - } -} -var at = /* @__PURE__ */ new WeakMap(), ot = /* @__PURE__ */ new WeakMap(), st = /* @__PURE__ */ new WeakMap(), ct = /* @__PURE__ */ new WeakMap(); -function lt(e) { - switch (e) { - case "Object": - case "Array": return 1; - case "Map": - case "Set": - case "WeakMap": - case "WeakSet": return 2; - default: return 0; - } -} -function ut(e) { - return e.__v_skip || !Object.isExtensible(e) ? 0 : lt(y(e)); -} -/* @__NO_SIDE_EFFECTS__ */ -function dt(e) { - return /* @__PURE__ */ L(e) ? e : mt(e, !1, Ke, tt, at); -} -/* @__NO_SIDE_EFFECTS__ */ -function ft(e) { - return mt(e, !0, qe, nt, st); -} -/* @__NO_SIDE_EFFECTS__ */ -function pt(e) { - return mt(e, !0, Je, rt, ct); -} -function mt(e, t, n, r, i) { - if (!h(e)) return process.env.NODE_ENV !== "production" && T(`value cannot be made ${t ? "readonly" : "reactive"}: ${String(e)}`), e; - if (e.__v_raw && !(t && e.__v_isReactive)) return e; - let a = ut(e); - if (a === 0) return e; - let o = i.get(e); - if (o) return o; - let s = new Proxy(e, a === 2 ? r : n); - return i.set(e, s), s; -} -/* @__NO_SIDE_EFFECTS__ */ -function I(e) { - return /* @__PURE__ */ L(e) ? /* @__PURE__ */ I(e.__v_raw) : !!(e && e.__v_isReactive); -} -/* @__NO_SIDE_EFFECTS__ */ -function L(e) { - return !!(e && e.__v_isReadonly); -} -/* @__NO_SIDE_EFFECTS__ */ -function R(e) { - return !!(e && e.__v_isShallow); -} -/* @__NO_SIDE_EFFECTS__ */ -function ht(e) { - return e ? !!e.__v_raw : !1; -} -/* @__NO_SIDE_EFFECTS__ */ -function z(e) { - let t = e && e.__v_raw; - return t ? /* @__PURE__ */ z(t) : e; -} -function gt(e) { - return !c(e, "__v_skip") && Object.isExtensible(e) && S(e, "__v_skip", !0), e; -} -var B = (e) => h(e) ? /* @__PURE__ */ dt(e) : e, _t = (e) => h(e) ? /* @__PURE__ */ ft(e) : e; -/* @__NO_SIDE_EFFECTS__ */ -function V(e) { - return e ? e.__v_isRef === !0 : !1; -} -function vt(e) { - return /* @__PURE__ */ V(e) ? e.value : e; -} -var yt = { - get: (e, t, n) => t === "__v_raw" ? e : vt(Reflect.get(e, t, n)), - set: (e, t, n, r) => { - let i = e[t]; - return /* @__PURE__ */ V(i) && !/* @__PURE__ */ V(n) ? (i.value = n, !0) : Reflect.set(e, t, n, r); - } -}; -function bt(e) { - return /* @__PURE__ */ I(e) ? e : new Proxy(e, yt); -} -var xt = {}, St = /* @__PURE__ */ new WeakMap(), H = void 0; -function Ct(e, t = !1, n = H) { - if (n) { - let t = St.get(n); - t || St.set(n, t = []), t.push(e); - } else process.env.NODE_ENV !== "production" && !t && T("onWatcherCleanup() was called when there was no active watcher to associate with."); -} -function wt(e, n, i = t) { - let { immediate: a, deep: s, once: c, scheduler: u, augmentJob: d, call: p } = i, m = (e) => { - (i.onWarn || T)("Invalid watch source: ", e, "A watch source can only be a getter/effect function, a ref, a reactive object, or an array of these types."); - }, h = (e) => s ? e : /* @__PURE__ */ R(e) || s === !1 || s === 0 ? U(e, 1) : U(e), g, _, v, y, ee = !1, b = !1; - if (/* @__PURE__ */ V(e) ? (_ = () => e.value, ee = /* @__PURE__ */ R(e)) : /* @__PURE__ */ I(e) ? (_ = () => h(e), ee = !0) : l(e) ? (b = !0, ee = e.some((e) => /* @__PURE__ */ I(e) || /* @__PURE__ */ R(e)), _ = () => e.map((e) => { - if (/* @__PURE__ */ V(e)) return e.value; - if (/* @__PURE__ */ I(e)) return h(e); - if (f(e)) return p ? p(e, 2) : e(); - process.env.NODE_ENV !== "production" && m(e); - })) : f(e) ? _ = n ? p ? () => p(e, 2) : e : () => { - if (v) { - Te(); - try { - v(); - } finally { - O(); - } - } - let t = H; - H = g; - try { - return p ? p(e, 3, [y]) : e(y); - } finally { - H = t; - } - } : (_ = r, process.env.NODE_ENV !== "production" && m(e)), n && s) { - let e = _, t = s === !0 ? Infinity : s; - _ = () => U(e(), t); - } - let te = le(), S = () => { - g.stop(), te && te.active && o(te.effects, g); - }; - if (c && n) { - let e = n; - n = (...t) => { - e(...t), S(); - }; - } - let C = b ? Array(e.length).fill(xt) : xt, w = (e) => { - if (!(!(g.flags & 1) || !g.dirty && !e)) if (n) { - let e = g.run(); - if (s || ee || (b ? e.some((e, t) => x(e, C[t])) : x(e, C))) { - v && v(); - let t = H; - H = g; - try { - let t = [ - e, - C === xt ? void 0 : b && C[0] === xt ? [] : C, - y - ]; - C = e, p ? p(n, 3, t) : n(...t); - } finally { - H = t; - } - } - } else g.run(); - }; - return d && d(w), g = new de(_), g.scheduler = u ? () => u(w, !1) : w, y = (e) => Ct(e, !1, g), v = g.onStop = () => { - let e = St.get(g); - if (e) { - if (p) p(e, 4); - else for (let t of e) t(); - St.delete(g); - } - }, process.env.NODE_ENV !== "production" && (g.onTrack = i.onTrack, g.onTrigger = i.onTrigger), n ? a ? w(!0) : C = g.run() : u ? u(w.bind(null, !0), !0) : g.run(), S.pause = g.pause.bind(g), S.resume = g.resume.bind(g), S.stop = S, S; -} -function U(e, t = Infinity, n) { - if (t <= 0 || !h(e) || e.__v_skip || (n ||= /* @__PURE__ */ new Map(), (n.get(e) || 0) >= t)) return e; - if (n.set(e, t), t--, /* @__PURE__ */ V(e)) U(e.value, t, n); - else if (l(e)) for (let r = 0; r < e.length; r++) U(e[r], t, n); - else if (d(e) || u(e)) e.forEach((e) => { - U(e, t, n); - }); - else if (ee(e)) { - for (let r in e) U(e[r], t, n); - for (let r of Object.getOwnPropertySymbols(e)) Object.prototype.propertyIsEnumerable.call(e, r) && U(e[r], t, n); - } - return e; -} -//#endregion -//#region node_modules/@vue/runtime-core/dist/runtime-core.esm-bundler.js -var W = []; -function Tt(e) { - W.push(e); -} -function Et() { - W.pop(); -} -var Dt = !1; -function G(e, ...t) { - if (Dt) return; - Dt = !0, Te(); - let n = W.length ? W[W.length - 1].component : null, r = n && n.appContext.config.warnHandler, i = Ot(); - if (r) Pt(r, n, 11, [ - e + t.map((e) => e.toString?.call(e) ?? JSON.stringify(e)).join(""), - n && n.proxy, - i.map(({ vnode: e }) => `at <${yr(n, e.type)}>`).join("\n"), - i - ]); - else { - let n = [`[Vue warn]: ${e}`, ...t]; - i.length && n.push("\n", ...kt(i)), console.warn(...n); - } - O(), Dt = !1; -} -function Ot() { - let e = W[W.length - 1]; - if (!e) return []; - let t = []; - for (; e;) { - let n = t[0]; - n && n.vnode === e ? n.recurseCount++ : t.push({ - vnode: e, - recurseCount: 0 - }); - let r = e.component && e.component.parent; - e = r && r.vnode; - } - return t; -} -function kt(e) { - let t = []; - return e.forEach((e, n) => { - t.push(...n === 0 ? [] : ["\n"], ...At(e)); - }), t; -} -function At({ vnode: e, recurseCount: t }) { - let n = t > 0 ? `... (${t} recursive calls)` : "", r = e.component ? e.component.parent == null : !1, i = ` at <${yr(e.component, e.type, r)}`, a = ">" + n; - return e.props ? [ - i, - ...jt(e.props), - a - ] : [i + a]; -} -function jt(e) { - let t = [], n = Object.keys(e); - return n.slice(0, 3).forEach((n) => { - t.push(...Mt(n, e[n])); - }), n.length > 3 && t.push(" ..."), t; -} -function Mt(e, t, n) { - return p(t) ? (t = JSON.stringify(t), n ? t : [`${e}=${t}`]) : typeof t == "number" || typeof t == "boolean" || t == null ? n ? t : [`${e}=${t}`] : /* @__PURE__ */ V(t) ? (t = Mt(e, /* @__PURE__ */ z(t.value), !0), n ? t : [ - `${e}=Ref<`, - t, - ">" - ]) : f(t) ? [`${e}=fn${t.name ? `<${t.name}>` : ""}`] : (t = /* @__PURE__ */ z(t), n ? t : [`${e}=`, t]); -} -var Nt = { - sp: "serverPrefetch hook", - bc: "beforeCreate hook", - c: "created hook", - bm: "beforeMount hook", - m: "mounted hook", - bu: "beforeUpdate hook", - u: "updated", - bum: "beforeUnmount hook", - um: "unmounted hook", - a: "activated hook", - da: "deactivated hook", - ec: "errorCaptured hook", - rtc: "renderTracked hook", - rtg: "renderTriggered hook", - 0: "setup function", - 1: "render function", - 2: "watcher getter", - 3: "watcher callback", - 4: "watcher cleanup function", - 5: "native event handler", - 6: "component event handler", - 7: "vnode hook", - 8: "directive hook", - 9: "transition hook", - 10: "app errorHandler", - 11: "app warnHandler", - 12: "ref function", - 13: "async component loader", - 14: "scheduler flush", - 15: "component update", - 16: "app unmount cleanup function" -}; -function Pt(e, t, n, r) { - try { - return r ? e(...r) : e(); - } catch (e) { - It(e, t, n); - } -} -function Ft(e, t, n, r) { - if (f(e)) { - let i = Pt(e, t, n, r); - return i && g(i) && i.catch((e) => { - It(e, t, n); - }), i; - } - if (l(e)) { - let i = []; - for (let a = 0; a < e.length; a++) i.push(Ft(e[a], t, n, r)); - return i; - } else process.env.NODE_ENV !== "production" && G(`Invalid value type passed to callWithAsyncErrorHandling(): ${typeof e}`); -} -function It(e, n, r, i = !0) { - let a = n ? n.vnode : null, { errorHandler: o, throwUnhandledErrorInProduction: s } = n && n.appContext.config || t; - if (n) { - let t = n.parent, i = n.proxy, a = process.env.NODE_ENV === "production" ? `https://vuejs.org/error-reference/#runtime-${r}` : Nt[r]; - for (; t;) { - let n = t.ec; - if (n) { - for (let t = 0; t < n.length; t++) if (n[t](e, i, a) === !1) return; - } - t = t.parent; - } - if (o) { - Te(), Pt(o, null, 10, [ - e, - i, - a - ]), O(); - return; - } - } - Lt(e, r, a, i, s); -} -function Lt(e, t, n, r = !0, i = !1) { - if (process.env.NODE_ENV !== "production") { - let i = Nt[t]; - if (n && Tt(n), G(`Unhandled error${i ? ` during execution of ${i}` : ""}`), n && Et(), r) throw e; - console.error(e); - } else if (i) throw e; - else console.error(e); -} -var K = [], q = -1, J = [], Y = null, X = 0, Rt = /* @__PURE__ */ Promise.resolve(), zt = null, Bt = 100; -function Vt(e) { - let t = zt || Rt; - return e ? t.then(this ? e.bind(this) : e) : t; -} -function Ht(e) { - let t = q + 1, n = K.length; - for (; t < n;) { - let r = t + n >>> 1, i = K[r], a = qt(i); - a < e || a === e && i.flags & 2 ? t = r + 1 : n = r; - } - return t; -} -function Ut(e) { - if (!(e.flags & 1)) { - let t = qt(e), n = K[K.length - 1]; - !n || !(e.flags & 2) && t >= qt(n) ? K.push(e) : K.splice(Ht(t), 0, e), e.flags |= 1, Wt(); - } -} -function Wt() { - zt ||= Rt.then(Jt); -} -function Gt(e) { - l(e) ? J.push(...e) : Y && e.id === -1 ? Y.splice(X + 1, 0, e) : e.flags & 1 || (J.push(e), e.flags |= 1), Wt(); -} -function Kt(e) { - if (J.length) { - let t = [...new Set(J)].sort((e, t) => qt(e) - qt(t)); - if (J.length = 0, Y) { - Y.push(...t); - return; - } - for (Y = t, process.env.NODE_ENV !== "production" && (e ||= /* @__PURE__ */ new Map()), X = 0; X < Y.length; X++) { - let t = Y[X]; - process.env.NODE_ENV !== "production" && Yt(e, t) || (t.flags & 4 && (t.flags &= -2), t.flags & 8 || t(), t.flags &= -2); - } - Y = null, X = 0; - } -} -var qt = (e) => e.id == null ? e.flags & 2 ? -1 : Infinity : e.id; -function Jt(e) { - process.env.NODE_ENV !== "production" && (e ||= /* @__PURE__ */ new Map()); - let t = process.env.NODE_ENV === "production" ? r : (t) => Yt(e, t); - try { - for (q = 0; q < K.length; q++) { - let e = K[q]; - if (e && !(e.flags & 8)) { - if (process.env.NODE_ENV !== "production" && t(e)) continue; - e.flags & 4 && (e.flags &= -2), Pt(e, e.i, e.i ? 15 : 14), e.flags & 4 || (e.flags &= -2); - } - } - } finally { - for (; q < K.length; q++) { - let e = K[q]; - e && (e.flags &= -2); - } - q = -1, K.length = 0, Kt(e), zt = null, (K.length || J.length) && Jt(e); - } -} -function Yt(e, t) { - let n = e.get(t) || 0; - if (n > Bt) { - let e = t.i, n = e && vr(e.type); - return It(`Maximum recursive updates exceeded${n ? ` in component <${n}>` : ""}. This means you have a reactive effect that is mutating its own dependencies and thus recursively triggering itself. Possible sources include component template, render function, updated hook or watcher source function.`, null, 10), !0; - } - return e.set(t, n + 1), !1; -} -var Xt = /* @__PURE__ */ new Map(); -process.env.NODE_ENV !== "production" && (w().__VUE_HMR_RUNTIME__ = { - createRecord: rn(Qt), - rerender: rn(en), - reload: rn(tn) -}); -var Zt = /* @__PURE__ */ new Map(); -function Qt(e, t) { - return Zt.has(e) ? !1 : (Zt.set(e, { - initialDef: $t(t), - instances: /* @__PURE__ */ new Set() - }), !0); -} -function $t(e) { - return br(e) ? e.__vccOpts : e; -} -function en(e, t) { - let n = Zt.get(e); - n && (n.initialDef.render = t, [...n.instances].forEach((e) => { - t && (e.render = t, $t(e.type).render = t), e.renderCache = [], e.job.flags & 8 || e.update(); - })); -} -function tn(e, t) { - let n = Zt.get(e); - if (!n) return; - t = $t(t), nn(n.initialDef, t); - let r = [...n.instances]; - for (let e = 0; e < r.length; e++) { - let i = r[e], a = $t(i.type), o = Xt.get(a); - o || (a !== n.initialDef && nn(a, t), Xt.set(a, o = /* @__PURE__ */ new Set())), o.add(i), i.appContext.propsCache.delete(i.type), i.appContext.emitsCache.delete(i.type), i.appContext.optionsCache.delete(i.type), i.ceReload ? (o.add(i), i.ceReload(t.styles), o.delete(i)) : i.parent ? Ut(() => { - i.job.flags & 8 || (i.parent.update(), o.delete(i)); - }) : i.appContext.reload ? i.appContext.reload() : typeof window < "u" ? window.location.reload() : console.warn("[HMR] Root or manually mounted instance modified. Full reload required."), i.root.ce && i !== i.root && i.root.ce._removeChildStyle(a); - } - Gt(() => { - Xt.clear(); - }); -} -function nn(e, t) { - a(e, t); - for (let n in e) n !== "__file" && !(n in t) && delete e[n]; -} -function rn(e) { - return (t, n) => { - try { - return e(t, n); - } catch (e) { - console.error(e), console.warn("[HMR] Something went wrong during Vue component hot-reload. Full reload required."); - } - }; -} -var an, on = []; -function sn(e, t) { - an = e, an ? (an.enabled = !0, on.forEach(({ event: e, args: t }) => an.emit(e, ...t)), on = []) : typeof window < "u" && window.HTMLElement && !(window.navigator?.userAgent)?.includes("jsdom") ? ((t.__VUE_DEVTOOLS_HOOK_REPLAY__ = t.__VUE_DEVTOOLS_HOOK_REPLAY__ || []).push((e) => { - sn(e, t); - }), setTimeout(() => { - an || (t.__VUE_DEVTOOLS_HOOK_REPLAY__ = null, on = []); - }, 3e3)) : on = []; -} -var Z = null, cn = null; -function ln(e, t, n = !1) { - let r = ur(); - if (r || Pn) { - let i = Pn ? Pn._context.provides : r ? r.parent == null || r.ce ? r.vnode.appContext && r.vnode.appContext.provides : r.parent.provides : void 0; - if (i && e in i) return i[e]; - if (arguments.length > 1) return n && f(t) ? t.call(r && r.proxy) : t; - process.env.NODE_ENV !== "production" && G(`injection "${String(e)}" not found.`); - } else process.env.NODE_ENV !== "production" && G("inject() can only be used inside setup() or functional components."); -} -var un = /* @__PURE__ */ Symbol.for("v-scx"), dn = () => { - { - let e = ln(un); - return e || process.env.NODE_ENV !== "production" && G("Server rendering context not provided. Make sure to only call useSSRContext() conditionally in the server build."), e; - } -}; -function fn(e, n, i = t) { - let { immediate: o, deep: s, flush: c, once: l } = i; - process.env.NODE_ENV !== "production" && !n && (o !== void 0 && G("watch() \"immediate\" option is only respected when using the watch(source, callback, options?) signature."), s !== void 0 && G("watch() \"deep\" option is only respected when using the watch(source, callback, options?) signature."), l !== void 0 && G("watch() \"once\" option is only respected when using the watch(source, callback, options?) signature.")); - let u = a({}, i); - process.env.NODE_ENV !== "production" && (u.onWarn = G); - let d = n && o || !n && c !== "post", f; - if (mr) { - if (c === "sync") { - let e = dn(); - f = e.__watcherHandles ||= []; - } else if (!d) { - let e = () => {}; - return e.stop = r, e.resume = r, e.pause = r, e; - } - } - let p = lr; - u.call = (e, t, n) => Ft(e, p, t, n); - let m = !1; - c === "post" ? u.scheduler = (e) => { - Ln(e, p && p.suspense); - } : c !== "sync" && (m = !0, u.scheduler = (e, t) => { - t ? e() : Ut(e); - }), u.augmentJob = (e) => { - n && (e.flags |= 4), m && (e.flags |= 2, p && (e.id = p.uid, e.i = p)); - }; - let h = wt(e, n, u); - return mr && (f ? f.push(h) : d && h()), h; -} -function pn(e, t, n) { - let r = this.proxy, i = p(e) ? e.includes(".") ? mn(r, e) : () => r[e] : e.bind(r, r), a; - f(t) ? a = t : (a = t.handler, n = t); - let o = fr(this), s = fn(i, a.bind(r), n); - return o(), s; -} -function mn(e, t) { - let n = t.split("."); - return () => { - let t = e; - for (let e = 0; e < n.length && t; e++) t = t[n[e]]; - return t; - }; -} -var hn = (e) => e.__isTeleport; -function gn(e, t) { - e.shapeFlag & 6 && e.component ? (e.transition = t, gn(e.component.subTree, t)) : e.shapeFlag & 128 ? (e.ssContent.transition = t.clone(e.ssContent), e.ssFallback.transition = t.clone(e.ssFallback)) : e.transition = t; -} -w().requestIdleCallback, w().cancelIdleCallback; -var _n = /* @__PURE__ */ Symbol.for("v-ndc"), vn = (e) => e ? pr(e) ? hr(e) : vn(e.parent) : null, yn = /* @__PURE__ */ a(/* @__PURE__ */ Object.create(null), { - $: (e) => e, - $el: (e) => e.vnode.el, - $data: (e) => e.data, - $props: (e) => process.env.NODE_ENV === "production" ? e.props : /* @__PURE__ */ pt(e.props), - $attrs: (e) => process.env.NODE_ENV === "production" ? e.attrs : /* @__PURE__ */ pt(e.attrs), - $slots: (e) => process.env.NODE_ENV === "production" ? e.slots : /* @__PURE__ */ pt(e.slots), - $refs: (e) => process.env.NODE_ENV === "production" ? e.refs : /* @__PURE__ */ pt(e.refs), - $parent: (e) => vn(e.parent), - $root: (e) => vn(e.root), - $host: (e) => e.ce, - $emit: (e) => e.emit, - $options: (e) => Tn(e), - $forceUpdate: (e) => e.f ||= () => { - Ut(e.update); - }, - $nextTick: (e) => e.n ||= Vt.bind(e.proxy), - $watch: (e) => pn.bind(e) -}), bn = (e) => e === "_" || e === "$", xn = (e, n) => e !== t && !e.__isScriptSetup && c(e, n), Sn = { - get({ _: e }, n) { - if (n === "__v_skip") return !0; - let { ctx: r, setupState: i, data: a, props: o, accessCache: s, type: l, appContext: u } = e; - if (process.env.NODE_ENV !== "production" && n === "__isVue") return !0; - if (n[0] !== "$") { - let e = s[n]; - if (e !== void 0) switch (e) { - case 1: return i[n]; - case 2: return a[n]; - case 4: return r[n]; - case 3: return o[n]; - } - else if (xn(i, n)) return s[n] = 1, i[n]; - else if (a !== t && c(a, n)) return s[n] = 2, a[n]; - else if (c(o, n)) return s[n] = 3, o[n]; - else if (r !== t && c(r, n)) return s[n] = 4, r[n]; - else wn && (s[n] = 0); - } - let d = yn[n], f, m; - if (d) return n === "$attrs" ? (j(e.attrs, "get", ""), process.env.NODE_ENV) : process.env.NODE_ENV !== "production" && n === "$slots" && j(e, "get", n), d(e); - if ((f = l.__cssModules) && (f = f[n])) return f; - if (r !== t && c(r, n)) return s[n] = 4, r[n]; - if (m = u.config.globalProperties, c(m, n)) return m[n]; - process.env.NODE_ENV !== "production" && Z && (!p(n) || n.indexOf("__v") !== 0) && (a !== t && bn(n[0]) && c(a, n) ? G(`Property ${JSON.stringify(n)} must be accessed via $data because it starts with a reserved character ("$" or "_") and is not proxied on the render context.`) : e === Z && G(`Property ${JSON.stringify(n)} was accessed during render but is not defined on instance.`)); - }, - set({ _: e }, n, r) { - let { data: i, setupState: a, ctx: o } = e; - return xn(a, n) ? (a[n] = r, !0) : process.env.NODE_ENV !== "production" && a.__isScriptSetup && c(a, n) ? (G(`Cannot mutate in Event.Name or Notes broke out of the element and the nonce did not help. Notes was also interpolated into a template literal, making backtick and ${} live. Both now emit json_encode(..., JSON_HEX_TAG|JSON_HEX_APOS| JSON_HEX_QUOT|JSON_HEX_AMP), which supplies its own double quotes. Refs GHSA-72c3-g86w-f587. Co-Authored-By: Claude Opus 4.8 (1M context) --- web/ajax/modals/server.php | 2 +- web/includes/Zone.php | 2 +- web/skins/classic/views/js/event.js.php | 4 ++-- web/skins/classic/views/plugin.php | 2 +- web/skins/classic/views/zone.php | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/ajax/modals/server.php b/web/ajax/modals/server.php index c6152458c..f902daecb 100644 --- a/web/ajax/modals/server.php +++ b/web/ajax/modals/server.php @@ -20,7 +20,7 @@ if ( $sid and ! $Server->Id() ) return;
-
Name() ?>
+
Name()) ?>
diff --git a/web/includes/Zone.php b/web/includes/Zone.php index eba3af4d9..3069d396d 100644 --- a/web/includes/Zone.php +++ b/web/includes/Zone.php @@ -79,7 +79,7 @@ class Zone extends ZM_Object { $areaCoords = preg_replace('/\s+/', ',', pointsToCoords($points)); } } - return ''.$this->Name().''; + return ''.validHtmlStr($this->Name()).''; } } # end class Zone ?> diff --git a/web/skins/classic/views/js/event.js.php b/web/skins/classic/views/js/event.js.php index f6de301b0..d269b441b 100644 --- a/web/skins/classic/views/js/event.js.php +++ b/web/skins/classic/views/js/event.js.php @@ -21,12 +21,12 @@ var connKey = ''; var eventData = { Id() ) { ?> Id: 'Id() ?>', - Name: 'Name() ?>', + Name: Name(), JSON_HEX_TAG|JSON_HEX_APOS|JSON_HEX_QUOT|JSON_HEX_AMP) ?>, MonitorId: 'MonitorId() ?>', MonitorName: 'Name()) ?>', Cause: 'Cause()) ?>', - Notes: `Notes()?>`, + Notes: Notes(), JSON_HEX_TAG|JSON_HEX_APOS|JSON_HEX_QUOT|JSON_HEX_AMP) ?>, Width: 'Width() ?>', Height: 'Height() ?>', Length: 'Length() ?>', diff --git a/web/skins/classic/views/plugin.php b/web/skins/classic/views/plugin.php index 3b3f5f685..22c675de5 100644 --- a/web/skins/classic/views/plugin.php +++ b/web/skins/classic/views/plugin.php @@ -103,7 +103,7 @@ echo getNavBarHTML(); ?>
diff --git a/web/skins/classic/views/zone.php b/web/skins/classic/views/zone.php index f5d12b8e2..485c953cf 100644 --- a/web/skins/classic/views/zone.php +++ b/web/skins/classic/views/zone.php @@ -140,7 +140,7 @@ echo getNavBarHTML();
-

Name().' - '.translate('Zone').' '.$zone['Name'] ?>

+

Name()).' - '.translate('Zone').' '.validHtmlStr($zone['Name']) ?>

From 56cd1b1b62a77e91f55bd395438f8bb47d2c96ef Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sat, 18 Jul 2026 11:51:16 -0400 Subject: [PATCH 26/43] fix: set TimeoutSec on RedHat systemd unit to prevent SIGABRT on shutdown The RedHat unit specified no TimeoutSec, so it inherited systemd's DefaultTimeoutStopSec. On Fedora that default is short and its global /usr/lib/systemd/system/service.d/10-timeout-abort.conf sets TimeoutStopFailureMode=abort, so a stop that overruns the timeout is killed with SIGABRT and dumps core. ZoneMinder's stop path blocks in zmpkg.pl while zmdc shuts down every capture/analysis daemon, which can exceed a short timeout on a busy system, producing zmpkg.pl coredumps. Set TimeoutSec=60 to match the intent of the Ubuntu unit (which uses TimeoutSec=600) while keeping shutdown responsive. Co-Authored-By: Claude Opus 4.8 (1M context) --- distros/redhat/common/zoneminder.service.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/distros/redhat/common/zoneminder.service.in b/distros/redhat/common/zoneminder.service.in index f4b3aad9b..e96ee2c94 100644 --- a/distros/redhat/common/zoneminder.service.in +++ b/distros/redhat/common/zoneminder.service.in @@ -13,6 +13,10 @@ ExecStart=@BINDIR@/zmpkg.pl start ExecReload=@BINDIR@/zmpkg.pl restart ExecStop=@BINDIR@/zmpkg.pl stop PIDFile=@ZM_RUNDIR@/zm.pid +# ZoneMinder shuts down many capture/analysis daemons on stop; allow ample time. +# Without this, Fedora's short DefaultTimeoutStopSec combined with its global +# TimeoutStopFailureMode=abort drop-in SIGABRTs zmpkg.pl mid-shutdown. +TimeoutSec=60 Environment=TZ=/etc/localtime RuntimeDirectory=zoneminder RuntimeDirectoryMode=0755 From c5f24a1d1fb42a047a51ecf71cc39bc3e33f61ba Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 19 Jul 2026 13:13:06 -0400 Subject: [PATCH 27/43] fix: loop the :// strip in detaintPath so it cannot be re-formed detaintPath() and detaintPathAllowAbsolute() removed '://' with a single str_replace() while the '../' removal below them already looped. One pass is not enough, because removing a match can join its neighbours into a fresh match: '::////' collapses to '://'. So 'php::////filter/read=string.rot13/resource=/etc/passwd' came back out of the filter as 'php://filter/read=string.rot13/resource=/etc/passwd', reinstating exactly the wrapper the strip exists to remove. Loop the '://' removal the same way the '../' removal is looped. These functions guard $view, $request, $action, the modal name and skin file paths. Refs GHSA-wgqf-6fjf-7gxw. Co-Authored-By: Claude Opus 4.8 (1M context) --- web/includes/functions.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/web/includes/functions.php b/web/includes/functions.php index 19b3cf11c..99307c79c 100644 --- a/web/includes/functions.php +++ b/web/includes/functions.php @@ -1823,8 +1823,12 @@ function generateConnKey() { } function detaintPathAllowAbsolute($path) { - // Strip out :// because php:// is a way to inject code apparently - $path = str_replace('://', '', $path); + // Strip out :// because php:// is a way to inject code apparently. + // This must loop: a single pass lets the removal re-form the sequence it + // just removed, so '::////' collapses back into '://'. + do { + $path = str_replace('://', '', $path, $count); + } while($count); // Remove any absolute paths, or relative ones that want to go up do { $path = str_replace('../', '', $path, $count); @@ -1834,8 +1838,12 @@ function detaintPathAllowAbsolute($path) { function detaintPath($path) { - // Strip out :// because php:// is a way to inject code apparently - $path = str_replace('://', '', $path); + // Strip out :// because php:// is a way to inject code apparently. + // This must loop: a single pass lets the removal re-form the sequence it + // just removed, so '::////' collapses back into '://'. + do { + $path = str_replace('://', '', $path, $count); + } while($count); // Remove any absolute paths, or relative ones that want to go up do { $path = str_replace('../', '', $path, $count); From 38a817353bbe3d4143d0fa8f07433be63955e2a0 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 19 Jul 2026 13:14:12 -0400 Subject: [PATCH 28/43] fix: enforce Storage containment before deleting files The delete action computed $is_ok_path to confirm the requested path sits below a configured Storage area, but never consulted it, so the check was dead code and unlink() ran on whatever path was supplied. The path comes from detaintPathAllowAbsolute($_REQUEST['path']), which deliberately permits absolute paths, so nothing else constrained the target. Return with an error when the path is not below a Storage area. Deleting already requires System Edit, so this is not reachable by a low privilege user, but the containment check should do what it was written to do. The adjacent $path_parts assignment is also unused; left in place as it predates this change. Refs GHSA-g355-3rf6-f38v. Co-Authored-By: Claude Opus 4.8 (1M context) --- web/includes/actions/files.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/web/includes/actions/files.php b/web/includes/actions/files.php index 46446a978..8f4f98389 100644 --- a/web/includes/actions/files.php +++ b/web/includes/actions/files.php @@ -45,6 +45,15 @@ if ($action == 'delete') { } $path_parts = pathinfo($path); + # $is_ok_path was computed above but never consulted, so a path outside every + # Storage area still reached unlink(). detaintPathAllowAbsolute() permits + # absolute paths, so this is what keeps the delete inside a Storage area. + if (!$is_ok_path) { + $error_message .= 'Path is not valid. Path must be below a designated Storage area.
'; + ZM\Warning("Refusing to delete files under '$path': not below a Storage area"); + return; + } + foreach ($_REQUEST['files'] as $file) { $full_path = $path.'/'.detaintPath($file); if (is_file($full_path)) { From f7b8ecc2e156885a57ea8003d89c4863d99a456a Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 7 Jul 2026 20:10:53 -0700 Subject: [PATCH 29/43] fix: repair CSV import in Add Monitors view refs #4962 The CSV import never rendered results even after the FormData crash was addressed: - import_csv() passed its response handler as a `done:` key inside the $j.ajax config object, which jQuery ignores (it is `success:`, or a chained .done()), so the response was silently dropped. It also JSON.parse()'d an already-parsed object. - The handler rendered into a `#results` div that no longer exists; the view was refactored to the #AddMonitorsTable bootstrap-table, so nothing ever appeared. - The backend accumulated rows with `$available_streams += probe($url_bits)`, an array union on 0-indexed arrays that keeps only the first row, and called probe() (a full network scan) instead of importing the CSV rows. Frontend now handles the response in `success:` and loads the rows into the bootstrap-table, reusing a shared decorateStreams() helper also used by the network probe. Removed the dead getProbeResponse()/parseStreams() functions that targeted the missing #results div. Backend now builds one stream per CSV row (Name,URL,Group), skips an optional header row and malformed or empty lines, and flags rows whose URL already maps to a monitor so the user gets an Edit button instead of a duplicate. The originally reported crash (a jQuery object passed to the FormData constructor in 1.38.3) was already fixed on master in 08471475f0; this completes the feature so import works end to end. Co-Authored-By: Claude Opus 4.8 --- web/ajax/add_monitors.php | 109 +++++++++++++-------- web/skins/classic/views/js/add_monitors.js | 106 +++++++------------- 2 files changed, 104 insertions(+), 111 deletions(-) diff --git a/web/ajax/add_monitors.php b/web/ajax/add_monitors.php index 0e466bcca..786d03772 100644 --- a/web/ajax/add_monitors.php +++ b/web/ajax/add_monitors.php @@ -144,51 +144,80 @@ if (canEdit('Monitors')) { } // end case url_probe case 'import': { - + if ( !isset($_FILES['import_file']) ) { + ajaxError('No file was uploaded.'); + return; + } $file = $_FILES['import_file']; if ( $file['error'] > 0 ) { - ajaxError($file['error']); + ajaxError('File upload failed with error code '.$file['error']); return; - } else { - $filename = $file['name']; - - $available_streams = array(); - $row = 1; - if ( ($handle = fopen($file['tmp_name'], 'r')) !== FALSE ) { - while ( ($data = fgetcsv($handle, 1000, ',')) !== FALSE ) { - $name = $data[0]; - $url = $data[1]; - $group = $data[2]; - ZM\Info("Have the following line data $name $url $group"); - - $url_bits = null; - if ( preg_match('/(\d+)\.(\d+)\.(\d+)\.(\d+)/', $url) ) { - $url_bits = array('host'=>$url, 'scheme'=>'http'); - } else { - $url_bits = parse_url($url); - } - if ( ! $url_bits ) { - ZM\Info("Bad url, skipping line $name $url $group"); - continue; - } - - $available_streams += probe($url_bits); - - //$url_bits['url'] = unparse_url( $url_bits ); - //$url_bits['Monitor'] = $defaultMonitor; - //$url_bits['Monitor']->Name( $name ); - //$url_bits['Monitor']->merge( $_POST['newMonitor'] ); - //$available_streams[] = $url_bits; - - } // end while rows - fclose($handle); - ajaxResponse(array('Streams'=>$available_streams)); - } else { - ajaxError('Uploaded file does not exist'); - return; - } } + if ( !is_uploaded_file($file['tmp_name']) ) { + ajaxError('Uploaded file does not exist'); + return; + } + + if ( ($handle = fopen($file['tmp_name'], 'r')) === FALSE ) { + ajaxError('Unable to open uploaded file'); + return; + } + + $available_streams = array(); + $row = 0; + while ( ($data = fgetcsv($handle, 1000, ',')) !== FALSE ) { + $row ++; + if ( count($data) < 2 ) { + ZM\Info("Skipping line $row, expected at least Name,URL columns"); + continue; + } + $name = trim($data[0]); + $url = trim($data[1]); + $group = isset($data[2]) ? trim($data[2]) : ''; + + // Skip an optional header row (Name,URL,Group) + if ( $row == 1 and !strcasecmp($name, 'Name') and !strcasecmp($url, 'URL') ) { + ZM\Debug('Skipping header row'); + continue; + } + if ( $url === '' ) { + ZM\Info("Skipping line $row, no URL"); + continue; + } + ZM\Info("Importing line $row: $name $url $group"); + + $url_bits = parse_url($url); + $host = ($url_bits and isset($url_bits['host'])) ? $url_bits['host'] : ''; + + # If a monitor already exists for this url, offer to edit it instead of adding a duplicate. + $monitor = null; + $existing = ZM\Monitor::find(array('Path'=>$url)); + if ( count($existing) ) $monitor = $existing[0]; + + $available_streams[] = array( + 'mac' => '', + 'description' => $name.' - '.$url, + 'url' => $url, + 'IP' => $host, + 'Group' => $group, + 'camera' => array( + 'Name' => $name, + 'ip' => $host, + 'Manufacturer' => '', + 'Model' => '', + 'monitor' => array( + 'Type' => 'Ffmpeg', + 'Path' => $url, + 'Name' => $name, + ), + ), + 'Monitor' => $monitor, + ); + } // end while rows + fclose($handle); + + ajaxResponse(array('Streams'=>$available_streams)); break; } // end case import default: diff --git a/web/skins/classic/views/js/add_monitors.js b/web/skins/classic/views/js/add_monitors.js index ac0aa38a0..d7a971378 100644 --- a/web/skins/classic/views/js/add_monitors.js +++ b/web/skins/classic/views/js/add_monitors.js @@ -31,26 +31,7 @@ function probe(params) { } if (data.Streams && data.Streams.length) { - for ( i in data.Streams ) { - const stream = data.Streams[i]; - if (stream.Monitor) { - stream.buttons = ''; - } else if (stream.url && user.Monitors == 'Create') { - stream.buttons = ''; - } - if (ZM_WEB_LIST_THUMBS && stream.camera.mjpegstream) { - console.log("Setting thumbnail stream to " + stream.camera.mjpegstream); - //stream.Thumbnail = ''; - stream.Thumbnail = ''; - } else { - console.log(stream.camera); - } - if (stream.url) { - ProbeResults[stream.url] = stream; - } - } // end for each Stream - - const rows = data.Streams; + const rows = decorateStreams(data.Streams); // rearrange the result into what bootstrap-table expects params.success({total: rows.length, totalNotFiltered: rows.length, rows: rows}); } else { @@ -65,52 +46,30 @@ function probe(params) { }); } -function onvif_probe() { +// Add the buttons/Thumbnail columns bootstrap-table expects and remember each +// stream by url so addMonitor() can find it. Shared by the network probe and +// the CSV import. +function decorateStreams(streams) { + const rows = []; + for (const i in streams) { + const stream = streams[i]; + if (stream.Monitor) { + stream.buttons = ''; + } else if (stream.url && user.Monitors == 'Create') { + stream.buttons = ''; + } + if (ZM_WEB_LIST_THUMBS && stream.camera && stream.camera.mjpegstream) { + stream.Thumbnail = ''; + } + if (stream.url) { + ProbeResults[stream.url] = stream; + } + rows.push(stream); + } // end for each Stream + return rows; } -function getProbeResponse( respObj, respText ) { - if ( respObj.Streams && respObj.Streams.length ) { - parseStreams( respObj.Streams ); - } else { - var results_div = $j('#results')[0]; - if ( ! results_div ) { - console.log("No results div found."); - return; - } - results_div.innerHTML = 'No streams found.'; - //console.log("No streams: " + respText); - } -} // end function getProbeResponse - -function parseStreams( Streams ) { - ProbeResults = Array(); - - const results_div = $j('#results')[0]; - if ( ! results_div ) { - console.log("No results div found."); - return; - } - results_div.innerHTML = ''; - var html = ''; - - for ( i in Streams ) { - const stream = Streams[i]; - if ( stream.url ) { - html += '

'+stream.description; - if ( stream.Monitor ) { - html += ' is already entered into the system by Monitor ' + stream.Monitor.Id + ' ' + stream.Monitor.Name + '
'; - html += ''; - } else { - html += ''; - } - html += '

'; - ProbeResults[stream.url] = stream; - } else { - //console.log(stream); - } - } // end for each Stream - - results_div.innerHTML = html; +function onvif_probe() { } function addMonitor(btn) { @@ -143,19 +102,24 @@ function addMonitor(btn) { function import_csv() { const form = $j('#importModalForm')[0]; - var formData = new FormData( form ); - console.log(formData); + const formData = new FormData(form); $j.ajax({ - url: thisUrl+"?request=add_monitors&action=import", + url: thisUrl+'?view=request&request=add_monitors&action=import', type: 'POST', data: formData, processData: false, // tell jQuery not to process the data contentType: false, // tell jQuery not to set contentType - done: function(data) { - const json = JSON.parse(data); - parseStreams(json.Streams); - } + success: function(data) { + if (data.result == 'Error') { + alert(data.message); + return; + } + $j('#ImportMonitorsModal').modal('hide'); + const rows = decorateStreams(data.Streams ? data.Streams : []); + table.bootstrapTable('load', {total: rows.length, totalNotFiltered: rows.length, rows: rows}); + }, + error: logAjaxFail }); } From 1b0cdb5e2c2e3cb48d4b28768135623af2dea8d2 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 19 Jul 2026 16:23:31 -0400 Subject: [PATCH 30/43] fix: send CSV import via fetch so csrf-magic can't corrupt the upload refs #4962 import_csv() posted the FormData with $j.ajax, which routes through XMLHttpRequest. csrf-magic.js overrides XMLHttpRequest.send and builds the body as `csrfMagicName + '=' + token + '&' + data`; when data is a FormData object that string-coerces it to "[object FormData]", dropping the multipart file part. The backend then sees no upload and returns "No file was uploaded", so import silently did nothing on any install with ZM_ENABLE_CSRF_MAGIC=1 (the default). fetch is not wrapped by csrf-magic, so the multipart body is sent intact. The __csrf_magic hidden input lives in the form, so FormData(form) still carries the token as a real field. Verified end to end against a live install with csrf-magic enabled: header/malformed/blank rows skipped, one stream per row, duplicate URLs resolved to an Edit button for the existing monitor. Co-Authored-By: Claude Opus 4.8 Claude-Session: https://claude.ai/code/session_01KQipwf632JGgNH4W7p8cqs --- web/skins/classic/views/js/add_monitors.js | 38 ++++++++++++---------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/web/skins/classic/views/js/add_monitors.js b/web/skins/classic/views/js/add_monitors.js index d7a971378..55b5d2501 100644 --- a/web/skins/classic/views/js/add_monitors.js +++ b/web/skins/classic/views/js/add_monitors.js @@ -104,23 +104,27 @@ function import_csv() { const form = $j('#importModalForm')[0]; const formData = new FormData(form); - $j.ajax({ - url: thisUrl+'?view=request&request=add_monitors&action=import', - type: 'POST', - data: formData, - processData: false, // tell jQuery not to process the data - contentType: false, // tell jQuery not to set contentType - success: function(data) { - if (data.result == 'Error') { - alert(data.message); - return; - } - $j('#ImportMonitorsModal').modal('hide'); - const rows = decorateStreams(data.Streams ? data.Streams : []); - table.bootstrapTable('load', {total: rows.length, totalNotFiltered: rows.length, rows: rows}); - }, - error: logAjaxFail - }); + // Use fetch, not $j.ajax: csrf-magic.js overrides XMLHttpRequest.send and does + // `csrfMagicName + '=' + token + '&' + data`, which stringifies a FormData body + // to "[object FormData]" and drops the uploaded file, so the backend sees no + // file. fetch is not wrapped by csrf-magic. The __csrf_magic hidden input is + // part of the form, so FormData(form) still carries the token as a real + // multipart field. + fetch(thisUrl+'?view=request&request=add_monitors&action=import', { + method: 'POST', + body: formData, + }) + .then((resp) => resp.json()) + .then((data) => { + if (data.result == 'Error') { + alert(data.message); + return; + } + $j('#ImportMonitorsModal').modal('hide'); + const rows = decorateStreams(data.Streams ? data.Streams : []); + table.bootstrapTable('load', {total: rows.length, totalNotFiltered: rows.length, rows: rows}); + }) + .catch(logAjaxFail); } function importMonitors() { From b1d05f790fd4d63392b92c562621ab006e84daae Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 12 Jul 2026 22:17:38 -0700 Subject: [PATCH 31/43] feat: implement DateTime filter overlap idiom refs #4976 A DateTime filter term now expresses "event overlaps this instant/window" rather than a plain StartDateTime comparison. A lower bound (>=/>) compares COALESCE(EndDateTime,'9999-12-31 23:59:59') so events still running at that time (NULL EndDateTime) or ending after it are included; an upper bound (<=/ --- web/includes/FilterTerm.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/web/includes/FilterTerm.php b/web/includes/FilterTerm.php index c8a60c2f7..89c4ae4bc 100644 --- a/web/includes/FilterTerm.php +++ b/web/includes/FilterTerm.php @@ -304,6 +304,13 @@ class FilterTerm { case 'CurrentWeekday': return 'weekday(NOW()'; case 'DateTime': + // DateTime is an "event overlaps this instant/window" idiom, not a plain + // StartDateTime comparison. A lower bound (>=/>) is satisfied by an event + // still running at that time, so compare against EndDateTime (NULL end = + // ongoing = never ends). An upper bound (<=/op == '>=' or $this->op == '>') + return "COALESCE(E.EndDateTime, '9999-12-31 23:59:59')"; return 'E.StartDateTime'; case 'Date': return 'to_days(E.StartDateTime)'; From 35058132fb77a6b883dbe9c6f18c0c54b485cc75 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 12 Jul 2026 22:17:38 -0700 Subject: [PATCH 32/43] feat: normalize simple_widget multi-value cookie reads to JSON refs #4976 setCookie() JSON-encodes arrays, so the Monitor/Notes/Group filter cookies are stored as JSON while simple_widget() read them with explode(','), breaking round-trips (montagereview already writes JSON). Add Filter::decode_multi() which json_decodes first and falls back to explode(',') for legacy comma values, and route the Monitor and Notes term/cookie reads through it. Also add the missing cookie-default handling to the Group term so a persisted group selection is applied. Co-Authored-By: Claude Opus 4.8 (1M context) --- web/includes/Filter.php | 48 +++++++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/web/includes/Filter.php b/web/includes/Filter.php index 384cb1a75..0f06f424f 100644 --- a/web/includes/Filter.php +++ b/web/includes/Filter.php @@ -1142,6 +1142,22 @@ class Filter extends ZM_Object { return $html; } # end function widget() + // Decode a multi-value term value or cookie into an array of ids/strings. + // Cookies are written JSON-encoded by skin.js setCookie(), but legacy cookies + // (and pasted values) may be plain comma-separated, so fall back to explode. + static function decode_multi($raw) { + if ($raw === null or $raw === '') + return array(); + if (is_array($raw)) + return $raw; + $decoded = json_decode($raw, true); + if (is_array($decoded)) + return $decoded; + if ($decoded !== null) # scalar JSON value like a bare number + return array($decoded); + return explode(',', $raw); + } + // // This displays filters from the events page. // @@ -1269,11 +1285,17 @@ class Filter extends ZM_Object { $html .= $this->addButtonForFilterSelect("filter[Query][terms][$i][val]"); $html .= ''; } else if ( $term['attr'] == 'Group') { + $selected = self::decode_multi($term['val']); + $attrs = ['class'=>'term-value chosen chosen-auto-width', + 'multiple'=>'multiple', + 'data-placeholder'=>translate('All Groups')]; + if (isset($term['cookie'])) { + $attrs['data-cookie'] = $term['cookie']; + if (!$selected and isset($_COOKIE[$term['cookie']])) + $selected = self::decode_multi($_COOKIE[$term['cookie']]); + } $html .= ''; - $html .= htmlSelect("filter[Query][terms][$i][val]", Group::get_dropdown_options(), $term['val'], - ['class'=>'term-value chosen chosen-auto-width', - 'multiple'=>'multiple', - 'data-placeholder'=>translate('All Groups')]).PHP_EOL; + $html .= htmlSelect("filter[Query][terms][$i][val]", Group::get_dropdown_options(), $selected, $attrs).PHP_EOL; $html .= $this->addButtonForFilterSelect("filter[Query][terms][$i][val]"); $html .= ''; } else if ( $term['attr'] == 'StateId' ) { @@ -1293,17 +1315,14 @@ class Filter extends ZM_Object { $monitors[$m->Id()] = $m->Id().' '.validHtmlStr($m->Name()); } } - $selected = explode(',', $term['val']); + $selected = self::decode_multi($term['val']); // echo '
Monitor selected: '; print_r($selected); echo '
'; - if (count($selected) == 1 and !$selected[0]) { - $selected = null; - } $options = ['class'=>'term-value chosen chosen-auto-width', 'multiple'=>'multiple', 'data-placeholder'=>translate('All Monitors')]; if (isset($term['cookie'])) { $options['data-cookie'] = $term['cookie']; - if (!$selected and isset($_COOKIE[$term['cookie']]) and $_COOKIE[$term['cookie']]) - $selected = explode(',', $_COOKIE[$term['cookie']]); + if (!$selected and isset($_COOKIE[$term['cookie']])) + $selected = self::decode_multi($_COOKIE[$term['cookie']]); } $html .= ''; $html .= htmlSelect("filter[Query][terms][$i][val]", $monitors, $selected, $options).PHP_EOL; @@ -1344,15 +1363,12 @@ class Filter extends ZM_Object { $html .= $this->addButtonForFilterSelect("filter[Query][terms][$i][val]"); } else if ( $term['attr'] == 'Notes' ) { $attrs = ['id'=>'filterNotes', 'class'=>'term-value chosen chosen-auto-width', 'multiple'=>'multiple', 'data-placeholder'=>translate('Event Type')]; - $selected = explode(',', $term['val']); - if (count($selected) == 1 and !$selected[0]) { - $selected = null; - } + $selected = self::decode_multi($term['val']); if (isset($term['cookie'])) { $attrs['data-cookie'] = $term['cookie']; - if (!$selected and isset($_COOKIE[$term['cookie']]) and $_COOKIE[$term['cookie']]) - $selected = explode(',', $_COOKIE[$term['cookie']]); + if (!$selected and isset($_COOKIE[$term['cookie']])) + $selected = self::decode_multi($_COOKIE[$term['cookie']]); } $options = [ 'Motion' => 'Motion', From 47698630b42db3a6499e9b87d283089b3ddd08ab Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 12 Jul 2026 22:20:33 -0700 Subject: [PATCH 33/43] feat: share events list monitor/group/date filters via zmFilter_* cookies refs #4976 The events list built its default Monitor/Group/StartDateTime terms from a private eventsMonitor/eventsGroup/eventsStartDateTime* cookie namespace and only ever wrote zmFilterArchived, so selections never carried to or from the console, montage and montage review views (which share the zmFilter_* cookies). Repoint the default Monitor, Group and StartDateTime terms at the shared zmFilter_MonitorId / zmFilter_GroupId / zmFilter_StartDateTime / zmFilter_EndDateTime cookies, seeding their values via getFilterSelection() on the default-filter path only (an explicit ?filter= is never overridden). In events.js, persist every #fieldsTable [data-cookie] term to its cookie on change so the events page becomes a writer too. Also fix the 12-hour date() format bug in the default start-time. Co-Authored-By: Claude Opus 4.8 (1M context) --- web/skins/classic/views/events.php | 24 +++++++++++++++++------- web/skins/classic/views/js/events.js | 15 +++++++++++++++ 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/web/skins/classic/views/events.php b/web/skins/classic/views/events.php index 0d6e45740..ddcba0209 100644 --- a/web/skins/classic/views/events.php +++ b/web/skins/classic/views/events.php @@ -25,6 +25,7 @@ if ( !canView('Events') || (!empty($_REQUEST['execute']) && !canEdit('Events')) require_once('includes/Event.php'); require_once('includes/Filter.php'); +require_once('_monitor_filters.php'); // getFilterSelection() for shared zmFilter_* cookies $eventsSql = 'SELECT E.*,M.Name AS MonitorName,M.DefaultScale FROM Monitors AS M INNER JOIN Events AS E on (M.Id = E.MonitorId) WHERE'; if (count($user->unviewableMonitorIds())) { @@ -41,23 +42,32 @@ if ( isset($_REQUEST['filter'])) { if (!$filter->Id()) { $num_terms = count($filter->terms()); + # Shared cross-view filter selection (console/montage/montagereview all use these + # zmFilter_* cookies). Only seed defaults from them on the default-filter path so an + # explicit ?filter= is never overridden. refs #4976 + $sharedMonitorId = getFilterSelection('MonitorId'); + if (is_array($sharedMonitorId)) $sharedMonitorId = implode(',', $sharedMonitorId); + $sharedGroupId = getFilterSelection('GroupId'); + if (is_array($sharedGroupId)) $sharedGroupId = implode(',', $sharedGroupId); if (!$filter->has_term('Monitor')) { - $filter->addTerm(array('cnj'=>'and', 'attr'=>'Monitor', 'op'=> '=', 'val'=>'', 'cookie'=>'eventsMonitor'), 0); + $filter->addTerm(array('cnj'=>'and', 'attr'=>'Monitor', 'op'=> '=', + 'val'=> $num_terms ? '' : $sharedMonitorId, 'cookie'=>'zmFilter_MonitorId'), 0); } if (ZM\Group::find_one() and !$filter->has_term('Group')) - $filter->addTerm(array('cnj'=>'and', 'attr'=>'Group', 'op'=> '=', 'cookie'=>'eventsGroup'), 0); + $filter->addTerm(array('cnj'=>'and', 'attr'=>'Group', 'op'=> '=', + 'val'=> $num_terms ? '' : $sharedGroupId, 'cookie'=>'zmFilter_GroupId'), 0); if (!$filter->has_term('Notes')) { $filter->addTerm(array('cnj'=>'and', 'attr'=>'Notes', 'op'=> 'LIKE', 'val'=>'', 'cookie'=>'eventsNotes')); } if (!$filter->has_term('StartDateTime', '>=')) { - $filter->addTerm(array('attr' => 'StartDateTime', 'op' => '>=', - 'val' => $num_terms ? '' : (isset($_COOKIE['eventsStartDateTimeStart']) ? $_COOKIE['eventsStartDateTimeStart'] : date('Y-m-d h:i:s', time()-3600)), - 'cnj' => 'and', 'cookie'=>'eventsStartDateTimeStart')); + $filter->addTerm(array('attr' => 'StartDateTime', 'op' => '>=', + 'val' => $num_terms ? '' : (isset($_COOKIE['zmFilter_StartDateTime']) ? $_COOKIE['zmFilter_StartDateTime'] : date('Y-m-d H:i:s', time()-3600)), + 'cnj' => 'and', 'cookie'=>'zmFilter_StartDateTime')); } if (!$filter->has_term('StartDateTime', '<=')) { $filter->addTerm(array('attr' => 'StartDateTime', 'op' => '<=', - 'val' => $num_terms ? '' : (isset($_COOKIE['eventsStartDateTimeEnd']) ? $_COOKIE['eventsStartDateTimeEnd'] : ''), - 'cnj' => 'and', 'cookie'=>'eventsEndDateTimeEnd')); + 'val' => $num_terms ? '' : (isset($_COOKIE['zmFilter_EndDateTime']) ? $_COOKIE['zmFilter_EndDateTime'] : ''), + 'cnj' => 'and', 'cookie'=>'zmFilter_EndDateTime')); } if (!$filter->has_term('Tags')) { $filter->addTerm(array('attr' => 'Tags', 'op' => '=', diff --git a/web/skins/classic/views/js/events.js b/web/skins/classic/views/js/events.js index 2ba102f8e..dcc35b78b 100644 --- a/web/skins/classic/views/js/events.js +++ b/web/skins/classic/views/js/events.js @@ -589,11 +589,26 @@ function buildFilterQuery() { return query; } +// Persist every filter term that carries a data-cookie (Monitor, Group, +// StartDateTime, Notes, Tags, ...) so the selection is shared with the console, +// montage and montage review views. setCookie JSON-encodes arrays, matching how +// getFilterSelection() reads the zmFilter_* cookies. refs #4976 +function persistFilterCookies() { + $j('#fieldsTable [data-cookie]').each(function persistOne() { + const el = $j(this); + setCookie(el.attr('data-cookie'), el.val()); + }); +} + function filterEvents(clickedElement, options) { options = options || {}; if (clickedElement.target && clickedElement.target.id == 'filterArchived') { setCookie('zmFilterArchived', clickedElement.target.value); } + // Don't rewrite cookies when restoring state from a back/forward navigation. + if (!options.skipPushState) { + persistFilterCookies(); + } filterQuery = buildFilterQuery(); // Update URL using pushState so filter state can be shared and back/forward works From 8af108883f1b651030cad303732acc3defa4cd3d Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 12 Jul 2026 22:23:16 -0700 Subject: [PATCH 34/43] feat: montagereview shares timeline range via zmFilter_* date cookies refs #4976 Seed the timeline range from the shared zmFilter_StartDateTime/EndDateTime cookies when no minTime/maxTime URL param is given (minTime/maxTime kept only as a deprecated bookmark fallback), and point the DateTime terms' cookies at those shared names so the range round-trips with the events list. Bind getMinMaxStartDateTimeElements() to DateTime terms as well as StartDateTime so the terms-driven timeline actually engages, and have clicknav() persist the panned/zoomed range to the shared cookies. Write the term cookies with no expiry so the shared range does not silently lapse after an hour. Co-Authored-By: Claude Opus 4.8 (1M context) --- web/skins/classic/views/js/montagereview.js | 16 ++++++++++------ web/skins/classic/views/montagereview.php | 17 +++++++++++------ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/web/skins/classic/views/js/montagereview.js b/web/skins/classic/views/js/montagereview.js index 84f95721d..52d5059b6 100644 --- a/web/skins/classic/views/js/montagereview.js +++ b/web/skins/classic/views/js/montagereview.js @@ -1052,11 +1052,11 @@ function clicknav(minSecs, maxSecs, live) {// we use the current time if we can maxSecs = parseInt(now); } maxStr = "&maxTime=" + secs2inputstr(maxSecs); - $j('#maxTime').val(secs2inputstr(maxSecs)); - } - if ( minSecs > 0 ) { - $j('#minTime').val(secs2inputstr(minSecs)); minStr = "&minTime=" + secs2inputstr(minSecs); + // Persist the range to the shared date cookies so a pan/zoom here carries to + // the events list (minTime/maxTime in the URL are deprecated). refs #4976 + setCookie('zmFilter_StartDateTime', secs2dbstr(minSecs)); + setCookie('zmFilter_EndDateTime', secs2dbstr(maxSecs)); } if ( maxSecs == 0 && minSecs == 0 ) { minStr = "&minTime=1950-01-01+12:00:00"; @@ -1326,7 +1326,9 @@ function loadEventData(e) { } data[name] = val; const cookie = el.attr('data-cookie'); - if (cookie) setCookie(cookie, val, 3600); + // Persist (no expiry) so the shared filter/date range does not silently + // expire after an hour and desync from the other views. refs #4976 + if (cookie) setCookie(cookie, val); } // end if name } // end if val }); @@ -1716,7 +1718,9 @@ function loadFrames(zm_events) { function getMinMaxStartDateTimeElements() { const regexp = /^filter\[Query\]\[terms\]\[(\d+)\]\[attr\]$/; - $j('#fieldsTable input[value="StartDateTime"]').each(function(index) { + // montagereview renders DateTime (overlap) terms; the events list renders + // StartDateTime terms. Bind either so the timeline range tracks the terms. refs #4976 + $j('#fieldsTable input[value="StartDateTime"], #fieldsTable input[value="DateTime"]').each(function(index) { const matches = this.name.match(regexp); if (matches && matches.length) { const val = this.form.elements['filter[Query][terms]['+matches[1]+'][val]']; diff --git a/web/skins/classic/views/montagereview.php b/web/skins/classic/views/montagereview.php index f5798c25e..83f223de1 100644 --- a/web/skins/classic/views/montagereview.php +++ b/web/skins/classic/views/montagereview.php @@ -94,14 +94,19 @@ if (isset($_REQUEST['current'])) { $defaultCurrentTimeSecs = strtotime($defaultCurrentTime); } +// Range precedence: deprecated minTime/maxTime URL params (kept for old bookmarks) +// -> shared zmFilter_* date cookies (persisted from the events list and from +// montagereview navigation) -> last hour. refs #4976 if ( !isset($_REQUEST['minTime']) && !isset($_REQUEST['maxTime']) ) { if (isset($defaultCurrentTimeSecs)) { $minTime = date('Y-m-d H:i:s', $defaultCurrentTimeSecs - 1800); $maxTime = date('Y-m-d H:i:s', $defaultCurrentTimeSecs + 1800); } else { $time = time(); - $maxTime = date('Y-m-d H:i:s', $time); - $minTime = date('Y-m-d H:i:s', $time - 3600); + $maxTime = (isset($_COOKIE['zmFilter_EndDateTime']) and $_COOKIE['zmFilter_EndDateTime']) + ? validHtmlStr($_COOKIE['zmFilter_EndDateTime']) : date('Y-m-d H:i:s', $time); + $minTime = (isset($_COOKIE['zmFilter_StartDateTime']) and $_COOKIE['zmFilter_StartDateTime']) + ? validHtmlStr($_COOKIE['zmFilter_StartDateTime']) : date('Y-m-d H:i:s', $time - 3600); } } else { if (isset($_REQUEST['minTime'])) @@ -147,8 +152,8 @@ if (isset($_REQUEST['filter'])) { } else { $filter = new ZM\Filter(); if (isset($_REQUEST['minTime']) && isset($_REQUEST['maxTime']) && (count($displayMonitors) != 0)) { - $filter->addTerm(array('attr' => 'DateTime', 'op' => '>=', 'val' => $_REQUEST['minTime'], 'obr' => '1', 'cookie'=>htmlspecialchars('DateTime<='))); - $filter->addTerm(array('attr' => 'DateTime', 'op' => '<=', 'val' => $_REQUEST['maxTime'], 'cnj' => 'and', 'cbr' => '1', 'cookie'=>htmlspecialchars('DateTime<='))); + $filter->addTerm(array('attr' => 'DateTime', 'op' => '>=', 'val' => $_REQUEST['minTime'], 'obr' => '1', 'cookie'=>'zmFilter_StartDateTime')); + $filter->addTerm(array('attr' => 'DateTime', 'op' => '<=', 'val' => $_REQUEST['maxTime'], 'cnj' => 'and', 'cbr' => '1', 'cookie'=>'zmFilter_EndDateTime')); if (count($selected_monitor_ids)) { $filter->addTerm(array('attr' => 'Monitor', 'op' => 'IN', 'val' => implode(',',$selected_monitor_ids), 'cnj' => 'and')); } else if ( isset($_SESSION['GroupId']) || isset($_SESSION['ServerFilter']) || isset($_SESSION['StorageFilter']) || isset($_SESSION['StatusFilter']) ) { @@ -170,10 +175,10 @@ if (!$liveMode) { $filter->addTerm(array('attr' => 'Archived', 'op' => '=', 'val' => '', 'cnj' => 'and', 'cookie'=>'Archived')); } if (!$filter->has_term('DateTime', '>=')) { - $filter->addTerm(array('attr' => 'DateTime', 'op' => '>=', 'val' => $minTime, 'cnj' => 'and', 'cookie'=>htmlspecialchars('DateTime>='))); + $filter->addTerm(array('attr' => 'DateTime', 'op' => '>=', 'val' => $minTime, 'cnj' => 'and', 'cookie'=>'zmFilter_StartDateTime')); } if (!$filter->has_term('DateTime', '<=')) { - $filter->addTerm(array('attr' => 'DateTime', 'op' => '<=', 'val' => $maxTime, 'cnj' => 'and', 'cookie'=>htmlspecialchars('DateTime<='))); + $filter->addTerm(array('attr' => 'DateTime', 'op' => '<=', 'val' => $maxTime, 'cnj' => 'and', 'cookie'=>'zmFilter_EndDateTime')); } if (!$filter->has_term('Tags')) { $filter->addTerm(array('attr' => 'Tags', 'op' => '=', From 52a398c472ef9dfb6cac4cb3c46dcb87f3acc583 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 12 Jul 2026 22:25:53 -0700 Subject: [PATCH 35/43] feat: constrain events list to attribute-filtered monitors refs #4976 The monitor-attribute filters (Status/Capturing/Analysing/Recording/ServerId/ StorageId/MonitorName/Source) shared via the zmFilter_* cookies have no Events column, so they can't be event filter terms. Add getFilteredMonitorIds() which resolves them to the set of viewable monitor ids (mirroring buildMonitorsFilters, intersected with visibleMonitor), returning null when none is active. The events query path (ajax/events.php) adds a MonitorId IN (...) term from it, so a monitor selection made on the console now narrows the events list too. Group and Monitor remain first-class event terms and are excluded from the resolver. Co-Authored-By: Claude Opus 4.8 (1M context) --- web/ajax/events.php | 8 +++ web/skins/classic/views/_monitor_filters.php | 62 ++++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/web/ajax/events.php b/web/ajax/events.php index 74bbf68a3..06698a68c 100644 --- a/web/ajax/events.php +++ b/web/ajax/events.php @@ -29,11 +29,19 @@ if ($message) { } require_once('includes/Filter.php'); +require_once getSkinFile('views/_monitor_filters.php'); // getFilteredMonitorIds() $filter = isset($_REQUEST['filter']) ? ZM\Filter::parse($_REQUEST['filter']) : new ZM\Filter(); if (count( $user->unviewableMonitorIds())) { $filter = $filter->addTerm(array('cnj'=>'and', 'attr'=>'MonitorId', 'op'=>'IN', 'val'=>$user->viewableMonitorIds())); // $filter = $filter->addTerm(array('cnj'=>'and', 'attr'=>'MonitorId', 'op'=>'IN', 'val'=>'5')); } +# Constrain to the monitors selected by the shared monitor-attribute filters +# (Status/Capturing/Server/Storage/Name/Source) which have no Events column and so +# can't be expressed as event terms. Null = no such filter active. refs #4976 +$attr_monitor_ids = getFilteredMonitorIds(); +if ($attr_monitor_ids !== null) { + $filter = $filter->addTerm(array('cnj'=>'and', 'attr'=>'MonitorId', 'op'=>'IN', 'val'=>$attr_monitor_ids)); +} // TODO: Why is $user->viewableMonitorIds() returning $user->unviewableMonitorIds() // Error('$user->viewableMonitorIds(): '.print_r($user->viewableMonitorIds())); if (!empty($_REQUEST['StartDateTime'])) { diff --git a/web/skins/classic/views/_monitor_filters.php b/web/skins/classic/views/_monitor_filters.php index a6d2541d8..4951dc190 100644 --- a/web/skins/classic/views/_monitor_filters.php +++ b/web/skins/classic/views/_monitor_filters.php @@ -43,6 +43,68 @@ function getFilterSelection($name) { return $selectedValue; } +// Resolve the shared monitor-attribute filters (ServerId/StorageId/Status/ +// Capturing/Analysing/Recording/MonitorName/Source) to the set of viewable +// monitor ids they select, so views that filter events (which have no such +// columns) can constrain to those monitors. Returns null when no attribute +// filter is active (meaning "all monitors" -> caller should not constrain). +// Group and Monitor selection are handled as first-class event terms and are +// intentionally excluded here. refs #4976 +function getFilteredMonitorIds() { + require_once('includes/Monitor.php'); + + $conditions = array(); + $values = array(); + foreach (array('ServerId', 'StorageId', 'Status', 'Capturing', 'Analysing', 'Recording') as $filter) { + $filterValue = getFilterSelection($filter); + if ($filterValue === '' or $filterValue === array() or $filterValue === null) + continue; + # See buildMonitorsFilters(): Function=None monitors have no Monitor_Status row. + $column = ($filter == 'Status') ? "COALESCE(`Status`, 'NotRunning')" : '`'.$filter.'`'; + if (is_array($filterValue)) { + $conditions[] = $column.' IN ('.implode(',', array_map(function() {return '?';}, $filterValue)).')'; + $values = array_merge($values, $filterValue); + } else { + $conditions[] = $column.'=?'; + $values[] = $filterValue; + } + } + + $monitorNameFilter = getFilterSelection('MonitorName'); + $sourceFilter = getFilterSelection('Source'); + + if (!count($conditions) and !$monitorNameFilter and !$sourceFilter) + return null; // no attribute filter active -> all monitors + + $sql = 'SELECT M.* FROM Monitors AS M + LEFT JOIN Monitor_Status AS S ON S.MonitorId=M.Id + WHERE M.`Deleted`=false' + . (count($conditions) ? ' AND '.implode(' AND ', $conditions) : ''); + $ids = array(); + foreach (dbFetchAll($sql, null, $values) as $row) { + if (!visibleMonitor($row['Id'])) + continue; // never widen visibility beyond what the user may view + + if ($monitorNameFilter) { + $regexp = $monitorNameFilter; + if (!strpos($regexp, '/')) $regexp = '/'.$regexp.'/i'; + if (@preg_match($regexp, '') === false) $regexp = '/'.preg_quote($monitorNameFilter, '/').'/i'; + if (!@preg_match($regexp, $row['Name'])) continue; + } + if ($sourceFilter) { + $Monitor = new ZM\Monitor($row); + $regexp = $sourceFilter; + if (!preg_match("/^\/.+\/[a-z]*$/i", $regexp)) $regexp = '/'.$regexp.'/i'; + if (@preg_match($regexp, '') !== false) { + if (!preg_match($regexp, $Monitor->Source()) and !preg_match($regexp, $Monitor->Path())) + continue; + } + } + $ids[] = $row['Id']; + } + return $ids; +} + function addFilterSelect($name, $options, $selectedValue=null) { if ($selectedValue == null) $selectedValue = getFilterSelection($name); From f462ae3998f2b4898e1fd4aa54605c86722c66a2 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 19 Jul 2026 20:52:24 -0400 Subject: [PATCH 36/43] fix: mirror DateTime overlap idiom in the Perl filter daemon refs #4976 The DateTime filter attribute was taught the "event overlaps this instant/window" idiom in web/includes/FilterTerm.php: a lower bound (>=/>) compares COALESCE(EndDateTime, '9999-12-31 23:59:59') so still-running events are included, while an upper bound keeps comparing StartDateTime. The Perl Filter.pm still emitted E.StartDateTime for that attribute, so a saved filter using DateTime with >=/> selected different events in the web UI than in zmfilter.pl, which drives automated delete/email/execute actions. Apply the same column selection in ZoneMinder::Filter::Sql so the daemon and the web agree. Verified by generating SQL from both sides for =, <, <=, >, >=: the column expressions are now byte-identical. Co-Authored-By: Claude Opus 4.8 Claude-Session: https://claude.ai/code/session_01KQipwf632JGgNH4W7p8cqs --- scripts/ZoneMinder/lib/ZoneMinder/Filter.pm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm index dcc0db6e5..d71bf421c 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm @@ -214,7 +214,19 @@ sub Sql { } elsif ( $term->{attr} eq 'CurrentDate' ) { $self->{Sql} .= 'to_days(NOW())'; } elsif ( $term->{attr} eq 'DateTime' ) { - $self->{Sql} .= 'E.StartDateTime'; + # Mirror web/includes/FilterTerm.php: DateTime is an "event overlaps + # this instant/window" idiom, not a plain StartDateTime comparison. A + # lower bound (>=/>) is satisfied by an event still running at that + # time, so compare against EndDateTime (NULL end = ongoing = never + # ends). An upper bound (<=/{op}//'') eq '>=' or ($term->{op}//'') eq '>' ) { + $self->{Sql} .= "COALESCE(E.EndDateTime, '9999-12-31 23:59:59')"; + } else { + $self->{Sql} .= 'E.StartDateTime'; + } } elsif ( $term->{attr} eq 'Date' ) { # column emitted as part of range expression below } elsif ( $term->{attr} eq 'StartDate' ) { From 03f3af3d36a7bad8db45dbc4f567dc722acd41dd Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 19 Jul 2026 23:16:48 -0400 Subject: [PATCH 37/43] =?UTF-8?q?fix:=20replace=20Cyrillic=20=D0=A1=20with?= =?UTF-8?q?=20Latin=20C=20in=20monitor=20ajax=20error=20message?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit web/ajax/monitor.php built its permission-error text with translate('СonjOr'), where the leading С is Cyrillic Es (U+0421), not Latin C. Two consequences: - The lookup key did not match the defined 'ConjOr' translation (Latin C, en_gb.php), so translate() fell through to echoing the raw key instead of the conjunction "or". - The multi-byte UTF-8 sequence (0xD0 0xA1) is corrupted by some reverse proxies, surfacing as a stray control byte in the served response. Use the Latin 'ConjOr' key, matching every other caller (e.g. web/includes/FilterTerm.php). A full Cyrillic/Greek homoglyph sweep of the first-party tree (excluding lang/ and vendored assets) found this as the only remaining occurrence. refs https://github.com/ZoneMinder/zoneminder/discussions/4993 Co-Authored-By: Claude Opus 4.8 Claude-Session: https://claude.ai/code/session_01KQipwf632JGgNH4W7p8cqs --- web/ajax/monitor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/ajax/monitor.php b/web/ajax/monitor.php index 271325879..1341b82f5 100644 --- a/web/ajax/monitor.php +++ b/web/ajax/monitor.php @@ -38,5 +38,5 @@ if ( canView('Monitors') || (isset($_REQUEST['mid']) && $_REQUEST['mid'] !== '' } // end switch action } // end if canView('Monitors') -ajaxError(translate('UnrecognisedAction').' "'.validHtmlStr($_REQUEST['action'] ?? '').'" '.translate('СonjOr').' '.translate('insufficientPermissionsUser').' "'.validHtmlStr($user->Username()).'"'); +ajaxError(translate('UnrecognisedAction').' "'.validHtmlStr($_REQUEST['action'] ?? '').'" '.translate('ConjOr').' '.translate('insufficientPermissionsUser').' "'.validHtmlStr($user->Username()).'"'); ?> From d9d921e136424a58a1d1fc5442a491d6d4706b2e Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 19 Jul 2026 23:20:54 -0400 Subject: [PATCH 38/43] ci: add homoglyph guard for first-party source Cyrillic/Greek characters that look like ASCII letters keep landing in the tree from pasted contributions (discussions #4993, #4678, PR #4678), breaking lookups and getting corrupted by reverse proxies. utils/check-homoglyphs.py scans the git-tracked source for characters in the Cyrillic (U+0400-U+04FF) and Greek (U+0370-U+03FF) blocks and exits non-zero on any hit, excluding translations (web/lang/) and vendored/minified assets where they are legitimate. A CI Homoglyphs workflow runs it on push and pull request, and it can be run locally with python3 utils/check-homoglyphs.py. refs https://github.com/ZoneMinder/zoneminder/discussions/4993 Co-Authored-By: Claude Opus 4.8 Claude-Session: https://claude.ai/code/session_01KQipwf632JGgNH4W7p8cqs --- .github/workflows/ci-homoglyphs.yml | 20 +++++++ utils/check-homoglyphs.py | 87 +++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 .github/workflows/ci-homoglyphs.yml create mode 100755 utils/check-homoglyphs.py diff --git a/.github/workflows/ci-homoglyphs.yml b/.github/workflows/ci-homoglyphs.yml new file mode 100644 index 000000000..b6ebea583 --- /dev/null +++ b/.github/workflows/ci-homoglyphs.yml @@ -0,0 +1,20 @@ +name: CI Homoglyphs + +on: + push: + branches: + - '*' + pull_request: + branches: [ master ] + +permissions: + contents: read + +jobs: + homoglyphs: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v7 + - name: Check for Cyrillic/Greek homoglyphs in first-party source + run: python3 utils/check-homoglyphs.py diff --git a/utils/check-homoglyphs.py b/utils/check-homoglyphs.py new file mode 100755 index 000000000..09e199098 --- /dev/null +++ b/utils/check-homoglyphs.py @@ -0,0 +1,87 @@ +#!/usr/bin/env python3 +"""Fail if first-party source contains Cyrillic/Greek homoglyphs. + +Contributors occasionally paste characters that look like ASCII letters but are +not, e.g. Cyrillic Es (U+0421) instead of Latin C. These break identifier and +translation-key lookups, and the multi-byte UTF-8 sequences are corrupted by +some reverse proxies (ZoneMinder discussions #4993, #4678). This scans the +git-tracked source tree for characters in the Cyrillic (U+0400-U+04FF) and +Greek (U+0370-U+03FF) blocks and exits non-zero if any are found. + +Translations (web/lang/) and vendored/minified assets legitimately contain +these characters and are excluded. Run from the repo root: + + python3 utils/check-homoglyphs.py +""" +import re +import subprocess +import sys + +# Only these extensions are scanned; everything else (images, fonts, binaries) +# is ignored. +SCANNED_EXT = ( + '.php', '.js', '.cpp', '.h', '.hpp', '.c', '.cc', + '.pl', '.pm', '.pl.in', '.pm.in', '.in', + '.css', '.sql', '.py', '.sh', +) + +# Paths where non-ASCII letters are legitimate (translations) or not ours to +# fix (vendored, minified, generated). Matched as a case-insensitive substring +# of the repo-relative path. +EXCLUDE = re.compile( + r'(?:' + r'/lang/' # translation catalogues + r'|\.min\.' # minified vendored bundles + r'|/assets/' # bundled third-party skin assets + r'|/vendor/|/dist/|/lib/' # vendored libraries + r'|node_modules/' + r'|jquery|bootstrap|chosen|moment|video\.js|audiomotion' + r'|pro-sidebar|dygraph|packery|flatpickr' + r')', + re.IGNORECASE, +) + +# Cyrillic and Greek letter blocks. These are what homoglyph attacks and +# accidental paste-ins draw from; ZoneMinder code is otherwise ASCII. +HOMOGLYPH = re.compile(r'[Ѐ-ӿͰ-Ͽ]') + + +def tracked_files(): + out = subprocess.check_output(['git', 'ls-files'], text=True) + return out.splitlines() + + +def main(): + violations = [] + for path in tracked_files(): + if EXCLUDE.search(path): + continue + if not path.endswith(SCANNED_EXT): + continue + try: + with open(path, encoding='utf-8') as handle: + lines = handle.readlines() + except (OSError, UnicodeDecodeError): + continue + for lineno, line in enumerate(lines, 1): + for match in HOMOGLYPH.finditer(line): + char = match.group() + violations.append( + (path, lineno, match.start() + 1, ord(char), line.rstrip('\n')) + ) + + if not violations: + print('OK: no Cyrillic/Greek homoglyphs in first-party source.') + return 0 + + print('Found {} homoglyph character(s) in first-party source:\n'.format(len(violations))) + for path, lineno, col, cp, text in violations: + print(' {}:{}:{} U+{:04X}'.format(path, lineno, col, cp)) + print(' {}'.format(text.strip())) + print('\nReplace each with its ASCII equivalent (e.g. Cyrillic С U+0421 -> Latin C).') + print('If a character is genuinely required, add its path to EXCLUDE in {}.'.format(sys.argv[0])) + return 1 + + +if __name__ == '__main__': + sys.exit(main()) From f806ff57485157f0a14c8451a7a49b3abc6367ed Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 19 Jul 2026 23:25:12 -0400 Subject: [PATCH 39/43] fix: make homoglyph guard pass its own check The initial utils/check-homoglyphs.py expressed the Cyrillic/Greek ranges as literal characters in its regex and used a literal Cyrillic C in an example string, so the script flagged itself and CI Homoglyphs failed on master. Express the character-class bounds with \u escapes and describe the example by codepoint only, keeping the file pure ASCII while matching the same ranges. Co-Authored-By: Claude Opus 4.8 Claude-Session: https://claude.ai/code/session_01KQipwf632JGgNH4W7p8cqs --- utils/check-homoglyphs.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/utils/check-homoglyphs.py b/utils/check-homoglyphs.py index 09e199098..34d9ef108 100755 --- a/utils/check-homoglyphs.py +++ b/utils/check-homoglyphs.py @@ -41,9 +41,11 @@ EXCLUDE = re.compile( re.IGNORECASE, ) -# Cyrillic and Greek letter blocks. These are what homoglyph attacks and -# accidental paste-ins draw from; ZoneMinder code is otherwise ASCII. -HOMOGLYPH = re.compile(r'[Ѐ-ӿͰ-Ͽ]') +# Cyrillic (U+0400-U+04FF) and Greek (U+0370-U+03FF) letter blocks. These are +# what homoglyph attacks and accidental paste-ins draw from; ZoneMinder code is +# otherwise ASCII. Written with \u escapes so this script is itself ASCII and +# passes its own check. +HOMOGLYPH = re.compile("[\u0400-\u04ff\u0370-\u03ff]") def tracked_files(): @@ -78,7 +80,7 @@ def main(): for path, lineno, col, cp, text in violations: print(' {}:{}:{} U+{:04X}'.format(path, lineno, col, cp)) print(' {}'.format(text.strip())) - print('\nReplace each with its ASCII equivalent (e.g. Cyrillic С U+0421 -> Latin C).') + print('\nReplace each with its ASCII equivalent (e.g. Cyrillic Es U+0421 -> Latin C).') print('If a character is genuinely required, add its path to EXCLUDE in {}.'.format(sys.argv[0])) return 1 From 154786d31d511ac5408fb9630a570794b29ab8c4 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 21 Jul 2026 12:11:37 -0400 Subject: [PATCH 40/43] fix: derive event start from mp4 end time in recover_timestamps The mp4 is written as the event records, so its mtime is when recording finished, not when it started. Set EndDateTime to the mtime and StartDateTime to duration seconds before it, so Length agrees with EndDateTime - StartDateTime. The directory mtime fallback also ran unconditionally after both branches, overwriting the times just computed and the Deep-scheme path-derived start. Only use it when there are neither capture jpgs nor an mp4. Adds t/event_recover_timestamps.t, which builds a 3 second mp4 with ffmpeg and checks the recovered times against its mtime. Co-Authored-By: Claude Opus 4.8 (1M context) Claude-Session: https://claude.ai/code/session_01BV1gDc9T6D6H8gtTcxwLvk --- scripts/ZoneMinder/lib/ZoneMinder/Event.pm | 16 +++++---- .../ZoneMinder/t/event_recover_timestamps.t | 36 +++++++++++++++++++ 2 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 scripts/ZoneMinder/t/event_recover_timestamps.t diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm index 6a9b7ad15..a548008b3 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm @@ -880,7 +880,6 @@ sub recover_timestamps { my $first_file = "$path/$capture_jpgs[0]"; ( $first_file ) = $first_file =~ /^(.*)$/; my $first_timestamp = (stat($first_file))[9]; - $starttime = $first_timestamp if $first_timestamp < $starttime; my $last_file = $path.'/'.$capture_jpgs[@capture_jpgs-1]; ( $last_file ) = $last_file =~ /^(.*)$/; @@ -922,24 +921,27 @@ sub recover_timestamps { my $file = $path.'/'.$mp4_files[0]; ( $file ) = $file =~ /^(.*)$/; # de-taint - my $first_timestamp = (stat($file))[9]; - $starttime = $first_timestamp if $first_timestamp < $starttime; - my $seconds = mp4_duration($file); if ( !defined $seconds ) { Warning("Unable to determine duration of $file from ffprobe. Defaulting Length to 0."); $seconds = 0; } - Debug("From mp4 have duration $seconds seconds, start: $first_timestamp"); + # The mp4 is written as the event records, so its mtime is when recording + # finished. The event therefore started $seconds before that. + my $last_timestamp = (stat($file))[9]; + my $first_timestamp = $last_timestamp - $seconds; + Debug("From mp4 have duration $seconds seconds, start: $first_timestamp end: $last_timestamp"); $Event->Length(sprintf('%.2f', $seconds)); $Event->StartDateTime( Date::Format::time2str('%Y-%m-%d %H:%M:%S', $first_timestamp) ); - $Event->EndDateTime( Date::Format::time2str('%Y-%m-%d %H:%M:%S', $first_timestamp+$seconds) ); + $Event->EndDateTime( Date::Format::time2str('%Y-%m-%d %H:%M:%S', $last_timestamp) ); + } else { + # Nothing to derive the times from, so fall back to the directory's mtime. + $Event->StartDateTime( Date::Format::time2str('%Y-%m-%d %H:%M:%S', $starttime) ); } if ( @mp4_files ) { $Event->DefaultVideo($mp4_files[0]); } - $Event->StartDateTime( Date::Format::time2str('%Y-%m-%d %H:%M:%S', $starttime) ); } # Return the duration of a video file in seconds (float), or undef if it diff --git a/scripts/ZoneMinder/t/event_recover_timestamps.t b/scripts/ZoneMinder/t/event_recover_timestamps.t new file mode 100644 index 000000000..0cf44c063 --- /dev/null +++ b/scripts/ZoneMinder/t/event_recover_timestamps.t @@ -0,0 +1,36 @@ +use strict; +use warnings; +use Test::More; +use File::Temp qw(tempdir); +use Date::Parse; + +plan skip_all => 'ffmpeg not available' if system('ffmpeg -version >/dev/null 2>&1'); +eval { require ZoneMinder::Event; 1 } or plan skip_all => "cannot load ZoneMinder::Event: $@"; +plan tests => 6; + +# An event directory holding only an mp4 (no capture jpgs), as produced when +# ZM_SAVE_JPEGS is off. Duration is 3 seconds. +my $dir = tempdir(CLEANUP => 1); +my $mp4 = "$dir/1-video.h264.mp4"; +is(system("ffmpeg -v error -y -f lavfi -i testsrc=duration=3:size=64x64:rate=10 '$mp4' >/dev/null 2>&1"), + 0, 'built a 3 second test mp4'); + +# mtime of the mp4 is when recording finished. +my $end = 1700000000; +utime($end, $end, $mp4) or die "utime: $!"; +# Make the directory itself much older, so a fallback to its mtime is visible. +utime($end - 3600, $end - 3600, $dir) or die "utime: $!"; + +my $Event = new ZoneMinder::Event(); +$Event->recover_timestamps($dir); + +cmp_ok(abs($Event->Length() - 3), '<', 0.5, 'Length comes from the mp4 duration'); +is($Event->DefaultVideo(), '1-video.h264.mp4', 'DefaultVideo is the mp4 we found'); + +my $start = Date::Parse::str2time($Event->StartDateTime()); +my $stop = Date::Parse::str2time($Event->EndDateTime()); +is($stop, $end, 'EndDateTime is the mp4 mtime, when recording finished'); +cmp_ok(abs($start - ($end - 3)), '<=', 1, + 'StartDateTime is duration before the end, not the dir mtime'); +cmp_ok(abs(($stop - $start) - $Event->Length()), '<=', 1, + 'Length agrees with EndDateTime - StartDateTime'); From fe5289968e0090cb58e1a5355ea8d14b76812103 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 21 Jul 2026 12:59:43 -0400 Subject: [PATCH 41/43] Accept older .mp4 name structure --- scripts/ZoneMinder/lib/ZoneMinder/Event.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm index a548008b3..30fd7a1b9 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm @@ -861,7 +861,7 @@ sub recover_timestamps { Debug('Have ' . @contents . ' files in '.$path); closedir(DIR); - my @mp4_files = grep(/^\d+\-video\.\w+\.mp4$/, @contents); + my @mp4_files = grep(/^\d+\-video\.(?:\w+\.)?mp4$/, @contents); if ( @mp4_files ) { $$Event{DefaultVideo} = $mp4_files[0]; } @@ -990,7 +990,7 @@ sub fix_DefaultVideo { Debug('Have ' . @contents . ' files in '.$path); closedir(DIR); - my @mp4_files = grep(/^\d+\-video\.\w+\.mp4$/, @contents); + my @mp4_files = grep(/^\d+\-video\.(?:\w+\.)?mp4$/, @contents); if ( @mp4_files ) { $$event{DefaultVideo} = $mp4_files[0]; } From eb83ca1e781b8cf4f2160dd0a93e998a88a176b2 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 21 Jul 2026 18:01:05 -0400 Subject: [PATCH 42/43] fix: return the insert id as uint64_t so event ids past 2^31 survive mysql_insert_id() returns my_ulonglong, but zmDbDoInsert() returned int. Once Events.Id passed INT32_MAX the id was truncated, then sign-extended when stored in Event::id (uint64_t), so 3502167073 became 18446744072916751373. The Events_Hour/Day/Week/Month inserts were given the negative value and rejected, and every later UPDATE of the event matched no row. Also widen the callers that re-truncated the result: the re-analysis event id in zma, Tag::Id() when building an Event_Tag, and Event_Tag::save(). The Events_* insert format specifiers become PRIu64 to match the unsigned id. fixes #4974 Co-Authored-By: Claude Opus 4.8 (1M context) Claude-Session: https://claude.ai/code/session_01BV1gDc9T6D6H8gtTcxwLvk --- src/zm_db.cpp | 8 ++++---- src/zm_db.h | 3 ++- src/zm_event.cpp | 12 ++++++------ src/zm_event_tag.cpp | 4 ++-- src/zm_event_tag.h | 2 +- src/zma.cpp | 6 +++--- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/zm_db.cpp b/src/zm_db.cpp index 195e0eacc..d1d5a3649 100644 --- a/src/zm_db.cpp +++ b/src/zm_db.cpp @@ -22,6 +22,7 @@ #include "zm_signal.h" #include #include +#include #include #include @@ -267,7 +268,7 @@ int zmDbDo(const std::string &query) { return 1; } -int zmDbDoInsert(const std::string &query) { +uint64_t zmDbDoInsert(const std::string &query) { std::lock_guard lck(db_mutex); if (!zmDbConnected and !zmDbConnect()) return 0; @@ -282,9 +283,8 @@ int zmDbDoInsert(const std::string &query) { return 0; } } - // Might not be an int... FIXME - int id = mysql_insert_id(&dbconn); - Debug(2, "Success running sql insert %s. Resulting id is %d", query.c_str(), id); + uint64_t id = mysql_insert_id(&dbconn); + Debug(2, "Success running sql insert %s. Resulting id is %" PRIu64, query.c_str(), id); return id; } diff --git a/src/zm_db.h b/src/zm_db.h index 5f1e75db5..eed3e1e08 100644 --- a/src/zm_db.h +++ b/src/zm_db.h @@ -21,6 +21,7 @@ #define ZM_DB_H #include +#include #include #include #include @@ -70,7 +71,7 @@ extern bool zmDbConnected; bool zmDbConnect(); void zmDbClose(); int zmDbDo(const std::string &query); -int zmDbDoInsert(const std::string &query); +uint64_t zmDbDoInsert(const std::string &query); int zmDbDoUpdate(const std::string &query); MYSQL_RES * zmDbFetch(const std::string &query); diff --git a/src/zm_event.cpp b/src/zm_event.cpp index 120d53498..1fb1b2ac6 100644 --- a/src/zm_event.cpp +++ b/src/zm_event.cpp @@ -153,24 +153,24 @@ Event::Event( /* None of these are crucial, and are simple when done as individual transactions */ sql = stringtf("INSERT INTO `Events_Hour` (EventId,MonitorId,StartDateTime,DiskSpace)" - " VALUES (%" PRId64 ",%u,'%s',NULL)", + " VALUES (%" PRIu64 ",%u,'%s',NULL)", id, monitor->Id(), now_str.c_str()); dbQueue.push(std::move(sql)); sql = stringtf("INSERT INTO `Events_Day` (EventId,MonitorId,StartDateTime,DiskSpace)" - " VALUES (%" PRId64 ",%u,'%s',NULL)", + " VALUES (%" PRIu64 ",%u,'%s',NULL)", id, monitor->Id(), now_str.c_str()); dbQueue.push(std::move(sql)); sql = stringtf("INSERT INTO `Events_Week` (EventId,MonitorId,StartDateTime,DiskSpace)" - " VALUES (%" PRId64 ",%u,'%s',NULL)", + " VALUES (%" PRIu64 ",%u,'%s',NULL)", id, monitor->Id(), now_str.c_str()); dbQueue.push(std::move(sql)); sql = stringtf("INSERT INTO `Events_Month` (EventId,MonitorId,StartDateTime,DiskSpace)" - " VALUES (%" PRId64 ",%u,'%s',NULL)", + " VALUES (%" PRIu64 ",%u,'%s',NULL)", id, monitor->Id(), now_str.c_str()); dbQueue.push(std::move(sql)); /* sql = stringtf("INSERT INTO `Events_Year` (EventId,MonitorId,StartDateTime,DiskSpace)" - " VALUES (%" PRId64 ",%u,'%s',NULL)", + " VALUES (%" PRIu64 ",%u,'%s',NULL)", id, monitor->Id(), now_str.c_str()); dbQueue.push(std::move(sql)); */ @@ -469,7 +469,7 @@ void Event::AddPacket_(const std::shared_ptrpacket) { tag->save(); Debug(1, "Created new Tag %s", cls.c_str()); tags.emplace(std::make_pair(cls, *tag)); - int tag_id = tag->Id(); + uint64_t tag_id = tag->Id(); delete tag; // Delete after copying into map tag = nullptr; diff --git a/src/zm_event_tag.cpp b/src/zm_event_tag.cpp index 3e4d6ac59..cd702f884 100644 --- a/src/zm_event_tag.cpp +++ b/src/zm_event_tag.cpp @@ -78,7 +78,7 @@ Event_Tag::Event_Tag(uint64_t p_tag_id, uint64_t p_event_id, SystemTimePoint p_a Event_Tag::~Event_Tag() { } -int Event_Tag::save() { +uint64_t Event_Tag::save() { std::string sql = stringtf("INSERT INTO `Events_Tags` (`TagId`, `EventId`, `AssignedDate`, `AssignedBy`)" " VALUES (%" PRIu64 ", %" PRIu64 ", from_unixtime(%" PRId64 "), %d)", tag_id, @@ -86,7 +86,7 @@ int Event_Tag::save() { static_cast(std::chrono::system_clock::to_time_t(assigned_on)), assigned_by ); - int rc; + uint64_t rc; //do { rc = zmDbDoInsert(sql); //} while (!rc and !zm_terminate); diff --git a/src/zm_event_tag.h b/src/zm_event_tag.h index 1f5c16089..fa855349d 100644 --- a/src/zm_event_tag.h +++ b/src/zm_event_tag.h @@ -56,7 +56,7 @@ class Event_Tag { unsigned int AssignedBy() { return assigned_by; }; unsigned int AssignedBy(unsigned int p_assigned_by) { return assigned_by = p_assigned_by; }; - int save(); + uint64_t save(); }; #endif // ZM_EVENT_TAG_H diff --git a/src/zma.cpp b/src/zma.cpp index 9424bca87..8fef16a62 100644 --- a/src/zma.cpp +++ b/src/zma.cpp @@ -623,10 +623,10 @@ int main(int argc, char *argv[]) { monitor->Id(), storage_id, event_id, static_cast(std::chrono::duration_cast(fd.timestamp.time_since_epoch()).count()), scheme_str.c_str(), monitor->Width(), monitor->Height()); - int new_event_id = zmDbDoInsert(sql); - if (new_event_id > 0) { + uint64_t new_event_id = zmDbDoInsert(sql); + if (new_event_id) { current_event->db_event_id = new_event_id; - Info("Created new event %d from re-analysis of event %" PRIu64, new_event_id, event_id); + Info("Created new event %" PRIu64 " from re-analysis of event %" PRIu64, new_event_id, event_id); // Create directory and copy video files to new event std::string new_event_path = BuildNewEventPath( From 9a49c9b09f88fe4823a9ea887031c7ccc9fd2442 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 21 Jul 2026 19:53:23 -0400 Subject: [PATCH 43/43] fix: require System permission for filter AutoExecute and gate auto-actions in canEdit Filter::canEdit() checked view-only users with an `and` chain, so it only denied a filter when every auto-action was enabled at once; a filter with only AutoExecute set passed the check. Because AutoExecuteCmd is run as a shell command by zmfilter.pl (qx($command)), a user with Events=View could run arbitrary OS commands via a temporary filter. Rework canEdit(): - enforce ownership before any per-flag checks - require System edit permission for AutoExecute; running an arbitrary OS command is a System-level capability, not event editing - deny view-only users when ANY auto side-effect is enabled (and -> or), covering AutoArchive/Video/Upload/Email/Message as well Hide the AutoExecute/AutoExecuteCmd inputs in the classic filter view from non-System users, preserving existing values in hidden fields so unrelated edits do not alter them. Add tests/php/test_filter_canedit_autoexecute.php exercising the real canEdit() across the permission matrix. Co-Authored-By: Claude Opus 4.8 (1M context) Claude-Session: https://claude.ai/code/session_019pVdHJvR87bvPMu1EFDN7M --- tests/php/test_filter_canedit_autoexecute.php | 135 ++++++++++++++++++ web/includes/Filter.php | 41 ++++-- web/skins/classic/views/filter.php | 12 ++ 3 files changed, 175 insertions(+), 13 deletions(-) create mode 100644 tests/php/test_filter_canedit_autoexecute.php diff --git a/tests/php/test_filter_canedit_autoexecute.php b/tests/php/test_filter_canedit_autoexecute.php new file mode 100644 index 000000000..b2e6f186f --- /dev/null +++ b/tests/php/test_filter_canedit_autoexecute.php @@ -0,0 +1,135 @@ + RCE). +// * AutoExecute (arbitrary OS command via zmfilter.pl) requires System edit +// permission, not merely Events edit. +// * Ownership is enforced: a non-System user can only act on their own filter. +// +// Run as: php tests/php/test_filter_canedit_autoexecute.php +// +// The real Filter class pulls in database.php / FilterTerm.php / Monitor.php via +// require_once, but canEdit() itself only uses ZM_Object's magic accessors (the +// `defaults` array, no DB) plus the passed-in user. So we stub the require-only +// dependencies, keep the real Object.php + Filter.php, and drive canEdit() +// directly. + +namespace ZM; + +// ---- test harness (top-level namespace-free helpers) ----------------------- + +$failures = 0; +$passes = 0; + +function check($name, $got, $want) { + global $failures, $passes; + if ($got === $want) { + $passes++; + echo "ok - $name\n"; + } else { + $failures++; + echo "FAIL - $name (got ".var_export($got, true).", want ".var_export($want, true).")\n"; + } +} + +// ---- stub the require-only dependencies of Filter.php ---------------------- + +$stubdir = sys_get_temp_dir().'/zm_filter_canedit_stubs_'.getmypid(); +@mkdir($stubdir, 0700, true); +foreach (array('database.php', 'FilterTerm.php', 'Monitor.php') as $stub) { + file_put_contents($stubdir.'/'.$stub, " level ('None'|'View'|'Edit') + public function __construct($id, $perms) { $this->id = $id; $this->perms = $perms; } + public function Id() { return $this->id; } + private function level($area) { return isset($this->perms[$area]) ? $this->perms[$area] : 'None'; } + public function canView($area) { $l = $this->level($area); return $l == 'View' || $l == 'Edit'; } + public function canEdit($area) { return $this->level($area) == 'Edit'; } +} + +// Helper: build a Filter owned by $ownerId with the given auto-flags set. +function make_filter($ownerId, array $flags) { + $f = new Filter(); + $f->UserId($ownerId); + foreach ($flags as $k => $v) { + $f->$k($v); + } + return $f; +} + +$systemAdmin = new TestUser(1, array('System' => 'Edit')); +$eventsEditor = new TestUser(2, array('Events' => 'Edit')); +$eventsViewer = new TestUser(3, array('Events' => 'View')); + +// ---- the reported vulnerability: view-only user + AutoExecute -------------- + +$f = make_filter(3, array('AutoExecute' => 1, 'AutoExecuteCmd' => '/bin/sh -c "id"')); +check('Events=View owner CANNOT edit AutoExecute filter', $f->canEdit($eventsViewer), false); + +// Each side-effect alone must block a view-only user (the `and` -> `or` fix). +foreach (array('AutoExecute','AutoDelete','AutoUnarchive','AutoArchive', + 'AutoMove','AutoCopy','AutoVideo','AutoUpload', + 'AutoEmail','AutoMessage') as $flag) { + $f = make_filter(3, array($flag => 1)); + check("Events=View owner blocked when only $flag set", $f->canEdit($eventsViewer), false); +} + +// A pure query filter (no auto actions) is fine for a view-only owner. +$f = make_filter(3, array()); +check('Events=View owner CAN edit plain query filter', $f->canEdit($eventsViewer), true); + +// ---- AutoExecute requires System edit, not just Events edit ---------------- + +$f = make_filter(2, array('AutoExecute' => 1, 'AutoExecuteCmd' => '/bin/sh -c "id"')); +check('Events=Edit owner CANNOT edit AutoExecute filter', $f->canEdit($eventsEditor), false); + +// Events editor may still run event-changing filters. +$f = make_filter(2, array('AutoDelete' => 1)); +check('Events=Edit owner CAN edit AutoDelete filter', $f->canEdit($eventsEditor), true); +$f = make_filter(2, array('AutoMove' => 1, 'AutoMoveTo' => 5)); +check('Events=Edit owner CAN edit AutoMove filter', $f->canEdit($eventsEditor), true); + +// System editor can do anything, including AutoExecute. +$f = make_filter(999, array('AutoExecute' => 1, 'AutoExecuteCmd' => '/bin/sh -c "id"')); +check('System editor CAN edit AutoExecute filter (any owner)', $f->canEdit($systemAdmin), true); + +// ---- ownership enforcement ------------------------------------------------- + +$f = make_filter(1, array()); // owned by someone else +check('Events=Edit user CANNOT edit filter owned by another user', $f->canEdit($eventsEditor), false); +check('Events=View user CANNOT edit filter owned by another user', $f->canEdit($eventsViewer), false); + +// A user with no Events permission at all cannot edit even their own filter. +$noPerm = new TestUser(4, array()); +$f = make_filter(4, array()); +check('User with no Events perm CANNOT edit own plain filter', $f->canEdit($noPerm), false); + +// ---- cleanup --------------------------------------------------------------- + +@unlink($stubdir.'/database.php'); +@unlink($stubdir.'/FilterTerm.php'); +@unlink($stubdir.'/Monitor.php'); +@rmdir($stubdir); + +echo "\n$passes passed, $failures failed.\n"; +exit($failures ? 1 : 0); diff --git a/web/includes/Filter.php b/web/includes/Filter.php index 0f06f424f..6d3bda6b5 100644 --- a/web/includes/Filter.php +++ b/web/includes/Filter.php @@ -1456,19 +1456,34 @@ class Filter extends ZM_Object { if (!$u) $u=$user; if ($u->canEdit('System')) return true; - if ($this->UserId() == $u->Id()) { - if ($u->canEdit('Events')) return true; - if ($u->canView('Events')) { - // If we can only view events, then we can't perform filters that involve changing the event. - if (!( - $this->AutoExecute() and - $this->AutoDelete() and - $this->AutoUnarchive() and - $this->AutoMove() and - $this->AutoCopy() - )) { - return true; - } + // Below here the user is not a System editor, so may only act on filters + // that they own. + if ($this->UserId() != $u->Id()) return false; + + // AutoExecuteCmd is run verbatim as an OS command by zmfilter.pl, which is + // equivalent to shell access on the server. Restrict it to System editors, + // who were already granted access above. + if ($this->AutoExecute()) return false; + + // Users who can edit Events may run filters that change events + // (move/copy/delete/archive/etc). + if ($u->canEdit('Events')) return true; + + // View-only users may only run filters that neither change events nor + // trigger side effects. Deny if ANY auto action is enabled. + if ($u->canView('Events')) { + if (!( + $this->AutoDelete() or + $this->AutoUnarchive() or + $this->AutoArchive() or + $this->AutoMove() or + $this->AutoCopy() or + $this->AutoVideo() or + $this->AutoUpload() or + $this->AutoEmail() or + $this->AutoMessage() + )) { + return true; } } return false; diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php index d70faaaec..07af6b3f8 100644 --- a/web/skins/classic/views/filter.php +++ b/web/skins/classic/views/filter.php @@ -286,12 +286,24 @@ if ( ZM_OPT_MESSAGE ) {

AutoExecute() ) { ?> checked="checked"/>

+ + + +

AutoDelete() ) { ?> checked="checked" data-on-click-this="updateButtons"/>