Easy Forms for MailChimp - Version 6.0.3.7

Version Description

Download this release

Release Info

Developer eherman24
Plugin Icon 128x128 Easy Forms for MailChimp
Version 6.0.3.7
Comparing to
See all releases

Code changes from version 6.0.3.6 to 6.0.3.7

Files changed (4) hide show
  1. includes/class-yikes-inc-easy-mailchimp-extender.php +1 -1
  2. public/partials/shortcodes/process_form_shortcode.php +17 -4
  3. readme.txt +1 -9
  4. yikes-inc-easy-mailchimp-extender.php +1 -1
includes/class-yikes-inc-easy-mailchimp-extender.php CHANGED
@@ -62,7 +62,7 @@ class Yikes_Inc_Easy_Mailchimp_Extender {
62
  */
63
  public function __construct() {
64
  $this->yikes_inc_easy_mailchimp_extender = 'yikes-inc-easy-mailchimp-extender';
65
- $this->version = '6.0.3.6';
66
  $this->load_dependencies();
67
  $this->set_locale();
68
  $this->define_admin_hooks();
62
  */
63
  public function __construct() {
64
  $this->yikes_inc_easy_mailchimp_extender = 'yikes-inc-easy-mailchimp-extender';
65
+ $this->version = '6.0.3.7';
66
  $this->load_dependencies();
67
  $this->set_locale();
68
  $this->define_admin_hooks();
public/partials/shortcodes/process_form_shortcode.php CHANGED
@@ -21,7 +21,7 @@ function process_mailchimp_shortcode( $atts ) {
21
  'recaptcha_expired_callback' => '', // set a custom js callback function to run after the recaptcha has expired - default none
22
  ), $atts , 'yikes-mailchimp' )
23
  );
24
-
25
  // set globals
26
  global $form_submitted, $process_submission_response;
27
 
@@ -60,9 +60,16 @@ function process_mailchimp_shortcode( $atts ) {
60
  if( get_option( 'yikes-mc-recaptcha-secret-key' , '' ) == '' ) {
61
  return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA secret key!" , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>';
62
  }
 
 
 
 
 
 
63
  // Store the site language (to load recaptcha in a specific language)
64
  $locale = get_locale();
65
  $locale_split = explode( '_', $locale );
 
66
  $lang = ( isset( $locale_split ) ? $locale_split[0] : $locale );
67
  $lang = ( isset( $atts['recaptcha_lang'] ) ) ? $atts['recaptcha_lang'] : $locale_split[0];
68
  $type = ( isset( $atts['recaptcha_type'] ) ) ? strtolower( $atts['recaptcha_type'] ) : 'image'; // setup recaptcha type
@@ -84,7 +91,6 @@ function process_mailchimp_shortcode( $atts ) {
84
  wp_enqueue_script( 'google-recaptcha-js' );
85
  $recaptcha_site_key = get_option( 'yikes-mc-recaptcha-site-key' , '' );
86
  $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>';
87
-
88
  ?>
89
  <script type="text/javascript">
90
  /* Script Callback to init. multiple recaptchas on a single page */
@@ -92,9 +98,16 @@ function process_mailchimp_shortcode( $atts ) {
92
  var x = 1;
93
  jQuery( '.g-recaptcha' ).each( function() {
94
  jQuery( this ).attr( 'id', 'recaptcha-' + x );
95
- grecaptcha.render( 'recaptcha-' + x, {
96
  'sitekey' : '<?php echo $recaptcha_site_key; ?>',
97
- });
 
 
 
 
 
 
 
98
  x++;
99
  });
100
  }
21
  'recaptcha_expired_callback' => '', // set a custom js callback function to run after the recaptcha has expired - default none
22
  ), $atts , 'yikes-mailchimp' )
23
  );
24
+
25
  // set globals
26
  global $form_submitted, $process_submission_response;
27
 
60
  if( get_option( 'yikes-mc-recaptcha-secret-key' , '' ) == '' ) {
61
  return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA secret key!" , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>';
62
  }
63
+
64
+ if( ! empty( $atts['recaptcha_type'] ) ) {
65
+ echo 'yes';
66
+ echo $atts['recaptcha_type'];
67
+ }
68
+
69
  // Store the site language (to load recaptcha in a specific language)
70
  $locale = get_locale();
71
  $locale_split = explode( '_', $locale );
72
+ // Setup reCaptcha parameters
73
  $lang = ( isset( $locale_split ) ? $locale_split[0] : $locale );
74
  $lang = ( isset( $atts['recaptcha_lang'] ) ) ? $atts['recaptcha_lang'] : $locale_split[0];
75
  $type = ( isset( $atts['recaptcha_type'] ) ) ? strtolower( $atts['recaptcha_type'] ) : 'image'; // setup recaptcha type
91
  wp_enqueue_script( 'google-recaptcha-js' );
92
  $recaptcha_site_key = get_option( 'yikes-mc-recaptcha-site-key' , '' );
93
  $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>';
 
94
  ?>
95
  <script type="text/javascript">
96
  /* Script Callback to init. multiple recaptchas on a single page */
98
  var x = 1;
99
  jQuery( '.g-recaptcha' ).each( function() {
100
  jQuery( this ).attr( 'id', 'recaptcha-' + x );
101
+ recaptcha_paramaters = {
102
  'sitekey' : '<?php echo $recaptcha_site_key; ?>',
103
+ 'lang' : '<?php echo $lang; ?>',
104
+ 'type' : '<?php echo $type; ?>',
105
+ 'theme' : '<?php echo $theme; ?>',
106
+ 'size' : '<?php echo $size; ?>',
107
+ 'data_callback' : '<?php echo $data_callback; ?>',
108
+ 'expired_callback' : '<?php echo $expired_callback; ?>'
109
+ };
110
+ grecaptcha.render( 'recaptcha-' + x, recaptcha_paramaters );
111
  x++;
112
  });
113
  }
readme.txt CHANGED
@@ -1 +1 @@
1
- === Easy Forms for MailChimp ===
2
- added `stripslashes()` to the following settings fields :
3
- Updated readme FAQ section
4
- added `stripslashes()` to the following settings fields :
5
- Updated readme FAQ section
6
- added `stripslashes()` to the following settings fields :
7
- Updated readme FAQ section
8
- added `stripslashes()` to the following settings fields :
9
- Updated readme FAQ section
1
+ === Easy Forms for MailChimp ===
 
 
 
 
 
 
 
 
yikes-inc-easy-mailchimp-extender.php CHANGED
@@ -3,7 +3,7 @@
3
  * Plugin Name: Easy Forms for MailChimp by YIKES
4
  * Plugin URI: http://www.yikesinc.com/services/yikes-inc-easy-mailchimp-extender/
5
  * Description: YIKES Easy Forms for MailChimp links your site to MailChimp and allows you to generate and display mailing list opt-in forms anywhere on your site with ease.
6
- * Version: 6.0.3.6
7
  * Author: YIKES
8
  * Author URI: http://www.yikesinc.com/
9
  * License: GPL-3.0+
3
  * Plugin Name: Easy Forms for MailChimp by YIKES
4
  * Plugin URI: http://www.yikesinc.com/services/yikes-inc-easy-mailchimp-extender/
5
  * Description: YIKES Easy Forms for MailChimp links your site to MailChimp and allows you to generate and display mailing list opt-in forms anywhere on your site with ease.
6
+ * Version: 6.0.3.7
7
  * Author: YIKES
8
  * Author URI: http://www.yikesinc.com/
9
  * License: GPL-3.0+