X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fdownload.php;h=0e9e9eedc2d71dafac35b02436d6a2abc6edf1cb;hp=17fe7f2b0f3fb93615934ce5ed162d57a841ba58;hb=6ee631f7b92f6a205e0841ac40e6b0e763a5a734;hpb=7bff2bfc33742523e0aeedd8dd58a2097db7989c

diff --git a/src/download.php b/src/download.php
index 17fe7f2b..0e9e9eed 100644
--- a/src/download.php
+++ b/src/download.php
@@ -7,26 +7,21 @@
     **
     **  Handles attachment downloads to the users computer.
     **  Also allows displaying of attachments when possible.
+    **
+    **  $Id$
     **/
 
-    $download_php = true;
-    $onetimepad = $otp;
-
-   if (!isset($config_php))
-      include("../config/config.php");
-   if (!isset($strings_php))
-      include("../functions/strings.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");
+   define('download_php', true);  // Used for preferences
 
+   include('../src/validate.php');
+   include("../functions/imap.php");
+   include("../functions/mime.php");
+   include("../functions/date.php");
    include("../src/load_prefs.php");
 
+   header("Pragma: ");
+   header("Cache-Control: cache");
+
    function viewText($color, $body, $id, $entid, $mailbox, $type1, $wrap_at) {
       global $where, $what, $charset;
       global $startMessage;
@@ -79,7 +74,14 @@
    $charset = $header->charset;
    $type0 = $header->type0;
    $type1 = $header->type1;
+   if (isset($override_type0))
+       $type0 = $override_type0;
+   if (isset($override_type1))
+       $type1 = $override_type1;
    $filename = decodeHeader($header->filename);
+   if (!$filename) {
+      $filename = decodeHeader($header->name);
+   }
 
    if (strlen($filename) < 1) {
       if ($type1 == "plain" && $type0 == "text")                  $suffix = "txt";
@@ -104,28 +106,35 @@
    //    is displayable (text or html), it will load them up in a text
    //    viewer (built in to squirrelmail).  Otherwise, it sets the
    //    content-type as application/octet-stream
-
-   header("Pragma: ");
-   header("Content-Description: SquirrelMail Attachment");
-   if ($absolute_dl == "true") {
+   
+   if (isset($absolute_dl) && $absolute_dl == "true") {
       switch($type0) {
          case "text":
+            set_up_language(getPref($data_dir, $username, "language"));
+	    DumpHeaders($type0, $type1, $filename, 1);
             $body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id);
             $body = decodeBody($body, $header->encoding);
-            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(sqStripSlashes($top_header->subject)) . "\n";
-               echo "   " . _("From") . ": " . decodeHeader(sqStripSlashes($top_header->from)) . "\n";
-               echo "     " . _("To") . ": " . decodeHeader(sqStripSlashes(getLineOfAddrs($top_header->to))) . "\n";
+            if ($type1 == "plain" && isset($showHeaders)) {
+               echo _("Subject") . ": " . decodeHeader($top_header->subject) . "\n";
+               echo "   " . _("From") . ": " . decodeHeader($top_header->from) . "\n";
+               echo "     " . _("To") . ": " . decodeHeader(getLineOfAddrs($top_header->to)) . "\n";
                echo "   " . _("Date") . ": " . getLongDateString($top_header->date) . "\n\n";
             }
-            echo trim($body);
+	    elseif ($type1 == "html" && isset($showHeaders)) {
+	       echo '<table><tr><th align=right>' . _("Subject");
+	       echo ':</th><td>' . decodeHeader($top_header->subject);
+	       echo "</td></tr>\n<tr><th align=right>" . _("From");
+	       echo ':</th><td>' . decodeHeader($top_header->from);
+	       echo "</td></tr>\n<tr><th align=right>" . _("To");
+	       echo ':</th><td>' . decodeHeader(getLineOfAddrs($top_header->to));
+	       echo "</td></tr>\n<tr><th align=right>" . _("Date");
+	       echo ':</th><td>' . getLongDateString($top_header->date);
+	       echo "</td></tr>\n</table>\n<hr>\n";
+	    }
+            echo $body;
             break;
          default:
-            header("Content-Disposition: attachment; filename=$filename");
-            header("Content-type: application/octet-stream; name=$filename");
+	    DumpHeaders($type0, $type1, $filename, 1);
             mime_print_body_lines ($imapConnection, $passed_id, $passed_ent_id, $header->encoding);
             break;
       }
@@ -138,10 +147,9 @@
                 include("../functions/page_header.php");
                 viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at);
             } else {
+		DumpHeaders($type0, $type1, $filename, 0);
                 $body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id);
                 $body = decodeBody($body, $header->encoding);
-                header("Content-type: $type0/$type1; name=$filename");
-                header("Content-Disposition: attachment; filename=$filename");
                 echo $body;
             }
             break;
@@ -152,12 +160,64 @@
             viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at);
             break;
          default:
-            header("Content-type: $type0/$type1; name=\"$filename\"");
-            header("Content-Disposition: attachment; filename=\"$filename\"");
+	    DumpHeaders($type0, $type1, $filename, 0);
             mime_print_body_lines ($imapConnection, $passed_id, $passed_ent_id, $header->encoding);
             break;
       }
-   }    
-    
-   sqimap_logout($imapConnection);
+   }
+   
+   
+   function DumpHeaders($type0, $type1, $filename, $force)
+   {
+      global $HTTP_USER_AGENT;
+      
+      $isIE = 0;
+      if (strstr($HTTP_USER_AGENT, 'compatible; MSIE ') !== false) {
+        $isIE = 1;
+      }
+      
+      $filename = ereg_replace('[^-a-zA-Z0-9\.]', '_', $filename);
+      
+      // A Pox on Microsoft and it's Office!
+      if (! $force)
+      {
+          // Try to show in browser window
+          header("Content-Disposition: inline; filename=\"$filename\"");
+	  header("Content-Type: $type0/$type1; name=\"$filename\"");
+      }
+      else
+      {
+          // Try to pop up the "save as" box
+	  // IE makes this hard.  It pops up 2 save boxes, or none.
+	  // http://support.microsoft.com/support/kb/articles/Q238/5/88.ASP
+	  // But, accordint to Microsoft, it is "RFC compliant but doesn't
+	  // take into account some deviations that allowed within the
+	  // specification."  Doesn't that mean RFC non-compliant?
+	  // http://support.microsoft.com/support/kb/articles/Q258/4/52.ASP
+	  //
+	  // The best thing you can do for IE is to upgrade to the latest
+	  // version
+          if ($isIE) {
+	     // http://support.microsoft.com/support/kb/articles/Q182/3/15.asp
+	     // Do not have quotes around filename, but that applied to
+	     // "attachment"... does it apply to inline too?
+	     //
+	     // This combination seems to work mostly.  IE 5.5 SP 1 has
+	     // known issues (see the Microsoft Knowledge Base)
+             header("Content-Disposition: inline; filename=$filename");
+             
+	     // This works for most types, but doesn't work with Word files
+             header("Content-Type: application/download; name=\"$filename\"");
+
+             // These are spares, just in case.  :-)
+             //header("Content-Type: $type0/$type1; name=\"$filename\"");
+             //header("Content-Type: application/x-msdownload; name=\"$filename\"");
+             //header("Content-Type: application/octet-stream; name=\"$filename\"");
+	  } else {
+             header("Content-Disposition: attachment; filename=\"$filename\"");
+	     // application/octet-stream forces download for Netscape
+             header("Content-Type: application/octet-stream; name=\"$filename\"");
+	  }
+      }
+   }
 ?>