X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Fright_main.php;h=f77c21aa1b1a4e0246e783d6af9d35fd3bf528bb;hp=f007b888704bee6adc9427e43485a651bd5ee38c;hb=8cc8ec794a4111845258794961df8cb093ab2b3f;hpb=8cc72ada75e8997f52dd775a453784d10a2e9bb8

diff --git a/src/right_main.php b/src/right_main.php
index f007b888..f77c21aa 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -1,29 +1,33 @@
 <?php
-
 /**
  * right_main.php
  *
- * Copyright (c) 1999-2002 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. */
 require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/global.php');
 require_once(SM_PATH . 'functions/imap.php');
 require_once(SM_PATH . 'functions/date.php');
-require_once(SM_PATH . 'functions/array.php');
 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:                            *
@@ -42,55 +46,41 @@ require_once(SM_PATH . 'functions/html.php');
 
 
 /* lets get the global vars we may need */
-$username = $_SESSION['username'];
-$key  = $_COOKIE['key'];
-$onetimepad = $_SESSION['onetimepad'];
-$base_uri = $_SESSION['base_uri'];
-$delimiter = $_SESSION['delimiter'];
- 
-if (isset($_GET['startMessage'])) {
-    $startMessage = $_GET['startMessage'];
-} elseif (isset($_POST['startMessage'])) {
-    $startMessage = $_POST['startMessage'];
-}
-if (isset($_GET['mailbox'])) {
-    $mailbox = $_GET['mailbox'];
-} else if (isset($_POST['mailbox'])) {
-    $mailbox = $_POST['mailbox'];
-}
-if (isset($_GET['PG_SHOWNUM'])) {
-    $PG_SHOWNUM = $_GET['PG_SHOWNUM'];
-}
-elseif (isset($_SESSION['PG_SHOWNUM'])) {
-    $PG_SHOWNUM = $_SESSION['PG_SHOWNUM'];
-}
-if (isset($_GET['PG_SHOWALL'])) {
-    $PG_SHOWALL = $_GET['PG_SHOWALL'];
-}
-if (isset($_GET['newsort'])) {
-    $newsort = $_GET['newsort'];
-}
-if (isset($_GET['composenew'])) {
-    $composenew = $_GET['composenew'];
-} else {
-    $composenew = false;
+sqgetGlobalVar('key',       $key,           SQ_COOKIE);
+sqgetGlobalVar('username',  $username,      SQ_SESSION);
+sqgetGlobalVar('onetimepad',$onetimepad,    SQ_SESSION);
+sqgetGlobalVar('delimiter', $delimiter,     SQ_SESSION);
+sqgetGlobalVar('base_uri',  $base_uri,      SQ_SESSION);
+
+sqgetGlobalVar('mailbox',   $mailbox);
+sqgetGlobalVar('lastTargetMailbox', $lastTargetMailbox, SQ_SESSION);
+sqgetGlobalVar('numMessages'      , $numMessages,       SQ_SESSION);
+sqgetGlobalVar('session',           $session,           SQ_GET);
+sqgetGlobalVar('note',              $note,              SQ_GET);
+sqgetGlobalVar('mail_sent',         $mail_sent,         SQ_GET);
+sqgetGlobalVar('use_mailbox_cache', $use_mailbox_cache, SQ_GET);
+
+if ( sqgetGlobalVar('startMessage', $temp) ) {
+  $startMessage = (int) $temp;
 }
-
-if (isset($_GET['checkall'])) {
-    $checkall = $_GET['checkall'];
+if ( sqgetGlobalVar('PG_SHOWNUM', $temp) ) {
+  $PG_SHOWNUM = (int) $temp;
 }
-if (isset($_GET['set_thread'])) {
-    $set_thread = $_GET['set_thread'];
+if ( sqgetGlobalVar('PG_SHOWALL', $temp, SQ_GET) ) {
+  $PG_SHOWALL = (int) $temp;
 }
-if (isset($_SESSION['lastTargetMailbox'])) {
-    $lastTargetMailbox =$_SESSION['lastTargetMailbox'];
+if ( sqgetGlobalVar('newsort', $temp, SQ_GET) ) {
+  $newsort = (int) $temp;
 }
-
-if (isset($_GET['session'])) {
-    $session = $_GET['session'];
+if ( sqgetGlobalVar('checkall', $temp, SQ_GET) ) {
+  $checkall = (int) $temp;
+}
+if ( sqgetGlobalVar('set_thread', $temp, SQ_GET) ) {
+  $set_thread = (int) $temp;
+}
+if ( !sqgetGlobalVar('composenew', $composenew, SQ_GET) ) {
+    $composenew = false;
 }
-
-
 /* end of get globals */
 
 
@@ -113,23 +103,24 @@ 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                                  */
-if (!isset($mailbox)) {
-    $mailbox = 'INBOX';
-    $startMessage = 1;
-}
-
+//if (!isset($mailbox)) {
+//    $mailbox = 'INBOX';
+//    $startMessage = 1;
+//}
 
-if (!isset($startMessage) || ($startMessage == '')) {
-    $startMessage = 1;
-}
+//if (!isset($startMessage) || ($startMessage == '')) {
+//    $startMessage = 1;
+//}
 
 /* compensate for the UW vulnerability. */
 if ($imap_server_type == 'uw' && (strstr($mailbox, '../') ||
@@ -137,51 +128,112 @@ if ($imap_server_type == 'uw' && (strstr($mailbox, '../') ||
    $mailbox = 'INBOX';
 }
 
+do_hook ('generic_header');
+
+$aMbxResponse = sqimap_mailbox_select($imapConnection, $mailbox);
+$aMbxResponse['SORT_ARRAY'] = false;
+
+sqgetGlobalVar('aLastSelectedMailbox',$aLastSelectedMailbox,SQ_SESSION);
+
+// deal with imap servers that do not return the required UIDNEXT or
+// UIDVALIDITY response
+// from a SELECT call (since rfc 3501 it's required)
+if (!isset($aMbxResponse['UIDNEXT']) || !isset($aMbxResponse['UIDVALIDITY'])) {
+    $aStatus = sqimap_status_messages($imapConnection,$mailbox,
+                                      array('UIDNEXT','UIDVALIDITY'));
+    $aMbxResponse['UIDNEXT'] = $aStatus['UIDNEXT'];
+    $aMbxResponse['UIDVALIDTY'] = $aStatus['UIDVALIDITY'];
+}
+
+if ($aLastSelectedMailbox && !isset($newsort)) {
+    // check if we deal with the same mailbox
+    if ($aLastSelectedMailbox['NAME'] == $mailbox) {
+       if ($aLastSelectedMailbox['EXISTS'] == $aMbxResponse['EXISTS'] &&
+           $aLastSelectedMailbox['UIDVALIDITY'] == $aMbxResponse['UIDVALIDITY'] &&
+           $aLastSelectedMailbox['UIDNEXT']  == $aMbxResponse['UIDNEXT']) {
+           // sort is still valid
+           sqgetGlobalVar('server_sort_array',$server_sort_array,SQ_SESSION);
+           if ($server_sort_array && is_array($server_sort_array)) {
+               $aMbxResponse['SORT_ARRAY'] = $server_sort_array;
+           }
+       }
+    }
+}
+
+$aLastSelectedMailbox['NAME'] = $mailbox;
+$aLastSelectedMailbox['EXISTS'] = $aMbxResponse['EXISTS'];
+$aLastSelectedMailbox['UIDVALIDITY'] = $aMbxResponse['UIDVALIDITY'];
+$aLastSelectedMailbox['UIDNEXT'] = $aMbxResponse['UIDNEXT'];
+$aLastSelectedMailbox['PERMANENTFLAGS'] = $aMbxResponse['PERMANENTFLAGS'];
+$aLastSelectedMailbox['OFFSET'] = (isset($startMessage) && $startMessage) ? $startMessage -1 : 0;
+$aLastSelectedMailbox['PAGEOFFSET'] = (isset($startMessage) && $startMessage) ? $startMessage : 1;
+$aLastSelectedMailbox['SORT'] = ($sort !== false) ? $sort : 0;
+$aLastSelectedMailbox['LIMIT'] = $show_num;
+
+$aLastSelectedMailbox['UIDSET'] = $aMbxResponse['SORT_ARRAY'];
+$aLastSelectedMailbox['SEEN'] = (isset($aMbxResponse['SEEN'])) ? $aMbxResponse['SEEN'] : $aMbxResponse['EXISTS'];
+$aLastSelectedMailbox['RECENT'] = (isset($aMbxResponse['RECENT'])) ? $aMbxResponse['RECENT'] : 0;
+
+$aLastSelectedMailbox['AUTO_EXPUNGE'] = $auto_expunge;
+
 /* decide if we are thread sorting or not */
+$aLastSelectedMailbox['ALLOW_THREAD'] = $allow_thread_sort;
 if ($allow_thread_sort == TRUE) {
     if (isset($set_thread)) {
+        $aLastSelectedMailbox['SORT_ARRAY'] = false;
+        if (sqsession_is_registered('indent_array')) {
+            sqsession_unregister('indent_array');
+        }
+        if (sqsession_is_registered('server_sort_array')) {
+            sqsession_unregister('server_sort_array');
+        }
         if ($set_thread == 1) {
             setPref($data_dir, $username, "thread_$mailbox", 1);
-            $thread_sort_messages = '1';    
-        }
-        elseif ($set_thread == 2)  {
+            $thread_sort_messages = '1';
+        } else if ($set_thread == 2)  {
             setPref($data_dir, $username, "thread_$mailbox", 0);
-            $thread_sort_messages = '0';    
+            $thread_sort_messages = '0';
         }
-    }
-    else {
+    } else {
         $thread_sort_messages = getPref($data_dir, $username, "thread_$mailbox");
     }
-}
-else {
+} else {
     $thread_sort_messages = 0;
-} 
-
-do_hook ('generic_header');
-
-sqimap_mailbox_select($imapConnection, $mailbox);
+}
+if ($thread_sort_messages == 1) {
+    $aLastSelectedMailbox['SORT_METHOD'] = 'THREAD';
+} else if ($allow_server_sort) {
+    $aLastSelectedMailbox['SORT_METHOD'] = 'SERVER';
+} else {
+    $aLastSelectedMailbox['SORT_METHOD'] = 'SQUIRREL';
+}
 
 if ($composenew) {
     $comp_uri = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox).
-		"&amp;session=$session";
+        "&session=$session";
     displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri');", false);
 } else {
     displayPageHeader($color, $mailbox);
 }
 do_hook('right_main_after_header');
+
+/* display a message to the user that their mail has been sent */
+if (isset($mail_sent) && $mail_sent == 'yes') {
+    $note = _("Your Message has been sent.");
+}
 if (isset($note)) {
     echo html_tag( 'div', '<b>' . $note .'</b>', 'center' ) . "<br>\n";
 }
 
-if (isset($_SESSION['just_logged_in'])) {
-    $just_logged_in = $_SESSION['just_logged_in'];
+if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) {
     if ($just_logged_in == true) {
         $just_logged_in = false;
+        sqsession_register($just_logged_in, 'just_logged_in');
 
         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' )
@@ -194,10 +246,6 @@ if (isset($_SESSION['just_logged_in'])) {
     }
 }
 
-if (isset($newsort)) {
-    $sort = $newsort;
-    sqsession_register($sort, 'sort');
-}
 
 /*********************************************************************
  * Check to see if we can use cache or not. Currently the only time  *
@@ -210,7 +258,10 @@ if (! isset($use_mailbox_cache)) {
 }
 
 if ($use_mailbox_cache && sqsession_is_registered('msgs')) {
-    showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color, $show_num, $use_mailbox_cache);
+    showMessagesForMailbox($imapConnection,$aLastSelectedMailbox);
+//    showMessagesForMailbox($imapConnection, $mailbox, $numMessages,
+//                           $startMessage, $sort, $color, $show_num,
+//                           $use_mailbox_cache, '',$aMbxResponse);
 } else {
     if (sqsession_is_registered('msgs')) {
         unset($msgs);
@@ -224,28 +275,27 @@ if ($use_mailbox_cache && sqsession_is_registered('msgs')) {
         unset($numMessages);
     }
 
-    $numMessages = sqimap_get_num_messages ($imapConnection, $mailbox);
+    $numMessages = $aMbxResponse['EXISTS'];
 
-    showMessagesForMailbox($imapConnection, $mailbox, $numMessages, 
-                           $startMessage, $sort, $color, $show_num,
-                           $use_mailbox_cache);
+    showMessagesForMailbox($imapConnection,$aLastSelectedMailbox);
+//    showMessagesForMailbox($imapConnection, $mailbox, $numMessages,
+//                           $startMessage, $sort, $color, $show_num,
+//                           $use_mailbox_cache,'',$aMbxResponse);
 
     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);
-
 echo '</body></html>';
 
+sqsession_register($aLastSelectedMailbox,'aLastSelectedMailbox');
+
 ?>