fix email from address in self hosted mode (#573)

madassdev · web-flow · commit 7f6c21408c61 · 2024-09-17T15:41:50.000+02:00
* fix email from address in self hosted mode

* fix linting
diff --git a/api/app/Mail/Forms/SubmissionConfirmationMail.php b/api/app/Mail/Forms/SubmissionConfirmationMail.php
@@ -54,6 +54,10 @@ public function build()
 
     private function getFromEmail()
     {
+        if(config('app.self_hosted')) {
+            return config('mail.from.address');
+        }
+
         $originalFromAddress = Str::of(config('mail.from.address'))->explode('@');
 
         return $originalFromAddress->first() . '+' . time() . '@' . $originalFromAddress->last();
diff --git a/api/app/Notifications/Forms/FormSubmissionNotification.php b/api/app/Notifications/Forms/FormSubmissionNotification.php
@@ -63,6 +63,9 @@ public function toMail($notifiable)
 
     private function getFromEmail()
     {
+        if(config('app.self_hosted')) {
+            return config('mail.from.address');
+        }
         $originalFromAddress = Str::of(config('mail.from.address'))->explode('@');
 
         return $originalFromAddress->first() . '+' . time() . '@' . $originalFromAddress->last();

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,10 @@ public function build()`
`54`	`54`
`55`	`55`	`private function getFromEmail()`
`56`	`56`	`{`
	`57`	`+ if(config('app.self_hosted')) {`
	`58`	`+ return config('mail.from.address');`
	`59`	`+ }`
	`60`	`+`
`57`	`61`	`$originalFromAddress = Str::of(config('mail.from.address'))->explode('@');`
`58`	`62`
`59`	`63`	`return $originalFromAddress->first() . '+' . time() . '@' . $originalFromAddress->last();`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,9 @@ public function toMail($notifiable)`
`63`	`63`
`64`	`64`	`private function getFromEmail()`
`65`	`65`	`{`
	`66`	`+ if(config('app.self_hosted')) {`
	`67`	`+ return config('mail.from.address');`
	`68`	`+ }`
`66`	`69`	`$originalFromAddress = Str::of(config('mail.from.address'))->explode('@');`
`67`	`70`
`68`	`71`	`return $originalFromAddress->first() . '+' . time() . '@' . $originalFromAddress->last();`