Removing Debug Info

[squirrelmail.git] / src / download.php

diff --git a/src/download.php b/src/download.php
index b1e0b1a9129205beb38d1930c6de695eca69706b..1d73a47b061edc8c0baf503eada29a3f64d3d27f 100644 (file)
--- a/src/download.php
+++ b/src/download.php
@@ -13,14 +13,10 @@
 
    define('download_php', true);  // Used for preferences
 
-   include('../src/validate.php');
-   include("../functions/strings.php");
-   include("../config/config.php");
-   include("../functions/imap.php");
-   include("../functions/mime.php");
-   include("../functions/date.php");
-   include("../functions/i18n.php");
-   include("../src/load_prefs.php");
+   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");
@@ -51,9 +47,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>";
@@ -113,7 +113,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);
@@ -147,7 +146,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);
@@ -159,7 +157,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:
@@ -170,12 +167,15 @@
    }
    
    
+   // This function is verified to work with Netscape and the *very latest*
+   // version of IE.  I don't know if it works with Opera, but it should now.
    function DumpHeaders($type0, $type1, $filename, $force)
    {
       global $HTTP_USER_AGENT;
       
       $isIE = 0;
-      if (strstr($HTTP_USER_AGENT, 'compatible; MSIE ') !== false) {
+      if (strstr($HTTP_USER_AGENT, 'compatible; MSIE ') !== false &&
+          strstr($HTTP_USER_AGENT, 'Opera') === false) {
         $isIE = 1;
       }
       
@@ -223,4 +223,4 @@
          }
       }
    }
-?>
+?>
\ No newline at end of file