Contact Form Clean and Simple

Version Description

Before overriding the from address, check that another plugin has not done it first. Any plugin that overrides 'from email address' and 'from name' such as wp-mail-smtp plugin will take precedence over the settings in this plugin.
Added 'reply-to' to the email header
Moved the Name field before Email field
Added Hebrew translation thanks to Shay Cohen

Release Info

Developer	megnicholas
Plugin	Contact Form Clean and Simple
Version	4.3.3
Comparing to
See all releases

Code changes from version 4.3.2 to 4.3.3

Files changed (7) hide show

class.cscf_contact.php +5 -1
class.cscf_filters.php +23 -2
clean-and-simple-contact-form-by-meg-nicholas.php +2 -2
languages/cleanandsimple-he_IL.mo +0 -0
languages/cleanandsimple-he_IL.po +302 -0
readme.txt +9 -1
views/contact-form.view.php +21 -19

class.cscf_contact.php CHANGED Viewed

	@@ -119,11 +119,15 @@ class cscf_Contact
119	$filters->add('wp_mail_from');
120	$filters->add('wp_mail_from_name');
121




122	$message="From: " . $this->Name . "\n\n";
123	$message.="Email: " . $this->Email . "\n\n";
124	$message.="Message:\n\n" . $this->Message;
125
126	- $result = (wp_mail(cscf_PluginSettings::RecipientEmails() , cscf_PluginSettings::Subject(), stripslashes($message)));
127
128	//remove filters (play nice)
129	$filters->remove('wp_mail_from');


119	$filters->add('wp_mail_from');
120	$filters->add('wp_mail_from_name');
121
122	+ //headers
123	+ $header="Reply-To: " .$this->Email. "\r\n";
124	+
125	+ //message
126	$message="From: " . $this->Name . "\n\n";
127	$message.="Email: " . $this->Email . "\n\n";
128	$message.="Message:\n\n" . $this->Message;
129
130	+ $result = (wp_mail(cscf_PluginSettings::RecipientEmails() , cscf_PluginSettings::Subject(), stripslashes($message), $header));
131
132	//remove filters (play nice)
133	$filters->remove('wp_mail_from');

class.cscf_filters.php CHANGED Viewed

