X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fview_text.php;h=0b3aeb8a102157d519479a31867da1ebcacc6e4b;hb=64033e1c54e52d462f6dbb93c3bb06a5c0050865;hp=959a4b901590837395f493845209b001576dabcd;hpb=5c4ff7bfc6e04337bd6bcf76743b1fbb92556233;p=squirrelmail.git

diff --git a/src/view_text.php b/src/view_text.php
index 959a4b90..0b3aeb8a 100644
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -1,11 +1,9 @@
 <?php
 
 /**
- * view_text.php -- Displays the main frameset
+ * view_text.php -- View a text attachment
  *
- * Who knows what this file does. However PUT IT HERE DID NOT PUT
- * A SINGLE FREAKING COMMENT IN! Whoever is responsible for this,
- * be very ashamed.
+ * Used by attachment_common code.
  *
  * @copyright &copy; 1999-2006 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
@@ -13,22 +11,14 @@
  * @package squirrelmail
  */
 
-/**
- * Path for SquirrelMail required files.
- * @ignore
- */
-define('SM_PATH','../');
+/** SquirrelMail required files. */
+include('../include/init.php');
+include(SM_PATH . 'functions/imap_general.php');
+include(SM_PATH . 'functions/imap_messages.php');
+include(SM_PATH . 'functions/mime.php');
+include(SM_PATH . 'functions/date.php');
+include(SM_PATH . 'functions/url_parser.php');
 
-/* SquirrelMail required files. */
-include_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/global.php');
-require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'functions/mime.php');
-require_once(SM_PATH . 'functions/html.php');
-
-sqgetGlobalVar('key',        $key,          SQ_COOKIE);
-sqgetGlobalVar('username',   $username,     SQ_SESSION);
-sqgetGlobalVar('onetimepad', $onetimepad,   SQ_SESSION);
 sqgetGlobalVar('messages',   $messages,     SQ_SESSION);
 sqgetGlobalVar('mailbox',    $mailbox,      SQ_GET);
 sqgetGlobalVar('ent_id',     $ent_id,       SQ_GET);
@@ -38,7 +28,7 @@ if (sqgetGlobalVar('passed_id', $temp, SQ_GET)) {
     $passed_id = (int) $temp;
 }
 
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
 $mbx_response = sqimap_mailbox_select($imapConnection, $mailbox);
 
 $message = &$messages[$mbx_response['UIDVALIDITY']][$passed_id];
@@ -61,6 +51,8 @@ $dwnld_url = '../src/download.php?' . $QUERY_STRING . '&amp;absolute_dl=true';
 
 $body = mime_fetch_body($imapConnection, $passed_id, $ent_id);
 $body = decodeBody($body, $encoding);
+$hookResults = do_hook('message_body', $body);
+$body = $hookResults[1];
 
 if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
     function_exists($languages[$squirrelmail_language]['XTRA_CODE'].'_decode')) {
@@ -81,17 +73,17 @@ if ($type1 == 'html' || (isset($override_type1) &&  $override_type1 == 'html'))
 displayPageHeader($color, 'None');
 ?>
 <br /><table width="100%" border="0" cellspacing="0" cellpadding="2" align="center"><tr><td bgcolor="<?php echo $color[0]; ?>">
-<b><center>
+<b><div style="text-align: center;">
 <?php
 echo _("Viewing a text attachment") . ' - ' .
     '<a href="'.$msg_url.'">' . _("View message") . '</a>';
 ?>
-</b></td><tr><tr><td><center>
+</b></td><tr><tr><td><div style="text-align: center;">
 <?php
 echo '<a href="' . $dwnld_url . '">' . _("Download this as a file") . '</a>';
 ?>
-</center><br />
-</center></b>
+</div><br />
+</div></b>
 </td></tr></table>
 <table width="98%" border="0" cellspacing="0" cellpadding="2" align="center"><tr><td bgcolor="<?php echo $color[0]; ?>">
 <tr><td bgcolor="<?php echo $color[4]; ?>"><tt>
@@ -99,4 +91,4 @@ echo '<a href="' . $dwnld_url . '">' . _("Download this as a file") . '</a>';
 </tt></td></tr></table>
 <?php
 $oTemplate->display('footer.tpl');
-?>
\ No newline at end of file
+?>