Fixed bug #11601: Copyright-Notice is hardcoded (Thanks to Christopher Stelmaszyk)

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

diff --git a/ChangeLog b/ChangeLog
index 1c1699a..d41f3e8 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-31  Christian Kuhn  <lollli@schwarzbu.ch>
+
+       * Fixed bug #11601: Copyright-Notice is hardcoded (Thanks to Christopher Stelmaszyk)
+

 2009-07-30  Oliver Hader  <oliver@typo3.org>
 
        * Cleanup: Fixed ChangeLog and moved information concerning database updates to NEWS.txt
 2009-07-30  Oliver Hader  <oliver@typo3.org>
 
        * Cleanup: Fixed ChangeLog and moved information concerning database updates to NEWS.txt

diff --git a/t3lib/class.t3lib_befunc.php b/t3lib/class.t3lib_befunc.php
index 75d110b..2bbce8e 100644 (file)
--- a/t3lib/class.t3lib_befunc.php
+++ b/t3lib/class.t3lib_befunc.php
@@ -3961,12 +3961,32 @@ final class t3lib_BEfunc {
                $loginCopyrightWarrantyURL = strip_tags(trim($TYPO3_CONF_VARS['SYS']['loginCopyrightWarrantyURL']));
 
                if (strlen($loginCopyrightWarrantyProvider)>=2 && strlen($loginCopyrightWarrantyURL)>=10) {
                $loginCopyrightWarrantyURL = strip_tags(trim($TYPO3_CONF_VARS['SYS']['loginCopyrightWarrantyURL']));
 
                if (strlen($loginCopyrightWarrantyProvider)>=2 && strlen($loginCopyrightWarrantyURL)>=10) {

-                       $warrantyNote = 'Warranty is supplied by '.htmlspecialchars($loginCopyrightWarrantyProvider).'; <a href="'.htmlspecialchars($loginCopyrightWarrantyURL).'" target="_blank">click for details.</a>';
+                       $warrantyNote = sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:warranty.by'),
+                               htmlspecialchars($loginCopyrightWarrantyProvider),
+                               '<a href="' . htmlspecialchars($loginCopyrightWarrantyURL) . '" target="_blank">', '</a>'
+                       );

                } else {
                } else {

-                       $warrantyNote = 'TYPO3 comes with ABSOLUTELY NO WARRANTY; <a href="http://typo3.com/1316.0.html" target="_blank">click for details.</a>';
+                       $warrantyNote = sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:no.warranty'),
+                               '<a href="http://typo3.com/1316.0.html" target="_blank">', '</a>'
+                       );

                }
                }

-               $cNotice = '<a href="http://typo3.com/" target="_blank"><img src="gfx/loginlogo_transp.gif" width="75" vspace="2" hspace="4" height="19" alt="TYPO3 logo" align="left" />TYPO3 CMS ver. '.htmlspecialchars(TYPO3_version).'</a>. Copyright &copy; '.htmlspecialchars(TYPO3_copyright_year).' Kasper Sk&aring;rh&oslash;j. Extensions are copyright of their respective owners. Go to <a href="http://typo3.com/" target="_blank">http://typo3.com/</a> for details.
-               '.strip_tags($warrantyNote, '<a>').' This is free software, and you are welcome to redistribute it under certain conditions; <a href="http://typo3.com/1316.0.html" target="_blank">click for details</a>. Obstructing the appearance of this notice is prohibited by law.';
+               $cNotice = '<a href="http://typo3.com/" target="_blank">' .
+                       '<img src="gfx/loginlogo_transp.gif" width="75" vspace="2" hspace="4" height="19" alt="' .
+                       $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:typo3.logo') . '" align="left" />' .
+                       $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:typo3.cms') . ' ' .
+                       $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:version.short') . ' ' .
+                       htmlspecialchars(TYPO3_version) . '</a>. ' .
+                       $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:copyright') . ' &copy; ' .
+                       htmlspecialchars(TYPO3_copyright_year) . ' Kasper Sk&aring;rh&oslash;j. ' .
+                       $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:extension.copyright') . ' ' .
+                       sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:details.link'),
+                               '<a href="http://typo3.com/" target="_blank">http://typo3.com/</a>'
+                       ) . ' ' .
+                       strip_tags($warrantyNote, '<a>') . ' ' .
+                       sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:free.software'),
+                               '<a href="http://typo3.com/1316.0.html" target="_blank">', '</a> '
+                       ) .
+                       $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_login.xml:keep.notice');

 
                return $cNotice;
        }
 
                return $cNotice;
        }