1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-13 20:28:44 +01:00

Merge pull request #6013 from marc1706/ticket/16534

[ticket/16534] Add conversion prefix to all passwords that need conversion
This commit is contained in:
Marc Alexander 2020-06-21 14:32:53 +02:00 committed by GitHub
commit 2afa989500
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -27,6 +27,12 @@ class passwords_convert_p1 extends \phpbb\db\migration\migration
);
}
/**
* Update passwords with convert flag to have $CP$ prefix
*
* @param int $start Limit start value
* @return int|void Null if conversion is finished, next start value if not
*/
public function update_passwords($start)
{
// Nothing to do if user_pass_convert column doesn't exist
@ -51,8 +57,8 @@ class passwords_convert_p1 extends \phpbb\db\migration\migration
$converted_users++;
$user_id = (int) $row['user_id'];
// Only prefix passwords without proper prefix
if (!isset($update_users[$user_id]) && !preg_match('#^\$([a-zA-Z0-9\\\]*?)\$#', $row['user_password']))
// Prefix all passwords that need to be converted
if (!isset($update_users[$user_id]))
{
// Use $CP$ prefix for passwords that need to
// be converted and set pass convert to false.