1
0
mirror of https://github.com/flarum/core.git synced 2025-08-08 17:36:38 +02:00

Add Mailgun region setting

Fixes #1834.
This commit is contained in:
Vladimir Vinogradov
2020-01-10 18:16:23 +01:00
committed by Franz Liedke
parent 809f353c52
commit 4c89e2eb77
5 changed files with 37 additions and 19 deletions

View File

@@ -19,8 +19,12 @@ class MailgunDriver implements DriverInterface
public function availableSettings(): array
{
return [
'mail_mailgun_secret', // the secret key
'mail_mailgun_domain', // the API base URL
'mail_mailgun_secret' => '', // the secret key
'mail_mailgun_domain' => '', // the API base URL
'mail_mailgun_region' => [ // region's endpoint
'api.mailgun.net' => 'US',
'api.eu.mailgun.net' => 'EU',
],
];
}
@@ -29,7 +33,8 @@ class MailgunDriver implements DriverInterface
return new MailgunTransport(
new Client(['connect_timeout' => 60]),
$settings->get('mail_mailgun_secret'),
$settings->get('mail_mailgun_domain')
$settings->get('mail_mailgun_domain'),
$settings->get('mail_mailgun_region')
);
}
}

View File

@@ -19,7 +19,7 @@ class MandrillDriver implements DriverInterface
public function availableSettings(): array
{
return [
'mail_mandrill_secret',
'mail_mandrill_secret' => '',
];
}

View File

@@ -19,9 +19,9 @@ class SesDriver implements DriverInterface
public function availableSettings(): array
{
return [
'mail_ses_key',
'mail_ses_secret',
'mail_ses_region',
'mail_ses_key' => '',
'mail_ses_secret' => '',
'mail_ses_region' => '',
];
}

View File

@@ -18,11 +18,11 @@ class SmtpDriver implements DriverInterface
public function availableSettings(): array
{
return [
'mail_host', // a hostname, IPv4 address or IPv6 wrapped in []
'mail_port', // a number, defaults to 25
'mail_encryption', // "tls" or "ssl"
'mail_username', // required
'mail_password', // required
'mail_host' => '', // a hostname, IPv4 address or IPv6 wrapped in []
'mail_port' => '', // a number, defaults to 25
'mail_encryption' => '', // "tls" or "ssl"
'mail_username' => '', // required
'mail_password' => '', // required
];
}