From 50c469dd99311b2b7c1595c0e538c44133082709 Mon Sep 17 00:00:00 2001
From: Wouter Wolters <typo3@wouterwolters.nl>
Date: Fri, 5 Dec 2014 00:10:07 +0100
Subject: [PATCH] [TASK] Remove conf.php from ext:recycler
Resolves: #63587
Releases: master
Change-Id: I3a1fa569374f1bc65c82c0c34a73fa339f384e4c
Reviewed-on: http://review.typo3.org/35064
Tested-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Tested-by: Markus Klein <klein.t3@reelworx.at>
---
.../Controller/RecyclerModuleController.php | 14 ++++++++++++--
typo3/sysext/recycler/ext_tables.php | 13 ++++++++++++-
typo3/sysext/recycler/mod1/conf.php | 7 -------
3 files changed, 24 insertions(+), 10 deletions(-)
delete mode 100644 typo3/sysext/recycler/mod1/conf.php
diff --git a/typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php b/typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php
index b68c2afffaaf..1964eb0b8c4f 100644
--- a/typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php
+++ b/typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php
@@ -70,6 +70,13 @@ class RecyclerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
*/
protected $languageService;
+ /**
+ * The name of the module
+ *
+ * @var string
+ */
+ protected $moduleName = 'web_txrecyclerM1';
+
/**
* Constructor
*/
@@ -78,7 +85,10 @@ class RecyclerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
$this->languageService->includeLLFile('EXT:recycler/mod1/locallang.xlf');
$this->backendUser = $GLOBALS['BE_USER'];
- $this->backendUser->modAccess($GLOBALS['MCONF'], TRUE);
+
+ $this->MCONF = array(
+ 'name' => $this->moduleName,
+ );
}
/**
@@ -268,7 +278,7 @@ class RecyclerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
protected function getShortcutButton() {
$result = '';
if ($this->backendUser->mayMakeShortcut()) {
- $result = $this->doc->makeShortcutIcon('', 'function', $this->MCONF['name']);
+ $result = $this->doc->makeShortcutIcon('', 'function', $this->moduleName);
}
return $result;
}
diff --git a/typo3/sysext/recycler/ext_tables.php b/typo3/sysext/recycler/ext_tables.php
index 2cacdfa0f78e..caf5395ff3ac 100644
--- a/typo3/sysext/recycler/ext_tables.php
+++ b/typo3/sysext/recycler/ext_tables.php
@@ -11,6 +11,17 @@ if (TYPO3_MODE === 'BE') {
'web',
'txrecyclerM1',
'',
- \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'mod1/'
+ \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'mod1/',
+ array(
+ 'script' => '_DISPATCH',
+ 'access' => 'user,group',
+ 'name' => 'web_txrecyclerM1',
+ 'labels' => array(
+ 'tabs_images' => array(
+ 'tab' => '../Resources/Public/Icons/module-recycler.png',
+ ),
+ 'll_ref' => 'LLL:EXT:recycler/mod1/locallang_mod.xlf',
+ ),
+ )
);
}
diff --git a/typo3/sysext/recycler/mod1/conf.php b/typo3/sysext/recycler/mod1/conf.php
deleted file mode 100644
index 1f399139f799..000000000000
--- a/typo3/sysext/recycler/mod1/conf.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-// DO NOT REMOVE OR CHANGE THESE 3 LINES:
-$MCONF['name'] = 'web_txrecyclerM1';
-$MCONF['script'] = '_DISPATCH';
-$MCONF['access'] = 'user,group';
-$MLANG['default']['tabs_images']['tab'] = '../Resources/Public/Icons/module-recycler.png';
-$MLANG['default']['ll_ref'] = 'LLL:EXT:recycler/mod1/locallang_mod.xlf';
--
GitLab