Changeset 3126570

Timestamp:

07/27/2024 02:46:50 PM (8 months ago)

Author:

omykhailenko

Message:

Updating trunk

Location:

mailgun/trunk

Files:

• CHANGELOG.md (modified) (1 diff)
• includes/admin.php (modified) (3 diffs)
• includes/options-page.php (modified) (6 diffs)
• includes/wp-mail-api.php (modified) (3 diffs)
• languages/mailgun-de_DE.po (modified) (1 diff)
• languages/mailgun-es_ES.po (modified) (1 diff)
• languages/mailgun-pt_BR.po (modified) (1 diff)
• mailgun.php (modified) (1 diff)
• readme.md (modified) (3 diffs)
• readme.txt (modified) (2 diffs)

mailgun/trunk/CHANGELOG.md

@@ -1 +1 @@
 Changelog
 =========
+
+2.1.0 (2024-07-27)
+ - Added ability to suppress Track Clicks when we send Reset Password email (it was an issue with domain url in the email)
+ - Added field to setup Reply-to(header) email for the emails. 
+ - When constants MAILGUN_TRACK_CLICKS, MAILGUN_TRACK_OPENS are used, we disable field on the UI as we do for other fields
 
 2.0.1 (2024-07-17)

mailgun/trunk/includes/admin.php

@@ -416 +416 @@
         $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) {
@@ -449 +450 @@
 
         try {
+            $headers = [
+                'Content-Type: text/plain',
+                'Reply-To: ' . $replyTo,
+            ];
+
             $result = wp_mail(
                 $admin_email,
@@ -454 +460 @@
                 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) {

mailgun/trunk/includes/options-page.php

@@ -46 +46 @@
 $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');
@@ -52 +55 @@
 $mailgun_use_api = !is_null($mailgun_use_api_const) ? ((string)(1 * $mailgun_use_api_const)) : $this->get_option('useAPI');
 $icon = $mailgun->getAssetsPath() . 'icon-128x128.png';
+
+$trackClicks = (defined('MAILGUN_TRACK_CLICKS') ? MAILGUN_TRACK_CLICKS : null);
+$trackOpens = (defined('MAILGUN_TRACK_OPENS') ? MAILGUN_TRACK_OPENS : null);
+
+$suppressClicks = $this->get_option('suppress_clicks') ?: 'no';
 
 ?>
@@ -258 +266 @@
                 </th>
                 <td>
-                    <select name="mailgun[track-clicks]">
+                    <select name="mailgun[track-clicks]" <?php echo $trackClicks ? 'disabled="disabled"' : '' ?>>
                         <option value="htmlonly"<?php selected('htmlonly', $this->get_option('track-clicks')); ?>><?php _e('HTML Only', 'mailgun'); ?></option>
                         <option value="yes"<?php selected('yes', $this->get_option('track-clicks')); ?>><?php _e('Yes', 'mailgun'); ?></option>
@@ -281 +289 @@
                 </th>
                 <td>
-                    <select name="mailgun[track-opens]">
+                    <select name="mailgun[track-opens]" <?php echo $trackOpens ? 'disabled="disabled"' : '' ?>>
                         <option value="1"<?php selected('1', $this->get_option('track-opens')); ?>><?php _e('Yes', 'mailgun'); ?></option>
                         <option value="0"<?php selected('0', $this->get_option('track-opens')); ?>><?php _e('No', 'mailgun'); ?></option>
@@ -319 +327 @@
                 </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">
@@ -377 +403 @@
                         );
                         ?>
+                    </p>
+                </td>
+            </tr>
+            <tr valign="top">
+                <th scope="row">
+                    <?php _e('Suppress Click Track for password reset email', 'mailgun'); ?> <br>
+                </th>
+                <td>
+                    <select
+                            name="mailgun[suppress_clicks]">
+                        <option value="yes"<?php selected('yes', $suppressClicks); ?>><?php _e('Yes', 'mailgun'); ?></option>
+                        <option value="no"<?php selected('no', $suppressClicks); ?>><?php _e('No', 'mailgun'); ?></option>
+                    </select>
+                    <p class="description">
+                        <span><?php _e('Experimental function', 'mailgun'); ?></span>
                     </p>
                 </td>

mailgun/trunk/includes/wp-mail-api.php

@@ -257 +257 @@
         ];
 
-
         $rcpt_data = apply_filters('mg_mutate_to_rcpt_vars', $to);
         if (!is_null($rcpt_data['rcpt_vars'])) {
@@ -274 +273 @@
             $trackOpens = empty($mailgun['track-opens']) ? 'no' : 'yes';
         }
+
+        if (isset($mailgun['suppress_clicks']) && $mailgun['suppress_clicks'] === 'yes') {
+            $passwordResetSubject = __('Password Reset Request', 'mailgun') ?: __( 'Password Reset Request', 'woocommerce' );
+            if (!empty($passwordResetSubject) && stripos($subject, $passwordResetSubject) !== false) {
+                $trackClicks = 'no';
+            }
+        }
+
         $body['o:tracking-clicks'] = $trackClicks;
         $body['o:tracking-opens'] = $trackOpens;
@@ -397 +404 @@
         }
 
