X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fview_text.php;h=b032b11a30fc3173ab843ab2837bcd44acc339f9;hb=32e0556a7b0a35972db014f5fde8fa89741d2b51;hp=da200a551d27c37c5b429915920233bb94d12124;hpb=facf44e7f650a129a5a483bf140696a5ae369e73;p=squirrelmail.git
diff --git a/src/view_text.php b/src/view_text.php
index da200a55..b032b11a 100644
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -1,66 +1,102 @@
getEntity($passed_ent_id);
+$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
+$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox);
- $header = $message->header;
- $charset = $header->charset;
- $type0 = $header->type0;
- $type1 = $header->type1;
- $encoding = strtolower($header->encoding);
+$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;
+$type0 = $header->type0;
+$type1 = $header->type1;
+$charset = $header->getParameter('charset');
+$encoding = strtolower($header->encoding);
- $msg_url = 'read_body.php?' . $QUERY_STRING;
+$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, $passed_ent_id);
- $body = decodeBody($body, $encoding);
- displayPageHeader($color, 'None');
+$body = mime_fetch_body($imapConnection, $passed_id, $ent_id);
+$body = decodeBody($body, $encoding);
+$hookResults = do_hook('message_body', $body);
+$body = $hookResults[1];
- echo "
".
- " |
". - "". - " |
". - " |
"; +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') { - $msg = sqimap_get_message($imapConnection, $passed_id, $mailbox); - $msg = $msg->getEntity($passed_ent_id); - $body = MagicHTML( $body, $passed_id, $msg ); - } else { - translateText($body, $wrap_at, $charset); +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); } - echo $body . - " |
+
+' . _("View message") . '';
+?>
+ |
+' . _("View Unsafe Images") . ' | ';
+}
+echo '' . _("Download this as a file") . '';
+?>
+ + + |
+ |
+ + |