Commit Graph

20059 Commits (c4dbbbccc57cd7c7467e89ec1ed63974e6f3b436)

Author SHA1 Message Date
Isaac Connor c4dbbbccc5 Revert change of tot_score and avg_score to unsigned ints. Make them ints so that comparison with other scores is ok 2024-10-16 10:22:25 -04:00
Isaac Connor a89160ff2d Fix zone edit image jumping around when status is alert 2024-10-15 16:36:31 -04:00
Isaac Connor d04153b06b Only show location tab when GEOLOCATION is turned on 2024-10-15 13:53:00 -04:00
Isaac Connor f12d7a2184 Fix labelling for defaultCodec, as it is used for event viewing, not live view. 2024-10-15 13:38:44 -04:00
Isaac Connor 4ea68c59d5 Add End Date Time as an option for sorting in filters 2024-10-15 13:22:50 -04:00
Isaac Connor fcebe4bcdc Fix ISE when auth is turned off. 2024-10-01 10:10:42 -04:00
Isaac Connor 36c6b8872f Use htmlspecialchars on Message to prevent Stored Cross-Site Scripting. Fixes GHSA-rqxv-447h-g7jx 2024-09-30 08:27:46 -04:00
Isaac Connor 7cc4ac2f95 Remove default of NOW from UpdatedOn in Monitor_Status field because old mysql can't handle it. Explicilty set it in zmc.
Fixes #4155
2024-09-27 17:16:01 -04:00
Isaac Connor fdf18696d7 Use event->duration when considering min_section_length because the first keyframe may have been quite a while ago and we can end up closing an empty event. 2024-09-27 17:14:56 -04:00
Isaac Connor c189952fe1 Add event->Duration 2024-09-27 17:14:09 -04:00
Isaac Connor 2e06aa638d Remove reorder_queue_size from output options to prevent logging 2024-09-26 16:03:23 -04:00
Isaac Connor 120e13a769 Add support for DateTime and Server advsearch filters 2024-09-25 09:31:20 -04:00
Isaac Connor 2899a4debc Don't start max score at -1 as that is not a valid value for the db. 2024-09-18 13:07:06 -04:00
Isaac Connor 6a48575504 Default end_time to start_time on event creation so that we don't get a negative duration 2024-09-18 13:02:34 -04:00
Isaac Connor da205f5876 Bump version to 1.36.35 2024-09-16 09:46:00 -04:00
Isaac Connor 525506517d If an invalid port is specified, don't actually start the rtp threads. They don't get used in RTP/RTSP. Fixes #3759 2024-09-13 13:22:56 -04:00
Isaac Connor 180bb77c6a add support for ffmpeg 2.8 2024-09-12 15:49:06 -04:00
Isaac Connor 01526f4bf5 Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2024-09-12 14:06:35 -04:00
Isaac Connor 36ab26db42 Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2024-09-12 13:55:54 -04:00
Isaac Connor 74b7b2d64e Always turn off db logging in zmDbDo. If db logging is set to debug, we will infinitely recurse. 2024-09-12 13:55:15 -04:00
Isaac Connor 009aab447d Include rc in debug 2024-09-12 13:52:46 -04:00
Isaac Connor 10cb137331 Add debugging of db failures 2024-09-12 13:51:56 -04:00
Isaac Connor f85c8935c2 Wait forever until reconnect, the fallthrough case had us retrying the sql on a closed connection which may have led to a crash. 2024-09-12 13:50:44 -04:00
Isaac Connor d5e2b7d310 Include unistd because we use sleep 2024-09-12 13:49:56 -04:00
Isaac Connor 54be2614ed Add a return value to zmDbReconnect which seems to fix the crashing 2024-09-12 13:49:39 -04:00
Isaac Connor 21808b7cf7 Fix nitpick 2024-09-12 13:49:18 -04:00
Isaac Connor d3452297bb Only do mysql_close if we think we are connected 2024-09-12 13:48:49 -04:00
Isaac Connor 36c14dc104 Add getting the connection id from mysql and log it in zmDbDo. This is so that when mysql reports a dropped connection, we can figure out which process it was. 2024-09-12 13:45:37 -04:00
Isaac Connor 72adf6d705 Improve debug logging when failed to connect to db, and provide reason when fail to run query 2024-09-12 13:39:11 -04:00
Isaac Connor 61f983ac3d Make reconnection logging a debug 2024-09-12 13:37:44 -04:00
Isaac Connor 420bb875c8 Replace deprecated mysql_ssl_set with mysql_options() 2024-09-12 13:37:03 -04:00
Isaac Connor 94ccdc3d4d set zmDbConnected to false before calling zmDbConnect 2024-09-12 13:36:41 -04:00
Isaac Connor e23ad0f4c5 Auto reconnect when mysql is lost 2024-09-12 13:33:43 -04:00
Isaac Connor e06fd9c207 Remove deprecated reconnect setting for mysql 2024-09-12 13:24:16 -04:00
Isaac Connor 91ef18f3d4 log stream index 2024-09-11 16:46:21 -04:00
Isaac Connor fd0d54b63d Fix use of deprecated pkt_duration 2024-09-11 11:23:48 -04:00
Isaac Connor 9764820102 Fix ffmpeg 5 channels depcrecation 2024-09-11 11:13:04 -04:00
Isaac Connor 8f2840b35c Put back support for ffmpeg < 5 2024-09-11 11:12:31 -04:00
iconnor 823a3818ce Implement more fixes for ffmpeg5 channel deprecations. 2024-09-10 16:53:45 -04:00
Isaac Connor b7c2b66c1a Handle ffmpeg5 channel deprecations 2024-09-10 16:50:40 -04:00
Isaac Connor 0980326d05 Handle another duration deprecation 2024-09-10 16:44:20 -04:00
Isaac Connor 098722f573 Handle ffmpeg6 deprecating (renaming) pkt_duration 2024-09-10 16:40:54 -04:00
Doug Nazar e4b45b89d5 Add guard to handle resetting AVPacket after use.
Also handle allocation failures.
2024-09-10 16:34:46 -04:00
Isaac Connor 4020be4ea8 Continue cherry-pick 2024-09-10 16:22:50 -04:00
Doug Nazar b4c71c0c7b Switch from av_init_packet() to av_packet_alloc()
Remove all uses of deprecated av_init_packet() and switch any stack
based AVPackets to unique_ptrs allocated with av_packet_alloc().

Ensure that all code paths call av_packet_unref() after use to reset
before next usage.
2024-09-10 16:22:25 -04:00
Isaac Connor 47b81286df Merge pull request #4117 from robertsilen/master
add MariaDB to docs
2024-09-03 10:23:34 -04:00
Isaac Connor 76fce065bc Track Monitor_Status and FPS logging times separately. Update db every 10seconds. 2024-08-29 12:55:18 -04:00
Isaac Connor 150145035a Fix not updating Monitor_Status 2024-08-22 09:57:50 -04:00
Isaac Connor 26b5983f64 Only output 403 status if not nph 2024-08-22 09:56:06 -04:00
Isaac Connor d513695bcf Don't output the boundary if we aren't streaming. Single jpegs don't need it and I think something was complaining about it. 2024-08-22 09:38:43 -04:00