Obsolete duplicate function to make sure version comparison is done in a

[squirrelmail.git] / src / view_text.php

diff --git a/src/view_text.php b/src/view_text.php
index e152b438c8ddd8323f0956ee543e40adaac69fa7..0aa24e99924e7da7d87f50c6ca6ed61f53627929 100644 (file)
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -3,7 +3,7 @@
 /**
  * view_text.php -- Displays the main frameset
  *
- * Copyright (c) 1999-2002 The SquirrelMail development team
+ * Copyright (c) 1999-2003 The SquirrelMail development team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Who knows what this file does. However PUT IT HERE DID NOT PUT
@@ -17,16 +17,31 @@
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'src/validate.php');
+require_once(SM_PATH . 'include/validate.php');
 require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/mime.php');
 require_once(SM_PATH . 'functions/html.php');
    
-$mailbox = urldecode($mailbox);
-if (!isset($passed_ent_id)) {
+$mailbox = urldecode($_GET['mailbox']);
+if (!isset($_GET['passed_ent_id'])) {
     $passed_ent_id = '';
+} else {
+    $passed_ent_id = $_GET['passed_ent_id'];
+}
+$passed_id = $_GET['passed_id'];
+if (isset($_GET['ent_id'])) {
+       $ent_id = $_GET['ent_id'];
+} else {
+       $ent_id = '';
 }
 
+$username = $_SESSION['username'];
+$key = $_COOKIE['key'];
+$delimiter = $_SESSION['delimiter'];
+$onetimepad = $_SESSION['onetimepad'];
+$QUERY_STRING = $_SERVER['QUERY_STRING'];
+sqextractGlobalVar('messages');
+
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 $mbx_response =  sqimap_mailbox_select($imapConnection, $mailbox);