Refactored IMAP cache expunge: delegate to storage object; don't rely on deprecated 'enable_caching' config option

1 files changed, 16 insertions, 1 deletions

diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 56b5e59fe..70b410ff8 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -3527,7 +3527,8 @@ class rcube_imap extends rcube_storage
     {
         if ($this->caching && !$this->cache) {
             $rcmail = rcmail::get_instance();
-            $this->cache = $rcmail->get_cache('IMAP', $this->caching);
+            $ttl = $rcmail->config->get('message_cache_lifetime', '10d') - mktime();
+            $this->cache = $rcmail->get_cache('IMAP', $this->caching, $ttl);
         }
 
         return $this->cache;
@@ -3574,6 +3575,20 @@ class rcube_imap extends rcube_storage
         }
     }
 
+    /**
+     * Delete outdated cache entries
+     */
+    public function expunge_cache()
+    {
+        if ($this->mcache) {
+            $ttl = rcmail::get_instance()->config->get('message_cache_lifetime', '10d');
+            $this->mcache->expunge($ttl);
+        }
+
+        if ($this->cache)
+            $this->cache->expunge();
+    }
+
 
     /* --------------------------------
      *   message caching methods