X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FPiwikAnalytics%2FPiwikAnalyticsPlugin.php;h=adc87e66eeb62a5c6768f4b95434446c7bebcb51;hb=51ef894a472cc9cc3bef66983f100926f57f6d07;hp=b353d725526920c22df02be716a374050159e7d4;hpb=95b534c5cee56602dffcc11121908c0f518cab6d;p=quix0rs-gnu-social.git

diff --git a/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php
index b353d72552..adc87e66ee 100644
--- a/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php
+++ b/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php
@@ -33,7 +33,7 @@ if (!defined('STATUSNET')) {
 }
 
 /**
- * Plugin to use Piwik Analytics (based on the Google Analytics plugin by Evan)
+ * Plugin to use Piwik Analytics (based on the Analytics plugin by Evan)
  *
  * This plugin will spoot out the correct JavaScript spell to invoke
  * Piwik Analytics on a page.
@@ -49,7 +49,6 @@ if (!defined('STATUSNET')) {
  * analytics setup - for example '8'.
  *
  */
-
 class PiwikAnalyticsPlugin extends Plugin
 {
     /** the base of your Piwik installation */
@@ -63,7 +62,6 @@ class PiwikAnalyticsPlugin extends Plugin
      * @param string $root Piwik root URL
      * @param string $id   Piwik ID of this app
      */
-
     function __construct($root=null, $id=null)
     {
         $this->piwikroot = $root;
@@ -78,35 +76,42 @@ class PiwikAnalyticsPlugin extends Plugin
      *
      * @return boolean ignored
      */
-
     function onEndShowScripts($action)
     {
-        $piwikCode1 = <<<ENDOFPIWIK
-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"));
-ENDOFPIWIK;
-        $piwikCode2 = <<<ENDOFPIWIK
+        // Slight modification to the default code.
+        // Loading the piwik.js file from a <script> created in a document.write
+        // meant that the browser had no way to preload it, ensuring that its
+        // loading will be synchronous, blocking further page rendering.
+        //
+        // User-agents understand protocol-relative links, so instead of the
+        // URL produced in JS we can just give a universal one. Since it's
+        // sitting there in the DOM ready to go, the browser can preload the
+        // file for us and we're less likely to have to wait for it.
+        $piwikUrl = '//' . $this->piwikroot . 'piwik.js';
+        $piwikCode = <<<ENDOFPIWIK
 try {
+var pkBaseURL = (("https:" == document.location.protocol) ? "https://{$this->piwikroot}" : "http://{$this->piwikroot}");
     var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", {$this->piwikId});
     piwikTracker.trackPageView();
     piwikTracker.enableLinkTracking();
 } catch( err ) {}
 ENDOFPIWIK;
 
-        $action->inlineScript($piwikCode1);
-        $action->inlineScript($piwikCode2);
+        // Don't use $action->script() here; it'll try to preface the URL.
+        $action->element('script', array('type' => 'text/javascript', 'src' => $piwikUrl), ' ');
+        $action->inlineScript($piwikCode);
         return true;
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'PiwikAnalytics',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Tobias Diekershoff, Evan Prodromou',
-                            'homepage' => 'http://status.net/wiki/Plugin:Piwik',
+                            'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Piwik',
                             'rawdescription' =>
-                            _m('Use <a href="http://piwik.org/">Piwik</a> Open Source Web analytics software.'));
+                            // TRANS: Plugin description.
+                            _m('Use <a href="http://piwik.org/">Piwik</a> Open Source web analytics software.'));
         return true;
     }
-
 }