Fixed undefined variable $dnGroup and variable name
I renamed $memberURL into $dynamicGroup and print that variable in the writeLog. I think this makes more sense.
This commit is contained in:
parent
39aac2c66b
commit
f4d4bed10b
|
@ -457,13 +457,13 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
|
||||||
// look through dynamic groups to add them to the result array if needed
|
// look through dynamic groups to add them to the result array if needed
|
||||||
$groupsToMatch = $this->access->fetchListOfGroups(
|
$groupsToMatch = $this->access->fetchListOfGroups(
|
||||||
$this->access->connection->ldapGroupFilter,array('dn',$dynamicGroupMemberURL));
|
$this->access->connection->ldapGroupFilter,array('dn',$dynamicGroupMemberURL));
|
||||||
foreach($groupsToMatch as $memberUrl) {
|
foreach($groupsToMatch as $dynamicGroup) {
|
||||||
if (!array_key_exists($dynamicGroupMemberURL, $memberUrl)) {
|
if (!array_key_exists($dynamicGroupMemberURL, $dynamicGroup)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
$pos = strpos($memberUrl[$dynamicGroupMemberURL][0], '(');
|
$pos = strpos($dynamicGroup[$dynamicGroupMemberURL][0], '(');
|
||||||
if ($pos !== false) {
|
if ($pos !== false) {
|
||||||
$memberUrlFilter = substr($memberUrl[$dynamicGroupMemberURL][0],$pos);
|
$memberUrlFilter = substr($dynamicGroup[$dynamicGroupMemberURL][0],$pos);
|
||||||
// apply filter via ldap search to see if this user is in this
|
// apply filter via ldap search to see if this user is in this
|
||||||
// dynamic group
|
// dynamic group
|
||||||
$userMatch = $this->access->readAttribute(
|
$userMatch = $this->access->readAttribute(
|
||||||
|
@ -473,15 +473,15 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
|
||||||
);
|
);
|
||||||
if ($userMatch !== false) {
|
if ($userMatch !== false) {
|
||||||
// match found so this user is in this group
|
// match found so this user is in this group
|
||||||
$pos = strpos($memberUrl['dn'][0], ',');
|
$pos = strpos($dynamicGroup['dn'][0], ',');
|
||||||
if ($pos !== false) {
|
if ($pos !== false) {
|
||||||
$membershipGroup = substr($memberUrl['dn'][0],3,$pos-3);
|
$membershipGroup = substr($dynamicGroup['dn'][0],3,$pos-3);
|
||||||
$groups[] = $membershipGroup;
|
$groups[] = $membershipGroup;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
\OCP\Util::writeLog('user_ldap', 'No search filter found on member url '.
|
\OCP\Util::writeLog('user_ldap', 'No search filter found on member url '.
|
||||||
'of group ' . $dnGroup, \OCP\Util::DEBUG);
|
'of group ' . $dynamicGroup, \OCP\Util::DEBUG);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue