X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fdownload.php;h=2ee84adf250f8dd10bbf6daa77b4e6f830958365;hp=37cb370fdf76e819ed46b5d8d47273388428518b;hb=53f5d72eb2cf9b453360c36e51cb3e8bba8a64ec;hpb=2a0372ff98b6da79ebb4798f2790c5ab79602911

diff --git a/src/download.php b/src/download.php
index 37cb370f..2ee84adf 100644
--- a/src/download.php
+++ b/src/download.php
@@ -1,23 +1,39 @@
 <?php
-   /**
-    **  download.php
-    **
-    **  Copyright (c) 1999-2000 The SquirrelMail development 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.
-    **
-    **  $Id$
-    **/
-
-   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");
+
+/**
+ * download.php
+ *
+ * Copyright (c) 1999-2002 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.
+ *
+ * $Id$
+ */
+
+/*****************************************************************/
+/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!!           ***/
+/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION.             ***/
+/***    + Base level indent should begin at left margin, as    ***/
+/***      the require_once below looks.                        ***/
+/***    + All identation should consist of four space blocks   ***/
+/***    + Tab characters are evil.                             ***/
+/***    + all comments should use "slash-star ... star-slash"  ***/
+/***      style -- no pound characters, no slash-slash style   ***/
+/***    + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD      ***/
+/***      ALWAYS USE { AND } CHARACTERS!!!                     ***/
+/***    + Please use ' instead of ", when possible. Note "     ***/
+/***      should always be used in _( ) function calls.        ***/
+/*** Thank you for your help making the SM code more readable. ***/
+/*****************************************************************/
+
+define('download_php', true);  // Used for preferences
+
+require_once('../src/validate.php');
+require_once('../functions/imap.php');
+require_once('../functions/mime.php');
+require_once('../functions/date.php');
 
    header("Pragma: ");
    header("Cache-Control: cache");
@@ -26,7 +42,7 @@
       global $where, $what, $charset;
       global $startMessage;
       
-      displayPageHeader($color, "None");
+      displayPageHeader($color, 'None');
 
       echo "<BR><TABLE WIDTH=100% BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR=\"$color[0]\">";
       echo "<B><CENTER>";
@@ -48,9 +64,13 @@
       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")
+      if ($type1 == 'html') {
+         $body = MagicHTML( $body, $id );
+      } else {
          translateText($body, $wrap_at, $charset);
+      }
       
+      flush();
       echo $body;
 
       echo "</TT></TD></TR></TABLE>";
@@ -110,7 +130,6 @@
    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);
@@ -144,7 +163,6 @@
             if ($type1 == "plain" || $type1 == "html") {
                 $body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id);
                 $body = decodeBody($body, $header->encoding);
-                include("../functions/page_header.php");
                 viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at);
             } else {
 		DumpHeaders($type0, $type1, $filename, 0);
@@ -156,7 +174,6 @@
          case "message":
             $body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id);
             $body = decodeBody($body, $header->encoding);
-            include("../functions/page_header.php");
             viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at);
             break;
          default: