Commit Graph

23250 Commits (revert-3817-database-certificate-verification)

Author SHA1 Message Date
Isaac Connor caccc6def0
Revert "Introducing a new ZM_DB_SSL_VERIFY_SERVER_CERT configuration option t…" 2024-02-07 09:58:49 -05:00
Isaac Connor 3f0076bf49
Merge pull request #3817 from jmpalacios/database-certificate-verification
Introducing a new ZM_DB_SSL_VERIFY_SERVER_CERT configuration option t…
2024-02-07 09:46:30 -05:00
Juan Manuel Palacios 51812416bc
Adding the ZM_DB_SSL_VERIFY_SERVER_CERT setting to the Perl database module. 2024-02-06 22:59:31 -05:00
Juan Manuel Palacios 595723d551
Introducing a new ZM_DB_SSL_VERIFY_SERVER_CERT configuration option to allow
deployments to specify whether they wish to verify their database server's
certificate or not, mapped to PHP's PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT
attribute.
2024-02-06 03:23:36 -05:00
Isaac Connor 57e9cc2b16 In the case where locale = System... properly set locale for the Date*FOrmatter classes 2024-02-05 19:06:16 -05:00
Isaac Connor 5a866aee0e Add id's to selects to appease label for= attributes 2024-02-05 18:42:25 -05:00
Isaac Connor 4107058000 FIx units on warning about timeout 2024-02-05 18:42:05 -05:00
Isaac Connor b4e8148c9e Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-02-05 17:40:26 -05:00
Isaac Connor 3bbc01858d Add codec in mp4 prevent recovery. Use oldest file time to set Event StartTime 2024-02-05 17:40:20 -05:00
Isaac Connor e159948d62 Handle state==TAPE when CLOSE_EVENT_MODE=IDLE 2024-02-05 17:39:05 -05:00
Isaac Connor c9c2898912 Fix some spacing 2024-02-05 16:11:22 -05:00
Isaac Connor f9c7380da1
Merge pull request #3812 from EtoTen/master
fixed bug in zmfilter.pl.in on line #632, per https://github.com/Zone
2024-02-04 12:09:57 -05:00
Nickolai Golubev fa9ddac61d fixed bug in zmfilter.pl.in on line #632, per https://github.com/ZoneMinder/zoneminder/issues/3811 2024-02-04 01:43:33 -08:00
Isaac Connor 43c3937b87 Fix image proxy broken due to imagecreatefromstream=>imagecreatefromstring 2024-02-02 11:50:03 -05:00
Isaac Connor 48015e6efd Remove extra / and urlencode password for Amcrest 2024-02-02 11:49:44 -05:00
Isaac Connor 63e57066c8 Always use a reorder_queue because an out of order packet may not have happened by the time we start recording, but may happen after. Reduce size to 1*keyframe interval as a test 2024-02-02 09:30:41 -05:00
Isaac Connor aa67e5f6f3 Add range limits to lat&long and don't do anything if empty 2024-02-01 18:01:26 -05:00
Isaac Connor 314236dea8 Add inputs and code to display and convert to and from decimal degress and dhms for lat&long. Update marker on map when values change. 2024-02-01 17:58:20 -05:00
Isaac Connor 4987ea1b21 Define user before using for viewableMonitorIds 2024-02-01 11:39:09 -05:00
Isaac Connor d47f78b354 Fix for use strict defining monitor_ids 2024-02-01 11:38:38 -05:00
Isaac Connor da2744749d fix vertical alignment and stretching of images on snapshot 2024-02-01 11:38:24 -05:00
Isaac Connor 9bb9f733a4 Reference the tab that the bad Path or Port is on 2024-01-31 18:24:22 -05:00
Isaac Connor 8e035f61ac Use viewableMonitorsIds instead of canView(Monitors) when deciding to show the Console or Montage Links 2024-01-31 16:09:33 -05:00
Isaac Connor 05d605fe55 change Map to zmMap to prevent name collision with luxor. Add a haversine function to get distance between two lat&long. Start to rough in grouping locations into 1 pin. 2024-01-30 19:57:18 -05:00
Isaac Connor 18606e78ad Remove width on p element on monitors view as it is too short for Recording and doesn't seem to be needed 2024-01-30 14:29:41 -05:00
Isaac Connor afb05f40d9 Always wait to determine keyframe interval before we start recording. 2024-01-30 13:46:49 -05:00
Isaac Connor 5176529073 Only reference decoding_image_count in Ready() 2024-01-30 09:31:42 -05:00
Isaac Connor 5285c6e716 cpplint spacing changes. The real change is in Analysis we move the Ready check to only affect motion detection. This hopefully fixes the massive memory leak when Decoding=OnDemand 2024-01-30 09:31:28 -05:00
Isaac Connor c6ff1e9748 Fix cppcheck complaint 2024-01-29 13:44:02 -05:00
Isaac Connor 0553450493 Fix syntax error 2024-01-29 13:42:56 -05:00
Isaac Connor 0295ef1252 Fix cppcheck complaint 2024-01-29 13:42:40 -05:00
Isaac Connor 2d73a083b5 curr_frame_id should never be 0. So set it to 1 instead 2024-01-29 13:30:17 -05:00
Isaac Connor 31091d0fd3 Handle out of bounds access to global_edges if it is empty 2024-01-29 13:12:30 -05:00
Isaac Connor b869a6e5a9 Must always CLose in PrimeCapture because each OpenFfmpeg allocates structures. 2024-01-29 10:10:56 -05:00
Isaac Connor 0e88d764f0 Use object methods to load montiors 2024-01-28 16:53:30 -05:00
Isaac Connor 2c7c928fa6 Use object methods when loading monitors and zones and filter them by Deleted status 2024-01-28 16:53:06 -05:00
Isaac Connor b7bc7cef7e Only load non deleted Monitors 2024-01-28 16:52:36 -05:00
Isaac Connor c84e7d4563 Include Monitor.php 2024-01-28 16:52:16 -05:00
Isaac Connor 512b1ec76d Only list viewable monitors and zones 2024-01-28 16:51:49 -05:00
Isaac Connor ac2cfa5ccb Add children groups to MonitorIds 2024-01-28 16:32:31 -05:00
Isaac Connor c00d3ea061 Add score to debug in monitor link 2024-01-28 16:31:49 -05:00
Isaac Connor 648bd77b21 Apply validCardinal to all eids. Remove dead delete code 2024-01-27 18:33:19 -05:00
Isaac Connor 7493230e03 Better debugging, of unsupported codec types and monitor link results 2024-01-27 18:32:22 -05:00
Isaac Connor 21743f71a1 Reset lastPTS on Close 2024-01-27 10:27:39 -05:00
Isaac Connor 543d3bdd98 Fix lastPTS assignment when not using a second input. Use a 10 sec max pts gap before fail to capture 2024-01-26 19:47:39 -05:00
Isaac Connor 4888019f1b Add detection for significant jump back in time in incoming packets 2024-01-26 18:16:24 -05:00
Isaac Connor cf516f29e3 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-01-26 17:55:31 -05:00
Isaac Connor d850031151
Merge pull request #3808 from dimhotepus/zm_fifo_error_text
Log pipe size mutate / access errors in Logs
2024-01-26 09:33:14 -05:00
Dmitry Tsarevich 4965fd09a6
Log pipe size mutate / access errors
See `set pipe size failed` in Logs, but hard to guess why.

Now should be able to debug pipe size issues.
2024-01-26 05:07:05 +03:00
Isaac Connor a5916f01d1 Protect against XSS in server db values 2024-01-25 19:34:46 -05:00