X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fright_main.php;h=1df827331a95a0f954199645b6de1fb9218afd77;hb=eaab965a67b8304bf9a7366d2d062488b7690737;hp=18eb55399c6dbc4fcaa3e8bd4f38c9ace7bdec76;hpb=2a32fc83f95eba42be0d1752ef685adf10e1edc9;p=squirrelmail.git diff --git a/src/right_main.php b/src/right_main.php index 18eb5539..1df82733 100644 --- a/src/right_main.php +++ b/src/right_main.php @@ -1,45 +1,24 @@ - - - -\n"; + if (isset($newsort) && $newsort != $sort) { + setPref($data_dir, $username, 'sort', $newsort); + } // 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'; + $startMessage = 1; + } + + // compensate for the UW vulnerability + if ($imap_server_type == 'uw' && (strstr($mailbox, '../') !== false || + substr($mailbox, 0, 1) == '/')) { + $mailbox = 'INBOX'; } 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 (isset($note)) + echo "$note
\n"; + + if ($just_logged_in == true) { + $just_logged_in = false; + + if (strlen(trim($motd)) > 0) { +?>
+ +

+ + +