X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fmime.php;h=8c4404f59efd99ba0c48ad462c69679928009be0;hb=3d6c7e964247034a8e7c1853d63badc02dcaebdd;hp=4c1930b728732796ff28ad06312b9a122824d708;hpb=377a40b2b1d2df34b77f5e35bf4493fd1c1ee748;p=squirrelmail.git

diff --git a/functions/mime.php b/functions/mime.php
index 4c1930b7..8c4404f5 100644
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -28,7 +28,7 @@
       var $encoding = '', $size = 0, $to = array(), $from = '', $date = '';
       var $cc = array(), $bcc = array(), $reply_to = '', $subject = '';
       var $id = 0, $mailbox = '', $description = '', $filename = '';
-      var $entity_id = 0, $message_id = 0;
+      var $entity_id = 0, $message_id = 0, $name = '';
    }
    
    class message {
@@ -161,6 +161,7 @@
       $elem_num = 1;
       $msg->header = new msg_header();
       $msg->header->entity_id = $ent_id;
+      $properties = array();
       
       while (strlen($structure) > 0) {
          $structure = trim($structure);
@@ -184,8 +185,6 @@
             // comment me
             $end = mime_match_parenthesis (0, $structure);
             $sub = substr($structure, 1, $end-1);
-	    if (! isset($properties))
-	        $properties = array();
             $properties = mime_get_props($properties, $sub);
             $structure = substr($structure, strlen($sub) + 2);
          } else {
@@ -352,6 +351,8 @@
       // ignore all extra characters
       // If inside of a string, skip string -- Boundary IDs and other
       // things can have ) in them.
+      if ($char != '(')
+          return strlen($structure);
       while ($pos < strlen($structure)) {
          $pos++;
          $char = substr($structure, $pos, 1); 
@@ -478,21 +479,48 @@
 
    // figures out what entity to display and returns the $message object
    // for that entity.
-   function findDisplayEntity ($message) {
-      if ($message) {
-         if ($message->header->type0 == "text") {
-            if ($message->header->type1 == "plain" ||
-                $message->header->type1 == "html") {
-	       if (isset($message->header->entity_id))
-                   return $message->header->entity_id;
-	       return 0;
-            }
-         } else {
-            for ($i=0; $message->entities[$i]; $i++) {
-               return findDisplayEntity($message->entities[$i]);
-            }   
-         }   
-      }
+   function findDisplayEntity ($message, $textOnly = 1, $next = 'none')
+   {
+      global $show_html_default;
+      
+      if (! $message)
+	return;
+
+      // 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 &&
+	       $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;
+	     }   
+	}   
+      return 0;
    }
 
    /** This returns a parsed string called $body. That string can then
@@ -510,7 +538,8 @@
       $urlmailbox = urlencode($message->header->mailbox);
 
       // Get the right entity and redefine message to be this entity
-      $ent_num = findDisplayEntity ($message);
+      // Pass the 0 to mean that we want the 'best' viewable one
+      $ent_num = findDisplayEntity ($message, 0);
       $body_message = getEntity($message, $ent_num);
       if (($body_message->header->type0 == "text") || 
           ($body_message->header->type0 == "rfc822")) {
@@ -567,11 +596,17 @@
          if (!$message->entities) {
             $type0 = strtolower($message->header->type0);
             $type1 = strtolower($message->header->type1);
+            $name = decodeHeader($message->header->name);
             
             if ($message->header->entity_id != $ent_id) {
                $filename = decodeHeader($message->header->filename);
                if (trim($filename) == "") {
-                  $display_filename = "untitled-".$message->header->entity_id;
+                  if (trim($name) == "") { 
+                     $display_filename = "untitled-".$message->header->entity_id; 
+                  } else { 
+                     $display_filename = $name; 
+                     $filename = $name; 
+                  } 
                } else {
                   $display_filename = $filename;
                }
@@ -665,7 +700,7 @@
             $replace = ereg_replace("_", " ", $res[3]);
 	    // Convert lowercase Quoted Printable to uppercase for
 	    // quoted_printable_decode to understand it.
-	    while (ereg("(=([0-9][abcdef])|([abcdef][0-9])|([abcdef][abcdef]))", $replace, $res)) {
+	    while (ereg("(=(([0-9][abcdef])|([abcdef][0-9])|([abcdef][abcdef])))", $replace, $res)) {
 	       $replace = str_replace($res[1], strtoupper($res[1]), $replace);
 	    }
             $replace = quoted_printable_decode($replace);
@@ -673,9 +708,10 @@
 
          $replace = charset_decode ($res[1], $replace);
 
-         $string = eregi_replace
-            ('=\\?([^?]+)\\?(q|b)\\?([^?]+)\\?=',
+         // Remove the name of the character set.
+         $string = eregi_replace ('=\\?([^?]+)\\?(q|b)\\?([^?]+)\\?=',
              $replace, $string);
+
          // In case there should be more encoding in the string: recurse
          return (decodeHeader($string));
       } else         
@@ -690,7 +726,6 @@
 
       // Encode only if the string contains 8-bit characters or =?
       if (ereg("([\200-\377]|=\\?)", $string)) {
-         $newstring = "=?$default_charset?Q?";
          
          // First the special characters
          $string = str_replace("=", "=3D", $string);
@@ -702,7 +737,6 @@
 	    $replace = chr($ch);
 	    $insert = sprintf("=%02X", $ch);
             $string = str_replace($replace, $insert, $string);
-	    $ch++;
          }
 
          $newstring = "=?$default_charset?Q?".$string."?=";