Commit Graph

168 Commits

Author SHA1 Message Date
Isaac Connor
4030da1caf Fix cutnpaste typo 2023-03-26 10:09:25 -04:00
Isaac Connor
3e34b36ec0 Fix email structure for ios 2023-02-16 17:24:23 -05:00
Isaac Connor
4b6f47eebd Fixup email structure so that inline images properly display while also having a text version. 2023-02-15 17:41:19 -05:00
Isaac Connor
c6e93036f3 Include command line in debug output when generating images 2023-02-13 14:46:33 -05:00
Isaac Connor
aba6281296 Fix typo 2023-02-12 16:49:46 -05:00
Isaac Connor
6893a3d84d Prevent duplicate attachments. Use eri_encode to escape content-id 2023-02-11 15:35:10 -05:00
Isaac Connor
44f75508c8 Attach a text version of body 2023-02-11 12:36:51 -05:00
Isaac Connor
6821be5d17 Add Content-ID to attachments 2023-02-11 09:21:00 -05:00
Isaac Connor
691e21997b Test out replacing attached image tag with cid based img 2023-02-10 18:49:50 -05:00
Isaac Connor
c747059996 Add a sleeping flag so that when we get sigterm, we can just exit instead of returning to the sleep 2023-02-07 09:27:38 -05:00
Isaac Connor
06a14f1410 Use object save method for Archive/Unarchive and don't do UpdateDiskSpace if event was deleted. 2022-12-02 15:57:47 -05:00
Isaac Connor
fd9b59a94b Improve info when moving event to show source and Dest paths 2022-11-27 17:38:56 -05:00
Isaac Connor
f965249ac6 Don't clear Diskspace a second time 2022-11-01 18:42:22 -04:00
Isaac Connor
0b11418c6a Update Execute function: Only add the path if there are no substitutions. Include status in debug output. Reload the Event from DB before updating the Executed flag because the executed command may have changed it. 2022-09-28 12:38:21 -04:00
Isaac Connor
3e43a1159a Add EPATH to substitutions and don't add path to execute unless no substitutions are being done 2022-09-28 11:08:06 -04:00
Isaac Connor
dd17bf5ef7 Make zmfilter.pl always honour ExecuteInterval. We might want it to be less than the default of 60 2022-05-17 14:49:54 -04:00
Isaac Connor
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
Isaac Connor
2aacbf790a handle warning due to not defined last_run 2021-12-26 11:51:32 -05:00
Isaac Connor
12ebdacf54 specify ZoneMinder::Database for zmSQLExecute 2021-12-15 09:11:55 -05:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
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
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
a99f9091fc remove useless commit. 2021-09-25 14:27:10 -04: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
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
a8bd1662e3 Add objdetect.gif support in filter email replacements 2021-04-28 19:12:37 -04: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
Isaac Connor
02386f0c64 SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED for zmfilter. 2021-01-14 12:56:54 -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
51ebaecc44 Fix MN and the various Event Total substitutions 2020-11-21 15:10:23 -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
adbd3486bf Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:49:39 -05:00
Isaac Connor
7a65a64644 add LockRows to Filters 2020-10-26 18:47:40 -04:00
Isaac Connor
4f5948cba0 Implement Unarchive action 2020-10-12 10:53:53 -04:00
Isaac Connor
e5776b79fa Introduce %EVF% Event video filename subst 2020-09-14 14:04:18 -04:00
Isaac Connor
98598f1441 Add a warning when an email exceeds 10Mb 2020-03-28 11:59:19 -04:00
Isaac Connor
4dee3532c3 handle additional atributes on the html tag in html detection 2020-02-26 09:42:17 -05:00
Isaac Connor
edf5066d84 Use Filter fields instead of config entries for Email content, subject, To. Also change the meaning of EPI1 and EPIM. Before they replaced with the url to the frame view. Now they are the url to the image view so that we can use them to embed images directly in the email. The old behaviour has been moved to EPF1 and EPFM. A similar change was made to EIMOD. 2020-01-22 13:58:44 -05:00
Isaac Connor
276be8fa37 spacing and quotes 2019-10-30 09:26:17 -04:00
Isaac Connor
370f93c56a toto => to 2019-10-21 10:27:41 -04:00
Isaac Connor
766a59884d Don't hard code perl path. Use PERL_EXECUTABLE cmake var 2019-09-23 12:54:27 -04:00
Isaac Connor
f01bedb33e Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-08-26 18:49:12 -04:00
Isaac Connor
5f5d5f691a Add backticks for mysql 8 2019-08-25 12:30:06 -04:00
Isaac Connor
5cc6b6b0af Fix EIMOD substitution 2019-08-07 11:15:50 -04:00
Isaac Connor
aff081ad41 Must commit after COpyTo to release locks 2019-07-24 11:23:13 -04:00
Isaac Connor
99f78c50af Add Updating SecondaryStorageId when using CopyTo 2019-07-24 09:37:38 -04:00
Isaac Connor
fd95ab23e9 Add AutoCopy support 2019-07-23 09:55:27 -04:00