SMPATH fix

[squirrelmail.git] / src / download.php

diff --git a/src/download.php b/src/download.php
index 899aacaf919a2d293c892d257739539a2f077101..574420ec16baa09bd44c3fe5b1f18bc51ca8341e 100644 (file)
--- a/src/download.php
+++ b/src/download.php
@@ -12,9 +12,13 @@
  * $Id$
  */
 
-require_once('../src/validate.php');
-require_once('../functions/imap.php');
-require_once('../functions/mime.php');
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/mime.php');
 
 header('Pragma: ');
 header('Cache-Control: cache');
@@ -43,6 +47,9 @@ if (!isset($passed_ent_id)) {
 }
 
 $message = &$messages[$mbx_response['UIDVALIDITY']]["$passed_id"];
+if (!is_object($message)) {
+    $message = sqimap_get_message($imapConnection,$passed_id, $mailbox);
+}
 $subject = $message->rfc822_header->subject;
 $message = &$message->getEntity($ent_id);
 $header = $message->header;
@@ -146,15 +153,12 @@ if (isset($absolute_dl) && $absolute_dl == 'true') {
  * attachment in case of ERROR reporting = E_ALL and the output is the screen */
 mime_print_body_lines ($imapConnection, $passed_id, $ent_id, $encoding);
 
-$message = &$message->getEntity('');
-$messages[$mbx_response['UIDVALIDITY']]["$passed_id"] = &$message;
-
 /*
  * 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;
+    global $HTTP_USER_AGENT, $languages, $squirrelmail_language;
     $isIE = 0;
 
     if (strstr($HTTP_USER_AGENT, 'compatible; MSIE ') !== false &&
@@ -167,7 +171,13 @@ function DumpHeaders($type0, $type1, $filename, $force) {
         $isIE6 = 1;
     }
 
-    $filename = ereg_replace('[^-a-zA-Z0-9\.]', '_', $filename);
+    if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
+        function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
+        $filename = 
+            $languages[$squirrelmail_language]['XTRA_CODE']('downloadfilename', $filename, $HTTP_USER_AGENT);
+    } else {
+       $filename = ereg_replace('[^-a-zA-Z0-9\.]', '_', $filename);
+    }
 
     // A Pox on Microsoft and it's Office!
     if (! $force) {