Commit Graph

20084 Commits (4e14320978550255cd2b33489f631a19f813da36)

Author SHA1 Message Date
Shobu UMEMURA f7a8d5b46d Update charset header in ja_jp.php from Shift_JIS to UTF-8
Given that most Japanese servers now use UTF-8, it makes sense to set UTF-8 as the default charset.
2024-07-04 09:21:10 -04:00
Isaac Connor b9ae17b8fe Don't pass shared_ptr by ref. Defeats the ref counting 2024-07-04 09:20:41 -04:00
Isaac Connor 2a9fa4a4f1 When dts==last_dts, don't log it as an error. It is too common. Just add duration and move on. 2024-06-26 14:14:05 -04:00
Isaac Connor 38e80b9024 Use last duration instead of 1 when adjusting dts when non-monotonic. Some googling indicates this might be a better approach. What I am seeing with a tapo C520WS agrees. 2024-06-26 14:12:59 -04:00
Isaac Connor 2ba179b54e ENsure that dts increases. Not enough to just == last_dts 2024-06-26 14:10:23 -04:00
Isaac Connor 3ef4c36b09 Don't log failure to get packet. Can only happen when stopping the pcketqueue. 2024-06-26 14:06:18 -04:00
Isaac Connor 8520f32990 Fix recording when Decoding=None by setting packet->decoded in capture 2024-06-26 14:01:52 -04:00
Isaac Connor 904a04207e Reset last_capture_image_count in connect so that we don't get negative fps reports and possible floating point exceptions 2024-06-26 14:01:02 -04:00
Isaac Connor b8cea22530 Update depends for noble 2024-06-18 18:58:20 -04:00
Isaac Connor 194b55a21c move image_count to shared mem. Use it in monitorstream to detect when last_write_time % buffer_count hasn't changed, but there is in fact a new image. 2024-06-17 18:40:46 -04:00
Isaac Connor a1cabef2e2 Wait for decoded flag so that we stay behind the decoder 2024-06-17 14:27:37 -04:00
Isaac Connor 6b63d58534 Mark audio packets as decoded 2024-06-17 14:27:18 -04:00
Isaac Connor 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
Isaac Connor 278f0d0eb4 Add dependencies for ubuntu noble 2024-06-10 10:15:46 -04:00
Isaac Connor aae2a9b48c Limit scale to 1.1 to prevent requesting images larger than 100% 2024-05-30 12:19:11 -04:00
Isaac Connor 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
Isaac Connor 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
Isaac Connor 062cf568a3 Sanitise filter[Id] when parsing filter. Fixes GHSA-6rrw-66rf-6g5f 2024-05-30 10:05:15 -04:00
Isaac Connor 6cc64dddff Sanitise displayinterval,speed and scale parameters. Fixes GHSA-pjjm-3qxp-6hj8 2024-05-30 10:05:15 -04:00
Isaac Connor 90ec23b410 Sanitise filter[Id] 2024-05-30 10:05:15 -04:00
Isaac Connor 8f774a0030 Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2024-05-25 09:27:35 -04:00
Isaac Connor 43bcd2ee4b Use parseInt to make MaxImageBufferCount and PreEventCount comparison work. 2024-05-22 09:14:55 -04:00
Isaac Connor 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
Isaac Connor b5d8f301c2 When done with a packet in event, clear raw images to free up ram early 2024-05-22 09:14:55 -04:00
Isaac Connor 0b641aabc4 Delete monitor status that has not been updated in a minute 2024-05-22 09:14:55 -04:00
Isaac Connor 6793d50385 Delete Monitor_Status records that havn't been updated in over a minute 2024-05-22 09:14:55 -04:00
Isaac Connor 66beae55fa Include UpdatedOn when updating Monitor_Status 2024-05-22 09:14:55 -04:00
Isaac Connor be08909af5 Move update for 1.37.25 to 1.36.34 2024-05-22 09:14:55 -04:00
Isaac Connor 01117348c6 Add UpdatedOn field to Monitor_Status 2024-05-22 09:14:55 -04:00
Isaac Connor 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
Isaac Connor 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
Isaac Connor 101bf62a29 Set default value for rows per page using WEB_EVENTS_PER_PAGE. Fixes #3728 2024-05-21 09:41:07 -04:00
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