a74b785d08
Move the protocol loading into the Monitor Object.
2021-10-26 18:15:43 -04:00
a2ec18be5a
Implement Control() function to implement the Protocol Specific Control object
2021-10-26 18:15:43 -04:00
d62d88a0a3
add utility functions parseNameEqualsValueToHash and hash_diff
2021-10-26 18:15:43 -04:00
c864d0765b
Update, add url parsing to match other control scripts. Add getConfig and setConfig
2021-10-26 18:15:43 -04:00
cebe86feb2
Make ZoneMinder::Control ingerit from Object. Make loadMonitor use MonitorId
2021-10-26 18:15:43 -04:00
5e21d4833a
Remove dead code, remove locking from CopyTo, put locking into MoveTo.
2021-10-25 11:09:29 -04:00
9169da6963
Only start a transaction if we are not already in a transaction
2021-10-25 11:09:06 -04:00
6fd33b4627
Change commands used to set and goto presets. Fixes #3371
2021-10-13 10:42:23 -04:00
a99f9091fc
remove useless commit.
2021-09-25 14:27:10 -04:00
7748307c5a
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
2021-09-23 16:39:35 -04:00
d3cfd3c224
Set new defaults for various settings
2021-09-23 16:39:35 -04:00
f5d8eaa2ad
Set character set as utf8 when connect to mysql to avoid mistakes when there are Chinese characters in storage path.
2021-09-16 18:24:37 +08:00
c2472894be
Fix html emails when using ZM_NEW_MAIL_MODULES. Improve debugging and reduce Info logging
2021-09-10 13:47:40 -04:00
c5b097af0a
Only suspend/resume motion detection if the monitor is doing motion detection
2021-09-08 13:57:46 -04:00
4a717820b1
Fixed broken wiki links
2021-09-08 15:18:52 +02:00
263a846251
Add missing fields. defaults need to be quoted because they are evalled
2021-09-04 10:43:38 -04:00
440bb12a9a
defaults need to be quoted because they are evalled
2021-09-04 10:43:25 -04:00
1a0d488457
Spacing
2021-08-30 13:32:43 -04:00
248ca9a5f9
Fix building SQL for ExistsInFileSystem PostCondition. Fix how we turn the rows into Event objects. Fix value handling in ExistsInFileSystem post condition.
2021-08-12 13:41:17 -04:00
91903d2822
Fix user summary, as there must be a space between -u and dbuser, etc
2021-08-05 13:30:52 -04:00
14047bc820
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:03:56 -04:00
e9845d96f4
Fix Archive FTP .zip filename not including monitor name. Fixes #3304
2021-06-23 10:30:42 -04:00
9438445d74
Fix PTZ Diagonal cmds. Fixes #3300
2021-06-16 15:56:08 -04:00
94634f1ca7
Spacing
2021-06-14 13:31:05 -04:00
d221d6ab3b
If we fail to suspend/resume, assume we need to disconnect/reconnect to the mmap
2021-06-14 13:30:37 -04:00
da208457b8
Fix EndTime case handling.
2021-06-14 11:58:23 -04:00
0cbb132f08
merge fixes from #3295 . Fixes #3295 .
2021-06-14 09:52:10 -04:00
9001327883
Fix incorrect use of == instead eq
2021-06-14 09:45:08 -04:00
3d70e621b2
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 16:54:41 -04:00
7417d32fbc
Add a 5 second timeout when setting suspending/resuming motion detection.Log errors appropriately
2021-05-28 10:29:44 -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
037f197f54
corrected $this to $self
2021-02-03 12:53:33 +01:00
e6358290b4
this=>self
2021-02-02 17:30:42 -05:00
a62d446f14
Add audio_frequency and audio_channels to shared mem
2021-03-01 16:49:27 -05:00
2a4723090b
Start zm_rtsp_server if ZM_MIN_RTSP_PORT is set
2021-03-01 16:47:18 -05:00
b70cd0bc76
Add zm_rtsp_server to list of daemons we can start
2021-03-01 16:47:18 -05:00
430f839954
add video_fifo filename strings to shmem.
2021-03-01 16:46:48 -05:00
671d58f0d0
bump version and put back ZM_MIN_RTSP_PORT setting
2021-01-26 12:35:17 -05:00
cb90c06cde
Merge branch 'master' into zma_to_thread
2021-01-17 17:38:34 -05:00
1e59c5bbde
Merge branch 'release-1.34'
2021-01-15 18:46:07 -05:00
7183a47a3a
split Netcat security header into multiple lines for legibility
2021-01-15 18:45:13 -05:00
f2fea95f4b
Merge branch 'master' into zma_to_thread
2021-01-14 13:02:52 -05:00
02386f0c64
SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED for zmfilter.
2021-01-14 12:56:54 -05:00
cf2d987fc0
Add MIN_RTSP_PORT config item, but commented out for now
2021-01-11 13:46:50 -05:00
284b9f963f
Merge branch 'master' into zma_to_thread
2020-12-29 12:18:26 -05:00
c9ac5dff62
Use parent printMsg
2020-12-21 12:17:02 -05:00
e123322d06
Merge branch 'master' into rtsp_server
2020-12-15 11:00:13 -05:00
99e7ae3505
Merge branch 'master' into rtsp_server
2020-12-15 10:14:19 -05:00
Isaac Connor
ColorfullyZhang
criadoperez
root
Isaac Connor
Arek Kossendowski
Jim Perkins
Brandon Thetford
Peter Keresztes Schmidt
gmanic