Commit Graph

2496 Commits

Author SHA1 Message Date
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
a74b785d08 Move the protocol loading into the Monitor Object. 2021-10-26 18:15:43 -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
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
a99f9091fc remove useless commit. 2021-09-25 14:27:10 -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
c2472894be Fix html emails when using ZM_NEW_MAIL_MODULES. Improve debugging and reduce Info logging 2021-09-10 13:47:40 -04: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
1a0d488457 Spacing 2021-08-30 13:32:43 -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
91903d2822 Fix user summary, as there must be a space between -u and dbuser, etc 2021-08-05 13:30:52 -04:00
Isaac Connor
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
Isaac Connor
e9845d96f4 Fix Archive FTP .zip filename not including monitor name. Fixes #3304 2021-06-23 10:30:42 -04:00
Isaac Connor
9438445d74 Fix PTZ Diagonal cmds. Fixes #3300 2021-06-16 15:56:08 -04:00
Isaac Connor
94634f1ca7 Spacing 2021-06-14 13:31:05 -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
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
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
c080dd8a12 Fixes #2992. If no definition for a monitor is found, don't modify it. 2021-05-11 15:29:10 -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
a8bd1662e3 Add objdetect.gif support in filter email replacements 2021-04-28 19:12:37 -04:00
Isaac Connor
2302d814f2 Fix version test. split takes a regexp, so '.' matches everything. So change it to /\./. 2021-04-28 13:25:01 -04:00
Isaac Connor
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
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