Isaac Connor
3bdd3c0d12
Move event summaries to their own table to reduce contention on Monitor_Status
2021-04-09 10:16:35 -04:00
Isaac Connor
30dfadcbf1
Add some parenthesis and use logic and/or install of binary
2021-04-07 14:15:55 -04:00
Isaac Connor
cc33718a2e
fix did you forget to declare my $deleteLogByRowsSth?)
2021-04-01 12:22:30 -04:00
Isaac Connor
1fd9361e4e
use zmDbDo to replace many lines of code
2021-04-01 09:27:49 -04:00
Isaac Connor
757ec2dbc1
Improve zmDbDo to return rows affected instead of boolean
2021-04-01 09:27:20 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
d54ba9b324
Change url used for authentication to magicBox.cgi?action=getDeviceType
2021-03-30 16:14:42 -04:00
Isaac Connor
21cf1f47a5
GroupIds is not a valid Column in Monitors
2021-03-25 17:33:04 -04:00
Isaac Connor
ec8e0f5997
replace while(1) with while(not zm_terminate) so that these scripts exit cleanly
2021-03-17 13:09:54 -04:00
Arek Kossendowski
0eab9987fc
Just updated the script with moveMap and moveRel functions.
2021-02-26 00:11:29 +00:00
Arek Kossendowski
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
Isaac Connor
0b0df96271
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-02-18 16:05:10 -05:00
Isaac Connor
2dfb07a69b
Must set StateId as well as it cannot be Null. Default to 1
2021-02-18 10:39:39 -05:00
Jim Perkins
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
Isaac Connor
217d632f1a
Remove epadding, last_frame_score replaced it
2021-02-17 11:54:30 -05:00
Isaac Connor
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
Isaac Connor
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
Brandon Thetford
a7eab75cf9
Added logging for copies/moves to zmfilter.pl
2021-02-10 15:31:10 -07:00
Peter Keresztes Schmidt
687ba03eb4
Drop relicts of zma
2021-02-10 13:26:25 +01:00
Isaac Connor
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
Peter Keresztes Schmidt
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
Isaac Connor
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
Peter Keresztes Schmidt
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
Isaac Connor
e05fdf423b
Merge pull request #3125 from gmanic/patch-1
...
corrected $this to $self
2021-02-03 10:21:33 -05:00
Isaac Connor
e085acedc8
ALlow micro version mismatches to not be fatal. Minor and Major are still fatal.
2021-02-03 09:50:37 -05:00
Isaac Connor
8a99665311
better variable names and code documentation
2021-02-03 09:50:13 -05:00
gmanic
037f197f54
corrected $this to $self
2021-02-03 12:53:33 +01:00
Isaac Connor
e6358290b4
this=>self
2021-02-02 17:30:42 -05:00
Isaac Connor
a62d446f14
Add audio_frequency and audio_channels to shared mem
2021-03-01 16:49:27 -05:00
Isaac Connor
2a4723090b
Start zm_rtsp_server if ZM_MIN_RTSP_PORT is set
2021-03-01 16:47:18 -05:00
Isaac Connor
b70cd0bc76
Add zm_rtsp_server to list of daemons we can start
2021-03-01 16:47:18 -05:00
Isaac Connor
430f839954
add video_fifo filename strings to shmem.
2021-03-01 16:46:48 -05:00
Isaac Connor
671d58f0d0
bump version and put back ZM_MIN_RTSP_PORT setting
2021-01-26 12:35:17 -05:00
Isaac Connor
cb90c06cde
Merge branch 'master' into zma_to_thread
2021-01-17 17:38:34 -05:00
Isaac Connor
1e59c5bbde
Merge branch 'release-1.34'
2021-01-15 18:46:07 -05:00
Isaac Connor
7183a47a3a
split Netcat security header into multiple lines for legibility
2021-01-15 18:45:13 -05:00
Isaac Connor
f2fea95f4b
Merge branch 'master' into zma_to_thread
2021-01-14 13:02:52 -05:00
Isaac Connor
02386f0c64
SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED for zmfilter.
2021-01-14 12:56:54 -05:00
Isaac Connor
cf2d987fc0
Add MIN_RTSP_PORT config item, but commented out for now
2021-01-11 13:46:50 -05:00
Isaac Connor
284b9f963f
Merge branch 'master' into zma_to_thread
2020-12-29 12:18:26 -05:00
Isaac Connor
c9ac5dff62
Use parent printMsg
2020-12-21 12:17:02 -05:00
Isaac Connor
e123322d06
Merge branch 'master' into rtsp_server
2020-12-15 11:00:13 -05:00
Isaac Connor
99e7ae3505
Merge branch 'master' into rtsp_server
2020-12-15 10:14:19 -05:00
Isaac Connor
bdf9a029ad
Must require ZoneMinder::Monitor if we want to use it
2020-12-15 09:35:17 -05:00
Isaac Connor
9fec11c4a9
Add missing Monitor() function.
2020-12-14 14:41:34 -05:00
Isaac Connor
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
Isaac Connor
b0f2ff6302
Add Session cleaning
2020-12-08 10:21:55 -05:00
Isaac Connor
b261fbb397
Merge branch 'master' into zma_to_thread
2020-12-07 16:26:26 -05:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
6e64114ac3
Skip row locking in UpdateDiskSpace if the filter is already locking rows
2020-12-03 14:26:51 -05:00
Isaac Connor
d1c3864778
Use the ZM_FONTDIR substitution instead of hardcoding a path
2020-12-01 09:21:54 -05:00
Isaac Connor
836cd2d58d
Merge branch 'Font' of https://github.com/hax0kartik/zoneminder into font
2020-11-30 09:45:39 -05:00
hax0kartik
b212b0e450
Allow modifying font file location
2020-11-28 20:18:17 +05:30
Andrew Bauer
ff4b0e6309
add option to disable thumb animation
2020-11-25 13:03:16 -06:00
Isaac Connor
51ebaecc44
Fix MN and the various Event Total substitutions
2020-11-21 15:10:23 -05:00
Isaac Connor
98c2c6cccf
Add Status,CaptureFPS,AnalysisFPS, CaptureBandWidth to MonitorStatus fields
2020-11-21 15:09:43 -05:00
Isaac Connor
30363c1d4b
Add Monitor Status loading
2020-11-21 15:08:29 -05:00
Isaac Connor
b44f14691e
Don't exit after 30 minutes. Google code style.
2020-11-21 15:08:09 -05:00
Isaac Connor
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
Isaac Connor
5bf5d58ac1
Fixes recovering frames from jpegs. Use Time::HiRes stat to get microseconds.
2020-11-16 11:32:50 -05:00
Isaac Connor
a47b72af49
Fixes recovering frames from jpegs. Use Time::HiRes stat to get microseconds.
2020-11-16 11:31:36 -05:00
Isaac Connor
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
Isaac Connor
f1b8266e26
Only join storage and Monitors if necessary
2020-11-13 17:03:51 -05:00
Isaac Connor
da99426535
if monitor is not found call loadMonitors to make sure it isn't new
2020-11-13 10:40:55 -05:00
Isaac Connor
df783f4835
Merge branch 'master' into zma_to_thread
2020-11-12 12:53:55 -05:00
Isaac Connor
7b764d04d3
Fix use of next when it should be return. Improve some logging of errors.
2020-11-11 17:40:31 -05:00
Isaac Connor
076d649189
Include Record Monitors in zmtrigger
2020-11-11 16:12:30 -05:00
Isaac Connor
0aef0adf48
Fix more Monitors.Id => Monitor_Status.MonitorId
2020-11-11 11:32:54 -05:00
Isaac Connor
330023f65b
Move Events totals to Monitor_Status instead of Monitors
2020-11-11 09:30:39 -05:00
Isaac Connor
159b383276
Move event stat totals to Monitor_Status. Implement a class for them called Monitor_Status
2020-11-06 13:27:47 -05:00
Isaac Connor
adbd3486bf
Rename StartTime, EndTime in Events to StartDateTime and EndDateTime
2020-11-04 13:49:39 -05:00
Isaac Connor
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
Isaac Connor
65df84ef7e
Make ZoneMinder::Event::delete aware of transactions
2020-10-30 11:49:00 -04:00
Isaac Connor
7a65a64644
add LockRows to Filters
2020-10-26 18:47:40 -04:00
Isaac Connor
90e81c5774
Merge branch 'release-1.34'
2020-10-23 09:34:35 -04:00
Isaac Connor
a0f733615c
allow empty string as a default value
2020-10-22 11:26:34 -04:00
Isaac Connor
40c57b4b23
Improve logic in set, improve logging
2020-10-22 10:43:53 -04:00
Isaac Connor
6c546f36ae
allow dashes and underscores in log file name
2020-10-22 10:43:35 -04:00
Isaac Connor
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
Isaac Connor
2eda49333f
Merge branch 'master' into zma_to_thread
2020-10-20 16:20:29 -04:00
Isaac Connor
9c943fb079
Merge branch 'release-1.34'
2020-10-14 16:48:01 -04:00
Isaac Connor
ba3b19d89a
Clean up DiskSpace option. Doesn't need to be there and shouldn't set HashDiskPercent
2020-10-14 16:45:03 -04:00
Isaac Connor
4f5948cba0
Implement Unarchive action
2020-10-12 10:53:53 -04:00
Isaac Connor
991cf97890
Fix null=>undef
2020-10-06 17:08:47 -04:00
Isaac Connor
9abde9ee06
Merge branch 'release-1.34'
2020-10-06 16:51:12 -04:00
Isaac Connor
de6a51ec15
Fix incorrect operator used for NOT IN and add IN operator to match php
2020-10-06 09:38:15 -04:00
Isaac Connor
42debf5392
Rough in a Zone class
2020-10-01 16:50:50 -04:00
Isaac Connor
3091759162
Add missing fields and impleent a control function
2020-10-01 16:50:39 -04:00
Isaac Connor
f2e4d1dd5c
Handle PostSQL Conditions when generating SQL
2020-09-29 15:02:46 -04:00
Isaac Connor
a39a656373
Merge branch 'master' into zma_to_thread
2020-09-29 11:02:40 -04:00
Isaac Connor
0a4a144bbc
Merge branch 'location'
2020-09-28 09:33:28 -04:00
Isaac Connor
c14e141295
Merge branch 'release-1.34'
2020-09-25 11:01:25 -04:00
Isaac Connor
3db8490d9c
Escape another case of Function for mysql8
2020-09-25 10:59:31 -04:00
Joseph Yasi
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
Isaac Connor
e9d8279d8a
Add geolocation config options
2020-09-24 20:20:01 -04:00
Isaac Connor
94fdddc1e8
Synchronize on space instead of = in zmcontrol.pl command line
2020-09-21 11:56:56 -04:00
Isaac Connor
5b2f397a54
Update EVENT_SORT_ORDER options
2020-09-14 15:13:04 -04:00
Isaac Connor
e5776b79fa
Introduce %EVF% Event video filename subst
2020-09-14 14:04:18 -04:00
Isaac Connor
0f04f9607a
Fixup Exists as opposed to ExistsInFileSsystem
2020-08-27 19:56:41 -04:00
Isaac Connor
43b4177a5b
fix crash due to incomplete code
2020-08-27 08:14:45 -04:00
Isaac Connor
0f27243007
Merge branch 'master' into filter_pre_post
2020-08-24 09:23:24 -04:00
Isaac Connor
0873b8a0ec
Remove long-deprecated config entries
2020-08-22 18:49:20 -04:00
Isaac Connor
9f9b771d3f
remove dead code
2020-08-22 10:58:16 -04:00
Isaac Connor
b589c3abd9
glob sorts since perl 5.6.0
2020-08-21 10:45:32 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
49316244a8
Merge branch 'master' into filter_pre_post
2020-08-13 13:46:35 -04:00
Isaac Connor
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
Isaac Connor
c0ab8bf90d
Merge branch 'master' into zma_to_thread
2020-08-07 17:53:32 -04:00
Isaac Connor
5fb56c9f57
Merge branch 'master' into zma_to_thread
2020-08-07 17:52:43 -04:00
dmo
c102c35c42
Don't prefix manpage with zoneminder-
2020-08-05 23:56:30 +02:00
Andrew Bauer
3ba8ad579e
fix pod2man out-of-source builds
2020-08-04 21:18:37 -05:00
Andrew Bauer
92cc03dbe8
fix pod2man out-of-source builds
2020-08-04 21:07:49 -05:00
Andrew Bauer
8d9410d510
spelling
2020-08-03 15:38:02 -05:00
Andrew Bauer
9d88f8ee73
implement zm about menu
2020-08-03 15:22:46 -05:00
Andrew Bauer
b6c0274b2c
implement collapsed navbar
2020-07-31 16:03:37 -05:00
Isaac Connor
34b079fa9e
Start roughing in pre and post conditions
2020-07-30 12:13:09 -04:00
Isaac Connor
5bea68c93d
add comment and improve logging of figuring out event starttime from youngest file
2020-07-28 10:35:28 -04:00
Isaac Connor
89007227b6
Add reboot method to SkyIPCam7xx control script
2020-07-23 11:54:19 -04:00
Isaac Connor
869860bb26
Merge branch 'master' into zma_to_thread
2020-07-21 17:49:39 -04:00
Isaac Connor
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
Isaac Connor
926c3b8d34
Isaac added these explicit zmc~_heartbeat and zma_heartbeat entries.
2020-07-13 14:53:03 -04:00
Joseph Yasi
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
Isaac Connor
cd707571e7
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-07-08 17:22:32 -04:00
Isaac Connor
a469fdef9a
include the non-existent path in the warning
2020-07-08 17:21:59 -04:00
Isaac Connor
e5afc1a2db
Cleanup code that sets digest credentials. Fixes #2972
2020-07-08 17:20:52 -04:00
Isaac Connor
209cbe1000
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-07 09:23:46 -04:00
Isaac Connor
b0f87eabc2
comment out hexdump stuff to remove the dependency
2020-07-07 09:23:32 -04:00
Andrew Bauer
dcab218a2e
remove global config item CREATE_ANALYSIS_IMAGES
2020-07-06 12:22:41 -05:00
Isaac Connor
2db65d3821
Merge branch 'release-1.34'
2020-07-04 09:09:24 -04:00
Isaac Connor
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
Isaac Connor
ab98deafd7
Add Log cleaning to zm_stats.pl
2020-07-02 16:02:49 -04:00
Isaac Connor
c022cae7ef
Sleep 10 secs if db connection fails to reduce log spamming and load
2020-06-30 18:59:27 -04:00
Isaac Connor
aff7e27dee
remove debug in zmtrack.pl.in
2020-06-30 18:58:46 -04:00
Brandon Myers
ce4e04cd0b
Fix typo in AUTH_TYPE help text
2020-06-27 00:23:05 -05:00
Isaac Connor
73ec5f10a5
sendCmd failures should not be fatal
2020-06-26 16:52:34 -04:00
Isaac Connor
d1e7d396f7
zmcontrol needs to be able to take floats instead of integers for it's parameters
2020-06-26 16:49:55 -04:00
Isaac Connor
e618966e08
spacing, improve error message when can't connect.
2020-06-23 10:23:17 -04:00
Isaac Connor
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
Isaac Connor
a2a28d389e
Finish exporting and fixing new systemStatus packageControl and daemonControl functions
2020-06-09 13:35:52 -04:00
Isaac Connor
5e0f1a03c5
Detect if system is running and prompt to stop it before doing the update.
2020-06-09 13:19:19 -04:00
Isaac Connor
d4488ac4e1
spacing
2020-06-09 12:18:29 -04:00
Isaac Connor
58ae7bb342
die early if db connection fails
2020-06-07 11:57:20 -04:00
Isaac Connor
d59697b9b5
fix event->self
2020-06-07 11:57:08 -04:00
Isaac Connor
a719565bf3
Merge branch 'master' into add_user_to_filters
2020-06-05 19:03:23 -04:00
Isaac Connor
d0a24ae32b
Make all Filters operate on in-progress events
2020-06-05 18:01:20 -04:00
Isaac Connor
caa48e7b80
Finish canEdit function
2020-06-05 17:50:52 -04:00
Isaac Connor
0905655377
Merge branch 'master' into add_user_to_filters
2020-06-05 17:08:14 -04:00