From 21b160f38c98bf41ebc843e7639b5b1af588b489 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sun, 08 Feb 2009 15:38:54 -0500
Subject: [PATCH] Added TNEF support to decode MS Outlook (winmail.dat) attachments
---
program/include/rcube_message.php | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index 8a2cb17..513cb4c 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -266,7 +266,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 +366,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 +389,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