Merge pull request #22 from ruudk/patch-2

Properly escape quotes in setFrom, addTo etc.
miguel250 · Sep 12, 2013 · 95a84ae · 95a84ae
2 parents 65759c3 + 296ef34
commit 95a84ae
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 12 deletions.
diff --git a/Postmark/Message.php b/Postmark/Message.php
@@ -133,7 +133,10 @@ public function __construct(HTTPClient $client, $from_email, $from_name = null)
     public function setFrom($email, $name = null)
     {
         if (!empty($name)) {
-            $email = "{$name} <{$email}>";
+            $email = sprintf('"%s" <%s>',
+                str_replace('"', '', $name),
+                $email
+            );
         }
 
         $this->from = $email;
@@ -151,7 +154,10 @@ public function setFrom($email, $name = null)
     public function addTo($email, $name = null)
     {
         if (!empty($name)) {
-            $email = "{$name} <{$email}>";
+            $email = sprintf('"%s" <%s>',
+                str_replace('"', '', $name),
+                $email
+            );
         }
 
         $this->to[] = $email;
@@ -169,7 +175,10 @@ public function addTo($email, $name = null)
     public function addCC($email, $name = null)
     {
         if (!empty($name)) {
-            $email = "{$name} <{$email}>";
+            $email = sprintf('"%s" <%s>',
+                str_replace('"', '', $name),
+                $email
+            );
         }
 
         $this->cc[] = $email;
@@ -187,7 +196,10 @@ public function addCC($email, $name = null)
     public function addBCC($email, $name = null)
     {
         if (!empty($name)) {
-            $email = "{$name} <{$email}>";
+            $email = sprintf('"%s" <%s>',
+                str_replace('"', '', $name),
+                $email
+            );
         }
 
         $this->bcc[] = $email;
@@ -205,7 +217,10 @@ public function addBCC($email, $name = null)
     public function setReplyTo($email, $name = null)
     {
         if (!empty($name)) {
-            $email = "{$name} <{$email}>";
+            $email = sprintf('"%s" <%s>',
+                str_replace('"', '', $name),
+                $email
+            );
         }
 
         $this->replyTo = $email;

diff --git a/Tests/Postmark/MessageTest.php b/Tests/Postmark/MessageTest.php
@@ -37,7 +37,7 @@ public function testSendMessage()
         $message->addAttachment(new File(__FILE__), 'attachment.php', 'text/plain'); // Attachment with custom filename and mimetype
         $response = json_decode($message->send(), true);
 
-        $this->assertEquals('Test Test <[email protected]>', $response['To']);
+        $this->assertEquals('"Test Test" <[email protected]>', $response['To']);
         $this->assertEquals(0, $response['ErrorCode']);
         $this->assertEquals('Test job accepted', $response['Message']);
     }
@@ -57,7 +57,7 @@ public function testSendMultipleMessages()
         $message->addAttachment(new File(__FILE__), 'attachment.php'); // Attachment with custom filename
         $response = json_decode($message->send(), true);
 
-        $this->assertEquals('Test Test <[email protected]>', $response['To']);
+        $this->assertEquals('"Test Test" <[email protected]>', $response['To']);
         $this->assertEquals(0, $response['ErrorCode']);
         $this->assertEquals('Test job accepted', $response['Message']);
 
@@ -68,7 +68,7 @@ public function testSendMultipleMessages()
         $message->addAttachment(new File(__FILE__), 'attachment.php'); // Attachment without custom filename or mimetype
         $response = json_decode($message->send(), true);
 
-        $this->assertEquals('Test Test <[email protected]>', $response['To']);
+        $this->assertEquals('"Test Test" <[email protected]>', $response['To']);
         $this->assertEquals(0, $response['ErrorCode']);
         $this->assertEquals('Test job accepted', $response['Message']);
 
@@ -78,7 +78,7 @@ public function testSendMultipleMessages()
         $message->setHTMLMessage('<b>second email body</b>');
         $response = json_decode($message->send(), true);
 
-        $this->assertEquals('Test Test <[email protected]>', $response['To']);
+        $this->assertEquals('"Test Test" <[email protected]>', $response['To']);
         $this->assertEquals(0, $response['ErrorCode']);
         $this->assertEquals('Test job accepted', $response['Message']);
     }
@@ -115,15 +115,15 @@ public function testSendMultipleMessagesViaBatch()
         $this->assertEquals(1, count($responses));
         $response = json_decode($responses[0], true);
 
-        $this->assertEquals('Test Test <[email protected]>', $response[0]['To']);
+        $this->assertEquals('"Test Test" <[email protected]>', $response[0]['To']);
         $this->assertEquals(0, $response[0]['ErrorCode']);
         $this->assertEquals('Test job accepted', $response[0]['Message']);
 
-        $this->assertEquals('Test Test <[email protected]>', $response[1]['To']);
+        $this->assertEquals('"Test Test" <[email protected]>', $response[1]['To']);
         $this->assertEquals(0, $response[1]['ErrorCode']);
         $this->assertEquals('Test job accepted', $response[1]['Message']);
 
-        $this->assertEquals('Test Test <[email protected]>', $response[2]['To']);
+        $this->assertEquals('"Test Test" <[email protected]>', $response[2]['To']);
         $this->assertEquals(0, $response[2]['ErrorCode']);
         $this->assertEquals('Test job accepted', $response[2]['Message']);
     }