diff --git a/htdocs/admin/ldap_groups.php b/htdocs/admin/ldap_groups.php
index d8d12a7e2d3..13532474681 100644
--- a/htdocs/admin/ldap_groups.php
+++ b/htdocs/admin/ldap_groups.php
@@ -58,7 +58,7 @@ if ($action == 'setvalue' && $user->admin) {
$error++;
}
if (!dolibarr_set_const($db, 'LDAP_GROUP_FILTER', GETPOST("filter"), 'chaine', 0, '', $conf->entity)) {
- $error++;
+ $error++;
}
if (!dolibarr_set_const($db, 'LDAP_GROUP_FIELD_FULLNAME', GETPOST("fieldfullname", 'alphanohtml'), 'chaine', 0, '', $conf->entity)) {
$error++;
@@ -222,12 +222,12 @@ if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap') {
show_ldap_test_button($butlabel, $testlabel, $key, $dn, $objectclass);
} elseif ($conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr') {
- $butlabel = $langs->trans("LDAPTestSearch");
- $testlabel = 'testsearchgroup';
- $key = $conf->global->LDAP_KEY_GROUPS;
- $dn = $conf->global->LDAP_GROUP_DN;
- $objectclass = $conf->global->LDAP_GROUP_OBJECT_CLASS;
- show_ldap_test_button($butlabel, $testlabel, $key, $dn, $objectclass);
+ $butlabel = $langs->trans("LDAPTestSearch");
+ $testlabel = 'testsearchgroup';
+ $key = $conf->global->LDAP_KEY_GROUPS;
+ $dn = $conf->global->LDAP_GROUP_DN;
+ $objectclass = $conf->global->LDAP_GROUP_OBJECT_CLASS;
+ show_ldap_test_button($butlabel, $testlabel, $key, $dn, $objectclass);
}
if (function_exists("ldap_connect")) {
@@ -278,59 +278,59 @@ if (function_exists("ldap_connect")) {
}
if ($action == 'testsearchgroup') {
- // TODO Mutualize code following with other ldap_xxxx.php pages
+ // TODO Mutualize code following with other ldap_xxxx.php pages
- // Test synchro
- $ldap = new Ldap();
- $result = $ldap->connect_bind();
+ // Test synchro
+ $ldap = new Ldap();
+ $result = $ldap->connect_bind();
- if ($result > 0) {
- $required_fields = array(
- $conf->global->LDAP_KEY_GROUPS,
- // $conf->global->LDAP_GROUP_FIELD_NAME,
- $conf->global->LDAP_GROUP_FIELD_DESCRIPTION,
- $conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS,
- $conf->global->LDAP_GROUP_FIELD_GROUPID
- );
+ if ($result > 0) {
+ $required_fields = array(
+ $conf->global->LDAP_KEY_GROUPS,
+ // $conf->global->LDAP_GROUP_FIELD_NAME,
+ $conf->global->LDAP_GROUP_FIELD_DESCRIPTION,
+ $conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS,
+ $conf->global->LDAP_GROUP_FIELD_GROUPID
+ );
- // Remove from required_fields all entries not configured in LDAP (empty) and duplicated
- $required_fields = array_unique(array_values(array_filter($required_fields, "dol_validElement")));
+ // Remove from required_fields all entries not configured in LDAP (empty) and duplicated
+ $required_fields = array_unique(array_values(array_filter($required_fields, "dol_validElement")));
- // Get from LDAP database an array of results
- $ldapgroups = $ldap->getRecords('*', $conf->global->LDAP_GROUP_DN, $conf->global->LDAP_KEY_GROUPS, $required_fields, 'group');
- //$ldapgroups = $ldap->getRecords('*', $conf->global->LDAP_GROUP_DN, $conf->global->LDAP_KEY_GROUPS, '', 'group');
+ // Get from LDAP database an array of results
+ $ldapgroups = $ldap->getRecords('*', $conf->global->LDAP_GROUP_DN, $conf->global->LDAP_KEY_GROUPS, $required_fields, 'group');
+ //$ldapgroups = $ldap->getRecords('*', $conf->global->LDAP_GROUP_DN, $conf->global->LDAP_KEY_GROUPS, '', 'group');
- if (is_array($ldapgroups)) {
- $liste = array();
- foreach ($ldapgroups as $key => $ldapgroup) {
- // Define the label string for this group
- $label = '';
- foreach ($required_fields as $value) {
- if ($value) {
- $label .= $value."=".$ldapgroup[$value]." ";
- }
- }
- $liste[$key] = $label;
- }
- } else {
- setEventMessages($ldap->error, $ldap->errors, 'errors');
- }
+ if (is_array($ldapgroups)) {
+ $liste = array();
+ foreach ($ldapgroups as $key => $ldapgroup) {
+ // Define the label string for this group
+ $label = '';
+ foreach ($required_fields as $value) {
+ if ($value) {
+ $label .= $value."=".$ldapgroup[$value]." ";
+ }
+ }
+ $liste[$key] = $label;
+ }
+ } else {
+ setEventMessages($ldap->error, $ldap->errors, 'errors');
+ }
- print "
\n";
- print "LDAP search for group:
\n";
- print "search: *
\n";
- print "userDN: ".$conf->global->LDAP_GROUP_DN."
\n";
- print "useridentifier: ".$conf->global->LDAP_KEY_GROUPS."
\n";
- print "required_fields: ".implode(',', $required_fields)."
\n";
- print "=> ".count($liste)." records
\n";
- print "\n
";
- } else {
- print img_picto('', 'error').' ';
- print ''.$langs->trans("LDAPSynchroKO");
- print ': '.$ldap->error;
- print '
';
- print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'
';
- }
+ print "
\n";
+ print "LDAP search for group:
\n";
+ print "search: *
\n";
+ print "userDN: ".$conf->global->LDAP_GROUP_DN."
\n";
+ print "useridentifier: ".$conf->global->LDAP_KEY_GROUPS."
\n";
+ print "required_fields: ".implode(',', $required_fields)."
\n";
+ print "=> ".count($liste)." records
\n";
+ print "\n
";
+ } else {
+ print img_picto('', 'error').' ';
+ print ''.$langs->trans("LDAPSynchroKO");
+ print ': '.$ldap->error;
+ print '
';
+ print $langs->trans("ErrorLDAPMakeManualTest", $conf->ldap->dir_temp).'
';
+ }
}
}
diff --git a/htdocs/core/class/ldap.class.php b/htdocs/core/class/ldap.class.php
index 8757666d0b6..0f97ed878cf 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -957,7 +957,7 @@ class Ldap
if (((string) $activefilter == '1' || (string) $activefilter == 'user') && $this->filter) {
$filter = '('.$this->filter.')';
} elseif (((string) $activefilter == 'group') && $this->filtergroup ) {
- $filter = '('.$this->filtergroup.')';
+ $filter = '('.$this->filtergroup.')';
} elseif (((string) $activefilter == 'member') && $this->filter) {
$filter = '('.$this->filtermember.')';
} else {
diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php
index f9725067762..67c14a4ee5d 100755
--- a/scripts/user/sync_groups_ldap2dolibarr.php
+++ b/scripts/user/sync_groups_ldap2dolibarr.php
@@ -98,9 +98,9 @@ print "login=".$conf->global->LDAP_ADMIN_DN."\n";
print "pass=".preg_replace('/./i', '*', $conf->global->LDAP_ADMIN_PASS)."\n";
print "DN to extract=".$conf->global->LDAP_GROUP_DN."\n";
if (!empty($conf->global->LDAP_GROUP_FILTER)) {
- print 'Filter=('.$conf->global->LDAP_GROUP_FILTER.')'."\n"; // Note: filter is defined into function getRecords
+ print 'Filter=('.$conf->global->LDAP_GROUP_FILTER.')'."\n"; // Note: filter is defined into function getRecords
} else {
- print 'Filter=('.$conf->global->LDAP_KEY_GROUPS.'=*)'."\n";
+ print 'Filter=('.$conf->global->LDAP_KEY_GROUPS.'=*)'."\n";
}
print "----- To Dolibarr database:\n";
print "type=".$conf->db->type."\n";