A terrible pile of things done to the code. Did a little bit of SM_PATH

[squirrelmail.git] / src / download.php

diff --git a/src/download.php b/src/download.php
index ebf4e91b299ee4fb205e567aeafbd6d4b3f9a494..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;
@@ -164,11 +171,12 @@ function DumpHeaders($type0, $type1, $filename, $force) {
         $isIE6 = 1;
     }
 
-    if (function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
+    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);
+       $filename = ereg_replace('[^-a-zA-Z0-9\.]', '_', $filename);
     }
 
     // A Pox on Microsoft and it's Office!