[TASK] Remove usage of the keyword global 50/33650/4
authorWouter Wolters <typo3@wouterwolters.nl>
Thu, 30 Oct 2014 22:57:50 +0000 (23:57 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Wed, 5 Nov 2014 21:50:05 +0000 (22:50 +0100)
Resolves: #47207
Releases: master
Change-Id: I953d05d478ae03626c235553ce8fe56ec13eb4f9
Reviewed-on: http://review.typo3.org/33650
Reviewed-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Tested-by: Stefan Neufeind <typo3.neufeind@speedpartner.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
48 files changed:
typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php
typo3/sysext/css_styled_content/Classes/Controller/CssStyledContentController.php
typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
typo3/sysext/frontend/Classes/Controller/PageInformationController.php
typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php
typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
typo3/sysext/impexp/Classes/Clickmenu.php
typo3/sysext/impexp/Classes/ImportExport.php
typo3/sysext/indexed_search/Classes/Controller/IndexedPagesController.php
typo3/sysext/indexed_search/Classes/Controller/IndexingStatisticsController.php
typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php
typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
typo3/sysext/indexed_search/Classes/Indexer.php
typo3/sysext/lowlevel/Classes/CleanFlexformCommand.php
typo3/sysext/lowlevel/Classes/DeletedRecordsCommand.php
typo3/sysext/lowlevel/Classes/DoubleFilesCommand.php
typo3/sysext/lowlevel/Classes/LostFilesCommand.php
typo3/sysext/lowlevel/Classes/MissingFilesCommand.php
typo3/sysext/lowlevel/Classes/MissingRelationsCommand.php
typo3/sysext/lowlevel/Classes/OrphanRecordsCommand.php
typo3/sysext/lowlevel/Classes/RteImagesCommand.php
typo3/sysext/lowlevel/Classes/SyslogCommand.php
typo3/sysext/lowlevel/Classes/VersionsCommand.php
typo3/sysext/lowlevel/Classes/View/ConfigurationView.php
typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php
typo3/sysext/rtehtmlarea/Classes/ContentParser.php
typo3/sysext/rtehtmlarea/Classes/Controller/FrontendRteController.php
typo3/sysext/rtehtmlarea/Classes/Extension/AboutEditor.php
typo3/sysext/rtehtmlarea/Classes/Extension/BlockElements.php
typo3/sysext/rtehtmlarea/Classes/Extension/CharacterMap.php
typo3/sysext/rtehtmlarea/Classes/Extension/DefaultImage.php
typo3/sysext/rtehtmlarea/Classes/Extension/DefaultInline.php
typo3/sysext/rtehtmlarea/Classes/Extension/DefinitionList.php
typo3/sysext/rtehtmlarea/Classes/Extension/FindReplace.php
typo3/sysext/rtehtmlarea/Classes/Extension/InlineElements.php
typo3/sysext/rtehtmlarea/Classes/Extension/InsertSmiley.php
typo3/sysext/rtehtmlarea/Classes/Extension/RemoveFormat.php
typo3/sysext/rtehtmlarea/Classes/Extension/TableOperations.php
typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Link.php
typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaApi.php
typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaBase.php
typo3/sysext/setup/Classes/Controller/SetupModuleController.php
typo3/sysext/sv/Classes/AuthenticationService.php
typo3/sysext/t3skin/ext_tables.php
typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateConstantEditorModuleFunctionController.php
typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php
typo3/sysext/workspaces/Classes/Service/AutoPublishService.php
typo3/sysext/workspaces/Classes/Service/StagesService.php

index 26156b9..a9b16e4 100644 (file)
@@ -133,11 +133,10 @@ class ElementBrowserRecordList extends \TYPO3\CMS\Recordlist\RecordList\Database
         * @param string $fieldName Field name
         */
        public function setRelatingTableAndField($tableName, $fieldName) {
-               global $TCA;
                // Check validity of the input data and load TCA
-               if (isset($TCA[$tableName])) {
+               if (isset($GLOBALS['TCA'][$tableName])) {
                        $this->relatingTable = $tableName;
-                       if ($fieldName && isset($TCA[$tableName]['columns'][$fieldName])) {
+                       if ($fieldName && isset($GLOBALS['TCA'][$tableName]['columns'][$fieldName])) {
                                $this->relatingField = $fieldName;
                        }
                }
index a45f4d3..2d1cb70 100644 (file)
@@ -1260,10 +1260,9 @@ class CssStyledContentController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlug
         * @return object Hook object, if any. Otherwise NULL.
         */
        public function hookRequest($functionName) {
-               global $TYPO3_CONF_VARS;
                // Hook: menuConfig_preProcessModMenu
-               if ($TYPO3_CONF_VARS['EXTCONF']['css_styled_content']['pi1_hooks'][$functionName]) {
-                       $hookObj = GeneralUtility::getUserObj($TYPO3_CONF_VARS['EXTCONF']['css_styled_content']['pi1_hooks'][$functionName]);
+               if ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['css_styled_content']['pi1_hooks'][$functionName]) {
+                       $hookObj = GeneralUtility::getUserObj($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['css_styled_content']['pi1_hooks'][$functionName]);
                        if (method_exists($hookObj, $functionName)) {
                                $hookObj->pObj = $this;
                                return $hookObj;
index 86cfdd6..1535087 100644 (file)
@@ -514,22 +514,21 @@ class ContentObjectRenderer {
         * @return void
         */
        public function start($data, $table = '') {
-               global $TYPO3_CONF_VARS;
-               if ($TYPO3_CONF_VARS['FE']['activateContentAdapter'] && is_array($data) && !empty($data) && !empty($table)) {
+               if ($GLOBALS['TYPO3_CONF_VARS']['FE']['activateContentAdapter'] && is_array($data) && !empty($data) && !empty($table)) {
                        \TYPO3\CMS\Core\Resource\Service\FrontendContentAdapterService::modifyDBRow($data, $table);
                }
                $this->data = $data;
                $this->table = $table;
                $this->currentRecord = $table ? $table . ':' . $this->data['uid'] : '';
                $this->parameters = array();
-               if (is_array($TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_content.php']['cObjTypeAndClass'])) {
-                       foreach ($TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_content.php']['cObjTypeAndClass'] as $classArr) {
+               if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_content.php']['cObjTypeAndClass'])) {
+                       foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_content.php']['cObjTypeAndClass'] as $classArr) {
                                $this->cObjHookObjectsRegistry[$classArr[0]] = $classArr[1];
                        }
                }
                $this->stdWrapHookObjects = array();
-               if (is_array($TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_content.php']['stdWrap'])) {
-                       foreach ($TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_content.php']['stdWrap'] as $classData) {
+               if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_content.php']['stdWrap'])) {
+                       foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_content.php']['stdWrap'] as $classData) {
                                $hookObject = GeneralUtility::getUserObj($classData);
                                if (!$hookObject instanceof \TYPO3\CMS\Frontend\ContentObject\ContentObjectStdWrapHookInterface) {
                                        throw new \UnexpectedValueException($classData . ' must implement interface TYPO3\\CMS\\Frontend\\ContentObject\\ContentObjectStdWrapHookInterface', 1195043965);
@@ -537,8 +536,8 @@ class ContentObjectRenderer {
                                $this->stdWrapHookObjects[] = $hookObject;
                        }
                }
-               if (is_array($TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_content.php']['postInit'])) {
-                       foreach ($TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_content.php']['postInit'] as $classData) {
+               if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_content.php']['postInit'])) {
+                       foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_content.php']['postInit'] as $classData) {
                                $postInitializationProcessor = GeneralUtility::getUserObj($classData);
                                if (!$postInitializationProcessor instanceof \TYPO3\CMS\Frontend\ContentObject\ContentObjectPostInitHookInterface) {
                                        throw new \UnexpectedValueException($classData . ' must implement interface TYPO3\\CMS\\Frontend\\ContentObject\\ContentObjectPostInitHookInterface', 1274563549);
@@ -657,7 +656,6 @@ class ContentObjectRenderer {
         * @throws \UnexpectedValueException
         */
        public function cObjGetSingle($name, $conf, $TSkey = '__') {
-               global $TYPO3_CONF_VARS;
                $content = '';
                // Checking that the function is not called eternally. This is done by interrupting at a depth of 100
                $GLOBALS['TSFE']->cObjectDepthCounter--;
@@ -697,8 +695,8 @@ class ContentObjectRenderer {
                                                $content .= $this->render($contentObject, $conf);
                                        } else {
                                                // Call hook functions for extra processing
-                                               if ($name && is_array($TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_content.php']['cObjTypeAndClassDefault'])) {
-                                                       foreach ($TYPO3_CONF_VARS['SC_OPTIONS']['tslib/class.tslib_content.php']['cObjTypeAndClassDefault'] as $classData) {
+                                               if ($name && is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_content.php']['cObjTypeAndClassDefault'])) {
+                                                       foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_content.php']['cObjTypeAndClassDefault'] as $classData) {
                                                                $hookObject = GeneralUtility::getUserObj($classData);
                                                                if (!$hookObject instanceof \TYPO3\CMS\Frontend\ContentObject\ContentObjectGetSingleHookInterface) {
                                                                        throw new \UnexpectedValueException('$hookObject must implement interface TYPO3\\CMS\\Frontend\\ContentObject\\ContentObjectGetSingleHookInterface', 1195043731);
@@ -5256,7 +5254,7 @@ class ContentObjectRenderer {
                                $processingConfiguration['additionalParameters'] = isset($fileArray['params.']) ? $this->stdWrap($fileArray['params'], $fileArray['params.']) : $fileArray['params'];
                                $processingConfiguration['frame'] = isset($fileArray['frame.']) ? (int)$this->stdWrap($fileArray['frame'], $fileArray['frame.']) : (int)$fileArray['frame'];
                                // Possibility to cancel/force profile extraction
-                               // see $TYPO3_CONF_VARS['GFX']['im_stripProfileCommand']
+                               // see $GLOBALS['TYPO3_CONF_VARS']['GFX']['im_stripProfileCommand']
                                if (isset($fileArray['stripProfile'])) {
                                        $processingConfiguration['stripProfile'] = $fileArray['stripProfile'];
                                }
@@ -7565,7 +7563,6 @@ class ContentObjectRenderer {
         * @return string The WHERE clause.
         */
        public function searchWhere($sw, $searchFieldList, $searchTable = '') {
-               global $TYPO3_DB;
                $prefixTableName = $searchTable ? $searchTable . '.' : '';
                $where = '';
                if ($sw) {
@@ -7575,7 +7572,7 @@ class ContentObjectRenderer {
                                $val = trim($val);
                                $where_p = array();
                                if (strlen($val) >= 2) {
-                                       $val = $TYPO3_DB->escapeStrForLike($TYPO3_DB->quoteStr($val, $searchTable), $searchTable);
+                                       $val = $GLOBALS['TYPO3_DB']->escapeStrForLike($GLOBALS['TYPO3_DB']->quoteStr($val, $searchTable), $searchTable);
                                        foreach ($searchFields as $field) {
                                                $where_p[] = $prefixTableName . $field . ' LIKE \'%' . $val . '%\'';
                                        }
index 77e43bd..22677ab 100644 (file)
@@ -29,19 +29,18 @@ class PageInformationController extends \TYPO3\CMS\Backend\Module\AbstractFuncti
         * @return      array
         */
        public function modMenu() {
-               global $LANG;
                return array(
                        'pages' => array(
-                               0 => $LANG->sL('LLL:EXT:cms/web_info/locallang.xlf:pages_0'),
-                               2 => $LANG->sL('LLL:EXT:cms/web_info/locallang.xlf:pages_2'),
-                               1 => $LANG->sL('LLL:EXT:cms/web_info/locallang.xlf:pages_1')
+                               0 => $GLOBALS['LANG']->sL('LLL:EXT:cms/web_info/locallang.xlf:pages_0'),
+                               2 => $GLOBALS['LANG']->sL('LLL:EXT:cms/web_info/locallang.xlf:pages_2'),
+                               1 => $GLOBALS['LANG']->sL('LLL:EXT:cms/web_info/locallang.xlf:pages_1')
                        ),
                        'depth' => array(
-                               0 => $LANG->getLL('depth_0'),
-                               1 => $LANG->getLL('depth_1'),
-                               2 => $LANG->getLL('depth_2'),
-                               3 => $LANG->getLL('depth_3'),
-                               999 => $LANG->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_infi')
+                               0 => $GLOBALS['LANG']->getLL('depth_0'),
+                               1 => $GLOBALS['LANG']->getLL('depth_1'),
+                               2 => $GLOBALS['LANG']->getLL('depth_2'),
+                               3 => $GLOBALS['LANG']->getLL('depth_3'),
+                               999 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_infi')
                        )
                );
        }
@@ -52,15 +51,14 @@ class PageInformationController extends \TYPO3\CMS\Backend\Module\AbstractFuncti
         * @return string Output HTML for the module.
         */
        public function main() {
-               global $BACK_PATH, $LANG, $SOBE;
                $dblist = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\View\\PageLayoutView');
                $dblist->descrTable = '_MOD_' . $GLOBALS['MCONF']['name'];
-               $dblist->backPath = $BACK_PATH;
+               $dblist->backPath = $GLOBALS['BACK_PATH'];
                $dblist->thumbs = 0;
                $dblist->script = BackendUtility::getModuleUrl('web_info');
                $dblist->showIcon = 0;
                $dblist->setLMargin = 0;
-               $dblist->agePrefixes = $LANG->sL('LLL:EXT:lang/locallang_core.xlf:labels.minutesHoursDaysYears');
+               $dblist->agePrefixes = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.minutesHoursDaysYears');
                $dblist->pI_showUser = 1;
                // PAGES:
                $this->pObj->MOD_SETTINGS['pages_levels'] = $this->pObj->MOD_SETTINGS['depth'];
@@ -70,7 +68,7 @@ class PageInformationController extends \TYPO3\CMS\Backend\Module\AbstractFuncti
                $dblist->start($this->pObj->id, 'pages', 0);
                $dblist->generateList();
                // CSH
-               $theOutput = $this->pObj->doc->header($LANG->sL('LLL:EXT:cms/web_info/locallang.xlf:page_title'));
+               $theOutput = $this->pObj->doc->header($GLOBALS['LANG']->sL('LLL:EXT:cms/web_info/locallang.xlf:page_title'));
                $theOutput .= $this->pObj->doc->section('', BackendUtility::cshItem($dblist->descrTable, 'pagetree_overview', $GLOBALS['BACK_PATH'], '|<br />') . $h_func . $dblist->HTMLcode, 0, 1);
                // Additional footer content
                $footerContentHook = $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms/web_info/class.tx_cms_webinfo.php']['drawFooterHook'];
index 49354d4..ca092fb 100644 (file)
@@ -30,14 +30,13 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
         * @return array
         */
        public function modMenu() {
-               global $LANG;
                $menuArray = array(
                        'depth' => array(
-                               0 => $LANG->getLL('depth_0'),
-                               1 => $LANG->getLL('depth_1'),
-                               2 => $LANG->getLL('depth_2'),
-                               3 => $LANG->getLL('depth_3'),
-                               999 => $LANG->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_infi')
+                               0 => $GLOBALS['LANG']->getLL('depth_0'),
+                               1 => $GLOBALS['LANG']->getLL('depth_1'),
+                               2 => $GLOBALS['LANG']->getLL('depth_2'),
+                               3 => $GLOBALS['LANG']->getLL('depth_3'),
+                               999 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_infi')
                        )
                );
                // Languages:
@@ -57,8 +56,7 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
         * @return string Output HTML for the module.
         */
        public function main() {
-               global $BACK_PATH, $LANG, $SOBE;
-               $theOutput = $this->pObj->doc->header($LANG->sL('LLL:EXT:cms/web_info/locallang.xlf:lang_title'));
+               $theOutput = $this->pObj->doc->header($GLOBALS['LANG']->sL('LLL:EXT:cms/web_info/locallang.xlf:lang_title'));
                if ($this->pObj->id) {
                        // Depth selector:
                        $h_func = BackendUtility::getFuncMenu($this->pObj->id, 'SET[depth]', $this->pObj->MOD_SETTINGS['depth'], $this->pObj->MOD_MENU['depth']);
@@ -98,7 +96,6 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
         * @return string HTML for the localization information table.
         */
        public function renderL10nTable(&$tree) {
-               global $LANG;
                // System languages retrieved:
                $languages = $this->getSystemLanguages();
                // Title length:
@@ -116,7 +113,7 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
                        // "View page" link is created:
                        $viewPageLink = '<a href="#" onclick="' . htmlspecialchars(BackendUtility::viewOnClick(
                                        $data['row']['uid'], $GLOBALS['BACK_PATH'], '', '', '', '&L=###LANG_UID###')
-                               ) . '" title="' . $LANG->sL('LLL:EXT:cms/web_info/locallang.xlf:lang_renderl10n_viewPage') . '">' .
+                               ) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:cms/web_info/locallang.xlf:lang_renderl10n_viewPage') . '">' .
                                IconUtility::getSpriteIcon('actions-document-view') . '</a>';
                        $status = $data['row']['l18n_cfg'] & 1 ? 'c-blocked' : 'c-ok';
                        // Create links:
@@ -125,20 +122,20 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
                        $params = '&edit[pages][' . $editUid . ']=edit';
                        $info .= '<a href="#" onclick="' . htmlspecialchars(BackendUtility::editOnClick(
                                        $params, $GLOBALS['BACK_PATH'])
-                               ) . '" title="' . $LANG->sL(
+                               ) . '" title="' . $GLOBALS['LANG']->sL(
                                        'LLL:EXT:cms/web_info/locallang.xlf:lang_renderl10n_editDefaultLanguagePage'
                                ) . '">' . IconUtility::getSpriteIcon('actions-document-open') . '</a>';
                        $info .= '<a href="#" onclick="' . htmlspecialchars(
                                        'top.loadEditId(' . (int)$data['row']['uid'] . ',"&SET[language]=0"); return false;'
-                               ) . '" title="' . $LANG->sL('LLL:EXT:cms/web_info/locallang.xlf:lang_renderl10n_editPage') . '">' .
+                               ) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:cms/web_info/locallang.xlf:lang_renderl10n_editPage') . '">' .
                                IconUtility::getSpriteIcon('actions-page-open') . '</a>';
                        $info .= str_replace('###LANG_UID###', '0', $viewPageLink);
                        $info .= '&nbsp;';
-                       $info .= $data['row']['l18n_cfg'] & 1 ? '<span title="' . $LANG->sL('LLL:EXT:cms/locallang_tca.xlf:pages.l18n_cfg.I.1', TRUE) . '">D</span>' : '&nbsp;';
-                       $info .= \TYPO3\CMS\Core\Utility\GeneralUtility::hideIfNotTranslated($data['row']['l18n_cfg']) ? '<span title="' . $LANG->sL('LLL:EXT:cms/locallang_tca.xlf:pages.l18n_cfg.I.2', TRUE) . '">N</span>' : '&nbsp;';
+                       $info .= $data['row']['l18n_cfg'] & 1 ? '<span title="' . $GLOBALS['LANG']->sL('LLL:EXT:cms/locallang_tca.xlf:pages.l18n_cfg.I.1', TRUE) . '">D</span>' : '&nbsp;';
+                       $info .= \TYPO3\CMS\Core\Utility\GeneralUtility::hideIfNotTranslated($data['row']['l18n_cfg']) ? '<span title="' . $GLOBALS['LANG']->sL('LLL:EXT:cms/locallang_tca.xlf:pages.l18n_cfg.I.2', TRUE) . '">N</span>' : '&nbsp;';
                        // Put into cell:
                        $tCells[] = '<td class="' . $status . ' c-leftLine">' . $info . '</td>';
-                       $tCells[] = '<td class="' . $status . '" title="' . $LANG->sL(
+                       $tCells[] = '<td class="' . $status . '" title="' . $GLOBALS['LANG']->sL(
                                        'LLL:EXT:cms/web_info/locallang.xlf:lang_renderl10n_CEcount'
                                ) . '" align="center">' . $this->getContentElementCount($data['row']['uid'], 0) . '</td>';
                        $modSharedTSconfig = BackendUtility::getModTSconfig($data['row']['uid'], 'mod.SHARED');
@@ -160,7 +157,7 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
                                                                \TYPO3\CMS\Core\Utility\GeneralUtility::fixed_lgd_cs($row['title'], $titleLen)
                                                        ) . ((string)$row['nav_title'] !== '' ? ' [Nav: <em>' . htmlspecialchars(
                                                                \TYPO3\CMS\Core\Utility\GeneralUtility::fixed_lgd_cs($row['nav_title'], $titleLen)
-                                                       ) . '</em>]' : '') . ($row['_COUNT'] > 1 ? '<div>' . $LANG->sL(
+                                                       ) . '</em>]' : '') . ($row['_COUNT'] > 1 ? '<div>' . $GLOBALS['LANG']->sL(
                                                                'LLL:EXT:cms/web_info/locallang.xlf:lang_renderl10n_badThingThereAre'
                                                        ) . '</div>' : '');
                                                $tCells[] = '<td class="' . $status . ' c-leftLine">' . $info . '</td>';
@@ -170,17 +167,17 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
                                                $params = '&edit[pages_language_overlay][' . $editUid . ']=edit';
                                                $info .= '<a href="#" onclick="' . htmlspecialchars(
                                                                BackendUtility::editOnClick($params, $GLOBALS['BACK_PATH'])
-                                                       ) . '" title="' . $LANG->sL(
+                                                       ) . '" title="' . $GLOBALS['LANG']->sL(
                                                                'LLL:EXT:cms/web_info/locallang.xlf:lang_renderl10n_editLanguageOverlayRecord'
                                                        ) . '">' . IconUtility::getSpriteIcon('actions-document-open') . '</a>';
                                                $info .= '<a href="#" onclick="' . htmlspecialchars(
                                                                'top.loadEditId(' . (int)$data['row']['uid'] . ',"&SET[language]=' . $langRow['uid'] . '"); return false;'
-                                                       ) . '" title="' . $LANG->sL(
+                                                       ) . '" title="' . $GLOBALS['LANG']->sL(
                                                                'LLL:EXT:cms/web_info/locallang.xlf:lang_renderl10n_editPageLang'
                                                        ) . '">' . IconUtility::getSpriteIcon('actions-page-open') . '</a>';
                                                $info .= str_replace('###LANG_UID###', $langRow['uid'], $viewPageLink);
                                                $tCells[] = '<td class="' . $status . '">' . $info . '</td>';
-                                               $tCells[] = '<td class="' . $status . '" title="' . $LANG->sL(
+                                               $tCells[] = '<td class="' . $status . '" title="' . $GLOBALS['LANG']->sL(
                                                                'LLL:EXT:cms/web_info/locallang.xlf:lang_renderl10n_CEcount'
                                                        ) . '" align="center">' . $this->getContentElementCount($data['row']['uid'], $langRow['uid']) . '</td>';
                                        } else {
@@ -209,18 +206,18 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
                }
                // Put together HEADER:
                $tCells = array();
-               $tCells[] = '<td>' . $LANG->sL('LLL:EXT:cms/web_info/locallang.xlf:lang_renderl10n_page') . ':</td>';
+               $tCells[] = '<td>' . $GLOBALS['LANG']->sL('LLL:EXT:cms/web_info/locallang.xlf:lang_renderl10n_page') . ':</td>';
                if (is_array($langRecUids[0])) {
                        $params = '&edit[pages][' . implode(',', $langRecUids[0]) . ']=edit&columnsOnly=title,nav_title,l18n_cfg,hidden';
                        $editIco = '<a href="#" onclick="' . htmlspecialchars(
                                        BackendUtility::editOnClick($params, $GLOBALS['BACK_PATH'])
-                               ) . '" title="' . $LANG->sL(
+                               ) . '" title="' . $GLOBALS['LANG']->sL(
                                        'LLL:EXT:cms/web_info/locallang.xlf:lang_renderl10n_editPageProperties'
                                ) . '">' . IconUtility::getSpriteIcon('actions-document-new') . '</a>';
                } else {
                        $editIco = '';
                }
-               $tCells[] = '<td class="c-leftLine" colspan="2">' . $LANG->sL(
+               $tCells[] = '<td class="c-leftLine" colspan="2">' . $GLOBALS['LANG']->sL(
                                'LLL:EXT:cms/web_info/locallang.xlf:lang_renderl10n_default'
                        ) . ':' . $editIco . '</td>';
                foreach ($languages as $langRow) {
@@ -234,7 +231,7 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
                                                ']=edit&columnsOnly=title,nav_title,hidden';
                                        $tCells[] = '<td><a href="#" onclick="' . htmlspecialchars(
                                                        BackendUtility::editOnClick($params, $GLOBALS['BACK_PATH'])
-                                               ) . '" title="' . $LANG->sL(
+                                               ) . '" title="' . $GLOBALS['LANG']->sL(
                                                        'LLL:EXT:cms/web_info/locallang.xlf:lang_renderl10n_editLangOverlays'
                                                ) . '">' . IconUtility::getSpriteIcon('actions-document-open') . '</a></td>';
                                } else {
@@ -247,7 +244,7 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
                                        $langRow['uid'];
                                $tCells[] = '<td><a href="#" onclick="' . htmlspecialchars(
                                                BackendUtility::editOnClick($params, $GLOBALS['BACK_PATH'])
-                                       ) . '" title="' . $LANG->sL(
+                                       ) . '" title="' . $GLOBALS['LANG']->sL(
                                                'LLL:EXT:cms/web_info/locallang.xlf:lang_getlangsta_createNewTranslationHeaders'
                                        ) . '">' . IconUtility::getSpriteIcon('actions-document-new') . '</a></td>';
                        }
index b2ab0b2..909f8bc 100644 (file)
@@ -4200,6 +4200,7 @@ class TypoScriptFrontendController {
         *
         * @param array $libraries The libraries to be included.
         * @return void
+        * @todo deprecate this method
         */
        public function includeLibraries(array $libraries) {
                global $TYPO3_CONF_VARS;
index 77f9d37..d40e862 100644 (file)
@@ -73,8 +73,7 @@ class Clickmenu {
         * @return array Local lang array
         */
        public function includeLL() {
-               global $LANG;
-               return $LANG->includeLLFile('EXT:impexp/app/locallang.xlf', FALSE);
+               return $GLOBALS['LANG']->includeLLFile('EXT:impexp/app/locallang.xlf', FALSE);
        }
 
 }
index 55ca715..5f275cc 100644 (file)
@@ -3280,22 +3280,21 @@ class ImportExport {
         * @see loadInit()
         */
        public function fixCharsets() {
-               global $LANG;
                $importCharset = $this->dat['header']['charset'];
                if ($importCharset) {
-                       if ($importCharset !== $LANG->charSet) {
-                               $this->error('CHARSET: Converting charset of input file (' . $importCharset . ') to the system charset (' . $LANG->charSet . ')');
+                       if ($importCharset !== $GLOBALS['LANG']->charSet) {
+                               $this->error('CHARSET: Converting charset of input file (' . $importCharset . ') to the system charset (' . $GLOBALS['LANG']->charSet . ')');
                                // Convert meta data:
                                if (is_array($this->dat['header']['meta'])) {
-                                       $LANG->csConvObj->convArray($this->dat['header']['meta'], $importCharset, $LANG->charSet);
+                                       $GLOBALS['LANG']->csConvObj->convArray($this->dat['header']['meta'], $importCharset, $GLOBALS['LANG']->charSet);
                                }
                                // Convert record headers:
                                if (is_array($this->dat['header']['records'])) {
-                                       $LANG->csConvObj->convArray($this->dat['header']['records'], $importCharset, $LANG->charSet);
+                                       $GLOBALS['LANG']->csConvObj->convArray($this->dat['header']['records'], $importCharset, $GLOBALS['LANG']->charSet);
                                }
                                // Convert records themselves:
                                if (is_array($this->dat['records'])) {
-                                       $LANG->csConvObj->convArray($this->dat['records'], $importCharset, $LANG->charSet);
+                                       $GLOBALS['LANG']->csConvObj->convArray($this->dat['records'], $importCharset, $GLOBALS['LANG']->charSet);
                                }
                        }
                } else {
@@ -3313,7 +3312,6 @@ class ImportExport {
         * @return string HTML content
         */
        public function displayContentOverview() {
-               global $LANG;
                // Check extension dependencies:
                if (is_array($this->dat['header']['extensionDependencies'])) {
                        foreach ($this->dat['header']['extensionDependencies'] as $extKey) {
@@ -3336,13 +3334,13 @@ class ImportExport {
                                $rows = array();
                                $rows[] = '
                                <tr class="bgColor5 tableheader">
-                                       <td>' . $LANG->getLL('impexpcore_displaycon_controls', TRUE) . '</td>
-                                       <td>' . $LANG->getLL('impexpcore_displaycon_title', TRUE) . '</td>
-                                       <td>' . $LANG->getLL('impexpcore_displaycon_size', TRUE) . '</td>
-                                       <td>' . $LANG->getLL('impexpcore_displaycon_message', TRUE) . '</td>
-                                       ' . ($this->update ? '<td>' . $LANG->getLL('impexpcore_displaycon_updateMode', TRUE) . '</td>' : '') . '
-                                       ' . ($this->update ? '<td>' . $LANG->getLL('impexpcore_displaycon_currentPath', TRUE) . '</td>' : '') . '
-                                       ' . ($this->showDiff ? '<td>' . $LANG->getLL('impexpcore_displaycon_result', TRUE) . '</td>' : '') . '
+                                       <td>' . $GLOBALS['LANG']->getLL('impexpcore_displaycon_controls', TRUE) . '</td>
+                                       <td>' . $GLOBALS['LANG']->getLL('impexpcore_displaycon_title', TRUE) . '</td>
+                                       <td>' . $GLOBALS['LANG']->getLL('impexpcore_displaycon_size', TRUE) . '</td>
+                                       <td>' . $GLOBALS['LANG']->getLL('impexpcore_displaycon_message', TRUE) . '</td>
+                                       ' . ($this->update ? '<td>' . $GLOBALS['LANG']->getLL('impexpcore_displaycon_updateMode', TRUE) . '</td>' : '') . '
+                                       ' . ($this->update ? '<td>' . $GLOBALS['LANG']->getLL('impexpcore_displaycon_currentPath', TRUE) . '</td>' : '') . '
+                                       ' . ($this->showDiff ? '<td>' . $GLOBALS['LANG']->getLL('impexpcore_displaycon_result', TRUE) . '</td>' : '') . '
                                </tr>';
                                foreach ($lines as $r) {
                                        $rows[] = '
@@ -3357,7 +3355,7 @@ class ImportExport {
                                        </tr>';
                                }
                                $out = '
-                                       <strong>' . $LANG->getLL('impexpcore_displaycon_insidePagetree', TRUE) . '</strong>
+                                       <strong>' . $GLOBALS['LANG']->getLL('impexpcore_displaycon_insidePagetree', TRUE) . '</strong>
                                        <br /><br />
                                        <table border="0" cellpadding="0" cellspacing="1">' . implode('', $rows) . '</table>
                                        <br /><br />';
@@ -3373,13 +3371,13 @@ class ImportExport {
                                        $rows = array();
                                        $rows[] = '
                                        <tr class="bgColor5 tableheader">
-                                               <td>' . $LANG->getLL('impexpcore_displaycon_controls', TRUE) . '</td>
-                                               <td>' . $LANG->getLL('impexpcore_displaycon_title', TRUE) . '</td>
-                                               <td>' . $LANG->getLL('impexpcore_displaycon_size', TRUE) . '</td>
-                                               <td>' . $LANG->getLL('impexpcore_displaycon_message', TRUE) . '</td>
-                                               ' . ($this->update ? '<td>' . $LANG->getLL('impexpcore_displaycon_updateMode', TRUE) . '</td>' : '') . '
-                                               ' . ($this->update ? '<td>' . $LANG->getLL('impexpcore_displaycon_currentPath', TRUE) . '</td>' : '') . '
-                                               ' . ($this->showDiff ? '<td>' . $LANG->getLL('impexpcore_displaycon_result', TRUE) . '</td>' : '') . '
+                                               <td>' . $GLOBALS['LANG']->getLL('impexpcore_displaycon_controls', TRUE) . '</td>
+                                               <td>' . $GLOBALS['LANG']->getLL('impexpcore_displaycon_title', TRUE) . '</td>
+                                               <td>' . $GLOBALS['LANG']->getLL('impexpcore_displaycon_size', TRUE) . '</td>
+                                               <td>' . $GLOBALS['LANG']->getLL('impexpcore_displaycon_message', TRUE) . '</td>
+                                               ' . ($this->update ? '<td>' . $GLOBALS['LANG']->getLL('impexpcore_displaycon_updateMode', TRUE) . '</td>' : '') . '
+                                               ' . ($this->update ? '<td>' . $GLOBALS['LANG']->getLL('impexpcore_displaycon_currentPath', TRUE) . '</td>' : '') . '
+                                               ' . ($this->showDiff ? '<td>' . $GLOBALS['LANG']->getLL('impexpcore_displaycon_result', TRUE) . '</td>' : '') . '
                                        </tr>';
                                        foreach ($lines as $r) {
                                                $rows[] = '<tr class="' . $r['class'] . '">
@@ -3393,7 +3391,7 @@ class ImportExport {
                                                </tr>';
                                        }
                                        $out .= '
-                                               <strong>' . $LANG->getLL('impexpcore_singlereco_outsidePagetree', TRUE) . '</strong>
+                                               <strong>' . $GLOBALS['LANG']->getLL('impexpcore_singlereco_outsidePagetree', TRUE) . '</strong>
                                                <br /><br />
                                                <table border="0" cellpadding="0" cellspacing="1">' . implode('', $rows) . '</table>';
                                }
@@ -3491,7 +3489,6 @@ class ImportExport {
         * @return void
         */
        public function singleRecordLines($table, $uid, &$lines, $preCode, $checkImportInPidRecord = FALSE) {
-               global $LANG;
                // Get record:
                $record = $this->dat['header']['records'][$table][$uid];
                unset($this->remainHeader['records'][$table][$uid]);
@@ -3546,21 +3543,21 @@ class ImportExport {
                                        $pInfo['updatePath'] = $recInf ? htmlspecialchars($this->getRecordPath($recInf['pid'])) : '<strong>NEW!</strong>';
                                        // Mode selector:
                                        $optValues = array();
-                                       $optValues[] = $recInf ? $LANG->getLL('impexpcore_singlereco_update') : $LANG->getLL('impexpcore_singlereco_insert');
+                                       $optValues[] = $recInf ? $GLOBALS['LANG']->getLL('impexpcore_singlereco_update') : $GLOBALS['LANG']->getLL('impexpcore_singlereco_insert');
                                        if ($recInf) {
-                                               $optValues['as_new'] = $LANG->getLL('impexpcore_singlereco_importAsNew');
+                                               $optValues['as_new'] = $GLOBALS['LANG']->getLL('impexpcore_singlereco_importAsNew');
                                        }
                                        if ($recInf) {
                                                if (!$this->global_ignore_pid) {
-                                                       $optValues['ignore_pid'] = $LANG->getLL('impexpcore_singlereco_ignorePid');
+                                                       $optValues['ignore_pid'] = $GLOBALS['LANG']->getLL('impexpcore_singlereco_ignorePid');
                                                } else {
-                                                       $optValues['respect_pid'] = $LANG->getLL('impexpcore_singlereco_respectPid');
+                                                       $optValues['respect_pid'] = $GLOBALS['LANG']->getLL('impexpcore_singlereco_respectPid');
                                                }
                                        }
                                        if (!$recInf && $GLOBALS['BE_USER']->isAdmin()) {
-                                               $optValues['force_uid'] = sprintf($LANG->getLL('impexpcore_singlereco_forceUidSAdmin'), $uid);
+                                               $optValues['force_uid'] = sprintf($GLOBALS['LANG']->getLL('impexpcore_singlereco_forceUidSAdmin'), $uid);
                                        }
-                                       $optValues['exclude'] = $LANG->getLL('impexpcore_singlereco_exclude');
+                                       $optValues['exclude'] = $GLOBALS['LANG']->getLL('impexpcore_singlereco_exclude');
                                        if ($table === 'sys_file') {
                                                $pInfo['updateMode'] = '';
                                        } else {
@@ -3612,12 +3609,12 @@ class ImportExport {
                                $pInfo['title'] = '<em>' . $info['field'] . ', "' . $info['spKey'] . '" </em>: <span title="' . htmlspecialchars($info['matchString']) . '">' . htmlspecialchars(GeneralUtility::fixed_lgd_cs($info['matchString'], 60)) . '</span>';
                                if ($info['subst']['type']) {
                                        if (strlen($info['subst']['title'])) {
-                                               $pInfo['title'] .= '<br/>' . $preCode_B . '<strong>' . $LANG->getLL('impexpcore_singlereco_title', TRUE) . '</strong> ' . htmlspecialchars(GeneralUtility::fixed_lgd_cs($info['subst']['title'], 60));
+                                               $pInfo['title'] .= '<br/>' . $preCode_B . '<strong>' . $GLOBALS['LANG']->getLL('impexpcore_singlereco_title', TRUE) . '</strong> ' . htmlspecialchars(GeneralUtility::fixed_lgd_cs($info['subst']['title'], 60));
                                        }
                                        if (strlen($info['subst']['description'])) {
-                                               $pInfo['title'] .= '<br/>' . $preCode_B . '<strong>' . $LANG->getLL('impexpcore_singlereco_descr', TRUE) . '</strong> ' . htmlspecialchars(GeneralUtility::fixed_lgd_cs($info['subst']['description'], 60));
+                                               $pInfo['title'] .= '<br/>' . $preCode_B . '<strong>' . $GLOBALS['LANG']->getLL('impexpcore_singlereco_descr', TRUE) . '</strong> ' . htmlspecialchars(GeneralUtility::fixed_lgd_cs($info['subst']['description'], 60));
                                        }
-                                       $pInfo['title'] .= '<br/>' . $preCode_B . ($info['subst']['type'] == 'file' ? $LANG->getLL('impexpcore_singlereco_filename', TRUE) . ' <strong>' . $info['subst']['relFileName'] . '</strong>' : '') . ($info['subst']['type'] == 'string' ? $LANG->getLL('impexpcore_singlereco_value', TRUE) . ' <strong>' . $info['subst']['tokenValue'] . '</strong>' : '') . ($info['subst']['type'] == 'db' ? $LANG->getLL('impexpcore_softrefsel_record', TRUE) . ' <strong>' . $info['subst']['recordRef'] . '</strong>' : '');
+                                       $pInfo['title'] .= '<br/>' . $preCode_B . ($info['subst']['type'] == 'file' ? $GLOBALS['LANG']->getLL('impexpcore_singlereco_filename', TRUE) . ' <strong>' . $info['subst']['relFileName'] . '</strong>' : '') . ($info['subst']['type'] == 'string' ? $GLOBALS['LANG']->getLL('impexpcore_singlereco_value', TRUE) . ' <strong>' . $info['subst']['tokenValue'] . '</strong>' : '') . ($info['subst']['type'] == 'db' ? $GLOBALS['LANG']->getLL('impexpcore_softrefsel_record', TRUE) . ' <strong>' . $info['subst']['recordRef'] . '</strong>' : '');
                                }
                                $pInfo['ref'] = 'SOFTREF';
                                $pInfo['size'] = '';
@@ -3821,8 +3818,7 @@ class ImportExport {
         * @return bool TRUE if OK
         */
        public function checkDokType($checkTable, $doktype) {
-               global $PAGES_TYPES;
-               $allowedTableList = isset($PAGES_TYPES[$doktype]['allowedTables']) ? $PAGES_TYPES[$doktype]['allowedTables'] : $PAGES_TYPES['default']['allowedTables'];
+               $allowedTableList = isset($GLOBALS['PAGES_TYPES'][$doktype]['allowedTables']) ? $GLOBALS['PAGES_TYPES'][$doktype]['allowedTables'] : $GLOBALS['PAGES_TYPES']['default']['allowedTables'];
                $allowedArray = GeneralUtility::trimExplode(',', $allowedTableList, TRUE);
                // If all tables or the table is listed as a allowed type, return TRUE
                if (strstr($allowedTableList, '*') || in_array($checkTable, $allowedArray)) {
@@ -3838,10 +3834,9 @@ class ImportExport {
         * @return string HTML
         */
        public function renderControls($r) {
-               global $LANG;
                if ($this->mode === 'export') {
                        if ($r['type'] === 'record') {
-                               return '<input type="checkbox" name="tx_impexp[exclude][' . $r['ref'] . ']" id="checkExclude' . $r['ref'] . '" value="1" /> <label for="checkExclude' . $r['ref'] . '">' . $LANG->getLL('impexpcore_singlereco_exclude', TRUE) . '</label>';
+                               return '<input type="checkbox" name="tx_impexp[exclude][' . $r['ref'] . ']" id="checkExclude' . $r['ref'] . '" value="1" /> <label for="checkExclude' . $r['ref'] . '">' . $GLOBALS['LANG']->getLL('impexpcore_singlereco_exclude', TRUE) . '</label>';
                        } else {
                                return  $r['type'] == 'softref' ? $this->softrefSelector($r['_softRefInfo']) : '';
                        }
@@ -3867,7 +3862,6 @@ class ImportExport {
         * @return string Selector box HTML
         */
        public function softrefSelector($cfg) {
-               global $LANG;
                // Looking for file ID if any:
                $fI = $cfg['file_ID'] ? $this->dat['header']['files'][$cfg['file_ID']] : array();
                // Substitution scheme has to be around and RTE images MUST be exported.
@@ -3875,8 +3869,8 @@ class ImportExport {
                        // Create options:
                        $optValues = array();
                        $optValues[''] = '';
-                       $optValues['editable'] = $LANG->getLL('impexpcore_softrefsel_editable');
-                       $optValues['exclude'] = $LANG->getLL('impexpcore_softrefsel_exclude');
+                       $optValues['editable'] = $GLOBALS['LANG']->getLL('impexpcore_softrefsel_editable');
+                       $optValues['exclude'] = $GLOBALS['LANG']->getLL('impexpcore_softrefsel_exclude');
                        // Get current value:
                        $value = $this->softrefCfg[$cfg['subst']['tokenID']]['mode'];
                        // Render options selector:
@@ -3892,7 +3886,7 @@ class ImportExport {
                                // Description:
                                if (!strlen($cfg['subst']['description'])) {
                                        $descriptionField .= '
-                                       ' . $LANG->getLL('impexpcore_printerror_description', TRUE) . '<br/>
+                                       ' . $GLOBALS['LANG']->getLL('impexpcore_printerror_description', TRUE) . '<br/>
                                        <input type="text" name="tx_impexp[softrefCfg][' . $cfg['subst']['tokenID'] . '][description]" value="' . htmlspecialchars($this->softrefCfg[$cfg['subst']['tokenID']]['description']) . '" />';
                                } else {
                                        $descriptionField .= '
@@ -4044,7 +4038,6 @@ class ImportExport {
         * @return string HTML
         */
        public function compareRecords($databaseRecord, $importRecord, $table, $inverseDiff = FALSE) {
-               global $LANG;
                // Initialize:
                $output = array();
                $t3lib_diff_Obj = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Utility\\DiffUtility');
index e128182..73f0748 100644 (file)
@@ -64,14 +64,13 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
         * @return void
         */
        public function modMenu() {
-               global $LANG;
                return array(
                        'depth' => array(
-                               0 => $LANG->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_0'),
-                               1 => $LANG->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_1'),
-                               2 => $LANG->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_2'),
-                               3 => $LANG->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_3'),
-                               999 => $LANG->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_infi')
+                               0 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_0'),
+                               1 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_1'),
+                               2 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_2'),
+                               3 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_3'),
+                               999 => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.depth_infi')
                        ),
                        'type' => array(
                                0 => 'Overview',
@@ -88,7 +87,6 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
         */
        public function main() {
                // Initializes the module. Done in this function because we may need to re-initialize if data is submitted!
-               global $LANG, $TYPO3_CONF_VARS;
                // Return if no page id:
                if ($this->pObj->id <= 0) {
                        return;
@@ -113,8 +111,8 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
                }
                // Initialize external document parsers:
                // Example configuration, see ext_localconf.php of this file!
-               if (is_array($TYPO3_CONF_VARS['EXTCONF']['indexed_search']['external_parsers'])) {
-                       foreach ($TYPO3_CONF_VARS['EXTCONF']['indexed_search']['external_parsers'] as $extension => $_objRef) {
+               if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['indexed_search']['external_parsers'])) {
+                       foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['indexed_search']['external_parsers'] as $extension => $_objRef) {
                                $this->external_parsers[$extension] = GeneralUtility::getUserObj($_objRef);
                                // Init parser and if it returns FALSE, unset its entry again:
                                if (!$this->external_parsers[$extension]->softInit($extension)) {
@@ -151,7 +149,7 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
                        $h_func = BackendUtility::getFuncMenu($this->pObj->id, 'SET[type]', $this->pObj->MOD_SETTINGS['type'], $this->pObj->MOD_MENU['type']);
                        $h_func .= BackendUtility::getFuncMenu($this->pObj->id, 'SET[depth]', $this->pObj->MOD_SETTINGS['depth'], $this->pObj->MOD_MENU['depth']);
                        // Show title / function menu:
-                       $theOutput .= $this->pObj->doc->header($LANG->getLL('title'));
+                       $theOutput .= $this->pObj->doc->header($GLOBALS['LANG']->getLL('title'));
                        $theOutput .= $this->pObj->doc->section('', $h_func, 0, 1);
                        $theOutput .= $this->drawTableOfIndexedPages();
                }
@@ -169,12 +167,11 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
         * @return string HTML output
         */
        public function drawTableOfIndexedPages() {
-               global $BACK_PATH;
                // Drawing tree:
                $tree = GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Tree\\View\\PageTreeView');
                $perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(1);
                $tree->init('AND ' . $perms_clause);
-               $HTML = '<img src="' . $BACK_PATH . \TYPO3\CMS\Backend\Utility\IconUtility::getIcon('pages', $this->pObj->pageinfo) . '" width="18" height="16" align="top" alt="" />';
+               $HTML = '<img src="' . $GLOBALS['BACK_PATH'] . \TYPO3\CMS\Backend\Utility\IconUtility::getIcon('pages', $this->pObj->pageinfo) . '" width="18" height="16" align="top" alt="" />';
                $tree->tree[] = array(
                        'row' => $this->pObj->pageinfo,
                        'HTML' => $HTML
index 90dee0d..b449d4d 100644 (file)
@@ -87,7 +87,6 @@ class IndexingStatisticsController extends \TYPO3\CMS\Backend\Module\AbstractFun
         * @return string html table with results
         */
        public function listSeveralStats($title, $addwhere, $conf) {
-               global $LANG;
                $queryParts['SELECT'] = 'word, COUNT(*) AS c';
                $queryParts['FROM'] = 'index_stat_word';
                $queryParts['WHERE'] = sprintf('pageid= %d ' . $addwhere, $conf['bid']);
@@ -102,11 +101,11 @@ class IndexingStatisticsController extends \TYPO3\CMS\Backend\Module\AbstractFun
                }
                // exist several statistics for this page?
                if ($count > 0) {
-                       $this->note = $LANG->getLL('justthispage');
+                       $this->note = $GLOBALS['LANG']->getLL('justthispage');
                } else {
                        // Limit access to pages of the current site
                        $secureaddwhere = ' AND pageid IN (' . $this->extGetTreeList($conf['bid'], 100, 0, '1=1') . $conf['bid'] . ') ';
-                       $this->note = $LANG->getLL('allpages');
+                       $this->note = $GLOBALS['LANG']->getLL('allpages');
                        $queryParts['WHERE'] = '1=1 ' . $addwhere . $secureaddwhere;
                }
                // make real query
@@ -120,7 +119,7 @@ class IndexingStatisticsController extends \TYPO3\CMS\Backend\Module\AbstractFun
                        }
                }
                if ($i == 0) {
-                       $table1 = '<tr class="bgColor4"><td callspan="3">' . $LANG->getLL('noresults') . '</td></tr>';
+                       $table1 = '<tr class="bgColor4"><td callspan="3">' . $GLOBALS['LANG']->getLL('noresults') . '</td></tr>';
                }
                $table1 = '<table class="bgColor5" cellpadding="2" cellspacing="1"><tr class="tableheader"><td colspan="3">' . $title . '</td></tr>' . $table1 . '</table>';
                return $note . $table1;
index cb68c7f..badd834 100644 (file)
@@ -131,14 +131,13 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
         * @return void
         */
        public function initialize() {
-               global $TYPO3_CONF_VARS;
                // Indexer configuration from Extension Manager interface:
                $this->indexerConfig = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['indexed_search']);
                $this->enableMetaphoneSearch = $this->indexerConfig['enableMetaphoneSearch'] ? TRUE : FALSE;
                $this->storeMetaphoneInfoAsWords = !\TYPO3\CMS\IndexedSearch\Utility\IndexedSearchUtility::isTableUsed('index_words');
                // Initialize external document parsers for icon display and other soft operations
-               if (is_array($TYPO3_CONF_VARS['EXTCONF']['indexed_search']['external_parsers'])) {
-                       foreach ($TYPO3_CONF_VARS['EXTCONF']['indexed_search']['external_parsers'] as $extension => $_objRef) {
+               if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['indexed_search']['external_parsers'])) {
+                       foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['indexed_search']['external_parsers'] as $extension => $_objRef) {
                                $this->external_parsers[$extension] = GeneralUtility::getUserObj($_objRef);
                                // Init parser and if it returns FALSE, unset its entry again:
                                if (!$this->external_parsers[$extension]->softInit($extension)) {
@@ -147,7 +146,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
                        }
                }
                // Init lexer (used to post-processing of search words)
-               $lexerObjRef = $TYPO3_CONF_VARS['EXTCONF']['indexed_search']['lexer'] ? $TYPO3_CONF_VARS['EXTCONF']['indexed_search']['lexer'] : 'EXT:indexed_search/Classes/Lexer.php:&TYPO3\\CMS\\IndexedSearch\\Lexer';
+               $lexerObjRef = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['indexed_search']['lexer'] ? $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['indexed_search']['lexer'] : 'EXT:indexed_search/Classes/Lexer.php:&TYPO3\\CMS\\IndexedSearch\\Lexer';
                $this->lexerObj = GeneralUtility::getUserObj($lexerObjRef);
                // If "_sections" is set, this value overrides any existing value.
                if ($this->piVars['_sections']) {
@@ -2169,10 +2168,9 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
         * @return object Hook object, if any. Otherwise NULL.
         */
        public function hookRequest($functionName) {
-               global $TYPO3_CONF_VARS;
                // Hook: menuConfig_preProcessModMenu
-               if ($TYPO3_CONF_VARS['EXTCONF']['indexed_search']['pi1_hooks'][$functionName]) {
-                       $hookObj = GeneralUtility::getUserObj($TYPO3_CONF_VARS['EXTCONF']['indexed_search']['pi1_hooks'][$functionName]);
+               if ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['indexed_search']['pi1_hooks'][$functionName]) {
+                       $hookObj = GeneralUtility::getUserObj($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['indexed_search']['pi1_hooks'][$functionName]);
                        if (method_exists($hookObj, $functionName)) {
                                $hookObj->pObj = $this;
                                return $hookObj;
index 4bf17dd..ba420c5 100644 (file)
@@ -558,7 +558,6 @@ class CrawlerHook {
         * @return array Array where the root lines uid values are found.
         */
        public function getUidRootLineForClosestTemplate($id) {
-               global $TYPO3_CONF_VARS;
                $tmpl = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\TypoScript\\ExtendedTemplateService');
                $tmpl->tt_track = 0;
                // Do not log time-performance information
index fffcf06..4252a17 100644 (file)
@@ -350,7 +350,6 @@ class Indexer {
         * @return void
         */
        public function init() {
-               global $TYPO3_CONF_VARS;
                // Initializing:
                $this->cHashParams = $this->conf['cHash_array'];
                if (is_array($this->cHashParams) && count($this->cHashParams)) {
@@ -377,13 +376,13 @@ class Indexer {
                        $this->initializeExternalParsers();
                }
                // Initialize lexer (class that deconstructs the text into words):
-               $lexerObjRef = $TYPO3_CONF_VARS['EXTCONF']['indexed_search']['lexer'] ? $TYPO3_CONF_VARS['EXTCONF']['indexed_search']['lexer'] : 'TYPO3\\CMS\\IndexedSearch\\Lexer';
+               $lexerObjRef = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['indexed_search']['lexer'] ? $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['indexed_search']['lexer'] : 'TYPO3\\CMS\\IndexedSearch\\Lexer';
                $this->lexerObj = GeneralUtility::getUserObj($lexerObjRef);
                $this->lexerObj->debug = $this->indexerConfig['debugMode'];
                // Initialize metaphone hook:
                // Make sure that the hook is loaded _after_ indexed_search as this may overwrite the hook depending on the configuration.
-               if ($this->enableMetaphoneSearch && $TYPO3_CONF_VARS['EXTCONF']['indexed_search']['metaphone']) {
-                       $this->metaphoneObj = GeneralUtility::getUserObj($TYPO3_CONF_VARS['EXTCONF']['indexed_search']['metaphone']);
+               if ($this->enableMetaphoneSearch && $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['indexed_search']['metaphone']) {
+                       $this->metaphoneObj = GeneralUtility::getUserObj($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['indexed_search']['metaphone']);
                        $this->metaphoneObj->pObj = $this;
                }
                // Init charset class:
@@ -398,9 +397,8 @@ class Indexer {
         * @see init()
         */
        public function initializeExternalParsers() {
-               global $TYPO3_CONF_VARS;
-               if (is_array($TYPO3_CONF_VARS['EXTCONF']['indexed_search']['external_parsers'])) {
-                       foreach ($TYPO3_CONF_VARS['EXTCONF']['indexed_search']['external_parsers'] as $extension => $_objRef) {
+               if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['indexed_search']['external_parsers'])) {
+                       foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['indexed_search']['external_parsers'] as $extension => $_objRef) {
                                $this->external_parsers[$extension] = GeneralUtility::getUserObj($_objRef);
                                $this->external_parsers[$extension]->pObj = $this;
                                // Init parser and if it returns FALSE, unset its entry again:
index b4819a6..12ee1a3 100644 (file)
@@ -47,7 +47,6 @@ Cleaning XML for FlexForm fields.
         * @return array
         */
        public function main() {
-               global $TYPO3_DB;
                // Initialize result array:
                $resultArray = array(
                        'message' => $this->cli_help['name'] . LF . LF . $this->cli_help['description'],
index 9a6a4c5..62f06a0 100644 (file)
@@ -47,7 +47,6 @@ Although deleted records are not errors to be repaired, this tool allows you to
         * @return array
         */
        public function main() {
-               global $TYPO3_DB;
                // Initialize result array:
                $resultArray = array(
                        'message' => $this->cli_help['name'] . LF . LF . $this->cli_help['description'],
index ce2eb17..04f635a 100644 (file)
@@ -61,7 +61,6 @@ This will check the system for double files relations.';
         * @return array
         */
        public function main() {
-               global $TYPO3_DB;
                // Initialize result array:
                $resultArray = array(
                        'message' => $this->cli_help['name'] . LF . LF . $this->cli_help['description'],
@@ -81,7 +80,7 @@ This will check the system for double files relations.';
                        'warnings' => array()
                );
                // Select all files in the reference table not found by a soft reference parser (thus TCA configured)
-               $recs = $TYPO3_DB->exec_SELECTgetRows('*', 'sys_refindex', 'ref_table=' . $TYPO3_DB->fullQuoteStr('_FILE', 'sys_refindex') . ' AND softref_key=' . $TYPO3_DB->fullQuoteStr('', 'sys_refindex'), '', 'sorting DESC');
+               $recs = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'sys_refindex', 'ref_table=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('_FILE', 'sys_refindex') . ' AND softref_key=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('', 'sys_refindex'), '', 'sorting DESC');
                // Traverse the files and put into a large table:
                $tempCount = array();
                if (is_array($recs)) {
index c55bf27..8ead0a5 100644 (file)
@@ -66,7 +66,6 @@ Will report lost files.';
         * @return array
         */
        public function main() {
-               global $TYPO3_DB;
                // Initialize result array:
                $resultArray = array(
                        'message' => $this->cli_help['name'] . LF . LF . $this->cli_help['description'],
@@ -104,7 +103,7 @@ Will report lost files.';
                                        $resultArray['ignoredFiles'][$shortKey] = $value;
                                } else {
                                        // Looking for a reference from a field which is NOT a soft reference (thus, only fields with a proper TCA/Flexform configuration)
-                                       $recs = $TYPO3_DB->exec_SELECTgetRows('*', 'sys_refindex', 'ref_table=' . $TYPO3_DB->fullQuoteStr('_FILE', 'sys_refindex') . ' AND ref_string=' . $TYPO3_DB->fullQuoteStr($value, 'sys_refindex') . ' AND softref_key=' . $TYPO3_DB->fullQuoteStr('', 'sys_refindex'), '', 'sorting DESC');
+                                       $recs = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'sys_refindex', 'ref_table=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('_FILE', 'sys_refindex') . ' AND ref_string=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($value, 'sys_refindex') . ' AND softref_key=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('', 'sys_refindex'), '', 'sorting DESC');
                                        // If found, unset entry:
                                        if (count($recs)) {
                                                unset($fileArr[$key]);
index 872d959..c13820b 100644 (file)
@@ -62,7 +62,6 @@ This will show you missing files in the TYPO3 system and only report back if err
         * @return array
         */
        public function main() {
-               global $TYPO3_DB;
                // Initialize result array:
                $listExplain = ' Shows the relative filename of missing file as header and under a list of record fields in which the references are found. ' . $this->label_infoString;
                $resultArray = array(
@@ -75,7 +74,7 @@ This will show you missing files in the TYPO3 system and only report back if err
                        'softrefFilesMissing' => array()
                );
                // Select all files in the reference table
-               $recs = $TYPO3_DB->exec_SELECTgetRows('*', 'sys_refindex', 'ref_table=' . $TYPO3_DB->fullQuoteStr('_FILE', 'sys_refindex'), '', 'sorting DESC');
+               $recs = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'sys_refindex', 'ref_table=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('_FILE', 'sys_refindex'), '', 'sorting DESC');
                // Traverse the files and put into a large table:
                if (is_array($recs)) {
                        foreach ($recs as $rec) {
index 0a3f44f..265e4c0 100644 (file)
@@ -64,7 +64,6 @@ Reports missing relations';
         * @return array
         */
        public function main() {
-               global $TYPO3_DB;
                // Initialize result array:
                $listExplain = ' Shows the missing record as header and underneath a list of record fields in which the references are found. ' . $this->label_infoString;
                $resultArray = array(
@@ -86,7 +85,7 @@ Reports missing relations';
                        'nonExistingRecords_s' => array()
                );
                // Select DB relations from reference table
-               $recs = $TYPO3_DB->exec_SELECTgetRows('*', 'sys_refindex', 'ref_table<>' . $TYPO3_DB->fullQuoteStr('_FILE', 'sys_refindex') . ' AND ref_uid>0' . $filterClause, '', 'sorting DESC');
+               $recs = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'sys_refindex', 'ref_table<>' . $GLOBALS['TYPO3_DB']->fullQuoteStr('_FILE', 'sys_refindex') . ' AND ref_uid>0' . $filterClause, '', 'sorting DESC');
                // Traverse the records
                $tempExists = array();
                if (is_array($recs)) {
index d9d76d3..4bb172b 100644 (file)
@@ -56,7 +56,6 @@ Will report orphan uids from TCA tables.';
         * @return array
         */
        public function main() {
-               global $TYPO3_DB;
                // Initialize result array:
                $resultArray = array(
                        'message' => $this->cli_help['name'] . LF . LF . $this->cli_help['description'],
index 7d4a38b..f82e30d 100644 (file)
@@ -62,7 +62,6 @@ Reports problems with RTE images';
         * @return array
         */
        public function main() {
-               global $TYPO3_DB;
                // Initialize result array:
                $resultArray = array(
                        'message' => $this->cli_help['name'] . LF . LF . $this->cli_help['description'],
@@ -80,7 +79,7 @@ Reports problems with RTE images';
                        'lostFiles' => array()
                );
                // Select all RTEmagic files in the reference table (only from soft references of course)
-               $recs = $TYPO3_DB->exec_SELECTgetRows('*', 'sys_refindex', 'ref_table=' . $TYPO3_DB->fullQuoteStr('_FILE', 'sys_refindex') . ' AND ref_string LIKE ' . $TYPO3_DB->fullQuoteStr('%/RTEmagic%', 'sys_refindex') . ' AND softref_key=' . $TYPO3_DB->fullQuoteStr('images', 'sys_refindex'), '', 'sorting DESC');
+               $recs = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'sys_refindex', 'ref_table=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('_FILE', 'sys_refindex') . ' AND ref_string LIKE ' . $GLOBALS['TYPO3_DB']->fullQuoteStr('%/RTEmagic%', 'sys_refindex') . ' AND softref_key=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('images', 'sys_refindex'), '', 'sorting DESC');
                // Traverse the files and put into a large table:
                if (is_array($recs)) {
                        foreach ($recs as $rec) {
index 728a3c5..fc6ac72 100644 (file)
@@ -39,7 +39,6 @@ Showing last 25 hour entries from the syslog. More features pending. This is the
         * @return array
         */
        public function main() {
-               global $TYPO3_DB;
                // Initialize result array:
                $resultArray = array(
                        'message' => $this->cli_help['name'] . LF . LF . $this->cli_help['description'],
@@ -50,7 +49,7 @@ Showing last 25 hour entries from the syslog. More features pending. This is the
                        'listing' => array(),
                        'allDetails' => array()
                );
-               $rows = $TYPO3_DB->exec_SELECTgetRows('*', 'sys_log', 'tstamp>' . ($GLOBALS['EXEC_TIME'] - 25 * 3600));
+               $rows = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('*', 'sys_log', 'tstamp>' . ($GLOBALS['EXEC_TIME'] - 25 * 3600));
                foreach ($rows as $r) {
                        $l = unserialize($r['log_data']);
                        $explained = '#' . $r['uid'] . ' ' . \TYPO3\CMS\Backend\Utility\BackendUtility::datetime($r['tstamp']) . ' USER[' . $r['userid'] . ']: ' . sprintf($r['details'], $l[0], $l[1], $l[2], $l[3], $l[4], $l[5]);
index 8acff4f..01e7485 100644 (file)
@@ -54,7 +54,6 @@ Automatic Repair:
         * @return array
         */
        public function main() {
-               global $TYPO3_DB;
                // Initialize result array:
                $resultArray = array(
                        'message' => $this->cli_help['name'] . LF . LF . $this->cli_help['description'],
index dbcd6cc..d426b58 100644 (file)
@@ -66,11 +66,10 @@ class ConfigurationView {
         * @return void
         */
        public function init() {
-               global $BACK_PATH;
                $this->MCONF = $GLOBALS['MCONF'];
                $this->menuConfig();
                $this->doc = GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Template\\DocumentTemplate');
-               $this->doc->backPath = $BACK_PATH;
+               $this->doc->backPath = $GLOBALS['BACK_PATH'];
                $this->doc->setModuleTemplate('EXT:lowlevel/Resources/Private/Templates/config.html');
                $this->doc->form = '<form action="" method="post">';
        }
@@ -81,7 +80,6 @@ class ConfigurationView {
         * @return void
         */
        public function menuConfig() {
-               global $TYPO3_CONF_VARS;
                // MENU-ITEMS:
                // If array, then it's a selector box menu
                // If empty string it's just a variable, that'll be saved.
index 7424e85..4b9359c 100644 (file)
@@ -57,11 +57,10 @@ class DatabaseIntegrityView {
         * @return void
         */
        public function init() {
-               global $LANG, $BACK_PATH;
                $this->MCONF = $GLOBALS['MCONF'];
                $this->menuConfig();
                $this->doc = GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Template\\DocumentTemplate');
-               $this->doc->backPath = $BACK_PATH;
+               $this->doc->backPath = $GLOBALS['BACK_PATH'];
                $this->doc->setModuleTemplate('EXT:lowlevel/Resources/Private/Templates/dbint.html');
                $this->doc->form = '<form action="" method="post" name="' . $this->formName . '">';
                $this->doc->table_TABLE = '<table class="t3-table">
@@ -83,7 +82,6 @@ class DatabaseIntegrityView {
         * @return void
         */
        public function menuConfig() {
-               global $LANG;
                // MENU-ITEMS:
                // If array, then it's a selector box menu
                // If empty string it's just a variable, that'll be saved.
@@ -313,7 +311,6 @@ class DatabaseIntegrityView {
         * @return void
         */
        public function func_search() {
-               global $LANG;
                $fullsearch = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Database\\QueryView');
                $fullsearch->setFormName($this->formName);
                $this->content .= $this->doc->header($GLOBALS['LANG']->getLL('search'));
@@ -396,7 +393,7 @@ class DatabaseIntegrityView {
                $admin->lostRecords($id_list);
                if ($admin->fixLostRecord(GeneralUtility::_GET('fixLostRecords_table'), GeneralUtility::_GET('fixLostRecords_uid'))) {
                        $admin = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Integrity\\DatabaseIntegrityCheck');
-                       $admin->backPath = $BACK_PATH;
+                       $admin->backPath = $GLOBALS['BACK_PATH'];
                        $admin->genTree(0, '');
                        $id_list = '-1,0,' . implode(',', array_keys($admin->page_idArray));
                        $id_list = rtrim($id_list, ',');
@@ -434,9 +431,9 @@ class DatabaseIntegrityView {
                                if (is_array($admin->lRecords[$t])) {
                                        foreach ($admin->lRecords[$t] as $data) {
                                                if (!GeneralUtility::inList($admin->lostPagesList, $data[pid])) {
-                                                       $lr .= '<nobr><strong><a href="' . htmlspecialchars((BackendUtility::getModuleUrl('system_dbint') . '&SET[function]=records&fixLostRecords_table=' . $t . '&fixLostRecords_uid=' . $data['uid'])) . '"><img src="' . $BACK_PATH . 'gfx/required_h.gif" width="10" hspace="3" height="10" border="0" align="top" title="' . $GLOBALS['LANG']->getLL('fixLostRecord') . '"></a>uid:' . $data['uid'] . ', pid:' . $data['pid'] . ', ' . htmlspecialchars(GeneralUtility::fixed_lgd_cs(strip_tags($data['title']), 20)) . '</strong></nobr><br>';
+                                                       $lr .= '<nobr><strong><a href="' . htmlspecialchars((BackendUtility::getModuleUrl('system_dbint') . '&SET[function]=records&fixLostRecords_table=' . $t . '&fixLostRecords_uid=' . $data['uid'])) . '"><img src="' . $GLOBALS['BACK_PATH'] . 'gfx/required_h.gif" width="10" hspace="3" height="10" border="0" align="top" title="' . $GLOBALS['LANG']->getLL('fixLostRecord') . '"></a>uid:' . $data['uid'] . ', pid:' . $data['pid'] . ', ' . htmlspecialchars(GeneralUtility::fixed_lgd_cs(strip_tags($data['title']), 20)) . '</strong></nobr><br>';
                                                } else {
-                                                       $lr .= '<nobr><img src="' . $BACK_PATH . 'clear.gif" width="16" height="1" border="0"><font color="Gray">uid:' . $data['uid'] . ', pid:' . $data['pid'] . ', ' . htmlspecialchars(GeneralUtility::fixed_lgd_cs(strip_tags($data['title']), 20)) . '</font></nobr><br>';
+                                                       $lr .= '<nobr><img src="' . $GLOBALS['BACK_PATH'] . 'clear.gif" width="16" height="1" border="0"><font color="Gray">uid:' . $data['uid'] . ', pid:' . $data['pid'] . ', ' . htmlspecialchars(GeneralUtility::fixed_lgd_cs(strip_tags($data['title']), 20)) . '</font></nobr><br>';
                                                }
                                        }
                                }
@@ -452,11 +449,10 @@ class DatabaseIntegrityView {
         * @return void
         */
        public function func_relations() {
-               global $LANG, $BACK_PATH;
                $this->content .= $this->doc->header($GLOBALS['LANG']->getLL('relations'));
                $admin = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Integrity\\DatabaseIntegrityCheck');
                $admin->genTree_makeHTML = 0;
-               $admin->backPath = $BACK_PATH;
+               $admin->backPath = $GLOBALS['BACK_PATH'];
                $fkey_arrays = $admin->getGroupFields('');
                $admin->selectNonEmptyRecordsWithFkeys($fkey_arrays);
                $fileTest = $admin->testFileRefs();
index 36eba7e..a399477 100644 (file)
@@ -91,7 +91,6 @@ class ContentParser {
         * @return      [type]          ...
         */
        public function main_parse_html($openKeys) {
-               global $TYPO3_CONF_VARS;
                $editorNo = GeneralUtility::_GP('editorNo');
                $html = GeneralUtility::_GP('content');
                $RTEtsConfigParts = explode(':', GeneralUtility::_GP('RTEtsConfigParams'));
@@ -108,8 +107,8 @@ class ContentParser {
                if (is_array($HTMLparserConfig)) {
                        $html = $HTMLParser->HTMLcleaner($html, $HTMLparserConfig[0], $HTMLparserConfig[1], $HTMLparserConfig[2], $HTMLparserConfig[3]);
                }
-               if (is_array($TYPO3_CONF_VARS['EXTCONF'][$this->extKey][$this->prefixId]['cleanPastedContent'])) {
-                       foreach ($TYPO3_CONF_VARS['EXTCONF'][$this->extKey][$this->prefixId]['cleanPastedContent'] as $classRef) {
+               if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][$this->extKey][$this->prefixId]['cleanPastedContent'])) {
+                       foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][$this->extKey][$this->prefixId]['cleanPastedContent'] as $classRef) {
                                $hookObj = GeneralUtility::getUserObj($classRef);
                                if (method_exists($hookObj, 'cleanPastedContent_afterCleanWord')) {
                                        $html = $hookObj->cleanPastedContent_afterCleanWord($html, $thisConfig);
index eac4676..a1a7384 100644 (file)
@@ -98,7 +98,6 @@ class FrontendRteController extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaBase {
         * @return string HTML code for RTE!
         */
        public function drawRTE(&$parentObject, $table, $field, $row, $PA, $specConf, $thisConfig, $RTEtypeVal, $RTErelPath, $thePidValue) {
-               global $TSFE, $TYPO3_CONF_VARS, $TYPO3_DB;
                $this->TCEform = $parentObject;
                $this->client = $this->clientInfo();
                $this->typoVersion = \TYPO3\CMS\Core\Utility\VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version);
@@ -122,7 +121,7 @@ class FrontendRteController extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaBase {
                $this->typeVal = $RTEtypeVal;
                // TCA "type" value for record
                // RTE configuration
-               $pageTSConfig = $TSFE->getPagesTSconfig();
+               $pageTSConfig = $GLOBALS['TSFE']->getPagesTSconfig();
                if (is_array($pageTSConfig) && is_array($pageTSConfig['RTE.'])) {
                        $this->RTEsetup = $pageTSConfig['RTE.'];
                }
@@ -170,12 +169,12 @@ class FrontendRteController extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaBase {
                }
                $this->contentTypo3Language = $this->contentISOLanguage;
                // Character set
-               $this->charset = $TSFE->renderCharset;
-               $this->OutputCharset = $TSFE->metaCharset ?: $TSFE->renderCharset;
+               $this->charset = $GLOBALS['TSFE']->renderCharset;
+               $this->OutputCharset = $GLOBALS['TSFE']->metaCharset ?: $GLOBALS['TSFE']->renderCharset;
                // Set the charset of the content
-               $this->contentCharset = $TSFE->csConvObj->charSetArray[$this->contentTypo3Language];
+               $this->contentCharset = $GLOBALS['TSFE']->csConvObj->charSetArray[$this->contentTypo3Language];
                $this->contentCharset = $this->contentCharset ?: 'utf-8';
-               $this->contentCharset = trim($TSFE->config['config']['metaCharset']) ?: $this->contentCharset;
+               $this->contentCharset = trim($GLOBALS['TSFE']->config['config']['metaCharset']) ?: $this->contentCharset;
                /* =======================================
                 * TOOLBAR CONFIGURATION
                 * =======================================
@@ -244,7 +243,7 @@ class FrontendRteController extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaBase {
                }
                // draw the textarea
                $item = $this->triggerField($PA['itemFormElName']) . '
-                       <div id="pleasewait' . $textAreaId . '" class="pleasewait" style="display: block;" >' . $TSFE->csConvObj->conv($TSFE->getLLL('Please wait', $this->LOCAL_LANG), $this->charset, $TSFE->renderCharset) . '</div>
+                       <div id="pleasewait' . $textAreaId . '" class="pleasewait" style="display: block;" >' . $GLOBALS['TSFE']->csConvObj->conv($GLOBALS['TSFE']->getLLL('Please wait', $this->LOCAL_LANG), $this->charset, $GLOBALS['TSFE']->renderCharset) . '</div>
                        <div id="editorWrap' . $textAreaId . '" class="editorWrap" style="visibility: hidden; ' . htmlspecialchars($this->RTEWrapStyle) . '">
                        <textarea id="RTEarea' . $textAreaId . '" name="' . htmlspecialchars($PA['itemFormElName']) . '" rows="0" cols="0" style="' . htmlspecialchars($this->RTEdivStyle) . '">' . \TYPO3\CMS\Core\Utility\GeneralUtility::formatForTextarea($value) . '</textarea>
                        </div>' . LF;
index 29b65f7..b3dcb03 100644 (file)
@@ -57,7 +57,6 @@ class AboutEditor extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
         * @return string JS configuration for registered plugins
         */
        public function buildJavascriptConfiguration($RTEcounter) {
-               global $TSFE, $LANG;
                $registerRTEinJavascriptString = '';
                return $registerRTEinJavascriptString;
        }
index 3be6c09..832ecdd 100644 (file)
@@ -92,7 +92,6 @@ class BlockElements extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
         * @return string JS configuration for registered plugins, in this case, JS configuration of block elements
         */
        public function buildJavascriptConfiguration($RTEcounter) {
-               global $TSFE, $LANG;
                $registerRTEinJavascriptString = '';
                if (in_array('formatblock', $this->toolbar)) {
                        if (!is_array($this->thisConfig['buttons.']) || !is_array($this->thisConfig['buttons.']['formatblock.'])) {
@@ -155,9 +154,9 @@ class BlockElements extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
                        }
                        foreach ($blockElementsOrder as $item) {
                                if ($this->htmlAreaRTE->is_FE()) {
-                                       $blockElementsOptions[$item] = $TSFE->getLLL($this->defaultBlockElements[$item], $this->LOCAL_LANG);
+                                       $blockElementsOptions[$item] = $GLOBALS['TSFE']->getLLL($this->defaultBlockElements[$item], $this->LOCAL_LANG);
                                } else {
-                                       $blockElementsOptions[$item] = $LANG->getLL($this->defaultBlockElements[$item]);
+                                       $blockElementsOptions[$item] = $GLOBALS['LANG']->getLL($this->defaultBlockElements[$item]);
                                }
                                // Getting custom labels
                                if (is_array($labels[$item . '.']) && $labels[$item . '.']['label']) {
index 8e69184..40adf8a 100644 (file)
@@ -58,7 +58,6 @@ class CharacterMap extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
         * @return string JS configuration for registered plugins
         */
        public function buildJavascriptConfiguration($RTEcounter) {
-               global $TSFE, $LANG;
                $registerRTEinJavascriptString = '';
                return $registerRTEinJavascriptString;
        }
index be0660b..cc3666d 100644 (file)
@@ -63,7 +63,6 @@ class DefaultImage extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
         * @return string JS configuration for registered plugins
         */
        public function buildJavascriptConfiguration($RTEcounter) {
-               global $TSFE, $LANG;
                $registerRTEinJavascriptString = '';
                return $registerRTEinJavascriptString;
        }
index 3b3b582..cdb4a59 100644 (file)
@@ -62,7 +62,6 @@ class DefaultInline extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
         * @return string JS configuration for registered plugins
         */
        public function buildJavascriptConfiguration($RTEcounter) {
-               global $TSFE, $LANG;
                $registerRTEinJavascriptString = '';
                return $registerRTEinJavascriptString;
        }
index a093321..7f8c5b1 100644 (file)
@@ -69,7 +69,6 @@ class DefinitionList extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
         * @return string JS configuration for registered plugins
         */
        public function buildJavascriptConfiguration($RTEcounter) {
-               global $TSFE, $LANG;
                $registerRTEinJavascriptString = '';
                return $registerRTEinJavascriptString;
        }
index dcd535c..1c0b096 100644 (file)
@@ -57,7 +57,6 @@ class FindReplace extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
         * @return string JS configuration for registered plugins
         */
        public function buildJavascriptConfiguration($RTEcounter) {
-               global $TSFE, $LANG;
                $registerRTEinJavascriptString = '';
                return $registerRTEinJavascriptString;
        }
index 939a724..b5ce857 100644 (file)
@@ -134,7 +134,6 @@ class InlineElements extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
         * @return string JS configuration for registered plugins
         */
        public function buildJavascriptConfiguration($RTEcounter) {
-               global $TSFE, $LANG;
                $registerRTEinJavascriptString = '';
                if (in_array('formattext', $this->toolbar)) {
                        if (!is_array($this->thisConfig['buttons.']) || !is_array($this->thisConfig['buttons.']['formattext.'])) {
@@ -174,9 +173,9 @@ class InlineElements extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
                        $inlineElementsOptions = array();
                        foreach ($inlineElementsOrder as $item) {
                                if ($this->htmlAreaRTE->is_FE()) {
-                                       $inlineElementsOptions[$this->buttonToInlineElement[$item]] = $TSFE->getLLL($this->defaultInlineElements[$this->buttonToInlineElement[$item]], $this->LOCAL_LANG);
+                                       $inlineElementsOptions[$this->buttonToInlineElement[$item]] = $GLOBALS['TSFE']->getLLL($this->defaultInlineElements[$this->buttonToInlineElement[$item]], $this->LOCAL_LANG);
                                } else {
-                                       $inlineElementsOptions[$this->buttonToInlineElement[$item]] = $LANG->getLL($this->defaultInlineElements[$this->buttonToInlineElement[$item]]);
+                                       $inlineElementsOptions[$this->buttonToInlineElement[$item]] = $GLOBALS['LANG']->getLL($this->defaultInlineElements[$this->buttonToInlineElement[$item]]);
                                }
                                $inlineElementsOptions[$this->buttonToInlineElement[$item]] = ($prefixLabelWithTag && $item != 'none' ? $this->buttonToInlineElement[$item] . ' - ' : '') . $inlineElementsOptions[$this->buttonToInlineElement[$item]] . ($postfixLabelWithTag && $item != 'none' ? ' - ' . $this->buttonToInlineElement[$item] : '');
                        }
index 573f8ec..4daccd7 100644 (file)
@@ -57,7 +57,6 @@ class InsertSmiley extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
         * @return string JS configuration for registered plugins
         */
        public function buildJavascriptConfiguration($RTEcounter) {
-               global $TSFE, $LANG;
                $registerRTEinJavascriptString = '';
                return $registerRTEinJavascriptString;
        }
index 0d6f58d..8a354aa 100644 (file)
@@ -57,7 +57,6 @@ class RemoveFormat extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
         * @return string JS configuration for registered plugins
         */
        public function buildJavascriptConfiguration($RTEcounter) {
-               global $TSFE, $LANG;
                $registerRTEinJavascriptString = '';
                return $registerRTEinJavascriptString;
        }
index 5e0d753..88c37e3 100644 (file)
@@ -92,7 +92,6 @@ class TableOperations extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
         * @return string JS configuration for registered plugins, in this case, JS configuration of block elements
         */
        public function buildJavascriptConfiguration($RTEcounter) {
-               global $TSFE, $LANG;
                $registerRTEinJavascriptString = '';
                if (in_array('table', $this->toolbar)) {
                        // Combining fieldset disablers as a list
index 06f40e0..84cbf9c 100644 (file)
@@ -97,7 +97,6 @@ class Typo3Link extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
         * @return string classesAnchor array definition
         */
        public function buildJSClassesAnchorArray() {
-               global $LANG;
                $JSClassesAnchorArray .= 'HTMLArea.classesAnchorSetup = [ ' . LF;
                $classesAnchorIndex = 0;
                foreach ($this->htmlAreaRTE->RTEsetup['properties']['classesAnchor.'] as $label => $conf) {
index fbf7a9b..2d0b418 100644 (file)
@@ -78,7 +78,6 @@ abstract class RteHtmlAreaApi {
         * @return bool TRUE if this plugin object should be made available in the current environment and is correctly initialized
         */
        public function main($parentObject) {
-               global $TYPO3_CONF_VARS, $LANG, $TSFE;
                $this->htmlAreaRTE = $parentObject;
                $this->rteExtensionKey = &$this->htmlAreaRTE->ID;
                $this->thisConfig = &$this->htmlAreaRTE->thisConfig;
@@ -87,7 +86,7 @@ abstract class RteHtmlAreaApi {
                // Set the value of this boolean based on the initial value of $this->pluginButtons
                $this->pluginAddsButtons = !empty($this->pluginButtons);
                // Check if the plugin should be disabled in frontend
-               if ($this->htmlAreaRTE->is_FE() && $TYPO3_CONF_VARS['EXTCONF'][$this->rteExtensionKey]['plugins'][$this->pluginName]['disableInFE']) {
+               if ($this->htmlAreaRTE->is_FE() && $GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][$this->rteExtensionKey]['plugins'][$this->pluginName]['disableInFE']) {
                        return FALSE;
                }
                // Localization array must be initialized here
@@ -101,7 +100,7 @@ abstract class RteHtmlAreaApi {
                                        )
                                );
                        } else {
-                               $LANG->includeLLFile('EXT:' . $this->extensionKey . '/' . $this->relativePathToLocallangFile);
+                               $GLOBALS['LANG']->includeLLFile('EXT:' . $this->extensionKey . '/' . $this->relativePathToLocallangFile);
                        }
                }
                return TRUE;
@@ -124,8 +123,7 @@ abstract class RteHtmlAreaApi {
         * @return string path to the skin (css) file
         */
        public function getPathToSkin() {
-               global $TYPO3_CONF_VARS;
-               if ($TYPO3_CONF_VARS['EXTCONF'][$this->rteExtensionKey]['plugins'][$this->pluginName]['addIconsToSkin']) {
+               if ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][$this->rteExtensionKey]['plugins'][$this->pluginName]['addIconsToSkin']) {
                        return $this->relativePathToSkin;
                } else {
                        return '';
@@ -139,7 +137,6 @@ abstract class RteHtmlAreaApi {
         * @return string JS configuration for registered plugins
         */
        public function buildJavascriptConfiguration($RTEcounter) {
-               global $TSFE, $LANG;
                $registerRTEinJavascriptString = '';
                $pluginButtons = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->pluginButtons, TRUE);
                foreach ($pluginButtons as $button) {
index d8597b0..5b394b2 100644 (file)
@@ -327,10 +327,9 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
         * @return string HTML code for RTE!
         */
        public function drawRTE($parentObject, $table, $field, $row, $PA, $specConf, $thisConfig, $RTEtypeVal, $RTErelPath, $thePidValue) {
-               global $LANG, $TYPO3_DB;
                $this->TCEform = $parentObject;
                $inline = $this->TCEform->inline;
-               $LANG->includeLLFile('EXT:' . $this->ID . '/locallang.xml');
+               $GLOBALS['LANG']->includeLLFile('EXT:' . $this->ID . '/locallang.xml');
                $this->client = $this->clientInfo();
                $this->typoVersion = \TYPO3\CMS\Core\Utility\VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version);
                $this->userUid = 'BE_' . $GLOBALS['BE_USER']->user['uid'];
@@ -492,7 +491,7 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
                        // Draw the textarea
                        $visibility = 'hidden';
                        $item = $this->triggerField($PA['itemFormElName']) . '
-                               <div id="pleasewait' . $textAreaId . '" class="pleasewait" style="display: block;" >' . $LANG->getLL('Please wait') . '</div>
+                               <div id="pleasewait' . $textAreaId . '" class="pleasewait" style="display: block;" >' . $GLOBALS['LANG']->getLL('Please wait') . '</div>
                                <div id="editorWrap' . $textAreaId . '" class="editorWrap" style="visibility: hidden; width:' . $editorWrapWidth . '; height:' . $editorWrapHeight . ';">
                                <textarea id="RTEarea' . $textAreaId . '" name="' . htmlspecialchars($PA['itemFormElName']) . '" rows="0" cols="0" style="' . htmlspecialchars($this->RTEdivStyle, ENT_COMPAT, 'UTF-8', FALSE) . '">' . GeneralUtility::formatForTextarea($value) . '</textarea>
                                </div>' . LF;
@@ -608,10 +607,9 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
         * Add registered plugins to the array of enabled plugins
         */
        public function enableRegisteredPlugins() {
-               global $TYPO3_CONF_VARS;
                // Traverse registered plugins
-               if (is_array($TYPO3_CONF_VARS['EXTCONF'][$this->ID]['plugins'])) {
-                       foreach ($TYPO3_CONF_VARS['EXTCONF'][$this->ID]['plugins'] as $pluginId => $pluginObjectConfiguration) {
+               if (is_array($GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][$this->ID]['plugins'])) {
+                       foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][$this->ID]['plugins'] as $pluginId => $pluginObjectConfiguration) {
                                $plugin = FALSE;
                                if (is_array($pluginObjectConfiguration) && count($pluginObjectConfiguration)) {
                                        $plugin = GeneralUtility::getUserObj($pluginObjectConfiguration['objectReference']);
@@ -1217,7 +1215,7 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
                } else {
                        $output = $contents;
                }
-               $relativeFilename = 'typo3temp/' . $this->ID . '_' . str_replace('-', '_', $label) . '_' . GeneralUtility::shortMD5((TYPO3_version . $TYPO3_CONF_VARS['EXTCONF'][$this->ID]['version'] . ($sourceFileName ? $sourceFileName : $output)), 20) . '.' . $fileExtension;
+               $relativeFilename = 'typo3temp/' . $this->ID . '_' . str_replace('-', '_', $label) . '_' . GeneralUtility::shortMD5((TYPO3_version . $GLOBALS['TYPO3_CONF_VARS']['EXTCONF'][$this->ID]['version'] . ($sourceFileName ? $sourceFileName : $output)), 20) . '.' . $fileExtension;
                $destination = PATH_site . $relativeFilename;
                if (!file_exists($destination)) {
                        $minifiedJavaScript = '';
@@ -1343,13 +1341,12 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
        }
 
        public function getPageConfigLabel($string, $JScharCode = 1) {
-               global $LANG, $TSFE, $TYPO3_CONF_VARS;
                if ($this->is_FE()) {
                        if (substr($string, 0, 4) !== 'LLL:') {
                                // A pure string coming from Page TSConfig must be in utf-8
-                               $label = $TSFE->csConvObj->conv($TSFE->sL(trim($string)), 'utf-8', $this->OutputCharset);
+                               $label = $GLOBALS['TSFE']->csConvObj->conv($GLOBALS['TSFE']->sL(trim($string)), 'utf-8', $this->OutputCharset);
                        } else {
-                               $label = $TSFE->csConvObj->conv($TSFE->sL(trim($string)), $this->charset, $this->OutputCharset);
+                               $label = $GLOBALS['TSFE']->csConvObj->conv($GLOBALS['TSFE']->sL(trim($string)), $this->charset, $this->OutputCharset);
                        }
                        $label = str_replace('"', '\\"', str_replace('\\\'', '\'', $label));
                        $label = $JScharCode ? $this->feJScharCode($label) : $label;
@@ -1357,7 +1354,7 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
                        if (substr($string, 0, 4) !== 'LLL:') {
                                $label = $string;
                        } else {
-                               $label = $LANG->sL(trim($string));
+                               $label = $GLOBALS['LANG']->sL(trim($string));
                        }
                        $label = str_replace('"', '\\"', str_replace('\\\'', '\'', $label));
                        $label = $JScharCode ? GeneralUtility::quoteJSvalue($label) : $label;
index 66bd443..39b210b 100644 (file)
@@ -327,7 +327,6 @@ class SetupModuleController {
         * @return void
         */
        public function main() {
-               global $LANG;
                if ($this->languageUpdate) {
                        $this->doc->JScodeArray['languageUpdate'] .= '
                                if (top.refreshMenu) {
@@ -348,33 +347,33 @@ class SetupModuleController {
                $this->loadModules = GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Module\\ModuleLoader');
                $this->loadModules->observeWorkspaces = TRUE;
                $this->loadModules->load($GLOBALS['TBE_MODULES']);
-               $this->content .= $this->doc->header($LANG->getLL('UserSettings'));
+               $this->content .= $this->doc->header($GLOBALS['LANG']->getLL('UserSettings'));
                // Show if setup was saved
                if ($this->setupIsUpdated && !$this->tempDataIsCleared && !$this->settingsAreResetToDefault) {
-                       $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage', $LANG->getLL('setupWasUpdated'), $LANG->getLL('UserSettings'));
+                       $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage', $GLOBALS['LANG']->getLL('setupWasUpdated'), $GLOBALS['LANG']->getLL('UserSettings'));
                        $this->content .= $flashMessage->render();
                }
                // Show if temporary data was cleared
                if ($this->tempDataIsCleared) {
-                       $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage', $LANG->getLL('tempDataClearedFlashMessage'), $LANG->getLL('tempDataCleared'));
+                       $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage', $GLOBALS['LANG']->getLL('tempDataClearedFlashMessage'), $GLOBALS['LANG']->getLL('tempDataCleared'));
                        $this->content .= $flashMessage->render();
                }
                // Show if temporary data was cleared
                if ($this->settingsAreResetToDefault) {
-                       $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage', $LANG->getLL('settingsAreReset'), $LANG->getLL('resetConfiguration'));
+                       $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage', $GLOBALS['LANG']->getLL('settingsAreReset'), $GLOBALS['LANG']->getLL('resetConfiguration'));
                        $this->content .= $flashMessage->render();
                }
                // Notice
                if ($this->setupIsUpdated || $this->settingsAreResetToDefault) {
-                       $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage', $LANG->getLL('activateChanges'), '', \TYPO3\CMS\Core\Messaging\FlashMessage::INFO);
+                       $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage', $GLOBALS['LANG']->getLL('activateChanges'), '', \TYPO3\CMS\Core\Messaging\FlashMessage::INFO);
                        $this->content .= $flashMessage->render();
                }
                // If password is updated, output whether it failed or was OK.
                if ($this->passwordIsSubmitted) {
                        if ($this->passwordIsUpdated) {
-                               $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage', $LANG->getLL('newPassword_ok'), $LANG->getLL('newPassword'));
+                               $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage', $GLOBALS['LANG']->getLL('newPassword_ok'), $GLOBALS['LANG']->getLL('newPassword'));
                        } else {
-                               $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage', $LANG->getLL('newPassword_failed'), $LANG->getLL('newPassword'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
+                               $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage', $GLOBALS['LANG']->getLL('newPassword_failed'), $GLOBALS['LANG']->getLL('newPassword'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR);
                        }
                        $this->content .= $flashMessage->render();
                }
@@ -400,7 +399,7 @@ class SetupModuleController {
                // Build the <body> for the module
                $this->content = $this->doc->moduleBody($this->pageinfo, $docHeaderButtons, $markers);
                // Renders the module page
-               $this->content = $this->doc->render($LANG->getLL('UserSettings'), $this->content);
+               $this->content = $this->doc->render($GLOBALS['LANG']->getLL('UserSettings'), $this->content);
        }
 
        /**
index 7feec8e..d5ff24c 100644 (file)
@@ -135,7 +135,6 @@ class AuthenticationService extends \TYPO3\CMS\Sv\AbstractAuthenticationService
         * @return mixed Groups array, keys = uid which must be unique
         */
        public function getGroups($user, $knownGroups) {
-               global $TYPO3_CONF_VARS;
                $groupDataArr = array();
                if ($this->mode == 'getGroupsFE') {
                        $groups = array();
@@ -145,8 +144,8 @@ class AuthenticationService extends \TYPO3\CMS\Sv\AbstractAuthenticationService
                                $this->getSubGroups($groupList, '', $groups);
                        }
                        // ADD group-numbers if the IPmask matches.
-                       if (is_array($TYPO3_CONF_VARS['FE']['IPmaskMountGroups'])) {
-                               foreach ($TYPO3_CONF_VARS['FE']['IPmaskMountGroups'] as $IPel) {
+                       if (is_array($GLOBALS['TYPO3_CONF_VARS']['FE']['IPmaskMountGroups'])) {
+                               foreach ($GLOBALS['TYPO3_CONF_VARS']['FE']['IPmaskMountGroups'] as $IPel) {
                                        if ($this->authInfo['REMOTE_ADDR'] && $IPel[0] && \TYPO3\CMS\Core\Utility\GeneralUtility::cmpIP($this->authInfo['REMOTE_ADDR'], $IPel[0])) {
                                                $groups[] = (int)$IPel[1];
                                        }
index 443f233..60763c3 100644 (file)
@@ -2,32 +2,31 @@
 defined('TYPO3_MODE') or die();
 
 if (TYPO3_MODE === 'BE' || TYPO3_MODE === 'FE' && isset($GLOBALS['BE_USER'])) {
-       global $TBE_STYLES;
 
        // Register as a skin
-       $TBE_STYLES['skins'][$_EXTKEY] = array(
+       $GLOBALS['TBE_STYLES']['skins'][$_EXTKEY] = array(
                'name' => 't3skin'
        );
 
        // Support for other extensions to add own icons...
-       $presetSkinImgs = is_array($TBE_STYLES['skinImg']) ? $TBE_STYLES['skinImg'] : array();
-       $TBE_STYLES['skins'][$_EXTKEY]['stylesheetDirectories']['sprites'] = 'EXT:t3skin/stylesheets/sprites/';
+       $presetSkinImgs = is_array($GLOBALS['TBE_STYLES']['skinImg']) ? $GLOBALS['TBE_STYLES']['skinImg'] : array();
+       $GLOBALS['TBE_STYLES']['skins'][$_EXTKEY]['stylesheetDirectories']['sprites'] = 'EXT:t3skin/stylesheets/sprites/';
 
        // Setting the relative path to the extension in temp. variable:
        $temp_eP = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($_EXTKEY);
 
        // Alternative dimensions for frameset sizes:
        // Left menu frame width
-       $TBE_STYLES['dims']['leftMenuFrameW'] = 190;
+       $GLOBALS['TBE_STYLES']['dims']['leftMenuFrameW'] = 190;
 
        // Top frame height
-       $TBE_STYLES['dims']['topFrameH'] = 45;
+       $GLOBALS['TBE_STYLES']['dims']['topFrameH'] = 45;
 
        // Default navigation frame width
-       $TBE_STYLES['dims']['navFrameWidth'] = 280;
+       $GLOBALS['TBE_STYLES']['dims']['navFrameWidth'] = 280;
 
        // Setting up auto detection of alternative icons:
-       $TBE_STYLES['skinImgAutoCfg'] = array(
+       $GLOBALS['TBE_STYLES']['skinImgAutoCfg'] = array(
                'absDir' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'icons/',
                'relDir' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($_EXTKEY) . 'icons/',
                'forceFileExtension' => 'gif',
@@ -37,11 +36,11 @@ if (TYPO3_MODE === 'BE' || TYPO3_MODE === 'FE' && isset($GLOBALS['BE_USER'])) {
        );
 
        // Changing icon for filemounts, needs to be done here as overwriting the original icon would also change the filelist tree's root icon
-       $TCA['sys_filemounts']['ctrl']['iconfile'] = '_icon_ftp_2.gif';
+       $GLOBALS['TCA']['sys_filemounts']['ctrl']['iconfile'] = '_icon_ftp_2.gif';
 
        // Adding flags to sys_language
-       $TCA['sys_language']['ctrl']['typeicon_column'] = 'flag';
-       $TCA['sys_language']['ctrl']['typeicon_classes'] = array(
+       $GLOBALS['TCA']['sys_language']['ctrl']['typeicon_column'] = 'flag';
+       $GLOBALS['TCA']['sys_language']['ctrl']['typeicon_classes'] = array(
                'default' => 'mimetypes-x-sys_language',
                'mask' => 'flags-###TYPE###'
        );
@@ -297,13 +296,13 @@ if (TYPO3_MODE === 'BE' || TYPO3_MODE === 'FE' && isset($GLOBALS['BE_USER'])) {
                'zw'
        );
        foreach ($flagNames as $flagName) {
-               $TCA['sys_language']['columns']['flag']['config']['items'][] = array($flagName, $flagName, 'EXT:t3skin/images/flags/' . $flagName . '.png');
+               $GLOBALS['TCA']['sys_language']['columns']['flag']['config']['items'][] = array($flagName, $flagName, 'EXT:t3skin/images/flags/' . $flagName . '.png');
        }
 
-       $TCA['pages']['columns']['module']['config']['items'][1][2] = 'EXT:t3skin/images/icons/status/user-frontend.png';
+       $GLOBALS['TCA']['pages']['columns']['module']['config']['items'][1][2] = 'EXT:t3skin/images/icons/status/user-frontend.png';
 
        // Manual setting up of alternative icons. This is mainly for module icons which has a special prefix:
-       $TBE_STYLES['skinImg'] = array_merge($presetSkinImgs, array(
+       $GLOBALS['TBE_STYLES']['skinImg'] = array_merge($presetSkinImgs, array(
                'gfx/ol/blank.gif' => array('clear.gif', 'width="18" height="16"'),
                'MOD:web/website.gif' => array($temp_eP . 'icons/module_web.gif', 'width="24" height="24"'),
                'MOD:web_ts/ts1.gif' => array($temp_eP . 'icons/module_web_ts.gif', 'width="24" height="24"'),
@@ -320,7 +319,7 @@ if (TYPO3_MODE === 'BE' || TYPO3_MODE === 'FE' && isset($GLOBALS['BE_USER'])) {
        ));
 
        // extJS theme
-       $TBE_STYLES['extJS']['theme'] = $temp_eP . 'extjs/xtheme-t3skin.css';
+       $GLOBALS['TBE_STYLES']['extJS']['theme'] = $temp_eP . 'extjs/xtheme-t3skin.css';
        $GLOBALS['TBE_STYLES']['stylesheets']['admPanel'] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath('t3skin') . 'stylesheets/standalone/admin_panel.css';
        $flagIcons = array();
        foreach ($flagNames as $flagName) {
index b97a2e5..cf03488 100644 (file)
@@ -83,7 +83,6 @@ class TypoScriptTemplateConstantEditorModuleFunctionController extends \TYPO3\CM
         * @return string
         */
        public function main() {
-               global $TYPO3_CONF_VARS;
                global $tmpl, $tplRow, $theConstants;
                $GLOBALS['LANG']->includeLLFile('EXT:tstemplate/Resources/Private/Language/locallang_ceditor.xlf');
                $theOutput = '';
index 53e558b..6a90e47 100644 (file)
@@ -186,7 +186,6 @@ class TypoScriptTemplateObjectBrowserModuleFunctionController extends \TYPO3\CMS
         * @return string
         */
        public function main() {
-               global $BACK_PATH;
                global $tmpl, $tplRow, $theConstants;
                $POST = GeneralUtility::_POST();
                // Checking for more than one template an if, set a menu...
index d437942..d6ca9ef 100644 (file)
@@ -30,7 +30,6 @@ class AutoPublishService {
         * @return void
         */
        public function autoPublishWorkspaces() {
-               global $TYPO3_CONF_VARS;
                // Temporarily set admin rights
                // FIXME: once workspaces are cleaned up a better solution should be implemented
                $currentAdminStatus = $GLOBALS['BE_USER']->user['admin'];
index 7db6728..391aff6 100644 (file)
@@ -271,7 +271,6 @@ class StagesService {
         * @return string
         */
        public function getStageTitle($ver_stage) {
-               global $LANG;
                $stageTitle = '';
                switch ($ver_stage) {
                        case self::STAGE_PUBLISH_EXECUTE_ID: