Fix saving SMTP without encryption

This commit is contained in:
notCharles 2024-08-10 19:39:41 -04:00
parent 3158bdfef8
commit bad5409d9c

View File

@ -262,28 +262,27 @@ class Settings extends Page implements HasForms
->visible(fn (Get $get) => $get('MAIL_MAILER') === 'smtp') ->visible(fn (Get $get) => $get('MAIL_MAILER') === 'smtp')
->schema([ ->schema([
TextInput::make('MAIL_HOST') TextInput::make('MAIL_HOST')
->label('SMTP Host') ->label('Host')
->required() ->required()
->default(env('MAIL_HOST', config('mail.mailers.smtp.host'))), ->default(env('MAIL_HOST', config('mail.mailers.smtp.host'))),
TextInput::make('MAIL_PORT') TextInput::make('MAIL_PORT')
->label('SMTP Port') ->label('Port')
->required() ->required()
->numeric() ->numeric()
->minValue(1) ->minValue(1)
->maxValue(65535) ->maxValue(65535)
->default(env('MAIL_PORT', config('mail.mailers.smtp.port'))), ->default(env('MAIL_PORT', config('mail.mailers.smtp.port'))),
TextInput::make('MAIL_USERNAME') TextInput::make('MAIL_USERNAME')
->label('SMTP Username') ->label('Username')
->required() ->required()
->default(env('MAIL_USERNAME', config('mail.mailers.smtp.username'))), ->default(env('MAIL_USERNAME', config('mail.mailers.smtp.username'))),
TextInput::make('MAIL_PASSWORD') TextInput::make('MAIL_PASSWORD')
->label('SMTP Password') ->label('Password')
->password() ->password()
->revealable() ->revealable()
->default(env('MAIL_PASSWORD')), ->default(env('MAIL_PASSWORD')),
ToggleButtons::make('MAIL_ENCRYPTION') ToggleButtons::make('MAIL_ENCRYPTION')
->label('SMTP encryption') ->label('Encryption')
->required()
->inline() ->inline()
->options(['tls' => 'TLS', 'ssl' => 'SSL', '' => 'None']) ->options(['tls' => 'TLS', 'ssl' => 'SSL', '' => 'None'])
->default(env('MAIL_ENCRYPTION', config('mail.mailers.smtp.encryption', 'tls'))), ->default(env('MAIL_ENCRYPTION', config('mail.mailers.smtp.encryption', 'tls'))),
@ -293,15 +292,15 @@ class Settings extends Page implements HasForms
->visible(fn (Get $get) => $get('MAIL_MAILER') === 'mailgun') ->visible(fn (Get $get) => $get('MAIL_MAILER') === 'mailgun')
->schema([ ->schema([
TextInput::make('MAILGUN_DOMAIN') TextInput::make('MAILGUN_DOMAIN')
->label('Mailgun Domain') ->label('Domain')
->required() ->required()
->default(env('MAILGUN_DOMAIN', config('services.mailgun.domain'))), ->default(env('MAILGUN_DOMAIN', config('services.mailgun.domain'))),
TextInput::make('MAILGUN_SECRET') TextInput::make('MAILGUN_SECRET')
->label('Mailgun Secret') ->label('Secret')
->required() ->required()
->default(env('MAIL_USERNAME', config('services.mailgun.secret'))), ->default(env('MAIL_USERNAME', config('services.mailgun.secret'))),
TextInput::make('MAILGUN_ENDPOINT') TextInput::make('MAILGUN_ENDPOINT')
->label('Mailgun Endpoint') ->label('Endpoint')
->required() ->required()
->default(env('MAILGUN_ENDPOINT', config('services.mailgun.endpoint'))), ->default(env('MAILGUN_ENDPOINT', config('services.mailgun.endpoint'))),
]), ]),