[TASK] Obsolete code in saltedpasswords 38/27138/2
authorChristian Kuhn <lolli@schwarzbu.ch>
Wed, 29 Jan 2014 22:15:30 +0000 (23:15 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Thu, 30 Jan 2014 12:25:05 +0000 (13:25 +0100)
tx_saltedpasswords_autoloader was used in old install tool only
and is obsolete now.

Change-Id: If398a197a18bfda20789afd0aa0104fcd8ba5993
Resolves: #55446
Releases: 6.2
Reviewed-on: https://review.typo3.org/27138
Reviewed-by: Thomas Maroschik
Reviewed-by: Marcin SÄ…gol
Reviewed-by: Wouter Wolters
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
typo3/sysext/core/Migrations/Code/LegacyClassesForIde.php
typo3/sysext/saltedpasswords/Classes/Autoloader.php [deleted file]
typo3/sysext/saltedpasswords/Classes/class.tx_saltedpasswords_autoloader.php [deleted file]
typo3/sysext/saltedpasswords/Migrations/Code/ClassAliasMap.php

index 3ce9984..be28893 100644 (file)
@@ -6104,11 +6104,6 @@ class tx_rtehtmlarea_user extends \TYPO3\CMS\Rtehtmlarea\User {}
 /**
  * @deprecated since 6.0 will be removed in 7.0
  */
-class tx_saltedpasswords_autoloader extends \TYPO3\CMS\Saltedpasswords\Autoloader {}
-
-/**
- * @deprecated since 6.0 will be removed in 7.0
- */
 class tx_saltedpasswords_eval_be extends \TYPO3\CMS\Saltedpasswords\Evaluation\BackendEvaluator {}
 
 /**
diff --git a/typo3/sysext/saltedpasswords/Classes/Autoloader.php b/typo3/sysext/saltedpasswords/Classes/Autoloader.php
deleted file mode 100644 (file)
index a708e9c..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-namespace TYPO3\CMS\Saltedpasswords;
-
-/***************************************************************
- *  Copyright notice
- *
- *  (c) 2011-2013 Helmut Hummel <helmut.hummel@typo3.org>
- *  All rights reserved
- *
- *  This script is part of the TYPO3 project. The TYPO3 project is
- *  free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  The GNU General Public License can be found at
- *  http://www.gnu.org/copyleft/gpl.html.
- *  A copy is found in the text file GPL.txt and important notices to the license
- *  from the author is found in LICENSE.txt distributed with these scripts.
- *
- *
- *  This script is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  This copyright notice MUST APPEAR in all copies of the script!
- ***************************************************************/
-/**
- * Autoloader included from Install Tool that lets saltedpasswords load itself
- *
- * @author Helmut Hummel <helmut.hummel@typo3.org>
- */
-class Autoloader {
-
-       /**
-        * Activates saltedpasswords if it is supported.
-        *
-        * @param \TYPO3\CMS\Install\Installer $instObj
-        * @return void
-        */
-       public function execute(\TYPO3\CMS\Install\Installer $instObj) {
-               switch ($instObj->step) {
-                       case 4:
-                               if (!\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('saltedpasswords') && $this->isSaltedPasswordsSupported()) {
-                                       $this->activateSaltedPasswords();
-                               }
-                               break;
-               }
-       }
-
-       /**
-        * Checks whether the OpenSSL PHP extension is working properly.
-        *
-        * Before automatically enabling saltedpasswords, we check for a working OpenSSL PHP extension. As we enable rsaauth
-        * in the process of automatically enabling saltedpasswords, working OpenSSL is a requirement for this.
-        * Availability of the command line openssl binary is not checked here, thus saltedpasswords is NOT enabled
-        * automatically in this case.
-        *
-        * @return boolean TRUE, in case of OpenSSL works and requirements for saltedpasswords are met.
-        * @see \TYPO3\CMS\Rsaauth\Backend\PhpBackend
-        */
-       protected function isSaltedPasswordsSupported() {
-               $isSupported = FALSE;
-               if (is_callable('openssl_pkey_new')) {
-                       $testKey = @openssl_pkey_new();
-                       if (is_resource($testKey)) {
-                               openssl_free_key($testKey);
-                               $isSupported = TRUE;
-                       }
-               }
-               return $isSupported;
-       }
-
-       /**
-        * Activates saltedpasswords.
-        *
-        * @return void
-        */
-       protected function activateSaltedPasswords() {
-               if (!\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('rsaauth')) {
-                       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::loadExtension('rsaauth');
-               }
-               if (!\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('saltedpasswords')) {
-                       \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::loadExtension('saltedpasswords');
-               }
-               \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager')->setLocalConfigurationValueByPath('EXT/extConf/saltedpasswords', 'a:2:{s:3:"FE.";a:2:{s:7:"enabled";s:1:"1";s:21:"saltedPWHashingMethod";s:28:"tx_saltedpasswords_salts_md5";}s:3:"BE.";a:2:{s:7:"enabled";s:1:"1";s:21:"saltedPWHashingMethod";s:28:"tx_saltedpasswords_salts_md5";}}');
-               \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager')->setLocalConfigurationValueByPath('BE/loginSecurityLevel', 'rsa');
-               \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Configuration\\ConfigurationManager')->setLocalConfigurationValueByPath('FE/loginSecurityLevel', 'rsa');
-       }
-
-}
diff --git a/typo3/sysext/saltedpasswords/Classes/class.tx_saltedpasswords_autoloader.php b/typo3/sysext/saltedpasswords/Classes/class.tx_saltedpasswords_autoloader.php
deleted file mode 100644 (file)
index 83a958b..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname tx_saltedpasswords_autoloader and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/saltedpasswords/Classes/Autoloader.php
- */
-require_once PATH_site . 'typo3/sysext/saltedpasswords/Classes/Autoloader.php';
-/**
- * @var $SOBE \TYPO3\CMS\Saltedpasswords\Autoloader
- */
-$SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Saltedpasswords\\Autoloader');
-$SOBE->execute($this);
index fc77669..d53007c 100644 (file)
@@ -1,6 +1,5 @@
 <?php
 return array(
-       'tx_saltedpasswords_autoloader' => 'TYPO3\\CMS\\Saltedpasswords\\Autoloader',
        'tx_saltedpasswords_eval_be' => 'TYPO3\\CMS\\Saltedpasswords\\Evaluation\\BackendEvaluator',
        'tx_saltedpasswords_eval' => 'TYPO3\\CMS\\Saltedpasswords\\Evaluation\\Evaluator',
        'tx_saltedpasswords_eval_fe' => 'TYPO3\\CMS\\Saltedpasswords\\Evaluation\\FrontendEvaluator',