summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2009-02-08 20:38:54 +0000
committerthomascube <thomas@roundcube.net>2009-02-08 20:38:54 +0000
commit21b160f38c98bf41ebc843e7639b5b1af588b489 (patch)
tree08bad782ccc1a146191c7af17d28cf718fc62924 /program/steps/mail
parent0ea8d3a08e6055293aaa689bff6525522986e71c (diff)
Added TNEF support to decode MS Outlook (winmail.dat) attachments
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/get.inc17
1 files changed, 15 insertions, 2 deletions
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index 8ed4a1ec1..d2863e8bc 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -48,6 +48,16 @@ if (!empty($_GET['_frame'])) {
}
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);
@@ -98,9 +108,12 @@ else if ($pid = get_input_value('_part', RCUBE_INPUT_GET)) {
$disposition = !empty($_GET['_download']) ? 'attachment' : 'inline';
header("Content-Disposition: $disposition; filename=\"$filename\"");
-
+
// turn off output buffering and print part content
- $IMAP->get_message_part($MESSAGE->uid, $part->mime_id, $part, true);
+ if ($part->body)
+ echo $part->body;
+ else
+ $IMAP->get_message_part($MESSAGE->uid, $part->mime_id, $part, true);
}
exit;