Changeset 7ab9c17 in github

Timestamp:

Jun 26, 2012 5:11:53 AM (11 months ago)

Author:

Aleksander Machniak <alec@…>

Branches:

master, HEAD

Children:

0be8bd1, e742744

Parents:

d86aa13

Message:

Improve performance by skipping redundant ENABLE commands

Location:

program/include

Files:

• rcube_imap_cache.php (modified) (1 diff)
• rcube_imap_generic.php (modified) (2 diffs)

program/include/rcube_imap_cache.php

@@ -918 +918 @@
         }
 
-        // NOTE: make sure the mailbox isn't selected, before
-        // enabling QRESYNC and invoking SELECT
-        if ($this->imap->conn->selected !== null) {
-            $this->imap->conn->close();
-        }
-
         // Enable QRESYNC
         $res = $this->imap->conn->enable($qresync ? 'QRESYNC' : 'CONDSTORE');
-        if (!is_array($res)) {
+        if ($res === false) {
             return;
+        }
+
+        // Close mailbox if already selected to get most recent data
+        if ($this->imap->conn->selected == $mailbox) {
+            $this->imap->conn->close();
         }
 

program/include/rcube_imap_generic.php

@@ -1473 +1473 @@
     function enable($extension)
     {
-        if (empty($extension))
-            return false;
-
-        if (!$this->hasCapability('ENABLE'))
-            return false;
-
-        if (!is_array($extension))
+        if (empty($extension)) {
+            return false;
+        }
+
+        if (!$this->hasCapability('ENABLE')) {
+            return false;
+        }
+
+        if (!is_array($extension)) {
             $extension = array($extension);
+        }
+
+        if (!empty($this->extensions_enabled)) {
+            // check if all extensions are already enabled
+            $diff = array_diff($extension, $this->extensions_enabled);
+
+            if (empty($diff)) {
+                return $extension;
+            }
+
+            // Make sure the mailbox isn't selected, before enabling extension(s)
+            if ($this->selected !== null) {
+                $this->close();
+            }
+        }
 
         list($code, $response) = $this->execute('ENABLE', $extension);
@@ -1488 +1505 @@
             $result   = (array) $this->tokenizeResponse($response);
 
-            return $result;
+            $this->extensions_enabled = array_unique(array_merge((array)$this->extensions_enabled, $result));
+
+            return $this->extensions_enabled;
         }