diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-05-30 23:00:57 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-06-01 21:31:05 +0200 |
| commit | 4698f6928e44a24a7a10ff8b4fed2c1a24cab338 (patch) | |
| tree | edc7bba181871a9a87718a5e0662eaa3b0ccd4b6 | |
| parent | 0a1e21c17fe6181d3826ff88c86e4d040aff447f (diff) | |
| download | forums-4698f6928e44a24a7a10ff8b4fed2c1a24cab338.tar forums-4698f6928e44a24a7a10ff8b4fed2c1a24cab338.tar.gz forums-4698f6928e44a24a7a10ff8b4fed2c1a24cab338.tar.bz2 forums-4698f6928e44a24a7a10ff8b4fed2c1a24cab338.tar.xz forums-4698f6928e44a24a7a10ff8b4fed2c1a24cab338.zip | |
[ticket/12352] Remove usages of user_pass_convert column
PHPBB3-12352
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_user.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_activate.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/auth/provider/db.php | 5 | ||||
| -rw-r--r-- | phpBB/phpbb/auth/provider/oauth/oauth.php | 2 | ||||
| -rw-r--r-- | tests/auth/fixtures/user.xml | 3 | ||||
| -rw-r--r-- | tests/auth/fixtures/user_533.xml | 3 | ||||
| -rw-r--r-- | tests/auth/provider_apache_test.php | 1 | ||||
| -rw-r--r-- | tests/auth/provider_db_test.php | 1 |
9 files changed, 3 insertions, 15 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index b653ddd13b..c25d6d36d1 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/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); diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 3dcb32350e..293a0dea52 100644 --- a/phpBB/includes/functions_user.php +++ b/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'], diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php index 06326e57e6..53dec89aad 100644 --- a/phpBB/includes/ucp/ucp_activate.php +++ b/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, ); diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php index 7307a697ae..142a47247f 100644 --- a/phpBB/phpbb/auth/provider/db.php +++ b/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) . "', - user_pass_convert = 0 + SET user_password = '" . $this->db->sql_escape($hash) . "' WHERE user_id = {$row['user_id']}"; $this->db->sql_query($sql); diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php index 2230ce15d1..07430bb42a 100644 --- a/phpBB/phpbb/auth/provider/oauth/oauth.php +++ b/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); diff --git a/tests/auth/fixtures/user.xml b/tests/auth/fixtures/user.xml index 77f707bab3..1e0eb6ee49 100644 --- a/tests/auth/fixtures/user.xml +++ b/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> diff --git a/tests/auth/fixtures/user_533.xml b/tests/auth/fixtures/user_533.xml index b64f376e5b..9731e4db4a 100644 --- a/tests/auth/fixtures/user_533.xml +++ b/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> diff --git a/tests/auth/provider_apache_test.php b/tests/auth/provider_apache_test.php index e17040902f..2decf0f18c 100644 --- a/tests/auth/provider_apache_test.php +++ b/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' => '', diff --git a/tests/auth/provider_db_test.php b/tests/auth/provider_db_test.php index f071709a4b..23324f87f2 100644 --- a/tests/auth/provider_db_test.php +++ b/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', |