Contact Form Clean and Simple - Version 4.2.1

Version Description

  • Fixed potential conflict with other themes or plugins that use Google reCAPTCHA. reCAPTCHA library is not loaded if it already loaded by another plugin or theme.
  • Recaptcha library function is now used to generate the sign up url on the settings page. The site domain is passed into the url for convenience.
  • Options subject, message, heading, and body text are now translated when they are retrieved from the the database. Previously only the default messages were translated when no values were found in the database.
  • Improved housekeeping: generic name for settings array has been changed from 'array_key' to 'cscf-options'
Download this release

Release Info

Developer megnicholas
Plugin Icon wp plugin Contact Form Clean and Simple
Version 4.2.1
Comparing to
See all releases

Code changes from version 4.2.0 to 4.2.1

Files changed (6) hide show
  1. class.cscf.php +11 -0
  2. class.cscf_pluginsettings.php +19 -19
  3. class.cscf_settings.php +27 -63
  4. clean-and-simple-contact-form-by-meg-nicholas.php +5 -3
  5. languages/cleanandsimple.pot +10 -10
  6. readme.txt +8 -1
class.cscf.php CHANGED
@@ -88,6 +88,17 @@ class cscf
88
  }
89
 
90
  if ($updated) update_option('cscf_options', $options);
 
 
 
 
 
 
 
 
 
 
 
91
  }
92
 
93
  /*
88
  }
89
 
90
  if ($updated) update_option('cscf_options', $options);
91
+
92
+ //delete old array key array_key
93
+ if (get_option('array_key') != FALSE) {
94
+ $options = get_option('array_key');
95
+
96
+ //check it was this plugin that created it by checking for a few values
97
+ if (isset($options['sent_message_heading']) && isset($options['sent_message_body'])) {
98
+ delete_option('array_key');
99
+ }
100
+ }
101
+
102
  }
103
 
104
  /*
class.cscf_pluginsettings.php CHANGED
@@ -7,70 +7,70 @@ class cscf_PluginSettings
7
  {
8
 
9
  /* @var $options type array*/
10
- $options = get_option('cscf_options');
11
 
12
  return isset($options['use_recaptcha']) ? true : false;
13
  }
14
  static
15
  function Theme()
16
  {
17
- $options = get_option('cscf_options');
18
 
19
  return isset($options['theme']) ? $options['theme'] : 'red';
20
  }
21
  static
22
  function PublicKey()
23
  {
24
- $options = get_option('cscf_options');
25
 
26
  return $options['recaptcha_public_key'];
27
  }
28
  static
29
  function PrivateKey()
30
  {
31
- $options = get_option('cscf_options');
32
 
33
  return $options['recaptcha_private_key'];
34
  }
35
  static
36
  function SentMessageHeading()
37
  {
38
- $options = get_option('cscf_options');
39
 
40
- return isset($options['sent_message_heading']) ? $options['sent_message_heading'] : __('Message Sent','cleanandsimple');
41
  }
42
  static
43
  function SentMessageBody()
44
  {
45
- $options = get_option('cscf_options');
46
 
47
- return isset($options['sent_message_body']) ? $options['sent_message_body'] : __('Thank you for your message, we will be in touch very shortly.','cleanandsimple');
48
  }
49
  static
50
  function Message()
51
  {
52
- $options = get_option('cscf_options');
53
 
54
- return isset($options['message']) ? $options['message'] : __('Please enter your contact details and a short message below and I will try to answer your query as soon as possible.','cleanandsimple');
55
  }
56
  static
57
  function LoadStyleSheet()
58
  {
59
- $options = get_option('cscf_options');
60
 
61
- return isset($options['load_stylesheet']) ? $options['load_stylesheet'] : true;
62
  }
63
  static
64
  function UseClientValidation()
65
  {
66
- $options = get_option('cscf_options');
67
 
68
- return isset($options['use_client_validation']) ? $options['use_client_validation'] : true;
69
  }
70
  static
71
  function RecipientEmail()
72
  {
73
- $options = get_option('cscf_options');
74
 
75
  return isset($options['recipient_email']) ? $options['recipient_email'] : get_bloginfo('admin_email');
76
  }
