diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-10-13 16:09:55 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-10-13 16:09:55 +0200 |
| commit | e674313559c0aa4705923fd79312ef14117abb9b (patch) | |
| tree | 770e8f5b1d4ffb9ad1137b30c760c84f26f69dc4 /phpBB/includes/functions.php | |
| parent | 0f64843ac82ad49e02392459e62fdc1c5e92477c (diff) | |
| download | forums-e674313559c0aa4705923fd79312ef14117abb9b.tar forums-e674313559c0aa4705923fd79312ef14117abb9b.tar.gz forums-e674313559c0aa4705923fd79312ef14117abb9b.tar.bz2 forums-e674313559c0aa4705923fd79312ef14117abb9b.tar.xz forums-e674313559c0aa4705923fd79312ef14117abb9b.zip | |
[feature/passwords] Use passwords.manager service in login_forum_box()
Additionally, unused variables have been removed from the globals and
the request class is now used instead of the request_var() function.
PHPBB3-11610
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 561ebaabb4..0a2dcc8b25 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3310,9 +3310,9 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa */ function login_forum_box($forum_data) { - global $db, $config, $user, $template, $phpEx; + global $db, $phpbb_container, $request, $template, $user; - $password = request_var('password', '', true); + $password = $request->variable('password', '', true); $sql = 'SELECT forum_id FROM ' . FORUMS_ACCESS_TABLE . ' @@ -3353,7 +3353,9 @@ function login_forum_box($forum_data) } $db->sql_freeresult($result); - if (phpbb_check_hash($password, $forum_data['forum_password'])) + $passwords_manager = $phpbb_container->get('passwords.manager'); + + if ($passwords_manager->check($password, $forum_data['forum_password'])) { $sql_ary = array( 'forum_id' => (int) $forum_data['forum_id'], |