Added option to use reply-to header for replies

webhaikal · Feb 24, 2021 · 6920570 · 6920570
1 parent 9a83bf7
commit 6920570
Show file tree

Hide file tree

Showing 13 changed files with 993 additions and 646 deletions.
diff --git a/app/Http/Controllers/UseReplyToController.php b/app/Http/Controllers/UseReplyToController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Requests\UpdateUseReplyToRequest;
+
+class UseReplyToController extends Controller
+{
+    public function update(UpdateUseReplyToRequest $request)
+    {
+        if ($request->use_reply_to) {
+            user()->update(['use_reply_to' => true]);
+        } else {
+            user()->update(['use_reply_to' => false]);
+        }
+
+        return back()->with(['status' => $request->use_reply_to ? 'Use Reply To Enabled Successfully' : 'Use Reply To Disabled Successfully']);
+    }
+}
diff --git a/app/Http/Requests/UpdateUseReplyToRequest.php b/app/Http/Requests/UpdateUseReplyToRequest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UpdateUseReplyToRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'use_reply_to' => 'required|boolean'
+        ];
+    }
+}
diff --git a/app/Mail/ForwardEmail.php b/app/Mail/ForwardEmail.php
@@ -94,7 +94,14 @@ public function __construct(Alias $alias, EmailData $emailData, Recipient $recip
      */
     public function build()
     {
-        $this->fromEmail = $this->alias->local_part . '+' . Str::replaceLast('@', '=', $this->replyToAddress) . '@' . $this->alias->domain;
+        // Check if the user is using the old reply-to and from headers
+        if ($this->user->use_reply_to) {
+            $this->fromEmail = $this->alias->email;
+
+            $replyToEmail = $this->alias->local_part . '+' . Str::replaceLast('@', '=', $this->replyToAddress) . '@' . $this->alias->domain;
+        } else {
+            $this->fromEmail = $this->alias->local_part . '+' . Str::replaceLast('@', '=', $this->replyToAddress) . '@' . $this->alias->domain;
+        }
 
         $returnPath = $this->alias->email;
 
@@ -106,13 +113,13 @@ public function build()
                     $this->dkimSigner->ignoreHeader('Return-Path');
                 }
             } else {
-                $replyToEmail = $this->fromEmail;
+                if (! isset($replyToEmail)) {
+                    $replyToEmail = $this->fromEmail;
+                }
 
                 $this->fromEmail = config('mail.from.address');
                 $returnPath = config('anonaddy.return_path');
             }
-        } else {
-            $returnPath = 'mailer@'.$this->alias->parentDomain();
         }
 
         $this->email =  $this

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -33,6 +33,9 @@ class User extends Authenticatable implements MustVerifyEmail
         'banner_location',
         'catch_all',
         'bandwidth',
+        'default_alias_domain',
+        'default_alias_format',
+        'use_reply_to',
         'default_recipient_id',
         'password',
         'two_factor_enabled',
@@ -67,7 +70,8 @@ class User extends Authenticatable implements MustVerifyEmail
         'id' => 'string',
         'default_recipient_id' => 'string',
         'catch_all' => 'boolean',
-        'two_factor_enabled' => 'boolean'
+        'two_factor_enabled' => 'boolean',
+        'use_reply_to' => 'boolean'
     ];
 
     protected $dates = [