@@ -78,15 +78,15 @@ class cscf_PluginSettings
78
  static
79
  function Subject()
80
  {
81
- $options = get_option('cscf_options');
82
 
83
- return isset($options['subject']) ? $options['subject'] : get_bloginfo('name') . __(' - Web Enquiry','cleanandsimple');
84
  }
85
 
86
  static
87
  function FromEmail()
88
  {
89
- $options = get_option('cscf_options');
90
 
91
  return isset($options['from-email']) ? $options['from-email'] : "";
92
  }
@@ -94,7 +94,7 @@ class cscf_PluginSettings
94
  static
95
  function OverrideFrom() {
96
 
97
- $options = get_option('cscf_options');
98
 
99
  return isset($options['override-from']) ? true : false;
100
 
7
  {
8
 
9
  /* @var $options type array*/
10
+ $options = get_option(CSCF_OPTIONS_KEY);
11
 
12
  return isset($options['use_recaptcha']) ? true : false;
13
  }
14
  static
15
  function Theme()
16
  {
17
+ $options = get_option(CSCF_OPTIONS_KEY);
18
 
19
  return isset($options['theme']) ? $options['theme'] : 'red';
20
  }
21
  static
22
  function PublicKey()
23
  {
24
+ $options = get_option(CSCF_OPTIONS_KEY);
25
 
26
  return $options['recaptcha_public_key'];
27
  }
28
  static
29
  function PrivateKey()
30
  {
31
+ $options = get_option(CSCF_OPTIONS_KEY);
32
 
33
  return $options['recaptcha_private_key'];
34
  }
35
  static
36
  function SentMessageHeading()
37
  {
38
+ $options = get_option(CSCF_OPTIONS_KEY);
39
 
40
+ return isset($options['sent_message_heading']) ? __($options['sent_message_heading'],'cleanandsimple') : __('Message Sent','cleanandsimple');
41
  }
42
  static
43
  function SentMessageBody()
44
  {
45
+ $options = get_option(CSCF_OPTIONS_KEY);
46
 
47
+ return isset($options['sent_message_body']) ? __($options['sent_message_body'],'cleanandsimple') : __('Thank you for your message, we will be in touch very shortly.','cleanandsimple');
48
  }
49
  static
50
  function Message()
51
  {
52
+ $options = get_option(CSCF_OPTIONS_KEY);
53
 
54
+ return isset($options['message']) ? __($options['message'],'cleanandsimple') : __('Please enter your contact details and a short message below and I will try to answer your query as soon as possible.','cleanandsimple');
55
  }
56
  static
57
  function LoadStyleSheet()
58
  {
59
+ $options = get_option(CSCF_OPTIONS_KEY);
60
 
61
+ return isset($options['load_stylesheet']) ? true : false;
62
  }
63
  static
64
  function UseClientValidation()
65
  {
66
+ $options = get_option(CSCF_OPTIONS_KEY);
67
 
68
+ return isset($options['use_client_validation']) ? true : false;
69
  }
70
  static
71
  function RecipientEmail()
72
  {
73
+ $options = get_option(CSCF_OPTIONS_KEY);
74
 
75
  return isset($options['recipient_email']) ? $options['recipient_email'] : get_bloginfo('admin_email');
76
  }
78
  static
79
  function Subject()
80
  {
81
+ $options = get_option(CSCF_OPTIONS_KEY);
82
 
83
+ return isset($options['subject']) ? __($options['subject'],'cleanandsimple') : get_bloginfo('name') . __(' - Web Enquiry','cleanandsimple');
84
  }
85
 
86
  static
87
  function FromEmail()
88
  {
89
+ $options = get_option(CSCF_OPTIONS_KEY);
90
 
91
  return isset($options['from-email']) ? $options['from-email'] : "";
92
  }
94
  static
95
  function OverrideFrom() {
96
 
97
+ $options = get_option(CSCF_OPTIONS_KEY);
98
 
99
  return isset($options['override-from']) ? true : false;
100
 
class.cscf_settings.php CHANGED
@@ -113,7 +113,7 @@ class cscf_settings
113
  $this,
114
  'print_section_info_recaptcha'
115
  ) , 'contact-form-settings');
