From 147c4d6cbd3cd4b2b18611b224060cbf08973e9e Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 8 Oct 2020 10:26:06 +0000
Subject: [PATCH] fix #3938 @0.5

---
 inc/commons/DAO/class.common.dao.entreprise.php  | 3 +--
 inc/commons/DAO/class.common.dao.utilisateur.php | 1 -
 inc/commons/class.common.core.php                | 6 ++++--
 inc/extranet/Controlleur/class.extranet.ajax.php | 4 +---
 inc/extranet/Controlleur/class.extranet.url.php  | 2 --
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/inc/commons/DAO/class.common.dao.entreprise.php b/inc/commons/DAO/class.common.dao.entreprise.php
index cac603078..fb56860df 100644
--- a/inc/commons/DAO/class.common.dao.entreprise.php
+++ b/inc/commons/DAO/class.common.dao.entreprise.php
@@ -183,8 +183,7 @@ class commonDAOEntreprise extends commonDAO
         }
         $core->refreshWSUsersTree();
 
-        $entreprise = $this->selectById($entreprise_id);
-        return $entreprise;
+        return $this->selectById($entreprise_id);
     }
 
     public function setWSAdmin($entreprise_id, $admin_id)
diff --git a/inc/commons/DAO/class.common.dao.utilisateur.php b/inc/commons/DAO/class.common.dao.utilisateur.php
index 42bbfd1e0..f10ff50e7 100644
--- a/inc/commons/DAO/class.common.dao.utilisateur.php
+++ b/inc/commons/DAO/class.common.dao.utilisateur.php
@@ -245,7 +245,6 @@ class commonDAOUtilisateur extends commonDAO
         $c->address = json_encode(['address' => $data['adresse'], 'postcode' => $data['code_postal'], 'country' => $data['pays'], 'city' => $data['ville']]);
         $c->phone = $data['telephone'];
         $c->e1_mobile = $data['mobile'];
-        $c->e1_fax = $data['fax'];
         $c->locale = $data['lang'];
         $c->company = $data['entreprise'];
         if ($data['grade'] > 0) {
diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index e90ac8f9c..4518d2373 100644
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -717,8 +717,10 @@ LEFT JOIN e2_u a ON ri.administrateur_id=a.utilisateur_id');
 
     public function refreshWSUsersTree()
     {
-        $t = new wsUsersTree($this->con);
-        $t->refreshWSUsersTree();
+        if (class_exists('wsUsersTree', true)) {
+            $t = new wsUsersTree($this->con);
+            $t->refreshWSUsersTree();
+        }
     }
 
     public function loadExtranetClasses()
diff --git a/inc/extranet/Controlleur/class.extranet.ajax.php b/inc/extranet/Controlleur/class.extranet.ajax.php
index dfcd39586..d8a62c79a 100644
--- a/inc/extranet/Controlleur/class.extranet.ajax.php
+++ b/inc/extranet/Controlleur/class.extranet.ajax.php
@@ -30,7 +30,7 @@ class extranetAjax {
 		global $core;
 		$dao = new commonDAOEntreprise($core->con);
 		$entreprise = $dao->sauve($_POST);
-		if ($_POST['entreprise_id'] == 'new') {
+		if ($_POST['entreprise_id'] === 'new') {
 			$data = $_POST['contact'];
 			$data['entreprise'] = $entreprise->entreprise_id;
 			$data['utilisateur_id'] = 'new';
@@ -44,8 +44,6 @@ class extranetAjax {
 			try {
 				$daoClient->sauve($data);
 			} catch (exception $e) {
-				fb($e);
-				$dao->supprime($entreprise->entreprise_id);
 			}
 		}
 
diff --git a/inc/extranet/Controlleur/class.extranet.url.php b/inc/extranet/Controlleur/class.extranet.url.php
index b4b705331..b6653d3d0 100644
--- a/inc/extranet/Controlleur/class.extranet.url.php
+++ b/inc/extranet/Controlleur/class.extranet.url.php
@@ -193,12 +193,10 @@ class extranetUrl
             $contact = $daoContact->cree();
             $res .= '<tr><th colspan="2" class="light"><strong>' . __('Contact') . '</strong></th></tr>';
             $res .= '<tr><td>' . __('Adresse e-mail') . '</td><td>' . form::field(array('contact[email]'), 30, 128, $contact->email) . '</td></tr>';
-            $res .= '<tr><td>' . __('Mot de passe') . '</td><td>' . form::field(array('contact[password]'), 30, 128, $contact->password) . '</td></tr>';
             $res .= '<tr><td>' . __('Prénom') . '</td><td>' . form::field(array('contact[prenom]'), 30, 128, $contact->prenom) . '</td></tr>';
             $res .= '<tr><td>' . __('Nom') . '</td><td>' . form::field(array('contact[nom]'), 30, 128, $contact->nom) . '</td></tr>';
             $res .= '<tr><td>' . __('Téléphone') . '</td><td>' . form::field(array('contact[telephone]'), 20, 128, $contact->telephone) . '</td></tr>';
             $res .= '<tr><td>' . __('Mobile') . '</td><td>' . form::field(array('contact[mobile]'), 20, 128, $contact->mobile) . '</td></tr>';
-            $res .= '<tr><td>' . __('Fax') . '</td><td>' . form::field(array('contact[fax]'), 20, 128, $contact->fax) . '</td></tr>';
             $res .= '<tr><td>' . __('Langue') . '</td><td>' . form::combo(array('contact[lang]'), cubeLang::getAvailableLangs(true), $contact->lang) . '</td></tr>';
         }
         return $res;
-- 
2.39.5