From 236ba6c597fc954babd6ebfd6b9b9ded9f109376 Mon Sep 17 00:00:00 2001 From: Wouter Wolters Date: Fri, 30 Aug 2013 20:00:22 +0200 Subject: [PATCH] [TASK] Remove old class files in ext:perm Remove old class files in ext:perm Change-Id: I8dc580ce07a3489a27ed92f427b504e9959af2ba Resolves: #51597 Releases: 6.2 Reviewed-on: https://review.typo3.org/23502 Reviewed-by: Kai Ole Hartwig Tested-by: Kai Ole Hartwig Reviewed-by: Christian Kuhn Tested-by: Christian Kuhn --- .../Controller/PermissionAjaxController.php | 1 + typo3/sysext/perm/ext_autoload.php | 7 ----- typo3/sysext/perm/ext_tables.php | 9 ++++-- .../perm/mod1/class.sc_mod_web_perm_ajax.php | 31 ------------------- typo3/sysext/perm/mod1/index.php | 7 +---- 5 files changed, 9 insertions(+), 46 deletions(-) delete mode 100644 typo3/sysext/perm/ext_autoload.php delete mode 100644 typo3/sysext/perm/mod1/class.sc_mod_web_perm_ajax.php diff --git a/typo3/sysext/perm/Classes/Controller/PermissionAjaxController.php b/typo3/sysext/perm/Classes/Controller/PermissionAjaxController.php index d704b47419d2..2c3f02cb271d 100644 --- a/typo3/sysext/perm/Classes/Controller/PermissionAjaxController.php +++ b/typo3/sysext/perm/Classes/Controller/PermissionAjaxController.php @@ -52,6 +52,7 @@ class PermissionAjaxController { * The constructor of this class */ public function __construct() { + $GLOBALS['LANG']->includeLLFile('EXT:lang/locallang_mod_web_perm.xlf'); // Configuration, variable assignment $this->conf['page'] = \TYPO3\CMS\Core\Utility\GeneralUtility::_POST('page'); $this->conf['who'] = \TYPO3\CMS\Core\Utility\GeneralUtility::_POST('who'); diff --git a/typo3/sysext/perm/ext_autoload.php b/typo3/sysext/perm/ext_autoload.php deleted file mode 100644 index 0ba09685af19..000000000000 --- a/typo3/sysext/perm/ext_autoload.php +++ /dev/null @@ -1,7 +0,0 @@ - $extensionPath . 'mod1/class.sc_mod_web_perm_ajax.php', - 'sc_mod_web_perm_index' => $extensionPath . 'mod1/index.php' -); -?> \ No newline at end of file diff --git a/typo3/sysext/perm/ext_tables.php b/typo3/sysext/perm/ext_tables.php index 2c23459923c6..76e499130d91 100644 --- a/typo3/sysext/perm/ext_tables.php +++ b/typo3/sysext/perm/ext_tables.php @@ -3,7 +3,12 @@ if (!defined('TYPO3_MODE')) { die('Access denied.'); } if (TYPO3_MODE === 'BE') { - \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule('web', 'perm', '', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'mod1/'); - $TYPO3_CONF_VARS['BE']['AJAX']['PermissionAjaxController::dispatch'] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'mod1/class.sc_mod_web_perm_ajax.php:TYPO3\\CMS\\Perm\\Controller\\PermissionAjaxController->dispatch'; + \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule( + 'web', + 'perm', + '', + \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'mod1/' + ); + $GLOBALS['TYPO3_CONF_VARS']['BE']['AJAX']['PermissionAjaxController::dispatch'] = 'TYPO3\\CMS\\Perm\\Controller\\PermissionAjaxController->dispatch'; } ?> \ No newline at end of file diff --git a/typo3/sysext/perm/mod1/class.sc_mod_web_perm_ajax.php b/typo3/sysext/perm/mod1/class.sc_mod_web_perm_ajax.php deleted file mode 100644 index c5f9e14473b2..000000000000 --- a/typo3/sysext/perm/mod1/class.sc_mod_web_perm_ajax.php +++ /dev/null @@ -1,31 +0,0 @@ -includeLLFile('EXT:lang/locallang_mod_web_perm.xlf'); -/* - * @deprecated since 6.0, the classname SC_mod_web_perm_ajax and this file is obsolete - * and will be removed with 6.2. The class was renamed and is now located at: - * typo3/sysext/perm/Classes/Controller/PermissionAjaxController.php - */ -require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('perm') . 'Classes/Controller/PermissionAjaxController.php'; -?> \ No newline at end of file diff --git a/typo3/sysext/perm/mod1/index.php b/typo3/sysext/perm/mod1/index.php index dd8c204da5cd..9eb93f1e3b25 100755 --- a/typo3/sysext/perm/mod1/index.php +++ b/typo3/sysext/perm/mod1/index.php @@ -31,12 +31,7 @@ */ $LANG->includeLLFile('EXT:lang/locallang_mod_web_perm.xlf'); $BE_USER->modAccess($MCONF, 1); -/* - * @deprecated since 6.0, the classname SC_mod_web_perm_index and this file is obsolete - * and will be removed with 6.2. The class was renamed and is now located at: - * typo3/sysext/perm/Classes/Controller/PermissionModuleController.php - */ -require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('perm') . 'Classes/Controller/PermissionModuleController.php'; + // Make instance: $SOBE = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Perm\\Controller\\PermissionModuleController'); $SOBE->init(); -- 2.20.1