diff options
| author | alecpl <alec@alec.pl> | 2008-09-14 09:19:29 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2008-09-14 09:19:29 +0000 |
| commit | 109314c7d15684c7ffe5d3f0545ed3f86615998f (patch) | |
| tree | a7c2b1ffd71b7ea36f4396c696dbeeaa6521eaa5 | |
| parent | 2106ec7043a636f2f706b44a0418e8d3c72c4c04 (diff) | |
- handle 'undisclosed-recipients in imap.inc
| -rw-r--r-- | program/lib/imap.inc | 3 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/program/lib/imap.inc b/program/lib/imap.inc index a2564de87..eb30d42c5 100644 --- a/program/lib/imap.inc +++ b/program/lib/imap.inc @@ -64,6 +64,7 @@ - don't return "??" from iil_C_GetQuota() - RFC3501 [7.1] don't call CAPABILITY if was returned in server optional resposne in iil_Connect(), added iil_C_GetCapability() + - remove 'undisclosed-recipients' string from 'To' header ********************************************************/ @@ -1676,7 +1677,7 @@ function iil_C_FetchHeaders(&$conn, $mailbox, $message_set, $uidfetch=false) $result[$id]->from = $string; break; case 'to': - $result[$id]->to = $string; + $result[$id]->to = preg_replace('/undisclosed-recipients:[;,]*/', '', $string); break; case 'subject': $result[$id]->subject = $string; diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 9f59931ea..6d23b6f8e 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -778,8 +778,6 @@ function rcmail_message_headers($attrib, $headers=NULL) else continue; } - else if ($hkey == 'to' && preg_match('/^undisclosed-recipients[:;]*$/', $headers['to'])) - continue; else if (in_array($hkey, array('from', 'to', 'cc', 'bcc'))) $header_value = Q(rcmail_address_string($headers[$hkey], null, true, $attrib['addicon']), 'show'); else |