diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-10-14 03:56:55 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-10-14 03:56:55 +0200 |
| commit | 14636f61d5e6d66927f2c9a024dcf2b18bba5a21 (patch) | |
| tree | 43ab8c6afa5375ea8f960851566aeb196f780110 | |
| parent | d68b815690e26d4327f306c84a21c60885ec7074 (diff) | |
| parent | 3100b9bb7cba6707483c411c086c112af781f8b9 (diff) | |
| download | forums-14636f61d5e6d66927f2c9a024dcf2b18bba5a21.tar forums-14636f61d5e6d66927f2c9a024dcf2b18bba5a21.tar.gz forums-14636f61d5e6d66927f2c9a024dcf2b18bba5a21.tar.bz2 forums-14636f61d5e6d66927f2c9a024dcf2b18bba5a21.tar.xz forums-14636f61d5e6d66927f2c9a024dcf2b18bba5a21.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10212] Return a CAPTCHA on incorrect username for ip limited users too
Conflicts:
phpBB/includes/auth/auth_db.php
| -rw-r--r-- | phpBB/includes/auth/auth_db.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/phpBB/includes/auth/auth_db.php b/phpBB/includes/auth/auth_db.php index a2ff9b4047..2e0031e4cf 100644 --- a/phpBB/includes/auth/auth_db.php +++ b/phpBB/includes/auth/auth_db.php @@ -108,6 +108,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', |