X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fright_main.php;h=c7b72b68bbd68401d32bad2ba601b663847cbb21;hp=b8bf19ab492d77119bff1f4b1becccb8f68445b6;hb=3392dc867232037b2c6e2089ebcab9d64e154db7;hpb=d4e84069d1d9af8760b8e858672d3ea3d4eac8b0

diff --git a/src/right_main.php b/src/right_main.php
index b8bf19ab..c7b72b68 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -1,109 +1,143 @@
 <?php
-   /**
-    **  right_main.php
-    **
-    **  Copyright (c) 1999-2000 The SquirrelMail development 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
-    **  goes on in SquirrelMail.
-    **
-    **  $Id$
-    **/
-
-   include('../src/validate.php');
-   include('../functions/imap.php');
-   include('../functions/date.php');
-   include('../functions/array.php');
-   include('../functions/mime.php');
-   include('../functions/mailbox_display.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 (isset($newsort) && $newsort != $sort) {
-      setPref($data_dir, $username, 'sort', $newsort);
-   }
-
-   // If the page has been loaded without a specific mailbox,
-   //   send them to the inbox
-   if (!isset($mailbox)) {
-      $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);
-   displayPageHeader($color, $mailbox);
-
-   do_hook('right_main_after_header');
+
+/**
+ * right_main.php
+ *
+ * Copyright (c) 1999-2001 The Squirrelmail Development 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
+ * goes on in SquirrelMail.
+ *
+ * $Id$
+ */
+
+require_once('../src/validate.php');
+require_once('../functions/imap.php');
+require_once('../functions/date.php');
+require_once('../functions/array.php');
+require_once('../functions/mime.php');
+require_once('../functions/mailbox_display.php');
+require_once('../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                               *
+ ***********************************************************/
+
+$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);
+}
+
+/* If the page has been loaded without a specific mailbox, */
+/* send them to the inbox                                  */
+if (!isset($mailbox)) {
+    $mailbox = 'INBOX';
+    $startMessage = 1;
+}
    
-   if (isset($just_logged_in) && $just_logged_in == 1 && 
-       strlen(trim($motd)) > 0) {
-      echo "<center><br>\n";
-      echo "<table width=70% cellpadding=0 cellspacing=0 border=0><tr><td bgcolor=\"$color[9]\">\n";
-      echo "<table width=100% cellpadding=5 cellspacing=1 border=0><tr><td bgcolor=\"$color[4]\">\n";
-      echo "$motd\n";
-      echo "</td></tr></table>\n";
-      echo "</td></tr></table>\n";
-      echo "</center><br>\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 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 (! 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);
-		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');
-   sqimap_logout ($imapConnection);
+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 "<br>\n";
+
+do_hook('right_main_after_header');
+
+if (isset($note)) {
+    echo "<CENTER><B>$note</B></CENTER><BR>\n";
+}
+
+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]\">" .
+         '<tr><td>' .
+             "<table width=100% cellpadding=5 cellspacing=1 border=0 bgcolor=\"$color[4]\">" .
+             "<tr><td align=center>$motd";
+        do_hook('motd');
+        echo '</td></tr>' .
+             '</table>' .
+             '</td></tr></table>';
+    }
+}
+
+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 (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');
+sqimap_logout ($imapConnection);
+
+echo '</FONT></BODY></HTML>';
+
 ?>
-</FONT>
-</BODY>
-</HTML>