Easy Forms for MailChimp - Version 6.3.8

Version Description

Download this release

Release Info

Developer yikesitskevin
Plugin Icon 128x128 Easy Forms for MailChimp
Version 6.3.8
Comparing to
See all releases

Code changes from version 6.3.7 to 6.3.8

Files changed (3) hide show
  1. public/partials/shortcodes/process_form_shortcode.php +9 -15
  2. readme.txt +4 -1
  3. yikes-inc-easy-mailchimp-extender.php +2 -2
public/partials/shortcodes/process_form_shortcode.php CHANGED
@@ -468,21 +468,13 @@ function process_mailchimp_shortcode( $atts ) {
468
  if( $field['type'] == 'email' ) {
469
  $field_array['required'] = 'required="required"';
470
  $label_array['visible'] = '';
471
- // $label_array['required'] = 'class="' . $field['merge'] . '-label yikes-mailchimp-field-required"';
472
  $label_class_array[] = $field['merge'] . '-label';
473
  $label_class_array[] = 'yikes-mailchimp-field-required';
474
  } else {
475
- if( $tag == 'merge' ) {
476
- $field_array['required'] = isset( $field['require'] ) ? 'required="required"' : '';
477
- $label_array['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : '';
478
- // $label_array['required'] = isset( $field['require'] ) ? 'class="' . $field['merge'] . '-label yikes-mailchimp-field-required"' : 'class="' . $field['merge'] . '-label"';
479
- $label_class_array[] = isset( $field['require'] ) ? $field['merge'] . '-label yikes-mailchimp-field-required' : $field['merge'] . '-label';
480
- } else {
481
- $field_array['required'] = isset( $field['require'] ) ? 'required="required"' : '';
482
- $label_array['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : '';
483
- // $label_array['required'] = isset( $field['require'] ) ? 'class="' . $field['group_id'] . '-label yikes-mailchimp-field-required"' : 'class="' . $field['group_id'] . '-label"';
484
- $label_class_array[] = isset( $field['require'] ) ? $field['group_id'] . '-label yikes-mailchimp-field-required' : $field['group_id'] . '-label';
485
- }
486
  }
487
 
488
  // if both hide label and hide field are checked, we gotta hide the field!
@@ -493,8 +485,10 @@ function process_mailchimp_shortcode( $atts ) {
493
  }
494
 
495
  // Sanitize the classes
496
- $label_class_array = array_map( 'sanitize_html_class', $label_class_array );
497
- $label_array['classes'] = 'class="' . implode( ' ', $label_class_array ) . '"';
 
 
498
 
499
  // Filter the field array data
500
  $field_array = apply_filters( 'yikes-mailchimp-field-data', $field_array, $field, $form_id );
@@ -1182,7 +1176,7 @@ function process_mailchimp_shortcode( $atts ) {
1182
 
1183
  foreach( $groups as $group_id => $name ) {
1184
  ?>
1185
- <label for="<?php echo esc_attr( $field['group_id'] ) . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ' , $custom_classes ); if ( $x === $count ) { echo 'last-selection'; } ?>" style="display:none;">
1186
  <input
1187
  type="checkbox"
1188
  name="group-<?php echo esc_attr( $field['group_id'] ); ?>[]"
468
  if( $field['type'] == 'email' ) {
469
  $field_array['required'] = 'required="required"';
470
  $label_array['visible'] = '';
 
471
  $label_class_array[] = $field['merge'] . '-label';
472
  $label_class_array[] = 'yikes-mailchimp-field-required';
473
  } else {
474
+ $field_array['required'] = isset( $field['require'] ) ? 'required="required"' : '';
475
+ $label_array['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : '';
476
+ $label_class_array[] = ( $tag === 'merge' ) ? $field['merge'] . '-label' : $field['group_id'] . '-label';
477
+ if ( isset( $field['require'] ) ) $label_class_array[] = 'yikes-mailchimp-field-required';
 
 
 
 
 
 
 
478
  }
479
 
480
  // if both hide label and hide field are checked, we gotta hide the field!
485
  }
486
 
487
  // Sanitize the classes
488
+ $label_class_array = function_exists( 'sanitize_html_class' ) ? array_map( 'sanitize_html_class', $label_class_array ) : $label_class_array;
489
+
490
+ // Turn the clases into a string
491
+ $label_array['classes'] = 'class="' . implode( ' ', $label_class_array ) . ' "';
492
 
493
  // Filter the field array data
494
  $field_array = apply_filters( 'yikes-mailchimp-field-data', $field_array, $field, $form_id );
1176
 
1177
  foreach( $groups as $group_id => $name ) {
1178
  ?>
1179
+ <label for="<?php echo esc_attr( $field['group_id'] ) . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ' , $custom_classes ); if ( $x === $count ) { echo ' last-selection'; } ?>" style="display:none;">
1180
  <input
1181
  type="checkbox"
1182
  name="group-<?php echo esc_attr( $field['group_id'] ); ?>[]"
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: https://yikesplugins.com/?utm_source=wp_plugin_repo&utm_medium=dona
4
  Tags: MailChimp, MailChimp forms, MailChimp lists, opt-in forms, sign up form, MailChimp, email, forms, mailing lists, marketing, newsletter, sign up
5
  Requires at least: 4.0
6
  Tested up to: 4.7.2
7
- Stable tag: 6.3.7
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -247,6 +247,9 @@ Below you'll find a complete list of the hooks and filters available in Easy For
247
 
248
  == Changelog ==
249
 
 
 
 
250
  = Easy Forms for MailChimp 6.3.7 - March 3rd, 2017 =
251
  * Fixed an issue with the JavaScript helper file that was updated in 6.3.5 - the update profile link should now work as expected (shout out to @manouallouon on GitHub for pointing this out)
252
 
4
  Tags: MailChimp, MailChimp forms, MailChimp lists, opt-in forms, sign up form, MailChimp, email, forms, mailing lists, marketing, newsletter, sign up
5
  Requires at least: 4.0
6
  Tested up to: 4.7.2
7
+ Stable tag: 6.3.8
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
247
 
248
  == Changelog ==
249
 
250
+ = Easy Forms for MailChimp 6.3.8 - March 3rd, 2017 =
251
+ * Fixed an issue with label classes and refactored the code - there are now spaces in between the classes
252
+
253
  = Easy Forms for MailChimp 6.3.7 - March 3rd, 2017 =
254
  * Fixed an issue with the JavaScript helper file that was updated in 6.3.5 - the update profile link should now work as expected (shout out to @manouallouon on GitHub for pointing this out)
255
 
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.3.7
7
  * Author: YIKES, Inc.
8
  * Author URI: https://www.yikesplugins.com/
9
  * License: GPL-3.0+
@@ -42,7 +42,7 @@ if ( ! defined( 'WPINC' ) ) {
42
  * @since 6.1.3
43
  */
44
  if ( ! defined( 'YIKES_MC_VERSION' ) ) {
45
- define( 'YIKES_MC_VERSION' , '6.3.7' );
46
  }
47
 
48
  /**
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.3.8
7
  * Author: YIKES, Inc.
8
  * Author URI: https://www.yikesplugins.com/
9
  * License: GPL-3.0+
42
  * @since 6.1.3
43
  */
44
  if ( ! defined( 'YIKES_MC_VERSION' ) ) {
45
+ define( 'YIKES_MC_VERSION' , '6.3.8' );
46
  }
47
 
48
  /**