Changeset 38bf4253 in github

Timestamp:

Sep 24, 2009 8:08:23 AM (4 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

c2e697f

Parents:

9e2a7af

Message:

• Fix cache status checking + improve cache operations performance (#1486104)

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_imap.php (modified) (6 diffs)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix cache status checking + improve cache operations performance (#1486104)
 - Prevent from setting INBOX as any of special folders (#1486114)
 - Fix regular expression for e-mail address (#1486152)

program/include/rcube_imap.php

@@ -486 +486 @@
   private function _messagecount($mailbox='', $mode='ALL', $force=FALSE)
     {
-    $a_mailbox_cache = FALSE;
     $mode = strtoupper($mode);
 
@@ -2141 +2140 @@
   function get_cache($key)
     {
-    // read cache
-    if (!isset($this->cache[$key]) && $this->caching_enabled)
+    // read cache (if it was not read before)
+    if (!count($this->cache) && $this->caching_enabled)
       {
       return $this->_read_cache_record($key);
@@ -2219 +2218 @@
         $sql_key = preg_replace('/^IMAP\./', '', $sql_arr['cache_key']);
         $this->cache_keys[$sql_key] = $sql_arr['cache_id'];
-        $this->cache[$sql_key] = $sql_arr['data'] ? unserialize($sql_arr['data']) : FALSE;
+        if (!isset($this->cache[$sql_key]))
+          $this->cache[$sql_key] = $sql_arr['data'] ? unserialize($sql_arr['data']) : FALSE;
         }
       }
@@ -2234 +2234 @@
       return FALSE;
 
-    // check if we already have a cache entry for this key
-    if (!isset($this->cache_keys[$key]))
-      {
+    // update existing cache record
+    if ($this->cache_keys[$key])
+      {
+      $this->db->query(
+        "UPDATE ".get_table_name('cache')."
+         SET    created=". $this->db->now().", data=?
+         WHERE  user_id=?
+         AND    cache_key=?",
+        $data,
+        $_SESSION['user_id'],
+        'IMAP.'.$key);
+      }
+    // add new cache record
+    else
+      {
+      $this->db->query(
+        "INSERT INTO ".get_table_name('cache')."
+         (created, user_id, cache_key, data)
+         VALUES (".$this->db->now().", ?, ?, ?)",
+        $_SESSION['user_id'],
+        'IMAP.'.$key,
+        $data);
+
+      // get cache entry ID for this key
       $sql_result = $this->db->query(
         "SELECT cache_id
@@ -2245 +2266 @@
         'IMAP.'.$key);
                                      
-      if ($sql_arr = $this->db->fetch_assoc($sql_result))
-        $this->cache_keys[$key] = $sql_arr['cache_id'];
-      else
-        $this->cache_keys[$key] = FALSE;
-      }
-
-    // update existing cache record
-    if ($this->cache_keys[$key])
-      {
-      $this->db->query(
-        "UPDATE ".get_table_name('cache')."
-         SET    created=". $this->db->now().", data=?
-         WHERE  user_id=?
-         AND    cache_key=?",
-        $data,
-        $_SESSION['user_id'],
-        'IMAP.'.$key);
-      }
-    // add new cache record
-    else
-      {
-      $this->db->query(
-        "INSERT INTO ".get_table_name('cache')."
-         (created, user_id, cache_key, data)
-         VALUES (".$this->db->now().", ?, ?, ?)",
-        $_SESSION['user_id'],
-        'IMAP.'.$key,
-        $data);
+        if ($sql_arr = $this->db->fetch_assoc($sql_result))
+          $this->cache_keys[$key] = $sql_arr['cache_id'];
       }
     }
@@ -2287 +2282 @@
       $_SESSION['user_id'],
       'IMAP.'.$key);
+      
+    unset($this->cache_keys[$key]);
     }