Changeset 862de1b in github

Timestamp:

Apr 21, 2012 12:28:03 PM (13 months ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo

Children:

6707ca4

Parents:

5a79416

Message:

Revert r6094; Add caching for ACL and Metadata

File:

• program/include/rcube_imap.php (modified) (8 diffs)

program/include/rcube_imap.php

@@ -567 +567 @@
         $mode = strtoupper($mode);
 
-        // count search set
-        if ($this->search_string && $folder == $this->folder && ($mode == 'ALL' || $mode == 'THREADS') && !$force) {
+        // count search set, assume search set is always up-to-date (don't check $force flag)
+        if ($this->search_string && $folder == $this->folder && ($mode == 'ALL' || $mode == 'THREADS')) {
             if ($mode == 'ALL') {
                 return $this->search_set->count_messages();
@@ -3145 +3145 @@
         }
 
+        // get cached metadata
+        $cache_key = 'mailboxes.folder-info.' . $folder;
+        $cached = $this->get_cache($cache_key);
+
+        if (is_array($cached))
+            return $cached;
+
         $acl       = $this->get_capability('ACL');
         $namespace = $this->get_namespace();
@@ -3207 +3214 @@
         }
 
+        // update caches
         $this->icache['options'] = $options;
+        $this->update_cache($cache_key, $options);
 
         return $options;
@@ -3273 +3282 @@
         }
 
+        $this->clear_cache('mailboxes.folder-info.' . $folder);
+
         return $this->conn->setACL($folder, $user, $acl);
     }
@@ -3385 +3396 @@
             return false;
         }
+
+        $this->clear_cache('mailboxes.metadata.' . $folder);
 
         if ($this->get_capability('METADATA') ||
@@ -3418 +3431 @@
         }
 
+        $this->clear_cache('mailboxes.metadata.' . $folder);
+
         if ($this->get_capability('METADATA') || 
             (!strlen($folder) && $this->get_capability('METADATA-SERVER'))
@@ -3451 +3466 @@
         }
 
+        $cache_key = 'mailboxes.metadata.' . $folder;
+        if ($cached = $this->get_cache($cache_key))
+            return $cached;
+
         if ($this->get_capability('METADATA') ||
             (!strlen($folder) && $this->get_capability('METADATA-SERVER'))
         ) {
-            return $this->conn->getMetadata($folder, $entries, $options);
+            $res = $this->conn->getMetadata($folder, $entries, $options);
+            $this->update_cache($cache_key, $res);
+            return $res;
         }
         else if ($this->get_capability('ANNOTATEMORE') || $this->get_capability('ANNOTATEMORE2')) {
@@ -3473 +3494 @@
             }
 
+            $this->update_cache($cache_key, $res);
             return $res;
         }