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 | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/program/include/session.inc b/program/include/session.inc
index dc362f8..6c4687e 100644
--- a/program/include/session.inc
+++ b/program/include/session.inc
@@ -45,7 +45,7 @@
if ($sql_arr = $DB->fetch_assoc($sql_result))
{
- $SESS_CHANGED = mktime(); //$sql_arr['changed'];
+ $SESS_CHANGED = $sql_arr['changed'];
if (strlen($sql_arr['vars']))
return $sql_arr['vars'];
@@ -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,7 +79,7 @@
{
$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']);
@@ -105,7 +105,6 @@
WHERE sess_id=?",
$key);
- rcmail_clear_session_temp($key);
return TRUE;
}
@@ -118,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('changed')." > ?",
+ WHERE ".$DB->unixtimestamp($DB->now())."-".$DB->unixtimestamp('changed')." > ?",
$maxlifetime);
$a_exp_sessions = array();
@@ -137,12 +136,9 @@
WHERE sess_id IN ('".join("','", $a_exp_sessions)."')");
}
- // remove session specific temp dirs
- foreach ($a_exp_sessions as $key)
- rcmail_clear_session_temp($key);
-
// also run message cache GC
rcmail_message_cache_gc();
+ rcmail_temp_gc();
return TRUE;
}
--
Gitblit v1.9.1