From 66773789e392305bba4cdf7ed8e6ae3b8380de51 Mon Sep 17 00:00:00 2001 From: svncommit <devs@roundcube.net> Date: Thu, 27 Oct 2005 09:45:33 -0400 Subject: [PATCH] --- program/include/session.inc | 6 +++--- program/include/main.inc | 4 ++-- program/include/cache.inc | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/program/include/cache.inc b/program/include/cache.inc index 9b01c9e..8d088e5 100644 --- a/program/include/cache.inc +++ b/program/include/cache.inc @@ -69,7 +69,7 @@ if ($CACHE_KEYS[$key]) { $DB->query("UPDATE ".get_table_name('cache')." - SET created=NOW(), + SET created=now(), data=? WHERE user_id=? AND cache_key=?", @@ -82,7 +82,7 @@ { $DB->query("INSERT INTO ".get_table_name('cache')." (created, user_id, session_id, cache_key, data) - VALUES (NOW(), ?, ?, ?, ?)", + VALUES (now(), ?, ?, ?, ?)", $_SESSION['user_id'], $session_cache ? $sess_id : 'NULL', $key, diff --git a/program/include/main.inc b/program/include/main.inc index ce9eaf0..d00efc7 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -299,7 +299,7 @@ // update user's record $DB->query("UPDATE ".get_table_name('users')." - SET last_login=NOW() + SET last_login=now() WHERE user_id=?", $user_id); } @@ -336,7 +336,7 @@ $DB->query("INSERT INTO ".get_table_name('users')." (created, last_login, username, mail_host, language) - VALUES (NOW(), NOW(), ?, ?, ?)", + VALUES (now(), now(), ?, ?, ?)", $user, $host, $_SESSION['user_lang']); diff --git a/program/include/session.inc b/program/include/session.inc index ccca0a9..54ed798 100644 --- a/program/include/session.inc +++ b/program/include/session.inc @@ -70,7 +70,7 @@ session_decode($vars); $DB->query("UPDATE ".get_table_name('session')." SET vars=?, - changed=NOW() + changed=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 (?, ?, ?, now(), now())", $key, $vars, $_SERVER['REMOTE_ADDR']); @@ -115,7 +115,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('now()')."-".$DB->unixtimestamp('created')." > ?", $maxlifetime); $a_exp_sessions = array(); -- Gitblit v1.9.1