Isaac Connor
|
42debf5392
|
Rough in a Zone class
|
2020-10-01 16:50:50 -04:00 |
|
Isaac Connor
|
3091759162
|
Add missing fields and impleent a control function
|
2020-10-01 16:50:39 -04:00 |
|
Isaac Connor
|
f2e4d1dd5c
|
Handle PostSQL Conditions when generating SQL
|
2020-09-29 15:02:46 -04:00 |
|
Isaac Connor
|
0a4a144bbc
|
Merge branch 'location'
|
2020-09-28 09:33:28 -04:00 |
|
Isaac Connor
|
c14e141295
|
Merge branch 'release-1.34'
|
2020-09-25 11:01:25 -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
|
e9d8279d8a
|
Add geolocation config options
|
2020-09-24 20:20:01 -04:00 |
|
Isaac Connor
|
5b2f397a54
|
Update EVENT_SORT_ORDER options
|
2020-09-14 15:13:04 -04:00 |
|
Isaac Connor
|
0f04f9607a
|
Fixup Exists as opposed to ExistsInFileSsystem
|
2020-08-27 19:56:41 -04:00 |
|
Isaac Connor
|
43b4177a5b
|
fix crash due to incomplete code
|
2020-08-27 08:14:45 -04:00 |
|
Isaac Connor
|
0f27243007
|
Merge branch 'master' into filter_pre_post
|
2020-08-24 09:23:24 -04:00 |
|
Isaac Connor
|
0873b8a0ec
|
Remove long-deprecated config entries
|
2020-08-22 18:49:20 -04:00 |
|
Isaac Connor
|
9f9b771d3f
|
remove dead code
|
2020-08-22 10:58:16 -04:00 |
|
Isaac Connor
|
b589c3abd9
|
glob sorts since perl 5.6.0
|
2020-08-21 10:45:32 -04:00 |
|
Isaac Connor
|
46aaddeac5
|
Sort loading of conf.d config files. Also ignore db Config table entries that have already been defined in conf.d files so that they take precedence.
|
2020-08-20 20:44:28 -04:00 |
|
Isaac Connor
|
b8433373b5
|
Rough in Pre and Post SQL Conditions in execute. Rough in ExistsInFileSystem support. Needs more work.
|
2020-08-15 17:49:11 -04:00 |
|
Isaac Connor
|
49316244a8
|
Merge branch 'master' into filter_pre_post
|
2020-08-13 13:46:35 -04:00 |
|
Isaac Connor
|
ac9432edf4
|
Older cameras don't have that file. It's ok for it to return a 404.
|
2020-08-11 15:17:27 -04:00 |
Andrew Bauer
|
8d9410d510
|
spelling
|
2020-08-03 15:38:02 -05:00 |
|
Andrew Bauer
|
9d88f8ee73
|
implement zm about menu
|
2020-08-03 15:22:46 -05:00 |
|
Andrew Bauer
|
b6c0274b2c
|
implement collapsed navbar
|
2020-07-31 16:03:37 -05:00 |
|
Isaac Connor
|
34b079fa9e
|
Start roughing in pre and post conditions
|
2020-07-30 12:13:09 -04:00 |
|
Isaac Connor
|
89007227b6
|
Add reboot method to SkyIPCam7xx control script
|
2020-07-23 11:54:19 -04:00 |
|
Isaac Connor
|
926c3b8d34
|
Isaac added these explicit zmc~_heartbeat and zma_heartbeat entries.
|
2020-07-13 14:53:03 -04:00 |
|
Joseph Yasi
|
cc93d553d8
|
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-07-10 23:11:59 +02:00 |
Isaac Connor
|
cd707571e7
|
Merge branch 'master' of github.com:zoneminder/ZoneMinder
|
2020-07-08 17:22:32 -04:00 |
|
Isaac Connor
|
a469fdef9a
|
include the non-existent path in the warning
|
2020-07-08 17:21:59 -04:00 |
|
Isaac Connor
|
e5afc1a2db
|
Cleanup code that sets digest credentials. Fixes #2972
|
2020-07-08 17:20:52 -04:00 |
|
Isaac Connor
|
209cbe1000
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-07-07 09:23:46 -04:00 |
|
Andrew Bauer
|
dcab218a2e
|
remove global config item CREATE_ANALYSIS_IMAGES
|
2020-07-06 12:22:41 -05:00 |
|
Isaac Connor
|
2db65d3821
|
Merge branch 'release-1.34'
|
2020-07-04 09:09:24 -04:00 |
|
Isaac Connor
|
db5370024a
|
implement moveMap and moveRel. Please note that many cameras do not implement these functions and may even report that they do implement them and then silently do nothing when you use them. So YMMV
|
2020-07-04 09:02:01 -04:00 |
Brandon Myers
|
ce4e04cd0b
|
Fix typo in AUTH_TYPE help text
|
2020-06-27 00:23:05 -05:00 |
|
Isaac Connor
|
73ec5f10a5
|
sendCmd failures should not be fatal
|
2020-06-26 16:52:34 -04:00 |
|
Isaac Connor
|
a2a28d389e
|
Finish exporting and fixing new systemStatus packageControl and daemonControl functions
|
2020-06-09 13:35:52 -04:00 |
|
Isaac Connor
|
5e0f1a03c5
|
Detect if system is running and prompt to stop it before doing the update.
|
2020-06-09 13:19:19 -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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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 |
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
|
fc8f94c315
|
Merge branch 'master' into improve_filter_emails
|
2020-02-17 16:42:44 -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
|
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
|
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 |
|
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
|
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 |
|
Isaac Connor
|
2619e90e96
|
add missing sendCmd's, spacing
|
2019-10-18 14:12:26 -04:00 |
|
Isaac Connor
|
13b02284fe
|
Merge branch 'master' into timezone_as_config
|
2019-10-18 13:58:22 -04:00 |
|
Isaac Connor
|
fdf48c4123
|
Merge pull request #2726 from externo6/more-filter-options
More filter options
|
2019-10-16 10:15:58 -04:00 |
externo6
|
e232c22b3d
|
Only add % to value if % is not present.
|
2019-10-16 10:10:23 +01:00 |
|
Isaac Connor
|
b63fc0b0e5
|
Delete linkpath before deleting empty directories. add closedir and some more debugging. Also add popping off that last part of the dir at each loop
|
2019-10-15 20:44:15 -04:00 |
|
externo6
|
4b71bc75ea
|
Change language to Contains / Not Contains and update perl filter.
|
2019-10-16 00:35:49 +01:00 |
|
Isaac Connor
|
04c22988ad
|
Add code to delete empty event directories after deleting an event
|
2019-10-15 15:04:55 -04:00 |
Simpler1
|
436c46207f
|
Remove dash from IPCC7210W.pm
|
2019-10-04 22:52:51 -04:00 |
|
Isaac Connor
|
5aa639ff76
|
use common printMsg
|
2019-10-03 18:11:54 -04:00 |
|
Isaac Connor
|
5799815c2e
|
Better debugging
|
2019-10-03 18:09:15 -04:00 |
|
Isaac Connor
|
0515fe51fd
|
debug
|
2019-10-03 17:59:34 -04:00 |
|
Isaac Connor
|
12f75c32de
|
Fix version
|
2019-10-03 17:54:41 -04:00 |
|
Isaac Connor
|
783358c932
|
Import Sony PTZ driver
|
2019-10-03 17:31:54 -04:00 |
|
Isaac Connor
|
88ca9816fe
|
handle a profile not being a videoEncoder
|
2019-10-03 17:29:33 -04:00 |
|
Isaac Connor
|
6f5c297265
|
google code style
|
2019-10-03 17:28:57 -04:00 |
|
Isaac Connor
|
a7f27dddde
|
quotes and more useful sendCmd debugging.
|
2019-10-03 17:27:46 -04:00 |
|
Isaac Connor
|
714ce0ba60
|
Add coller info to AUTOLOAD error message when PTZ function isn't defined. Provide parent printMsg function.
|
2019-10-03 17:27:16 -04:00 |
|
Isaac Connor
|
d02aee64e4
|
Add setting of timezone to Options/Config instead of php.ini
|
2019-10-02 09:07:18 -04:00 |
|
Isaac Connor
|
30687de918
|
Handle 0 value for StorageId
|
2019-09-10 17:20:18 -04:00 |
|
Isaac Connor
|
6b83a62fad
|
allow for StorageId to be 0
|
2019-09-04 13:35:46 -04:00 |
|
Isaac Connor
|
d1ac88d301
|
Now you can have a subpath under the S3 bucket
|
2019-08-29 17:55:39 -04:00 |
|
Isaac Connor
|
ab0a939550
|
Turn off event dir creation on S3. It's not neccessary. Allow s3fs:// at the beginning of the S3 url
|
2019-08-29 11:27:58 -04:00 |
|
Isaac Connor
|
93d642304e
|
Add debug line for aws credentials
|
2019-08-29 09:42:20 -04:00 |
|
Isaac Connor
|
307fad72be
|
Default to using V4 Signature
|
2019-08-28 11:43:46 -04:00 |
Isaac Connor
|
cdb8e056b6
|
Turn off debug in Event
|
2019-08-27 15:20:30 -04:00 |
|
Isaac Connor
|
35d3a7d4fa
|
introduce files, has_capture_jpegs and has_analyse_jpegs functions to use in zmaudit. Improve delete debugging output
|
2019-08-27 15:17:18 -04:00 |
|
Isaac Connor
|
b43093234f
|
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
|
2019-08-27 13:54:24 -04:00 |
|
Isaac Connor
|
bf40421203
|
Turn on debugging in Event
|
2019-08-27 13:54:19 -04:00 |
|
Isaac Connor
|
796b99cd5b
|
When no results from Object->load, clear the id in the object
|
2019-08-27 13:52:52 -04:00 |
|
Isaac Connor
|
547ee749e6
|
Test for Storage existing when generating path
|
2019-08-27 13:52:25 -04:00 |
|
Isaac Connor
|
b0b27a24aa
|
Add errstr reporting on add_key_filename failure
|
2019-08-27 13:11:38 -04:00 |
|
Isaac Connor
|
561fcfac7d
|
Fix
|
2019-08-27 10:01:01 -04:00 |
|
Isaac Connor
|
1e91f5501e
|
MOre debug, fix problems with S3 upload
|
2019-08-26 20:44:59 -04:00 |
|
Isaac Connor
|
f01bedb33e
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2019-08-26 18:49:12 -04:00 |
|
Isaac Connor
|
5f5d5f691a
|
Add backticks for mysql 8
|
2019-08-25 12:30:06 -04:00 |
|
Isaac Connor
|
45aa5bd58c
|
Code style, spacing, quotes and documentation
|
2019-08-22 08:28:42 -04:00 |
|
Isaac Connor
|
74e414eb00
|
Clean up ugly hack in CopyTo. Do not modify the object resulting in cached crap
|
2019-08-13 15:33:38 -04:00 |
|
Isaac Connor
|
bf6170bf61
|
Test for values in aws url and give better errors if Url empty. Don't append events dir to S3 bucket path
|
2019-08-07 15:47:12 -04:00 |
|
Isaac Connor
|
afa02e436d
|
Upgrade Storage perl object to use parent Object::find
|
2019-07-24 10:53:56 -04:00 |
|
Isaac Connor
|
98922b6788
|
Add SecondaryStorageId to Event so that we can update it
|
2019-07-24 09:37:16 -04:00 |
|
Isaac Connor
|
bb653b172c
|
Use hires time to give better bandwidth reporitng
|
2019-07-23 14:34:26 -04:00 |