X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=inline;f=src%2Fright_main.php;h=a583ec062786387a4a47b9e7551b930dbf3f9ede;hb=c57b0888fe1f3bf8dbd55b8a4657a4de23a29f6a;hp=bf155105c16d3873fba30c89d7d41c3e823e1043;hpb=fb120846d2c635e28cb95463dc0b4cac1c3219d3;p=squirrelmail.git
diff --git a/src/right_main.php b/src/right_main.php
index bf155105..a583ec06 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -1,136 +1,137 @@
\n";
+
+do_hook('right_main_after_header');
+
+if (isset($note)) {
+ echo "
$note
\n";
+}
+
+if ($just_logged_in == true) {
+ $just_logged_in = false;
+
+ if (strlen(trim($motd)) > 0) {
+ echo "
" .
+ '' .
+ "" .
+ "$motd";
+ do_hook('motd');
+ echo ' | ' .
+ ' ' .
+ ' |
';
}
-
- /* If the page has been loaded without a specific mailbox, */
- /* send them to the inbox */
- if (!isset($mailbox)) {
- $mailbox = 'INBOX';
- $startMessage = 1;
- }
-
- if (! isset($startMessage) || $startMessage == '')
- $startMessage = 1;
-
- /* compensate for the UW vulnerability. */
- if ($imap_server_type == 'uw' && (strstr($mailbox, '../') ||
- substr($mailbox, 0, 1) == '/')) {
- $mailbox = 'INBOX';
- }
-
- sqimap_mailbox_select($imapConnection, $mailbox);
- displayPageHeader($color, $mailbox);
- echo "
\n";
-
- do_hook('right_main_after_header');
-
- if (isset($note)) {
- echo "$note
\n";
+}
+
+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;
+}
+
+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 ($just_logged_in == true) {
- $just_logged_in = false;
-
- if (strlen(trim($motd)) > 0) {
- echo "
" .
- '' .
- "" .
- "$motd";
- do_hook('motd');
- echo ' | ' .
- ' ' .
- ' |
';
- }
+ if (session_is_registered('msort')) {
+ unset($msort);
}
- if (isset($newsort)) {
- $sort = $newsort;
- session_register('sort');
+ if (session_is_registered('numMessages')) {
+ unset($numMessages);
}
- /*********************************************************************
- * 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 && 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);
- }
+ $numMessages = sqimap_get_num_messages ($imapConnection, $mailbox);
- if (session_is_registered('numMessages')) {
- unset($numMessages);
- }
+ showMessagesForMailbox($imapConnection, $mailbox, $numMessages,
+ $startMessage, $sort, $color, $show_num,
+ $use_mailbox_cache);
- $numMessages = sqimap_get_num_messages ($imapConnection, $mailbox);
+ if (session_is_registered('msgs') && isset($msgs)) {
+ session_register('msgs');
+ }
- showMessagesForMailbox($imapConnection, $mailbox, $numMessages,
- $startMessage, $sort, $color, $show_num,
- $use_mailbox_cache);
+ if (session_is_registered('msort') && isset($msort)) {
+ session_register('msort');
+ }
- if (session_is_registered('msgs') && isset($msgs)) {
- session_register('msgs');
- }
+ session_register('numMessages');
+}
- if (session_is_registered('msort') && isset($msort)) {
- session_register('msort');
- }
+do_hook('right_main_bottom');
+sqimap_logout ($imapConnection);
- session_register('numMessages');
- }
+echo '/FONT>