From ae579cee860c90183b3968d9658ffe0b3ba29dd5 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 18 Sep 2008 16:48:04 -0400
Subject: [PATCH] Also list message/rfc822 parts as attachment if a filename is specified
---
program/include/rcube_message.php | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index 1e3bc7f..10b9e8e 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -117,12 +117,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;
}
@@ -227,6 +228,11 @@
// print body if message doesn't have multiple parts
if ($message_ctype_primary == 'text' && !$recursive) {
+ $structure->type = 'content';
+ $this->parts[] = &$structure;
+ }
+ // the same for pgp signed messages
+ else if ($message_ctype_primary == 'application' && $message_ctype_secondary == 'pgp' && !$recursive) {
$structure->type = 'content';
$this->parts[] = &$structure;
}
@@ -339,6 +345,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')
@@ -356,6 +366,10 @@
$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;
+ }
// is regular attachment
else {
if (!$mail_part->filename)
@@ -370,7 +384,11 @@
$a_replaces = array();
foreach ($this->inline_parts as $inline_object) {
- $a_replaces['cid:'.$inline_object->content_id] = $this->get_part_url($inline_object->mime_id);
+ $part_url = $this->get_part_url($inline_object->mime_id);
+ if ($inline_object->content_id)
+ $a_replaces['cid:'.$inline_object->content_id] = $part_url;
+ if ($inline_object->content_location)
+ $a_replaces[$inline_object->content_location] = $part_url;
}
// add replace array to each content part
--
Gitblit v1.9.1