From 9efa95ea9b51cec0a12502455e9c27e64e3aae14 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 27 Feb 2012 07:12:41 -0500
Subject: [PATCH] Better manual upgrading instructions: rsync plugins and skins to keep manually installed stuff
---
program/steps/mail/viewsource.inc | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/program/steps/mail/viewsource.inc b/program/steps/mail/viewsource.inc
index 16d92c8..f38ca76 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-2009, 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 |
@@ -24,14 +27,15 @@
// 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;
+ $headers = $RCMAIL->storage->get_message_headers($uid);
+ $charset = $headers->charset ? $headers->charset : $CONFIG['default_charset'];
header("Content-Type: text/plain; charset={$charset}");
if (!empty($_GET['_save'])) {
- $filename = ($headers->subject ? $headers->subject : 'roundcube') . '.eml';
- $browser = new rcube_browser;
-
+ $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)
@@ -42,18 +46,18 @@
header("Content-Length: {$headers->size}");
header("Content-Disposition: attachment; filename=\"$filename\"");
}
-
- $IMAP->print_raw_body($uid);
+
+ $RCMAIL->storage->print_raw_body($uid);
}
else
{
raise_error(array(
'code' => 500,
'type' => 'php',
+ 'file' => __FILE__, 'line' => __LINE__,
'message' => 'Message UID '.$uid.' not found'),
- true,
- true);
+ true, true);
}
exit;
-?>
+
--
Gitblit v1.9.1