use the "old" approach

git-svn-id: file:///svn/phpbb/trunk@6407 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-09-25 14:32:05 +00:00
parent 8e06ad3829
commit 12f2fbc415

View file

@ -671,66 +671,28 @@ class session
$this->time_now = time(); $this->time_now = time();
} }
switch (SQL_LAYER)
{
case 'mysql4':
case 'mysqli':
// Firstly, delete guest sessions // Firstly, delete guest sessions
$sql = 'DELETE FROM ' . SESSIONS_TABLE . ' $sql = 'DELETE FROM ' . SESSIONS_TABLE . '
WHERE session_user_id = ' . ANONYMOUS . ' WHERE session_user_id = ' . ANONYMOUS . '
AND session_time < ' . (int) ($this->time_now - $config['session_length']); AND session_time < ' . (int) ($this->time_now - $config['session_length']);
$db->sql_query($sql); $db->sql_query($sql);
// Keep only the most recent session for each user
// Note: if the user is currently browsing the board, his
// last_visit field won't be updated, which I believe should be
// the normal behavior anyway
$db->sql_return_on_error(true);
$sql = 'DELETE FROM ' . SESSIONS_TABLE . '
USING ' . SESSIONS_TABLE . ' s1, ' . SESSIONS_TABLE . ' s2
WHERE s1.session_user_id = s2.session_user_id
AND s1.session_time < s2.session_time';
$db->sql_query($sql);
$db->sql_return_on_error(false);
// Update last visit time
$sql = 'UPDATE ' . USERS_TABLE. ' u, ' . SESSIONS_TABLE . ' s
SET u.user_lastvisit = s.session_time, u.user_lastpage = s.session_page
WHERE s.session_time < ' . (int) ($this->time_now - $config['session_length']) . '
AND u.user_id = s.session_user_id';
$db->sql_query($sql);
// Delete everything else now
$sql = 'DELETE FROM ' . SESSIONS_TABLE . '
WHERE session_time < ' . (int) ($this->time_now - $config['session_length']);
$db->sql_query($sql);
set_config('session_last_gc', $this->time_now, true);
break;
default:
// Get expired sessions, only most recent for each user // Get expired sessions, only most recent for each user
$sql = 'SELECT session_user_id, session_page, MAX(session_time) AS recent_time $sql = 'SELECT session_user_id, session_page, MAX(session_time) AS recent_time
FROM ' . SESSIONS_TABLE . ' FROM ' . SESSIONS_TABLE . '
WHERE session_time < ' . ($this->time_now - $config['session_length']) . ' WHERE session_time < ' . ($this->time_now - $config['session_length']) . '
GROUP BY session_user_id, session_page'; GROUP BY session_user_id, session_page';
$result = $db->sql_query_limit($sql, 5); $result = $db->sql_query_limit($sql, 10);
$del_user_id = array(); $del_user_id = array();
$del_sessions = 0; $del_sessions = 0;
while ($row = $db->sql_fetchrow($result)); while ($row = $db->sql_fetchrow($result));
{
if ($row['session_user_id'] != ANONYMOUS)
{ {
$sql = 'UPDATE ' . USERS_TABLE . ' $sql = 'UPDATE ' . USERS_TABLE . '
SET user_lastvisit = ' . (int) $row['recent_time'] . ", user_lastpage = '" . $db->sql_escape($row['session_page']) . "' SET user_lastvisit = ' . (int) $row['recent_time'] . ", user_lastpage = '" . $db->sql_escape($row['session_page']) . "'
WHERE user_id = " . (int) $row['session_user_id']; WHERE user_id = " . (int) $row['session_user_id'];
$db->sql_query($sql); $db->sql_query($sql);
}
$del_user_id[] = (int) $row['session_user_id']; $del_user_id[] = (int) $row['session_user_id'];
$del_sessions++; $del_sessions++;
@ -746,14 +708,12 @@ class session
$db->sql_query($sql); $db->sql_query($sql);
} }
if ($del_sessions < 5) if ($del_sessions < 10)
{ {
// Less than 5 sessions, update gc timer ... else we want gc // Less than 10 sessions, update gc timer ... else we want gc
// called again to delete other sessions // called again to delete other sessions
set_config('session_last_gc', $this->time_now, true); set_config('session_last_gc', $this->time_now, true);
} }
break;
}
if ($config['max_autologin_time']) if ($config['max_autologin_time'])
{ {