summaryrefslogtreecommitdiffstats
path: root/apps/provisioning_api
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2019-06-21 10:18:44 +0200
committerArthur Schiwon <blizzz@arthur-schiwon.de>2019-06-21 10:22:12 +0200
commit29449f85b688deb1f103f3f67993475a040b4d80 (patch)
treed559843031dd09b030b68cc3b5719e973ddc4296 /apps/provisioning_api
parent05b3288fdd5c863a328b919b10cfe604695a4b45 (diff)
downloadnextcloud-server-29449f85b688deb1f103f3f67993475a040b4d80.tar.gz
nextcloud-server-29449f85b688deb1f103f3f67993475a040b4d80.zip
uses "yes" and "no" for config switch over stringified numbers
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'apps/provisioning_api')
-rw-r--r--apps/provisioning_api/lib/Controller/UsersController.php4
-rw-r--r--apps/provisioning_api/tests/Controller/UsersControllerTest.php6
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php
index 28ab99a0ee0..252db66c35e 100644
--- a/apps/provisioning_api/lib/Controller/UsersController.php
+++ b/apps/provisioning_api/lib/Controller/UsersController.php
@@ -237,7 +237,7 @@ class UsersController extends AUserData {
$isAdmin = $this->groupManager->isAdmin($user->getUID());
$subAdminManager = $this->groupManager->getSubAdmin();
- if(empty($userid) && $this->config->getAppValue('settings', 'newUser.generateUserID', '0') === '1') {
+ if(empty($userid) && $this->config->getAppValue('core', 'newUser.generateUserID', 'no') === 'yes') {
$userid = $this->createNewUserId();
}
@@ -293,7 +293,7 @@ class UsersController extends AUserData {
$generatePasswordResetToken = true;
}
- if ($email === '' && $this->config->getAppValue('settings', 'newUser.requireEmail', '0') === '1') {
+ if ($email === '' && $this->config->getAppValue('core', 'newUser.requireEmail', 'no') === 'yes') {
throw new OCSException('Required email address was not provided', 110);
}
diff --git a/apps/provisioning_api/tests/Controller/UsersControllerTest.php b/apps/provisioning_api/tests/Controller/UsersControllerTest.php
index eaee0380f78..63f9d4c376a 100644
--- a/apps/provisioning_api/tests/Controller/UsersControllerTest.php
+++ b/apps/provisioning_api/tests/Controller/UsersControllerTest.php
@@ -428,7 +428,7 @@ class UsersControllerTest extends TestCase {
->method('getAppValue')
->willReturnCallback(function($appid, $key, $default) {
if($key === 'newUser.generateUserID') {
- return true;
+ return 'yes';
}
return null;
});
@@ -483,7 +483,7 @@ class UsersControllerTest extends TestCase {
->method('getAppValue')
->willReturnCallback(function($appid, $key, $default) {
if($key === 'newUser.generateUserID') {
- return '1';
+ return 'yes';
}
return null;
});
@@ -526,7 +526,7 @@ class UsersControllerTest extends TestCase {
->method('getAppValue')
->willReturnCallback(function($appid, $key, $default) {
if($key === 'newUser.requireEmail') {
- return '1';
+ return 'yes';
}
return null;
});