Move always included vars to init.php because it is confusing when not logged in.

[squirrelmail.git] / src / view_text.php

diff --git a/src/view_text.php b/src/view_text.php
index 563b8778db7a1a020baa5d6c40bd9bf98d6150e7..0b3aeb8a102157d519479a31867da1ebcacc6e4b 100644 (file)
--- 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,8 +11,7 @@
  * @package squirrelmail
  */
 
-
-/* SquirrelMail required files. */
+/** SquirrelMail required files. */
 include('../include/init.php');
 include(SM_PATH . 'functions/imap_general.php');
 include(SM_PATH . 'functions/imap_messages.php');
@@ -22,9 +19,6 @@ include(SM_PATH . 'functions/mime.php');
 include(SM_PATH . 'functions/date.php');
 include(SM_PATH . 'functions/url_parser.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);
@@ -34,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];
@@ -97,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
+?>