[TASK] Cleanup EXT:openid 09/28309/2
authorWouter Wolters <typo3@wouterwolters.nl>
Wed, 12 Mar 2014 18:15:48 +0000 (19:15 +0100)
committerStefan Neufeind <typo3.neufeind@speedpartner.de>
Thu, 13 Mar 2014 22:22:10 +0000 (23:22 +0100)
* Remove deprecated calls to require_once
* Restore license header
* Remove empty TODO file

Resolves: #56832
Releases: 6.2
Change-Id: I291f5469638659d64e9df181017d1588f27317e1
Reviewed-on: https://review.typo3.org/28309
Reviewed-by: Stefan Neufeind
Tested-by: Stefan Neufeind
typo3/sysext/openid/TODO [deleted file]
typo3/sysext/openid/class.tx_openid_eid.php
typo3/sysext/openid/class.tx_openid_return.php
typo3/sysext/openid/ext_localconf.php

diff --git a/typo3/sysext/openid/TODO b/typo3/sysext/openid/TODO
deleted file mode 100644 (file)
index 4af1832..0000000
+++ /dev/null
@@ -1 +0,0 @@
-None
\ No newline at end of file
index 614b7ef..c2f463a 100644 (file)
@@ -1,10 +1,27 @@
 <?php
-/*
- * @deprecated since 6.0, the classname tx_openid_eID 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/OpenidEid.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('openid') . 'Classes/OpenidEid.php';
+/***************************************************************
+ *  Copyright notice
+ *
+ *  (c) 2008-2011 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!
+ ***************************************************************/
+
 $module = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Openid\\OpenidEid');
 /* @var \TYPO3\CMS\Openid\OpenidEid $module */
 $module->main();
index b69e726..cc2cbf4 100644 (file)
@@ -27,12 +27,7 @@ if (isset($_GET['login_status'])) {
 }
 define('TYPO3_MOD_PATH', 'sysext/openid/');
 require_once '../../init.php';
-/*
- * @deprecated since 6.0, the classname tx_openid_return 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/OpenidReturn.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('openid') . 'Classes/OpenidReturn.php';
+
 $module = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Openid\\OpenidReturn');
 /* @var \TYPO3\CMS\Openid\OpenidReturn $module */
 $module->main();
index 76155ab..66e41de 100644 (file)
@@ -46,4 +46,4 @@ if (!defined('TYPO3_MODE')) {
 $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_openid'] = 'EXT:openid/class.tx_openid_eid.php';
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['setup']['accessLevelCheck']['TYPO3\\CMS\\Openid\\OpenidModuleSetup'] = '';
 // Use popup window to refresh login instead of the AJAX relogin:
-$TYPO3_CONF_VARS['BE']['showRefreshLoginPopup'] = 1;
+$GLOBALS['TYPO3_CONF_VARS']['BE']['showRefreshLoginPopup'] = 1;