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

fixes

Browse Source
This commit is contained in:
Andras Bacsai
2023-07-28 11:49:25 +02:00
parent 4a20abcbfa
commit 766fa85c4c
3 changed files with 40 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/Http/Livewire/Notifications/EmailSettings.php
View File

@@ -55,17 +55,23 @@ class EmailSettings extends Component
{
$settings = InstanceSettings::get();
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->saveModel();
$team = auth()->user()->currentTeam();
$team->smtp_enabled = true;
$team->smtp_from_address = $settings->smtp_from_address;
$team->smtp_from_name = $settings->smtp_from_name;
$team->smtp_recipients = $settings->smtp_recipients;
$team->smtp_host = $settings->smtp_host;
$team->smtp_port = $settings->smtp_port;
$team->smtp_encryption = $settings->smtp_encryption;
$team->smtp_username = $settings->smtp_username;
$team->smtp_password = $settings->smtp_password;
$team->smtp_timeout = $settings->smtp_timeout;
$team->save();
$this->decrypt();
if (is_a($team, Team::class)) {
session(['currentTeam' => $this->model]);
}
$this->emit('success', 'Settings saved.');
} else {
$this->emit('error', 'Instance SMTP settings are not enabled.');
}

2
app/Models/Team.php
View File

@@ -26,10 +26,8 @@ class Team extends Model implements SendsDiscord, SendsEmail
public function getRecepients($notification)
{
$recipients = data_get($notification,'emails',null);
ray($recipients);
if (is_null($recipients)) {
$recipients = $this->members()->pluck('email')->toArray();
ray($recipients);
return $recipients;
}
return explode(',', $recipients);