X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fimage.php;h=87423e80ca94ad821a0215fdd07ef5e3fa1fc6e0;hb=918fcc1d131a60df5ba01212d61d82d753014468;hp=2a323a2a6fb2f4b3c6f8167916b85ac85785160e;hpb=15e6162eacc97158393bc75aed3afeb7b19c24a6;p=squirrelmail.git

diff --git a/src/image.php b/src/image.php
index 2a323a2a..87423e80 100644
--- a/src/image.php
+++ b/src/image.php
@@ -3,69 +3,56 @@
 /**
  * image.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * This file shows an attached image
  *
- * $Id$
+ * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
  */
 
-/*****************************************************************/
-/*** 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. ***/
-/*****************************************************************/
-
-require_once('../src/validate.php');
-require_once('../functions/date.php');
-require_once('../functions/page_header.php');
-require_once('../src/load_prefs.php');
+/**
+ * Include the SquirrelMail initialization file.
+ */
+require('../include/init.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] . '">' .
+    '<div style="text-align: center;"><b>' .
+    _("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';
 
 ?>
+</b></div></td></tr>
+<tr><td align="center">
+<a href="<?php echo $DownloadLink; ?>"><?php echo _("Download this as a file"); ?></a>
+<br />&nbsp;</td></tr></table>
+
+<table border="0" cellspacing="0" cellpadding="2" align="center">
+<tr><td bgcolor="<?php echo $color[4]; ?>">
+<img src="<?php echo $DownloadLink; ?>" />
+
+</td></tr></table>
+<?php
+$oTemplate->display('footer.tpl');