diff options
Diffstat (limited to 'apps/settings/lib/Controller/UsersController.php')
| -rw-r--r-- | apps/settings/lib/Controller/UsersController.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apps/settings/lib/Controller/UsersController.php b/apps/settings/lib/Controller/UsersController.php index 7e323baf300..f78fa7dd9b8 100644 --- a/apps/settings/lib/Controller/UsersController.php +++ b/apps/settings/lib/Controller/UsersController.php @@ -243,7 +243,12 @@ class UsersController extends Controller { /* QUOTAS PRESETS */ $quotaPreset = $this->parseQuotaPreset($this->config->getAppValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB')); - $defaultQuota = $this->config->getAppValue('files', 'default_quota', 'none'); + $allowUnlimitedQuota = $this->config->getAppValue('files', 'allow_unlimited_quota', '1') === '1'; + if (!$allowUnlimitedQuota && count($quotaPreset) > 0) { + $defaultQuota = $this->config->getAppValue('files', 'default_quota', $quotaPreset[0]); + } else { + $defaultQuota = $this->config->getAppValue('files', 'default_quota', 'none'); + } $event = new BeforeTemplateRenderedEvent(); $this->dispatcher->dispatch('OC\Settings\Users::loadAdditionalScripts', $event); @@ -260,6 +265,7 @@ class UsersController extends Controller { $serverData['isAdmin'] = $this->isAdmin; $serverData['sortGroups'] = $sortGroupsBy; $serverData['quotaPreset'] = $quotaPreset; + $serverData['allowUnlimitedQuota'] = $allowUnlimitedQuota; $serverData['userCount'] = $userCount; $serverData['languages'] = $languages; $serverData['defaultLanguage'] = $this->config->getSystemValue('default_language', 'en'); |