[FOLLOWUP][!!!][TASK] Move old mailform to compatibility6 75/36575/2
authorWouter Wolters <typo3@wouterwolters.nl>
Sun, 1 Feb 2015 13:00:58 +0000 (14:00 +0100)
committerMarkus Klein <klein.t3@reelworx.at>
Sun, 1 Feb 2015 22:17:03 +0000 (23:17 +0100)
Resolves: #64668
Releases: master
Change-Id: Ibe2fdf4eb654da312f1dd58188dd7a55b83444be
Reviewed-on: http://review.typo3.org/36575
Reviewed-by: Oliver Klee <typo3-coding@oliverklee.de>
Tested-by: Oliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: Stephan Großberndt <stephan@grossberndt.de>
Tested-by: Stephan Großberndt <stephan@grossberndt.de>
Reviewed-by: Jan Helke <typo3@helke.de>
Tested-by: Jan Helke <typo3@helke.de>
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Tested-by: Markus Klein <klein.t3@reelworx.at>
typo3/sysext/compatibility6/Classes/Utility/FormUtility.php
typo3/sysext/compatibility6/ext_localconf.php

index 4aea8ce..f49d465 100644 (file)
@@ -31,7 +31,7 @@ class FormUtility {
         * @param bool $decode If set, string is decoded, not encoded.
         * @return string encoded/decoded version of $string
         */
-       public static function codeString($string, $decode = FALSE) {
+       static public function codeString($string, $decode = FALSE) {
                if ($decode) {
                        list($md5Hash, $str) = explode(':', $string, 2);
                        $newHash = substr(md5($GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'] . ':' . $str), 0, 10);
@@ -62,7 +62,7 @@ class FormUtility {
         * @param string $string String to crypt, may be empty
         * @return string binary crypt string, will have the same length as $string
         */
-       protected static function roundTripCryptString($string) {
+       static protected function roundTripCryptString($string) {
                $out = '';
                $cleartextLength = strlen($string);
                $key = sha1($GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey']);
index 4aad91e..68a5898 100644 (file)
@@ -27,7 +27,7 @@ if (TYPO3_MODE === 'FE') {
  */
 // Add Default TypoScript for CType "mailform" after default content rendering
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript('compatibility6', 'constants', '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:compatibility6/Configuration/TypoScript/Form/constants.txt">', 'defaultContentRendering');
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript('compatibility6', 'setup',     '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:compatibility6/Configuration/TypoScript/Form/setup.txt">', 'defaultContentRendering');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript('compatibility6', 'setup', '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:compatibility6/Configuration/TypoScript/Form/setup.txt">', 'defaultContentRendering');
 
 // Add the search CType to the "New Content Element" wizard
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('
@@ -65,7 +65,7 @@ $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms/layout/class.tx_cms_layout.php'][
 
 // Add Default TypoScript for CType "search" after default content rendering
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript('compatibility6', 'constants', '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:compatibility6/Configuration/TypoScript/Search/constants.txt">', 'defaultContentRendering');
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript('compatibility6', 'setup',     '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:compatibility6/Configuration/TypoScript/Search/setup.txt">', 'defaultContentRendering');
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript('compatibility6', 'setup', '<INCLUDE_TYPOSCRIPT: source="FILE:EXT:compatibility6/Configuration/TypoScript/Search/setup.txt">', 'defaultContentRendering');
 
 // Add the search CType to the "New Content Element" wizard
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('