GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

rename isMemberOfGroup to be more consistent with other LDAP functions

Browse Source
This commit is contained in:
Craig Andrews 2009-11-18 15:53:22 -05:00
parent a215ce6ed6
commit b417e4d24f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/LdapAuthorization/LdapAuthorizationPlugin.php
View File

@ -85,12 +85,12 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
if(isset($this->login_group)){ if(isset($this->login_group)){
if(is_array($this->login_group)){ if(is_array($this->login_group)){
foreach($this->login_group as $group){ foreach($this->login_group as $group){
if($this->isMemberOfGroup($entry->dn(),$group)){ if($this->ldap_is_dn_member_of_group($entry->dn(),$group)){
return true; return true;
} }
} }
}else{ }else{
if($this->isMemberOfGroup($entry->dn(),$this->login_group)){ if($this->ldap_is_dn_member_of_group($entry->dn(),$this->login_group)){
return true; return true;
} }
} }
@ -117,12 +117,12 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
if(isset($this->roles_to_groups[$name])){ if(isset($this->roles_to_groups[$name])){
if(is_array($this->roles_to_groups[$name])){ if(is_array($this->roles_to_groups[$name])){
foreach($this->roles_to_groups[$name] as $group){ foreach($this->roles_to_groups[$name] as $group){
if($this->isMemberOfGroup($entry->dn(),$group)){ if($this->ldap_is_dn_member_of_group($entry->dn(),$group)){
return true; return true;
} }
} }
}else{ }else{
if($this->isMemberOfGroup($entry->dn(),$this->roles_to_groups[$name])){ if($this->ldap_is_dn_member_of_group($entry->dn(),$this->roles_to_groups[$name])){
return true; return true;
} }
} }
@ -132,9 +132,9 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
return false; return false;
} }
function isMemberOfGroup($userDn, $groupDn) function ldap_is_dn_member_of_group($userDn, $groupDn)
{ {
$ldap = ldap_get_connection(); $ldap = $this->ldap_get_connection();
$link = $ldap->getLink(); $link = $ldap->getLink();
$r = ldap_compare($link, $groupDn, $this->uniqueMember_attribute, $userDn); $r = ldap_compare($link, $groupDn, $this->uniqueMember_attribute, $userDn);
if ($r === true){ if ($r === true){