X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmime.php;h=8c4c5dd0ba2a0771e5a244abba32cc217fdc13b3;hb=40c9b37a16319f362369c122314c28fdc3ff14e5;hp=3b684a9edb8dd4c185d48c0f07ca6f82ae1a01c8;hpb=1eb943d41c8924fb657e9ec41333bd1f12917b6b;p=squirrelmail.git

diff --git a/functions/mime.php b/functions/mime.php
index 3b684a9e..8c4c5dd0 100644
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -412,10 +412,16 @@
       // that it is the first one.  That is usually the case anyway.
       if (!$ent_id) $ent_id = 1;
 
+      // Don't kill the connection if the browser is over a dialup
+      // and it would take over 30 seconds to download it.
+      set_time_limit(0);
+      
       fputs ($imap_stream, "a001 FETCH $id BODY[$ent_id]\r\n");
 	  $cnt = 0;
 	  $continue = true;
 	  	$read = fgets ($imap_stream,4096);
+		// This could be bad -- if the section has 'a001 OK'
+		// or similar, it will kill the download.
 		while (!ereg("^a001 (OK|BAD|NO)(.*)$", $read, $regs)) {
 			if (trim($read) == ")==") {
 				$read1 = $read;
@@ -477,48 +483,48 @@
 
    // figures out what entity to display and returns the $message object
    // for that entity.
-   function findDisplayEntity ($message, $textOnly = 1, $next = 'none')
+   function findDisplayEntity ($message, $textOnly = 1)
    {
       global $show_html_default;
       
       if (! $message)
 	return 0;
 
+      if ($message->header->type0 == "multipart" &&
+          $message->header->type1 == "alternative" &&
+	  $show_html_default && ! $textOnly) {
+	 $entity = findDisplayEntityHTML($message);
+	 if ($entity != 0)
+	    return $entity;
+      }
+	 
       // Show text/plain or text/html -- the first one we find.
       if ($message->header->type0 == 'text' && 
 	  ($message->header->type1 == 'plain' ||
-	   $message->header->type1 == 'html'))
-	{
-	   // If the next part is an HTML version, this will
-	   // all be true.  Show it, if the user so desires.
-	   // HTML mails this way all have entity_id of 2.  1 = text/plain
-	   if ($next != 'none' &&
-	       $textOnly == 0 &&
-	       $next->header->type0 == "text" &&
-	       $next->header->type1 == "html" &&
-	       ($next->header->entity_id == 2 || 
-	        $next->header->entity_id == 1.2) &&
-	       $message->header->type1 == "plain" &&
-	       isset($show_html_default) &&
-	       $show_html_default)
-	     $message = $next;
-	   
-	   if (isset($message->header->entity_id))
-	     return $message->header->entity_id;
-	} 
-      else 
-	{
-	   for ($i=0; isset($message->entities[$i]); $i++) 
-	     {
-		$next = 'none';
-		if (isset($message->entities[$i + 1]))
-		  $next = $message->entities[$i + 1];
-		$entity = findDisplayEntity($message->entities[$i],
-                  $textOnly, $next);
-		if ($entity != 0)
-		  return $entity;
-	     }   
-	}   
+	   $message->header->type1 == 'html') && 
+	  isset($message->header->entity_id))
+	 return $message->header->entity_id;
+
+      for ($i=0; isset($message->entities[$i]); $i++) {
+         $entity = findDisplayEntity($message->entities[$i], $textOnly);
+         if ($entity != 0)
+            return $entity;
+      }
+      
+      return 0;
+   }
+   
+   // Shows the HTML version
+   function findDisplayEntityHTML ($message) {
+      if ($message->header->type0 == 'text' && 
+          $message->header->type1 == 'html' &&
+	  isset($message->header->entity_id))
+	 return $message->header->entity_id;
+      for ($i = 0; isset($message->entities[$i]); $i ++) {
+         $entity = findDisplayEntityHTML($message->entities[$i]);
+	 if ($entity != 0)
+	    return $entity;
+      }
       return 0;
    }