Contact Form 7 - Version 4.3.1

Version Description

  • Use wp_loaded action hook instead of init to initialize the controller process.
  • Fixed: Validation error messages for Really Simple CAPTCHA fields didnt appear.
  • Display an alert message if there is a reCAPTCHA widget left unanswered.
  • Translations for Portuguese, Hungarian, and Turkish have been updated.
Download this release

Release Info

Developer takayukister
Plugin Icon 128x128 Contact Form 7
Version 4.3.1
Comparing to
See all releases

Code changes from version 4.3 to 4.3.1

Files changed (18) hide show
  1. admin/includes/class-contact-forms-list-table.php +6 -1
  2. admin/includes/editor.php +5 -0
  3. images/service-icons/recaptcha-72x72.png +0 -0
  4. includes/controller.php +7 -3
  5. includes/css/styles.css +3 -3
  6. includes/js/scripts.js +7 -0
  7. includes/submission.php +5 -3
  8. languages/contact-form-7-hu_HU.mo +0 -0
  9. languages/contact-form-7-ja.mo +0 -0
  10. languages/contact-form-7-pt_PT.mo +0 -0
  11. languages/contact-form-7-tr_TR.mo +0 -0
  12. languages/contact-form-7.pot +67 -67
  13. license.txt +0 -8
  14. modules/flamingo.php +2 -2
  15. modules/really-simple-captcha.php +0 -4
  16. modules/recaptcha.php +10 -8
  17. readme.txt +15 -22
  18. wp-contact-form-7.php +2 -2
