Isaac Connor
|
4f29875609
|
Fix password config type to be password in db
|
2022-03-21 16:08:13 -04:00 |
|
Isaac Connor
|
67f765bc82
|
Add password as a config entry type
|
2022-03-21 16:08:13 -04:00 |
|
Isaac Connor
|
d08cac052c
|
Add MQTT settings to config
|
2022-03-21 16:08:13 -04:00 |
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
addfdcd330
|
Remove sets::isin references
|
2022-02-28 15:41:57 -05:00 |
|
Isaac Connor
|
e33b41745d
|
Merge branch 'master' into replace_function_concept
|
2022-02-27 14:04:01 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
2bc0ec269a
|
Merge branch 'master' into replace_function_concept
|
2022-02-15 17:02:03 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
f66a463574
|
Merge branch 'master' into replace_function_concept
|
2022-02-08 12:07:30 -05:00 |
|
Isaac Connor
|
a7dc9d4e36
|
Implement General::jsonLoad
|
2022-02-08 10:14:00 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
caebef3103
|
Replace uses of Function
|
2022-02-03 12:38:26 -05:00 |
|
Isaac Connor
|
f40279b745
|
Remove active, add capturing, analysing, recording
|
2022-02-03 12:38:09 -05:00 |
|
Isaac Connor
|
10e39b3b13
|
:wqMerge branch 'master' into replace_function_concept
|
2022-02-02 17:08:01 -05:00 |
|
Isaac Connor
|
a4c91e9a3c
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-02-02 14:36:15 -05:00 |
|
Isaac Connor
|
339f102196
|
Implement reboot and ping methods for Trendnet PTZ Control
|
2022-02-02 14:36:11 -05:00 |
|
Isaac Connor
|
48fc99a0e3
|
Implement reboot and ping methods for Trendnet PTZ Control
|
2022-02-02 14:34:53 -05:00 |
|
Isaac Connor
|
4d87b49f07
|
Remove weird cutnpaste User modules stuff from top of Filter.pm
|
2022-02-01 17:22:56 -05:00 |
|
Isaac Connor
|
c524298f8e
|
Rough in State module
|
2022-01-27 13:42:46 -05:00 |
|
Isaac Connor
|
86f393565e
|
Remove Function references and swap with appropriate Capturing, Analysing, Recording
|
2022-01-27 13:42:31 -05:00 |
|
Isaac Connor
|
23bfbcd6ce
|
Merge branch 'master' into multistream
|
2022-01-26 10:13:20 -05:00 |
Jonathan Bennett
|
ec9403fb6f
|
Adds Amcrest On-camera Motion Detection
|
2022-01-25 22:38:00 -06:00 |
|
Jonathan Bennett
|
8125aa633b
|
Merge branch 'ZoneMinder:master' into master
|
2022-01-22 12:20:13 -06:00 |
|
Isaac Connor
|
35efb111ac
|
Add Private to Config
|
2022-01-22 12:30:59 -05:00 |
|
Jonathan Bennett
|
52e48c02b6
|
Add janus_path and janus_secret, allowing for more secure and flexible Janus installs
|
2022-01-21 22:23:41 -06:00 |
|
Isaac Connor
|
27abe85036
|
replace active with analysing, capturing, recording
|
2022-01-13 22:14:44 -05:00 |
|
Isaac Connor
|
3504b13e2a
|
Merge branch 'master' into multistream
|
2022-01-13 12:29:34 -05:00 |
|
Isaac Connor
|
274ffd7da0
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-01-13 12:02:14 -05:00 |
|
Isaac Connor
|
58bd09d83d
|
Fix debug output from zmDbDo
|
2022-01-13 09:56:04 -05:00 |
|
Isaac Connor
|
e4f0c7cd98
|
Fix debug output from zmDbDo
|
2022-01-13 09:54:47 -05:00 |
|
Isaac Connor
|
e4693c251c
|
add backticks around field names because some like Function are reserved
|
2022-01-12 23:08:29 -05:00 |
|
Isaac Connor
|
9243b1d081
|
Add debugging to zmDbDo
|
2022-01-11 12:43:42 -05:00 |
|
Isaac Connor
|
1891537e91
|
Remove redundant logLevel from docs
|
2022-01-11 12:38:57 -05:00 |
|
Isaac Connor
|
fd3a70172d
|
Merge branch 'master' into multistream
|
2022-01-10 17:51:50 -05:00 |
|
Jonathan Bennett
|
1333d8c751
|
Adds ONVIF Motion Detection Support
|
2022-01-06 16:45:15 -06:00 |
|
Isaac Connor
|
99900e8c1d
|
Merge branch 'master' into multistream
|
2022-01-05 18:04:10 -05:00 |
|
Isaac Connor
|
bfac696fb7
|
return logger from loginit so that we can use it
|
2022-01-05 16:49:00 -05:00 |
|
Isaac Connor
|
cce24ea427
|
Add RTSPServer and Importance fields
|
2022-01-05 16:48:46 -05:00 |
|
Isaac Connor
|
6bd04de5f6
|
Merge branch 'master' into multistream
|
2021-12-31 17:53:36 -05:00 |
|
Isaac Connor
|
fe0e4627ef
|
Specify ZoneMinder::General for runCommand
|
2021-12-15 09:11:55 -05:00 |
|
Isaac Connor
|
28d5614da0
|
Fix missing ;
|
2021-12-15 09:11:55 -05:00 |
|
Isaac Connor
|
f683557b0e
|
Fix Monitor::Control to handle local cameras
|
2021-12-15 09:11:55 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
aa320cb28f
|
Fix missing STATE_UNKNOWN
|
2021-12-10 15:35:53 -05:00 |
maddios
|
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 |
|
Isaac Connor
|
f9f2615d48
|
Return if unable to lock the event record. Improve code around CopyTo call.
|
2021-11-26 15:26:38 -05:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
40e7f607f5
|
If no protocol defined, fall back to the name of the Control
|
2021-11-22 11:38:40 -05:00 |
|
Isaac Connor
|
2c798069d3
|
improve debug logging when loading Control in Monitor
|
2021-11-18 18:12:07 -05:00 |
|
Isaac Connor
|
df88c5bbef
|
layout->layer
|
2021-10-28 15:28:03 -04:00 |
|
Isaac Connor
|
4122ae99a5
|
add a comment about rollbacks
|
2021-10-28 15:27:45 -04:00 |
|
Isaac Connor
|
644c6e6b41
|
Just return the error
|
2021-10-28 11:48:08 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
a2ec18be5a
|
Implement Control() function to implement the Protocol Specific Control object
|
2021-10-26 18:15:43 -04:00 |
|
Isaac Connor
|
d62d88a0a3
|
add utility functions parseNameEqualsValueToHash and hash_diff
|
2021-10-26 18:15:43 -04:00 |
|
Isaac Connor
|
c864d0765b
|
Update, add url parsing to match other control scripts. Add getConfig and setConfig
|
2021-10-26 18:15:43 -04:00 |
|
Isaac Connor
|
cebe86feb2
|
Make ZoneMinder::Control ingerit from Object. Make loadMonitor use MonitorId
|
2021-10-26 18:15:43 -04:00 |
|
Isaac Connor
|
72d2b99ca4
|
Add last_viewed_time
|
2021-10-25 16:51:57 -04:00 |
|
Isaac Connor
|
5e21d4833a
|
Remove dead code, remove locking from CopyTo, put locking into MoveTo.
|
2021-10-25 11:09:29 -04:00 |
|
Isaac Connor
|
9169da6963
|
Only start a transaction if we are not already in a transaction
|
2021-10-25 11:09:06 -04:00 |
|
Isaac Connor
|
6fd33b4627
|
Change commands used to set and goto presets. Fixes #3371
|
2021-10-13 10:42:23 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
d3cfd3c224
|
Set new defaults for various settings
|
2021-09-23 16:39:35 -04:00 |
ColorfullyZhang
|
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 |
|
Isaac Connor
|
c5b097af0a
|
Only suspend/resume motion detection if the monitor is doing motion detection
|
2021-09-08 13:57:46 -04:00 |
criadoperez
|
4a717820b1
|
Fixed broken wiki links
|
2021-09-08 15:18:52 +02:00 |
|
Isaac Connor
|
263a846251
|
Add missing fields. defaults need to be quoted because they are evalled
|
2021-09-04 10:43:38 -04:00 |
|
Isaac Connor
|
440bb12a9a
|
defaults need to be quoted because they are evalled
|
2021-09-04 10:43:25 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
9438445d74
|
Fix PTZ Diagonal cmds. Fixes #3300
|
2021-06-16 15:56:08 -04:00 |
|
Isaac Connor
|
d221d6ab3b
|
If we fail to suspend/resume, assume we need to disconnect/reconnect to the mmap
|
2021-06-14 13:30:37 -04:00 |
|
Isaac Connor
|
da208457b8
|
Fix EndTime case handling.
|
2021-06-14 11:58:23 -04:00 |
|
Isaac Connor
|
0cbb132f08
|
merge fixes from #3295. Fixes #3295.
|
2021-06-14 09:52:10 -04:00 |
|
Isaac Connor
|
9001327883
|
Fix incorrect use of == instead eq
|
2021-06-14 09:45:08 -04:00 |
|
Isaac Connor
|
7417d32fbc
|
Add a 5 second timeout when setting suspending/resuming motion detection.Log errors appropriately
|
2021-05-28 10:29:44 -04:00 |
|
Isaac Connor
|
bdae5dd9f8
|
Sort field should be StartDateTime not StartTime
|
2021-05-12 10:32:03 -04:00 |
|
Isaac Connor
|
9ee5e983d6
|
Add ZM_FEATURES_SNAPSHOTS to Config. Fix true=>yes
|
2021-05-04 13:19:10 -04:00 |
|
Isaac Connor
|
91a09608ea
|
Use newlines to make debugging sql easier to read.
|
2021-05-02 13:37:26 -04:00 |
|
Isaac Connor
|
202c4ef28c
|
copy array_diff sub into Object so we don't have the dependency
|
2021-04-29 19:00:36 -04:00 |
|
Isaac Connor
|
e32771c255
|
Add Zones() to Monitor
|
2021-04-29 14:49:39 -04:00 |
|
Isaac Connor
|
69098ccdcb
|
Implement changes() in Object
|
2021-04-29 14:49:30 -04:00 |
|
Isaac Connor
|
df754f0085
|
Can't do suspend in sendCmd
|
2021-04-24 19:22:17 -04:00 |
|
Isaac Connor
|
8d4c2afda8
|
Can't do suspend in sendCmd
|
2021-04-24 12:00:38 -04:00 |
|
Isaac Connor
|
4843cb8593
|
Add ModectDuringPTZ and suspend and resume functions
|
2021-04-23 14:52:29 -04:00 |
|
Isaac Connor
|
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 |
|
Isaac Connor
|
36ac473ad2
|
Add suspend/resume of MotionDetection of ModectDuringPTZ is off.
|
2021-04-23 14:52:29 -04:00 |
|
Isaac Connor
|
7c70c26fbd
|
Cleanup old Continuous stop. Rename lastMove to LastCmd and implement for Zoom
|
2021-04-21 14:30:02 -04:00 |
root
|
200dda11a2
|
Merge branch 'continuous' into cont_mast
|
2021-04-16 10:07:10 -04:00 |
|
Isaac Connor
|
c9c4224dd2
|
Change url used for authentication to magicBox.cgi?action=getDeviceType
|
2021-04-14 17:19:07 -04:00 |
|
Isaac Connor
|
7489c3850d
|
Store last command for continuous moves so that moveStop can send the correct stop command
|
2021-04-14 17:19:01 -04:00 |
|
Isaac Connor
|
4ead6886a3
|
Make shm debug level 3
|
2021-04-10 15:40:37 -04:00 |
|
Isaac Connor
|
da630f7534
|
Move shm Memory debug statements to level 2.
|
2021-04-10 15:35:24 -04:00 |
|
Isaac Connor
|
60970673c7
|
Implement debug levels in perl side. DEBUG==DEBUG1.
|
2021-04-10 15:35:04 -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 |