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

Qual: Meilleure gestion erreur sur fiches LDAP

Browse Source
This commit is contained in:
Laurent Destailleur 2007-05-01 22:13:34 +00:00
parent 80d4b0f11d
commit d480cb561c
4 changed files with 46 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/adherents/ldap.php
View File

@ -177,8 +177,10 @@ if ($result > 0)
$search = "(".$adh->_load_ldap_dn($info,2).")";
$records=$ldap->search($dn,$search);
//print_r($records);
// Affichage arbre
if (sizeof($records))
if (sizeof($records) && (! isset($records['count']) || $records['count'] > 0))
{
if (! is_array($records))
{

19
htdocs/contact/ldap.php
View File

@ -159,17 +159,26 @@ if ($result > 0)
$info=$contact->_load_ldap_info();
$dn=$contact->_load_ldap_dn($info,1);
$search = "(".$contact->_load_ldap_dn($info,2).")";
$result=$ldap->search($dn,$search);
$records=$ldap->search($dn,$search);
//print_r($records);
// Affichage arbre
if (sizeof($result))
if (sizeof($records) && (! isset($records['count']) || $records['count'] > 0))
{
$html=new Form($db);
$html->show_ldap_content($result,0,0,true);
if (! is_array($records))
{
print '<tr '.$bc[false].'><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
}
else
{
$html=new Form($db);
$result=$html->show_ldap_content($records,0,0,true);
}
}
else
{
print '<tr><td colspan="2">'.$langs->trans("LDAPRecordNotFound").'</td></tr>';
print '<tr '.$bc[false].'><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
}
$ldap->unbind();

27
htdocs/lib/ldap.class.php
View File

@ -762,17 +762,17 @@ class Ldap
/**
* \brief Returns an array containing a details of elements
* \param $search
* \param $userDn
* \param $useridentifier
* \param $attributeArray Variables required
* \param $search Valeur champ clé recherché, sinon '*' pour tous.
* \param $userDn DN (Ex: ou=adherents,ou=people,dc=parinux,dc=org)
* \param $useridentifier Nom du champ clé (Ex: uid)
* \param $attributeArray Array of fields required (Ex: sn,userPassword)
* \param $activefilter 1=utilise le champ this->filter comme filtre
*
* \return array Array of [id_record][ldap_field]=value
* \remarks ldapsearch -LLLx -hlocalhost -Dcn=admin,dc=parinux,dc=org -w password -b "ou=adherents,ou=people,dc=parinux,dc=org" userPassword
*/
function getRecords($search, $userDn, $useridentifier, $attributeArray, $activefilter=0)
{
$userslist=array();
$fulllist=array();
dolibarr_syslog("Ldap::getRecords search=".$search." userDn=".$userDn." useridentifier=".$useridentifier." attributeArray=array(".join(',',$attributeArray).")");
@ -822,7 +822,7 @@ class Ldap
if ($recordid)
{
//print "Found record with key $useridentifier=".$recordid."<br>\n";
$userslist[$recordid][$useridentifier]=$recordid;
$fulllist[$recordid][$useridentifier]=$recordid;
// Add to the array for each attribute in my list
for ($j = 0; $j < count($attributeArray); $j++)
@ -834,18 +834,18 @@ class Ldap
if ($this->serverType == "activedirectory" && $keyattributelower == "objectsid")
{
$objectsid = $this->getObjectSid($recordid);
$userslist[$recordid][$attributeArray[$j]] = $objectsid;
$fulllist[$recordid][$attributeArray[$j]] = $objectsid;
}
else
{
$userslist[$recordid][$attributeArray[$j]] = $this->ldap_utf8_decode($info[$i][$keyattributelower][0]);
$fulllist[$recordid][$attributeArray[$j]] = $this->ldap_utf8_decode($info[$i][$keyattributelower][0]);
}
}
}
}
asort($userslist);
return $userslist;
asort($fulllist);
return $fulllist;
}
/**
@ -922,7 +922,10 @@ class Ldap
* \remarks this->connection doit etre défini donc la methode bind ou bindauth doit avoir deja été appelée
* \param checkDn DN de recherche (Ex: ou=users,cn=my-domain,cn=com)
* \param filter Filtre de recherche (ex: (sn=nom_personne) )
* \return array Tableau des reponses
* \return array Tableau des reponses (clé en minuscule-valeur)
* \remarks Ne pas utiliser pour recherche d'une liste donnée de propriétés
* car conflit majuscule-minuscule. A n'utiliser que pour les pages
* 'Fiche LDAP' qui affiche champ lisibles par defaut.
*/
function search($checkDn, $filter)
{

20
htdocs/user/group/ldap.php
View File

@ -123,19 +123,27 @@ if ($result > 0)
$info=$fgroup->_load_ldap_info();
$dn=$fgroup->_load_ldap_dn($info,1);
$search = "(".$fgroup->_load_ldap_dn($info,2).")";
$result=$ldap->search($dn,$search);
$records=$ldap->search($dn,$search);
//print_r($records);
// Affichage arbre
if (sizeof($result))
if (sizeof($records) && (! isset($records['count']) || $records['count'] > 0))
{
$html=new Form($db);
$html->show_ldap_content($result,0,0,true);
if (! is_array($records))
{
print '<tr '.$bc[false].'><td colspan="2"><font class="error">'.$langs->trans("ErrorFailedToReadLDAP").'</font></td></tr>';
}
else
{
$html=new Form($db);
$result=$html->show_ldap_content($records,0,0,true);
}
}
else
{
print '<tr><td colspan="2">'.$langs->trans("LDAPRecordNotFound").'</td></tr>';
print '<tr '.$bc[false].'><td colspan="2">'.$langs->trans("LDAPRecordNotFound").' (dn='.$dn.' - search='.$search.')</td></tr>';
}
$ldap->unbind();
$ldap->close();
}