fix for downloadlink and for redirecting html entities

[squirrelmail.git] / src / view_text.php

diff --git a/src/view_text.php b/src/view_text.php
index da200a551d27c37c5b429915920233bb94d12124..e1ddde570290a1c198e09618d4e8db1614b2ebfa 100644 (file)
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -1,21 +1,10 @@
 <?php
 
-/**
- * view_text.php
- *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
- * This is the code to view the text attachments.
- *
- * $Id$
- */
-
-
    require_once('../src/validate.php');
    require_once('../functions/imap.php');
    require_once('../functions/mime.php');
-
+   require_once('../functions/html.php');
+   
    $mailbox = urldecode($mailbox);
    if (!isset($passed_ent_id)) {
       $passed_ent_id = '';
@@ -25,17 +14,18 @@
    $mbx_response =  sqimap_mailbox_select($imapConnection, $mailbox);
 
    $message = &$messages[$mbx_response['UIDVALIDITY']]["$passed_id"];
-   $message = &$message->getEntity($passed_ent_id);
-
+   $message = &$message->getEntity($ent_id);
+   
    $header = $message->header;
-   $charset = $header->charset;
+   $charset = $header->getParameter('charset');
    $type0 = $header->type0;
    $type1 = $header->type1;
    $encoding = strtolower($header->encoding);
 
    $msg_url = 'read_body.php?' . $QUERY_STRING;
+   $msg_url = set_url_var($msg_url, 'ent_id', 0);
 
-   $body = mime_fetch_body($imapConnection, $passed_id, $passed_ent_id);
+   $body = mime_fetch_body($imapConnection, $passed_id, $ent_id);
    $body = decodeBody($body, $encoding);
 
     displayPageHeader($color, 'None');
@@ -45,7 +35,7 @@
          _("Viewing a text attachment") . " - ";
     echo '<a href="'.$msg_url.'">'. _("View message") . '</a>';
 
-    $dwnld_url = '../src/download.php?'. $QUERY_STRING.'&amp;absolute_dl=1';
+    $dwnld_url = '../src/download.php?'. $QUERY_STRING.'&amp;absolute_dl=true';
     echo '</b></td><tr><tr><td><CENTER><A HREF="'.$dwnld_url. '">'.
          _("Download this as a file").
          "</A></CENTER><BR>".
@@ -53,10 +43,9 @@
          "</TD></TR></TABLE>".
          "<TABLE WIDTH=\"98%\" BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER><TR><TD BGCOLOR=\"$color[0]\">".
          "<TR><TD BGCOLOR=\"$color[4]\"><TT>";
-
-    if ($type1 == 'html') {
+    if ($type1 == 'html' || $override_type1 == 'html') {
         $msg  = sqimap_get_message($imapConnection, $passed_id, $mailbox);
-       $msg = $msg->getEntity($passed_ent_id);
+       $msg = $msg->getEntity($ent_id);
         $body = MagicHTML( $body, $passed_id, $msg );
     } else {
         translateText($body, $wrap_at, $charset);