Added rfc2184 support in order to handle:

[squirrelmail.git] / class / mime / AddressStructure.class.php

diff --git a/class/mime/AddressStructure.class.php b/class/mime/AddressStructure.class.php
index 1382493124a76dfaee676735c6d362b755491482..91e04e27c87046ebe3a7fb692b551a49aae75199 100644 (file)
--- a/class/mime/AddressStructure.class.php
+++ b/class/mime/AddressStructure.class.php
@@ -20,13 +20,16 @@ class AddressStructure {
 
     function getAddress($full = true, $encoded = false) {
         $result = '';
-
         if (is_object($this)) {
             $email = ($this->host ? $this->mailbox.'@'.$this->host
-                                 : $this->mailbox);
+                                  : $this->mailbox);
             $personal = trim($this->personal);
+            $is_encoded = false;
+            if (preg_match('/(=\?([^?]*)\?(Q|B)\?([^?]*)\?=)(.*)/Ui',$personal,$reg)) {
+                $is_encoded = true;
+            }
             if ($personal) {
-                if ($encoded) {
+                if ($encoded && !$is_encoded) {
                     $personal_encoded = encodeHeader($personal);
                     if ($personal !== $personal_encoded) {
                         $personal = $personal_encoded;
@@ -34,10 +37,12 @@ class AddressStructure {
                         $personal = '"'.$this->personal.'"';
                     }
                 } else {
-                    $personal = '"'.$this->personal.'"';
+                    if (!$is_encoded) {
+                        $personal = '"'.$this->personal.'"';
+                    }
                 }
-               $addr = ($email ? $personal . ' <' .$email.'>'
-                               : $this->personal);
+                $addr = ($email ? $personal . ' <' .$email.'>'
+                        : $this->personal);                                    
                 $best_dpl = $this->personal;
             } else {
                 $addr = $email;