From d1302d5bc650cf0908d9a102f1ce0c129b663b6f Mon Sep 17 00:00:00 2001
From: Oleksandr Mykhailenko <mihaskep@gmail.com>
Date: Sat, 27 Jul 2024 17:43:33 +0300
Subject: [PATCH] =?UTF-8?q?Adding=20suppress=20function=20for=20tracking?=
 =?UTF-8?q?=20clicks=20in=20the=20Reset=20Password=20em=E2=80=A6=20(#186)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Adding suppress function for tracking clicks in the Reset Password emails. It will lead to long domain in the list. Experimental

Prepare new version

* Adding suppress function for tracking clicks in the Reset Password emails. It will lead to long domain in the list. Experimental

Prepare new version
---
 CHANGELOG.md              | 5 +++++
 includes/options-page.php | 7 +++++--
 mailgun.php               | 2 +-
 readme.md                 | 9 +++++++--
 readme.txt                | 9 +++++++--
 5 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c026662..db3d6b6 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 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
 
diff --git a/includes/options-page.php b/includes/options-page.php
index 87dfbda..22514c2 100755
--- a/includes/options-page.php
+++ b/includes/options-page.php
@@ -55,6 +55,9 @@
 $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';
 
 ?>
@@ -262,7 +265,7 @@
                     <?php _e('Click Tracking', 'mailgun'); ?>
                 </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>
                         <option value="no"<?php selected('no', $this->get_option('track-clicks')); ?>><?php _e('No', 'mailgun'); ?></option>
@@ -285,7 +288,7 @@
                     <?php _e('Open Tracking', 'mailgun'); ?>
                 </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>
                     </select>
diff --git a/mailgun.php b/mailgun.php
index 7553284..3b3ff69 100755
--- a/mailgun.php
+++ b/mailgun.php
@@ -3,7 +3,7 @@
  * Plugin Name:  Mailgun
  * 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
  * Author:       Mailgun
diff --git a/readme.md b/readme.md
index 053c7c8..e41ec25 100755
--- a/readme.md
+++ b/readme.md
@@ -3,8 +3,8 @@ Mailgun for WordPress
 
 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
 
 Easily send email from your WordPress site through Mailgun using the HTTP API or SMTP.
@@ -132,6 +132,11 @@ MAILGUN_REPLY_TO_ADDRESS Type: string
 
 == 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
 
diff --git a/readme.txt b/readme.txt
index 66d1fb0..a238232 100755
--- a/readme.txt
+++ b/readme.txt
@@ -3,8 +3,8 @@ Mailgun for WordPress
 
 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
 
 Easily send email from your WordPress site through Mailgun using the HTTP API or SMTP.
@@ -129,6 +129,11 @@ MAILGUN_TRACK_OPENS  Type: string Choices: 'yes' or 'no'
 
 == 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