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

Merge pull request #43789 from nextcloud/backport/39607/stable27

Browse source
This commit is contained in:
John Molakvoæ 2024-02-29 11:36:12 +01:00 committed by GitHub
commit 7b9fed1cb5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/settings/templates/settings/admin/additional-mail.php
View file

@ -45,7 +45,7 @@ if ($_['mail_smtpmode'] === 'qmail') {
$mail_sendmailmode = [
'smtp' => 'smtp (-bs)',
'pipe' => 'pipe (-t)'
'pipe' => 'pipe (-t -i)'
];
?>

12
lib/private/Mail/Mailer.php
View file

@ -350,14 +350,10 @@ class Mailer implements IMailer {
break;
}
switch ($this->config->getSystemValueString('mail_sendmailmode', 'smtp')) {
case 'pipe':
$binaryParam = ' -t';
break;
default:
$binaryParam = ' -bs';
break;
}
$binaryParam = match ($this->config->getSystemValueString('mail_sendmailmode', 'smtp')) {
'pipe' => ' -t -i',
default => ' -bs',
};
return new SendmailTransport($binaryPath . $binaryParam, null, $this->logger);
}

2
tests/lib/Mail/MailerTest.php
View file

@ -72,7 +72,7 @@ class MailerTest extends TestCase {
public function sendmailModeProvider(): array {
return [
'smtp' => ['smtp', ' -bs'],
'pipe' => ['pipe', ' -t'],
'pipe' => ['pipe', ' -t -i'],
];
}