Aleksander Machniak
2013-07-31 a67ad15d2f0b2f2e8aec9e5f0cff07f48447f287
Support special Return-Path form used on some (PEAR) mailing list (#1489241)
1 files modified
8 ■■■■ changed files
program/steps/mail/func.inc 8 ●●●● patch | view | raw | blame | history
program/steps/mail/func.inc
@@ -1803,8 +1803,14 @@
    // 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;
                }