Commit Graph

2173 Commits

Author SHA1 Message Date
Isaac Connor 5bf5d58ac1 Fixes recovering frames from jpegs. Use Time::HiRes stat to get microseconds. 2020-11-16 11:32:50 -05:00
Isaac Connor a0f733615c allow empty string as a default value 2020-10-22 11:26:34 -04:00
Isaac Connor 40c57b4b23 Improve logic in set, improve logging 2020-10-22 10:43:53 -04:00
Isaac Connor 6c546f36ae allow dashes and underscores in log file name 2020-10-22 10:43:35 -04:00
Isaac Connor ba3b19d89a Clean up DiskSpace option. Doesn't need to be there and shouldn't set HashDiskPercent 2020-10-14 16:45:03 -04:00
Isaac Connor de6a51ec15 Fix incorrect operator used for NOT IN and add IN operator to match php 2020-10-06 09:38:15 -04:00
Isaac Connor 3db8490d9c Escape another case of Function for mysql8 2020-09-25 10:59:31 -04:00
Joseph Yasi 52ca2abf69 Quote some more MySQL8 Reserved keywords
See:
https://bugs.launchpad.net/ubuntu/+source/zoneminder/+bug/1859295/comments/1
https://github.com/ZoneMinder/zoneminder/issues/2659
https://bugs.launchpad.net/ubuntu/+source/zoneminder/+bug/1859295
2020-09-25 09:37:21 -04:00
Andrew Bauer 3ba8ad579e fix pod2man out-of-source builds 2020-08-04 21:18:37 -05:00
Isaac Connor ab98deafd7 Add Log cleaning to zm_stats.pl 2020-07-02 16:02:49 -04:00
Isaac Connor c022cae7ef Sleep 10 secs if db connection fails to reduce log spamming and load 2020-06-30 18:59:27 -04:00
Isaac Connor aff7e27dee remove debug in zmtrack.pl.in 2020-06-30 18:58:46 -04:00
Isaac Connor 73ec5f10a5 sendCmd failures should not be fatal 2020-06-26 16:52:34 -04:00
Isaac Connor d1e7d396f7 zmcontrol needs to be able to take floats instead of integers for it's parameters 2020-06-26 16:49:55 -04:00
Isaac Connor e618966e08 spacing, improve error message when can't connect. 2020-06-23 10:23:17 -04:00
Isaac Connor 20e6a1f53d Use single quotes when escaping password so that $ has no effect. Also escape any single quotes in the password. 2020-06-04 11:37:44 -04:00
Isaac Connor f8a11633bb Handle no db_host specified, meaning local unix socket 2020-06-04 11:35:48 -04:00
Isaac Connor a7ef8e3dc8 detaint command before performing backup. Fixes #2945 2020-05-29 14:53:42 -04:00
Isaac Connor 58a015e20a fix use of printMsg 2020-05-29 12:20:39 -04:00
Isaac Connor e24b6214b1 test logFile before doing regexps on it 2020-05-13 08:05:58 -04:00
Isaac Connor f72ad1023c As params are passed in command, they should not be fatal to the control process 2020-05-13 08:02:40 -04:00
Isaac Connor 3ac6dc267b out an error if name contains invalid characters 2020-04-23 11:01:34 -04:00
Isaac Connor 57141fddeb handle additional atributes on the html tag in html detection 2020-04-23 10:46:18 -04:00
Isaac Connor 576e3149d6 escape table columns for mysql8 2020-04-23 10:43:01 -04:00
Isaac Connor 7046612b65 Code style updates. Quote the word Function in SQL for newer mysql 2020-04-23 10:41:59 -04:00
Isaac Connor 67b35967d4 MOstly spaces and quotes, remove duplicated db version update and only prepare the sth once. 2020-04-23 10:39:50 -04:00
Isaac Connor a7b553cdbe code style and correct license. Author was contacted and ok'd the change. Fies #2883 2020-04-23 10:37:42 -04:00
Isaac Connor 10d89ed82e Spacing, quotes, improve debug messages. 2020-04-23 10:00:11 -04:00
Isaac Connor 38555b0dd4 strip leading and trailing " in trigger message. Accept a space instead of a + in enable/disable commands to match on/off 2020-04-04 11:08:19 -04:00
Pliable Pixels cf6b24b432 add ES status to telemetry and --show option to display what is being sent to ZM 2020-03-26 12:11:00 -04:00
zlodag 0c97bff645 monitor presets and controls for D-Link DCS-5020L 2020-02-19 22:50:09 +13:00
zlodag 1168db9df0 Fixed regexp in zmcamtool to accept names for currently existing MonitorPresets 2020-02-19 22:47:40 +13:00
Isaac Connor cac7ddd89d Discover that authority also contains port. Remove redundant stuff. 2020-02-18 16:48:08 -05:00
Isaac Connor 9a21ebf696 Remove unneeded test for :80 2020-02-18 15:10:44 -05:00
Isaac Connor 568c42cfa9 Use URI to better handle ControlAddress parsing. 2020-02-18 13:05:45 -05:00
Isaac Connor 223b618f74 quotes 2020-02-18 11:08:05 -05:00
Isaac Connor 179da58bc8 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-02-17 16:32:52 -05:00
Isaac Connor c337fb921d Don't die if no MetaDataConfigurations 2020-02-17 16:32:37 -05:00
zlodag 2c51b1436c cleaned input for "zmcamtool.pl --export <control_or_preset_name>" to fix error when running in taint mode 2020-02-16 11:41:06 +13:00
Isaac Connor 9c65a8b293 handle Amcrest cameras giving a 401 Unauthorized on the first attempt to send a command. Just send another. 2020-02-12 12:34:43 -05:00
Isaac Connor eb5ef5203a Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-02-11 17:40:46 -05:00
Isaac Connor cc9add9310 fall back to ControlAddress if first ptz get fails 2020-02-11 17:40:33 -05:00
Isaac Connor 050d02f1fa
Merge pull request #2832 from connortechnology/fix_2831
Fix 2831
2020-02-11 17:09:07 -05:00
Isaac Connor 4758b2304a Do not alter the start time of an event 2020-02-11 15:02:12 -05:00
Isaac Connor ac8c7a9347 default ZM_TIMEZONE value to empty in which case we don't set the value 2020-02-11 13:21:02 -05:00
Isaac Connor 3b30d0a8db code restructure, return all valid profiles instead of just the first one. Also add multicase stream types. This incorporates ideas from patch from remi-crypto. Fixes #2825 2020-02-09 13:51:36 -05:00
Isaac Connor a9ed5c1158 escape column names for mysql8. Fixes #2814 2020-01-21 16:53:43 -05:00
Isaac Connor f6d10e84f2 Fix basic auth. TUrn ControlAddress into a URI if it isn't one 2020-01-12 18:07:20 -05:00
Isaac Connor 9b2a5b2261 Add table column definitions so we can use perl code to actually create or update monitors 2020-01-10 19:06:34 -05:00
Isaac Connor 80c95d5afe Merge branch 'master' into wip_axisv2 2020-01-10 17:20:32 -05:00