Encoded From headers now properly quoted (#2830141). A better fix might be to re...

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@13900 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/class/mime/AddressStructure.class.php b/class/mime/AddressStructure.class.php
index bb55cf83ec6693881bac9654bce9ce619d7d8f56..a4438944eb793e9760710c69073c7f4214f6e1a5 100644 (file)
--- a/class/mime/AddressStructure.class.php
+++ b/class/mime/AddressStructure.class.php
@@ -65,9 +65,9 @@ class AddressStructure {
             }
             if ($personal) {
                 if ($encoded && !$is_encoded) {
-                    $personal_encoded = encodeHeader($personal);
+                    $personal_encoded = encodeHeader('"' . $personal . '"');
                     if ($personal !== $personal_encoded) {
-                        $personal = '"' . $personal_encoded . '"';
+                        $personal = $personal_encoded;
                     } else {
                         $personal = '"' . $this->personal . '"';
                     }

diff --git a/doc/ChangeLog b/doc/ChangeLog
index e158fd71e43017ab5f2369db5ce0fa73a249253c..5a2a56b4a167546e2018b00e47586f72b4632017 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -330,6 +330,7 @@ Version 1.5.2 - SVN
     patch.
   - Make base URL autodetection more robust; fixes some lighttpd issues
     (probably #1741469).
+  - Encoded From headers now properly quoted (#2830141).
 
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------

diff --git a/functions/identity.php b/functions/identity.php
index 55ed924628249c8d7b70764ad94e6b8fd3fdf2ca..dc3e5550ed735f7675e8506154302f3605cb5f1f 100644 (file)
--- a/functions/identity.php
+++ b/functions/identity.php
@@ -241,9 +241,9 @@ function build_from_header($identity = 0) {
         $from_mail .= '@' . $domain;
     
     if ( isset($from_name) ) {
-        $from_name_encoded = encodeHeader($from_name);
+        $from_name_encoded = encodeHeader('"' . $from_name . '"');
         if ($from_name_encoded != $from_name) {
-            return '"' . $from_name_encoded . '" <' . $from_mail . '>';
+            return $from_name_encoded . ' <' . $from_mail . '>';
         }
         return '"' . $from_name . '" <' . $from_mail . '>';
     }

diff --git a/functions/mime.php b/functions/mime.php
index d14adc2843f3e302920df0e818c180c6d7e4ea30..91d87207a7192c11bf4c548b3442c73c43c76432 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -958,6 +958,7 @@ function encodeHeader ($string) {
     for($i = 0; $i < $j; ++$i) {
         switch($string{$i})
         {
+            case '"':
             case '=':
             case '<':
             case '>':