diff options
author | Lukas Winkler <Findus23@users.noreply.github.com> | 2017-10-16 02:07:26 +0300 |
---|---|---|
committer | Stefan Giehl <stefan@piwik.org> | 2017-10-16 02:07:26 +0300 |
commit | c1422b533fef97b63b434befe57856ee348c1e46 (patch) | |
tree | 62adee00b541053e113c024af10c400233812755 /plugins/CoreUpdater | |
parent | 3a2bc010b1dfebb9424e090dab595c66cd613926 (diff) |
Even more HTTPS links (#12161)
* http://piwik.org -> https://piwik.org
* more HTTPS URLs
* some more HTTPS URLs
* test README
* don't show "Plugin Hompage" for Piwik plugins
* fix tests
* compile minified js
(hope I didn't break anything)
* some more small changes
* fix UI test
* comment length in piwik.js changed due to https links
* fix test
* update ui file
* update submodule
Diffstat (limited to 'plugins/CoreUpdater')
7 files changed, 11 insertions, 11 deletions
diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php index 650569a922..6caf7cafc9 100644 --- a/plugins/CoreUpdater/CoreUpdater.php +++ b/plugins/CoreUpdater/CoreUpdater.php @@ -74,7 +74,7 @@ class CoreUpdater extends \Piwik\Plugin if ($updater->getComponentUpdates() !== null) { if (FrontController::shouldRethrowException()) { throw new Exception("Piwik and/or some plugins have been upgraded to a new version. \n" . - "--> Please run the update process first. See documentation: http://piwik.org/docs/update/ \n"); + "--> Please run the update process first. See documentation: https://piwik.org/docs/update/ \n"); } elseif ($module === 'API') { $outputFormat = strtolower(Common::getRequestVar('format', 'xml', 'string', $_GET + $_POST)); diff --git a/plugins/CoreUpdater/SystemSettings.php b/plugins/CoreUpdater/SystemSettings.php index 70bab5bdd1..f8db4e1d49 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=http://piwik.org/participate/development-process/' target='_blank'>", + array("<a href='?module=Proxy&action=redirect&url=https://piwik.org/participate/development-process/' target='_blank'>", "</a>")) . Piwik::translate('<br/>') . Piwik::translate('CoreAdminHome_StableReleases', - array("<a href='?module=Proxy&action=redirect&url=http%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>", + array("<a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.piwik.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>", "</a>")) . Piwik::translate('<br />') . Piwik::translate('CoreAdminHome_LtsReleases'); diff --git a/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php b/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php index 8533e5675c..34870e4f2f 100644 --- a/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php +++ b/plugins/CoreUpdater/Test/Integration/UpdateCommunicationTest.php @@ -77,12 +77,12 @@ CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage {$rootUrl}index.php?module=CoreUpdater&action=newVersionAvailable CoreUpdater_ViewVersionChangelog -http://piwik.org/changelog/piwik-33-0-0/ +https://piwik.org/changelog/piwik-33-0-0/ CoreUpdater_ReceiveEmailBecauseIsSuperUser CoreUpdater_FeedbackRequest -http://piwik.org/contact/"; +https://piwik.org/contact/"; $this->assertEmailForVersion('33.0.0', $message); } @@ -100,7 +100,7 @@ CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage CoreUpdater_ReceiveEmailBecauseIsSuperUser CoreUpdater_FeedbackRequest -http://piwik.org/contact/"; +https://piwik.org/contact/"; $this->assertEmailForVersion('33.0.0-b1', $message); } diff --git a/plugins/CoreUpdater/UpdateCommunication.php b/plugins/CoreUpdater/UpdateCommunication.php index 43271c83dc..def5f97a2a 100644 --- a/plugins/CoreUpdater/UpdateCommunication.php +++ b/plugins/CoreUpdater/UpdateCommunication.php @@ -87,7 +87,7 @@ class UpdateCommunication $message .= "\n\n"; $message .= Piwik::translate('CoreUpdater_FeedbackRequest'); $message .= "\n"; - $message .= 'http://piwik.org/contact/'; + $message .= 'https://piwik.org/contact/'; $this->sendEmailNotification($subject, $message); } @@ -96,7 +96,7 @@ class UpdateCommunication { $version = str_replace('.', '-', $version); - $link = sprintf('http://piwik.org/changelog/piwik-%s/', $version); + $link = sprintf('https://piwik.org/changelog/piwik-%s/', $version); return $link; } diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig index 1f634f5d1f..4afc51ac17 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=http://piwik.org/faq/">','</a>','</li><li>')|raw }} + {{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/faq/">','</a>','</li><li>')|raw }} {% endset %} {% block content %} diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig index 3d1a8a5357..679b56e254 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=http://piwik.org/faq/">','</a>','</li><li>')|raw }} + {{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/faq/">','</a>','</li><li>')|raw }} {% endset %} {% if coreError %} diff --git a/plugins/CoreUpdater/templates/updateHttpError.twig b/plugins/CoreUpdater/templates/updateHttpError.twig index c7d6a90dfb..74f1d4ff7c 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=http://piwik.org/docs/update/'>","</a>")|raw }} + {{ 'CoreUpdater_UpdateHasBeenCancelledExplanation'|translate("<br /><br />","<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/docs/update/'>","</a>")|raw }} </p> </div> |