diff options
| author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2017-10-31 19:42:17 +0100 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2017-11-09 11:10:56 +0100 |
| commit | 59c05d54472aeed458611341970a72e42e5b9e6a (patch) | |
| tree | d8503e2c9a080d068c4bb6b7a3e7cf7bfa1e1a06 /apps/user_ldap/lib/User/Manager.php | |
| parent | ef3cd329167ce236b7f7a09293be439623e585c5 (diff) | |
| download | nextcloud-server-59c05d54472aeed458611341970a72e42e5b9e6a.tar.gz nextcloud-server-59c05d54472aeed458611341970a72e42e5b9e6a.zip | |
move LDAP user attributes "sync" to background (except for ajax jobs)
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'apps/user_ldap/lib/User/Manager.php')
| -rw-r--r-- | apps/user_ldap/lib/User/Manager.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/user_ldap/lib/User/Manager.php b/apps/user_ldap/lib/User/Manager.php index f04106b7fbf..b04a321652c 100644 --- a/apps/user_ldap/lib/User/Manager.php +++ b/apps/user_ldap/lib/User/Manager.php @@ -28,6 +28,7 @@ namespace OCA\User_LDAP\User; use OC\Cache\CappedMemoryCache; +use OCA\User_LDAP\Access; use OCA\User_LDAP\LogWrapper; use OCA\User_LDAP\FilesystemHelper; use OCP\IAvatarManager; @@ -167,8 +168,9 @@ class Manager { * @return string[] */ public function getAttributes($minimal = false) { - $attributes = array('dn', 'uid', 'samaccountname', 'memberof'); + $attributes = array_merge(Access::UUID_ATTRIBUTES, ['dn', 'uid', 'samaccountname', 'memberof']); $possible = array( + $this->access->getConnection()->ldapExpertUUIDUserAttr, $this->access->getConnection()->ldapQuotaAttribute, $this->access->getConnection()->ldapEmailAttribute, $this->access->getConnection()->ldapUserDisplayName, |