This urlencode(urldecode thing breaks stuff and doesn't add real value.

[squirrelmail.git] / src / image.php

diff --git a/src/image.php b/src/image.php
index 1778343bf2dbcaf3292e14668cadaf17ece466ef..5702e44809cc15b04d7f97097f272de8fa63e096 100644 (file)
--- a/src/image.php
+++ b/src/image.php
@@ -3,7 +3,7 @@
 /**
  * image.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * This file shows an attached image
@@ -23,6 +23,13 @@ require_once(SM_PATH . 'include/load_prefs.php');
 
 displayPageHeader($color, 'None');
 
+/* globals */
+$mailbox = $_GET['mailbox'];
+$passed_id = (int) $_GET['passed_id'];
+$ent_id = $_GET['ent_id'];
+$QUERY_STRING = $_SERVER['QUERY_STRING'];
+/* end globals */
+
 echo '<BR>' . 
     '<TABLE WIDTH="100%" BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER>' .
     "\n" .
@@ -37,7 +44,7 @@ echo '<a href="'.$msg_url.'">'. _("View message") . '</a>';
 
 $DownloadLink = '../src/download.php?passed_id=' . $passed_id .
                '&amp;mailbox=' . urlencode($mailbox) . 
-               '&amp;ent_id=' . $ent_id . '&amp;absolute_dl=true';
+               '&amp;ent_id=' . urlencode($ent_id) . '&amp;absolute_dl=true';
 
 echo '</b></td></tr>' . "\n" .
     '<tr><td align=center><A HREF="' . $DownloadLink . '">' .