diff --git a/composer.json b/composer.json
index e3ae34ba37a398e1a447e9190acf6aca23f80860..bdc14fb401d7823a693a18ca1fa811834755094a 100644
--- a/composer.json
+++ b/composer.json
@@ -107,7 +107,6 @@
"typo3/cms-impexp": "self.version",
"typo3/cms-indexed-search": "self.version",
"typo3/cms-info": "self.version",
- "typo3/cms-info-pagetsconfig": "self.version",
"typo3/cms-install": "self.version",
"typo3/cms-lang": "self.version",
"typo3/cms-linkvalidator": "self.version",
@@ -151,7 +150,6 @@
"TYPO3\\CMS\\Impexp\\": "typo3/sysext/impexp/Classes/",
"TYPO3\\CMS\\IndexedSearch\\": "typo3/sysext/indexed_search/Classes/",
"TYPO3\\CMS\\Info\\": "typo3/sysext/info/Classes/",
- "TYPO3\\CMS\\InfoPagetsconfig\\": "typo3/sysext/info_pagetsconfig/Classes/",
"TYPO3\\CMS\\Install\\": "typo3/sysext/install/Classes/",
"TYPO3\\CMS\\Lang\\": "typo3/sysext/lang/Classes/",
"TYPO3\\CMS\\Linkvalidator\\": "typo3/sysext/linkvalidator/Classes/",
diff --git a/composer.lock b/composer.lock
index 105f18d8224e86d4022440b99cc0abc996588643..70303236f57d5427d5f0647bc64a70c2f7fe29b0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "content-hash": "b054fb89baff8fbce0b4822829f871f3",
+ "content-hash": "c4f44e0a5b85cfeaec793167eb75853c",
"packages": [
{
"name": "cogpowered/finediff",
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-82505-MergedEXTinfo_pagetsconfigToEXTinfo.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-82505-MergedEXTinfo_pagetsconfigToEXTinfo.rst
new file mode 100644
index 0000000000000000000000000000000000000000..15b1838f3cfd63295ae92bcde38811aab7c48b85
--- /dev/null
+++ b/typo3/sysext/core/Documentation/Changelog/master/Breaking-82505-MergedEXTinfo_pagetsconfigToEXTinfo.rst
@@ -0,0 +1,33 @@
+.. include:: ../../Includes.txt
+
+===========================================================
+Breaking: #82505 - Merged EXT:info_pagetsconfig to EXT:info
+===========================================================
+
+See :issue:`82505`
+
+Description
+===========
+
+The extension `info_pagetsconfig` has been merged into the extension `info`.
+
+
+Impact
+======
+
+The extension `info` now contains the `PageTSconfig` analysis as well, without the possibility to disable this submodule
+function on a per-system functionality.
+
+
+Affected Installations
+======================
+
+Installations with extensions with checks for extension `info_pagetsconfig` being installed.
+
+
+Migration
+=========
+
+Change the extensions to check for `info` instead of `info_pagetsconfig`.
+
+.. index:: Backend, NotScanned
diff --git a/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php b/typo3/sysext/info/Classes/Controller/InfoPageTyposcriptConfigController.php
similarity index 96%
rename from typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php
rename to typo3/sysext/info/Classes/Controller/InfoPageTyposcriptConfigController.php
index 3e6c8e2275289daa20b8f0a11bc60436bbf66c1c..9ad52de460677e70186a1cd1c0a7cac5e1caf6b0 100644
--- a/typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php
+++ b/typo3/sysext/info/Classes/Controller/InfoPageTyposcriptConfigController.php
@@ -1,5 +1,5 @@
<?php
-namespace TYPO3\CMS\InfoPagetsconfig\Controller;
+namespace TYPO3\CMS\Info\Controller;
/*
* This file is part of the TYPO3 CMS project.
@@ -45,7 +45,7 @@ class InfoPageTyposcriptConfigController extends \TYPO3\CMS\Backend\Module\Abstr
public function __construct()
{
$this->iconFactory = GeneralUtility::makeInstance(IconFactory::class);
- $this->getLanguageService()->includeLLFile('EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf');
+ $this->getLanguageService()->includeLLFile('EXT:info/Resources/Private/Language/InfoPageTsConfig.xlf');
$this->view = $this->getFluidTemplateObject();
}
@@ -381,13 +381,13 @@ class InfoPageTyposcriptConfigController extends \TYPO3\CMS\Backend\Module\Abstr
{
/** @var StandaloneView $view */
$view = GeneralUtility::makeInstance(StandaloneView::class);
- $view->setLayoutRootPaths([GeneralUtility::getFileAbsFileName('EXT:info_pagetsconfig/Resources/Private/Layouts')]);
- $view->setPartialRootPaths([GeneralUtility::getFileAbsFileName('EXT:info_pagetsconfig/Resources/Private/Partials')]);
- $view->setTemplateRootPaths([GeneralUtility::getFileAbsFileName('EXT:info_pagetsconfig/Resources/Private/Templates')]);
+ $view->setLayoutRootPaths([GeneralUtility::getFileAbsFileName('EXT:info/Resources/Private/Layouts')]);
+ $view->setPartialRootPaths([GeneralUtility::getFileAbsFileName('EXT:info/Resources/Private/Partials')]);
+ $view->setTemplateRootPaths([GeneralUtility::getFileAbsFileName('EXT:info/Resources/Private/Templates')]);
- $view->setTemplatePathAndFilename(GeneralUtility::getFileAbsFileName('EXT:info_pagetsconfig/Resources/Private/Templates/Main.html'));
+ $view->setTemplatePathAndFilename(GeneralUtility::getFileAbsFileName('EXT:info/Resources/Private/Templates/PageTsConfig.html'));
- $view->getRequest()->setControllerExtensionName('info_pagetsconfig');
+ $view->getRequest()->setControllerExtensionName('info');
return $view;
}
}
diff --git a/typo3/sysext/info/Migrations/Code/ClassAliasMap.php b/typo3/sysext/info/Migrations/Code/ClassAliasMap.php
index 314dc7983b62867ef8c053b1e66895ab79bb73c9..b7a09cc1cc85cee117a26197a535c7199774d513 100644
--- a/typo3/sysext/info/Migrations/Code/ClassAliasMap.php
+++ b/typo3/sysext/info/Migrations/Code/ClassAliasMap.php
@@ -2,4 +2,5 @@
return [
'TYPO3\\CMS\\Frontend\\Controller\\PageInformationController' => \TYPO3\CMS\Info\Controller\PageInformationController::class,
'TYPO3\\CMS\\Frontend\\Controller\\TranslationStatusController' => \TYPO3\CMS\Info\Controller\TranslationStatusController::class,
+ 'TYPO3\\CMS\\InfoPagetsconfig\\Controller\\InfoPageTyposcriptConfigController' => \TYPO3\CMS\Info\Controller\InfoPageTyposcriptConfigController::class,
];
diff --git a/typo3/sysext/info/Migrations/Code/LegacyClassesForIde.php b/typo3/sysext/info/Migrations/Code/LegacyClassesForIde.php
index 5e476fbf80ccc71e35f68d150e44bc8129a8ccd5..cf870e88e0c36565ef463821893aa2162c3e0f2d 100644
--- a/typo3/sysext/info/Migrations/Code/LegacyClassesForIde.php
+++ b/typo3/sysext/info/Migrations/Code/LegacyClassesForIde.php
@@ -11,3 +11,9 @@ namespace TYPO3\CMS\Frontend\Controller {
{
}
}
+
+namespace TYPO3\CMS\InfoPagetsconfig\Controller {
+ class InfoPageTyposcriptConfigController extends \TYPO3\CMS\Info\Controller\InfoPageTyposcriptConfigController
+ {
+ }
+}
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Private/Language/locallang.xlf b/typo3/sysext/info/Resources/Private/Language/InfoPageTsConfig.xlf
similarity index 100%
rename from typo3/sysext/info_pagetsconfig/Resources/Private/Language/locallang.xlf
rename to typo3/sysext/info/Resources/Private/Language/InfoPageTsConfig.xlf
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Private/Language/locallang_csh_webinfo.xlf b/typo3/sysext/info/Resources/Private/Language/locallang_csh_tsconfigInfo.xlf
similarity index 100%
rename from typo3/sysext/info_pagetsconfig/Resources/Private/Language/locallang_csh_webinfo.xlf
rename to typo3/sysext/info/Resources/Private/Language/locallang_csh_tsconfigInfo.xlf
diff --git a/typo3/sysext/info/Resources/Private/Partials/PageTsConfig/EditIcon.html b/typo3/sysext/info/Resources/Private/Partials/PageTsConfig/EditIcon.html
new file mode 100644
index 0000000000000000000000000000000000000000..164ec38dcf44916da91f5d58d53c4f171981d69e
--- /dev/null
+++ b/typo3/sysext/info/Resources/Private/Partials/PageTsConfig/EditIcon.html
@@ -0,0 +1,8 @@
+<f:if condition="{editIcon}">
+ <a href="{editIcon -> f:format.raw()}" title="{f:translate(key: 'LLL:EXT:info/Resources/Private/Language/InfoPageTsConfig.xlf:{editTitle}')}" class="btn btn-default">
+ <core:icon identifier="actions-document-open" />
+ <f:if condition="{editAll}">
+ <f:translate key="LLL:EXT:info/Resources/Private/Language/InfoPageTsConfig.xlf:editTSconfig_all" />
+ </f:if>
+ </a>
+</f:if>
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/Menu.html b/typo3/sysext/info/Resources/Private/Partials/PageTsConfig/Menu.html
similarity index 68%
rename from typo3/sysext/info_pagetsconfig/Resources/Private/Partials/Menu.html
rename to typo3/sysext/info/Resources/Private/Partials/PageTsConfig/Menu.html
index d72224c85f7587c839fa3b923ae431bec612ce9a..09687cf190c7b849ba0f64155cf268278d5d024e 100644
--- a/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/Menu.html
+++ b/typo3/sysext/info/Resources/Private/Partials/PageTsConfig/Menu.html
@@ -3,7 +3,7 @@
<div class="checkbox">
<label for="checkTsconf_alphaSort">
<f:format.raw>{alphaSort}</f:format.raw>
- {f:translate(key: 'LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:sort_alphabetic')}
+ {f:translate(key: 'LLL:EXT:info/Resources/Private/Language/InfoPageTsConfig.xlf:sort_alphabetic')}
</label>
</div>
</div>
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/Page.html b/typo3/sysext/info/Resources/Private/Partials/PageTsConfig/Page.html
similarity index 66%
rename from typo3/sysext/info_pagetsconfig/Resources/Private/Partials/Page.html
rename to typo3/sysext/info/Resources/Private/Partials/PageTsConfig/Page.html
index 079519eb94c1ee38b5d59ddccf8be64f8cddf1a8..cacbce2515e38190e209c7fd7e76451d66a89314 100644
--- a/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/Page.html
+++ b/typo3/sysext/info/Resources/Private/Partials/PageTsConfig/Page.html
@@ -1,8 +1,8 @@
-<h1>{f:translate(key: 'LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:tsconf_title')}</h1>
+<h1>{f:translate(key: 'LLL:EXT:info/Resources/Private/Language/locallang.xlf:tsconf_title')}</h1>
<f:if condition="{csh}">
<span class="btn btn-default btn-sm"><f:format.raw>{csh}</f:format.raw></span>
</f:if>
-<f:render partial="Menu" arguments="{_all}"/>
+<f:render partial="PageTsConfig/Menu" arguments="{_all}"/>
<f:if condition="{tsconfParts99}">
<f:then>
<f:for each="{lines}" as="line">
@@ -10,7 +10,7 @@
<div class="panel-heading">
<f:if condition="{line.defaultPageTSconfig}">
<f:then>
- <f:translate key="LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:editTSconfig_default" />
+ <f:translate key="LLL:EXT:info/Resources/Private/Language/InfoPageTsConfig.xlf:editTSconfig_default" />
</f:then>
<f:else>
<f:format.raw>{line.title}</f:format.raw>
@@ -21,11 +21,11 @@
<f:if condition="{line.content -> f:format.stripTags() -> f:spaceless()}">
<f:format.raw>{line.content}</f:format.raw>
</f:if>
- <f:render partial="EditIcon" arguments="{editIcon: line.editIcon, editTitle: line.editTitle}" />
+ <f:render partial="PageTsConfig/EditIcon" arguments="{editIcon: line.editIcon, editTitle: line.editTitle}" />
</div>
</div>
</f:for>
- <f:render partial="EditIcon" arguments="{editIcon: editIcon, editTitle: editTitle, editAll: 1}" />
+ <f:render partial="PageTsConfig/EditIcon" arguments="{editIcon: editIcon, editTitle: editTitle, editAll: 1}" />
</f:then>
<f:else>
<div class="nowrap">
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/PageZero.html b/typo3/sysext/info/Resources/Private/Partials/PageTsConfig/PageZero.html
similarity index 51%
rename from typo3/sysext/info_pagetsconfig/Resources/Private/Partials/PageZero.html
rename to typo3/sysext/info/Resources/Private/Partials/PageTsConfig/PageZero.html
index fbeafd8f24edddd633fe02ca3cbfe6fca9234c3c..daf3946199601cc0467577654fe2e72829631489 100644
--- a/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/PageZero.html
+++ b/typo3/sysext/info/Resources/Private/Partials/PageTsConfig/PageZero.html
@@ -5,21 +5,21 @@
<table class="table table-striped table-hover" id="tsconfig-overview">
<thead>
<tr>
- <th>{f:translate(key: 'LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:pagetitle')}</th>
- <th>{f:translate(key: 'LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:included_tsconfig_files')}</th>
- <th>{f:translate(key: 'LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:written_tsconfig_lines')}</th>
+ <th>{f:translate(key: 'LLL:EXT:info/Resources/Private/Language/InfoPageTsConfig.xlf:pagetitle')}</th>
+ <th>{f:translate(key: 'LLL:EXT:info/Resources/Private/Language/InfoPageTsConfig.xlf:included_tsconfig_files')}</th>
+ <th>{f:translate(key: 'LLL:EXT:info/Resources/Private/Language/InfoPageTsConfig.xlf:written_tsconfig_lines')}</th>
</tr>
</thead>
<tbody>
<f:for each="{overviewOfPagesUsingTSConfig}" as="line">
- <f:render partial="PageZeroTableRow" arguments="{line: line}" />
+ <f:render partial="PageTsConfig/PageZeroTableRow" arguments="{line: line}" />
</f:for>
</tbody>
</table>
</div>
</f:then>
<f:else>
- <f:be.infobox message="{f:translate(key: 'LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:tsconf_noPageTSconfig')}" state="-1" />
+ <f:be.infobox message="{f:translate(key: 'LLL:EXT:info/Resources/Private/Language/InfoPageTsConfig.xlf:tsconf_noPageTSconfig')}" state="-1" />
</f:else>
</f:if>
-</div>
\ No newline at end of file
+</div>
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/PageZeroTableRow.html b/typo3/sysext/info/Resources/Private/Partials/PageTsConfig/PageZeroTableRow.html
similarity index 100%
rename from typo3/sysext/info_pagetsconfig/Resources/Private/Partials/PageZeroTableRow.html
rename to typo3/sysext/info/Resources/Private/Partials/PageTsConfig/PageZeroTableRow.html
diff --git a/typo3/sysext/info/Resources/Private/Templates/PageTsConfig.html b/typo3/sysext/info/Resources/Private/Templates/PageTsConfig.html
new file mode 100644
index 0000000000000000000000000000000000000000..6b1953a7245e6c683236c4515a4849f69655535f
--- /dev/null
+++ b/typo3/sysext/info/Resources/Private/Templates/PageTsConfig.html
@@ -0,0 +1,8 @@
+<f:if condition="{pageZero}">
+ <f:then>
+ <f:render partial="PageTsConfig/PageZero" arguments="{_all}" />
+ </f:then>
+ <f:else>
+ <f:render partial="PageTsConfig/Page" arguments="{_all}" />
+ </f:else>
+</f:if>
diff --git a/typo3/sysext/info/ext_tables.php b/typo3/sysext/info/ext_tables.php
index 9296b233b04381b7b682bfcf77df8b265217fcb3..7715a91de1ebfeaa52b2ca3659ebc6f48b476d7d 100644
--- a/typo3/sysext/info/ext_tables.php
+++ b/typo3/sysext/info/ext_tables.php
@@ -16,6 +16,7 @@ if (TYPO3_MODE === 'BE') {
]
);
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_web_info', 'EXT:info/Resources/Private/Language/locallang_csh_web_info.xlf');
+ \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_web_infotsconfig', 'EXT:info/Resources/Private/Language/locallang_csh_tsconfigInfo.xlf');
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction(
'web_info',
@@ -29,4 +30,10 @@ if (TYPO3_MODE === 'BE') {
null,
'LLL:EXT:frontend/Resources/Private/Language/locallang_tca.xlf:mod_tx_cms_webinfo_lang'
);
+ \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction(
+ 'web_info',
+ \TYPO3\CMS\Info\Controller\InfoPageTyposcriptConfigController::class,
+ null,
+ 'LLL:EXT:info/Resources/Private/Language/InfoPageTsConfig.xlf:mod_pagetsconfig'
+ );
}
diff --git a/typo3/sysext/info_pagetsconfig/LICENSE.txt b/typo3/sysext/info_pagetsconfig/LICENSE.txt
deleted file mode 100644
index 95d36a78ffce9a9ad8c4000f87603a76dd17e67e..0000000000000000000000000000000000000000
--- a/typo3/sysext/info_pagetsconfig/LICENSE.txt
+++ /dev/null
@@ -1,345 +0,0 @@
-Some icons used in the TYPO3 project are retrieved from the "Silk" icon set of
-Mark James, which can be found at http://famfamfam.com/lab/icons/silk/. This
-set is distributed under a Creative Commons Attribution 2.5 License. The
-license can be found at http://creativecommons.org/licenses/by/2.5/.
----------------------------------
-
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/EditIcon.html b/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/EditIcon.html
deleted file mode 100644
index 7feddc5638e84c53c27e9690ad1f75f188250fc9..0000000000000000000000000000000000000000
--- a/typo3/sysext/info_pagetsconfig/Resources/Private/Partials/EditIcon.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<f:if condition="{editIcon}">
- <a href="{editIcon -> f:format.raw()}" title="{f:translate(key: 'LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:{editTitle}')}" class="btn btn-default">
- <span class="t3js-icon icon icon-size-small icon-state-default icon-actions-document-open" data-identifier="actions-document-open">
- <span class="icon-markup">
- <img width="16" height="16" src="/typo3/sysext/core/Resources/Public/Icons/T3Icons/actions/actions-document-open.svg">
- </span>
- </span>
- <f:if condition="{editAll}">
- <f:translate key="LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:editTSconfig_all" />
- </f:if>
- </a>
-</f:if>
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Private/Templates/Main.html b/typo3/sysext/info_pagetsconfig/Resources/Private/Templates/Main.html
deleted file mode 100644
index ad585b899707b5201520476fce021d65667ec15a..0000000000000000000000000000000000000000
--- a/typo3/sysext/info_pagetsconfig/Resources/Private/Templates/Main.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<f:if condition="{pageZero}">
- <f:then>
- <f:render partial="PageZero" arguments="{_all}" />
- </f:then>
- <f:else>
- <f:render partial="Page" arguments="{_all}" />
- </f:else>
-</f:if>
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Public/Icons/Extension.png b/typo3/sysext/info_pagetsconfig/Resources/Public/Icons/Extension.png
deleted file mode 100644
index 07e8c1ce5318e6e95ab6d2e202f224f3f1f00a57..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/info_pagetsconfig/Resources/Public/Icons/Extension.png and /dev/null differ
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_1.png b/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_1.png
deleted file mode 100644
index 7c3b179f24be4f1bde8053e476fd9a25adda7d6c..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_1.png and /dev/null differ
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_2.png b/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_2.png
deleted file mode 100644
index b039f4238af667139f7296ce5acf7a6114d6a421..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_2.png and /dev/null differ
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_3.png b/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_3.png
deleted file mode 100644
index a9dd9363ad59a81eb15542ba1c1d8d2d97a5dcbe..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_3.png and /dev/null differ
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_4.png b/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_4.png
deleted file mode 100644
index a9016c46cb38d18790fab4a165040637eddcc8ac..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_4.png and /dev/null differ
diff --git a/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_5.png b/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_5.png
deleted file mode 100644
index 7bbc563acbd7055195e96fda7b292a12f4c37786..0000000000000000000000000000000000000000
Binary files a/typo3/sysext/info_pagetsconfig/Resources/Public/Images/cshimages/img_5.png and /dev/null differ
diff --git a/typo3/sysext/info_pagetsconfig/composer.json b/typo3/sysext/info_pagetsconfig/composer.json
deleted file mode 100644
index fa9ab2d31d25d85c92ab77db52df6567485abf6d..0000000000000000000000000000000000000000
--- a/typo3/sysext/info_pagetsconfig/composer.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
- "name": "typo3/cms-info-pagetsconfig",
- "type": "typo3-cms-framework",
- "description": "Displays the compiled Page TSconfig values relative to a page.",
- "homepage": "https://typo3.org",
- "license": ["GPL-2.0+"],
- "authors": [{
- "name": "TYPO3 Core Team",
- "email": "typo3cms@typo3.org",
- "role": "Developer"
- }],
-
- "require": {
- "typo3/cms-core": ">=9.0.0 <=9.0.99",
- "typo3/cms-info": ">=9.0.0 <=9.0.99"
- },
- "conflict": {
- "typo3/cms": "*"
- },
- "replace": {
- "info_pagetsconfig": "*"
- },
- "extra": {
- "branch-alias": {
- "dev-master": "9.x-dev"
- },
- "typo3/cms": {
- "Package": {
- "partOfFactoryDefault": true
- },
- "extension-key": "info_pagetsconfig"
- }
- },
- "autoload": {
- "psr-4": {
- "TYPO3\\CMS\\InfoPagetsconfig\\": "Classes/"
- }
- }
-}
diff --git a/typo3/sysext/info_pagetsconfig/ext_emconf.php b/typo3/sysext/info_pagetsconfig/ext_emconf.php
deleted file mode 100644
index 4f0dcc58d6c504825c2baa87d1ea72d0a6c28ebf..0000000000000000000000000000000000000000
--- a/typo3/sysext/info_pagetsconfig/ext_emconf.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-$EM_CONF[$_EXTKEY] = [
- 'title' => 'Web>Info, Page TSconfig',
- 'description' => 'Displays the compiled Page TSconfig values relative to a page.',
- 'category' => 'module',
- 'state' => 'stable',
- 'uploadfolder' => 0,
- 'createDirs' => '',
- 'clearCacheOnLoad' => 0,
- 'author' => 'TYPO3 Core Team',
- 'author_email' => 'typo3cms@typo3.org',
- 'author_company' => '',
- 'version' => '9.0.0',
- 'constraints' => [
- 'depends' => [
- 'typo3' => '9.0.0-9.0.99',
- 'info' => '9.0.0-9.0.99',
- ],
- 'conflicts' => [],
- 'suggests' => [],
- ],
-];
diff --git a/typo3/sysext/info_pagetsconfig/ext_tables.php b/typo3/sysext/info_pagetsconfig/ext_tables.php
deleted file mode 100644
index abfe6cc628966e6a97978183ba03a74488f1cfca..0000000000000000000000000000000000000000
--- a/typo3/sysext/info_pagetsconfig/ext_tables.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-defined('TYPO3_MODE') or die();
-
-if (TYPO3_MODE === 'BE') {
- \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::insertModuleFunction(
- 'web_info',
- \TYPO3\CMS\InfoPagetsconfig\Controller\InfoPageTyposcriptConfigController::class,
- null,
- 'LLL:EXT:info_pagetsconfig/Resources/Private/Language/locallang.xlf:mod_pagetsconfig'
- );
-}
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_web_info', 'EXT:info_pagetsconfig/Resources/Private/Language/locallang_csh_webinfo.xlf');