116
- register_setting('test_option_group', 'array_key', array(
117
  $this,
118
  'check_form'
119
  ));
@@ -207,85 +207,49 @@ class cscf_settings
207
  public
208
  function check_form($input)
209
  {
210
- $options = get_option(CSCF_OPTIONS_KEY);
211
-
212
- //use_recaptcha
213
- if (isset($input['use_recaptcha']))
214
- $options['use_recaptcha'] = true;
215
- else
216
- unset($options['use_recaptcha']);
217
 
218
  //recaptcha theme
219
- if (isset($input['theme'])) $options['theme'] = filter_var($input['theme'], FILTER_SANITIZE_STRING);
220
 
221
  //recaptcha_public_key
222
- if (isset($input['recaptcha_public_key'])) $options['recaptcha_public_key'] = filter_var($input['recaptcha_public_key'], FILTER_SANITIZE_STRING);
223
 
224
  //recaptcha_private_key
225
- if (isset($input['recaptcha_private_key'])) $options['recaptcha_private_key'] = filter_var($input['recaptcha_private_key'], FILTER_SANITIZE_STRING);
226
 
227
  //sent_message_heading
228
- $options['sent_message_heading'] = filter_var($input['sent_message_heading'], FILTER_SANITIZE_STRING);
229
 
230
  //sent_message_body
231
- $options['sent_message_body'] = filter_var($input['sent_message_body'], FILTER_SANITIZE_STRING);
232
 
233
  //message
234
- $options['message'] = filter_var($input['message'], FILTER_SANITIZE_STRING);
235
-
236
- //load_stylesheet
237
- if (isset($input['load_stylesheet']))
238
- $options['load_stylesheet'] = true;
239
- else
240
- $options['load_stylesheet'] = false;
241
-
242
- //use_client_validation
243
- if (isset($input['use_client_validation']))
244
- $options['use_client_validation'] = true;
245
- else
246
- $options['use_client_validation'] = false;
247
 
248
  //recipient_email
249
  if (!filter_var($input['recipient_email'], FILTER_VALIDATE_EMAIL)) {
250
- unset($options['recipient_email']);
251
- }
252
- else {
253
- $options['recipient_email']=$input['recipient_email'];
254
  }
255
 
256
- //override-from
257
- if (isset($input['override-from']))
258
- $options['override-from'] = true;
259
- else
260
- unset($options['override-from']);
261
-
262
  //from
263
  if (!filter_var($input['from-email'], FILTER_VALIDATE_EMAIL)) {
264
- unset($options['from-email']);
265
- unset($options['override-from']);
266
  }
267
- else {
268
- $options['from-email']=$input['from-email'];
269
- }
270
 
271
  //subject
272
- $options['subject'] = trim(filter_var($input['subject'], FILTER_SANITIZE_STRING));
273
- if ( empty($options['subject']) ) {
274
- unset($options['subject']);
275
  }
276
 
277
- //update the options
278
- update_option(CSCF_OPTIONS_KEY, $options);
279
-
280
-
281
-
282
  return $input;
283
  }
284
  public
285
  function print_section_info_recaptcha()
286
  {
287
  print __('Enter your reCAPTCHA settings below :','cleanandsimple');
288
- print "<p>" . __('To use reCAPTCHA you must get an API key from','cleanandsimple')." <a target='_blank' href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a></p>";
289
  }
290
  public
291
  function print_section_info_message()
