WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use cleanLDAPResult()

This commit is contained in:
Roland Gruber 2009-12-19 16:28:16 +00:00
parent 9f5570482e
commit 8b9d668f38
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lam/lib/ldap.inc
View File

@ -138,7 +138,7 @@ class Ldap{
$sr = @ldap_search($this->server(), escapeDN($suffix), "objectClass=organizationalunit", array("DN"), 0, 0, 0, LDAP_DEREF_NEVER); $sr = @ldap_search($this->server(), escapeDN($suffix), "objectClass=organizationalunit", array("DN"), 0, 0, 0, LDAP_DEREF_NEVER);
if ($sr) { if ($sr) {
$units = ldap_get_entries($this->server, $sr); $units = ldap_get_entries($this->server, $sr);
unset($units['count']); $units = cleanLDAPResult($units);
// extract Dns // extract Dns
for ($i = 0; $i < sizeof($units); $i++) { for ($i = 0; $i < sizeof($units); $i++) {
if ($units[$i]['dn']) $ret[] = $units[$i]['dn']; if ($units[$i]['dn']) $ret[] = $units[$i]['dn'];

10
lam/lib/lists.inc
View File

@ -481,8 +481,6 @@ class lamList {
protected function listPrintTableCellContent(&$entry, &$attribute) { protected function listPrintTableCellContent(&$entry, &$attribute) {
// print all attribute entries seperated by "; " // print all attribute entries seperated by "; "
if (isset($entry[$attribute]) && sizeof($entry[$attribute]) > 0) { if (isset($entry[$attribute]) && sizeof($entry[$attribute]) > 0) {
// delete "count" entry
unset($entry[$attribute]['count']);
if (is_array($entry[$attribute])) { if (is_array($entry[$attribute])) {
// sort array // sort array
sort($entry[$attribute]); sort($entry[$attribute]);
@ -832,14 +830,8 @@ class lamList {
} }
if ($sr) { if ($sr) {
$info = ldap_get_entries($_SESSION["ldap"]->server(), $sr); $info = ldap_get_entries($_SESSION["ldap"]->server(), $sr);
$info = cleanLDAPResult($info);
ldap_free_result($sr); ldap_free_result($sr);
// delete first array entry which is "count"
unset($info['count']);
// save position in original $info
$infoCount = sizeof($info);
for ($i = 0; $i < $infoCount; $i++) {
if (isset($info[$i]['count'])) unset($info[$i]['count']);
}
// save results // save results
$this->entries = $info; $this->entries = $info;
} }

6
lam/templates/delete.php
View File

@ -257,7 +257,8 @@ function getChildCount($dn) {
$sr = @ldap_search($_SESSION['ldap']->server(), escapeDN($dn), 'objectClass=*', array('dn'), 0, 0, 0, LDAP_DEREF_NEVER); $sr = @ldap_search($_SESSION['ldap']->server(), escapeDN($dn), 'objectClass=*', array('dn'), 0, 0, 0, LDAP_DEREF_NEVER);
if ($sr) { if ($sr) {
$entries = ldap_get_entries($_SESSION['ldap']->server(), $sr); $entries = ldap_get_entries($_SESSION['ldap']->server(), $sr);
$return = $entries['count'] - 1; $entries = cleanLDAPResult($entries);
$return = sizeof($entries) - 1;
} }
return $return; return $return;
} }
@ -273,7 +274,8 @@ function deleteDN($dn) {
$sr = @ldap_list($_SESSION['ldap']->server(), $dn, 'objectClass=*', array('dn'), 0); $sr = @ldap_list($_SESSION['ldap']->server(), $dn, 'objectClass=*', array('dn'), 0);
if ($sr) { if ($sr) {
$entries = ldap_get_entries($_SESSION['ldap']->server(), $sr); $entries = ldap_get_entries($_SESSION['ldap']->server(), $sr);
for ($i = 0; $i < $entries['count']; $i++) { $entries = cleanLDAPResult($entries);
for ($i = 0; $i < sizeof($entries); $i++) {
// delete recursively // delete recursively
$subErrors = deleteDN($entries[$i]['dn']); $subErrors = deleteDN($entries[$i]['dn']);
for ($e = 0; $e < sizeof($subErrors); $e++) $errors[] = $subErrors[$e]; for ($e = 0; $e < sizeof($subErrors); $e++) $errors[] = $subErrors[$e];

5
lam/templates/login.php
View File

@ -446,11 +446,12 @@ if(!empty($_POST['checklogin'])) {
if ($searchResult) { if ($searchResult) {
$searchInfo = @ldap_get_entries($searchLDAP->server(), $searchResult); $searchInfo = @ldap_get_entries($searchLDAP->server(), $searchResult);
if ($searchInfo) { if ($searchInfo) {
if ($searchInfo['count'] == 0) { $searchInfo = cleanLDAPResult($searchInfo);
if (sizeof($searchInfo) == 0) {
$searchSuccess = false; $searchSuccess = false;
$searchError = _('Wrong password/user name combination. Please try again.'); $searchError = _('Wrong password/user name combination. Please try again.');
} }
elseif ($searchInfo['count'] > 1) { elseif (sizeof($searchInfo) > 1) {
$searchSuccess = false; $searchSuccess = false;
$searchError = _('The given user name matches multiple LDAP entries.'); $searchError = _('The given user name matches multiple LDAP entries.');
} }