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 | 81 ++++++++++++++++++++++------------------
1 files changed, 45 insertions(+), 36 deletions(-)
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index 842c605..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,48 +49,41 @@
}
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);
$mimetype = sprintf('%s/%s', $ctype_primary, $ctype_secondary);
+
+ $browser = new rcube_browser;
- header("Expires: 0");
- header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
- header("Cache-Control: private", false);
- header("Content-Transfer-Encoding: binary");
-
+ send_nocacheing_headers();
+
// send download headers
if ($_GET['_download']) {
- header("Cache-Control: private", false);
header("Content-Type: application/octet-stream");
+ if ($browser->ie)
+ header("Content-Type: application/force-download");
}
- else if ($ctype_primary == 'text')
- header("Content-Type: text/$ctype_secondary; charset=" . RCMAIL_CHARSET);
- else
+ else if ($ctype_primary == 'text') {
+ header("Content-Type: text/$ctype_secondary; charset=" . ($part->charset ? $part->charset : RCMAIL_CHARSET));
+ }
+ else {
header("Content-Type: $mimetype");
-
- // We need to set the following headers to make downloads work using IE in HTTPS mode.
- if (isset($_SERVER['HTTPS'])) {
- header('Pragma: ');
- header('Cache-Control: ');
+ header("Content-Transfer-Encoding: binary");
}
// deliver part content
if ($ctype_primary == 'text' && $ctype_secondary == 'html') {
- // we have to analyze the whole structure again to find inline objects
- /* what was this good for again ?
- list($new_parts, $new_attachments) =
- rcmail_parse_message($MESSAGE['structure'],
- array('safe' => intval($_GET['_safe']),
- 'prefer_html' => TRUE,
- 'get_url' => $GET_URL.'&_part=%s'));
-
- $all_parts = array_merge($new_parts, $new_attachments);
- for ($partix = 0; $partix < sizeof($all_parts); $partix++)
- if ($all_parts[$partix]->mime_id == $pid)
- $part = &$all_parts[$partix];
- */
-
// get part body if not available
if (!$part->body)
$part->body = $MESSAGE->get_part_content($part->mime_id);
@@ -100,12 +92,29 @@
$OUTPUT->write(rcmail_print_body($part, array('safe' => $MESSAGE->is_safe, 'inline_html' => false)));
}
else {
- header(sprintf('Content-Disposition: %s; filename="%s";',
- $_GET['_download'] ? 'attachment' : 'inline',
- $part->filename ? abbreviate_string($part->filename, 55) : "roundcube.$ctype_secondary"));
-
+ // don't kill the connection if download takes more than 30 sec.
+ if (!ini_get('safe_mode')) {
+ set_time_limit(0);
+ }
+
+ $filename = $part->filename ? $part->filename : ($MESSAGE->subject ? $MESSAGE->subject : 'roundcube') . '.'.$ctype_secondary;
+
+ 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