summaryrefslogtreecommitdiffstats
path: root/apps/user_ldap/appinfo
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2014-03-27 18:01:14 +0100
committerArthur Schiwon <blizzz@owncloud.com>2014-06-03 12:59:09 +0200
commit6d64d7ec3fb64d6b2f196d4008f59b64e5a50446 (patch)
tree830c0d7dc3c9b4feb10f261d2e41df8061296062 /apps/user_ldap/appinfo
parentd3e830e938fe85da2fd6d9912c26677034d952f7 (diff)
downloadnextcloud-server-6d64d7ec3fb64d6b2f196d4008f59b64e5a50446.tar.gz
nextcloud-server-6d64d7ec3fb64d6b2f196d4008f59b64e5a50446.zip
LDAP: put out fetching of user meta data into a fully tested class of its own and update them (mail, quota, etc.) directly after mapping. Fixes #7785 properly on master
Diffstat (limited to 'apps/user_ldap/appinfo')
-rw-r--r--apps/user_ldap/appinfo/app.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index c2cd295523e..b62f205a627 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -26,8 +26,14 @@ OCP\App::registerAdmin('user_ldap', 'settings');
$configPrefixes = OCA\user_ldap\lib\Helper::getServerConfigurationPrefixes(true);
$ldapWrapper = new OCA\user_ldap\lib\LDAP();
if(count($configPrefixes) === 1) {
+ $ocConfig = \OC::$server->getConfig();
+ $userManager = new OCA\user_ldap\lib\user\Manager($ocConfig,
+ new OCA\user_ldap\lib\FilesystemHelper(),
+ new OCA\user_ldap\lib\LogWrapper(),
+ new \OCP\Image(),
+ \OC::$server->getAvatarManager());
$connector = new OCA\user_ldap\lib\Connection($ldapWrapper, $configPrefixes[0]);
- $ldapAccess = new OCA\user_ldap\lib\Access($connector, $ldapWrapper);
+ $ldapAccess = new OCA\user_ldap\lib\Access($connector, $ldapWrapper, $userManager);
$userBackend = new OCA\user_ldap\USER_LDAP($ldapAccess);
$groupBackend = new OCA\user_ldap\GROUP_LDAP($ldapAccess);
} else if(count($configPrefixes) > 1) {