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

Resolve #3647 "Login: Eingabeformular wird nicht angezeigt, obwohl es der primäre Login ist"

Closes #3647

Merge request studip/studip!2528
parent 00000b28
No related branches found
No related tags found
No related merge requests found
...@@ -23,7 +23,8 @@ if (!match_route('web_migrate.php')) { ...@@ -23,7 +23,8 @@ if (!match_route('web_migrate.php')) {
$bg_desktop = URLHelper::getURL('pictures/loginbackgrounds/1.jpg'); $bg_desktop = URLHelper::getURL('pictures/loginbackgrounds/1.jpg');
$bg_mobile = URLHelper::getURL('pictures/loginbackgrounds/2.jpg'); $bg_mobile = URLHelper::getURL('pictures/loginbackgrounds/2.jpg');
} }
$show_hidden_login = false; $show_login = !(current(StudipAuthAbstract::getInstance()) instanceOf StudipAuthSSO) && StudipAuthAbstract::isLoginEnabled();
$show_hidden_login = !$show_login && StudipAuthAbstract::isLoginEnabled();
?> ?>
<main id="content" class="loginpage"> <main id="content" class="loginpage">
<div id="background-desktop" style="background: url(<?= $bg_desktop ?>) no-repeat top left/cover;"></div> <div id="background-desktop" style="background: url(<?= $bg_desktop ?>) no-repeat top left/cover;"></div>
...@@ -48,7 +49,7 @@ $show_hidden_login = false; ...@@ -48,7 +49,7 @@ $show_hidden_login = false;
<h1><?= htmlReady(Config::get()->UNI_NAME_CLEAN) ?></h1> <h1><?= htmlReady(Config::get()->UNI_NAME_CLEAN) ?></h1>
</header> </header>
<? if (count($GLOBALS['STUDIP_AUTH_PLUGIN']) === 1 && StudipAuthAbstract::isLoginEnabled()) : ?> <? if ($show_login) : ?>
<?= $this->render_partial('_standard_loginform', [ <?= $this->render_partial('_standard_loginform', [
'hidden' => false, 'hidden' => false,
]) ?> ]) ?>
...@@ -57,14 +58,7 @@ $show_hidden_login = false; ...@@ -57,14 +58,7 @@ $show_hidden_login = false;
<ul> <ul>
<? foreach (Navigation::getItem('/login') as $key => $nav) : ?> <? foreach (Navigation::getItem('/login') as $key => $nav) : ?>
<? if ($nav->isVisible()) : ?> <? if ($nav->isVisible()) : ?>
<? if ($key === 'standard_login') { <? if ($key === 'standard_login' && $show_login) continue; ?>
if (count($GLOBALS['STUDIP_AUTH_PLUGIN']) === 1 && StudipAuthAbstract::isLoginEnabled()) {
continue;
} else {
$show_hidden_login = true;
}
}
?>
<? $name_and_title = explode(' - ', $nav->getTitle()) ?> <? $name_and_title = explode(' - ', $nav->getTitle()) ?>
<li class="login_link"> <li class="login_link">
<? if (is_internal_url($url = $nav->getURL())) : ?> <? if (is_internal_url($url = $nav->getURL())) : ?>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment