From 82d5795afb30d67630c10a0a67624f3d201641ef Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Mon, 17 Mar 2014 16:43:05 +0000
Subject: [PATCH] Java-Script code for Piwik-Tracking updated for Piwik 2.1

git-svn-id: https://svn.libreccm.org/ccm/trunk@2566 8810af33-2d31-482b-a856-94f89814c4df
---
 .../mandalay/user/includes/piwik/piwik.xsl    | 64 ++++++++++---------
 1 file changed, 33 insertions(+), 31 deletions(-)

diff --git a/ccm-sci-bundle/web/themes/mandalay/user/includes/piwik/piwik.xsl b/ccm-sci-bundle/web/themes/mandalay/user/includes/piwik/piwik.xsl
index 62b39a292..210315171 100644
--- a/ccm-sci-bundle/web/themes/mandalay/user/includes/piwik/piwik.xsl
+++ b/ccm-sci-bundle/web/themes/mandalay/user/includes/piwik/piwik.xsl
@@ -77,38 +77,40 @@ To use the templates definied here follow these steps:
                 exclude-result-prefixes="xsl bebop cms"
                 version="1.0">
 
-  <xsl:template name="piwikJsTracker">
-    <xsl:param name="piwikUrl"/>
-    <xsl:param name="idSite"/>
-    <script type="text/javascript">
-      var pkBaseURL = (("https:" == document.location.protocol) ? "https://<xsl:value-of select="$piwikUrl"/>/" : "http://<xsl:value-of select="$piwikUrl"/>/");
-      document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-    </script>
-    <script type="text/javascript">
-      try {
-      var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", <xsl:value-of select="$idSite"/>);
-      if (!window.location.pathname.match("/^/(preview)//")) {
-        piwikTracker.trackPageView();
-      }
-      piwikTracker.enableLinkTracking();
-      } catch( err ) {}
-    </script>
-  </xsl:template>
+    <xsl:template name="piwikJsTracker">
+        <xsl:param name="piwikUrl"/>
+        <xsl:param name="idSite"/>
+        <script type="text/javascript">
+            <xsl:value-of select="concat('var piwikUrl = &quot;', $piwikUrl, '&quot;')" />
+            <xsl:value-of select="concat('var idSite = ', $idSite)" />
+            var _paq = _paq || [];
+            _paq.push(["trackPageView"]);
+            _paq.push(["enableLinkTracking"]);
 
-  <xsl:template name="piwikImageTracker">
-    <xsl:param name="piwikUrl"/>
-    <xsl:param name="idSite"/>
-    <noscript>
-      <img>
-	<xsl:attribute name="href">
-	  <xsl:value-of disable-output-escaping="no" 
-			select="concat('http://', $piwikUrl, '?idsite=', $idSite, '&amp;rec=1')"/>
-	</xsl:attribute>
-	<xsl:attribute name="style">border:0</xsl:attribute>
-	<xsl:attribute name="alt"></xsl:attribute>
-      </img>
-    </noscript>
+            (function() {
+            var u=(("https:" == document.location.protocol) ? "https" : "http") + piwikUrl;
+            _paq.push(["setTrackerUrl", u+"piwik.php"]);
+            _paq.push(["setSiteId", idSite]);
+            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);
+            })();
+        </script>
+    </xsl:template>
 
-  </xsl:template>
+    <xsl:template name="piwikImageTracker">
+        <xsl:param name="piwikUrl"/>
+        <xsl:param name="idSite"/>
+        <noscript>
+            <img>
+                <xsl:attribute name="href">
+                    <xsl:value-of disable-output-escaping="no" 
+                                  select="concat('http://', $piwikUrl, '?idsite=', $idSite, '&amp;rec=1')"/>
+                </xsl:attribute>
+                <xsl:attribute name="style">border:0</xsl:attribute>
+                <xsl:attribute name="alt"></xsl:attribute>
+            </img>
+        </noscript>
+
+    </xsl:template>
 
 </xsl:stylesheet>
\ No newline at end of file