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
Isaac Connor
Isaac Connor
Brandon Thetford
Peter Keresztes Schmidt
gmanic
hax0kartik
Andrew Bauer
Joseph Yasi
dmo
Isaac Connor
Brandon Myers
Kevin Stolp
Pliable Pixels