X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fview_text.php;h=dbdc16b89bf42173e1f73af12265f2f069845142;hb=c91b2e3b5b2b35ab39b7c44bc866318b7341f7a1;hp=88210f1cc763f871c2c2f153654754479b7048f3;hpb=dcc1cc825e550711d0207a737f9ea3ac2b38e923;p=squirrelmail.git
diff --git a/src/view_text.php b/src/view_text.php
index 88210f1c..dbdc16b8 100644
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -1,32 +1,27 @@
getEntity($ent_id);
+$message_ent = $message->getEntity($ent_id);
if ($passed_ent_id) {
$message = &$message->getEntity($passed_ent_id);
}
@@ -55,37 +50,41 @@ $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'])) {
+ function_exists($languages[$squirrelmail_language]['XTRA_CODE'].'_decode')) {
if (mb_detect_encoding($body) != 'ASCII') {
- $body = $languages[$squirrelmail_language]['XTRA_CODE']('decode', $body);
+ $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);
}
-displayPageHeader($color, 'None');
+displayPageHeader($color);
+
+$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');
-echo '
' .
- ' |
' . - '' . - ' |
' . - ' |
' . - $body . ' |