phpdoc blocks

[squirrelmail.git] / src / right_main.php

diff --git a/src/right_main.php b/src/right_main.php
index 1a99b0bdd77f52276133d3cd0853c135a212cb15..1d3ef5e53f0001beda0be67ca1edb1e5aa5d88af 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -10,13 +10,15 @@
  * goes on in SquirrelMail.
  *
  * $Id$
+ * @package squirrelmail
  */
 
-/* Path for SquirrelMail required files. */
+/** Path for SquirrelMail required files. */
 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 +51,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 +156,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', '<b>' . $note .'</b>', 'center' ) . "<br>\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 +224,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);