From d311d809d650e4cab6a5bf0aeb92b97631672c64 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 28 May 2010 05:38:41 -0400
Subject: [PATCH] - Fix forwarding of messages with winmail attachments - Remove some redundant code for winmail handling in get.inc, move tnef_decode() to rcube_message - Fix handling of uuencoded attachments in message body (#1485839) - Extend rc_mime_content_type() to work with string buffer
---
CHANGELOG | 2
program/include/rcube_shared.inc | 18
program/include/rcube_imap.php | 40 --
program/steps/mail/compose.inc | 5
program/steps/mail/get.inc | 11
program/include/rcube_message.php | 1036 ++++++++++++++++++++++++++++++------------------------
6 files changed, 589 insertions(+), 523 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 7ec5476..7ee8fbd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
CHANGELOG RoundCube Webmail
===========================
+- Fix forwarding of messages with winmail attachments
+- Fix handling of uuencoded attachments in message body (#1485839)
- Added list_mailboxes hook in rcube_imap::list_unsubscribed() (#1486668)
- Fix wrong message on file upload error (#1486725)
- Add support for data URI scheme [RFC2397] (#1486740)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index cdf346a..97662e4 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -472,7 +472,6 @@
// get message count and store in cache
if ($mode == 'UNSEEN')
$search_str .= " UNSEEN";
-
// get message count using SEARCH
// not very performant but more precise (using UNDELETED)
// disable THREADS for this request
@@ -2034,7 +2033,7 @@
return true;
// convert charset (if text or message part)
- if ($o_part->ctype_primary=='text' || $o_part->ctype_primary=='message') {
+ if ($o_part->ctype_primary == 'text' || $o_part->ctype_primary == 'message') {
// assume default if no charset specified
if (empty($o_part->charset) || strtolower($o_part->charset) == 'us-ascii')
$o_part->charset = $this->default_charset;
@@ -3379,43 +3378,6 @@
}
return $out;
- }
-
-
- /**
- * Decode a Microsoft Outlook TNEF part (winmail.dat)
- *
- * @param object rcube_message_part Message part to decode
- * @param string UID of the message
- * @return array List of rcube_message_parts extracted from windmail.dat
- */
- function tnef_decode(&$part, $uid)
- {
- if (!isset($part->body))
- $part->body = $this->get_message_part($uid, $part->mime_id, $part);
-
- require_once('lib/tnef_decoder.inc');
-
- $pid = 0;
- $tnef_parts = array();
- $tnef_arr = tnef_decode($part->body);
-
- foreach ($tnef_arr as $winatt) {
- $tpart = new rcube_message_part;
- $tpart->filename = trim($winatt['name']);
- $tpart->encoding = 'stream';
- $tpart->ctype_primary = trim(strtolower($winatt['type0']));
- $tpart->ctype_secondary = trim(strtolower($winatt['type1']));
- $tpart->mimetype = $tpart->ctype_primary . '/' . $tpart->ctype_secondary;
- $tpart->mime_id = "winmail." . $part->mime_id . ".$pid";
- $tpart->size = $winatt['size'];
- $tpart->body = $winatt['stream'];
-
- $tnef_parts[] = $tpart;
- $pid++;
- }
-
- return $tnef_parts;
}
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index 47fe3d7..8236503 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -29,489 +29,595 @@
*/
class rcube_message
{
- private $app;
- private $imap;
- private $opt = array();
- private $inline_parts = array();
- private $parse_alternative = false;
+ private $app;
+ private $imap;
+ private $opt = array();
+ private $inline_parts = array();
+ private $parse_alternative = false;
- public $uid = null;
- public $headers;
- public $structure;
- public $parts = array();
- public $mime_parts = array();
- public $attachments = array();
- public $subject = '';
- public $sender = null;
- public $is_safe = false;
+ public $uid = null;
+ public $headers;
+ public $structure;
+ public $parts = array();
+ public $mime_parts = array();
+ public $attachments = array();
+ public $subject = '';
+ 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, 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, $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));
- }
-
-
- /**
- * Return a (decoded) message header
- *
- * @param string Header name
- * @param bool Don't mime-decode the value
- * @return string Header value
- */
- public function get_header($name, $raw = false)
- {
- $value = $this->headers->$name;
- return $raw ? $value : $this->imap->decode_header($value);
- }
-
- /**
- * Set is_safe var and session data
- *
- * @param bool enable/disable
- */
- public function set_safe($safe = true)
- {
- $this->is_safe = $safe;
- $_SESSION['safe_messages'][$this->uid] = $this->is_safe;
- }
-
- /**
- * Compose a valid URL for getting a message part
- *
- * @param string Part MIME-ID
- * @return string URL or false if part does not exist
- */
- public function get_part_url($mime_id)
- {
- if ($this->mime_parts[$mime_id])
- return $this->opt['get_url'] . "&_part=" . $mime_id;
- else
- return false;
- }
-
-
- /**
- * 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, $fp=NULL)
- {
- if ($part = $this->mime_parts[$mime_id])
- return $this->imap->get_message_part($this->uid, $mime_id, $part, NULL, $fp);
- else
- return null;
- }
-
-
- /**
- * Determine if the message contains a HTML part
- *
- * @return bool True if a HTML is available, False if not
- */
- function has_html_part()
- {
- // check all message parts
- foreach ($this->parts as $pid => $part) {
- $mimetype = strtolower($part->ctype_primary . '/' . $part->ctype_secondary);
- if ($mimetype == 'text/html')
- return true;
- }
-
- return false;
- }
-
- /**
- * Return the first HTML part of this message
- *
- * @return string HTML message part content
- */
- function first_html_part()
+ /**
+ * __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)
{
- // check all message parts
- foreach ($this->mime_parts as $mime_id => $part) {
- $mimetype = strtolower($part->ctype_primary . '/' . $part->ctype_secondary);
- if ($mimetype == 'text/html') {
- return $this->imap->get_message_part($this->uid, $mime_id, $part);
- }
- }
- }
+ $this->app = rcmail::get_instance();
+ $this->imap = $this->app->imap;
+
+ $this->uid = $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))
+ );
- /**
- * Return the first text part of this message
- *
- * @return string Plain text message/part content
- */
- function first_text_part()
- {
- // no message structure, return complete body
- if (empty($this->parts))
- return $this->body;
-
- $out = null;
-
- // check all message parts
- foreach ($this->mime_parts as $mime_id => $part) {
- $mimetype = strtolower($part->ctype_primary . '/' . $part->ctype_secondary);
-
- if ($mimetype == 'text/plain') {
- $out = $this->imap->get_message_part($this->uid, $mime_id, $part);
-
- // re-format format=flowed content
- if ($part->ctype_secondary == "plain" && $part->ctype_parameters['format'] == "flowed")
- $out = self::unfold_flowed($out);
- break;
- }
- else if ($mimetype == 'text/html') {
- $html_part = $this->imap->get_message_part($this->uid, $mime_id, $part);
-
- // remove special chars encoding
- $trans = array_flip(get_html_translation_table(HTML_ENTITIES));
- $html_part = strtr($html_part, $trans);
-
- // create instance of html2text class
- $txt = new html2text($html_part);
- $out = $txt->get_text();
- break;
- }
- }
-
- return $out;
- }
-
-
- /**
- * Raad the message structure returend by the IMAP server
- * and build flat lists of content parts and attachments
- *
- * @param object rcube_message_part Message structure node
- * @param bool True when called recursively
- */
- private function parse_structure($structure, $recursive = false)
- {
- $message_ctype_primary = $structure->ctype_primary;
- $message_ctype_secondary = $structure->ctype_secondary;
- $mimetype = $structure->mimetype;
-
- // real content-type of message/rfc822 part
- if ($mimetype == 'message/rfc822') {
- if ($structure->real_mimetype) {
- $mimetype = $structure->real_mimetype;
- list($message_ctype_primary, $message_ctype_secondary) = explode('/', $mimetype);
- }
- }
-
- // show message headers
- if ($recursive && is_array($structure->headers) && isset($structure->headers['subject'])) {
- $c = new stdClass;
- $c->type = 'headers';
- $c->headers = &$structure->headers;
- $this->parts[] = $c;
- }
-
- // 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 ($mimetype == 'application/pgp' && !$recursive) {
- $structure->type = 'content';
- $this->parts[] = &$structure;
- }
- // message contains alternative parts
- else if ($mimetype == 'multipart/alternative' && is_array($structure->parts)) {
- // get html/plaintext parts
- $plain_part = $html_part = $print_part = $related_part = null;
-
- foreach ($structure->parts as $p => $sub_part) {
- $sub_mimetype = $sub_part->mimetype;
-
- // check if sub part is
- if ($sub_mimetype == 'text/plain')
- $plain_part = $p;
- else if ($sub_mimetype == 'text/html')
- $html_part = $p;
- else if ($sub_mimetype == 'text/enriched')
- $enriched_part = $p;
- else if (in_array($sub_mimetype, array('multipart/related', 'multipart/mixed', 'multipart/alternative')))
- $related_part = $p;
- }
-
- // parse related part (alternative part could be in here)
- if ($related_part !== null && !$this->parse_alternative) {
- $this->parse_alternative = true;
- $this->parse_structure($structure->parts[$related_part], true);
- $this->parse_alternative = false;
-
- // if plain part was found, we should unset it if html is preferred
- if ($this->opt['prefer_html'] && count($this->parts))
- $plain_part = null;
- }
-
- // choose html/plain part to print
- if ($html_part !== null && $this->opt['prefer_html']) {
- $print_part = &$structure->parts[$html_part];
- }
- else if ($enriched_part !== null) {
- $print_part = &$structure->parts[$enriched_part];
- }
- else if ($plain_part !== null) {
- $print_part = &$structure->parts[$plain_part];
- }
-
- // add the right message body
- if (is_object($print_part)) {
- $print_part->type = 'content';
- $this->parts[] = $print_part;
- }
- // show plaintext warning
- else if ($html_part !== null && empty($this->parts)) {
- $c = new stdClass;
- $c->type = 'content';
- $c->body = rcube_label('htmlmessage');
- $c->ctype_primary = 'text';
- $c->ctype_secondary = 'plain';
-
- $this->parts[] = $c;
- }
-
- // add html part as attachment
- if ($html_part !== null && $structure->parts[$html_part] !== $print_part) {
- $html_part = &$structure->parts[$html_part];
- $html_part->filename = rcube_label('htmlmessage');
- $html_part->mimetype = 'text/html';
-
- $this->attachments[] = $html_part;
- }
- }
- // this is an ecrypted message -> create a plaintext body with the according message
- else if ($mimetype == 'multipart/encrypted') {
- $p = new stdClass;
- $p->type = 'content';
- $p->ctype_primary = 'text';
- $p->ctype_secondary = 'plain';
- $p->body = rcube_label('encryptedmessage');
- $p->size = strlen($p->body);
-
- // 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)) {
- // iterate over parts
- for ($i=0; $i < count($structure->parts); $i++) {
- $mail_part = &$structure->parts[$i];
- $primary_type = $mail_part->ctype_primary;
- $secondary_type = $mail_part->ctype_secondary;
-
- // real content-type of message/rfc822
- if ($mail_part->real_mimetype) {
- $part_orig_mimetype = $mail_part->mimetype;
- $part_mimetype = $mail_part->real_mimetype;
- list($primary_type, $secondary_type) = explode('/', $part_mimetype);
+ 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));
+ }
+
+
+ /**
+ * Return a (decoded) message header
+ *
+ * @param string Header name
+ * @param bool Don't mime-decode the value
+ * @return string Header value
+ */
+ public function get_header($name, $raw = false)
+ {
+ $value = $this->headers->$name;
+ return $raw ? $value : $this->imap->decode_header($value);
+ }
+
+
+ /**
+ * Set is_safe var and session data
+ *
+ * @param bool enable/disable
+ */
+ public function set_safe($safe = true)
+ {
+ $this->is_safe = $safe;
+ $_SESSION['safe_messages'][$this->uid] = $this->is_safe;
+ }
+
+
+ /**
+ * Compose a valid URL for getting a message part
+ *
+ * @param string Part MIME-ID
+ * @return string URL or false if part does not exist
+ */
+ public function get_part_url($mime_id)
+ {
+ if ($this->mime_parts[$mime_id])
+ return $this->opt['get_url'] . '&_part=' . $mime_id;
else
- $part_mimetype = $mail_part->mimetype;
-
- // multipart/alternative
- if ($primary_type=='multipart') {
- $this->parse_structure($mail_part, true);
-
- // list message/rfc822 as attachment as well (mostly .eml)
- if ($part_orig_mimetype == 'message/rfc822' && !empty($mail_part->filename))
- $this->attachments[] = $mail_part;
- }
- // part text/[plain|html] OR message/delivery-status
- else if ((($part_mimetype == 'text/plain' || $part_mimetype == 'text/html') && $mail_part->disposition != 'attachment') ||
- $part_mimetype == 'message/delivery-status' || $part_mimetype == 'message/disposition-notification') {
-
- // add text part if it matches the prefs
- if (!$this->parse_alternative ||
- ($secondary_type == 'html' && $this->opt['prefer_html']) ||
- ($secondary_type == 'plain' && !$this->opt['prefer_html'])) {
- $mail_part->type = 'content';
- $this->parts[] = $mail_part;
- }
-
- // list as attachment as well
- if (!empty($mail_part->filename))
- $this->attachments[] = $mail_part;
- }
- // 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 ($part_mimetype == 'application/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 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 and is linked
- if ($mimetype == 'multipart/related'
- && preg_match('!^image/!', $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;
- }
- // attachment encapsulated within message/rfc822 part needs further decoding (#1486743)
- else if ($part_orig_mimetype == 'message/rfc822') {
- $this->parse_structure($mail_part, true);
- }
- // is a regular attachment
- else if (preg_match('!^[a-z0-9-.+]+/[a-z0-9-.+]+$!i', $part_mimetype)) {
- if (!$mail_part->filename)
- $mail_part->filename = 'Part '.$mail_part->mime_id;
- $this->attachments[] = $mail_part;
- }
- }
- }
-
- // if this was a related part try to resolve references
- if ($mimetype == 'multipart/related' && sizeof($this->inline_parts)) {
- $a_replaces = array();
-
- foreach ($this->inline_parts as $inline_object) {
- $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
- // (will be applied later when part body is available)
- foreach ($this->parts as $i => $part) {
- if ($part->type == 'content')
- $this->parts[$i]->replaces = $a_replaces;
- }
- }
+ return false;
}
- // message is a single part non-text
- else if ($structure->filename) {
- $this->attachments[] = $structure;
+
+ /**
+ * 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, $fp=NULL)
+ {
+ if ($part = $this->mime_parts[$mime_id]) {
+ // stored in message structure (winmail/inline-uuencode)
+ if ($part->encoding == 'stream') {
+ if ($fp) {
+ fwrite($fp, $part->body);
+ }
+ return $fp ? true : $part->body;
+ }
+ // get from IMAP
+ return $this->imap->get_message_part($this->uid, $mime_id, $part, NULL, $fp);
+ } else
+ return null;
}
- }
- /**
- * Fill aflat array with references to all parts, indexed by part numbers
- *
- * @param object rcube_message_part Message body structure
- */
- private function get_mime_numbers(&$part)
- {
- if (strlen($part->mime_id))
- $this->mime_parts[$part->mime_id] = &$part;
+ /**
+ * Determine if the message contains a HTML part
+ *
+ * @return bool True if a HTML is available, False if not
+ */
+ function has_html_part()
+ {
+ // check all message parts
+ foreach ($this->parts as $pid => $part) {
+ $mimetype = strtolower($part->ctype_primary . '/' . $part->ctype_secondary);
+ if ($mimetype == 'text/html')
+ return true;
+ }
+
+ return false;
+ }
+
+
+ /**
+ * Return the first HTML part of this message
+ *
+ * @return string HTML message part content
+ */
+ function first_html_part()
+ {
+ // check all message parts
+ foreach ($this->mime_parts as $mime_id => $part) {
+ $mimetype = strtolower($part->ctype_primary . '/' . $part->ctype_secondary);
+ if ($mimetype == 'text/html') {
+ return $this->imap->get_message_part($this->uid, $mime_id, $part);
+ }
+ }
+ }
+
+
+ /**
+ * Return the first text part of this message
+ *
+ * @return string Plain text message/part content
+ */
+ function first_text_part()
+ {
+ // no message structure, return complete body
+ if (empty($this->parts))
+ return $this->body;
+
+ $out = null;
+
+ // check all message parts
+ foreach ($this->mime_parts as $mime_id => $part) {
+ $mimetype = $part->ctype_primary . '/' . $part->ctype_secondary;
+
+ if ($mimetype == 'text/plain') {
+ $out = $this->imap->get_message_part($this->uid, $mime_id, $part);
+
+ // re-format format=flowed content
+ if ($part->ctype_secondary == 'plain' && $part->ctype_parameters['format'] == 'flowed')
+ $out = self::unfold_flowed($out);
+ break;
+ }
+ else if ($mimetype == 'text/html') {
+ $html_part = $this->imap->get_message_part($this->uid, $mime_id, $part);
+
+ // remove special chars encoding
+ $trans = array_flip(get_html_translation_table(HTML_ENTITIES));
+ $html_part = strtr($html_part, $trans);
+
+ // create instance of html2text class
+ $txt = new html2text($html_part);
+ $out = $txt->get_text();
+ break;
+ }
+ }
+
+ return $out;
+ }
+
+
+ /**
+ * Raad the message structure returend by the IMAP server
+ * and build flat lists of content parts and attachments
+ *
+ * @param object rcube_message_part Message structure node
+ * @param bool True when called recursively
+ */
+ private function parse_structure($structure, $recursive = false)
+ {
+ $message_ctype_primary = $structure->ctype_primary;
+ $message_ctype_secondary = $structure->ctype_secondary;
+ $mimetype = $structure->mimetype;
+
+ // real content-type of message/rfc822 part
+ if ($mimetype == 'message/rfc822') {
+ if ($structure->real_mimetype) {
+ $mimetype = $structure->real_mimetype;
+ list($message_ctype_primary, $message_ctype_secondary) = explode('/', $mimetype);
+ }
+ }
+
+ // show message headers
+ if ($recursive && is_array($structure->headers) && isset($structure->headers['subject'])) {
+ $c = new stdClass;
+ $c->type = 'headers';
+ $c->headers = &$structure->headers;
+ $this->parts[] = $c;
+ }
+
+ // print body if message doesn't have multiple parts
+ if ($message_ctype_primary == 'text' && !$recursive) {
+ $structure->type = 'content';
+ $this->parts[] = &$structure;
+
+ // Parse simple (plain text) message body
+ if ($message_ctype_secondary == 'plain')
+ foreach ((array)$this->uu_decode($structure) as $uupart) {
+ $this->mime_parts[$uupart->mime_id] = $uupart;
+ $this->attachments[] = $uupart;
+ }
+
+ // @TODO: plugin hook?
+ }
+ // the same for pgp signed messages
+ else if ($mimetype == 'application/pgp' && !$recursive) {
+ $structure->type = 'content';
+ $this->parts[] = &$structure;
+ }
+ // message contains alternative parts
+ else if ($mimetype == 'multipart/alternative' && is_array($structure->parts)) {
+ // get html/plaintext parts
+ $plain_part = $html_part = $print_part = $related_part = null;
+
+ foreach ($structure->parts as $p => $sub_part) {
+ $sub_mimetype = $sub_part->mimetype;
+
+ // check if sub part is
+ if ($sub_mimetype == 'text/plain')
+ $plain_part = $p;
+ else if ($sub_mimetype == 'text/html')
+ $html_part = $p;
+ else if ($sub_mimetype == 'text/enriched')
+ $enriched_part = $p;
+ else if (in_array($sub_mimetype, array('multipart/related', 'multipart/mixed', 'multipart/alternative')))
+ $related_part = $p;
+ }
+
+ // parse related part (alternative part could be in here)
+ if ($related_part !== null && !$this->parse_alternative) {
+ $this->parse_alternative = true;
+ $this->parse_structure($structure->parts[$related_part], true);
+ $this->parse_alternative = false;
+
+ // if plain part was found, we should unset it if html is preferred
+ if ($this->opt['prefer_html'] && count($this->parts))
+ $plain_part = null;
+ }
+
+ // choose html/plain part to print
+ if ($html_part !== null && $this->opt['prefer_html']) {
+ $print_part = &$structure->parts[$html_part];
+ }
+ else if ($enriched_part !== null) {
+ $print_part = &$structure->parts[$enriched_part];
+ }
+ else if ($plain_part !== null) {
+ $print_part = &$structure->parts[$plain_part];
+ }
+
+ // add the right message body
+ if (is_object($print_part)) {
+ $print_part->type = 'content';
+ $this->parts[] = $print_part;
+ }
+ // show plaintext warning
+ else if ($html_part !== null && empty($this->parts)) {
+ $c = new stdClass;
+ $c->type = 'content';
+ $c->ctype_primary = 'text';
+ $c->ctype_secondary = 'plain';
+ $c->body = rcube_label('htmlmessage');
+
+ $this->parts[] = $c;
+ }
+
+ // add html part as attachment
+ if ($html_part !== null && $structure->parts[$html_part] !== $print_part) {
+ $html_part = &$structure->parts[$html_part];
+ $html_part->filename = rcube_label('htmlmessage');
+ $html_part->mimetype = 'text/html';
+
+ $this->attachments[] = $html_part;
+ }
+ }
+ // this is an ecrypted message -> create a plaintext body with the according message
+ else if ($mimetype == 'multipart/encrypted') {
+ $p = new stdClass;
+ $p->type = 'content';
+ $p->ctype_primary = 'text';
+ $p->ctype_secondary = 'plain';
+ $p->body = rcube_label('encryptedmessage');
+ $p->size = strlen($p->body);
- if (is_array($part->parts))
- for ($i=0; $i<count($part->parts); $i++)
- $this->get_mime_numbers($part->parts[$i]);
- }
+ // 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)) {
+ // iterate over parts
+ for ($i=0; $i < count($structure->parts); $i++) {
+ $mail_part = &$structure->parts[$i];
+ $primary_type = $mail_part->ctype_primary;
+ $secondary_type = $mail_part->ctype_secondary;
- /**
- * Interpret a format=flowed message body according to RFC 2646
- *
- * @param string Raw body formatted as flowed text
- * @return string Interpreted text with unwrapped lines and stuffed space removed
- */
- public static function unfold_flowed($text)
- {
- return preg_replace(
- array('/-- (\r?\n)/', '/^ /m', '/(.) \r?\n/', '/--%SIGEND%(\r?\n)/'),
- array('--%SIGEND%\\1', '', '\\1 ', '-- \\1'),
- $text);
- }
-
- /**
- * Wrap the given text to comply with RFC 2646
- */
- public static function format_flowed($text, $length = 72)
- {
- $out = '';
-
- foreach (preg_split('/\r?\n/', trim($text)) as $line) {
- // don't wrap quoted lines (to avoid wrapping problems)
- if ($line[0] != '>')
- $line = rc_wordwrap(rtrim($line), $length - 1, " \r\n");
+ // real content-type of message/rfc822
+ if ($mail_part->real_mimetype) {
+ $part_orig_mimetype = $mail_part->mimetype;
+ $part_mimetype = $mail_part->real_mimetype;
+ list($primary_type, $secondary_type) = explode('/', $part_mimetype);
+ }
+ else
+ $part_mimetype = $mail_part->mimetype;
- $out .= $line . "\r\n";
+ // multipart/alternative
+ if ($primary_type == 'multipart') {
+ $this->parse_structure($mail_part, true);
+
+ // list message/rfc822 as attachment as well (mostly .eml)
+ if ($part_orig_mimetype == 'message/rfc822' && !empty($mail_part->filename))
+ $this->attachments[] = $mail_part;
+ }
+ // part text/[plain|html] OR message/delivery-status
+ else if ((($part_mimetype == 'text/plain' || $part_mimetype == 'text/html') && $mail_part->disposition != 'attachment') ||
+ $part_mimetype == 'message/delivery-status' || $part_mimetype == 'message/disposition-notification'
+ ) {
+ // add text part if it matches the prefs
+ if (!$this->parse_alternative ||
+ ($secondary_type == 'html' && $this->opt['prefer_html']) ||
+ ($secondary_type == 'plain' && !$this->opt['prefer_html'])
+ ) {
+ $mail_part->type = 'content';
+ $this->parts[] = $mail_part;
+ }
+
+ // list as attachment as well
+ if (!empty($mail_part->filename))
+ $this->attachments[] = $mail_part;
+ }
+ // 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 ($part_mimetype == 'application/ms-tnef') {
+ foreach ((array)$this->tnef_decode($mail_part) as $tpart) {
+ $this->mime_parts[$tpart->mime_id] = $tpart;
+ $this->attachments[] = $tpart;
+ }
+ }
+ // 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 and is linked
+ if ($mimetype == 'multipart/related'
+ && preg_match('!^image/!', $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;
+ }
+ // attachment encapsulated within message/rfc822 part needs further decoding (#1486743)
+ else if ($part_orig_mimetype == 'message/rfc822') {
+ $this->parse_structure($mail_part, true);
+ }
+ // is a regular attachment
+ else if (preg_match('!^[a-z0-9-.+]+/[a-z0-9-.+]+$!i', $part_mimetype)) {
+ if (!$mail_part->filename)
+ $mail_part->filename = 'Part '.$mail_part->mime_id;
+ $this->attachments[] = $mail_part;
+ }
+ }
+ }
+
+ // if this was a related part try to resolve references
+ if ($mimetype == 'multipart/related' && sizeof($this->inline_parts)) {
+ $a_replaces = array();
+
+ foreach ($this->inline_parts as $inline_object) {
+ $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
+ // (will be applied later when part body is available)
+ foreach ($this->parts as $i => $part) {
+ if ($part->type == 'content')
+ $this->parts[$i]->replaces = $a_replaces;
+ }
+ }
+ }
+ // message is a single part non-text
+ else if ($structure->filename) {
+ $this->attachments[] = $structure;
+ }
}
+
+
+ /**
+ * Fill aflat array with references to all parts, indexed by part numbers
+ *
+ * @param object rcube_message_part Message body structure
+ */
+ private function get_mime_numbers(&$part)
+ {
+ if (strlen($part->mime_id))
+ $this->mime_parts[$part->mime_id] = &$part;
+
+ if (is_array($part->parts))
+ for ($i=0; $i<count($part->parts); $i++)
+ $this->get_mime_numbers($part->parts[$i]);
+ }
+
+
+ /**
+ * Decode a Microsoft Outlook TNEF part (winmail.dat)
+ *
+ * @param object rcube_message_part Message part to decode
+ */
+ function tnef_decode(&$part)
+ {
+ // @TODO: attachment may be huge, hadle it via file
+ if (!isset($part->body))
+ $part->body = $this->imap->get_message_part($this->uid, $part->mime_id, $part);
+
+ require_once('lib/tnef_decoder.inc');
+
+ $parts = array();
+ $tnef_arr = tnef_decode($part->body);
+
+ foreach ($tnef_arr as $pid => $winatt) {
+ $tpart = new rcube_message_part;
+
+ $tpart->filename = trim($winatt['name']);
+ $tpart->encoding = 'stream';
+ $tpart->ctype_primary = trim(strtolower($winatt['type0']));
+ $tpart->ctype_secondary = trim(strtolower($winatt['type1']));
+ $tpart->mimetype = $tpart->ctype_primary . '/' . $tpart->ctype_secondary;
+ $tpart->mime_id = 'winmail.' . $part->mime_id . '.' . $pid;
+ $tpart->size = $winatt['size'];
+ $tpart->body = $winatt['stream'];
+
+ $parts[] = $tpart;
+ unset($tnef_arr[$pid]);
+ }
+
+ return $parts;
+ }
+
+
+ /**
+ * Parse message body for UUencoded attachments bodies
+ *
+ * @param object rcube_message_part Message part to decode
+ */
+ function uu_decode(&$part)
+ {
+ // @TODO: messages may be huge, hadle body via file
+ if (!isset($part->body))
+ $part->body = $this->imap->get_message_part($this->uid, $part->mime_id, $part);
+
+ $parts = array();
+ // FIXME: line length is max.65?
+ $uu_regexp = '/begin [0-7]{3,4} ([^\n]+)\n(([\x21-\x7E]{0,65}\n)+)`\nend/s';
+
+ if (preg_match_all($uu_regexp, $part->body, $matches, PREG_SET_ORDER)) {
+ // remove attachments bodies from the message body
+ $part->body = preg_replace($uu_regexp, '', $part->body);
+ // update message content-type
+ $part->ctype_primary = 'multipart';
+ $part->ctype_secondary = 'mixed';
+ $part->mimetype = $part->ctype_primary . '/' . $part->ctype_secondary;
+
+ // add attachments to the structure
+ foreach ($matches as $pid => $att) {
+ $uupart = new rcube_message_part;
+
+ $uupart->filename = trim($att[1]);
+ $uupart->encoding = 'stream';
+ $uupart->body = convert_uudecode($att[2]);
+ $uupart->size = strlen($uupart->body);
+ $uupart->mime_id = 'uu.' . $part->mime_id . '.' . $pid;
+
+ $ctype = rc_mime_content_type($uupart->body, $uupart->filename, 'application/octet-stream', true);
+ $uupart->mimetype = $ctype;
+ list($uupart->ctype_primary, $uupart->ctype_secondary) = explode('/', $ctype);
+
+ $parts[] = $uupart;
+ unset($matches[$pid]);
+ }
+ }
+
+ return $parts;
+ }
+
+
+ /**
+ * Interpret a format=flowed message body according to RFC 2646
+ *
+ * @param string Raw body formatted as flowed text
+ * @return string Interpreted text with unwrapped lines and stuffed space removed
+ */
+ public static function unfold_flowed($text)
+ {
+ return preg_replace(
+ array('/-- (\r?\n)/', '/^ /m', '/(.) \r?\n/', '/--%SIGEND%(\r?\n)/'),
+ array('--%SIGEND%\\1', '', '\\1 ', '-- \\1'),
+ $text);
+ }
+
+
+ /**
+ * Wrap the given text to comply with RFC 2646
+ */
+ public static function format_flowed($text, $length = 72)
+ {
+ $out = '';
- return $out;
- }
+ foreach (preg_split('/\r?\n/', trim($text)) as $line) {
+ // don't wrap quoted lines (to avoid wrapping problems)
+ if ($line[0] != '>')
+ $line = rc_wordwrap(rtrim($line), $length - 1, " \r\n");
+
+ $out .= $line . "\r\n";
+ }
+
+ return $out;
+ }
}
-
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index 2c3e639..3ab7691 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -430,16 +430,17 @@
/**
* A method to guess the mime_type of an attachment.
*
- * @param string $path Path to the file.
- * @param string $name File name (with suffix)
- * @param string $failover Mime type supplied for failover.
+ * @param string $path Path to the file.
+ * @param string $name File name (with suffix)
+ * @param string $failover Mime type supplied for failover.
+ * @param string $is_stream Set to True if $path contains file body
*
* @return string
* @author Till Klampaeckel <till@php.net>
* @see http://de2.php.net/manual/en/ref.fileinfo.php
* @see http://de2.php.net/mime_content_type
*/
-function rc_mime_content_type($path, $name, $failover = 'application/octet-stream')
+function rc_mime_content_type($path, $name, $failover = 'application/octet-stream', $is_stream=false)
{
$mime_type = null;
$mime_magic = rcmail::get_instance()->config->get('mime_magic');
@@ -453,13 +454,16 @@
// try fileinfo extension if available
if (!$mime_type && function_exists('finfo_open')) {
if ($finfo = finfo_open(FILEINFO_MIME, $mime_magic)) {
- $mime_type = finfo_file($finfo, $path);
+ if ($is_stream)
+ $mime_type = finfo_buffer($finfo, $path);
+ else
+ $mime_type = finfo_file($finfo, $path);
finfo_close($finfo);
}
}
// try PHP's mime_content_type
- if (!$mime_type && function_exists('mime_content_type')) {
- $mime_type = mime_content_type($path);
+ if (!$mime_type && !$is_stream && function_exists('mime_content_type')) {
+ $mime_type = @mime_content_type($path);
}
// fall back to user-submitted string
if (!$mime_type) {
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index a6f1d9d..b0da227 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -725,8 +725,9 @@
foreach ((array)$message->mime_parts as $pid => $part)
{
if (($part->ctype_primary != 'message' || !$bodyIsHtml) && $part->ctype_primary != 'multipart' &&
- ($part->disposition == 'attachment' || ($part->disposition == 'inline' && $bodyIsHtml) || $part->filename))
- {
+ ($part->disposition == 'attachment' || ($part->disposition == 'inline' && $bodyIsHtml) || $part->filename)
+ && $part->mimetype != 'application/ms-tnef'
+ ) {
$skip = false;
if ($part->mimetype == 'message/rfc822') {
$messages[] = $part->mime_id;
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index fdf9013..89180dd 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -50,16 +50,7 @@
}
else if ($pid = get_input_value('_part', RCUBE_INPUT_GET)) {
- // TNEF encoded attachment part
- if (preg_match('/^winmail\.([0-9.]+)\.([0-9]+)$/', $pid, $nt)) {
- $pid = $nt[1]; $i = $nt[2];
- if ($part = $MESSAGE->mime_parts[$pid]) {
- $tnef_arr = $IMAP->tnef_decode($part, $MESSAGE->uid);
- if (is_a($tnef_arr[$i], 'rcube_message_part'))
- $MESSAGE->mime_parts[$pid] = $tnef_arr[$i];
- }
- }
-
+
if ($part = $MESSAGE->mime_parts[$pid]) {
$ctype_primary = strtolower($part->ctype_primary);
$ctype_secondary = strtolower($part->ctype_secondary);
--
Gitblit v1.9.1