@@ -9,12 +9,33 @@ class cscf_Filters {
                 var $fromEmail;
                 var $fromName;
-            -
                function wp_mail_from () {
                     return $this->fromEmail;
+                }
                 //strip slashes from the name
-            -
                function wp_mail_from_name () {
                     return stripslashes($this->fromName);
+                }


9	var $fromEmail;
10	var $fromName;
11
12	+ function wp_mail_from ($orig) {
13	+
14	+ // This is copied from pluggable.php lines 348-354 as at revision 10150
15	+ // http://trac.wordpress.org/browser/branches/2.7/wp-includes/pluggable.php#L348
16	+
17	+ // Get the site domain and get rid of www.
18	+ $sitename = strtolower( $_SERVER['SERVER_NAME'] );
19	+ if ( substr( $sitename, 0, 4 ) == 'www.' ) {
20	+ $sitename = substr( $sitename, 4 );
21	+ }
22	+
23	+ $default_from = 'wordpress@' . $sitename;
24	+ // End of copied code
25	+
26	+ // If the from email is not the default, return it unchanged
27	+ if ( $orig != $default_from ) {
28	+ return $orig;
29	+ }
30	return $this->fromEmail;
31	}
32
33	//strip slashes from the name
34	+ function wp_mail_from_name ($orig) {
35	+
36	+ if ( $orig != 'WordPress') {
37	+ return $orig;
38	+ }
39	return stripslashes($this->fromName);
40	}
41

clean-and-simple-contact-form-by-meg-nicholas.php CHANGED Viewed

	@@ -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.3.2
11	Author: Meghan Nicholas
12	Author URI: http://www.megnicholas.co.uk
13	License: GPLv2 or later
	@@ -52,7 +52,7 @@ if (!defined('CSCF_PLUGIN_URL')) define('CSCF_PLUGIN_URL', WP_PLUGIN_URL . '/' .
52
53	if (!defined('CSCF_VERSION_KEY')) define('CSCF_VERSION_KEY', 'cscf_version');
54
55	- if (!defined('CSCF_VERSION_NUM')) define('CSCF_VERSION_NUM', '4.3.2');
56
57	if (!defined('CSCF_OPTIONS_KEY')) define('CSCF_OPTIONS_KEY', 'cscf_options');
58


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.3.3
11	Author: Meghan Nicholas
12	Author URI: http://www.megnicholas.co.uk
13	License: GPLv2 or later

52
53	if (!defined('CSCF_VERSION_KEY')) define('CSCF_VERSION_KEY', 'cscf_version');
54
55	+ if (!defined('CSCF_VERSION_NUM')) define('CSCF_VERSION_NUM', '4.3.3');
56
57	if (!defined('CSCF_OPTIONS_KEY')) define('CSCF_OPTIONS_KEY', 'cscf_options');
58

languages/cleanandsimple-he_IL.mo ADDED Viewed

Binary file

languages/cleanandsimple-he_IL.po ADDED Viewed

	@@ -0,0 +1,302 @@


1	+ # Copyright (C) 2013 Clean and Simple Contact Form
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.4\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-11-06 14:29:38+00:00\n"
9	+ "MIME-Version: 1.0\n"
10	+ "Content-Type: text/plain; charset=UTF-8\n"
11	+ "Content-Transfer-Encoding: 8bit\n"
12	+ "PO-Revision-Date: 2014-01-28 22:57+0200\n"
13	+ "Last-Translator: \n"
14	+ "Language-Team: LANGUAGE <LL@li.org>\n"
15	+ "X-Generator: Poedit 1.6.3\n"
16	+ "Plural-Forms: nplurals=2; plural=(n != 1);\n"
17	+ "Language: he_IL\n"
18	+
19	+ #: class.cscf.php:149
20	+ msgid "Settings"
21	+ msgstr "הגדרות"
22	+
23	+ #: class.cscf_contact.php:54
24	+ msgid "Sorry the email addresses do not match."
25	+ msgstr "מצטערים כתובות הדוא\"ל אינן תואמות."
26	+
27	+ #: class.cscf_contact.php:59 views/contact-form.view.php:32
28	+ msgid "Please give your email address."
29	+ msgstr "יש לרשום כתובת דואר אלקטרוני."
30	+
31	+ #: class.cscf_contact.php:63
32	+ msgid "Please confirm your email address."
33	+ msgstr "יש לאשר את כתובת הדואר אלקטרוני."
34	+
35	+ #: class.cscf_contact.php:68 views/contact-form.view.php:79
36	+ msgid "Please give your name."
37	+ msgstr "בבקשה לרשום השם שלך."
38	+
39	+ #: class.cscf_contact.php:72
40	+ msgid "Please enter a message."
41	+ msgstr "יש להזין הודעה."
42	+
43	+ #: class.cscf_contact.php:76 views/contact-form.view.php:33
44	+ #: views/contact-form.view.php:57
45	+ msgid "Please enter a valid email address."
46	+ msgstr "נא להזין כתובת דואר אלקטרוני חוקית."
47	+
48	+ #: class.cscf_contact.php:84
49	+ msgid "Sorry the code wasn't entered correctly please try again."
50	+ msgstr "מצטערים הקוד לא הוזן כראוי אנא נסה שוב."
51	+
52	+ #: class.cscf_pluginsettings.php:40
53	+ msgid "Message Sent"
54	+ msgstr "הודעה נשלחה"
55	+
56	+ #: class.cscf_pluginsettings.php:47
57	+ msgid "Thank you for your message, we will be in touch very shortly."
58	+ msgstr "תודה לך על פנייתך, נישתדל ליצור איתך קשר בהקדם."
59	+
60	+ #: class.cscf_pluginsettings.php:54
61	+ msgid ""
62	+ "Please enter your contact details and a short message below and I will try "
63	+ "to answer your query as soon as possible."
64	+ msgstr ""
65	+ "נא להזין את פרטי הקשר שלך והודעה קצרה ואנחנו נשתדל ליצור איתך קשר בהקדם."
66	+
67	+ #: class.cscf_pluginsettings.php:83
68	+ msgid " - Web Enquiry"
69	+ msgstr "- פניה מהאתר"
70	+
71	+ #: class.cscf_settings.php:30
72	+ msgid "Contact Form Settings"
73	+ msgstr "הגדרות טופס יצירת קשר"
74	+
75	+ #: class.cscf_settings.php:30
76	+ msgid "Contact Form"
77	+ msgstr "טופס יצירת קשר"
78	+
79	+ #: class.cscf_settings.php:40
80	+ msgid "Clean and Simple Contact Form Settings"
81	+ msgstr "הגדרות טופס יצירת קשר נקייה ופשוטה"
82	+
83	+ #: class.cscf_settings.php:46
84	+ msgid "Donate $10, $20 or $50!"
85	+ msgstr "לתרום 10 $, 20 $ או 50 $!"
86	+
87	+ #: class.cscf_settings.php:48
88	+ msgid ""
89	+ "If you like this plugin, please donate to support development and "
90	+ "maintenance of:"
91	+ msgstr "אם אתה אוהב את התוסף הזה, בבקשה תרום כדי לתמוך בפיתוח ותחזוקה של:"
92	+
93	+ #: class.cscf_settings.php:48
94	+ msgid "Clean and Simple Contact Form!"
95	+ msgstr "טופס יצירת קשר נקי ופשוט!"
96	+
97	+ #: class.cscf_settings.php:63
98	+ msgid "You are using version"
99	+ msgstr "אתה משתמש בגרסה"
100	+
101	+ #: class.cscf_settings.php:64
102	+ msgid "If you find this plugin useful please consider"
103	+ msgstr "אם אתה מוצא את התוסף הזה שימושי נשמח אם"
104	+
105	+ #: class.cscf_settings.php:67
106	+ msgid "leaving a review"
107	+ msgstr "תשלח לנו ביקורת"
108	+
109	+ #: class.cscf_settings.php:69
110	+ msgid "Thank you!"
111	+ msgstr "תודה לך!"
112	+
113	+ #: class.cscf_settings.php:74
114	+ msgid ""
115	+ "NOTICE: You have JetPack's Contact Form enabled please deactivate it or use "
116	+ "the shortcode [cscf-contact-form] instead."
117	+ msgstr ""
118	+ "שים לב: יש לך טופס יצירת קשר של JetPack אפשר בבקשה לנטרל אותה או להשתמש בקוד "
119	+ "הקצר [cscf מגע הטופס] במקום."
120	+
121	+ #: class.cscf_settings.php:75
122	+ msgid "Read More"
123	+ msgstr "קראו עוד"
124	+
125	+ #: class.cscf_settings.php:79
126	+ msgid "Please Note: To add the contact form to your page please add the text"
127	+ msgstr "שים לב: כדי להוסיף טופס יצירת קשר לדף שלך בבקשה להוסיף את הטקסט"
128	+
129	+ #: class.cscf_settings.php:79
130	+ msgid "to your post or page."
131	+ msgstr "לפוסט או לדף שלך."
132	+
133	+ #: class.cscf_settings.php:98
134	+ msgid "ReCAPTCHA Settings"
135	+ msgstr ""
136	+
137	+ #: class.cscf_settings.php:106
138	+ msgid "Use reCAPTCHA :"
139	+ msgstr ""
140	+
141	+ #: class.cscf_settings.php:112
142	+ msgid "reCAPTCHA Theme :"
143	+ msgstr ""
144	+
145	+ #: class.cscf_settings.php:118
146	+ msgid "reCAPTCHA Public Key :"
147	+ msgstr ""
148	+
149	+ #: class.cscf_settings.php:124
150	+ msgid "reCAPTCHA Private Key :"
151	+ msgstr ""
152	+
153	+ #: class.cscf_settings.php:130
154	+ msgid "Message Settings"
155	+ msgstr "הגדרות הודעה"
156	+
157	+ #: class.cscf_settings.php:134
158	+ msgid "Recipient Emails :"
159	+ msgstr "הודעות דוא\"ל של נמען:"
160	+
161	+ #: class.cscf_settings.php:140
162	+ msgid "Confirm Email Address :"
163	+ msgstr "אשר כתובת דוא\"ל:"
164	+
165	+ #: class.cscf_settings.php:146
166	+ msgid "Override 'From' Address :"
167	+ msgstr ""
168	+
169	+ #: class.cscf_settings.php:152
170	+ msgid "'From' Email Address :"
171	+ msgstr "'מאת' כתובת דוא\"ל:"
172	+
173	+ #: class.cscf_settings.php:158
174	+ msgid "Email Subject :"
175	+ msgstr "כותרת הודעה דואר אלקטרוני:"
176	+
177	+ #: class.cscf_settings.php:164
178	+ msgid "Message :"
179	+ msgstr "הודעה:"
180	+
181	+ #: class.cscf_settings.php:170
182	+ msgid "Message Sent Heading :"
183	+ msgstr "כותרת נשלחה הודעה:"
184	+
185	+ #: class.cscf_settings.php:176
186	+ msgid "Message Sent Content :"
187	+ msgstr "תוכן שנשלח הודעה:"
188	+
189	+ #: class.cscf_settings.php:182
190	+ msgid "Styling and Validation"
191	+ msgstr "עיצוב ואימות"
192	+
193	+ #: class.cscf_settings.php:186
194	+ msgid ""
195	+ "Use the plugin default stylesheet (un-tick to use your theme style sheet "
196	+ "instead) :"
197	+ msgstr ""
198	+ "השתמש בגיליון סגנון ברירת המחדל של תוסף (un-tick להשתמש בסגנון גיליון נושא "
199	+ "שלך במקום):"
200	+
201	+ #: class.cscf_settings.php:192
202	+ msgid "Use client side validation (AJAX) :"
203	+ msgstr ""
204	+
205	+ #: class.cscf_settings.php:262
206	+ msgid "Enter your reCAPTCHA settings below :"
207	+ msgstr ""
208	+
209	+ #: class.cscf_settings.php:263
210	+ msgid "To use reCAPTCHA you must get an API key from"
211	+ msgstr ""
212	+
213	+ #: class.cscf_settings.php:268
214	+ msgid "Enter your message settings below :"
215	+ msgstr "הזן את ההגדרות של ההודעות שלך:"
216	+
217	+ #: class.cscf_settings.php:342
218	+ msgid "Red"
219	+ msgstr ""
220	+
221	+ #: class.cscf_settings.php:343
222	+ msgid "White"
223	+ msgstr ""
224	+
225	+ #: class.cscf_settings.php:344
226	+ msgid "Blackglass"
227	+ msgstr ""
228	+
229	+ #: class.cscf_settings.php:345
230	+ msgid "Clean"
231	+ msgstr ""
232	+
233	+ #: views/contact-form.view.php:24
234	+ msgid "Email Address:"
235	+ msgstr "כתובת דוא\"ל:"
236	+
237	+ #: views/contact-form.view.php:36
238	+ msgid "Your Email Address"
239	+ msgstr "כתובת הדואר האלקטרוני שלך"
240	+
241	+ #: views/contact-form.view.php:47
242	+ msgid "Confirm Email Address:"
243	+ msgstr "אשר כתובת דוא\"ל:"
244	+
245	+ #: views/contact-form.view.php:56 views/contact-form.view.php:58
246	+ msgid "Please enter the same email address again."
247	+ msgstr "אנא הכנס אותה כתובת דוא\"ל שוב."
248	+
249	+ #: views/contact-form.view.php:61
250	+ msgid "Confirm Your Email Address"
251	+ msgstr "אשר את כתובת הדואר האלקטרוני שלך"
252	+
253	+ #: views/contact-form.view.php:72
254	+ msgid "Name:"
255	+ msgstr "שם:"
256	+
257	+ #: views/contact-form.view.php:82
258	+ msgid "Your Name"
259	+ msgstr "השם שלך"
260	+
261	+ #: views/contact-form.view.php:92
262	+ msgid "Message:"
263	+ msgstr "הודעה:"
264	+
265	+ #: views/contact-form.view.php:99
266	+ msgid "Please give a message."
267	+ msgstr "יש לרשום הודעה."
268	+
269	+ #: views/contact-form.view.php:101
270	+ msgid "Your Message"
271	+ msgstr "ההודעה שלך"
272	+
273	+ #: views/contact-form.view.php:123
274	+ msgid "Send Message"
275	+ msgstr "שלח הודעה"
276	+
277	+ #: views/message-not-sent.view.php:1
278	+ msgid "Sorry, there has been a problem and your message was not sent."
279	+ msgstr "סליחה, יש בעיה ההודעה שלך לא נשלחה."
280	+
281	+ #. Plugin Name of the plugin/theme
282	+ msgid "Clean and Simple Contact Form"
283	+ msgstr ""
284	+
285	+ #. Plugin URI of the plugin/theme
286	+ msgid ""
287	+ "http://www.megnicholas.co.uk/wordpress-plugins/clean-and-simple-contact-form"
288	+ msgstr ""
289	+
290	+ #. Description of the plugin/theme
291	+ msgid ""
292	+ "A clean and simple contact form with Google reCAPTCHA and Twitter Bootstrap "
293	+ "markup."
294	+ msgstr ""
295	+
296	+ #. Author of the plugin/theme
297	+ msgid "Meghan Nicholas"
298	+ msgstr ""
299	+
300	+ #. Author URI of the plugin/theme
301	+ msgid "http://www.megnicholas.co.uk"
302	+ msgstr ""

readme.txt CHANGED Viewed

	@@ -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, akismet, 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.8
9	- Stable tag: 4.3.2
10
11	A clean and simple AJAX contact form with Google reCAPTCHA, Twitter Bootstrap markup and Akismet spam filtering.
12
	@@ -201,6 +201,12 @@ the reCAPTCHA for the contact form will be displayed correctly but not in the co
201	The comments form will never validate due to no supplied reCAPTCHA code.
202
203	== Changelog ==






204	= 4.3.2 =
205	* Added Norwegian Bokmål translation thanks to Jann Vestby
206	* Added Brazilian Portugese translation originally a Portugese translation by Ricardo Santos aka BogasoBogolha
	@@ -302,6 +308,8 @@ Polish thanks to Patryk Peas
302
303
304	== Upgrade Notice ==


305	= 4.3.2 =
306	Added Norwegian and Brazilian Portugese Translations
307	= 4.3.1 =


6	Tags: simple, contact, form, contact button, contact form, contact form plugin, akismet, 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.8
9	+ Stable tag: 4.3.3
10
11	A clean and simple AJAX contact form with Google reCAPTCHA, Twitter Bootstrap markup and Akismet spam filtering.
12

201	The comments form will never validate due to no supplied reCAPTCHA code.
202
203	== Changelog ==
204	+ = 4.3.3 =
205	+ * Before overriding the from address, check that another plugin has not done it first.
206	+ Any plugin that overrides 'from email address' and 'from name' such as wp-mail-smtp plugin will take precedence over the settings in this plugin.
207	+ * Added 'reply-to' to the email header
208	+ * Moved the Name field before Email field
209	+ * Added Hebrew translation thanks to Shay Cohen
210	= 4.3.2 =
211	* Added Norwegian Bokmål translation thanks to Jann Vestby
212	* Added Brazilian Portugese translation originally a Portugese translation by Ricardo Santos aka BogasoBogolha

308
309
310	== Upgrade Notice ==
311	+ = 4.3.3 =
312	+ Hebrew Language added, name field moved to top of form, added 'reply-to'
313	= 4.3.2 =
314	Added Norwegian and Brazilian Portugese Translations
315	= 4.3.1 =

views/contact-form.view.php CHANGED Viewed

@@ -20,6 +20,27 @@
                             </div>
                         <?php } ?>
                         <!--email address-->
                         <div class="control-group form-group<?php if (isset($contact->Errors['email'])) echo ' error has-error'; ?>">
                             <label for="cscf_email"><?php _e('Email Address:','cleanandsimple');?></label>
@@ -68,25 +89,6 @@
                         </div>
                         <?php } ?>
