- fixed bug when deleting last message, sends you to previous list

[squirrelmail.git] / src / download.php

diff --git a/src/download.php b/src/download.php
index 9f60f343d3da046c7758ee13b3b4e93b3177f9dc..bb7adb366c16b47cdcfd376184ad5da3ee1cd331 100644 (file)
--- a/src/download.php
+++ b/src/download.php
@@ -9,8 +9,6 @@
     **  Also allows displaying of attachments when possible.
     **/
 
-   session_start();
-
    if (!isset($config_php))
       include("../config/config.php");
    if (!isset($strings_php))
@@ -27,7 +25,7 @@
    include("../src/load_prefs.php");
 
    function viewText($color, $body, $id, $entid, $mailbox, $type1, $wrap_at) {
-      global $where, $what;
+      global $where, $what, $charset;
       displayPageHeader($color, "None");
 
       echo "<BR><TABLE WIDTH=90% BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR=\"$color[0]\">";
@@ -48,7 +46,7 @@
       if ($type1 == "html")
          echo $body;
       else
-         echo translateText($body, $wrap_at);
+         echo translateText($body, $wrap_at, $charset);
 
       echo "</TT></TD></TR></TABLE>";
    }
@@ -69,6 +67,7 @@
    $header = $message->header;
    $body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id);
 
+   $charset = $header->charset;
    $type0 = $header->type0;
    $type1 = $header->type1;
    $filename = decodeHeader($header->filename);
@@ -101,8 +100,8 @@
       switch($type0) {
          case "text":
             $body = decodeBody($body, $header->encoding);
-            header("Content-type: application/octet-stream; name=\"$filename\"");
             header("Content-Disposition: attachment; filename=\"$filename\"");
+            header("Content-type: application/octet-stream; name=\"$filename\"");
             if ($type1 == "plain") {
                echo _("Subject") . ": " . decodeHeader(stripslashes($top_header->subject)) . "\n";
                echo "   " . _("From") . ": " . decodeHeader(stripslashes($top_header->from)) . "\n";
@@ -113,8 +112,8 @@
             break;
          default:
             $body = decodeBody($body, $header->encoding);
-            header("Content-type: application/octet-stream; name=\"$filename\"");
             header("Content-Disposition: attachment; filename=\"$filename\"");
+            header("Content-type: application/octet-stream; name=\"$filename\"");
             echo $body;
             break;
       }
@@ -130,8 +129,8 @@
             break;
          default:
             $body = decodeBody($body, $header->encoding);
-            header("Content-type: $type0/$type1; name=\"$filename\"");
             header("Content-Disposition: attachment; filename=\"$filename\"");
+            header("Content-type: $type0/$type1; name=\"$filename\"");
             echo $body;
             break;
       }