From c016a6ef47eb08ad0f1f72968348af7bfa0acad0 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 12 Mar 2024 21:52:18 +0100
Subject: mod/notification-email: add display name with identity (if not given)

---
 mod/notification-email.rsc | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'mod')

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;
-- 
cgit v1.2.3-70-g09d2