From 9f5570482ed51faf101b4ce711c63f188826c4fb Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Sat, 19 Dec 2009 16:07:10 +0000
Subject: [PATCH] use cleanLDAPResult()

---
 lam/lib/modules/ddns.inc      | 7 +++++--
 lam/lib/modules/kolabUser.inc | 3 ++-
 lam/lib/types/group.inc       | 8 ++------
 lam/lib/types/user.inc        | 4 +---
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/lam/lib/modules/ddns.inc b/lam/lib/modules/ddns.inc
index b6e4b6d4..95bb68e0 100644
--- a/lam/lib/modules/ddns.inc
+++ b/lam/lib/modules/ddns.inc
@@ -190,8 +190,11 @@ class ddns extends baseModule {
 		$search = @ldap_search($ldap,$dn,"dhcpStatements=ddns-update-style interim", array(), 0, 0, 0, LDAP_DEREF_NEVER);
 		if ($search) {
 			$info = @ldap_get_entries($ldap,$search);
-			if ($info && ($info['count'] > 0)) {
-				return true;
+			if ($info) {
+				$info = cleanLDAPResult($info);
+				if (sizeof($info) > 0) {
+					return true;
+				}
 			}
 			else {
 				return false;
diff --git a/lam/lib/modules/kolabUser.inc b/lam/lib/modules/kolabUser.inc
index be864912..d51827c3 100644
--- a/lam/lib/modules/kolabUser.inc
+++ b/lam/lib/modules/kolabUser.inc
@@ -827,7 +827,8 @@ class kolabUser extends baseModule {
 			$sr = @ldap_search($_SESSION['ldapHandle'], escapeDN($this->selfServiceSettings->LDAPSuffix), '(&(objectClass=inetOrgPerson)(mail=*))', array('mail'), 0, 0, 0, LDAP_DEREF_NEVER);
 			if ($sr) {
 				$result = ldap_get_entries($_SESSION['ldapHandle'], $sr);
-				for ($i = 0; $i < $result['count']; $i++) {
+				$result = cleanLDAPResult($result);
+				for ($i = 0; $i < sizeof($result); $i++) {
 					$delegates[] = $result[$i]['mail'][0];
 				}
 			}
diff --git a/lam/lib/types/group.inc b/lam/lib/types/group.inc
index 2818ebc5..6b8aa087 100644
--- a/lam/lib/types/group.inc
+++ b/lam/lib/types/group.inc
@@ -165,11 +165,8 @@ class lamGroupList extends lamList {
 					isset($this->primary_hash[$gid]) && is_array($this->primary_hash[$gid]) &&
 					(sizeof($this->primary_hash[$gid]) > 0));
 			}
-			if ($use_primary) {
-				if (isset($entry[$attribute]) && isset($entry[$attribute]['count'])) unset($entry[$attribute]['count']);
-			} else {
+			if (!$use_primary) {
 				if (!isset($entry[$attribute]) || !is_array($entry[$attribute]) || (sizeof($entry[$attribute]) < 1)) return;
-				if (isset($entry[$attribute]['count'])) unset($entry[$attribute]['count']);
 				// sort array
 				sort($entry[$attribute]);
 			}
@@ -250,8 +247,7 @@ class lamGroupList extends lamList {
 			if ($sr) {
 				$members = ldap_get_entries($_SESSION["ldap"]->server(), $sr);
 				ldap_free_result($sr);
-				// delete first array entry which is "count"
-				unset($members['count']);
+				$members = cleanLDAPResult($members);
 				for ($j = 0; $j < sizeof($members); $j++) {
 					$this->primary_hash[$gid][$j] = $members[$j]['uid'][0];
 				}
diff --git a/lam/lib/types/user.inc b/lam/lib/types/user.inc
index ced8ed44..297ed0a0 100644
--- a/lam/lib/types/user.inc
+++ b/lam/lib/types/user.inc
@@ -170,7 +170,7 @@ class lamUserList extends lamList {
 		$sr = @ldap_search($_SESSION["ldap"]->server(), escapeDN($grp_suffix), $filter, $attrs, 0, 0, 0, LDAP_DEREF_NEVER);
 		if ($sr) {
 			$info = @ldap_get_entries($_SESSION["ldap"]->server(), $sr);
-			unset($info['count']); // delete count entry
+			$info = cleanLDAPResult($info);
 			for ($i = 0; $i < sizeof($info); $i++) {
 				$this->trans_primary_hash[$info[$i]['gidnumber'][0]] = $info[$i]['cn'][0];
 			}
@@ -186,7 +186,6 @@ class lamUserList extends lamList {
 	protected function listPrintTableCellContent(&$entry, &$attribute) {
 		// check if there is something to display at all
 		if (!isset($entry[$attribute]) || !is_array($entry[$attribute]) || (sizeof($entry[$attribute]) < 1)) return;
-		if (isset($entry[$attribute]['count'])) unset($entry[$attribute]['count']);
 		// translate GID to group name
 		if (($attribute == "gidnumber") && ($this->trans_primary == "on")) {
 			if (isset($this->trans_primary_hash[$entry[$attribute][0]])) {
@@ -205,7 +204,6 @@ class lamUserList extends lamList {
 					$tempEntry = @ldap_first_entry($_SESSION['ldap']->server(), $result);
 					if ($tempEntry) {
 						$binData = ldap_get_values_len($_SESSION['ldap']->server(), $tempEntry, $attribute);
-						if (isset($binData['count'])) unset($binData['count']);
 						$entry[$attribute] = $binData;
 					}
 				}