From efe5a55c4c5d4bd2ba7d5398d33824a45f628f3a Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 04 Dec 2009 05:53:20 -0500
Subject: [PATCH] - added comment
---
program/include/rcube_message.php | 62 +++++++++++++++++++++---------
1 files changed, 43 insertions(+), 19 deletions(-)
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index ec3be4b..4d01348 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -84,6 +84,9 @@
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));
}
@@ -221,8 +224,9 @@
*
* @param object rcube_message_part Message structure node
* @param bool True when called recursively
+ * @param bool True when message should be parsed as message/alternative
*/
- private function parse_structure($structure, $recursive = false)
+ private function parse_structure($structure, $recursive = false, $force_alternative = false)
{
$message_ctype_primary = strtolower($structure->ctype_primary);
$message_ctype_secondary = strtolower($structure->ctype_secondary);
@@ -320,8 +324,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)) {
@@ -338,23 +350,34 @@
// 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 ||
+
+ // add text part if it matches the prefs
+ if ((!$this->parse_alternative && !$force_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);
-
+ // let's try to find out if message/rfc822 is a multipart/alternative
+ if ($secondary_type == 'rfc822' && is_array($mail_part->parts) && count($mail_part->parts) > 1) {
+ $types = array();
+ // iterate over parts to find its types and count them by type
+ for ($j=0; $j < count($mail_part->parts); $j++) {
+ $_type = strtolower($mail_part->parts[$j]->ctype_primary).'/'.strtolower($mail_part->parts[$j]->ctype_secondary);
+ $types[$_type] = $types[$_type] ? $types[$_type]+1 : 1;
+ }
+ if ($types['text/plain'] == 1 && $types['text/html'] == 1)
+ $_alternative = true;
+ }
+ $this->parse_structure($mail_part, true, $_alternative);
+
// list as attachment as well (mostly .eml)
if (!empty($mail_part->filename))
$this->attachments[] = $mail_part;
@@ -363,7 +386,7 @@
else if ($primary_type == 'protocol')
continue;
- // part is Microsoft outlook TNEF (winmail.dat)
+ // 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;
@@ -371,26 +394,27 @@
}
}
- // 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') {
+ // 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'];
-
- if ($mail_part->content_id || $mail_part->content_location) {
- $this->inline_parts[] = $mail_part;
- }
+
+ $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