Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

add new rule

Browse Source
This commit is contained in:
Frédéric FRANCE
2020-05-21 09:35:30 +02:00
parent f4011520a3
commit 85625a46bb
122 changed files with 1031 additions and 2128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/admin/ldap_users.php
View File

@@ -89,8 +89,7 @@ if ($action == 'setvalue' && $user->admin)
{
$db->commit();
setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
}
else {
} else {
$db->rollback();
dol_print_error($db);
}
@@ -356,8 +355,7 @@ if ($conf->global->LDAP_SYNCHRO_ACTIVE == 'dolibarr2ldap')
$objectclass = $conf->global->LDAP_USER_OBJECT_CLASS;
show_ldap_test_button($butlabel, $testlabel, $key, $dn, $objectclass);
}
elseif ($conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')
} elseif ($conf->global->LDAP_SYNCHRO_ACTIVE == 'ldap2dolibarr')
{
$butlabel = $langs->trans("LDAPTestSearch");
$testlabel = 'testsearchuser';
@@ -394,8 +392,7 @@ if (function_exists("ldap_connect"))
{
print img_picto('', 'info').' ';
print '<font class="ok">'.$langs->trans("LDAPSynchroOK").'</font><br>';
}
else {
} else {
print img_picto('', 'error').' ';
print '<font class="error">'.$langs->trans("LDAPSynchroKOMayBePermissions");
print ': '.$ldap->error;
@@ -407,8 +404,7 @@ if (function_exists("ldap_connect"))
print "LDAP input file used for test:<br><br>\n";
print nl2br($ldap->dump_content($dn, $info));
print "\n<br>";
}
else {
} else {
print img_picto('', 'error').' ';
print '<font class="error">'.$langs->trans("LDAPSynchroKO");
print ': '.$ldap->error;
@@ -473,8 +469,7 @@ if (function_exists("ldap_connect"))
}
$liste[$key] = $label;
}
}
else {
} else {
setEventMessages($ldap->error, $ldap->errors, 'errors');
}
@@ -486,8 +481,7 @@ if (function_exists("ldap_connect"))
print "required_fields: ".implode(',', $required_fields)."<br>\n";
print "=> ".count($liste)." records<br>\n";
print "\n<br>";
}
else {
} else {
print img_picto('', 'error').' ';
print '<font class="error">'.$langs->trans("LDAPSynchroKO");
print ': '.$ldap->error;