Merge branch 'master' of https://git.gnu.io/gnu/gnu-social into social-master

[quix0rs-gnu-social.git] / plugins / GoogleAnalytics / GoogleAnalyticsPlugin.php

diff --git a/plugins/GoogleAnalytics/GoogleAnalyticsPlugin.php b/plugins/GoogleAnalytics/GoogleAnalyticsPlugin.php
index dff43eff95ccf6b550bbf3579b04b0f8cb099e46..2f07747a4d9d065369705e0c59919306bad259e4 100644 (file)
--- a/plugins/GoogleAnalytics/GoogleAnalyticsPlugin.php
+++ b/plugins/GoogleAnalytics/GoogleAnalyticsPlugin.php
@@ -49,6 +49,9 @@ if (!defined('STATUSNET')) {
  */
 class GoogleAnalyticsPlugin extends Plugin
 {
+    var $code;
+    var $domain;
+
     const VERSION = '0.2';
 
     function __construct($code=null)
@@ -61,10 +64,16 @@ class GoogleAnalyticsPlugin extends Plugin
         parent::__construct();
     }
 
-    function onEndShowScripts($action)
+    function onEndShowScripts(Action $action)
     {
         $code = common_config('googleanalytics', 'code');
+        if (empty($code)) {
+            $code = $this->code;
+        }
         $domain = common_config('googleanalytics', 'domain');
+        if (empty($domain)) {
+            $domain = $this->domain;
+        }
 
         $js = <<<ENDOFSCRIPT0
 
@@ -96,13 +105,14 @@ ENDOFSCRIPT2;
        $action->inlineScript($js);
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'GoogleAnalytics',
                             'version' => self::VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'http://status.net/wiki/Plugin:GoogleAnalytics',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('Use <a href="http://www.google.com/analytics/">Google Analytics</a>'.
                                ' to track web access.'));
         return true;