Changing squirrelmail/Squirrelmail to SquirrelMail in some strings as well as other...

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

diff --git a/class/mime/AddressStructure.class.php b/class/mime/AddressStructure.class.php
index 7621b8f3b2cbb5da9179876cdb8572dd1d86707f..0f9d3b8ff46966ceb30904aa739ef687cfc0dc8f 100644 (file)
--- a/class/mime/AddressStructure.class.php
+++ b/class/mime/AddressStructure.class.php
@@ -3,14 +3,19 @@
 /**
  * AddressStructure.class.php
  *
- * Copyright (c) 2003 The SquirrelMail Project Team
+ * Copyright (c) 2003-2005 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * This contains functions needed to handle mime messages.
  *
- * $Id$
+ * @version $Id$
+ * @package squirrelmail
  */
 
+/**
+ * Undocumented class
+ * @package squirrelmail
+ */
 class AddressStructure {
     var $personal = '',
         $adl      = '',
@@ -18,15 +23,31 @@ class AddressStructure {
         $host     = '',
         $group    = '';
 
-    function getAddress($full = true) {
+    function getAddress($full = true, $encoded = false) {
         $result = '';
-
         if (is_object($this)) {
             $email = ($this->host ? $this->mailbox.'@'.$this->host
-                                 : $this->mailbox);
-            if (trim($this->personal)) {
-               $addr = ($email ? '"' . $this->personal . '" <' .$email.'>'
-                               : $this->personal);
+                                  : $this->mailbox);
+            $personal = trim($this->personal);
+            $is_encoded = false;
+            if (preg_match('/(=\?([^?]*)\?(Q|B)\?([^?]*)\?=)(.*)/Ui',$personal,$reg)) {
+                $is_encoded = true;
+            }
+            if ($personal) {
+                if ($encoded && !$is_encoded) {
+                    $personal_encoded = encodeHeader($personal);
+                    if ($personal !== $personal_encoded) {
+                        $personal = $personal_encoded;
+                    } else {
+                        $personal = '"'.$this->personal.'"';
+                    }
+                } else {
+                    if (!$is_encoded) {
+                        $personal = '"'.$this->personal.'"';
+                    }
+                }
+                $addr = ($email ? $personal . ' <' .$email.'>'
+                        : $this->personal);
                 $best_dpl = $this->personal;
             } else {
                 $addr = $email;
@@ -36,6 +57,10 @@ class AddressStructure {
         }
         return $result;
     }
+
+    function getEncodedAddress() {
+        return $this->getAddress(true, true);
+    }
 }
 
-?>
+?>
\ No newline at end of file