Changeset 5033 in subversion for trunk/roundcubemail/program/lib/Mail/mimePart.php

Timestamp:

Aug 9, 2011 5:46:54 AM (22 months ago)

Author:

alec

Message:

• Fix handling of email addresses with quoted local part (#1487939)

File:

• trunk/roundcubemail/program/lib/Mail/mimePart.php (modified) (3 diffs)

trunk/roundcubemail/program/lib/Mail/mimePart.php

@@ -132 +132 @@
     var $_eol = "\r\n";
 
+
     /**
     * Constructor.
@@ -801 +802 @@
         // Structured header (make sure addr-spec inside is not encoded)
         if (!empty($separator)) {
+            // Simple e-mail address regexp
+            $email_regexp = '(\S+|("\s*(?:[^"\f\n\r\t\v\b\s]+\s*)+"))@\S+';
+
             $parts = Mail_mimePart::_explodeQuotedString($separator, $value);
             $value = '';
@@ -818 +822 @@
 
                 // let's find phrase (name) and/or addr-spec
-                if (preg_match('/^<\S+@\S+>$/', $part)) {
+                if (preg_match('/^<' . $email_regexp . '>$/', $part)) {
                     $value .= $part;
-                } else if (preg_match('/^\S+@\S+$/', $part)) {
+                } else if (preg_match('/^' . $email_regexp . '$/', $part)) {
                     // address without brackets and without name
                     $value .= $part;
-                } else if (preg_match('/<*\S+@\S+>*$/', $part, $matches)) {
+                } else if (preg_match('/<*' . $email_regexp . '>*$/', $part, $matches)) {
                     // address with name (handle name)
                     $address = $matches[0];