+        $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)) {

mailgun/trunk/languages/mailgun-de_DE.po

@@ -205 +205 @@
 msgid "Save Changes"
 msgstr "Änderungen speichern"
+
+msgid "Reply-to address"
+msgstr "Antwortadresse"
+
+msgid "Suppress Click Track for password reset email"
+msgstr "Klick-Tracking für Passwort-Reset-Email unterdrücken"

mailgun/trunk/languages/mailgun-es_ES.po

@@ -206 +206 @@
 msgid "Save Changes"
 msgstr "Guardar cambios"
+
+msgid "Reply-to address"
+msgstr "dirección de respuesta"
+
+msgid "Suppress Click Track for password reset email"
+msgstr "Suprimir seguimiento de clics para el email de restablecimiento de contraseña"

mailgun/trunk/languages/mailgun-pt_BR.po

@@ -364 +364 @@
 msgid "http://www.mailgun.com/"
 msgstr ""
+
+msgid "Reply-to address"
+msgstr ""
+
+msgid "Suppress Click Track for password reset email"
+msgstr ""

mailgun/trunk/mailgun.php

@@ -4 +4 @@
  * Plugin URI:   http://wordpress.org/extend/plugins/mailgun/
  * Description:  Mailgun integration for WordPress
- * Version:      2.0.1
+ * Version:      2.1.0
  * Requires PHP: 7.4
  * Requires at least: 4.4

mailgun/trunk/readme.md

@@ -4 +4 @@
 Contributors: mailgun, sivel, lookahead.io, m35dev, alanfuller
 Tags: mailgun, smtp, http, api, mail, email
-Tested up to: 6.5.5
-Stable tag: 2.0.1
+Tested up to: 6.6.1
+Stable tag: 2.1.0
 License: GPLv2 or later
 
@@ -67 +67 @@
 MAILGUN_TRACK_CLICKS Type: string Choices: 'yes' or 'no'
 MAILGUN_TRACK_OPENS  Type: string Choices: 'yes' or 'no'
+MAILGUN_REPLY_TO_ADDRESS Type: string
 ```
 
@@ -131 +132 @@
 
 == Changelog ==
+
+= 2.1.0 (2024-07-27): =
+- Added ability to suppress Track Clicks when we send Reset Password email (it was an issue with domain url in the email)
+- Added field to setup Reply-to(header) email for the emails.
+- When constants MAILGUN_TRACK_CLICKS, MAILGUN_TRACK_OPENS are used, we disable field on the UI as we do for other fields
 
 = 2.0.1 (2024-07-17): =

mailgun/trunk/readme.txt

@@ -4 +4 @@
 Contributors: mailgun, sivel, lookahead.io, m35dev, alanfuller
 Tags: mailgun, smtp, http, api, mail, email
-Tested up to: 6.5.5
-Stable tag: 2.0.1
+Tested up to: 6.6.1
+Stable tag: 2.1.0
 License: GPLv2 or later
 
@@ -130 +130 @@
 == Changelog ==
 
+= 2.1.0 (2024-07-27): =
+- Added ability to suppress Track Clicks when we send Reset Password email (it was an issue with domain url in the email)
+- Added field to setup Reply-to(header) email for the emails.
+- When constants MAILGUN_TRACK_CLICKS, MAILGUN_TRACK_OPENS are used, we disable field on the UI as we do for other fields
+
 = 2.0.1 (2024-07-17): =
 - Updated changelog