diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php index fb248becb72..d2dfa7338c3 100644 --- a/htdocs/admin/ldap_contacts.php +++ b/htdocs/admin/ldap_contacts.php @@ -237,7 +237,7 @@ print ''; $var=!$var; print ''.$langs->trans("LDAPFieldCountry").''; print ''; -print ''.$langs->trans("LDAPFieldCountryExample").''; +print ' '; print 'global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_COUNTRY?' checked="true"':'').">"; print ''; diff --git a/htdocs/contact/ldap.php b/htdocs/contact/ldap.php index 44f086c5b0a..8c181597cfd 100644 --- a/htdocs/contact/ldap.php +++ b/htdocs/contact/ldap.php @@ -144,14 +144,14 @@ if ($message) { print $message; } print '
'; -if ($conf->global->LDAP_CONTACT_SYNCHRO_ACTIVE == 'dolibarr2ldap') +if (! empty($conf->global->LDAP_CONTACT_ACTIVE) && $conf->global->LDAP_CONTACT_ACTIVE != 'ldap2dolibarr') { print ''.$langs->trans("ForceSynchronize").''; } print "
\n"; -if ($conf->global->LDAP_CONTACT_SYNCHRO_ACTIVE == 'dolibarr2ldap') print "
\n"; +if (! empty($conf->global->LDAP_CONTACT_ACTIVE) && $conf->global->LDAP_CONTACT_ACTIVE != 'ldap2dolibarr') print "
\n";