You should check you can read a dir, and it exists before attempting to use

[squirrelmail.git] / src / right_main.php

diff --git a/src/right_main.php b/src/right_main.php
index 9558cdba6ba4f804f82730e027077a0b5f54c3b3..27dd05f0509383b24cfafc551c1b8a3caefa6ec0 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -1,19 +1,21 @@
 <?php
-
 /**
  * right_main.php
  *
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 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
  * goes on in SquirrelMail.
  *
- * $Id$
+ * @version $Id$
  * @package squirrelmail
  */
 
-/** Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
@@ -25,6 +27,7 @@ require_once(SM_PATH . 'functions/mime.php');
 require_once(SM_PATH . 'functions/mailbox_display.php');
 require_once(SM_PATH . 'functions/display_messages.php');
 require_once(SM_PATH . 'functions/html.php');
+require_once(SM_PATH . 'functions/plugin.php');
 
 /***********************************************************
  * incoming variables from URL:                            *
@@ -100,11 +103,13 @@ else if( isset( $PG_SHOWNUM ) ) {
     $show_num = $PG_SHOWNUM;
 }
 
-if (isset($newsort) && $newsort != $sort) {
-    setPref($data_dir, $username, 'sort', $newsort);
-}
-
+if (isset($newsort) ) {
+    if ( $newsort != $sort )
+        setPref($data_dir, $username, 'sort', $newsort);
 
+    $sort = $newsort;
+    sqsession_register($sort, 'sort');
+}
 
 /* If the page has been loaded without a specific mailbox, */
 /* send them to the inbox                                  */
@@ -129,11 +134,11 @@ if ($allow_thread_sort == TRUE) {
     if (isset($set_thread)) {
         if ($set_thread == 1) {
             setPref($data_dir, $username, "thread_$mailbox", 1);
-            $thread_sort_messages = '1';    
+            $thread_sort_messages = '1';
         }
         elseif ($set_thread == 2)  {
             setPref($data_dir, $username, "thread_$mailbox", 0);
-            $thread_sort_messages = '0';    
+            $thread_sort_messages = '0';
         }
     }
     else {
@@ -142,7 +147,7 @@ if ($allow_thread_sort == TRUE) {
 }
 else {
     $thread_sort_messages = 0;
-} 
+}
 
 do_hook ('generic_header');
 
@@ -150,7 +155,7 @@ sqimap_mailbox_select($imapConnection, $mailbox);
 
 if ($composenew) {
     $comp_uri = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox).
-               "&session=$session";
+        "&session=$session";
     displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri');", false);
 } else {
     displayPageHeader($color, $mailbox);
@@ -173,7 +178,7 @@ if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) {
         if (strlen(trim($motd)) > 0) {
             echo html_tag( 'table',
                         html_tag( 'tr',
-                            html_tag( 'td', 
+                            html_tag( 'td',
                                 html_tag( 'table',
                                     html_tag( 'tr',
                                         html_tag( 'td', $motd, 'center' )
@@ -186,10 +191,6 @@ if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) {
     }
 }
 
-if (isset($newsort)) {
-    $sort = $newsort;
-    sqsession_register($sort, 'sort');
-}
 
 /*********************************************************************
  * Check to see if we can use cache or not. Currently the only time  *
@@ -218,25 +219,23 @@ if ($use_mailbox_cache && sqsession_is_registered('msgs')) {
 
     $numMessages = sqimap_get_num_messages ($imapConnection, $mailbox);
 
-    showMessagesForMailbox($imapConnection, $mailbox, $numMessages, 
+    showMessagesForMailbox($imapConnection, $mailbox, $numMessages,
                            $startMessage, $sort, $color, $show_num,
                            $use_mailbox_cache);
 
     if (sqsession_is_registered('msgs') && isset($msgs)) {
         sqsession_register($msgs, 'msgs');
-        //$_SESSION['msgs'] = $msgs;
     }
 
     if (sqsession_is_registered('msort') && isset($msort)) {
         sqsession_register($msort, 'msort');
-        //$_SESSION['msort'] = $msort;
     }
 
     sqsession_register($numMessages, 'numMessages');
-    //$_SESSION['numMessages'] = $numMessages;
 }
 do_hook('right_main_bottom');
 sqimap_logout ($imapConnection);
-noframes_bottom();
 
-?>
\ No newline at end of file
+echo '</body></html>';
+
+?>