* Hopefully fixed the "no text part" bug -- # 417504

[squirrelmail.git] / functions / mime.php

diff --git a/functions/mime.php b/functions/mime.php
index 90b8b37a0a8e6e7e4d137fc63a5e9b1d76175209..dff98e9ff27ff3fd4b63997e551b74aff1e3fb04 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -6,17 +6,17 @@
     **
     ** $Id$
     **/
+    
+   if (defined('mime_php'))
+      return;
+   define('mime_php', true);
 
+   global $debug_mime;
    $debug_mime = false;
-   $mime_php = true;
-
-   if (!isset($i18n_php))
-      include "../functions/i18n.php";
-   if (!isset($imap_php))
-      include "../functions/imap.php";
-   if (!isset($config_php))
-      include "../config/config.php";
-
+   
+   include "../functions/i18n.php";
+   include "../functions/imap.php";
+   include "../config/config.php";
 
    /** Setting up the objects that have the structure for the message **/
 
@@ -484,7 +484,7 @@
       global $show_html_default;
       
       if (! $message)
-       return;
+       return 0;
 
       // Show text/plain or text/html -- the first one we find.
       if ($message->header->type0 == 'text' && 
@@ -498,7 +498,8 @@
               $textOnly == 0 &&
               $next->header->type0 == "text" &&
               $next->header->type1 == "html" &&
-              $next->header->entity_id == 2 &&
+              ($next->header->entity_id == 2 || 
+               $next->header->entity_id == 1.2) &&
               $message->header->type1 == "plain" &&
               isset($show_html_default) &&
               $show_html_default)
@@ -553,13 +554,14 @@
             translateText($body, $wrap_at, $body_message->header->charset);
          }   
    
-         $body .= "<SMALL><CENTER><A HREF=\"../src/download.php?absolute_dl=true&passed_id=$id&passed_ent_id=$ent_num&mailbox=$urlmailbox\">". _("Download this as a file") ."</A></CENTER><BR></SMALL>";
+         $body .= "<SMALL><CENTER><A HREF=\"../src/download.php?absolute_dl=true&passed_id=$id&passed_ent_id=$ent_num&mailbox=$urlmailbox&showHeaders=1\">". _("Download this as a file") ."</A></CENTER><BR></SMALL>";
    
          /** Display the ATTACHMENTS: message if there's more than one part **/
          $body .= "</TD></TR></TABLE>";
          if (isset($message->entities[0])) {
             $body .= formatAttachments ($message, $ent_num, $message->header->mailbox, $id);
          }
+            $body .= "</TD></TR></TABLE>";
       } else {
          $body = formatAttachments ($message, -1, $message->header->mailbox, $id);
       }