X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fright_main.php;h=7223cacf8a9f1cf3ae42d778247080076a9466cd;hb=5826affb7b923cce53fc68643167eec5f0f3931e;hp=1a99b0bdd77f52276133d3cd0853c135a212cb15;hpb=1e12d1ffb4f54350932a17397d38917db21d64df;p=squirrelmail.git
diff --git a/src/right_main.php b/src/right_main.php
index 1a99b0bd..7223cacf 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -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');
@@ -49,8 +50,11 @@ 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 ( sqgetGlobalVar('startMessage', $temp) ) {
$startMessage = (int) $temp;
@@ -151,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',
@@ -214,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);