ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
22,046 Commits
32 Branches
93 Tags
164 MiB
Commit Graph

9366 Commits (a7743dd0eda9ed4b24163185a44e909f4e9aef9a)

Author SHA1 Message Date
iconnor@connortechnology.com a7743dd0ed Add DiskTotalSpace and DiskUsedSpace to returned Storage objects 2023-02-25 13:02:19 -05:00
Isaac Connor a7af29c0c4 Add IN operator 2023-02-25 13:00:38 -05:00
Isaac Connor 0995a44561 Only show Location tab if geolocation is turned on 2023-02-25 12:46:48 -05:00
Isaac Connor a2879fb66c Add Map view to header 2023-02-25 12:46:34 -05:00
Isaac Connor b0413f330e Merge branch 'map' 2023-02-25 12:44:28 -05:00
iconnor@connortechnology.com 4979d299a6 Cleanup code style 2023-02-25 12:40:54 -05:00
iconnor@connortechnology.com cbabf9d5ce Add getFromApi 2023-02-25 12:40:41 -05:00
Isaac Connor 82a28b78d8 Use function style of member access to prevent errors on unsaved monitor 2023-02-23 13:22:50 -05:00
Isaac Connor 6867b0c841 Correct the syntax of the CSP 2023-02-23 09:47:49 -05:00
Isaac Connor 32afb13b39 Sanitise attr input in FilterTerm to prefent SQL Injection. Fixes GHSA-222j-wh8m-xjrx 2023-02-23 09:25:03 -05:00
Isaac Connor 7b36027066 add in files actions, with delete 2023-02-22 05:59:16 -05:00
Isaac Connor 4a19b4ec05 Scale the thumbnail, not the full view 2023-02-21 14:26:37 -05:00
Isaac Connor d6dc1d3e30 Add object-src CSP directive 2023-02-20 18:15:16 -05:00
Isaac Connor 44c7582003 Don't shorten analysis 2023-02-20 17:30:48 -05:00
Isaac Connor d073ba37ba Default to Monitor->DefaultScale instead of 100% scale. 2023-02-20 15:42:30 -05:00
Isaac Connor bfbe0d581b uncomment out the mintime and maxtime validations. They were commented out for some quick testing. 2023-02-20 12:27:16 -05:00
Isaac Connor 119e4e6756 use detaintPath on modal to prevent including other files instead of real modals 2023-02-20 11:58:10 -05:00
Isaac Connor 4067151fd8 Check for valid date in minTime and maxTime to prevent SQL attack 2023-02-20 11:54:50 -05:00
Isaac Connor 8d36edb602 Be more specific about which form we are styling so as not to affect modals 2023-02-20 11:54:29 -05:00
Isaac Connor 4f66ab3503 Introduce check_datetime function to validate dates 2023-02-20 11:53:53 -05:00
Isaac Connor 00234fbb20 Attempt to sanitize daemon and arguments before executing commands to prevent executing other programs. 2023-02-20 11:53:32 -05:00
Isaac Connor 82a9d6d444 Use validCardinal on Id to prevent executing other commands 2023-02-20 11:41:41 -05:00
Isaac Connor d6575cdec3 Adjust size of text inputs MonitorName and Source Path Filters to match chosen inputs 2023-02-20 10:36:13 -05:00
Isaac Connor f4a2925177 Test for valid monitor id in snapshot creation. 2023-02-20 10:30:34 -05:00
Isaac Connor bf810ec8c4 test for existence of username in session to prevent error outputs 2023-02-20 10:20:59 -05:00
Isaac Connor 80797e97d7 Move actions process to after the unauth check. In the past the action did the logging in but that is no longer the case. We can now assume in actions that the user is at least logged in. 2023-02-20 10:16:44 -05:00
Isaac Connor 3268f95282 Fix detaintPath not stripping sequences like ..././ 2023-02-20 09:18:51 -05:00
Isaac Connor 2ec375d51c Default to auto instead of 100% scale. 2023-02-19 17:29:32 -05:00
Isaac Connor 74a0790c56 Use const instead of var, code comment fix 2023-02-19 17:29:32 -05:00
Isaac Connor 3803a872fc Replace some vars with const or let 2023-02-19 17:29:32 -05:00
Isaac Connor 5090000cdd Remove ZM\s that shouldn't be there 2023-02-19 17:29:32 -05:00
Isaac Connor 74b8bf3a2a decodeURI when taking password from uri. Always update username/password. 2023-02-18 18:02:15 -05:00
dependabot[bot] 2412fefdf5
Bump firebase/php-jwt from 5.0.0 to 6.0.0 in /web 
Bumps [firebase/php-jwt](https://github.com/firebase/php-jwt) from 5.0.0 to 6.0.0.
- [Release notes](https://github.com/firebase/php-jwt/releases)
- [Changelog](https://github.com/firebase/php-jwt/blob/main/CHANGELOG.md)
- [Commits](https://github.com/firebase/php-jwt/compare/v5.0.0...v6.0.0)

---
updated-dependencies:
- dependency-name: firebase/php-jwt
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-17 14:54:52 +00:00
Isaac Connor a2e9cc23cb Set a short expiry 1min and set the cookie name to include the filter so that each and every filter gets it;s own pagination saved. Fixes #3510 2023-02-16 14:10:41 -05:00
Isaac Connor ee89169a7b Use reload instead of restart on zone save 2023-02-16 14:10:30 -05:00
Isaac Connor 855ab6f141 Add reload to monitor zmcControl 2023-02-16 14:10:21 -05:00
Isaac Connor f044d04271 Stop streams when clicking cancel/Save so that we don't log errors trying to access a dead zms. Fixes #3643 2023-02-16 14:10:12 -05:00
Isaac Connor 1a8a84da96 Remove debug when relay not hashed 2023-02-15 15:02:22 -05:00
Isaac Connor 8ec5946791 Add backtrace to value not in values warning 2023-02-15 15:02:11 -05:00
Isaac Connor c009ef1bbe Fix AlarmFrames validity test 2023-02-15 15:00:23 -05:00
Isaac Connor 71265a8271 Define serversr, stats for simple widget 2023-02-15 15:00:13 -05:00
Isaac Connor 113171e5ee username in session can also be unset 2023-02-15 13:46:34 -05:00
Isaac Connor ff528e578f Show 0 instead of null in storage disk used column 2023-02-15 11:00:59 -05:00
Isaac Connor 1e77b58409 Don't set NextTimeStamp when we have a change of event. 2023-02-15 11:00:33 -05:00
Isaac Connor 30a75d81d2 Turn off debug, fix frame->frames typo 2023-02-15 10:24:45 -05:00
Isaac Connor 1a215dab3e Handle no frames in data gracefully 2023-02-15 10:20:59 -05:00
Isaac Connor e31fa4a4c3 Clear action when loading events. 2023-02-14 17:56:55 -05:00
Isaac Connor 40e7f8a517 Handle SESSION[password] not being set which happens when you switch AUTH_RELAY to plain. 2023-02-14 17:10:58 -05:00
Isaac Connor 29b688a2a5 Fix storageareas not being defined. 2023-02-14 17:05:20 -05:00
Isaac Connor 1fa0253fa5 When switching from hashed to plain relay, the session won't have password. So prevent errors. 2023-02-14 17:04:32 -05:00