3 files changed, 136 insertions, 2 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/passwords_convert_p1.php b/phpBB/phpbb/db/migration/data/v310/passwords_convert_p1.php
new file mode 100644
index 0000000000..004d94d8bd
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v310/passwords_convert_p1.php
@@ -0,0 +1,85 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\db\migration\data\v310;
+
+class passwords_convert_p1 extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array('\phpbb\db\migration\data\v310\passwords_p2');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('custom', array(array($this, 'update_passwords'))),
+		);
+	}
+
+	public function update_passwords($start)
+	{
+		// Nothing to do if user_pass_convert column doesn't exist
+		if (!$this->db_tools->sql_column_exists($this->table_prefix . 'users', 'user_pass_convert'))
+		{
+			return;
+		}
+
+		$start = (int) $start;
+		$limit = 1000;
+		$converted_users = 0;
+
+		$sql = 'SELECT user_password, user_id
+			FROM ' . $this->table_prefix . 'users
+			WHERE user_pass_convert = 1
+			GROUP BY user_id
+			ORDER BY user_id';
+		$result = $this->db->sql_query_limit($sql, $limit, $start);
+
+		$update_users = array();
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$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']))
+			{
+				// Use $CP$ prefix for passwords that need to
+				// be converted and set pass convert to false.
+				$update_users[$user_id] = array(
+					'user_password'		=> '$CP$' . $row['user_password'],
+					'user_pass_convert'	=> 0,
+				);
+			}
+		}
+		$this->db->sql_freeresult($result);
+
+		foreach ($update_users as $user_id => $user_data)
+		{
+			$sql = 'UPDATE ' . $this->table_prefix . 'users
+				SET ' . $this->db->sql_build_array('UPDATE', $user_data) . '
+				WHERE user_id = ' . $user_id;
+			$this->sql_query($sql);
+		}
+
+		if ($converted_users < $limit)
+		{
+			// There are no more users to be converted
+			return;
+		}
+
+		// There are still more users to query, return the next start value
+		return $start + $limit;
+	}
+}
diff --git a/phpBB/phpbb/db/migration/data/v310/passwords_convert_p2.php b/phpBB/phpbb/db/migration/data/v310/passwords_convert_p2.php
new file mode 100644
index 0000000000..26a99184a6
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v310/passwords_convert_p2.php
@@ -0,0 +1,49 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\db\migration\data\v310;
+
+class passwords_convert_p2 extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return !$this->db_tools->sql_column_exists($this->table_prefix . 'users', 'user_pass_convert');
+	}
+
+	static public function depends_on()
+	{
+		return array('\phpbb\db\migration\data\v310\passwords_convert_p1');
+	}
+
+	public function update_schema()
+	{
+		return array(
+			'drop_columns'		=> array(
+				$this->table_prefix . 'users'		=> array(
+					'user_pass_convert',
+				),
+			),
+		);
+	}
+
+	public function revert_schema()
+	{
+		return array(
+			'add_columns'		=> array(
+				$this->table_prefix . 'users'		=> array(
+					'user_pass_convert'	=> array('BOOL', 0, 'after' => 'user_passchg'),
+				),
+			),
+		);
+	}
+}
diff --git a/phpBB/phpbb/db/migrator.php b/phpBB/phpbb/db/migrator.php
index 9b9532a7ad..5255c73c1c 100644
--- a/phpBB/phpbb/db/migrator.php
+++ b/phpBB/phpbb/db/migrator.php
@@ -714,7 +714,7 @@ class migrator
 	/**
 	* Load migration data files from a directory
 	*
-	* @param \phpbb\extension\finder $finder
+	* @param \phpbb\finder $finder
 	* @param string $path Path to migration data files
 	* @param bool $check_fulfillable If TRUE (default), we will check
 	* 	if all of the migrations are fulfillable after loading them.
@@ -723,7 +723,7 @@ class migrator
 	* 	with the last call to prevent throwing errors unnecessarily).
 	* @return array Array of migration names
 	*/
-	public function load_migrations(\phpbb\extension\finder $finder, $path, $check_fulfillable = true)
+	public function load_migrations(\phpbb\finder $finder, $path, $check_fulfillable = true)
 	{
 		if (!is_dir($path))
 		{