X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fright_main.php;h=fb68c39281d7740ca234857a4125f17583916049;hb=a61878d029c321a773834b25a146fe7a38f9b294;hp=d0f380798e1f66a635ab08eb4ed5f856d1003011;hpb=872fef9719ef81064416ad260d82fcc6674a3578;p=squirrelmail.git
diff --git a/src/right_main.php b/src/right_main.php
index d0f38079..fb68c392 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -1,118 +1,199 @@
0) {
-?>
-
-' . $note .'', 'center' ) . "
\n";
+}
+
+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;
+ session_register('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;
+}
+
+/* There is a problem with registered vars in 4.1 */
+/*
+if( substr( phpversion(), 0, 3 ) == '4.1' ) {
+ $use_mailbox_cache = FALSE;
+}
+*/
+
+if ($use_mailbox_cache && session_is_registered('msgs')) {
+ showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color, $show_num, $use_mailbox_cache);
+} else {
+ if (session_is_registered('msgs')) {
+ unset($msgs);
+ }
+
+ if (session_is_registered('msort')) {
+ unset($msort);
+ }
+
+ if (session_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 (session_is_registered('msgs') && isset($msgs)) {
+ session_register('msgs');
+ $_SESSION['msgs'] = $msgs;
+ }
+
+ if (session_is_registered('msort') && isset($msort)) {
+ session_register('msort');
+ $_SESSION['msort'] = $msort;
+ }
+
+ session_register('numMessages');
+ $_SESSION['numMessages'] = $numMessages;
+}
+do_hook('right_main_bottom');
+sqimap_logout ($imapConnection);
+
+echo '