lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dbut amlioration LDAP

Browse Source
This commit is contained in:
Regis Houssin 2006-06-12 13:14:02 +00:00
parent f587a8ac77
commit 32fa237a5b
2 changed files with 40 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
htdocs/admin/ldap.php
View File

@ -277,9 +277,9 @@ if (function_exists("ldap_connect"))
print "<br>"; print "<br>";
} }
// Test ldap_getversion
if ($ds) if ($ds)
{ {
// Test ldap_getversion
if ((dolibarr_ldap_getversion($ds) == 3)) if ((dolibarr_ldap_getversion($ds) == 3))
{ {
print img_picto('','info'); print img_picto('','info');
@ -290,37 +290,37 @@ if (function_exists("ldap_connect"))
print img_picto('','info'); print img_picto('','info');
print $langs->trans("LDAPSetupForVersion2").'<br>'; print $langs->trans("LDAPSetupForVersion2").'<br>';
} }
}
// Test ldap_bind // Test ldap_bind
$bind = @dolibarr_ldap_bind($ds); $bind = @dolibarr_ldap_bind($ds);
if ($bind)
{ if ($bind)
print img_picto('','info'); {
print "Connexion au dn $dn réussi<br>"; print img_picto('','info');
} print "Connexion au dn $dn réussi<br>";
else }
{ else
print img_picto('','alerte'); {
print img_picto('','alerte');
print "Connexion au dn $dn raté : "; print "Connexion au dn $dn raté : ";
print ldap_error($ds); print $bind->err;
print "<br>"; print "<br>";
} }
// Test ldap_unbind // Test ldap_unbind
$unbind = @dolibarr_ldap_unbind($ds); $unbind = @dolibarr_ldap_unbind($ds);
if ($bind)
{ if ($bind)
print img_picto('','info'); {
print "Déconnection du dn $dn réussi<br>"; print img_picto('','info');
} print "Déconnection du dn $dn réussi<br>";
else }
{ else
print img_picto('','alerte'); {
print img_picto('','alerte');
print "Déconnection du dn $dn raté"; print "Déconnection du dn $dn raté";
print "<br>"; print "<br>";
}
} }
} }
} }

13
htdocs/lib/ldap.lib.php
View File

@ -61,7 +61,7 @@ function dolibarr_ldap_connect()
} }
else else
{ {
$this->err .= ldap_error($ldapconnect); $this->err = ldap_error($ldapconnect);
} }
} }
@ -79,8 +79,15 @@ function dolibarr_ldap_bind($ds)
{ {
$ldapbind = ldap_bind($ds, $conf->global->LDAP_ADMIN_DN, $conf->global->LDAP_ADMIN_PASS); $ldapbind = ldap_bind($ds, $conf->global->LDAP_ADMIN_DN, $conf->global->LDAP_ADMIN_PASS);
} }
return $ldapbind; if ($ldapbind)
{
return $ldapbind;
}
else
{
$this->err = ldap_error($ldapbind);
}
} }
/** /**