Reply to field (#184)

Author: oleksandr-mykhailenko

includes/admin.php

@@ -415,6 +415,7 @@ public function ajax_send_test()
         $useAPI = (defined('MAILGUN_USEAPI') && MAILGUN_USEAPI) ? MAILGUN_USEAPI : $this->get_option('useAPI');
         $secure = (defined('MAILGUN_SECURE') && MAILGUN_SECURE) ? MAILGUN_SECURE : $this->get_option('secure');
         $sectype = (defined('MAILGUN_SECTYPE') && MAILGUN_SECTYPE) ? MAILGUN_SECTYPE : $this->get_option('sectype');
+        $replyTo = (defined('MAILGUN_REPLY_TO_ADDRESS') && MAILGUN_REPLY_TO_ADDRESS) ? MAILGUN_REPLY_TO_ADDRESS : $this->get_option('reply_to');
 
         if (!$getRegion) {
             mg_api_last_error(__("Region has not been selected", "mailgun"));
@@ -448,12 +449,17 @@ public function ajax_send_test()
         }
 
         try {
+            $headers = [
+                'Content-Type: text/plain',
+                'Reply-To: ' . $replyTo,
+            ];
+
             $result = wp_mail(
                 $admin_email,
                 __('Mailgun WordPress Plugin Test', 'mailgun'),
                 sprintf(__("This is a test email generated by the Mailgun WordPress plugin.\n\nIf you have received this message, the requested test has succeeded.\n\nThe sending region is set to %s.\n\nThe method used to send this email was: %s.",
                     'mailgun'), $region, $method),
-                ['Content-Type: text/plain']
+                $headers
             );
         } catch (Throwable $throwable) {
             //Log purpose

includes/options-page.php

@@ -45,6 +45,9 @@
 $mailgun_from_address_const = ((defined('MAILGUN_FROM_ADDRESS') && MAILGUN_FROM_ADDRESS) ? MAILGUN_FROM_ADDRESS : null);
 $mailgun_from_address = $mailgun_from_address_const ?: $this->get_option('from-address');
 
+$mailgunReplyToAddressConst = ((defined('MAILGUN_REPLY_TO_ADDRESS') && MAILGUN_REPLY_TO_ADDRESS) ? MAILGUN_REPLY_TO_ADDRESS : null);
+$mailgunReplyTo = $mailgunReplyToAddressConst ?: $this->get_option('reply_to');
+
 $mailgun_secure_const = (defined('MAILGUN_SECURE') ? MAILGUN_SECURE : null);
 $mailgun_secure = !is_null($mailgun_secure_const) ? ((string)(1 * $mailgun_secure_const)) : $this->get_option('secure');
 
@@ -318,6 +321,24 @@ class="regular-text"
                     </p>
                 </td>
             </tr>
+            <tr>
+                <th scope="row">
+                    <?php _e('Reply To Address', 'mailgun'); ?>
+                </th>
+                <td>
+                    <input type="text"
+                           class="regular-text"
+                           name="mailgun[reply_to]"
+                           value="<?php esc_attr_e($mailgunReplyTo); ?>"
+                           placeholder="[email protected]"
+                    />
+                    <p class="description">
+                        <?php
+                        _e('Reply-to address', 'mailgun');
+                        ?>
+                    </p>
+                </td>
+            </tr>
             <tr valign="top">
                 <th scope="row">
                     <?php _e('From Name', 'mailgun'); ?>

includes/wp-mail-api.php

@@ -396,6 +396,11 @@ function wp_mail($to, $subject, $message, $headers = '', $attachments = [])
             }
         }
 
+        $replyTo = (defined('MAILGUN_REPLY_TO_ADDRESS') && MAILGUN_REPLY_TO_ADDRESS) ? MAILGUN_REPLY_TO_ADDRESS : get_option('reply_to');
+        if (!empty($replyTo)) {
+            $headers['Reply-To'] = $replyTo;
+        }
+
         // Set custom headers
         if (!empty($headers)) {
             foreach ((array)$headers as $name => $content) {

languages/mailgun-de_DE.po

@@ -204,3 +204,6 @@ msgstr ""
 #: includes/options-page.php:74
 msgid "Save Changes"
 msgstr "Änderungen speichern"
+
+msgid "Reply-to address"
+msgstr "Antwortadresse"

languages/mailgun-es_ES.po

@@ -205,3 +205,6 @@ msgstr ""
 #: includes/options-page.php:74
 msgid "Save Changes"
 msgstr "Guardar cambios"
+
+msgid "Reply-to address"
+msgstr "dirección de respuesta"

languages/mailgun-pt_BR.po

@@ -363,3 +363,6 @@ msgstr ""
 #. Author URI of the plugin/theme
 msgid "http://www.mailgun.com/"
 msgstr ""
+
+msgid "Reply-to address"
+msgstr ""

readme.md

@@ -66,6 +66,7 @@ MAILGUN_FROM_NAME    Type: string
 MAILGUN_FROM_ADDRESS Type: string
 MAILGUN_TRACK_CLICKS Type: string Choices: 'yes' or 'no'
 MAILGUN_TRACK_OPENS  Type: string Choices: 'yes' or 'no'
+MAILGUN_REPLY_TO_ADDRESS Type: string
 ```
 
 - What hooks are available for use with other plugins?