Skip to content

Commit 146435d

Browse files
Daniel GoerzNeoBlack
authored andcommitted
[BUGFIX] FeLogin: FlexForm is misleading
The option showLogoutFormAfterLogin in the FeLogin FlexForm actually disables all redirect configuration on login. This patch reflects that behavior by adjusting its label to better describe what it actually does. Since the redirect is turned off if showLogoutFormAfterLogin is set the FrontendLoginController is also prevented from gathering redirect URLs in the first place. Change-Id: I0be9d166e67dd055d6057e841d9fd5509ed1e8a7 Resolves: #67115 Releases: master Reviewed-on: http://review.typo3.org/39671 Reviewed-by: Markus Klein <markus.klein@typo3.org> Tested-by: Markus Klein <markus.klein@typo3.org> Reviewed-by: Frank Nägler <typo3@naegler.net> Tested-by: Frank Nägler <typo3@naegler.net>
1 parent a53fb85 commit 146435d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public function main($content, $conf) {
159159
// Is user logged in?
160160
$this->userIsLoggedIn = $this->frontendController->loginUser;
161161
// Redirect
162-
if ($this->conf['redirectMode'] && !$this->conf['redirectDisable'] && !$this->noRedirect) {
162+
if ($this->conf['redirectMode'] && !$this->conf['redirectDisable'] && !$this->noRedirect && !$this->conf['showLogoutFormAfterLogin']) {
163163
$redirectUrl = $this->processRedirect();
164164
if (count($redirectUrl)) {
165165
$this->redirectUrl = $this->conf['redirectFirstMethod'] ? array_shift($redirectUrl) : array_pop($redirectUrl);

typo3/sysext/felogin/locallang_db.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<source>Display Remember Login Option</source>
7777
</trans-unit>
7878
<trans-unit id="tt_content.pi_flexform.show_logoutFormAfterLogin">
79-
<source>Display Logout Form After Successful Login</source>
79+
<source>Disable redirect after successful login, but display logout-form</source>
8080
</trans-unit>
8181
<trans-unit id="tt_content.pi_flexform.groupSelectmode">
8282
<source>FE group select mode:</source>

0 commit comments

Comments
 (0)