X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fright_main.php;h=59d84f328497fece7b5082fc7f7117e99ef8fb9c;hp=4379dc031a099c0ffe5deef70457bebc36f7991b;hb=aca403fab85e23f9e70e04b3787f282c79cc7acf;hpb=28010579e84f885656823b9f2cfa3d808498caa0
diff --git a/src/right_main.php b/src/right_main.php
index 4379dc03..59d84f32 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -1,87 +1,198 @@
-
- /**
- ** right_main.php
- **
- ** This is where the mailboxes are listed. This controls most of what
- ** goes on in SquirrelMail.
- **
- **/
-
- if(!isset($logged_in)) {
- echo _("You must ");
- echo "";
- echo _("login");
- echo "";
- echo _(" first.");
- exit;
- }
- if(!isset($username) || !isset($key)) {
- echo _("You need a valid user and password to access this page!");
- exit;
- }
-
- if (!isset($config_php))
- include("../config/config.php");
- if (!isset($imap_php))
- include("../functions/imap.php");
- if (!isset($strings_php))
- include("../functions/strings.php");
- if (!isset($date_php))
- include("../functions/date.php");
- if (!isset($page_header_php))
- include("../functions/page_header.php");
- if (!isset($array_php))
- include("../functions/array.php");
- if (!isset($mime_php))
- include("../functions/mime.php");
- if (!isset($mailbox_display_php))
- include("../functions/mailbox_display.php");
- if (!isset($display_messages_php))
- include("../functions/display_messages.php");
-?>
-
-
-
- /////////////////////////////////////////////////////////////////////////////////
- //
- // incoming variables from URL:
- // $sort Direction to sort by date
- // values: 0 - descending order
- // values: 1 - ascending order
- // $startMessage Message to start at
- // $mailbox Full Mailbox name
- //
- // incoming from cookie:
- // $username duh
- // $key pass
- //
- /////////////////////////////////////////////////////////////////////////////////
-
- // open a connection on the imap port (143)
- $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-
- /** If it was a successful login, lets load their preferences **/
- include("../src/load_prefs.php");
- echo "\n";
-
- // If the page has been loaded without a specific mailbox,
- // just show a page of general info.
- if (!isset($mailbox)) {
- displayPageHeader($color, "None");
- general_info($motd, $org_logo, $version, $org_name, $color);
- echo "";
- exit;
- }
-
- sqimap_mailbox_select($imapConnection, $mailbox);
- $numMessages = sqimap_get_num_messages ($imapConnection, $mailbox);
- displayPageHeader($color, $mailbox);
-
- showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color);
-
- // close the connection
- sqimap_logout ($imapConnection);
+\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 (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 '