From 65b61cdd1ce5b011ca9f846847e81f16f10ef0d0 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 07 Jul 2011 07:55:59 -0400
Subject: [PATCH] - Insert APC_UPLOAD_PROGRESS hidden field before file field (#1486039)

---
 program/steps/mail/viewsource.inc |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/program/steps/mail/viewsource.inc b/program/steps/mail/viewsource.inc
index 16d92c8..e25fad1 100644
--- a/program/steps/mail/viewsource.inc
+++ b/program/steps/mail/viewsource.inc
@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | program/steps/mail/viewsource.inc                                     |
  |                                                                       |
- | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                 |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2009, The Roundcube Dev Team                       |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -25,13 +25,13 @@
 if ($uid = get_input_value('_uid', RCUBE_INPUT_GET))
 {
   $headers = $IMAP->get_headers($uid);
-  $charset = $headers->charset ? $headers->charset : $IMAP->default_charset;
+  $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;
-    
+    $filename = ($headers->subject ? $IMAP->decode_header($headers->subject) : 'roundcube') . '.eml';
+    $browser = $RCMAIL->output->browser;
+
     if ($browser->ie && $browser->ver < 7)
       $filename = rawurlencode(abbreviate_string($filename, 55));
     else if ($browser->ie)
@@ -42,7 +42,7 @@
     header("Content-Length: {$headers->size}");
     header("Content-Disposition: attachment; filename=\"$filename\"");
   }
-  
+
   $IMAP->print_raw_body($uid);
 }
 else
@@ -50,10 +50,10 @@
   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