Changeset 3161:468195e4ad8b for inc/admin

Timestamp:

02/05/16 17:05:45 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Use new pref type 'array' for some prefs, addresses #1833

File:

• inc/admin/class.dc.favorites.php (modified) (9 diffs)

inc/admin/class.dc.favorites.php

@@ -52 +52 @@
 
           if ($this->ws->prefExists('favorites')) {
-               $this->local_prefs = @unserialize($this->ws->getLocal('favorites'));
-               $this->global_prefs = @unserialize($this->ws->getGlobal('favorites'));
+               $this->local_prefs = $this->ws->getLocal('favorites');
+               $this->global_prefs = $this->ws->getGlobal('favorites');
                // Since we never know what user puts through user:preferences ...
                if (!is_array($this->local_prefs)) {
@@ -106 +106 @@
                $fattr = $this->fav_defs[$p];
           }
-          $fattr = array_merge (array('id' => null,'class'=>null),$fattr);
+          $fattr = array_merge(array('id' => null,'class' => null),$fattr);
           if (isset($fattr['permissions'])) {
                if (is_bool($fattr['permissions']) && !$fattr['permissions'] ) {
@@ -158 +158 @@
           $u = explode('?',$_SERVER['REQUEST_URI']);
           // Loop over prefs to enable active favorites
-          foreach ($this->user_prefs as $k=>&$v) {
+          foreach ($this->user_prefs as $k => &$v) {
                if (isset($v['active_cb']) && is_callable($v['active_cb'])) {
                     // Use callback if defined to match whether favorite is active or not
@@ -164 +164 @@
                } else {
                     // Failback active detection. We test against URI name & parameters
-                    $v['active']=true; // true until something proves it is false
+                    $v['active'] = true; // true until something proves it is false
                     $u = explode('?',$v['url'],2);
                     if (!preg_match('/'.preg_quote($u[0],"/").'/',$_SERVER['REQUEST_URI'])) {
@@ -203 +203 @@
                }
           }
-          $this->ws->put('favorites',serialize($this->global_prefs),'string','User favorites',true,true);
-          $this->ws->put('favorites',serialize($this->local_prefs));
+          $this->ws->put('favorites',$this->global_prefs,'array','User favorites',true,true);
+          $this->ws->put('favorites',$this->local_prefs);
           $this->user_prefs = $this->getFavorites($this->local_prefs);
      }
@@ -271 +271 @@
      */
      public function setFavoriteIDs($ids,$global=false) {
-          $this->ws->put('favorites',serialize($ids),null,null,true,$global);
+          $this->ws->put('favorites',$ids,null,null,true,$global);
      }
 
@@ -307 +307 @@
      */
      public function appendMenu($menu) {
-          foreach ($this->user_prefs as $k=>$v) {
+          foreach ($this->user_prefs as $k => $v) {
                $menu['Favorites']->addItem(
                     $v['title'],
@@ -330 +330 @@
      */
      public function appendDashboardIcons($icons) {
-          foreach ($this->user_prefs as $k=>$v) {
+          foreach ($this->user_prefs as $k => $v) {
                if (isset($v['dashboard_cb']) && is_callable($v['dashboard_cb'])) {
                     $v = new ArrayObject($v);
@@ -368 +368 @@
      */
       public function registerMultiple($data) {
-          foreach ($data as $k=>$v) {
+          foreach ($data as $k => $v) {
                $this->register($k,$v);
           }