little fix

[squirrelmail.git] / src / download.php

diff --git a/src/download.php b/src/download.php
index 700396e012e82a3e7904500abbaa3d578ae252fd..ad291fe6fa43912c0d6e7517dd1c02617cbf2b08 100644 (file)
--- a/src/download.php
+++ b/src/download.php
@@ -9,40 +9,51 @@
     **  Also allows displaying of attachments when possible.
     **/
 
-   session_start();
-
    if (!isset($config_php))
       include("../config/config.php");
    if (!isset($strings_php))
       include("../functions/strings.php");
-   if (!isset($page_header_php))
-      include("../functions/page_header.php");
    if (!isset($imap_php))
       include("../functions/imap.php");
    if (!isset($mime_php))
       include("../functions/mime.php");
    if (!isset($date_php))
       include("../functions/date.php");
+   if (!isset($i18n_php))
+      include("../functions/i18n.php");
 
    include("../src/load_prefs.php");
 
    function viewText($color, $body, $id, $entid, $mailbox, $type1, $wrap_at) {
+      global $where, $what, $charset;
+      global $startMessage;
+      
       displayPageHeader($color, "None");
 
-      echo "<BR><TABLE WIDTH=90% BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR=\"$color[0]\">";
+      echo "<BR><TABLE WIDTH=100% BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR=\"$color[0]\">";
       echo "<B><CENTER>";
       echo _("Viewing a text attachment") . " - ";
-      echo "<a href=\"read_body.php?mailbox=$mailbox&passed_id=$id\">". _("View message") . "</a>";
-      echo "</CENTER></B>";
-      echo "</TD></TR><TR><TD BGCOLOR=\"$color[4]\">";
+      if ($where && $what) {
+         // from a search
+         echo "<a href=\"read_body.php?mailbox=".urlencode($mailbox)."&passed_id=$id&where=".urlencode($where)."&what=".urlencode($what)."\">". _("View message") . "</a>";
+      } else {   
+         echo "<a href=\"read_body.php?mailbox=".urlencode($mailbox)."&passed_id=$id&startMessage=$startMessage&show_more=0\">". _("View message") . "</a>";
+      }   
+
       $urlmailbox = urlencode($mailbox);
-      echo "<CENTER><A HREF=\"../src/download.php?absolute_dl=true&passed_id=$id&passed_ent_id=$entid&mailbox=$urlmailbox\">";
+      echo "</b></td><tr><tr><td><CENTER><A HREF=\"../src/download.php?absolute_dl=true&passed_id=$id&passed_ent_id=$entid&mailbox=$urlmailbox\">";
       echo _("Download this as a file");
-      echo "</A></CENTER><BR><BR><TT>";
-      if ($type1 == "html")
-         echo $body;
-      else
-         echo translateText($body, $wrap_at);
+      echo "</A></CENTER><BR>";
+      echo "</CENTER></B>";
+      echo "</TD></TR></TABLE>";
+
+      echo "<TABLE WIDTH=98% BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR=\"$color[0]\">";
+      echo "<TR><TD BGCOLOR=\"$color[4]\"><TT>";
+
+      if ($type1 != "html")
+         translateText($body, $wrap_at, $charset);
+      
+      echo $body;
 
       echo "</TT></TD></TR></TABLE>";
    }
@@ -63,13 +74,12 @@
    $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);
 
    if (strlen($filename) < 1) {
-      # set some standard suffixes to the filenames if the filename isn't known
-
       if ($type1 == "plain" && $type0 == "text")                  $suffix = "txt";
       else if ($type1 == "richtext" && $type0 == "text")          $suffix = "rtf";
       else if ($type1 == "postscript" && $type0 == "application") $suffix = "ps";
@@ -93,24 +103,28 @@
    //    viewer (built in to squirrelmail).  Otherwise, it sets the
    //    content-type as application/octet-stream
 
+   header("Pragma: ");
+   header("Content-Description: SquirrelMail Attachment");
+   header("Cache-Control: no-cache, must-revalidate");
    if ($absolute_dl == "true") {
       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\"");
+            set_up_language(getPref($data_dir, $username, "language"));
             if ($type1 == "plain") {
-               echo _("Subject") . ": " . decodeHeader(stripslashes($top_header->subject)) . "\n";
-               echo "   " . _("From") . ": " . decodeHeader(stripslashes($top_header->from)) . "\n";
-               echo "     " . _("To") . ": " . decodeHeader(stripslashes(getLineOfAddrs($top_header->to))) . "\n";
+               echo _("Subject") . ": " . decodeHeader(sqStripSlashes($top_header->subject)) . "\n";
+               echo "   " . _("From") . ": " . decodeHeader(sqStripSlashes($top_header->from)) . "\n";
+               echo "     " . _("To") . ": " . decodeHeader(sqStripSlashes(getLineOfAddrs($top_header->to))) . "\n";
                echo "   " . _("Date") . ": " . getLongDateString($top_header->date) . "\n\n";
             }
             echo trim($body);
             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;
       }
@@ -118,10 +132,12 @@
       switch ($type0) {
          case "text":
             $body = decodeBody($body, $header->encoding);
+            include("../functions/page_header.php");
             viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at);
             break;
          case "message":
             $body = decodeBody($body, $header->encoding);
+            include("../functions/page_header.php");
             viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at);
             break;
          default:
@@ -131,7 +147,8 @@
             echo $body;
             break;
       }
-   }
-
+   }    
+    
+   sqimap_mailbox_close($imapConnection);
    sqimap_logout($imapConnection);
 ?>