[TASK] EXT:func Uniform extension directory structure 60/41660/4
authorMichael Oehlhof <typo3@oehlhof.de>
Sat, 18 Jul 2015 09:44:25 +0000 (11:44 +0200)
committerJigal van Hemert <jigal.van.hemert@typo3.org>
Sun, 19 Jul 2015 14:01:39 +0000 (16:01 +0200)
Moved the code from the mod1 directory to the Modules/AdvancedFunctions
directory.

Resolves: #68334
Releases: master
Change-Id: Idd3da42aab317d26b7af73d6820fb1f75d4250ee
Reviewed-on: http://review.typo3.org/41660
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Jigal van Hemert <jigal.van.hemert@typo3.org>
Tested-by: Jigal van Hemert <jigal.van.hemert@typo3.org>
typo3/sysext/func/Modules/AdvancedFunctions/index.php [new file with mode: 0644]
typo3/sysext/func/ext_tables.php
typo3/sysext/func/mod1/clear.gif [deleted file]
typo3/sysext/func/mod1/index.php [deleted file]

diff --git a/typo3/sysext/func/Modules/AdvancedFunctions/index.php b/typo3/sysext/func/Modules/AdvancedFunctions/index.php
new file mode 100644 (file)
index 0000000..93c11d6
--- /dev/null
@@ -0,0 +1,30 @@
+<?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!
+ */
+
+/**
+ * Module: Advanced functions
+ * Advanced Functions related to pages
+ */
+
+/** @var $SOBE \TYPO3\CMS\Func\Controller\PageFunctionsController */
+$GLOBALS['SOBE'] = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Func\Controller\PageFunctionsController::class);
+$GLOBALS['SOBE']->init();
+
+// Checking for first level external objects
+$GLOBALS['SOBE']->checkExtObj();
+
+// Checking second level external objects
+$GLOBALS['SOBE']->checkSubExtObj();
+$GLOBALS['SOBE']->main();
+$GLOBALS['SOBE']->printContent();
index f19c430..339733b 100644 (file)
@@ -6,14 +6,14 @@ if (TYPO3_MODE === 'BE') {
                'web',
                'func',
                '',
-               \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'mod1/',
+               'EXT:func/Modules/AdvancedFunctions/',
                array(
                        'script' => '_DISPATCH',
                        'access' => 'user,group',
                        'name' => 'web_func',
                        'labels' => array(
                                'tabs_images' => array(
-                                       'tab' => '../Resources/Public/Icons/module-func.svg',
+                                       'tab' => 'EXT:func/Resources/Public/Icons/module-func.svg',
                                ),
                                'll_ref' => 'LLL:EXT:lang/locallang_mod_web_func.xlf',
                        ),
diff --git a/typo3/sysext/func/mod1/clear.gif b/typo3/sysext/func/mod1/clear.gif
deleted file mode 100644 (file)
index e1d2d83..0000000
Binary files a/typo3/sysext/func/mod1/clear.gif and /dev/null differ
diff --git a/typo3/sysext/func/mod1/index.php b/typo3/sysext/func/mod1/index.php
deleted file mode 100644 (file)
index 93c11d6..0000000
+++ /dev/null
@@ -1,30 +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!
- */
-
-/**
- * Module: Advanced functions
- * Advanced Functions related to pages
- */
-
-/** @var $SOBE \TYPO3\CMS\Func\Controller\PageFunctionsController */
-$GLOBALS['SOBE'] = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Func\Controller\PageFunctionsController::class);
-$GLOBALS['SOBE']->init();
-
-// Checking for first level external objects
-$GLOBALS['SOBE']->checkExtObj();
-
-// Checking second level external objects
-$GLOBALS['SOBE']->checkSubExtObj();
-$GLOBALS['SOBE']->main();
-$GLOBALS['SOBE']->printContent();