X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fimage.php;h=5702e44809cc15b04d7f97097f272de8fa63e096;hb=ae37633cebd7121b4141213a7e98462a83c29fc1;hp=4cad2b0037f5119c1f9f5b119b37fd01ac59e504;hpb=5be9f1952729e353cf3a2b8431e432254b879b15;p=squirrelmail.git

diff --git a/src/image.php b/src/image.php
index 4cad2b00..5702e448 100644
--- 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
@@ -11,33 +11,40 @@
  * $Id$
  */
 
-require_once('../src/validate.php');
-require_once('../functions/date.php');
-require_once('../functions/page_header.php');
-require_once('../src/load_prefs.php');
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/date.php');
+require_once(SM_PATH . 'functions/page_header.php');
+require_once(SM_PATH . 'functions/html.php');
+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" .
     '<TR><TD BGCOLOR="' . $color[0] . '">' .
     '<B><CENTER>' .
     _("Viewing an image attachment") . " - ";
-if (isset($where) && isset($what)) {
-  // from a search
-  echo '<a href="../src/read_body.php?mailbox=' . urlencode($mailbox) .
-        '&passed_id=' . $passed_id . '&where=' . urlencode($where) . 
-        '&what=' . urlencode($what). '">' . _("View message") . '</a>';
-} else {   
-  echo '<a href="../src/read_body.php?mailbox=' . urlencode($mailbox) .
-       '&passed_id=' . $passed_id . '&startMessage=' . $startMessage .
-       '&show_more=0">' . _("View message") . '</a>';
-}   
+
+$msg_url = 'read_body.php?' . $QUERY_STRING;
+$msg_url = set_url_var($msg_url, 'ent_id', 0);
+echo '<a href="'.$msg_url.'">'. _("View message") . '</a>';
+
 
 $DownloadLink = '../src/download.php?passed_id=' . $passed_id .
-               '&mailbox=' . urlencode($mailbox) . 
-               '&passed_ent_id=' . $passed_ent_id . '&absolute_dl=true';
+               '&amp;mailbox=' . urlencode($mailbox) . 
+               '&amp;ent_id=' . urlencode($ent_id) . '&amp;absolute_dl=true';
 
 echo '</b></td></tr>' . "\n" .
     '<tr><td align=center><A HREF="' . $DownloadLink . '">' .