Changeset 3161:468195e4ad8b for plugins/userPref

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:

• plugins/userPref/index.php (modified) (4 diffs)

plugins/userPref/index.php

@@ -27 +27 @@
      try
      {
-          foreach ($_POST['s'] as $ws => $s)
-          {
+          foreach ($_POST['s'] as $ws => $s) {
                $core->auth->user_prefs->addWorkspace($ws);
-
-               foreach ($s as $k => $v)      {
+               foreach ($s as $k => $v) {
+                    if ($_POST['s_type'][$ws][$k] == 'array') {
+                         $v = json_decode($v,true);
+                    }
                     $core->auth->user_prefs->$ws->put($k,$v);
                }
@@ -50 +51 @@
      try
      {
-          foreach ($_POST['gs'] as $ws => $s)
-          {
+          foreach ($_POST['gs'] as $ws => $s) {
                $core->auth->user_prefs->addWorkspace($ws);
-
-               foreach ($s as $k => $v)      {
+               foreach ($s as $k => $v) {
+                    if ($_POST['gs_type'][$ws][$k] == 'array') {
+                         $v = json_decode($v,true);
+                    }
                     $core->auth->user_prefs->$ws->put($k,$v,null,null,true,true);
                }
@@ -76 +78 @@
           array(__('yes') => 1, __('no') => 0),$s['value'] ? 1 : 0);
      } else {
-          $field = form::field(array($field_name.'['.$ws.']['.$id.']',$field_name.'_'.$ws.'_'.$id),40,null,
-          html::escapeHTML($s['value']));
-     }
+          if ($s['type'] == 'array') {
+               $field = form::field(array($field_name.'['.$ws.']['.$id.']',$field_name.'_'.$ws.'_'.$id),40,null,
+               html::escapeHTML(json_encode($s['value'])));
+          } else {
+               $field = form::field(array($field_name.'['.$ws.']['.$id.']',$field_name.'_'.$ws.'_'.$id),40,null,
+               html::escapeHTML($s['value']));
+          }
+     }
+     $type = form::hidden(array($field_name.'_type'.'['.$ws.']['.$id.']',$field_name.'_'.$ws.'_'.$id.'_type'),
+          html::escapeHTML($s['type']));
 
      $slabel = $strong_label ? '<strong>%s</strong>' : '%s';
@@ -86 +95 @@
      '<td scope="row"><label for="'.$field_name.'_'.$ws.'_'.$id.'">'.sprintf($slabel,html::escapeHTML($id)).'</label></td>'.
      '<td>'.$field.'</td>'.
-     '<td>'.$s['type'].'</td>'.
+     '<td>'.$s['type'].$type.'</td>'.
      '<td>'.html::escapeHTML($s['label']).'</td>'.
      '</tr>';