headers encoding

Author: ddrv

src/Message.php

@@ -50,13 +50,15 @@ final class Message
 
     public function __construct($subject = null, $html = null, $plain = null)
     {
+        $this->boundary = dechex(rand(0, 16777215));
         $this->setHeader("MIME-Version", "1.0");
+        $this->setHeaderRaw("Content-Type", "multipart/mixed; boundary=\"r={$this->boundary}\"");
+        $this->setHeader("Content-Transfer-Encoding", "7bit");
         $mailer = sprintf("ddrv/mailer-%s (https://github.com/ddrv/mailer)", Mailer::MAILER_VERSION);
         $this->setHeader("X-Mailer", $mailer);
         $this->setSubject($subject);
         $this->setHtmlBody($html);
         $this->setPlainBody($plain);
-        $this->boundary = dechex(rand(0, 16777215));
     }
 
     public function setSubject($subject)
@@ -143,15 +145,30 @@ public function getBcc()
         return $this->bcc;
     }
 
+    public function setFrom($email, $name = "")
+    {
+        $email = (string)$email;
+        if (!$email) return false;
+        if (!$this->checkEmail($email)) return false;
+        $contact = $this->getContact($email, $name);
+        $this->setHeaderRaw("From", $contact);
+    }
+
     public function getRecipients()
     {
         return array_keys(array_replace($this->to, $this->cc, $this->bcc));
     }
 
     public function setHeader($header, $value)
+    {
+        $this->setHeaderRaw($header, $this->headerEncode($value));
+        return $this;
+    }
+
+    private function setHeaderRaw($header, $value)
     {
         $header = (string)$header;
-        $value = str_replace("\r\n", "", (string)$value);
+        //$value = str_replace(array("\r", "\n"), "", (string)$value);
         if ($value) {
             $this->headers[mb_strtolower($header)] = "$header: $value";
         } else {
@@ -226,8 +243,6 @@ public function getSubject()
 
     public function getHeaders()
     {
-        $this->setHeader("Content-Type", "multipart/mixed; boundary=\"r={$this->boundary}\"");
-        $this->setHeader("Content-Transfer-Encoding", "7bit");
         $headers = array_values($this->headers);
         return $headers;
     }
@@ -359,26 +374,26 @@ private function addAddress($type, $email, $name)
 
     private function replaceHeaderTo()
     {
-        $this->setHeader("To", implode(", ", $this->to));
+        $this->setHeaderRaw("To", implode(", ", $this->to));
     }
 
     private function replaceHeaderCc()
     {
-        $this->setHeader("Cc", implode(", ", $this->cc));
+        $this->setHeaderRaw("Cc", implode(", ", $this->cc));
     }
 
     private function replaceHeaderBcc()
     {
-        $this->setHeader("Bcc", implode(", ", $this->bcc));
+        $this->setHeaderRaw("Bcc", implode(", ", $this->bcc));
     }
 
     private function getContact($email, $name = "")
     {
         $email = (string)$email;
         $name = preg_replace("/[^\pL\s\,\.\d]/ui", "", (string)$name);
         $name = trim($name);
-        if (preg_match("/[\,\.]/ui", $name)) $name = "\"$name\"";
-        if ($name) $name .= " ";
+        if (preg_match("/[^a-z0-9\s]+/ui", $name)) $name = $this->headerEncode($name);
+        if ($name) $name = "$name ";
         return "$name<$email>";
     }
 
@@ -414,4 +429,10 @@ public function unserialize($serialized)
             $this->$key = array_key_exists($key, $raw) ? $raw[$key] : $default;
         }
     }
+
+    private function headerEncode($value)
+    {
+        $value = mb_encode_mimeheader($value, "UTF-8", "B", "\r\n", 0);
+        return $value;
+    }
 }

src/Message/MessagePart.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Ddrv\Mailer\Message;
+
+final class MessagePart
+{
+
+    private $content;
+
+    private $mime;
+
+    public function __construct($content, $mimeType)
+    {
+        $this->content = $content;
+        $this->mime = $mimeType;
+    }
+
+    public function getRaw()
+    {
+
+    }
+}

tests/Support/Factory/MessageFactory.php

@@ -18,7 +18,7 @@ class MessageFactory
 
     public function __construct()
     {
-        $this->faker = Factory::create();
+        $this->faker = Factory::create("ru_RU");
         $this->from = sprintf("PHPUnit Test <%s+phpunit@localhost>", get_current_user());
     }