Fixed bug #11895: Cookie detection in new t3skin login screen fails for certain cirum...

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5914 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index de47e4c..0d265db 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2009-09-09  Steffen Kamper  <info@sk-typo3.de>
 
 2009-09-09  Steffen Kamper  <info@sk-typo3.de>
 

+       * Fixed bug #11895: Cookie detection in new t3skin login screen fails for certain cirumstances (thanks to Steffen Gebert)

        * renamed t3lib_PageRenderer and the templates for backend/frontend
        * Fixed bug #11908: Wrong labels in Media section in constants of css_styled_content
 
        * renamed t3lib_PageRenderer and the templates for backend/frontend
        * Fixed bug #11908: Wrong labels in Media section in constants of css_styled_content
 

diff --git a/typo3/index.php b/typo3/index.php
index 422203f..9e116e7 100644 (file)
--- a/typo3/index.php
+++ b/typo3/index.php
@@ -320,6 +320,7 @@ class SC_index {
                        'INFO_RELOAD'      => $GLOBALS['LANG']->getLL('info.reset', true),
                        'ERROR_JAVASCRIPT' => $GLOBALS['LANG']->getLL('error.javascript', true),
                        'ERROR_COOKIES'    => $GLOBALS['LANG']->getLL('error.cookies', true),
                        'INFO_RELOAD'      => $GLOBALS['LANG']->getLL('info.reset', true),
                        'ERROR_JAVASCRIPT' => $GLOBALS['LANG']->getLL('error.javascript', true),
                        'ERROR_COOKIES'    => $GLOBALS['LANG']->getLL('error.cookies', true),

+                       'ERROR_COOKIES_IGNORE' => $GLOBALS['LANG']->getLL('error.cookies_ignore', true),

                        'ERROR_CAPSLOCK'   => $GLOBALS['LANG']->getLL('error.capslock', true),
                        'LABEL_DONATELINK' => $GLOBALS['LANG']->getLL('labels.donate', true),
                        'LABEL_USERNAME'   => $GLOBALS['LANG']->getLL('labels.username', true),
                        'ERROR_CAPSLOCK'   => $GLOBALS['LANG']->getLL('error.capslock', true),
                        'LABEL_DONATELINK' => $GLOBALS['LANG']->getLL('labels.donate', true),
                        'LABEL_USERNAME'   => $GLOBALS['LANG']->getLL('labels.username', true),

diff --git a/typo3/sysext/lang/locallang_login.xml b/typo3/sysext/lang/locallang_login.xml
index fa67629..bd6f0e3 100644 (file)
--- a/typo3/sysext/lang/locallang_login.xml
+++ b/typo3/sysext/lang/locallang_login.xml
@@ -21,6 +21,7 @@
                        <label index="error.login">Your login attempt did not succeed. Make sure to spell your username and password correctly, including upper/lowercase characters.</label>
                        <label index="error.javascript">Activate JavaScript, please!</label>
                        <label index="error.cookies">Activate Cookies, please!</label>
                        <label index="error.login">Your login attempt did not succeed. Make sure to spell your username and password correctly, including upper/lowercase characters.</label>
                        <label index="error.javascript">Activate JavaScript, please!</label>
                        <label index="error.cookies">Activate Cookies, please!</label>

+                       <label index="error.cookies_ignore">Ignore!</label>

                        <label index="error.capslock">Attention: Caps lock enabled!</label>
                        <label index="warranty.by">Warranty is supplied by %s; %sclick for details.%s</label>
                        <label index="no.warranty">TYPO3 comes with ABSOLUTELY NO WARRANTY; %sclick for details.%s</label>
                        <label index="error.capslock">Attention: Caps lock enabled!</label>
                        <label index="warranty.by">Warranty is supplied by %s; %sclick for details.%s</label>
                        <label index="no.warranty">TYPO3 comes with ABSOLUTELY NO WARRANTY; %sclick for details.%s</label>

diff --git a/typo3/sysext/t3skin/templates/login.html b/typo3/sysext/t3skin/templates/login.html
index e0a6781..479d2dc 100644 (file)
--- a/typo3/sysext/t3skin/templates/login.html
+++ b/typo3/sysext/t3skin/templates/login.html
@@ -33,18 +33,17 @@
                                <p>\r
                                        ###ERROR_COOKIES###\r
                                </p>\r
                                <p>\r
                                        ###ERROR_COOKIES###\r
                                </p>\r

+                               <p>\r
+                                       <a href="#" onclick="document.getElementById('t3-nocookies-error').style.display = 'none'; document.getElementById('t3-login-form-fields').style.display = 'block'; return false;">###ERROR_COOKIES_IGNORE###</a>\r
+                               </p>\r

                        </div>\r
                        <div id="t3-login-form-fields">\r
                                ###FORM###\r
                        </div>\r
                        <script type="text/javascript">\r
                        /*<![CDATA[*/\r
                        </div>\r
                        <div id="t3-login-form-fields">\r
                                ###FORM###\r
                        </div>\r
                        <script type="text/javascript">\r
                        /*<![CDATA[*/\r

-                               var cookieEnabled = (navigator.cookieEnabled) ? true : false;\r
-                               \r
-                               if (typeof navigator.cookieEnabled == "undefined" && !cookieEnabled) {\r
-                                       document.cookie = "testcookie";\r
-                                       cookieEnabled = (document.cookie.indexOf("testcookie") != -1) ? true : false;\r
-                               }\r
+                               document.cookie = "testcookie";\r
+                               cookieEnabled = (document.cookie.indexOf("testcookie") != -1) ? true : false;\r

                                if (cookieEnabled) {\r
                                        document.getElementById("t3-login-form-fields").style.display = 'block';\r
                                }\r
                                if (cookieEnabled) {\r
                                        document.getElementById("t3-login-form-fields").style.display = 'block';\r
                                }\r