removed displaying attachments in case we are dealing with

multipart/alternative or multipart/related messages.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2889 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/mime.php b/functions/mime.php
index 6e11b1d067c69d3928a9e2aaa330ab5add00d2cd..61e345741c836eedaf62ebdb31d92f3345288819 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -811,7 +811,13 @@ function formatBody($imap_stream, $message, $color, $wrap_at) {
 
         /** Display the ATTACHMENTS: message if there's more than one part **/
         if (isset($message->entities[1])) {
 
         /** Display the ATTACHMENTS: message if there's more than one part **/
         if (isset($message->entities[1])) {

-            $body .= formatAttachments ($message, $ent_num, $message->header->mailbox, $id);
+           /* Header-type alternative means we choose the best one to display 
+              so don't show the alternatives as attachment. Header-type related
+              means that the attachments are already part of the related message.
+           */   
+           if ($message->header->type1 !='related' && $message->header->type1 !='alternative') {
+               $body .= formatAttachments ($message, $ent_num, $message->header->mailbox, $id);
+           }

         }
     } else {
         $body = formatAttachments ($message, -1, $message->header->mailbox, $id);
         }
     } else {
         $body = formatAttachments ($message, -1, $message->header->mailbox, $id);