Replace proxy redirect with rel=noreferrer (#12780)

* Replace proxy redirect with rel=noreferrer

* Add noopener

* Restore action=redirect for non-Matomo links

* Wrap referring URLs

* NO target on download link

* Fix Github links

* Fix whitespace

* Fix tests

* Revert change

* Revert changes

* Fix tests

* Add noreferrer shim for MSIE 10

* Remove all action=redirect links

* Restore noreferrer

* Restore test

* Fix one more occurrence

* Update changelog

* Combine if's

* Fix changelog wording

* Fix stray whitespace

5 files changed, 9 insertions, 9 deletions

diff --git a/plugins/CoreUpdater/SystemSettings.php b/plugins/CoreUpdater/SystemSettings.php
index 604c0c6e9e..630165a330 100644
--- a/plugins/CoreUpdater/SystemSettings.php
+++ b/plugins/CoreUpdater/SystemSettings.php
@@ -84,11 +84,11 @@ class SystemSettings extends \Piwik\Settings\Plugin\SystemSettings
             };
 
             $field->inlineHelp = Piwik::translate('CoreAdminHome_DevelopmentProcess',
-                                                  array("<a href='?module=Proxy&action=redirect&url=https://matomo.org/participate/development-process/' target='_blank'>",
+                                                  array("<a target='_blank' rel='noreferrer noopener' href='https://matomo.org/participate/development-process/'>",
                                                         "</a>"))
                             . Piwik::translate('<br/>')
                             . Piwik::translate('CoreAdminHome_StableReleases',
-                                               array("<a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.matomo.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>",
+                                               array("<a target='_blank' rel='noreferrer noopener' href='https://developer.matomo.org/guides/core-team-workflow#influencing-piwik-development'>",
                                                      "</a>"))
                             . Piwik::translate('<br />')
                             . Piwik::translate('CoreAdminHome_LtsReleases');
diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig
index 0d9f608822..23d1d67eec 100644
--- a/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig
+++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig
@@ -1,6 +1,6 @@
 {% extends '@CoreUpdater/layout.twig' %}
 {% set helpMessage %}
-    {{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=https://matomo.org/faq/">','</a>','</li><li>')|raw }}
+    {{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" rel="noreferrer noopener" href="https://matomo.org/faq/">','</a>','</li><li>')|raw }}
 {% endset %}
 
 {% block content %}
@@ -24,7 +24,7 @@
         <ul>
             <li>{{ 'CoreUpdater_ErrorDIYHelp_1'|translate }}</li>
             <li>{{ 'CoreUpdater_ErrorDIYHelp_2'|translate }}</li>
-            <li>{{ 'CoreUpdater_ErrorDIYHelp_3'|translate }} <a href='https://matomo.org/faq/how-to-update/#faq_179' rel='noreferrer' target='_blank'>(see FAQ)</a></li>
+            <li>{{ 'CoreUpdater_ErrorDIYHelp_3'|translate }} <a href='https://matomo.org/faq/how-to-update/#faq_179' rel='noreferrer noopener' target='_blank'>(see FAQ)</a></li>
             <li>{{ 'CoreUpdater_ErrorDIYHelp_4'|translate }}</li>
             <li>{{ 'CoreUpdater_ErrorDIYHelp_5'|translate }}</li>
         </ul>
diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig
index 7563d6217f..041dacccb7 100644
--- a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig
+++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig
@@ -11,7 +11,7 @@
     <div class="content" style="text-align:left;">
 
         {% set helpMessage %}
-            {{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=https://matomo.org/faq/">','</a>','</li><li>')|raw }}
+            {{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" rel="noreferrer noopener" href="https://matomo.org/faq/">','</a>','</li><li>')|raw }}
         {% endset %}
 
         {% if coreError %}
@@ -51,7 +51,7 @@
                 {% endif %}
                 <p>{{ 'CoreUpdater_TheUpgradeProcessMayFailExecuteCommand'|translate('') }}</p>
                 <pre>{{ commandUpgradePiwik }}</pre>
-                <p>{{ 'CoreUpdater_HighTrafficPiwikServerEnableMaintenance'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=http%3A%2F%2Fmatomo.org%2Ffaq%2Fhow-to%2F%23faq_111">', '</a>')|raw }}</p>
+                <p>{{ 'CoreUpdater_HighTrafficPiwikServerEnableMaintenance'|translate('<a target="_blank" rel="noreferrer noopener" href="https://matomo.org/faq/how-to/#faq_111">', '</a>')|raw }}</p>
 
                 {% if queries is not empty %}
                     <p><a href="#" id="showSql">› {{ 'CoreUpdater_ClickHereToViewSqlQueries'|translate }}</a></p>
@@ -61,7 +61,7 @@
                 {% endif %}
 
                 <h2>{{ 'CoreUpdater_NeedHelpUpgrading'|translate }}</h2>
-                <p>{{ 'CoreUpdater_NeedHelpUpgradingText'|translate("<a rel='noreferrer' target='_blank' href='https://matomo.org/support/upgrading-piwik/'>", "</a>")|raw }}</p>
+                <p>{{ 'CoreUpdater_NeedHelpUpgradingText'|translate("<a rel='noreferrer noopener' target='_blank' href='https://matomo.org/support/upgrading-piwik/'>", "</a>")|raw }}</p>
 
                 <h2>{{ 'CoreUpdater_ReadyToGo'|translate }}</h2>
                 <p>{{ 'CoreUpdater_TheUpgradeProcessMayTakeAWhilePleaseBePatient'|translate }}</p>
diff --git a/plugins/CoreUpdater/templates/updateHttpError.twig b/plugins/CoreUpdater/templates/updateHttpError.twig
index 7666bb3d52..f302b64cd8 100644
--- a/plugins/CoreUpdater/templates/updateHttpError.twig
+++ b/plugins/CoreUpdater/templates/updateHttpError.twig
@@ -18,7 +18,7 @@
         </div>
 
         <p>
-            {{ 'CoreUpdater_UpdateHasBeenCancelledExplanation'|translate("<br /><br />","<a target='_blank' href='?module=Proxy&action=redirect&url=https://matomo.org/docs/update/'>","</a>")|raw }}
+            {{ 'CoreUpdater_UpdateHasBeenCancelledExplanation'|translate("<br /><br />","<a target='_blank' rel='noreferrer noopener' href='https://matomo.org/docs/update/'>","</a>")|raw }}
         </p>
 
     </div>
diff --git a/plugins/CoreUpdater/templates/updateSuccess.twig b/plugins/CoreUpdater/templates/updateSuccess.twig
index 6b6fa35a10..2ea2647f81 100644
--- a/plugins/CoreUpdater/templates/updateSuccess.twig
+++ b/plugins/CoreUpdater/templates/updateSuccess.twig
@@ -9,7 +9,7 @@
     <div class="content">
         <h2>Piwik is now Matomo</h2>
         <p>
-            <a target='_blank' rel='noreferrer' href='https://matomo.org/blog/2018/01/piwik-is-now-matomo/'>
+            <a target='_blank' rel='noreferrer noopener' href='https://matomo.org/blog/2018/01/piwik-is-now-matomo/'>
                 <img src='https://matomo.org/wp-content/uploads/2018/01/banner_piwik_is_now_matomo.jpg' width='70%'>
             </a>
         </p>