🐛 Fix access to change password page

🎨 Code cleanup
This commit is contained in:
Eric
2019-10-15 11:43:47 +02:00
parent 75794fb4d9
commit ed9259df9e

View File

@@ -1015,22 +1015,6 @@ class LoginWebPage extends NiceWebPage
$sMessage = ''; // most of the operations never return, but some can return a message to be displayed $sMessage = ''; // most of the operations never return, but some can return a message to be displayed
if ($operation == 'logoff') if ($operation == 'logoff')
{ {
if (isset($_SESSION['login_mode']))
{
$sLoginMode = $_SESSION['login_mode'];
}
else
{
$aAllowedLoginTypes = MetaModel::GetConfig()->GetAllowedLoginTypes();
if (count($aAllowedLoginTypes) > 0)
{
$sLoginMode = $aAllowedLoginTypes[0];
}
else
{
$sLoginMode = 'form';
}
}
self::ResetSession(); self::ResetSession();
$oPage = self::NewLoginWebPage(); $oPage = self::NewLoginWebPage();
$oPage->DisplayLoginForm(false /* not a failed attempt */); $oPage->DisplayLoginForm(false /* not a failed attempt */);
@@ -1066,6 +1050,8 @@ class LoginWebPage extends NiceWebPage
exit; exit;
} }
else if ($operation == 'change_pwd') else if ($operation == 'change_pwd')
{
if (isset($_SESSION['auth_user']))
{ {
$sAuthUser = $_SESSION['auth_user']; $sAuthUser = $_SESSION['auth_user'];
UserRights::Login($sAuthUser); // Set the user's language UserRights::Login($sAuthUser); // Set the user's language
@@ -1074,7 +1060,10 @@ class LoginWebPage extends NiceWebPage
$oPage->output(); $oPage->output();
exit; exit;
} }
}
if ($operation == 'do_change_pwd') if ($operation == 'do_change_pwd')
{
if (isset($_SESSION['auth_user']))
{ {
$sAuthUser = $_SESSION['auth_user']; $sAuthUser = $_SESSION['auth_user'];
UserRights::Login($sAuthUser); // Set the user's language UserRights::Login($sAuthUser); // Set the user's language
@@ -1089,6 +1078,7 @@ class LoginWebPage extends NiceWebPage
} }
$sMessage = Dict::S('UI:Login:PasswordChanged'); $sMessage = Dict::S('UI:Login:PasswordChanged');
} }
}
return $sMessage; return $sMessage;
} }