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 |
|
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 |
|
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
|
edf5066d84
|
Use Filter fields instead of config entries for Email content, subject, To. Also change the meaning of EPI1 and EPIM. Before they replaced with the url to the frame view. Now they are the url to the image view so that we can use them to embed images directly in the email. The old behaviour has been moved to EPF1 and EPFM. A similar change was made to EIMOD.
|
2020-01-22 13:58:44 -05:00 |
|
Isaac Connor
|
8f2aeca0d7
|
Hide EMAIL_TO, EMAIL_BODY, EMAIL_SUBJECT config entries as they are in the Filter object now
|
2020-01-22 13:55:49 -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 |
|
Isaac Connor
|
f8e54ba6e3
|
spacing, quotes
|
2020-01-10 16:41:22 -05:00 |
|
Isaac Connor
|
971d62f60d
|
encode the telemetry to utf-8 before sending. Fixes #2800
|
2020-01-07 12:09:34 -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
|
1add3a4bb4
|
Add an update to Storage DiskSpace.
|
2019-12-02 15:04:01 -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
|
6c997a0bd6
|
quotes
|
2019-11-22 10:03:09 -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
|
f1ec455665
|
Add some debug to logrot
|
2019-11-21 10:49:23 -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
|
19d4a2287f
|
When restarting, if the process was already dead, we won't restart it. So add a start call. Fixes #2757
|
2019-11-20 14:22:12 -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
|
8d75cba444
|
quotes, spacing. Fix closing events on monitors other than the specified on the command line monitor
|
2019-11-06 20:58:07 -05:00 |
|
Isaac Connor
|
24cc45b3e8
|
Cleanup, handle warnings when output of command is undef
|
2019-11-06 17:20:24 -05:00 |
|
Isaac Connor
|
276be8fa37
|
spacing and quotes
|
2019-10-30 09:26:17 -04:00 |
|
Isaac Connor
|
15d30b45c3
|
spacing and quotes
|
2019-10-30 09:25:55 -04:00 |
|
Isaac Connor
|
e4256ddd90
|
Can't use tainting as SOAP::WDSL::Factory::Transport will fail
|
2019-10-30 09:22:00 -04:00 |
|
Isaac Connor
|
5c715ec96b
|
fix use of printMsg in Netcat
|
2019-10-21 13:18:50 -04:00 |
|
Isaac Connor
|
a486aafa48
|
spacing
|
2019-10-21 13:18:30 -04:00 |
Isaac Connor
|
370f93c56a
|
toto => to
|
2019-10-21 10:27:41 -04:00 |
|
Isaac Connor
|
4261550678
|
Change default css theme to base
|
2019-10-21 09:39:34 -04:00 |
|
Isaac Connor
|
98d0c4b104
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-10-18 14:14:07 -04:00 |