From aa416f03244ce4a0a0cfc33d3e60c3287cbfe1ce Mon Sep 17 00:00:00 2001
From: Matthias Vogel <typo3@kanti.de>
Date: Fri, 8 Sep 2017 23:42:54 +0200
Subject: [PATCH] [BUGFIX] Replace all system_extinstall urls with
corresponding urls
Resolves: #82393
Releases: master
Change-Id: I0782af0fa9dc36f7a1e54caec8b7ff24334e63c7
Reviewed-on: https://review.typo3.org/54046
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
---
.../SystemInformationToolbarItem.php | 2 +-
.../Resources/Private/Language/locallang.xlf | 2 +-
.../SystemInformationDropDown.html | 4 ++--
.../Classes/Report/InstallStatusReport.php | 18 ++++++------------
.../Classes/Report/SecurityStatusReport.php | 5 ++---
.../Partials/Action/Common/MenuModuleLink.html | 14 +++++++-------
.../Partials/Action/Common/ModuleMenu.html | 4 ++--
7 files changed, 21 insertions(+), 28 deletions(-)
diff --git a/typo3/sysext/backend/Classes/Backend/ToolbarItems/SystemInformationToolbarItem.php b/typo3/sysext/backend/Classes/Backend/ToolbarItems/SystemInformationToolbarItem.php
index 78bcfb93f1ac..39e644277bbf 100644
--- a/typo3/sysext/backend/Classes/Backend/ToolbarItems/SystemInformationToolbarItem.php
+++ b/typo3/sysext/backend/Classes/Backend/ToolbarItems/SystemInformationToolbarItem.php
@@ -346,7 +346,7 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
$view = $this->getFluidTemplateObject('SystemInformationDropDown.html');
$view->assignMultiple([
- 'installToolUrl' => BackendUtility::getModuleUrl('system_extinstall'),
+ 'environmentToolUrl' => BackendUtility::getModuleUrl('tools_toolsenvironment'),
'messages' => $this->systemMessages,
'count' => $this->totalCount > $this->maximumCountInBadge ? $this->maximumCountInBadge . '+' : $this->totalCount,
'severityBadgeClass' => $this->severityBadgeClass,
diff --git a/typo3/sysext/backend/Resources/Private/Language/locallang.xlf b/typo3/sysext/backend/Resources/Private/Language/locallang.xlf
index 2036664e7573..a2d1f3efae28 100644
--- a/typo3/sysext/backend/Resources/Private/Language/locallang.xlf
+++ b/typo3/sysext/backend/Resources/Private/Language/locallang.xlf
@@ -13,7 +13,7 @@
<source>Application Information</source>
</trans-unit>
<trans-unit id="systemmessage.intro">
- <source><![CDATA[This is a short system overview. For advanced information please head to the <a href="%s">Install Tool</a>.]]></source>
+ <source><![CDATA[This is a short system overview. For advanced information please head to the <a href="%s">Environment Module</a>.]]></source>
</trans-unit>
<trans-unit id="systemmessage.allgood" xml:space="preserve">
<source>Your system is fully operational.
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/SystemInformationDropDown.html b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/SystemInformationDropDown.html
index 1bb6c268bf20..4a8fe6998d57 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/SystemInformationDropDown.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/SystemInformationDropDown.html
@@ -5,9 +5,9 @@
<h3 class="dropdown-headline">
<f:translate key="systemmessage.header"/>
</h3>
-<p class="dropdown-text typo3-module-menu-item submodule mod-system_extinstall" data-modulename="system_extinstall">
+<p class="dropdown-text typo3-module-menu-item submodule mod-tools_toolsenvironment" data-modulename="tools_toolsenvironment">
<f:format.raw>
- <f:translate key="systemmessage.intro" arguments="{0: '{installToolUrl}'}"/>
+ <f:translate key="systemmessage.intro" arguments="{0: '{environmentToolUrl}'}"/>
</f:format.raw>
</p>
diff --git a/typo3/sysext/install/Classes/Report/InstallStatusReport.php b/typo3/sysext/install/Classes/Report/InstallStatusReport.php
index da4c9debd715..018b92199272 100644
--- a/typo3/sysext/install/Classes/Report/InstallStatusReport.php
+++ b/typo3/sysext/install/Classes/Report/InstallStatusReport.php
@@ -25,11 +25,6 @@ use TYPO3\CMS\Reports\Status;
*/
class InstallStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface
{
- /**
- * @var string
- */
- protected $reportList = 'FileSystem,RemainingUpdates,NewVersion';
-
/**
* Compiles a collection of system status checks as a status report.
*
@@ -37,12 +32,11 @@ class InstallStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface
*/
public function getStatus()
{
- $reports = [];
- $reportMethods = explode(',', $this->reportList);
- foreach ($reportMethods as $reportMethod) {
- $reports[$reportMethod] = $this->{'get' . $reportMethod . 'Status'}();
- }
- return $reports;
+ return [
+ 'FileSystem' => $this->getFileSystemStatus(),
+ 'RemainingUpdates' => $this->getRemainingUpdatesStatus(),
+ 'NewVersion' => $this->getNewVersionStatus(),
+ ];
}
/**
@@ -155,7 +149,7 @@ class InstallStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface
// at least one wizard was found
$value = $languageService->getLL('status_updateIncomplete');
$severity = Status::WARNING;
- $url = BackendUtility::getModuleUrl('system_extinstall');
+ $url = BackendUtility::getModuleUrl('tools_toolsupgrade');
$message = sprintf($languageService->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.install_update'), '<a href="' . htmlspecialchars($url) . '">', '</a>');
break;
}
diff --git a/typo3/sysext/install/Classes/Report/SecurityStatusReport.php b/typo3/sysext/install/Classes/Report/SecurityStatusReport.php
index e30920a05f0d..25e139ce8703 100644
--- a/typo3/sysext/install/Classes/Report/SecurityStatusReport.php
+++ b/typo3/sysext/install/Classes/Report/SecurityStatusReport.php
@@ -32,11 +32,10 @@ class SecurityStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface
public function getStatus()
{
$this->executeAdminCommand();
- $statuses = [
+ return [
'installToolPassword' => $this->getInstallToolPasswordStatus(),
'installToolProtection' => $this->getInstallToolProtectionStatus()
];
- return $statuses;
}
/**
@@ -60,7 +59,7 @@ class SecurityStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface
if (!$validPassword) {
$value = $GLOBALS['LANG']->getLL('status_insecure');
$severity = Status::ERROR;
- $changeInstallToolPasswordUrl = BackendUtility::getModuleUrl('system_extinstall');
+ $changeInstallToolPasswordUrl = BackendUtility::getModuleUrl('tools_toolssettings');
$message = sprintf(
$GLOBALS['LANG']->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:warning.installtool_default_password'),
'<a href="' . htmlspecialchars($changeInstallToolPasswordUrl) . '">',
diff --git a/typo3/sysext/install/Resources/Private/Partials/Action/Common/MenuModuleLink.html b/typo3/sysext/install/Resources/Private/Partials/Action/Common/MenuModuleLink.html
index 1008c314c9d8..c663152ee366 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Action/Common/MenuModuleLink.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Action/Common/MenuModuleLink.html
@@ -2,13 +2,13 @@
<li class="modulemenu-item t3js-mainmodule {f:if(condition:'{action} == {action_name}', then:' active')}">
<a class="modulemenu-item-link" href="{i:uri.action(action: action_name)}">
- <span class="modulemenu-icon modulemenu-item-icon">
- <span class="t3js-icon icon icon-size-default icon-state-default icon-module-system_extinstall" data-identifier="module-system_extinstall">
- <span class="icon-markup">
- <img src="{f:uri.resource(path: 'Icons/module-install-{action_name}.svg')}" width="32" height="32">
+ <span class="modulemenu-icon modulemenu-item-icon">
+ <span class="t3js-icon icon icon-size-default icon-state-default">
+ <span class="icon-markup">
+ <img src="{f:uri.resource(path: 'Icons/module-install-{action_name}.svg')}" width="32" height="32">
+ </span>
</span>
</span>
- </span>
- <span class="modulemenu-item-title">{label}</span>
- </a>
+ <span class="modulemenu-item-title">{label}</span>
+ </a>
</li>
diff --git a/typo3/sysext/install/Resources/Private/Partials/Action/Common/ModuleMenu.html b/typo3/sysext/install/Resources/Private/Partials/Action/Common/ModuleMenu.html
index bd4121939e88..9d58fbe23ee8 100644
--- a/typo3/sysext/install/Resources/Private/Partials/Action/Common/ModuleMenu.html
+++ b/typo3/sysext/install/Resources/Private/Partials/Action/Common/ModuleMenu.html
@@ -29,7 +29,7 @@
<li class="modulemenu-item t3js-mainmodule ">
<a class="modulemenu-item-link" href="index.php">
<span class="modulemenu-icon modulemenu-item-icon">
- <span class="t3js-icon icon icon-size-default icon-state-default icon-module-system_extinstall" data-identifier="module-system_extinstall">
+ <span class="t3js-icon icon icon-size-default icon-state-default">
<span class="icon-markup">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g class="icon-color"><path d="M9 10v4H2V2h7v4h1V1.5a.5.5 0 0 0-.5-.5h-8a.5.5 0 0 0-.5.5v13a.5.5 0 0 0 .5.5h8a.5.5 0 0 0 .5-.5V10H9z"></path><path d="M10.983 5.041a.5.5 0 0 1 .812-.39l3.7 2.96a.5.5 0 0 1 0 .78l-3.7 2.96a.5.5 0 0 1-.812-.39V9H6V7h4.983V5.041z"></path></g></svg>
</span>
@@ -41,7 +41,7 @@
<li class="modulemenu-item t3js-mainmodule ">
<a class="modulemenu-item-link" href="../index.php">
<span class="modulemenu-icon modulemenu-item-icon">
- <span class="t3js-icon icon icon-size-default icon-state-default icon-module-system_extinstall" data-identifier="module-system_extinstall">
+ <span class="t3js-icon icon icon-size-default icon-state-default">
<span class="icon-markup">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g class="icon-color"><path d="M9 10v4H2V2h7v4h1V1.5a.5.5 0 0 0-.5-.5h-8a.5.5 0 0 0-.5.5v13a.5.5 0 0 0 .5.5h8a.5.5 0 0 0 .5-.5V10H9z"></path><path d="M10.983 5.041a.5.5 0 0 1 .812-.39l3.7 2.96a.5.5 0 0 1 0 .78l-3.7 2.96a.5.5 0 0 1-.812-.39V9H6V7h4.983V5.041z"></path></g></svg>
</span>
--
GitLab