Changeset cfe4a6b in github

Timestamp:

Jun 5, 2008 1:35:12 PM (5 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

cd67494

Parents:

0770703

Message:

Fix structure parsing and html output for multipart messages

Files:

• program/include/rcube_imap.php (modified) (2 diffs)
• program/lib/imap.inc (modified) (1 diff)
• program/steps/mail/func.inc (modified) (4 diffs)
• skins/default/mail.css (modified) (1 diff)

program/include/rcube_imap.php

@@ -1075 +1075 @@
       
       // find first non-array entry
-      for ($i=1; count($part); $i++)
+      for ($i=1; $i<count($part); $i++)
         if (!is_array($part[$i]))
           {
@@ -1086 +1086 @@
       $struct->parts = array();
       for ($i=0, $count=0; $i<count($part); $i++)
-        if (is_array($part[$i]) && count($part[$i]) > 5)
+        if (is_array($part[$i]) && count($part[$i]) > 3)
           $struct->parts[] = $this->_structure_part($part[$i], ++$count, $struct->mime_id);
           

program/lib/imap.inc

@@ -2571 +2571 @@
                         } while (!preg_match("/^$key/", $line));
 
-                        $result = trim(substr($result, strpos($result, 'BODYSTRUCTURE')+13, 
-                                    -(strlen($result)-strrpos($result, $key)-2)));
+                        $result = trim(substr($result, strpos($result, 'BODYSTRUCTURE')+13, -(strlen($result)-strrpos($result, $key)+1)));
                 }
         }

program/steps/mail/func.inc

@@ -550 +550 @@
   // text/enriched
   else if ($part->ctype_secondary=='enriched') {
+    $part->ctype_secondary = 'html';
     return Q(enriched_to_html($body), 'show');
   }
@@ -646 +647 @@
   if (!$headers)
     $headers = is_object($MESSAGE->headers) ? get_object_vars($MESSAGE->headers) : $MESSAGE->headers;
+    
+  // add empty subject if none exsists
+  if (empty($headers['subject']))
+    $headers['subject'] = rcube_label('nosubject');
   
   $header_count = 0;
@@ -721 +726 @@
         $body = rcmail_print_body($part, $safe_mode, !$CONFIG['prefer_html']);
         
-        if ($part->ctype_secondary != 'plain')
+        if ($part->ctype_secondary == 'html')
           $out .= html::div('message-htmlpart', rcmail_html4inline($body, $attrib['id']));
         else
@@ -729 +734 @@
     }
   else
-    $out .= html::div('message-part', html::div('pre', $MESSAGE->body));
+    $out .= html::div('message-part', html::div('pre', Q($MESSAGE->body)));
 
 

skins/default/mail.css

@@ -678 +678 @@
 }
 
-div.message-part a
+div.message-part a,
+div.message-htmlpart a
 {
   color: #0000CC;