diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2012-05-08 23:47:23 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2012-05-08 23:49:33 +0200 |
| commit | c1490239e53a30c27e8512f7a04664c155b9e144 (patch) | |
| tree | 71d86da9e88351fe07b0634f6f752aea1c18b3a8 /apps/user_ldap/lib_ldap.php | |
| parent | 051442bc7654cc41bc8e1bb48762494764111daa (diff) | |
| download | nextcloud-server-c1490239e53a30c27e8512f7a04664c155b9e144.tar.gz nextcloud-server-c1490239e53a30c27e8512f7a04664c155b9e144.zip | |
LDAP group: support for memberUid, fix for oc-594
Diffstat (limited to 'apps/user_ldap/lib_ldap.php')
| -rwxr-xr-x | apps/user_ldap/lib_ldap.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php index 9de03a07fef..30806a63b08 100755 --- a/apps/user_ldap/lib_ldap.php +++ b/apps/user_ldap/lib_ldap.php @@ -49,6 +49,7 @@ class OC_LDAP { static protected $ldapUserDisplayName; static protected $ldapUserFilter; static protected $ldapGroupDisplayName; + static protected $ldapLoginFilter; static public function init() { self::readConfiguration(); @@ -76,6 +77,7 @@ class OC_LDAP { $availableProperties = array( 'ldapUserDisplayName', 'ldapGroupDisplayName', + 'ldapLoginFilter' ); if(in_array($key, $availableProperties)) { @@ -574,6 +576,7 @@ class OC_LDAP { self::$ldapNoCase = OCP\Config::getAppValue('user_ldap', 'ldap_nocase', 0); self::$ldapUserDisplayName = OCP\Config::getAppValue('user_ldap', 'ldap_display_name', OC_USER_BACKEND_LDAP_DEFAULT_DISPLAY_NAME); self::$ldapUserFilter = OCP\Config::getAppValue('user_ldap', 'ldap_userlist_filter','objectClass=person'); + self::$ldapLoginFilter = OCP\Config::getAppValue('user_ldap', 'ldap_login_filter', '(uid=%uid)'); self::$ldapGroupDisplayName = OCP\Config::getAppValue('user_ldap', 'ldap_group_display_name', LDAP_GROUP_DISPLAY_NAME_ATTR); if(empty(self::$ldapBaseUsers)) { |