summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Andrews <candrews@integralblue.com>2009-11-18 15:53:22 -0500
committerCraig Andrews <candrews@integralblue.com>2009-11-18 15:53:22 -0500
commitb417e4d24f2c4c13439c01f9f664bf6090c99016 (patch)
tree6008be73497ac2bcc1c2512f78b98af056d26f4c
parenta215ce6ed6d3a0eb9bb29db5ebe103e28f2ff95e (diff)
rename isMemberOfGroup to be more consistent with other LDAP functions
-rw-r--r--plugins/LdapAuthorization/LdapAuthorizationPlugin.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php
index 91ee9b1ab..cf1347bed 100644
--- a/plugins/LdapAuthorization/LdapAuthorizationPlugin.php
+++ b/plugins/LdapAuthorization/LdapAuthorizationPlugin.php
@@ -85,12 +85,12 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
if(isset($this->login_group)){
if(is_array($this->login_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;
}
}
}else{
- if($this->isMemberOfGroup($entry->dn(),$this->login_group)){
+ if($this->ldap_is_dn_member_of_group($entry->dn(),$this->login_group)){
return true;
}
}
@@ -117,12 +117,12 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
if(isset($this->roles_to_groups[$name])){
if(is_array($this->roles_to_groups[$name])){
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;
}
}
}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;
}
}
@@ -132,9 +132,9 @@ class LdapAuthorizationPlugin extends AuthorizationPlugin
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();
$r = ldap_compare($link, $groupDn, $this->uniqueMember_attribute, $userDn);
if ($r === true){