From c505e59a6d2cf45233c1e0de186b8d6fe9d804ba Mon Sep 17 00:00:00 2001 From: thomascube <thomas@roundcube.net> Date: Fri, 05 Sep 2008 05:29:06 -0400 Subject: [PATCH] Respect Content-Location headers in multipart/related messages (#1484946) --- program/include/rcube_imap.php | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php index 51e6b7d..439c556 100644 --- a/program/include/rcube_imap.php +++ b/program/include/rcube_imap.php @@ -1149,16 +1149,17 @@ if (empty($struct->disposition)) $struct->disposition = 'inline'; } + + // fetch message headers if message/rfc822 or named part (could contain Content-Location header) + if ($struct->ctype_primary == 'message' || ($struct->ctype_parameters['name'] && !$struct->content_id)) { + $part_headers = iil_C_FetchPartHeader($this->conn, $this->mailbox, $this->_msg_id, $struct->mime_id); + $struct->headers = $this->_parse_headers($part_headers) + $struct->headers; + } - // fetch message headers if message/rfc822 - if ($struct->ctype_primary=='message') - { - $headers = iil_C_FetchPartBody($this->conn, $this->mailbox, $this->_msg_id, $struct->mime_id.'.HEADER'); - $struct->headers = $this->_parse_headers($headers); - + if ($struct->ctype_primary=='message') { if (is_array($part[8]) && empty($struct->parts)) $struct->parts[] = $this->_structure_part($part[8], ++$count, $struct->mime_id); - } + } // normalize filename property $this->_set_part_filename($struct); -- Gitblit v1.9.1