@@ -308,48 +272,48 @@ class cscf_settings
308
  {
309
  case 'use_recaptcha':
310
  $checked = cscf_PluginSettings::UseRecaptcha() == true ? "checked" : "";
311
- ?><input type="checkbox" <?php echo $checked; ?> id="use_recaptcha" name="array_key[use_recaptcha]"><?php
312
  break;
313
  case 'load_stylesheet':
314
  $checked = cscf_PluginSettings::LoadStyleSheet() == true ? "checked" : "";
315
- ?><input type="checkbox" <?php echo $checked; ?> id="load_stylesheet" name="array_key[load_stylesheet]"><?php
316
  break;
317
  case 'recaptcha_public_key':
318
  $disabled = cscf_PluginSettings::UseRecaptcha() == false ? "readonly" : "";
319
- ?><input <?php echo $disabled; ?> type="text" size="60" id="recaptcha_public_key" name="array_key[recaptcha_public_key]" value="<?php echo cscf_PluginSettings::PublicKey(); ?>" /><?php
320
  break;
321
  case 'recaptcha_private_key':
322
  $disabled = cscf_PluginSettings::UseRecaptcha() == false ? "readonly" : "";
323
- ?><input <?php echo $disabled; ?> type="text" size="60" id="recaptcha_private_key" name="array_key[recaptcha_private_key]" value="<?php echo cscf_PluginSettings::PrivateKey(); ?>" /><?php
324
  break;
325
  case 'recipient_email':
326
- ?><input type="text" size="60" id="recipient_email" name="array_key[recipient_email]" value="<?php echo cscf_PluginSettings::RecipientEmail(); ?>" /><?php
327
  break;
328
  case 'override-from':
329
  $checked = cscf_PluginSettings::OverrideFrom() == true ? "checked" : "";
330
- ?><input type="checkbox" <?php echo $checked; ?> id="override-from" name="array_key[override-from]"><?php
331
  break;
332
  case 'from-email':
333
  $disabled = cscf_PluginSettings::OverrideFrom() == false ? "readonly" : "";
334
- ?><input <?php echo $disabled; ?> type="text" size="60" id="from-email" name="array_key[from-email]" value="<?php echo cscf_PluginSettings::FromEmail(); ?>" /><?php
335
  break;
336
  case 'subject':
337
- ?><input type="text" size="60" id="subject" name="array_key[subject]" value="<?php echo cscf_PluginSettings::Subject(); ?>" /><?php
338
  break;
339
  case 'sent_message_heading':
340
- ?><input type="text" size="60" id="sent_message_heading" name="array_key[sent_message_heading]" value="<?php echo cscf_PluginSettings::SentMessageHeading(); ?>" /><?php
341
  break;
342
  case 'sent_message_body':
343
- ?><textarea cols="63" rows="8" name="array_key[sent_message_body]"><?php echo cscf_PluginSettings::SentMessageBody(); ?></textarea><?php
344
  break;
345
  case 'message':
346
- ?><textarea cols="63" rows="8" name="array_key[message]"><?php echo cscf_PluginSettings::Message(); ?></textarea><?php
347
  break;
348
  case 'theme':
349
  $theme = cscf_PluginSettings::Theme();
350
  $disabled = cscf_PluginSettings::UseRecaptcha() == false ? "disabled" : "";
351
  ?>
352
- <select <?php echo $disabled; ?> id="theme" name="array_key[theme]">
353
  <option <?php echo $theme == "red" ? "selected" : ""; ?> value="red"><?php _e('Red', 'cleanandsimple'); ?></option>
354
  <option <?php echo $theme == "white" ? "selected" : ""; ?> value="white"><?php _e('White','cleanandsimple'); ?></option>
355
  <option <?php echo $theme == "blackglass" ? "selected" : ""; ?> value="blackglass"><?php _e('Blackglass', 'cleanandsimple'); ?></option>
@@ -359,7 +323,7 @@ class cscf_settings
359
  break;
360
  case 'use_client_validation':
361
  $checked = cscf_PluginSettings::UseClientValidation() == true ? "checked" : "";
362
- ?><input type="checkbox" <?php echo $checked; ?> id="use_client_validation" name="array_key[use_client_validation]"><?php
363
  break;
364
  default:
365
  break;
113
  $this,
114
  'print_section_info_recaptcha'
115
  ) , 'contact-form-settings');
116
+ register_setting('test_option_group', CSCF_OPTIONS_KEY, array(
117
  $this,
118
  'check_form'
119
  ));
207
  public
208
  function check_form($input)
