Decoder config options added #175

Author: Webklex

src/IMAP/Attachment.php

@@ -25,6 +25,9 @@ class Attachment {
     /** @var Message $oMessage */
     protected $oMessage;
 
+    /** @var array $config */
+    protected $config = [];
+
     /** @var object $structure */
     protected $structure;
 
@@ -85,6 +88,8 @@ class Attachment {
      * @throws Exceptions\ConnectionFailedException
      */
     public function __construct(Message $oMessage, $structure, $part_number = 1) {
+        $this->config = config('imap.options');
+
         $this->oMessage = $oMessage;
         $this->structure = $structure;
         $this->part_number = ($part_number) ? $part_number : $this->part_number;
@@ -226,7 +231,11 @@ public function getId() {
      * @param $name
      */
     public function setName($name) {
-        $this->name = mb_decode_mimeheader($name);
+        if($this->config['decoder']['message']['subject'] === 'utf-8') {
+            $this->name = imap_utf8($name);
+        }else{
+            $this->name = mb_decode_mimeheader($name);
+        }
     }
 
     /**

src/IMAP/Message.php

@@ -31,6 +31,9 @@ class Message {
      */
     private $client = Client::class;
 
+    /** @var array $config */
+    protected $config = [];
+
     /**
      * U ID
      *
@@ -174,8 +177,12 @@ class Message {
      * @param boolean       $fetch_flags
      *
      * @throws Exceptions\ConnectionFailedException
+     * @throws InvalidMessageDateException
      */
     public function __construct($uid, $msglist, Client $client, $fetch_options = null, $fetch_body = false, $fetch_attachment = false, $fetch_flags = false) {
+
+        $this->config = config('imap.options');
+
         $this->setFetchOption($fetch_options);
         $this->setFetchBodyOption($fetch_body);
         $this->setFetchAttachmentOption($fetch_attachment);
@@ -320,7 +327,11 @@ private function parseHeader() {
         }
 
         if (property_exists($header, 'subject')) {
-            $this->subject = mb_decode_mimeheader($header->subject);
+            if($this->config['decoder']['message']['subject'] === 'utf-8') {
+                $this->subject = imap_utf8($header->subject);
+            }else{
+                $this->subject = mb_decode_mimeheader($header->subject);
+            }
         }
         if (property_exists($header, 'from')) {
             $this->from = $this->parseAddresses($header->from);

src/config/imap.php

@@ -98,6 +98,9 @@
     |                               error: "Kerberos error: No credentials cache
     |                               file found (try running kinit) (...)"
     |                               or ['GSSAPI','PLAIN'] if you are using outlook mail
+    |   -Decoder options (currently only the message subject and attachment name decoder can be set)
+    |       'utf-8' - Uses imap_utf8($string) to decode a string
+    |       'mimeheader' - Uses mb_decode_mimeheader($string) to decode a string
     |
     */
     'options' => [
@@ -110,6 +113,14 @@
         'fetch_order' => 'asc',
         'open' => [
             // 'DISABLE_AUTHENTICATOR' => 'GSSAPI'
+        ],
+        'decoder' => [
+            'message' => [
+                'subject' => 'utf-8' // mimeheader
+            ],
+            'attachment' => [
+                'name' => 'utf-8' // mimeheader
+            ]
         ]
     ]
 ];