From d51c93b43e4b24b56e5c225154be4a60fcb418c6 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 01 Jun 2009 03:21:14 -0400
Subject: [PATCH] - get rid of some hardcoded action names and move decission about output compression to the user
---
program/steps/mail/get.inc | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index fc3ee83..cf66914 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -5,7 +5,7 @@
| program/steps/mail/get.inc |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -18,8 +18,6 @@
$Id$
*/
-
-require_once('Mail/mimeDecode.php');
// show loading page
@@ -35,6 +33,7 @@
exit;
}
+ob_end_clean();
// similar code as in program/steps/mail/show.inc
if (!empty($_GET['_uid'])) {
@@ -50,6 +49,16 @@
}
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);
@@ -89,14 +98,23 @@
}
$filename = $part->filename ? $part->filename : ($MESSAGE->subject ? $MESSAGE->subject : 'roundcube') . '.'.$ctype_secondary;
- $filename = abbreviate_string($part->filename, 55);
- $filename = $browser->ie ? rawurlencode($filename) : addslashes($filename);
+
+ if ($browser->ie && $browser->ver < 7)
+ $filename = rawurlencode(abbreviate_string($filename, 55));
+ else if ($browser->ie)
+ $filename = rawurlencode($filename);
+ else
+ $filename = addcslashes($filename, '"');
+
$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;
--
Gitblit v1.9.1