diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2009-09-15 09:08:37 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2009-09-15 09:08:37 +0000 |
| commit | bf2133d38038504a455a56ad18ddea2a879ad579 (patch) | |
| tree | b123a3d811fb2f4e698d562d2e126da7c85eec9b /phpBB/includes/auth/auth_db.php | |
| parent | cb88671638b016b4454fef121cbe623ed3490638 (diff) | |
| download | forums-bf2133d38038504a455a56ad18ddea2a879ad579.tar forums-bf2133d38038504a455a56ad18ddea2a879ad579.tar.gz forums-bf2133d38038504a455a56ad18ddea2a879ad579.tar.bz2 forums-bf2133d38038504a455a56ad18ddea2a879ad579.tar.xz forums-bf2133d38038504a455a56ad18ddea2a879ad579.zip | |
#51395 - remove legacy captcha code. authorised by: acyd burn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10143 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/auth/auth_db.php')
| -rw-r--r-- | phpBB/includes/auth/auth_db.php | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/phpBB/includes/auth/auth_db.php b/phpBB/includes/auth/auth_db.php index 5dc141ff77..71f8a7c082 100644 --- a/phpBB/includes/auth/auth_db.php +++ b/phpBB/includes/auth/auth_db.php @@ -67,10 +67,12 @@ function login_db(&$username, &$password) // Every auth module is able to define what to do by itself... if ($config['max_login_attempts'] && $row['user_login_attempts'] >= $config['max_login_attempts']) { - $confirm_id = request_var('confirm_id', ''); - // Visual Confirmation handling - if (!$confirm_id) + + $captcha =& phpbb_captcha_factory::get_instance($config['captcha_plugin']); + $captcha->init(CONFIRM_LOGIN); + $vc_response = $captcha->validate(); + if ($vc_response) { return array( 'status' => LOGIN_ERROR_ATTEMPTS, @@ -78,21 +80,7 @@ function login_db(&$username, &$password) 'user_row' => $row, ); } - else - { - $captcha =& phpbb_captcha_factory::get_instance($config['captcha_plugin']); - $captcha->init(CONFIRM_LOGIN); - $vc_response = $captcha->validate(); - - if ($vc_response) - { - return array( - 'status' => LOGIN_ERROR_ATTEMPTS, - 'error_msg' => 'LOGIN_ERROR_ATTEMPTS', - 'user_row' => $row, - ); - } - } + } // If the password convert flag is set we need to convert it |