Easy Forms for MailChimp - Version 4.3

Version Description

  • Updated radio button fields
  • Re-worked related JS and PHP functions
Download this release

Release Info

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

Code changes from version 4.3.1 to 4.3

Files changed (9) hide show
  1. .gitignore +0 -6
  2. classes/class.yksemeBase.php +14 -37
  3. images/Thumbs.db +0 -0
  4. images/pagination/Thumbs.db +0 -0
  5. images/smoothness/Thumbs.db +0 -0
  6. readme.md +0 -11
  7. readme.txt +1 -16
  8. templates/shortcode_form.php +2 -2
  9. yikes-inc-easy-mailchimp-extender.php +2 -2
.gitignore DELETED
@@ -1,6 +0,0 @@
1
- # Windows Files
2
- Thumbs.db
3
- desktop.ini
4
-
5
- # OS X Files
6
- .DS_Store
 
 
 
 
 
 
classes/class.yksemeBase.php CHANGED
@@ -74,10 +74,6 @@ public function initialize()
74
  add_action('admin_print_styles', array(&$this, 'addStyles'));
75
  add_action('admin_print_scripts', array(&$this, 'addScripts'));
76
  add_action('admin_init', array( &$this, 'yks_easy_mc_plugin_activation_redirect' ) );
77
- // adding our custom content action
78
- // used to prevent other plugins from hooking
79
- // into the_content (such as jetpack sharedadddy, sharethis etc.)
80
- add_action( 'init', array( &$this, 'yks_mc_content' ), 1 );
81
  // tinymce buttons
82
  // only add filters and actions on wp 3.9 and above
83
  if ( get_bloginfo( 'version' ) >= '3.9' ) {
@@ -1883,14 +1879,15 @@ public function getFrontendFormDisplay($list='', $submit_text)
1883
  var formRedirectPage = '<?php echo $redirect_url ?>';
1884
  var formID = '<?php echo $form_id[1] ?>';
1885
  jQuery('#yks-mailchimp-form_0-'+formID).submit(function() {
1886
- var interval = setInterval(function() {
 
1887
  if ( jQuery('.yks-success').is(':visible') ) {
1888
- window.location.replace(formRedirectPage);
1889
- clearInterval(interval);
1890
- return;
 
1891
  }
1892
- //do whatever here..
1893
- }, 2000);
1894
  });
1895
  });
1896
  </script>
@@ -1969,14 +1966,15 @@ public function getFrontendFormDisplay($list='', $submit_text)
1969
  var formRedirectPage = '<?php echo $redirect_url ?>';
1970
  var formID = '<?php echo $form_id[1] ?>';
1971
  jQuery('#yks-mailchimp-form_0-'+formID).submit(function() {
1972
- var interval = setInterval(function() {
 
1973
  if ( jQuery('.yks-success').is(':visible') ) {
1974
- window.location.replace(formRedirectPage);
1975
- clearInterval(interval);
1976
- return;
 
1977
  }
1978
- //do whatever here..
1979
- }, 2000);
1980
  });
1981
  });
1982
  </script>
@@ -2333,27 +2331,6 @@ private function runUpdateTasks_1_3_0()
2333
  }
2334
  }
2335
 
2336
- /****
2337
- **
2338
- ** Custom The_Content filter
2339
- ** used to prevent other plugins from hooking here
2340
- **
2341
- ****/
2342
- function yks_mc_content() {
2343
- //Create our own version of the_content so that others can't accidentally loop into our output - Taken from default-filters.php, shortcodes.php, and media.php
2344
- if ( !has_filter( 'yks_mc_content', 'wptexturize' ) ) {
2345
- add_filter( 'yks_mc_content', 'wptexturize' );
2346
- add_filter( 'yks_mc_content', 'convert_smilies' );
2347
- add_filter( 'yks_mc_content', 'convert_chars' );
2348
- add_filter( 'yks_mc_content', 'wpautop' );
2349
- add_filter( 'yks_mc_content', 'shortcode_unautop' );
2350
- add_filter( 'yks_mc_content', 'prepend_attachment' );
2351
- $vidembed = new WP_Embed();
2352
- add_filter( 'yks_mc_content', array( &$vidembed, 'run_shortcode'), 8 );
2353
- add_filter( 'yks_mc_content', array( &$vidembed, 'autoembed'), 8 );
2354
- add_filter( 'yks_mc_content', 'do_shortcode', 11);
2355
- } //end has_filter
2356
- } //end yks_mc_content
2357
 
2358
  // Check if cURL is enabled at the server level
2359
  // used on the options.php page
74
  add_action('admin_print_styles', array(&$this, 'addStyles'));
75
  add_action('admin_print_scripts', array(&$this, 'addScripts'));
76
  add_action('admin_init', array( &$this, 'yks_easy_mc_plugin_activation_redirect' ) );
 
 
 
 
77
  // tinymce buttons
78
  // only add filters and actions on wp 3.9 and above
