X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fright_main.php;h=7223cacf8a9f1cf3ae42d778247080076a9466cd;hb=5826affb7b923cce53fc68643167eec5f0f3931e;hp=ef9be5e3f1a1f05de782ecd0db03869781a87638;hpb=625c8b787b79d07a1e53ba05213f66451d73651e;p=squirrelmail.git diff --git a/src/right_main.php b/src/right_main.php index ef9be5e3..7223cacf 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,6 +17,7 @@ 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/mime.php'); @@ -41,55 +42,41 @@ 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); + +sqgetGlobalVar('mailbox', $mailbox); +sqgetGlobalVar('lastTargetMailbox', $lastTargetMailbox, SQ_SESSION); +sqgetGlobalVar('numMessages' , $numMessages, SQ_SESSION); +sqgetGlobalVar('session', $session, SQ_GET); +sqgetGlobalVar('note', $note, SQ_GET); +sqgetGlobalVar('mail_sent', $mail_sent, SQ_GET); +sqgetGlobalVar('use_mailbox_cache', $use_mailbox_cache, SQ_GET); -if (isset($_GET['checkall'])) { - $checkall = $_GET['checkall']; +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 */ @@ -168,14 +155,19 @@ if ($composenew) { displayPageHeader($color, $mailbox); } do_hook('right_main_after_header'); + +/* display a message to the user that their mail has been sent */ +if (isset($mail_sent) && $mail_sent == 'yes') { + $note = _("Your Message has been sent."); +} 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', @@ -231,16 +223,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);