[BUGFIX] Replace all system_extinstall urls with corresponding urls 46/54046/4
authorMatthias Vogel <typo3@kanti.de>
Fri, 8 Sep 2017 21:42:54 +0000 (23:42 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Sat, 9 Sep 2017 09:32:37 +0000 (11:32 +0200)
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>
typo3/sysext/backend/Classes/Backend/ToolbarItems/SystemInformationToolbarItem.php
typo3/sysext/backend/Resources/Private/Language/locallang.xlf
typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/SystemInformationDropDown.html
typo3/sysext/install/Classes/Report/InstallStatusReport.php
typo3/sysext/install/Classes/Report/SecurityStatusReport.php
typo3/sysext/install/Resources/Private/Partials/Action/Common/MenuModuleLink.html
typo3/sysext/install/Resources/Private/Partials/Action/Common/ModuleMenu.html

index 78bcfb9..39e6442 100644 (file)
@@ -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,
index 2036664..a2d1f3e 100644 (file)
@@ -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.
index 1bb6c26..4a8fe69 100644 (file)
@@ -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>
 
index da4c9de..018b921 100644 (file)
@@ -26,23 +26,17 @@ 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.
      *
      * @return Status[]
      */
     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;
                 }
index e30920a..25e139c 100644 (file)
@@ -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) . '">',
index 1008c31..c663152 100644 (file)
@@ -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>
index bd41219..9d58fbe 100644 (file)
@@ -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>