From 7a5c48e7f70b8bc938fcae3ffd2be0fdbeaab145 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 13 Dec 2006 02:17:24 -0500
Subject: [PATCH] Changed 'junk' label in French localization
---
program/include/session.inc | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/program/include/session.inc b/program/include/session.inc
index 54ed798..6c4687e 100644
--- a/program/include/session.inc
+++ b/program/include/session.inc
@@ -59,7 +59,7 @@
function sess_write($key, $vars)
{
global $DB;
-
+
$sql_result = $DB->query("SELECT 1
FROM ".get_table_name('session')."
WHERE sess_id=?",
@@ -70,7 +70,7 @@
session_decode($vars);
$DB->query("UPDATE ".get_table_name('session')."
SET vars=?,
- changed=now()
+ changed=".$DB->now()."
WHERE sess_id=?",
$vars,
$key);
@@ -79,10 +79,12 @@
{
$DB->query("INSERT INTO ".get_table_name('session')."
(sess_id, vars, ip, created, changed)
- VALUES (?, ?, ?, now(), now())",
+ VALUES (?, ?, ?, ".$DB->now().", ".$DB->now().")",
$key,
$vars,
$_SERVER['REMOTE_ADDR']);
+
+
}
return TRUE;
@@ -102,7 +104,7 @@
$DB->query("DELETE FROM ".get_table_name('session')."
WHERE sess_id=?",
$key);
-
+
return TRUE;
}
@@ -115,7 +117,7 @@
// get all expired sessions
$sql_result = $DB->query("SELECT sess_id
FROM ".get_table_name('session')."
- WHERE ".$DB->unixtimestamp('now()')."-".$DB->unixtimestamp('created')." > ?",
+ WHERE ".$DB->unixtimestamp($DB->now())."-".$DB->unixtimestamp('changed')." > ?",
$maxlifetime);
$a_exp_sessions = array();
@@ -134,6 +136,10 @@
WHERE sess_id IN ('".join("','", $a_exp_sessions)."')");
}
+ // also run message cache GC
+ rcmail_message_cache_gc();
+ rcmail_temp_gc();
+
return TRUE;
}
--
Gitblit v1.9.1