From 1f5e32d536318ae62000b6335c05d075f90eefab Mon Sep 17 00:00:00 2001 From: jsoro Date: Thu, 15 Jan 2015 13:19:30 -0800 Subject: [PATCH 1/2] Add isset check on $entries[$i]["description"] --- lib/adLDAP/classes/adLDAPGroups.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/adLDAP/classes/adLDAPGroups.php b/lib/adLDAP/classes/adLDAPGroups.php index 5faa9c1..f6816ba 100644 --- a/lib/adLDAP/classes/adLDAPGroups.php +++ b/lib/adLDAP/classes/adLDAPGroups.php @@ -558,7 +558,7 @@ public function search($sAMAaccountType = adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP, $groupsArray = array(); for ($i=0; $i<$entries["count"]; $i++) { - if ($includeDescription && strlen($entries[$i]["description"][0]) > 0 ) { + if ($includeDescription && isset($entries[$i]["description"]) && strlen($entries[$i]["description"][0]) > 0 ) { $groupsArray[$entries[$i]["samaccountname"][0]] = $entries[$i]["description"][0]; } else if ($includeDescription) { From f340dfbebe7e8d73259909c0a2c3d38cd41d64b1 Mon Sep 17 00:00:00 2001 From: jsoro Date: Thu, 15 Jan 2015 17:32:26 -0800 Subject: [PATCH 2/2] Update group search to use !empty check --- lib/adLDAP/classes/adLDAPGroups.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/adLDAP/classes/adLDAPGroups.php b/lib/adLDAP/classes/adLDAPGroups.php index f6816ba..1c26cd8 100644 --- a/lib/adLDAP/classes/adLDAPGroups.php +++ b/lib/adLDAP/classes/adLDAPGroups.php @@ -558,7 +558,7 @@ public function search($sAMAaccountType = adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP, $groupsArray = array(); for ($i=0; $i<$entries["count"]; $i++) { - if ($includeDescription && isset($entries[$i]["description"]) && strlen($entries[$i]["description"][0]) > 0 ) { + if ($includeDescription && !empty($entries[$i]["description"][0])) { $groupsArray[$entries[$i]["samaccountname"][0]] = $entries[$i]["description"][0]; } else if ($includeDescription) {