From 56ff30467206fc5d5fcdd2f032e9d8da852700e2 Mon Sep 17 00:00:00 2001
From: Nicolas Le Gall <Darkitty@users.noreply.github.com>
Date: Mon, 24 Jun 2019 21:51:12 +0200
Subject: [PATCH] Replace Piwik code with Matomo (#183)

Piwik was renamed to Matomo
---
 README.md                     |  2 +-
 templates/base.html           |  4 ++--
 templates/partial/matomo.html | 15 +++++++++++++++
 templates/partial/piwik.html  | 15 ---------------
 4 files changed, 18 insertions(+), 18 deletions(-)
 create mode 100644 templates/partial/matomo.html
 delete mode 100644 templates/partial/piwik.html

diff --git a/README.md b/README.md
index 3397b7e..b5e5b5f 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ The minimalist [Pelican](http://blog.getpelican.com/) theme.
 - [Google AdSense](https://www.google.com.br/adsense/start/) (new in 2.1.0)
 - [Google Analytics](https://www.google.com/analytics/web/)
 - [Google Tag Manager](https://www.google.com/tagmanager/)
-- [Piwik Analytics](http://piwik.org/)
+- [Matomo Analytics (formerly Piwik)](https://matomo.org/)
 - [StatusCake](https://www.statuscake.com/)
 
 ## Plugins Support
diff --git a/templates/base.html b/templates/base.html
index 38a0dc5..2425148 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -194,8 +194,8 @@
     <script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid={{ ADD_THIS_ID }}" async="async"></script>
   {% endif %}
 
-  {% if PIWIK_URL and PIWIK_SITE_ID %}
-    {% include "partial/piwik.html" %}
+  {% if (PIWIK_URL and PIWIK_SITE_ID) or (MATOMO_URL and MATOMO_SITE_ID) %}
+    {% include "partial/matomo.html" %}
   {% endif %}
 
   {% include "partial/jsonld.html" %}
diff --git a/templates/partial/matomo.html b/templates/partial/matomo.html
new file mode 100644
index 0000000..7fe966b
--- /dev/null
+++ b/templates/partial/matomo.html
@@ -0,0 +1,15 @@
+<!-- Matomo -->
+<script type="text/javascript">
+  var _paq = window._paq || [];
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://{{ MATOMO_URL or  PIWIK_URL }}/";
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', {{ MATOMO_SITE_ID or PIWIK_SITE_ID }}]);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+  })();
+</script>
+<noscript><p><img src="https://{{ MATOMO_URL or PIWIK_URL }}/matomo.php?idsite={{ MATOMO_SITE_ID or PIWIK_SITE_ID }}&rec=1" style="border:0" alt="" /></p></noscript>
+<!-- End Matomo Code -->
diff --git a/templates/partial/piwik.html b/templates/partial/piwik.html
deleted file mode 100644
index ca4740f..0000000
--- a/templates/partial/piwik.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="//{{ PIWIK_URL }}/";
-    _paq.push(['setTrackerUrl', u+'piwik.php']);
-    _paq.push(['setSiteId', {{ PIWIK_SITE_ID }}]);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<noscript><p><img src="//{{ PIWIK_URL }}/piwik.php?idsite={{ PIWIK_SITE_ID }}" style="border:0" alt="" /></p></noscript>
-<!-- End Piwik Code -->