Changeset 3159:a7553434ee4c for plugins

Timestamp:

02/05/16 15:12:03 (10 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Use new setting type 'array' for some settings, addresses #1833

Location:

plugins

Files:

• antispam/inc/class.dc.spamfilters.php (modified) (2 diffs)
• pings/_admin.php (modified) (1 diff)
• pings/index.php (modified) (2 diffs)
• pings/lib.pings.php (modified) (2 diffs)
• simpleMenu/_install.php (modified) (1 diff)
• simpleMenu/_public.php (modified) (2 diffs)
• simpleMenu/index.php (modified) (5 diffs)

plugins/antispam/inc/class.dc.spamfilters.php

@@ -128 +128 @@
                $this->core->blog->settings->antispam->drop('antispam_filters');
           }
-          $this->core->blog->settings->antispam->put('antispam_filters',serialize($opts),'string','Antispam Filters',true,$global);
+          $this->core->blog->settings->antispam->put('antispam_filters',$opts,'array','Antispam Filters',true,$global);
      }
 
@@ -134 +134 @@
      {
           if ($this->core->blog->settings->antispam->antispam_filters !== null) {
-               $this->filters_opt = @unserialize($this->core->blog->settings->antispam->antispam_filters);
+               $this->filters_opt = $this->core->blog->settings->antispam->antispam_filters;
           }
 

plugins/pings/_admin.php

@@ -31 +31 @@
      $core->blog->settings->addNamespace('pings');
      $core->blog->settings->pings->put('pings_active',1,'boolean','Activate pings plugin',true,true);
-     $core->blog->settings->pings->put('pings_uris',serialize($default_pings_uris),'string','Pings services URIs',true,true);
+     $core->blog->settings->pings->put('pings_uris',$default_pings_uris,'array','Pings services URIs',true,true);
 }
 

plugins/pings/index.php

@@ -16 +16 @@
 try
 {
-     $pings_uris = @unserialize($core->blog->settings->pings->pings_uris);
+     $pings_uris = $core->blog->settings->pings->pings_uris;
      if (!$pings_uris) {
           $pings_uris = array();
@@ -35 +35 @@
           $core->blog->settings->addNamespace('pings');
           $core->blog->settings->pings->put('pings_active',!empty($_POST['pings_active']),null,null,true,true);
-          $core->blog->settings->pings->put('pings_uris',serialize($pings_uris),null,null,true,true);
+          $core->blog->settings->pings->put('pings_uris',$pings_uris,null,null,true,true);
           dcPage::addSuccessNotice(__('Settings have been successfully updated.'));
           http::redirect($p_url);

plugins/pings/lib.pings.php

@@ -50 +50 @@
           }
 
-          $pings_uris = @unserialize($core->blog->settings->pings->pings_uris);
+          $pings_uris = $core->blog->settings->pings->pings_uris;
           if (empty($pings_uris) || !is_array($pings_uris)) {
                return;
@@ -86 +86 @@
           }
 
-          $pings_uris = @unserialize($core->blog->settings->pings->pings_uris);
+          $pings_uris = $core->blog->settings->pings->pings_uris;
           if (empty($pings_uris) || !is_array($pings_uris)) {
                return;

plugins/simpleMenu/_install.php

@@ -23 +23 @@
      array('label' => 'Archives', 'descr' => '', 'url' => $blog_url.$core->url->getURLFor('archive'))
 );
-$core->blog->settings->system->put('simpleMenu',serialize($menu_default),'string','simpleMenu default menu',false,true);
+$core->blog->settings->system->put('simpleMenu',$menu_default,'array','simpleMenu default menu',false,true);
 $core->blog->settings->system->put('simpleMenu_active',true,'boolean','Active',false,true);
 

plugins/simpleMenu/_public.php

@@ -82 +82 @@
                return $ret;
 
-          $menu = $GLOBALS['core']->blog->settings->system->get('simpleMenu');
-          $menu = @unserialize($menu);
-
+          $menu = $core->blog->settings->system->simpleMenu;
           if (is_array($menu))
           {
@@ -92 +90 @@
 
                // Home recognition var
-               $home_url = html::stripHostURL($GLOBALS['core']->blog->url);
+               $home_url = html::stripHostURL($core->blog->url);
                $home_directory = dirname($home_url);
                if ($home_directory != '/')

plugins/simpleMenu/index.php

@@ -106 +106 @@
 # Lecture menu existant
 $menu = $core->blog->settings->system->get('simpleMenu');
-$menu = @unserialize($menu);
 if (!is_array($menu)) {
      $menu = array();
@@ -233 +232 @@
                               );
                               // Save menu in blog settings
-                              $core->blog->settings->system->put('simpleMenu',serialize($menu));
+                              $core->blog->settings->system->put('simpleMenu',$menu);
                               $core->blog->triggerBlog();
 
@@ -271 +270 @@
                          $menu = $newmenu;
                          // Save menu in blog settings
-                         $core->blog->settings->system->put('simpleMenu',serialize($menu));
+                         $core->blog->settings->system->put('simpleMenu',$menu);
                          $core->blog->triggerBlog();
 
@@ -306 +305 @@
                     $menu = $newmenu;
                     // Save menu in blog settings
-                    $core->blog->settings->system->put('simpleMenu',serialize($menu));
+                    $core->blog->settings->system->put('simpleMenu',$menu);
                     $core->blog->triggerBlog();
 
@@ -344 +343 @@
                     $menu = $newmenu;
                     // Save menu in blog settings
-                    $core->blog->settings->system->put('simpleMenu',serialize($menu));
+                    $core->blog->settings->system->put('simpleMenu',$menu);
                     $core->blog->triggerBlog();