[TASK] Remove dummy files from ext:tstemplate_* extensions 66/20766/3
authorWouter Wolters <typo3@wouterwolters.nl>
Mon, 13 May 2013 21:00:20 +0000 (23:00 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Mon, 27 May 2013 21:35:51 +0000 (23:35 +0200)
* Remove dummy files from ext:tstemplate_* extensions
* Remove old class names to the new ones
* Adjust function names for the backend module
* Adjust AJAX save type

Change-Id: I560c1c0e7bceb271eaba1a1d660cec71614df64a
Resolves: #48157
Related: #47756
Releases: 6.2
Reviewed-on: https://review.typo3.org/20766
Reviewed-by: Anja Leichsenring
Tested-by: Anja Leichsenring
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn
14 files changed:
typo3/sysext/frontend/Classes/Page/PageRepository.php
typo3/sysext/t3editor/Classes/Hook/FileEditHook.php
typo3/sysext/t3editor/Classes/Hook/TypoScriptTemplateInfoHook.php
typo3/sysext/t3editor/Classes/T3Editor.php
typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
typo3/sysext/tstemplate_analyzer/class.tx_tstemplateanalyzer.php [deleted file]
typo3/sysext/tstemplate_analyzer/ext_tables.php
typo3/sysext/tstemplate_ceditor/class.tx_tstemplateceditor.php [deleted file]
typo3/sysext/tstemplate_ceditor/ext_tables.php
typo3/sysext/tstemplate_info/class.tx_tstemplateinfo.php [deleted file]
typo3/sysext/tstemplate_info/ext_tables.php
typo3/sysext/tstemplate_objbrowser/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php
typo3/sysext/tstemplate_objbrowser/class.tx_tstemplateobjbrowser.php [deleted file]
typo3/sysext/tstemplate_objbrowser/ext_tables.php

index ac8b7a9..4348302 100644 (file)
@@ -132,7 +132,7 @@ class PageRepository {
         *
         * @param boolean $show_hidden If $show_hidden is TRUE, the hidden-field is ignored!! Normally this should be FALSE. Is used for previewing.
         * @return void
-        * @see \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::fetch_the_id(), tx_tstemplateanalyzer::initialize_editor()
+        * @see \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::fetch_the_id(), \TYPO3\CMS\TstemplateAnalyzer\Controller\TemplateAnalyzerModuleFunctionController::initialize_editor()
         * @todo Define visibility
         */
        public function init($show_hidden) {
index 02f3490..aaec3f2 100644 (file)
@@ -42,7 +42,7 @@ class FileEditHook {
        /**
         * @var string
         */
-       protected $ajaxSaveType = 'tx_tstemplateinfo';
+       protected $ajaxSaveType = 'TypoScriptTemplateInformationModuleFunctionController';
 
        /**
         * @return \TYPO3\CMS\T3Editor\T3Editor
index cfb7d3d..61a2b29 100644 (file)
@@ -42,7 +42,7 @@ class TypoScriptTemplateInfoHook {
        /**
         * @var string
         */
-       protected $ajaxSaveType = 'tx_tstemplateinfo';
+       protected $ajaxSaveType = 'TypoScriptTemplateInformationModuleFunctionController';
 
        /**
         * @return \TYPO3\CMS\T3Editor\T3Editor
@@ -74,7 +74,7 @@ class TypoScriptTemplateInfoHook {
 
        /**
         * Hook-function:
-        * called in typo3/sysext/tstemplate_info/class.tx_tstemplateinfo.php
+        * called in typo3/sysext/tstemplate_info/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php
         *
         * @param array $parameters
         * @param \TYPO3\CMS\TstemplateInfo\Controller\TypoScriptTemplateInformationModuleFunctionController $pObj
@@ -147,9 +147,8 @@ class TypoScriptTemplateInfoHook {
                                        }
                                        if (count($recData)) {
                                                // process template row before saving
-                                               require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('tstemplate_info') . 'class.tx_tstemplateinfo.php';
-                                               $tstemplateinfo = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_tstemplateinfo');
-                                               /* @var $tstemplateinfo tx_tstemplateinfo */
+                                               $tstemplateinfo = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\TstemplateInfo\\Controller\\TypoScriptTemplateInformationModuleFunctionController');
+                                               /* @var $tstemplateinfo \TYPO3\CMS\TstemplateInfo\Controller\TypoScriptTemplateInformationModuleFunctionController */
                                                // load the MOD_SETTINGS in order to check if the includeTypoScriptFileContent is set
                                                $tstemplateinfo->pObj->MOD_SETTINGS = \TYPO3\CMS\Backend\Utility\BackendUtility::getModuleData(array('includeTypoScriptFileContent' => TRUE), array(), 'web_ts');
                                                $recData['sys_template'][$saveId] = $tstemplateinfo->processTemplateRowBeforeSaving($recData['sys_template'][$saveId]);
@@ -173,5 +172,4 @@ class TypoScriptTemplateInfoHook {
 
 }
 
-
 ?>
\ No newline at end of file
index 7563545..f7864e3 100644 (file)
@@ -392,7 +392,7 @@ class T3Editor implements \TYPO3\CMS\Core\SingletonInterface {
         * new Ajax.Request('/dev/t3e/dummy/typo3/ajax.php', {
         * parameters: {
         * ajaxID: 'T3Editor::saveCode',
-        * t3editor_savetype: 'tx_tstemplateinfo'
+        * t3editor_savetype: 'TypoScriptTemplateInformationModuleFunctionController'
         * }
         * });
         *
index 21b740e..db878dd 100644 (file)
@@ -145,7 +145,7 @@ class TypoScriptTemplateModuleController extends \TYPO3\CMS\Backend\Module\BaseS
                                document.forms[0].action = ' . \TYPO3\CMS\Core\Utility\GeneralUtility::quoteJSvalue(($aHref . '#'), TRUE) . '+aname;
                        }
                        function brPoint(lnumber,t) {
-                               window.location.href = ' . \TYPO3\CMS\Core\Utility\GeneralUtility::quoteJSvalue(($aHref . '&SET[function]=tx_tstemplateobjbrowser&SET[ts_browser_type]='), TRUE) . '+(t?"setup":"const")+"&breakPointLN="+lnumber;
+                               window.location.href = ' . \TYPO3\CMS\Core\Utility\GeneralUtility::quoteJSvalue(($aHref . '&SET[function]=TYPO3\\CMS\\TstemplateObjbrowser\\Controller\\TypoScriptTemplateObjectBrowserModuleFunctionController&SET[ts_browser_type]='), TRUE) . '+(t?"setup":"const")+"&breakPointLN="+lnumber;
                                return false;
                        }
                </script>
@@ -249,7 +249,7 @@ class TypoScriptTemplateModuleController extends \TYPO3\CMS\Backend\Module\BaseS
                if ($this->id && $this->access) {
                        // View page
                        $buttons['view'] = '<a href="#" onclick="' . htmlspecialchars(\TYPO3\CMS\Backend\Utility\BackendUtility::viewOnClick($this->pageinfo['uid'], $GLOBALS['BACK_PATH'], \TYPO3\CMS\Backend\Utility\BackendUtility::BEgetRootLine($this->pageinfo['uid']))) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage', TRUE) . '">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-document-view') . '</a>';
-                       if ($this->extClassConf['name'] == 'tx_tstemplateinfo') {
+                       if ($this->extClassConf['name'] == 'TYPO3\CMS\TstemplateInfo\Controller\TypoScriptTemplateInformationModuleFunctionController') {
                                // NEW button
                                $buttons['new'] = '<input type="image" class="c-inputButton" name="createExtension" value="New"' . \TYPO3\CMS\Backend\Utility\IconUtility::skinImg($GLOBALS['BACK_PATH'], 'gfx/new_el.gif', '') . ' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:db_new.php.pagetitle', TRUE) . '" />';
                                if (!empty($this->e) && !\TYPO3\CMS\Core\Utility\GeneralUtility::_POST('abort') && !\TYPO3\CMS\Core\Utility\GeneralUtility::_POST('saveclose')) {
@@ -268,10 +268,10 @@ class TypoScriptTemplateModuleController extends \TYPO3\CMS\Backend\Module\BaseS
                                                'html' => '<input type="image" class="c-inputButton" name="abort" src="clear.gif" ' . 'title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:rm.closeDoc', TRUE) . '" ' . 'value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:rm.closeDoc', TRUE) . '" ' . '/>'
                                        ));
                                }
-                       } elseif ($this->extClassConf['name'] == 'tx_tstemplateceditor' && count($this->MOD_MENU['constant_editor_cat'])) {
+                       } elseif ($this->extClassConf['name'] == 'TYPO3\CMS\TstemplateCeditor\Controller\TypoScriptTemplateConstantEditorModuleFunctionController' && count($this->MOD_MENU['constant_editor_cat'])) {
                                // SAVE button
                                $buttons['save'] = \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-document-save', array('html' => '<input type="image" class="c-inputButton" name="submit" src="clear.gif" ' . 'title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDoc', TRUE) . '" ' . 'value="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDoc', TRUE) . '" ' . '/>'));
-                       } elseif ($this->extClassConf['name'] == 'tx_tstemplateobjbrowser') {
+                       } elseif ($this->extClassConf['name'] == 'TYPO3\CMS\TstemplateObjbrowser\Controller\TypoScriptTemplateObjectBrowserModuleFunctionController') {
                                if (!empty($this->sObj)) {
                                        // BACK
                                        $urlParameters = array(
@@ -309,9 +309,9 @@ class TypoScriptTemplateModuleController extends \TYPO3\CMS\Backend\Module\BaseS
                );
                $aHref = \TYPO3\CMS\Backend\Utility\BackendUtility::getModuleUrl('web_ts', $urlParameters);
                if ($onlyKey) {
-                       $title = '<a href="' . htmlspecialchars(($aHref . '&e[' . $onlyKey . ']=1&SET[function]=tx_tstemplateinfo')) . '">' . htmlspecialchars($title) . '</a>';
+                       $title = '<a href="' . htmlspecialchars(($aHref . '&e[' . $onlyKey . ']=1&SET[function]=TYPO3\\CMS\\TstemplateInfo\\Controller\\TypoScriptTemplateInformationModuleFunctionController')) . '">' . htmlspecialchars($title) . '</a>';
                } else {
-                       $title = '<a href="' . htmlspecialchars(($aHref . '&e[constants]=1&e[config]=1&SET[function]=tx_tstemplateinfo')) . '">' . htmlspecialchars($title) . '</a>';
+                       $title = '<a href="' . htmlspecialchars(($aHref . '&e[constants]=1&e[config]=1&SET[function]=TYPO3\\CMS\\TstemplateInfo\\Controller\\TypoScriptTemplateInformationModuleFunctionController')) . '">' . htmlspecialchars($title) . '</a>';
                }
                return $title;
        }
diff --git a/typo3/sysext/tstemplate_analyzer/class.tx_tstemplateanalyzer.php b/typo3/sysext/tstemplate_analyzer/class.tx_tstemplateanalyzer.php
deleted file mode 100644 (file)
index fec1bb5..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname tx_tstemplateanalyzer and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/tstemplate_analyzer/Classes/Controller/TemplateAnalyzerModuleFunctionController.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('tstemplate_analyzer') . 'Classes/Controller/TemplateAnalyzerModuleFunctionController.php';
-?>
\ No newline at end of file
index 320d77f..b9a5b2e 100644 (file)
@@ -5,7 +5,7 @@ if (!defined('TYPO3_MODE')) {
 if (TYPO3_MODE === 'BE') {
        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction(
                'web_ts',
-               'tx_tstemplateanalyzer',
+               'TYPO3\\CMS\\TstemplateAnalyzer\\Controller\\TemplateAnalyzerModuleFunctionController',
                \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'Classes/Controller/TemplateAnalyzerModuleFunctionController.php',
                'LLL:EXT:tstemplate/ts/locallang.xlf:templateAnalyzer'
        );
diff --git a/typo3/sysext/tstemplate_ceditor/class.tx_tstemplateceditor.php b/typo3/sysext/tstemplate_ceditor/class.tx_tstemplateceditor.php
deleted file mode 100644 (file)
index 0811776..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname tx_tstemplateceditor and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/tstemplate_ceditor/Classes/Controller/TypoScriptTemplateConstantEditorModuleFunctionController.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('tstemplate_ceditor') . 'Classes/Controller/TypoScriptTemplateConstantEditorModuleFunctionController.php';
-?>
\ No newline at end of file
index 3d91b3f..363579f 100644 (file)
@@ -5,7 +5,7 @@ if (!defined('TYPO3_MODE')) {
 if (TYPO3_MODE === 'BE') {
        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction(
                'web_ts',
-               'tx_tstemplateceditor',
+               'TYPO3\\CMS\\TstemplateCeditor\\Controller\\TypoScriptTemplateConstantEditorModuleFunctionController',
                \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'Classes/Controller/TypoScriptTemplateConstantEditorModuleFunctionController.php',
                'LLL:EXT:tstemplate/ts/locallang.xlf:constantEditor'
        );
diff --git a/typo3/sysext/tstemplate_info/class.tx_tstemplateinfo.php b/typo3/sysext/tstemplate_info/class.tx_tstemplateinfo.php
deleted file mode 100644 (file)
index a532046..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname tx_tstemplateinfo and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/tstemplate_info/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('tstemplate_info') . 'Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php';
-?>
\ No newline at end of file
index 6ab630b..f8a4a51 100644 (file)
@@ -5,7 +5,7 @@ if (!defined('TYPO3_MODE')) {
 if (TYPO3_MODE === 'BE') {
        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction(
                'web_ts',
-               'tx_tstemplateinfo',
+               'TYPO3\\CMS\\TstemplateInfo\\Controller\\TypoScriptTemplateInformationModuleFunctionController',
                \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php',
                'LLL:EXT:tstemplate/ts/locallang.xlf:infoModify'
        );
index 2e68abc..ea5ccef 100644 (file)
@@ -407,7 +407,7 @@ class TypoScriptTemplateObjectBrowserModuleFunctionController extends \TYPO3\CMS
                                foreach ($tmpl->parserErrors[$pEkey] as $inf) {
                                        $errorLink = '';
                                        if ($templateAnalyzerInstalled) {
-                                               $errorLink = ' <a href="' . htmlspecialchars(($aHref . '&SET[function]=tx_tstemplateanalyzer&template=all&SET[ts_analyzer_checkLinenum]=1#line-' . $inf[2])) . '">' . $GLOBALS['LANG']->getLL('errorShowDetails') . '</a>';
+                                               $errorLink = ' <a href="' . htmlspecialchars(($aHref . '&SET[function]=TYPO3\\CMS\\TstemplateAnalyzer\\Controller\\TemplateAnalyzerModuleFunctionController&template=all&SET[ts_analyzer_checkLinenum]=1#line-' . $inf[2])) . '">' . $GLOBALS['LANG']->getLL('errorShowDetails') . '</a>';
                                        }
                                        $errMsg[] = $inf[1] . ': &nbsp; &nbsp;' . $inf[0] . $errorLink;
                                }
diff --git a/typo3/sysext/tstemplate_objbrowser/class.tx_tstemplateobjbrowser.php b/typo3/sysext/tstemplate_objbrowser/class.tx_tstemplateobjbrowser.php
deleted file mode 100644 (file)
index ff7b82c..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/*
- * @deprecated since 6.0, the classname tx_tstemplateobjbrowser and this file is obsolete
- * and will be removed with 6.2. The class was renamed and is now located at:
- * typo3/sysext/tstemplate_objbrowser/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php
- */
-require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('tstemplate_objbrowser') . 'Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php';
-?>
\ No newline at end of file
index d57d69c..37e1be6 100644 (file)
@@ -5,7 +5,7 @@ if (!defined('TYPO3_MODE')) {
 if (TYPO3_MODE === 'BE') {
        \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction(
                'web_ts',
-               'tx_tstemplateobjbrowser',
+               'TYPO3\\CMS\\TstemplateObjbrowser\\Controller\\TypoScriptTemplateObjectBrowserModuleFunctionController',
                \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php',
                'LLL:EXT:tstemplate/ts/locallang.xlf:objectBrowser'
        );