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

diff --git a/src/image.php b/src/image.php
index 4cad2b00..23d0a01d 100644
--- a/src/image.php
+++ b/src/image.php
@@ -3,53 +3,57 @@
 /**
  * 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-2009 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
+ */
+
+/** This is the image page */
+define('PAGE_NAME', 'image');
+
+/**
+ * Include the SquirrelMail initialization file.
  */
+require('../include/init.php');
 
-require_once('../src/validate.php');
-require_once('../functions/date.php');
-require_once('../functions/page_header.php');
-require_once('../src/load_prefs.php');
+displayPageHeader($color);
 
-displayPageHeader($color, 'None');
+/* globals */
+sqgetGlobalVar('passed_id', $passed_id, SQ_GET, NULL, SQ_TYPE_BIGINT);
+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>' .
+echo '<br />' .
+    '<table width="100%" border="0" cellspacing="0" cellpadding="2" align="center">' .
     "\n" .
-    '<TR><TD BGCOLOR="' . $color[0] . '">' .
-    '<B><CENTER>' .
+    '<tr><td bgcolor="' . $color[0] . '">' .
+    '<div style="text-align: center;"><b>' .
     _("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>';
-}   
 
-$DownloadLink = '../src/download.php?passed_id=' . $passed_id .
-               '&mailbox=' . urlencode($mailbox) . 
-               '&passed_ent_id=' . $passed_ent_id . '&absolute_dl=true';
+$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>';
 
-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";
+$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');