ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
23,582 Commits
33 Branches
94 Tags
172 MiB
Commit Graph

2269 Commits (add_startup_delay)

Author SHA1 Message Date
Isaac Connor b647280766 FIx arrap_map to array_map. Don't assume _REQUEST[mids] exists. Fixes #3859 2024-03-10 10:59:56 -04:00
Isaac Connor 55df0fd8f7 Only save permissions if passed in POST. We might not be able to see all monitors, so might not exist in POST. 2024-03-05 16:33:41 -05:00
Isaac Connor b5e1d5e611 Fix invalid canEditMonitor call, simplify login in canView and canEdit to prefer per-monitor permissions 2024-03-05 14:02:01 -05:00
Isaac Connor b4bbff6353 Use per-monitor permissions 2024-03-05 14:00:40 -05:00
Isaac Connor ecab601c21 Use array_values to discard the keys in the array of monitorIds 2024-03-01 16:13:52 -05:00
Isaac Connor 9cd048d97b Only try to set monitor_permissions for non-deleted Monitors 2024-02-29 09:19:19 -05:00
Server 58d8cf0adf Makes the "Events" part of the ONVIF URL configurable 
as required per some ONVIF version 21.06 cameras
by default sets the Events Path equals to "/Events"
to maintain functionality
 2024-02-24 11:05:08 -06:00
Isaac Connor a738f1bc2e Remove unused EventStartMode. Fixes #3839 2024-02-23 08:56:26 -05:00
Isaac Connor ebad97038e Implement CpuLoad in Server object 2024-02-22 12:52:49 -05:00
Isaac Connor 799dcd5f51 Default thisServer to a default server object. 2024-02-22 12:52:39 -05:00
Isaac Connor eeb8856157 Ad EventStartMode and EventCLoseMode to monitor 2024-02-22 10:46:36 -05:00
Isaac Connor edcf09882f Subsitute a 0 when ZM_SERVER_ID is not defined 2024-02-21 16:35:04 -05:00
Isaac Connor f54f10df72 Add server stats fields 2024-02-20 13:14:23 -05:00
Server 0ff48f631e Implements an option to disable soap_wsa code that doesn't work 
with some chinese cameras, more common to Latam zone
 2024-02-12 19:22:01 -06:00
Isaac Connor 51020e92a4
Merge pull request #3822 from IgorA100/patch-1 
Sorting an array of events when merging into a file
 2024-02-09 10:35:05 -05:00
Isaac Connor 8bb368fe13 Fix children MonitorIds not being included due to the use of + instead of array_merge 2024-02-09 10:33:22 -05:00
IgorA100 a204a973f1
Code optimization 2024-02-09 18:09:51 +03:00
IgorA100 d0dc4bcbe1
Sorting an array of events when merging into a file 
When merging events into a file, they must first be sorted by time and start date of the event.
 2024-02-09 17:34:06 +03:00
Isaac Connor 31af9d905c Still generate an auth if no password present. 2024-02-08 13:31:21 -05:00
Isaac Connor 57e9cc2b16 In the case where locale = System... properly set locale for the Date*FOrmatter classes 2024-02-05 19:06:16 -05:00
Isaac Connor 48015e6efd Remove extra / and urlencode password for Amcrest 2024-02-02 11:49:44 -05:00
Isaac Connor b7bc7cef7e Only load non deleted Monitors 2024-01-28 16:52:36 -05:00
Isaac Connor c84e7d4563 Include Monitor.php 2024-01-28 16:52:16 -05:00
Isaac Connor 512b1ec76d Only list viewable monitors and zones 2024-01-28 16:51:49 -05:00
Isaac Connor ac2cfa5ccb Add children groups to MonitorIds 2024-01-28 16:32:31 -05:00
Isaac Connor c138984fc9 XSS prevent on sort_asc and eid. Still need to protect filter 2024-01-25 18:48:39 -05:00
Isaac Connor ceb81e13d6 Quiet warning about MonitorIds not exisitng in newGroup array when no MonitorIds are selected for that group 2024-01-23 16:14:21 -05:00
Isaac Connor 1ffc10ca83 Add recursive adding of monitors from children groups 2024-01-23 16:13:33 -05:00
Isaac Connor e47fd8f661 Recamp zones actions, adding a redirect after finishing deletion and fixing CanEdit=>canEdit 2024-01-21 11:30:01 -05:00
Isaac Connor 0d6e7bc082 Add debugging to editableMonitor and handle when permission is set to Create. 2024-01-21 11:28:34 -05:00
Isaac Connor ebadc7a07b GIve default user the create permission 2024-01-14 08:41:12 -05:00
Isaac Connor a402217456 Correct state values so that Unknown starts at 0 2024-01-11 17:19:29 -05:00
Isaac Connor 36bdc3f8a9 Revert "Remove STATE_UNKNOWN" 
This reverts commit 66e7179242.
 2024-01-11 17:16:58 -05:00
Isaac Connor 66e7179242 Remove STATE_UNKNOWN 2024-01-11 17:13:09 -05:00
Isaac Connor 63def6b82e Add a function to_string that handles nulls, arrays, etc 2024-01-11 10:30:36 -05:00
Isaac Connor c954214b03 If success when saving monitors, do a redirect so that a reload doesn't repeat the request and ask to resubmit data 2024-01-09 17:12:45 -05:00
Isaac Connor c456960254 Add tags_opTypes and use it to limit operators for tags in a filter 2024-01-08 17:24:19 -05:00
Isaac Connor 5887a1e853 State Unknown starts at -1 2024-01-03 16:52:44 -05:00
Isaac Connor 31036ae9dd Users with Create permission should be able to view console 2024-01-03 16:41:56 -05:00
Isaac Connor 2cc47557df Remove bogus adding RTSP2WEB to CSP and CORS 2024-01-02 16:44:05 -05:00
Isaac Connor f064887451 Add ZM_RTSP2WEB_PATH to CSP_Headers 2024-01-02 16:25:28 -05:00
Isaac Connor 85006269f7 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-01-02 14:07:16 -05:00
Isaac Connor 2d49e93405 Introduce a Create permission for Monitors, so that a given user may Edit existing monitors, but not create new ones. 2024-01-02 12:18:09 -05:00
Isaac Connor deb880e99b TRun off SSL verification when restarting remote filters. 2023-12-29 12:27:18 -05:00
Isaac Connor 6e93e3df4c Allow untrsuted ssl certs when sending commands to other servers 2023-12-24 12:17:08 -05:00
Isaac Connor 4e2dd31cdc Use ZM_PATH_API instead of hard coded /zm/api 2023-12-15 09:18:04 -05:00
Isaac Connor f9b82ca037 Always append username to zmu command line so that auth is more efficient 2023-12-12 11:14:29 -05:00
Isaac Connor af3f380692 set defaults on properties of user object to fix neew user creation. 2023-12-09 18:01:04 -05:00
Isaac Connor 88db0e9854 Handle when ZM_RTSP2WEB_PATH hasn't been filled, but RTSP2Web has been turned on for a monitor. 2023-12-07 13:17:08 -05:00
Isaac Connor ffc111f1e7 Need to a () so that ModelId is called as a function and so it doesn't complain about lack of property 2023-12-06 09:37:45 -05:00