From 526638b31b957cf3933204a760019729569fdbb2 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Mon, 20 Sep 2010 13:21:51 +0000 Subject: [PATCH] --- inc/ws/DAO/class.ws.dao.theme.php | 5 +++++ inc/ws/Metier/class.ws.parametres.php | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/inc/ws/DAO/class.ws.dao.theme.php b/inc/ws/DAO/class.ws.dao.theme.php index 5f1283747..1dc1067e6 100644 --- 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); foreach($data as $k => $v) { try { + if(!isset($p->$k)){ + continue; + } $p->$k = $v; + fb($v,$k); } catch(Exception $e) { + fb($e); } } $c->parametres = serialize($p); diff --git a/inc/ws/Metier/class.ws.parametres.php b/inc/ws/Metier/class.ws.parametres.php index d54df7d6e..319df1647 100644 --- 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; case 'color': case 'couleur': - $value = trim($value, '#'); - if (strlen($value) != 6) { - $value = dechex($value); - } - $value = cubeMath::fill($value, 6); + $value = cubeMath::fill(ltrim($value, '#'), 6); + fb($value); break; case 'date': if (!is_int($value)) { @@ -132,6 +129,7 @@ class wsParametres extends cubeMetier implements Iterator { $value = (string)$value; break; } // switch + fb($value,$varname); $this->datas[$varname] = $value; } -- 2.39.5