Merge branch 'lugmap.linux.it' of github.com:Gelma/LugMap into lugmap…

….linux.it
Gelma · Jun 5, 2023 · 55f418f · 55f418f
2 parents 87dacdf + 6750cfe
commit 55f418f
Show file tree

Hide file tree

Showing 3 changed files with 116 additions and 110 deletions.
diff --git a/db/toscana.txt b/db/toscana.txt
@@ -1,4 +1,3 @@
-Firenze|ILS Firenze|Firenze|https://firenze.ils.org/|
 Firenze|GOLEM|Empoli|http://golem.linux.it/|vasb@tbyrz.yvahk.vg
 Grosseto|Working Class Hero|Grosseto|https://www.facebook.com/workingclasshero.it|cerfvqragr@jbexvatpynffureb.vg
 Livorno|Gulli|Livorno e provincia|http://linux.livorno.it/|cerfvqragr@yvahk.yvibeab.vg|2098656759

diff --git a/funzioni.php b/funzioni.php
@@ -59,6 +59,11 @@ function lugheader ($title, $extracss = null, $extrajs = null) {
   <meta name="viewport" content="width=device-width, initial-scale=1">
 
   <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans|Nobile|Nobile:b" />
+
+
+  <script type="text/javascript" src="https://www.linux.it/shared/index.php?f=jquery.js"></script>
+  <!-- <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.3/jquery.min.js"></script> -->
+  <script type="text/javascript" src="https://www.linux.it/shared/index.php?f=bootstrap.js"></script>
   <link href="https://www.linux.it/shared/?f=bootstrap.css" rel="stylesheet" type="text/css" />
   <link href="https://www.linux.it/shared/?f=main.css" rel="stylesheet" type="text/css" />
 
@@ -82,8 +87,8 @@ function lugheader ($title, $extracss = null, $extrajs = null) {
   <meta property="og:locale" content="it_IT" />
   <meta property="og:description" content="La mappa dei Linux Users Groups italiani" />
 
-  <script type="text/javascript" src="https://www.linux.it/shared/index.php?f=jquery.js"></script>
-  <!-- <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.3/jquery.min.js"></script> -->
+
+
 
   <?php
     if ($extracss != null)
@@ -196,22 +201,23 @@ function lugfooter () {
 	<div style="clear: both"></div>
 </div>
 
-<!-- Piwik -->
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(['disableCookies']);
+<!-- Matomo -->
+<script>
+  var _paq = window._paq = window._paq || [];
+  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+  _paq.push(["setDoNotTrack", true]);
+  _paq.push(["disableCookies"]);
   _paq.push(['trackPageView']);
   _paq.push(['enableLinkTracking']);
   (function() {
-    var u="//pergamena.lugbs.linux.it/";
-    _paq.push(['setTrackerUrl', u+'piwik.php']);
-    _paq.push(['setSiteId', 1]);
+    var u="//stats.linux.it/";
+    _paq.push(['setTrackerUrl', u+'matomo.php']);
+    _paq.push(['setSiteId', '6']);
     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);
+    g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
   })();
 </script>
-<noscript><p><img src="//pergamena.lugbs.linux.it/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
-<!-- End Piwik Code -->
+<!-- End Matomo Code -->
 
 </body>
 </html>