From 0c259682f65eaaf23ea4ccb56a706d6baf3007e4 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 13 Apr 2012 04:52:02 -0400
Subject: [PATCH] - Merge devel-framework branch, resolved conflicts
---
program/include/rcube_cache.php | 78 ++++++++++++++++++++++++++------------
1 files changed, 53 insertions(+), 25 deletions(-)
diff --git a/program/include/rcube_cache.php b/program/include/rcube_cache.php
index 204eaa5..3e6bc0f 100644
--- a/program/include/rcube_cache.php
+++ b/program/include/rcube_cache.php
@@ -7,7 +7,10 @@
| This file is part of the Roundcube Webmail client |
| Copyright (C) 2011, The Roundcube Dev Team |
| Copyright (C) 2011, Kolab Systems AG |
- | Licensed under the GNU GPL |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
| PURPOSE: |
| Caching engine |
@@ -28,7 +31,7 @@
* @package Cache
* @author Thomas Bruederli <roundcube@gmail.com>
* @author Aleksander Machniak <alec@alec.pl>
- * @version 1.0
+ * @version 1.1
*/
class rcube_cache
{
@@ -63,7 +66,7 @@
*/
function __construct($type, $userid, $prefix='', $ttl=0, $packed=true)
{
- $rcmail = rcmail::get_instance();
+ $rcmail = rcube::get_instance();
$type = strtolower($type);
if ($type == 'memcache') {
@@ -188,6 +191,24 @@
/**
+ * Remove cache records older than ttl
+ */
+ function expunge()
+ {
+ if ($this->type == 'db' && $this->db) {
+ $this->db->query(
+ "DELETE FROM ".$this->db->table_name('cache').
+ " WHERE user_id = ?".
+ " AND cache_key LIKE ?".
+ " AND " . $this->db->unixtimestamp('created')." < ?",
+ $this->userid,
+ $this->prefix.'.%',
+ time() - $this->ttl);
+ }
+ }
+
+
+ /**
* Writes the cache back to the DB.
*/
function close()
@@ -227,29 +248,33 @@
return null;
}
- if ($this->type == 'memcache') {
- $data = $this->db->get($this->ckey($key));
- }
- else if ($this->type == 'apc') {
- $data = apc_fetch($this->ckey($key));
- }
-
- if ($data) {
- $md5sum = md5($data);
- $data = $this->packed ? unserialize($data) : $data;
-
- if ($nostore) {
- return $data;
+ if ($this->type != 'db') {
+ if ($this->type == 'memcache') {
+ $data = $this->db->get($this->ckey($key));
}
+ else if ($this->type == 'apc') {
+ $data = apc_fetch($this->ckey($key));
+ }
- $this->cache_sums[$key] = $md5sum;
- $this->cache[$key] = $data;
+ if ($data) {
+ $md5sum = md5($data);
+ $data = $this->packed ? unserialize($data) : $data;
+
+ if ($nostore) {
+ return $data;
+ }
+
+ $this->cache_sums[$key] = $md5sum;
+ $this->cache[$key] = $data;
+ }
+ else {
+ $this->cache[$key] = null;
+ }
}
-
- if ($this->type == 'db') {
+ else {
$sql_result = $this->db->limitquery(
"SELECT cache_id, data, cache_key".
- " FROM ".get_table_name('cache').
+ " FROM ".$this->db->table_name('cache').
" WHERE user_id = ?".
" AND cache_key = ?".
// for better performance we allow more records for one key
@@ -271,6 +296,9 @@
$this->cache[$key] = $data;
$this->cache_sums[$key] = $md5sum;
$this->cache_keys[$key] = $sql_arr['cache_id'];
+ }
+ else {
+ $this->cache[$key] = null;
}
}
@@ -302,7 +330,7 @@
// Remove NULL rows (here we don't need to check if the record exist)
if ($data == 'N;') {
$this->db->query(
- "DELETE FROM ".get_table_name('cache').
+ "DELETE FROM ".$this->db->table_name('cache').
" WHERE user_id = ?".
" AND cache_key = ?",
$this->userid, $key);
@@ -313,7 +341,7 @@
// update existing cache record
if ($key_exists) {
$result = $this->db->query(
- "UPDATE ".get_table_name('cache').
+ "UPDATE ".$this->db->table_name('cache').
" SET created = ". $this->db->now().", data = ?".
" WHERE user_id = ?".
" AND cache_key = ?",
@@ -324,7 +352,7 @@
// for better performance we allow more records for one key
// so, no need to check if record exist (see rcube_cache::read_record())
$result = $this->db->query(
- "INSERT INTO ".get_table_name('cache').
+ "INSERT INTO ".$this->db->table_name('cache').
" (created, user_id, cache_key, data)".
" VALUES (".$this->db->now().", ?, ?, ?)",
$this->userid, $key, $data);
@@ -388,7 +416,7 @@
}
$this->db->query(
- "DELETE FROM ".get_table_name('cache').
+ "DELETE FROM ".$this->db->table_name('cache').
" WHERE user_id = ?" . $where,
$this->userid);
}
--
Gitblit v1.9.1