Will Browning преди 6 години
родител
ревизия
01e3cb828a
променени са 4 файла, в които са добавени 13 реда и са изтрити 20 реда
  1. 0 3
      app/Mail/ForwardEmail.php
  2. 1 5
      app/Mail/ReplyToEmail.php
  3. 11 11
      composer.lock
  4. 1 1
      config/mail.php

+ 0 - 3
app/Mail/ForwardEmail.php

@@ -69,9 +69,6 @@ class ForwardEmail extends Mailable implements ShouldQueue
             ->withSwiftMessage(function ($message) {
             ->withSwiftMessage(function ($message) {
                 $message->getHeaders()
                 $message->getHeaders()
                         ->addTextHeader('List-Unsubscribe', '<' . $this->deactivateUrl . '>, <mailto:' . $this->alias->id . '@unsubscribe.' . config('anonaddy.domain') . '>');
                         ->addTextHeader('List-Unsubscribe', '<' . $this->deactivateUrl . '>, <mailto:' . $this->alias->id . '@unsubscribe.' . config('anonaddy.domain') . '>');
-
-                $message->getHeaders()
-                        ->addTextHeader('Return-Path', 'bounce@' . config('anonaddy.domain'));
             });
             });
 
 
         if ($this->emailHtml) {
         if ($this->emailHtml) {

+ 1 - 5
app/Mail/ReplyToEmail.php

@@ -51,11 +51,7 @@ class ReplyToEmail extends Mailable implements ShouldQueue
             ->subject($this->emailSubject)
             ->subject($this->emailSubject)
             ->text('emails.reply.text')->with([
             ->text('emails.reply.text')->with([
                 'text' => $this->emailText
                 'text' => $this->emailText
-            ])
-            ->withSwiftMessage(function ($message) {
-                $message->getHeaders()
-                        ->addTextHeader('Return-Path', 'bounce@' . config('anonaddy.domain'));
-            });
+            ]);
 
 
         if ($this->emailHtml) {
         if ($this->emailHtml) {
             $email->view('emails.reply.html')->with([
             $email->view('emails.reply.html')->with([

+ 11 - 11
composer.lock

@@ -789,16 +789,16 @@
         },
         },
         {
         {
             "name": "laravel/framework",
             "name": "laravel/framework",
-            "version": "v5.8.26",
+            "version": "v5.8.27",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "1d8ec9afdedc79314c18715056b8143d7e1fac31"
+                "reference": "f1dccffb96f614895393e27e4667105a05407af5"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/1d8ec9afdedc79314c18715056b8143d7e1fac31",
-                "reference": "1d8ec9afdedc79314c18715056b8143d7e1fac31",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/f1dccffb96f614895393e27e4667105a05407af5",
+                "reference": "f1dccffb96f614895393e27e4667105a05407af5",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
@@ -932,7 +932,7 @@
                 "framework",
                 "framework",
                 "laravel"
                 "laravel"
             ],
             ],
-            "time": "2019-06-25T16:20:51+00:00"
+            "time": "2019-07-02T13:43:47+00:00"
         },
         },
         {
         {
             "name": "laravel/tinker",
             "name": "laravel/tinker",
@@ -5023,16 +5023,16 @@
         },
         },
         {
         {
             "name": "phpunit/phpunit",
             "name": "phpunit/phpunit",
-            "version": "8.2.3",
+            "version": "8.2.4",
             "source": {
             "source": {
                 "type": "git",
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "f67ca36860ebca7224d4573f107f79bd8ed0ba03"
+                "reference": "25fe0b5031b24722f66a75ad479a074cccc1bb37"
             },
             },
             "dist": {
             "dist": {
                 "type": "zip",
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f67ca36860ebca7224d4573f107f79bd8ed0ba03",
-                "reference": "f67ca36860ebca7224d4573f107f79bd8ed0ba03",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/25fe0b5031b24722f66a75ad479a074cccc1bb37",
+                "reference": "25fe0b5031b24722f66a75ad479a074cccc1bb37",
                 "shasum": ""
                 "shasum": ""
             },
             },
             "require": {
             "require": {
@@ -5059,7 +5059,7 @@
                 "sebastian/global-state": "^3.0.0",
                 "sebastian/global-state": "^3.0.0",
                 "sebastian/object-enumerator": "^3.0.3",
                 "sebastian/object-enumerator": "^3.0.3",
                 "sebastian/resource-operations": "^2.0.1",
                 "sebastian/resource-operations": "^2.0.1",
-                "sebastian/type": "^1.1.0",
+                "sebastian/type": "^1.1.3",
                 "sebastian/version": "^2.0.1"
                 "sebastian/version": "^2.0.1"
             },
             },
             "require-dev": {
             "require-dev": {
@@ -5102,7 +5102,7 @@
                 "testing",
                 "testing",
                 "xunit"
                 "xunit"
             ],
             ],
-            "time": "2019-06-19T12:03:56+00:00"
+            "time": "2019-07-03T08:30:33+00:00"
         },
         },
         {
         {
             "name": "sebastian/code-unit-reverse-lookup",
             "name": "sebastian/code-unit-reverse-lookup",

+ 1 - 1
config/mail.php

@@ -99,7 +99,7 @@ return [
     |
     |
     */
     */
 
 
-    'sendmail' => '/usr/sbin/sendmail -bs',
+    'sendmail' => '/usr/sbin/sendmail -bs -XV -f bounces',
 
 
     /*
     /*
     |--------------------------------------------------------------------------
     |--------------------------------------------------------------------------