Bugfixes
parent
4625321079
commit
9cb7812144
|
@ -46,7 +46,7 @@ try {
|
||||||
if ($twoFactorAuth->verify($pending2FA['user_id'], $code)) {
|
if ($twoFactorAuth->verify($pending2FA['user_id'], $code)) {
|
||||||
// Complete login
|
// Complete login
|
||||||
handleSuccessfulLogin($pending2FA['user_id'], $pending2FA['username'],
|
handleSuccessfulLogin($pending2FA['user_id'], $pending2FA['username'],
|
||||||
$pending2FA['remember_me'], $config, $logObject, $user_IP);
|
$pending2FA['remember_me'], $config, $app_root, $logObject, $user_IP);
|
||||||
|
|
||||||
// Clean up 2FA session data
|
// Clean up 2FA session data
|
||||||
Session::clear2FAPending();
|
Session::clear2FAPending();
|
||||||
|
@ -243,7 +243,7 @@ try {
|
||||||
case 'success':
|
case 'success':
|
||||||
// Complete login
|
// Complete login
|
||||||
handleSuccessfulLogin($loginResult['user_id'], $loginResult['username'],
|
handleSuccessfulLogin($loginResult['user_id'], $loginResult['username'],
|
||||||
isset($formData['remember_me']), $config, $logObject, $user_IP);
|
isset($formData['remember_me']), $config, $app_root, $logObject, $user_IP);
|
||||||
exit();
|
exit();
|
||||||
|
|
||||||
default:
|
default:
|
||||||
|
@ -280,7 +280,7 @@ include '../app/templates/form-login.php';
|
||||||
/**
|
/**
|
||||||
* Handle successful login by setting up session and cookies
|
* Handle successful login by setting up session and cookies
|
||||||
*/
|
*/
|
||||||
function handleSuccessfulLogin($userId, $username, $rememberMe, $config, $logObject, $userIP) {
|
function handleSuccessfulLogin($userId, $username, $rememberMe, $config, $app_root, $logObject, $userIP) {
|
||||||
// Create authenticated session
|
// Create authenticated session
|
||||||
Session::createAuthSession($userId, $username, $rememberMe, $config);
|
Session::createAuthSession($userId, $username, $rememberMe, $config);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue