Merge pull request #9540 from frederic34/patch-22

reduce complexity of contact class
This commit is contained in:
Laurent Destailleur 2018-09-18 15:13:29 +02:00 committed by GitHub
commit eba0ce2f4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -493,8 +493,8 @@ class Contact extends CommonObject
global $conf; global $conf;
$dn=''; $dn='';
if ($mode==0) $dn=$conf->global->LDAP_KEY_CONTACTS."=".$info[$conf->global->LDAP_KEY_CONTACTS].",".$conf->global->LDAP_CONTACT_DN; if ($mode==0) $dn=$conf->global->LDAP_KEY_CONTACTS."=".$info[$conf->global->LDAP_KEY_CONTACTS].",".$conf->global->LDAP_CONTACT_DN;
if ($mode==1) $dn=$conf->global->LDAP_CONTACT_DN; elseif ($mode==1) $dn=$conf->global->LDAP_CONTACT_DN;
if ($mode==2) $dn=$conf->global->LDAP_KEY_CONTACTS."=".$info[$conf->global->LDAP_KEY_CONTACTS]; elseif ($mode==2) $dn=$conf->global->LDAP_KEY_CONTACTS."=".$info[$conf->global->LDAP_KEY_CONTACTS];
return $dn; return $dn;
} }
@ -887,9 +887,9 @@ class Contact extends CommonObject
if ($obj->nb) if ($obj->nb)
{ {
if ($obj->element=='facture') $this->ref_facturation = $obj->nb; if ($obj->element=='facture') $this->ref_facturation = $obj->nb;
if ($obj->element=='contrat') $this->ref_contrat = $obj->nb; elseif ($obj->element=='contrat') $this->ref_contrat = $obj->nb;
if ($obj->element=='commande') $this->ref_commande = $obj->nb; elseif ($obj->element=='commande') $this->ref_commande = $obj->nb;
if ($obj->element=='propal') $this->ref_propal = $obj->nb; elseif ($obj->element=='propal') $this->ref_propal = $obj->nb;
} }
} }
$this->db->free($resql); $this->db->free($resql);