From e796d36eeeaf15379ae7edac301310d2e5a47833 Mon Sep 17 00:00:00 2001
From: Wouter Wolters <typo3@wouterwolters.nl>
Date: Thu, 4 Dec 2014 23:45:37 +0100
Subject: [PATCH] [TASK] Remove conf.php from ext:taskcenter

Resolves: #63584
Releases: master
Change-Id: I7da0dd37e275a7d2c42771f20e22f765ab0428c7
Reviewed-on: http://review.typo3.org/35061
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Tested-by: Markus Klein <klein.t3@reelworx.at>
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Tested-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
---
 .../Classes/Controller/TaskModuleController.php     | 13 +++++++++++--
 typo3/sysext/taskcenter/ext_tables.php              | 13 ++++++++++++-
 typo3/sysext/taskcenter/task/conf.php               |  6 ------
 3 files changed, 23 insertions(+), 9 deletions(-)
 delete mode 100644 typo3/sysext/taskcenter/task/conf.php

diff --git a/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php b/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
index ec76754a109f..b54012dcf389 100644
--- a/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
+++ b/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
@@ -30,6 +30,13 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
 	 */
 	protected $pageinfo;
 
+	/**
+	 * The name of the module
+	 *
+	 * @var string
+	 */
+	protected $moduleName = 'user_task';
+
 	/**
 	 * Initializes the Module
 	 *
@@ -37,7 +44,9 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
 	 */
 	public function __construct() {
 		$GLOBALS['LANG']->includeLLFile('EXT:taskcenter/task/locallang.xlf');
-		$GLOBALS['BE_USER']->modAccess($GLOBALS['MCONF'], TRUE);
+		$this->MCONF = array(
+			'name' => $this->moduleName
+		);
 		parent::init();
 		// Initialize document
 		$this->doc = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Template\DocumentTemplate::class);
@@ -320,7 +329,7 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
 		);
 		// Shortcut
 		if ($GLOBALS['BE_USER']->mayMakeShortcut()) {
-			$buttons['shortcut'] = $this->doc->makeShortcutIcon('', 'function', $this->MCONF['name']);
+			$buttons['shortcut'] = $this->doc->makeShortcutIcon('', 'function', $this->moduleName);
 		}
 		return $buttons;
 	}
diff --git a/typo3/sysext/taskcenter/ext_tables.php b/typo3/sysext/taskcenter/ext_tables.php
index b94f38b4875f..98cf07754b03 100644
--- a/typo3/sysext/taskcenter/ext_tables.php
+++ b/typo3/sysext/taskcenter/ext_tables.php
@@ -10,7 +10,18 @@ if (TYPO3_MODE === 'BE') {
 		'user',
 		'task',
 		'top',
-		\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'task/'
+		\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'task/',
+		array(
+			'script' => '_DISPATCH',
+			'access' => 'group,user',
+			'name' => 'user_task',
+			'labels' => array(
+				'tabs_images' => array(
+					'tab' => '../Resources/Public/Icons/module-taskcenter.png',
+				),
+				'll_ref' => 'LLL:EXT:taskcenter/task/locallang_mod.xlf',
+			),
+		)
 	);
 
 	\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::registerAjaxHandler(
diff --git a/typo3/sysext/taskcenter/task/conf.php b/typo3/sysext/taskcenter/task/conf.php
deleted file mode 100644
index 9ea83e7f7945..000000000000
--- a/typo3/sysext/taskcenter/task/conf.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$MLANG['default']['tabs_images']['tab'] = '../Resources/Public/Icons/module-taskcenter.png';
-$MLANG['default']['ll_ref'] = 'LLL:EXT:taskcenter/task/locallang_mod.xlf';
-$MCONF['script'] = '_DISPATCH';
-$MCONF['access'] = 'group,user';
-$MCONF['name'] = 'user_task';
-- 
2.20.1