[TASK] EXT:lowlevel Uniform extension directory structure 84/41784/2
authorWouter Wolters <typo3@wouterwolters.nl>
Tue, 21 Jul 2015 15:34:34 +0000 (17:34 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Tue, 21 Jul 2015 16:52:29 +0000 (18:52 +0200)
Move dbint and config to Modules/ directory
Move language files to Resources/Private/Language/
Move CLI scripts to Resource/PHP/

Resolves: #68435
Releases: master
Change-Id: I8b512fb421ee6133b8ecf02a09f3121dff84ff9d
Reviewed-on: http://review.typo3.org/41784
Reviewed-by: Susanne Moog <typo3@susannemoog.de>
Tested-by: Susanne Moog <typo3@susannemoog.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
16 files changed:
typo3/sysext/lowlevel/Modules/Configuration/index.php [new file with mode: 0644]
typo3/sysext/lowlevel/Modules/DatabaseIntegrity/index.php [new file with mode: 0644]
typo3/sysext/lowlevel/Resources/PHP/admin_cli.php [new file with mode: 0644]
typo3/sysext/lowlevel/Resources/PHP/cleaner_cli.php [new file with mode: 0644]
typo3/sysext/lowlevel/Resources/PHP/refindex_cli.php [new file with mode: 0644]
typo3/sysext/lowlevel/Resources/Private/Language/locallang_mod.xlf [new file with mode: 0644]
typo3/sysext/lowlevel/Resources/Private/Language/locallang_mod_configuration.xlf [new file with mode: 0644]
typo3/sysext/lowlevel/admin_cli.php [deleted file]
typo3/sysext/lowlevel/config/index.php [deleted file]
typo3/sysext/lowlevel/config/locallang_mod.xlf [deleted file]
typo3/sysext/lowlevel/dbint/cli/cleaner_cli.php [deleted file]
typo3/sysext/lowlevel/dbint/cli/refindex_cli.php [deleted file]
typo3/sysext/lowlevel/dbint/index.php [deleted file]
typo3/sysext/lowlevel/dbint/locallang_mod.xlf [deleted file]
typo3/sysext/lowlevel/ext_localconf.php
typo3/sysext/lowlevel/ext_tables.php

diff --git a/typo3/sysext/lowlevel/Modules/Configuration/index.php b/typo3/sysext/lowlevel/Modules/Configuration/index.php
new file mode 100644 (file)
index 0000000..85f1268
--- /dev/null
@@ -0,0 +1,24 @@
+<?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: Config
+ *
+ * This module lets you view the config variables around TYPO3.
+ */
+
+$GLOBALS['SOBE'] = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Lowlevel\View\ConfigurationView::class);
+$GLOBALS['SOBE']->init();
+$GLOBALS['SOBE']->main();
+$GLOBALS['SOBE']->printContent();
diff --git a/typo3/sysext/lowlevel/Modules/DatabaseIntegrity/index.php b/typo3/sysext/lowlevel/Modules/DatabaseIntegrity/index.php
new file mode 100644 (file)
index 0000000..e197ad0
--- /dev/null
@@ -0,0 +1,24 @@
+<?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: Database integrity check
+ *
+ * This module lets you check if all pages and the records relate properly to each other
+ */
+
+$GLOBALS['SOBE'] = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Lowlevel\View\DatabaseIntegrityView::class);
+$GLOBALS['SOBE']->init();
+$GLOBALS['SOBE']->main();
+$GLOBALS['SOBE']->printContent();
diff --git a/typo3/sysext/lowlevel/Resources/PHP/admin_cli.php b/typo3/sysext/lowlevel/Resources/PHP/admin_cli.php
new file mode 100644 (file)
index 0000000..2e01900
--- /dev/null
@@ -0,0 +1,8 @@
+<?php
+if (!defined('TYPO3_cliMode')) {
+       die('You cannot run this script directly!');
+}
+
+// Call the functionality
+$adminObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Lowlevel\AdminCommand::class);
+$adminObj->cli_main($_SERVER['argv']);
diff --git a/typo3/sysext/lowlevel/Resources/PHP/cleaner_cli.php b/typo3/sysext/lowlevel/Resources/PHP/cleaner_cli.php
new file mode 100644 (file)
index 0000000..f1bc7d3
--- /dev/null
@@ -0,0 +1,8 @@
+<?php
+if (!defined('TYPO3_cliMode')) {
+       die('You cannot run this script directly!');
+}
+
+// Call the functionality
+$cleanerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Lowlevel\CleanerCommand::class);
+$cleanerObj->cli_main($_SERVER['argv']);
diff --git a/typo3/sysext/lowlevel/Resources/PHP/refindex_cli.php b/typo3/sysext/lowlevel/Resources/PHP/refindex_cli.php
new file mode 100644 (file)
index 0000000..2975046
--- /dev/null
@@ -0,0 +1,19 @@
+<?php
+if (!defined('TYPO3_cliMode')) {
+       die('You cannot run this script directly!');
+}
+// Call the functionality
+if (in_array('-e', $_SERVER['argv']) || in_array('-c', $_SERVER['argv'])) {
+       $testOnly = in_array('-c', $_SERVER['argv']);
+       $refIndexObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Database\ReferenceIndex::class);
+       list($headerContent, $bodyContent) = $refIndexObj->updateIndex($testOnly, !in_array('-s', $_SERVER['argv']));
+       $bodyContent = str_replace('##LF##', LF, $bodyContent);
+} else {
+       echo '
+Options:
+-c = Check refindex
+-e = Update refindex
+-s = Silent
+';
+       die;
+}
diff --git a/typo3/sysext/lowlevel/Resources/Private/Language/locallang_mod.xlf b/typo3/sysext/lowlevel/Resources/Private/Language/locallang_mod.xlf
new file mode 100644 (file)
index 0000000..d3e0402
--- /dev/null
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
+       <file t3:id="1415814899" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:34Z" product-name="lowlevel">
+               <header/>
+               <body>
+                       <trans-unit id="mlang_labels_tablabel">
+                               <source>Database integrity check</source>
+                       </trans-unit>
+                       <trans-unit id="mlang_labels_tabdescr">
+                               <source>Here you can check the integrity of the database tables configured by the $TCA. For instance all records must belong to a page record. In addition the existence of uploaded files attached to records (normally residing in uploads/* folders) are verified as well. You can also get a view of the total pagetree including deleted pages. Finally you've got access to a global database search facility.&lt;br /&gt;&lt;em&gt;Access for 'admin' users only!&lt;/em&gt;</source>
+                       </trans-unit>
+                       <trans-unit id="mlang_tabs_tab">
+                               <source>DB check</source>
+                       </trans-unit>
+               </body>
+       </file>
+</xliff>
diff --git a/typo3/sysext/lowlevel/Resources/Private/Language/locallang_mod_configuration.xlf b/typo3/sysext/lowlevel/Resources/Private/Language/locallang_mod_configuration.xlf
new file mode 100644 (file)
index 0000000..39a3196
--- /dev/null
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
+       <file t3:id="1415814897" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:34Z" product-name="lowlevel">
+               <header/>
+               <body>
+                       <trans-unit id="mlang_labels_tablabel">
+                               <source>View configuration from localconf.php and tables.php</source>
+                       </trans-unit>
+                       <trans-unit id="mlang_labels_tabdescr">
+                               <source>Allows you to browse the values of the $TCA array (table configuration) and $TYPO3_CONF_VARS. You cannot set any values, only browse them.&lt;br /&gt;&lt;em&gt;Access for 'admin' users only!&lt;/em&gt;</source>
+                       </trans-unit>
+                       <trans-unit id="mlang_tabs_tab">
+                               <source>Configuration</source>
+                       </trans-unit>
+               </body>
+       </file>
+</xliff>
diff --git a/typo3/sysext/lowlevel/admin_cli.php b/typo3/sysext/lowlevel/admin_cli.php
deleted file mode 100644 (file)
index 2e01900..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-if (!defined('TYPO3_cliMode')) {
-       die('You cannot run this script directly!');
-}
-
-// Call the functionality
-$adminObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Lowlevel\AdminCommand::class);
-$adminObj->cli_main($_SERVER['argv']);
diff --git a/typo3/sysext/lowlevel/config/index.php b/typo3/sysext/lowlevel/config/index.php
deleted file mode 100644 (file)
index 85f1268..0000000
+++ /dev/null
@@ -1,24 +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: Config
- *
- * This module lets you view the config variables around TYPO3.
- */
-
-$GLOBALS['SOBE'] = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Lowlevel\View\ConfigurationView::class);
-$GLOBALS['SOBE']->init();
-$GLOBALS['SOBE']->main();
-$GLOBALS['SOBE']->printContent();
diff --git a/typo3/sysext/lowlevel/config/locallang_mod.xlf b/typo3/sysext/lowlevel/config/locallang_mod.xlf
deleted file mode 100644 (file)
index 39a3196..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
-       <file t3:id="1415814897" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:34Z" product-name="lowlevel">
-               <header/>
-               <body>
-                       <trans-unit id="mlang_labels_tablabel">
-                               <source>View configuration from localconf.php and tables.php</source>
-                       </trans-unit>
-                       <trans-unit id="mlang_labels_tabdescr">
-                               <source>Allows you to browse the values of the $TCA array (table configuration) and $TYPO3_CONF_VARS. You cannot set any values, only browse them.&lt;br /&gt;&lt;em&gt;Access for 'admin' users only!&lt;/em&gt;</source>
-                       </trans-unit>
-                       <trans-unit id="mlang_tabs_tab">
-                               <source>Configuration</source>
-                       </trans-unit>
-               </body>
-       </file>
-</xliff>
diff --git a/typo3/sysext/lowlevel/dbint/cli/cleaner_cli.php b/typo3/sysext/lowlevel/dbint/cli/cleaner_cli.php
deleted file mode 100644 (file)
index f1bc7d3..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-if (!defined('TYPO3_cliMode')) {
-       die('You cannot run this script directly!');
-}
-
-// Call the functionality
-$cleanerObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Lowlevel\CleanerCommand::class);
-$cleanerObj->cli_main($_SERVER['argv']);
diff --git a/typo3/sysext/lowlevel/dbint/cli/refindex_cli.php b/typo3/sysext/lowlevel/dbint/cli/refindex_cli.php
deleted file mode 100644 (file)
index 2975046..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-if (!defined('TYPO3_cliMode')) {
-       die('You cannot run this script directly!');
-}
-// Call the functionality
-if (in_array('-e', $_SERVER['argv']) || in_array('-c', $_SERVER['argv'])) {
-       $testOnly = in_array('-c', $_SERVER['argv']);
-       $refIndexObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Database\ReferenceIndex::class);
-       list($headerContent, $bodyContent) = $refIndexObj->updateIndex($testOnly, !in_array('-s', $_SERVER['argv']));
-       $bodyContent = str_replace('##LF##', LF, $bodyContent);
-} else {
-       echo '
-Options:
--c = Check refindex
--e = Update refindex
--s = Silent
-';
-       die;
-}
diff --git a/typo3/sysext/lowlevel/dbint/index.php b/typo3/sysext/lowlevel/dbint/index.php
deleted file mode 100644 (file)
index e197ad0..0000000
+++ /dev/null
@@ -1,24 +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: Database integrity check
- *
- * This module lets you check if all pages and the records relate properly to each other
- */
-
-$GLOBALS['SOBE'] = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Lowlevel\View\DatabaseIntegrityView::class);
-$GLOBALS['SOBE']->init();
-$GLOBALS['SOBE']->main();
-$GLOBALS['SOBE']->printContent();
diff --git a/typo3/sysext/lowlevel/dbint/locallang_mod.xlf b/typo3/sysext/lowlevel/dbint/locallang_mod.xlf
deleted file mode 100644 (file)
index d3e0402..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xliff version="1.0" xmlns:t3="http://typo3.org/schemas/xliff">
-       <file t3:id="1415814899" source-language="en" datatype="plaintext" original="messages" date="2011-10-17T20:22:34Z" product-name="lowlevel">
-               <header/>
-               <body>
-                       <trans-unit id="mlang_labels_tablabel">
-                               <source>Database integrity check</source>
-                       </trans-unit>
-                       <trans-unit id="mlang_labels_tabdescr">
-                               <source>Here you can check the integrity of the database tables configured by the $TCA. For instance all records must belong to a page record. In addition the existence of uploaded files attached to records (normally residing in uploads/* folders) are verified as well. You can also get a view of the total pagetree including deleted pages. Finally you've got access to a global database search facility.&lt;br /&gt;&lt;em&gt;Access for 'admin' users only!&lt;/em&gt;</source>
-                       </trans-unit>
-                       <trans-unit id="mlang_tabs_tab">
-                               <source>DB check</source>
-                       </trans-unit>
-               </body>
-       </file>
-</xliff>
index 01f7589..4d9e0f3 100644 (file)
@@ -3,9 +3,9 @@ defined('TYPO3_MODE') or die();
 
 if (TYPO3_MODE === 'BE') {
        // Setting up scripts that can be run from the cli_dispatch.phpsh script.
-       $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['cliKeys']['lowlevel_refindex'] = array('EXT:lowlevel/dbint/cli/refindex_cli.php', '_CLI_lowlevel');
-       $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['cliKeys']['lowlevel_cleaner'] = array('EXT:lowlevel/dbint/cli/cleaner_cli.php', '_CLI_lowlevel');
-       $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['cliKeys']['lowlevel_admin'] = array('EXT:lowlevel/admin_cli.php', '_CLI_lowlevel');
+       $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['cliKeys']['lowlevel_refindex'] = array('EXT:lowlevel/Resources/PHP/refindex_cli.php', '_CLI_lowlevel');
+       $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['cliKeys']['lowlevel_cleaner'] = array('EXT:lowlevel/Resources/PHP/cleaner_cli.php', '_CLI_lowlevel');
+       $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['cliKeys']['lowlevel_admin'] = array('EXT:lowlevel/Resources/PHP/admin_cli.php', '_CLI_lowlevel');
        $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['lowlevel']['cleanerModules']['missing_files'] = array('TYPO3\\CMS\\Lowlevel\\MissingFilesCommand');
        $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['lowlevel']['cleanerModules']['missing_relations'] = array('TYPO3\\CMS\\Lowlevel\\MissingRelationsCommand');
        $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['lowlevel']['cleanerModules']['double_files'] = array('TYPO3\\CMS\\Lowlevel\\DoubleFilesCommand');
index 83a7046..a425168 100644 (file)
@@ -6,7 +6,7 @@ if (TYPO3_MODE === 'BE') {
                'system',
                'dbint',
                '',
-               \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'dbint/',
+               'EXT:lowlevel/Modules/DatabaseIntegrity/',
                array(
                        'script' => '_DISPATCH',
                        'access' => 'admin',
@@ -14,9 +14,9 @@ if (TYPO3_MODE === 'BE') {
                        'workspaces' => 'online',
                        'labels' => array(
                                'tabs_images' => array(
-                                       'tab' => '../Resources/Public/Icons/module-dbint.svg',
+                                       'tab' => 'EXT:lowlevel/Resources/Public/Icons/module-dbint.svg',
                                ),
-                               'll_ref' => 'LLL:EXT:lowlevel/dbint/locallang_mod.xlf',
+                               'll_ref' => 'LLL:EXT:lowlevel/Resources/Private/Language/locallang_mod.xlf',
                        ),
                )
        );
@@ -24,7 +24,7 @@ if (TYPO3_MODE === 'BE') {
                'system',
                'config',
                '',
-               \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'config/',
+               'EXT:lowlevel/Modules/Configuration/',
                array(
                        'script' => '_DISPATCH',
                        'access' => 'admin',
@@ -32,9 +32,9 @@ if (TYPO3_MODE === 'BE') {
                        'workspaces' => 'online',
                        'labels' => array(
                                'tabs_images' => array(
-                                       'tab' => '../Resources/Public/Icons/module-config.svg',
+                                       'tab' => 'EXT:lowlevel/Resources/Public/Icons/module-config.svg',
                                ),
-                               'll_ref' => 'LLL:EXT:lowlevel/config/locallang_mod.xlf',
+                               'll_ref' => 'LLL:EXT:lowlevel/Resources/Private/Language/locallang_mod_configuration.xlf',
                        ),
                )
        );