Changeset 4180 in subversion

Timestamp:

Nov 4, 2010 10:03:26 AM (3 years ago)

Author:

alec

Message:

• Add possibility to force mailbox selection. There're situations where we're invoking STATUS (for all messages count) and SELECT later for other operations. If we call SELECT first, the STATUS will be not needed.

Location:

trunk/roundcubemail/program

Files:

• include/rcube_imap.php (modified) (19 diffs)
• steps/mail/pagenav.inc (modified) (1 diff)

trunk/roundcubemail/program/include/rcube_imap.php

@@ -114 +114 @@
     }
 
-    
+
     /**
      * Connect to an IMAP server
@@ -183 +183 @@
     }
 
-    
+
     /**
      * Close IMAP connection
@@ -196 +196 @@
     }
 
-    
+
     /**
      * Close IMAP connection and re-connect
@@ -234 +234 @@
         return ($this->conn) ? $this->conn->error : '';
     }
-    
+
 
     /**
@@ -246 +246 @@
     }
 
-    
+
     /**
      * Set a root folder for the IMAP connection.
@@ -268 +268 @@
     }
 
-    
+
     /**
      * Set default message charset
@@ -282 +282 @@
     }
 
-    
+
     /**
      * This list of folders will be listed above all other folders
@@ -300 +300 @@
     }
 
-    
+
     /**
      * Set internal mailbox reference.
@@ -322 +322 @@
     }
 
-    
+
+    /**
+     * Forces selection of a mailbox
+     *
+     * @param  string $mailbox Mailbox/Folder name
+     * @access public
+     */
+    function select_mailbox($mailbox)
+    {
+        $mailbox = $this->mod_mailbox($mailbox);
+
+        $selected = $this->conn->select($mailbox);
+
+        if ($selected && $this->mailbox != $mailbox) {
+            // clear messagecount cache for this mailbox
+            $this->_clear_messagecount($mailbox);
+            $this->mailbox = $mailbox;
+        }
+    }
+
+
     /**
      * Set internal list page
@@ -334 +354 @@
     }
 
-    
+
     /**
      * Set internal page size
@@ -346 +366 @@
     }
 
-    
+
     /**
      * Save a set of message ids for future message listing methods
@@ -373 +393 @@
     }
 
-    
+
     /**
      * Return the saved search set as hash array
@@ -389 +409 @@
     }
 
-    
+
     /**
      * Returns the currently used mailbox name
@@ -401 +421 @@
     }
 
-    
+
     /**
      * Returns the IMAP server's capability
@@ -414 +434 @@
     }
 
-    
+
     /**
      * Sets threading flag to the best supported THREAD algorithm
@@ -438 +458 @@
     }
 
-    
+
     /**
      * Checks the PERMANENTFLAGS capability of the current mailbox
@@ -454 +474 @@
     }
 
-    
+
     /**
      * Returns the delimiter that is used by the IMAP server for folder separation
@@ -472 +492 @@
     }
 
-    
+
     /**
      * Get message count for a specific mailbox
@@ -490 +510 @@
     }
 
-    
+
     /**
      * Private method for getting nr of messages

trunk/roundcubemail/program/steps/mail/pagenav.inc

@@ -21 +21 @@
 
 $uid = get_input_value('_uid', RCUBE_INPUT_GET);
-$cnt  = $IMAP->messagecount(NULL, 'ALL'); // Only messages, no threads here
+
+// Select mailbox first, for better performance
+$mbox_name = $IMAP->get_mailbox_name();
+$IMAP->select_mailbox($mbox_name);
+
+// Get messages count (only messages, no threads here)
+$cnt  = $IMAP->messagecount(NULL, 'ALL');
 
 if ($_SESSION['sort_col'] == 'date' && $_SESSION['sort_order'] != 'DESC'