diff options
Diffstat (limited to 'plugins/CoreHome')
| -rw-r--r-- | plugins/CoreHome/CoreHome.php | 1 | ||||
| -rw-r--r-- | plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html | 4 | ||||
| -rw-r--r-- | plugins/CoreHome/javascripts/dataTable.js | 2 | ||||
| -rw-r--r-- | plugins/CoreHome/javascripts/noreferrer.js | 18 | ||||
| -rw-r--r-- | plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig | 2 | ||||
| -rw-r--r-- | plugins/CoreHome/templates/_dataTableCell.twig | 2 | ||||
| -rw-r--r-- | plugins/CoreHome/templates/_donate.twig | 2 | ||||
| -rw-r--r-- | plugins/CoreHome/templates/_headerMessage.twig | 6 | ||||
| -rw-r--r-- | plugins/CoreHome/templates/_topBar.twig | 11 | ||||
| -rw-r--r-- | plugins/CoreHome/templates/_warningInvalidHost.twig | 2 | ||||
| -rw-r--r-- | plugins/CoreHome/templates/getPromoVideo.twig | 6 |
11 files changed, 40 insertions, 16 deletions
diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php index b1a29135d4..04fc917ec7 100644 --- a/plugins/CoreHome/CoreHome.php +++ b/plugins/CoreHome/CoreHome.php @@ -158,6 +158,7 @@ class CoreHome extends \Piwik\Plugin $jsFiles[] = "plugins/CoreHome/javascripts/notification_parser.js"; $jsFiles[] = "plugins/CoreHome/javascripts/numberFormatter.js"; $jsFiles[] = "plugins/CoreHome/javascripts/zen-mode.js"; + $jsFiles[] = "plugins/CoreHome/javascripts/noreferrer.js"; $jsFiles[] = "plugins/CoreHome/angularjs/piwikApp.config.js"; diff --git a/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html b/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html index 277769d3de..236f6e6d37 100644 --- a/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html +++ b/plugins/CoreHome/angularjs/enrichedheadline/enrichedheadline.directive.html @@ -7,7 +7,7 @@ <span ng-show="view.showIcons || view.showInlineHelp" class="iconsBar"> <a ng-if="helpUrl && !inlineHelp" - rel="noreferrer" + rel="noreferrer noopener" target="_blank" href="{{ helpUrl }}" title="{{ 'CoreHome_ExternalHelp'|translate }}" @@ -26,7 +26,7 @@ <div class="inlineHelp" ng-show="view.showInlineHelp"> <div ng-bind-html="inlineHelp"></div> <a ng-if="helpUrl" - rel="noreferrer" + rel="noreferrer noopener" target="_blank" href="{{ helpUrl }}" class="readMore">{{ 'General_MoreDetails'|translate }}</a> diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js index 103b9afb89..1fbae58f68 100644 --- a/plugins/CoreHome/javascripts/dataTable.js +++ b/plugins/CoreHome/javascripts/dataTable.js @@ -1722,7 +1722,7 @@ $.extend(DataTable.prototype, UIControl.prototype, { }, handleSummaryRow: function (domElem) { - var details = _pk_translate('General_LearnMore', [' (<a href="https://matomo.org/faq/how-to/faq_54/" rel="noreferrer" target="_blank">', '</a>)']); + var details = _pk_translate('General_LearnMore', [' (<a href="https://matomo.org/faq/how-to/faq_54/" rel="noreferrer noopener" target="_blank">', '</a>)']); domElem.find('tr.summaryRow').each(function () { var labelSpan = $(this).find('.label .value'); diff --git a/plugins/CoreHome/javascripts/noreferrer.js b/plugins/CoreHome/javascripts/noreferrer.js new file mode 100644 index 0000000000..cc3b0d35a8 --- /dev/null +++ b/plugins/CoreHome/javascripts/noreferrer.js @@ -0,0 +1,18 @@ +/*! + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + */ +$(function () { + if ($.browser.msie && parseInt($.browser.version) === 10) { + $(document).on('click', 'a[rel~="noreferrer"]', function (event) { + event.preventDefault(); + var a = event.currentTarget; + var w = window.open(a.href, a.target || '_self'); + if (/\bnoopener\b/.test(a.rel)) { + w.opener = null; + } + }); + } +}); diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig index 8ce96f42e4..2aeeaa26c7 100644 --- a/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig +++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportHeader.twig @@ -16,7 +16,7 @@ <table style="width:100%; background-color:#37474f; padding:10px 0; margin: 0 0 25px 0; height:64px;"> <tr> <td> - <a style="font-size:16px;padding:0 15px;color:#ffffff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer" target="_blank" href="{{ piwikUrl }}" style="lineheight:17px"> + <a style="font-size:16px;padding:0 15px;color:#ffffff;height: 22px;display: inline-block;vertical-align: inherit;" rel="noreferrer noopener" target="_blank" href="{{ piwikUrl }}" style="lineheight:17px"> {% if isCustomLogo and logoHeader %} <img src="{{ logoHeader }}" height="20px" width="auto" /> {% else %} diff --git a/plugins/CoreHome/templates/_dataTableCell.twig b/plugins/CoreHome/templates/_dataTableCell.twig index 3b771e596c..d82a7bb851 100644 --- a/plugins/CoreHome/templates/_dataTableCell.twig +++ b/plugins/CoreHome/templates/_dataTableCell.twig @@ -2,7 +2,7 @@ {% set tooltipIndex = column ~ '_tooltip' %} {% if row.getMetadata(tooltipIndex) %}<span class="cell-tooltip" data-tooltip="{{ row.getMetadata(tooltipIndex) }}">{% endif %} {% if not row.getIdSubDataTable() and column=='label' and row.getMetadata('url') %} - <a rel="noreferrer" + <a rel="noreferrer noopener" target="_blank" href='{% if row.getMetadata('url')|slice(0,4) not in ['http','ftp:'] %}http://{% endif %}{{ row.getMetadata('url')|rawSafeDecoded }}'> {% if not row.getMetadata('logo') %} diff --git a/plugins/CoreHome/templates/_donate.twig b/plugins/CoreHome/templates/_donate.twig index 93d6cfb9b8..43e99dc324 100644 --- a/plugins/CoreHome/templates/_donate.twig +++ b/plugins/CoreHome/templates/_donate.twig @@ -37,7 +37,7 @@ title="{{ 'CoreHome_SubscribeAndBecomePiwikSupporter'|translate }}"/> <a class="donate-spacer">{{ 'CoreHome_MakeOneTimeDonation'|translate }}</a> <a href="index.php?module=CoreHome&action=redirectToPaypal&idSite=1&cmd=_s-xclick&hosted_button_id=RPL23NJURMTFA&bb2_screener_=1357583494+83.233.186.82" - rel="noreferrer" target="_blank" class="donate-one-time">{{ 'CoreHome_MakeOneTimeDonation'|translate }}</a> + rel="noreferrer noopener" target="_blank" class="donate-one-time">{{ 'CoreHome_MakeOneTimeDonation'|translate }}</a> </div> <!-- to cache images --> diff --git a/plugins/CoreHome/templates/_headerMessage.twig b/plugins/CoreHome/templates/_headerMessage.twig index ba837f9f9a..10ff0f1bc5 100644 --- a/plugins/CoreHome/templates/_headerMessage.twig +++ b/plugins/CoreHome/templates/_headerMessage.twig @@ -30,14 +30,14 @@ <div class="dropdown positionInViewport"> {% if latest_version_available and isSuperUser %} {% if isMultiServerEnvironment %} - {{ 'CoreHome_OneClickUpdateNotPossibleAsMultiServerEnvironment'|translate("<a rel='noreferrer' href='https://builds.matomo.org/piwik-" ~ latest_version_available ~ ".zip'>","</a>")|raw }} + {{ 'CoreHome_OneClickUpdateNotPossibleAsMultiServerEnvironment'|translate("<a rel='noreferrer noopener' href='https://builds.matomo.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=https://matomo.org/changelog/' target='_blank'>","</a>")|raw }} + {{ 'General_PiwikXIsAvailablePleaseUpdateNow'|translate(latest_version_available,"<br /><a href='index.php?module=CoreUpdater&action=newVersionAvailable'>","</a>","<a target='_blank' rel='noreferrer noopener' href='https://matomo.org/changelog/'>","</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=https://matomo.org/' target='_blank'>Piwik</a> <a href='?module=Proxy&action=redirect&url=https://matomo.org/changelog/' target='_blank'>" ~ latest_version_available ~ "</a>", "<a href='mailto:" ~ superUserEmails ~ "?subject=" ~ updateSubject ~ "'>", "</a>")|raw }} + {{ 'General_PiwikXIsAvailablePleaseNotifyPiwikAdmin'|translate("<a target='_blank' rel='noreferrer noopener' href='https://matomo.org/'>Piwik</a> <a target='_blank' rel='noreferrer noopener' href='https://matomo.org/changelog/'>" ~ latest_version_available ~ "</a>", "<a href='mailto:" ~ superUserEmails ~ "?subject=" ~ updateSubject ~ "'>", "</a>")|raw }} <br /> {% endif %} diff --git a/plugins/CoreHome/templates/_topBar.twig b/plugins/CoreHome/templates/_topBar.twig index f722e74ffc..c53ce95577 100644 --- a/plugins/CoreHome/templates/_topBar.twig +++ b/plugins/CoreHome/templates/_topBar.twig @@ -13,12 +13,17 @@ {{ menu._html|raw }} {% else %} <a {% if menu._tooltip is defined %}title="{{ menu._tooltip }}"{% endif %} - id="topmenu-{{ menu._url.module|lower }}" target="_self" - href="index.php{{ menu._url|urlRewriteWithParameters }}" tabindex="3">{{ _self.menuItemLabel(label, icon) }}</a> + {% if menu._url.module is defined %} + id="topmenu-{{ menu._url.module|lower }}" + href="index.php{{ menu._url|urlRewriteWithParameters }}" + {% else %} + href="{{ menu._url }}" rel="noreferrer noopener" + {% endif %} + target="_self" tabindex="3">{{ _self.menuItemLabel(label, icon) }}</a> {% endif %} {% endmacro %} - {% macro isActiveItem(menu, currentModule, currentAction) %}{% if (menu and menu._url and menu._url.module == currentModule and (menu._url.action is empty or menu._url.action == currentAction)) %}active{% endif %}{% endmacro %} + {% macro isActiveItem(menu, currentModule, currentAction) %}{% if (menu and menu._url and menu._url.module is defined and menu._url.module == currentModule and (menu._url.action is empty or menu._url.action == currentAction)) %}active{% endif %}{% endmacro %} {% if topMenuModule is not defined %} {% set topMenuModule = currentModule %} diff --git a/plugins/CoreHome/templates/_warningInvalidHost.twig b/plugins/CoreHome/templates/_warningInvalidHost.twig index 86d1247967..a29ef55271 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="https://matomo.org/faq/troubleshooting/#faq_171" rel="noreferrer" target="_blank"> + <a class="btn btn-link" style="float:right;" href="https://matomo.org/faq/troubleshooting/#faq_171" rel="noreferrer noopener" 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 8da27c773a..e068bb25e1 100644 --- 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="https://matomo.org/blog/2012/12/piwik-how-to-videos/" rel="noreferrer" target="_blank"> + <a id="piwik-promo-videos-link" href="https://matomo.org/blog/2012/12/piwik-how-to-videos/" rel="noreferrer noopener" target="_blank"> {{ 'CoreHome_ViewAllPiwikVideoTutorials'|translate }} </a> @@ -16,12 +16,12 @@ <span>{{ 'CoreHome_ShareThis'|translate }}:</span> {# facebook #} - <a href="https://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 noopener" target="_blank"> <img src="plugins/Morpheus/icons/dist/socials/facebook.com.png" width="16px" height="16px" /> </a> {# twitter #} - <a href="https://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 noopener" target="_blank"> <img src="plugins/Morpheus/icons/dist/socials/twitter.com.png" width="16px" height="16px" /> </a> |