X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FPiwikAnalyticsPlugin.php;h=e36bd1c5c341c16fbe22bc3e91183a255d1e1617;hb=0d72456a84b8fc9a612b26ac8c26ce12c1759711;hp=d2c52354ed0c688ca001f3c64732c6d1bd9422de;hpb=58dfad57576d5529b7f6538a460fa9f4bd90b40f;p=quix0rs-gnu-social.git

diff --git a/plugins/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalyticsPlugin.php
index d2c52354ed..e36bd1c5c3 100644
--- a/plugins/PiwikAnalyticsPlugin.php
+++ b/plugins/PiwikAnalyticsPlugin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Plugin to use Piwik Analytics
  *
@@ -20,15 +20,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Plugin
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
  * @author    Tobias Diekershoff <tobias.diekershoff@gmx.net>
- * @copyright 2008 Control Yourself, Inc.
+ * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
@@ -45,13 +45,13 @@ if (!defined('LACONICA')) {
  *
  * exchange example.com/piwik/ with the url to your piwik installation and
  * make sure you don't forget the final /
- * exchange id with the ID your laconica installation has in your Piwik analytics
+ * exchange id with the ID your statusnet installation has in your Piwik analytics
  *
  * @category Plugin
- * @package  Laconica
+ * @package  StatusNet
  * @author   Tobias Diekershoff <tobias.diekershoff@gmx.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  *
  * @see      Event
  */
@@ -59,9 +59,9 @@ if (!defined('LACONICA')) {
 class PiwikAnalyticsPlugin extends Plugin
 {
     /** the base of your Piwik installation */
-    var $piwikroot = null;
-    /** the Piwik Id of your laconica installation */
-    var $piwikId   = null;
+    public $piwikroot = null;
+    /** the Piwik Id of your statusnet installation */
+    public $piwikId   = null;
 
     /**
      * constructor
@@ -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", {$this->piwikId});
+    piwikTracker.trackPageView();
+    piwikTracker.enableLinkTracking();
+} catch( err ) {}
+</script>
+<!-- End Piwik Tag -->
+
+ENDOFPIWIK;
+
+        $action->raw($piwikCode);
         return true;
     }
-}
\ No newline at end of file
+}