refs #21045 avoid getting/setting/displaying unlimited default quota …

…if not allowed

Signed-off-by: Julien Veyssier <eneiluj@posteo.net>

apps/provisioning_api/lib/Controller/AppConfigController.php

@@ -162,5 +162,12 @@ protected function verifyConfigKey(string $app, string $key, string $value) {
 		if ($app === 'core' && (strpos($key, 'public_') === 0 || strpos($key, 'remote_') === 0)) {
 			throw new \InvalidArgumentException('The given key can not be set');
 		}
+
+		if ($app === 'files'
+			&& $key === 'default_quota'
+			&& $value === 'none'
+			&& $this->config->getAppValue('files', 'allow_unlimited_quota', '1') === '0') {
+			throw new \InvalidArgumentException('The given key can not be set, unlimited quota is forbidden on this instance');
+		}
 	}
 }

apps/provisioning_api/lib/Controller/UsersController.php

@@ -800,7 +800,7 @@ public function editUser(string $userId, string $key, string $value): DataRespon
 					} else {
 						$maxQuota = (int) $this->config->getAppValue('files', 'max_quota', '-1');
 						if ($maxQuota !== -1 && $quota > $maxQuota) {
-							throw new OCSException('Invalid quota value '.$value, 102);
+							throw new OCSException('Invalid quota value. ' . $value . ' is exceeding the maximum quota', 102);
 						}
 						$quota = \OCP\Util::humanFileSize($quota);
 					}
@@ -809,7 +809,7 @@ public function editUser(string $userId, string $key, string $value): DataRespon
 				if ($quota === 'none') {
 					$allowUnlimitedQuota = $this->config->getAppValue('files', 'allow_unlimited_quota', '1') === '1';
 					if (!$allowUnlimitedQuota) {
-						throw new OCSException('Invalid quota value '.$value, 102);
+						throw new OCSException('Unlimited quota is forbidden on this instance', 102);
 					}
 				}
 				$targetUser->setQuota($quota);

apps/settings/src/views/Users.vue

@@ -273,7 +273,9 @@ export default {
 			// convert the preset array into objects
 			const quotaPreset = this.settings.quotaPreset.reduce((acc, cur) => acc.concat({ id: cur, label: cur }), [])
 			// add default presets
-			quotaPreset.unshift(this.unlimitedQuota)
+			if (this.settings.allowUnlimitedQuota) {
+				quotaPreset.unshift(this.unlimitedQuota)
+			}
 			return quotaPreset
 		},
 		// mapping saved values to objects