X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fimage.php;h=574c9adc427cac5870da3bb3fef49721ae7c73c0;hb=42f2eadfbdc4a3b8144b5dae28194a71780790c2;hp=5da6858787c6f2af5eab46b558bfea9fdbaaf46f;hpb=bd9bbfefba8fa274260a37c965f7510bb6670599;p=squirrelmail.git

diff --git a/src/image.php b/src/image.php
index 5da68587..574c9adc 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,61 +11,55 @@
  * $Id$
  */
 
-/*****************************************************************/
-/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!!           ***/
-/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION.             ***/
-/***    + Base level indent should begin at left margin, as    ***/
-/***      the require_once below looks.                        ***/
-/***    + All identation should consist of four space blocks   ***/
-/***    + Tab characters are evil.                             ***/
-/***    + all comments should use "slash-star ... star-slash"  ***/
-/***      style -- no pound characters, no slash-slash style   ***/
-/***    + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD      ***/
-/***      ALWAYS USE { AND } CHARACTERS!!!                     ***/
-/***    + Please use ' instead of ", when possible. Note "     ***/
-/***      should always be used in _( ) function calls.        ***/
-/*** Thank you for your help making the SM code more readable. ***/
-/*****************************************************************/
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
 
-require_once('../src/validate.php');
-require_once('../functions/date.php');
-require_once('../functions/page_header.php');
-require_once('../src/load_prefs.php');
+/* 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');
+displayPageHeader($color, 'None');
 
-   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>';
-   }   
+/* 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 */
 
-   $DownloadLink = '../src/download.php?passed_id=' . $passed_id .
-                   '&mailbox=' . urlencode($mailbox) . 
-                   '&passed_ent_id=' . $passed_ent_id . '&absolute_dl=true';
+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") . " - ";
 
-   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" .
+$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>';
 
-        '<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";
+$DownloadLink = '../src/download.php?passed_id=' . $passed_id .
+               '&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 . '">' .
+    _("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";
 
 ?>