Merge pull request #94 from Miller-Media/1.4

Version 1.4
Miller-Media · Aug 28, 2024 · 817e8d7 · 817e8d7
2 parents 4f1d739 + ebc9d85
commit 817e8d7
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 20 deletions.
diff --git a/js/mandrill.js b/js/mandrill.js
@@ -42,28 +42,32 @@ jQuery( function() {
 function showStats() {
     var filter = jQuery("#filter option:selected").val();
     var display = jQuery("#display option:selected").val();
+    var mandrillNonce = wpMandrillData.nonce;
+
     jQuery('#loading_data').css('display','block');
 
-    jQuery.ajax({  
-        type: 'POST',  
-        url: ajaxurl,  
-        data: {  
-                action: 'get_mandrill_stats',
-                filter: filter, 
-                display: display
-            },  
-        success: function(data, textStatus, XMLHttpRequest){  
-                jQuery('#loading_data').css('display','none');
-                eval(data);
-            },  
-        error: function(MLHttpRequest, textStatus, errorThrown){  
-                jQuery('#loading_data').css('display','none');
-            }  
+    jQuery.ajax({
+        type: 'POST',
+        url: ajaxurl,
+        data: {
+            action: 'get_mandrill_stats',
+            filter: filter,
+            display: display,
+            _wpnonce: mandrillNonce
+        },
+        success: function(data, textStatus, XMLHttpRequest){
+            jQuery('#loading_data').css('display','none');
+            eval(data);
+        },
+        error: function(MLHttpRequest, textStatus, errorThrown){
+            jQuery('#loading_data').css('display','none');
+        }
     });
-    
-  return false;
+
+    return false;
 }
 
+
 function redrawDashboardWidget() {
     jQuery('#mandrill_widget div#filtered_recent').html('<div id="ajax-icon-container"><span id="loading_data"></span></div>');
     jQuery.ajax({  

diff --git a/lib/wpMandrill.class.php b/lib/wpMandrill.class.php
@@ -59,6 +59,8 @@ static function evaluate_response( $response ) {
 
         if ( !isset( $response[0]['status'] ) )
             throw new Exception( 'Email status was not provided in response.' );
+
+	do_action( 'mandrill_response_received', $response );
 
         if (
             'rejected' === $response[0]['status']
@@ -189,6 +191,11 @@ static function adminMenu() {
         wp_enqueue_style( 'mandrill_stylesheet' );
         wp_register_script('mandrill', SEWM_URL . 'js/mandrill.js', array(), SEWM_VERSION, true);
         wp_enqueue_script('mandrill');
+
+         // Pass nonce to JavaScript
+        wp_localize_script('mandrill', 'wpMandrillData', array(
+            'nonce' => wp_create_nonce('get_mandrill_stats_nonce')
+        ));
     }
 
     static function network_connect_notice() {
@@ -1434,6 +1441,11 @@ static function showDashboardWidgetOptions() {
     }
 
     static function getAjaxStats() {
+        if ( !isset($_POST['_wpnonce']) || !wp_verify_nonce($_POST['_wpnonce'], 'get_mandrill_stats_nonce') ) {
+            wp_send_json_error('Invalid nonce');
+            exit();
+        }
+
         $stats = self::getCurrentStats();
         if ( empty($stats) ) {
             exit();

diff --git a/readme.txt b/readme.txt
@@ -3,8 +3,8 @@ Contributors: MillerMediaNow, mikemm01, MC_Will, MC_Amanda, cornelraiu-1, crstau
 Tags: mandrill, mailchimp, transactional email, email, email reliability, smtp, wp_mail, email templates
 Requires PHP: 5.6
 Requires at least: 3.0
-Tested up to: 6.1.1
-Stable tag: 1.3.1
+Tested up to: 6.6.1
+Stable tag: 1.4
 License: GPLv2
 
 The Send Emails with Mandrill plugin sends emails that are generated by WordPress through Mandrill, a transactional email service powered by MailChimp.
@@ -112,6 +112,10 @@ If your account has more than 20 senders registered or more than 40 tags used, t
 4. Dashboard widget Settings
 
 == Changelog ==
+= 1.4 =
+* Added action hook for monitoring Mandrill API response
+* Added nonce to stats AJAX call
+
 = 1.3.1 =
 * Check for error messages parameters before processing (was throwing an error)
 

diff --git a/wpmandrill.php b/wpmandrill.php
@@ -32,7 +32,7 @@
 
 // Define plugin constants
 if ( !defined('SEWM_VERSION'))
-	define( 'SEWM_VERSION', '1.3.1' );
+	define( 'SEWM_VERSION', '1.4' );
 
 if ( !defined( 'SEWM_BASE' ) )
 	define( 'SEWM_BASE', plugin_basename( __FILE__ ) );