diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-08-26 18:50:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-26 18:50:52 +0200 |
| commit | 0b652648cc698d3b5c2979ccb7f1d1544057294d (patch) | |
| tree | 43e49602aee82520f57690bb952510b99466782d /core | |
| parent | 2966b503ba9eac0ff1becdeb014cf8ecc0b3660a (diff) | |
| parent | 2e4cd445564ba4882ab239bbfd82b6aa800436e3 (diff) | |
| download | nextcloud-server-0b652648cc698d3b5c2979ccb7f1d1544057294d.tar.gz nextcloud-server-0b652648cc698d3b5c2979ccb7f1d1544057294d.zip | |
Merge pull request #6177 from nextcloud/properly-add-slo-url
Properly allow \OCP\Authentication\IApacheBackend to specify logout URL
Diffstat (limited to 'core')
| -rw-r--r-- | core/Controller/TwoFactorChallengeController.php | 8 | ||||
| -rw-r--r-- | core/templates/twofactorselectchallenge.php | 2 | ||||
| -rw-r--r-- | core/templates/twofactorshowchallenge.php | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/core/Controller/TwoFactorChallengeController.php b/core/Controller/TwoFactorChallengeController.php index 9c22da8ae09..50d63b07403 100644 --- a/core/Controller/TwoFactorChallengeController.php +++ b/core/Controller/TwoFactorChallengeController.php @@ -71,8 +71,8 @@ class TwoFactorChallengeController extends Controller { /** * @return string */ - protected function getLogoutAttribute() { - return OC_User::getLogoutAttribute(); + protected function getLogoutUrl() { + return OC_User::getLogoutUrl($this->urlGenerator); } /** @@ -91,7 +91,7 @@ class TwoFactorChallengeController extends Controller { 'providers' => $providers, 'backupProvider' => $backupProvider, 'redirect_url' => $redirect_url, - 'logout_attribute' => $this->getLogoutAttribute(), + 'logout_url' => $this->getLogoutUrl(), ]; return new TemplateResponse($this->appName, 'twofactorselectchallenge', $data, 'guest'); } @@ -133,7 +133,7 @@ class TwoFactorChallengeController extends Controller { 'error_message' => $errorMessage, 'provider' => $provider, 'backupProvider' => $backupProvider, - 'logout_attribute' => $this->getLogoutAttribute(), + 'logout_url' => $this->getLogoutUrl(), 'redirect_url' => $redirect_url, 'template' => $tmpl->fetchPage(), ]; diff --git a/core/templates/twofactorselectchallenge.php b/core/templates/twofactorselectchallenge.php index 431f4c78c22..a1e626567e7 100644 --- a/core/templates/twofactorselectchallenge.php +++ b/core/templates/twofactorselectchallenge.php @@ -19,7 +19,7 @@ </ul> </p> <p class="two-factor-link"> - <a class="button" <?php print_unescaped($_['logout_attribute']); ?>><?php p($l->t('Cancel log in')) ?></a> + <a class="button" href="<?php print_unescaped($_['logout_url']); ?>"><?php p($l->t('Cancel log in')) ?></a> <?php if (!is_null($_['backupProvider'])): ?> <a class="button" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge', [ diff --git a/core/templates/twofactorshowchallenge.php b/core/templates/twofactorshowchallenge.php index ec760ead7c7..fbfeeb4255a 100644 --- a/core/templates/twofactorshowchallenge.php +++ b/core/templates/twofactorshowchallenge.php @@ -22,7 +22,7 @@ $template = $_['template']; <?php endif; ?> <?php print_unescaped($template); ?> <p class="two-factor-link"> - <a class="button" <?php print_unescaped($_['logout_attribute']); ?>><?php p($l->t('Cancel log in')) ?></a> + <a class="button" href="<?php print_unescaped($_['logout_url']); ?>"><?php p($l->t('Cancel log in')) ?></a> <?php if (!is_null($_['backupProvider'])): ?> <a class="button" href="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.TwoFactorChallenge.showChallenge', [ |