- Fix incorrect cache ttl used in get_cache_engine() (#1488447), use time() where mktime() without arguments was used

git-svn-id: https://svn.roundcube.net/trunk@6101 208e9e7b-5314-0410-a742-e7e81cd9613c

4 files changed, 6 insertions, 4 deletions

diff --git a/roundcubemail/program/include/rcmail.php b/roundcubemail/program/include/rcmail.php
index 024fd3ec3..e70980137 100644
--- a/roundcubemail/program/include/rcmail.php
+++ b/roundcubemail/program/include/rcmail.php
@@ -520,7 +520,7 @@ class rcmail extends rcube
       $_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/roundcubemail/program/include/rcube.php b/roundcubemail/program/include/rcube.php
index 6064a7287..2566defa8 100644
--- a/roundcubemail/program/include/rcube.php
+++ b/roundcubemail/program/include/rcube.php
@@ -486,7 +486,7 @@ class rcube
     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/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php
index 2e1e3ede5..daba72e50 100644
--- a/roundcubemail/program/include/rcube_imap.php
+++ b/roundcubemail/program/include/rcube_imap.php
@@ -3531,7 +3531,9 @@ class rcube_imap extends rcube_storage
     {
         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/roundcubemail/program/include/rcube_shared.inc b/roundcubemail/program/include/rcube_shared.inc
index 30436b7bd..b3911659e 100644
--- a/roundcubemail/program/include/rcube_shared.inc
+++ b/roundcubemail/program/include/rcube_shared.inc
@@ -164,7 +164,7 @@ function get_offset_time($offset_str, $factor=1)
         $unit   = 's';
     }
 
-    $ts = mktime();
+    $ts = time();
     switch ($unit) {
     case 'w':
         $amount *= 7;