X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fview_text.php;h=226dd41102b240e3d3854204f3fa2902cc339cf5;hb=7b2092f1298addb768a06c390935599c672e2eca;hp=54ddf14217f278a8ecb0bd2983ce4e4af37e2e2f;hpb=e842b215cc74203501fe50e52497f9f0329e721b;p=squirrelmail.git
diff --git a/src/view_text.php b/src/view_text.php
index 54ddf142..226dd411 100644
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -1,97 +1,89 @@
getEntity($ent_id);
+$message = &$messages[$mbx_response['UIDVALIDITY']][$passed_id];
+if (!is_object($message)) {
+ $message = sqimap_get_message($imapConnection, $passed_id, $mailbox);
+}
+$message_ent = $message->getEntity($ent_id);
if ($passed_ent_id) {
$message = &$message->getEntity($passed_ent_id);
}
-
-$header = $message_ent->header;
-$charset = $header->getParameter('charset');
-$type0 = $header->type0;
-$type1 = $header->type1;
+$header = $message_ent->header;
+$type0 = $header->type0;
+$type1 = $header->type1;
+$charset = $header->getParameter('charset');
$encoding = strtolower($header->encoding);
-$msg_url = 'read_body.php?' . $QUERY_STRING;
-$msg_url = set_url_var($msg_url, 'ent_id', 0);
+$msg_url = 'read_body.php?' . $QUERY_STRING;
+$msg_url = set_url_var($msg_url, 'ent_id', 0);
+$dwnld_url = '../src/download.php?' . $QUERY_STRING . '&absolute_dl=true';
+$unsafe_url = 'view_text.php?' . $QUERY_STRING;
+$unsafe_url = set_url_var($unsafe_url, 'view_unsafe_images', 1);
+
$body = mime_fetch_body($imapConnection, $passed_id, $ent_id);
$body = decodeBody($body, $encoding);
+do_hook('message_body', $body);
-displayPageHeader($color, 'None');
-
-echo "
".
- " |
". - "". - " |
". - " |
"; - - if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && - function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) { - if (mb_detect_encoding($body) != 'ASCII') { - $body = $languages[$squirrelmail_language]['XTRA_CODE']('decode', $body); - } +if (isset($languages[$squirrelmail_language]['XTRA_CODE']) && + function_exists($languages[$squirrelmail_language]['XTRA_CODE'].'_decode')) { + if (mb_detect_encoding($body) != 'ASCII') { + $body = call_user_func($languages[$squirrelmail_language]['XTRA_CODE'] . '_decode', $body); } +} if ($type1 == 'html' || (isset($override_type1) && $override_type1 == 'html')) { + $ishtml = TRUE; + // html attachment with character set information + if (! empty($charset)) { + $body = charset_decode($charset,$body,false,true); + } $body = MagicHTML( $body, $passed_id, $message, $mailbox); } else { + $ishtml = FALSE; translateText($body, $wrap_at, $charset); } -echo $body . " |