X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fright_main.php;h=bcac251087f5a72875494e6a7635ead7a375efed;hb=ecaf63527e8e4fea88480a896813419b3f5cefb5;hp=33a4cd5b5323872e44ee55bc4b18359830fda608;hpb=0cb19b376b0ecb2506e05629ea0012410368ef25;p=squirrelmail.git
diff --git a/src/right_main.php b/src/right_main.php
index 33a4cd5b..bcac2510 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -3,7 +3,7 @@
/**
* right_main.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* This is where the mailboxes are listed. This controls most of what
@@ -17,9 +17,9 @@ define('SM_PATH','../');
/* SquirrelMail required files. */
require_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/date.php');
-require_once(SM_PATH . 'functions/array.php');
require_once(SM_PATH . 'functions/mime.php');
require_once(SM_PATH . 'functions/mailbox_display.php');
require_once(SM_PATH . 'functions/display_messages.php');
@@ -42,55 +42,40 @@ require_once(SM_PATH . 'functions/html.php');
/* lets get the global vars we may need */
-$username = $_SESSION['username'];
-$key = $_COOKIE['key'];
-$onetimepad = $_SESSION['onetimepad'];
-$base_uri = $_SESSION['base_uri'];
-$delimiter = $_SESSION['delimiter'];
-
-if (isset($_GET['startMessage'])) {
- $startMessage = $_GET['startMessage'];
-} elseif (isset($_POST['startMessage'])) {
- $startMessage = $_POST['startMessage'];
-}
-if (isset($_GET['mailbox'])) {
- $mailbox = $_GET['mailbox'];
-} else if (isset($_POST['mailbox'])) {
- $mailbox = $_POST['mailbox'];
-}
-if (isset($_GET['PG_SHOWNUM'])) {
- $PG_SHOWNUM = $_GET['PG_SHOWNUM'];
-}
-elseif (isset($_SESSION['PG_SHOWNUM'])) {
- $PG_SHOWNUM = $_SESSION['PG_SHOWNUM'];
-}
-if (isset($_GET['PG_SHOWALL'])) {
- $PG_SHOWALL = $_GET['PG_SHOWALL'];
-}
-if (isset($_GET['newsort'])) {
- $newsort = $_GET['newsort'];
-}
-if (isset($_GET['composenew'])) {
- $composenew = $_GET['composenew'];
-} else {
- $composenew = false;
-}
+sqgetGlobalVar('key', $key, SQ_COOKIE);
+sqgetGlobalVar('username', $username, SQ_SESSION);
+sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION);
+sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
+sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION);
-if (isset($_GET['checkall'])) {
- $checkall = $_GET['checkall'];
+sqgetGlobalVar('mailbox', $mailbox);
+sqgetGlobalVar('lastTargetMailbox', $lastTargetMailbox, SQ_SESSION);
+sqgetGlobalVar('numMessages' , $numMessages, SQ_SESSION);
+sqgetGlobalVar('session', $session, SQ_GET);
+sqgetGlobalVar('note', $note, SQ_GET);
+sqgetGlobalVar('use_mailbox_cache', $use_mailbox_cache, SQ_GET);
+
+if ( sqgetGlobalVar('startMessage', $temp) ) {
+ $startMessage = (int) $temp;
}
-if (isset($_GET['set_thread'])) {
- $set_thread = $_GET['set_thread'];
+if ( sqgetGlobalVar('PG_SHOWNUM', $temp) ) {
+ $PG_SHOWNUM = (int) $temp;
}
-if (isset($_SESSION['lastTargetMailbox'])) {
- $lastTargetMailbox =$_SESSION['lastTargetMailbox'];
+if ( sqgetGlobalVar('PG_SHOWALL', $temp, SQ_GET) ) {
+ $PG_SHOWALL = (int) $temp;
}
-
-if (isset($_GET['session'])) {
- $session = $_GET['session'];
+if ( sqgetGlobalVar('newsort', $temp, SQ_GET) ) {
+ $newsort = (int) $temp;
+}
+if ( sqgetGlobalVar('checkall', $temp, SQ_GET) ) {
+ $checkall = (int) $temp;
+}
+if ( sqgetGlobalVar('set_thread', $temp, SQ_GET) ) {
+ $set_thread = (int) $temp;
+}
+if ( !sqgetGlobalVar('composenew', $composenew, SQ_GET) ) {
+ $composenew = false;
}
-
-
/* end of get globals */
@@ -173,10 +158,10 @@ if (isset($note)) {
echo html_tag( 'div', '' . $note .'', 'center' ) . "
\n";
}
-if (isset($_SESSION['just_logged_in'])) {
- $just_logged_in = $_SESSION['just_logged_in'];
+if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) {
if ($just_logged_in == true) {
$just_logged_in = false;
+ sqsession_register($just_logged_in, 'just_logged_in');
if (strlen(trim($motd)) > 0) {
echo html_tag( 'table',
@@ -232,16 +217,16 @@ if ($use_mailbox_cache && sqsession_is_registered('msgs')) {
if (sqsession_is_registered('msgs') && isset($msgs)) {
sqsession_register($msgs, 'msgs');
- $_SESSION['msgs'] = $msgs;
+ //$_SESSION['msgs'] = $msgs;
}
if (sqsession_is_registered('msort') && isset($msort)) {
sqsession_register($msort, 'msort');
- $_SESSION['msort'] = $msort;
+ //$_SESSION['msort'] = $msort;
}
sqsession_register($numMessages, 'numMessages');
- $_SESSION['numMessages'] = $numMessages;
+ //$_SESSION['numMessages'] = $numMessages;
}
do_hook('right_main_bottom');
sqimap_logout ($imapConnection);