Easy Forms for MailChimp - Version 6.6.2

Version Description

  • November, 3, 2019 =
  • Bug scrub WCUS! Fixed issues with adding tags on resubscribe.
Download this release

Release Info

Developer fmixell
Plugin Icon 128x128 Easy Forms for MailChimp
Version 6.6.2
Comparing to
See all releases

Code changes from version 6.6.1 to 6.6.2

Files changed (4) hide show
  1. public/partials/shortcodes/process/process_form_submission.php +8 -2
  2. public/partials/shortcodes/process/process_form_submission_ajax.php +9 -2
  3. readme.txt +4 -1
  4. yikes-inc-easy-mailchimp-extender.php +2 -2
public/partials/shortcodes/process/process_form_submission.php CHANGED
@@ -248,8 +248,12 @@ if ( is_wp_error( $member_exists ) || $double_optin_resubscribe === true ) {
248
  $member_data = apply_filters( 'yikes-mailchimp-filter-subscribe-request', $member_data, $form_id );
249
  $member_data = apply_filters( "yikes-mailchimp-filter-subscribe-request-{$form_id}", $member_data, $form_id );
250
 
251
- foreach( $form_data['tags'] as $tag ) {
252
- $member_data['tags'][] = $tag['name'];
 
 
 
 
253
  }
254
 
255
  // Send the API request to create a new subscriber! (Or update an existing one)
@@ -261,6 +265,8 @@ $subscribe_response = $list_handler->member_subscribe( $list_id, md5( $sanitized
261
  if ( is_wp_error( $subscribe_response ) ) {
262
  $success_array = $submission_handler->handle_submission_response_error( $subscribe_response, $form_fields );
263
  } else {
 
 
264
 
265
  $submission_handler->handle_submission_response_success( $submission_settings, array(), $merge_variables, $notifications, $optin_settings, $new_subscriber );
266
  }
248
  $member_data = apply_filters( 'yikes-mailchimp-filter-subscribe-request', $member_data, $form_id );
249
  $member_data = apply_filters( "yikes-mailchimp-filter-subscribe-request-{$form_id}", $member_data, $form_id );
250
 
251
+ // If this is the first time subscriber add the tags along with the subscribe request.
252
+ // This allows for double opt-in forms submissions to be tagged.
253
+ if ( ! empty( $form_data['tags'] ) && ! is_array( $member_exists ) ) {
254
+ foreach( $form_data['tags'] as $tag ) {
255
+ $member_data['tags'][] = $tag['name'];
256
+ }
257
  }
258
 
259
  // Send the API request to create a new subscriber! (Or update an existing one)
265
  if ( is_wp_error( $subscribe_response ) ) {
266
  $success_array = $submission_handler->handle_submission_response_error( $subscribe_response, $form_fields );
267
  } else {
268
+ // Check if we have any tags to add.
269
+ $tags_response = $submission_handler->maybe_add_tags( $form_data, $data );
270
 
271
  $submission_handler->handle_submission_response_success( $submission_settings, array(), $merge_variables, $notifications, $optin_settings, $new_subscriber );
272
  }
public/partials/shortcodes/process/process_form_submission_ajax.php CHANGED
@@ -208,8 +208,12 @@ if ( is_wp_error( $member_exists ) || $double_optin_resubscribe === true ) {
208
  $member_data = apply_filters( 'yikes-mailchimp-filter-subscribe-request', $member_data, $form_id );
209
  $member_data = apply_filters( "yikes-mailchimp-filter-subscribe-request-{$form_id}", $member_data, $form_id );
210
 
211
- foreach( $form_data['tags'] as $tag ) {
212
- $member_data['tags'][] = $tag['name'];
 
 
 
 
213
  }
214
 
215
  // Send the API request to create a new subscriber! (Or update an existing one)
@@ -221,6 +225,9 @@ $subscribe_response = $list_handler->member_subscribe( $list_id, md5( $sanitized
221
  if ( is_wp_error( $subscribe_response ) ) {
222
  $submission_handler->handle_submission_response_error( $subscribe_response, $form_fields );
223
  } else {
 
 
 
224
  $submission_handler->handle_submission_response_success( $submission_settings, $page_data, $merge_variables, $notifications, $optin_settings, $new_subscriber );
225
  }
226
 
208
  $member_data = apply_filters( 'yikes-mailchimp-filter-subscribe-request', $member_data, $form_id );
209
  $member_data = apply_filters( "yikes-mailchimp-filter-subscribe-request-{$form_id}", $member_data, $form_id );
210
 
211
+ // If this is the first time subscriber add the tags along with the subscribe request.
212
+ // This allows for double opt-in forms submissions to be tagged.
213
+ if ( ! empty( $form_data['tags'] ) && ! is_array( $member_exists ) ) {
214
+ foreach( $form_data['tags'] as $tag ) {
215
+ $member_data['tags'][] = $tag['name'];
216
+ }
217
  }
218
 
219
  // Send the API request to create a new subscriber! (Or update an existing one)
225
  if ( is_wp_error( $subscribe_response ) ) {
226
  $submission_handler->handle_submission_response_error( $subscribe_response, $form_fields );
227
  } else {
228
+ // Check if we have any tags to add.
229
+ $tags_response = $submission_handler->maybe_add_tags( $form_data, $data );
230
+
231
  $submission_handler->handle_submission_response_success( $submission_settings, $page_data, $merge_variables, $notifications, $optin_settings, $new_subscriber );
232
  }
233
 
readme.txt CHANGED
@@ -5,7 +5,7 @@ Tags: Mailchimp, Mailchimp forms, Mailchimp lists, opt-in forms, sign up form, M
5
  Requires at least: 4.0
6
  Tested up to: 5.3
7
  Requires PHP: 5.2.13
8
- Stable tag: 6.6.1
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
 
@@ -172,6 +172,9 @@ For information and code examples on how to implement the hooks and filters prov
172
 
173
  == Changelog ==
174
 
 
 
 
175
  = 6.6.0 - October 25, 2019 =
176
  * Adding Double Opt-in Subscribe.
177
  * Easy Forms Gutenberg Category - Thanks to @Ajwerth.
5
  Requires at least: 4.0
6
  Tested up to: 5.3
7
  Requires PHP: 5.2.13
8
+ Stable tag: 6.6.2
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
 
172
 
173
  == Changelog ==
174
 
175
+ = 6.6.2 - November, 3, 2019 =
176
+ * Bug scrub WCUS! Fixed issues with adding tags on resubscribe.
177
+
178
  = 6.6.0 - October 25, 2019 =
179
  * Adding Double Opt-in Subscribe.
180
  * Easy Forms Gutenberg Category - Thanks to @Ajwerth.
yikes-inc-easy-mailchimp-extender.php CHANGED
@@ -3,7 +3,7 @@
3
  * Plugin Name: Easy Forms for Mailchimp
4
  * Plugin URI: https://yikesplugins.com/plugin/easy-forms-for-mailchimp/
5
  * Description: The ultimate Mailchimp WordPress plugin. Easily build <strong>unlimited forms for your Mailchimp lists</strong>, add them to your site and track subscriber activity. To get started, go to the settings page and enter your <a href="https://yikesplugins.com/support/knowledge-base/finding-your-mailchimp-api-key/" target="_blank">Mailchimp API key</a>.
6
- * Version: 6.6.1
7
  * Author: YIKES, Inc.
8
  * Author URI: https://www.yikesplugins.com/
9
  * License: GPL-3.0+
@@ -43,7 +43,7 @@ if ( ! defined( 'WPINC' ) ) {
43
  * @since 6.1.3
44
  */
45
  if ( ! defined( 'YIKES_MC_VERSION' ) ) {
46
- define( 'YIKES_MC_VERSION', '6.6.1' );
47
  }
48
 
49
  /**
3
  * Plugin Name: Easy Forms for Mailchimp
4
  * Plugin URI: https://yikesplugins.com/plugin/easy-forms-for-mailchimp/
5
  * Description: The ultimate Mailchimp WordPress plugin. Easily build <strong>unlimited forms for your Mailchimp lists</strong>, add them to your site and track subscriber activity. To get started, go to the settings page and enter your <a href="https://yikesplugins.com/support/knowledge-base/finding-your-mailchimp-api-key/" target="_blank">Mailchimp API key</a>.
6
+ * Version: 6.6.2
7
  * Author: YIKES, Inc.
8
  * Author URI: https://www.yikesplugins.com/
9
  * License: GPL-3.0+
43
  * @since 6.1.3
44
  */
45
  if ( ! defined( 'YIKES_MC_VERSION' ) ) {
46
+ define( 'YIKES_MC_VERSION', '6.6.2' );
47
  }
48
 
49
  /**