mirror of
https://github.com/phpbb/phpbb.git
synced 2025-02-25 04:23:38 +01:00
Merge pull request #3077 from marc1706/ticket/13225
[ticket/13225] Use passwords manager instead of phpbb_hash in migration
This commit is contained in:
commit
aa916fc43f
@ -55,6 +55,9 @@ class release_3_0_5_rc1 extends \phpbb\db\migration\migration
|
|||||||
|
|
||||||
public function hash_old_passwords()
|
public function hash_old_passwords()
|
||||||
{
|
{
|
||||||
|
global $phpbb_container;
|
||||||
|
|
||||||
|
$passwords_manager = $phpbb_container->get('passwords.manager');
|
||||||
$sql = 'SELECT user_id, user_password
|
$sql = 'SELECT user_id, user_password
|
||||||
FROM ' . $this->table_prefix . 'users
|
FROM ' . $this->table_prefix . 'users
|
||||||
WHERE user_pass_convert = 1';
|
WHERE user_pass_convert = 1';
|
||||||
@ -65,7 +68,7 @@ class release_3_0_5_rc1 extends \phpbb\db\migration\migration
|
|||||||
if (strlen($row['user_password']) == 32)
|
if (strlen($row['user_password']) == 32)
|
||||||
{
|
{
|
||||||
$sql_ary = array(
|
$sql_ary = array(
|
||||||
'user_password' => phpbb_hash($row['user_password']),
|
'user_password' => '$CP$' . $passwords_manager->hash($row['user_password'], 'passwords.driver.salted_md5'),
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->sql_query('UPDATE ' . $this->table_prefix . 'users SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . $row['user_id']);
|
$this->sql_query('UPDATE ' . $this->table_prefix . 'users SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . $row['user_id']);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user