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

Merge branch '3.1.x'

Browse source
This commit is contained in:
Nicofuma 2015-03-24 23:20:03 +01:00
commit 9a5aefd4c2
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
phpBB/includes/functions.php
View file

@ -2793,19 +2793,6 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
// Special cases... determine // Special cases... determine
switch ($result['status']) switch ($result['status'])
{ {
case LOGIN_ERROR_ATTEMPTS:
$captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']);
$captcha->init(CONFIRM_LOGIN);
// $captcha->reset();
$template->assign_vars(array(
'CAPTCHA_TEMPLATE' => $captcha->get_template(),
));
$err = $user->lang[$result['error_msg']];
break;
case LOGIN_ERROR_PASSWORD_CONVERT: case LOGIN_ERROR_PASSWORD_CONVERT:
$err = sprintf( $err = sprintf(
$user->lang[$result['error_msg']], $user->lang[$result['error_msg']],
@ -2816,6 +2803,17 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
); );
break; break;
case LOGIN_ERROR_ATTEMPTS:
$captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']);
$captcha->init(CONFIRM_LOGIN);
// $captcha->reset();
$template->assign_vars(array(
'CAPTCHA_TEMPLATE' => $captcha->get_template(),
));
// no break;
// Username, password, etc... // Username, password, etc...
default: default:
$err = $user->lang[$result['error_msg']]; $err = $user->lang[$result['error_msg']];