From 03e078afbf5abb7b90ee82499aee4bc2673a5a32 Mon Sep 17 00:00:00 2001
From: dassels <62292490+dassels@users.noreply.github.com>
Date: Sat, 28 Dec 2024 22:50:07 +0100
Subject: [PATCH 1/3] Widget form html updates in mailgun.php

Updates to markup to ease editing of CSS.
-Wrapped "name" and "email" in <label> tag
-Added placeholder text
-Wrapped submit and lists in <div> with "mailgun-list-widget-lists" class
-Added basic email pattern check to JS as form would submit with no "@" sign and return success message. But server message in console reports that email field invalid so nothing happens
---
 mailgun.php | 59 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 34 insertions(+), 25 deletions(-)

diff --git a/mailgun.php b/mailgun.php
index 79ea933..47dc964 100755
--- a/mailgun.php
+++ b/mailgun.php
@@ -382,37 +382,38 @@ public function list_form(string $list_address, array $args = [], array $instanc
                     <?php endif; ?>
                     <?php if (isset($args[ 'collect_name' ]) && (int)$args['collect_name'] === 1): ?>
                         <p class="mailgun-list-widget-name">
-                            <strong>Name:</strong>
-                            <input type="text" name="name"/>
+                            <label><strong>Name:</strong></label>
+                            <input type="text" name="name" placeholder="Name"/>
                         </p>
                     <?php endif; ?>
                     <p class="mailgun-list-widget-email">
-                        <strong>Email:</strong>
-                        <input type="text" name="email"/>
+                        <label><strong>Email:</strong></label>
+                        <input type="text" name="email" placeholder="Email"/>
                     </p>
                 </div>
 
-                <?php if (count($list_addresses) > '1'): ?>
-                    <ul class="mailgun-lists" style="list-style: none;">
-                        <?php
-                            foreach ($all_list_addresses as $la):
-                                if (!in_array($la[ 'address' ], $list_addresses)):
-                                    continue;
-                                endif;
-                        ?>
-                                <li>
-                                    <input type="checkbox" class="mailgun-list-name"
-                                           name="addresses[<?php echo esc_attr($la[ 'address' ]); ?>]"/> <?php echo esc_attr($la[ 'name' ] ?: $la[ 'address' ]); ?>
-                                </li>
-                        <?php endforeach; ?>
-                    </ul>
-                <?php else: ?>
-                    <input type="hidden" name="addresses[<?php echo esc_attr($list_addresses[ 0 ]); ?>]" value="on"/>
-                <?php endif; ?>
-
-                <input class="mailgun-list-submit-button" data-form-id="<?php echo esc_attr($form_class_id); ?>" type="button"
-                       value="Subscribe"/>
-                <input type="hidden" name="mailgun-submission" value="1"/>
+                <div class="mailgun-list-widget-lists">
+                    <?php if (count($list_addresses) > '1'): ?>
+                        <ul class="mailgun-lists" style="list-style: none;">
+                            <?php
+                                foreach ($all_list_addresses as $la):
+                                    if (!in_array($la[ 'address' ], $list_addresses)):
+                                        continue;
+                                    endif;
+                            ?>
+                                    <li>
+                                        <input type="checkbox" class="mailgun-list-name"
+                                               name="addresses[<?php echo esc_attr($la[ 'address' ]); ?>]"/> <?php echo esc_attr($la[ 'name' ] ?: $la[ 'address' ]); ?>
+                                    </li>
+                            <?php endforeach; ?>
+                        </ul>
+                    <?php else: ?>
+                        <input type="hidden" name="addresses[<?php echo esc_attr($list_addresses[ 0 ]); ?>]" value="on"/>
+                    <?php endif; ?>
+                    <input class="mailgun-list-submit-button" data-form-id="<?php echo esc_attr($form_class_id); ?>" type="button"
+                           value="Subscribe"/>
+                    <input type="hidden" name="mailgun-submission" value="1"/>
+                </div>
 
             </form>
             <div class="widget-list-panel result-panel" style="display:none;">
@@ -442,6 +443,14 @@ public function list_form(string $list_address, array $args = [], array $instanc
                 return
               }
 
+              // Email validation regex pattern              
+              var emailPattern = /.+@.+\..{2,}/;
+
+              if (!emailPattern.test(jQuery('.' + form_id + ' .mailgun-list-widget-email input').val())) {
+                  alert('Please enter a valid email address.')
+                  return
+              }
+
               jQuery.ajax({
                 url: '<?php echo admin_url('admin-ajax.php?action=add_list'); ?>',
                 action: 'add_list',

From e07af95212ce6bcbacf7eb8b10e0c172e5fd6081 Mon Sep 17 00:00:00 2001
From: Oleksandr Mykhailenko <mihaskep@gmail.com>
Date: Tue, 24 Jun 2025 20:45:56 +0300
Subject: [PATCH 2/3] Fallback option added to have ability to turn on/off it.

---
 includes/options-page.php | 13 +++++++++++++
 includes/wp-mail-api.php  |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/includes/options-page.php b/includes/options-page.php
index 5573ed2..d849e10 100755
--- a/includes/options-page.php
+++ b/includes/options-page.php
@@ -60,6 +60,7 @@
 $trackOpens  = ( defined('MAILGUN_TRACK_OPENS') ? MAILGUN_TRACK_OPENS : null );
 
 $suppressClicks = $this->get_option('suppress_clicks') ?: 'no';
+$emailFallback = $this->get_option('email_fallback') ?: 'no';
 
 ?>
 <div class="wrap">
@@ -431,6 +432,18 @@ class="regular-text"
                     </p>
                 </td>
             </tr>
+            <tr valign="top">
+                <th scope="row">
+                    <?php _e('Email fallback', 'mailgun'); ?> <br>
+                </th>
+                <td>
+                    <select
+                            name="mailgun[email_fallback]">
+                        <option value="yes"<?php selected('yes', $emailFallback); ?>><?php _e('Yes', 'mailgun'); ?></option>
+                        <option value="no"<?php selected('no', $emailFallback); ?>><?php _e('No', 'mailgun'); ?></option>
+                    </select>
+                </td>
+            </tr>
         </table>
         <h3><?php _e('Lists', 'mailgun'); ?></h3>
         <table class="form-table">
diff --git a/includes/wp-mail-api.php b/includes/wp-mail-api.php
index 5c0f38d..2d910a1 100644
--- a/includes/wp-mail-api.php
+++ b/includes/wp-mail-api.php
@@ -495,8 +495,8 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
         }
 
         // Email Fallback
-
-        if ($isFallbackNeeded) {
+        $isFallbackEnabled = get_option('email_fallback') ?: 'no';
+        if ($isFallbackNeeded && $isFallbackEnabled === 'yes') {
             global $phpmailer;
 
             // (Re)create it, if it's gone missing.

From 0cd1d92406fcb5ad052c562533ac8da3b3012505 Mon Sep 17 00:00:00 2001
From: Oleksandr Mykhailenko <mihaskep@gmail.com>
Date: Tue, 24 Jun 2025 22:14:45 +0300
Subject: [PATCH 3/3] Fallback option added to have ability to turn on/off it.
 Information about Tracking settings Widget style fixes

---
 CHANGELOG.md              |  3 +++
 includes/options-page.php | 24 ++++++++++++++++++++++++
 mailgun.php               | 17 ++++++++++++++++-
 readme.md                 |  2 +-
 readme.txt                |  5 ++++-
 5 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0724fa8..e013b7e 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 Changelog
 =========
 
+2.1.9 (2025-06-24)
+- Added fallback option. Merge PR for widget
+
 2.1.8 (2025-05-11)
 - Just keep update WP version. And tested compatibility with it
 
diff --git a/includes/options-page.php b/includes/options-page.php
index d849e10..3d27097 100755
--- a/includes/options-page.php
+++ b/includes/options-page.php
@@ -62,6 +62,12 @@
 $suppressClicks = $this->get_option('suppress_clicks') ?: 'no';
 $emailFallback = $this->get_option('email_fallback') ?: 'no';
 
+$settings = [];
+try {
+    $settings = $mailgun->getTrackingSettings();
+} catch (Throwable $e) {
+}
+
 ?>
 <div class="wrap">
     <div id="icon-options-general" class="icon32"><br/></div>
@@ -117,6 +123,24 @@
         <?php settings_fields('mailgun'); ?>
 
         <table class="form-table">
+            <?php if ($settings) : ?>
+                <tr>
+                    <th><?php _e('Domain tracking settings from account', 'mailgun'); ?></th>
+                    <td>
+                        <ul>
+                            <li>
+                                <b>Click tracking</b> &mdash; <?php echo $settings['tracking']['open']['active'] == 1 ? 'Yes' : 'No'?>
+                            </li>
+                            <li>
+                                <b>Open tracking</b> &mdash;  <?php echo $settings['tracking']['click']['active'] == 1 ? 'Yes' : 'No'?>
+                            </li>
+                            <li>
+                                <b>Unsubscribes</b> &mdash; <?php echo $settings['tracking']['unsubscribe']['active'] == 1 ? 'Yes' : 'No'?>
+                            </li>
+                        </ul>
+                    </td>
+                </tr>
+            <?php endif; ?>
             <tr valign="top">
                 <th scope="row">
                     <?php _e('Select Your Region', 'mailgun'); ?>
diff --git a/mailgun.php b/mailgun.php
index 053b728..6bc65b4 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.1.8
+ * Version:      2.1.9
  * Requires PHP: 7.4
  * Requires at least: 4.4
  * Author:       Mailgun
@@ -294,6 +294,21 @@ public function get_lists(): array {
         return $results;
     }
 
+    /**
+     * @return array
+     * @throws JsonException
+     */
+    public function getTrackingSettings(): array
+    {
+        $domain   = ( defined( 'MAILGUN_DOMAIN' ) && MAILGUN_DOMAIN ) ? MAILGUN_DOMAIN : $this->get_option( 'domain' );
+        if (!$domain) {
+            return [];
+        }
+        $settings = $this->api_call(sprintf("domains/%s/tracking", $domain), [], 'GET' );
+
+        return json_decode( $settings, true, 512, JSON_THROW_ON_ERROR );
+    }
+
     /**
      * Handle add list ajax post.
      *
diff --git a/readme.md b/readme.md
index 1b9fd73..78c0a5b 100755
--- a/readme.md
+++ b/readme.md
@@ -4,7 +4,7 @@ Mailgun for WordPress
 Contributors: mailgun, sivel, lookahead.io, m35dev, alanfuller
 Tags: mailgun, smtp, http, api, mail, email
 Tested up to: 6.8.1
-Stable tag: 2.1.8
+Stable tag: 2.1.9
 Requires PHP: 7.4
 License: GPLv2 or later
 
diff --git a/readme.txt b/readme.txt
index 321e3b4..1c12f27 100755
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Mailgun for WordPress
 Contributors: mailgun, sivel, lookahead.io, m35dev, alanfuller
 Tags: mailgun, smtp, http, api, mail, email
 Tested up to: 6.8.1
-Stable tag: 2.1.8
+Stable tag: 2.1.9
 Requires PHP: 7.4
 License: GPLv2 or later
 
@@ -129,6 +129,9 @@ MAILGUN_TRACK_OPENS  Type: string Choices: 'yes' or 'no'
 
 == Changelog ==
 
+= 2.1.9 (2025-06-24): =
+- Added fallback option. Merge PR for widget
+
 = 2.1.8 (2025-05-11): =
 - Just keep update WP version. And tested compatibility with it