From c055449ee086b617891f6efa31cfab487336ec44 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 16 Jul 2009 10:56:46 -0400
Subject: [PATCH] update Piwik analytics code

---
 plugins/PiwikAnalyticsPlugin.php | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/plugins/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalyticsPlugin.php
index d2c52354ed..dc3c7c37fe 100644
--- a/plugins/PiwikAnalyticsPlugin.php
+++ b/plugins/PiwikAnalyticsPlugin.php
@@ -87,18 +87,25 @@ class PiwikAnalyticsPlugin extends Plugin
 
     function onEndShowScripts($action)
     {
-        $js1 = 'var pkBaseURL = (("https:" == document.location.protocol) ? "https://'.
-                $this->piwikroot.'" : "http://'.$this->piwikroot.
-                '"); document.write(unescape("%3Cscript src=\'" + pkBaseURL + "piwik.js\''.
-                ' type=\'text/javascript\'%3E%3C/script%3E"));';
-        $js2 = 'piwik_action_name = ""; piwik_idsite = '.$this->piwikid.
-               '; piwik_url = pkBaseURL + "piwik.php"; piwik_log(piwik_action_name, piwik_idsite, piwik_url);';
-        $action->elementStart('script', array('type' => 'text/javascript'));
-        $action->raw($js1);
-        $action->elementEnd('script');
-        $action->elementStart('script', array('type' => 'text/javascript'));
-        $action->raw($js2);
-        $action->elementEnd('script');
+        $piwikCode = <<<ENDOFPIWIK
+
+<!-- Piwik -->
+<script type="text/javascript">
+var pkBaseURL = (("https:" == document.location.protocol) ? "https://{$this->piwikroot}" : "http://{$this->piwikroot}");
+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", 4);
+    piwikTracker.trackPageView();
+    piwikTracker.enableLinkTracking();
+} catch( err ) {}
+</script>
+<!-- End Piwik Tag -->
+
+ENDOFPIWIK;
+
+        $action->raw($piwikCode);
         return true;
     }
 }
\ No newline at end of file