[TASK] Remove old class files from ext:openid 07/27507/2
authorChristian Kuhn <lolli@schwarzbu.ch>
Sun, 9 Feb 2014 11:48:06 +0000 (12:48 +0100)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Sun, 9 Feb 2014 13:47:47 +0000 (14:47 +0100)
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
typo3/sysext/openid/class.tx_openid_mod_setup.php [deleted file]
typo3/sysext/openid/ext_localconf.php
typo3/sysext/openid/sv1/class.tx_openid_store.php [deleted file]
typo3/sysext/openid/sv1/class.tx_openid_sv1.php [deleted file]

index e597a3a..1a67024 100644 (file)
@@ -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 (file)
index ac3e45c..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname tx_openid_mod_setup 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/OpenidModuleSetup.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('openid') . 'Classes/OpenidModuleSetup.php';
index 7a78597..95be8d3 100644 (file)
@@ -3,33 +3,44 @@
 if (!defined('TYPO3_MODE')) {
        die('Access denied.');
 }
+
 // Register OpenID pocessing service with TYPO3
-\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'
-));
+\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 (file)
index 6e48350..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/***************************************************************
- *  Copyright notice
- *
- *  (c) 2009-2013 Dmitry Dulepov (dmitry.dulepov@gmail.com)
- *  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!
- ***************************************************************/
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('openid') . 'lib/php-openid/Auth/OpenID/Interface.php';
-/*
- * @deprecated since 6.0, the classname tx_openid_store 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/OpenidStore.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('openid') . 'Classes/OpenidStore.php';
diff --git a/typo3/sysext/openid/sv1/class.tx_openid_sv1.php b/typo3/sysext/openid/sv1/class.tx_openid_sv1.php
deleted file mode 100644 (file)
index 7b90fd8..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/***************************************************************
- *  Copyright notice
- *
- *  (c) 2008-2013 Dmitry Dulepov <dmitry@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.
- *
- *  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';