From 10858091a003b4e4b67bc4306801aedacfb4a13f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 17 Jan 2010 14:11:54 +0000
Subject: [PATCH] Fix: Button to force LDAP synchro was not visible.

---
 htdocs/admin/ldap_contacts.php | 2 +-
 htdocs/contact/ldap.php        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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 '</tr>';
 $var=!$var;
 print '<tr '.$bc[$var].'><td>'.$langs->trans("LDAPFieldCountry").'</td><td>';
 print '<input size="25" type="text" name="fieldcountry" value="'.$conf->global->LDAP_CONTACT_FIELD_COUNTRY.'">';
-print '</td><td>'.$langs->trans("LDAPFieldCountryExample").'</td>';
+print '</td><td>&nbsp;</td>';
 print '<td align="right"><input type="radio" name="key" value="'.$conf->global->LDAP_CONTACT_FIELD_COUNTRY.'"'.($conf->global->LDAP_KEY_CONTACTS==$conf->global->LDAP_CONTACT_FIELD_COUNTRY?' checked="true"':'')."></td>";
 print '</tr>';
 
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 '<div class="tabsAction">';
 
-if ($conf->global->LDAP_CONTACT_SYNCHRO_ACTIVE == 'dolibarr2ldap')
+if (! empty($conf->global->LDAP_CONTACT_ACTIVE) && $conf->global->LDAP_CONTACT_ACTIVE != 'ldap2dolibarr')
 {
 	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$contact->id.'&amp;action=dolibarr2ldap">'.$langs->trans("ForceSynchronize").'</a>';
 }
 
 print "</div>\n";
 
-if ($conf->global->LDAP_CONTACT_SYNCHRO_ACTIVE == 'dolibarr2ldap') print "<br>\n";
+if (! empty($conf->global->LDAP_CONTACT_ACTIVE) && $conf->global->LDAP_CONTACT_ACTIVE != 'ldap2dolibarr') print "<br>\n";