Fix bug with 2-factor auth not logging in
This commit is contained in:
parent
1a11f365f8
commit
94df144321
BIN
database.mwb
BIN
database.mwb
Binary file not shown.
@ -6,6 +6,7 @@ require_once __DIR__ . "/lib/login.php";
|
|||||||
// If we're logged in, we don't need to be here.
|
// If we're logged in, we don't need to be here.
|
||||||
if ($_SESSION['loggedin'] && !is_empty($_SESSION['password'])) {
|
if ($_SESSION['loggedin'] && !is_empty($_SESSION['password'])) {
|
||||||
header('Location: home.php');
|
header('Location: home.php');
|
||||||
|
die();
|
||||||
// This branch will likely run if the user signed in from a different app.
|
// This branch will likely run if the user signed in from a different app.
|
||||||
} else if ($_SESSION['loggedin'] && is_empty($_SESSION['password'])) {
|
} else if ($_SESSION['loggedin'] && is_empty($_SESSION['password'])) {
|
||||||
$alert = lang("sign in again", false);
|
$alert = lang("sign in again", false);
|
||||||
@ -54,6 +55,7 @@ if ($VARS['progress'] == "1") {
|
|||||||
$_SESSION['passok'] = true; // stop logins using only username and authcode
|
$_SESSION['passok'] = true; // stop logins using only username and authcode
|
||||||
if (userHasTOTP($VARS['username'])) {
|
if (userHasTOTP($VARS['username'])) {
|
||||||
$multiauth = true;
|
$multiauth = true;
|
||||||
|
$_SESSION['password'] = $VARS['password'];
|
||||||
} else {
|
} else {
|
||||||
doLoginUser($VARS['username'], $VARS['password']);
|
doLoginUser($VARS['username'], $VARS['password']);
|
||||||
insertAuthLog(1, $_SESSION['uid']);
|
insertAuthLog(1, $_SESSION['uid']);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user