Easy Forms for MailChimp - Version 6.3.25

Version Description

Download this release

Release Info

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

Code changes from version 6.3.24 to 6.3.25

Files changed (3) hide show
  1. public/partials/shortcodes/process_form_shortcode.php +15 -13
  2. readme.txt +4 -1
  3. yikes-inc-easy-mailchimp-extender.php +2 -2
public/partials/shortcodes/process_form_shortcode.php CHANGED
@@ -91,7 +91,7 @@ function process_mailchimp_shortcode( $atts ) {
91
  wp_register_script( 'google-recaptcha-js' , 'https://www.google.com/recaptcha/api.js?hl=' . $recaptcha_shortcode_params['language'] . '&onload=renderReCaptchaCallback&render=explicit', array( 'jquery' ) , 'all' );
92
  wp_enqueue_script( 'google-recaptcha-js' );
93
  $recaptcha_site_key = get_option( 'yikes-mc-recaptcha-site-key' , '' );
94
- $recaptcha_box = '<div name="g-recaptcha" class="g-recaptcha" data-sitekey="' . $recaptcha_site_key . '" data-theme="' . $recaptcha_shortcode_params['theme'] . '" data-type="' . $recaptcha_shortcode_params['type'] . '" data-size="' . $recaptcha_shortcode_params['size'] . '" data-callback="' . $recaptcha_shortcode_params['success_callback'] . '" data-expired-callback="' . $recaptcha_shortcode_params['expired_callback'] . '"></div>';
95
  ?>
96
  <script type="text/javascript">
97
  /* Script Callback to init. multiple recaptchas on a single page */
@@ -117,8 +117,9 @@ function process_mailchimp_shortcode( $atts ) {
117
  }
118
  }
119
 
120
- // place our results into a seperate variable for easy looping
121
  $additional_form_settings = ( isset( $form_data['form_settings'] ) ) ? $form_data['form_settings'] : false;
 
122
  // store our options from the additional form settings array
123
  $form_classes = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-class-names'] : '';
124
  $inline_form = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-inline-form'] : '';
