X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fright_main.php;h=5dcaf7a3b17f5c13f40c7a9faf0992a6791b2638;hb=7b6563c0c41196cd6ed9bef7b12bb3ceac1acb89;hp=1df827331a95a0f954199645b6de1fb9218afd77;hpb=eaab965a67b8304bf9a7366d2d062488b7690737;p=squirrelmail.git
diff --git a/src/right_main.php b/src/right_main.php
index 1df82733..5dcaf7a3 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -1,121 +1,240 @@
$note
\n";
-
- if ($just_logged_in == true) {
- $just_logged_in = false;
-
- if (strlen(trim($motd)) > 0) {
-?>
-
-' . $note .'', 'center' ) . "
\n";
+}
+
+if (isset($_SESSION['just_logged_in'])) {
+ $just_logged_in = $_SESSION['just_logged_in'];
+ if ($just_logged_in == true) {
+ $just_logged_in = false;
+
+ if (strlen(trim($motd)) > 0) {
+ echo html_tag( 'table',
+ html_tag( 'tr',
+ html_tag( 'td',
+ html_tag( 'table',
+ html_tag( 'tr',
+ html_tag( 'td', $motd, 'center' )
+ ) ,
+ '', $color[4], 'width="100%" cellpadding="5" cellspacing="1" border="0"' )
+ )
+ ) ,
+ 'center', $color[9], 'width="70%" cellpadding="0" cellspacing="3" border="0"' );
+ }
+ }
+}
+
+if (isset($newsort)) {
+ $sort = $newsort;
+ sqsession_register($sort, 'sort');
+}
+
+/*********************************************************************
+ * Check to see if we can use cache or not. Currently the only time *
+ * when you will not use it is when a link on the left hand frame is *
+ * used. Also check to make sure we actually have the array in the *
+ * registered session data. :) *
+ *********************************************************************/
+if (! isset($use_mailbox_cache)) {
+ $use_mailbox_cache = 0;
+}
+
+if ($use_mailbox_cache && sqsession_is_registered('msgs')) {
+ showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color, $show_num, $use_mailbox_cache);
+} else {
+ if (sqsession_is_registered('msgs')) {
+ unset($msgs);
+ }
+
+ if (sqsession_is_registered('msort')) {
+ unset($msort);
+ }
+
+ if (sqsession_is_registered('numMessages')) {
+ unset($numMessages);
+ }
+
+ $numMessages = sqimap_get_num_messages ($imapConnection, $mailbox);
+
+ showMessagesForMailbox($imapConnection, $mailbox, $numMessages,
+ $startMessage, $sort, $color, $show_num,
+ $use_mailbox_cache);
+
+ if (sqsession_is_registered('msgs') && isset($msgs)) {
+ sqsession_register($msgs, 'msgs');
+ $_SESSION['msgs'] = $msgs;
+ }
+
+ if (sqsession_is_registered('msort') && isset($msort)) {
+ sqsession_register($msort, 'msort');
+ $_SESSION['msort'] = $msort;
+ }
+
+ sqsession_register($numMessages, 'numMessages');
+ $_SESSION['numMessages'] = $numMessages;
+}
+do_hook('right_main_bottom');
+sqimap_logout ($imapConnection);
+
+echo '