mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

Merge pull request #4864 from Jimmi08/patch-2

Browse Source 
Fixes #4860 and correct fix for #3983 - correct second authorization
This commit is contained in:
Cameron
2022-09-29 12:11:16 -07:00
committed by GitHub
parent 0cf5768218 782c416cb4
commit 6af11ec71c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
e107_handlers/login.php
View File

@@ -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;
} }