diff options
| -rw-r--r-- | mod/notification-email.rsc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mod/notification-email.rsc b/mod/notification-email.rsc index e266201..a505a50 100644 --- a/mod/notification-email.rsc +++ b/mod/notification-email.rsc @@ -42,7 +42,8 @@ :return false; } - :if ([ :typeof [ :toip [ /tool/e-mail/get address ] ] ] != "ip" && [ $IsDNSResolving ] = false) do={ + :local EMailSettings [ /tool/e-mail/get ]; + :if ([ :typeof [ :toip [ $EitherOr ($EMailSettings->"server") ($EMailSettings->"address") ] ] ] != "ip" && [ $IsDNSResolving ] = false) do={ $LogPrintExit2 debug $0 ("Server address is a DNS name and resolving fails, not flushing.") false; :return false; } @@ -136,7 +137,7 @@ :local Cc [ $EitherOr ($EmailGeneralCcOverride->($Notification->"origin")) $EmailGeneralCc ]; :local EMailSettings [ /tool/e-mail/get ]; - :if ([ :len $To ] = 0 || ($EMailSettings->"address") = "0.0.0.0" || ($EMailSettings->"from") = "<>") do={ + :if ([ :len $To ] = 0 || [ $EitherOr ($EMailSettings->"server") ($EMailSettings->"address") ] = "0.0.0.0" || ($EMailSettings->"from") = "<>") do={ :return false; } |