From fe8b41c06f45f115639ff842682c1493d8fd1529 Mon Sep 17 00:00:00 2001
From: Andrew Engelbrecht <andrew@fsf.org>
Date: Fri, 31 Jul 2020 14:07:36 -0400
Subject: [PATCH] updated piwik tracking code

it wasn't working before. this should help make it work now.
---
 v10/givingguide.html | 33 ++++++++++++++++++++-------------
 v6/givingguide.html  | 33 ++++++++++++++++++++-------------
 v7/givingguide.html  | 33 ++++++++++++++++++++-------------
 v7beta/template.html | 33 ++++++++++++++++++++-------------
 v8/givingguide.html  | 33 ++++++++++++++++++++-------------
 v9/givingguide.html  | 33 ++++++++++++++++++++-------------
 6 files changed, 120 insertions(+), 78 deletions(-)

diff --git a/v10/givingguide.html b/v10/givingguide.html
index 65db3f0..57b6357 100644
--- a/v10/givingguide.html
+++ b/v10/givingguide.html
@@ -1390,19 +1390,26 @@ numbers, which aids in password generation and encryption.</p>
         <!-- Our JS -->
         <script src="js/magic.js" charset="utf-8"></script>
 
-        <!-- Piwik -->
-        <script type="text/javascript">
-        // @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt
-        var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
-        document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-        try {
-          var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 14);
-          piwikTracker.trackPageView();
-          piwikTracker.enableLinkTracking();
-        } catch (err) {}
-        // @license-end
-        </script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=14" style="border:0" alt="" /></p></noscript>
-        <!-- End Piwik Tracking Code -->
+<!-- Piwik -->
+<script type="text/javascript">
+  // @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-2.0-or-later
+  var _paq = _paq || [];
+  _paq.push(["trackPageView"]);
+  _paq.push(["enableLinkTracking"]);
+
+  (function() {
+    var u = (("https:" == document.location.protocol) ? "https" : "http") + "://"+"piwik.fsf.org//";
+    _paq.push(["setTrackerUrl", u+"piwik.php"]);
+    _paq.push(["setSiteId", "14"]);
+    var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+    g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+  })();
+  // @license-end
+</script>
+<!-- End Piwik Code -->
+<!-- Piwik Image Tracker -->
+<noscript><img src="https://piwik.fsf.org//piwik.php?idsite=14&rec=1" style="border:0" alt="" /></noscript>
+<!-- End Piwik -->
       </body>
 
       </html>
diff --git a/v6/givingguide.html b/v6/givingguide.html
index d0e09ce..d966edb 100755
--- a/v6/givingguide.html
+++ b/v6/givingguide.html
@@ -637,19 +637,26 @@ Software Foundation at <a href="https://smile.amazon.com">smile.amazon.com</a> t
 
 
 
-			<!-- Piwik -->
-			<script type="text/javascript" >
-			  // @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt
-			  var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
-			  document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-			  try {
-			  var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 14);
-			  piwikTracker.trackPageView();
-			  piwikTracker.enableLinkTracking();
-			  } catch( err ) {}
-			  // @license-end
-			</script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=14" style="border:0" alt="" /></p></noscript>
-			<!-- End Piwik Tracking Code -->
+<!-- Piwik -->
+<script type="text/javascript">
+  // @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-2.0-or-later
+  var _paq = _paq || [];
+  _paq.push(["trackPageView"]);
+  _paq.push(["enableLinkTracking"]);
+
+  (function() {
+    var u = (("https:" == document.location.protocol) ? "https" : "http") + "://"+"piwik.fsf.org//";
+    _paq.push(["setTrackerUrl", u+"piwik.php"]);
+    _paq.push(["setSiteId", "14"]);
+    var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+    g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+  })();
+  // @license-end
+</script>
+<!-- End Piwik Code -->
+<!-- Piwik Image Tracker -->
+<noscript><img src="https://piwik.fsf.org//piwik.php?idsite=14&rec=1" style="border:0" alt="" /></noscript>
+<!-- End Piwik -->
 
 
 	                    </body>
diff --git a/v7/givingguide.html b/v7/givingguide.html
index 8c86010..4fb784e 100644
--- a/v7/givingguide.html
+++ b/v7/givingguide.html
@@ -1022,19 +1022,26 @@ Many of these items are <a href="https://www.fsf.org/resources/hw/endorsement/re
         <!-- Our JS -->
         <script src="js/magic.js" charset="utf-8"></script>
 
-        <!-- Piwik -->
-        <script type="text/javascript">
-        // @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt
-        var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
-        document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-        try {
-          var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 14);
-          piwikTracker.trackPageView();
-          piwikTracker.enableLinkTracking();
-        } catch (err) {}
-        // @license-end
-        </script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=14" style="border:0" alt="" /></p></noscript>
-        <!-- End Piwik Tracking Code -->
+<!-- Piwik -->
+<script type="text/javascript">
+  // @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-2.0-or-later
+  var _paq = _paq || [];
+  _paq.push(["trackPageView"]);
+  _paq.push(["enableLinkTracking"]);
+
+  (function() {
+    var u = (("https:" == document.location.protocol) ? "https" : "http") + "://"+"piwik.fsf.org//";
+    _paq.push(["setTrackerUrl", u+"piwik.php"]);
+    _paq.push(["setSiteId", "14"]);
+    var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+    g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+  })();
+  // @license-end
+</script>
+<!-- End Piwik Code -->
+<!-- Piwik Image Tracker -->
+<noscript><img src="https://piwik.fsf.org//piwik.php?idsite=14&rec=1" style="border:0" alt="" /></noscript>
+<!-- End Piwik -->
         <a href="js/weblabels.html" rel="jslicense"></a>
       </body>
 
