Changeset 6a8b4c2 in github


Ignore:
Timestamp:
Apr 19, 2012 2:56:52 AM (13 months ago)
Author:
alecpl <alec@…>
Branches:
master, HEAD, courier-fix, dev-browser-capabilities, pdo
Children:
5d66a4b
Parents:
b4f95a9
Message:
  • Fix incorrect cache ttl used in get_cache_engine() (#1488447), use time() where mktime() without arguments was used
Location:
program/include
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • program/include/rcmail.php

    re7ca048 r6a8b4c2  
    521521      $_SESSION['storage_ssl']  = $ssl; 
    522522      $_SESSION['password']     = $this->encrypt($pass); 
    523       $_SESSION['login_time']   = mktime(); 
     523      $_SESSION['login_time']   = time(); 
    524524 
    525525      if (isset($_REQUEST['_timezone']) && $_REQUEST['_timezone'] != '_default_') 

  • program/include/rcube.php

    r963a10b r6a8b4c2  
    487487    { 
    488488        $tmp = unslashify($this->config->get('temp_dir')); 
    489         $expire = mktime() - 172800;  // expire in 48 hours 
     489        $expire = time() - 172800;  // expire in 48 hours 
    490490 
    491491        if ($tmp && ($dir = opendir($tmp))) { 

  • program/include/rcube_imap.php

    r6ab9e8a6 r6a8b4c2  
    35323532        if ($this->caching && !$this->cache) { 
    35333533            $rcube = rcube::get_instance(); 
    3534             $ttl = $rcube->config->get('message_cache_lifetime', '10d') - mktime(); 
     3534            $ttl = $rcube->config->get('message_cache_lifetime', '10d'); 
     3535            $ttl = get_offset_time($ttl) - time(); 
     3536 
    35353537            $this->cache = $rcube->get_cache('IMAP', $this->caching, $ttl); 
    35363538        } 

  • program/include/rcube_shared.inc

    r1aceb9c r6a8b4c2  
    165165    } 
    166166 
    167     $ts = mktime(); 
     167    $ts = time(); 
    168168    switch ($unit) { 
    169169    case 'w': 
Note: See TracChangeset for help on using the changeset viewer.