Merge pull request #30755 from owncloud/backport/bugfix/owncloud#19811

fixes #19811 - only use existing key words 'default' and 'none' as ma…
owncloud · Mar 13, 2018 · d890c82 · d890c82
2 parents f833582 + 249ebb6
commit d890c82
Show file tree

Hide file tree

Showing 2 changed files with 190 additions and 175 deletions.
diff --git a/apps/provisioning_api/lib/Users.php b/apps/provisioning_api/lib/Users.php
@@ -277,7 +277,7 @@ public function editUser($parameters) {
 				break;
 			case 'quota':
 				$quota = $parameters['_put']['value'];
-				if($quota !== 'none' and $quota !== 'default') {
+				if($quota !== 'none' && $quota !== 'default') {
 					if (is_numeric($quota)) {
 						$quota = floatval($quota);
 					} else {
@@ -286,13 +286,7 @@ public function editUser($parameters) {
 					if ($quota === false) {
 						return new Result(null, 103, "Invalid quota value {$parameters['_put']['value']}");
 					}
-					if($quota === 0) {
-						$quota = 'default';
-					}else if($quota === -1) {
-						$quota = 'none';
-					} else {
-						$quota = Util::humanFileSize($quota);
-					}
+					$quota = Util::humanFileSize($quota);
 				}
 				$targetUser->setQuota($quota);
 				break;