79
  if ( get_bloginfo( 'version' ) >= '3.9' ) {
1879
  var formRedirectPage = '<?php echo $redirect_url ?>';
1880
  var formID = '<?php echo $form_id[1] ?>';
1881
  jQuery('#yks-mailchimp-form_0-'+formID).submit(function() {
1882
+ var i = 0;
1883
+ setInterval(function(){
1884
  if ( jQuery('.yks-success').is(':visible') ) {
1885
+ i++;
1886
+ if ( i == 1 ) {
1887
+ window.location.replace(formRedirectPage);
1888
+ }
1889
  }
1890
+ }, 1000);
 
1891
  });
1892
  });
1893
  </script>
1966
  var formRedirectPage = '<?php echo $redirect_url ?>';
1967
  var formID = '<?php echo $form_id[1] ?>';
1968
  jQuery('#yks-mailchimp-form_0-'+formID).submit(function() {
1969
+ var i = 0;
1970
+ setInterval(function(){
1971
  if ( jQuery('.yks-success').is(':visible') ) {
1972
+ i++;
1973
+ if ( i == 1 ) {
1974
+ window.location.replace(formRedirectPage);
1975
+ }
1976
  }
1977
+ }, 1000);
 
1978
  });
1979
  });
1980
  </script>
2331
  }
2332
  }
2333
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2334
 
2335
  // Check if cURL is enabled at the server level
2336
  // used on the options.php page
images/Thumbs.db ADDED
Binary file
images/pagination/Thumbs.db ADDED
Binary file
images/smoothness/Thumbs.db ADDED
Binary file
readme.md CHANGED
@@ -24,13 +24,6 @@ Features
24
  1. Easily add forms to pages and posts with a button in the page/post editor
25
  1. Use cURL error detection to troubleshoot MailChimp connection issues
26
 
27
- Coming Soon
28
- ===========
29
- 1. ReCaptcha for spam prevention
30
- 1. MailChimp Campaign statistic tracking
31
- 1. Track list growth, campaign opens, un-subscribes, user interactivity and much more!
32
- 1. View further MailChimp account details such as account level, emails left for the month etc.
33
-
34
  Installation
35
  ===========
36
 
@@ -417,10 +410,6 @@ These functions should be used in conjunction with the `yikes_mc_get_form_data`
417
 
418
  Changes
419
  ===========
420
- ### 4.3.1
421
- * Removed the_content filter, added custom filter to prevent other plugins from hooking in
422
- * Re-work redirect function to prevent infinite loop (and no redirect) issue
423
-
424
  ### 4.3
425
  * Updated radio button fields
426
  * Re-worked related JS and PHP functions
24
  1. Easily add forms to pages and posts with a button in the page/post editor
25
  1. Use cURL error detection to troubleshoot MailChimp connection issues
26
 
 
 
 
 
 
 
 
27
  Installation
28
  ===========
29
 
410
 
411
  Changes
412
  ===========
 
 
 
 
413
  ### 4.3
414
  * Updated radio button fields
415
  * Re-worked related JS and PHP functions
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: http://yikesinc.com
4
  Tags: mailchimp, marketing, email, mailing lists, newsletter, signup, forms, signup form
5
  Requires at least: 3.0
6
  Tested up to: 3.9.1
7
- Stable tag: 4.3.1
8
  License: GPLv2 or later
9
 
10
  Easy MailChimp Forms allows you to painlessly add MailChimp signup forms to your WordPress site.
@@ -33,13 +33,6 @@ Easy MailChimp Forms allows you to painlessly add MailChimp signup forms to your
33
  * Use cURL error detection to troubleshoot MailChimp connection issues
34
 
35
 
