WPBruiser {no- Captcha anti-Spam} - Version 3.1.36

Version Description

Fixes - Compatibility with latest JetPack Contact Form

Download this release

Release Info

Developer mihche
Plugin Icon 128x128 WPBruiser {no- Captcha anti-Spam}
Version 3.1.36
Comparing to
See all releases

Code changes from version 3.1.35 to 3.1.36

Files changed (4) hide show
  1. engine/modules/jetpack-contact-form/GdbcJetPackContactFormPublicModule.php +27 -6
  2. goodbye-captcha.php +2 -2
  3. includes/vendor/MchHttp/MchGdbcTrustedIPRanges.php +1 -1
  4. readme.txt +6 -2
engine/modules/jetpack-contact-form/GdbcJetPackContactFormPublicModule.php CHANGED
@@ -34,18 +34,39 @@ final class GdbcJetPackContactFormPublicModule extends GdbcBasePublicModule
34
  $this->registerJetPackContactFormHooks();
35
 
36
  }
37
-
38
  public function registerJetPackContactFormHooks()
39
  {
40
-
41
- add_filter('grunion_contact_form_field_html', array($this, 'insertGoodByeCaptchaToken'), 10, 3);
42
-
43
  defined('JETPACK__VERSION') && version_compare(JETPACK__VERSION, '3.4-beta', '>')
44
  ? add_filter('jetpack_contact_form_is_spam', array($this, 'validateContactFormEncryptedToken'), 1, 2)
45
  : add_filter('contact_form_is_spam', array($this, 'validateContactFormEncryptedToken'));
46
-
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
47
  }
48
-
49
  public function validateContactFormEncryptedToken($isSpam, $arrPostedData)
50
  {
51
 
34
  $this->registerJetPackContactFormHooks();
35
 
36
  }
37
+
38
  public function registerJetPackContactFormHooks()
39
  {
40
+
41
+ add_filter('grunion_contact_form_field_html', array($this, 'insertGoodByeCaptchaToken'), 1000, 3);
42
+
43
  defined('JETPACK__VERSION') && version_compare(JETPACK__VERSION, '3.4-beta', '>')
44
  ? add_filter('jetpack_contact_form_is_spam', array($this, 'validateContactFormEncryptedToken'), 1, 2)
45
  : add_filter('contact_form_is_spam', array($this, 'validateContactFormEncryptedToken'));
46
+
47
+
48
+ $inputTokenField = $this->getTokenFieldHtml();
49
+
50
+ add_filter('do_shortcode_tag', function($formOutputHtml, $shortCodeTag ) use ($inputTokenField){
51
+
52
+ if($shortCodeTag !== 'contact-form')
53
+ return $formOutputHtml;
54
+
55
+ $hiddenField = GdbcSettingsPublicModule::getInstance()->getOption(GdbcSettingsAdminModule::OPTION_HIDDEN_INPUT_NAME);
56
+
57
+ if(false === strpos($formOutputHtml, $hiddenField))
58
+ {
59
+ $formOutputHtml = str_replace('</form>', $inputTokenField . '</form>', $formOutputHtml);
60
+ }
61
+
62
+ return $formOutputHtml;
63
+
64
+
65
+ }, 1000, 2);
66
+
67
+
68
  }
69
+
70
  public function validateContactFormEncryptedToken($isSpam, $arrPostedData)
