Fixed bug #14131: Styling of cookie warning is hardcoded (thanks to Jigal van Hemert)
authorJochen Rau <j.rau@web.de>
Thu, 22 Apr 2010 09:57:25 +0000 (09:57 +0000)
committerJochen Rau <j.rau@web.de>
Thu, 22 Apr 2010 09:57:25 +0000 (09:57 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7425 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/felogin/ext_typoscript_setup.txt
typo3/sysext/felogin/pi1/class.tx_felogin_pi1.php

index e2e584d..cd744dd 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-04-22 Jochen Rau <jochen.rau@typoplanet.de>
 
+       * Fixed bug #14131: Styling of cookie warning is hardcoded (thanks to Jigal van Hemert)
+
+2010-04-22 Jochen Rau <jochen.rau@typoplanet.de>
+
        * Fixed bug #13972: cropHTML uses faulty reg exp for HTML entities (thanks to Ralf Hettinger)
 
 2010-04-22  Ernesto Baschny  <ernst@cron-it.de>
index cbc7979..485cec2 100644 (file)
@@ -73,7 +73,10 @@ plugin.tx_felogin_pi1 {
        changePasswordMessage_stdWrap {
                wrap = <div>|</div>
        }
-       
+
+       cookieWarning_stdWrap {
+               wrap = <p style="color:red; font-weight:bold;">|</p>
+       }
        
        # stdWrap for fe_users fields used in Messages
        userfields {
index f51e7f5..17d3d56 100644 (file)
@@ -126,13 +126,11 @@ class tx_felogin_pi1 extends tslib_pibase {
                                $content .= $this->showLogin();
                        }
                }
-
-
-
+               
                        // Process the redirect
                if (($this->logintype === 'login' || $this->logintype === 'logout') && $this->redirectUrl && !$this->noRedirect) {
                        if (!$GLOBALS['TSFE']->fe_user->cookieId) {
-                               $content .= '<p style="color:red; font-weight:bold;">' . $this->pi_getLL('cookie_warning', '', 1) . '</p>';
+                               $content .= $this->cObj->stdWrap($this->pi_getLL('cookie_warning', '', 1), $this->conf['cookieWarning_stdWrap.']);
                        } else {
                                t3lib_utility_Http::redirect($this->redirectUrl);
                        }