From 2965a981b7ec22866fbdf2d567d87e2d068d3617 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 31 Jul 2015 16:04:08 -0400
Subject: [PATCH] Allow to search and import missing PGP pubkeys from keyservers using Publickey.js

---
 program/lib/Roundcube/rcube_cache_shared.php |  142 +++++++++++++++++++++++------------------------
 1 files changed, 69 insertions(+), 73 deletions(-)

diff --git a/program/lib/Roundcube/rcube_cache_shared.php b/program/lib/Roundcube/rcube_cache_shared.php
index e156895..bd5fb6e 100644
--- a/program/lib/Roundcube/rcube_cache_shared.php
+++ b/program/lib/Roundcube/rcube_cache_shared.php
@@ -42,12 +42,11 @@
     private $index;
     private $table;
     private $debug;
+    private $index_changed = false;
     private $cache         = array();
     private $cache_changes = array();
     private $cache_sums    = array();
     private $max_packet    = -1;
-
-    const DEBUG_LINE_LENGTH = 4096;
 
 
     /**
@@ -117,7 +116,6 @@
     function set($key, $data)
     {
         $this->cache[$key]         = $data;
-        $this->cache_changed       = true;
         $this->cache_changes[$key] = true;
     }
 
@@ -166,7 +164,6 @@
         // Remove all keys
         if ($key === null) {
             $this->cache         = array();
-            $this->cache_changed = false;
             $this->cache_changes = array();
             $this->cache_sums    = array();
         }
@@ -224,10 +221,6 @@
      */
     function close()
     {
-        if (!$this->cache_changed) {
-            return;
-        }
-
         foreach ($this->cache as $key => $data) {
             // The key has been used
             if ($this->cache_changes[$key]) {
@@ -241,7 +234,9 @@
             }
         }
 
-        $this->write_index();
+        if ($this->index_changed) {
+            $this->write_index();
+        }
     }
 
 
@@ -268,20 +263,18 @@
                 // to have data in consistent state. Keeping the index consistent
                 // is needed for keys delete operation when we delete all keys or by prefix.
             }
-            else if ($this->type == 'memcache') {
+            else {
                 $ckey = $this->ckey($key);
-                $data = $this->db->get($ckey);
+
+                if ($this->type == 'memcache') {
+                    $data = $this->db->get($ckey);
+                }
+                else if ($this->type == 'apc') {
+                    $data = apc_fetch($ckey);
+                }
 
                 if ($this->debug) {
                     $this->debug('get', $ckey, $data);
-                }
-            }
-            else if ($this->type == 'apc') {
-                $ckey = $this->ckey($key);
-                $data = apc_fetch($ckey);
-
-                if ($this->debug) {
-                    $this->debug('fetch', $ckey, $data);
                 }
             }
 
@@ -353,7 +346,22 @@
         }
 
         if ($this->type == 'memcache' || $this->type == 'apc') {
-            return $this->add_record($this->ckey($key), $data);
+            $result = $this->add_record($this->ckey($key), $data);
+
+            // make sure index will be updated
+            if ($result) {
+                if (!array_key_exists($key, $this->cache_sums)) {
+                    $this->cache_sums[$key] = true;
+                }
+
+                $this->load_index();
+
+                if (!$this->index_changed && !in_array($key, $this->index)) {
+                    $this->index_changed = true;
+                }
+            }
+
+            return $result;
         }
 
         $key_exists = array_key_exists($key, $this->cache_sums);
@@ -409,22 +417,29 @@
             // Remove all keys
             if ($key === null) {
                 foreach ($this->index as $key) {
-                    $this->delete_record($key, false);
+                    $this->delete_record($this->ckey($key));
                 }
+
                 $this->index = array();
             }
             // Remove keys by name prefix
             else if ($prefix_mode) {
-                foreach ($this->index as $k) {
+                foreach ($this->index as $idx => $k) {
                     if (strpos($k, $key) === 0) {
-                        $this->delete_record($k);
+                        $this->delete_record($this->ckey($k));
+                        unset($this->index[$idx]);
                     }
                 }
             }
             // Remove one key by name
             else {
-                $this->delete_record($key);
+                $this->delete_record($this->ckey($key));
+                if (($idx = array_search($key, $this->index)) !== false) {
+                    unset($this->index[$idx]);
+                }
             }
+
+            $this->index_changed = true;
 
             return;
         }
