diff --git a/app/Http/Controllers/ThirdPartyServices/EmailService.php b/app/Http/Controllers/ThirdPartyServices/EmailService.php index a4dca89..6df3df2 100644 --- a/app/Http/Controllers/ThirdPartyServices/EmailService.php +++ b/app/Http/Controllers/ThirdPartyServices/EmailService.php @@ -17,7 +17,7 @@ class EmailService extends Controller { $this->email_address_recepient = config('mail.email_address_recepient', null); $this->email_prefix_subject = config('mail.email_prefix_subject', null); - $this->nextcloud_upload_folder_web_link = config('mail.nextcloud_upload_folder_web_link', false); + $this->nextcloud_upload_folder_web_link = config('app.nextcloud_upload_folder_web_link', false); } function send_export_via_email(string $from_date, string $to_date, string $file_name){ try{ diff --git a/app/Http/Controllers/ThirdPartyServices/ThirdPartyServices.php b/app/Http/Controllers/ThirdPartyServices/ThirdPartyServices.php index 5711b0b..5cc35ab 100644 --- a/app/Http/Controllers/ThirdPartyServices/ThirdPartyServices.php +++ b/app/Http/Controllers/ThirdPartyServices/ThirdPartyServices.php @@ -16,7 +16,7 @@ class ThirdPartyServices extends Controller { $this->third_party_integrations_nextcloud = $third_party_integrations_nextcloud || config('app.third_party_integrations_nextcloud', false); $this->third_party_integrations_open_project = $third_party_integrations_open_project || config('app.third_party_integrations_open_project', false); - $this->email_send_allow = $email_send_allow || config('email.email_send_allow', false); + $this->email_send_allow = $email_send_allow || config('app.email_send_allow', false); $this->nextcloud_service = new \App\Http\Controllers\ThirdPartyServices\NextcloudService(); $this->open_project_service = new \App\Http\Controllers\ThirdPartyServices\OpenProjectService(); $this->email_service = new \App\Http\Controllers\ThirdPartyServices\EmailService(); diff --git a/config/mail.php b/config/mail.php index d93156c..be0fa4a 100644 --- a/config/mail.php +++ b/config/mail.php @@ -96,12 +96,9 @@ return [ */ 'from' => [ - 'address' => config('MAIL_FROM_ADDRESS', 'hello@example.com'), - 'name' => config('MAIL_FROM_NAME', 'Example'), + 'address' => config('MAIL_FROM_ADDRESS', 'export-git@congegni.net'), + 'name' => config('MAIL_FROM_NAME', 'Congegni - Export git'), ], 'email_address_recepient' => env('EMAIL_ADDRESS_RECEPIENT', null), 'email_prefix_subject' => env('EMAIL_PREFIX_SUBJECT', null), - - 'mail_from_address' => env('MAIL_FROM_ADDRESS', 'export - git@test . net'), - 'mail_from_name' => env('MAIL_FROM_NAME', "Export git"), ];