04b58ab51e
Put swap file File::find into an eval because it can die.
2024-07-16 10:19:51 -04:00
c9d5daf649
Redo the event thread. Instead of analysis adding packets to an event specific queue, just pass in the iterator and let the event thread do it's own locking. This allows us to free ram in packet in the event, and not segfault.
2024-06-15 13:54:32 -04:00
278f0d0eb4
Add dependencies for ubuntu noble
2024-06-10 10:15:46 -04:00
aae2a9b48c
Limit scale to 1.1 to prevent requesting images larger than 100%
2024-05-30 12:19:11 -04:00
0812aa4725
Limit scale to 16x mainly to put an upper bound on the amount of ram we might use.
2024-05-30 12:15:05 -04:00
a8fcebd4b0
Move code to shutdown the process properly into exit_zms and use it when auth fails. The stops a segfault.
2024-05-30 12:15:00 -04:00
062cf568a3
Sanitise filter[Id] when parsing filter. Fixes GHSA-6rrw-66rf-6g5f
2024-05-30 10:05:15 -04:00
6cc64dddff
Sanitise displayinterval,speed and scale parameters. Fixes GHSA-pjjm-3qxp-6hj8
2024-05-30 10:05:15 -04:00
90ec23b410
Sanitise filter[Id]
2024-05-30 10:05:15 -04:00
8f774a0030
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
2024-05-25 09:27:35 -04:00
43bcd2ee4b
Use parseInt to make MaxImageBufferCount and PreEventCount comparison work.
2024-05-22 09:14:55 -04:00
d8647ac2bb
Fre update analysis image when encoding as it won't be used anyways. Should reduce ram use while recording
2024-05-22 09:14:55 -04:00
b5d8f301c2
When done with a packet in event, clear raw images to free up ram early
2024-05-22 09:14:55 -04:00
0b641aabc4
Delete monitor status that has not been updated in a minute
2024-05-22 09:14:55 -04:00
6793d50385
Delete Monitor_Status records that havn't been updated in over a minute
2024-05-22 09:14:55 -04:00
66beae55fa
Include UpdatedOn when updating Monitor_Status
2024-05-22 09:14:55 -04:00
be08909af5
Move update for 1.37.25 to 1.36.34
2024-05-22 09:14:55 -04:00
01117348c6
Add UpdatedOn field to Monitor_Status
2024-05-22 09:14:55 -04:00
2fa8ae4db1
Change save button to a regular button that calls validateForm and don't set form.subit to validateForm. ValidateForm will now alert and switch tabs to better inform what the incorrect value is. Built-in validation doesn't work due to tabs and the invalid input not being focusable
2024-05-22 09:14:55 -04:00
efcf5f6cec
Merge pull request #4025 from IgorA100/patch-108
...
When save cookies via PHP >= 7.3.0, add handling of the "path" value in the options (session.php)
2024-05-22 08:59:13 -04:00
101bf62a29
Set default value for rows per page using WEB_EVENTS_PER_PAGE. Fixes #3728
2024-05-21 09:41:07 -04:00
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
b24955fb09
Use either version or version.txt. Fixes #3798
2024-05-19 08:59:18 -04:00
b4e29f45b5
When editing buffer settings, ensure that MaxImageBuffers > PreEventCount.
2024-05-14 10:05:42 -04:00
a9a0a916a3
Set fps and bandwidth to 0 on start and stop of zmc.
2024-05-09 09:47:21 -04:00
6c87027145
Handle ffmpeg 7 deprecations
2024-05-08 16:30:53 -04:00
cbd8b1f40f
Make view does not exist an error instead of fatal
2024-05-08 16:24:45 -04:00
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
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
ab898fa4a8
WHen AUTH turned off, return an empty array in login as the result.
2024-01-15 18:30:46 -05:00
e1d2e0981c
Don't try to do auth if auth is turned off
2024-01-15 18:30:46 -05:00
72162b6ea0
Always return an array in getCredentialsDeprecated
2024-01-15 18:30:46 -05:00
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
c1a8c75575
Info to Debug for login.
2024-01-15 18:30:46 -05:00
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
cc0d04b57c
Only show groups that we can view
2024-01-15 18:30:46 -05:00
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
1c3b9fd4c1
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
2024-01-02 14:09:20 -05:00
6a68b8baea
Add quotes around dbUser to prevent command injection
2024-01-02 14:08:55 -05:00
cd303111e5
Add quotes around dbUser and dbPass to prevent command injection
2024-01-02 14:08:08 -05:00
29197dbe1c
define count. Fixes #3799
2023-12-29 11:05:37 -05:00
f6100f9f79
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
2023-10-31 10:13:52 -04:00
0ee1b6476b
Fix Auto Unarchive not deselecting
2023-10-31 10:13:17 -04:00
35cbef280c
Use https proxy instead of http since we now access an https url
2023-09-23 12:30:23 -04:00
0967a54dda
Ensure that group_id is defined
2023-09-15 09:26:27 -04:00
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
3f95e04ede
in detaintPath also strip :// because php:// is a way to inject code
2023-09-15 09:25:45 -04:00
bb07118118
Restrict mid to a cardinal value. Fixes GHSA-9cmr-7437-v9fj
2023-09-15 09:25:23 -04:00
0b952a3db9
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
2023-07-27 11:48:14 -04:00
6a5abeca83
Handle RateControl being undef
2023-07-27 11:48:11 -04:00
Isaac Connor
Isaac Connor
Joe