fix for downloadlink and for redirecting html entities

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3464 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/view_text.php b/src/view_text.php
index 9768caf5ee04ab86972837365bc5fa6f018c457f..e1ddde570290a1c198e09618d4e8db1614b2ebfa 100644 (file)
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -35,7 +35,7 @@
          _("Viewing a text attachment") . " - ";
     echo '<a href="'.$msg_url.'">'. _("View message") . '</a>';
 
          _("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>".
     echo '</b></td><tr><tr><td><CENTER><A HREF="'.$dwnld_url. '">'.
          _("Download this as a file").
          "</A></CENTER><BR>".


@@ -43,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>";
          "</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  = 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);
         $body = MagicHTML( $body, $passed_id, $msg );
     } else {
         translateText($body, $wrap_at, $charset);