From 8fc80c3d39624efb136f9a904ea4434d24c88db2 Mon Sep 17 00:00:00 2001
From: rehrar <rehrar@tuta.io>
Date: Wed, 11 Apr 2018 16:29:00 -0600
Subject: [PATCH] Updated as per request - Reverted changed lines in footer -
 Removed GA script in langauge.php - Replaced mentions of GA with Matomo in
 Legal page

---
 _includes/footer.html | 40 ++++++++++++++++++++++------------------
 language.php          | 10 ----------
 legal/index.md        |  4 ++--
 3 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/_includes/footer.html b/_includes/footer.html
index 48099ee4..d99774c7 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -35,21 +35,25 @@
                 </div>
             </div>
 </footer>
-
-
-    <!-- JS -->
-    <script src="//static.getmonero.org/scripts.js"></script>
-    <script type="text/javascript">
-        $(document).ready(function(){
-            $('[data-toggle="tooltip"]').tooltip();
-        });
-		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-		})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-		ga('create', 'UA-53312765-1', 'auto');
-		ga('require', 'linkid', 'linkid.js');
-		ga('send', 'pageview');
-	</script>
-    
-    {% include hostflag.html %}
+<!-- Matomo -->
+<script type="text/javascript">
+    var _paq = _paq || [];
+    /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+    _paq.push(['trackPageView']);
+    _paq.push(['enableLinkTracking']);
+    (function() {
+        var u = "//analytics.getmonero.org/";
+        _paq.push(['setTrackerUrl', u + 'piwik.php']);
+        _paq.push(['setSiteId', '1']);
+        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>
+<!-- End Matomo Code -->
+{% include hostflag.html %}
\ No newline at end of file
diff --git a/language.php b/language.php
index d564327b..11986900 100644
--- a/language.php
+++ b/language.php
@@ -71,15 +71,5 @@ if (isset($_COOKIE["MONERO_LANG"]))
 
     <!-- JS -->
     <script src="//static.getmonero.org/scripts.js"></script>
-	<script>
-		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-		})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-		ga('create', 'UA-53312765-1', 'auto');
-		ga('require', 'linkid', 'linkid.js');
-		ga('send', 'pageview');
-	</script>
   </body>
 </html>
diff --git a/legal/index.md b/legal/index.md
index 84c16467..7bdc5d49 100644
--- a/legal/index.md
+++ b/legal/index.md
@@ -158,11 +158,11 @@ Certain logos, such as those for the operating systems and platforms we support
 <div class="col" markdown="1">
 ### What We Collect
 
-The Monero Project uses Google Analytics to collect usage and visitor data for this website. This is enabled via a small piece of JavaScript code, and will not run if you have JavaScript disabled. We also collect standard server logs from our webserver.
+The Monero Project uses [Matomo](https://matomo.org/) to collect usage and visitor data for this website. This is enabled via a small piece of JavaScript code, and will not run if you have JavaScript disabled. We also collect standard server logs from our webserver.
 
 ### What We Use the Data For
 
-The Google Analytics data is used to provide statistics on the website and help us to improve the content and the information flow.
+The Matomo data is used to provide statistics on the website and help us to improve the content and the information flow.
 
 Server logs are used to analyze errors and diagnose requests to dead links. A portion of the server logs are used to gather statistics on Monero downloads in order to help us better understand our user's needs.
 </div>