From 92acdf65df7b124d6f451f32610502efe99ddccf Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Tue, 3 Jul 2007 06:29:59 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20envoi=20des=20donn=E9es=20ldap=20en=20ut?= =?UTF-8?q?f8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/contact.class.php | 6 +++--- htdocs/langs/en_US/companies.lang | 3 ++- htdocs/langs/fr_FR/companies.lang | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/htdocs/contact.class.php b/htdocs/contact.class.php index 7ce936b8f31..09e10757a88 100644 --- a/htdocs/contact.class.php +++ b/htdocs/contact.class.php @@ -237,9 +237,9 @@ class Contact $info["objectclass"]=split(',',$conf->global->LDAP_CONTACT_OBJECT_CLASS); // Champs - if ($this->fullname && $conf->global->LDAP_FIELD_FULLNAME) $info[$conf->global->LDAP_FIELD_FULLNAME] = $this->fullname; - if ($this->name && $conf->global->LDAP_FIELD_NAME) $info[$conf->global->LDAP_FIELD_NAME] = $this->name; - if ($this->firstname && $conf->global->LDAP_FIELD_FIRSTNAME) $info[$conf->global->LDAP_FIELD_FIRSTNAME] = $this->firstname; + if ($this->fullname && $conf->global->LDAP_FIELD_FULLNAME) $info[$conf->global->LDAP_FIELD_FULLNAME] = utf8_encode($this->fullname); + if ($this->name && $conf->global->LDAP_FIELD_NAME) $info[$conf->global->LDAP_FIELD_NAME] = utf8_encode($this->name); + if ($this->firstname && $conf->global->LDAP_FIELD_FIRSTNAME) $info[$conf->global->LDAP_FIELD_FIRSTNAME] = utf8_encode($this->firstname); if ($this->poste) $info["title"] = $this->poste; if ($this->socid > 0) diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 9761ab66959..3ae56e18693 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -216,4 +216,5 @@ JuridicalStatus200=Independant DeleteFile=Delete file ConfirmDeleteFile=Are you sure you want to delete this file? AllocateCommercial=Allocate a commercial -SelectCountry=Select a country \ No newline at end of file +SelectCountry=Select a country +SelectCompany=Select a third party \ No newline at end of file diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang index b2110602ec2..3e675ab6cf6 100644 --- a/htdocs/langs/fr_FR/companies.lang +++ b/htdocs/langs/fr_FR/companies.lang @@ -219,4 +219,5 @@ CardCompany=Fiche Soci DeleteFile=Suppression d'un fichier ConfirmDeleteFile=Êtes-vous sûr de vouloir supprimer ce fichier ? AllocateCommercial=Affecter un commercial -SelectCountry=Sélectionner un pays \ No newline at end of file +SelectCountry=Sélectionner un pays +SelectCompany=Sélectionner un tiers \ No newline at end of file