admin/includes/class-contact-forms-list-table.php CHANGED
@@ -128,11 +128,16 @@ class WPCF7_Contact_Form_List_Table extends WP_List_Table {
128
  function column_author( $item ) {
129
  $post = get_post( $item->id() );
130
 
131
- if ( ! $post )
132
  return;
 
133
 
134
  $author = get_userdata( $post->post_author );
135
 
 
 
 
 
136
  return esc_html( $author->display_name );
137
  }
138
 
128
  function column_author( $item ) {
129
  $post = get_post( $item->id() );
130
 
131
+ if ( ! $post ) {
132
  return;
133
+ }
134
 
135
  $author = get_userdata( $post->post_author );
136
 
137
+ if ( false === $author ) {
138
+ return;
139
+ }
140
+
141
  return esc_html( $author->display_name );
142
  }
143
 
admin/includes/editor.php CHANGED
@@ -163,6 +163,11 @@ function wpcf7_editor_box_mail( $post, $args = '' ) {
163
 
164
  function wpcf7_editor_panel_messages( $post ) {
165
  $messages = wpcf7_messages();
 
 
 
 
 
166
  ?>
167
  <h3><?php echo esc_html( __( 'Messages', 'contact-form-7' ) ); ?></h3>
168
  <fieldset>
163
 
164
  function wpcf7_editor_panel_messages( $post ) {
165
  $messages = wpcf7_messages();
166
+
167
+ if ( ! wpcf7_use_really_simple_captcha() ) {
168
+ unset( $messages['captcha_not_match'] );
169
+ }
170
+
171
  ?>
172
  <h3><?php echo esc_html( __( 'Messages', 'contact-form-7' ) ); ?></h3>
173
  <fieldset>
images/service-icons/recaptcha-72x72.png DELETED
Binary file
includes/controller.php CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
 
3
- add_action( 'init', 'wpcf7_control_init', 11 );
4
 
5
  function wpcf7_control_init() {
6
  if ( ! isset( $_SERVER['REQUEST_METHOD'] ) ) {
@@ -166,13 +166,17 @@ function wpcf7_enqueue_scripts() {
166
 
167
  $_wpcf7 = array(
168
  'loaderUrl' => wpcf7_ajax_loader(),
 
 
169
  'sending' => __( 'Sending ...', 'contact-form-7' ) );
170
 
171
- if ( defined( 'WP_CACHE' ) && WP_CACHE )
172
  $_wpcf7['cached'] = 1;
 
173
 
174
- if ( wpcf7_support_html5_fallback() )
175
  $_wpcf7['jqueryUi'] = 1;
 
176
 
177
  wp_localize_script( 'contact-form-7', '_wpcf7', $_wpcf7 );
178
 
1
  <?php
2
 
3
+ add_action( 'wp_loaded', 'wpcf7_control_init' );
4
 
5
  function wpcf7_control_init() {
6
  if ( ! isset( $_SERVER['REQUEST_METHOD'] ) ) {
166
 
167
  $_wpcf7 = array(
168
  'loaderUrl' => wpcf7_ajax_loader(),
169
+ 'recaptchaEmpty' =>
170
+ __( 'Please verify that you are not a robot.', 'contact-form-7' ),
171
  'sending' => __( 'Sending ...', 'contact-form-7' ) );
172
 
173
+ if ( defined( 'WP_CACHE' ) && WP_CACHE ) {
174
  $_wpcf7['cached'] = 1;
175
+ }
176
 
177
+ if ( wpcf7_support_html5_fallback() ) {
178
  $_wpcf7['jqueryUi'] = 1;
179
+ }
180
 
181
  wp_localize_script( 'contact-form-7', '_wpcf7', $_wpcf7 );
182
 
includes/css/styles.css CHANGED
@@ -35,7 +35,7 @@ div.wpcf7-validation-errors {
35
  border: 2px solid #f7e700;
36
  }
37
 
38
- span.wpcf7-form-control-wrap {
39
  position: relative;
40
  }
41
 
@@ -45,7 +45,7 @@ span.wpcf7-not-valid-tip {
45
  display: block;
46
  }
47
 
48
- .use-floating-validation-tip span.wpcf7-not-valid-tip {
49
  position: absolute;
50
  top: 20%;
51
  left: 20%;
@@ -75,4 +75,4 @@ div.wpcf7 div.ajax-error {
75
 
76
  div.wpcf7 .placeheld {
77
  color: #888;
78
- }
35
  border: 2px solid #f7e700;
36
  }
37
 
38
+ .wpcf7-form-control-wrap {
39
  position: relative;
40
  }
41
 
45
  display: block;
46
  }
47
 
48
+ .use-floating-validation-tip span.wpcf7-not-valid-tip {
49
  position: absolute;
50
  top: 20%;
51
  left: 20%;
75
 
76
  div.wpcf7 .placeheld {
77
  color: #888;
78
+ }
includes/js/scripts.js CHANGED
@@ -110,6 +110,13 @@
110
  $(data.into).trigger('invalid.wpcf7'); // deprecated
111
 
112
  } else if (1 == data.spam) {
 
 
 
 
 
 
 
113
  $responseOutput.addClass('wpcf7-spam-blocked');
114
  $form.addClass('spam');
115
 
110
  $(data.into).trigger('invalid.wpcf7'); // deprecated
111
 
112
  } else if (1 == data.spam) {
113
+ $form.find('[name="g-recaptcha-response"]').each(function() {
114
+ if ('' == $(this).val()) {
115
+ var $recaptcha = $(this).closest('.wpcf7-form-control-wrap');
116
+ $recaptcha.wpcf7NotValidTip(_wpcf7.recaptchaEmpty);
117
+ }
118
+ });
119
+
120
  $responseOutput.addClass('wpcf7-spam-blocked');
121
  $form.addClass('spam');
122
 
includes/submission.php CHANGED
@@ -131,9 +131,11 @@ class WPCF7_Submission {
131
  }
132
 
133
  $this->meta = array(
134
- 'remote_ip' => preg_replace( '/[^0-9a-f.:, ]/', '',
135
- $_SERVER['REMOTE_ADDR'] ),
136
- 'user_agent' => substr( $_SERVER['HTTP_USER_AGENT'], 0, 254 ),
 
 
137
  'url' => preg_replace( '%(?<!:|/)/.*$%', '',
138
  untrailingslashit( home_url() ) ) . wpcf7_get_request_uri(),
139
  'timestamp' => current_time( 'timestamp' ),
131
  }
132
 
133
  $this->meta = array(
134
+ 'remote_ip' => isset( $_SERVER['REMOTE_ADDR'] )
135
+ ? preg_replace( '/[^0-9a-f.:, ]/', '', $_SERVER['REMOTE_ADDR'] )
136
+ : '',
137
+ 'user_agent' => isset( $_SERVER['HTTP_USER_AGENT'] )
138
+ ? substr( $_SERVER['HTTP_USER_AGENT'], 0, 254 ) : '',
139
  'url' => preg_replace( '%(?<!:|/)/.*$%', '',
140
  untrailingslashit( home_url() ) ) . wpcf7_get_request_uri(),
141
  'timestamp' => current_time( 'timestamp' ),
languages/contact-form-7-hu_HU.mo CHANGED
Binary file
languages/contact-form-7-ja.mo CHANGED
Binary file
languages/contact-form-7-pt_PT.mo CHANGED
Binary file
languages/contact-form-7-tr_TR.mo CHANGED
Binary file
languages/contact-form-7.pot CHANGED
@@ -3,7 +3,7 @@ msgid ""
3
  msgstr ""
4
  "Project-Id-Version: Contact Form 7\n"
5
  "Report-Msgid-Bugs-To: \n"
6
- "POT-Creation-Date: 2015-09-16 22:18+0900\n"
7
  "PO-Revision-Date: 2015-05-18 21:49+0900\n"
8
  "Last-Translator: Takayuki Miyoshi <takayukister@gmail.com>\n"
9
  "Language-Team: \n"
@@ -14,14 +14,14 @@ msgstr ""
14
  "X-Poedit-KeywordsList: __;_e;__ngettext:1,2;_c\n"
15
  "X-Poedit-Basepath: ../..\n"
16
  "Plural-Forms: nplurals=1; plural=0;\n"
17
- "X-Generator: Poedit 1.8.1\n"
18
  "X-Poedit-SearchPath-0: contact-form-7\n"
19
 
20
  #: contact-form-7/wp-contact-form-7.php:5
21
  msgid "Just another contact form plugin. Simple but flexible."
22
  msgstr ""
23
 
24
- #: contact-form-7/admin/admin.php:16 contact-form-7/modules/flamingo.php:134
25
  msgid "Contact Form 7"
26
  msgstr ""
27
 
@@ -221,7 +221,7 @@ msgstr ""
221
 
222
  #: contact-form-7/admin/edit-contact-form.php:26
223
  #: contact-form-7/admin/edit-contact-form.php:124
224
- #: contact-form-7/modules/recaptcha.php:212
225
  msgid "Save"
226
  msgstr ""
227
 
@@ -309,7 +309,7 @@ msgid "Mail"
309
  msgstr ""
310
 
311
  #: contact-form-7/admin/edit-contact-form.php:188
312
- #: contact-form-7/admin/includes/editor.php:167
313
  msgid "Messages"
314
  msgstr ""
315
 
@@ -319,8 +319,8 @@ msgid "Additional Settings (%d)"
319
  msgstr ""
320
 
321
  #: contact-form-7/admin/edit-contact-form.php:201
322
- #: contact-form-7/admin/includes/editor.php:190
323
  #: contact-form-7/admin/includes/editor.php:195
 
324
  msgid "Additional Settings"
325
  msgstr ""
326
 
@@ -349,16 +349,16 @@ msgstr ""
349
  msgid "Edit &#8220;%s&#8221;"
350
  msgstr ""
351
 
352
- #: contact-form-7/admin/includes/class-contact-forms-list-table.php:160
353
  msgid "Y/m/d g:i:s A"
354
  msgstr ""
355
 
356
- #: contact-form-7/admin/includes/class-contact-forms-list-table.php:167
357
  #, php-format
358
  msgid "%s ago"
359
  msgstr ""
360
 
361
- #: contact-form-7/admin/includes/class-contact-forms-list-table.php:169
362
  msgid "Y/m/d"
363
  msgstr ""
364
 
@@ -411,15 +411,15 @@ msgstr ""
411
  msgid "File Attachments"
412
  msgstr ""
413
 
414
- #: contact-form-7/admin/includes/editor.php:169
415
  msgid "Edit messages used in the following situations."
416
  msgstr ""
417
 
418
- #: contact-form-7/admin/includes/editor.php:189
419
  msgid "http://contactform7.com/additional-settings/"
420
  msgstr ""
421
 
422
- #: contact-form-7/admin/includes/editor.php:191
423
  #, php-format
424
  msgid "You can add customization code snippets here. For details, see %s."
425
  msgstr ""
@@ -714,7 +714,11 @@ msgid ""
714
  "<strong>no longer accessible</strong>. Use <code>%2$s</code> method instead."
715
  msgstr ""
716
 
717
- #: contact-form-7/includes/controller.php:169
 
 
 
 
718
  msgid "Sending ..."
719
  msgstr ""
720
 
@@ -996,7 +1000,7 @@ msgstr ""
996
  #: contact-form-7/modules/checkbox.php:309 contact-form-7/modules/date.php:169
997
  #: contact-form-7/modules/file.php:253 contact-form-7/modules/number.php:177
998
  #: contact-form-7/modules/quiz.php:181
999
- #: contact-form-7/modules/really-simple-captcha.php:237
1000
  #: contact-form-7/modules/select.php:188 contact-form-7/modules/text.php:239
1001
  #: contact-form-7/modules/textarea.php:155
1002
  msgid "Name"
@@ -1022,9 +1026,9 @@ msgstr ""
1022
  #: contact-form-7/modules/checkbox.php:330 contact-form-7/modules/date.php:198
1023
  #: contact-form-7/modules/file.php:268 contact-form-7/modules/number.php:206
1024
  #: contact-form-7/modules/quiz.php:197
1025
- #: contact-form-7/modules/really-simple-captcha.php:247
1026
- #: contact-form-7/modules/really-simple-captcha.php:262
1027
- #: contact-form-7/modules/recaptcha.php:451
1028
  #: contact-form-7/modules/select.php:206 contact-form-7/modules/submit.php:71
1029
  #: contact-form-7/modules/text.php:279 contact-form-7/modules/textarea.php:166
1030
  msgid "Id attribute"
@@ -1034,9 +1038,9 @@ msgstr ""
1034
  #: contact-form-7/modules/checkbox.php:335 contact-form-7/modules/date.php:203
1035
  #: contact-form-7/modules/file.php:273 contact-form-7/modules/number.php:211
1036
  #: contact-form-7/modules/quiz.php:202
1037
- #: contact-form-7/modules/really-simple-captcha.php:252
1038
- #: contact-form-7/modules/really-simple-captcha.php:267
1039
- #: contact-form-7/modules/recaptcha.php:456
1040
  #: contact-form-7/modules/select.php:211 contact-form-7/modules/submit.php:76
1041
  #: contact-form-7/modules/text.php:284 contact-form-7/modules/textarea.php:171
1042
  msgid "Class attribute"
@@ -1046,8 +1050,8 @@ msgstr ""
1046
  #: contact-form-7/modules/checkbox.php:348 contact-form-7/modules/date.php:215
1047
  #: contact-form-7/modules/file.php:286 contact-form-7/modules/number.php:223
1048
  #: contact-form-7/modules/quiz.php:215
1049
- #: contact-form-7/modules/really-simple-captcha.php:279
1050
- #: contact-form-7/modules/recaptcha.php:469
1051
  #: contact-form-7/modules/select.php:224 contact-form-7/modules/submit.php:89
1052
  #: contact-form-7/modules/text.php:297 contact-form-7/modules/textarea.php:184
1053
  msgid "Insert Tag"
@@ -1373,48 +1377,48 @@ msgid ""
1373
  "really-simple-captcha/\">Really Simple CAPTCHA</a> plugin installed."
1374
  msgstr ""
1375
 
1376
- #: contact-form-7/modules/really-simple-captcha.php:189
1377
  msgid "The code that sender entered does not match the CAPTCHA"
1378
  msgstr ""
1379
 
1380
- #: contact-form-7/modules/really-simple-captcha.php:190
1381
  msgid "Your entered code is incorrect."
1382
  msgstr ""
1383
 
1384
- #: contact-form-7/modules/really-simple-captcha.php:206
1385
  msgid "CAPTCHA (Really Simple CAPTCHA)"
1386
  msgstr ""
1387
 
1388
- #: contact-form-7/modules/really-simple-captcha.php:217
1389
  #, php-format
1390
  msgid "To use CAPTCHA, you first need to install and activate %s plugin."
1391
  msgstr ""
1392
 
1393
- #: contact-form-7/modules/really-simple-captcha.php:225
1394
  #, php-format
1395
  msgid ""
1396
  "Generate form-tags for a CAPTCHA image and corresponding response input "
1397
  "field. For more details, see %s."
1398
  msgstr ""
1399
 
1400
- #: contact-form-7/modules/really-simple-captcha.php:227
1401
  msgid "http://contactform7.com/captcha/"
1402
  msgstr ""
1403
 
1404
- #: contact-form-7/modules/really-simple-captcha.php:227
1405
- #: contact-form-7/modules/recaptcha.php:224
1406
  msgid "CAPTCHA"
1407
  msgstr ""
1408
 
1409
- #: contact-form-7/modules/really-simple-captcha.php:244
1410
  msgid "Image settings"
1411
  msgstr ""
1412
 
1413
- #: contact-form-7/modules/really-simple-captcha.php:259
1414
  msgid "Input field settings"
1415
  msgstr ""
1416
 
1417
- #: contact-form-7/modules/really-simple-captcha.php:310
1418
  #, php-format
1419
  msgid ""
1420
  "This contact form contains CAPTCHA fields, but the temporary folder for the "
@@ -1422,109 +1426,105 @@ msgid ""
1422
  "change its permission manually."
1423
  msgstr ""
1424
 
1425
- #: contact-form-7/modules/really-simple-captcha.php:316
1426
  msgid ""
1427
  "This contact form contains CAPTCHA fields, but the necessary libraries (GD "
1428
  "and FreeType) are not available on your server."
1429
  msgstr ""
1430
 
1431
  #: contact-form-7/modules/recaptcha.php:23
1432
- #: contact-form-7/modules/recaptcha.php:190
1433
- #: contact-form-7/modules/recaptcha.php:394
1434
- #: contact-form-7/modules/recaptcha.php:407
1435
- #: contact-form-7/modules/recaptcha.php:417
1436
  msgid "reCAPTCHA"
1437
  msgstr ""
1438
 
1439
- #: contact-form-7/modules/recaptcha.php:40
1440
- msgid "reCAPTCHA Logo"
1441
- msgstr ""
1442
-
1443
- #: contact-form-7/modules/recaptcha.php:144
1444
  msgid "ERROR"
1445
  msgstr ""
1446
 
1447
- #: contact-form-7/modules/recaptcha.php:145
1448
  msgid "Invalid key values."
1449
  msgstr ""
1450
 
1451
- #: contact-form-7/modules/recaptcha.php:150
1452
  msgid "Settings saved."
1453
  msgstr ""
1454
 
1455
- #: contact-form-7/modules/recaptcha.php:156
1456
  msgid ""
1457
  "reCAPTCHA is a free service to protect your website from spam and abuse."
1458
  msgstr ""
1459
 
1460
- #: contact-form-7/modules/recaptcha.php:171
1461
- #: contact-form-7/modules/recaptcha.php:202
1462
  msgid "Site Key"
1463
  msgstr ""
1464
 
1465
- #: contact-form-7/modules/recaptcha.php:175
1466
- #: contact-form-7/modules/recaptcha.php:206
1467
  msgid "Secret Key"
1468
  msgstr ""
1469
 
1470
- #: contact-form-7/modules/recaptcha.php:181
1471
  msgid "Reset Keys"
1472
  msgstr ""
1473
 
1474
- #: contact-form-7/modules/recaptcha.php:186
1475
  msgid "To use reCAPTCHA, you need to install an API key pair."
1476
  msgstr ""
1477
 
1478
- #: contact-form-7/modules/recaptcha.php:188
1479
  msgid "Configure Keys"
1480
  msgstr ""
1481
 
1482
- #: contact-form-7/modules/recaptcha.php:190
1483
  #, php-format
1484
  msgid "For more details, see %s."
1485
  msgstr ""
1486
 
1487
- #: contact-form-7/modules/recaptcha.php:190
1488
- #: contact-form-7/modules/recaptcha.php:407
1489
- #: contact-form-7/modules/recaptcha.php:417
1490
  msgid "http://contactform7.com/recaptcha/"
1491
  msgstr ""
1492
 
1493
- #: contact-form-7/modules/recaptcha.php:407
1494
  #, php-format
1495
  msgid ""
1496
  "To use reCAPTCHA, first you need to install an API key pair. For more "
1497
  "details, see %s."
1498
  msgstr ""
1499
 
1500
- #: contact-form-7/modules/recaptcha.php:415
1501
  #, php-format
1502
  msgid "Generate a form-tag for a reCAPTCHA widget. For more details, see %s."
1503
  msgstr ""
1504
 
1505
- #: contact-form-7/modules/recaptcha.php:427
1506
- #: contact-form-7/modules/recaptcha.php:430
1507
  msgid "Theme"
1508
  msgstr ""
1509
 
1510
- #: contact-form-7/modules/recaptcha.php:431
1511
  msgid "Light"
1512
  msgstr ""
1513
 
1514
- #: contact-form-7/modules/recaptcha.php:433
1515
  msgid "Dark"
1516
  msgstr ""
1517
 
1518
- #: contact-form-7/modules/recaptcha.php:439
1519
- #: contact-form-7/modules/recaptcha.php:442
1520
  msgid "Size"
1521
  msgstr ""
1522
 
1523
- #: contact-form-7/modules/recaptcha.php:443
1524
  msgid "Normal"
1525
  msgstr ""
1526
 
1527
- #: contact-form-7/modules/recaptcha.php:445
1528
  msgid "Compact"
1529
  msgstr ""
1530
 
3
  msgstr ""
4
  "Project-Id-Version: Contact Form 7\n"
5
  "Report-Msgid-Bugs-To: \n"
6
+ "POT-Creation-Date: 2015-11-24 01:46+0900\n"
7
  "PO-Revision-Date: 2015-05-18 21:49+0900\n"
8
  "Last-Translator: Takayuki Miyoshi <takayukister@gmail.com>\n"
9
  "Language-Team: \n"
14
  "X-Poedit-KeywordsList: __;_e;__ngettext:1,2;_c\n"
15
  "X-Poedit-Basepath: ../..\n"
16
  "Plural-Forms: nplurals=1; plural=0;\n"
17
+ "X-Generator: Poedit 1.8.6\n"
18
  "X-Poedit-SearchPath-0: contact-form-7\n"
19
 
20
  #: contact-form-7/wp-contact-form-7.php:5
21
  msgid "Just another contact form plugin. Simple but flexible."
22
  msgstr ""
23
 
24
+ #: contact-form-7/admin/admin.php:16 contact-form-7/modules/flamingo.php:136
25
  msgid "Contact Form 7"
26
  msgstr ""
27
 
221
 
222
  #: contact-form-7/admin/edit-contact-form.php:26
223
  #: contact-form-7/admin/edit-contact-form.php:124
224
+ #: contact-form-7/modules/recaptcha.php:206
225
  msgid "Save"
226
  msgstr ""
227
 
309
  msgstr ""
310
 
311
  #: contact-form-7/admin/edit-contact-form.php:188
312
+ #: contact-form-7/admin/includes/editor.php:172
313
  msgid "Messages"
314
  msgstr ""
315
 
319
  msgstr ""
320
 
321
  #: contact-form-7/admin/edit-contact-form.php:201
 
322
  #: contact-form-7/admin/includes/editor.php:195
323
+ #: contact-form-7/admin/includes/editor.php:200
324
  msgid "Additional Settings"
325
  msgstr ""
326
 
349
  msgid "Edit &#8220;%s&#8221;"
350
  msgstr ""
351
 
352
+ #: contact-form-7/admin/includes/class-contact-forms-list-table.php:165
353
  msgid "Y/m/d g:i:s A"
354
  msgstr ""
355
 
356
+ #: contact-form-7/admin/includes/class-contact-forms-list-table.php:172
357
  #, php-format
358
  msgid "%s ago"
359
  msgstr ""
360
 
361
+ #: contact-form-7/admin/includes/class-contact-forms-list-table.php:174
362
  msgid "Y/m/d"
363
  msgstr ""
364
 
411
  msgid "File Attachments"
412
  msgstr ""
413
 
414
+ #: contact-form-7/admin/includes/editor.php:174
415
  msgid "Edit messages used in the following situations."
416
  msgstr ""
417
 
418
+ #: contact-form-7/admin/includes/editor.php:194
419
  msgid "http://contactform7.com/additional-settings/"
420
  msgstr ""
421
 
422
+ #: contact-form-7/admin/includes/editor.php:196
423
  #, php-format
424
  msgid "You can add customization code snippets here. For details, see %s."
425
  msgstr ""
714
  "<strong>no longer accessible</strong>. Use <code>%2$s</code> method instead."
715
  msgstr ""
716
 
717
+ #: contact-form-7/includes/controller.php:170
718
+ msgid "Please verify that you are not a robot."
719
+ msgstr ""
720
+
721
+ #: contact-form-7/includes/controller.php:171
722
  msgid "Sending ..."
723
  msgstr ""
724
 
1000
  #: contact-form-7/modules/checkbox.php:309 contact-form-7/modules/date.php:169
1001
  #: contact-form-7/modules/file.php:253 contact-form-7/modules/number.php:177
1002
  #: contact-form-7/modules/quiz.php:181
1003
+ #: contact-form-7/modules/really-simple-captcha.php:233
1004
  #: contact-form-7/modules/select.php:188 contact-form-7/modules/text.php:239
1005
  #: contact-form-7/modules/textarea.php:155
1006
  msgid "Name"
1026
  #: contact-form-7/modules/checkbox.php:330 contact-form-7/modules/date.php:198
1027
  #: contact-form-7/modules/file.php:268 contact-form-7/modules/number.php:206
1028
  #: contact-form-7/modules/quiz.php:197
1029
+ #: contact-form-7/modules/really-simple-captcha.php:243
1030
+ #: contact-form-7/modules/really-simple-captcha.php:258
1031
+ #: contact-form-7/modules/recaptcha.php:445
1032
  #: contact-form-7/modules/select.php:206 contact-form-7/modules/submit.php:71
1033
  #: contact-form-7/modules/text.php:279 contact-form-7/modules/textarea.php:166
1034
  msgid "Id attribute"
1038
  #: contact-form-7/modules/checkbox.php:335 contact-form-7/modules/date.php:203
1039
  #: contact-form-7/modules/file.php:273 contact-form-7/modules/number.php:211
1040
  #: contact-form-7/modules/quiz.php:202
1041
+ #: contact-form-7/modules/really-simple-captcha.php:248
1042
+ #: contact-form-7/modules/really-simple-captcha.php:263
1043
+ #: contact-form-7/modules/recaptcha.php:450
1044
  #: contact-form-7/modules/select.php:211 contact-form-7/modules/submit.php:76
1045
  #: contact-form-7/modules/text.php:284 contact-form-7/modules/textarea.php:171
1046
  msgid "Class attribute"
1050
  #: contact-form-7/modules/checkbox.php:348 contact-form-7/modules/date.php:215
1051
  #: contact-form-7/modules/file.php:286 contact-form-7/modules/number.php:223
1052
  #: contact-form-7/modules/quiz.php:215
1053
+ #: contact-form-7/modules/really-simple-captcha.php:275
1054
+ #: contact-form-7/modules/recaptcha.php:463
1055
  #: contact-form-7/modules/select.php:224 contact-form-7/modules/submit.php:89
1056
  #: contact-form-7/modules/text.php:297 contact-form-7/modules/textarea.php:184
1057
  msgid "Insert Tag"
1377
  "really-simple-captcha/\">Really Simple CAPTCHA</a> plugin installed."
1378
  msgstr ""
1379
 
1380
+ #: contact-form-7/modules/really-simple-captcha.php:185
1381
  msgid "The code that sender entered does not match the CAPTCHA"
1382
  msgstr ""
1383
 
1384
+ #: contact-form-7/modules/really-simple-captcha.php:186
1385
  msgid "Your entered code is incorrect."
1386
  msgstr ""
1387
 
1388
+ #: contact-form-7/modules/really-simple-captcha.php:202
1389
  msgid "CAPTCHA (Really Simple CAPTCHA)"
1390
  msgstr ""
1391
 
1392
+ #: contact-form-7/modules/really-simple-captcha.php:213
1393
  #, php-format
1394
  msgid "To use CAPTCHA, you first need to install and activate %s plugin."
1395
  msgstr ""
1396
 
1397
+ #: contact-form-7/modules/really-simple-captcha.php:221
1398
  #, php-format
1399
  msgid ""
1400
  "Generate form-tags for a CAPTCHA image and corresponding response input "
1401
  "field. For more details, see %s."
1402
  msgstr ""
1403
 
1404
+ #: contact-form-7/modules/really-simple-captcha.php:223
1405
  msgid "http://contactform7.com/captcha/"
1406
  msgstr ""
1407
 
1408
+ #: contact-form-7/modules/really-simple-captcha.php:223
1409
+ #: contact-form-7/modules/recaptcha.php:218
1410
  msgid "CAPTCHA"
1411
  msgstr ""
1412
 
1413
+ #: contact-form-7/modules/really-simple-captcha.php:240
1414
  msgid "Image settings"
1415
  msgstr ""
1416
 
1417
+ #: contact-form-7/modules/really-simple-captcha.php:255
1418
  msgid "Input field settings"
1419
  msgstr ""
1420
 
1421
+ #: contact-form-7/modules/really-simple-captcha.php:306
1422
  #, php-format
1423
  msgid ""
1424
  "This contact form contains CAPTCHA fields, but the temporary folder for the "
1426
  "change its permission manually."
1427
  msgstr ""
1428
 
1429
+ #: contact-form-7/modules/really-simple-captcha.php:312
1430
  msgid ""
1431
  "This contact form contains CAPTCHA fields, but the necessary libraries (GD "
1432
  "and FreeType) are not available on your server."
1433
  msgstr ""
1434
 
1435
  #: contact-form-7/modules/recaptcha.php:23
1436
+ #: contact-form-7/modules/recaptcha.php:184
1437
+ #: contact-form-7/modules/recaptcha.php:388
1438
+ #: contact-form-7/modules/recaptcha.php:401
1439
+ #: contact-form-7/modules/recaptcha.php:411
1440
  msgid "reCAPTCHA"
1441
  msgstr ""
1442
 
1443
+ #: contact-form-7/modules/recaptcha.php:138
 
 
 
 
1444
  msgid "ERROR"
1445
  msgstr ""
1446
 
1447
+ #: contact-form-7/modules/recaptcha.php:139
1448
  msgid "Invalid key values."
1449
  msgstr ""
1450
 
1451
+ #: contact-form-7/modules/recaptcha.php:144
1452
  msgid "Settings saved."
1453
  msgstr ""
1454
 
1455
+ #: contact-form-7/modules/recaptcha.php:150
1456
  msgid ""
1457
  "reCAPTCHA is a free service to protect your website from spam and abuse."
1458
  msgstr ""
1459
 
1460
+ #: contact-form-7/modules/recaptcha.php:165
1461
+ #: contact-form-7/modules/recaptcha.php:196
1462
  msgid "Site Key"
1463
  msgstr ""
1464
 
1465
+ #: contact-form-7/modules/recaptcha.php:169
1466
+ #: contact-form-7/modules/recaptcha.php:200
1467
  msgid "Secret Key"
1468
  msgstr ""
1469
 
1470
+ #: contact-form-7/modules/recaptcha.php:175
1471
  msgid "Reset Keys"
1472
  msgstr ""
1473
 
1474
+ #: contact-form-7/modules/recaptcha.php:180
1475
  msgid "To use reCAPTCHA, you need to install an API key pair."
1476
  msgstr ""
1477
 
1478
+ #: contact-form-7/modules/recaptcha.php:182
1479
  msgid "Configure Keys"
1480
  msgstr ""
1481
 
1482
+ #: contact-form-7/modules/recaptcha.php:184
1483
  #, php-format
1484
  msgid "For more details, see %s."
1485
  msgstr ""
1486
 
1487
+ #: contact-form-7/modules/recaptcha.php:184
1488
+ #: contact-form-7/modules/recaptcha.php:401
1489
+ #: contact-form-7/modules/recaptcha.php:411
1490
  msgid "http://contactform7.com/recaptcha/"
1491
  msgstr ""
1492
 
1493
+ #: contact-form-7/modules/recaptcha.php:401
1494
  #, php-format
1495
  msgid ""
1496
  "To use reCAPTCHA, first you need to install an API key pair. For more "
1497
  "details, see %s."
1498
  msgstr ""
1499
 
1500
+ #: contact-form-7/modules/recaptcha.php:409
1501
  #, php-format
1502
  msgid "Generate a form-tag for a reCAPTCHA widget. For more details, see %s."
1503
  msgstr ""
1504
 
1505
+ #: contact-form-7/modules/recaptcha.php:421
1506
+ #: contact-form-7/modules/recaptcha.php:424
1507
  msgid "Theme"
1508
  msgstr ""
1509
 
1510
+ #: contact-form-7/modules/recaptcha.php:425
1511
  msgid "Light"
1512
  msgstr ""
1513
 
1514
+ #: contact-form-7/modules/recaptcha.php:427
1515
  msgid "Dark"
1516
  msgstr ""
1517
 
1518
+ #: contact-form-7/modules/recaptcha.php:433
1519
+ #: contact-form-7/modules/recaptcha.php:436
1520
  msgid "Size"
1521
  msgstr ""
1522
 
1523
+ #: contact-form-7/modules/recaptcha.php:437
1524
  msgid "Normal"
1525
  msgstr ""
1526
 
1527
+ #: contact-form-7/modules/recaptcha.php:439
1528
  msgid "Compact"
1529
  msgstr ""
1530
 
license.txt CHANGED
@@ -14,11 +14,3 @@ GNU General Public License for more details.
14
  You should have received a copy of the GNU General Public License
15
  along with this program; if not, write to the Free Software
16
  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
-
18
-
19
- Contact Form 7 WordPress Plugin bundles the following third-party resources:
20
-
21
- Google reCAPTCHA icon
22
- https://www.google.com/recaptcha/
23
- licensed under the Creative Commons Attribution 3.0 License
24
- http://creativecommons.org/licenses/by/3.0/
14
  You should have received a copy of the GNU General Public License
15
  along with this program; if not, write to the Free Software
16
  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 
 
 
 
 
 
 
modules/flamingo.php CHANGED
@@ -39,6 +39,8 @@ function wpcf7_flamingo_submit( $contactform, $result ) {
39
  $exclude_names[] = $tag['name'];
40
  }
41
 
 
 
42
  foreach ( $posted_data as $key => $value ) {
43
  if ( '_' == substr( $key, 0, 1 ) || in_array( $key, $exclude_names ) ) {
44
  unset( $posted_data[$key] );
@@ -167,5 +169,3 @@ function wpcf7_flamingo_add_channel( $slug, $name = '' ) {
167
 
168
  return (int) $channel['term_id'];
169
  }
170
-
171
- ?>
39
  $exclude_names[] = $tag['name'];
40
  }
41
 
42
+ $exclude_names[] = 'g-recaptcha-response';
43
+
44
  foreach ( $posted_data as $key => $value ) {
45
  if ( '_' == substr( $key, 0, 1 ) || in_array( $key, $exclude_names ) ) {
46
  unset( $posted_data[$key] );
169
 
170
  return (int) $channel['term_id'];
171
  }
 
 
modules/really-simple-captcha.php CHANGED
@@ -181,10 +181,6 @@ function wpcf7_captcha_ajax_refill( $items ) {
181
  add_filter( 'wpcf7_messages', 'wpcf7_captcha_messages' );
182
 
183
  function wpcf7_captcha_messages( $messages ) {
184
- if ( ! wpcf7_use_really_simple_captcha() ) {
185
- return $messages;
186
- }
187
-
188
  return array_merge( $messages, array( 'captcha_not_match' => array(
189
  'description' => __( "The code that sender entered does not match the CAPTCHA", 'contact-form-7' ),
190
  'default' => __( 'Your entered code is incorrect.', 'contact-form-7' )
181
  add_filter( 'wpcf7_messages', 'wpcf7_captcha_messages' );
182
 
183
  function wpcf7_captcha_messages( $messages ) {
 
 
 
 
184
  return array_merge( $messages, array( 'captcha_not_match' => array(
185
  'description' => __( "The code that sender entered does not match the CAPTCHA", 'contact-form-7' ),
186
  'default' => __( 'Your entered code is incorrect.', 'contact-form-7' )
modules/recaptcha.php CHANGED
@@ -34,12 +34,6 @@ class WPCF7_RECAPTCHA extends WPCF7_Service {
34
  }
35
 
36
  public function icon() {
37
- $icon = sprintf(
38
- '<img src="%1$s" alt="%2$s" width="%3$d" height="%4$d" class="icon" />',
39
- wpcf7_plugin_url( 'images/service-icons/recaptcha-72x72.png' ),
40
- esc_attr( __( 'reCAPTCHA Logo', 'contact-form-7' ) ),
41
- 36, 36 );
42
- echo $icon;
43
  }
44
 
45
  public function link() {
@@ -319,6 +313,7 @@ function wpcf7_recaptcha_shortcode_handler( $tag ) {
319
  $html = sprintf( '<div %1$s></div>', wpcf7_format_atts( $atts ) );
320
  $html .= wpcf7_recaptcha_noscript(
321
  array( 'sitekey' => $atts['data-sitekey'] ) );
 
322
 
323
  return $html;
324
  }
@@ -380,8 +375,7 @@ function wpcf7_recaptcha_check_with_google( $spam ) {
380
  return $spam;
381
  }
382
 
383
- $response_token = isset( $_POST['g-recaptcha-response'] )
384
- ? $_POST['g-recaptcha-response'] : '';
385
  $spam = ! $recaptcha->verify( $response_token );
386
 
387
  return $spam;
@@ -471,3 +465,11 @@ function wpcf7_tag_generator_recaptcha( $contact_form, $args = '' ) {
471
  </div>
472
  <?php
473
  }
 
 
 
 
 
 
 
 
34
  }
35
 
36
  public function icon() {
 
 
 
 
 
 
37
  }
38
 
39
  public function link() {
313
  $html = sprintf( '<div %1$s></div>', wpcf7_format_atts( $atts ) );
314
  $html .= wpcf7_recaptcha_noscript(
315
  array( 'sitekey' => $atts['data-sitekey'] ) );
316
+ $html = sprintf( '<div class="wpcf7-form-control-wrap">%s</div>', $html );
317
 
318
  return $html;
319
  }
375
  return $spam;
376
  }
377
 
378
+ $response_token = wpcf7_recaptcha_response();
 
379
  $spam = ! $recaptcha->verify( $response_token );
380
 
381
  return $spam;
465
  </div>
466
  <?php
467
  }
468
+
469
+ function wpcf7_recaptcha_response() {
470
+ if ( isset( $_POST['g-recaptcha-response'] ) ) {
471
+ return $_POST['g-recaptcha-response'];
472
+ }
473
+
474
+ return false;
475
+ }
readme.txt CHANGED
@@ -3,8 +3,8 @@ Contributors: takayukister
3
  Donate link: http://contactform7.com/donate/
4
  Tags: contact, form, contact form, feedback, email, ajax, captcha, akismet, multilingual
5
  Requires at least: 4.2
6
- Tested up to: 4.3.1
7
- Stable tag: 4.3
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -24,10 +24,13 @@ It is hard to continue development and support for this free plugin without cont
24
 
25
  = Recommended Plugins =
26
 
27
- The following are other recommended plugins by the author of Contact Form 7.
28
 
29
- * [Flamingo](http://wordpress.org/extend/plugins/flamingo/) - With Flamingo, you can save submitted messages via contact forms in the database.
30
- * [Bogo](http://wordpress.org/extend/plugins/bogo/) - Bogo is a straight-forward multilingual plugin that doesn't cause headaches.
 
 
 
31
 
32
  = Translators =
33
 
@@ -124,25 +127,15 @@ Do you have questions or issues with Contact Form 7? Use these support channels
124
 
125
  For more information, see [Releases](http://contactform7.com/category/releases/).
126
 
 
 
 
 
 
 
 
127
  = 4.3 =
128
 
129
  * reCAPTCHA module has been introduced.
130
  * Translations for Croatian, Danish, Persian, and Swedish have been updated.
131
  * WordPress 4.2 or higher is required.
132
-
133
- = 4.2.2 =
134
-
135
- * Fixed: Possible empty name attribute of form element (invalid HTML5).
136
- * Translations for Portuguese, Hungarian, and Spanish have been updated.
137
-
138
- = 4.2.1 =
139
-
140
- * Corrected admin script dependencies.
141
- * Shows a hint for keyboard operation in the editor screen.
142
- * Translations for Estonian, Portuguese, Dutch, and Turkish have been updated.
143
-
144
- = 4.2 =
145
-
146
- * Renewal of the editor screen.
147
- * Translation for Slovene has been updated.
148
- * WordPress 4.1 or higher is required.
3
  Donate link: http://contactform7.com/donate/
4
  Tags: contact, form, contact form, feedback, email, ajax, captcha, akismet, multilingual
5
  Requires at least: 4.2
6
+ Tested up to: 4.4
7
+ Stable tag: 4.3.1
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
24
 
25
  = Recommended Plugins =
26
 
27
+ The following plugins are recommended for Contact Form 7 users:
28
 
29
+ * [Flamingo](http://wordpress.org/extend/plugins/flamingo/) by Takayuki Miyoshi - With Flamingo, you can save submitted messages via contact forms in the database.
30
+ * [Postman](https://wordpress.org/plugins/postman-smtp/) by
31
+ Jason Hendriks - Postman is a next-generation SMTP Mailer, software that assists in the delivery of email generated by your WordPress site.
32
+ * [Contact Form 7: Accessible Defaults](https://wordpress.org/plugins/contact-form-7-accessible-defaults/) by Joe Dolson - Replaces the default Contact Form 7 form with an accessible equivalent and provides a suite of selectable base forms.
33
+ * [Bogo](http://wordpress.org/extend/plugins/bogo/) by Takayuki Miyoshi - Bogo is a straight-forward multilingual plugin that doesn't cause headaches.
34
 
35
  = Translators =
36
 
127
 
128
  For more information, see [Releases](http://contactform7.com/category/releases/).
129
 
130
+ = 4.3.1 =
131
+
132
+ * Use wp_loaded action hook instead of init to initialize the controller process.
133
+ * Fixed: Validation error messages for Really Simple CAPTCHA fields didn’t appear.
134
+ * Display an alert message if there is a reCAPTCHA widget left unanswered.
135
+ * Translations for Portuguese, Hungarian, and Turkish have been updated.
136
+
137
  = 4.3 =
138
 
139
  * reCAPTCHA module has been introduced.
140
  * Translations for Croatian, Danish, Persian, and Swedish have been updated.
141
  * WordPress 4.2 or higher is required.
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
wp-contact-form-7.php CHANGED
@@ -7,10 +7,10 @@ Author: Takayuki Miyoshi
7
  Author URI: http://ideasilo.wordpress.com/
8
  Text Domain: contact-form-7
9
  Domain Path: /languages/
10
- Version: 4.3
11
  */
12
 
13
- define( 'WPCF7_VERSION', '4.3' );
14
 
15
  define( 'WPCF7_REQUIRED_WP_VERSION', '4.2' );
16
 
7
  Author URI: http://ideasilo.wordpress.com/
8
  Text Domain: contact-form-7
9
  Domain Path: /languages/
10
+ Version: 4.3.1
11
  */
12
 
13
+ define( 'WPCF7_VERSION', '4.3.1' );
14
 
15
  define( 'WPCF7_REQUIRED_WP_VERSION', '4.2' );
16