Skip to content

Add the ability to find a group by its GUID #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add the ability to find a group by its GUID #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions lib/adLDAP/classes/adLDAPGroups.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,17 +437,24 @@ public function members($group, $recursive = NULL) {
*
* @param string $groupName The group name to retrieve info about
* @param array $fields Fields to retrieve
* @param bool $isGUID Is the groupName passed a GUID or a name
* @return array
*/
public function info($groupName, $fields = NULL) {
public function info($groupName, $fields = NULL, $isGUID = false) {
if ($groupName === NULL) { return false; }
if (!$this->adldap->getLdapBind()) { return false; }

if (stristr($groupName, '+')) {
$groupName = stripslashes($groupName);

if ($isGUID === true) {
$filter = "objectguid=" . $this->adldap->utilities()->strGuidToHex($groupName);
}
else {
if (stristr($groupName, '+')) {
$groupName = stripslashes($groupName);
}
$filter = "name=" . $this->adldap->utilities()->ldapSlashes($groupName);
}

$filter = "(&(objectCategory=group)(name=" . $this->adldap->utilities()->ldapSlashes($groupName) . "))";
$filter = "(&(objectCategory=group)($filter))";
if ($fields === NULL) {
$fields = array("member","memberof","cn","description","distinguishedname","objectcategory","samaccountname");
}
Expand Down Expand Up @@ -484,13 +491,14 @@ public function info($groupName, $fields = NULL) {
*
* @param string $groupName The group name to retrieve info about
* @param array $fields Fields to retrieve
* @param bool $isGUID Is the groupName passed a GUID or a name
* @return \adLDAP\collections\adLDAPGroupCollection
*/
public function infoCollection($groupName, $fields = NULL) {
public function infoCollection($groupName, $fields = NULL, $isGUID = false) {
if ($groupName === NULL) { return false; }
if (!$this->adldap->getLdapBind()) { return false; }

$info = $this->info($groupName, $fields);
$info = $this->info($groupName, $fields, $isGUID);
if ($info !== false) {
$collection = new \adLDAP\collections\adLDAPGroupCollection($info, $this->adldap);
return $collection;
Expand Down