removed debugging info

[squirrelmail.git] / src / right_main.php

diff --git a/src/right_main.php b/src/right_main.php
index bc1cc16b01e6e907d2cea23b35456ffe3df68452..d4e613b553310f0cdfca1e64dc21113e1a9101f2 100644 (file)
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -7,6 +7,7 @@
     **
     **/
 
+
    session_start();
 
    if(!isset($logged_in)) {
@@ -72,24 +73,36 @@
    }
 
    sqimap_mailbox_select($imapConnection, $mailbox);
-   $numMessages = sqimap_get_num_messages ($imapConnection, $mailbox);
    displayPageHeader($color, $mailbox);
 
+       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 (!$use_mailbox_cache || !session_is_registered("msgs")) {
-//      echo "<br>not using cache<br>\n";
-//      if (session_is_registered("messages"))
-//         session_unregister("messages");
+   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);
 
-      showMessagesForMailbox($imapConnection, $mailbox, $numMessages, $startMessage, $sort, $color);
-//   } else {
-//      echo "<br>using cache<br>\n";
-//      $msgs = unserialize($messages);
+       $numMessages = sqimap_get_num_messages ($imapConnection, $mailbox);
 
-//      displayMessageArray($imapConnection, $numMessages, $startMessage, $msgs, $mailbox, $sort, $color);
-//   }
+      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");
+   }
 
    // close the connection
    sqimap_logout ($imapConnection);