Support special Return-Path form used on some (PEAR) mailing list (#1489241)

pull/117/head
Aleksander Machniak 11 years ago
parent dfaf8c5b8c
commit a67ad15d2f

@ -1803,8 +1803,14 @@ function rcmail_identity_select($MESSAGE, $identities = null, $compose_mode = 'r
// Try Return-Path
if ($from_idx === null && ($return_path = $MESSAGE->headers->others['return-path'])) {
foreach ($identities as $idx => $ident) {
// Return-Path header contains an email address, but on some mailing list
// it can be e.g. <pear-dev-return-55250-local=domain.tld@lists.php.net>
// where local@domain.tld is the address we're looking for (#1489241)
$ident1 = $ident['email_ascii'];
$ident2 = str_replace('@', '=', $ident1);
foreach ((array)$return_path as $path) {
if (stripos($path, $ident['email_ascii']) !== false) {
if (stripos($path, $ident1) !== false || stripos($path, $ident2)) {
$from_idx = $idx;
break 2;
}

Loading…
Cancel
Save