@@ -319,7 +320,7 @@ function process_mailchimp_shortcode( $atts ) {
319
  * pre-form action hooks
320
  * check readme for usage examples
321
  */
322
- do_action( 'yikes-mailchimp-before-form', $form_id );
323
 
324
  /*
325
  * Set a custom title using custom_title="lorem ipsum" parameter in the shortcode
@@ -484,7 +485,8 @@ function process_mailchimp_shortcode( $atts ) {
484
  }
485
 
486
  // build up our array
487
- $field_array['id'] = 'id="yikes-easy-mc-form-' . $form_id . '-' . esc_attr( $field[$tag] ) . '" ';
 
488
  $field_array['name'] = 'name="' . $group . esc_attr( $field[ $tag ] ) . '" ';
489
  $field_array['placeholder'] = isset( $field['placeholder'] ) ? 'placeholder="' . esc_attr( stripslashes( $field['placeholder'] ) ) . '" ' : '';
490
  $field_array['classes'] = 'class="yikes-easy-mc-'.$field['type'] . ' ' . esc_attr( trim( implode( ' ' , $custom_classes ) ) ) . '" ';
@@ -554,7 +556,7 @@ function process_mailchimp_shortcode( $atts ) {
554
  $default_value = apply_filters( 'yikes-mailchimp-process-default-tag', $default_value );
555
 
556
  ?>
557
- <label for="<?php echo esc_attr( $field['merge'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
558
 
559
  <!-- dictate label visibility -->
560
  <?php if( !isset( $field['hide-label'] ) ) { ?>
@@ -593,7 +595,7 @@ function process_mailchimp_shortcode( $atts ) {
593
  }
594
  </script>
595
 
596
- <label for="<?php echo esc_attr( $field['merge'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
597
 
598
  <!-- dictate label visibility -->
599
  <?php if( !isset( $field['hide-label'] ) ) { ?>
@@ -630,7 +632,7 @@ function process_mailchimp_shortcode( $atts ) {
630
  }
631
  </script>
632
 
633
- <label for="<?php echo esc_attr( $field['merge'] ) ?>" <?php echo implode( ' ' , $label_array ); ?>>
634
 
635
  <!-- dictate label visibility -->
636
  <?php if( !isset( $field['hide-label'] ) ) { ?>
@@ -655,7 +657,7 @@ function process_mailchimp_shortcode( $atts ) {
655
  $default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
656
 
657
  ?>
658
- <label for="<?php echo esc_attr( $field['merge'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
659
 
660
  <!-- dictate label visibility -->
661
  <?php if( ! isset( $field['hide-label'] ) ) { ?>
@@ -759,7 +761,7 @@ function process_mailchimp_shortcode( $atts ) {
759
  * Filter the HTML options for the states dropdown
760
  *
761
  * @param string | $state_and_province_list | HTML string of state/province options
762
- * @param int | $form_id | The form ID
763
  *
764
  * @return string | $state_and_province_list | Filtered HTML string of state/province options
765
  */
@@ -894,7 +896,7 @@ function process_mailchimp_shortcode( $atts ) {
894
  $x = 0;
895
 
896
  ?>
897
- <label for="<?php echo esc_attr( $field['merge'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
898
 
899
  <!-- dictate label visibility -->
900
  <?php if( !isset( $field['hide-label'] ) ) { ?>
@@ -923,7 +925,7 @@ function process_mailchimp_shortcode( $atts ) {
923
  // hidden labels
924
 
925
  ?>
926
- <label for="<?php echo esc_attr( $field['merge'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
927
  <!-- dictate label visibility -->
928
  <?php if( ! isset( $field['hide-label'] ) ) { ?>
929
  <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
@@ -986,7 +988,7 @@ function process_mailchimp_shortcode( $atts ) {
986
  $x = 0;
987
 
988
  ?>
989
- <label for="<?php echo esc_attr( $field['merge'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
990
 
991
  <!-- dictate label visibility -->
992
  <?php if( ! isset( $field['hide-label'] ) ) { ?>
@@ -1284,7 +1286,7 @@ function process_mailchimp_shortcode( $atts ) {
1284
  * post-form action hooks
1285
  * check readme for usage examples
1286
  */
1287
- do_action( 'yikes-mailchimp-after-form', $form_id );
1288
 
1289
  /*
1290
  * Update the impressions count
91
  wp_register_script( 'google-recaptcha-js' , 'https://www.google.com/recaptcha/api.js?hl=' . $recaptcha_shortcode_params['language'] . '&onload=renderReCaptchaCallback&render=explicit', array( 'jquery' ) , 'all' );
92
  wp_enqueue_script( 'google-recaptcha-js' );
93
  $recaptcha_site_key = get_option( 'yikes-mc-recaptcha-site-key' , '' );
94
+ $recaptcha_box = '<div class="g-recaptcha" data-sitekey="' . $recaptcha_site_key . '" data-theme="' . $recaptcha_shortcode_params['theme'] . '" data-type="' . $recaptcha_shortcode_params['type'] . '" data-size="' . $recaptcha_shortcode_params['size'] . '" data-callback="' . $recaptcha_shortcode_params['success_callback'] . '" data-expired-callback="' . $recaptcha_shortcode_params['expired_callback'] . '"></div>';
95
  ?>
96
  <script type="text/javascript">
97
  /* Script Callback to init. multiple recaptchas on a single page */
117
  }
118
  }
119
 
120
+ // place our results into a separate variable for easy looping
121
  $additional_form_settings = ( isset( $form_data['form_settings'] ) ) ? $form_data['form_settings'] : false;
122
+
123
  // store our options from the additional form settings array
124
  $form_classes = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-class-names'] : '';
125
  $inline_form = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-inline-form'] : '';
320
  * pre-form action hooks
321
  * check readme for usage examples
322
  */
323
+ do_action( 'yikes-mailchimp-before-form', $form_id, $form_data );
324
 
325
  /*
326
  * Set a custom title using custom_title="lorem ipsum" parameter in the shortcode
485
  }
486
 
487
  // build up our array
488
+ $field_id_string = 'yikes-easy-mc-form-' . $form_id . '-' . $field[ $tag ];
489
+ $field_array['id'] = 'id="' . esc_attr( $field_id_string ) . '" ';
490
  $field_array['name'] = 'name="' . $group . esc_attr( $field[ $tag ] ) . '" ';
491
  $field_array['placeholder'] = isset( $field['placeholder'] ) ? 'placeholder="' . esc_attr( stripslashes( $field['placeholder'] ) ) . '" ' : '';
492
  $field_array['classes'] = 'class="yikes-easy-mc-'.$field['type'] . ' ' . esc_attr( trim( implode( ' ' , $custom_classes ) ) ) . '" ';
556
  $default_value = apply_filters( 'yikes-mailchimp-process-default-tag', $default_value );
557
 
558
  ?>
559
+ <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
560
 
561
  <!-- dictate label visibility -->
562
  <?php if( !isset( $field['hide-label'] ) ) { ?>
595
  }
596
  </script>
597
 
598
+ <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
599
 
600
  <!-- dictate label visibility -->
601
  <?php if( !isset( $field['hide-label'] ) ) { ?>
632
  }
633
  </script>
634
 
635
+ <label for="<?php echo esc_attr( $field_id_string ) ?>" <?php echo implode( ' ' , $label_array ); ?>>
636
 
637
  <!-- dictate label visibility -->
638
  <?php if( !isset( $field['hide-label'] ) ) { ?>
657
  $default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
658
 
659
  ?>
660
+ <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
661
 
662
  <!-- dictate label visibility -->
663
  <?php if( ! isset( $field['hide-label'] ) ) { ?>
761
  * Filter the HTML options for the states dropdown
762
  *
763
  * @param string | $state_and_province_list | HTML string of state/province options
764
+ * @param int | $form_id | The form ID
765
  *
766
  * @return string | $state_and_province_list | Filtered HTML string of state/province options
767
  */
896
  $x = 0;
897
 
898
  ?>
899
+ <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
900
 
901
  <!-- dictate label visibility -->
902
  <?php if( !isset( $field['hide-label'] ) ) { ?>
925
  // hidden labels
926
 
927
  ?>
928
+ <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
929
  <!-- dictate label visibility -->
930
  <?php if( ! isset( $field['hide-label'] ) ) { ?>
931
  <span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
988
  $x = 0;
989
 
990
  ?>
991
+ <label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
992
 
993
  <!-- dictate label visibility -->
994
  <?php if( ! isset( $field['hide-label'] ) ) { ?>
1286
  * post-form action hooks
1287
  * check readme for usage examples
1288
  */
1289
+ do_action( 'yikes-mailchimp-after-form', $form_id, $form_data );
1290
 
1291
  /*
1292
  * Update the impressions count
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.8.1
7
- Stable tag: 6.3.24
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -268,6 +268,9 @@ Below you'll find a complete list of the hooks and filters available in Easy For
268
 
269
  == Changelog ==
270
 
 
 
 
271
  = Easy Forms for MailChimp 6.3.24 - August 28th, 2017 =
272
  * If a subscriber has unsubscribed, the signup form will re-send them a confirmation email (double opt-in only)
273
  * If a subscriber received the double confirmation email but never subscribed (pending status), the signup form will re-send them a confirmation email (double opt-in only)
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.8.1
7
+ Stable tag: 6.3.25
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
268
 
269
  == Changelog ==
270
 
271
+ = Easy Forms for MailChimp 6.3.25 - September 11th, 2017 =
272
+ * Fixing some HTML validation/markup errors related to labels. Thanks to @upekshapriya for bringing these to our attention.
273
+
274
  = Easy Forms for MailChimp 6.3.24 - August 28th, 2017 =
275
  * If a subscriber has unsubscribed, the signup form will re-send them a confirmation email (double opt-in only)
276
  * If a subscriber received the double confirmation email but never subscribed (pending status), the signup form will re-send them a confirmation email (double opt-in only)
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.24
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.3.24' );
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.3.25
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.3.25' );
47
  }
48
 
49
  /**