[BUGFIX] FeLogin: FlexForm is misleading 71/39671/5
authorDaniel Goerz <dlg@lightwerk.com>
Sat, 23 May 2015 08:32:47 +0000 (10:32 +0200)
committerFrank Nägler <typo3@naegler.net>
Fri, 29 May 2015 16:45:01 +0000 (18:45 +0200)
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>
typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
typo3/sysext/felogin/locallang_db.xlf

index b60cd07..5d0f129 100644 (file)
@@ -159,7 +159,7 @@ class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
                // Is user logged in?
                $this->userIsLoggedIn = $this->frontendController->loginUser;
                // Redirect
-               if ($this->conf['redirectMode'] && !$this->conf['redirectDisable'] && !$this->noRedirect) {
+               if ($this->conf['redirectMode'] && !$this->conf['redirectDisable'] && !$this->noRedirect && !$this->conf['showLogoutFormAfterLogin']) {
                        $redirectUrl = $this->processRedirect();
                        if (count($redirectUrl)) {
                                $this->redirectUrl = $this->conf['redirectFirstMethod'] ? array_shift($redirectUrl) : array_pop($redirectUrl);
index 087643e..4487076 100644 (file)
@@ -76,7 +76,7 @@
                                <source>Display Remember Login Option</source>
                        </trans-unit>
                        <trans-unit id="tt_content.pi_flexform.show_logoutFormAfterLogin">
-                               <source>Display Logout Form After Successful Login</source>
+                               <source>Disable redirect after successful login, but display logout-form</source>
                        </trans-unit>
                        <trans-unit id="tt_content.pi_flexform.groupSelectmode">
                                <source>FE group select mode:</source>