fix display of <> emails

lekoala · Apr 4, 2024 · ff48e51 · ff48e51
1 parent 0b09eb9
commit ff48e51
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/SparkPostAdmin.php b/src/SparkPostAdmin.php
@@ -29,6 +29,7 @@
 use SilverStripe\Security\Permission;
 use LeKoala\SparkPost\SparkPostHelper;
 use SilverStripe\Control\HTTPResponse;
+use SilverStripe\Core\Convert;
 use SilverStripe\Forms\CompositeField;
 use SilverStripe\SiteConfig\SiteConfig;
 use SilverStripe\Forms\GridField\GridField;
@@ -343,7 +344,7 @@ public function getEditForm($id = null, $fields = null)
             // Show default from email
             $defaultEmail = SparkPostHelper::resolveDefaultFromEmail();
             $defaultEmailDisplayed = EmailUtils::stringify($defaultEmail);
-            $toolsHtml .= "<p>Default sending email: " . $defaultEmailDisplayed . " (" . SparkPostHelper::resolveDefaultFromEmailType() . ")</p>";
+            $toolsHtml .= "<p>Default sending email: " . Convert::raw2xml($defaultEmailDisplayed) . " (" . SparkPostHelper::resolveDefaultFromEmailType() . ")</p>";
             if (!SparkPostHelper::isEmailDomainReady($defaultEmailDisplayed)) {
                 $toolsHtml .= '<p style="color:red">The default email is not ready to send emails</p>';
             }

diff --git a/src/SparkPostHelper.php b/src/SparkPostHelper.php
@@ -295,6 +295,7 @@ public static function isEmailDomainReady($email)
         if (!$email) {
             return false;
         }
+        $email = EmailUtils::get_email_from_rfc_email($email);
         $parts = explode("@", $email);
         if (count($parts) != 2) {
             return false;