395d087994
If no protocol defined, fall back to the name of the Control
2022-04-03 17:09:09 -04:00
81b752d16f
improve debug logging when loading Control in Monitor
2022-04-03 17:08:52 -04:00
f5fd8cb111
Implement Control() function to implement the Protocol Specific Control object
2022-04-03 17:08:18 -04:00
6a3fff0aa9
Add backtrace when no primary key
2022-04-03 17:03:15 -04:00
80d622b085
Must set MonitorId in Control
2022-03-31 19:37:11 -04:00
325d1429a7
Fix logged value
2022-03-31 19:36:29 -04:00
d640468dd4
reduce debug logging
2022-03-29 19:00:34 -04:00
223afe271e
rough in Url, UrlToZMS PathToZMS PathToIndex, UrlToIndex UrlToApi PathToApi in SERver object
2022-03-29 18:59:17 -04:00
71689a58a1
Implement reboot and ping methods for Trendnet PTZ Control
2022-03-29 18:57:26 -04:00
b522f8ffce
Use the reported move with x=0 y=0 for autostop in addition to old stop movement code
2022-03-29 18:56:59 -04:00
77566967d3
Make ZoneMinder::Control ingerit from Object. Make loadMonitor use MonitorId
2022-03-29 18:56:14 -04:00
0b2e5b1450
Set new defaults for various settings
2022-03-29 18:54:06 -04:00
388142b4e1
More new defaults. The navbar refreshes every 60 secs so make full page refresh be 240sec. Ajax timeout needs to be 10 seconds. Large event listings can take longer than 3
2022-03-29 18:52:48 -04:00
e395cf75e1
Add mp4 as an option for generated video and make it the default instead of avi
2022-03-29 18:52:27 -04:00
5f019ec550
Remove weird cutnpaste User modules stuff from top of Filter.pm
2022-03-23 14:58:46 -04:00
024f0c15a4
Add NOT IN case. Also, fix bad SQL when value evals to false. Test for empty string instead. Fixes #3425
2022-03-23 14:58:33 -04:00
4a51253aa9
Fix auth not getting realm from auth headers due to them being an array now. Get auth and ip from Path if not set in ControlAddress.
2021-12-14 10:26:17 -05:00
afc21cd14d
If we are starting a process that is waiting to term, mark it to get started by the reaper. Fixes case where zmdc thought the process was still running and so didn't start it. We never noticed because zmwatch would eventually notice. The result is instant restart.
2021-11-29 13:54:11 -05:00
765886ae72
Handle bug where a value of '' will prevent special case handling. Allow '' to mean NULL when specifying Storage Area
2021-11-29 13:52:05 -05:00
84b8e43034
Only start a transaction if we are not already in a transaction
2021-10-28 15:28:55 -04:00
15a7c22b94
layout->layer
2021-10-28 15:26:12 -04:00
d7abdb1505
Set character set as utf8 when connect to mysql to avoid mistakes when there are Chinese characters in storage path.
2021-10-28 15:18:55 -04:00
ee30c0f05e
add a comment about rollbacks
2021-10-28 12:03:58 -04:00
a6795cd026
Just return the error
2021-10-28 11:59:36 -04:00
6e68a35861
Remove dead code, remove locking from CopyTo, put locking into MoveTo.
2021-10-28 11:59:23 -04:00
dd758aacac
Fix Event count subsitutions in emails because they are no longer in Monitor_Status. They are in Event_Summaries. So create a new object for them and use it.
2021-10-27 12:21:30 -04:00
522f8dd5ba
Do no commit on error as it releases locks. Add better storage loading error handling
2021-10-25 09:44:27 -04:00
a258567c16
You cannot commit on error because it releases the locks.
2021-10-25 09:44:27 -04:00
b5bb5e67ff
Change commands used to set and goto presets. Fixes #3371
2021-10-19 13:16:21 -04:00
7905f11be6
remove useless commit.
2021-09-25 14:27:26 -04:00
5475b44852
Fix html emails when using ZM_NEW_MAIL_MODULES. Improve debugging and reduce Info logging
2021-09-10 18:01:04 -04:00
ad1db2c960
Only suspend/resume motion detection if the monitor is doing motion detection
2021-09-08 13:59:34 -04:00
4d09e5f93f
Fixed broken wiki links
2021-09-08 13:59:07 -04:00
09d4f0f9c2
Add missing fields. defaults need to be quoted because they are evalled
2021-09-04 10:44:12 -04:00
29e8d39c74
defaults need to be quoted because they are evalled
2021-09-04 10:44:04 -04:00
b0df3fd2f6
Fix user summary, as there must be a space between -u and dbuser, etc
2021-09-04 10:02:43 -04:00
583c259951
Spacing
2021-09-04 10:02:16 -04:00
8da5a1d2c9
If we fail to suspend/resume, assume we need to disconnect/reconnect to the mmap
2021-09-04 10:00:55 -04:00
9ebff52c44
Add a 5 second timeout when setting suspending/resuming motion detection.Log errors appropriately
2021-09-04 10:00:42 -04:00
e9dab48834
Fix building SQL for ExistsInFileSystem PostCondition. Fix how we turn the rows into Event objects. Fix value handling in ExistsInFileSystem post condition.
2021-09-04 09:59:38 -04:00
f319d02373
Fix PTZ Diagonal cmds. Fixes #3300
2021-09-03 22:39:44 -04:00
c00651e826
Spacing
2021-09-03 11:34:32 -04:00
3e59ad9cb4
Test for existence of file before adding it to zip. Apparently our glob can return the snapshot.jpg string even if it doesn't exist. This is a workaround to Archive::Zip not testing for failure and crashing. Fixes #3313
2021-07-08 11:06:20 -04:00
cb3dd78c61
Fix Archive FTP .zip filename not including monitor name. Fixes #3304
2021-06-23 10:27:23 -04:00
f6c29b51ef
Fix EndTime case handling.
2021-06-14 11:58:06 -04:00
db0f9911ae
merge fixes from #3295 . Fixes #3295 .
2021-06-14 09:55:43 -04:00
be5c6371bb
zmstats.pl: add use warnings. Fix log deletion only ever deleting 100 when it should delete more in a loop. Add deleting more than 100 sessions. Fix loop not terminating on Ctrl-C
2021-06-08 13:01:30 -04:00
bdae5dd9f8
Sort field should be StartDateTime not StartTime
2021-05-12 10:32:03 -04:00
c080dd8a12
Fixes #2992 . If no definition for a monitor is found, don't modify it.
2021-05-11 15:29:10 -04:00
9ee5e983d6
Add ZM_FEATURES_SNAPSHOTS to Config. Fix true=>yes
2021-05-04 13:19:10 -04:00
91a09608ea
Use newlines to make debugging sql easier to read.
2021-05-02 13:37:26 -04:00
202c4ef28c
copy array_diff sub into Object so we don't have the dependency
2021-04-29 19:00:36 -04:00
e32771c255
Add Zones() to Monitor
2021-04-29 14:49:39 -04:00
69098ccdcb
Implement changes() in Object
2021-04-29 14:49:30 -04:00
a8bd1662e3
Add objdetect.gif support in filter email replacements
2021-04-28 19:12:37 -04:00
2302d814f2
Fix version test. split takes a regexp, so '.' matches everything. So change it to /\./.
2021-04-28 13:25:01 -04:00
c50c30c6b5
Add super command line param to use mysql --defaults-file instead of zmuser/zmpass. This will only work for debian based systems.
2021-04-28 10:03:26 -04:00
df754f0085
Can't do suspend in sendCmd
2021-04-24 19:22:17 -04:00
8d4c2afda8
Can't do suspend in sendCmd
2021-04-24 12:00:38 -04:00
4843cb8593
Add ModectDuringPTZ and suspend and resume functions
2021-04-23 14:52:29 -04:00
e256d9a5a8
Use ZoneMinder::Monitor->find_one instead of zmDbGetMonitor so that we get an object with useful methods
2021-04-23 14:52:29 -04:00
36ac473ad2
Add suspend/resume of MotionDetection of ModectDuringPTZ is off.
2021-04-23 14:52:29 -04:00
7c70c26fbd
Cleanup old Continuous stop. Rename lastMove to LastCmd and implement for Zoom
2021-04-21 14:30:02 -04:00
79cede7cac
Merge branch 'release-1.34'
2021-04-20 09:24:49 -04:00
ed58447c4d
Only update event StorageId when the new StorageId has a value
2021-04-19 17:53:08 -04:00
7485735e9c
Change url used for authentication to magicBox.cgi?action=getDeviceType
2021-04-19 17:31:22 -04:00
6225b8babe
Indicate that there should be a space after single char options and their value
2021-04-19 11:56:59 -04:00
200dda11a2
Merge branch 'continuous' into cont_mast
2021-04-16 10:07:10 -04:00
c9c4224dd2
Change url used for authentication to magicBox.cgi?action=getDeviceType
2021-04-14 17:19:07 -04:00
7489c3850d
Store last command for continuous moves so that moveStop can send the correct stop command
2021-04-14 17:19:01 -04:00
4ead6886a3
Make shm debug level 3
2021-04-10 15:40:37 -04:00
da630f7534
Move shm Memory debug statements to level 2.
2021-04-10 15:35:24 -04:00
60970673c7
Implement debug levels in perl side. DEBUG==DEBUG1.
2021-04-10 15:35:04 -04:00
3bdd3c0d12
Move event summaries to their own table to reduce contention on Monitor_Status
2021-04-09 10:16:35 -04:00
30dfadcbf1
Add some parenthesis and use logic and/or install of binary
2021-04-07 14:15:55 -04:00
cc33718a2e
fix did you forget to declare my $deleteLogByRowsSth?)
2021-04-01 12:22:30 -04:00
1fd9361e4e
use zmDbDo to replace many lines of code
2021-04-01 09:27:49 -04:00
757ec2dbc1
Improve zmDbDo to return rows affected instead of boolean
2021-04-01 09:27:20 -04:00
9f5bc8b2b9
Merge pull request #3174 from akeyx/3173-bugfix-fix-onvif-control
...
3173 bugfix fix onvif control
2021-03-30 18:38:00 -04:00
dedf42371b
copy onvif.pm which isn't actually onvif to FoscamCGI.pm We will later replace onvif.pm with an Actual onvif implementation.
2021-03-30 18:32:42 -04:00
d54ba9b324
Change url used for authentication to magicBox.cgi?action=getDeviceType
2021-03-30 16:14:42 -04:00
21cf1f47a5
GroupIds is not a valid Column in Monitors
2021-03-25 17:33:04 -04:00
ec8e0f5997
replace while(1) with while(not zm_terminate) so that these scripts exit cleanly
2021-03-17 13:09:54 -04:00
0eab9987fc
Just updated the script with moveMap and moveRel functions.
2021-02-26 00:11:29 +00:00
36f11158df
Replaced the onvif control module with a modified version of Netcat.
...
The original onvif module was NOT at all ONVIF protocol implementation.
This one pretty much copies the Netcat module but with a bit of clarity
to the XML that is sent to the camera but most importantly allows
specification of full onvif URL including authentication and control URI
through the Control Address field. Parsing of the url is done through a
combination of sane defaults and the URI module.
2021-02-25 22:37:34 +00:00
0b0df96271
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-02-18 16:05:10 -05:00
2dfb07a69b
Must set StateId as well as it cannot be Null. Default to 1
2021-02-18 10:39:39 -05:00
9a37c393cc
Update HikVision.pm
...
ERR [Can't access name:zoomStop AUTOLOAD:ZoneMinder::Control::HikVision::zoomStop member of object of class ZoneMinder::Control::HikVision from main:186]
https://forums.zoneminder.com/viewtopic.php?f=9&t=25442&p=119856#p119856
2021-02-17 19:02:01 -06:00
217d632f1a
Remove epadding, last_frame_score replaced it
2021-02-17 11:54:30 -05:00
e601c08ed0
last_read_index and last_write_index are not int32_ts. Add last_motion_score which should fix our failure to detect alarms in zmalarm etc
2021-02-16 16:56:10 -05:00
33cabd3621
Merge pull request #3156 from dodexahedron/3155-log-copies-and-moves
...
Added logging for copies/moves to zmfilter.pl
2021-02-10 17:35:06 -05:00
a7eab75cf9
Added logging for copies/moves to zmfilter.pl
2021-02-10 15:31:10 -07:00
687ba03eb4
Drop relicts of zma
2021-02-10 13:26:25 +01:00
fab7efa003
Fix PrimeCapture on local cams. We need to be able to call it for each monitor
2021-02-09 20:29:37 -05:00
6c9983155c
Build: Reindent the CMakeLists
...
Indent with 2 spaces
Also remove expressions form closing tags. They have been made optional a while ago since they make reading rather more difficult.
2021-02-04 22:00:56 +01:00
bf8b3fee2a
Merge pull request #3126 from Carbenium/cmake-man-pages
...
Build: Make building man pages optional (enabled by default)
2021-02-04 12:05:22 -05:00
4db0dea1f2
Build: Make building man pages optional (enabled by default)
...
Add a new CMake option (-DBUILD_MAN) which can be used
to deactivate the man page build steps.
This is especially useful in a development situation where "make all"
is needlessly slowed down by these build steps.
2021-02-03 21:22:28 +01:00
e05fdf423b
Merge pull request #3125 from gmanic/patch-1
...
corrected $this to $self
2021-02-03 10:21:33 -05:00
e085acedc8
ALlow micro version mismatches to not be fatal. Minor and Major are still fatal.
2021-02-03 09:50:37 -05:00
8a99665311
better variable names and code documentation
2021-02-03 09:50:13 -05:00
Isaac Connor
Isaac Connor
ColorfullyZhang
criadoperez
root
Arek Kossendowski
Jim Perkins
Brandon Thetford
Peter Keresztes Schmidt