aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2011-10-14 03:41:52 +0200
committerNils Adermann <naderman@naderman.de>2011-10-14 03:41:52 +0200
commit768932a3f2c3218925d564ebfdfca902fc2922e1 (patch)
tree9a39f2a9fdbab60e67fe14ee4b47ffdd8c7427e4 /phpBB/includes
parentd16b160d5ce96813ea8c249382175b364643be0c (diff)
downloadforums-768932a3f2c3218925d564ebfdfca902fc2922e1.tar
forums-768932a3f2c3218925d564ebfdfca902fc2922e1.tar.gz
forums-768932a3f2c3218925d564ebfdfca902fc2922e1.tar.bz2
forums-768932a3f2c3218925d564ebfdfca902fc2922e1.tar.xz
forums-768932a3f2c3218925d564ebfdfca902fc2922e1.zip
[ticket/10212] Return a CAPTCHA on incorrect username for ip limited users too
PHPBB3-10212
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/auth/auth_db.php11
1 files changed, 10 insertions, 1 deletions
diff --git a/phpBB/includes/auth/auth_db.php b/phpBB/includes/auth/auth_db.php
index 6ca69d9174..c20196d019 100644
--- a/phpBB/includes/auth/auth_db.php
+++ b/phpBB/includes/auth/auth_db.php
@@ -107,6 +107,15 @@ function login_db($username, $password, $ip = '', $browser = '', $forwarded_for
if (!$row)
{
+ if ($config['ip_login_limit_max'] && $attempts >= $config['ip_login_limit_max'])
+ {
+ return array(
+ 'status' => LOGIN_ERROR_ATTEMPTS,
+ 'error_msg' => 'LOGIN_ERROR_ATTEMPTS',
+ 'user_row' => array('user_id' => ANONYMOUS),
+ );
+ }
+
return array(
'status' => LOGIN_ERROR_USERNAME,
'error_msg' => 'LOGIN_ERROR_USERNAME',
@@ -264,4 +273,4 @@ function login_db($username, $password, $ip = '', $browser = '', $forwarded_for
);
}
-?> \ No newline at end of file
+?>