@@ -458,22 +473,21 @@
     {
         if ($this->type == 'memcache') {
             $result = $this->db->replace($key, $data, MEMCACHE_COMPRESSED, $this->ttl);
+
             if (!$result) {
                 $result = $this->db->set($key, $data, MEMCACHE_COMPRESSED, $this->ttl);
-            }
-            if ($this->debug) {
-                $this->debug('set', $key, $data, $result);
             }
         }
         else if ($this->type == 'apc') {
             if (apc_exists($key)) {
                 apc_delete($key);
             }
-            $result = apc_store($key, $data, $this->ttl);
 
-            if ($this->debug) {
-                $this->debug('store', $key, $data, $result);
-            }
+            $result = apc_store($key, $data, $this->ttl);
+        }
+
+        if ($this->debug) {
+            $this->debug('set', $key, $data, $result);
         }
 
         return $result;
@@ -482,32 +496,26 @@
 
     /**
      * Deletes entry from memcache/apc DB.
+     *
+     * @param string $key Cache key name
+     *
+     * @param boolean True on success, False on failure
      */
-    private function delete_record($key, $index=true)
+    private function delete_record($key)
     {
         if ($this->type == 'memcache') {
-            $ckey = $this->ckey($key);
             // #1488592: use 2nd argument
             $result = $this->db->delete($ckey, 0);
-
-            if ($this->debug) {
-                $this->debug('delete', $ckey, null, $result);
-            }
         }
         else {
-            $ckey   = $this->ckey($key);
             $result = apc_delete($ckey);
-
-            if ($this->debug) {
-                $this->debug('delete', $ckey, null, $result);
-            }
         }
 
-        if ($index) {
-            if (($idx = array_search($key, $this->index)) !== false) {
-                unset($this->index[$idx]);
-            }
+        if ($this->debug) {
+            $this->debug('delete', $ckey, null, $result);
         }
+
+        return $result;
     }
 
 
@@ -516,11 +524,7 @@
      */
     private function write_index()
     {
-        if (!$this->db) {
-            return;
-        }
-
-        if ($this->type == 'db') {
+        if (!$this->db || $this->type == 'db') {
             return;
         }
 
@@ -528,10 +532,15 @@
 
         // Make sure index contains new keys
         foreach ($this->cache as $key => $value) {
-            if ($value !== null) {
-                if (array_search($key, $this->index) === false) {
-                    $this->index[] = $key;
-                }
+            if ($value !== null && !in_array($key, $this->index)) {
+                $this->index[] = $key;
+            }
+        }
+
+        // new keys added using self::write()
+        foreach ($this->cache_sums as $key => $value) {
+            if ($value === true && !in_array($key, $this->index)) {
+                $this->index[] = $key;
             }
         }
 
@@ -545,7 +554,7 @@
      */
     private function load_index()
     {
-        if (!$this->db) {
+        if (!$this->db || $this->type == 'db') {
             return;
         }
 
@@ -557,17 +566,13 @@
 
         if ($this->type == 'memcache') {
             $data = $this->db->get($index_key);
-
-            if ($this->debug) {
-                $this->debug('get', $index_key, $data);
-            }
         }
         else if ($this->type == 'apc') {
             $data = apc_fetch($index_key);
+        }
 
-            if ($this->debug) {
-                $this->debug('fetch', $index_key, $data);
-            }
+        if ($this->debug) {
+            $this->debug('get', $index_key, $data);
         }
 
         $this->index = $data ? unserialize($data) : array();
@@ -659,17 +664,8 @@
 
         if ($data !== null) {
             $line .= ' ' . ($this->packed ? $data : serialize($data));
-
-            if (($len = strlen($line)) > self::DEBUG_LINE_LENGTH) {
-                $diff = $len - self::DEBUG_LINE_LENGTH;
-                $line = substr($line, 0, self::DEBUG_LINE_LENGTH) . "... [truncated $diff bytes]";
-            }
         }
 
-        if ($result !== null) {
-            $line .= ' [' . ($result ? 'TRUE' : 'FALSE') . ']';
-        }
-
-        rcube::write_log($this->type, $line);
+        rcube::debug($this->type, $line, $result);
     }
 }

--
Gitblit v1.9.1