X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fview_text.php;h=d86fe1782b61b0bc238ac56abd99a69dedc1dbc5;hb=a571cff36ff1c340cbd2130ce9c0e2ab7ef96977;hp=d0c387426eec66a107812558a2c8934990fac171;hpb=24419a724250992245ee1a9e0753577667c8eeec;p=squirrelmail.git
diff --git a/src/view_text.php b/src/view_text.php
index d0c38742..d86fe178 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,14 @@ $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);
+do_hook('message_body', $body);
if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
function_exists($languages[$squirrelmail_language]['XTRA_CODE'].'_decode')) {
@@ -71,28 +64,25 @@ 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');
+
+$oTemplate->assign('view_message_href', $msg_url);
+$oTemplate->assign('download_href', $dwnld_url);
+$oTemplate->assign('view_unsafe_image_href', $ishtml ? $unsafe_url : '');
+$oTemplate->assign('body', $body);
+
+$oTemplate->display('view_text.tpl');
+
+$oTemplate->display('footer.tpl');
?>
-
- |
- - |
- |
- - |