196 Commits

Author SHA1 Message Date
Isaac Connor
a7e25ad18b Only require mail sending modules if we are actually sending mail 2024-08-18 12:18:44 -04:00
Isaac Connor
a24fbe4574 Add EmailServer to filter to override server set in options 2024-07-10 17:14:36 -04:00
Isaac Connor
84e1869fb8 Add ELOC substitution to get Latitude and Longitude of event 2024-07-05 17:28:59 -04:00
Isaac Connor
56dec01eef Fix summary email inline images not working. 2024-06-27 08:11:33 -04:00
Isaac Connor
efe61f3a83 Remove debug line causing crashes 2024-02-07 16:50:18 -05:00
Nickolai Golubev
fa9ddac61d fixed bug in zmfilter.pl.in on line #632, per https://github.com/ZoneMinder/zoneminder/issues/3811 2024-02-04 01:43:33 -08:00
Charlie Root
dbb8a942d9 Only require URI::Encode if having attachments 2024-01-24 14:27:38 -08:00
Isaac Connor
0a6139b57d Rename variable from html to text because it is the text case. 2024-01-17 17:08:35 -05:00
Isaac Connor
f45c787d07 Instead of replacing with empty string, replace with content_id which is the filename and is the behaviour specified in PR #3769 2024-01-17 17:08:35 -05:00
Isaac Connor
8618900339 If we are not doing an html email, then don't replace with img tags referencing the attachment. Just do the attachment. Introduce %FID% to sub with the id of the filter. 2024-01-15 16:58:54 -05:00
Isaac Connor
878b521a08 Add replacements for EI1, EIM, EIA1, EIAM when there are no alarm frames. 2024-01-12 13:34:36 -05:00
Isaac Connor
9e2a4335d1 Even objects can have cached properties, so add an undef in calls to Storage and Path so that they get recalculated. This should fix invalid errors about Event already being moved, when in fact it hasn't. 2024-01-05 10:43:33 -05:00
Isaac Connor
6f40293e93 Fix incorrect use of zmDbExecute causing emails to not be sent. Fixes #3800 2024-01-04 10:16:38 -05:00
Isaac Connor
112eb6b9ad Add support for EISNAP and EPISNAP for snapshot image 2023-12-19 12:27:02 -05:00
Isaac Connor
4eaf274c67 Use new zmDbExecute helper function, when there are no alarm frames, still do the substitutions so that we don't leave the tags. EIMOD and EIMODG don't depend on frames, so move them out. 2023-12-19 12:16:19 -05:00
Isaac Connor
66e1f968c0 Add a warning when a filter takes longere than it's execution period 2023-12-18 11:40:20 -05:00
Isaac Connor
651fe2596f Remove debug, add ETAGS subsitution. Fix not doing substitutions on the head of a summary email 2023-10-04 17:08:13 -04:00
Isaac Connor
bf34db7da2 Log a warning when failed to send an email 2023-09-09 12:04:57 -04:00
Alejandro Criado-Pérez
871bf1772f fix: messages 2023-07-05 01:03:48 +02:00
Isaac Connor
2f827a5178 Fix EPATH substitution 2023-05-30 12:01:14 -04:00
Isaac Connor
e51ddc2492 Don't require loading the monitor object for MonitorId 2023-05-29 20:43:49 -04:00
Isaac Connor
e8cd673569 Add MID and EID substitutions 2023-05-29 16:23:15 -04:00
Isaac Connor
e0d0d17f5e Fix not attaching body when not doing an html body. Fixes #3708 2023-05-16 09:56:01 -04:00
Isaac Connor
becabbcd1a Make objdetect attachments have unique filename 2023-04-26 14:54:02 -04:00
Isaac Connor
1d7fe3f8ff objdetect images not existing should not be a warning 2023-04-25 09:59:40 -04:00
Isaac Connor
3fbf16cf74 Only send summary email if there are events 2023-04-24 20:15:11 -04:00
Isaac Connor
d2fb365fa9 Add the ability to send a single summary email instead of individual emails per event 2023-04-24 17:53:16 -04:00
Isaac Connor
ffb4e05089 Missing objdetect.gif should be a debug, not a warning 2023-04-24 08:28:54 -04:00
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