mirror of
https://github.com/nextcloud/server.git
synced 2026-06-09 00:32:29 -04:00
use getsystemvalue-functions in Mailer.php
Signed-off-by: Simon L <szaimen@e.mail.de>
This commit is contained in:
parent
9c904e85f7
commit
c10f3e31e8
1 changed files with 6 additions and 6 deletions
|
|
@ -293,8 +293,8 @@ class Mailer implements IMailer {
|
|||
// either null or true - if nothing is passed, let the symfony mailer figure out the configuration by itself
|
||||
$mailSmtpsecure = ($this->config->getSystemValue('mail_smtpsecure', null) === 'ssl') ? true : null;
|
||||
$transport = new EsmtpTransport(
|
||||
$this->config->getSystemValue('mail_smtphost', '127.0.0.1'),
|
||||
(int)$this->config->getSystemValue('mail_smtpport', 25),
|
||||
$this->config->getSystemValueString('mail_smtphost', '127.0.0.1'),
|
||||
$this->config->getSystemValueInt('mail_smtpport', 25),
|
||||
$mailSmtpsecure,
|
||||
null,
|
||||
$this->logger
|
||||
|
|
@ -302,11 +302,11 @@ class Mailer implements IMailer {
|
|||
/** @var SocketStream $stream */
|
||||
$stream = $transport->getStream();
|
||||
/** @psalm-suppress InternalMethod */
|
||||
$stream->setTimeout($this->config->getSystemValue('mail_smtptimeout', 10));
|
||||
$stream->setTimeout($this->config->getSystemValueInt('mail_smtptimeout', 10));
|
||||
|
||||
if ($this->config->getSystemValue('mail_smtpauth', false)) {
|
||||
$transport->setUsername($this->config->getSystemValue('mail_smtpname', ''));
|
||||
$transport->setPassword($this->config->getSystemValue('mail_smtppassword', ''));
|
||||
if ($this->config->getSystemValueBool('mail_smtpauth', false)) {
|
||||
$transport->setUsername($this->config->getSystemValueString('mail_smtpname', ''));
|
||||
$transport->setPassword($this->config->getSystemValueString('mail_smtppassword', ''));
|
||||
}
|
||||
|
||||
$streamingOptions = $this->config->getSystemValue('mail_smtpstreamoptions', []);
|
||||
|
|
|
|||
Loading…
Reference in a new issue