From b8ae99a6b38838045257c7dac6f52c66a0f6ef39 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 28 Aug 2009 04:29:46 -0400
Subject: [PATCH] - Fix endless loop on error response for APPEND command (#1486060)
---
program/steps/mail/viewsource.inc | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/program/steps/mail/viewsource.inc b/program/steps/mail/viewsource.inc
index 0fcb1f9..a61385d 100644
--- a/program/steps/mail/viewsource.inc
+++ b/program/steps/mail/viewsource.inc
@@ -5,7 +5,7 @@
| program/steps/mail/viewsource.inc |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -19,21 +19,41 @@
*/
+ob_end_clean();
// similar code as in program/steps/mail/get.inc
-if ($_GET['_uid'])
- {
- header('Content-Type: text/plain');
- print rcmail_message_source($_GET['_uid']);
+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 (!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-Length: {$headers->size}");
+ header("Content-Disposition: attachment; filename=\"$filename\"");
}
+
+ $IMAP->print_raw_body($uid);
+}
else
- {
- raise_error(array('code' => 500,
- 'type' => 'php',
- 'message' => 'Message UID '.$_GET['_uid'].' not found'),
- TRUE,
- TRUE);
- }
+{
+ raise_error(array(
+ 'code' => 500,
+ 'type' => 'php',
+ 'message' => 'Message UID '.$uid.' not found'),
+ true,
+ true);
+}
exit;
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1