From fa33348bac1dd31346141c385519c1aa635ac8b3 Mon Sep 17 00:00:00 2001
From: Thomas Steur <tsteur@users.noreply.github.com>
Date: Mon, 11 Mar 2019 10:19:09 +1300
Subject: [PATCH 1/2] add canonical and nofollow

---
 src/helpers/Markdown.php  | 6 ++++--
 src/templates/issue.twig  | 4 ++++
 src/templates/layout.twig | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/helpers/Markdown.php b/src/helpers/Markdown.php
index 7c7cdb7..ff1d17b 100755
--- a/src/helpers/Markdown.php
+++ b/src/helpers/Markdown.php
@@ -53,12 +53,14 @@ class Markdown extends \Parsedown
 
     private function purifyHtml($html) {
         $config = \HTMLPurifier_Config::createDefault();
+
         $config->set('HTML.Doctype', 'XHTML 1.0 Transitional');
         $config->set('HTML.Allowed', 'p,strong,em,b,a[href],i,span,ul,ol,li,cite,code,pre,br,blockquote,img');
-        $config->set('HTML.AllowedAttributes', 'src, height, width, alt, href, class');
+        $config->set('HTML.AllowedAttributes', 'src, height, width, alt, href, class, rel');
         $config->set('URI.AllowedSchemes', array('http' => true, 'https' => true, 'mailto' => true, 'ftp' => true));
         $config->set('HTML.TargetBlank', true);
-
+        $config->set('HTML.Nofollow', true);
+        
         $purifier = new \HTMLPurifier($config);
 
         return $purifier->purify($html);
diff --git a/src/templates/issue.twig b/src/templates/issue.twig
index 777cb0f..5cd9ffa 100755
--- a/src/templates/issue.twig
+++ b/src/templates/issue.twig
@@ -1,6 +1,10 @@
 {% extends "layout.twig" %}
 {% import "macros.twig" as macro %}
 
+{% block head %}
+    <link rel="canonical" href="https://github.com/matomo-org/matomo/{{ pull_request ? "pulls" : "issues" }}/{{ number|e('html_attr') }}" />
+{% endblock %}
+
 {% block title %}
     <title>{{ projectName }} {{ pull_request ? "Pull Request" : "Issue" }} #{{ number }} - {{ title }}</title>
 {% endblock %}
diff --git a/src/templates/layout.twig b/src/templates/layout.twig
index 2dc8a4b..8890b02 100644
--- a/src/templates/layout.twig
+++ b/src/templates/layout.twig
@@ -7,6 +7,7 @@
     <link href="/css/style.css" rel="stylesheet">
 
     {% block head %}
+        <link rel="canonical" href="https://github.com/matomo-org/matomo/issues/" />
     {% endblock %}
 
     {% block title %}

From fb3525c88efed9d0292259cd9bf4b3de2175ea46 Mon Sep 17 00:00:00 2001
From: Thomas Steur <tsteur@users.noreply.github.com>
Date: Mon, 11 Mar 2019 10:24:52 +1300
Subject: [PATCH 2/2] add canonical for individual pages. unfortunately we
 cannot link to correct page

---
 src/helpers/Markdown.php | 2 +-
 src/templates/page.twig  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/helpers/Markdown.php b/src/helpers/Markdown.php
index ff1d17b..994cdeb 100755
--- a/src/helpers/Markdown.php
+++ b/src/helpers/Markdown.php
@@ -60,7 +60,7 @@ class Markdown extends \Parsedown
         $config->set('URI.AllowedSchemes', array('http' => true, 'https' => true, 'mailto' => true, 'ftp' => true));
         $config->set('HTML.TargetBlank', true);
         $config->set('HTML.Nofollow', true);
-        
+
         $purifier = new \HTMLPurifier($config);
 
         return $purifier->purify($html);
diff --git a/src/templates/page.twig b/src/templates/page.twig
index dd156d5..a640323 100644
--- a/src/templates/page.twig
+++ b/src/templates/page.twig
@@ -9,6 +9,8 @@
     {% if currentPage != numPages %}
         <link rel="next" href="{{ path_for('page', [], { 'page': nextPage }) }}"/>
     {% endif %}
+
+    <link rel="canonical" href="https://github.com/matomo-org/matomo/issues/" />
 {% endblock %}
 
 {% block content %}