Changeset cc95700 in github

Timestamp:

Feb 5, 2006 10:38:51 AM (7 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

bde645f

Parents:

fd80c1e

Message:

Added message cache garbage collector

Files:

• config/main.inc.php.dist (modified) (1 diff)
• program/include/main.inc (modified) (3 diffs)
• program/include/rcube_shared.inc (modified) (1 diff)
• program/include/session.inc (modified) (2 diffs)

config/main.inc.php.dist

@@ -22 +22 @@
 // this is recommended if the IMAP server does not run on the same machine
 $rcmail_config['enable_caching'] = TRUE;
+
+// lifetime of message cache
+// possible units: s, m, h, d, w
+$rcmail_config['message_cache_lifetime'] = '10d';
 
 // automatically create a new RoundCube user when log-in the first time.

program/include/main.inc

@@ -698 +698 @@
 
 
+// remove all expired message cache records
+function rcmail_message_cache_gc()
+  {
+  global $DB, $CONFIG;
+  
+  // no cache lifetime configured
+  if (empty($CONFIG['message_cache_lifetime']))
+    return;
+  
+  // get target timestamp
+  $ts = get_offset_time($CONFIG['message_cache_lifetime'], -1);
+  
+  $DB->query("DELETE FROM ".get_table_name('messages')."
+             WHERE  created < ".$DB->fromunixtime($ts));
+  }
+
 
 // convert a string from one charset to another
@@ -710 +726 @@
     
   // convert charset using iconv module  
-  if (0 && function_exists('iconv') && $from!='UTF-7' && $to!='UTF-7') {
+  if (function_exists('iconv') && $from!='UTF-7' && $to!='UTF-7') {
     return iconv($from, $to, $str);
     }
@@ -1507 +1523 @@
 
 
+/****** debugging function ********/
+
 function rcube_timer()
   {

program/include/rcube_shared.inc

@@ -1354 +1354 @@
 
 
+// create a unix timestamp with a specified offset from now
+function get_offset_time($offset_str, $factor=1)
+  {
+  if (preg_match('/^([0-9]+)\s*([smhdw])/i', $offset_str, $regs))
+    {
+    $amount = (int)$regs[1];
+    $unit = strtolower($regs[2]);
+    }
+  else
+    {
+    $amount = (int)$offset_str;
+    $unit = 's';
+    }
+    
+  $ts = mktime();
+  switch ($unit)
+    {
+    case 'w':
+      $amount *= 7;
+    case 'd':
+      $amount *= 24;
+    case 'h':
+      $amount *= 60;
+    case 'h':
+      $amount *= 60;
+    case 's':
+      $ts += $amount * $factor;
+    }
+
+  return $ts;
+  }
+
+
 ?>

program/include/session.inc

@@ -107 +107 @@
 
   rcmail_clear_session_temp($key);
-
   return TRUE;
   }
@@ -143 +142 @@
     rcmail_clear_session_temp($key);
 
+  // also run message cache GC
+  rcmail_message_cache_gc();
+
   return TRUE;
   }