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
72d2b99ca4
Add last_viewed_time
2021-10-25 16:51:57 -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
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
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
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
9438445d74
Fix PTZ Diagonal cmds. Fixes #3300
2021-06-16 15:56:08 -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
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
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
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
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
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
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
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
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
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
cf2d987fc0
Add MIN_RTSP_PORT config item, but commented out for now
2021-01-11 13:46:50 -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
bdf9a029ad
Must require ZoneMinder::Monitor if we want to use it
2020-12-15 09:35:17 -05:00
9fec11c4a9
Add missing Monitor() function.
2020-12-14 14:41:34 -05:00
47b3f319e7
Add capture_fps and analysis_fps to shared memory. This also requires support for type double
2020-12-09 12:18:43 -05:00
b30b4cd66a
Fall back to whatever Storage Areas are in the db or ZM_DIR_EVENTS if not specified in getDIskPercent and getDiskBlocks. Fixes #3081
2020-12-03 14:28:48 -05:00
5a489b3e99
Fall back to whatever Storage Areas are in the db or ZM_DIR_EVENTS if not specified in getDIskPercent and getDiskBlocks. Fixes #3081
2020-12-03 14:28:03 -05:00
d1c3864778
Use the ZM_FONTDIR substitution instead of hardcoding a path
2020-12-01 09:21:54 -05:00
836cd2d58d
Merge branch 'Font' of https://github.com/hax0kartik/zoneminder into font
2020-11-30 09:45:39 -05:00
b212b0e450
Allow modifying font file location
2020-11-28 20:18:17 +05:30
ff4b0e6309
add option to disable thumb animation
2020-11-25 13:03:16 -06:00
98c2c6cccf
Add Status,CaptureFPS,AnalysisFPS, CaptureBandWidth to MonitorStatus fields
2020-11-21 15:09:43 -05:00
30363c1d4b
Add Monitor Status loading
2020-11-21 15:08:29 -05:00
5bf5d58ac1
Fixes recovering frames from jpegs. Use Time::HiRes stat to get microseconds.
2020-11-16 11:32:50 -05:00
a47b72af49
Fixes recovering frames from jpegs. Use Time::HiRes stat to get microseconds.
2020-11-16 11:31:36 -05:00
f1b8266e26
Only join storage and Monitors if necessary
2020-11-13 17:03:51 -05:00
159b383276
Move event stat totals to Monitor_Status. Implement a class for them called Monitor_Status
2020-11-06 13:27:47 -05:00
adbd3486bf
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:49:39 -05:00
5fadd366e7
Always setup Logging SIG handlers. Implement SIGUSR1 and SIGUSR2 handling to match c++ side behaviour. Fixes #3057
2020-10-30 11:50:03 -04:00
65df84ef7e
Make ZoneMinder::Event::delete aware of transactions
2020-10-30 11:49:00 -04:00
7a65a64644
add LockRows to Filters
2020-10-26 18:47:40 -04:00
90e81c5774
Merge branch 'release-1.34'
2020-10-23 09:34:35 -04:00
a0f733615c
allow empty string as a default value
2020-10-22 11:26:34 -04:00
40c57b4b23
Improve logic in set, improve logging
2020-10-22 10:43:53 -04:00
6c546f36ae
allow dashes and underscores in log file name
2020-10-22 10:43:35 -04:00
b950962f98
Revert WEB_EVENT_SORT_FIELD change from StartTime to StartDateTime back to StartTime. StartTime is the column name.
2020-10-20 19:21:15 -04:00
9c943fb079
Merge branch 'release-1.34'
2020-10-14 16:48:01 -04:00
ba3b19d89a
Clean up DiskSpace option. Doesn't need to be there and shouldn't set HashDiskPercent
2020-10-14 16:45:03 -04:00
4f5948cba0
Implement Unarchive action
2020-10-12 10:53:53 -04:00
991cf97890
Fix null=>undef
2020-10-06 17:08:47 -04:00
9abde9ee06
Merge branch 'release-1.34'
2020-10-06 16:51:12 -04:00
de6a51ec15
Fix incorrect operator used for NOT IN and add IN operator to match php
2020-10-06 09:38:15 -04:00
42debf5392
Rough in a Zone class
2020-10-01 16:50:50 -04:00
3091759162
Add missing fields and impleent a control function
2020-10-01 16:50:39 -04:00
f2e4d1dd5c
Handle PostSQL Conditions when generating SQL
2020-09-29 15:02:46 -04:00
0a4a144bbc
Merge branch 'location'
2020-09-28 09:33:28 -04:00
c14e141295
Merge branch 'release-1.34'
2020-09-25 11:01:25 -04:00
3db8490d9c
Escape another case of Function for mysql8
2020-09-25 10:59:31 -04:00
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
e9d8279d8a
Add geolocation config options
2020-09-24 20:20:01 -04:00
5b2f397a54
Update EVENT_SORT_ORDER options
2020-09-14 15:13:04 -04:00
0f04f9607a
Fixup Exists as opposed to ExistsInFileSsystem
2020-08-27 19:56:41 -04:00
43b4177a5b
fix crash due to incomplete code
2020-08-27 08:14:45 -04:00
Isaac Connor
Isaac Connor
ColorfullyZhang
criadoperez
root
Arek Kossendowski
Jim Perkins
gmanic
hax0kartik
Andrew Bauer
Joseph Yasi