Isaac Connor
bdf59f056d
clear packaet images even when there is an event, because we send it to the event, which will use the images and so we don't need them anymore. ALso free analysis images even when not passthrough.
2024-05-19 09:44:37 -04:00
Isaac Connor
b24955fb09
Use either version or version.txt. Fixes #3798
2024-05-19 08:59:18 -04:00
Isaac Connor
b4e29f45b5
When editing buffer settings, ensure that MaxImageBuffers > PreEventCount.
2024-05-14 10:05:42 -04:00
Isaac Connor
a9a0a916a3
Set fps and bandwidth to 0 on start and stop of zmc.
2024-05-09 09:47:21 -04:00
Isaac Connor
6c87027145
Handle ffmpeg 7 deprecations
2024-05-08 16:30:53 -04:00
Isaac Connor
cbd8b1f40f
Make view does not exist an error instead of fatal
2024-05-08 16:24:45 -04:00
Isaac Connor
7fdb318e49
Don't assume findByEventidAndType actually returns a frame. If we are only recoridng, then there will be no alarm frames in the db
2024-01-16 09:51:58 -05:00
Isaac Connor
c2b6e884c0
When ZM_AUTH_HASH_IPS is off, don't use remote ip in storing auth hash in session. If ips are constantly changing it breaks.
2024-01-15 19:25:23 -05:00
Isaac Connor
ab898fa4a8
WHen AUTH turned off, return an empty array in login as the result.
2024-01-15 18:30:46 -05:00
Isaac Connor
e1d2e0981c
Don't try to do auth if auth is turned off
2024-01-15 18:30:46 -05:00
Isaac Connor
72162b6ea0
Always return an array in getCredentialsDeprecated
2024-01-15 18:30:46 -05:00
Joe
78c28a50ac
Fix usage of unset variable
...
If daemon or args are unset the preg_replace is never called which can
result in count not having a value when referenced in the if statement.
This generates a warning in error.log.
2024-01-15 18:30:46 -05:00
Isaac Connor
c1a8c75575
Info to Debug for login.
2024-01-15 18:30:46 -05:00
Isaac Connor
71ff19a1ba
Revert change to cookie and cookie expire to fix loss of bootstrap table preferences. Add samesite
2024-01-15 18:30:46 -05:00
Isaac Connor
cc0d04b57c
Only show groups that we can view
2024-01-15 18:30:46 -05:00
Isaac Connor
e76d90e9e8
If group is empty, return false for canview so that it doesn't appear in dropdowns etc.
2024-01-15 18:30:45 -05:00
Isaac Connor
1c3b9fd4c1
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
2024-01-02 14:09:20 -05:00
Isaac Connor
6a68b8baea
Add quotes around dbUser to prevent command injection
2024-01-02 14:08:55 -05:00
Isaac Connor
cd303111e5
Add quotes around dbUser and dbPass to prevent command injection
2024-01-02 14:08:08 -05:00
Isaac Connor
29197dbe1c
define count. Fixes #3799
2023-12-29 11:05:37 -05:00
Isaac Connor
f6100f9f79
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
2023-10-31 10:13:52 -04:00
Isaac Connor
0ee1b6476b
Fix Auto Unarchive not deselecting
2023-10-31 10:13:17 -04:00
Isaac Connor
35cbef280c
Use https proxy instead of http since we now access an https url
2023-09-23 12:30:23 -04:00
Isaac Connor
0967a54dda
Ensure that group_id is defined
2023-09-15 09:26:27 -04:00
Isaac Connor
677f6a3155
Only allow Events Columns for sort. Fixes GHSA-2qp3-fwpv-mc96. Fixes GHSA-9cmr-7437-v9fj
2023-09-15 09:25:55 -04:00
Isaac Connor
3f95e04ede
in detaintPath also strip :// because php:// is a way to inject code
2023-09-15 09:25:45 -04:00
Isaac Connor
bb07118118
Restrict mid to a cardinal value. Fixes GHSA-9cmr-7437-v9fj
2023-09-15 09:25:23 -04:00
Isaac Connor
0b952a3db9
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
2023-07-27 11:48:14 -04:00
Isaac Connor
6a5abeca83
Handle RateControl being undef
2023-07-27 11:48:11 -04:00
Isaac Connor
d298877384
add missing formatter for username
2023-07-14 17:30:46 -04:00
Isaac Connor
662b75c8ed
Correct tests for avcodec version for channel layout deprecations.
2023-07-14 17:30:38 -04:00
Isaac Connor
45da63b624
put back to upstream
2023-06-30 17:25:11 -04:00
Isaac Connor
2d06dc98a1
Bump version to 1.36.34 for pre-release
2023-06-29 11:50:48 -04:00
Isaac Connor
f0dc038d43
Add auth_relay to control command
2023-06-29 11:47:11 -04:00
Isaac Connor
966c0c3a54
Transform date string to int to satisfy newer php
2023-06-29 11:44:22 -04:00
Isaac Connor
1be1da5584
Handle failure to db query more gracefully
2023-06-29 11:43:31 -04:00
Isaac Connor
fa47f77c29
Switch from utf8 to utf8mb4 so that collate works
2023-06-29 11:42:19 -04:00
Isaac Connor
5508ba29be
Don't exit on segfault, perhaps allowing graceful shutdown
2023-06-29 11:41:19 -04:00
Isaac Connor
46be99f798
Point to https
2023-06-29 11:40:15 -04:00
Isaac Connor
47afedfad2
Make objdetect modals 65% width to make it easier to see
2023-06-29 11:36:34 -04:00
Isaac Connor
f3fd03209e
Fix missing auth_relay on alarm xhr
2023-06-29 11:35:16 -04:00
Isaac Connor
8d80095690
Add the other submodule tarballs
2023-06-29 11:33:41 -04:00
Isaac Connor
cdffff981d
Be more specific about which permission failed, providing a better log message
2023-06-29 11:33:17 -04:00
Isaac Connor
fb62fcccf8
Don't show bandwidth options if there are none to choose from
2023-06-29 11:31:14 -04:00
clipo1979
e4c16ec0fb
Update fail2ban.rules
...
Update to add working rule for changes from version 1.35+
2023-06-29 11:30:47 -04:00
Isaac Connor
c7917da0e0
Improve logged wrt insufficient permissions
2023-06-29 11:30:22 -04:00
Isaac Connor
bb67bb0bce
Debug alarm.jpg path when not found. Spacing. Remove unused Monitor variable
2023-06-29 10:51:35 -04:00
Isaac Connor
784ce14e50
Allow caching of images
2023-06-29 10:38:17 -04:00
Isaac Connor
ce74d4a09d
Diskspace(null) updates the db record so no need to call save as well
2023-06-29 10:38:02 -04:00
Martin Tiernan
2141403861
If no next bulk. Use Event data to estimate the delta.
2023-06-29 10:37:05 -04:00