From a2cf7c41b97a587d90188b83e4d15da1567a54b4 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 09 Apr 2014 02:48:28 -0400
Subject: [PATCH] Fix accidental key replacements
---
program/steps/mail/viewsource.inc | 71 ++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/program/steps/mail/viewsource.inc b/program/steps/mail/viewsource.inc
index a61385d..0328d96 100644
--- a/program/steps/mail/viewsource.inc
+++ b/program/steps/mail/viewsource.inc
@@ -4,9 +4,12 @@
+-----------------------------------------------------------------------+
| program/steps/mail/viewsource.inc |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland |
- | Licensed under the GNU GPL |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
| PURPOSE: |
| Display a mail message similar as a usual mail application does |
@@ -14,46 +17,44 @@
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
-
- $Id$
-
*/
ob_end_clean();
// similar code as in program/steps/mail/get.inc
-if ($uid = get_input_value('_uid', RCUBE_INPUT_GET))
-{
- $headers = $IMAP->get_headers($uid);
- $charset = $headers->charset ? $headers->charset : $IMAP->default_charset;
- header("Content-Type: text/plain; charset={$charset}");
+if ($uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET)) {
+ $headers = $RCMAIL->storage->get_message_headers($uid);
+ $charset = $headers->charset ? $headers->charset : $RCMAIL->config->get('default_charset');
- if (!empty($_GET['_save'])) {
- $filename = ($headers->subject ? $IMAP->decode_header($headers->subject) : 'roundcube') . '.eml';
- $browser = new rcube_browser;
-
- if ($browser->ie && $browser->ver < 7)
- $filename = rawurlencode(abbreviate_string($filename, 55));
- else if ($browser->ie)
- $filename = rawurlencode($filename);
- else
- $filename = addcslashes($filename, '"');
+ header("Content-Type: text/plain; charset={$charset}");
- header("Content-Length: {$headers->size}");
- header("Content-Disposition: attachment; filename=\"$filename\"");
- }
-
- $IMAP->print_raw_body($uid);
+ if (!empty($_GET['_save'])) {
+ $subject = rcube_mime::decode_header($headers->subject, $headers->charset);
+ $filename = ($subject ? $subject : $RCMAIL->config->get('product_name', 'email')) . '.eml';
+ $browser = $RCMAIL->output->browser;
+
+ if ($browser->ie && $browser->ver < 7)
+ $filename = rawurlencode(abbreviate_string($filename, 55));
+ else if ($browser->ie)
+ $filename = rawurlencode($filename);
+ else
+ $filename = addcslashes($filename, '"');
+
+ header("Content-Length: {$headers->size}");
+ header("Content-Disposition: attachment; filename=\"$filename\"");
+ }
+
+ $RCMAIL->storage->print_raw_body($uid, empty($_GET['_save']));
}
-else
-{
- raise_error(array(
- 'code' => 500,
- 'type' => 'php',
- 'message' => 'Message UID '.$uid.' not found'),
- true,
- true);
+else {
+ rcube::raise_error(array(
+ 'code' => 500,
+ 'type' => 'php',
+ 'file' => __FILE__,
+ 'line' => __LINE__,
+ 'message' => "Message UID $uid not found"
+ ),
+ true, true);
}
exit;
-?>
--
Gitblit v1.9.1