[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squirrelmail-cvs
Subject:    [SM-CVS] SF.net SVN: squirrelmail:[13899]
From:       pdontthink () users ! sourceforge ! net
Date:       2010-01-30 16:14:56
Message-ID: E1NbFyK-0005gp-Nw () bj8yhf1 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 13899
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=13899&view=rev
Author:   pdontthink
Date:     2010-01-30 16:14:53 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Encoded From headers now properly quoted (#2830141). A better fix might be to \
re-write encodeHeader()

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/class/mime/AddressStructure.class.php
    branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog
    branches/SM-1_4-STABLE/squirrelmail/functions/mime.php
    branches/SM-1_4-STABLE/squirrelmail/src/compose.php

Modified: branches/SM-1_4-STABLE/squirrelmail/class/mime/AddressStructure.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/mime/AddressStructure.class.php	2010-01-28 \
                16:59:27 UTC (rev 13898)
+++ branches/SM-1_4-STABLE/squirrelmail/class/mime/AddressStructure.class.php	2010-01-30 \
16:14:53 UTC (rev 13899) @@ -60,12 +60,13 @@
                                   : $this->mailbox);
             $personal = trim($this->personal);
             $is_encoded = false;
+            // FIXME: I don't think the U modifier below does anything at all
             if (preg_match('/(=\?([^?]*)\?(Q|B)\?([^?]*)\?=)(.*)/Ui',$personal,$reg)) \
{  $is_encoded = true;
             }
             if ($personal) {
                 if ($encoded && !$is_encoded) {
-                    $personal_encoded = encodeHeader($personal);
+                    $personal_encoded = encodeHeader('"' . $personal . '"');
                     if ($personal !== $personal_encoded) {
                         $personal = $personal_encoded;
                     } else {

Modified: branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog	2010-01-28 16:59:27 UTC (rev \
                13898)
+++ branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog	2010-01-30 16:14:53 UTC (rev \
13899) @@ -13,6 +13,7 @@
     patch.
   - Make base URL autodetection more robust; fixes some lighttpd issues
     (probably #1741469).
+  - Encoded From headers now properly quoted (#2830141).
 
 Version 1.4.20 RC2 - 17 Aug 2009
 --------------------------------

Modified: branches/SM-1_4-STABLE/squirrelmail/functions/mime.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/functions/mime.php	2010-01-28 16:59:27 UTC \
                (rev 13898)
+++ branches/SM-1_4-STABLE/squirrelmail/functions/mime.php	2010-01-30 16:14:53 UTC \
(rev 13899) @@ -789,6 +789,7 @@
     for($i = 0; $i < $j; ++$i) {
         switch($string{$i})
         {
+            case '"':
             case '=':
             case '<':
             case '>':

Modified: branches/SM-1_4-STABLE/squirrelmail/src/compose.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/src/compose.php	2010-01-28 16:59:27 UTC (rev \
                13898)
+++ branches/SM-1_4-STABLE/squirrelmail/src/compose.php	2010-01-30 16:14:53 UTC (rev \
13899) @@ -1525,7 +1525,7 @@
     if (!$rfc822_header->from[0]->host) $rfc822_header->from[0]->host = $domain;
     if ($full_name) {
         $from = $rfc822_header->from[0];
-        $full_name_encoded = encodeHeader($full_name);
+        $full_name_encoded = encodeHeader('"' . $full_name . '"');
         if ($full_name_encoded != $full_name) {
             $from_addr = $full_name_encoded .' \
<'.$from->mailbox.'@'.$from->host.'>';  } else {


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
-----
squirrelmail-cvs mailing list
List address: squirrelmail-cvs@lists.sourceforge.net
List info (subscribe/unsubscribe/change options): \
                https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
Repository: http://squirrelmail.org/svn


[prev in list] [next in list] [prev in thread] [next in thread]