Changeset 451 in subversion

Timestamp:

Jan 7, 2007 9:26:47 PM (6 years ago)

Author:

estadtherr

Message:

fixed display of HTML attachments

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_imap.inc (modified) (1 diff)
• program/steps/mail/func.inc (modified) (2 diffs)
• program/steps/mail/get.inc (modified) (2 diffs)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ---------------------------
 
+2007/01/07 (estadtherr)
+----------
+- Fixed display of HTML message attachments (closes #1484178)
+
+
 2007/01/07 (thomasb)
 ----------
 - Applied patch for preview caching (closes #1484186)
 - Added Thai and Vietnamese localization files
+
 
 2006/12/29 (thomasb)

trunk/roundcubemail/program/include/rcube_imap.inc

@@ -1122 +1122 @@
   
   /**
-   * Return a flat array with references to all parts, indexed by part numbmers
+   * Return a flat array with references to all parts, indexed by part numbers
    *
    * @param object Message body structure

trunk/roundcubemail/program/steps/mail/func.inc

@@ -974 +974 @@
                (empty($mail_part->disposition) && ($mail_part->d_parameters['filename'] || $mail_part->ctype_parameters['name'])))
         {
-        // skip apple ressource files
+        // skip apple resource forks
         if ($message_ctype_secondary=='appledouble' && $secondary_type=='applefile')
           continue;
@@ -996 +996 @@
       }
 
-
     // if this was a related part try to resolve references
     if ($message_ctype_secondary=='related' && sizeof($sa_inline_objects))

trunk/roundcubemail/program/steps/mail/get.inc

@@ -89 +89 @@
       {
       // we have to analyze the whole structure again to find inline objects
-      list($MESSAGE['parts']) = rcmail_parse_message($MESSAGE['structure'],
-                                                     array('safe' => (bool)$_GET['_safe'],
-                                                           'prefer_html' => TRUE,
-                                                           'get_url' => $GET_URL.'&_part=%s'));
-      $part = &$MESSAGE['parts'][0];
+      list($new_parts, $new_attachments) =
+        rcmail_parse_message($MESSAGE['structure'],
+                             array('safe' => (bool)$_GET['_safe'],
+                                   'prefer_html' => TRUE,
+                                   'get_url' => $GET_URL.'&_part=%s'));
+
+      $all_parts = array_merge($new_parts, $new_attachments);
+      for ($partix = 0; $partix < sizeof($all_parts); $partix++)
+        if ($all_parts[$partix]->mime_id == $pid)
+          $part = &$all_parts[$partix];
 
       // get part body if not available
       if (!$part->body)
-        $part->body = $IMAP->get_message_part($MESSAGE['UID'], $part->mime_id, $part);      
+        $part->body = $IMAP->get_message_part($MESSAGE['UID'], $part->mime_id, $part);
 
       $OUTPUT = new rcube_html_page();
@@ -105 +110 @@
       {
       // turn off output buffering and print part content
-      //@ob_end_clean();
       $IMAP->get_message_part($MESSAGE['UID'], $part->mime_id, $part->encoding, true);
       }