X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fview_text.php;h=948420e016b5ba1728b9c2791c281d66ac10530a;hb=d4c2aa240cb09ef33ece91769f2781186edffd2d;hp=2c2b54b47db4152a3baec72c9d4227953f588528;hpb=3c621ba1116356a3a8e2616ef6d267f5edb3ea06;p=squirrelmail.git
diff --git a/src/view_text.php b/src/view_text.php
index 2c2b54b4..948420e0 100644
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -1,35 +1,24 @@
getEntity($ent_id);
+$message_ent = $message->getEntity($ent_id);
if ($passed_ent_id) {
$message = &$message->getEntity($passed_ent_id);
}
@@ -58,10 +47,15 @@ $encoding = strtolower($header->encoding);
$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';
+$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);
+$hookResults = do_hook('message_body', $body);
+$body = $hookResults[1];
if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
function_exists($languages[$squirrelmail_language]['XTRA_CODE'].'_decode')) {
@@ -71,24 +65,39 @@ if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
}
if ($type1 == 'html' || (isset($override_type1) && $override_type1 == 'html')) {
+ $ishtml = TRUE;
$body = MagicHTML( $body, $passed_id, $message, $mailbox);
+ // html attachment with character set information
+ if (! empty($charset)) {
+ $body = charset_decode($charset,$body,false,true);
+ }
} else {
+ $ishtml = FALSE;
translateText($body, $wrap_at, $charset);
}
displayPageHeader($color, 'None');
-
-echo '
' .
- ' |
' . - '' . - ' |
' . - ' |
' . - $body . ' |