[TASK] Remove option to show TYPO3 version in backend login 71/39471/3
authorBenjamin Mack <benni@typo3.org>
Tue, 12 May 2015 03:23:39 +0000 (11:23 +0800)
committerWouter Wolters <typo3@wouterwolters.nl>
Tue, 12 May 2015 07:49:19 +0000 (09:49 +0200)
Resolves: #66902
Releases: master
Change-Id: Icbde70171d848b97ecf2da9af4598236cfc53656
Reviewed-on: http://review.typo3.org/39471
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
Reviewed-by: Frederic Gaus <frederic.gaus@flagbit.de>
Tested-by: Frederic Gaus <frederic.gaus@flagbit.de>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
typo3/sysext/backend/Classes/Controller/LoginController.php
typo3/sysext/backend/Classes/Utility/BackendUtility.php
typo3/sysext/core/Configuration/DefaultConfiguration.php
typo3/sysext/install/Classes/Service/SilentConfigurationUpgradeService.php

index a6cab9a..2a6bd3b 100644 (file)
@@ -294,7 +294,7 @@ class LoginController {
                                'typo3' => $this->getUriForFileName('EXT:backend/Resources/Public/Images/typo3_orange.svg'),
                        ),
                        'isOpenIdLoaded' => ExtensionManagementUtility::isLoaded('openid'),
-                       'copyright' => BackendUtility::TYPO3_copyRightNotice($GLOBALS['TYPO3_CONF_VARS']['SYS']['loginCopyrightShowVersion']),
+                       'copyright' => BackendUtility::TYPO3_copyRightNotice(),
                        'loginNewsItems' => $this->getSystemNews()
                ));
 
index 0344d77..8204b0e 100644 (file)
@@ -4272,18 +4272,14 @@ class BackendUtility {
         * According to the GPL license an interactive application must show such a notice on start-up ('If the program is interactive, make it output a short notice... ' - see GPL.txt)
         * Therefore preventing this notice from being properly shown is a violation of the license, regardless of whether you remove it or use a stylesheet to obstruct the display.
         *
-        * @param bool $showVersionNumber Display the version number within the copyright notice?
         * @return string Text/Image (HTML) for copyright notice.
         */
-       static public function TYPO3_copyRightNotice($showVersionNumber = TRUE) {
+       static public function TYPO3_copyRightNotice() {
                // Copyright Notice
                $loginCopyrightWarrantyProvider = strip_tags(trim($GLOBALS['TYPO3_CONF_VARS']['SYS']['loginCopyrightWarrantyProvider']));
                $loginCopyrightWarrantyURL = strip_tags(trim($GLOBALS['TYPO3_CONF_VARS']['SYS']['loginCopyrightWarrantyURL']));
 
                $lang = static::getLanguageService();
-               $versionNumber = $showVersionNumber ?
-                               ' ' . $lang->sL('LLL:EXT:lang/locallang_login.xlf:version.short') . ' ' .
-                               htmlspecialchars(TYPO3_version) : '';
 
                if (strlen($loginCopyrightWarrantyProvider) >= 2 && strlen($loginCopyrightWarrantyURL) >= 10) {
                        $warrantyNote = sprintf($lang->sL('LLL:EXT:lang/locallang_login.xlf:warranty.by'), htmlspecialchars($loginCopyrightWarrantyProvider), '<a href="' . htmlspecialchars($loginCopyrightWarrantyURL) . '" target="_blank">', '</a>');
@@ -4291,7 +4287,7 @@ class BackendUtility {
                        $warrantyNote = sprintf($lang->sL('LLL:EXT:lang/locallang_login.xlf:no.warranty'), '<a href="' . TYPO3_URL_LICENSE . '" target="_blank">', '</a>');
                }
                $cNotice = '<a href="' . TYPO3_URL_GENERAL . '" target="_blank">' .
-                               $lang->sL('LLL:EXT:lang/locallang_login.xlf:typo3.cms') . $versionNumber . '</a>. ' .
+                               $lang->sL('LLL:EXT:lang/locallang_login.xlf:typo3.cms') . '</a>. ' .
                                $lang->sL('LLL:EXT:lang/locallang_login.xlf:copyright') . ' &copy; ' . htmlspecialchars(TYPO3_copyright_year) . ' Kasper Sk&aring;rh&oslash;j. ' .
                                $lang->sL('LLL:EXT:lang/locallang_login.xlf:extension.copyright') . ' ' .
                                sprintf($lang->sL('LLL:EXT:lang/locallang_login.xlf:details.link'), ('<a href="' . TYPO3_URL_GENERAL . '" target="_blank">' . TYPO3_URL_GENERAL . '</a>')) . ' ' .
index 137ce5a..fdf011d 100644 (file)
@@ -69,7 +69,6 @@ return array(
                'USdateFormat' => FALSE,                                // Boolean: If TRUE, dates entered in the TCEforms of the backend will be formatted mm-dd-yyyy
                'loginCopyrightWarrantyProvider' => '', // String: If you provide warranty for TYPO3 to your customers insert you (company) name here. It will appear in the login-dialog as the warranty provider. (You must also set URL below).
                'loginCopyrightWarrantyURL' => '',              // String: Add the URL where you explain the extend of the warranty you provide. This URL is displayed in the login dialog as the place where people can learn more about the conditions of your warranty. Must be set (more than 10 chars) in addition with the 'loginCopyrightWarrantyProvider' message.
-               'loginCopyrightShowVersion' => FALSE,   // Boolean: If set, the current TYPO3 version is shown.
                'curlUse' => FALSE,                                             // Boolean: If set, try to use cURL to fetch external URLs
                'curlProxyNTLM' => FALSE,                                       // Boolean: Proxy NTLM authentication support.
                /**
index b54dc5b..2b7c369 100644 (file)
@@ -84,6 +84,8 @@ class SilentConfigurationUpgradeService {
                'FE/allowedTempPaths',
                // #66034
                'FE/activateContentAdapter',
+               // #66902
+               'SYS/loginCopyrightShowVersion'
        );
 
        /**