aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/notification-email.rsc19
1 files changed, 17 insertions, 2 deletions
diff --git a/mod/notification-email.rsc b/mod/notification-email.rsc
index 78192f3..d801d78 100644
--- a/mod/notification-email.rsc
+++ b/mod/notification-email.rsc
@@ -8,6 +8,7 @@
# send notifications via e-mail
# https://git.eworm.de/cgit/routeros-scripts/about/doc/mod/notification-email.md
+:global EMailGenerateFrom;
:global FlushEmailQueue;
:global LogForwardFilterLogForwarding;
:global NotificationEMailSubject;
@@ -17,11 +18,25 @@
:global SendEMail;
:global SendEMail2;
+# generate from-property with display name
+:set EMailGenerateFrom do={
+ :global Identity;
+
+ :local From [ /tool/e-mail/get from ];
+
+ :if ($From ~ "<.*>\$") do={
+ :return $From;
+ }
+
+ :return ("\"" . $Identity . " via routeros-scripts\" <" . $From . ">");
+}
+
# flush e-mail queue
:set FlushEmailQueue do={
:global EmailQueue;
:global EitherOr;
+ :global EMailGenerateFrom;
:global IsDNSResolving;
:global IsTimeSync;
:global LogPrint;
@@ -67,8 +82,8 @@
$LogPrint warning $0 ("File '" . $File . "' does not exist, can not attach.");
}
}
- /tool/e-mail/send to=($Message->"to") cc=($Message->"cc") subject=($Message->"subject") \
- body=($Message->"body") file=$Attach;
+ /tool/e-mail/send from=[ $EMailGenerateFrom ] to=($Message->"to") cc=($Message->"cc") \
+ subject=($Message->"subject") body=($Message->"body") file=$Attach;
:local Wait true;
:do {
:delay 1s;