Fixes some bugs in preferences

[squirrelmail.git] / src / download.php
diff --git a/src/download.php b/src/download.php

index 56c57335546badc42cfc0ec05060e0098c88d34d..ce491fcf562112f29909b0489721ebfbdc9576af 100644 (file)
--- a/src/download.php
+++ b/src/download.php
@@ -7,6 +7,8 @@
     include("../functions/mailbox.php");
     include("../functions/date.php");
  
+   include("../src/load_prefs.php");
+
     function viewText($color, $body, $id, $entid, $mailbox) {
        echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
        displayPageHeader($color, "None");
@@ -15,8 +17,8 @@
        echo "<B><CENTER>Viewing a plain text attachment</CENTER></B>";
        echo "</TD></TR><TR><TD BGCOLOR=\"$color[4]\">";
        $urlmailbox = urlencode($mailbox);
-      echo "<FONT FACE=\"Arial, Helvetica\"><A HREF=\"../src/download.php?absolute_dl=true&passed_id=$id&passed_ent_id=$entid&mailbox=$urlmailbox\">Download this as a file</A><BR><BR></FONT><TT>";
-      echo nl2br($body);
+      echo "<FONT FACE=\"Arial, Helvetica\"><CENTER><A HREF=\"../src/download.php?absolute_dl=true&passed_id=$id&passed_ent_id=$entid&mailbox=$urlmailbox\">Download this as a file</A></CENTER><BR><BR></FONT><TT>";
+      echo nl2br(trim($body));
        echo "</TT></TD></TR></TABLE>";
     }
  
@@ -39,13 +41,13 @@
        switch($type0) {
           case "text":
              $body = decodeBody($message["ENTITIES"][$passed_ent_id]["BODY"], $message["ENTITIES"][$passed_ent_id]["ENCODING"]);
-            header("Content-type: $type0/$type1");
+            header("Content-type: $type0/$type1; name=\"$filename\"");
              header("Content-Disposition: attachment; filename=\"$filename\"");
-            echo $body;
+            echo trim($body);
              break;
           default:
              $body = decodeBody($message["ENTITIES"][$passed_ent_id]["BODY"], $message["ENTITIES"][$passed_ent_id]["ENCODING"]);
-            header("Content-type: $type0/$type1");
+            header("Content-type: $type0/$type1; name=\"$filename\"");
              header("Content-Disposition: attachment; filename=\"$filename\"");
              echo $body;
              break;
@@ -62,7 +64,7 @@
              break;
           default:
              $body = decodeBody($message["ENTITIES"][$passed_ent_id]["BODY"], $message["ENTITIES"][$passed_ent_id]["ENCODING"]);
-            header("Content-type: $type0/$type1");
+            header("Content-type: $type0/$type1; name=\"$filename\"");
              header("Content-Disposition: attachment; filename=\"$filename\"");
              echo $body;
              break;