From d4976c6eb6dc8c3340276764dfe023f216e152b8 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 20 Jun 2023 20:40:19 +0200 Subject: [PATCH] fix --- .../Livewire/Notifications/EmailSettings.php | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/app/Http/Livewire/Notifications/EmailSettings.php b/app/Http/Livewire/Notifications/EmailSettings.php index 88004bea5..ed39ad976 100644 --- a/app/Http/Livewire/Notifications/EmailSettings.php +++ b/app/Http/Livewire/Notifications/EmailSettings.php @@ -42,18 +42,22 @@ class EmailSettings extends Component public function copyFromInstanceSettings() { $settings = InstanceSettings::get(); - $this->model->smtp->enabled = true; - $this->model->smtp->from_address = $settings->smtp->from_address; - $this->model->smtp->from_name = $settings->smtp->from_name; - $this->model->smtp->recipients = $settings->smtp->recipients; - $this->model->smtp->host = $settings->smtp->host; - $this->model->smtp->port = $settings->smtp->port; - $this->model->smtp->encryption = $settings->smtp->encryption; - $this->model->smtp->username = $settings->smtp->username; - $this->model->smtp->password = $settings->smtp->password; - $this->model->smtp->timeout = $settings->smtp->timeout; - $this->model->smtp->test_recipients = $settings->smtp->test_recipients; - $this->saveModel(); + if ($settings->smtp->enabled) { + $this->model->smtp->enabled = true; + $this->model->smtp->from_address = $settings->smtp->from_address; + $this->model->smtp->from_name = $settings->smtp->from_name; + $this->model->smtp->recipients = $settings->smtp->recipients; + $this->model->smtp->host = $settings->smtp->host; + $this->model->smtp->port = $settings->smtp->port; + $this->model->smtp->encryption = $settings->smtp->encryption; + $this->model->smtp->username = $settings->smtp->username; + $this->model->smtp->password = $settings->smtp->password; + $this->model->smtp->timeout = $settings->smtp->timeout; + $this->model->smtp->test_recipients = $settings->smtp->test_recipients; + $this->saveModel(); + } else { + $this->emit('error', 'Instance SMTP settings are not enabled.'); + } } public function submit() {