Commit Graph

2217 Commits

Author SHA1 Message Date
Isaac Connor
d4488ac4e1 spacing 2020-06-09 12:18:29 -04:00
Isaac Connor
58ae7bb342 die early if db connection fails 2020-06-07 11:57:20 -04:00
Isaac Connor
d59697b9b5 fix event->self 2020-06-07 11:57:08 -04:00
Isaac Connor
a719565bf3 Merge branch 'master' into add_user_to_filters 2020-06-05 19:03:23 -04:00
Isaac Connor
d0a24ae32b Make all Filters operate on in-progress events 2020-06-05 18:01:20 -04:00
Isaac Connor
caa48e7b80 Finish canEdit function 2020-06-05 17:50:52 -04:00
Isaac Connor
0905655377 Merge branch 'master' into add_user_to_filters 2020-06-05 17:08:14 -04:00
Isaac Connor
f71926c736 Merge branch 'release-1.34' 2020-06-05 10:09:07 -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
6869710747 Handle no db_host specified, meaning local unix socket 2020-06-04 11:28:26 -04:00
Isaac Connor
ade0d750c8 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-06-03 15:37:32 -04:00
Isaac Connor
6f42cb22d6 Use single quotes when escaping password so that $ has no effect. Also escape any single quotes in the password. 2020-06-03 15:36:47 -04:00
Kevin Stolp
0e6ff1ad09 Detaint mysql commands in update script 2020-06-01 22:54:29 -07: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
b99059638a Use plural soap versions 2020-05-18 17:57:40 -04:00
Isaac Connor
5f5cede104 Fix log file containing - or _ 2020-05-13 16:06:26 -04:00
Isaac Connor
437a96915f sketchy fix for soap 1.1 2020-05-13 15:24:58 -04:00
Isaac Connor
fc12b61750 Fix probing 2020-05-13 15:09:31 -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
a6b804bb62 As params are passed in command, they should not be fatal to the control process 2020-05-13 07:58:53 -04:00
Isaac Connor
a1217db117 hardcode log id 2020-05-12 18:20:05 -04:00
Isaac Connor
011ea1098c Rename COnfig* to ONVIF_* 2020-05-12 15:49:54 -04:00
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
cd9d3311ed Add a User object script 2020-05-07 11:07:27 -04:00
Isaac Connor
4bd0cca4b8 Update Filter object, specifying fields and using parent's find methods 2020-05-07 10:59:06 -04:00
Isaac Connor
58fae48736 Add canEdit tests to delete,delete_files,CopyTo,MoveTo 2020-05-07 10:58:31 -04:00
Isaac Connor
ac31abd30c Make onvif handle no resolution graceully 2020-05-05 18:07:12 -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
e770be2e13 Merge branch 'release-1.34' 2020-04-23 10:26:16 -04:00