wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

group LDAP: usersInGroup not getUsersInGroup

Browse source 
offer static readonly properties
This commit is contained in:
Arthur Schiwon 2012-04-15 14:47:33 +02:00
parent 2a03db6065
commit 0a46c7a393
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/user_ldap/group_ldap.php
View file

@ -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'));
}
/**

10
apps/user_ldap/lib_ldap.php
View file

@ -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