From 109314c7d15684c7ffe5d3f0545ed3f86615998f Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sun, 14 Sep 2008 09:19:29 +0000
Subject: - handle 'undisclosed-recipients in imap.inc

---
 program/lib/imap.inc        | 3 ++-
 program/steps/mail/func.inc | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'program')

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
-- 
cgit v1.2.3