Contact Form 7 - Version 1.7

Version Description

Download this release

Release Info

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

Code changes from version 1.6.1 to 1.7

README.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: http://takayukister.chipin.com/contact-form-7
4
  Tags: contact form, email, ajax, captcha, akismet
5
  Requires at least: 2.2
6
  Tested up to: 2.4-bleeding
7
- Stable tag: 1.6.1
8
 
9
  Just another contact form plugin. Simple but flexible.
10
 
@@ -23,6 +23,17 @@ Just another contact form plugin. Simple but flexible.
23
  1. Upload whole `contact-form-7` folder to the `/wp-content/plugins/` directory
24
  1. Activate the plugin through the 'Plugins' menu in WordPress
25
 
 
 
 
 
 
 
 
 
 
 
 
26
  == Screenshots ==
27
 
28
  1. screenshot-1.png
4
  Tags: contact form, email, ajax, captcha, akismet
5
  Requires at least: 2.2
6
  Tested up to: 2.4-bleeding
7
+ Stable tag: 1.7
8
 
9
  Just another contact form plugin. Simple but flexible.
10
 
23
  1. Upload whole `contact-form-7` folder to the `/wp-content/plugins/` directory
24
  1. Activate the plugin through the 'Plugins' menu in WordPress
25
 
26
+ == Frequently Asked Questions ==
27
+
28
+ If you have questions about Contact Form 7,
29
+ please submit it [to the support forum](http://wordpress.org/tags/contact-form-7#postform) or
30
+ comment [on my blog](http://ideasilo.wordpress.com/2007/04/30/contact-form-7/).
31
+
32
+ = By default the size of text field is really small. How can I increase it? =
33
+
34
+ [This documentation](http://ideasilo.wordpress.com/2007/04/30/contact-form-7/#Tags_in_form_content) may help.
35
+ You can do that by editting a tag like: `[text your-name 40/100]`
36
+
37
  == Screenshots ==
38
 
39
  1. screenshot-1.png
admin-stylesheet.css CHANGED
@@ -77,7 +77,7 @@ div.tag-generator {
77
  div.tg-pane {
78
  border: 1px solid #999;
79
  background: #fff;
80
- margin: 1ex 0 0;
81
  padding: 10px;
82
  }
83
  div.tg-pane table {
77
  div.tg-pane {
78
  border: 1px solid #999;
79
  background: #fff;
80
+ margin: 1ex 28px 0 0;
81
  padding: 10px;
82
  }
83
  div.tg-pane table {
contact-form-7.js CHANGED
@@ -5,6 +5,11 @@ jQuery(document).ready(function() {
5
  dataType: 'json',
6
  success: processJson
7
  });
 
 
 
 
 
8
  });
9
 
10
  function beforeSubmit(formData, jqForm, options) {
5
  dataType: 'json',
6
  success: processJson
7
  });
8
+
9
+ // Exclusive checkbox
10
+ jQuery('input:checkbox.exclusive').click(function() {
11
+ jQuery(this.form).find('input:checkbox.exclusive[@name="' + this.name + '"]').not(this).removeAttr('checked');
12
+ });
13
  });
14
 
15
  function beforeSubmit(formData, jqForm, options) {
languages/wpcf7-ja.mo CHANGED
Binary file
languages/wpcf7-ja.po CHANGED
@@ -2,7 +2,7 @@ msgid ""
2
  msgstr ""
3
  "Project-Id-Version: WP Contact Form 7\n"
4
  "POT-Creation-Date: \n"
5
- "PO-Revision-Date: 2007-10-16 15:07+0900\n"
6
  "Last-Translator: Takayuki Miyoshi <takayukister@gmail.com>\n"
7
  "Language-Team: Takayuki Miyoshi <takayukister@gmail.com>\n"
8
  "MIME-Version: 1.0\n"
@@ -15,194 +15,206 @@ msgstr ""
15
  "X-Poedit-Basepath: ../..\n"
16
  "X-Poedit-SearchPath-0: contact-form-7\n"
17
 
18
- #: contact-form-7/wp-contact-form-7.php:235
19
  msgid "Contact form"
20
  msgstr "コンタクトフォーム"
21
 
22
- #: contact-form-7/wp-contact-form-7.php:320
23
  #: contact-form-7/includes/admin-panel.php:5
24
  msgid "Contact Form 7"
25
  msgstr "Contact Form 7"
26
 
27
- #: contact-form-7/wp-contact-form-7.php:336
28
  msgid "optional"
29
  msgstr "オプション"
30
 
31
- #: contact-form-7/wp-contact-form-7.php:337
32
  msgid "Generate Tag"
33
  msgstr "タグの作成"
34
 
35
- #: contact-form-7/wp-contact-form-7.php:338
36
  msgid "Text field"
37
  msgstr "テキスト項目"
38
 
39
- #: contact-form-7/wp-contact-form-7.php:339
40
  msgid "Email field"
41
  msgstr "メールアドレス項目"
42
 
43
- #: contact-form-7/wp-contact-form-7.php:340
44
  msgid "Text area"
45
  msgstr "テキストエリア"
46
 
47
- #: contact-form-7/wp-contact-form-7.php:341
48
  msgid "Drop-down menu"
49
  msgstr "ドロップダウン・メニュー"
50
 
51
- #: contact-form-7/wp-contact-form-7.php:342
 
 
 
 
 
 
 
 
52
  msgid "CAPTCHA"
53
  msgstr "CAPTCHA"
54
 
55
- #: contact-form-7/wp-contact-form-7.php:343
56
  msgid "Submit button"
57
  msgstr "送信ボタン"
58
 
59
- #: contact-form-7/wp-contact-form-7.php:344
60
  msgid "Name"
61
  msgstr "名前"
62
 
63
- #: contact-form-7/wp-contact-form-7.php:345
64
  msgid "Required field?"
65
  msgstr "必須入力の項目ですか?"
66
 
67
- #: contact-form-7/wp-contact-form-7.php:346
 
 
 
 
68
  msgid "Choices"
69
  msgstr "選択項目"
70
 
71
- #: contact-form-7/wp-contact-form-7.php:347
72
  msgid "Label"
73
  msgstr "ラベル"
74
 
75
- #: contact-form-7/wp-contact-form-7.php:348
76
  msgid "Default value"
77
  msgstr "デフォルト値"
78
 
79
- #: contact-form-7/wp-contact-form-7.php:349
80
  msgid "Akismet"
81
  msgstr "Akismet"
82
 
83
- #: contact-form-7/wp-contact-form-7.php:350
84
  msgid "This field requires author's name"
85
  msgstr "送信者の名前の入力を要求する項目"
86
 
87
- #: contact-form-7/wp-contact-form-7.php:351
88
  msgid "This field requires author's URL"
89
  msgstr "送信者の URL の入力を要求する項目"
90
 
91
- #: contact-form-7/wp-contact-form-7.php:352
92
  msgid "This field requires author's email address"
93
  msgstr "送信者のメールアドレスの入力を要求する項目"
94
 
95
- #: contact-form-7/wp-contact-form-7.php:353
96
  msgid "Copy and paste this code into the form"
97
  msgstr "次のコードをコピーしてフォームにペーストして下さい。"
98
 
99
- #: contact-form-7/wp-contact-form-7.php:354
100
  msgid "Foreground color"
101
  msgstr "文字色"
102
 
103
- #: contact-form-7/wp-contact-form-7.php:355
104
  msgid "Background color"
105
  msgstr "背景色"
106
 
107
- #: contact-form-7/wp-contact-form-7.php:356
108
  msgid "Image size"
109
  msgstr "画像サイズ"
110
 
111
- #: contact-form-7/wp-contact-form-7.php:357
112
  msgid "Small"
113
  msgstr "小"
114
 
115
- #: contact-form-7/wp-contact-form-7.php:358
116
  msgid "Medium"
117
  msgstr "中"
118
 
119
- #: contact-form-7/wp-contact-form-7.php:359
120
  msgid "Large"
121
  msgstr "大"
122
 
123
- #: contact-form-7/wp-contact-form-7.php:360
124
  msgid "Image settings"
125
  msgstr "画像の設定"
126
 
127
- #: contact-form-7/wp-contact-form-7.php:361
128
  msgid "Input field settings"
129
  msgstr "入力項目の設定"
130
 
131
- #: contact-form-7/wp-contact-form-7.php:362
132
  msgid "For image"
133
  msgstr "画像"
134
 
135
- #: contact-form-7/wp-contact-form-7.php:363
136
  msgid "For input field"
137
  msgstr "入力項目"
138
 
139
- #: contact-form-7/wp-contact-form-7.php:364
140
  msgid "* One choice per line."
141
  msgstr "* 1行ごとに分けて入力してください。"
142
 
143
- #: contact-form-7/wp-contact-form-7.php:383
144
  msgid "Contact form created."
145
  msgstr "コンタクトフォームが作成されました。"
146
 
147
- #: contact-form-7/wp-contact-form-7.php:386
148
  msgid "Contact form saved."
149
  msgstr "コンタクトフォームが保存されました。"
150
 
151
- #: contact-form-7/wp-contact-form-7.php:389
152
  msgid "Contact form deleted."
153
  msgstr "コンタクトフォームが削除されました。"
154
 
155
- #: contact-form-7/wp-contact-form-7.php:396
156
  msgid "Untitled"
157
  msgstr "無題"
158
 
159
- #: contact-form-7/wp-contact-form-7.php:420
160
  msgid "Your Name"
161
  msgstr "お名前"
162
 
163
- #: contact-form-7/wp-contact-form-7.php:420
164
- #: contact-form-7/wp-contact-form-7.php:422
165
  msgid "(required)"
166
  msgstr "(必須)"
167
 
168
- #: contact-form-7/wp-contact-form-7.php:422
169
  msgid "Your Email"
170
  msgstr "メールアドレス"
171
 
172
- #: contact-form-7/wp-contact-form-7.php:424
173
  msgid "Subject"
174
  msgstr "題名"
175
 
176
- #: contact-form-7/wp-contact-form-7.php:426
177
  msgid "Your Message"
178
  msgstr "メッセージ本文"
179
 
180
- #: contact-form-7/wp-contact-form-7.php:428
181
- #: contact-form-7/wp-contact-form-7.php:795
182
  msgid "Send"
183
  msgstr "送信"
184
 
185
- #: contact-form-7/wp-contact-form-7.php:457
186
  msgid "Your message was sent successfully. Thanks."
187
  msgstr "あなたのメッセージは送信されました。ありがとうございました。"
188
 
189
- #: contact-form-7/wp-contact-form-7.php:459
190
  msgid "Failed to send your message. Please try later or contact administrator by other way."
191
  msgstr "メッセージの送信に失敗しました。間をおいてもう一度お試しいただくか、別の手段で管理者にお問い合わせ下さい。"
192
 
193
- #: contact-form-7/wp-contact-form-7.php:461
194
  msgid "Validation errors occurred. Please confirm the fields and submit it again."
195
  msgstr "入力内容に不備があります。確認してもう一度送信してください。"
196
 
197
- #: contact-form-7/wp-contact-form-7.php:463
198
  msgid "Email address seems invalid."
199
  msgstr "メールアドレスの形式が正しくないようです。"
200
 
201
- #: contact-form-7/wp-contact-form-7.php:465
202
  msgid "Please fill the required field."
203
  msgstr "必須項目に記入もれがあります。"
204
 
205
- #: contact-form-7/wp-contact-form-7.php:467
206
  msgid "Your entered code is incorrect."
207
  msgstr "入力されたコードが正しくありません。"
208
 
@@ -222,43 +234,43 @@ msgstr "フォーム"
222
  msgid "Mail"
223
  msgstr "メール"
224
 
225
- #: contact-form-7/includes/admin-panel.php:38
226
- #: contact-form-7/includes/admin-panel.php:51
227
  msgid "To:"
228
  msgstr "宛先:"
229
 
230
- #: contact-form-7/includes/admin-panel.php:40
231
- #: contact-form-7/includes/admin-panel.php:53
232
  msgid "From:"
233
  msgstr "差出人:"
234
 
235
- #: contact-form-7/includes/admin-panel.php:42
236
- #: contact-form-7/includes/admin-panel.php:55
237
  msgid "Subject:"
238
  msgstr "件名:"
239
 
240
- #: contact-form-7/includes/admin-panel.php:44
241
- #: contact-form-7/includes/admin-panel.php:57
242
  msgid "Message body:"
243
  msgstr "メッセージ本文:"
244
 
245
- #: contact-form-7/includes/admin-panel.php:48
246
  msgid "Mail (2)"
247
  msgstr "メール (2)"
248
 
249
- #: contact-form-7/includes/admin-panel.php:50
250
  msgid "Use mail (2)"
251
  msgstr "メール (2) を使う"
252
 
253
- #: contact-form-7/includes/admin-panel.php:64
254
  msgid "Save"
255
  msgstr "保存"
256
 
257
- #: contact-form-7/includes/admin-panel.php:70
258
  msgid "Delete this contact form"
259
  msgstr "このコンタクトフォームを削除"
260
 
261
- #: contact-form-7/includes/admin-panel.php:71
262
  msgid ""
263
  "You are about to delete this contact form.\n"
264
  " 'Cancel' to stop, 'OK' to delete."
2
  msgstr ""
3
  "Project-Id-Version: WP Contact Form 7\n"
4
  "POT-Creation-Date: \n"
5
+ "PO-Revision-Date: 2007-11-26 20:10+0900\n"
6
  "Last-Translator: Takayuki Miyoshi <takayukister@gmail.com>\n"
7
  "Language-Team: Takayuki Miyoshi <takayukister@gmail.com>\n"
8
  "MIME-Version: 1.0\n"
15
  "X-Poedit-Basepath: ../..\n"
16
  "X-Poedit-SearchPath-0: contact-form-7\n"
17
 
18
+ #: contact-form-7/wp-contact-form-7.php:251
19
  msgid "Contact form"
20
  msgstr "コンタクトフォーム"
21
 
22
+ #: contact-form-7/wp-contact-form-7.php:336
23
  #: contact-form-7/includes/admin-panel.php:5
24
  msgid "Contact Form 7"
25
  msgstr "Contact Form 7"
26
 
27
+ #: contact-form-7/wp-contact-form-7.php:352
28
  msgid "optional"
29
  msgstr "オプション"
30
 
31
+ #: contact-form-7/wp-contact-form-7.php:353
32
  msgid "Generate Tag"
33
  msgstr "タグの作成"
34
 
35
+ #: contact-form-7/wp-contact-form-7.php:354
36
  msgid "Text field"
37
  msgstr "テキスト項目"
38
 
39
+ #: contact-form-7/wp-contact-form-7.php:355
40
  msgid "Email field"
41
  msgstr "メールアドレス項目"
42
 
43
+ #: contact-form-7/wp-contact-form-7.php:356
44
  msgid "Text area"
45
  msgstr "テキストエリア"
46
 
47
+ #: contact-form-7/wp-contact-form-7.php:357
48
  msgid "Drop-down menu"
49
  msgstr "ドロップダウン・メニュー"
50
 
51
+ #: contact-form-7/wp-contact-form-7.php:358
52
+ msgid "Checkboxes"
53
+ msgstr "チェックボックス"
54
+
55
+ #: contact-form-7/wp-contact-form-7.php:359
56
+ msgid "Radio buttons"
57
+ msgstr "ラジオボタン"
58
+
59
+ #: contact-form-7/wp-contact-form-7.php:360
60
  msgid "CAPTCHA"
61
  msgstr "CAPTCHA"
62
 
63
+ #: contact-form-7/wp-contact-form-7.php:361
64
  msgid "Submit button"
65
  msgstr "送信ボタン"
66
 
67
+ #: contact-form-7/wp-contact-form-7.php:362
68
  msgid "Name"
69
  msgstr "名前"
70
 
71
+ #: contact-form-7/wp-contact-form-7.php:363
72
  msgid "Required field?"
73
  msgstr "必須入力の項目ですか?"
74
 
75
+ #: contact-form-7/wp-contact-form-7.php:364
76
+ msgid "Allows multiple selections?"
77
+ msgstr "複数選択を可能にしますか?"
78
+
79
+ #: contact-form-7/wp-contact-form-7.php:365
80
  msgid "Choices"
81
  msgstr "選択項目"
82
 
83
+ #: contact-form-7/wp-contact-form-7.php:366
84
  msgid "Label"
85
  msgstr "ラベル"
86
 
87
+ #: contact-form-7/wp-contact-form-7.php:367
88
  msgid "Default value"
89
  msgstr "デフォルト値"
90
 
91
+ #: contact-form-7/wp-contact-form-7.php:368
92
  msgid "Akismet"
93
  msgstr "Akismet"
94
 
95
+ #: contact-form-7/wp-contact-form-7.php:369
96
  msgid "This field requires author's name"
97
  msgstr "送信者の名前の入力を要求する項目"
98
 
99
+ #: contact-form-7/wp-contact-form-7.php:370
100
  msgid "This field requires author's URL"
101
  msgstr "送信者の URL の入力を要求する項目"
102
 
103
+ #: contact-form-7/wp-contact-form-7.php:371
104
  msgid "This field requires author's email address"
105
  msgstr "送信者のメールアドレスの入力を要求する項目"
106
 
107
+ #: contact-form-7/wp-contact-form-7.php:372
108
  msgid "Copy and paste this code into the form"
109
  msgstr "次のコードをコピーしてフォームにペーストして下さい。"
110
 
111
+ #: contact-form-7/wp-contact-form-7.php:373
112
  msgid "Foreground color"
113
  msgstr "文字色"
114
 
115
+ #: contact-form-7/wp-contact-form-7.php:374
116
  msgid "Background color"
117
  msgstr "背景色"
118
 
119
+ #: contact-form-7/wp-contact-form-7.php:375
120
  msgid "Image size"
121
  msgstr "画像サイズ"
122
 
123
+ #: contact-form-7/wp-contact-form-7.php:376
124
  msgid "Small"
125
  msgstr "小"
126
 
127
+ #: contact-form-7/wp-contact-form-7.php:377
128
  msgid "Medium"
129
  msgstr "中"
130
 
131
+ #: contact-form-7/wp-contact-form-7.php:378
132
  msgid "Large"
133
  msgstr "大"
134
 
135
+ #: contact-form-7/wp-contact-form-7.php:379
136
  msgid "Image settings"
137
  msgstr "画像の設定"
138
 
139
+ #: contact-form-7/wp-contact-form-7.php:380
140
  msgid "Input field settings"
141
  msgstr "入力項目の設定"
142
 
143
+ #: contact-form-7/wp-contact-form-7.php:381
144
  msgid "For image"
145
  msgstr "画像"
146
 
147
+ #: contact-form-7/wp-contact-form-7.php:382
148
  msgid "For input field"
149
  msgstr "入力項目"
150
 
151
+ #: contact-form-7/wp-contact-form-7.php:383
152
  msgid "* One choice per line."
153
  msgstr "* 1行ごとに分けて入力してください。"
154
 
155
+ #: contact-form-7/wp-contact-form-7.php:402
156
  msgid "Contact form created."
157
  msgstr "コンタクトフォームが作成されました。"
158
 
159
+ #: contact-form-7/wp-contact-form-7.php:405
160
  msgid "Contact form saved."
161
  msgstr "コンタクトフォームが保存されました。"
162
 
163
+ #: contact-form-7/wp-contact-form-7.php:408
164
  msgid "Contact form deleted."
165
  msgstr "コンタクトフォームが削除されました。"
166
 
167
+ #: contact-form-7/wp-contact-form-7.php:415
168
  msgid "Untitled"
169
  msgstr "無題"
170
 
171
+ #: contact-form-7/wp-contact-form-7.php:439
172
  msgid "Your Name"
173
  msgstr "お名前"
174
 
175
+ #: contact-form-7/wp-contact-form-7.php:439
176
+ #: contact-form-7/wp-contact-form-7.php:441
177
  msgid "(required)"
178
  msgstr "(必須)"
179
 
180
+ #: contact-form-7/wp-contact-form-7.php:441
181
  msgid "Your Email"
182
  msgstr "メールアドレス"
183
 
184
+ #: contact-form-7/wp-contact-form-7.php:443
185
  msgid "Subject"
186
  msgstr "題名"
187
 
188
+ #: contact-form-7/wp-contact-form-7.php:445
189
  msgid "Your Message"
190
  msgstr "メッセージ本文"
191
 
192
+ #: contact-form-7/wp-contact-form-7.php:447
193
+ #: contact-form-7/wp-contact-form-7.php:891
194
  msgid "Send"
195
  msgstr "送信"
196
 
197
+ #: contact-form-7/wp-contact-form-7.php:476
198
  msgid "Your message was sent successfully. Thanks."
199
  msgstr "あなたのメッセージは送信されました。ありがとうございました。"
200
 
201
+ #: contact-form-7/wp-contact-form-7.php:478
202
  msgid "Failed to send your message. Please try later or contact administrator by other way."
203
  msgstr "メッセージの送信に失敗しました。間をおいてもう一度お試しいただくか、別の手段で管理者にお問い合わせ下さい。"
204
 
205
+ #: contact-form-7/wp-contact-form-7.php:480
206
  msgid "Validation errors occurred. Please confirm the fields and submit it again."
207
  msgstr "入力内容に不備があります。確認してもう一度送信してください。"
208
 
209
+ #: contact-form-7/wp-contact-form-7.php:482
210
  msgid "Email address seems invalid."
211
  msgstr "メールアドレスの形式が正しくないようです。"
212
 
213
+ #: contact-form-7/wp-contact-form-7.php:484
214
  msgid "Please fill the required field."
215
  msgstr "必須項目に記入もれがあります。"
216
 
217
+ #: contact-form-7/wp-contact-form-7.php:486
218
  msgid "Your entered code is incorrect."
219
  msgstr "入力されたコードが正しくありません。"
220
 
234
  msgid "Mail"
235
  msgstr "メール"
236
 
237
+ #: contact-form-7/includes/admin-panel.php:39
238
+ #: contact-form-7/includes/admin-panel.php:60
239
  msgid "To:"
240
  msgstr "宛先:"
241
 
242
+ #: contact-form-7/includes/admin-panel.php:43
243
+ #: contact-form-7/includes/admin-panel.php:64
244
  msgid "From:"
245
  msgstr "差出人:"
246
 
247
+ #: contact-form-7/includes/admin-panel.php:47
248
+ #: contact-form-7/includes/admin-panel.php:68
249
  msgid "Subject:"
250
  msgstr "件名:"
251
 
252
+ #: contact-form-7/includes/admin-panel.php:51
253
+ #: contact-form-7/includes/admin-panel.php:72
254
  msgid "Message body:"
255
  msgstr "メッセージ本文:"
256
 
257
+ #: contact-form-7/includes/admin-panel.php:56
258
  msgid "Mail (2)"
259
  msgstr "メール (2)"
260
 
261
+ #: contact-form-7/includes/admin-panel.php:58
262
  msgid "Use mail (2)"
263
  msgstr "メール (2) を使う"
264
 
265
+ #: contact-form-7/includes/admin-panel.php:80
266
  msgid "Save"
267
  msgstr "保存"
268
 
269
+ #: contact-form-7/includes/admin-panel.php:86
270
  msgid "Delete this contact form"
271
  msgstr "このコンタクトフォームを削除"
272
 
273
+ #: contact-form-7/includes/admin-panel.php:87
274
  msgid ""
275
  "You are about to delete this contact form.\n"
276
  " 'Cancel' to stop, 'OK' to delete."
languages/wpcf7.pot CHANGED
@@ -2,7 +2,7 @@ msgid ""
2
  msgstr ""
3
  "Project-Id-Version: Contact Form 7\n"
4
  "POT-Creation-Date: 2007-10-24 13:47+0900\n"
5
- "PO-Revision-Date: 2007-10-24 13:56+0900\n"
6
  "Last-Translator: Takayuki Miyoshi <takayukister@gmail.com>\n"
7
  "Language-Team: \n"
8
  "MIME-Version: 1.0\n"
@@ -13,194 +13,206 @@ msgstr ""
13
  "X-Poedit-Basepath: ../..\n"
14
  "X-Poedit-SearchPath-0: contact-form-7\n"
15
 
16
- #: contact-form-7/wp-contact-form-7.php:238
17
  msgid "Contact form"
18
  msgstr ""
19
 
20
- #: contact-form-7/wp-contact-form-7.php:323
21
  #: contact-form-7/includes/admin-panel.php:5
22
  msgid "Contact Form 7"
23
  msgstr ""
24
 
25
- #: contact-form-7/wp-contact-form-7.php:339
26
  msgid "optional"
27
  msgstr ""
28
 
29
- #: contact-form-7/wp-contact-form-7.php:340
30
  msgid "Generate Tag"
31
  msgstr ""
32
 
33
- #: contact-form-7/wp-contact-form-7.php:341
34
  msgid "Text field"
35
  msgstr ""
36
 
37
- #: contact-form-7/wp-contact-form-7.php:342
38
  msgid "Email field"
39
  msgstr ""
40
 
41
- #: contact-form-7/wp-contact-form-7.php:343
42
  msgid "Text area"
43
  msgstr ""
44
 
45
- #: contact-form-7/wp-contact-form-7.php:344
46
  msgid "Drop-down menu"
47
  msgstr ""
48
 
49
- #: contact-form-7/wp-contact-form-7.php:345
 
 
 
 
 
 
 
 
50
  msgid "CAPTCHA"
51
  msgstr ""
52
 
53
- #: contact-form-7/wp-contact-form-7.php:346
54
  msgid "Submit button"
55
  msgstr ""
56
 
57
- #: contact-form-7/wp-contact-form-7.php:347
58
  msgid "Name"
59
  msgstr ""
60
 
61
- #: contact-form-7/wp-contact-form-7.php:348
62
  msgid "Required field?"
63
  msgstr ""
64
 
65
- #: contact-form-7/wp-contact-form-7.php:349
 
 
 
 
66
  msgid "Choices"
67
  msgstr ""
68
 
69
- #: contact-form-7/wp-contact-form-7.php:350
70
  msgid "Label"
71
  msgstr ""
72
 
73
- #: contact-form-7/wp-contact-form-7.php:351
74
  msgid "Default value"
75
  msgstr ""
76
 
77
- #: contact-form-7/wp-contact-form-7.php:352
78
  msgid "Akismet"
79
  msgstr ""
80
 
81
- #: contact-form-7/wp-contact-form-7.php:353
82
  msgid "This field requires author's name"
83
  msgstr ""
84
 
85
- #: contact-form-7/wp-contact-form-7.php:354
86
  msgid "This field requires author's URL"
87
  msgstr ""
88
 
89
- #: contact-form-7/wp-contact-form-7.php:355
90
  msgid "This field requires author's email address"
91
  msgstr ""
92
 
93
- #: contact-form-7/wp-contact-form-7.php:356
94
  msgid "Copy and paste this code into the form"
95
  msgstr ""
96
 
97
- #: contact-form-7/wp-contact-form-7.php:357
98
  msgid "Foreground color"
99
  msgstr ""
100
 
101
- #: contact-form-7/wp-contact-form-7.php:358
102
  msgid "Background color"
103
  msgstr ""
104
 
105
- #: contact-form-7/wp-contact-form-7.php:359
106
  msgid "Image size"
107
  msgstr ""
108
 
109
- #: contact-form-7/wp-contact-form-7.php:360
110
  msgid "Small"
111
  msgstr ""
112
 
113
- #: contact-form-7/wp-contact-form-7.php:361
114
  msgid "Medium"
115
  msgstr ""
116
 
117
- #: contact-form-7/wp-contact-form-7.php:362
118
  msgid "Large"
119
  msgstr ""
120
 
121
- #: contact-form-7/wp-contact-form-7.php:363
122
  msgid "Image settings"
123
  msgstr ""
124
 
125
- #: contact-form-7/wp-contact-form-7.php:364
126
  msgid "Input field settings"
127
  msgstr ""
128
 
129
- #: contact-form-7/wp-contact-form-7.php:365
130
  msgid "For image"
131
  msgstr ""
132
 
133
- #: contact-form-7/wp-contact-form-7.php:366
134
  msgid "For input field"
135
  msgstr ""
136
 
137
- #: contact-form-7/wp-contact-form-7.php:367
138
  msgid "* One choice per line."
139
  msgstr ""
140
 
141
- #: contact-form-7/wp-contact-form-7.php:386
142
  msgid "Contact form created."
143
  msgstr ""
144
 
145
- #: contact-form-7/wp-contact-form-7.php:389
146
  msgid "Contact form saved."
147
  msgstr ""
148
 
149
- #: contact-form-7/wp-contact-form-7.php:392
150
  msgid "Contact form deleted."
151
  msgstr ""
152
 
153
- #: contact-form-7/wp-contact-form-7.php:399
154
  msgid "Untitled"
155
  msgstr ""
156
 
157
- #: contact-form-7/wp-contact-form-7.php:423
158
  msgid "Your Name"
159
  msgstr ""
160
 
161
- #: contact-form-7/wp-contact-form-7.php:423
162
- #: contact-form-7/wp-contact-form-7.php:425
163
  msgid "(required)"
164
  msgstr ""
165
 
166
- #: contact-form-7/wp-contact-form-7.php:425
167
  msgid "Your Email"
168
  msgstr ""
169
 
170
- #: contact-form-7/wp-contact-form-7.php:427
171
  msgid "Subject"
172
  msgstr ""
173
 
174
- #: contact-form-7/wp-contact-form-7.php:429
175
  msgid "Your Message"
176
  msgstr ""
177
 
178
- #: contact-form-7/wp-contact-form-7.php:431
179
- #: contact-form-7/wp-contact-form-7.php:813
180
  msgid "Send"
181
  msgstr ""
182
 
183
- #: contact-form-7/wp-contact-form-7.php:460
184
  msgid "Your message was sent successfully. Thanks."
185
  msgstr ""
186
 
187
- #: contact-form-7/wp-contact-form-7.php:462
188
  msgid "Failed to send your message. Please try later or contact administrator by other way."
189
  msgstr ""
190
 
191
- #: contact-form-7/wp-contact-form-7.php:464
192
  msgid "Validation errors occurred. Please confirm the fields and submit it again."
193
  msgstr ""
194
 
195
- #: contact-form-7/wp-contact-form-7.php:466
196
  msgid "Email address seems invalid."
197
  msgstr ""
198
 
199
- #: contact-form-7/wp-contact-form-7.php:468
200
  msgid "Please fill the required field."
201
  msgstr ""
202
 
203
- #: contact-form-7/wp-contact-form-7.php:470
204
  msgid "Your entered code is incorrect."
205
  msgstr ""
206
 
2
  msgstr ""
3
  "Project-Id-Version: Contact Form 7\n"
4
  "POT-Creation-Date: 2007-10-24 13:47+0900\n"
5
+ "PO-Revision-Date: 2007-11-26 20:12+0900\n"
6
  "Last-Translator: Takayuki Miyoshi <takayukister@gmail.com>\n"
7
  "Language-Team: \n"
8
  "MIME-Version: 1.0\n"
13
  "X-Poedit-Basepath: ../..\n"
14
  "X-Poedit-SearchPath-0: contact-form-7\n"
15
 
16
+ #: contact-form-7/wp-contact-form-7.php:251
17
  msgid "Contact form"
18
  msgstr ""
19
 
20
+ #: contact-form-7/wp-contact-form-7.php:336
21
  #: contact-form-7/includes/admin-panel.php:5
22
  msgid "Contact Form 7"
23
  msgstr ""
24
 
25
+ #: contact-form-7/wp-contact-form-7.php:352
26
  msgid "optional"
27
  msgstr ""
28
 
29
+ #: contact-form-7/wp-contact-form-7.php:353
30
  msgid "Generate Tag"
31
  msgstr ""
32
 
33
+ #: contact-form-7/wp-contact-form-7.php:354
34
  msgid "Text field"
35
  msgstr ""
36
 
37
+ #: contact-form-7/wp-contact-form-7.php:355
38
  msgid "Email field"
39
  msgstr ""
40
 
41
+ #: contact-form-7/wp-contact-form-7.php:356
42
  msgid "Text area"
43
  msgstr ""
44
 
45
+ #: contact-form-7/wp-contact-form-7.php:357
46
  msgid "Drop-down menu"
47
  msgstr ""
48
 
49
+ #: contact-form-7/wp-contact-form-7.php:358
50
+ msgid "Checkboxes"
51
+ msgstr ""
52
+
53
+ #: contact-form-7/wp-contact-form-7.php:359
54
+ msgid "Radio buttons"
55
+ msgstr ""
56
+
57
+ #: contact-form-7/wp-contact-form-7.php:360
58
  msgid "CAPTCHA"
59
  msgstr ""
60
 
61
+ #: contact-form-7/wp-contact-form-7.php:361
62
  msgid "Submit button"
63
  msgstr ""
64
 
65
+ #: contact-form-7/wp-contact-form-7.php:362
66
  msgid "Name"
67
  msgstr ""
68
 
69
+ #: contact-form-7/wp-contact-form-7.php:363
70
  msgid "Required field?"
71
  msgstr ""
72
 
73
+ #: contact-form-7/wp-contact-form-7.php:364
74
+ msgid "Allows multiple selections?"
75
+ msgstr ""
76
+
77
+ #: contact-form-7/wp-contact-form-7.php:365
78
  msgid "Choices"
79
  msgstr ""
80
 
81
+ #: contact-form-7/wp-contact-form-7.php:366
82
  msgid "Label"
83
  msgstr ""
84
 
85
+ #: contact-form-7/wp-contact-form-7.php:367
86
  msgid "Default value"
87
  msgstr ""
88
 
89
+ #: contact-form-7/wp-contact-form-7.php:368
90
  msgid "Akismet"
91
  msgstr ""
92
 
93
+ #: contact-form-7/wp-contact-form-7.php:369
94
  msgid "This field requires author's name"
95
  msgstr ""
96
 
97
+ #: contact-form-7/wp-contact-form-7.php:370
98
  msgid "This field requires author's URL"
99
  msgstr ""
100
 
101
+ #: contact-form-7/wp-contact-form-7.php:371
102
  msgid "This field requires author's email address"
103
  msgstr ""
104
 
105
+ #: contact-form-7/wp-contact-form-7.php:372
106
  msgid "Copy and paste this code into the form"
107
  msgstr ""
108
 
109
+ #: contact-form-7/wp-contact-form-7.php:373
110
  msgid "Foreground color"
111
  msgstr ""
112
 
113
+ #: contact-form-7/wp-contact-form-7.php:374
114
  msgid "Background color"
115
  msgstr ""
116
 
117
+ #: contact-form-7/wp-contact-form-7.php:375
118
  msgid "Image size"
119
  msgstr ""
120
 
121
+ #: contact-form-7/wp-contact-form-7.php:376
122
  msgid "Small"
123
  msgstr ""
124
 
125
+ #: contact-form-7/wp-contact-form-7.php:377
126
  msgid "Medium"
127
  msgstr ""
128
 
129
+ #: contact-form-7/wp-contact-form-7.php:378
130
  msgid "Large"
131
  msgstr ""
132
 
133
+ #: contact-form-7/wp-contact-form-7.php:379
134
  msgid "Image settings"
135
  msgstr ""
136
 
137
+ #: contact-form-7/wp-contact-form-7.php:380
138
  msgid "Input field settings"
139
  msgstr ""
140
 
141
+ #: contact-form-7/wp-contact-form-7.php:381
142
  msgid "For image"
143
  msgstr ""
144
 
145
+ #: contact-form-7/wp-contact-form-7.php:382
146
  msgid "For input field"
147
  msgstr ""
148
 
149
+ #: contact-form-7/wp-contact-form-7.php:383
150
  msgid "* One choice per line."
151
  msgstr ""
152
 
153
+ #: contact-form-7/wp-contact-form-7.php:402
154
  msgid "Contact form created."
155
  msgstr ""
156
 
157
+ #: contact-form-7/wp-contact-form-7.php:405
158
  msgid "Contact form saved."
159
  msgstr ""
160
 
161
+ #: contact-form-7/wp-contact-form-7.php:408
162
  msgid "Contact form deleted."
163
  msgstr ""
164
 
165
+ #: contact-form-7/wp-contact-form-7.php:415
166
  msgid "Untitled"
167
  msgstr ""
168
 
169
+ #: contact-form-7/wp-contact-form-7.php:439
170
  msgid "Your Name"
171
  msgstr ""
172
 
173
+ #: contact-form-7/wp-contact-form-7.php:439
174
+ #: contact-form-7/wp-contact-form-7.php:441
175
  msgid "(required)"
176
  msgstr ""
177
 
178
+ #: contact-form-7/wp-contact-form-7.php:441
179
  msgid "Your Email"
180
  msgstr ""
181
 
182
+ #: contact-form-7/wp-contact-form-7.php:443
183
  msgid "Subject"
184
  msgstr ""
185
 
186
+ #: contact-form-7/wp-contact-form-7.php:445
187
  msgid "Your Message"
188
  msgstr ""
189
 
190
+ #: contact-form-7/wp-contact-form-7.php:447
191
+ #: contact-form-7/wp-contact-form-7.php:891
192
  msgid "Send"
193
  msgstr ""
194
 
195
+ #: contact-form-7/wp-contact-form-7.php:476
196
  msgid "Your message was sent successfully. Thanks."
197
  msgstr ""
198
 
199
+ #: contact-form-7/wp-contact-form-7.php:478
200
  msgid "Failed to send your message. Please try later or contact administrator by other way."
201
  msgstr ""
202
 
203
+ #: contact-form-7/wp-contact-form-7.php:480
204
  msgid "Validation errors occurred. Please confirm the fields and submit it again."
205
  msgstr ""
206
 
207
+ #: contact-form-7/wp-contact-form-7.php:482
208
  msgid "Email address seems invalid."
209
  msgstr ""
210
 
211
+ #: contact-form-7/wp-contact-form-7.php:484
212
  msgid "Please fill the required field."
213
  msgstr ""
214
 
215
+ #: contact-form-7/wp-contact-form-7.php:486
216
  msgid "Your entered code is incorrect."
217
  msgstr ""
218
 
stylesheet.css CHANGED
@@ -41,3 +41,7 @@ span.wpcf7-not-valid-tip-no-ajax {
41
  font-size: 10pt;
42
  display: block;
43
  }
 
 
 
 
41
  font-size: 10pt;
42
  display: block;
43
  }
44
+
45
+ span.wpcf7-list-item {
46
+ margin-left: 0.5em;
47
+ }
wp-contact-form-7.php CHANGED
@@ -4,7 +4,7 @@ Plugin Name: Contact Form 7
4
  Plugin URI: http://ideasilo.wordpress.com/2007/04/30/contact-form-7/
5
  Description: Just another contact form plugin. Simple but flexible.
6
  Author: Takayuki Miyoshi
7
- Version: 1.6.1
8
  Author URI: http://ideasilo.wordpress.com/
9
  */
10
 
@@ -134,7 +134,7 @@ class tam_contact_form_seven {
134
  function mail($contact_form) {
135
  $contact_form = $this->upgrade_160($contact_form);
136
  $regex = '/\[\s*([a-zA-Z][0-9a-zA-Z:._-]*)\s*\]/';
137
- $callback = create_function('$matches', 'if (isset($_POST[$matches[1]])) return stripslashes($_POST[$matches[1]]); else return $matches[0];');
138
  $mail_subject = preg_replace_callback($regex, $callback, $contact_form['mail']['subject']);
139
  $mail_sender = preg_replace_callback($regex, $callback, $contact_form['mail']['sender']);
140
  $mail_body = preg_replace_callback($regex, $callback, $contact_form['mail']['body']);
@@ -159,6 +159,17 @@ class tam_contact_form_seven {
159
  return false;
160
  }
161
  }
 
 
 
 
 
 
 
 
 
 
 
162
 
163
  function akismet($contact_form) {
164
  global $akismet_api_host, $akismet_api_port;
@@ -344,10 +355,13 @@ var _wpcf7 = {
344
  emailField: "<?php echo js_escape(__('Email field', 'wpcf7')); ?>",
345
  textArea: "<?php echo js_escape(__('Text area', 'wpcf7')); ?>",
346
  menu: "<?php echo js_escape(__('Drop-down menu', 'wpcf7')); ?>",
 
 
347
  captcha: "<?php echo js_escape(__('CAPTCHA', 'wpcf7')); ?>",
348
  submit: "<?php echo js_escape(__('Submit button', 'wpcf7')); ?>",
349
  tagName: "<?php echo js_escape(__('Name', 'wpcf7')); ?>",
350
  isRequiredField: "<?php echo js_escape(__('Required field?', 'wpcf7')); ?>",
 
351
  menuChoices: "<?php echo js_escape(__('Choices', 'wpcf7')); ?>",
352
  label: "<?php echo js_escape(__('Label', 'wpcf7')); ?>",
353
  defaultValue: "<?php echo js_escape(__('Default value', 'wpcf7')); ?>",
@@ -539,7 +553,7 @@ var _wpcf7 = {
539
  $url = parse_url($_SERVER['REQUEST_URI']);
540
  $url = $url['path'] . (empty($url['query']) ? '' : '?' . $url['query']) . '#' . $unit_tag;
541
 
542
- $form .= '<form action="' . $url . '" method="post">';
543
  $form .= '<input type="hidden" name="_wpcf7" value="' . $id . '" />';
544
  $form .= '<input type="hidden" name="_wpcf7_unit_tag" value="' . $unit_tag . '" />';
545
  $form .= $this->form_elements($cf['form']);
@@ -583,7 +597,25 @@ var _wpcf7 = {
583
  foreach ($fes as $fe) {
584
  $type = $fe['type'];
585
  $name = $fe['name'];
586
-
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
587
  // Required item (*)
588
  if (preg_match('/^(?:text|textarea)[*]$/', $type)) {
589
  if (empty($_POST[$name])) {
@@ -665,8 +697,8 @@ var _wpcf7 = { ajaxUrl: '<?php echo $override_url; ?>' };
665
  /* Processing form element placeholders */
666
 
667
  function form_elements($form, $replace = true) {
668
- $types = 'text|email|textarea|select|captchac|captchar';
669
- $regex = '%\[\s*((?:' . $types . ')[*]?)(\s+[a-zA-Z][0-9a-zA-Z:._-]*)([-0-9a-zA-Z:#_/\s]*)?((?:\s*(?:"[^"]*"|\'[^\']*\'))*)?\s*\]%';
670
  $submit_regex = '/\[\s*submit(\s+(?:"[^"]*"|\'[^\']*\'))?\s*\]/';
671
  if ($replace) {
672
  $form = preg_replace_callback($regex, array(&$this, 'form_element_replace_callback'), $form);
@@ -694,33 +726,42 @@ var _wpcf7 = { ajaxUrl: '<?php echo $override_url; ?>' };
694
  }
695
 
696
  $atts = '';
697
- if (is_array($options)) {
698
- $id_array = preg_grep('%^id:[-0-9a-zA-Z_]+$%', $options);
699
- if ($id = array_shift($id_array)) {
700
- preg_match('%^id:([-0-9a-zA-Z_]+)$%', $id, $id_matches);
701
- if ($id = $id_matches[1])
702
- $atts .= ' id="' . $id . '"';
703
- }
704
-
705
- $class_att = "";
706
- $class_array = preg_grep('%^class:[-0-9a-zA-Z_]+$%', $options);
707
- foreach ($class_array as $class) {
708
- preg_match('%^class:([-0-9a-zA-Z_]+)$%', $class, $class_matches);
709
- if ($class = $class_matches[1])
710
- $class_att .= ' ' . $class;
711
- }
712
-
713
- if (preg_match('/^email[*]?$/', $type))
714
- $class_att .= ' wpcf7-validates-as-email';
715
- if (preg_match('/[*]$/', $type))
716
- $class_att .= ' wpcf7-validates-as-required';
717
-
718
- if (preg_match('/^captchac$/', $type))
719
- $class_att .= ' wpcf7-captcha-' . $name;
720
-
721
- if ($class_att)
722
- $atts .= ' class="' . trim($class_att) . '"';
723
- }
 
 
 
 
 
 
 
 
 
724
 
725
  // Value.
726
  if ($this->processing_unit_tag == $_POST['_wpcf7_unit_tag']) {
@@ -734,10 +775,11 @@ var _wpcf7 = { ajaxUrl: '<?php echo $override_url; ?>' };
734
  $value = $values[0];
735
  }
736
 
737
- $type = preg_replace('/[*]$/', '', $type);
738
  switch ($type) {
739
  case 'text':
 
740
  case 'email':
 
741
  case 'captchar':
742
  if (is_array($options)) {
743
  $size_maxlength_array = preg_grep('%^[0-9]*[/x][0-9]*$%', $options);
@@ -754,6 +796,7 @@ var _wpcf7 = { ajaxUrl: '<?php echo $override_url; ?>' };
754
  return $html;
755
  break;
756
  case 'textarea':
 
757
  if (is_array($options)) {
758
  $cols_rows_array = preg_grep('%^[0-9]*[x/][0-9]*$%', $options);
759
  if ($cols_rows = array_shift($cols_rows_array)) {
@@ -769,17 +812,50 @@ var _wpcf7 = { ajaxUrl: '<?php echo $override_url; ?>' };
769
  return $html;
770
  break;
771
  case 'select':
 
 
772
  if (empty($values))
773
  array_push($values, '---');
774
  $html = '';
775
  foreach ($values as $value) {
776
- if ($this->processing_unit_tag == $_POST['_wpcf7_unit_tag'] && $_POST[$name] == $value)
777
- $selected = ' selected="selected"';
778
- else
779
- $selected = '';
 
780
  $html .= '<option value="' . attribute_escape($value) . '"' . $selected . '>' . $value . '</option>';
781
  }
782
- $html = '<select name="' . $name . '"' . $atts . '>' . $html . '</select>';
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
783
  $html = '<span style="position: relative;">' . $html . $validation_error . '</span>';
784
  return $html;
785
  break;
4
  Plugin URI: http://ideasilo.wordpress.com/2007/04/30/contact-form-7/
5
  Description: Just another contact form plugin. Simple but flexible.
6
  Author: Takayuki Miyoshi
7
+ Version: 1.7
8
  Author URI: http://ideasilo.wordpress.com/
9
  */
10
 
134
  function mail($contact_form) {
135
  $contact_form = $this->upgrade_160($contact_form);
136
  $regex = '/\[\s*([a-zA-Z][0-9a-zA-Z:._-]*)\s*\]/';
137
+ $callback = array(&$this, 'mail_callback');
138
  $mail_subject = preg_replace_callback($regex, $callback, $contact_form['mail']['subject']);
139
  $mail_sender = preg_replace_callback($regex, $callback, $contact_form['mail']['sender']);
140
  $mail_body = preg_replace_callback($regex, $callback, $contact_form['mail']['body']);
159
  return false;
160
  }
161
  }
162
+
163
+ function mail_callback($matches) {
164
+ if (isset($_POST[$matches[1]])) {
165
+ $submitted = $_POST[$matches[1]];
166
+ if (is_array($submitted))
167
+ $submitted = join(', ', $submitted);
168
+ return stripslashes($submitted);
169
+ } else {
170
+ return $matches[0];
171
+ }
172
+ }
173
 
174
  function akismet($contact_form) {
175
  global $akismet_api_host, $akismet_api_port;
355
  emailField: "<?php echo js_escape(__('Email field', 'wpcf7')); ?>",
356
  textArea: "<?php echo js_escape(__('Text area', 'wpcf7')); ?>",
357
  menu: "<?php echo js_escape(__('Drop-down menu', 'wpcf7')); ?>",
358
+ checkboxes: "<?php echo js_escape(__('Checkboxes', 'wpcf7')); ?>",
359
+ radioButtons: "<?php echo js_escape(__('Radio buttons', 'wpcf7')); ?>",
360
  captcha: "<?php echo js_escape(__('CAPTCHA', 'wpcf7')); ?>",
361
  submit: "<?php echo js_escape(__('Submit button', 'wpcf7')); ?>",
362
  tagName: "<?php echo js_escape(__('Name', 'wpcf7')); ?>",
363
  isRequiredField: "<?php echo js_escape(__('Required field?', 'wpcf7')); ?>",
364
+ allowsMultipleSelections: "<?php echo js_escape(__('Allows multiple selections?', 'wpcf7')); ?>",
365
  menuChoices: "<?php echo js_escape(__('Choices', 'wpcf7')); ?>",
366
  label: "<?php echo js_escape(__('Label', 'wpcf7')); ?>",
367
  defaultValue: "<?php echo js_escape(__('Default value', 'wpcf7')); ?>",
553
  $url = parse_url($_SERVER['REQUEST_URI']);
554
  $url = $url['path'] . (empty($url['query']) ? '' : '?' . $url['query']) . '#' . $unit_tag;
555
 
556
+ $form .= '<form action="' . $url . '" method="post" class="wpcf7-form">';
557
  $form .= '<input type="hidden" name="_wpcf7" value="' . $id . '" />';
558
  $form .= '<input type="hidden" name="_wpcf7_unit_tag" value="' . $unit_tag . '" />';
559
  $form .= $this->form_elements($cf['form']);
597
  foreach ($fes as $fe) {
598
  $type = $fe['type'];
599
  $name = $fe['name'];
600
+ $values = $fe['values'];
601
+
602
+ // Before validation corrections
603
+ if (preg_match('/^(?:text|email)[*]?$/', $type))
604
+ $_POST[$name] = trim(strtr($_POST[$name], "\n", " "));
605
+
606
+ if (preg_match('/^(?:select|checkbox|radio)$/', $type)) {
607
+ if (! in_array($_POST[$name], $values)) // Not in given choices.
608
+ $_POST[$name] = '';
609
+ }
610
+
611
+ if (preg_match('/^(?:select|checkbox)[+]$/', $type)) {
612
+ $_POST[$name] = (array) $_POST[$name];
613
+ foreach ($_POST[$name] as $key => $value) {
614
+ if (! in_array($value, $values)) // Not in given choices.
615
+ unset($_POST[$name][$key]);
616
+ }
617
+ }
618
+
619
  // Required item (*)
620
  if (preg_match('/^(?:text|textarea)[*]$/', $type)) {
621
  if (empty($_POST[$name])) {
697
  /* Processing form element placeholders */
698
 
699
  function form_elements($form, $replace = true) {
700
+ $types = 'text[*]?|email[*]?|textarea[*]?|select[+]?|checkbox[+]?|radio|captchac|captchar';
701
+ $regex = '%\[\s*(' . $types . ')(\s+[a-zA-Z][0-9a-zA-Z:._-]*)([-0-9a-zA-Z:#_/\s]*)?((?:\s*(?:"[^"]*"|\'[^\']*\'))*)?\s*\]%';
702
  $submit_regex = '/\[\s*submit(\s+(?:"[^"]*"|\'[^\']*\'))?\s*\]/';
703
  if ($replace) {
704
  $form = preg_replace_callback($regex, array(&$this, 'form_element_replace_callback'), $form);
726
  }
727
 
728
  $atts = '';
729
+ $options = (array) $options;
730
+
731
+ $id_array = preg_grep('%^id:[-0-9a-zA-Z_]+$%', $options);
732
+ if ($id = array_shift($id_array)) {
733
+ preg_match('%^id:([-0-9a-zA-Z_]+)$%', $id, $id_matches);
734
+ if ($id = $id_matches[1])
735
+ $atts .= ' id="' . $id . '"';
736
+ }
737
+
738
+ $class_att = "";
739
+ $class_array = preg_grep('%^class:[-0-9a-zA-Z_]+$%', $options);
740
+ foreach ($class_array as $class) {
741
+ preg_match('%^class:([-0-9a-zA-Z_]+)$%', $class, $class_matches);
742
+ if ($class = $class_matches[1])
743
+ $class_att .= ' ' . $class;
744
+ }
745
+
746
+ if (preg_match('/^email[*]?$/', $type))
747
+ $class_att .= ' wpcf7-validates-as-email';
748
+ if (preg_match('/[*]$/', $type))
749
+ $class_att .= ' wpcf7-validates-as-required';
750
+
751
+ if ('checkbox' == $type)
752
+ $class_att .= ' wpcf7-checkbox';
753
+
754
+ if ('checkbox+' == $type)
755
+ $class_att .= ' wpcf7-checkbox-plus';
756
+
757
+ if ('radio' == $type)
758
+ $class_att .= ' wpcf7-radio';
759
+
760
+ if (preg_match('/^captchac$/', $type))
761
+ $class_att .= ' wpcf7-captcha-' . $name;
762
+
763
+ if ($class_att)
764
+ $atts .= ' class="' . trim($class_att) . '"';
765
 
766
  // Value.
767
  if ($this->processing_unit_tag == $_POST['_wpcf7_unit_tag']) {
775
  $value = $values[0];
776
  }
777
 
 
778
  switch ($type) {
779
  case 'text':
780
+ case 'text*':
781
  case 'email':
782
+ case 'email*':
783
  case 'captchar':
784
  if (is_array($options)) {
785
  $size_maxlength_array = preg_grep('%^[0-9]*[/x][0-9]*$%', $options);
796
  return $html;
797
  break;
798
  case 'textarea':
799
+ case 'textarea*':
800
  if (is_array($options)) {
801
  $cols_rows_array = preg_grep('%^[0-9]*[x/][0-9]*$%', $options);
802
  if ($cols_rows = array_shift($cols_rows_array)) {
812
  return $html;
813
  break;
814
  case 'select':
815
+ case 'select+':
816
+ $multiple = ('select+' == $type) ? true : false;
817
  if (empty($values))
818
  array_push($values, '---');
819
  $html = '';
820
  foreach ($values as $value) {
821
+ $selected = '';
822
+ if ($this->processing_unit_tag == $_POST['_wpcf7_unit_tag'] && (
823
+ $multiple && in_array($value, $_POST[$name]) ||
824
+ ! $multiple && $_POST[$name] == $value))
825
+ $selected = ' selected="selected"';
826
  $html .= '<option value="' . attribute_escape($value) . '"' . $selected . '>' . $value . '</option>';
827
  }
828
+
829
+ if ($multiple)
830
+ $atts .= ' multiple="multiple"';
831
+
832
+ $html = '<select name="' . $name . ($multiple ? '[]' : '') . '"' . $atts . '>' . $html . '</select>';
833
+ $html = '<span style="position: relative;">' . $html . $validation_error . '</span>';
834
+ return $html;
835
+ break;
836
+ case 'checkbox':
837
+ case 'checkbox+':
838
+ case 'radio':
839
+ $multiple = ('checkbox+' == $type) ? true : false;
840
+ $input_type = preg_replace('/[+]$/', '', $type);
841
+ $html = '';
842
+
843
+ if ('checkbox' == $type)
844
+ $input_class = ' class="exclusive"';
845
+
846
+ foreach ($values as $value) {
847
+ $checked = '';
848
+ if ($this->processing_unit_tag == $_POST['_wpcf7_unit_tag'] && (
849
+ $multiple && in_array($value, $_POST[$name]) ||
850
+ ! $multiple && $_POST[$name] == $value))
851
+ $checked = ' checked="checked"';
852
+ $item = '<input type="' . $input_type . '" name="' . $name . ($multiple ? '[]' : '') . '" value="' . attribute_escape($value) . '"' . $checked . $input_class . ' />';
853
+ $item .= '&nbsp;<span class="wpcf7-list-item-label">' . $value . '</span>';
854
+ $item = '<span class="wpcf7-list-item">' . $item . '</span>';
855
+ $html .= $item;
856
+ }
857
+
858
+ $html = '<span' . $atts . '>' . $html . '</span>';
859
  $html = '<span style="position: relative;">' . $html . $validation_error . '</span>';
860
  return $html;
861
  break;
wpcf7-admin.js CHANGED
@@ -93,12 +93,12 @@ function tagGenerator() {
93
  var dropdown = jQuery('<div class="tg-dropdown"></div>');
94
  dropdown.hide();
95
 
96
- jQuery.each([ 'textField', 'emailField', 'textArea', 'menu', 'captcha', 'submit' ], function(i, n) {
97
  var submenu = jQuery('<div>' + _wpcf7.l10n[n] + '</div>');
98
  submenu.css({
99
  margin: 0,
100
  padding: '0 4px',
101
- 'line-height': '200%',
102
  background: '#fff'
103
  });
104
  submenu.mouseover(function() {
@@ -146,7 +146,7 @@ function tgPane(pane, tagType) {
146
  });
147
  });
148
  tgInputs.tagName.css({ 'border-color': '#555' });
149
- jQuery.each([ 'isRequiredField', 'akismetAuthor', 'akismetAuthorEmail', 'akismetAuthorUrl',
150
  'imageSizeSmall', 'imageSizeMedium', 'imageSizeLarge' ], function(i, n) {
151
  tgInputs[n] = jQuery('<input type="checkbox" />');
152
  tgInputs[n].change(function() {
@@ -229,8 +229,16 @@ function tgPane(pane, tagType) {
229
  pane.append(jQuery('<div class="tg-tag">' + _wpcf7.l10n.generatedTag + '<br /></div>').append(tgInputs.tag1st));
230
  break;
231
  case 'menu':
 
 
232
  var table1 = jQuery('<table></table>');
233
  pane.append(table1);
 
 
 
 
 
 
234
  table1.append(tgTr(
235
  jQuery('<span>' + _wpcf7.l10n.tagName + '<br /></span>').append(tgInputs.tagName),
236
  jQuery('<span></span>')
@@ -434,7 +442,18 @@ function tgCreateTag(tagType, tgInputs, trigger) {
434
  tgInputs.tag1st.val(tag);
435
  break;
436
  case 'menu':
437
- var type = 'select';
 
 
 
 
 
 
 
 
 
 
 
438
  var name = tgInputs.tagName.val();
439
  var options = [];
440
  if (tgInputs.tagId.val())
@@ -512,6 +531,10 @@ function tgDefaultName(tagType) {
512
  return 'textarea-' + rand;
513
  } else if ('menu' == tagType) {
514
  return 'menu-' + rand;
 
 
 
 
515
  } else if ('captcha' == tagType) {
516
  return 'captcha-' + rand;
517
  }
93
  var dropdown = jQuery('<div class="tg-dropdown"></div>');
94
  dropdown.hide();
95
 
96
+ jQuery.each([ 'textField', 'emailField', 'textArea', 'menu', 'checkboxes', 'radioButtons', 'captcha', 'submit' ], function(i, n) {
97
  var submenu = jQuery('<div>' + _wpcf7.l10n[n] + '</div>');
98
  submenu.css({
99
  margin: 0,
100
  padding: '0 4px',
101
+ 'line-height': '180%',
102
  background: '#fff'
103
  });
104
  submenu.mouseover(function() {
146
  });
147
  });
148
  tgInputs.tagName.css({ 'border-color': '#555' });
149
+ jQuery.each([ 'isRequiredField', 'allowsMultipleSelections', 'akismetAuthor', 'akismetAuthorEmail', 'akismetAuthorUrl',
150
  'imageSizeSmall', 'imageSizeMedium', 'imageSizeLarge' ], function(i, n) {
151
  tgInputs[n] = jQuery('<input type="checkbox" />');
152
  tgInputs[n].change(function() {
229
  pane.append(jQuery('<div class="tg-tag">' + _wpcf7.l10n.generatedTag + '<br /></div>').append(tgInputs.tag1st));
230
  break;
231
  case 'menu':
232
+ case 'checkboxes':
233
+ case 'radioButtons':
234
  var table1 = jQuery('<table></table>');
235
  pane.append(table1);
236
+
237
+ if ('radioButtons' != tagType)
238
+ table1.append(tgTr(
239
+ jQuery('<span>&nbsp;' + _wpcf7.l10n.allowsMultipleSelections + '</span>').prepend(tgInputs.allowsMultipleSelections)
240
+ ));
241
+
242
  table1.append(tgTr(
243
  jQuery('<span>' + _wpcf7.l10n.tagName + '<br /></span>').append(tgInputs.tagName),
244
  jQuery('<span></span>')
442
  tgInputs.tag1st.val(tag);
443
  break;
444
  case 'menu':
445
+ case 'checkboxes':
446
+ case 'radioButtons':
447
+ var type = '';
448
+ if ('menu' == tagType)
449
+ type = 'select';
450
+ else if ('checkboxes' == tagType)
451
+ type = 'checkbox';
452
+ else if ('radioButtons' == tagType)
453
+ type = 'radio';
454
+ if (tgInputs.allowsMultipleSelections.is(':checked'))
455
+ type += '+';
456
+
457
  var name = tgInputs.tagName.val();
458
  var options = [];
459
  if (tgInputs.tagId.val())
531
  return 'textarea-' + rand;
532
  } else if ('menu' == tagType) {
533
  return 'menu-' + rand;
534
+ } else if ('checkboxes' == tagType) {
535
+ return 'checkbox-' + rand;
536
+ } else if ('radioButtons' == tagType) {
537
+ return 'radio-' + rand;
538
  } else if ('captcha' == tagType) {
539
  return 'captcha-' + rand;
540
  }