Changeset 930 for trunk/Packages/Common/Mail.php

Timestamp:

May 11, 2022, 12:21:42 PM (3 years ago)

Author:

chronos

Message:

• Fixed: Encode utf-8 names in "from" email field.

File:

• trunk/Packages/Common/Mail.php (modified) (1 diff)

trunk/Packages/Common/Mail.php

@@ -135 +135 @@
     if ($this->AgentIdent != '') $this->Headers['X-Mailer'] = $this->AgentIdent;
     if ($this->ReplyTo != '') $this->Headers['Reply-To'] = $this->ReplyTo;
-    if ($this->From != '') $this->Headers['From'] = $this->From;
+    if ($this->From != '') 
+    { 
+      $IndexStart = strpos($this->From, '<');
+      if ($IndexStart !== false)
+      {
+        $this->Headers['From'] = '=?utf-8?Q?'.quoted_printable_encode(trim(substr($this->From, 0, $IndexStart))).'?= '.substr($this->From, $IndexStart);
+      } else
+      {
+        $this->Headers['From'] = $this->From;
+      }
+    }
 
     $Headers = '';