Fix address<->phone association on profile.

[platal.git] / include / validations / entreprises.inc.php

diff --git a/include/validations/entreprises.inc.php b/include/validations/entreprises.inc.php
index 409b1a4..da2e65e 100644 (file)
--- a/include/validations/entreprises.inc.php
+++ b/include/validations/entreprises.inc.php
@@ -27,16 +27,16 @@ class EntrReq extends ProfileValidate
 
     public $id;
     public $name;
-    public $acronym;
-    public $url;
-    public $email;
+    public $acronym = null;
+    public $url = null;
+    public $email = null;
     public $holdingid = null;
     public $NAF_code = null;
     public $AX_code = null;
 
-    public $tel;
-    public $fax;
-    public $address;
+    public $tel = null;
+    public $fax = null;
+    public $address = null;
 
     public $suggestions;
     public $rules = 'Si l\'entreprise est déjà présente sous un autre nom dans la liste des suggestions, remplacer son nom par celui-ci avant de valider. Laisser les autres champs tels quels.';
@@ -101,36 +101,13 @@ class EntrReq extends ProfileValidate
 
     protected function handle_editor()
     {
-        if (Env::has('name')) {
-            $this->name = Env::t('name');
+        foreach (array('name', 'acronym', 'url', 'email', 'NAF_code', 'tel', 'fax', 'address') as $field) {
+            $this->$field = (Env::t($field) == '' ? null : Env::t($field));
         }
-        if (Env::has('acronym')) {
-            $this->acronym = Env::t('acronym');
-        }
-        if (Env::has('url')) {
-            $this->url = Env::t('url');
-        }
-        if (Env::has('email')) {
-            $this->email = Env::t('email');
-        }
-        if (Env::has('holdingid')) {
-            $this->holdingid = Env::i('holdingid');
-        }
-        if (Env::has('NAF_code')) {
-            $this->NAF_code = Env::t('NAF_code');
-        }
-        if (Env::has('AX_code')) {
-            $this->AX_code = Env::i('AX_code');
-        }
-        if (Env::has('address')) {
-            $this->address['text'] = Env::t('address');
-        }
-        if (Env::has('tel')) {
-            $this->tel = Env::t('tel');
-        }
-        if (Env::has('fax')) {
-            $this->fax = Env::t('fax');
+        foreach (array('AX_code', 'holdingid') as $field) {
+            $this->$field = (Env::i($field) == 0 ? null : Env::i($field));
         }
+
         return true;
     }