allow forcing sender

lekoala · Mar 10, 2021 · 4707af8 · 4707af8
1 parent f3166bd
commit 4707af8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/SparkPostAdmin.php b/src/SparkPostAdmin.php
@@ -245,6 +245,9 @@ public function getEditForm($id = null, $fields = null)
             if (SparkPostHelper::getEnvSubaccountId()) {
                 $toolsHtml .= '<p style="color:orange">Using subaccount id</p>';
             }
+            if (SparkPostHelper::getEnvForceSender()) {
+                $toolsHtml .= '<p style="color:orange">Sender is forced to ' . SparkPostHelper::getEnvForceSender() . '</p>';
+            }
 
             // Add a refresh button
             $toolsHtml .= $this->ButtonHelper(

diff --git a/src/SparkPostHelper.php b/src/SparkPostHelper.php
@@ -175,6 +175,11 @@ public static function getEnvSubaccountId()
         return  Environment::getEnv('SPARKPOST_SUBACCOUNT_ID');
     }
 
+    public static function getEnvForceSender()
+    {
+        return  Environment::getEnv('SPARKPOST_FORCE_SENDER');
+    }
+
     /**
      * Register the transport with the client
      *

diff --git a/src/SparkPostSwiftTransport.php b/src/SparkPostSwiftTransport.php
@@ -284,12 +284,14 @@ public function getTransmissionFromMessage(Swift_Mime_Message $message)
 
         $fromAddresses = $message->getFrom();
 
-        $fromEmails = array_keys($fromAddresses);
         $fromFirstEmail = key($fromAddresses);
         $fromFirstName = current($fromAddresses);
         if (SparkPostHelper::config()->override_admin_email && SparkPostHelper::isAdminEmail($fromFirstEmail)) {
             $fromFirstEmail = SparkPostHelper::resolveDefaultFromEmail();
         }
+        if (SparkPostHelper::getEnvForceSender()) {
+            $fromFirstEmail = SparkPostHelper::getEnvForceSender();
+        }
         if (!$fromFirstName) {
             $fromFirstName = EmailUtils::get_displayname_from_rfc_email($fromFirstEmail);
         }