From ffbf910df93d0a29fc8ea5a6fb0fa39e078fa77e Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 01 Dec 2008 15:15:50 -0500
Subject: [PATCH] Insert meta content-type at top of the html head + add both content-id and content-location of related parts to replacement table
---
program/include/rcube_message.php | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index f2e4be3..75c47df 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);
@@ -345,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')
@@ -356,14 +373,14 @@
// skip apple resource forks
if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile')
continue;
-
- // part belongs to a related message
- if ($message_ctype_secondary == 'related' && $mail_part->headers['content-id']) {
+
+ 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']) {
+ if ($message_ctype_secondary == 'related' && $mail_part->headers['content-location'])
$mail_part->content_location = $mail_part->headers['content-base'] . $mail_part->headers['content-location'];
+
+ // part belongs to a related message
+ if ($mail_part->content_id || $mail_part->content_location) {
$this->inline_parts[] = $mail_part;
}
// is regular attachment
--
Gitblit v1.9.1