From 66510e20d36cb8da4f3012ef063de7bfce9b51aa Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 09 May 2012 07:52:28 -0400
Subject: [PATCH] Merge pull request #1 from Brianetta/de-svn
---
program/include/rcube_cache.php | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/program/include/rcube_cache.php b/program/include/rcube_cache.php
index 018d5f5..ef04beb 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 |
@@ -56,19 +59,19 @@
* @param string $type Engine type ('db' or 'memcache' or 'apc')
* @param int $userid User identifier
* @param string $prefix Key name prefix
- * @param int $ttl Expiration time of memcache/apc items in seconds (max.2592000)
+ * @param string $ttl Expiration time of memcache/apc items
* @param bool $packed Enables/disabled data serialization.
* It's possible to disable data serialization if you're sure
* stored data will be always a safe string
*/
function __construct($type, $userid, $prefix='', $ttl=0, $packed=true)
{
- $rcmail = rcmail::get_instance();
- $type = strtolower($type);
+ $rcube = rcube::get_instance();
+ $type = strtolower($type);
if ($type == 'memcache') {
$this->type = 'memcache';
- $this->db = $rcmail->get_memcache();
+ $this->db = $rcube->get_memcache();
}
else if ($type == 'apc') {
$this->type = 'apc';
@@ -76,11 +79,15 @@
}
else {
$this->type = 'db';
- $this->db = $rcmail->get_dbh();
+ $this->db = $rcube->get_dbh();
}
+ // convert ttl string to seconds
+ $ttl = get_offset_sec($ttl);
+ if ($ttl > 2592000) $ttl = 2592000;
+
$this->userid = (int) $userid;
- $this->ttl = (int) $ttl;
+ $this->ttl = $ttl;
$this->packed = $packed;
$this->prefix = $prefix;
}
@@ -194,7 +201,7 @@
{
if ($this->type == 'db' && $this->db) {
$this->db->query(
- "DELETE FROM ".get_table_name('cache').
+ "DELETE FROM ".$this->db->table_name('cache').
" WHERE user_id = ?".
" AND cache_key LIKE ?".
" AND " . $this->db->unixtimestamp('created')." < ?",
@@ -271,7 +278,7 @@
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
@@ -327,7 +334,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);
@@ -338,7 +345,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 = ?",
@@ -349,7 +356,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);
@@ -413,7 +420,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