Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-12-04 18:48:07 +0300
committerMorris Jobke <hey@morrisjobke.de>2014-12-09 00:42:37 +0300
commit0d4f0ab87182cf2cb588bd3285fe41b46f26ee4d (patch)
tree68ee815c2f06e4f6ef049d56f65fdbf2cf8c4d18 /settings/users.php
parent2d5fc9c1a6beec15f04277ccf1408b17f04631e9 (diff)
reduce OC_Preferences, OC_Config and \OCP\Config usage
* files_encryption * files_versions * files_trashbin * tests * status.php * core * server container
Diffstat (limited to 'settings/users.php')
-rw-r--r--settings/users.php6
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;