Changeset 2484

Timestamp:

07/19/10 21:52:02 (13 years ago)

Author:

franck

Message:

PHP 5.3 and new settings system compliance

Location:

plugins/piwik

Files:

• _define.php (modified) (1 diff)
• _public.php (modified) (2 diffs)
• index.php (modified) (3 diffs)

plugins/piwik/_define.php

@@ -16 +16 @@
      /* Description*/         "Piwik statistics integration",
      /* Author */             "Olivier Meunier",
-     /* Version */            '0.8',
+     /* Version */            '0.8.1',
      /* Permissions */        'admin'
 );

plugins/piwik/_public.php

@@ -16 +16 @@
 class piwikPublic
 {
-     public static function publicFooterContent(&$core,&$_ctx)
+     public static function publicFooterContent($core,$_ctx)
      {
-          $piwik_service_uri = $core->blog->settings->piwik_service_uri;
-          $piwik_site = $core->blog->settings->piwik_site;
-          $piwik_ips = $core->blog->settings->piwik_ips;
+          $piwik_service_uri = $core->blog->settings->piwik->piwik_service_uri;
+          $piwik_site = $core->blog->settings->piwik->piwik_site;
+          $piwik_ips = $core->blog->settings->piwik->piwik_ips;
           
           if (!$piwik_service_uri || !$piwik_site) {
@@ -33 +33 @@
           
           $action = $_SERVER['URL_REQUEST_PART'];
-          if ($core->blog->settings->piwik_fancy) {
+          if ($core->blog->settings->piwik->piwik_fancy) {
                $action = $action == '' ? 'home' : str_replace('/',' : ',$action);
           }

plugins/piwik/index.php

@@ -12 +12 @@
 if (!defined('DC_CONTEXT_ADMIN')) { return; }
 
-$piwik_service_uri = $core->blog->settings->piwik_service_uri;
-$piwik_site = $core->blog->settings->piwik_site;
-$piwik_ips = $core->blog->settings->piwik_ips;
-$piwik_fancy = $core->blog->settings->piwik_fancy;
+$core->blog->settings->addNameSpace('piwik');
+$piwik_service_uri = $core->blog->settings->piwik->piwik_service_uri;
+$piwik_site = $core->blog->settings->piwik->piwik_site;
+$piwik_ips = $core->blog->settings->piwik->piwik_ips;
+$piwik_fancy = $core->blog->settings->piwik->piwik_fancy;
 
 $site_url = preg_replace('/\?$/','',$core->blog->url);
@@ -39 +40 @@
           
           # Dotclear piwik setting
-          $core->blog->settings->setNameSpace('piwik');
-          $core->blog->settings->put('piwik_service_uri',$piwik_service_uri);
+          $core->blog->settings->addNameSpace('piwik');
+          $core->blog->settings->piwik->put('piwik_service_uri',$piwik_service_uri);
           
           # More stuff to set
@@ -55 +56 @@
                     }
                }
-               $core->blog->settings->put('piwik_site',$piwik_site);
-               $core->blog->settings->put('piwik_ips',$piwik_ips);
-               $core->blog->settings->put('piwik_fancy',$piwik_fancy,'boolean');
+               $core->blog->settings->piwik->put('piwik_site',$piwik_site);
+               $core->blog->settings->piwik->put('piwik_ips',$piwik_ips);
+               $core->blog->settings->piwik->put('piwik_fancy',$piwik_fancy,'boolean');
                $core->blog->triggerBlog();
           }