local dev tweaks

lekoala · Aug 8, 2024 · 350bb50 · 350bb50
1 parent 95b6e22
commit 350bb50
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/SparkPostApiTransport.php b/src/SparkPostApiTransport.php
@@ -75,6 +75,13 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e
 
         $to = $email->getTo();
 
+        // check .local addresses
+        foreach ($to as $addr) {
+            if (str_ends_with($addr->getAddress(), '.local')) {
+                $disableSending = true;
+            }
+        }
+
         if ($disableSending) {
             $result = [
                 'total_rejected_recipients' => 0,

diff --git a/src/SparkPostHelper.php b/src/SparkPostHelper.php
@@ -145,6 +145,13 @@ public static function init()
         }
 
         $sending_disabled = self::getEnvSendingDisabled();
+        if ($sending_disabled === false) {
+            // In dev, if we didn't set a value, disable by default
+            // This can avoid sending emails by mistake :-) oops!
+            if (Director::isDev() && !self::hasEnvSendingDisabled()) {
+                $sending_disabled = true;
+            }
+        }
         if ($sending_disabled) {
             self::config()->disable_sending = $sending_disabled;
         }
@@ -187,6 +194,14 @@ public static function getEnvSendingDisabled()
         return Environment::getEnv('SPARKPOST_SENDING_DISABLED');
     }
 
+    /**
+     * @return bool
+     */
+    public static function hasEnvSendingDisabled()
+    {
+        return Environment::hasEnv('SPARKPOST_SENDING_DISABLED');
+    }
+
     /**
      * @return mixed
      */