Commit Graph

949 Commits

Author SHA1 Message Date
Isaac Connor
c9c4224dd2 Change url used for authentication to magicBox.cgi?action=getDeviceType 2021-04-14 17:19:07 -04:00
Isaac Connor
7489c3850d Store last command for continuous moves so that moveStop can send the correct stop command 2021-04-14 17:19:01 -04:00
Isaac Connor
e6358290b4 this=>self 2021-02-02 17:30:42 -05:00
Isaac Connor
7183a47a3a split Netcat security header into multiple lines for legibility 2021-01-15 18:45:13 -05:00
Isaac Connor
c9ac5dff62 Use parent printMsg 2020-12-21 12:17:02 -05:00
Isaac Connor
b30b4cd66a Fall back to whatever Storage Areas are in the db or ZM_DIR_EVENTS if not specified in getDIskPercent and getDiskBlocks. Fixes #3081 2020-12-03 14:28:48 -05:00
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
Isaac Connor
73ec5f10a5 sendCmd failures should not be fatal 2020-06-26 16:52:34 -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
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
zlodag
0c97bff645 monitor presets and controls for D-Link DCS-5020L 2020-02-19 22:50:09 +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
c337fb921d Don't die if no MetaDataConfigurations 2020-02-17 16:32:37 -05: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
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
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
Isaac Connor
f8e54ba6e3 spacing, quotes 2020-01-10 16:41:22 -05:00
Isaac Connor
1d24e022bb Add realm detection 2020-01-02 16:45:27 -05:00
Isaac Connor
9d57be4c9e google code style, remove redundant code matching parent. Don't re-instantiate UA. 2020-01-02 16:24:43 -05:00
Isaac Connor
66ff602941 change default for file logging to be debug, which results in INF unless debug messages are turned on. Also clear LOG_DEBUG_FILE because it is designed to be a temporary debugging tool, and isn't all that useful at that. 2019-12-31 12:50:03 -05:00
Isaac Connor
8913341140 Bump default for WATCH_MAX_DELAY to 45 seconds. Many cameras take even over 30 seconds to obtain the first image. I find 45 to be a reasonable default 2019-12-31 12:44:41 -05:00
Isaac Connor
c6813fecd5 handle new values for Orientation enum. Spacing, quotes. Handle uppercase HTTP in ControlAddress. 2019-12-10 10:14:32 -05:00
Isaac Connor
22b61cd5b2 wip cleanup of AxisV2 2019-12-02 15:51:40 -05:00
Isaac Connor
e096e0a7fe improve error logging when running as root as can't chown log file 2019-11-30 15:35:09 -05:00
Isaac Connor
ce44fd52d8 must reset do_log_rotate! 2019-11-22 10:04:55 -05:00
Isaac Connor
c6d5198984 Fix the log Hup handler. It is too heavy. Signals can happen at any time and rotating the logs can pull the dbh connection out from under a running dbi operation. So just set a flag and move the re-init to logPrint 2019-11-22 10:02:50 -05:00
Isaac Connor
1c51c695d9 Remove printMsg, it will be inherited 2019-11-21 10:49:04 -05:00
Isaac Connor
e215a6661d Google code style updates, better quotes 2019-11-21 10:45:18 -05:00
Isaac Connor
1c54f22627 Introduce CSP_REPORT_URI to config and use it when setting up CSP headers as to where to report unsafe inline js to. 2019-11-08 15:18:08 -05:00
Isaac Connor
24cc45b3e8 Cleanup, handle warnings when output of command is undef 2019-11-06 17:20:24 -05:00
Isaac Connor
15d30b45c3 spacing and quotes 2019-10-30 09:25:55 -04:00