Commit Graph

2183 Commits

Author SHA1 Message Date
Isaac Connor
045ea77bf3 Pass verbose to client. Add stream type to profiles. Add passing generic commands to the media element so that we can query anything we want easier 2020-05-12 15:49:42 -04:00
Isaac Connor
43b776bc80 Remove duplicated code byusing a foreach. Add streamtype to returned profiles 2020-05-12 15:49:01 -04:00
Isaac Connor
1f3cf266a2 Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream 2020-05-12 11:20:49 -04:00
Isaac Connor
bbcb7f2c60 Better debug output on errors. Use libXML to pretty-print the returned XML 2020-05-12 11:14:56 -04:00
Isaac Connor
e40c3d8487 Print out the returned profiles like profiles() used to do 2020-05-12 10:49:47 -04:00
Isaac Connor
e950f3c843 Return profiles instead of doing nothing with them 2020-05-12 10:49:29 -04:00
Isaac Connor
323c171a27 test logFile before doing regexps on it 2020-05-11 18:35:31 -04:00
Isaac Connor
77b4dd6b35 add POD and fixups to zmonvif-trigger.pl 2020-05-11 18:34:38 -04:00
Isaac Connor
415ffbd771 remove weird comments 2020-05-09 18:30:21 -04:00
Isaac Connor
8c133fc973 use perl executable replacement 2020-05-09 17:36:51 -04:00
Isaac Connor
183fe1febd remove +x and move zmtrigger.pl to /scripts 2020-05-09 17:36:20 -04:00
Isaac Connor
80ed0b219a Add zmonvif-trigger.pl and split into multiple lines 2020-05-09 17:35:27 -04:00
Isaac Connor
7938952a90 Fix botched merge in ONVIF.PM 2020-05-09 12:22:11 -04:00
Isaac Connor
8bebb2b890 fix use of printMsg 2020-05-09 11:49:02 -04:00
Isaac Connor
ac31abd30c Make onvif handle no resolution graceully 2020-05-05 18:07:12 -04:00
Isaac Connor
e770be2e13 Merge branch 'release-1.34' 2020-04-23 10:26:16 -04:00
Isaac Connor
10d89ed82e Spacing, quotes, improve debug messages. 2020-04-23 10:00:11 -04:00
Isaac Connor
571ff260cc Merge branch 'release-1.34' 2020-04-04 16:35:09 -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
Isaac Connor
3117f29f71 code style and correct license. Author was contacted and ok'd the change. Fies #2883 2020-03-30 10:32:26 -04:00
Isaac Connor
98598f1441 Add a warning when an email exceeds 10Mb 2020-03-28 11:59:19 -04:00
Isaac Connor
bfa08c3422 MOstly spaces and quotes, remove duplicated db version update and only prepare the sth once. 2020-03-27 13:06:10 -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
Pliable Pixels
090cd845b0 add ES status to telemetry and --show option to display what is being sent to ZM 2020-03-16 14:49:27 -04:00
Isaac Connor
0323925406 Code style updates. Quote the word Function in SQL for newer mysql 2020-03-04 09:48:55 -05:00
Isaac Connor
7c066822f3 escape table columns for mysql8 2020-03-03 17:29:31 -05:00
Isaac Connor
4dee3532c3 handle additional atributes on the html tag in html detection 2020-02-26 09:42:17 -05:00
Isaac Connor
d51fdafbc0 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-02-21 09:37:45 -05:00
Isaac Connor
869713826a mine code cleanup 2020-02-21 09:29:35 -05:00
Isaac Connor
ade95283d9 Merge pull request #2839 from connortechnology/add_alarmed_zone_to_filters
Add alarmed zone to filters
2020-02-19 14:52:19 -05:00
Isaac Connor
be75be9bc4 Merge pull request #2815 from connortechnology/improve_filter_emails
Improve filter emails
2020-02-19 14:50:48 -05:00
Isaac Connor
300402013c Merge branch 'master' into improve_filter_emails 2020-02-19 14:44:37 -05:00
Isaac Connor
ec4d565f07 set the net interface used in TransportUDP when specified 2020-02-19 14:28:53 -05:00
Isaac Connor
b8d0192bcd Add optional net_interface after soap version to discover command 2020-02-19 14:28:23 -05:00
Isaac Connor
dab5c520fe Merge branch 'master' into add_alarmed_zone_to_filters 2020-02-19 14:20:08 -05:00
Isaac Connor
a599028de4 If Filter attr is AlarmedZoneId we can only support the EXISTS operator 2020-02-19 14:18:28 -05:00
Isaac Connor
258ae23fb9 out an error if name contains invalid characters 2020-02-19 09:42:54 -05: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
fc8f94c315 Merge branch 'master' into improve_filter_emails 2020-02-17 16:42:44 -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