From 77c28206a14b5bee3f3091f10cffd531bce5649c Mon Sep 17 00:00:00 2001 From: yllar <yllar.pajus@gmail.com> Date: Sat, 16 Dec 2006 13:25:16 -0500 Subject: [PATCH] updated ja and fr translations --- program/steps/mail/get.inc | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc index f05bbbd..e1ae281 100644 --- a/program/steps/mail/get.inc +++ b/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,17 +87,19 @@ // deliver part content if ($ctype_primary=='text' && $ctype_secondary=='html') { + // 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]; + // 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')); - $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 { -- Gitblit v1.9.1