Browse Source
uses "yes" and "no" for config switch over stringified numbers
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
pull/15964/head
Arthur Schiwon
7 years ago
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
3 changed files with
7 additions and
7 deletions
-
apps/provisioning_api/lib/Controller/UsersController.php
-
apps/provisioning_api/tests/Controller/UsersControllerTest.php
-
settings/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); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -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; |
|
|
|
}); |
|
|
|
|
|
|
|
@ -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]); |
|
|
|
} |
|
|
|
|