aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/auth/auth_db.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-06-07 11:34:01 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-06-07 11:34:01 +0000
commita539fca62b10f53a5f5dadf07f9ab07340fdabf9 (patch)
tree28f4ab59d1564aefd30709748ce245f993be5f7c /phpBB/includes/auth/auth_db.php
parent711f482cb62070ab2340aa27c736a85cc6e8c518 (diff)
downloadforums-a539fca62b10f53a5f5dadf07f9ab07340fdabf9.tar
forums-a539fca62b10f53a5f5dadf07f9ab07340fdabf9.tar.gz
forums-a539fca62b10f53a5f5dadf07f9ab07340fdabf9.tar.bz2
forums-a539fca62b10f53a5f5dadf07f9ab07340fdabf9.tar.xz
forums-a539fca62b10f53a5f5dadf07f9ab07340fdabf9.zip
some corrections, only very minor things.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9554 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/auth/auth_db.php')
-rw-r--r--phpBB/includes/auth/auth_db.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/auth/auth_db.php b/phpBB/includes/auth/auth_db.php
index bdafefa70b..f798264ada 100644
--- a/phpBB/includes/auth/auth_db.php
+++ b/phpBB/includes/auth/auth_db.php
@@ -68,7 +68,6 @@ function login_db(&$username, &$password)
if ($config['max_login_attempts'] && $row['user_login_attempts'] >= $config['max_login_attempts'])
{
$confirm_id = request_var('confirm_id', '');
- $confirm_code = request_var('confirm_code', '');
// Visual Confirmation handling
if (!$confirm_id)
@@ -84,12 +83,13 @@ function login_db(&$username, &$password)
$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,
+ 'status' => LOGIN_ERROR_ATTEMPTS,
+ 'error_msg' => 'LOGIN_ERROR_ATTEMPTS',
+ 'user_row' => $row,
);
}
}
@@ -130,7 +130,7 @@ function login_db(&$username, &$password)
$row['user_pass_convert'] = 0;
$row['user_password'] = $hash;
}
- else
+ else
{
// Although we weren't able to convert this password we have to
// increase login attempt count to make sure this cannot be exploited