Alex/Pterodactyl-Panel
1
1
Fork 1
mirror of https://github.com/pterodactyl/panel.git synced 2024-11-22 09:02:28 +01:00
Code Issues Releases Wiki Activity

app: fix email config keys

Browse Source
This commit is contained in:
Matthew Penner 2022-12-12 14:21:47 -07:00
parent 3432cadd4a
commit 63a179d7f3
No known key found for this signature in database
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Console/Commands/Environment/EmailSettingsCommand.php
View File

@ -67,12 +67,6 @@ class EmailSettingsCommand extends Command
$this->config->get('mail.from.name') $this->config->get('mail.from.name')
); );
$this->variables['MAIL_ENCRYPTION'] = $this->option('encryption') ?? $this->choice(
trans('command/messages.environment.mail.ask_encryption'),
['tls' => 'TLS', 'ssl' => 'SSL', '' => 'None'],
$this->config->get('mail.encryption', 'tls')
);
$this->writeToEnvironment($this->variables); $this->writeToEnvironment($this->variables);
$this->line('Updating stored environment configuration file.'); $this->line('Updating stored environment configuration file.');
@ -102,6 +96,12 @@ class EmailSettingsCommand extends Command
$this->variables['MAIL_PASSWORD'] = $this->option('password') ?? $this->secret( $this->variables['MAIL_PASSWORD'] = $this->option('password') ?? $this->secret(
trans('command/messages.environment.mail.ask_smtp_password') trans('command/messages.environment.mail.ask_smtp_password')
); );
$this->variables['MAIL_ENCRYPTION'] = $this->option('encryption') ?? $this->choice(
trans('command/messages.environment.mail.ask_encryption'),
['tls' => 'TLS', 'ssl' => 'SSL', '' => 'None'],
$this->config->get('mail.mailers.smtp.encryption', 'tls')
);
} }
/** /**

10
app/Providers/SettingsServiceProvider.php
View File

@ -37,13 +37,13 @@ class SettingsServiceProvider extends ServiceProvider
* when using the SMTP driver. * when using the SMTP driver.
*/ */
protected array $emailKeys = [ protected array $emailKeys = [
'mail:host', 'mail:mailers:smtp:host',
'mail:port', 'mail:mailers:smtp:port',
'mail:mailers:smtp:encryption',
'mail:mailers:smtp:username',
'mail:mailers:smtp:password',
'mail:from:address', 'mail:from:address',
'mail:from:name', 'mail:from:name',
'mail:encryption',
'mail:username',
'mail:password',
]; ];
/** /**

22
resources/views/admin/settings/mail.blade.php
View File

@ -38,14 +38,14 @@
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label class="control-label">SMTP Host</label> <label class="control-label">SMTP Host</label>
<div> <div>
<input required type="text" class="form-control" name="mail:host" value="{{ old('mail:host', config('mail.mailers.smtp.host')) }}" /> <input required type="text" class="form-control" name="mail:mailers:smtp:host" value="{{ old('mail:mailers:smtp:host', config('mail.mailers.smtp.host')) }}" />
<p class="text-muted small">Enter the SMTP server address that mail should be sent through.</p> <p class="text-muted small">Enter the SMTP server address that mail should be sent through.</p>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<label class="control-label">SMTP Port</label> <label class="control-label">SMTP Port</label>
<div> <div>
<input required type="number" class="form-control" name="mail:port" value="{{ old('mail:port', config('mail.mailers.smtp.port')) }}" /> <input required type="number" class="form-control" name="mail:mailers:smtp:port" value="{{ old('mail:mailers:smtp:port', config('mail.mailers.smtp.port')) }}" />
<p class="text-muted small">Enter the SMTP server port that mail should be sent through.</p> <p class="text-muted small">Enter the SMTP server port that mail should be sent through.</p>
</div> </div>
</div> </div>
@ -53,9 +53,9 @@
<label class="control-label">Encryption</label> <label class="control-label">Encryption</label>
<div> <div>
@php @php
$encryption = old('mail:encryption', config('mail.mailers.smtp.encryption')); $encryption = old('mail:mailers:smtp:encryption', config('mail.mailers.smtp.encryption'));
@endphp @endphp
<select name="mail:encryption" class="form-control"> <select name="mail:mailers:smtp:encryption" class="form-control">
<option value="" @if($encryption === '') selected @endif>None</option> <option value="" @if($encryption === '') selected @endif>None</option>
<option value="tls" @if($encryption === 'tls') selected @endif>Transport Layer Security (TLS)</option> <option value="tls" @if($encryption === 'tls') selected @endif>Transport Layer Security (TLS)</option>
<option value="ssl" @if($encryption === 'ssl') selected @endif>Secure Sockets Layer (SSL)</option> <option value="ssl" @if($encryption === 'ssl') selected @endif>Secure Sockets Layer (SSL)</option>
@ -66,14 +66,14 @@
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label class="control-label">Username <span class="field-optional"></span></label> <label class="control-label">Username <span class="field-optional"></span></label>
<div> <div>
<input type="text" class="form-control" name="mail:username" value="{{ old('mail:username', config('mail.mailers.smtp.username')) }}" /> <input type="text" class="form-control" name="mail:mailers:smtp:username" value="{{ old('mail:mailers:smtp:username', config('mail.mailers.smtp.username')) }}" />
<p class="text-muted small">The username to use when connecting to the SMTP server.</p> <p class="text-muted small">The username to use when connecting to the SMTP server.</p>
</div> </div>
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label class="control-label">Password <span class="field-optional"></span></label> <label class="control-label">Password <span class="field-optional"></span></label>
<div> <div>
<input type="password" class="form-control" name="mail:password"/> <input type="password" class="form-control" name="mail:mailers:smtp:password"/>
<p class="text-muted small">The password to use in conjunction with the SMTP username. Leave blank to continue using the existing password. To set the password to an empty value enter <code>!e</code> into the field.</p> <p class="text-muted small">The password to use in conjunction with the SMTP username. Leave blank to continue using the existing password. To set the password to an empty value enter <code>!e</code> into the field.</p>
</div> </div>
</div> </div>
@ -120,11 +120,11 @@
url: '/admin/settings/mail', url: '/admin/settings/mail',
contentType: 'application/json', contentType: 'application/json',
data: JSON.stringify({ data: JSON.stringify({
'mail:host': $('input[name="mail:host"]').val(), 'mail:mailers:smtp:host': $('input[name="mail:mailers:smtp:host"]').val(),
'mail:port': $('input[name="mail:port"]').val(), 'mail:mailers:smtp:port': $('input[name="mail:mailers:smtp:port"]').val(),
'mail:encryption': $('select[name="mail:encryption"]').val(), 'mail:mailers:smtp:encryption': $('select[name="mail:mailers:smtp:encryption"]').val(),
'mail:username': $('input[name="mail:username"]').val(), 'mail:mailers:smtp:username': $('input[name="mail:mailers:smtp:username"]').val(),
'mail:password': $('input[name="mail:password"]').val(), 'mail:mailers:smtp:password': $('input[name="mail:mailers:smtp:password"]').val(),
'mail:from:address': $('input[name="mail:from:address"]').val(), 'mail:from:address': $('input[name="mail:from:address"]').val(),
'mail:from:name': $('input[name="mail:from:name"]').val() 'mail:from:name': $('input[name="mail:from:name"]').val()
}), }),