209
  {
 
 
 
 
 
 
 
210
 
211
  //recaptcha theme
212
+ if (isset($input['theme'])) $input['theme'] = filter_var($input['theme'], FILTER_SANITIZE_STRING);
213
 
214
  //recaptcha_public_key
215
+ if (isset($input['recaptcha_public_key'])) $input['recaptcha_public_key'] = filter_var($input['recaptcha_public_key'], FILTER_SANITIZE_STRING);
216
 
217
  //recaptcha_private_key
218
+ if (isset($input['recaptcha_private_key'])) $input['recaptcha_private_key'] = filter_var($input['recaptcha_private_key'], FILTER_SANITIZE_STRING);
219
 
220
  //sent_message_heading
221
+ $input['sent_message_heading'] = filter_var($input['sent_message_heading'], FILTER_SANITIZE_STRING);
222
 
223
  //sent_message_body
224
+ $input['sent_message_body'] = filter_var($input['sent_message_body'], FILTER_SANITIZE_STRING);
225
 
226
  //message
227
+ $input['message'] = filter_var($input['message'], FILTER_SANITIZE_STRING);
 
 
 
 
 
 
 
 
 
 
 
 
228
 
229
  //recipient_email
230
  if (!filter_var($input['recipient_email'], FILTER_VALIDATE_EMAIL)) {
231
+ unset($input['recipient_email']);
 
 
 
232
  }
233
 
 
 
 
 
 
 
234
  //from
235
  if (!filter_var($input['from-email'], FILTER_VALIDATE_EMAIL)) {
236
+ unset($input['override-from']);
237
+ unset($input['from-email']);
238
  }
 
 
 
239
 
240
  //subject
241
+ $input['subject'] = trim(filter_var($input['subject'], FILTER_SANITIZE_STRING));
242
+ if ( empty($input['subject']) ) {
243
+ unset($input['subject']);
244
  }
245
 
 
 
 
 
 
246
  return $input;
247
  }
248
  public
249
  function print_section_info_recaptcha()
250
  {
251
  print __('Enter your reCAPTCHA settings below :','cleanandsimple');
252
+ print "<p>" . __('To use reCAPTCHA you must get an API key from','cleanandsimple')." <a target='_blank' href='" . recaptcha_get_signup_url($_SERVER['SERVER_NAME']). "'>Google reCAPTCHA</a></p>";
253
  }
254
  public
255
  function print_section_info_message()
