X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fimage.php;h=500d689c3e27405e60b08625bfb6852c3946af65;hb=8d4de56c3a980e1ddc2cd0738a2f7b01c62f1312;hp=559ad12faceeeca4ab2131a17c1f9e106c91d0e8;hpb=3fde693bb3935007ca630a23f72e352dd3889549;p=squirrelmail.git

diff --git a/src/image.php b/src/image.php
index 559ad12f..500d689c 100644
--- a/src/image.php
+++ b/src/image.php
@@ -3,61 +3,67 @@
 /**
  * image.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * This file shows an attached image
  *
- * $Id$
+ * @version $Id$
+ * @package squirrelmail
  */
 
-require_once('../src/validate.php');
-require_once('../functions/date.php');
-require_once('../functions/page_header.php');
-require_once('../src/load_prefs.php');
-require_once('../functions/html.php');
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/global.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');
 
-if (isset($where) && isset($what)) {
-  // from a search
-  $ViewMessageLink = '<a href="../src/read_body.php?mailbox=' . urlencode($mailbox) .
-        '&amp;passed_id=' . $passed_id . '&amp;where=' . urlencode($where) . 
-        '&amp;what=' . urlencode($what). '">' . _("View message") . '</a>';
-} else {   
-  $ViewMessageLink = '<a href="../src/read_body.php?mailbox=' . urlencode($mailbox) .
-       '&amp;passed_id=' . $passed_id . '&amp;startMessage=' . $startMessage .
-       '&amp;show_more=0">' . _("View message") . '</a>';
+/* globals */
+if ( sqgetGlobalVar('passed_id', $temp, SQ_GET) ) {
+  $passed_id = (int) $temp;
 }
+sqgetGlobalVar('mailbox',       $mailbox,       SQ_GET);
+sqgetGlobalVar('ent_id',        $ent_id,        SQ_GET);
+sqgetGlobalVar('QUERY_STRING',  $QUERY_STRING,  SQ_SERVER);
+/* 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") . " - ";
+
+$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 .
                '&amp;mailbox=' . urlencode($mailbox) . 
-               '&amp;passed_ent_id=' . $passed_ent_id . '&amp;absolute_dl=true';
-
-echo '<br>' . 
-    html_tag( 'table',
-        html_tag( 'tr',
-        html_tag( 'td',
-                '<b>' .
-                _("Viewing an image attachment") . ' - ' .
-                $ViewMessageLink . '</b>' ,
-          'center', $color[0] )
-         ) .
-        html_tag( 'tr',
-        html_tag( 'td',
-                    '<a href="' . $DownloadLink . '">' .
-		    _("Download this as a file") .
-                    '</a><br>&nbsp;' . "\n" ,
-          'center' )
-         ) ,
-     'center', '', 'border="0" width="100%" cellspacing="0" cellpadding="2"' ) .
-
-    html_tag( 'table',
-        html_tag( 'tr',
-        html_tag( 'td',
-                '<img src="' . $DownloadLink . '">'
-        , 'left', $color[4] )
-         )
-   , 'center', '', 'border="0" cellspacing="0" cellpadding="2"' );
+               '&amp;ent_id=' . urlencode($ent_id) . '&amp;absolute_dl=true';
+
+echo '</b></td></tr>' . "\n" .
+    '<tr><td align=center><A HREF="' . $DownloadLink . '">' .
+    _("Download this as a file") .
+    '</A></B><BR>&nbsp;' . "\n" .
+    '</TD></TR></TABLE>' . "\n" .
+
+    '<TABLE BORDER=0 CELLSPACING=0 CELLPADDING=2 ALIGN=CENTER>' . "\n" .
+    '<TR><TD BGCOLOR="' . $color[4] . '">' .
+    '<img src="' . $DownloadLink . '">' .
+
+    '</TD></TR></TABLE>' . "\n";
+    '</body></html>' . "\n";
 
 ?>