svncommit
2007-01-07 bb85623f8ab1eb263cb0bfac6e1758438eaa5bd2
program/steps/mail/get.inc
@@ -29,7 +29,7 @@
  $message = rcube_label('loadingdata');
  print "<html>\n<head>\n" .
        '<meta http-equiv="refresh" content="0; url='.$url.'">' .
        '<meta http-equiv="refresh" content="0; url='.htmlspecialchars($url).'">' .
        "\n</head>\n<body>" .
        $message .
        "\n</body>\n</html>";
@@ -87,22 +87,28 @@
    // deliver part content
    if ($ctype_primary=='text' && $ctype_secondary=='html')
      {
      // we have to analyze the whole structure again to find inline objects
      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);
      list($MESSAGE['parts']) = rcmail_parse_message($part,
                                                     array('safe' => (bool)$_GET['_safe'],
                                                           'prefer_html' => TRUE,
                                                           'get_url' => $GET_URL.'&_part=%s'));
        $part->body = $IMAP->get_message_part($MESSAGE['UID'], $part->mime_id, $part);
      $OUTPUT = new rcube_html_page();
      $OUTPUT->write(rcmail_print_body($MESSAGE['parts'][0], (bool)$_GET['_safe']));
      $OUTPUT->write(rcmail_print_body($part, (bool)$_GET['_safe']));
      }
    else
      {
      // turn off output buffering and print part content
      //@ob_end_clean();
      $IMAP->get_message_part($MESSAGE['UID'], $part->mime_id, $part->encoding, true);
      }