71
  {
72
 
goodbye-captcha.php CHANGED
@@ -10,7 +10,7 @@
10
  * Plugin Name: WPBruiser
11
  * Plugin URI: http://www.wpbruiser.com
12
  * Description: An extremely powerful anti-spam plugin that blocks spambots without annoying captcha images.
13
- * Version: 3.1.35
14
  * Author: Mihai Chelaru
15
  * Author URI: http://www.wpbruiser.com
16
  * Text Domain: wp-bruiser
@@ -24,7 +24,7 @@ if(!class_exists('GoodByeCaptcha', false))
24
  class GoodByeCaptcha
25
  {
26
 
27
- CONST PLUGIN_VERSION = '3.1.35';
28
  CONST PLUGIN_SLUG = 'wp-bruiser';
29
  CONST PLUGIN_NAME = 'WPBruiser';
30
  CONST PLUGIN_SITE_URL = 'https://www.wpbruiser.com';
10
  * Plugin Name: WPBruiser
11
  * Plugin URI: http://www.wpbruiser.com
12
  * Description: An extremely powerful anti-spam plugin that blocks spambots without annoying captcha images.
13
+ * Version: 3.1.36
14
  * Author: Mihai Chelaru
15
  * Author URI: http://www.wpbruiser.com
16
  * Text Domain: wp-bruiser
24
  class GoodByeCaptcha
25
  {
26
 
27
+ CONST PLUGIN_VERSION = '3.1.36';
28
  CONST PLUGIN_SLUG = 'wp-bruiser';
29
  CONST PLUGIN_NAME = 'WPBruiser';
30
  CONST PLUGIN_SITE_URL = 'https://www.wpbruiser.com';
includes/vendor/MchHttp/MchGdbcTrustedIPRanges.php CHANGED
@@ -53,7 +53,7 @@ final class MchGdbcTrustedIPRanges
53
 
54
  return ( $ipVersion === MchGdbcIPUtils::IP_VERSION_4 )
55
  ?
56
- self::isIPInRanges($ipAddress, $ipVersion, array(50331648=>50462719,50692096=>50693631,50712576=>50714111,50724864=>51118079,51183616=>51642367,51904512=>52166655,55574528=>56623103,57147392=>57409535,57671680=>57933823,58195968=>58720255,58851328=>58916863,58982400=>59768831,63963136=>66060287,66584576=>67108863,221249536=>221380607,221511680=>222035967,225443840=>225705983,226230272=>226492415,231735296=>231997439,233046016=>233832447,234094592=>234225663,234487808=>234618879,262406144=>262537215,263258112=>263274495,263782400=>263847935,263979008=>264044543,264306688=>264308735,264765440=>264830975,265158656=>265289727,266207232=>266338303,267124736=>267255807,310509568=>310575103,310902784=>310968319,311033856=>311558143,312016896=>312082431,312606720=>312737791,312868864=>312999935,313458688=>314179583,314310656=>317587455,318111744=>318177279,318504960=>318636031,387186688=>387448831,583008256=>587202559,597229568=>599261183,750780416=>754974719,775127040=>775147519,775149568=>775159807,780730368=>780795903,839909376=>840171519,846200832=>846266367,872415232=>875429887,875475968=>875478015,875495424=>877821951,877831168=>877832463,877834240=>877836799,877854720=>877920255,878051328=>878444543,878605312=>878606335,878627072=>878627135,878639104=>878639343,878639392=>878639407,878639424=>878639551,878698752=>878700287,878702336=>878706591,880266496=>880266751,884998144=>886571007,886833152=>886996991,910163968=>912261119,915406848=>917897215,917962752=>918552575,918618112=>920518655,920526848=>920528895,920531968=>920532991,920533536=>920533551,920533760=>920534015,920535040=>920535551,920551424=>921042943,921174016=>921632767,921702656=>921702911,921763840=>922746879,1059061760=>1059323903,1137311744=>1137328127,1189134336=>1189150719,1210851328=>1210859519,1264943104=>1264975871,1333592064=>1333624831,1618935808=>1618968575,1666023424=>1666025983,1666026240=>1666028031,1666028288=>1666029311,1666039552=>1666039807,1666055424=>1666055935,1666121728=>1666318335,1679032320=>1679818751,1728317440=>1728319487,1796472832=>1796734975,1820327936=>1820852223,2063122432=>2063138815,2360541184=>2360606719,2645491712=>2645557247,2684420096=>2684485631,2713518080=>2713583615,2731927552=>2731928575,2734353408=>2734354431,2927689728=>2927755263,2938732544=>2938765311,2954903552=>2954911743,2955018240=>2955083775,2974253056=>2974285823,3091726336=>3091857407,3098116096=>3098148863,3106961408=>3106962431,3438051328=>3438084095,3495319552=>3495320575,3635863552=>3635867647,))
57
  :
58
  self::isIPInRanges($ipAddress, $ipVersion, array());
59
 
53
 
54
  return ( $ipVersion === MchGdbcIPUtils::IP_VERSION_4 )
55
  ?
56
+ self::isIPInRanges($ipAddress, $ipVersion, array(50331648=>50462719,50692096=>50693631,50712576=>50714111,50724864=>52166655,55574528=>56623103,57147392=>57409535,57671680=>57933823,58195968=>59768831,63963136=>66060287,66584576=>67108863,221249536=>221380607,221511680=>222035967,225443840=>225705983,226230272=>226492415,231735296=>231997439,233046016=>233832447,234094592=>234225663,234487808=>234618879,262406144=>262537215,263258112=>263274495,263782400=>263847935,263979008=>264044543,264306688=>264308735,264765440=>264830975,265158656=>265289727,266207232=>266338303,267124736=>267255807,310509568=>310575103,310902784=>310968319,311033856=>311558143,312016896=>312082431,312213504=>312475647,312606720=>312737791,312868864=>312999935,313458688=>314179583,314310656=>317587455,318111744=>318177279,318504960=>318636031,387186688=>387448831,583008256=>587202559,597229568=>599261183,750780416=>754974719,775127040=>775147519,775149568=>775159807,780730368=>780795903,839909376=>840171519,846200832=>846266367,872415232=>875429887,875475968=>875478015,875495424=>877821951,877831168=>877832463,877834240=>877836799,877854720=>877920255,878051328=>878444543,878605312=>878606335,878627072=>878627135,878639104=>878639343,878639392=>878639407,878639424=>878639551,878698752=>878700287,878702336=>878706591,880266496=>880266751,884998144=>886571007,886833152=>886996991,910163968=>912261119,915406848=>917897215,917962752=>918552575,918618112=>920518655,920526848=>920528895,920531968=>920532991,920533536=>920533551,920533760=>920534015,920535040=>920535551,920551424=>921042943,921174016=>921632767,921702656=>921702911,921763840=>922746879,1059061760=>1059323903,1137311744=>1137328127,1189134336=>1189150719,1210851328=>1210859519,1264943104=>1264975871,1333592064=>1333624831,1618935808=>1618968575,1666023424=>1666025983,1666026240=>1666028031,1666028288=>1666029311,1666039552=>1666039807,1666053888=>1666054143,1666054656=>1666054911,1666055424=>1666055935,1666121728=>1666318335,1679032320=>1679818751,1728317440=>1728319487,1796472832=>1796734975,1820327936=>1820852223,2063122432=>2063138815,2360541184=>2360606719,2645491712=>2645557247,2684420096=>2684485631,2713518080=>2713583615,2731927552=>2731928575,2734353408=>2734354431,2927689728=>2927755263,2938732544=>2938765311,2954903552=>2954911743,2955018240=>2955083775,2974253056=>2974285823,3091726336=>3091857407,3098116096=>3098148863,3106961408=>3106962431,3438051328=>3438084095,3495319552=>3495320575,3635863552=>3635867647,))
57
  :
58
  self::isIPInRanges($ipAddress, $ipVersion, array());
59
 
readme.txt CHANGED
@@ -3,8 +3,8 @@ Contributors: mihche
3
  Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XVC3TSGEJQP2U
4
  Tags: captcha, antispam, anti-spam, spam, mailpoet, antispambot, brute force, comment spam, jetpack contact form, contact form 7, ninja forms, formidable forms, wp bruiser
5
  Requires at least: 4.0
6
- Tested up to: 5.2
7
- Stable tag: 3.1.35
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -222,6 +222,10 @@ Studies shown that visual CAPTCHAs take around 5-10 seconds to complete and audi
222
 
223
  == Changelog ==
224
 
 
 
 
 
225
  = 3.1.35 =
226
  **Improvements**
227
  - Refreshed Country IPs
3
  Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=XVC3TSGEJQP2U
4
  Tags: captcha, antispam, anti-spam, spam, mailpoet, antispambot, brute force, comment spam, jetpack contact form, contact form 7, ninja forms, formidable forms, wp bruiser
5
  Requires at least: 4.0
6
+ Tested up to: 5.3
7
+ Stable tag: 3.1.36
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
222
 
223
  == Changelog ==
224
 
225
+ = 3.1.36 =
226
+ **Fixes**
227
+ - Compatibility with latest JetPack Contact Form
228
+
229
  = 3.1.35 =
230
  **Improvements**
231
  - Refreshed Country IPs