Commit Graph

660 Commits (master)

Author SHA1 Message Date
Isaac Connor 7250923e02 Comment out debug 2025-07-26 11:52:21 -04:00
Isaac Connor 7f9cde76b5 More gracefully handle NaN so that hopefully the real error won't get lost in the noise 2025-06-19 17:03:38 -04:00
IgorA100 9f68c60a90
Added the ability to request information when saving (saveconfirm.php) 2025-03-15 18:23:22 +03:00
Isaac Connor ffeec4cdec Add E.Id != and use >= and <= when comparing StartDateTime so that we don't skip events with the same startDateTime. Fixes #4186 2024-12-09 17:27:56 -05:00
Isaac Connor 359330b384 When loading prev/next event, sort by StartDateTime, not Id. Id's are not guaranteed to be time-wise sequential. Maybe Fixes #4186 2024-11-27 13:55:50 -05:00
Isaac Connor d42040d7c3 Add grouping by Monitor. Apparently mysql is complaining about not having it now. 2024-11-27 13:54:24 -05:00
Isaac Connor 9c097919f6 Rough in missing v4l2settings.php 2024-11-22 16:28:32 -05:00
Isaac Connor 7933bd4852 Add some logging of invalid mid 2024-11-22 16:28:08 -05:00
Isaac Connor 6c214c462c Don't show deleted monitors 2024-11-06 13:21:02 -05:00
Isaac Connor b78ce0fea5 Give an id to the newGroup[MonitorIds] select can look it up more efficiently when applying chosen rules 2024-11-06 12:20:09 -05:00
Isaac Connor 9e7d31841e Fix SQL Vulnerability. Fixes GHSA-qm8h-3xvf-m7j3 2024-10-31 13:51:50 -04:00
Isaac Connor 02871576a5 Add fps to event status. Convert CmdTimer to Interval 2024-10-22 18:22:19 -04:00
Isaac Connor 4f03ce362d Add analysing to stream data 2024-10-01 17:01:17 -04:00
Isaac Connor 0780032149 Add score to monitorstream status 2024-10-01 16:28:56 -04:00
IPC df5f76f43a Improve logging, include event_id in TriggerOff 2024-10-01 13:40:37 -05:00
Isaac Connor 8592187288 Rough in an ajax interface for triggering 2024-10-01 12:19:03 -04:00
Isaac Connor 97b7ae9c5f Use htmlspecialchars on Message to prevent Stored Cross-Site Scripting. Fixes GHSA-rqxv-447h-g7jx 2024-09-30 06:23:22 -04:00
Isaac Connor b5f393d960 prevent fatal php crash when maxfps is '' but forcing it to 0 2024-09-18 09:10:43 -04:00
Isaac Connor 0f722c11fc Notes can be null and should not be passed to htmlspecialchars 2024-09-06 15:00:46 -04:00
Isaac Connor 51ad77c6b9 Always add auth_relay info to status requests 2024-06-06 18:10:23 -04:00
Isaac Connor ad6a8c376b Add new auth_hash to any status request. Fixed auth timeout when using rtsp2web or janus 2024-06-06 17:51:05 -04:00
Isaac Connor 582f594b0f Merge branch 'IgorA100-patch-6' 2024-05-15 11:46:26 -04:00
Isaac Connor a64115fe21 Add popup with confirm and chunked unarchiving. 2024-05-10 13:03:08 -04:00
IgorA100 3648bfd56f
Merge branch 'ZoneMinder:master' into patch-6 2024-05-08 01:15:45 +03:00
Simpler1 b166fdb840 fix(): Comment debug statement 2024-04-10 15:21:59 -04:00
Simpler1 ebf1e8b1cc Fix(filter): Set tags operator to = instead of LIKE 2024-04-10 15:14:36 -04:00
IgorA100 c046c2ddc5
Merge branch 'ZoneMinder:master' into patch-6 2024-04-09 14:40:38 +03:00
IgorA100 1b9dc86869
% in frame statistics should be rounded to a decimal place.
When setting up analysis of small objects, it is useful to know the % value more precisely
2024-04-07 22:59:01 +03:00
IgorA100 c77078d098
Merge branch 'ZoneMinder:master' into patch-6 2024-03-28 23:31:53 +03:00
Isaac Connor 162b1a7c1d Log an error when we don't have permission to load the preset edit modal 2024-03-23 13:38:26 -04:00
IgorA100 95ee9f816d
Merge branch 'ZoneMinder:master' into patch-6 2024-03-15 23:20:35 +03:00
Isaac Connor 5120baa9ee Implement object permissions vs entity permissions so that we can handle the new group based permissions on Monitors. This fixes status updates when MOnitors=None but there is a per-monitor group based view permission. 2024-03-05 14:00:23 -05:00
IgorA100 852dd772ab
Merge branch 'ZoneMinder:master' into patch-6 2024-03-03 00:38:02 +03:00
Simpler1 3d008263e4
fix(tags): Tags were not populated on watch view 2024-03-02 11:30:35 -05:00
IgorA100 cd8ffa08dc
Add getCpuUsageHTML() 2024-02-27 16:49:29 +03:00
Isaac Connor 7e98cf36d6 Remove requirement for id or eids. We can specify by filter now. Fix populating exportIds making sure it is an array. 2024-02-15 16:21:39 -05:00
Isaac Connor f339ba5508 When listing option name, remove the ZM_ to be consistent with the options view 2024-02-15 12:54:39 -05:00
Isaac Connor 4107058000 FIx units on warning about timeout 2024-02-05 18:42:05 -05:00
Isaac Connor 648bd77b21 Apply validCardinal to all eids. Remove dead delete code 2024-01-27 18:33:19 -05:00
Isaac Connor a5916f01d1 Protect against XSS in server db values 2024-01-25 19:34:46 -05:00
Isaac Connor b5757a2d05 Use validCardinal on Id's cuz we don't trust the db or Object 2024-01-25 18:38:44 -05:00
Isaac Connor 5a498878b8 Protect mid with validCardinal. Return early if it is invalid or monitor is not found 2024-01-24 19:28:59 -05:00
Isaac Connor 914f7e0ae2 APply validCardinal to sid so that arrays don't get passed to new Server() which then prevents XSS 2024-01-24 19:25:15 -05:00
Isaac Connor 9669f1e3ef Sanitize entity before outputting it preventing XSS 2024-01-24 19:22:47 -05:00
Isaac Connor 1255ae4bc7 Change Tags to be concated and add GROUP BY to fix SQL. Populate event object with db row instead of reloading by Id. Remove datetime formatting as it is screwing up and formatting should happen in js 2024-01-24 13:00:31 -05:00
Isaac Connor ef926f4437 Return an array of string error messages instead of an array of arrays of arrays in deleting events. 2024-01-18 13:15:25 -05:00
Isaac Connor 839ef9ce67 Add a Component filter to logs 2024-01-16 16:35:52 -05:00
Isaac Connor e9362f1a10 Fix duplicated Capturing in monitor status elements. Add Recording. Fix MinEventId, MaxEventId, TotalEvents. Ad CaptureFPS, AnalysisFPS and CaptureBandwidth 2024-01-02 16:28:49 -05:00
Isaac Connor ea3d91b46f Actually fix problem by not putting () on an integer has-post_sql_conditions 2023-12-14 09:32:32 -05:00
Isaac Connor d910585ed9 Be a little more specific about what we are int'ing. https://forums.zoneminder.com/viewtopic.php?t=32942 has a weird error report that this might address 2023-12-13 19:39:11 -05:00