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.php | 112 ++++++++++++++++++++++++++------------------------------
1 files changed, 52 insertions(+), 60 deletions(-)
diff --git a/program/lib/Roundcube/rcube_cache.php b/program/lib/Roundcube/rcube_cache.php
index ba7b1f5..c74c50c 100644
--- a/program/lib/Roundcube/rcube_cache.php
+++ b/program/lib/Roundcube/rcube_cache.php
@@ -268,20 +268,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);
}
}
@@ -357,8 +355,16 @@
$result = $this->add_record($this->ckey($key), $data);
// make sure index will be updated
- if ($result && !array_key_exists($key, $this->cache_sums)) {
- $this->cache_sums[$key] = true;
+ 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;
@@ -422,22 +428,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;
}
@@ -473,25 +486,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);
+ if (!$result) {
+ $result = $this->db->set($key, $data, MEMCACHE_COMPRESSED, $this->ttl);
}
}
else if ($this->type == 'apc') {
- if (apc_exists($key))
+ 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 ($result) {
- $this->index_changed = true;
+ if ($this->debug) {
+ $this->debug('set', $key, $data, $result);
}
return $result;
@@ -500,36 +509,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);
- }
+ $result = $this->db->delete($key, 0);
}
else {
- $ckey = $this->ckey($key);
- $result = apc_delete($ckey);
-
- if ($this->debug) {
- $this->debug('delete', $ckey, null, $result);
- }
+ $result = apc_delete($key);
}
- if ($result) {
- $this->index_changed = true;
+ if ($this->debug) {
+ $this->debug('delete', $key, null, $result);
}
- if ($index) {
- if (($idx = array_search($key, $this->index)) !== false) {
- unset($this->index[$idx]);
- }
- }
+ return $result;
}
@@ -538,11 +537,7 @@
*/
private function write_index()
{
- if (!$this->db) {
- return;
- }
-
- if ($this->type == 'db') {
+ if (!$this->db || $this->type == 'db') {
return;
}
@@ -572,7 +567,7 @@
*/
private function load_index()
{
- if (!$this->db) {
+ if (!$this->db || $this->type == 'db') {
return;
}
@@ -581,19 +576,16 @@
}
$index_key = $this->ikey();
+
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();
--
Gitblit v1.9.1