3d093ed8a6
Fix monitor not change status when zoneminder state change
2022-03-09 21:07:39 +01:00
4a1dbc884d
Fix zmpkg recording status
2022-03-09 19:40:04 +01:00
858ab62fc4
Fix when using a custom state
2022-03-08 17:10:29 +01:00
0785e3571c
code style, remove duplicated code.
2022-03-08 09:06:31 -05:00
a748b0ed0a
When connecting to a monitor, if it fails, disconnect. This should fix a bug in zmtrigger and others where it would never reconnect. The idea is that we asked for a successful connection, if it failed, we shouldn't be in a failed connected state, we should be disconnected.
2022-03-08 09:06:06 -05:00
8fe0cb5e33
tidy up the mem_info hash and turn into a hash instead of a pointer to a hash. Check for validity flah before checking sizes. Improve debug logging.
2022-03-08 09:04:41 -05:00
addfdcd330
Remove sets::isin references
2022-02-28 15:41:57 -05:00
a32b77510d
Fix logic on error reporting of failure to connect to db
2022-02-28 09:38:54 -05:00
e33b41745d
Merge branch 'master' into replace_function_concept
2022-02-27 14:04:01 -05:00
0bcb9d276f
code style.
2022-02-26 18:25:51 -05:00
2bd85089f4
Put integers in quotes as well. Proper JSON has all values in quotes. This is important because integers like 0123 are invalid
2022-02-26 18:25:51 -05:00
2bc0ec269a
Merge branch 'master' into replace_function_concept
2022-02-15 17:02:03 -05:00
b2e0f805bd
Add NOT IN case. Also, fix bad SQL when value evals to false. Test for empty string instead. Fixes #3425
2022-02-15 10:29:58 -05:00
f66a463574
Merge branch 'master' into replace_function_concept
2022-02-08 12:07:30 -05:00
a7dc9d4e36
Implement General::jsonLoad
2022-02-08 10:14:00 -05:00
ac909d404a
Use the reported move with x=0 y=0 for autostop in addition to old stop movement code
2022-02-03 18:19:07 -05:00
ac39be33f5
Don't assume filename of mp4. We store it in the event record for a reason. Fixes #3422
2022-02-03 17:24:33 -05:00
caebef3103
Replace uses of Function
2022-02-03 12:38:26 -05:00
f40279b745
Remove active, add capturing, analysing, recording
2022-02-03 12:38:09 -05:00
f7099bc6cb
Replace another use of Function
2022-02-03 12:37:51 -05:00
10e39b3b13
:wqMerge branch 'master' into replace_function_concept
2022-02-02 17:08:01 -05:00
a4c91e9a3c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-02-02 14:36:15 -05:00
339f102196
Implement reboot and ping methods for Trendnet PTZ Control
2022-02-02 14:36:11 -05:00
48fc99a0e3
Implement reboot and ping methods for Trendnet PTZ Control
2022-02-02 14:34:53 -05:00
3feb4fcc51
Merge branch 'master' into master
2022-02-02 12:28:17 -05:00
1c1630e5b4
add require Filter and fix missing $
2022-02-01 17:23:16 -05:00
4d87b49f07
Remove weird cutnpaste User modules stuff from top of Filter.pm
2022-02-01 17:22:56 -05:00
c524298f8e
Rough in State module
2022-01-27 13:42:46 -05:00
86f393565e
Remove Function references and swap with appropriate Capturing, Analysing, Recording
2022-01-27 13:42:31 -05:00
23bfbcd6ce
Merge branch 'master' into multistream
2022-01-26 10:13:20 -05:00
ec9403fb6f
Adds Amcrest On-camera Motion Detection
2022-01-25 22:38:00 -06:00
3cc243b9a8
Don't freshing config when doing update. That is it's own command
2022-01-24 09:24:16 -05:00
8125aa633b
Merge branch 'ZoneMinder:master' into master
2022-01-22 12:20:13 -06:00
35efb111ac
Add Private to Config
2022-01-22 12:30:59 -05:00
52e48c02b6
Add janus_path and janus_secret, allowing for more secure and flexible Janus installs
2022-01-21 22:23:41 -06:00
27abe85036
replace active with analysing, capturing, recording
2022-01-13 22:14:44 -05:00
3504b13e2a
Merge branch 'master' into multistream
2022-01-13 12:29:34 -05:00
9b8ca69203
default interactive to whether we have stdio. So now when running from console it will default to interactive and when running from zmdc.pl will be non-interactive. Do check regardless of ZM_UPDATE_CHECK setting.
2022-01-13 12:26:47 -05:00
274ffd7da0
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2022-01-13 12:02:14 -05:00
3cc1b74b4e
Merge branch 'master' into multistream
2022-01-13 10:21:58 -05:00
162e12bf92
default interactive to whether we have stdio. So now when running from console it will default to interactive and when running from zmdc.pl will be non-interactive. Do check regardless of ZM_UPDATE_CHECK setting.
2022-01-13 10:21:32 -05:00
58bd09d83d
Fix debug output from zmDbDo
2022-01-13 09:56:04 -05:00
3ec6c7e32f
Fix behaviour of update check to support interactive mode. Use zmDbDo functions to simplify code. When interactive print out lastVersion, latestVersion and currentVersion
2022-01-13 09:55:26 -05:00
3dad3a5200
update description to reflect that zmupdate.pl now does all the things it will someday do. Meantion how -c works better. When in interactive mode, check once and print out the result instead of daemonising. Fix formatting osf usage
2022-01-13 09:55:16 -05:00
e4f0c7cd98
Fix debug output from zmDbDo
2022-01-13 09:54:47 -05:00
b178b0af5e
Fix behaviour of update check to support interactive mode. Use zmDbDo functions to simplify code. When interactive print out lastVersion, latestVersion and currentVersion
2022-01-13 09:54:36 -05:00
cb1cbed8e7
update description to reflect that zmupdate.pl now does all the things it will someday do. Meantion how -c works better. When in interactive mode, check once and print out the result instead of daemonising. Fix formatting osf usage
2022-01-13 09:37:54 -05:00
e4693c251c
add backticks around field names because some like Function are reserved
2022-01-12 23:08:29 -05:00
8d06175024
Rework to use ZoneMinder::Monitor class. Simplify loadMonitors and get rid of loadMonitor. Add in ServerId change handling.
2022-01-12 23:07:48 -05:00
9243b1d081
Add debugging to zmDbDo
2022-01-11 12:43:42 -05:00
152efd0987
make aud_print add a newline if printing. Tidy up Event Summary updating, using zmDbDo.
2022-01-11 12:39:52 -05:00
1891537e91
Remove redundant logLevel from docs
2022-01-11 12:38:57 -05:00
3dcfd3e26e
reduce debug logging
2022-01-11 12:02:33 -05:00
fd3a70172d
Merge branch 'master' into multistream
2022-01-10 17:51:50 -05:00
1333d8c751
Adds ONVIF Motion Detection Support
2022-01-06 16:45:15 -06:00
99900e8c1d
Merge branch 'master' into multistream
2022-01-05 18:04:10 -05:00
aefed4e174
Merge branch 'master' into multistream
2022-01-05 18:03:44 -05:00
bc67493f91
Alter log level of restart events based on Importance setting
2022-01-05 16:49:20 -05:00
bfac696fb7
return logger from loginit so that we can use it
2022-01-05 16:49:00 -05:00
cce24ea427
Add RTSPServer and Importance fields
2022-01-05 16:48:46 -05:00
6bd04de5f6
Merge branch 'master' into multistream
2021-12-31 17:53:36 -05:00
2aacbf790a
handle warning due to not defined last_run
2021-12-26 11:51:32 -05:00
d86456b6f2
revamp, using ZoneMinder::Monitor methods to reduce code. Reduce last analysze time was zero to a debug. Fixes #3389
2021-12-15 09:11:55 -05:00
12ebdacf54
specify ZoneMinder::Database for zmSQLExecute
2021-12-15 09:11:55 -05:00
fe0e4627ef
Specify ZoneMinder::General for runCommand
2021-12-15 09:11:55 -05:00
28d5614da0
Fix missing ;
2021-12-15 09:11:55 -05:00
f683557b0e
Fix Monitor::Control to handle local cameras
2021-12-15 09:11:55 -05:00
4fa804e9a2
Can only SKIP LOCKED if locking rows. Remove FOR SHARE as it isn't supported on < mysql 8
2021-12-14 13:33:00 -05:00
fe72fd83f8
Fix auth not getting realm from auth headers due to them being an array now. Get auth and ip from Path if not set in ControlAddress.
2021-12-14 10:04:35 -05:00
a65f2b42ce
Implement per-filter delays using the ExecuteInterval member of Filters. Remove uneded lockandload when doing row locks. We will have already locked when executing the filter sql.
2021-12-13 14:59:38 -05:00
0382a677df
Add ExecuteInterval to Filter Object. Allow empty sort_field to have the effort of not sorting. Always add FOR SHARE which adds a read-only lock the returned records. Add SKIP LOCKED functionality so that filters can simply skip locked records. This should reduce contention. Also specify FOR UPDATE of the events table, otherwise we also lock Monitors and Storage.
2021-12-13 14:58:32 -05:00
ef13c84d8b
fix zmtrigger. Need {}
2021-12-12 17:01:12 -05:00
ed360348ef
spacing, remove dead code. If Monitor Function becomes None, skip it
2021-12-10 15:36:47 -05:00
aa320cb28f
Fix missing STATE_UNKNOWN
2021-12-10 15:35:53 -05:00
35bca1d89b
When launching concurrent zmfilter, use the id instead of Name because Name isn't necessarily unique
2021-12-06 10:32:17 -05:00
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
Javier Gonzalez
Isaac Connor
Isaac Connor
Jonathan Bennett
maddios
ColorfullyZhang
criadoperez
root
Arek Kossendowski
Jim Perkins
Brandon Thetford
Peter Keresztes Schmidt
gmanic
hax0kartik
Andrew Bauer
Joseph Yasi