36
- **Coming to v.4.4**
37
-
38
- * ReCaptcha for spam prevention
39
- * MailChimp Campaign statistic tracking
40
- * Track list growth, campaign opens, un-subscribes, user interactivity and much more!
41
- * View further MailChimp account details such as account level, emails left for the month etc.
42
-
43
  Instructions on how to use the plugin can be [found in the FAQ](http://wordpress.org/plugins/yikes-inc-easy-mailchimp-extender/faq/). If you experience any problems, please submit a New Issue on our [Github Issue Tracker](https://github.com/yikesinc/yikes-inc-easy-mailchimp-extender/issues) and we'll look in to it as soon as possible.
44
 
45
 
@@ -446,10 +439,6 @@ These functions should be used in conjunction with the `yikes_mc_get_form_data`
446
 
447
  == Changelog ==
448
 
449
- = 4.3.1 =
450
- * Removed the_content filter, added custom filter to prevent other plugins from hooking in
451
- * Re-work redirect function to prevent infinite loop (and no redirect) issue
452
-
453
  = 4.3 =
454
  * Updated radio button fields
455
  * Re-worked related JS and PHP functions
@@ -559,10 +548,6 @@ These functions should be used in conjunction with the `yikes_mc_get_form_data`
559
  * Initial Release
560
 
561
  == Upgrade Notice ==
562
- = 4.3.1 =
563
- * Removed the_content filter, added custom filter to prevent other plugins from hooking in
564
- * Re-work redirect function to prevent infinite loop (and no redirect) issue
565
-
566
  = 3.0 =
567
  * Update Mail Chimp API to v2.0
568
  * Added API Key Validation Check
4
  Tags: mailchimp, marketing, email, mailing lists, newsletter, signup, forms, signup form
5
  Requires at least: 3.0
6
  Tested up to: 3.9.1
7
+ Stable tag: 4.3
8
  License: GPLv2 or later
9
 
10
  Easy MailChimp Forms allows you to painlessly add MailChimp signup forms to your WordPress site.
33
  * Use cURL error detection to troubleshoot MailChimp connection issues
34
 
35
 
 
 
 
 
 
 
 
36
  Instructions on how to use the plugin can be [found in the FAQ](http://wordpress.org/plugins/yikes-inc-easy-mailchimp-extender/faq/). If you experience any problems, please submit a New Issue on our [Github Issue Tracker](https://github.com/yikesinc/yikes-inc-easy-mailchimp-extender/issues) and we'll look in to it as soon as possible.
37
 
38
 
439
 
440
  == Changelog ==
441
 
 
 
 
 
442
  = 4.3 =
443
  * Updated radio button fields
444
  * Re-worked related JS and PHP functions
548
  * Initial Release
549
 
550
  == Upgrade Notice ==
 
 
 
 
551
  = 3.0 =
552
  * Update Mail Chimp API to v2.0
553
  * Added API Key Validation Check
templates/shortcode_form.php CHANGED
@@ -26,8 +26,8 @@ $ymce = jQuery.noConflict();
26
  return (err > 0 ? false : true);
27
  }
28
  $ymce('#yks-mailchimp-form_<?php echo $list['id']; ?>').submit(function(e){
29
- var singleOptinMessage = '<?php echo str_replace( '\'' , '"' , preg_replace('/\r?\n/', '\\n', apply_filters('yks_mc_content' , $this->optionVal['single-optin-message']))); ?>';
30
- var doubleOptinMessage = '<?php echo str_replace( '\'' , '"' , preg_replace('/\r?\n/', '\\n', apply_filters('yks_mc_content' , $this->optionVal['double-optin-message']))); ?>';
31
  var optinValue = '<?php echo $this->optionVal['optin']; ?>';
32
  e.preventDefault();
33
  // Make sure the api key exists
26
  return (err > 0 ? false : true);
27
  }
28
  $ymce('#yks-mailchimp-form_<?php echo $list['id']; ?>').submit(function(e){
29
+ var singleOptinMessage = '<?php echo preg_replace("/\r?\n/", "\\n", apply_filters('the_content' , $this->optionVal['single-optin-message'])); ?>';
30
+ var doubleOptinMessage = '<?php echo preg_replace("/\r?\n/", "\\n", apply_filters('the_content' , $this->optionVal['double-optin-message'])); ?>';
31
  var optinValue = '<?php echo $this->optionVal['optin']; ?>';
32
  e.preventDefault();
33
  // Make sure the api key exists
yikes-inc-easy-mailchimp-extender.php CHANGED
@@ -4,7 +4,7 @@
4
  Plugin Name: Easy MailChimp Forms
5
  Plugin URI: http://www.yikesinc.com/services/yikes-inc-easy-mailchimp-extender/
6
  Description: Mailchimp API integration in the form of a shortcode or php snippet
7
- Version: 4.3.1
8
  Author: YIKES Inc
9
  Author URI: http://yikesinc.com
10
  License: GPL2
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
30
 
31
  /** Configuration **/
32
  if(!defined('YKSEME_DEBUG')) define('YKSEME_DEBUG', false);
33
- if(!defined('YKSEME_VERSION_CURRENT')) define('YKSEME_VERSION_CURRENT', '4.3.1');
34
  if(!defined('YKSEME_REQ_PHP')) define('YKSEME_REQ_PHP', '5.0');
35
  if(!defined('YKSEME_AUTHOR')) define('YKSEME_AUTHOR', 'YIKES Inc');
36
  if(!defined('YKSEME_SITE')) define('YKSEME_SITE', site_url().'/');
4
  Plugin Name: Easy MailChimp Forms
5
  Plugin URI: http://www.yikesinc.com/services/yikes-inc-easy-mailchimp-extender/
6
  Description: Mailchimp API integration in the form of a shortcode or php snippet
7
+ Version: 4.3
8
  Author: YIKES Inc
9
  Author URI: http://yikesinc.com
10
  License: GPL2
30
 
31
  /** Configuration **/
32
  if(!defined('YKSEME_DEBUG')) define('YKSEME_DEBUG', false);
33
+ if(!defined('YKSEME_VERSION_CURRENT')) define('YKSEME_VERSION_CURRENT', '4.3');
34
  if(!defined('YKSEME_REQ_PHP')) define('YKSEME_REQ_PHP', '5.0');
35
  if(!defined('YKSEME_AUTHOR')) define('YKSEME_AUTHOR', 'YIKES Inc');
36
  if(!defined('YKSEME_SITE')) define('YKSEME_SITE', site_url().'/');