[TASK] Code cleanup EXT:backend/Classes/File/*.php 13/37513/3
authorMichael Oehlhof <typo3@oehlhof.de>
Tue, 3 Mar 2015 22:57:25 +0000 (23:57 +0100)
committerWouter Wolters <typo3@wouterwolters.nl>
Wed, 4 Mar 2015 18:50:24 +0000 (19:50 +0100)
- add missing return values
- add missing phpdoc comments
- remove unused variable assingments
- add getter for LanguageService
- add getter for BackendUser

Resolves: #65498
Releases: master
Change-Id: I0314fa03b9ac885c46e281a167d04f060fb10617
Reviewed-on: http://review.typo3.org/37513
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php
typo3/sysext/backend/Classes/Controller/File/EditFileController.php
typo3/sysext/backend/Classes/Controller/File/FileController.php
typo3/sysext/backend/Classes/Controller/File/FileUploadController.php

index b83060b..c159383 100644 (file)
@@ -102,8 +102,8 @@ class CreateFolderController {
                }
                // Cleaning and checking target directory
                if (!$this->folderObject) {
-                       $title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:paramError', TRUE);
-                       $message = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:targetNoDir', TRUE);
+                       $title = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:paramError', TRUE);
+                       $message = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:targetNoDir', TRUE);
                        throw new \RuntimeException($title . ': ' . $message, 1294586845);
                }
                if ($this->folderObject->getStorage()->getUid() === 0) {
@@ -121,7 +121,7 @@ class CreateFolderController {
                        var path = "' . $this->target . '";
 
                        function reload(a) {    //
-                               if (!changed || (changed && confirm(' . GeneralUtility::quoteJSvalue($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:mess.redraw')) . '))) {
+                               if (!changed || (changed && confirm(' . GeneralUtility::quoteJSvalue($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:mess.redraw')) . '))) {
                                        var params = "&target="+encodeURIComponent(path)+"&number="+a+"&returnUrl=' . rawurlencode($this->returnUrl) . '";
                                        window.location.href = ' . GeneralUtility::quoteJSvalue(BackendUtility::getModuleUrl('file_newfolder')) . '+params;
                                }
@@ -140,10 +140,11 @@ class CreateFolderController {
         * @return void
         */
        public function main() {
+               $lang = $this->getLanguageService();
                // Start content compilation
-               $this->content .= $this->doc->startPage($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.pagetitle'));
+               $this->content .= $this->doc->startPage($lang->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.pagetitle'));
                // Make page header:
-               $pageContent = $this->doc->header($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.pagetitle'));
+               $pageContent = $this->doc->header($lang->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.pagetitle'));
 
                if ($this->folderObject->checkActionPermission('add')) {
                        $code = '<form role="form" action="' . htmlspecialchars(BackendUtility::getModuleUrl('tce_file')) . '" method="post" name="editform">';
@@ -153,7 +154,7 @@ class CreateFolderController {
                                <div class="form-group">
                                        <div class="form-section">
                                                <div class="form-group">
-                                                       <label for="number-of-new-folders">' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.number_of_folders') . ' ' . BackendUtility::cshItem('xMOD_csh_corebe', 'file_newfolder') . '</label>
+                                                       <label for="number-of-new-folders">' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.number_of_folders') . ' ' . BackendUtility::cshItem('xMOD_csh_corebe', 'file_newfolder') . '</label>
                                                        <div class="form-control-wrap">
                                                                <div class="input-group">
                                                                        <select class="form-control form-control-adapt" name="number" id="number-of-new-folders" onchange="reload(this.options[this.selectedIndex].value);">';
@@ -172,7 +173,7 @@ class CreateFolderController {
                                $code .= '
                                        <div class="form-section">
                                                <div class="form-group">
-                                                       <label for="folder_new_' . $a . '">' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.label_newfolder') . ' ' . ($a + 1) . ':</label>
+                                                       <label for="folder_new_' . $a . '">' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.label_newfolder') . ' ' . ($a + 1) . ':</label>
                                                        <div class="form-control-wrap">
                                                                <input type="text" class="form-control" id="folder_new_' . $a . '" name="file[newfolder][' . $a . '][data]" onchange="changed=true;" />
                                                                <input type="hidden" name="file[newfolder][' . $a . '][target]" value="' . htmlspecialchars($this->target) . '" />
@@ -183,13 +184,13 @@ class CreateFolderController {
                        // Making submit button for folder creation:
                        $code .= '
                                </div><div class="form-group">
-                                       <input class="btn btn-default" type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.submit', TRUE) . '" />
+                                       <input class="btn btn-default" type="submit" value="' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.submit', TRUE) . '" />
                                        <input type="hidden" name="redirect" value="' . htmlspecialchars($this->returnUrl) . '" />
                                        ' . \TYPO3\CMS\Backend\Form\FormEngine::getHiddenTokenField('tceAction') . '
                                </div>
                                ';
                        // Switching form tags:
-                       $pageContent .= $this->doc->section($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.newfolders'), $code);
+                       $pageContent .= $this->doc->section($lang->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.newfolders'), $code);
                        $pageContent .= $this->doc->sectionEnd() . '</form>';
                }
 
@@ -197,8 +198,8 @@ class CreateFolderController {
                        $pageContent .= '<form action="' . BackendUtility::getModuleUrl('tce_file') . '" method="post" name="editform2">';
                        // Create a list of allowed file extensions with the nice format "*.jpg, *.gif" etc.
                        $fileExtList = array();
-                       $textfileExt = GeneralUtility::trimExplode(',', $GLOBALS['TYPO3_CONF_VARS']['SYS']['textfile_ext'], TRUE);
-                       foreach ($textfileExt as $fileExt) {
+                       $textFileExt = GeneralUtility::trimExplode(',', $GLOBALS['TYPO3_CONF_VARS']['SYS']['textfile_ext'], TRUE);
+                       foreach ($textFileExt as $fileExt) {
                                if (!preg_match(('/' . $GLOBALS['TYPO3_CONF_VARS']['BE']['fileDenyPattern'] . '/i'), ('.' . $fileExt))) {
                                        $fileExtList[] = '<span class="label label-success">' . strtoupper(htmlspecialchars($fileExt)) . '</span>';
                                }
@@ -208,13 +209,13 @@ class CreateFolderController {
                                <div class="form-group">
                                        <div class="form-section">
                                                <div class="form-group">
-                                                       <label for="newfile">' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.label_newfile') . ' ' . BackendUtility::cshItem('xMOD_csh_corebe', 'file_newfile') . '</label>
+                                                       <label for="newfile">' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.label_newfile') . ' ' . BackendUtility::cshItem('xMOD_csh_corebe', 'file_newfile') . '</label>
                                                        <div class="form-control-wrap">
                                                                <input class="form-control" type="text" id="newfile" name="file[newfile][0][data]" onchange="changed=true;" />
                                                                <input type="hidden" name="file[newfile][0][target]" value="' . htmlspecialchars($this->target) . '" />
                                                        </div>
                                                        <div class="help-block">
-                                                               ' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:cm.allowedFileExtensions') . '<br>
+                                                               ' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:cm.allowedFileExtensions') . '<br>
                                                                ' . implode(' ', $fileExtList) . '
                                                        </div>
                                                </div>
@@ -224,12 +225,12 @@ class CreateFolderController {
                        // Submit button for creation of a new file:
                        $code .= '
                                <div class="form-group">
-                                       <input class="btn btn-default" type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.newfile_submit', TRUE) . '" />
+                                       <input class="btn btn-default" type="submit" value="' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.newfile_submit', TRUE) . '" />
                                        <input type="hidden" name="redirect" value="' . htmlspecialchars($this->returnUrl) . '" />
                                        ' . \TYPO3\CMS\Backend\Form\FormEngine::getHiddenTokenField('tceAction') . '
                                </div>
                                ';
-                       $pageContent .= $this->doc->section($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.newfile'), $code);
+                       $pageContent .= $this->doc->section($lang->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.newfile'), $code);
                        $pageContent .= $this->doc->sectionEnd();
                        $pageContent .= '</form>';
                }
@@ -239,12 +240,12 @@ class CreateFolderController {
                );
                // Back
                if ($this->returnUrl) {
-                       $docHeaderButtons['back'] = '<a href="' . htmlspecialchars(GeneralUtility::linkThisUrl($this->returnUrl)) . '" class="typo3-goBack" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.goBack', TRUE) . '">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-view-go-back') . '</a>';
+                       $docHeaderButtons['back'] = '<a href="' . htmlspecialchars(GeneralUtility::linkThisUrl($this->returnUrl)) . '" class="typo3-goBack" title="' . $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.goBack', TRUE) . '">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-view-go-back') . '</a>';
                }
                // Add the HTML as a section:
                $markerArray = array(
                        'CSH' => $docHeaderButtons['csh'],
-                       'FUNC_MENU' => BackendUtility::getFuncMenu($this->id, 'SET[function]', $this->MOD_SETTINGS['function'], $this->MOD_MENU['function']),
+                       'FUNC_MENU' => '',
                        'CONTENT' => $pageContent,
                        'PATH' => $this->title
                );
@@ -262,4 +263,13 @@ class CreateFolderController {
                echo $this->content;
        }
 
+       /**
+        * Returns LanguageService
+        *
+        * @return \TYPO3\CMS\Lang\LanguageService
+        */
+       protected function getLanguageService() {
+               return $GLOBALS['LANG'];
+       }
+
 }
index c19564d..2342e31 100644 (file)
@@ -86,6 +86,7 @@ class EditFileController {
         * Initialize script class
         *
         * @return void
+        * @throws \TYPO3\CMS\Core\Resource\Exception\InsufficientFileAccessPermissionsException
         */
        protected function init() {
                // Setting target, which must be a file reference to a file within the mounts.
@@ -97,8 +98,8 @@ class EditFileController {
                }
                // Cleaning and checking target directory
                if (!$this->fileObject) {
-                       $title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:paramError', TRUE);
-                       $message = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:targetNoDir', TRUE);
+                       $title = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:paramError', TRUE);
+                       $message = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:targetNoDir', TRUE);
                        throw new \RuntimeException($title . ': ' . $message, 1294586841);
                }
                if ($this->fileObject->getStorage()->getUid() === 0) {
@@ -128,7 +129,7 @@ class EditFileController {
         */
        public function main() {
                $docHeaderButtons = $this->getButtons();
-               $this->content = $this->doc->startPage($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:file_edit.php.pagetitle'));
+               $this->content = $this->doc->startPage($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:file_edit.php.pagetitle'));
                // Hook before compiling the output
                if (isset($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/file_edit.php']['preOutputProcessingHook'])) {
                        $preOutputProcessingHook = &$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/file_edit.php']['preOutputProcessingHook'];
@@ -142,7 +143,7 @@ class EditFileController {
                                }
                        }
                }
-               $pageContent = $this->doc->header($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:file_edit.php.pagetitle') . ' ' . htmlspecialchars($this->fileObject->getName()));
+               $pageContent = $this->doc->header($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:file_edit.php.pagetitle') . ' ' . htmlspecialchars($this->fileObject->getName()));
                $pageContent .= $this->doc->spacer(2);
                $code = '';
                $extList = $GLOBALS['TYPO3_CONF_VARS']['SYS']['textfile_ext'];
@@ -160,20 +161,20 @@ class EditFileController {
                        // Edit textarea:
                        $code .= '
                                <div id="c-edit">
-                                       <textarea rows="30" name="file[editfile][0][data]" wrap="off"' . $this->doc->formWidth(48, TRUE, 'width:98%;height:80%') . ' class="text-monospace enable-tab">' . GeneralUtility::formatForTextarea($fileContent) . '</textarea>
+                                       <textarea rows="30" name="file[editfile][0][data]" wrap="off" ' . $this->doc->formWidth(48, TRUE, 'width:98%;height:80%') . ' class="text-monospace enable-tab">' . GeneralUtility::formatForTextarea($fileContent) . '</textarea>
                                        <input type="hidden" name="file[editfile][0][target]" value="' . $this->fileObject->getUid() . '" />
                                        <input type="hidden" name="redirect" value="' . htmlspecialchars($hValue) . '" />
                                        ' . \TYPO3\CMS\Backend\Form\FormEngine::getHiddenTokenField('tceAction') . '
                                </div>
                                <br />';
                        // Make shortcut:
-                       if ($GLOBALS['BE_USER']->mayMakeShortcut()) {
+                       if ($this->getBackendUser()->mayMakeShortcut()) {
                                $docHeaderButtons['shortcut'] = $this->doc->makeShortcutIcon('target', '', 'file_edit', 1);
                        } else {
                                $docHeaderButtons['shortcut'] = '';
                        }
                } catch (\Exception $e) {
-                       $code .= sprintf($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:file_edit.php.coundNot'), $extList);
+                       $code .= sprintf($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:file_edit.php.coundNot'), $extList);
                }
                // Ending of section and outputting editing form:
                $pageContent .= $this->doc->sectionEnd();
@@ -194,7 +195,7 @@ class EditFileController {
                // Add the HTML as a section:
                $markerArray = array(
                        'CSH' => $docHeaderButtons['csh'],
-                       'FUNC_MENU' => BackendUtility::getFuncMenu($this->id, 'SET[function]', $this->MOD_SETTINGS['function'], $this->MOD_MENU['function']),
+                       'FUNC_MENU' => '',
                        'BUTTONS' => $docHeaderButtons,
                        'PATH' => $this->title,
                        'CONTENT' => $pageContent
@@ -219,19 +220,38 @@ class EditFileController {
         * @return array
         */
        public function getButtons() {
+               $lang = $this->getLanguageService();
                $buttons = array();
                // CSH button
                $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'file_edit');
                // Save button
                $theIcon = IconUtility::getSpriteIcon('actions-document-save');
-               $buttons['SAVE'] = '<a href="#" onclick="document.editform.submit();" title="' . $GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:file_edit.php.submit', TRUE)) . '">' . $theIcon . '</a>';
+               $buttons['SAVE'] = '<a href="#" onclick="document.editform.submit();" title="' . $lang->makeEntities($lang->sL('LLL:EXT:lang/locallang_core.xlf:file_edit.php.submit', TRUE)) . '">' . $theIcon . '</a>';
                // Save and Close button
                $theIcon = IconUtility::getSpriteIcon('actions-document-save-close');
-               $buttons['SAVE_CLOSE'] = '<a href="#" onclick="document.editform.redirect.value=\'' . htmlspecialchars($this->returnUrl) . '\'; document.editform.submit();" title="' . $GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:file_edit.php.saveAndClose', TRUE)) . '">' . $theIcon . '</a>';
+               $buttons['SAVE_CLOSE'] = '<a href="#" onclick="document.editform.redirect.value=\'' . htmlspecialchars($this->returnUrl) . '\'; document.editform.submit();" title="' . $lang->makeEntities($lang->sL('LLL:EXT:lang/locallang_core.xlf:file_edit.php.saveAndClose', TRUE)) . '">' . $theIcon . '</a>';
                // Cancel button
                $theIcon = IconUtility::getSpriteIcon('actions-document-close');
-               $buttons['CANCEL'] = '<a href="#" onclick="backToList(); return false;" title="' . $GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.cancel', TRUE)) . '">' . $theIcon . '</a>';
+               $buttons['CANCEL'] = '<a href="#" onclick="backToList(); return false;" title="' . $lang->makeEntities($lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.cancel', TRUE)) . '">' . $theIcon . '</a>';
                return $buttons;
        }
 
+       /**
+        * Returns LanguageService
+        *
+        * @return \TYPO3\CMS\Lang\LanguageService
+        */
+       protected function getLanguageService() {
+               return $GLOBALS['LANG'];
+       }
+
+       /**
+        * Returns the current BE user.
+        *
+        * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
+        */
+       protected function getBackendUser() {
+               return $GLOBALS['BE_USER'];
+       }
+
 }
index 18b4037..3918ffa 100644 (file)
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
 
 /**
  * Gateway for TCE (TYPO3 Core Engine) file-handling through POST forms.
- * This script serves as the fileadministration part of the TYPO3 Core Engine.
+ * This script serves as the file administration part of the TYPO3 Core Engine.
  * Basically it includes two libraries which are used to manipulate files on the server.
  * Before TYPO3 4.3, it was located in typo3/tce_file.php and redirected back to a
  * $redirectURL. Since 4.3 this class is also used for accessing via AJAX
@@ -137,7 +137,7 @@ class FileController {
                // Checking referrer / executing:
                $refInfo = parse_url(GeneralUtility::getIndpEnv('HTTP_REFERER'));
                $httpHost = GeneralUtility::getIndpEnv('TYPO3_HOST_ONLY');
-               if ($httpHost != $refInfo['host'] && $this->vC != $GLOBALS['BE_USER']->veriCode() && !$GLOBALS['TYPO3_CONF_VARS']['SYS']['doNotCheckReferer'] && $GLOBALS['CLIENT']['BROWSER'] != 'flash') {
+               if ($httpHost != $refInfo['host'] && $this->vC != $this->getBackendUser()->veriCode() && !$GLOBALS['TYPO3_CONF_VARS']['SYS']['doNotCheckReferer'] && $GLOBALS['CLIENT']['BROWSER'] != 'flash') {
                        $this->fileProcessor->writeLog(0, 2, 1, 'Referrer host "%s" and server host "%s" did not match!', array($refInfo['host'], $httpHost));
                } else {
                        $this->fileProcessor->start($this->file);
@@ -206,7 +206,6 @@ class FileController {
         * @return bool|string|array
         */
        protected function flattenResultDataValue($result) {
-
                if ($result instanceof \TYPO3\CMS\Core\Resource\File) {
                        $result = array_merge(
                                $result->toArray(),
@@ -222,4 +221,13 @@ class FileController {
                return $result;
        }
 
+       /**
+        * Returns the current BE user.
+        *
+        * @return \TYPO3\CMS\Core\Authentication\BackendUserAuthentication
+        */
+       protected function getBackendUser() {
+               return $GLOBALS['BE_USER'];
+       }
+
 }
index 4891510..b36683a 100644 (file)
@@ -71,7 +71,7 @@ class FileUploadController {
         */
        public function __construct() {
                $GLOBALS['SOBE'] = $this;
-               $GLOBALS['LANG']->includeLLFile('EXT:lang/locallang_misc.xlf');
+               $this->getLanguageService()->includeLLFile('EXT:lang/locallang_misc.xlf');
                $GLOBALS['BACK_PATH'] = '';
 
                $this->init();
@@ -99,8 +99,8 @@ class FileUploadController {
 
                // Cleaning and checking target directory
                if (!$this->folderObject) {
-                       $title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:paramError', TRUE);
-                       $message = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:targetNoDir', TRUE);
+                       $title = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:paramError', TRUE);
+                       $message = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_file_list.xlf:targetNoDir', TRUE);
                        throw new \RuntimeException($title . ': ' . $message, 1294586843);
                }
                // Setting the title and the icon
@@ -120,9 +120,9 @@ class FileUploadController {
         */
        public function main() {
                // Make page header:
-               $this->content = $this->doc->startPage($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:file_upload.php.pagetitle'));
+               $this->content = $this->doc->startPage($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:file_upload.php.pagetitle'));
                $form = $this->renderUploadForm();
-               $pageContent = $this->doc->header($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:file_upload.php.pagetitle')) . $this->doc->section('', $form);
+               $pageContent = $this->doc->header($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:file_upload.php.pagetitle')) . $this->doc->section('', $form);
                // Header Buttons
                $docHeaderButtons = array(
                        'csh' => BackendUtility::cshItem('xMOD_csh_corebe', 'file_upload'),
@@ -130,13 +130,13 @@ class FileUploadController {
                );
                $markerArray = array(
                        'CSH' => $docHeaderButtons['csh'],
-                       'FUNC_MENU' => BackendUtility::getFuncMenu($this->id, 'SET[function]', $this->MOD_SETTINGS['function'], $this->MOD_MENU['function']),
+                       'FUNC_MENU' => '',
                        'CONTENT' => $pageContent,
                        'PATH' => $this->title
                );
                // Back
                if ($this->returnUrl) {
-                       $docHeaderButtons['back'] = '<a href="' . htmlspecialchars(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisUrl($this->returnUrl)) . '" class="typo3-goBack" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.goBack', TRUE) . '">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-view-go-back') . '</a>';
+                       $docHeaderButtons['back'] = '<a href="' . htmlspecialchars(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisUrl($this->returnUrl)) . '" class="typo3-goBack" title="' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.goBack', TRUE) . '">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-view-go-back') . '</a>';
                }
                $this->content .= $this->doc->moduleBody(array(), $docHeaderButtons, $markerArray);
                $this->content .= $this->doc->endPage();
@@ -146,15 +146,15 @@ class FileUploadController {
        /**
         * This function renders the upload form
         *
-        * @return      string  the HTML form as a string, ready for outputting
+        * @return string The HTML form as a string, ready for outputting
         */
        public function renderUploadForm() {
                // Make checkbox for "overwrite"
                $content = '
                        <div id="c-override">
-                               <p><label for="overwriteExistingFiles"><input type="checkbox" class="checkbox" name="overwriteExistingFiles" id="overwriteExistingFiles" value="1" /> ' . $GLOBALS['LANG']->getLL('overwriteExistingFiles', 1) . '</label></p>
+                               <p><label for="overwriteExistingFiles"><input type="checkbox" class="checkbox" name="overwriteExistingFiles" id="overwriteExistingFiles" value="1" /> ' . $this->getLanguageService()->getLL('overwriteExistingFiles', 1) . '</label></p>
                                <p>&nbsp;</p>
-                               <p>' . $GLOBALS['LANG']->getLL('uploadMultipleFilesInfo', TRUE) . '</p>
+                               <p>' . $this->getLanguageService()->getLL('uploadMultipleFilesInfo', TRUE) . '</p>
                        </div>
                        ';
                // Produce the number of upload-fields needed:
@@ -175,7 +175,7 @@ class FileUploadController {
                        <div id="c-submit">
                                <input type="hidden" name="redirect" value="' . $this->returnUrl . '" /><br />
                                ' . \TYPO3\CMS\Backend\Form\FormEngine::getHiddenTokenField('tceAction') . '
-                               <input class="btn btn-default" type="submit" value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:file_upload.php.submit', TRUE) . '" />
+                               <input class="btn btn-default" type="submit" value="' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:file_upload.php.submit', TRUE) . '" />
                        </div>
                ';
                return $content;
@@ -190,4 +190,13 @@ class FileUploadController {
                echo $this->content;
        }
 
+       /**
+        * Returns LanguageService
+        *
+        * @return \TYPO3\CMS\Lang\LanguageService
+        */
+       protected function getLanguageService() {
+               return $GLOBALS['LANG'];
+       }
+
 }