Changeset 2465 in subversion

Timestamp:

May 10, 2009 4:59:39 AM (4 years ago)

Author:

alec

Message:

• speed up remove_message_cache() by using message uid instead of idx

File:

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

trunk/roundcubemail/program/include/rcube_imap.php

@@ -797 +797 @@
           // delete from cache
           if ($cache_index[$headers->id] && $cache_index[$headers->id] == $headers->uid)
-            $this->remove_message_cache($cache_key, $headers->id);
+            $this->remove_message_cache($cache_key, $headers->uid);
 
           $deleted_count++;
@@ -928 +928 @@
       if (isset($cache_index[$id]))
         {
-        $this->remove_message_cache($cache_key, $id);
+        $this->remove_message_cache($cache_key, $cache_index[$id]);
         unset($cache_index[$id]);
         }
@@ -942 +942 @@
       {
       foreach ($cache_index as $id => $uid)
-        $this->remove_message_cache($cache_key, $id);
+        $this->remove_message_cache($cache_key, $uid);
       }
     }
@@ -1437 +1437 @@
       {
       $mode = $o_part->encoding == 'base64' ? 3 : ($o_part->encoding == 'quoted-printable' ? 1 : 2);
-      $body = iil_C_HandlePartBody($this->conn, $this->mailbox, $msg_id, $part, $mode);
+      $body = iil_C_HandlePartBody($this->conn, $this->mailbox, '', $part, $mode);
       
       // we have to decode the part manually before printing
@@ -1568 +1568 @@
       foreach ($uids as $uid)
         if ($cached_headers = $this->get_cached_message($cache_key, $uid))
-          $this->remove_message_cache($cache_key, $this->_uid2id($uid));
+          $this->remove_message_cache($cache_key, $uid);
 
       // close and re-open connection
@@ -2431 +2431 @@
    * @access private
    */
-  function remove_message_cache($key, $index)
+  function remove_message_cache($key, $uid)
     {
     if (!$this->caching_enabled)
@@ -2440 +2440 @@
        WHERE  user_id=?
        AND    cache_key=?
-       AND    idx=?",
+       AND    uid=?",
       $_SESSION['user_id'],
       $key,
-      $index);
+      $uid);
     }