diff --git a/v7beta/template.html b/v7beta/template.html
index 91d084d..a9b5f04 100644
--- a/v7beta/template.html
+++ b/v7beta/template.html
@@ -956,19 +956,26 @@
   <!-- Our JS -->
   <script src="js/magic.js" charset="utf-8"></script>
 
-  <!-- Piwik -->
-  <script type="text/javascript">
-    // @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt
-    var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
-    document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-    try {
-      var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 14);
-      piwikTracker.trackPageView();
-      piwikTracker.enableLinkTracking();
-    } catch (err) {}
-    // @license-end
-  </script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=14" style="border:0" alt="" /></p></noscript>
-  <!-- End Piwik Tracking Code -->
+<!-- Piwik -->
+<script type="text/javascript">
+  // @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-2.0-or-later
+  var _paq = _paq || [];
+  _paq.push(["trackPageView"]);
+  _paq.push(["enableLinkTracking"]);
+
+  (function() {
+    var u = (("https:" == document.location.protocol) ? "https" : "http") + "://"+"piwik.fsf.org//";
+    _paq.push(["setTrackerUrl", u+"piwik.php"]);
+    _paq.push(["setSiteId", "14"]);
+    var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+    g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+  })();
+  // @license-end
+</script>
+<!-- End Piwik Code -->
+<!-- Piwik Image Tracker -->
+<noscript><img src="https://piwik.fsf.org//piwik.php?idsite=14&rec=1" style="border:0" alt="" /></noscript>
+<!-- End Piwik -->
 </body>
 
 </html>
diff --git a/v8/givingguide.html b/v8/givingguide.html
index 0b03baa..44e531f 100644
--- a/v8/givingguide.html
+++ b/v8/givingguide.html
@@ -1113,19 +1113,26 @@
         <!-- Our JS -->
         <script src="js/magic.js" charset="utf-8"></script>
 
-        <!-- Piwik -->
-        <script type="text/javascript">
-        // @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt
-        var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
-        document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-        try {
-          var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 14);
-          piwikTracker.trackPageView();
-          piwikTracker.enableLinkTracking();
-        } catch (err) {}
-        // @license-end
-        </script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=14" style="border:0" alt="" /></p></noscript>
-        <!-- End Piwik Tracking Code -->
+<!-- Piwik -->
+<script type="text/javascript">
+  // @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-2.0-or-later
+  var _paq = _paq || [];
+  _paq.push(["trackPageView"]);
+  _paq.push(["enableLinkTracking"]);
+
+  (function() {
+    var u = (("https:" == document.location.protocol) ? "https" : "http") + "://"+"piwik.fsf.org//";
+    _paq.push(["setTrackerUrl", u+"piwik.php"]);
+    _paq.push(["setSiteId", "14"]);
+    var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+    g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+  })();
+  // @license-end
+</script>
+<!-- End Piwik Code -->
+<!-- Piwik Image Tracker -->
+<noscript><img src="https://piwik.fsf.org//piwik.php?idsite=14&rec=1" style="border:0" alt="" /></noscript>
+<!-- End Piwik -->
         <a href="js/weblabels.html" rel="jslicense"></a>
       </body>
 
diff --git a/v9/givingguide.html b/v9/givingguide.html
index effd782..c07dad8 100644
--- a/v9/givingguide.html
+++ b/v9/givingguide.html
@@ -1628,19 +1628,26 @@ MakerBot was founded with a more freedom-respecting philosophy, but <a href="htt
         <!-- Our JS -->
         <script src="js/magic.js" charset="utf-8"></script>
 
-        <!-- Piwik -->
-        <script type="text/javascript">
-        // @license magnet:?xt=urn:btih:c80d50af7d3db9be66a4d0a86db0286e4fd33292&dn=bsd-3-clause.txt
-        var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.fsf.org/" : "http://piwik.fsf.org/");
-        document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-        try {
-          var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 14);
-          piwikTracker.trackPageView();
-          piwikTracker.enableLinkTracking();
-        } catch (err) {}
-        // @license-end
-        </script><noscript><p><img src="//piwik.fsf.org/piwik.php?idsite=14" style="border:0" alt="" /></p></noscript>
-        <!-- End Piwik Tracking Code -->
+<!-- Piwik -->
+<script type="text/javascript">
+  // @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-2.0-or-later
+  var _paq = _paq || [];
+  _paq.push(["trackPageView"]);
+  _paq.push(["enableLinkTracking"]);
+
+  (function() {
+    var u = (("https:" == document.location.protocol) ? "https" : "http") + "://"+"piwik.fsf.org//";
+    _paq.push(["setTrackerUrl", u+"piwik.php"]);
+    _paq.push(["setSiteId", "14"]);
+    var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+    g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+  })();
+  // @license-end
+</script>
+<!-- End Piwik Code -->
+<!-- Piwik Image Tracker -->
+<noscript><img src="https://piwik.fsf.org//piwik.php?idsite=14&rec=1" style="border:0" alt="" /></noscript>
+<!-- End Piwik -->
       </body>
 
       </html>
-- 
2.25.1