From 6a8b4c2951314441e670d89204dd3b913698b23d Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 19 Apr 2012 02:56:52 -0400
Subject: [PATCH] - Fix incorrect cache ttl used in get_cache_engine() (#1488447), use time() where mktime() without arguments was used
---
program/include/rcube.php | 2 +-
program/include/rcube_shared.inc | 2 +-
program/include/rcube_imap.php | 4 +++-
program/include/rcmail.php | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 024fd3e..e709801 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -520,7 +520,7 @@
$_SESSION['storage_port'] = $port;
$_SESSION['storage_ssl'] = $ssl;
$_SESSION['password'] = $this->encrypt($pass);
- $_SESSION['login_time'] = mktime();
+ $_SESSION['login_time'] = time();
if (isset($_REQUEST['_timezone']) && $_REQUEST['_timezone'] != '_default_')
$_SESSION['timezone'] = floatval($_REQUEST['_timezone']);
diff --git a/program/include/rcube.php b/program/include/rcube.php
index 6064a72..2566def 100644
--- a/program/include/rcube.php
+++ b/program/include/rcube.php
@@ -486,7 +486,7 @@
public function temp_gc()
{
$tmp = unslashify($this->config->get('temp_dir'));
- $expire = mktime() - 172800; // expire in 48 hours
+ $expire = time() - 172800; // expire in 48 hours
if ($tmp && ($dir = opendir($tmp))) {
while (($fname = readdir($dir)) !== false) {
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 2e1e3ed..daba72e 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -3531,7 +3531,9 @@
{
if ($this->caching && !$this->cache) {
$rcube = rcube::get_instance();
- $ttl = $rcube->config->get('message_cache_lifetime', '10d') - mktime();
+ $ttl = $rcube->config->get('message_cache_lifetime', '10d');
+ $ttl = get_offset_time($ttl) - time();
+
$this->cache = $rcube->get_cache('IMAP', $this->caching, $ttl);
}
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index 30436b7..b391165 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -164,7 +164,7 @@
$unit = 's';
}
- $ts = mktime();
+ $ts = time();
switch ($unit) {
case 'w':
$amount *= 7;
--
Gitblit v1.9.1