forked from Wavyzz/dolibarr
Modification afin de rcuprer le SID avec Active Directory
This commit is contained in:
@@ -2835,7 +2835,7 @@ class Form
|
|||||||
|
|
||||||
function show_ldap_content($result,$level,$count,$var)
|
function show_ldap_content($result,$level,$count,$var)
|
||||||
{
|
{
|
||||||
global $bc;
|
global $bc, $conf;
|
||||||
|
|
||||||
$count++;
|
$count++;
|
||||||
if ($count > 1000) return -1; // To avoid infinite loop
|
if ($count > 1000) return -1; // To avoid infinite loop
|
||||||
@@ -2866,6 +2866,7 @@ class Form
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
print utf8_decode("$val");
|
print utf8_decode("$val");
|
||||||
|
//print $val;
|
||||||
//print "<br>\n";
|
//print "<br>\n";
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -762,10 +762,20 @@ class Ldap
|
|||||||
for ($j = 0; $j < count($attributeArray); $j++)
|
for ($j = 0; $j < count($attributeArray); $j++)
|
||||||
{
|
{
|
||||||
//print " Param ".$attributeArray[$j]."=".$info[$i][$attributeArray[$j]][0]."<br>\n";
|
//print " Param ".$attributeArray[$j]."=".$info[$i][$attributeArray[$j]][0]."<br>\n";
|
||||||
|
|
||||||
|
//permet de r<>cup<75>rer le SID avec Active Directory
|
||||||
|
if ($this->serverType == "activedirectory" && strtolower($attributeArray[$j]) == "objectsid")
|
||||||
|
{
|
||||||
|
$objectsid = $this->getObjectSid($recordid);
|
||||||
|
$userslist[$recordid][$attributeArray[$j]] = $objectsid;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
$userslist[$recordid][$attributeArray[$j]] = $this->ldap_utf8_decode($info[$i][$attributeArray[$j]][0]);
|
$userslist[$recordid][$attributeArray[$j]] = $this->ldap_utf8_decode($info[$i][$attributeArray[$j]][0]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
asort($userslist);
|
asort($userslist);
|
||||||
return $userslist;
|
return $userslist;
|
||||||
|
|||||||
Reference in New Issue
Block a user