X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fview_text.php;h=88210f1cc763f871c2c2f153654754479b7048f3;hb=df7b27c12af4da5af86c63fccc6b5adf2dbf33ff;hp=a333a1eb843dc3d61d0fa1e3ea4f1c88242a563f;hpb=1e12d1ffb4f54350932a17397d38917db21d64df;p=squirrelmail.git
diff --git a/src/view_text.php b/src/view_text.php
index a333a1eb..88210f1c 100644
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -11,9 +11,10 @@
* be very ashamed.
*
* $Id$
+ * @package squirrelmail
*/
-/* Path for SquirrelMail required files. */
+/** Path for SquirrelMail required files. */
define('SM_PATH','../');
/* SquirrelMail required files. */
@@ -26,64 +27,65 @@ require_once(SM_PATH . 'functions/html.php');
sqgetGlobalVar('key', $key, SQ_COOKIE);
sqgetGlobalVar('username', $username, SQ_SESSION);
sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
-sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
+sqgetGlobalVar('messages', $messages, SQ_SESSION);
+sqgetGlobalVar('mailbox', $mailbox, SQ_GET);
+sqgetGlobalVar('ent_id', $ent_id, SQ_GET);
+sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET);
sqgetGlobalVar('QUERY_STRING', $QUERY_STRING, SQ_SERVER);
-sqgetGlobalVar('messages', $messages);
-sqgetGlobalVar('passed_id', $passed_id, SQ_GET);
-
-if ( sqgetGlobalVar('mailbox', $temp, SQ_GET) ) {
- $mailbox = urldecode($temp);
-}
-if ( !sqgetGlobalVar('ent_id', $ent_id, SQ_GET) ) {
- $ent_id = '';
+if (sqgetGlobalVar('passed_id', $temp, SQ_GET)) {
+ $passed_id = (int) $temp;
}
-if ( !sqgetGlobalVar('passed_ent_id', $passed_ent_id, SQ_GET) ) {
- $passed_ent_id = '';
-}
-
-
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox);
+$mbx_response = sqimap_mailbox_select($imapConnection, $mailbox);
-$message = &$messages[$mbx_response['UIDVALIDITY']]["$passed_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';
$body = mime_fetch_body($imapConnection, $passed_id, $ent_id);
$body = decodeBody($body, $encoding);
-displayPageHeader($color, 'None');
-
-echo "
".
- "".
- _("Viewing a text attachment") . " - ";
-echo ''. _("View message") . '';
+if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
+ function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
+ if (mb_detect_encoding($body) != 'ASCII') {
+ $body = $languages[$squirrelmail_language]['XTRA_CODE']('decode', $body);
+ }
+}
-$dwnld_url = '../src/download.php?'. $QUERY_STRING.'&absolute_dl=true';
-echo ' |
|
'.
- _("Download this as a file").
- " ".
- "".
- " |
".
- "".
- " |
";
if ($type1 == 'html' || (isset($override_type1) && $override_type1 == 'html')) {
$body = MagicHTML( $body, $passed_id, $message, $mailbox);
} else {
translateText($body, $wrap_at, $charset);
}
-echo $body . " |
";
+displayPageHeader($color, 'None');
+
+echo '
' .
+ '' .
+ '