[ticket/12352] Remove usages of user_pass_convert column

PHPBB3-12352

phpBB/includes/acp/acp_users.php

@@ -922,7 +922,6 @@ class acp_users
 							$sql_ary += array(
 								'user_password'		=> $passwords_manager->hash($data['new_password']),
 								'user_passchg'		=> time(),
-								'user_pass_convert'	=> 0,
 							);
 
 							$user->reset_login_keys($user_id);

phpBB/includes/functions_user.php

@@ -184,7 +184,6 @@ function user_add($user_row, $cp_data = false)
 		'username'			=> $user_row['username'],
 		'username_clean'	=> $username_clean,
 		'user_password'		=> (isset($user_row['user_password'])) ? $user_row['user_password'] : '',
-		'user_pass_convert'	=> 0,
 		'user_email'		=> strtolower($user_row['user_email']),
 		'user_email_hash'	=> phpbb_email_hash($user_row['user_email']),
 		'group_id'			=> $user_row['group_id'],

phpBB/includes/ucp/ucp_activate.php

@@ -78,7 +78,6 @@ class ucp_activate
 				'user_actkey'		=> '',
 				'user_password'		=> $user_row['user_newpasswd'],
 				'user_newpasswd'	=> '',
-				'user_pass_convert'	=> 0,
 				'user_login_attempts'	=> 0,
 			);
 

phpBB/phpbb/auth/provider/db.php

@@ -78,7 +78,7 @@ class db extends \phpbb\auth\provider\base
 
 		$username_clean = utf8_clean_string($username);
 
-		$sql = 'SELECT user_id, username, user_password, user_passchg, user_pass_convert, user_email, user_type, user_login_attempts
+		$sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type, user_login_attempts
 			FROM ' . USERS_TABLE . "
 			WHERE username_clean = '" . $this->db->sql_escape($username_clean) . "'";
 		$result = $this->db->sql_query($sql);
@@ -180,8 +180,7 @@ class db extends \phpbb\auth\provider\base
 
 				// Update the password in the users table to the new format
 				$sql = 'UPDATE ' . USERS_TABLE . "
-					SET user_password = '" . $this->db->sql_escape($hash) . "',
+					SET user_password = '" . $this->db->sql_escape($hash) . "'
-						user_pass_convert = 0
 					WHERE user_id = {$row['user_id']}";
 				$this->db->sql_query($sql);
 

phpBB/phpbb/auth/provider/oauth/oauth.php

@@ -215,7 +215,7 @@ class oauth extends \phpbb\auth\provider\base
 			}
 
 			// Retrieve the user's account
-			$sql = 'SELECT user_id, username, user_password, user_passchg, user_pass_convert, user_email, user_type, user_login_attempts
+			$sql = 'SELECT user_id, username, user_password, user_passchg, user_email, user_type, user_login_attempts
 				FROM ' . $this->users_table . '
 					WHERE user_id = ' . (int) $row['user_id'];
 			$result = $this->db->sql_query($sql);

tests/auth/fixtures/user.xml

@@ -6,7 +6,6 @@
 		<column>username_clean</column>
 		<column>user_password</column>
 		<column>user_passchg</column>
-		<column>user_pass_convert</column>
 		<column>user_email</column>
 		<column>user_type</column>
 		<column>user_login_attempts</column>
@@ -18,7 +17,6 @@
 			<value>foobar</value>
 			<value>$2y$10$4RmpyVu2y8Yf/lP3.yQBquKvE54TCUuEDEBJYY6FDDFN3LcbCGz9i</value>
 			<value>0</value>
-			<value>0</value>
 			<value>example@example.com</value>
 			<value>0</value>
 			<value>0</value>
@@ -31,7 +29,6 @@
 			<value>foobar2</value>
 			<value>$H$9E45lK6J8nLTSm9oJE5aNCSTFK9wqa/</value>
 			<value>0</value>
-			<value>0</value>
 			<value>example@example.com</value>
 			<value>0</value>
 			<value>0</value>

tests/auth/fixtures/user_533.xml

@@ -6,7 +6,6 @@
 		<column>username_clean</column>
 		<column>user_password</column>
 		<column>user_passchg</column>
-		<column>user_pass_convert</column>
 		<column>user_email</column>
 		<column>user_type</column>
 		<column>user_login_attempts</column>
@@ -18,7 +17,6 @@
 			<value>foobar</value>
 			<value>$2a$10$e01Syh9PbJjUkio66eFuUu4FhCE2nRgG7QPc1JACalsPXcIuG2bbi</value>
 			<value>0</value>
-			<value>0</value>
 			<value>example@example.com</value>
 			<value>0</value>
 			<value>0</value>
@@ -31,7 +29,6 @@
 			<value>foobar2</value>
 			<value>$H$9E45lK6J8nLTSm9oJE5aNCSTFK9wqa/</value>
 			<value>0</value>
-			<value>0</value>
 			<value>example@example.com</value>
 			<value>0</value>
 			<value>0</value>

tests/auth/provider_apache_test.php

@@ -148,7 +148,6 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case
 			'username_clean' => 'foobar',
 			'user_password' => $this->password_hash,
 			'user_passchg' => '0',
-			'user_pass_convert' => '0',
 			'user_email' => 'example@example.com',
 			'user_email_hash' => '0',
 			'user_birthday' => '',

tests/auth/provider_db_test.php

@@ -70,7 +70,6 @@ class phpbb_auth_provider_db_test extends phpbb_database_test_case
 				'username' 				=> 'foobar',
 				'user_password'			=> $password_hash,
 				'user_passchg' 			=> '0',
-				'user_pass_convert' 	=> '0',
 				'user_email' 			=> 'example@example.com',
 				'user_type' 			=> '0',
 				'user_login_attempts' 	=> '0',