The 2000000 bugfix

[squirrelmail.git] / src / right_main.php

diff --git a/src/right_main.php b/src/right_main.php
index a583ec062786387a4a47b9e7551b930dbf3f9ede..3aa7c944bb2bc652affdcb2dcdb231572034dc83 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -3,7 +3,7 @@
 /**
  * right_main.php
  *
- * Copyright (c) 1999-2001 The Squirrelmail Development Team
+ * Copyright (c) 1999-2002 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * This is where the mailboxes are listed. This controls most of what
@@ -33,9 +33,15 @@ require_once('../functions/display_messages.php');
  *    $key              pass                               *
  ***********************************************************/
 
+$bob = getHashedFile($username, $data_dir, "username.pref");
+
 /* Open a connection on the imap port (143) */
 $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
 
+if( isset( $PG_SHOWNUM ) ) {
+    $show_num = $PG_SHOWNUM;
+}
+
 if (isset($newsort) && $newsort != $sort) {
     setPref($data_dir, $username, 'sort', $newsort);
 }
@@ -58,7 +64,11 @@ if ($imap_server_type == 'uw' && (strstr($mailbox, '../') ||
 }
 
 sqimap_mailbox_select($imapConnection, $mailbox);
-displayPageHeader($color, $mailbox);
+if( strtolower( $mailbox ) == 'inbox' ) {
+    displayPageHeader($color, _("INBOX"));
+} else {
+    displayPageHeader($color, $mailbox);
+}
 echo "<br>\n";
 
 do_hook('right_main_after_header');
@@ -71,9 +81,9 @@ if ($just_logged_in == true) {
     $just_logged_in = false;
 
     if (strlen(trim($motd)) > 0) {
-        echo "<br><table align=center width=70% cellpadding=0 cellspacing=3 border=0 bgcolor=\"$color[9]\">" .
+        echo "<br><table align=center width=\"70%\" cellpadding=0 cellspacing=3 border=0 bgcolor=\"$color[9]\">" .
          '<tr><td>' .
-             "<table width=100% cellpadding=5 cellspacing=1 border=0 bgcolor=\"$color[4]\">" .
+             "<table width=\"100%\" cellpadding=5 cellspacing=1 border=0 bgcolor=\"$color[4]\">" .
              "<tr><td align=center>$motd";
         do_hook('motd');
         echo '</td></tr>' .
@@ -97,6 +107,13 @@ 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 {
@@ -132,6 +149,6 @@ if ($use_mailbox_cache && session_is_registered('msgs')) {
 do_hook('right_main_bottom');
 sqimap_logout ($imapConnection);
 
-echo '/FONT></BODY></HTML>';
+echo '</BODY></HTML>';
 
-?>
+?>
\ No newline at end of file