diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-12-09 09:36:38 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-12-09 09:36:38 +0100 |
| commit | c36bac3abdd4b41620bdebbc3391612aac620fb8 (patch) | |
| tree | 81367a95e82769d78f862426b37e015a665642ea /settings/users.php | |
| parent | 8f8f9deb66af0e32c508bbca033573824b1388f5 (diff) | |
| parent | 9a7362dd0d4e0f738089302329ce10817377433e (diff) | |
| download | nextcloud-server-c36bac3abdd4b41620bdebbc3391612aac620fb8.tar.gz nextcloud-server-c36bac3abdd4b41620bdebbc3391612aac620fb8.zip | |
Merge pull request #12406 from owncloud/drop-getApps-getUsers
Config cleanup - OC_Preferences refactoring
Diffstat (limited to 'settings/users.php')
| -rw-r--r-- | settings/users.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/settings/users.php b/settings/users.php index 85f160a1552..3da8017b883 100644 --- a/settings/users.php +++ b/settings/users.php @@ -21,6 +21,8 @@ $users = array(); $userManager = \OC_User::getManager(); $groupManager = \OC_Group::getManager(); +$config = \OC::$server->getConfig(); + $isAdmin = OC_User::isAdminUser(OC_User::getUser()); $groupsInfo = new \OC\Group\MetaData(OC_User::getUser(), $isAdmin, $groupManager); @@ -28,7 +30,7 @@ $groupsInfo->setSorting($groupsInfo::SORT_USERCOUNT); list($adminGroup, $groups) = $groupsInfo->get(); $recoveryAdminEnabled = OC_App::isEnabled('files_encryption') && - OC_Appconfig::getValue( 'files_encryption', 'recoveryAdminEnabled' ); + $config->getAppValue( 'files_encryption', 'recoveryAdminEnabled', null ); if($isAdmin) { $accessibleUsers = OC_User::getDisplayNames('', 30); @@ -59,7 +61,7 @@ $defaultQuotaIsUserDefined=array_search($defaultQuota, $quotaPreset)===false // load users and quota foreach($accessibleUsers as $uid => $displayName) { - $quota = OC_Preferences::getValue($uid, 'files', 'quota', 'default'); + $quota = $config->getUserValue($uid, 'files', 'quota', 'default'); $isQuotaUserDefined = array_search($quota, $quotaPreset) === false && array_search($quota, array('none', 'default')) === false; |