Fix missing $username when rg=0

[squirrelmail.git] / src / view_text.php

diff --git a/src/view_text.php b/src/view_text.php
index e152b438c8ddd8323f0956ee543e40adaac69fa7..53ad394550e31872140902d01a9356606d8d7277 100644 (file)
--- a/src/view_text.php
+++ b/src/view_text.php
@@ -17,15 +17,23 @@
 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'];
+$username = $_SESSION['username'];
+$key = $_COOKIE['key'];
+$delimiter = $_SESSION['delimiter'];
+$onetimepad = $_SESSION['onetimepad'];
+
 
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 $mbx_response =  sqimap_mailbox_select($imapConnection, $mailbox);