[TASK] EXT:setup Uniform extension directory structure 10/41710/2
authorMichael Oehlhof <typo3@oehlhof.de>
Sun, 19 Jul 2015 16:43:59 +0000 (18:43 +0200)
committerStefan Froemken <froemken@gmail.com>
Mon, 20 Jul 2015 13:19:18 +0000 (15:19 +0200)
Moved the code from the mod directory to the Modules/Setup directory.

Resolves: #68350
Releases: master
Change-Id: Ibd9850c426dbf703939741faa8736d6b25760971
Reviewed-on: http://review.typo3.org/41710
Reviewed-by: Susanne Moog <typo3@susannemoog.de>
Tested-by: Susanne Moog <typo3@susannemoog.de>
Reviewed-by: Stefan Froemken <froemken@gmail.com>
Tested-by: Stefan Froemken <froemken@gmail.com>
typo3/sysext/setup/Modules/Setup/index.php [new file with mode: 0644]
typo3/sysext/setup/ext_tables.php
typo3/sysext/setup/mod/clear.gif [deleted file]
typo3/sysext/setup/mod/index.php [deleted file]
typo3/sysext/setup/mod/setup.gif [deleted file]

diff --git a/typo3/sysext/setup/Modules/Setup/index.php b/typo3/sysext/setup/Modules/Setup/index.php
new file mode 100644 (file)
index 0000000..e279a23
--- /dev/null
@@ -0,0 +1,20 @@
+<?php
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+$GLOBALS['SOBE'] = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Setup\Controller\SetupModuleController::class);
+$GLOBALS['SOBE']->simulateUser();
+$GLOBALS['SOBE']->storeIncomingData();
+$GLOBALS['SOBE']->init();
+$GLOBALS['SOBE']->main();
+$GLOBALS['SOBE']->printContent();
index c45e549..4498041 100644 (file)
@@ -6,14 +6,14 @@ if (TYPO3_MODE === 'BE') {
                'user',
                'setup',
                'after:task',
-               \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'mod/',
+               'EXT:setup/Modules/Setup/',
                array(
                        'script' => '_DISPATCH',
                        'access' => 'group,user',
                        'name' => 'user_setup',
                        'labels' => array(
                                'tabs_images' => array(
-                                       'tab' => '../Resources/Public/Icons/module-setup.svg',
+                                       'tab' => 'EXT:setup/Resources/Public/Icons/module-setup.svg',
                                ),
                                'll_ref' => 'LLL:EXT:setup/Resources/Private/Language/locallang_mod.xlf',
                        ),
diff --git a/typo3/sysext/setup/mod/clear.gif b/typo3/sysext/setup/mod/clear.gif
deleted file mode 100644 (file)
index e1d2d83..0000000
Binary files a/typo3/sysext/setup/mod/clear.gif and /dev/null differ
diff --git a/typo3/sysext/setup/mod/index.php b/typo3/sysext/setup/mod/index.php
deleted file mode 100644 (file)
index e279a23..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-$GLOBALS['SOBE'] = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Setup\Controller\SetupModuleController::class);
-$GLOBALS['SOBE']->simulateUser();
-$GLOBALS['SOBE']->storeIncomingData();
-$GLOBALS['SOBE']->init();
-$GLOBALS['SOBE']->main();
-$GLOBALS['SOBE']->printContent();
diff --git a/typo3/sysext/setup/mod/setup.gif b/typo3/sysext/setup/mod/setup.gif
deleted file mode 100644 (file)
index 2f74225..0000000
Binary files a/typo3/sysext/setup/mod/setup.gif and /dev/null differ