From 1cb940eab5862f4e224ffa5e20b5e4e8efaa00aa Mon Sep 17 00:00:00 2001
From: Wouter Wolters <typo3@wouterwolters.nl>
Date: Thu, 26 Feb 2015 18:58:47 +0100
Subject: [PATCH] [TASK] Introduce getters for $GLOBALS in ext:taskcenter
Resolves: #65299
Releases: master
Change-Id: I3d3d9409e8994f9e61a487b02a132cc2db6c14df
Reviewed-on: http://review.typo3.org/37290
Reviewed-by: Michael Oehlhof <typo3@oehlhof.de>
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Tested-by: Markus Klein <klein.t3@reelworx.at>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
.../Controller/TaskModuleController.php | 60 ++++++++++++-------
1 file changed, 39 insertions(+), 21 deletions(-)
diff --git a/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php b/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
index 4eff110942ff..c5d2f14e8e11 100644
--- a/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
+++ b/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
@@ -43,7 +43,7 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
* @return void
*/
public function __construct() {
- $GLOBALS['LANG']->includeLLFile('EXT:taskcenter/task/locallang.xlf');
+ $this->getLanguageService()->includeLLFile('EXT:taskcenter/task/locallang.xlf');
$this->MCONF = array(
'name' => $this->moduleName
);
@@ -63,7 +63,7 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
*/
public function menuConfig() {
$this->MOD_MENU = array('mode' => array());
- $this->MOD_MENU['mode']['information'] = $GLOBALS['LANG']->sL('LLL:EXT:taskcenter/locallang.xlf:task_overview');
+ $this->MOD_MENU['mode']['information'] = $this->getLanguageService()->sL('LLL:EXT:taskcenter/locallang.xlf:task_overview');
$this->MOD_MENU['mode']['tasks'] = 'Tasks';
parent::menuConfig();
}
@@ -92,7 +92,7 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
// Build the <body> for the module
$this->content = $this->doc->moduleBody($this->pageinfo, $docHeaderButtons, $markers);
// Renders the module page
- $this->content = $this->doc->render($GLOBALS['LANG']->getLL('title'), $this->content);
+ $this->content = $this->doc->render($this->getLanguageService()->getLL('title'), $this->content);
}
/**
@@ -118,7 +118,7 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
}
// Render the task
list($extKey, $taskClass) = explode('.', $chosenTask, 2);
- $title = $GLOBALS['LANG']->sL($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['taskcenter'][$extKey][$taskClass]['title']);
+ $title = $this->getLanguageService()->sL($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['taskcenter'][$extKey][$taskClass]['title']);
if (class_exists($taskClass)) {
$taskInstance = GeneralUtility::makeInstance($taskClass, $this);
if ($taskInstance instanceof \TYPO3\CMS\Taskcenter\TaskInterface) {
@@ -126,16 +126,16 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
if ($this->checkAccess($extKey, $taskClass)) {
$actionContent .= $taskInstance->getTask();
} else {
- $flashMessage = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Messaging\FlashMessage::class, $GLOBALS['LANG']->getLL('error-access', TRUE), $GLOBALS['LANG']->getLL('error_header'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
+ $flashMessage = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Messaging\FlashMessage::class, $this->getLanguageService()->getLL('error-access', TRUE), $this->getLanguageService()->getLL('error_header'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
$actionContent .= $flashMessage->render();
}
} else {
// Error if the task is not an instance of \TYPO3\CMS\Taskcenter\TaskInterface
- $flashMessage = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Messaging\FlashMessage::class, sprintf($GLOBALS['LANG']->getLL('error_no-instance', TRUE), $taskClass, \TYPO3\CMS\Taskcenter\TaskInterface::class), $GLOBALS['LANG']->getLL('error_header'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
+ $flashMessage = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Messaging\FlashMessage::class, sprintf($this->getLanguageService()->getLL('error_no-instance', TRUE), $taskClass, \TYPO3\CMS\Taskcenter\TaskInterface::class), $this->getLanguageService()->getLL('error_header'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
$actionContent .= $flashMessage->render();
}
} else {
- $flashMessage = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Messaging\FlashMessage::class, $GLOBALS['LANG']->sL('LLL:EXT:taskcenter/task/locallang_mod.xlf:mlang_labels_tabdescr'), $GLOBALS['LANG']->sL('LLL:EXT:taskcenter/task/locallang_mod.xlf:mlang_tabs_tab'), \TYPO3\CMS\Core\Messaging\FlashMessage::INFO);
+ $flashMessage = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Messaging\FlashMessage::class, $this->getLanguageService()->sL('LLL:EXT:taskcenter/task/locallang_mod.xlf:mlang_labels_tabdescr'), $this->getLanguageService()->sL('LLL:EXT:taskcenter/task/locallang_mod.xlf:mlang_tabs_tab'), \TYPO3\CMS\Core\Messaging\FlashMessage::INFO);
$actionContent .= $flashMessage->render();
}
$content = '<div id="taskcenter-main">
@@ -152,10 +152,10 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
* @return void
*/
protected function renderInformationContent() {
- $content = $this->description($GLOBALS['LANG']->getLL('mlang_tabs_tab'), $GLOBALS['LANG']->sL('LLL:EXT:taskcenter/task/locallang_mod.xlf:mlang_labels_tabdescr'));
- $content .= $GLOBALS['LANG']->getLL('taskcenter-about');
- if ($GLOBALS['BE_USER']->isAdmin()) {
- $content .= '<br /><br />' . $this->description($GLOBALS['LANG']->getLL('taskcenter-adminheader'), $GLOBALS['LANG']->getLL('taskcenter-admin'));
+ $content = $this->description($this->getLanguageService()->getLL('mlang_tabs_tab'), $this->getLanguageService()->sL('LLL:EXT:taskcenter/task/locallang_mod.xlf:mlang_labels_tabdescr'));
+ $content .= $this->getLanguageService()->getLL('taskcenter-about');
+ if ($this->getBackendUser()->isAdmin()) {
+ $content .= '<br /><br />' . $this->description($this->getLanguageService()->getLL('taskcenter-adminheader'), $this->getLanguageService()->getLL('taskcenter-admin'));
}
$this->content .= $content;
}
@@ -196,7 +196,7 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
// Change the sorting of items to the user's one
if ($mainMenu) {
$this->doc->getPageRenderer()->loadRequireJsModule('TYPO3/CMS/Taskcenter/Taskcenter');
- $userSorting = unserialize($GLOBALS['BE_USER']->uc['taskcenter']['sorting']);
+ $userSorting = unserialize($this->getBackendUser()->uc['taskcenter']['sorting']);
if (is_array($userSorting)) {
$newSorting = array();
foreach ($userSorting as $item) {
@@ -231,7 +231,7 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
$description = $item['descriptionHtml'] ?: '<p>' . nl2br(htmlspecialchars($item['description'])) . '</p>';
$id = $this->getUniqueKey($item['uid']);
// Collapsed & expanded menu items
- if ($mainMenu && isset($GLOBALS['BE_USER']->uc['taskcenter']['states'][$id]) && $GLOBALS['BE_USER']->uc['taskcenter']['states'][$id]) {
+ if ($mainMenu && isset($this->getBackendUser()->uc['taskcenter']['states'][$id]) && $this->getBackendUser()->uc['taskcenter']['states'][$id]) {
$collapsedStyle = 'style="display:none"';
$additionalClass = 'collapsed';
} else {
@@ -247,7 +247,7 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
$active = (string)$this->MOD_SETTINGS['function'] == $item['uid'] ? ' active-task' : '';
// Main menu: Render additional syntax to sort tasks
if ($mainMenu) {
- $dragIcon = \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-document-move', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.move', TRUE)));
+ $dragIcon = \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-document-move', array('title' => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.move', TRUE)));
$section = '<div class="down"> </div>
<div class="drag">' . $dragIcon . '</div>';
$backgroundClass = 't3-row-header ';
@@ -283,7 +283,7 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
continue;
}
$link = BackendUtility::getModuleUrl('user_task') . '&SET[function]=' . $extKey . '.' . $taskClass;
- $taskTitle = $GLOBALS['LANG']->sL($task['title']);
+ $taskTitle = $this->getLanguageService()->sL($task['title']);
$taskDescriptionHtml = '';
// Check for custom icon
if (!empty($task['icon'])) {
@@ -300,7 +300,7 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
$tasks[$uniqueKey] = array(
'title' => $taskTitle,
'descriptionHtml' => $taskDescriptionHtml,
- 'description' => $GLOBALS['LANG']->sL($task['description']),
+ 'description' => $this->getLanguageService()->sL($task['description']),
'icon' => $icon,
'link' => $link,
'uid' => $extKey . '.' . $taskClass
@@ -309,7 +309,7 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
}
$content .= $this->renderListMenu($tasks, TRUE);
} else {
- $flashMessage = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Messaging\FlashMessage::class, $GLOBALS['LANG']->getLL('no-tasks', TRUE), '', \TYPO3\CMS\Core\Messaging\FlashMessage::INFO);
+ $flashMessage = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Messaging\FlashMessage::class, $this->getLanguageService()->getLL('no-tasks', TRUE), '', \TYPO3\CMS\Core\Messaging\FlashMessage::INFO);
$this->content .= $flashMessage->render();
}
return $content;
@@ -328,7 +328,7 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
'open_new_window' => $this->openInNewWindow()
);
// Shortcut
- if ($GLOBALS['BE_USER']->mayMakeShortcut()) {
+ if ($this->getBackendUser()->mayMakeShortcut()) {
$buttons['shortcut'] = $this->doc->makeShortcutIcon('', 'function', $this->moduleName);
}
return $buttons;
@@ -346,12 +346,12 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
*/
protected function checkAccess($extKey, $taskClass) {
// Check if task is blinded with TsConfig (taskcenter.<extkey>.<taskName>
- $tsConfig = $GLOBALS['BE_USER']->getTSConfig('taskcenter.' . $extKey . '.' . $taskClass);
+ $tsConfig = $this->getBackendUser()->getTSConfig('taskcenter.' . $extKey . '.' . $taskClass);
if (isset($tsConfig['value']) && (int)$tsConfig['value'] === 0) {
return FALSE;
}
// Admins are always allowed
- if ($GLOBALS['BE_USER']->isAdmin()) {
+ if ($this->getBackendUser()->isAdmin()) {
return TRUE;
}
// Check if task is restricted to admins
@@ -394,9 +394,27 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
$url = GeneralUtility::getIndpEnv('TYPO3_REQUEST_URL');
$onClick = 'devlogWin=window.open(\'' . $url . '\',\'taskcenter\',\'width=790,status=0,menubar=1,resizable=1,location=0,scrollbars=1,toolbar=0\');return false;';
$content = '<a href="#" onclick="' . htmlspecialchars($onClick) . '">' .
- IconUtility::getSpriteIcon('actions-window-open', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.openInNewWindow', TRUE))) .
+ IconUtility::getSpriteIcon('actions-window-open', array('title' => $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.openInNewWindow', TRUE))) .
'</a>';
return $content;
}
+ /**
+ * Returns the current BE user.
+ *
+ * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
+ */
+ protected function getBackendUser() {
+ return $GLOBALS['BE_USER'];
+ }
+
+ /**
+ * Returns LanguageService
+ *
+ * @return \TYPO3\CMS\Lang\LanguageService
+ */
+ protected function getLanguageService() {
+ return $GLOBALS['LANG'];
+ }
+
}
--
GitLab