mirror of
https://github.com/e107inc/e107.git
synced 2025-08-04 21:57:51 +02:00
with continue on second auth there was no invalid login CLOSES #4860 CLOSES #3983
This commit is contained in:
@@ -117,9 +117,9 @@ class userlogin
|
|||||||
$authMethod[0] = varset($pref['auth_method'], 'e107'); // Primary authentication method
|
$authMethod[0] = varset($pref['auth_method'], 'e107'); // Primary authentication method
|
||||||
$authMethod[1] = varset($pref['auth_method2'], 'none'); // Secondary authentication method (if defined)
|
$authMethod[1] = varset($pref['auth_method2'], 'none'); // Secondary authentication method (if defined)
|
||||||
$result = false;
|
$result = false;
|
||||||
foreach ($authMethod as $method)
|
foreach ($authMethod as $key => $method)
|
||||||
{
|
{
|
||||||
if ($method == 'e107' OR $method == 'e107db')
|
if ($method == 'e107')
|
||||||
{
|
{
|
||||||
if ($this->lookupUser($username, $forceLogin))
|
if ($this->lookupUser($username, $forceLogin))
|
||||||
{
|
{
|
||||||
@@ -161,6 +161,9 @@ class userlogin
|
|||||||
$authorized = true;
|
$authorized = true;
|
||||||
break;
|
break;
|
||||||
case LOGIN_TRY_OTHER:
|
case LOGIN_TRY_OTHER:
|
||||||
|
if ($key === array_key_last($authMethod)) {
|
||||||
|
return $this->invalidLogin($username,LOGIN_ABORT);
|
||||||
|
}
|
||||||
continue 2;
|
continue 2;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user