mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
Cross-port a patch from 2.0.20 into the 3.0 branch
git-svn-id: file:///svn/phpbb/trunk@5660 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
af2036427a
commit
9d5b427032
3 changed files with 25 additions and 0 deletions
|
@ -662,6 +662,7 @@ class acp_users
|
|||
'user_passchg' => time(),
|
||||
);
|
||||
|
||||
$user->reset_login_keys($user_id);
|
||||
add_log('admin', 'LOG_USER_NEW_PASSWORD', $user_row['username']);
|
||||
add_log('user', $user_id, 'LOG_USER_NEW_PASSWORD', $user_row['username']);
|
||||
}
|
||||
|
|
|
@ -763,6 +763,29 @@ class session
|
|||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Reset all login keys for the specified user
|
||||
*
|
||||
* This method removes all current login keys for a specified (or the current)
|
||||
* user. It will be called on password change to render old keys unusable
|
||||
*/
|
||||
function reset_login_keys($user_id = false)
|
||||
{
|
||||
global $config, $db;
|
||||
|
||||
$user_id = ($user_id === false) ? $this->data['user_id'] : $user_id;
|
||||
|
||||
$sql = 'DELETE FROM ' . SESSIONS_KEYS_TABLE . ' WHERE user_id = ' . (int) $user_id;
|
||||
$db->sql_query($sql);
|
||||
|
||||
// We're changing the password of the current user and they have a key
|
||||
// Lets regenerate it to be safe
|
||||
if ($user_id === $this->data['user_id'] && $this->cookie_data['k'])
|
||||
{
|
||||
$this->set_login_key($user_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -97,6 +97,7 @@ class ucp_profile
|
|||
|
||||
if ($auth->acl_get('u_chgpasswd') && $new_password && md5($new_password) != $user->data['user_password'])
|
||||
{
|
||||
$user->reset_login_keys();
|
||||
add_log('admin', 'LOG_USER_NEW_PASSWORD', $username);
|
||||
add_log('user', $user->data['user_id'], 'LOG_USER_NEW_PASSWORD', $username);
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue