From 9e8a1756b7032fba21fec82efda57cf896a2735a Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 08 Dec 2008 14:42:31 -0500
Subject: [PATCH] #1485616: read content-id/content-location only for multipart/related type
---
program/include/rcube_message.php | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index c18db4b..6f4963b 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -45,7 +45,20 @@
public $sender = null;
public $is_safe = false;
-
+
+ /**
+ * __construct
+ *
+ * Provide a uid, and parse message structure.
+ *
+ * @param string $uid The message UID.
+ *
+ * @uses rcmail::get_instance()
+ * @uses rcube_imap::decode_mime_string()
+ * @uses self::set_safe()
+ *
+ * @see self::$app, self::$imap, self::$opt, self::$structure
+ */
function __construct($uid)
{
$this->app = rcmail::get_instance();
@@ -63,7 +76,7 @@
'prefer_html' => $this->app->config->get('prefer_html'),
'get_url' => rcmail_url('get', array('_mbox' => $this->imap->get_mailbox_name(), '_uid' => $uid))
);
-
+
if ($this->structure = $this->imap->get_structure($uid)) {
$this->get_mime_numbers($this->structure);
$this->parse_structure($this->structure);
@@ -117,12 +130,13 @@
* Get content of a specific part of this message
*
* @param string Part MIME-ID
+ * @param resource File pointer to save the message part
* @return string Part content
*/
- public function get_part_content($mime_id)
+ public function get_part_content($mime_id, $fp=NULL)
{
if ($part = $this->mime_parts[$mime_id])
- return $this->imap->get_message_part($this->uid, $mime_id, $part);
+ return $this->imap->get_message_part($this->uid, $mime_id, $part, NULL, $fp);
else
return null;
}
@@ -336,7 +350,7 @@
$mail_part->type = 'content';
$this->parts[] = $mail_part;
}
-
+
// list as attachment as well
if (!empty($mail_part->filename))
$this->attachments[] = $mail_part;
@@ -344,6 +358,10 @@
// part message/*
else if ($primary_type=='message') {
$this->parse_structure($mail_part, true);
+
+ // list as attachment as well (mostly .eml)
+ if (!empty($mail_part->filename))
+ $this->attachments[] = $mail_part;
}
// ignore "virtual" protocol parts
else if ($primary_type == 'protocol')
@@ -357,14 +375,16 @@
continue;
// part belongs to a related message
- if ($message_ctype_secondary == 'related' && $mail_part->headers['content-id']) {
- $mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']);
- $this->inline_parts[] = $mail_part;
- }
- else if ($message_ctype_secondary == 'related' && $mail_part->headers['content-location']) {
- $mail_part->content_location = $mail_part->headers['content-base'] . $mail_part->headers['content-location'];
- $this->inline_parts[] = $mail_part;
- }
+ if ($message_ctype_secondary == 'related') {
+ if ($mail_part->headers['content-id'])
+ $mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']);
+ if ($mail_part->headers['content-location'])
+ $mail_part->content_location = $mail_part->headers['content-base'] . $mail_part->headers['content-location'];
+
+ if ($mail_part->content_id || $mail_part->content_location) {
+ $this->inline_parts[] = $mail_part;
+ }
+ }
// is regular attachment
else {
if (!$mail_part->filename)
--
Gitblit v1.9.1