From e09383ebeedd6b6f8dee8b57373027b00e6203b5 Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Wed, 25 Jul 2018 19:47:29 +0000 Subject: 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 --- plugins/Referrers/Controller.php | 4 ++-- plugins/Referrers/Reports/GetCampaigns.php | 2 +- plugins/Referrers/Reports/GetKeywordsFromCampaignId.php | 2 +- plugins/Referrers/templates/_visitorDetails.twig | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/Referrers') diff --git a/plugins/Referrers/Controller.php b/plugins/Referrers/Controller.php index 5a2ccd6459..367be3c9c9 100644 --- a/plugins/Referrers/Controller.php +++ b/plugins/Referrers/Controller.php @@ -428,8 +428,8 @@ function DisplayTopKeywords($url = "") echo "

This widget is designed to work in your website directly. This widget makes it easy to use Piwik to automatically display the list of Top Keywords, for each of your website Page URLs.

- Example API URL - For example if you would like to get the top 10 keywords, used last week, to land on the page $topPageUrl, - in format JSON: you would dynamically fetch the data using this API request URL. Make sure you encode the 'url' parameter in the URL.

+ Example API URL - For example if you would like to get the top 10 keywords, used last week, to land on the page $topPageUrl, + in format JSON: you would dynamically fetch the data using this API request URL. Make sure you encode the 'url' parameter in the URL.

PHP Function ready to use! - If you use PHP on your website, we have prepared a small code snippet that you can copy paste in your Website PHP files. You can then simply call the function DisplayTopKeywords(); anywhere in your template, at the bottom of the content or in your blog sidebar. If you run this code in your page $topPageUrl, it would output the following:"; diff --git a/plugins/Referrers/Reports/GetCampaigns.php b/plugins/Referrers/Reports/GetCampaigns.php index da3e0edfdb..6984999f80 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('
', '', '')); + array('
', '', '')); $this->actionToLoadSubTables = 'getKeywordsFromCampaignId'; $this->hasGoalMetrics = true; $this->order = 9; diff --git a/plugins/Referrers/Reports/GetKeywordsFromCampaignId.php b/plugins/Referrers/Reports/GetKeywordsFromCampaignId.php index 7885bd0940..4ad420711e 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('
', '', '')); + array('
', '', '')); $this->isSubtableReport = true; $this->order = 10; } diff --git a/plugins/Referrers/templates/_visitorDetails.twig b/plugins/Referrers/templates/_visitorDetails.twig index 107a0980e8..39c43d816e 100644 --- a/plugins/Referrers/templates/_visitorDetails.twig +++ b/plugins/Referrers/templates/_visitorDetails.twig @@ -1,7 +1,7 @@

{% if visitInfo.getColumn('referrerType') == 'website' %} {{ 'Referrers_ColumnWebsite'|translate }}: - {{ visitInfo.getColumn('referrerName') }} @@ -29,7 +29,7 @@ {% endif %} {{ visitInfo.getColumn('referrerName') }} {%- if showKeyword %}, {{ 'Referrers_Keywords'|translate }}: - + "{{ visitInfo.getColumn('referrerKeyword') }}" {% endif %} {% set keyword %}{{ visitInfo.getColumn('referrerKeyword') }}{% endset %} -- cgit v1.2.3