3b84d7d82a
Add --daemon to command line documentation so it ends up in man page. Fixes #3393 . Improve the description and move the pod documentation to the bottom after __END__. Improve executeCommand a bit
2021-12-06 10:28:02 -05:00
b47e96d7cf
Fix Copy/Move to Default Storage
...
When moving from a 2nd storage to Default it fails with "New storage does not have an id. Moving will not happen" because the default ID is 0.
2021-11-29 00:20:25 -05:00
f9f2615d48
Return if unable to lock the event record. Improve code around CopyTo call.
2021-11-26 15:26:38 -05:00
af5436d009
Handle bug where a value of '' will prevent special case handling. Allow '' to mean NULL when specifying Storage Area
2021-11-26 10:31:54 -05:00
ffdb0f9824
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-23 11:05:39 -05:00
40e7f607f5
If no protocol defined, fall back to the name of the Control
2021-11-22 11:38:40 -05:00
2c798069d3
improve debug logging when loading Control in Monitor
2021-11-18 18:12:07 -05:00
20629fdf5a
Include Manufacturer and Model in telemetry
2021-11-16 09:20:14 -05:00
df88c5bbef
layout->layer
2021-10-28 15:28:03 -04:00
4122ae99a5
add a comment about rollbacks
2021-10-28 15:27:45 -04:00
644c6e6b41
Just return the error
2021-10-28 11:48:08 -04:00
9fe2762bc8
Add mp4 as an option for generated video and make it the default instead of avi
2021-10-28 10:46:50 -04:00
6478999ecf
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:03 -04:00
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
509cecf9f5
Skip image checking capturing==Ondemand
2021-10-25 16:52:20 -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
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
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
b0f2ff6302
Add Session cleaning
2020-12-08 10:21:55 -05:00
b261fbb397
Merge branch 'master' into zma_to_thread
2020-12-07 16:26:26 -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
6e64114ac3
Skip row locking in UpdateDiskSpace if the filter is already locking rows
2020-12-03 14:26:51 -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
51ebaecc44
Fix MN and the various Event Total substitutions
2020-11-21 15:10:23 -05: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
b44f14691e
Don't exit after 30 minutes. Google code style.
2020-11-21 15:08:09 -05:00
271dcbc4e8
select returns EINTR when HUP'd. This is not fatal. Handling this gracefully reduces log spam
2020-11-21 09:12:41 -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
a0dcdd135a
DefaultRate and DefaultScale are Monitor properties, so just load them in a Monitor object so we don't have to JOIN the Monitors table
2020-11-13 17:04:22 -05:00
f1b8266e26
Only join storage and Monitors if necessary
2020-11-13 17:03:51 -05:00
da99426535
if monitor is not found call loadMonitors to make sure it isn't new
2020-11-13 10:40:55 -05:00
df783f4835
Merge branch 'master' into zma_to_thread
2020-11-12 12:53:55 -05:00
7b764d04d3
Fix use of next when it should be return. Improve some logging of errors.
2020-11-11 17:40:31 -05:00
076d649189
Include Record Monitors in zmtrigger
2020-11-11 16:12:30 -05:00
0aef0adf48
Fix more Monitors.Id => Monitor_Status.MonitorId
2020-11-11 11:32:54 -05:00
330023f65b
Move Events totals to Monitor_Status instead of Monitors
2020-11-11 09:30:39 -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
2eda49333f
Merge branch 'master' into zma_to_thread
2020-10-20 16:20:29 -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
a39a656373
Merge branch 'master' into zma_to_thread
2020-09-29 11:02:40 -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
94fdddc1e8
Synchronize on space instead of = in zmcontrol.pl command line
2020-09-21 11:56:56 -04:00
5b2f397a54
Update EVENT_SORT_ORDER options
2020-09-14 15:13:04 -04:00
e5776b79fa
Introduce %EVF% Event video filename subst
2020-09-14 14:04:18 -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
0f27243007
Merge branch 'master' into filter_pre_post
2020-08-24 09:23:24 -04:00
0873b8a0ec
Remove long-deprecated config entries
2020-08-22 18:49:20 -04:00
9f9b771d3f
remove dead code
2020-08-22 10:58:16 -04:00
b589c3abd9
glob sorts since perl 5.6.0
2020-08-21 10:45:32 -04:00
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
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
49316244a8
Merge branch 'master' into filter_pre_post
2020-08-13 13:46:35 -04:00
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
c0ab8bf90d
Merge branch 'master' into zma_to_thread
2020-08-07 17:53:32 -04:00
5fb56c9f57
Merge branch 'master' into zma_to_thread
2020-08-07 17:52:43 -04:00
c102c35c42
Don't prefix manpage with zoneminder-
2020-08-05 23:56:30 +02:00
3ba8ad579e
fix pod2man out-of-source builds
2020-08-04 21:18:37 -05:00
92cc03dbe8
fix pod2man out-of-source builds
2020-08-04 21:07:49 -05:00
8d9410d510
spelling
2020-08-03 15:38:02 -05:00
9d88f8ee73
implement zm about menu
2020-08-03 15:22:46 -05:00
b6c0274b2c
implement collapsed navbar
2020-07-31 16:03:37 -05:00
34b079fa9e
Start roughing in pre and post conditions
2020-07-30 12:13:09 -04:00
5bea68c93d
add comment and improve logging of figuring out event starttime from youngest file
2020-07-28 10:35:28 -04:00
89007227b6
Add reboot method to SkyIPCam7xx control script
2020-07-23 11:54:19 -04:00
869860bb26
Merge branch 'master' into zma_to_thread
2020-07-21 17:49:39 -04:00
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
926c3b8d34
Isaac added these explicit zmc~_heartbeat and zma_heartbeat entries.
2020-07-13 14:53:03 -04:00
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
cd707571e7
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-07-08 17:22:32 -04:00
a469fdef9a
include the non-existent path in the warning
2020-07-08 17:21:59 -04:00
e5afc1a2db
Cleanup code that sets digest credentials. Fixes #2972
2020-07-08 17:20:52 -04:00
209cbe1000
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-07 09:23:46 -04:00
b0f87eabc2
comment out hexdump stuff to remove the dependency
2020-07-07 09:23:32 -04:00
dcab218a2e
remove global config item CREATE_ANALYSIS_IMAGES
2020-07-06 12:22:41 -05:00
2db65d3821
Merge branch 'release-1.34'
2020-07-04 09:09:24 -04:00
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
ab98deafd7
Add Log cleaning to zm_stats.pl
2020-07-02 16:02:49 -04:00
c022cae7ef
Sleep 10 secs if db connection fails to reduce log spamming and load
2020-06-30 18:59:27 -04:00
aff7e27dee
remove debug in zmtrack.pl.in
2020-06-30 18:58:46 -04:00
ce4e04cd0b
Fix typo in AUTH_TYPE help text
2020-06-27 00:23:05 -05:00
73ec5f10a5
sendCmd failures should not be fatal
2020-06-26 16:52:34 -04:00
d1e7d396f7
zmcontrol needs to be able to take floats instead of integers for it's parameters
2020-06-26 16:49:55 -04:00
e618966e08
spacing, improve error message when can't connect.
2020-06-23 10:23:17 -04:00
d984c33b92
Replace old message abou ensuring that ZM is stopped with our new one, which only pauses if ZMIS running.
2020-06-09 13:36:33 -04:00
a2a28d389e
Finish exporting and fixing new systemStatus packageControl and daemonControl functions
2020-06-09 13:35:52 -04:00
5e0f1a03c5
Detect if system is running and prompt to stop it before doing the update.
2020-06-09 13:19:19 -04:00
d4488ac4e1
spacing
2020-06-09 12:18:29 -04:00
58ae7bb342
die early if db connection fails
2020-06-07 11:57:20 -04:00
d59697b9b5
fix event->self
2020-06-07 11:57:08 -04:00
a719565bf3
Merge branch 'master' into add_user_to_filters
2020-06-05 19:03:23 -04:00
d0a24ae32b
Make all Filters operate on in-progress events
2020-06-05 18:01:20 -04:00
caa48e7b80
Finish canEdit function
2020-06-05 17:50:52 -04:00
0905655377
Merge branch 'master' into add_user_to_filters
2020-06-05 17:08:14 -04:00
f71926c736
Merge branch 'release-1.34'
2020-06-05 10:09:07 -04:00
20e6a1f53d
Use single quotes when escaping password so that $ has no effect. Also escape any single quotes in the password.
2020-06-04 11:37:44 -04:00
f8a11633bb
Handle no db_host specified, meaning local unix socket
2020-06-04 11:35:48 -04:00
6869710747
Handle no db_host specified, meaning local unix socket
2020-06-04 11:28:26 -04:00
ade0d750c8
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-06-03 15:37:32 -04:00
6f42cb22d6
Use single quotes when escaping password so that $ has no effect. Also escape any single quotes in the password.
2020-06-03 15:36:47 -04:00
0e6ff1ad09
Detaint mysql commands in update script
2020-06-01 22:54:29 -07:00
a7ef8e3dc8
detaint command before performing backup. Fixes #2945
2020-05-29 14:53:42 -04:00
58a015e20a
fix use of printMsg
2020-05-29 12:20:39 -04:00
b99059638a
Use plural soap versions
2020-05-18 17:57:40 -04:00
5f5cede104
Fix log file containing - or _
2020-05-13 16:06:26 -04:00
437a96915f
sketchy fix for soap 1.1
2020-05-13 15:24:58 -04:00
fc12b61750
Fix probing
2020-05-13 15:09:31 -04:00
e24b6214b1
test logFile before doing regexps on it
2020-05-13 08:05:58 -04:00
f72ad1023c
As params are passed in command, they should not be fatal to the control process
2020-05-13 08:02:40 -04:00
a6b804bb62
As params are passed in command, they should not be fatal to the control process
2020-05-13 07:58:53 -04:00
a1217db117
hardcode log id
2020-05-12 18:20:05 -04:00
011ea1098c
Rename COnfig* to ONVIF_*
2020-05-12 15:49:54 -04:00
045ea77bf3
Pass verbose to client. Add stream type to profiles. Add passing generic commands to the media element so that we can query anything we want easier
2020-05-12 15:49:42 -04:00
43b776bc80
Remove duplicated code byusing a foreach. Add streamtype to returned profiles
2020-05-12 15:49:01 -04:00
1f3cf266a2
Merge branch 'master' of github.com:zoneminder/ZoneMinder into onvif_updated_to_upstream
2020-05-12 11:20:49 -04:00
bbcb7f2c60
Better debug output on errors. Use libXML to pretty-print the returned XML
2020-05-12 11:14:56 -04:00
e40c3d8487
Print out the returned profiles like profiles() used to do
2020-05-12 10:49:47 -04:00
e950f3c843
Return profiles instead of doing nothing with them
2020-05-12 10:49:29 -04:00
323c171a27
test logFile before doing regexps on it
2020-05-11 18:35:31 -04:00
77b4dd6b35
add POD and fixups to zmonvif-trigger.pl
2020-05-11 18:34:38 -04:00
415ffbd771
remove weird comments
2020-05-09 18:30:21 -04:00
8c133fc973
use perl executable replacement
2020-05-09 17:36:51 -04:00
183fe1febd
remove +x and move zmtrigger.pl to /scripts
2020-05-09 17:36:20 -04:00
80ed0b219a
Add zmonvif-trigger.pl and split into multiple lines
2020-05-09 17:35:27 -04:00
7938952a90
Fix botched merge in ONVIF.PM
2020-05-09 12:22:11 -04:00
8bebb2b890
fix use of printMsg
2020-05-09 11:49:02 -04:00
cd9d3311ed
Add a User object script
2020-05-07 11:07:27 -04:00
4bd0cca4b8
Update Filter object, specifying fields and using parent's find methods
2020-05-07 10:59:06 -04:00
58fae48736
Add canEdit tests to delete,delete_files,CopyTo,MoveTo
2020-05-07 10:58:31 -04:00
ac31abd30c
Make onvif handle no resolution graceully
2020-05-05 18:07:12 -04:00
4ff341a0f5
Merge branch 'master' into zma_to_thread
2020-05-02 18:03:42 -04:00
3ac6dc267b
out an error if name contains invalid characters
2020-04-23 11:01:34 -04:00
57141fddeb
handle additional atributes on the html tag in html detection
2020-04-23 10:46:18 -04:00
576e3149d6
escape table columns for mysql8
2020-04-23 10:43:01 -04:00
7046612b65
Code style updates. Quote the word Function in SQL for newer mysql
2020-04-23 10:41:59 -04:00
67b35967d4
MOstly spaces and quotes, remove duplicated db version update and only prepare the sth once.
2020-04-23 10:39:50 -04:00
a7b553cdbe
code style and correct license. Author was contacted and ok'd the change. Fies #2883
2020-04-23 10:37:42 -04:00
e770be2e13
Merge branch 'release-1.34'
2020-04-23 10:26:16 -04:00
10d89ed82e
Spacing, quotes, improve debug messages.
2020-04-23 10:00:11 -04:00
571ff260cc
Merge branch 'release-1.34'
2020-04-04 16:35:09 -04:00
38555b0dd4
strip leading and trailing " in trigger message. Accept a space instead of a + in enable/disable commands to match on/off
2020-04-04 11:08:19 -04:00
3117f29f71
code style and correct license. Author was contacted and ok'd the change. Fies #2883
2020-03-30 10:32:26 -04:00
98598f1441
Add a warning when an email exceeds 10Mb
2020-03-28 11:59:19 -04:00
bfa08c3422
MOstly spaces and quotes, remove duplicated db version update and only prepare the sth once.
2020-03-27 13:06:10 -04:00
cf6b24b432
add ES status to telemetry and --show option to display what is being sent to ZM
2020-03-26 12:11:00 -04:00
090cd845b0
add ES status to telemetry and --show option to display what is being sent to ZM
2020-03-16 14:49:27 -04:00
0323925406
Code style updates. Quote the word Function in SQL for newer mysql
2020-03-04 09:48:55 -05:00
7c066822f3
escape table columns for mysql8
2020-03-03 17:29:31 -05:00
4dee3532c3
handle additional atributes on the html tag in html detection
2020-02-26 09:42:17 -05:00
d51fdafbc0
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-02-21 09:37:45 -05:00
869713826a
mine code cleanup
2020-02-21 09:29:35 -05:00
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
be75be9bc4
Merge pull request #2815 from connortechnology/improve_filter_emails
...
Improve filter emails
2020-02-19 14:50:48 -05:00
300402013c
Merge branch 'master' into improve_filter_emails
2020-02-19 14:44:37 -05:00
ec4d565f07
set the net interface used in TransportUDP when specified
2020-02-19 14:28:53 -05:00
b8d0192bcd
Add optional net_interface after soap version to discover command
2020-02-19 14:28:23 -05:00
dab5c520fe
Merge branch 'master' into add_alarmed_zone_to_filters
2020-02-19 14:20:08 -05:00
a599028de4
If Filter attr is AlarmedZoneId we can only support the EXISTS operator
2020-02-19 14:18:28 -05:00
258ae23fb9
out an error if name contains invalid characters
2020-02-19 09:42:54 -05:00
0c97bff645
monitor presets and controls for D-Link DCS-5020L
2020-02-19 22:50:09 +13:00
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
Isaac Connor
maddios
Isaac Connor
ColorfullyZhang
criadoperez
root
Arek Kossendowski
Jim Perkins
Brandon Thetford
Peter Keresztes Schmidt
gmanic
hax0kartik
Andrew Bauer
Joseph Yasi
dmo
Isaac Connor
Brandon Myers
Kevin Stolp
Pliable Pixels
zlodag
Isaac Connor
externo6
Simpler1
Isaac Connor