version 2.0.0

Author: ddrv

README.md

@@ -25,10 +25,13 @@ PHP Class for sending email.
 ```php
 /**
  * Inititalization Mailer class. 
- * Sender must be from@host.name
- * Encoding of mail must be UTF-8
  */
-$mailer = new \Ddrv\Mailer\Mailer('from@host.name','utf8');
+$mailer = new \Ddrv\Mailer\Mailer();
+
+/**
+ * Set sender from@host.name as Site Administrator
+ */
+$mailer->sender('from@host.name','Site Administrator');
 
 /**
  * Set subject of mail

src/Mailer.php

@@ -11,7 +11,6 @@
  *
  * @property string  $sender
  * @property string  $subject
- * @property string  $encoding
  * @property array   $headers
  * @property array   $body
  * @property array   $attachments
@@ -58,22 +57,29 @@ class Mailer {
     protected $attachments;
 
     /**
-     * Encoding of message.
+     * Mailer constructor.
      *
-     * @var string
+     * @param string $sender
      */
-    protected $encoding = 'utf8';
+    public function __construct($sender='admin@localhost')
+    {
+        $this->sender = (string)$sender;
+        $this->reset();
+    }
 
     /**
-     * Mailer constructor.
+     * Set sender.
      *
-     * @param string $sender
-     * @param string $encoding
+     * @param string $senderEmail
+     * @param string $senderName
      */
-    public function __construct($sender='admin@localhost', $encoding='utf8')
+    public function sender($senderEmail, $senderName='')
     {
-        $this->sender = (string)$sender;
-        $this->encoding = preg_replace('/[^a-z0-9]/ui','',mb_strtolower((string)$encoding));
+        $this->sender = (string)$senderEmail;
+        $senderName = (string)$senderName;
+        if ($senderName) {
+            $this->sender .= '<'.$senderName.'>';
+        }
         $this->reset();
     }
 
@@ -98,7 +104,7 @@ public function body($text)
     {
         $this->body = [
             'headers' => [
-                'Content-Type' => 'text/html; charset='.$this->encoding,
+                'Content-Type' => 'text/html; charset=utf8',
             ],
             'content' => (string)$text,
         ];
@@ -227,7 +233,7 @@ protected function getBodySimpleText()
                 $this->setHeader($header, $value, true);
             }
         }
-        $this->setHeader('Content-type','text/html; charset='.$this->encoding, true);
+        $this->setHeader('Content-type','text/html; charset=utf8', true);
         return isset($this->body['content'])?(string)$this->body['content']:'';
     }
 
@@ -243,15 +249,9 @@ protected function getBodyMultipart()
         $this->setHeader('Content-Type', 'multipart/mixed; boundary="'.$separator.'"', true);
         $this->setHeader('Content-Transfer-Encoding', '7bit', true);
         $body[] = null;
-        $b = $eol.'Content-type: text/html; charset='.$this->encoding.$eol;
-        $bits = '7bit';
-        switch ($this->encoding) {
-            case 'utf8':
-                $bits='8bit';
-                break;
-        }
+        $b = $eol.'Content-type: text/html; charset=utf8'.$eol;
         $message = isset($this->body['content'])?$this->body['content']:null;
-        $b .= 'Content-Transfer-Encoding: '.$bits.$eol;
+        $b .= 'Content-Transfer-Encoding: 8bit'.$eol;
         $b .= $eol.$message.$eol;
         $body[] = $b;
         foreach ($this->attachments as $attachment=>$data) {