1168db9df0
Fixed regexp in zmcamtool to accept names for currently existing MonitorPresets
2020-02-19 22:47:40 +13:00
cac7ddd89d
Discover that authority also contains port. Remove redundant stuff.
2020-02-18 16:48:08 -05:00
9a21ebf696
Remove unneeded test for :80
2020-02-18 15:10:44 -05:00
568c42cfa9
Use URI to better handle ControlAddress parsing.
2020-02-18 13:05:45 -05:00
223b618f74
quotes
2020-02-18 11:08:05 -05:00
fc8f94c315
Merge branch 'master' into improve_filter_emails
2020-02-17 16:42:44 -05:00
179da58bc8
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-02-17 16:32:52 -05:00
c337fb921d
Don't die if no MetaDataConfigurations
2020-02-17 16:32:37 -05:00
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
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
eb5ef5203a
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-02-11 17:40:46 -05:00
cc9add9310
fall back to ControlAddress if first ptz get fails
2020-02-11 17:40:33 -05:00
050d02f1fa
Merge pull request #2832 from connortechnology/fix_2831
...
Fix 2831
2020-02-11 17:09:07 -05:00
4758b2304a
Do not alter the start time of an event
2020-02-11 15:02:12 -05:00
ac8c7a9347
default ZM_TIMEZONE value to empty in which case we don't set the value
2020-02-11 13:21:02 -05:00
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
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
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
a9ed5c1158
escape column names for mysql8. Fixes #2814
2020-01-21 16:53:43 -05:00
f6d10e84f2
Fix basic auth. TUrn ControlAddress into a URI if it isn't one
2020-01-12 18:07:20 -05:00
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
80c95d5afe
Merge branch 'master' into wip_axisv2
2020-01-10 17:20:32 -05:00
f8e54ba6e3
spacing, quotes
2020-01-10 16:41:22 -05:00
971d62f60d
encode the telemetry to utf-8 before sending. Fixes #2800
2020-01-07 12:09:34 -05:00
1d24e022bb
Add realm detection
2020-01-02 16:45:27 -05:00
9d57be4c9e
google code style, remove redundant code matching parent. Don't re-instantiate UA.
2020-01-02 16:24:43 -05:00
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
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
c6813fecd5
handle new values for Orientation enum. Spacing, quotes. Handle uppercase HTTP in ControlAddress.
2019-12-10 10:14:32 -05:00
22b61cd5b2
wip cleanup of AxisV2
2019-12-02 15:51:40 -05:00
1add3a4bb4
Add an update to Storage DiskSpace.
2019-12-02 15:04:01 -05:00
e096e0a7fe
improve error logging when running as root as can't chown log file
2019-11-30 15:35:09 -05:00
09fcbad666
Merge branch 'master' into zma_to_thread
2019-11-30 14:59:39 -05:00
ce44fd52d8
must reset do_log_rotate!
2019-11-22 10:04:55 -05:00
6c997a0bd6
quotes
2019-11-22 10:03:09 -05:00
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
f1ec455665
Add some debug to logrot
2019-11-21 10:49:23 -05:00
1c51c695d9
Remove printMsg, it will be inherited
2019-11-21 10:49:04 -05:00
e215a6661d
Google code style updates, better quotes
2019-11-21 10:45:18 -05:00
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
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
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
24cc45b3e8
Cleanup, handle warnings when output of command is undef
2019-11-06 17:20:24 -05:00
276be8fa37
spacing and quotes
2019-10-30 09:26:17 -04:00
15d30b45c3
spacing and quotes
2019-10-30 09:25:55 -04:00
e4256ddd90
Can't use tainting as SOAP::WDSL::Factory::Transport will fail
2019-10-30 09:22:00 -04:00
5c715ec96b
fix use of printMsg in Netcat
2019-10-21 13:18:50 -04:00
a486aafa48
spacing
2019-10-21 13:18:30 -04:00
370f93c56a
toto => to
2019-10-21 10:27:41 -04:00
4261550678
Change default css theme to base
2019-10-21 09:39:34 -04:00
98d0c4b104
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-10-18 14:14:07 -04:00
2619e90e96
add missing sendCmd's, spacing
2019-10-18 14:12:26 -04:00
13b02284fe
Merge branch 'master' into timezone_as_config
2019-10-18 13:58:22 -04:00
fdf48c4123
Merge pull request #2726 from externo6/more-filter-options
...
More filter options
2019-10-16 10:15:58 -04:00
ebebcad10d
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-10-16 10:13:31 -04:00
a3ea0c224e
detaint cmd in runSysCmd. code style fixes. Return unknown for Longitude as well
2019-10-16 10:13:18 -04:00
e232c22b3d
Only add % to value if % is not present.
2019-10-16 10:10:23 +01:00
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
4b71bc75ea
Change language to Contains / Not Contains and update perl filter.
2019-10-16 00:35:49 +01:00
04c22988ad
Add code to delete empty event directories after deleting an event
2019-10-15 15:04:55 -04:00
55b1d29927
better error messages when no command is given to zmcontrol
2019-10-08 18:06:52 -04:00
436c46207f
Remove dash from IPCC7210W.pm
2019-10-04 22:52:51 -04:00
5aa639ff76
use common printMsg
2019-10-03 18:11:54 -04:00
5799815c2e
Better debugging
2019-10-03 18:09:15 -04:00
0515fe51fd
debug
2019-10-03 17:59:34 -04:00
12f75c32de
Fix version
2019-10-03 17:54:41 -04:00
783358c932
Import Sony PTZ driver
2019-10-03 17:31:54 -04:00
88ca9816fe
handle a profile not being a videoEncoder
2019-10-03 17:29:33 -04:00
6f5c297265
google code style
2019-10-03 17:28:57 -04:00
a7f27dddde
quotes and more useful sendCmd debugging.
2019-10-03 17:27:46 -04:00
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
d02aee64e4
Add setting of timezone to Options/Config instead of php.ini
2019-10-02 09:07:18 -04:00
766a59884d
Don't hard code perl path. Use PERL_EXECUTABLE cmake var
2019-09-23 12:54:27 -04:00
dfa51c4e3f
update of zmtrack.pl. include id in logfile.
2019-09-23 12:38:58 -04:00
bc33c0bcb5
make zmcontrol log to zmcontrol_id.log
2019-09-23 12:21:59 -04:00
f0a8595e50
quiet warning caused by server_up being undef for false
2019-09-20 10:36:08 -04:00
52c17f9651
Set event_path to '' to prevent warnings
2019-09-17 10:27:38 -04:00
30687de918
Handle 0 value for StorageId
2019-09-10 17:20:18 -04:00
6b83a62fad
allow for StorageId to be 0
2019-09-04 13:35:46 -04:00
571082ff95
StorageId clears Path
2019-09-03 12:55:31 -04:00
d1ac88d301
Now you can have a subpath under the S3 bucket
2019-08-29 17:55:39 -04:00
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
93d642304e
Add debug line for aws credentials
2019-08-29 09:42:20 -04:00
efb8711c02
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-08-28 11:43:59 -04:00
307fad72be
Default to using V4 Signature
2019-08-28 11:43:46 -04:00
403ece42dd
fix backticks
2019-08-28 09:03:45 -04:00
cdb8e056b6
Turn off debug in Event
2019-08-27 15:20:30 -04:00
da15d1b6d6
add a check when saveJPEGs isn't set to determine whether jpegs exist and update saveJPEGs appropriately
2019-08-27 15:18:28 -04:00
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
b43093234f
Merge branch 'master' of github.com:/ZoneMinder/zoneminder
2019-08-27 13:54:24 -04:00
bf40421203
Turn on debugging in Event
2019-08-27 13:54:19 -04:00
796b99cd5b
When no results from Object->load, clear the id in the object
2019-08-27 13:52:52 -04:00
547ee749e6
Test for Storage existing when generating path
2019-08-27 13:52:25 -04:00
b0b27a24aa
Add errstr reporting on add_key_filename failure
2019-08-27 13:11:38 -04:00
561fcfac7d
Fix
2019-08-27 10:01:01 -04:00
1e91f5501e
MOre debug, fix problems with S3 upload
2019-08-26 20:44:59 -04:00
f01bedb33e
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-08-26 18:49:12 -04:00
5f5d5f691a
Add backticks for mysql 8
2019-08-25 12:30:06 -04:00
3e84597900
Backtick escape table and column names for mysql8
2019-08-25 11:36:23 -04:00
396be10d6f
Merge branch 'master' into zma_to_thread
2019-08-22 12:57:00 -04:00
45aa5bd58c
Code style, spacing, quotes and documentation
2019-08-22 08:28:42 -04:00
74e414eb00
Clean up ugly hack in CopyTo. Do not modify the object resulting in cached crap
2019-08-13 15:33:38 -04:00
3368f94c1a
Add code to handleDelay to cancel identical delayed actions. Fixes #2619 ( #2681 )
2019-08-08 14:38:27 -04:00
2e9d72ed63
spacing and extra ()
2019-08-08 14:11:24 -04:00
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
5cc6b6b0af
Fix EIMOD substitution
2019-08-07 11:15:50 -04:00
aff081ad41
Must commit after COpyTo to release locks
2019-07-24 11:23:13 -04:00
afa02e436d
Upgrade Storage perl object to use parent Object::find
2019-07-24 10:53:56 -04:00
99f78c50af
Add Updating SecondaryStorageId when using CopyTo
2019-07-24 09:37:38 -04:00
98922b6788
Add SecondaryStorageId to Event so that we can update it
2019-07-24 09:37:16 -04:00
bb653b172c
Use hires time to give better bandwidth reporitng
2019-07-23 14:34:26 -04:00
d4eae18055
Merge branch 'master' into filter_add_copy
2019-07-23 13:06:17 -04:00
49621bf652
Only parse Sql if there is a Query in the filter
2019-07-23 12:58:03 -04:00
fd95ab23e9
Add AutoCopy support
2019-07-23 09:55:27 -04:00
f9b5c8a1f4
If query is empty don't bother parsing it
2019-07-23 09:55:14 -04:00
e821553265
Split MoveTo into CopyTo and MoveTo.
2019-07-23 09:54:39 -04:00
52e7cde66d
If Email has EIMOD, not only attach the image if it exists, but replace %EIMOD% with the link to it
2019-07-11 19:04:51 -04:00
44e4d93445
Merge branch 'master' into storageareas
2019-06-24 11:35:36 -04:00
ad1df8f80a
log the response if command fails, and add missing uthentication sections
2019-06-21 11:40:46 -04:00
36995de96f
Alter option help for EVENT_CLOSE_MODE to reflect that alarm will end the continuous event and start a new one
2019-06-20 15:11:49 -04:00
db7362dbcb
Merge branch 'master' into storageareas
2019-06-20 14:18:47 -04:00
3bae7a5432
spaces and parenthesis
2019-06-20 13:28:12 -04:00
b068428bbc
zmcontrol complains about unfinished statement handles. This is because we aren't finishing them in functions in Database.pm
2019-06-20 13:27:42 -04:00
9a33e55efc
Bump log level to warning if we are restarting any daemons. Daemons should NOT need to be restarted in a healthy system.
2019-06-13 11:53:26 -04:00
1928d1153f
spacing and quotes
2019-06-11 13:32:15 -04:00
2e624522c7
fixes #2294 ( #2637 )
2019-06-10 09:43:56 -04:00
983da41c7a
Reduce log level for filter execution from Info to Debug
2019-06-03 09:46:28 -04:00
3be0b774bd
better error logging
2019-05-23 16:26:21 -04:00
4466ef13fd
Merge branch 'pliablepixels-crypt-replacement3' into storageareas
2019-05-23 15:21:58 -04:00
2bf022d69c
Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement3
2019-05-23 14:26:05 -04:00
bdbbab0d3e
Handle no results from get_ProbeMatch()
2019-05-21 17:15:08 -04:00
93aeceecfc
Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement
2019-05-17 10:18:15 -04:00
3888d140a8
Merge branch 'master' into storageareas
2019-05-17 10:16:29 -04:00
915e9f05a9
merged fifo changes
2019-05-16 16:14:06 -04:00
eb005e8b9c
FIFO support for zoneminder zone debugging ( #2594 )
...
Adds fifo options for diagnostic images for much lower impact diagnostics mode. Diagnostic images are only written when there is a client listening for them (otherwise they are skipped). Also added a json stream for the detection data so you can see in real time the pixels or blobs detected for the motion. This allows for easy real time stream of both delta and reference images (as video streams) along with the detection numbers.
2019-05-16 15:37:03 -04:00
0e72080c4a
Migrate from libdigest to crypt-eks-blowfish due to notice
2019-05-16 09:37:11 -04:00
e9f843f297
bulk overlay hash mysql encoded passwords
2019-05-13 14:29:24 -04:00
87e407aa90
forgot to checkin update file
2019-05-13 10:31:09 -04:00
74d9f4f1aa
Spelling and grammar fixes in help ( #2603 )
...
* Edit Help array to make it match others below. This should not affect the results
* Misc. grammer and spelling fixes along with removing some duplicated words. This should not affect compilation.
* More grammer and spelling errors
* Replace Javascript with ZoneMinder because it did not make sense there.
* More spelling and grammar edits
2019-05-13 07:58:18 -04:00
74095963cc
Merge branch 'master' into storageareas
2019-05-12 19:39:09 -04:00
881d531fe9
make old API auth optional, on by default
2019-05-12 18:19:19 -04:00
c1891e35b9
moved API enable back to system
2019-05-12 12:15:08 -04:00
e6b7af4583
initial baby step for api tab
2019-05-10 15:11:35 -04:00
d9f7e93df3
Fix typo gegress to degrees. Fixes #2601
2019-05-10 14:27:51 -04:00
1498027f12
Add option to attach the objdetect image in emails
2019-05-08 22:45:04 -04:00
f0e5a435cf
spacing and quotes, but the main change is using aud_print instead of Info
2019-05-06 10:04:53 -04:00
25614bb75e
Merge branch 'master' into storageareas
2019-05-01 08:57:20 -04:00
16697565bf
Netcat ONVIF: adding ONVIF authentication
2019-04-30 07:48:47 +02:00
dfa997a989
Add camera relative iris control methods
...
This set of methods invoke realtive iris size in the direction indicated by
the <Large/Small> portion of their name. They accept no arguments.
NOTE:
This only just does work. The Dahua API specifies "multiples" as the input.
We pass in a 1 for that as it does not seem to matter what number (0-8) is
provided, the camera iris behaves the same.
2019-04-29 16:05:44 -04:00
76dd411341
Netcat ONVIF: Added support for "profile token" ( #2589 )
2019-04-29 15:56:55 -04:00
077ad75516
Merge branch 'storageareas' into origin/zma_to_thread
2019-04-25 12:41:48 -04:00
9421c0208d
Add instructions for enabling the web user to run shutdown
2019-04-12 14:48:47 -04:00
0dd4a23770
Add Config for showing a system shutdown/restart option
2019-04-12 09:36:30 -04:00
3abf263e7a
fixup half-merged changes to filter to view in montagereview
2019-04-08 16:57:41 -04:00
aa83239069
rework zmcontrol.pl. If command is given and server is not up, use zmdc.pl to start it. Give up after 10 seconds.
2019-04-05 15:18:03 -04:00
e1873b1693
debug response content
2019-04-05 15:17:13 -04:00
aaef151815
ZM_VERSION is a constant not a scalar variable
2019-04-05 13:18:06 -04:00
2bb15c4f90
daemonize zmcontrol ( #2563 )
2019-04-01 17:26:24 -04:00
d579faa291
attr in modern ZM should be StartWeekday. Continue to support legacy filters
2019-03-28 15:13:53 -04:00
9a70dff143
to single quotes, include monitor Id when logging the closing of an event
2019-03-28 09:43:17 -04:00
7b878a4c64
Sync up quotes and space differences frmo zma_to_thread
2019-03-19 17:15:32 -04:00
3f9564c10a
Merge branch 'master' into storageareas
2019-03-19 10:37:35 -04:00
18f1881ffd
spacing
2019-03-18 17:13:19 -04:00
ad5f6a8729
Camera reboot function ( #2554 )
...
* Adding a button for camera reboot function
This series of commits will add a camera reboot function to the
control interface if supported by the camera configuration.
* Adding reboot function option to contorl configuration
This patch adds a reboot option to the camera control configuration
view.
* Adding Reboot field to Controls table
This patch adds a Reboot field to the Controls table to support
a camera reboot control option.
* Correcting button value to match reset
* Updating language files
I'm not sure of the proper procedure to trigger updating of
non-english language files so I'm updating them all with English
hoping that that will draw attention to the changes and others
will translate accordingly.
* Add missing forward slash
2019-03-18 14:49:05 -04:00
63982a6282
Disable PRIVACY enable
2019-03-18 14:42:05 -04:00
520c41da23
Merge ../ZoneMinder.connortechnology.bad into storageareas
2019-03-18 14:40:03 -04:00
e486b035f0
Revert "Implement a date filter to zmaudit so that it only looks in directories by date."
...
This reverts commit d86b1ea49c
2019-03-18 13:50:00 -04:00
d86b1ea49c
Implement a date filter to zmaudit so that it only looks in directories by date.
2019-03-18 13:48:55 -04:00
6ee689f4bf
Dahua control improvements ( #2552 )
...
* Adding a presetHome method
The Dahua protocol does not appear to support a preset Home feature. We could
allow the user to assign a preset slot as the "home" slot. Dahua does appear
to support naming presets which may lend itself to this sort of thing. At
this point, we'll just send the camera back to center and zoom wide. (0°,0°,0)
* Adjusting naming of private methods and adding POD
* Adding relative focus methods
This patch also adds the return value of the get request used to
send the command to the camera.
Furthermore, it fixes a small bug in the authentication of requests
sent to the camera after the connection is opened. I really have no
idea why the problem occurred and it appeared to have no practical
effect on the execution of the command. It showed up when I enabled
debug, so this attempts to fix it or at least quiet it.
* Adding POD for the new relative focus methods
Also doing a bit of cleanup on POD in general.
* Adding some documentation to demystify control motion types
This was not clear to me at the outset, and I could not locate existing
documentation which explained the prioritization and exclusion aspects.
Maybe it will help someone else.
* Renaming private methods and adding more POD
This patch renames private methods by prefixing an underscore to
them. This at least helps visually distinguish them as private
when reading through the code.
It also adds more documentation on public methods.
* Grouping all relative motion methods together
This makes for easier reading.
* Adding in a reset method from Issue #2414
This method was supplied by kobold81 who got it from
bobylapointe69300 who posted it in the following forum post:
https://forums.zoneminder.com/viewtopic.php?f=9&t=27000&p=104601&hilit=dahua#p104601
This patch also includes some POD cleanup.
* Adding continuous movement methods and fixing reset
This patch adds the continuous movement methods provided in the patch
for Issue #2414 . Note that these are not truly continuous as they
result in movement for less than a ms. Adapting the code to support
truly continuous movement would invovle some considerable work.
This patch also correct the reset method and adds a reboot method.
The two are different creatures with different effects.
POD added as well.
* Removing redundant get request code
Two slightly different versions of code are currently used to post
the get request to the camera in order to execute commands. This
patch modifies the open method in order to allow its re-use and
removes redundant code.
Note: This is the first installment on changes towards improving
the way the HTTP transactions are handled.
* Making authenication failures fatal
Authentication failures result in camera commands not being executed.
They may as well be fatal and return the general reason to the user
directly.
* Work on persistent sessions
I think this will have to wait since it appears that the camera expects
some sort of keepalive/heartbeat signal to keep the session open.
* Restoring accidentally deleted code
2019-03-12 11:09:57 -04:00
016fda22ce
reduce duplicated db code from Config. Use fully namespace'd variables so we can use require instead of use
2019-03-01 12:31:41 -05:00
1828ea2d6f
small cleanup of zmstats
2019-03-01 10:26:55 -05:00
af9c87a112
Merge branch 'master' into storageareas
2019-02-27 10:53:19 -05:00
849442502c
add support for server based zmeventnotification
2019-02-27 09:28:15 -05:00
279e0d8bcf
Merge branch 'storageareas' into zma_to_thread
2019-02-22 11:39:58 -05:00
fd310c0f0a
Merge branch 'master' into storageareas
2019-02-22 11:33:47 -05:00
2b90bf15a6
Improve session ( #2487 )
...
* Introduce ZM_COOKIE_LIFETIME which sets the life of the SESSION cookie, instead of using what is in php.ini
* Use zm specific session functions, which are now located in includes/session.php. Be more agressive about clearing session on logout.
* Move session code to includes/session.php
* remove duplicate line
* Move is_session_open to session.php. Move code to clear a session into session.php
* improve debug line when there is a problem updating config entry
* split description into description and help text for COOKIE_LIFETIME
* Remove redirect on line. We do it in javascript on postlogin view so that we can say logging in before switching to console
* If there is a username in the session, then we are logged in, but we need to load the user object from the db. We can't just trust it from the session. The user may have been deleted and having that data in the session can be a security risk. So load the user object on every request.
* Use session_regenerate_id instead of our broken code to do the same
* Move auth code to includes/auth.php
* add autocomplete tags to username and password inputs
* Don't redirect to login if we are already viewing login. Put auth before including skin includes
* need to include session.php in auth.php
* update to php namespace
2019-02-22 09:43:38 -05:00
b8117f7fc9
Add support for control of Amcrest cameras ( #2536 )
...
* Add a control module to support the current Amcrest HTTP API
This patch adds ZoneMinder::Control::Amcrest_HTTP
This module is adapted and improved from one available on the ZoneMinder
forums.[1] It appears that a number of individuals have contributed to
it. This is an attempt to correct some of its interactions with ZM::Control
and friends as well as enhance and extend supported control features
for Amcrest cameras.
This work is based on Amcrest HTTP Protocol API Specifications
Rev. 2.12 2017-03-15
[1]https://forums.zoneminder.com/download/file.php?id=1878
* Fixing zoom methods
* Misc. cleanup of comments, etc.
* Fixing up POD, etc.
* Converting line endings to Unix
* Fixing up preset methods
The current Amcrest HTTP API does not support a Home command per se. So this
method is set up to send the camera to the first preset position. Of course,
this presupposes that the user will setup a preset #1 otherwise the command
will fail on a bad preset error.
If a future version of the API supports a true Home command, we'll adjust
at that point. For now this seems to be a useful workaround.
* Removing duplicate home method
* Adding moveAbs method
I'm putting this in, but absolute camera movement does not seem to be well
supported in the classic skin ATM. Reading
www/skins/classic/include/control_functions.php seems to indicate
a faulty implementation, unless I'm reading it wrong. I see nowhere
where the user is able to specify the absolute location to move to. Rather,
the call is passed back movement in increments of 1 unit. At least with the
Amcrest/Duhua API this would result in the camera moving to the 1* or 0* etc.
position.
moveAbsUp, Down, Left, Right, etc. Doesn't make sense given the definition
of Absolute movement.
* Adding a note about the moveMap method
This method does not appear to be implemented in the classic skin,
but we'll leave it here for future implementation. Caveat: It may
or may not work as-is.
* Fixing up zoomConTele/Wide methods
* Adding a vanilla control type for the Amcrest HTTP API
Please note that this control type matches (mostly) the currently
available control options in Amcrest_HTTP.pm. It does not match
all (or possibly any) of the control options available on a specific
Amcrest camera. The user may need to create their own control type
specific to the camera model they are using.
* Removing misplaced comment
Thanks to connortechnology for pointing this out!
2019-02-22 09:17:28 -05:00
7d6286d517
Merge branch 'storageareas' into zma_to_thread
2019-02-18 16:23:17 -05:00
24845e0457
Merge branch 'master' into storageareas
2019-02-14 15:40:52 -05:00
62bf7d54f1
close sth's on Fatal to prevent error message
2019-02-14 15:40:42 -05:00
a9e2011727
Merge branch 'storageareas' into zma_to_thread
2019-02-13 12:24:38 -05:00
a3374aa26c
Merge branch 'reload_zmfilter_on_filter_save' into storageareas
2019-02-11 13:26:53 -05:00
87413d447d
Set CSRF on as the default for new installs. Fixes #2507 ( #2508 )
...
* Set CSRF on as the default for new installs. Not sure we can impact config on existing installations.
* Fix the spelling mistake that I noticed after editing this.
2019-02-10 13:08:58 -05:00
555cb4780d
Merge branch 'master' into storageareas
2019-02-10 12:37:45 -05:00
e2fc0ea25d
Increase navbar refresh times. 5 seconds is way too fast
2019-02-08 10:22:42 -05:00
d121ecab75
Merge branch 'improve_session' into storageareas
2019-02-05 15:48:42 -05:00
5b288d3b67
split description into description and help text for COOKIE_LIFETIME
2019-02-05 11:39:50 -05:00
a176c9bbd2
improve debug line when there is a problem updating config entry
2019-02-05 11:39:21 -05:00
4e10e6f0ae
Merge branch 'improve_session' into storageareas
2019-01-30 15:26:37 -05:00
1e56e750cf
Introduce ZM_COOKIE_LIFETIME which sets the life of the SESSION cookie, instead of using what is in php.ini
2019-01-30 11:04:38 -05:00
cc8de69eba
Merge branch 'master' into storageareas
2019-01-22 11:44:42 -05:00
e60e3666d5
Fix comment
2019-01-22 10:53:53 -05:00
0619a4a161
Validate cnj, obr, and cbr arguments in parseFilter ( #2434 )
2019-01-22 08:03:25 -05:00
b8d065275b
Merge branch 'master' into storageareas
2019-01-04 15:22:18 -05:00
571daec8fc
Merge branch 'master' of git://github.com/ZoneMinder/zoneminder
...
refresh with master
2019-01-03 15:02:57 -05:00
e21b8dc1f9
changed to ZM db functions
2019-01-02 16:01:33 -05:00
51d3e6b2cd
changed to ZM db functions
2019-01-02 14:09:35 -05:00
bd2b761bcd
change configdata.pm.in defaults
2018-12-31 09:54:48 -06:00
f25e176b88
added create table if not exist
2018-12-29 20:57:46 -05:00
60d5880694
Merge branch 'master' of git://github.com/ZoneMinder/zoneminder
2018-12-29 19:36:20 -05:00
2cac25d353
removed unused preset code
2018-12-29 19:35:16 -05:00
5060358870
Merge branch 'master' into storageareas
2018-12-29 09:56:53 -05:00
3258d8e590
remove ZM_DIR_IMAGES ( #2374 )
2018-12-29 09:52:58 -05:00
bcbe9075f9
fixed preset delete and set
2018-12-28 21:11:52 -05:00
826201a3f9
Merge branch 'master' of git://github.com/ZoneMinder/zoneminder
2018-12-28 20:32:04 -05:00
1a1231fdaa
Merge branch 'master' into storageareas
2018-12-28 10:47:27 -05:00
265a73ab29
Spelling mistake fix
...
Changed his to this
2018-12-27 22:26:07 -05:00
3e06bbcef8
Merge branch 'master' into storageareas
2018-12-27 13:50:29 -05:00
08e5166bcb
remove quotes around state in command documentation.
2018-12-27 12:24:50 -05:00
c017219a1e
use do instead of many lines of dbi. Cleanup logic around command detection
2018-12-27 12:22:06 -05:00
e15227d53e
remove zma restarts
2018-12-26 18:18:22 -05:00
28dafd5931
Merge branch 'storageareas' into zma_to_thread
2018-12-26 12:02:00 -05:00
f815aaa5f5
Merge branch 'master' of git://github.com/ZoneMinder/zoneminder
2018-12-21 19:46:45 -05:00
7a8beffdcc
Merge branch 'master' into storageareas
2018-12-20 15:10:52 -05:00
e626049f6b
Merge branch 'swresample' into storageareas
2018-12-20 14:08:40 -05:00
0c09616059
put back privacy notice update
2018-12-20 13:58:09 -05:00
88e148068e
Logging and whitespace
2018-12-20 13:56:57 -05:00
6af8f0d419
Logging and whitespace
2018-12-20 13:55:18 -05:00
64bdf40e86
Logging and whitespace changes. No logical changes
2018-12-20 13:50:55 -05:00
eccfdb8a6a
Logging and whitespace changes. No logical changes
2018-12-20 13:50:07 -05:00
3a068ae6a3
Merge branch 'master' into swresample
2018-12-16 16:15:28 -05:00
180a4b07b1
foscam r2c ptz
2018-12-14 19:13:41 -05:00
51b4c27b27
foscam r2c ptz
2018-12-14 17:30:45 -05:00
0bfe1007c8
Merge branch 'master' into storageareas
2018-12-14 10:16:08 -05:00
ebaafef607
Ffmpeg logs optional ( #2345 )
...
* make ffmpeg logs configurable via web
* fix Info
2018-12-14 08:01:23 -05:00
b61eb7d4fc
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-12-13 10:53:56 -05:00
0c5eead929
Merge branch 'master' into fix_startup_db_connection
2018-12-13 10:53:34 -05:00
db81465fa2
allow one to set manpage destination
2018-12-07 09:47:00 -06:00
0c7f91c38a
Merge branch 'master' into storageareas
2018-12-03 16:25:28 -05:00
f2f1e230d1
put back missing !
2018-12-03 16:25:03 -05:00
14272a42b4
fix use of getcwd in delete_empty_subdirs. We use absolute paths
2018-12-03 11:08:24 -05:00
7d90a56561
Merge branch 'master' into storageareas
2018-11-30 14:46:42 -05:00
f9139f2d98
Use the word skipped instead of aborted
2018-11-30 10:48:20 -05:00
df0b600431
Merge branch 'master' into storageareas
2018-11-29 10:49:06 -05:00
45a9f9158d
spelling mistakes
2018-11-29 10:45:30 -05:00
1a85e282e2
use find_one instead of new. We seem to be comparing against unfound event objects
2018-11-29 10:09:49 -05:00
4625f7c879
Merge branch 'master' into storageareas
2018-11-28 10:46:49 -05:00
6de704922c
Set scheme to '' if undefined to quiet warnings
2018-11-27 17:01:49 -05:00
e15bbba090
Make debug line more useful by printing out the containing directory
2018-11-26 15:45:05 -05:00
b3703a5eed
Check in db a second time for the event. Long running zmaudits can find an event in the fs that was created after we loaded all the db events.
2018-11-26 15:16:10 -05:00
3f4e918b9e
Merge branch 'zmaudit_check_other_storageareas' into storageareas
2018-11-26 15:09:14 -05:00
d6fb4e1910
Add StorageId function to clear Storage when you set a new StorageId. Clear Path when assigning a new StorageArea
2018-11-26 15:09:04 -05:00
7fb0e1eaf7
Cache All StorageAreas and just to next event if we find the event somewhere other than where it should be.
2018-11-26 15:02:34 -05:00
1c45f98a65
Merge branch 'zmaudit_check_other_storageareas' into storageareas
2018-11-23 15:16:15 -05:00
1b74aa959b
Have to refresh the Path in the Event when updating Storage Area
2018-11-23 15:15:51 -05:00
32337c5dbb
fix prompt when updating StorageArea
2018-11-23 15:13:47 -05:00
d16981365f
Merge branch 'zmaudit_check_other_storageareas' into storageareas
2018-11-23 12:16:21 -05:00
6d19280069
Set Scheme when Shallow. Improve debug message. Fix spacing
2018-11-23 12:16:11 -05:00
dea5db9dd9
Merge branch 'zmaudit_check_other_storageareas' into storageareas
2018-11-23 11:11:39 -05:00
73d27f5095
Add code to see if a db event is stored at the wrong storage area
2018-11-23 10:10:50 -05:00
zlodag
Isaac Connor
Isaac Connor
Isaac Connor
externo6
Simpler1
Isaac Connor
Pliable Pixels
Mitch Capper
Jonathan Meredith
Rémi Da Costa
cnighswonger
redaco
Andrew Bauer
Chris
Isaac Connor
Steve Gilvarry
Matt N
techrockedge
Pliable Pixels