Fixed some bugs in folder deleting

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

index 094dc04e27810c8f7ef0dbe3498f014982f35c6f..f8a334d180b98465c4ba92fd0e356e109034d43a 100644 (file)
--- a/src/download.php
+++ b/src/download.php
@@ -1,31 +1,46 @@
  <?
-   include("../config/config.php");
-   include("../functions/strings.php");
-   include("../functions/page_header.php");
-   include("../functions/imap.php");
-   include("../functions/mime.php");
-   include("../functions/mailbox.php");
-   include("../functions/date.php");
+   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");
  
-   function viewText($color, $body, $id, $entid, $mailbox) {
+   include("../src/load_prefs.php");
+
+   function viewText($color, $body, $id, $entid, $mailbox, $type1, $wrap_at) {
        echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
        displayPageHeader($color, "None");
  
        echo "<BR><TABLE WIDTH=90% BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR=\"$color[0]\">";
-      echo "<B><CENTER>Viewing a plain text attachment</CENTER></B>";
+      echo "<B><CENTER>";
+      echo _("Viewing a plain text attachment");
+      echo "</CENTER></B>";
        echo "</TD></TR><TR><TD BGCOLOR=\"$color[4]\">";
        $urlmailbox = urlencode($mailbox);
-      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($body);
+      echo "<FONT FACE=\"Arial, Helvetica\"><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></FONT><TT>";
+      if ($type1 == "html")
+         echo $body;
+      else
+         echo translateText($body, $wrap_at);
+
        echo "</TT></TD></TR></TABLE>";
     }
  
-   $imapConnection = loginToImapServer($username, $key, $imapServerAddress);
-   selectMailbox($imapConnection, $mailbox, $numMessages);
+   $imapConnection = sqimap_login($username, $key, $imapServerAddress, 0);
+   sqimap_mailbox_select($imapConnection, $mailbox);
  
     // $message contains all information about the message
     // including header and body
-   $message = fetchMessage($imapConnection, $passed_id, $mailbox);
+   $message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
  
     $type0 = $message["ENTITIES"][$passed_ent_id]["TYPE0"];
     $type1 = $message["ENTITIES"][$passed_ent_id]["TYPE1"];
@@ -41,7 +56,7 @@
              $body = decodeBody($message["ENTITIES"][$passed_ent_id]["BODY"], $message["ENTITIES"][$passed_ent_id]["ENCODING"]);
              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"]);
@@ -54,11 +69,11 @@
        switch ($type0) {
           case "text":
              $body = decodeBody($message["ENTITIES"][$passed_ent_id]["BODY"], $message["ENTITIES"][$passed_ent_id]["ENCODING"]);
-            viewText($color, $body, $passed_id, $passed_ent_id, $mailbox);
+            viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at);
              break;
           case "message":
              $body = decodeBody($message["ENTITIES"][$passed_ent_id]["BODY"], $message["ENTITIES"][$passed_ent_id]["ENCODING"]);
-            viewText($color, $body, $passed_id, $passed_ent_id, $mailbox);
+            viewText($color, $body, $passed_id, $passed_ent_id, $mailbox, $type1, $wrap_at);
              break;
           default:
              $body = decodeBody($message["ENTITIES"][$passed_ent_id]["BODY"], $message["ENTITIES"][$passed_ent_id]["ENCODING"]);
@@ -69,5 +84,5 @@
        }
     }
  
-   fputs($imapConnection, "1 logout\n");
+   sqimap_logout($imapConnection);
  ?>