[TASK] Cleanup FactoryConfiguration for saltedpasswords 66/23366/3
authorNicole Cordes <typo3@cordes.co>
Tue, 27 Aug 2013 14:05:24 +0000 (16:05 +0200)
committerWouter Wolters <typo3@wouterwolters.nl>
Tue, 27 Aug 2013 17:15:35 +0000 (19:15 +0200)
This patch rewrites the configuration of ext:saltedpasswords into
a readable array which gets serialized afterwards. The check for
enabling salted passwords in the backend is obsolete and removed.
The values of the "checkConfiguration" user functions superfluous
and removed as well.

Resolves: #51354
Releases: 6.2
Change-Id: I539070d1642660ad0a5641d8971bdabc7cf92223
Reviewed-on: https://review.typo3.org/23366
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
typo3/sysext/core/Configuration/DefaultConfiguration.php
typo3/sysext/core/Configuration/FactoryConfiguration.php

index 01959ac..f3ccf79 100644 (file)
@@ -241,8 +241,6 @@ return array(
                ),
                'extConf' => array(
                        'saltedpasswords' => serialize(array(
-                               'checkConfigurationFE' => 0,
-                               'checkConfigurationBE' => 0,
                                'BE.' => array(
                                        'saltedPWHashingMethod' => 'TYPO3\\CMS\\Saltedpasswords\\Salt\\PhpassSalt',
                                        'forceSalted' => 0,
index 1773d13..3de1fc9 100644 (file)
@@ -17,7 +17,21 @@ return array(
        'EXT' => array(
                'extConf' => array(
                        'rsaauth' => 'a:1:{s:18:"temporaryDirectory";s:0:"";}',
-                       'saltedpasswords' => 'a:7:{s:20:"checkConfigurationFE";s:1:"0";s:20:"checkConfigurationBE";s:1:"0";s:3:"FE.";a:5:{s:7:"enabled";s:1:"1";s:21:"saltedPWHashingMethod";s:41:"TYPO3\\CMS\\Saltedpasswords\\Salt\\PhpassSalt";s:11:"forceSalted";s:1:"0";s:15:"onlyAuthService";s:1:"0";s:12:"updatePasswd";s:1:"1";}s:3:"BE.";a:5:{s:7:"enabled";s:1:"1";s:21:"saltedPWHashingMethod";s:41:"TYPO3\\CMS\\Saltedpasswords\\Salt\\PhpassSalt";s:11:"forceSalted";s:1:"0";s:15:"onlyAuthService";s:1:"0";s:12:"updatePasswd";s:1:"1";}s:21:"checkConfigurationFE2";s:1:"0";s:21:"checkConfigurationBE2";s:1:"0";s:8:"__meta__";N;}',
+                       'saltedpasswords' => serialize(array(
+                               'BE.' => array(
+                                       'saltedPWHashingMethod' => 'TYPO3\\CMS\\Saltedpasswords\\Salt\\PhpassSalt',
+                                       'forceSalted' => 0,
+                                       'onlyAuthService' => 0,
+                                       'updatePasswd' => 1,
+                               ),
+                               'FE.' => array(
+                                       'enabled' => 1,
+                                       'saltedPWHashingMethod' => 'TYPO3\\CMS\\Saltedpasswords\\Salt\\PhpassSalt',
+                                       'forceSalted' => 0,
+                                       'onlyAuthService' => 0,
+                                       'updatePasswd' => 1,
+                               ),
+                       )),
                ),
                'extListArray' => array(
                        'info',
@@ -68,4 +82,4 @@ return array(
                'sitename' => 'New TYPO3 site',
        ),
 );
-?>
+?>
\ No newline at end of file