Changeset 3158:568e0d0e0991

Timestamp:

01/28/16 11:03:55 (10 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add new array type for settings and prefs, closes #1833 (thank's Dsls for code)

Location:

inc/core

Files:

• class.dc.namespace.php (modified) (3 diffs)
• class.dc.workspace.php (modified) (3 diffs)

inc/core/class.dc.namespace.php

@@ -75 +75 @@
                $type = $rs->f('setting_type');
 
-               if ($type == 'float' || $type == 'double') {
-                    $type = 'float';
-               } elseif ($type != 'boolean' && $type != 'integer') {
-                    $type = 'string';
+               if ($type == 'array') {
+                    $value = @json_decode($value);
+               } else {
+                    if ($type == 'float' || $type == 'double') {
+                         $type = 'float';
+                    } elseif ($type != 'boolean' && $type != 'integer') {
+                         $type = 'string';
+                    }
                }
 
@@ -233 +237 @@
                }
           }
-          elseif ($type != 'boolean' && $type != 'integer' && $type != 'float')
+          elseif ($type != 'boolean' && $type != 'integer' && $type != 'float' && $type != 'array')
           {
                $type = 'string';
@@ -248 +252 @@
           }
 
-          settype($value,$type);
+          if ($type != 'array') {
+               settype($value,$type);
+          } else {
+               $value = json_encode($value);
+          }
 
           $cur = $this->con->openCursor($this->table);

inc/core/class.dc.workspace.php

@@ -79 +79 @@
                $type = $rs->f('pref_type');
 
-               if ($type == 'float' || $type == 'double') {
-                    $type = 'float';
-               } elseif ($type != 'boolean' && $type != 'integer') {
-                    $type = 'string';
+               if ($type == 'array') {
+                    $value = @json_decode($value);
+               } else {
+                    if ($type == 'float' || $type == 'double') {
+                         $type = 'float';
+                    } elseif ($type != 'boolean' && $type != 'integer') {
+                         $type = 'string';
+                    }
                }
 
@@ -236 +240 @@
                }
           }
-          elseif ($type != 'boolean' && $type != 'integer' && $type != 'float')
+          elseif ($type != 'boolean' && $type != 'integer' && $type != 'float' && $type != 'array')
           {
                $type = 'string';
@@ -251 +255 @@
           }
 
-          settype($value,$type);
+          if ($type != 'array') {
+               settype($value,$type);
+          } else {
+               $value = json_encode($value);
+          }
 
           $cur = $this->con->openCursor($this->table);