[BUGFIX] EXT:saltedpasswords remove dependency on EXT:setup 56/29656/8
authorMarkus Klein <klein.t3@mfc-linz.at>
Fri, 25 Apr 2014 13:26:11 +0000 (15:26 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Tue, 6 May 2014 12:08:24 +0000 (14:08 +0200)
As saltedpasswords is required for backend and can't be uninstalled, we
can remove the implicit dependency on extension "setup" by adjusting
the default settings there.

Resolves: #58192
Releases: 6.2
Change-Id: I6490b9962924c0e384243f663f3e5057c947749e
Reviewed-on: https://review.typo3.org/29656
Reviewed-by: Nicole Cordes
Tested-by: Nicole Cordes
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
typo3/sysext/rsaauth/Classes/Hook/UserSetupHook.php
typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php
typo3/sysext/saltedpasswords/ext_tables.php
typo3/sysext/setup/Classes/Controller/SetupModuleController.php
typo3/sysext/setup/ext_tables.php

index aaf3611..cdeee18 100644 (file)
@@ -57,7 +57,7 @@ class UserSetupHook {
         * Provides form code and javascript for the user setup.
         *
         * @param array $parameters Parameters to the script
-        * @param \TYPO3\CMS\Backend\Controller\LoginController $userSetupObject Calling object: user setup module
+        * @param \TYPO3\CMS\Setup\Controller\SetupModuleController $userSetupObject Calling object: user setup module
         * @return string The code for the user setup
         */
        public function getLoginScripts(array $parameters, \TYPO3\CMS\Setup\Controller\SetupModuleController $userSetupObject) {
index b22d0f3..cd9e710 100644 (file)
@@ -221,9 +221,7 @@ be ignored (except "rsauth", which is implicitely used).';
                        $problems[] = 'SaltedPasswords has been configured to enforce salted passwords (forceSalted).
 <br />
 This means that only passwords in the format of this extension will succeed for
-login.<br />
-<strong><i>IMPORTANT:</i></strong> This has the effect that passwords that are set from
-the Install Tool will not work!';
+login.';
                }
                // updatePasswd wont work with "forceSalted"
                if ($extConf['updatePasswd'] && $extConf['forceSalted']) {
index 7060434..ac523ab 100644 (file)
@@ -26,8 +26,5 @@ $operations['tx_saltedpasswords_eval_be'] = 1;
 $operations['password'] = 1;
 $GLOBALS['TCA']['be_users']['columns']['password']['config']['eval'] = implode(',', array_keys($operations));
 unset($operations);
-// Prevent md5 hashing on client side via JS
-$GLOBALS['TYPO3_USER_SETTINGS']['columns']['password']['eval'] = '';
-$GLOBALS['TYPO3_USER_SETTINGS']['columns']['password2']['eval'] = '';
 // Add context sensitive help (csh) for scheduler task
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_txsaltedpasswords', 'EXT:' . $_EXTKEY . '/locallang_csh_saltedpasswords.xlf');
index 2906631..661f12e 100644 (file)
@@ -499,15 +499,12 @@ class SetupModuleController {
                        }
                        switch ($type) {
                        case 'text':
-
                        case 'password':
-                               if ($eval == 'md5') {
-                                       $more .= ' onchange="this.value=this.value?MD5(this.value):\'\';"';
-                               }
-                               if ($type == 'password') {
+                               $noAutocomplete = '';
+                               if ($type === 'password') {
                                        $value = '';
+                                       $noAutocomplete = 'autocomplete="off" ';
                                }
-                               $noAutocomplete = $type == 'password' ? 'autocomplete="off" ' : '';
                                $html = '<input id="field_' . $fieldName . '"
                                                        type="' . $type . '"
                                                        name="data' . $dataAdd . '[' . $fieldName . ']" ' . $noAutocomplete . 'value="' . htmlspecialchars($value) . '" ' . $GLOBALS['TBE_TEMPLATE']->formWidth(20) . $more . ' />';
index 5373360..a5d6fe6 100644 (file)
@@ -41,14 +41,12 @@ if (TYPO3_MODE === 'BE') {
                                'label' => 'LLL:EXT:setup/mod/locallang.xlf:newPassword',
                                'table' => 'be_users',
                                'csh' => 'newPassword',
-                               'eval' => 'md5'
                        ),
                        'password2' => array(
                                'type' => 'password',
                                'label' => 'LLL:EXT:setup/mod/locallang.xlf:newPasswordAgain',
                                'table' => 'be_users',
                                'csh' => 'newPasswordAgain',
-                               'eval' => 'md5'
                        ),
                        'lang' => array(
                                'type' => 'select',