Changeset 4978 in subversion

Timestamp:

Jul 27, 2011 11:53:48 AM (23 months ago)

Author:

alec

Message:

• Delay imap cache initialization, fixes problem with cache cleanup on login (where user ID wasn't set on init time)

File:

• trunk/roundcubemail/program/include/rcube_imap.php (modified) (6 diffs)

trunk/roundcubemail/program/include/rcube_imap.php

@@ -81 +81 @@
     private $options = array('auth_method' => 'check');
     private $host, $user, $pass, $port, $ssl;
+    private $caching = false;
 
     /**
@@ -3815 +3816 @@
     {
         if ($type) {
-            $rcmail = rcmail::get_instance();
-            $this->cache = $rcmail->get_cache('IMAP', $type);
+            $this->caching = true;
         }
         else {
@@ -3822 +3822 @@
                 $this->cache->close();
             $this->cache = null;
-        }
-    }
-
+            $this->caching = false;
+        }
+    }
+
+    /**
+     * Getter for IMAP cache object
+     */
+    private function get_cache_engine()
+    {
+        if ($this->caching && !$this->cache) {
+            $rcmail = rcmail::get_instance();
+            $this->cache = $rcmail->get_cache('IMAP', $type);
+        }
+
+        return $this->cache;
+    }
 
     /**
@@ -3835 +3848 @@
     function get_cache($key)
     {
-        if ($this->cache) {
-            return $this->cache->get($key);
+        if ($cache = $this->get_cache_engine()) {
+            return $cache->get($key);
         }
     }
@@ -3849 +3862 @@
     function update_cache($key, $data)
     {
-        if ($this->cache) {
-            $this->cache->set($key, $data);
+        if ($cache = $this->get_cache_engine()) {
+            $cache->set($key, $data);
         }
     }
@@ -3864 +3877 @@
     function clear_cache($key=null, $prefix_mode=false)
     {
-        if ($this->cache) {
-            $this->cache->remove($key, $prefix_mode);
+        if ($cache = $this->get_cache_engine()) {
+            $cache->remove($key, $prefix_mode);
         }
     }