diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-10-14 03:55:23 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-10-14 03:55:23 +0200 |
| commit | 3100b9bb7cba6707483c411c086c112af781f8b9 (patch) | |
| tree | 9a39f2a9fdbab60e67fe14ee4b47ffdd8c7427e4 /phpBB/includes/auth | |
| parent | d16b160d5ce96813ea8c249382175b364643be0c (diff) | |
| parent | 768932a3f2c3218925d564ebfdfca902fc2922e1 (diff) | |
| download | forums-3100b9bb7cba6707483c411c086c112af781f8b9.tar forums-3100b9bb7cba6707483c411c086c112af781f8b9.tar.gz forums-3100b9bb7cba6707483c411c086c112af781f8b9.tar.bz2 forums-3100b9bb7cba6707483c411c086c112af781f8b9.tar.xz forums-3100b9bb7cba6707483c411c086c112af781f8b9.zip | |
Merge remote-tracking branch 'naderman/ticket/10212' into develop-olympus
* naderman/ticket/10212:
[ticket/10212] Return a CAPTCHA on incorrect username for ip limited users too
Diffstat (limited to 'phpBB/includes/auth')
| -rw-r--r-- | phpBB/includes/auth/auth_db.php | 11 |
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 +?> |