simplify some reply and from formatting logic for easier testing

cypht-org · Nov 13, 2018 · 5bdd026 · 5bdd026
1 parent 5cb8199
commit 5bdd026
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/modules/smtp/modules.php b/modules/smtp/modules.php
@@ -1218,13 +1218,13 @@ function outbound_address_check($mod, $from, $reply_to) {
         }
     }
     if ($domain) {
-        if (!is_email_address($from)) {
+        if (strpos($from, '@') === false) {
             $from = $from.'@'.$domain;
         }
         if (!trim($reply_to)) {
             $reply_to = $from;
         }
-        elseif (!is_email_address($reply_to)) {
+        elseif (strpos($reply_to, '@') === false) {
             $reply_to = $reply_to.'@'.$domain;
         }
     }