updated Brazillian Portuguise translation

[squirrelmail.git] / functions / mime.php

diff --git a/functions/mime.php b/functions/mime.php
index eb2330ec4f4bf09d7a40439362eb80bc897bc142..53ae552cd6123f0487f1d5abdac889d0f5042700 100644 (file)
--- 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); 
@@ -361,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) {
@@ -377,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)) {
@@ -509,7 +516,7 @@
       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
@@ -561,11 +568,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;
                }
@@ -651,7 +664,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]);
@@ -668,7 +681,7 @@
          $replace = charset_decode ($res[1], $replace);
 
          $string = eregi_replace
-            ('=\?([^?]+)\?(q|b)\?([^?]+)\?=',
+            ('=\\?([^?]+)\\?(q|b)\\?([^?]+)\\?=',
              $replace, $string);
          // In case there should be more encoding in the string: recurse
          return (decodeHeader($string));