X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fright_main.php;h=8db65bc666fbaeef84aa1047d794ae6c086ef9c9;hp=4379dc031a099c0ffe5deef70457bebc36f7991b;hb=06ad27a2ea5e8cef7e172f2d39a5c43b06dd2410;hpb=28010579e84f885656823b9f2cfa3d808498caa0 diff --git a/src/right_main.php b/src/right_main.php index 4379dc03..8db65bc6 100644 --- a/src/right_main.php +++ b/src/right_main.php @@ -1,18 +1,20 @@ -"; - echo _("login"); - echo ""; - echo _(" first."); + echo _("You must login first."); exit; } if(!isset($username) || !isset($key)) { @@ -39,9 +41,7 @@ if (!isset($display_messages_php)) include("../functions/display_messages.php"); ?> - - -\n"; // If the page has been loaded without a specific mailbox, - // just show a page of general info. + // send them to the inbox if (!isset($mailbox)) { - displayPageHeader($color, "None"); - general_info($motd, $org_logo, $version, $org_name, $color); - echo ""; - exit; + $mailbox = "INBOX"; + $sort = $newsort = 0; + $startMessage = 1; } sqimap_mailbox_select($imapConnection, $mailbox); - $numMessages = sqimap_get_num_messages ($imapConnection, $mailbox); displayPageHeader($color, $mailbox); - showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color); + do_hook("right_main_after_header"); + + if ($just_logged_in == 1 && strlen(trim($motd)) > 0) { + echo "
"; + echo "

"; + echo "

"; + echo "$motd"; + echo "

"; + echo "

"; + echo "
"; + } + + if (isset($newsort)) { + $sort = $newsort; + session_register("sort"); + } + + // Check to see if we can use cache or not. Currently the only time when you wont 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 ($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"); + if (session_is_registered("msort") && isset($msort)) + session_register("msort"); + session_register("numMessages"); + } + do_hook("right_main_bottom"); // close the connection sqimap_logout ($imapConnection); ?>