diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2018-07-06 11:39:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-06 11:39:09 +0300 |
| commit | 3ade347b0d072a287dbc183d3651ff59fd36f537 (patch) | |
| tree | 2cf5886ebd2a0e385ee8bcff7c3863df00653572 /settings | |
| parent | 8969e100a0f6115319b10c656ffaf343d1aff11f (diff) | |
| parent | 6a0c54d5bfd70baeed2438ac05278a9b4cb73d88 (diff) | |
Merge pull request #9791 from nextcloud/3rdparty/noid/bump_swiftmailer
Upgrade to swiftmailer-6
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/Controller/CheckSetupController.php | 6 | ||||
| -rw-r--r-- | settings/templates/settings/admin/additional-mail.php | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php index ecbb9839c75..a301ecb1f66 100644 --- a/settings/Controller/CheckSetupController.php +++ b/settings/Controller/CheckSetupController.php @@ -523,6 +523,10 @@ Raw output return []; } + protected function isPhpMailerUsed(): bool { + return $this->config->getSystemValue('mail_smtpmode', 'php') === 'php'; + } + /** * @return DataResponse */ @@ -557,6 +561,8 @@ Raw output 'missingIndexes' => $this->hasMissingIndexes(), 'isSqliteUsed' => $this->isSqliteUsed(), 'databaseConversionDocumentation' => $this->urlGenerator->linkToDocs('admin-db-conversion'), + 'isPhpMailerUsed' => $this->isPhpMailerUsed(), + 'mailSettingsDocumentation' => $this->urlGenerator->getAbsoluteURL('index.php/settings/admin') ] ); } diff --git a/settings/templates/settings/admin/additional-mail.php b/settings/templates/settings/admin/additional-mail.php index adcc5293ff1..1e0b458f60f 100644 --- a/settings/templates/settings/admin/additional-mail.php +++ b/settings/templates/settings/admin/additional-mail.php @@ -38,7 +38,6 @@ $mail_smtpsecure = [ ]; $mail_smtpmode = [ - ['php', 'PHP'], ['smtp', 'SMTP'], ]; if ($_['sendmail_is_available']) { |