Crash_Override/routeros-scripts
1
0
Fork 0
mirror of https://github.com/eworm-de/routeros-scripts synced 2024-05-14 10:04:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

mod/notification-email: add display name with identity (if not given)

Browse source
This commit is contained in:
Christian Hesse 2024-03-12 21:52:18 +01:00
parent 44fc69e82d
commit c016a6ef47
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
mod/notification-email.rsc
View file

@ -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;