272
  {
273
  case 'use_recaptcha':
274
  $checked = cscf_PluginSettings::UseRecaptcha() == true ? "checked" : "";
275
+ ?><input type="checkbox" <?php echo $checked; ?> id="use_recaptcha" name="<?php echo CSCF_OPTIONS_KEY; ?>[use_recaptcha]"><?php
276
  break;
277
  case 'load_stylesheet':
278
  $checked = cscf_PluginSettings::LoadStyleSheet() == true ? "checked" : "";
279
+ ?><input type="checkbox" <?php echo $checked; ?> id="load_stylesheet" name="<?php echo CSCF_OPTIONS_KEY; ?>[load_stylesheet]"><?php
280
  break;
281
  case 'recaptcha_public_key':
282
  $disabled = cscf_PluginSettings::UseRecaptcha() == false ? "readonly" : "";
283
+ ?><input <?php echo $disabled; ?> type="text" size="60" id="recaptcha_public_key" name="<?php echo CSCF_OPTIONS_KEY; ?>[recaptcha_public_key]" value="<?php echo cscf_PluginSettings::PublicKey(); ?>" /><?php
284
  break;
285
  case 'recaptcha_private_key':
286
  $disabled = cscf_PluginSettings::UseRecaptcha() == false ? "readonly" : "";
287
+ ?><input <?php echo $disabled; ?> type="text" size="60" id="recaptcha_private_key" name="<?php echo CSCF_OPTIONS_KEY; ?>[recaptcha_private_key]" value="<?php echo cscf_PluginSettings::PrivateKey(); ?>" /><?php
288
  break;
289
  case 'recipient_email':
290
+ ?><input type="text" size="60" id="recipient_email" name="<?php echo CSCF_OPTIONS_KEY; ?>[recipient_email]" value="<?php echo cscf_PluginSettings::RecipientEmail(); ?>" /><?php
291
  break;
292
  case 'override-from':
293
  $checked = cscf_PluginSettings::OverrideFrom() == true ? "checked" : "";
294
+ ?><input type="checkbox" <?php echo $checked; ?> id="override-from" name="<?php echo CSCF_OPTIONS_KEY; ?>[override-from]"><?php
295
  break;
296
  case 'from-email':
297
  $disabled = cscf_PluginSettings::OverrideFrom() == false ? "readonly" : "";
298
+ ?><input <?php echo $disabled; ?> type="text" size="60" id="from-email" name="<?php echo CSCF_OPTIONS_KEY; ?>[from-email]" value="<?php echo cscf_PluginSettings::FromEmail(); ?>" /><?php
299
  break;
300
  case 'subject':
301
+ ?><input type="text" size="60" id="subject" name="<?php echo CSCF_OPTIONS_KEY; ?>[subject]" value="<?php echo cscf_PluginSettings::Subject(); ?>" /><?php
302
  break;
303
  case 'sent_message_heading':
304
+ ?><input type="text" size="60" id="sent_message_heading" name="<?php echo CSCF_OPTIONS_KEY; ?>[sent_message_heading]" value="<?php echo cscf_PluginSettings::SentMessageHeading(); ?>" /><?php
305
  break;
306
  case 'sent_message_body':
307
+ ?><textarea cols="63" rows="8" name="<?php echo CSCF_OPTIONS_KEY; ?>[sent_message_body]"><?php echo cscf_PluginSettings::SentMessageBody(); ?></textarea><?php
308
  break;
309
  case 'message':
310
+ ?><textarea cols="63" rows="8" name="<?php echo CSCF_OPTIONS_KEY; ?>[message]"><?php echo cscf_PluginSettings::Message(); ?></textarea><?php
311
  break;
312
  case 'theme':
313
  $theme = cscf_PluginSettings::Theme();
314
  $disabled = cscf_PluginSettings::UseRecaptcha() == false ? "disabled" : "";
315
  ?>
316
+ <select <?php echo $disabled; ?> id="theme" name="<?php echo CSCF_OPTIONS_KEY; ?>[theme]">
317
  <option <?php echo $theme == "red" ? "selected" : ""; ?> value="red"><?php _e('Red', 'cleanandsimple'); ?></option>
318
  <option <?php echo $theme == "white" ? "selected" : ""; ?> value="white"><?php _e('White','cleanandsimple'); ?></option>
319
  <option <?php echo $theme == "blackglass" ? "selected" : ""; ?> value="blackglass"><?php _e('Blackglass', 'cleanandsimple'); ?></option>
323
  break;
324
  case 'use_client_validation':
325
  $checked = cscf_PluginSettings::UseClientValidation() == true ? "checked" : "";
326
+ ?><input type="checkbox" <?php echo $checked; ?> id="use_client_validation" name="<?php echo CSCF_OPTIONS_KEY; ?>[use_client_validation]"><?php
327
  break;
328
  default:
329
  break;
clean-and-simple-contact-form-by-meg-nicholas.php CHANGED
@@ -7,7 +7,7 @@
7
  Plugin Name: Clean and Simple Contact Form
8
  Plugin URI: http://www.megnicholas.co.uk/wordpress-plugins/clean-and-simple-contact-form
9
  Description: A clean and simple contact form with Google reCAPTCHA and Twitter Bootstrap markup.
10
- Version: 4.2.0
11
  Author: Meghan Nicholas
12
  Author URI: http://www.megnicholas.co.uk
13
  License: GPLv2 or later
@@ -41,7 +41,9 @@ include ('class.view.php');
41
  include ('class.cscf_filters.php');
42
  include ('ajax.php');
43
 
44
- if (cscf_PluginSettings::UseRecaptcha()) include ('recaptcha-php-1.11/recaptchalib.php');
 
 
45
 
46
  if (!defined('CSCF_THEME_DIR')) define('CSCF_THEME_DIR', ABSPATH . 'wp-content/themes/' . get_template());
47
 
@@ -53,7 +55,7 @@ if (!defined('CSCF_PLUGIN_URL')) define('CSCF_PLUGIN_URL', WP_PLUGIN_URL . '/' .
53
 
54
  if (!defined('CSCF_VERSION_KEY')) define('CSCF_VERSION_KEY', 'cscf_version');
55
 
56
- if (!defined('CSCF_VERSION_NUM')) define('CSCF_VERSION_NUM', '4.2.0');
57
 
58
  if (!defined('CSCF_OPTIONS_KEY')) define('CSCF_OPTIONS_KEY', 'cscf_options');
59
 
7
  Plugin Name: Clean and Simple Contact Form
8
  Plugin URI: http://www.megnicholas.co.uk/wordpress-plugins/clean-and-simple-contact-form
9
  Description: A clean and simple contact form with Google reCAPTCHA and Twitter Bootstrap markup.
10
+ Version: 4.2.1
11
  Author: Meghan Nicholas
12
  Author URI: http://www.megnicholas.co.uk
13
  License: GPLv2 or later
41
  include ('class.cscf_filters.php');
42
  include ('ajax.php');
43
 
44
+ if ( ! function_exists("recaptcha_get_html") ) {
45
+ include ('recaptcha-php-1.11/recaptchalib.php');
46
+ }
47
 
48
  if (!defined('CSCF_THEME_DIR')) define('CSCF_THEME_DIR', ABSPATH . 'wp-content/themes/' . get_template());
49
 
55
 
56
  if (!defined('CSCF_VERSION_KEY')) define('CSCF_VERSION_KEY', 'cscf_version');
57
 
58
+ if (!defined('CSCF_VERSION_NUM')) define('CSCF_VERSION_NUM', '4.2.1');
59
 
60
  if (!defined('CSCF_OPTIONS_KEY')) define('CSCF_OPTIONS_KEY', 'cscf_options');
61
 
languages/cleanandsimple.pot CHANGED
@@ -2,10 +2,10 @@
2
  # This file is distributed under the same license as the Clean and Simple Contact Form package.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: Clean and Simple Contact Form 4.2.0\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/clean-and-simple-contact-form-"
7
  "by-meg-nicholas\n"
8
- "POT-Creation-Date: 2013-10-05 14:52:46+00:00\n"
9
  "MIME-Version: 1.0\n"
10
  "Content-Type: text/plain; charset=UTF-8\n"
11
  "Content-Transfer-Encoding: 8bit\n"
@@ -13,7 +13,7 @@ msgstr ""
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
15
 
16
- #: class.cscf.php:106
17
  msgid "Settings"
18
  msgstr ""
19
 
@@ -190,31 +190,31 @@ msgstr ""
190
  msgid "Use client side validation (AJAX) :"
191
  msgstr ""
192
 
193
- #: class.cscf_settings.php:287
194
  msgid "Enter your reCAPTCHA settings below :"
195
  msgstr ""
196
 
197
- #: class.cscf_settings.php:288
198
  msgid "To use reCAPTCHA you must get an API key from"
199
  msgstr ""
200
 
201
- #: class.cscf_settings.php:293
202
  msgid "Enter your message settings below :"
203
  msgstr ""
204
 
205
- #: class.cscf_settings.php:353
206
  msgid "Red"
207
  msgstr ""
208
 
209
- #: class.cscf_settings.php:354
210
  msgid "White"
211
  msgstr ""
212
 
213
- #: class.cscf_settings.php:355
214
  msgid "Blackglass"
215
  msgstr ""
216
 
217
- #: class.cscf_settings.php:356
218
  msgid "Clean"
219
  msgstr ""
220
 
2
  # This file is distributed under the same license as the Clean and Simple Contact Form package.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: Clean and Simple Contact Form 4.2.1\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/clean-and-simple-contact-form-"
7
  "by-meg-nicholas\n"
8
+ "POT-Creation-Date: 2013-10-14 08:13:32+00:00\n"
9
  "MIME-Version: 1.0\n"
10
  "Content-Type: text/plain; charset=UTF-8\n"
11
  "Content-Transfer-Encoding: 8bit\n"
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
15
 
16
+ #: class.cscf.php:117
17
  msgid "Settings"
18
  msgstr ""
19
 
190
  msgid "Use client side validation (AJAX) :"
191
  msgstr ""
192
 
193
+ #: class.cscf_settings.php:251
194
  msgid "Enter your reCAPTCHA settings below :"
195
  msgstr ""
196
 
197
+ #: class.cscf_settings.php:252
198
  msgid "To use reCAPTCHA you must get an API key from"
199
  msgstr ""
200
 
201
+ #: class.cscf_settings.php:257
202
  msgid "Enter your message settings below :"
203
  msgstr ""
204
 
205
+ #: class.cscf_settings.php:317
206
  msgid "Red"
207
  msgstr ""
208
 
209
+ #: class.cscf_settings.php:318
210
  msgid "White"
211
  msgstr ""
212
 
213
+ #: class.cscf_settings.php:319
214
  msgid "Blackglass"
215
  msgstr ""
216
 
217
+ #: class.cscf_settings.php:320
218
  msgid "Clean"
219
  msgstr ""
220
 
readme.txt CHANGED
@@ -6,7 +6,7 @@ License URI: http://www.gnu.org/licenses/gpl.html
6
  Tags: simple, contact, form, contact button, contact form, contact form plugin, contacts, contacts form plugin, contact me, feedback form, bootstrap, twitter, google, reCAPTCHA, ajax, secure
7
  Requires at least: 3.3
8
  Tested up to: 3.6.1
9
- Stable tag: 4.2.0
10
 
11
  A clean and simple AJAX contact form with Google reCAPTCHA and Twitter Bootstrap markup.
12
 
@@ -174,6 +174,11 @@ Currently you may only have one contact form per page. You CAN however put the c
174
  Note that making changes to the settings will affect all implementations of the plugin across your site.
175
 
176
  == Changelog ==
 
 
 
 
 
177
  = 4.2.0 =
178
  * Updated Turkish translations thanks again to [Abdullah Manaz](http://manaz.net "Abdullah Manaz")
179
  * Fixed a problem where certain texts on the settings screen were not being translated
@@ -246,6 +251,8 @@ Polish thanks to Patryk Peas
246
 
247
 
248
  == Upgrade Notice ==
 
 
249
  = 4.2.0 =
250
  Translation and documentation updates
251
  = 4.1.9 =
6
  Tags: simple, contact, form, contact button, contact form, contact form plugin, contacts, contacts form plugin, contact me, feedback form, bootstrap, twitter, google, reCAPTCHA, ajax, secure
7
  Requires at least: 3.3
8
  Tested up to: 3.6.1
9
+ Stable tag: 4.2.1
10
 
11
  A clean and simple AJAX contact form with Google reCAPTCHA and Twitter Bootstrap markup.
12
 
174
  Note that making changes to the settings will affect all implementations of the plugin across your site.
175
 
176
  == Changelog ==
177
+ = 4.2.1 =
178
+ * Fixed potential conflict with other themes or plugins that use Google reCAPTCHA. reCAPTCHA library is not loaded if it already loaded by another plugin or theme.
179
+ * Recaptcha library function is now used to generate the sign up url on the settings page. The site domain is passed into the url for convenience.
180
+ * Options subject, message, heading, and body text are now translated when they are retrieved from the the database. Previously only the default messages were translated when no values were found in the database.
181
+ * Improved housekeeping: generic name for settings array has been changed from 'array_key' to 'cscf-options'
182
  = 4.2.0 =
183
  * Updated Turkish translations thanks again to [Abdullah Manaz](http://manaz.net "Abdullah Manaz")
184
  * Fixed a problem where certain texts on the settings screen were not being translated
251
 
252
 
253
  == Upgrade Notice ==
254
+ = 4.2.1 =
255
+ Translation and housekeeping updates
256
  = 4.2.0 =
257
  Translation and documentation updates
258
  = 4.1.9 =