From 74d421d55ae35a18440d738245fbc68c7f75d5b4 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sun, 17 May 2009 03:04:51 -0400
Subject: [PATCH] - don't show message on unknown error (#1485848) + translate "Server Error!" message
---
program/include/rcube_message.php | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index 8a2cb17..5c03b21 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));
}
@@ -166,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;
}
@@ -266,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;
}
@@ -366,6 +365,14 @@
// 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' ||
@@ -381,10 +388,10 @@
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) {
+ if ($mail_part->content_id || $mail_part->content_location) {
$this->inline_parts[] = $mail_part;
}
- }
+ }
// is regular attachment
else {
if (!$mail_part->filename)
--
Gitblit v1.9.1