From 0a46c7a393c9eda86eda1b450dcc10436626db4c Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Sun, 15 Apr 2012 14:47:33 +0200 Subject: [PATCH] group LDAP: usersInGroup not getUsersInGroup offer static readonly properties --- apps/user_ldap/group_ldap.php | 4 ++-- apps/user_ldap/lib_ldap.php | 10 +++++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php index 19a488b843..92e3b53d24 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 4a4784eb15..5188ef9402 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