-            -
                        <!-- name -->
-            -
                        <div class="control-group form-group<?php if (isset($contact->Errors['name'])) echo ' error has-error'; ?>">
-            -
                            <label for="cscf_name"><?php _e('Name:','cleanandsimple');?></label>
-            -
                            <div class="<?php echo cscf_PluginSettings::InputIcons() ? "input-group" : ""; ?>">
-            -
                                <?php if ( cscf_PluginSettings::InputIcons() == true ) { ?>
-            -
                                    <span class="input-group-addon"><span class="glyphicon glyphicon-user"></span></span>
-            -
                                <?php } ?>
-            -
                                <input class="form-control input-xlarge"
-            -
                                   data-rule-required="true"
-            -
                                   data-msg-required="<?php _e('Please give your name.','cleanandsimple');?>"
-            -
                                   type="text" id="cscf_name" name="cscf[name]"
-            -
                                   value="<?php echo $contact->Name; ?>"
-            -
                                   placeholder="<?php _e('Your Name','cleanandsimple');?>"
-            -
                                />
-            -
                            </div>
-            -
                            <span for="cscf_name" class="help-inline help-block error" style="display:<?php echo isset($contact->Errors['name']) ? 'block' : 'none'; ?>;">
-            -
                                <?php if (isset($contact->Errors['name'])) echo $contact->Errors['name']; ?>
