makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/10212] Return a CAPTCHA on incorrect username for ip limited users too

Conflicts:
	phpBB/includes/auth/auth_db.php
This commit is contained in:
Igor Wiedler 2011-10-14 03:56:55 +02:00
commit 14636f61d5
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
phpBB/includes/auth/auth_db.php
View file

@ -108,6 +108,15 @@ function login_db($username, $password, $ip = '', $browser = '', $forwarded_for
if (!$row) 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( return array(
'status' => LOGIN_ERROR_USERNAME, 'status' => LOGIN_ERROR_USERNAME,
'error_msg' => 'LOGIN_ERROR_USERNAME', 'error_msg' => 'LOGIN_ERROR_USERNAME',