banquise/pelican-panel-mirror
3
0
Fork 1
mirror of https://github.com/pelican-dev/panel.git synced 2025-05-19 21:04:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix SMTP scheme/ encryption (#1120)

Browse Source
This commit is contained in:
Boy132 2025-03-21 08:42:42 +01:00 committed by GitHub
parent adca50a372
commit 82b0aff105
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/Filament/Admin/Pages/Settings.php
View File

@ -308,7 +308,7 @@ class Settings extends Page implements HasForms
'mail.mailers.smtp.port' => config('mail.mailers.smtp.port'), 'mail.mailers.smtp.port' => config('mail.mailers.smtp.port'),
'mail.mailers.smtp.username' => config('mail.mailers.smtp.username'), 'mail.mailers.smtp.username' => config('mail.mailers.smtp.username'),
'mail.mailers.smtp.password' => config('mail.mailers.smtp.password'), 'mail.mailers.smtp.password' => config('mail.mailers.smtp.password'),
'mail.mailers.smtp.encryption' => config('mail.mailers.smtp.encryption'), 'mail.mailers.smtp.scheme' => config('mail.mailers.smtp.scheme'),
'mail.from.address' => config('mail.from.address'), 'mail.from.address' => config('mail.from.address'),
'mail.from.name' => config('mail.from.name'), 'mail.from.name' => config('mail.from.name'),
'services.mailgun.domain' => config('services.mailgun.domain'), 'services.mailgun.domain' => config('services.mailgun.domain'),
@ -324,7 +324,7 @@ class Settings extends Page implements HasForms
'mail.mailers.smtp.port' => $get('MAIL_PORT'), 'mail.mailers.smtp.port' => $get('MAIL_PORT'),
'mail.mailers.smtp.username' => $get('MAIL_USERNAME'), 'mail.mailers.smtp.username' => $get('MAIL_USERNAME'),
'mail.mailers.smtp.password' => $get('MAIL_PASSWORD'), 'mail.mailers.smtp.password' => $get('MAIL_PASSWORD'),
'mail.mailers.smtp.encryption' => $get('MAIL_SCHEME'), 'mail.mailers.smtp.scheme' => $get('MAIL_SCHEME'),
'mail.from.address' => $get('MAIL_FROM_ADDRESS'), 'mail.from.address' => $get('MAIL_FROM_ADDRESS'),
'mail.from.name' => $get('MAIL_FROM_NAME'), 'mail.from.name' => $get('MAIL_FROM_NAME'),
'services.mailgun.domain' => $get('MAILGUN_DOMAIN'), 'services.mailgun.domain' => $get('MAILGUN_DOMAIN'),
@ -388,22 +388,16 @@ class Settings extends Page implements HasForms
->revealable() ->revealable()
->default(env('MAIL_PASSWORD')), ->default(env('MAIL_PASSWORD')),
ToggleButtons::make('MAIL_SCHEME') ToggleButtons::make('MAIL_SCHEME')
->label(trans('admin/setting.mail.smtp.encryption')) ->label(trans('admin/setting.mail.smtp.scheme'))
->inline() ->inline()
->options([ ->options([
'tls' => trans('admin/setting.mail.smtp.tls'), 'smtp' => 'SMTP',
'ssl' => trans('admin/setting.mail.smtp.ssl'), 'smtps' => 'SMTPS',
'' => trans('admin/setting.mail.smtp.none'),
]) ])
->default(env('MAIL_SCHEME', config('mail.mailers.smtp.encryption', 'tls'))) ->default(env('MAIL_SCHEME', config('mail.mailers.smtp.scheme')))
->live() ->live()
->afterStateUpdated(function ($state, Set $set) { ->afterStateUpdated(function ($state, Set $set) {
$port = match ($state) { $set('MAIL_PORT', $state === 'smtps' ? 587 : 2525);
'tls' => 587,
'ssl' => 465,
default => 25,
};
$set('MAIL_PORT', $port);
}), }),
]), ]),
Section::make(trans('admin/setting.mail.mailgun.mailgun_title')) Section::make(trans('admin/setting.mail.mailgun.mailgun_title'))

2
config/mail.php
View File

@ -42,7 +42,7 @@ return [
'smtp' => [ 'smtp' => [
'transport' => 'smtp', 'transport' => 'smtp',
'scheme' => env('MAIL_SCHEME', env('MAIL_ENCRYPTION')), 'scheme' => env('MAIL_SCHEME', env('MAIL_ENCRYPTION') === 'ssl' || env('MAIL_ENCRYPTION') === 'tls' ? 'smtps' : 'smtp'),
'url' => env('MAIL_URL'), 'url' => env('MAIL_URL'),
'host' => env('MAIL_HOST', '127.0.0.1'), 'host' => env('MAIL_HOST', '127.0.0.1'),
'port' => env('MAIL_PORT', 2525), 'port' => env('MAIL_PORT', 2525),

5
lang/en/admin/setting.php
View File

@ -59,10 +59,7 @@ return [
'port' => 'Port', 'port' => 'Port',
'username' => 'Username', 'username' => 'Username',
'password' => 'Password', 'password' => 'Password',
'encryption' => 'Encryption', 'scheme' => 'Scheme',
'ssl' => 'SSL',
'tls' => 'TLS',
'none' => 'None',
], ],
'mailgun' => [ 'mailgun' => [
'mailgun_title' => 'Mailgun Configuration', 'mailgun_title' => 'Mailgun Configuration',