-            -
                            </span>
-            -
                        </div>
                         <!-- message -->
                         <div class="control-group form-group<?php if (isset($contact->Errors['message'])) echo ' error has-error'; ?>">


20	</div>
21	<?php } ?>
22
23	+ <!-- name -->
24	+ <div class="control-group form-group<?php if (isset($contact->Errors['name'])) echo ' error has-error'; ?>">
25	+ <label for="cscf_name"><?php _e('Name:','cleanandsimple');?></label>
26	+ <div class="<?php echo cscf_PluginSettings::InputIcons() ? "input-group" : ""; ?>">
27	+ <?php if ( cscf_PluginSettings::InputIcons() == true ) { ?>
28	+ <span class="input-group-addon"><span class="glyphicon glyphicon-user"></span></span>
29	+ <?php } ?>
30	+ <input class="form-control input-xlarge"
31	+ data-rule-required="true"
32	+ data-msg-required="<?php _e('Please give your name.','cleanandsimple');?>"
33	+ type="text" id="cscf_name" name="cscf[name]"
34	+ value="<?php echo $contact->Name; ?>"
35	+ placeholder="<?php _e('Your Name','cleanandsimple');?>"
36	+ />
37	+ </div>
38	+ <span for="cscf_name" class="help-inline help-block error" style="display:<?php echo isset($contact->Errors['name']) ? 'block' : 'none'; ?>;">
39	+ <?php if (isset($contact->Errors['name'])) echo $contact->Errors['name']; ?>
40	+ </span>
41	+ </div>
42	+
43	+
44	<!--email address-->
45	<div class="control-group form-group<?php if (isset($contact->Errors['email'])) echo ' error has-error'; ?>">
46	<label for="cscf_email"><?php _e('Email Address:','cleanandsimple');?></label>

89	</div>
90	<?php } ?>
91



















92
93	<!-- message -->
94	<div class="control-group form-group<?php if (isset($contact->Errors['message'])) echo ' error has-error'; ?>">

Contact Form Clean and Simple - Version 4.3.3

Version Description

Release Info

Code changes from version 4.3.2 to 4.3.3