upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-27 01:00:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

Merge pull request #49891 from nextcloud/refactor/settings/mail-settings-parameters

Browse source
This commit is contained in:
John Molakvoæ 2025-01-07 16:59:02 +01:00 committed by GitHub
commit cd236c7941
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 28 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
apps/settings/lib/Controller/MailSettingsController.php
View file

@ -44,34 +44,37 @@ class MailSettingsController extends Controller {
/**
* Sets the email settings
*
* @param string $mail_domain
* @param string $mail_from_address
* @param string $mail_smtpmode
* @param string $mail_smtpsecure
* @param string $mail_smtphost
* @param int $mail_smtpauth
* @param string $mail_smtpport
* @return DataResponse
*/
#[AuthorizedAdminSetting(settings: Overview::class)]
#[PasswordConfirmationRequired]
public function setMailSettings($mail_domain,
$mail_from_address,
$mail_smtpmode,
$mail_smtpsecure,
$mail_smtphost,
$mail_smtpauth,
$mail_smtpport,
$mail_sendmailmode) {
$params = get_defined_vars();
$configs = [];
foreach ($params as $key => $value) {
public function setMailSettings(
string $mail_domain,
string $mail_from_address,
string $mail_smtpmode,
string $mail_smtpsecure,
string $mail_smtphost,
?string $mail_smtpauth,
string $mail_smtpport,
string $mail_sendmailmode,
): DataResponse {
$mail_smtpauth = $mail_smtpauth == '1';
$configs = [
'mail_domain' => $mail_domain,
'mail_from_address' => $mail_from_address,
'mail_smtpmode' => $mail_smtpmode,
'mail_smtpsecure' => $mail_smtpsecure,
'mail_smtphost' => $mail_smtphost,
'mail_smtpauth' => $mail_smtpauth,
'mail_smtpport' => $mail_smtpport,
'mail_sendmailmode' => $mail_sendmailmode,
];
foreach ($configs as $key => $value) {
$configs[$key] = empty($value) ? null : $value;
}
// Delete passwords from config in case no auth is specified
if ($params['mail_smtpauth'] !== 1) {
if (!$mail_smtpauth) {
$configs['mail_smtpname'] = null;
$configs['mail_smtppassword'] = null;
}

8
apps/settings/tests/Controller/MailSettingsControllerTest.php
View file

@ -70,7 +70,7 @@ class MailSettingsControllerTest extends \Test\TestCase {
'mail_smtphost' => 'mx.nextcloud.org',
'mail_smtpauth' => 1,
'mail_smtpport' => '25',
'mail_sendmailmode' => null,
'mail_sendmailmode' => 'smtp',
]],
[[
'mail_domain' => 'nextcloud.com',
@ -82,7 +82,7 @@ class MailSettingsControllerTest extends \Test\TestCase {
'mail_smtpport' => '25',
'mail_smtpname' => null,
'mail_smtppassword' => null,
'mail_sendmailmode' => null,
'mail_sendmailmode' => 'smtp',
]]
);
@ -95,7 +95,7 @@ class MailSettingsControllerTest extends \Test\TestCase {
'mx.nextcloud.org',
1,
'25',
null
'smtp'
);
$this->assertSame(Http::STATUS_OK, $response->getStatus());
@ -108,7 +108,7 @@ class MailSettingsControllerTest extends \Test\TestCase {
'mx.nextcloud.org',
0,
'25',
null
'smtp'
);
$this->assertSame(Http::STATUS_OK, $response->getStatus());
}