From c5741aa9f3514d7e82caadf24f959555c2a5ae7f Mon Sep 17 00:00:00 2001 From: Christian Kuhn Date: Sun, 9 Feb 2014 12:48:06 +0100 Subject: [PATCH 1/1] [TASK] Remove old class files from ext:openid MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Removes old class files from ext:openid except the two current entry points for _eid and _return. Change-Id: Ibdeca07881aad92af28c9f0e81c42a4ee1b600c2 Resolves: #55808 Related: #47756 Releases: 6.2 Reviewed-on: https://review.typo3.org/27507 Reviewed-by: Oliver Klee Reviewed-by: Marcin Sągol Reviewed-by: Anja Leichsenring Tested-by: Anja Leichsenring --- typo3/sysext/openid/Classes/OpenidStore.php | 2 + .../openid/class.tx_openid_mod_setup.php | 7 --- typo3/sysext/openid/ext_localconf.php | 59 +++++++++++-------- .../openid/sv1/class.tx_openid_store.php | 30 ---------- .../sysext/openid/sv1/class.tx_openid_sv1.php | 34 ----------- 5 files changed, 37 insertions(+), 95 deletions(-) delete mode 100644 typo3/sysext/openid/class.tx_openid_mod_setup.php delete mode 100644 typo3/sysext/openid/sv1/class.tx_openid_store.php delete mode 100644 typo3/sysext/openid/sv1/class.tx_openid_sv1.php diff --git a/typo3/sysext/openid/Classes/OpenidStore.php b/typo3/sysext/openid/Classes/OpenidStore.php index e597a3a240d7..1a67024386cf 100644 --- a/typo3/sysext/openid/Classes/OpenidStore.php +++ b/typo3/sysext/openid/Classes/OpenidStore.php @@ -24,6 +24,8 @@ namespace TYPO3\CMS\Openid; * This copyright notice MUST APPEAR in all copies of the script! ***************************************************************/ +require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('openid') . 'lib/php-openid/Auth/OpenID/Interface.php'; + /** * This class is a TYPO3-specific OpenID store. * diff --git a/typo3/sysext/openid/class.tx_openid_mod_setup.php b/typo3/sysext/openid/class.tx_openid_mod_setup.php deleted file mode 100644 index ac3e45cb6c22..000000000000 --- a/typo3/sysext/openid/class.tx_openid_mod_setup.php +++ /dev/null @@ -1,7 +0,0 @@ - 'OpenID Authentication', - 'description' => 'OpenID processing login information service for Frontend and Backend', - 'subtype' => 'processLoginDataBE,processLoginDataFE', - 'available' => TRUE, - 'priority' => 35, - // Must be lower than for \TYPO3\CMS\Sv\AuthenticationService (50) to let other processing take place before - 'quality' => 50, - 'os' => '', - 'exec' => '', - 'className' => 'TYPO3\\CMS\\Openid\\OpenidService' -)); +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addService( + $_EXTKEY, + 'auth', + 'tx_openid_service_process', + array( + 'title' => 'OpenID Authentication', + 'description' => 'OpenID processing login information service for Frontend and Backend', + 'subtype' => 'processLoginDataBE,processLoginDataFE', + 'available' => TRUE, + 'priority' => 35, + // Must be lower than for \TYPO3\CMS\Sv\AuthenticationService (50) to let other processing take place before + 'quality' => 50, + 'os' => '', + 'exec' => '', + 'className' => 'TYPO3\\CMS\\Openid\\OpenidService' + ) +); // Register OpenID authentication service with TYPO3 -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addService($_EXTKEY, 'auth', 'tx_openid_service', array( - 'title' => 'OpenID Authentication', - 'description' => 'OpenID authentication service for Frontend and Backend', - 'subtype' => 'getUserFE,authUserFE,getUserBE,authUserBE', - 'available' => TRUE, - 'priority' => 75, - // Must be higher than for \TYPO3\CMS\Sv\AuthenticationService (50) or \TYPO3\CMS\Sv\AuthenticationService will log failed login attempts - 'quality' => 50, - 'os' => '', - 'exec' => '', - 'className' => 'TYPO3\\CMS\\Openid\\OpenidService' -)); +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addService( + $_EXTKEY, + 'auth', + 'tx_openid_service', + array( + 'title' => 'OpenID Authentication', + 'description' => 'OpenID authentication service for Frontend and Backend', + 'subtype' => 'getUserFE,authUserFE,getUserBE,authUserBE', + 'available' => TRUE, + 'priority' => 75, + // Must be higher than for \TYPO3\CMS\Sv\AuthenticationService (50) or \TYPO3\CMS\Sv\AuthenticationService will log failed login attempts + 'quality' => 50, + 'os' => '', + 'exec' => '', + 'className' => 'TYPO3\\CMS\\Openid\\OpenidService' + ) +); // Register eID script that performs final FE user authentication. It will be called by the OpenID provider $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_openid'] = 'EXT:openid/class.tx_openid_eid.php'; diff --git a/typo3/sysext/openid/sv1/class.tx_openid_store.php b/typo3/sysext/openid/sv1/class.tx_openid_store.php deleted file mode 100644 index 6e48350a7417..000000000000 --- a/typo3/sysext/openid/sv1/class.tx_openid_store.php +++ /dev/null @@ -1,30 +0,0 @@ - - * 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. - * - * 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! - ***************************************************************/ - -// @TODO: Find out if we still need those requires -require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('core') . 'Classes/Service/AbstractService.php'; -require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('openid', 'sv1/class.tx_openid_store.php'); - -/* - * @deprecated since 6.0, the classname tx_openid_sv1 and this file is obsolete - * and will be removed with 6.2. The class was renamed and is now located at: - * typo3/sysext/openid/Classes/OpenidService.php - */ -require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('openid') . 'Classes/OpenidService.php'; -- 2.20.1