From 3815e050e0e0ddafb919741426f3c36ebdadb9a8 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 03 Dec 2009 04:54:38 -0500
Subject: [PATCH] - Fix displaying nested message parts (#1486246)
---
program/include/rcube_message.php | 95 ++++++++++++++++++++++++++++++++---------------
1 files changed, 65 insertions(+), 30 deletions(-)
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index c18db4b..0b6fbb1 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -5,7 +5,7 @@
| program/include/rcube_message.php |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2008, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2008-2009, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -45,32 +45,48 @@
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();
$this->imap = $this->app->imap;
$this->uid = $uid;
- $this->headers = $this->imap->get_headers($uid);
+ $this->headers = $this->imap->get_headers($uid, NULL, true, true);
+
$this->subject = rcube_imap::decode_mime_string($this->headers->subject, $this->headers->charset);
list(, $this->sender) = each($this->imap->decode_address_list($this->headers->from));
$this->set_safe((intval($_GET['_safe']) || $_SESSION['safe_messages'][$uid]));
-
$this->opt = array(
'safe' => $this->is_safe,
'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)) {
+
+ if ($this->structure = $this->imap->get_structure($uid, $this->headers->body_structure)) {
$this->get_mime_numbers($this->structure);
$this->parse_structure($this->structure);
}
else {
$this->body = $this->imap->get_body($uid);
}
+
+ // notify plugins and let them analyze this structured message object
+ $this->app->plugins->exec_hook('message_load', array('object' => $this));
}
@@ -117,12 +133,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;
}
@@ -152,17 +169,13 @@
*/
function first_html_part()
{
- $html_part = null;
-
// check all message parts
foreach ($this->mime_parts as $mime_id => $part) {
$mimetype = strtolower($part->ctype_primary . '/' . $part->ctype_secondary);
if ($mimetype == 'text/html') {
- $html_part = $this->imap->get_message_part($this->uid, $mime_id, $part);
+ return $this->imap->get_message_part($this->uid, $mime_id, $part);
}
}
-
- return $html_part;
}
@@ -252,7 +265,7 @@
$html_part = $p;
else if ($sub_ctype_primary=='text' && $sub_ctype_secondary=='enriched')
$enriched_part = $p;
- else if ($sub_ctype_primary=='multipart' && ($sub_ctype_secondary=='related' || $sub_ctype_secondary=='mixed'))
+ else if ($sub_ctype_primary=='multipart' && in_array($sub_ctype_secondary, array('related', 'mixed', 'alternative')))
$related_part = $p;
}
@@ -310,8 +323,16 @@
$p->ctype_primary = 'text';
$p->ctype_secondary = 'plain';
$p->body = rcube_label('encryptedmessage');
+ $p->size = strlen($p->body);
- $this->parts[] = $p;
+ // maybe some plugins are able to decode this encrypted message part
+ $data = $this->app->plugins->exec_hook('message_part_encrypted', array('object' => $this, 'struct' => $structure, 'part' => $p));
+ if (is_array($data['parts'])) {
+ $this->parts = array_merge($this->parts, $data['parts']);
+ }
+ else if ($data['part']) {
+ $this->parts[] = $p;
+ }
}
// message contains multiple parts
else if (is_array($structure->parts) && !empty($structure->parts)) {
@@ -328,10 +349,9 @@
// part text/[plain|html] OR message/delivery-status
else if (($primary_type == 'text' && ($secondary_type == 'plain' || $secondary_type == 'html') && $mail_part->disposition != 'attachment') ||
($primary_type == 'message' && ($secondary_type == 'delivery-status' || $secondary_type == 'disposition-notification'))) {
-
- // add text part if we're not in alternative mode or if it matches the prefs
- if (!$this->parse_alternative ||
- ($secondary_type == 'html' && $this->opt['prefer_html']) ||
+
+ // add text part if it matches the prefs
+ if (($secondary_type == 'html' && $this->opt['prefer_html']) ||
($secondary_type == 'plain' && !$this->opt['prefer_html'])) {
$mail_part->type = 'content';
$this->parts[] = $mail_part;
@@ -344,29 +364,44 @@
// 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')
continue;
+
+ // part is Microsoft Outlook TNEF (winmail.dat)
+ else if ($primary_type == 'application' && $secondary_type == 'ms-tnef') {
+ foreach ((array)$this->imap->tnef_decode($mail_part, $structure->headers['uid']) as $tnef_part) {
+ $this->mime_parts[$tnef_part->mime_id] = $tnef_part;
+ $this->attachments[] = $tnef_part;
+ }
+ }
- // part is file/attachment
- else if ($mail_part->disposition == 'attachment' || $mail_part->disposition == 'inline' ||
+ // part is a file/attachment
+ else if (preg_match('/^(inline|attach)/', $mail_part->disposition) ||
$mail_part->headers['content-id'] || (empty($mail_part->disposition) && $mail_part->filename)) {
+
// 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']) {
- $mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']);
+ // part belongs to a related message and is linked
+ if ($message_ctype_secondary == 'related'
+ && preg_match('!^image/!', $mail_part->mimetype)
+ && ($mail_part->headers['content-id'] || $mail_part->headers['content-location'])) {
+ 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'];
+
$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 {
+ // is a regular attachment
+ else if (preg_match('!^[a-z]+/[a-z0-9-.+]+$!i', $mail_part->mimetype)) {
if (!$mail_part->filename)
$mail_part->filename = 'Part '.$mail_part->mime_id;
$this->attachments[] = $mail_part;
--
Gitblit v1.9.1