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

diff --git a/functions/mime.php b/functions/mime.php
index 379bdb27..8c4404f5 100644
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -25,10 +25,10 @@
       /** could be in a header.                                 **/
       
       var $type0 = '', $type1 = '', $boundary = '', $charset = '';
-      var $encoding = '', $size = 0, $to = '', $from = '', $date = '';
-      var $cc = '', $bcc = '', $reply_to = '', $subject = '';
+      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 {
@@ -38,7 +38,7 @@
           a better description of how this works.
        **/   
       var $header = '';
-      var $entities = '';
+      var $entities = array();
       
       function addEntity ($msg) {
          $this->entities[] = $msg;
@@ -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,14 +185,13 @@
             // 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 {
             // loop through until we find a space or an end parenthesis
             $pos = 0;
             $char = substr($structure, $pos, 1);
+            $text = "";
             while ($char != " " && $char != ")" && $pos < strlen($structure)) {
                $text .= $char;
                $pos++;
@@ -351,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); 
@@ -360,12 +362,18 @@
             $pos ++;
             while (substr($structure, $pos, 1) != '"' && 
                $pos < strlen($structure)) {
+	       if (substr($structure, $pos, 2) == '\\"')
+	           $pos ++;
+	       elseif (substr($structure, $pos, 2) == '\\\\')
+	           $pos ++;
                $pos ++;
             }
          } else if ($char == "(") {
             $pos = mime_match_parenthesis ($pos, $structure);
          }
       }
+      echo "Error decoding mime structure.  Report this as a bug!<br>\n";
+      return $pos;
    }
 
    function mime_fetch_body ($imap_stream, $id, $ent_id) {
@@ -376,11 +384,11 @@
       fputs ($imap_stream, "a010 FETCH $id BODY[$ent_id]\r\n");
       $data = sqimap_read_data ($imap_stream, 'a010', true, $response, $message);
       $topline = array_shift($data);
-      while (! ereg('\* [0-9]+ FETCH ', $topline) && data)
+      while (! ereg('\\* [0-9]+ FETCH ', $topline) && data)
           $topline = array_shift($data);
       $wholemessage = implode('', $data);
 
-      if (ereg('\{([^\}]*)\}', $topline, $regs)) {
+      if (ereg('\\{([^\\}]*)\\}', $topline, $regs)) {
          return substr($wholemessage, 0, $regs[1]);
       }
       else if (ereg('"([^"]*)"', $topline, $regs)) {
@@ -460,7 +468,7 @@
          if ($message->header->entity_id == $ent_id && strlen($ent_id) == strlen($message->header->entity_id)) {
             return $message;
          } else {
-            for ($i = 0; $message->entities[$i]; $i++) {
+            for ($i = 0; isset($message->entities[$i]); $i++) {
                $msg = getEntity ($message->entities[$i], $ent_id);
                if ($msg)
                   return $msg;
@@ -471,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
@@ -503,12 +538,13 @@
       $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")) {
    
-         $body = mime_fetch_body ($imap_stream, $id, $ent_num); 
+         $body = mime_fetch_body ($imap_stream, $id, $ent_num);
          $body = decodeBody($body, $body_message->header->encoding);
    
          // If there are other types that shouldn't be formatted, add
@@ -544,7 +580,7 @@
             
             $body .= "<TABLE WIDTH=100% CELLSPACING=0 CELLPADDING=2 BORDER=0 BGCOLOR=\"$color[0]\"><TR>\n";
             $body .= "<TH ALIGN=\"left\" BGCOLOR=\"$color[9]\"><B>\n";
-            $body .= _('Attachments') . ':';
+            $body .= _("Attachments") . ':';
             $body .= "</B></TH></TR><TR><TD>\n";
             
             $body .= "<TABLE CELLSPACING=0 CELLPADDING=1 BORDER=0>\n";
@@ -560,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;
                }
@@ -576,7 +618,7 @@
                   "../src/download.php?startMessage=$startMessage&passed_id=$id&mailbox=$urlMailbox&passed_ent_id=$ent";
                if ($where && $what)
                   $DefaultLink .= '&where=' . urlencode($where) . '&what=' . urlencode($what);
-               $Links['download link']['text'] = _('download');
+               $Links['download link']['text'] = _("download");
                $Links['download link']['href'] = 
                    "../src/download.php?absolute_dl=true&passed_id=$id&mailbox=$urlMailbox&passed_ent_id=$ent";
                $ImageURL = '';
@@ -650,7 +692,7 @@
    // This functions decode strings that is encoded according to 
    // RFC1522 (MIME Part Two: Message Header Extensions for Non-ASCII Text).
    function decodeHeader ($string) {
-      if (eregi('=\?([^?]+)\?(q|b)\?([^?]+)\?=', 
+      if (eregi('=\\?([^?]+)\\?(q|b)\\?([^?]+)\\?=', 
                 $string, $res)) {
          if (ucfirst($res[2]) == "B") {
             $replace = base64_decode($res[3]);
@@ -658,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);
@@ -666,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         
@@ -683,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);
@@ -695,7 +737,6 @@
 	    $replace = chr($ch);
 	    $insert = sprintf("=%02X", $ch);
             $string = str_replace($replace, $insert, $string);
-	    $ch++;
          }
 
          $newstring = "=?$default_charset?Q?".$string."?=";