From fb5c9b138f29a1f54a8ad2823435e9d747f5b4f5 Mon Sep 17 00:00:00 2001 From: Philipp Boeing Date: Wed, 30 Jan 2019 15:34:36 +0000 Subject: [PATCH] reply-to case fix in valid_emails_in_headers Currently valid_emails_in_headers fails for Reply-To headers that are name + email, even though they are correct and are accepted by sendgrid. --- lib/class-sendgrid-tools.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/class-sendgrid-tools.php b/lib/class-sendgrid-tools.php index ed9fbac..887a194 100644 --- a/lib/class-sendgrid-tools.php +++ b/lib/class-sendgrid-tools.php @@ -1263,7 +1263,15 @@ public static function valid_emails_in_headers( $headers ) break; case 'reply-to': - if( ! Sendgrid_Tools::is_valid_email( $content ) ) { + if ( false !== strpos( $content, '<' ) ) { + $from_email = substr( $content, strpos( $content, '<' ) + 1 ); + $from_email = str_replace( '>', '', $from_email ); + $from_email = trim( $from_email ); + } else { + $from_email = trim( $content ); + } + + if( ! Sendgrid_Tools::is_valid_email( $from_email ) ) { return false; }