Skip to content
Snippets Groups Projects
Commit fd3abc4f authored by André Noack's avatar André Noack
Browse files

Resolve #5092 "Verloren gegangene Änderungen ais Login/Logout"

Closes #5092

Merge request studip/studip!3807
parent 8d0530e7
No related branches found
No related tags found
No related merge requests found
......@@ -49,7 +49,7 @@ class LoginController extends AuthenticatedController
foreach (array_keys($GLOBALS['INSTALLED_LANGUAGES']) as $language_key) {
if (Request::submitted('set_language_' . $language_key)) {
if (Request::get('set_language') === $language_key) {
$_SESSION['forced_language'] = $language_key;
$_SESSION['_language'] = $language_key;
init_i18n($_SESSION['_language']);
......@@ -60,7 +60,8 @@ class LoginController extends AuthenticatedController
}
}
if (Request::isPost()) {
if (Request::submitted('Login')) {
CSRFProtection::verifyUnsafeRequest();
$check_auth = StudipAuthAbstract::CheckAuthentication(
......
......@@ -18,15 +18,25 @@ class LogoutController extends AuthenticatedController
public function index_action()
{
if (
!Request::isPost()
&& !(
isset($_SESSION['logout_ticket'])
&& check_ticket($_SESSION['logout_ticket'])
)
) {
$this->redirect(URLHelper::getURL('dispatch.php/start'));
return;
}
if ($GLOBALS['user']->id !== 'nobody') {
$my_messaging_settings = $GLOBALS['user']->cfg->MESSAGING_SETTINGS;
//Wenn Option dafuer gewaehlt, alle ungelsesenen Nachrichten als gelesen speichern
if ($my_messaging_settings["logout_markreaded"]) {
if (!empty($my_messaging_settings['logout_markreaded'])) {
Message::markAllAs();
}
$logout_user = $GLOBALS['user']->id;
$_language = $_SESSION['_language'];
$contrast = UserConfig::get($GLOBALS['user']->id)->USER_HIGH_CONTRAST;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment