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 | |
| 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')
73 files changed, 105 insertions, 104 deletions
diff --git a/plugins/API/Menu.php b/plugins/API/Menu.php index 312f03a2ef..0d031304a5 100644 --- a/plugins/API/Menu.php +++ b/plugins/API/Menu.php @@ -56,7 +56,7 @@ class Menu extends \Piwik\Plugin\Menu if (!empty($parsedOS['short_name']) && in_array($parsedOS['short_name'], array(self::DD_SHORT_NAME_ANDROID, self::DD_SHORT_NAME_IOS))) { - $url = $this->urlForModuleAction('Proxy', 'redirect', array('url' => 'http://piwik.org/mobile/')); + $url = $this->urlForModuleAction('Proxy', 'redirect', array('url' => 'https://piwik.org/mobile/')); if ($url) { $menu->addItem('Piwik Mobile App', null, $url, 4); diff --git a/plugins/API/templates/listAllAPI.twig b/plugins/API/templates/listAllAPI.twig index 9aa2685881..fd9a879144 100644 --- a/plugins/API/templates/listAllAPI.twig +++ b/plugins/API/templates/listAllAPI.twig @@ -14,7 +14,7 @@ <p>{{ 'API_PluginDescription'|translate }}</p> <p> - {{ 'API_MoreInformation'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/analytics-api'>","</a>","<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/analytics-api/reference'>","</a>")|raw }} + {{ 'API_MoreInformation'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/docs/analytics-api'>","</a>","<a target='_blank' href='?module=Proxy&action=redirect&url=httpd://piwik.org/docs/analytics-api/reference'>","</a>")|raw }} </p> </div> <div piwik-content-block content-title="{{ 'API_UserAuthentication'|translate|e('html_attr') }}"> diff --git a/plugins/Actions/Reports/GetSiteSearchKeywords.php b/plugins/Actions/Reports/GetSiteSearchKeywords.php index dc4b5e2d16..53a2acfea6 100644 --- a/plugins/Actions/Reports/GetSiteSearchKeywords.php +++ b/plugins/Actions/Reports/GetSiteSearchKeywords.php @@ -24,7 +24,7 @@ class GetSiteSearchKeywords extends SiteSearchBase $this->dimension = new Keyword(); $this->name = Piwik::translate('Actions_WidgetSearchKeywords'); $this->documentation = Piwik::translate('Actions_SiteSearchKeywordsDocumentation') . '<br/><br/>' . Piwik::translate('Actions_SiteSearchIntro') . '<br/><br/>' - . '<a href="http://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">' . Piwik::translate('Actions_LearnMoreAboutSiteSearchLink') . '</a>'; + . '<a href="https://piwik.org/docs/site-search/" rel="noreferrer" target="_blank">' . Piwik::translate('Actions_LearnMoreAboutSiteSearchLink') . '</a>'; $this->metrics = array('nb_visits', 'nb_pages_per_search'); $this->processedMetrics = array( new AverageTimeOnPage(), diff --git a/plugins/BulkTracking/Tracker/Requests.php b/plugins/BulkTracking/Tracker/Requests.php index af4eb23a15..5baf6bbd4d 100644 --- a/plugins/BulkTracking/Tracker/Requests.php +++ b/plugins/BulkTracking/Tracker/Requests.php @@ -43,7 +43,7 @@ class Requests { if (empty($token)) { throw new Exception("token_auth must be specified when using Bulk Tracking Import. " - . " See <a href='http://developer.piwik.org/api-reference/tracking-api'>Tracking Doc</a>"); + . " See <a href='https://developer.piwik.org/api-reference/tracking-api'>Tracking Doc</a>"); } } diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig index 8a78087345..bd53e896f8 100644 --- a/plugins/CoreAdminHome/templates/generalSettings.twig +++ b/plugins/CoreAdminHome/templates/generalSettings.twig @@ -33,14 +33,14 @@ <label for="enableBrowserTriggerArchiving2"> {{ 'General_No'|translate }} - <span class="form-description">{{ 'General_ArchivingTriggerDescription'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/setup-auto-archiving/' target='_blank'>","</a>")|raw }}</span> + <span class="form-description">{{ 'General_ArchivingTriggerDescription'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/docs/setup-auto-archiving/' target='_blank'>","</a>")|raw }}</span> </label> </p> </div><div class="col s12 m6"> <div class="form-help"> {{ 'General_ArchivingInlineHelp'|translate }} <br/> - {{ 'General_SeeTheOfficialDocumentationForMoreInformation'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/setup-auto-archiving/' target='_blank'>","</a>")|raw }} + {{ 'General_SeeTheOfficialDocumentationForMoreInformation'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/docs/setup-auto-archiving/' target='_blank'>","</a>")|raw }} </div> </div> </div> diff --git a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig index 71834c676e..98b55053f1 100644 --- a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig +++ b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig @@ -14,7 +14,7 @@ <div piwik-content-block content-title="{{ title|e('html_attr') }}" - help-url="http://piwik.org/docs/tracking-api/" + help-url="https://piwik.org/docs/tracking-api/" rate="{{ 'CoreAdminHome_TrackingCode'|translate|e('html_attr') }}"> <div id="js-code-options" ng-controller="JsTrackingCodeController as jsTrackingCode"> @@ -22,11 +22,11 @@ <p> {{ 'CoreAdminHome_JSTrackingIntro1'|translate }} <br/><br/> - {{ 'CoreAdminHome_JSTrackingIntro2'|translate }} {{ 'CoreAdminHome_JSTrackingIntro3b'|translate('<a href="http://piwik.org/integrate/" rel="noreferrer" target="_blank">','</a>')|raw }} + {{ 'CoreAdminHome_JSTrackingIntro2'|translate }} {{ 'CoreAdminHome_JSTrackingIntro3b'|translate('<a href="https://piwik.org/integrate/" rel="noreferrer" target="_blank">','</a>')|raw }} <br/><br/> {{ 'CoreAdminHome_JSTrackingIntro4'|translate('<a href="#image-tracking-link">','</a>')|raw }} <br/><br/> - {{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a rel="noreferrer" target="_blank" href="http://piwik.org/docs/javascript-tracking/">','</a>')|raw }} + {{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/javascript-tracking/">','</a>')|raw }} </p> <div piwik-field uicontrol="site" name="js-tracker-website" @@ -42,7 +42,7 @@ {# track across all subdomains #} <div id="jsTrackAllSubdomainsInlineHelp" class="inline-help-node"> {{ 'CoreAdminHome_JSTracking_MergeSubdomainsDesc'|translate("x.<span class='current-site-host'></span>","y.<span class='current-site-host'></span>")|raw }} - {{ 'General_LearnMore'|translate(' (<a href="http://developer.piwik.org/guides/tracking-javascript-guide#measuring-domains-andor-sub-domains" rel="noreferrer" target="_blank">', '</a>)')|raw }} + {{ 'General_LearnMore'|translate(' (<a href="https://developer.piwik.org/guides/tracking-javascript-guide#measuring-domains-andor-sub-domains" rel="noreferrer" target="_blank">', '</a>)')|raw }} </div> <div piwik-field uicontrol="checkbox" name="javascript-tracking-all-subdomains" @@ -183,7 +183,7 @@ {# custom campaign name/keyword query params #} <div id="jsTrackCampaignParamsInlineHelp" class="inline-help-node"> - {{ 'CoreAdminHome_JSTracking_CustomCampaignQueryParamDesc'|translate('<a href="http://piwik.org/faq/general/#faq_119" rel="noreferrer" target="_blank">','</a>')|raw }} + {{ 'CoreAdminHome_JSTracking_CustomCampaignQueryParamDesc'|translate('<a href="https://piwik.org/faq/general/#faq_119" rel="noreferrer" target="_blank">','</a>')|raw }} </div> <div piwik-field uicontrol="checkbox" name="custom-campaign-query-params-check" @@ -245,7 +245,7 @@ {{ 'CoreAdminHome_ImageTrackingIntro1'|translate }} {{ 'CoreAdminHome_ImageTrackingIntro2'|translate("<code><noscript></noscript></code>")|raw }} </p> <p> - {{ 'CoreAdminHome_ImageTrackingIntro3'|translate('<a href="http://piwik.org/docs/tracking-api/reference/" rel="noreferrer" target="_blank">','</a>')|raw }} + {{ 'CoreAdminHome_ImageTrackingIntro3'|translate('<a href="https://piwik.org/docs/tracking-api/reference/" rel="noreferrer" target="_blank">','</a>')|raw }} </p> {# website #} @@ -314,7 +314,7 @@ <div piwik-content-block content-title="{{ 'CoreAdminHome_ImportingServerLogs'|translate|e('html_attr') }}"> <p> - {{ 'CoreAdminHome_ImportingServerLogsDesc'|translate('<a href="http://piwik.org/log-analytics/" rel="noreferrer" target="_blank">','</a>')|raw }} + {{ 'CoreAdminHome_ImportingServerLogsDesc'|translate('<a href="https://piwik.org/log-analytics/" rel="noreferrer" target="_blank">','</a>')|raw }} </p> </div> {% endblock %} diff --git a/plugins/CoreConsole/Commands/DevelopmentSyncProcessedSystemTests.php b/plugins/CoreConsole/Commands/DevelopmentSyncProcessedSystemTests.php index 367cee78f1..6879298f23 100644 --- a/plugins/CoreConsole/Commands/DevelopmentSyncProcessedSystemTests.php +++ b/plugins/CoreConsole/Commands/DevelopmentSyncProcessedSystemTests.php @@ -50,7 +50,7 @@ class DevelopmentSyncProcessedSystemTests extends ConsoleCommand } $filename = sprintf('system.%s.tar.bz2', $buildNumber); - $urlBase = sprintf('http://builds-artifacts.piwik.org/piwik/piwik/%s', $filename); + $urlBase = sprintf('https://builds-artifacts.piwik.org/piwik/piwik/%s', $filename); $tests = Http::sendHttpRequest($urlBase, $timeout = 120); $tarFile = $tmpDir . $filename; diff --git a/plugins/CoreConsole/Commands/GenerateAngularDirective.php b/plugins/CoreConsole/Commands/GenerateAngularDirective.php index d312cd995f..afe0ce5581 100644 --- a/plugins/CoreConsole/Commands/GenerateAngularDirective.php +++ b/plugins/CoreConsole/Commands/GenerateAngularDirective.php @@ -72,7 +72,7 @@ class GenerateAngularDirective extends GeneratePluginBase sprintf('In <comment>%1$s/%2$s.php</comment> you should now require the JS files', $pluginPath, $pluginName), sprintf('<comment>%1$s%2$s</comment>, <comment>%1$s%3$s</comment>', $pluginPath, $js1, $js2), sprintf('and the less file <comment>%1$s%2$s</comment>.', $pluginPath, $less1), - 'If you are not familiar with this have a look at <comment>http://developer.piwik.org/guides/working-with-piwiks-ui</comment>' + 'If you are not familiar with this have a look at <comment>https://developer.piwik.org/guides/working-with-piwiks-ui</comment>' )); } diff --git a/plugins/CoreConsole/Commands/GeneratePlugin.php b/plugins/CoreConsole/Commands/GeneratePlugin.php index 611a177fbb..17d1795db5 100644 --- a/plugins/CoreConsole/Commands/GeneratePlugin.php +++ b/plugins/CoreConsole/Commands/GeneratePlugin.php @@ -84,13 +84,13 @@ class GeneratePlugin extends GeneratePluginBase if ($isTheme) { $this->writeSuccessMessage($output, array( sprintf('Theme %s %s generated.', $pluginName, $version), - 'If you have not done yet check out our Theming guide <comment>http://developer.piwik.org/guides/theming</comment>', + 'If you have not done yet check out our Theming guide <comment>https://developer.piwik.org/guides/theming</comment>', 'Enjoy!' )); } else { $this->writeSuccessMessage($output, array( sprintf('Plugin %s %s generated.', $pluginName, $version), - 'Our developer guides will help you developing this plugin, check out <comment>http://developer.piwik.org/guides</comment>', + 'Our developer guides will help you developing this plugin, check out <comment>https://developer.piwik.org/guides</comment>', 'To see a list of available generators execute <comment>./console list generate</comment>', 'Enjoy!' )); diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js index 2120dd5a46..2bc8361875 100644 --- a/plugins/CoreHome/javascripts/dataTable.js +++ b/plugins/CoreHome/javascripts/dataTable.js @@ -1847,7 +1847,7 @@ $.extend(DataTable.prototype, UIControl.prototype, { }, handleSummaryRow: function (domElem) { - var details = _pk_translate('General_LearnMore', [' (<a href="http://piwik.org/faq/how-to/faq_54/" rel="noreferrer" target="_blank">', '</a>)']); + var details = _pk_translate('General_LearnMore', [' (<a href="https://piwik.org/faq/how-to/faq_54/" rel="noreferrer" target="_blank">', '</a>)']); domElem.find('tr.summaryRow').each(function () { var labelSpan = $(this).find('.label .value'); diff --git a/plugins/CoreHome/templates/_headerMessage.twig b/plugins/CoreHome/templates/_headerMessage.twig index 91858adf66..1a47c5399b 100644 --- a/plugins/CoreHome/templates/_headerMessage.twig +++ b/plugins/CoreHome/templates/_headerMessage.twig @@ -32,12 +32,12 @@ {% if isMultiServerEnvironment %} {{ 'CoreHome_OneClickUpdateNotPossibleAsMultiServerEnvironment'|translate("<a rel='noreferrer' href='https://builds.piwik.org/piwik-" ~ latest_version_available ~ ".zip'>","</a>")|raw }} {% else %} - {{ 'General_PiwikXIsAvailablePleaseUpdateNow'|translate(latest_version_available,"<br /><a href='index.php?module=CoreUpdater&action=newVersionAvailable'>","</a>","<a href='?module=Proxy&action=redirect&url=http://piwik.org/changelog/' target='_blank'>","</a>")|raw }} + {{ 'General_PiwikXIsAvailablePleaseUpdateNow'|translate(latest_version_available,"<br /><a href='index.php?module=CoreUpdater&action=newVersionAvailable'>","</a>","<a href='?module=Proxy&action=redirect&url=https://piwik.org/changelog/' target='_blank'>","</a>")|raw }} {% endif %} <br /> {% elseif latest_version_available and not isPiwikDemo and hasSomeViewAccess and not isUserIsAnonymous %} {% set updateSubject = 'General_NewUpdatePiwikX'|translate(latest_version_available)|e('url') %} - {{ 'General_PiwikXIsAvailablePleaseNotifyPiwikAdmin'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/' target='_blank'>Piwik</a> <a href='?module=Proxy&action=redirect&url=http://piwik.org/changelog/' target='_blank'>" ~ latest_version_available ~ "</a>", "<a href='mailto:" ~ superUserEmails ~ "?subject=" ~ updateSubject ~ "'>", "</a>")|raw }} + {{ 'General_PiwikXIsAvailablePleaseNotifyPiwikAdmin'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/' target='_blank'>Piwik</a> <a href='?module=Proxy&action=redirect&url=https://piwik.org/changelog/' target='_blank'>" ~ latest_version_available ~ "</a>", "<a href='mailto:" ~ superUserEmails ~ "?subject=" ~ updateSubject ~ "'>", "</a>")|raw }} <br /> {% endif %} diff --git a/plugins/CoreHome/templates/_warningInvalidHost.twig b/plugins/CoreHome/templates/_warningInvalidHost.twig index c93539346f..1caf03b791 100644 --- a/plugins/CoreHome/templates/_warningInvalidHost.twig +++ b/plugins/CoreHome/templates/_warningInvalidHost.twig @@ -1,7 +1,7 @@ {# untrusted host warning #} {% if (isValidHost is defined and invalidHostMessage is defined and isValidHost == false) %} {% set invalidHostText %} - <a class="btn btn-link" style="float:right;" href="http://piwik.org/faq/troubleshooting/#faq_171" rel="noreferrer" target="_blank"> + <a class="btn btn-link" style="float:right;" href="https://piwik.org/faq/troubleshooting/#faq_171" rel="noreferrer" target="_blank"> <span class="icon-help"></span> {{ 'General_Help'|translate }} </a> diff --git a/plugins/CoreHome/templates/getPromoVideo.twig b/plugins/CoreHome/templates/getPromoVideo.twig index 227ce9670a..3b911b63ed 100755 --- a/plugins/CoreHome/templates/getPromoVideo.twig +++ b/plugins/CoreHome/templates/getPromoVideo.twig @@ -8,7 +8,7 @@ </div> </div> - <a id="piwik-promo-videos-link" href="http://piwik.org/blog/2012/12/piwik-how-to-videos/" rel="noreferrer" target="_blank"> + <a id="piwik-promo-videos-link" href="https://piwik.org/blog/2012/12/piwik-how-to-videos/" rel="noreferrer" target="_blank"> {{ 'CoreHome_ViewAllPiwikVideoTutorials'|translate }} </a> @@ -16,12 +16,12 @@ <span>{{ 'CoreHome_ShareThis'|translate }}:</span> {# facebook #} - <a href="http://www.facebook.com/sharer.php?u={{ promoVideoUrl|url_encode }}" rel="noreferrer" target="_blank"> + <a href="https://www.facebook.com/sharer.php?u={{ promoVideoUrl|url_encode }}" rel="noreferrer" target="_blank"> <img src="plugins/Morpheus/icons/dist/socials/facebook.com.png" width="16px" height="16px" /> </a> {# twitter #} - <a href="http://twitter.com/share?text={{ shareText|url_encode }}&url={{ promoVideoUrl|url_encode }}" rel="noreferrer" target="_blank"> + <a href="https://twitter.com/share?text={{ shareText|url_encode }}&url={{ promoVideoUrl|url_encode }}" rel="noreferrer" target="_blank"> <img src="plugins/Morpheus/icons/dist/socials/twitter.com.png" width="16px" height="16px" /> </a> diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig index ffdff511f7..b3ceafe741 100644 --- a/plugins/CorePluginsAdmin/templates/macros.twig +++ b/plugins/CorePluginsAdmin/templates/macros.twig @@ -144,7 +144,8 @@ {{ plugin.info.description|raw|nl2br }} {% if plugin.info.homepage|default is not empty and plugin.info.homepage not in [ - 'http://piwik.org', 'http://www.piwik.org', 'http://piwik.org/', 'http://www.piwik.org/' + 'http://piwik.org', 'http://www.piwik.org', 'http://piwik.org/', 'http://www.piwik.org/', + 'https://piwik.org', 'https://www.piwik.org', 'https://piwik.org/', 'https://www.piwik.org/' ] %} <span class="plugin-homepage"> <a target="_blank" href="{{ plugin.info.homepage }}">({{ 'CorePluginsAdmin_PluginHomepage'|translate|replace({' ': ' '})|raw }})</a> 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> diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions -Subproject 0f6930f1b89bc61970637000f32b132e5a2f664 +Subproject a304f97bc23315c06091bea0e1c1b52172344d3 diff --git a/plugins/CustomVariables/Reports/GetCustomVariables.php b/plugins/CustomVariables/Reports/GetCustomVariables.php index b460c8b836..c97746330a 100644 --- a/plugins/CustomVariables/Reports/GetCustomVariables.php +++ b/plugins/CustomVariables/Reports/GetCustomVariables.php @@ -21,7 +21,7 @@ class GetCustomVariables extends Base $this->dimension = new CustomVariableName(); $this->name = Piwik::translate('CustomVariables_CustomVariables'); $this->documentation = Piwik::translate('CustomVariables_CustomVariablesReportDocumentation', - array('<br />', '<a href="http://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">', '</a>')); + array('<br />', '<a href="https://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">', '</a>')); $this->actionToLoadSubTables = 'getCustomVariablesValuesFromNameId'; $this->order = 10; diff --git a/plugins/CustomVariables/Reports/GetCustomVariablesValuesFromNameId.php b/plugins/CustomVariables/Reports/GetCustomVariablesValuesFromNameId.php index e4f57af4fc..44c63fd2d5 100644 --- a/plugins/CustomVariables/Reports/GetCustomVariablesValuesFromNameId.php +++ b/plugins/CustomVariables/Reports/GetCustomVariablesValuesFromNameId.php @@ -20,7 +20,7 @@ class GetCustomVariablesValuesFromNameId extends Base $this->dimension = new CustomVariableValue(); $this->name = Piwik::translate('CustomVariables_CustomVariables'); $this->documentation = Piwik::translate('CustomVariables_CustomVariablesReportDocumentation', - array('<br />', '<a href="http://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">', '</a>')); + array('<br />', '<a href="https://piwik.org/docs/custom-variables/" rel="noreferrer" target="_blank">', '</a>')); $this->isSubtableReport = true; $this->order = 15; } diff --git a/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.html b/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.html index 96b61a92cb..286ec3d064 100644 --- a/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.html +++ b/plugins/CustomVariables/angularjs/manage-custom-vars/manage-custom-vars.directive.html @@ -1,7 +1,7 @@ <div class="manageCustomVars"> <div piwik-content-intro> <h2 piwik-enriched-headline - help-url="http://piwik.org/docs/custom-variables/"> + help-url="https://piwik.org/docs/custom-variables/"> {{ 'CustomVariables_CustomVariables'|translate }} </h2> diff --git a/plugins/CustomVariables/lang/en.json b/plugins/CustomVariables/lang/en.json index 56a6d3380b..1ecccedc5a 100644 --- a/plugins/CustomVariables/lang/en.json +++ b/plugins/CustomVariables/lang/en.json @@ -4,7 +4,7 @@ "ColumnCustomVariableValue": "Custom Variable value", "CustomVariables": "Custom Variables", "CustomVariablesReportDocumentation": "This report contains information about your Custom Variables. Click on a variable name to see the distribution of the values. %1$s For more information about Custom Variables in general, read the %2$sCustom Variables documentation on piwik.org%3$s", - "PluginDescription": "Custom Variables are (name, value) pairs that you can assign using the Javascript API to visitors or any of their action. Piwik will then report how many visits, pages, conversions for each of these custom names and values. View the detailed Custom Variables for each user and action in the Visitor Log.<br />Required to use <a href=\"http://piwik.org/docs/ecommerce-analytics/\">Ecommerce Analytics</a> feature!", + "PluginDescription": "Custom Variables are (name, value) pairs that you can assign using the Javascript API to visitors or any of their action. Piwik will then report how many visits, pages, conversions for each of these custom names and values. View the detailed Custom Variables for each user and action in the Visitor Log.<br />Required to use <a href=\"https://piwik.org/docs/ecommerce-analytics/\">Ecommerce Analytics</a> feature!", "ScopePage": "scope page", "ScopeVisit": "scope visit", "ScopeConversion": "scope conversion", diff --git a/plugins/DBStats/templates/index.twig b/plugins/DBStats/templates/index.twig index 486e4c8528..08b900ecf1 100755 --- a/plugins/DBStats/templates/index.twig +++ b/plugins/DBStats/templates/index.twig @@ -9,7 +9,7 @@ </h2> <p> {{ 'DBStats_MainDescription'|translate(totalSpaceUsed) }}<br/> - {{ 'DBStats_LearnMore'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/setup-auto-archiving/' target='_blank'>Piwik Auto Archiving</a>")|raw }} + {{ 'DBStats_LearnMore'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/docs/setup-auto-archiving/' target='_blank'>Piwik Auto Archiving</a>")|raw }} </p> </div> diff --git a/plugins/Diagnostics/Diagnostic/LoadDataInfileCheck.php b/plugins/Diagnostics/Diagnostic/LoadDataInfileCheck.php index 0d06ceef04..15bf5d83df 100644 --- a/plugins/Diagnostics/Diagnostic/LoadDataInfileCheck.php +++ b/plugins/Diagnostics/Diagnostic/LoadDataInfileCheck.php @@ -78,7 +78,7 @@ class LoadDataInfileCheck implements Diagnostic '<br/><strong>%s:</strong> %s<br/>%s', $this->translator->translate('General_Error'), $errorMessage, - 'Troubleshooting: <a target="_blank" href="?module=Proxy&action=redirect&url=http://piwik.org/faq/troubleshooting/%23faq_194">FAQ on piwik.org</a>' + 'Troubleshooting: <a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/faq/troubleshooting/%23faq_194">FAQ on piwik.org</a>' ); } diff --git a/plugins/ExampleAPI/plugin.json b/plugins/ExampleAPI/plugin.json index bf17ca1e07..544965416e 100644 --- a/plugins/ExampleAPI/plugin.json +++ b/plugins/ExampleAPI/plugin.json @@ -3,13 +3,13 @@ "description": "Piwik Platform showcase: how to create an API for your plugin to let your users export your data in multiple formats.", "version": "1.0", "keywords": ["example", "api"], - "homepage": "http://piwik.org", + "homepage": "https://piwik.org", "license": "GPL v3+", "authors": [ { "name": "Piwik", "email": "hello@piwik.org", - "homepage": "http://piwik.org" + "homepage": "https://piwik.org" } ] }
\ No newline at end of file diff --git a/plugins/ExampleVisualization/plugin.json b/plugins/ExampleVisualization/plugin.json index bcf9f49ce2..1fa9d6c281 100644 --- a/plugins/ExampleVisualization/plugin.json +++ b/plugins/ExampleVisualization/plugin.json @@ -5,12 +5,12 @@ "theme": false, "license": "GPL v3+", "keywords": ["SimpleTable"], - "homepage": "http://piwik.org", + "homepage": "https://piwik.org", "authors": [ { "name": "The Piwik Team", "email": "hello@piwik.org", - "homepage": "http://piwik.org" + "homepage": "https://piwik.org" } ] }
\ No newline at end of file diff --git a/plugins/Goals/Visualizations/Goals.php b/plugins/Goals/Visualizations/Goals.php index 4be5e24ef0..b6a3e573ac 100644 --- a/plugins/Goals/Visualizations/Goals.php +++ b/plugins/Goals/Visualizations/Goals.php @@ -48,7 +48,7 @@ class Goals extends HtmlTable if (1 == Common::getRequestVar('documentationForGoalsPage', 0, 'int')) { // TODO: should not use query parameter $this->config->documentation = Piwik::translate('Goals_ConversionByTypeReportDocumentation', - array('<br />', '<br />', '<a href="http://piwik.org/docs/tracking-goals-web-analytics/" rel="noreferrer" target="_blank">', '</a>')); + array('<br />', '<br />', '<a href="https://piwik.org/docs/tracking-goals-web-analytics/" rel="noreferrer" target="_blank">', '</a>')); } parent::beforeRender(); diff --git a/plugins/Goals/templates/_formAddGoal.twig b/plugins/Goals/templates/_formAddGoal.twig index 9505ac1898..b0c68aaf87 100644 --- a/plugins/Goals/templates/_formAddGoal.twig +++ b/plugins/Goals/templates/_formAddGoal.twig @@ -37,7 +37,7 @@ </div> <div class="col s12 m6"> <div piwik-alert="info" ng-show="manageGoals.goal.triggerType == 'manually'"> - {{ 'Goals_WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/javascript-tracking/%23toc-manually-trigger-a-conversion-for-a-goal'>","</a>")|raw }} + {{ 'Goals_WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=https://piwik.org/docs/javascript-tracking/%23toc-manually-trigger-a-conversion-for-a-goal'>","</a>")|raw }} </div> <div piwik-field uicontrol="radio" name="match_attribute" diff --git a/plugins/Goals/templates/_listGoalEdit.twig b/plugins/Goals/templates/_listGoalEdit.twig index c0ca80e08a..6fab4baec8 100644 --- a/plugins/Goals/templates/_listGoalEdit.twig +++ b/plugins/Goals/templates/_listGoalEdit.twig @@ -6,7 +6,7 @@ <div piwik-activity-indicator loading="manageGoals.isLoading"></div> <div class="contentHelp"> - {{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }} + {{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }} {% if not ecommerceEnabled %} <br /><br/> @@ -14,7 +14,7 @@ <a href='{{ linkTo({'module':'SitesManager','action':'index' }) }}'>{{ 'SitesManager_WebsitesManagement'|translate }}</a> {% endset %} {% set ecommerceReportText %} - <a href="http://piwik.org/docs/ecommerce-analytics/" rel="noreferrer" target="_blank">{{ 'Goals_EcommerceReports'|translate }}</a> + <a href="https://piwik.org/docs/ecommerce-analytics/" rel="noreferrer" target="_blank">{{ 'Goals_EcommerceReports'|translate }}</a> {% endset %} {{ 'Goals_Optional'|translate }} {{ 'Goals_Ecommerce'|translate }}: {{ 'Goals_YouCanEnableEcommerceReports'|translate(ecommerceReportText,websiteManageText)|raw }} {% endif %} diff --git a/plugins/Goals/templates/addNewGoal.twig b/plugins/Goals/templates/addNewGoal.twig index ae57805f3c..5ce89449d6 100644 --- a/plugins/Goals/templates/addNewGoal.twig +++ b/plugins/Goals/templates/addNewGoal.twig @@ -1,7 +1,7 @@ {% if userCanEditGoals %} {% set addNewGoalIntro %} <p>{{ 'Goals_NewGoalIntro'|translate }}</p> - <p>{{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }}</p> + <p>{{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }}</p> {% endset %} {% include "@Goals/_addEditGoal.twig" %} @@ -14,7 +14,7 @@ {{ 'Goals_NoGoalsNeedAccess'|translate|raw }} </p> <p> - {{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }} + {{ 'Goals_LearnMoreAboutGoalTrackingDocumentation'|translate("<a href='?module=Proxy&action=redirect&url=https://piwik.org/docs/tracking-goals-web-analytics/' target='_blank'>","</a>")|raw }} </p> </div> {{ postEvent("Template.afterGoalCannotAddNewGoal") }} diff --git a/plugins/Installation/templates/finished.twig b/plugins/Installation/templates/finished.twig index 133bdc6ab4..59191eff1e 100644 --- a/plugins/Installation/templates/finished.twig +++ b/plugins/Installation/templates/finished.twig @@ -11,8 +11,8 @@ {{ 'Installation_CollaborativeProject'|translate }} </p> <p> - {{ 'Installation_GetInvolved'|translate('<a rel="noreferrer" target="_blank" href="http://piwik.org/get-involved/">','</a>')|raw }} - {{ 'General_HelpTranslatePiwik'|translate("<a rel='noreferrer' target='_blank' href=\'http://piwik.org/translations/\'>","<\/a>")|raw }} + {{ 'Installation_GetInvolved'|translate('<a rel="noreferrer" target="_blank" href="https://piwik.org/get-involved/">','</a>')|raw }} + {{ 'General_HelpTranslatePiwik'|translate("<a rel='noreferrer' target='_blank' href=\'https://piwik.org/translations/\'>","<\/a>")|raw }} </p> <p>{{ 'Installation_WeHopeYouWillEnjoyPiwik'|translate }}</p> <p><i>{{ 'Installation_HappyAnalysing'|translate }}</i></p> diff --git a/plugins/Installation/templates/systemCheck.twig b/plugins/Installation/templates/systemCheck.twig index f73ab100c0..acdb965a81 100644 --- a/plugins/Installation/templates/systemCheck.twig +++ b/plugins/Installation/templates/systemCheck.twig @@ -23,7 +23,7 @@ {% if not showNextStep %} <p> <span class="icon-export"></span> - <a href="?module=Proxy&action=redirect&url=http://piwik.org/docs/requirements/" target="_blank">{{ 'Installation_Requirements'|translate }}</a> + <a href="?module=Proxy&action=redirect&url=https://piwik.org/docs/requirements/" target="_blank">{{ 'Installation_Requirements'|translate }}</a> </p> {% include "@Installation/_systemCheckLegend.twig" %} {% endif %} diff --git a/plugins/Installation/templates/trackingCode.twig b/plugins/Installation/templates/trackingCode.twig index f2555c1c15..f51f74383a 100644 --- a/plugins/Installation/templates/trackingCode.twig +++ b/plugins/Installation/templates/trackingCode.twig @@ -12,10 +12,10 @@ <h3>{{ 'Installation_LargePiwikInstances'|translate }}</h3> <p> - {{ 'Installation_JsTagArchivingHelp1'|translate('<a rel="noreferrer" target="_blank" href="http://piwik.org/docs/setup-auto-archiving/">','</a>')|raw }} + {{ 'Installation_JsTagArchivingHelp1'|translate('<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/setup-auto-archiving/">','</a>')|raw }} </p> <p> - {{ 'General_ReadThisToLearnMore'|translate('<a rel="noreferrer" target="_blank" href="http://piwik.org/docs/optimize/">','</a>')|raw }} + {{ 'General_ReadThisToLearnMore'|translate('<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/optimize/">','</a>')|raw }} </p> {% endblock %} diff --git a/plugins/LanguagesManager/API.php b/plugins/LanguagesManager/API.php index 9d75f62c2f..e02573bf12 100644 --- a/plugins/LanguagesManager/API.php +++ b/plugins/LanguagesManager/API.php @@ -21,7 +21,7 @@ use Piwik\Translation\Loader\DevelopmentLoader; * The LanguagesManager API lets you access existing Piwik translations, and change Users languages preferences. * * "getTranslationsForLanguage" will return all translation strings for a given language, - * so you can leverage Piwik translations in your application (and automatically benefit from the <a href='http://piwik.org/translations/' rel='noreferrer' target='_blank'>40+ translations</a>!). + * so you can leverage Piwik translations in your application (and automatically benefit from the <a href='https://piwik.org/translations/' rel='noreferrer' target='_blank'>40+ translations</a>!). * This is mostly useful to developers who integrate Piwik API results in their own application. * * You can also request the default language to load for a user via "getLanguageForUser", diff --git a/plugins/LanguagesManager/angularjs/translationsearch/translationsearch.directive.html b/plugins/LanguagesManager/angularjs/translationsearch/translationsearch.directive.html index b67dda0e19..f7f87f4479 100644 --- a/plugins/LanguagesManager/angularjs/translationsearch/translationsearch.directive.html +++ b/plugins/LanguagesManager/angularjs/translationsearch/translationsearch.directive.html @@ -2,7 +2,7 @@ <p> This page helps you to find existing translations that you can reuse in your Plugin. - If you want to know more about translations have a look at our <a href="http://developer.piwik.org/guides/internationalization" rel="noreferrer" target="_blank">Internationalization guide</a>. + If you want to know more about translations have a look at our <a href="https://developer.piwik.org/guides/internationalization" rel="noreferrer" target="_blank">Internationalization guide</a>. Enter a search term to find translations and their corresponding keys: </p> diff --git a/plugins/LanguagesManager/templates/getLanguagesSelector.twig b/plugins/LanguagesManager/templates/getLanguagesSelector.twig index ecd881202b..5265bf24c5 100644 --- a/plugins/LanguagesManager/templates/getLanguagesSelector.twig +++ b/plugins/LanguagesManager/templates/getLanguagesSelector.twig @@ -3,7 +3,7 @@ menu-title="{{ currentLanguageName|e('html_attr') }}" piwik-menudropdown> <a class="item" - href="?module=Proxy&action=redirect&url=http://piwik.org/translations/">{{ 'LanguagesManager_AboutPiwikTranslations'|translate }}</a> + href="?module=Proxy&action=redirect&url=https://piwik.org/translations/">{{ 'LanguagesManager_AboutPiwikTranslations'|translate }}</a> {% for language in languages %} <a class="item {% if language.code == currentLanguageCode %}active{% endif %}" value="{{ language.code }}" diff --git a/plugins/Live/templates/getVisitorProfilePopup.twig b/plugins/Live/templates/getVisitorProfilePopup.twig index f21a2477a3..77fe92a742 100644 --- a/plugins/Live/templates/getVisitorProfilePopup.twig +++ b/plugins/Live/templates/getVisitorProfilePopup.twig @@ -8,7 +8,7 @@ tabindex="0"> <div class="visitor-profile-options"> <a href class="visitor-profile-close" title="{{ 'General_Close'|translate }} "></a> - <a href="http://piwik.org/docs/user-profile/" class="visitor-profile-help" rel="noreferrer" + <a href="https://piwik.org/docs/user-profile/" class="visitor-profile-help" rel="noreferrer" target="_blank" title="{{ 'General_ViewDocumentationFor'|translate("Live_VisitorProfile"|translate|ucwords) }}"> </a> diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php index 01c115333f..a32eeb5e9a 100644 --- a/plugins/Login/Controller.php +++ b/plugins/Login/Controller.php @@ -215,7 +215,7 @@ class Controller extends \Piwik\Plugin\Controller protected function getMessageExceptionNoAccess() { - $message = Piwik::translate('Login_InvalidNonceOrHeadersOrReferrer', array('<a href="?module=Proxy&action=redirect&url=' . urlencode('http://piwik.org/faq/how-to-install/#faq_98') . '" target="_blank">', '</a>')); + $message = Piwik::translate('Login_InvalidNonceOrHeadersOrReferrer', array('<a href="?module=Proxy&action=redirect&url=' . urlencode('https://piwik.org/faq/how-to-install/#faq_98') . '" target="_blank">', '</a>')); $message .= $this->getMessageExceptionNoAccessWhenInsecureConnectionMayBeUsed(); @@ -234,7 +234,7 @@ class Controller extends \Piwik\Plugin\Controller if(Url::isSecureConnectionAssumedByPiwikButNotForcedYet()) { $message = '<br/><br/>' . Piwik::translate('Login_InvalidNonceSSLMisconfigured', array( - '<a href="?module=Proxy&action=redirect&url=' . urlencode('<a href="http://piwik.org/faq/how-to/faq_91/">') . '">', + '<a href="?module=Proxy&action=redirect&url=' . urlencode('<a href="https://piwik.org/faq/how-to/faq_91/">') . '">', '</a>', 'config/config.ini.php', '<pre>force_ssl=1</pre>', diff --git a/plugins/Marketplace/templates/overview.twig b/plugins/Marketplace/templates/overview.twig index f158b2522a..4d20b79bd2 100644 --- a/plugins/Marketplace/templates/overview.twig +++ b/plugins/Marketplace/templates/overview.twig @@ -70,7 +70,7 @@ {% include '@Marketplace/plugin-list.twig' %} <div class="footer-message center"> - {{ 'Marketplace_DevelopersLearnHowToDevelopPlugins'|translate('<a href="?module=Proxy&action=redirect&url=http://developer.piwik.org/develop" target="_blank">', '</a>')|raw }} + {{ 'Marketplace_DevelopersLearnHowToDevelopPlugins'|translate('<a href="?module=Proxy&action=redirect&url=https://developer.piwik.org/develop" target="_blank">', '</a>')|raw }} <br /> <br /> <br /> diff --git a/plugins/MobileAppMeasurable/Type.php b/plugins/MobileAppMeasurable/Type.php index 34ff4335b5..2c6de23b66 100644 --- a/plugins/MobileAppMeasurable/Type.php +++ b/plugins/MobileAppMeasurable/Type.php @@ -14,7 +14,7 @@ class Type extends \Piwik\Measurable\Type protected $name = 'MobileAppMeasurable_MobileApp'; protected $namePlural = 'MobileAppMeasurable_MobileApps'; protected $description = 'MobileAppMeasurable_MobileAppDescription'; - protected $howToSetupUrl = 'http://developer.piwik.org/guides/tracking-api-clients#mobile-sdks'; + protected $howToSetupUrl = 'https://developer.piwik.org/guides/tracking-api-clients#mobile-sdks'; } diff --git a/plugins/Morpheus/templates/ajaxMacros.twig b/plugins/Morpheus/templates/ajaxMacros.twig index 2a4584c425..b526ae8b19 100644 --- a/plugins/Morpheus/templates/ajaxMacros.twig +++ b/plugins/Morpheus/templates/ajaxMacros.twig @@ -27,7 +27,7 @@ {{ 'General_NeedMoreHelp'|translate }} <a rel="noreferrer" target="_blank" href="https://piwik.org/faq/troubleshooting/faq_19489/">{{ 'General_Faq'|translate }}</a> – - <a rel="noreferrer" target="_blank" href="http://forum.piwik.org/">{{ 'Feedback_CommunityHelp'|translate }}</a> + <a rel="noreferrer" target="_blank" href="https://forum.piwik.org/">{{ 'Feedback_CommunityHelp'|translate }}</a> {%- if areAdsForProfessionalServicesEnabled %} – diff --git a/plugins/Morpheus/templates/maintenance.tpl b/plugins/Morpheus/templates/maintenance.tpl index 076b6a069a..2895a3cdb8 100644 --- a/plugins/Morpheus/templates/maintenance.tpl +++ b/plugins/Morpheus/templates/maintenance.tpl @@ -12,7 +12,7 @@ <div class="logo"> <img title="Piwik" alt="Piwik" src="%logoUrl%" /> <br/> - <a href='http://piwik.org/'>%piwikTitle%</a> + <a href='https://piwik.org/'>%piwikTitle%</a> </div> <div class="box"> diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html index a0354621b8..25e57c802e 100644 --- a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html +++ b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html @@ -1,7 +1,7 @@ <div> <h2 piwik-enriched-headline class="card-title" - help-url="http://piwik.org/docs/manage-websites/#all-websites-dashboard" + help-url="https://piwik.org/docs/manage-websites/#all-websites-dashboard" feature-name="{{ 'General_AllWebsitesDashboard'|translate }}"> {{ 'General_AllWebsitesDashboard'|translate }} <span class='smallTitle' @@ -65,7 +65,7 @@ <a rel="noreferrer" target="_blank" href="https://piwik.org/faq/troubleshooting/faq_19489/">{{ 'General_Faq'|translate }}</a> – - <a rel="noreferrer" target="_blank" href="http://forum.piwik.org/">{{ 'Feedback_CommunityHelp'|translate }}</a> + <a rel="noreferrer" target="_blank" href="https://forum.piwik.org/">{{ 'Feedback_CommunityHelp'|translate }}</a> <span ng-show="areAdsForProfessionalServicesEnabled"> – </span> <a ng-show="areAdsForProfessionalServicesEnabled" rel="noreferrer" target="_blank" href="https://piwik.org/support/?pk_campaign=Help&pk_medium=AjaxError&pk_content=MultiSites&pk_source=Piwik_App">{{ 'Feedback_ProfessionalHelp'|translate }}</a>. </div> diff --git a/plugins/Overlay/templates/index.twig b/plugins/Overlay/templates/index.twig index 13315dc56c..1d4ed41db2 100644 --- a/plugins/Overlay/templates/index.twig +++ b/plugins/Overlay/templates/index.twig @@ -8,7 +8,7 @@ {% block content %} <div class="overlay-sidebar-container"> - <a id="overlayTitle" href="http://piwik.org/docs/page-overlay/" rel="noreferrer" target="_blank"> + <a id="overlayTitle" href="https://piwik.org/docs/page-overlay/" rel="noreferrer" target="_blank"> {{ 'Overlay_Overlay'|translate }} <span class="icon-info2"></span> </a> @@ -37,7 +37,7 @@ </p> <p> - <a href="http://piwik.org/docs/page-overlay/#toc-page-overlay-troubleshooting" rel="noreferrer" target="_blank"> + <a href="https://piwik.org/docs/page-overlay/#toc-page-overlay-troubleshooting" rel="noreferrer" target="_blank"> {{ 'Overlay_ErrorNotLoadingLink'|translate }} </a> </p> diff --git a/plugins/PrivacyManager/templates/privacySettings.twig b/plugins/PrivacyManager/templates/privacySettings.twig index ab26aa3bef..056ac36065 100644 --- a/plugins/PrivacyManager/templates/privacySettings.twig +++ b/plugins/PrivacyManager/templates/privacySettings.twig @@ -7,10 +7,10 @@ {% if isSuperUser %} <div piwik-content-intro> - <h2 piwik-enriched-headline help-url="http://piwik.org/docs/privacy/">{{ title }}</h2> + <h2 piwik-enriched-headline help-url="https://piwik.org/docs/privacy/">{{ title }}</h2> <p>{{ 'PrivacyManager_Teaser'|translate('<a href="#anonymizeIPAnchor">',"</a>",'<a href="#deleteLogsAnchor">',"</a>",'<a href="#optOutAnchor">',"</a>")|raw }} - {{'PrivacyManager_SeeAlsoOurOfficialGuidePrivacy'|translate('<a href="http://piwik.org/privacy/" rel="noreferrer" target="_blank">','</a>')|raw }}</p> + {{'PrivacyManager_SeeAlsoOurOfficialGuidePrivacy'|translate('<a href="https://piwik.org/privacy/" rel="noreferrer" target="_blank">','</a>')|raw }}</p> </div> <div piwik-content-block @@ -94,7 +94,7 @@ <div class="alert alert-warning" style="width: 50%;"> {{ 'PrivacyManager_DeleteLogDescription2'|translate|raw }} - <a href="http://piwik.org/faq/general/#faq_125" rel="noreferrer" target="_blank"> + <a href="https://piwik.org/faq/general/#faq_125" rel="noreferrer" target="_blank"> {{ 'General_ClickHere'|translate }} </a> </div> diff --git a/plugins/ProfessionalServices/templates/promoBelowEvents.twig b/plugins/ProfessionalServices/templates/promoBelowEvents.twig index 8121d9c1cb..ef7d95bb67 100644 --- a/plugins/ProfessionalServices/templates/promoBelowEvents.twig +++ b/plugins/ProfessionalServices/templates/promoBelowEvents.twig @@ -1,6 +1,6 @@ <p style="margin-top:3em" class=" alert-info alert">Did you know? - <br/>Using Events you can measure any user interaction and gain amazing insights into your audience. <a target="_blank" href="?module=Proxy&action=redirect&url=http://piwik.org/docs/event-tracking/">Learn more</a>. - <br/> To measure blocks of content such as image galleries, listings or ads: use <a target="_blank" href="?module=Proxy&action=redirect&url=http://developer.piwik.org/guides/content-tracking">Content Tracking</a> and see exactly which content is viewed and clicked. + <br/>Using Events you can measure any user interaction and gain amazing insights into your audience. <a target="_blank" href="?module=Proxy&action=redirect&url=https://piwik.org/docs/event-tracking/">Learn more</a>. + <br/> To measure blocks of content such as image galleries, listings or ads: use <a target="_blank" href="?module=Proxy&action=redirect&url=https://developer.piwik.org/guides/content-tracking">Content Tracking</a> and see exactly which content is viewed and clicked. {% if displayMediaAnalyticsAd %} <br/>When you publish videos or audios, <a target="_blank" rel="noreferrer" href="https://piwik.org/recommends/media-analytics-website">Media Analytics gives deep insights into your audience</a> and how they watch your videos or listens to your music. {% endif %} diff --git a/plugins/Provider/Reports/GetProvider.php b/plugins/Provider/Reports/GetProvider.php index adf03cd26f..a5ff778f0a 100644 --- a/plugins/Provider/Reports/GetProvider.php +++ b/plugins/Provider/Reports/GetProvider.php @@ -44,7 +44,7 @@ class GetProvider extends Report if (! Common::getRequestVar('disableLink', 0, 'int')) { $message .= ' ' . Piwik::translate( 'General_SeeThisFaq', - array('<a href="http://piwik.org/faq/general/faq_52/" rel="noreferrer" target="_blank">', '</a>') + array('<a href="https://piwik.org/faq/general/faq_52/" rel="noreferrer" target="_blank">', '</a>') ); } $view->config->show_footer_message = $message; diff --git a/plugins/Referrers/Reports/GetCampaigns.php b/plugins/Referrers/Reports/GetCampaigns.php index a1b5f6fd94..36df4fead4 100644 --- a/plugins/Referrers/Reports/GetCampaigns.php +++ b/plugins/Referrers/Reports/GetCampaigns.php @@ -21,7 +21,7 @@ class GetCampaigns extends Base $this->dimension = new Campaign(); $this->name = Piwik::translate('Referrers_Campaigns'); $this->documentation = Piwik::translate('Referrers_CampaignsReportDocumentation', - array('<br />', '<a href="http://piwik.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">', '</a>')); + array('<br />', '<a href="https://piwik.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">', '</a>')); $this->actionToLoadSubTables = 'getKeywordsFromCampaignId'; $this->hasGoalMetrics = true; $this->order = 9; diff --git a/plugins/Referrers/Reports/GetKeywordsFromCampaignId.php b/plugins/Referrers/Reports/GetKeywordsFromCampaignId.php index 0a12e87fde..d3f2fd1784 100644 --- a/plugins/Referrers/Reports/GetKeywordsFromCampaignId.php +++ b/plugins/Referrers/Reports/GetKeywordsFromCampaignId.php @@ -20,7 +20,7 @@ class GetKeywordsFromCampaignId extends Base $this->dimension = new Keyword(); $this->name = Piwik::translate('Referrers_Campaigns'); $this->documentation = Piwik::translate('Referrers_CampaignsReportDocumentation', - array('<br />', '<a href="http://piwik.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">', '</a>')); + array('<br />', '<a href="https://piwik.org/docs/tracking-campaigns/" rel="noreferrer" target="_blank">', '</a>')); $this->isSubtableReport = true; $this->order = 10; } diff --git a/plugins/Referrers/SearchEngine.php b/plugins/Referrers/SearchEngine.php index f8b1f806e0..02e4338d95 100644 --- a/plugins/Referrers/SearchEngine.php +++ b/plugins/Referrers/SearchEngine.php @@ -485,7 +485,7 @@ class SearchEngine extends Singleton public function getBackLinkFromUrlAndKeyword($url, $keyword) { if ($keyword === API::LABEL_KEYWORD_NOT_DEFINED) { - return 'http://piwik.org/faq/general/#faq_144'; + return 'https://piwik.org/faq/general/#faq_144'; } $keyword = urlencode($keyword); $keyword = str_replace(urlencode('+'), urlencode(' '), $keyword); diff --git a/plugins/RssWidget/plugin.json b/plugins/RssWidget/plugin.json index ba44ad733c..a9a6472345 100644 --- a/plugins/RssWidget/plugin.json +++ b/plugins/RssWidget/plugin.json @@ -3,13 +3,13 @@ "description": "Piwik Platform showcase: how to create a new widget that displays a user submitted RSS feed.", "version": "1.0", "keywords": ["example", "feed", "widget"], - "homepage": "http://piwik.org", + "homepage": "https://piwik.org", "license": "GPL v3+", "authors": [ { "name": "Piwik", "email": "hello@piwik.org", - "homepage": "http://piwik.org" + "homepage": "https://piwik.org" } ] }
\ No newline at end of file diff --git a/plugins/ScheduledReports/templates/_listReports.twig b/plugins/ScheduledReports/templates/_listReports.twig index f755f6c0ee..ffbeeeb564 100644 --- a/plugins/ScheduledReports/templates/_listReports.twig +++ b/plugins/ScheduledReports/templates/_listReports.twig @@ -1,7 +1,7 @@ <div id='entityEditContainer' class="entityTableContainer" piwik-content-block content-title="{{ title|e('html_attr') }}" - help-url="http://piwik.org/docs/email-reports/" + help-url="https://piwik.org/docs/email-reports/" feature="true" ng-show="manageScheduledReport.showReportsList"> diff --git a/plugins/SitesManager/templates/_displayJavascriptCode.twig b/plugins/SitesManager/templates/_displayJavascriptCode.twig index a400c316ad..6425e1fc41 100644 --- a/plugins/SitesManager/templates/_displayJavascriptCode.twig +++ b/plugins/SitesManager/templates/_displayJavascriptCode.twig @@ -3,7 +3,7 @@ <div class='trackingHelp'> <p>{{ 'Installation_JSTracking_Intro'|translate }}</p> - <p>{{ 'CoreAdminHome_JSTrackingIntro3b'|translate('<a href="http://piwik.org/integrate/" rel="noreferrer" target="_blank">','</a>')|raw }}</p> + <p>{{ 'CoreAdminHome_JSTrackingIntro3b'|translate('<a href="https://piwik.org/integrate/" rel="noreferrer" target="_blank">','</a>')|raw }}</p> <h3>{{ 'General_JsTrackingTag'|translate }}</h3> @@ -11,7 +11,7 @@ <pre piwik-select-on-focus>{{ jsTag|raw }}</pre> - <p>{{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a rel="noreferrer" target="_blank" href="http://piwik.org/docs/javascript-tracking/">','</a>')|raw }}</p> + <p>{{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/javascript-tracking/">','</a>')|raw }}</p> {% if isInstall is defined %} <p>{{ 'Installation_JSTracking_EndNote'|translate('', '')|raw }}</p> diff --git a/plugins/SitesManager/templates/sites-manager-header.html b/plugins/SitesManager/templates/sites-manager-header.html index 4a7a1c08cb..a677cc1968 100644 --- a/plugins/SitesManager/templates/sites-manager-header.html +++ b/plugins/SitesManager/templates/sites-manager-header.html @@ -2,7 +2,7 @@ <h2 ng-show="availableTypes" piwik-enriched-headline - help-url="http://piwik.org/docs/manage-websites/" + help-url="https://piwik.org/docs/manage-websites/" feature-name="{{ 'SitesManager_WebsitesManagement'|translate }}"> {{ 'SitesManager_XManagement'|translate:(availableTypes.length > 1 ? ('General_Measurables'|translate) : ('SitesManager_Sites'|translate)) }} </h2> diff --git a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml index 21672ff427..a0aa7be1ac 100644 --- a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml +++ b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml @@ -210,7 +210,7 @@ <row>Ecommerce enabled</row> </availableValues> <description /> - <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Piwik allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='http://piwik.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> + <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Piwik allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='https://piwik.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> <templateFile /> <introduction /> <condition /> diff --git a/plugins/TestRunner/Commands/SyncScreenshots.php b/plugins/TestRunner/Commands/SyncScreenshots.php index b0f7616598..1ce6fa4828 100644 --- a/plugins/TestRunner/Commands/SyncScreenshots.php +++ b/plugins/TestRunner/Commands/SyncScreenshots.php @@ -79,7 +79,7 @@ class SyncScreenshots extends ConsoleCommand private function getScreenshotList($repository, $buildNumber, $httpUser = null, $httpPassword = null) { - $url = sprintf('http://builds-artifacts.piwik.org/api/%s/%s', $repository, $buildNumber); + $url = sprintf('https://builds-artifacts.piwik.org/api/%s/%s', $repository, $buildNumber); $this->logger->debug('Fetching {url}', array('url' => $url)); @@ -110,7 +110,7 @@ class SyncScreenshots extends ConsoleCommand private function downloadScreenshot($url, $repository, $screenshot, $httpUser, $httpPassword) { $downloadTo = $this->getDownloadToPath($repository) . $screenshot; - $url = 'http://builds-artifacts.piwik.org' . $url; + $url = 'https://builds-artifacts.piwik.org' . $url; $this->logger->debug("Downloading {url} to {destination}", array('url' => $url, 'destination' => $downloadTo)); diff --git a/plugins/Transitions/javascripts/transitions.js b/plugins/Transitions/javascripts/transitions.js index a8fb05a363..f26470e0b3 100644 --- a/plugins/Transitions/javascripts/transitions.js +++ b/plugins/Transitions/javascripts/transitions.js @@ -188,7 +188,7 @@ Piwik_Transitions.prototype.showPopover = function () { var self = this; this.popover = Piwik_Popover.showLoading('Transitions', self.actionName, 550); - Piwik_Popover.addHelpButton('http://piwik.org/docs/transitions'); + Piwik_Popover.addHelpButton('https://piwik.org/docs/transitions'); var bothLoaded = function () { Piwik_Popover.setContent(Piwik_Transitions.popoverHtml); diff --git a/plugins/UserCountry/Diagnostic/GeolocationDiagnostic.php b/plugins/UserCountry/Diagnostic/GeolocationDiagnostic.php index c01660bbc0..432d57d444 100644 --- a/plugins/UserCountry/Diagnostic/GeolocationDiagnostic.php +++ b/plugins/UserCountry/Diagnostic/GeolocationDiagnostic.php @@ -50,12 +50,12 @@ class GeolocationDiagnostic implements Diagnostic if ($isProviderInstalled) { $comment = $this->translator->translate('UserCountry_GeoIpLocationProviderNotRecomnended') . ' '; $comment .= $this->translator->translate('UserCountry_GeoIpLocationProviderDesc_ServerBased2', array( - '<a href="http://piwik.org/docs/geo-locate/" rel="noreferrer" target="_blank">', '', '', '</a>' + '<a href="https://piwik.org/docs/geo-locate/" rel="noreferrer" target="_blank">', '', '', '</a>' )); } else { $comment = $this->translator->translate('UserCountry_DefaultLocationProviderDesc1') . ' '; $comment .= $this->translator->translate('UserCountry_DefaultLocationProviderDesc2', array( - '<a href="http://piwik.org/docs/geo-locate/" rel="noreferrer" target="_blank">', '', '', '</a>' + '<a href="https://piwik.org/docs/geo-locate/" rel="noreferrer" target="_blank">', '', '', '</a>' )); } diff --git a/plugins/UserCountry/LocationProvider/DefaultProvider.php b/plugins/UserCountry/LocationProvider/DefaultProvider.php index 665f7c0e17..6a0cf82f17 100755 --- a/plugins/UserCountry/LocationProvider/DefaultProvider.php +++ b/plugins/UserCountry/LocationProvider/DefaultProvider.php @@ -104,7 +104,7 @@ class DefaultProvider extends LocationProvider $desc = Piwik::translate('UserCountry_DefaultLocationProviderDesc1') . ' ' . Piwik::translate('UserCountry_DefaultLocationProviderDesc2', array('<strong>', '', '', '</strong>')) - . '<p><a href="http://piwik.org/faq/how-to/#faq_163" rel="noreferrer" target="_blank">' + . '<p><a href="https://piwik.org/faq/how-to/#faq_163" rel="noreferrer" target="_blank">' . Piwik::translate('UserCountry_HowToInstallGeoIPDatabases') . '</a></p>'; return array('id' => self::ID, 'title' => self::TITLE, 'description' => $desc, 'order' => 1); diff --git a/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php b/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php index a462bd2419..965740824f 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php +++ b/plugins/UserCountry/LocationProvider/GeoIp/Pecl.php @@ -217,7 +217,7 @@ class Pecl extends GeoIp { $desc = Piwik::translate('UserCountry_GeoIpLocationProviderDesc_Pecl1') . '<br/><br/>' . Piwik::translate('UserCountry_GeoIpLocationProviderDesc_Pecl2'); - $installDocs = '<a rel="noreferrer" target="_blank" href="http://piwik.org/faq/how-to/#faq_164">' + $installDocs = '<a rel="noreferrer" target="_blank" href="https://piwik.org/faq/how-to/#faq_164">' . Piwik::translate('UserCountry_HowToInstallGeoIpPecl') . '</a>'; diff --git a/plugins/UserCountry/LocationProvider/GeoIp/Php.php b/plugins/UserCountry/LocationProvider/GeoIp/Php.php index 02399ecf8f..35c505f7b9 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp/Php.php +++ b/plugins/UserCountry/LocationProvider/GeoIp/Php.php @@ -324,7 +324,7 @@ class Php extends GeoIp $desc = Piwik::translate('UserCountry_GeoIpLocationProviderDesc_Php1') . '<br/><br/>' . Piwik::translate('UserCountry_GeoIpLocationProviderDesc_Php2', array('<strong>', '</strong>', '<strong>', '</strong>')); - $installDocs = '<a rel="noreferrer" target="_blank" href="http://piwik.org/faq/how-to/#faq_163">' + $installDocs = '<a rel="noreferrer" target="_blank" href="https://piwik.org/faq/how-to/#faq_163">' . Piwik::translate('UserCountry_HowToInstallGeoIPDatabases') . '</a>'; diff --git a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php index 71199f2f0b..fe27a5dd2e 100755 --- a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php +++ b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php @@ -223,10 +223,10 @@ class ServerBased extends GeoIp . Piwik::translate('UserCountry_GeoIpLocationProviderDesc_ServerBased2', array('<strong>', '</strong>', '<strong>', '</strong>')); $installDocs = - '<a rel="noreferrer" target="_blank" href="http://piwik.org/faq/how-to/#faq_165">' + '<a rel="noreferrer" target="_blank" href="https://piwik.org/faq/how-to/#faq_165">' . Piwik::translate('UserCountry_HowToInstallApacheModule') . '</a><br/>' - . '<a rel="noreferrer" target="_blank" href="http://piwik.org/faq/how-to/#faq_166">' + . '<a rel="noreferrer" target="_blank" href="https://piwik.org/faq/how-to/#faq_166">' . Piwik::translate('UserCountry_HowToInstallNginxModule') . '</a>'; diff --git a/plugins/UserCountry/Reports/Base.php b/plugins/UserCountry/Reports/Base.php index c24ec82d24..a1ec96e427 100644 --- a/plugins/UserCountry/Reports/Base.php +++ b/plugins/UserCountry/Reports/Base.php @@ -54,7 +54,7 @@ abstract class Base extends \Piwik\Plugin\Report '</a>')); } else { $footerMessage .= ' ' . Piwik::translate('UserCountry_ToGeolocateOldVisits', - array('<a rel="noreferrer" target="_blank" href="http://piwik.org/faq/how-to/#faq_167">', '</a>')); + array('<a rel="noreferrer" target="_blank" href="https://piwik.org/faq/how-to/#faq_167">', '</a>')); } $view->config->show_footer_message = $footerMessage; diff --git a/plugins/UserCountry/Reports/GetCountry.php b/plugins/UserCountry/Reports/GetCountry.php index 5b038f7e49..9e5c7faae1 100644 --- a/plugins/UserCountry/Reports/GetCountry.php +++ b/plugins/UserCountry/Reports/GetCountry.php @@ -39,7 +39,7 @@ class GetCountry extends Base // if we're using the default location provider, add a note explaining how it works $footerMessage = Piwik::translate("General_Note") . ': ' . Piwik::translate('UserCountry_DefaultLocationProviderExplanation', - array('<a rel="noreferrer" target="_blank" href="http://piwik.org/docs/geo-locate/">', '</a>')); + array('<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/geo-locate/">', '</a>')); $view->config->show_footer_message = $footerMessage; } diff --git a/plugins/UserCountry/templates/adminIndex.twig b/plugins/UserCountry/templates/adminIndex.twig index 7fec097d1d..0e45d899f6 100755 --- a/plugins/UserCountry/templates/adminIndex.twig +++ b/plugins/UserCountry/templates/adminIndex.twig @@ -7,7 +7,7 @@ <div piwik-content-intro> <h2 piwik-enriched-headline - help-url="http://piwik.org/docs/geo-locate/" + help-url="https://piwik.org/docs/geo-locate/" id="location-providers">{{ title }}</h2> <p>{{ 'UserCountry_GeolocationPageDesc'|translate }}</p> </div> diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig index 23a8001047..2217ce28ae 100644 --- a/plugins/UsersManager/templates/userSettings.twig +++ b/plugins/UsersManager/templates/userSettings.twig @@ -35,7 +35,7 @@ </div> <div id="languageHelp" class="inline-help-node"> - <a href="?module=Proxy&action=redirect&url=http://piwik.org/translations/" target="_blank"> + <a href="?module=Proxy&action=redirect&url=https://piwik.org/translations/" target="_blank"> {{ 'LanguagesManager_AboutPiwikTranslations'|translate }}</a> </div> diff --git a/plugins/VisitsSummary/API.php b/plugins/VisitsSummary/API.php index db0a52ce86..76606885db 100644 --- a/plugins/VisitsSummary/API.php +++ b/plugins/VisitsSummary/API.php @@ -146,7 +146,7 @@ class API extends \Piwik\Plugin\API if (!SettingsPiwik::isUniqueVisitorsEnabled($period)) { throw new \Exception( "The metric " . $metric . " is not enabled for the requested period. " . - "Please see this FAQ: http://piwik.org/faq/how-to/faq_113/" + "Please see this FAQ: https://piwik.org/faq/how-to/faq_113/" ); } } diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php index ca141b7ed8..fc15828149 100644 --- a/plugins/VisitsSummary/Controller.php +++ b/plugins/VisitsSummary/Controller.php @@ -77,7 +77,7 @@ class Controller extends \Piwik\Plugin\Controller . $this->translator->translate('General_ColumnNbActionsDocumentation') . '<br />' . '<b>' . $this->translator->translate('General_ColumnNbUsers') . ':</b> ' - . $this->translator->translate('General_ColumnNbUsersDocumentation') . ' (<a rel="noreferrer" target="_blank" href="http://piwik.org/docs/user-id/">User ID</a>)<br />' + . $this->translator->translate('General_ColumnNbUsersDocumentation') . ' (<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/user-id/">User ID</a>)<br />' . '<b>' . $this->translator->translate('General_ColumnActionsPerVisit') . ':</b> ' . $this->translator->translate('General_ColumnActionsPerVisitDocumentation'); diff --git a/plugins/WebsiteMeasurable/MeasurableSettings.php b/plugins/WebsiteMeasurable/MeasurableSettings.php index 3d141b5301..a0e696a842 100644 --- a/plugins/WebsiteMeasurable/MeasurableSettings.php +++ b/plugins/WebsiteMeasurable/MeasurableSettings.php @@ -334,7 +334,7 @@ class MeasurableSettings extends \Piwik\Settings\Measurable\MeasurableSettings $field->inlineHelp = Piwik::translate('SitesManager_EcommerceHelp') . '<br />' . Piwik::translate('SitesManager_PiwikOffersEcommerceAnalytics', - array("<a href='http://piwik.org/docs/ecommerce-analytics/' target='_blank'>", '</a>')); + array("<a href='https://piwik.org/docs/ecommerce-analytics/' target='_blank'>", '</a>')); $field->uiControl = FieldConfig::UI_CONTROL_SINGLE_SELECT; $field->availableValues = array( 0 => Piwik::translate('SitesManager_NotAnEcommerceSite'), |