mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-29 06:38:52 +00:00
oopsie in gc
git-svn-id: file:///svn/phpbb/trunk@4769 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
c2f5e580aa
commit
6a3f8902c8
1 changed files with 42 additions and 37 deletions
|
@ -165,7 +165,7 @@ class session
|
||||||
|
|
||||||
// Garbage collection ... remove old sessions updating user information
|
// Garbage collection ... remove old sessions updating user information
|
||||||
// if necessary. It means (potentially) 11 queries but only infrequently
|
// if necessary. It means (potentially) 11 queries but only infrequently
|
||||||
if ($current_time > $config['session_last_gc'] + $config['session_gc'] && defined('PHPBB_INSTALLED'))
|
if ($current_time > $config['session_last_gc'] + $config['session_gc'])
|
||||||
{
|
{
|
||||||
$this->gc($current_time);
|
$this->gc($current_time);
|
||||||
}
|
}
|
||||||
|
@ -365,11 +365,13 @@ class session
|
||||||
// last_visit field won't be updated, which I believe should be
|
// last_visit field won't be updated, which I believe should be
|
||||||
// the normal behavior anyway
|
// the normal behavior anyway
|
||||||
$db->sql_return_on_error(TRUE);
|
$db->sql_return_on_error(TRUE);
|
||||||
|
|
||||||
$sql = 'DELETE FROM ' . SESSIONS_TABLE . '
|
$sql = 'DELETE FROM ' . SESSIONS_TABLE . '
|
||||||
USING ' . SESSIONS_TABLE . ' s1, ' . SESSIONS_TABLE . ' s2
|
USING ' . SESSIONS_TABLE . ' s1, ' . SESSIONS_TABLE . ' s2
|
||||||
WHERE s1.session_user_id = s2.session_user_id
|
WHERE s1.session_user_id = s2.session_user_id
|
||||||
AND s1.session_time < s2.session_time';
|
AND s1.session_time < s2.session_time';
|
||||||
$db->sql_query($sql);
|
$db->sql_query($sql);
|
||||||
|
|
||||||
$db->sql_return_on_error(FALSE);
|
$db->sql_return_on_error(FALSE);
|
||||||
|
|
||||||
// Update last visit time
|
// Update last visit time
|
||||||
|
@ -387,6 +389,8 @@ class session
|
||||||
set_config('session_last_gc', $current_time);
|
set_config('session_last_gc', $current_time);
|
||||||
break;
|
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 . '
|
||||||
|
@ -429,6 +433,7 @@ class session
|
||||||
// called again to delete other sessions
|
// called again to delete other sessions
|
||||||
set_config('session_last_gc', $current_time);
|
set_config('session_last_gc', $current_time);
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
@ -970,7 +975,7 @@ class auth
|
||||||
{
|
{
|
||||||
global $db;
|
global $db;
|
||||||
|
|
||||||
$where_sql = ($user_id) ? ' WHERE user_id = ' . $user_id : '';
|
$where_sql = ($user_id) ? ' WHERE user_id ' . ((is_array($user_id)) ? ' IN (' . implode(', ', array_map('intval', $user_id)) . ')' : " = $user_id") : '';
|
||||||
|
|
||||||
$sql = 'UPDATE ' . USERS_TABLE . "
|
$sql = 'UPDATE ' . USERS_TABLE . "
|
||||||
SET user_permissions = ''
|
SET user_permissions = ''
|
||||||
|
|
Loading…
Add table
Reference in a new issue