diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php index 19a488b8434dc48e6fd8e015f36e23a597143b3e..92e3b53d24966332f4bec461fbaa02522feb706d 100644 --- a/apps/user_ldap/group_ldap.php +++ b/apps/user_ldap/group_ldap.php @@ -77,13 +77,13 @@ class OC_GROUP_LDAP extends OC_Group_Backend { * @brief get a list of all users in a group * @returns array with user ids */ - public function getUsersInGroup($gid) { + public function usersInGroup($gid) { $filter = OC_LDAP::combineFilterWithAnd(array( $this->ldapGroupFilter, $this->ldapGroupDisplayName.'='.$gid )); - return $this->retrieveList($filter, OC_LDAP::ldapUserDisplayName); + return $this->retrieveList($filter, OC_LDAP::conf('ldapUserDisplayName')); } /** diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php index 4a4784eb159a648971e534047e50f78ce5cc2080..5188ef940261b0698062a77ec3cab99471b7a283 100644 --- a/apps/user_ldap/lib_ldap.php +++ b/apps/user_ldap/lib_ldap.php @@ -36,7 +36,7 @@ class OC_LDAP { static protected $ldapTLS; static protected $ldapNoCase; // user and group settings, that are needed in both backends - static protected $ldapUserDisplayName; + static public $ldapUserDisplayName; static public function init() { @@ -44,6 +44,14 @@ class OC_LDAP { self::establishConnection(); } + static public function conf($key) { + $availableProperties = array('ldapUserDisplayName'); + + if(in_array($key, $availableProperties)) { + return self::$$key; + } + } + /** * @brief executes an LDAP search * @param $filter the LDAP filter for the search