X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fview_text.php;h=d537daabc161c2ef80f6937007c3940b0f90941f;hb=caa592dc7d3d53777323707cc5731fb48d3dc1bc;hp=7e856659dd3b0338e1d754cf14de29db40534338;hpb=08185f2a7631c3a12cb1ac085fec3be471b56b00;p=squirrelmail.git
diff --git a/src/view_text.php b/src/view_text.php
index 7e856659..d537daab 100644
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -1,73 +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 ($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 . " |