De 1558 wp mailgun ability to disable fallback (#209)

* 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

* Fallback option added to have ability to turn on/off it.

* Fallback option added to have ability to turn on/off it.
Information about Tracking settings
Widget style fixes

---------

Co-authored-by: dassels <[email protected]>

Author: oleksandr-mykhailenko

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
 

includes/options-page.php

@@ -60,6 +60,13 @@
 $trackOpens  = ( defined('MAILGUN_TRACK_OPENS') ? MAILGUN_TRACK_OPENS : null );
 
 $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">
@@ -116,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'); ?>
@@ -431,6 +456,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">

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.

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.
      *
@@ -384,17 +399,18 @@ public function list_form( string $list_address, array $args = array() ): void {
                     <?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' ) : ?>
+                <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 ) :
@@ -414,7 +430,7 @@ public function list_form( string $list_address, array $args = array() ): void {
 
                 <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"/>
+                <input type="hidden" name="mailgun-submission" value="1"/></div>
 
             </form>
             <div class="widget-list-panel result-panel" style="display:none;">
@@ -444,6 +460,14 @@ public function list_form( string $list_address, array $args = array() ): void {
                 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',

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
 

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