utils: fix mailflow if smtputf8 is disabled

[pmg-api.git] / src / PMG / Utils.pm

diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm
index 10193f6ec943985806b9e0715452e3d8b7bb9931..825b8d94873197814457bc3cba2ddd3d16cd404e 100644 (file)
--- a/src/PMG/Utils.pm
+++ b/src/PMG/Utils.pm
@@ -221,6 +221,24 @@ sub subst_values_for_header {
     return $res;
 }
 
+sub mail_needs_smtputf8 {
+    my ($entity, $sender, $targets) = @_;
+
+    return 1 if ($sender =~ /[^\p{PosixPrint}]/);
+
+    foreach my $target (@$targets) {
+       if ($target =~ /[^\p{PosixPrint}]/) {
+           return 1;
+       }
+    }
+
+    if ($entity->head()->as_string() =~ /([^\p{PosixPrint}\n\r\t])/) {
+       return 1;
+    }
+
+    return 0;
+}
+
 sub reinject_mail {
     my ($entity, $sender, $targets, $xforward, $me, $params) = @_;
 
@@ -245,23 +263,9 @@ sub reinject_mail {
            }
        }
 
-       my $has_utf8_targets = 0;
-       foreach my $target (@$targets) {
-           if (utf8::is_utf8($target)) {
-               $has_utf8_targets = 1;
-               last;
-           }
-       }
-
        my $mail_opts = " BODY=8BITMIME";
-       my $sender_addr;
-       if (utf8::is_utf8($sender)) {
-           $sender_addr = encode('UTF-8', $smtp->_addr($sender));
-           $mail_opts .= " SMTPUTF8";
-       } else {
-           $sender_addr = $smtp->_addr($sender);
-           $mail_opts .= " SMTPUTF8" if $has_utf8_targets;
-       }
+       $mail_opts .= " SMTPUTF8" if mail_needs_smtputf8($entity, $sender, $targets);
+       my $sender_addr = encode('UTF-8', $smtp->_addr($sender));
 
        if (defined($params->{mail})) {
            my $mailparams = $params->{mail};
@@ -284,12 +288,8 @@ sub reinject_mail {
                    $rcpt_opts .= " $p=$rcptparams->{$p}";
                }
            }
+           $rcpt_addr = encode('UTF-8', $smtp->_addr($target));
 
-           if (utf8::is_utf8($target)) {
-               $rcpt_addr = encode('UTF-8', $smtp->_addr($target));
-           } else {
-               $rcpt_addr = $smtp->_addr($target);
-           }
            if (!$smtp->_RCPT("TO:" . $rcpt_addr . $rcpt_opts)) {
                syslog ('err', "smtp error - got: %s %s", $smtp->code, scalar($smtp->message));
                die "smtp to: ERROR";