upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

uses "yes" and "no" for config switch over stringified numbers

Browse source 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2019-06-21 10:18:44 +02:00
parent 05b3288fdd
commit 29449f85b6
No known key found for this signature in database
GPG key ID: 7424F1874854DF23
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/provisioning_api/lib/Controller/UsersController.php
View file

@ -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);
}

6
apps/provisioning_api/tests/Controller/UsersControllerTest.php
View file

@ -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;
});

4
settings/Controller/UsersController.php
View file

@ -246,8 +246,8 @@ class UsersController extends Controller {
// Settings
$serverData['defaultQuota'] = $defaultQuota;
$serverData['canChangePassword'] = $canChangePassword;
$serverData['newUserGenerateUserID'] = $this->config->getAppValue('settings', 'newUser.generateUserID', '0') === '1';
$serverData['newUserRequireEmail'] = $this->config->getAppValue('settings', 'newUser.requireEmail', '0') === '1';
$serverData['newUserGenerateUserID'] = $this->config->getAppValue('core', 'newUser.generateUserID', 'no') === 'yes';
$serverData['newUserRequireEmail'] = $this->config->getAppValue('core', 'newUser.requireEmail', 'no') === 'yes';
return new TemplateResponse('settings', 'settings-vue', ['serverData' => $serverData]);
}