makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'prep-release-3.1.0' into develop-ascraeus

Browse source
This commit is contained in:
Joas Schilling 2014-10-27 23:40:04 +01:00
commit 91a9d25a38
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php
View file

@ -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']);