Add support for Reply-To header

EmailHandler.php

@@ -21,25 +21,30 @@ class EmailHandler extends Base implements ClientInterface
      * Send a HTML email
      *
      * @access public
-     * @param  string  $email
-     * @param  string  $name
+     * @param  string  $recipientEmail
+     * @param  string  $recipientName
      * @param  string  $subject
      * @param  string  $html
-     * @param  string  $author
+     * @param  string  $authorName
+     * @param  string  $authorEmail
      */
-    public function sendEmail($email, $name, $subject, $html, $author)
+    public function sendEmail($recipientEmail, $recipientName, $subject, $html, $authorName, $authorEmail = '')
     {
         $headers = array(
             'Authorization: Basic '.base64_encode('api:'.$this->getApiToken())
         );
 
         $payload = array(
-            'from' => sprintf('%s <%s>', $author, $this->helper->mail->getMailSenderAddress()),
-            'to' => sprintf('%s <%s>', $name, $email),
+            'from' => sprintf('%s <%s>', $authorName, $this->helper->mail->getMailSenderAddress()),
+            'to' => sprintf('%s <%s>', $recipientName, $recipientEmail),
             'subject' => $subject,
             'html' => $html,
         );
 
+        if (! empty($authorEmail)) {
+            $payload['h:Reply-To'] = $authorEmail;
+        }
+
         $this->httpClient->postFormAsync('https://api.mailgun.net/v3/'.$this->getDomain().'/messages', $payload, $headers);
     }
 

Makefile

@@ -1,3 +1,5 @@
+plugin=Mailgun
+
 all:
 	@ echo "Build archive for plugin ${plugin} version=${version}"
 	@ git archive HEAD --prefix=${plugin}/ --format=zip -o ${plugin}-${version}.zip

Plugin.php

@@ -39,7 +39,7 @@ public function getPluginAuthor()
 
     public function getPluginVersion()
     {
-        return '1.0.7';
+        return '1.0.8';
     }
 
     public function getPluginHomepage()
@@ -49,6 +49,6 @@ public function getPluginHomepage()
 
     public function getCompatibleVersion()
     {
-        return '>=1.0.39';
+        return '>=1.0.40';
     }
 }

README.md

@@ -17,7 +17,7 @@ Author
 Requirements
 ------------
 
-- Kanboard >= 1.0.39
+- Kanboard >= 1.0.40
 - Mailgun API credentials
 
 Installation
@@ -111,6 +111,10 @@ Notes
 Changes
 -------
 
+### Version 1.0.8
+
+- Add support for Reply-To header
+
 ### Version 1.0.7
 
 - Add original email body as attachment

Test/EmailHandlerTest.php

@@ -56,6 +56,29 @@ public function testSendEmail()
         $handler->sendEmail('test@localhost', 'Me', 'Test', 'Content', 'Bob');
     }
 
+    public function testSendEmailWithAuthorEmail()
+    {
+        $handler = new EmailHandler($this->container);
+
+        $headers = array(
+            'Authorization: Basic '.base64_encode('api:my token')
+        );
+
+        $this->container['configModel']
+            ->save(array('mailgun_api_token' => 'my token', 'mailgun_domain' => 'my_domain'));
+
+        $this->container['httpClient']
+            ->expects($this->once())
+            ->method('postFormAsync')
+            ->with(
+                'https://api.mailgun.net/v3/my_domain/messages',
+                $this->contains('bob@localhost'),
+                $headers
+            );
+
+        $handler->sendEmail('test@localhost', 'Me', 'Test', 'Content', 'Bob', 'bob@localhost');
+    }
+
     public function testHandlePayload()
     {
         $emailHandler = new EmailHandler($this->container);