Skip to content

use getsystemvalue-functions in Mailer.php - #38958

Merged
szaimen merged 2 commits into
masterfrom
enh/noid/use-getsystemvalue-mailer
Jun 26, 2023
Merged

use getsystemvalue-functions in Mailer.php#38958
szaimen merged 2 commits into
masterfrom
enh/noid/use-getsystemvalue-mailer

Conversation

@szaimen

Copy link
Copy Markdown
Contributor

@szaimenszaimen added bug 3. to review Waiting for reviews labels Jun 23, 2023
@szaimenszaimen added this to the Nextcloud 28 milestone Jun 23, 2023
@szaimen
szaimen requested review from a team, ArtificialOwl, come-nc, miaulalala and nfebe and removed request for a teamJune 23, 2023 09:08
@szaimen

Copy link
Copy Markdown
ContributorAuthor

/backport to stable27

@szaimen

Copy link
Copy Markdown
ContributorAuthor

/backport to stable26

@szaimen
szaimenforce-pushed the enh/noid/use-getsystemvalue-mailer branch from 9df6883 to 192ac56CompareJune 23, 2023 09:11
Signed-off-by: Simon L <szaimen@e.mail.de>
@szaimen
szaimenforce-pushed the enh/noid/use-getsystemvalue-mailer branch from 192ac56 to 76bedb8CompareJune 23, 2023 09:16
@@ -292,7 +292,7 @@ protected function getSmtpInstance(): EsmtpTransport {
// 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;

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe?

Suggested change
$mailSmtpsecure = ($this->config->getSystemValue('mail_smtpsecure', null) === 'ssl') ? true : null;
$mailSmtpsecure = ($this->config->getSystemValueString('mail_smtpsecure', '') === 'ssl') ? true : null;

$transport->setPassword($this->config->getSystemValueString('mail_smtppassword', ''));
}

$streamingOptions = $this->config->getSystemValue('mail_smtpstreamoptions', []);

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe?

Suggested change
$streamingOptions = $this->config->getSystemValue('mail_smtpstreamoptions', []);
$streamingOptions = (array)$this->config->getSystemValue('mail_smtpstreamoptions', []);

@szaimen
szaimen requested a review from kesselbJune 23, 2023 13:08
Signed-off-by: Simon L <szaimen@e.mail.de>
@szaimen
szaimen merged commit f7183c9 into masterJun 26, 2023
@szaimen
szaimen deleted the enh/noid/use-getsystemvalue-mailer branch June 26, 2023 08:23
@backportbot-nextcloud

Copy link
Copy Markdown

The backport to stable26 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable26
git pull origin stable26
# Create the new backport branch
git checkout -b fix/foo-stable26
# Cherry pick the change from the commit sha1 of the change against the default branch# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@szaimen

Copy link
Copy Markdown
ContributorAuthor

/backport to stable26

@backportbot-nextcloud

Copy link
Copy Markdown

The backport to stable26 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable26
git pull origin stable26
# Create the new backport branch
git checkout -b fix/foo-stable26
# Cherry pick the change from the commit sha1 of the change against the default branch# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@szaimen

Copy link
Copy Markdown
ContributorAuthor

#39006

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsbug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: Nextcloud 26.0.2 email notification error

3 participants

@szaimen@kesselb@come-nc