* applying patch from #1484811

release-0.6
till 17 years ago
parent bf1be0c931
commit 14432db388

@ -1596,7 +1596,8 @@ function iil_C_FetchHeaders(&$conn, $mailbox, $message_set, $uidfetch=false)
while ( list($lines_key, $str) = each($lines) ) { while ( list($lines_key, $str) = each($lines) ) {
list($field, $string) = iil_SplitHeaderLine($str); list($field, $string) = iil_SplitHeaderLine($str);
$field = strtolower($field); $field = strtolower($field);
$string = ereg_replace("\n[[:space:]]*"," ",$string);
switch ($field) { switch ($field) {
case 'date'; case 'date';
@ -1607,22 +1608,22 @@ function iil_C_FetchHeaders(&$conn, $mailbox, $message_set, $uidfetch=false)
$result[$id]->from = $string; $result[$id]->from = $string;
break; break;
case 'to': case 'to':
$result[$id]->to = str_replace("\n", " ", $string); $result[$id]->to = $string;
break; break;
case 'subject': case 'subject':
$result[$id]->subject = str_replace("\n", '', $string); $result[$id]->subject = $string;
break; break;
case 'reply-to': case 'reply-to':
$result[$id]->replyto = str_replace("\n", " ", $string); $result[$id]->replyto = $string;
break; break;
case 'cc': case 'cc':
$result[$id]->cc = str_replace("\n", " ", $string); $result[$id]->cc = $string;
break; break;
case 'bcc': case 'bcc':
$result[$id]->bcc = str_replace("\n", " ", $string); $result[$id]->bcc = $string;
break; break;
case 'content-transfer-encoding': case 'content-transfer-encoding':
$result[$id]->encoding = str_replace("\n", " ", $string); $result[$id]->encoding = $string;
break; break;
case 'content-type': case 'content-type':
$ctype_parts = explode(";", $string); $ctype_parts = explode(";", $string);
@ -1643,7 +1644,7 @@ function iil_C_FetchHeaders(&$conn, $mailbox, $message_set, $uidfetch=false)
case 'return-receipt-to': case 'return-receipt-to':
case 'disposition-notification-to': case 'disposition-notification-to':
case 'x-confirm-reading-to': case 'x-confirm-reading-to':
$result[$id]->mdn_to = str_replace("\n", " ", $string); $result[$id]->mdn_to = $string;
break; break;
case 'message-id': case 'message-id':
$result[$id]->messageID = $string; $result[$id]->messageID = $string;

Loading…
Cancel
Save