(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.theme.php b/inc/ws/DAO/class.ws.dao.theme.php
index 5f128374769180185b057dd0510b78ed210b63b1..1dc1067e6ed02c71c4a8236a84f43b1dcdb2683d 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.theme.php
+++ b/inc/ws/DAO/class.ws.dao.theme.php
@@ -56,9 +56,14 @@ class wsDAOTheme extends extranetDAO {
                $p = new wsThemeParametres($parent);\r
                foreach($data as $k => $v) {\r
                        try {\r
+                               if(!isset($p->$k)){\r
+                                       continue;\r
+                               }\r
                                $p->$k = $v;\r
+                               fb($v,$k);\r
                        }\r
                        catch(Exception $e) {\r
+                               fb($e);\r
                        }\r
                }\r
                $c->parametres = serialize($p);\r

diff --git a/inc/ws/Metier/class.ws.parametres.php b/inc/ws/Metier/class.ws.parametres.php
index d54df7d6ead5a5955151610abd9c48317160bfed..319df1647b053be6d41d92cd0a6d6a511b82229a 100644 (file)
--- a/inc/ws/Metier/class.ws.parametres.php
+++ b/inc/ws/Metier/class.ws.parametres.php
@@ -113,11 +113,8 @@ class wsParametres extends cubeMetier implements Iterator {
                                break;\r
                        case 'color':\r
                        case 'couleur':\r
-                               $value = trim($value, '#');\r
-                               if (strlen($value) != 6) {\r
-                                       $value = dechex($value);\r
-                               }\r
-                               $value = cubeMath::fill($value, 6);\r
+                               $value = cubeMath::fill(ltrim($value, '#'), 6);\r
+                               fb($value);\r
                                break;\r
                        case 'date':\r
                                if (!is_int($value)) {\r
@@ -132,6 +129,7 @@ class wsParametres extends cubeMetier implements Iterator {
                                $value = (string)$value;\r
                                break;\r
                } // switch\r
+               fb($value,$varname);\r
                $this->datas[$varname] = $value;\r
        }\r
 \r