Fix handling of email addresses with quoted domain part (#1490040)

Aleksander Machniak

2014-08-21 f01666a6229cfacee45d4131e7dbcb52e40abfea

 program/lib/Roundcube/rcube_mime.php

@@ -394,6 +394,7 @@
            }

            if ($address) {
                $address      = self::fix_email($address);
                $result[$key] = array('name' => $name, 'address' => $address);
            }
        }
@@ -906,4 +907,19 @@
        return 'image/' . $type;
    }

    /**
     * Try to fix invalid email addresses
     */
    public static function fix_email($email)
    {
        $parts = rcube_utils::explode_quoted_string('@', $email);
        foreach ($parts as $idx => $part) {
            // remove redundant quoting (#1490040)
            if ($part[0] == '"' && preg_match('/^"([a-zA-Z0-9._+=-]+)"$/', $part, $m)) {
                $parts[$idx] = $m[1];
            }
        }

        return implode('@', $parts);
    }
}