X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fdownload.php;h=f8a334d180b98465c4ba92fd0e356e109034d43a;hb=d30d79f24098bb0e09a68467539912208434ac2f;hp=b89fced173a99c58dd6fdcfa9de9cc51b4ab6279;hpb=11307a4c707a22ef7dc2530b0e33c2afa5329e58;p=squirrelmail.git

diff --git a/src/download.php b/src/download.php
index b89fced1..f8a334d1 100644
--- a/src/download.php
+++ b/src/download.php
@@ -1,11 +1,16 @@
 <?
-   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");
 
    include("../src/load_prefs.php");
 
@@ -14,10 +19,14 @@
       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 "<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
@@ -26,12 +35,12 @@
       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"];
@@ -75,5 +84,5 @@
       }
    }
 
-   fputs($imapConnection, "1 logout\n");
+   sqimap_logout($imapConnection);
 ?>