X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdownload.php;h=5a69181009560609f99e378856583360cae35667;hb=a15f9d9379cebc62fa39b6cb10d2195f95ed5081;hp=fa966ed4106a5058c913d059658e3ac5a0a28d82;hpb=324ac3c54f72cb39a994d9a80a586fce591fca84;p=squirrelmail.git

diff --git a/src/download.php b/src/download.php
index fa966ed4..5a691810 100644
--- a/src/download.php
+++ b/src/download.php
@@ -3,12 +3,11 @@
 /**
  * download.php
  *
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * Handles attachment downloads to the users computer.
  * Also allows displaying of attachments when possible.
  *
+ * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  */
@@ -39,11 +38,17 @@ sqgetGlobalVar('absolute_dl',$absolute_dl,  SQ_GET);
 if ( sqgetGlobalVar('passed_id', $temp, SQ_GET) ) {
     $passed_id = (int) $temp;
 }
+if (!sqgetGlobalVar('account', $account, SQ_GET) ) {
+    $account = 0;
+}
+
+global $default_charset;
+set_my_charset();
 
 /* end globals */
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-$aMailbox = sqm_api_mailbox_select($imapConnection, $mailbox,array(),array());
+$aMailbox = sqm_api_mailbox_select($imapConnection, $account, $mailbox,array(),array());
 
 if (isset($aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT']) &&
     is_object($aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT']) ) {
@@ -61,7 +66,8 @@ if (isset($aMailbox['MSG_HEADERS'][$passed_id]['MESSAGE_OBJECT']) &&
 //}
 $subject = $message->rfc822_header->subject;
 if ($ent_id) {
-    $message = &$message->getEntity($ent_id);
+    // replace message with message part, if message part is requested.
+    $message = $message->getEntity($ent_id);
     $header = $message->header;
 
     if ($message->rfc822_header) {
@@ -105,11 +111,13 @@ if (is_object($message->header->disposition)) {
     $filename = $header->getParameter('name');
 }
 
-//$filename = decodeHeader($filename, false, false);	//Don't want html output nor utf8 because it will return html output
-$filename = decodeHeader($filename, true, false);   //Don't want html output
+$filename = decodeHeader($filename,true,false);
+$filename = charset_encode($filename,$default_charset,false);
+
+// If name is not set, use subject of email
 if (strlen($filename) < 1) {
-    //$filename = decodeHeader($subject, false, false);	//Don't want html output nor utf8 because it will return html output
-    $filename = decodeHeader($subject, true, false);   //Don't want html output
+    $filename = decodeHeader($subject, true, true);
+    $filename = charset_encode($filename,$default_charset,false);
     if ($type1 == 'plain' && $type0 == 'text')
         $suffix = 'txt';
     else if ($type1 == 'richtext' && $type0 == 'text')
@@ -138,7 +146,7 @@ if (strlen($filename) < 1) {
  *    most likely display the attachment inline inside the browser.
  *      And finally, the third one will be used by default.  If it
  *    is displayable (text or html), it will load them up in a text
- *    viewer (built in to squirrelmail).  Otherwise, it sets the
+ *    viewer (built in to SquirrelMail).  Otherwise, it sets the
  *    content-type as application/octet-stream
  */
 if (isset($absolute_dl) && $absolute_dl) {
@@ -151,4 +159,5 @@ if (isset($absolute_dl) && $absolute_dl) {
 mime_print_body_lines ($imapConnection, $passed_id, $ent_id, $encoding);
 $mailbox_cache[$aMailbox['NAME']] = $aMailbox;
 sqsession_register($mailbox_cache,'mailbox_cache');
-?>
+
+?>
\ No newline at end of file