dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

refactor(email): streamline SMTP and resend settings logic for improved clarity

Browse Source
This commit is contained in:
Andras Bacsai
2025-06-24 18:27:09 +02:00
parent 5023eb0f04
commit bcddba3569
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Livewire/Notifications/Email.php
View File

@@ -254,10 +254,9 @@ class Email extends Component
'smtpEncryption.required' => 'Encryption type is required.', 'smtpEncryption.required' => 'Encryption type is required.',
]); ]);
$this->settings->resend_enabled = false; if ($this->smtpEnabled) {
$this->settings->use_instance_email_settings = false; $this->settings->resend_enabled = $this->resendEnabled = false;
$this->resendEnabled = false; }
$this->useInstanceEmailSettings = false;
$this->settings->smtp_enabled = $this->smtpEnabled; $this->settings->smtp_enabled = $this->smtpEnabled;
$this->settings->smtp_from_address = $this->smtpFromAddress; $this->settings->smtp_from_address = $this->smtpFromAddress;
@@ -293,11 +292,9 @@ class Email extends Component
'smtpFromAddress.email' => 'Please enter a valid email address.', 'smtpFromAddress.email' => 'Please enter a valid email address.',
'smtpFromName.required' => 'From Name is required.', 'smtpFromName.required' => 'From Name is required.',
]); ]);
if ($this->resendEnabled) {
$this->settings->smtp_enabled = false; $this->settings->smtp_enabled = $this->smtpEnabled = false;
$this->settings->use_instance_email_settings = false; }
$this->smtpEnabled = false;
$this->useInstanceEmailSettings = false;
$this->settings->resend_enabled = $this->resendEnabled; $this->settings->resend_enabled = $this->resendEnabled;
$this->settings->resend_api_key = $this->resendApiKey; $this->settings->resend_api_key = $this->resendApiKey;