From 4b484710ee367150989cd1b939a04111b8b5a923 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 03 Sep 2012 13:01:50 -0400
Subject: [PATCH] Fix displaying all headers when they contain malformed characters (#1488666)
---
program/steps/mail/headers.inc | 53 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/program/steps/mail/headers.inc b/program/steps/mail/headers.inc
index 946a688..3bb087a 100644
--- a/program/steps/mail/headers.inc
+++ b/program/steps/mail/headers.inc
@@ -3,9 +3,12 @@
+-----------------------------------------------------------------------+
| program/steps/mail/headers.inc |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland |
- | Licensed under the GNU GPL |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2007, 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: |
| Fetch message headers in raw format for display |
@@ -20,28 +23,32 @@
if ($uid = get_input_value('_uid', RCUBE_INPUT_POST))
{
- $source = $IMAP->get_raw_headers($uid);
+ $source = $RCMAIL->storage->get_raw_headers($uid);
- if ($source)
- {
- $source = htmlspecialchars(trim($source));
- $source = preg_replace(
- array(
- '/\n[\t\s]+/',
- '/^([a-z0-9_:-]+)/im',
- '/\r?\n/'
- ),
- array(
- "\n ",
- '<font class="bold">\1</font>',
- '<br />'
- ), $source);
-
- $OUTPUT->command('set_headers', $source);
- $OUTPUT->send();
+ if ($source !== false) {
+ $source = trim(rcube_charset::clean($source));
+ $source = htmlspecialchars($source);
+ $source = preg_replace(
+ array(
+ '/\n[\t\s]+/',
+ '/^([a-z0-9_:-]+)/im',
+ '/\r?\n/'
+ ),
+ array(
+ "\n ",
+ '<font class="bold">\1</font>',
+ '<br />'
+ ), $source);
+
+ $OUTPUT->command('set_headers', $source);
}
+ else {
+ $RCMAIL->output->show_message('messageopenerror', 'error');
+ }
+
+ $OUTPUT->send();
}
-
+
exit;
-?>
+
--
Gitblit v1.9.1