MW WP Form - Version 1.6.0

Version Description

  • Changed : Changed Redirection flow.
  • Changed : If querystring setting is set and doesn't get post from querystring, return empty.
  • Changed : When a URL doesn't begin http or https in URL settings, home_url() is complemented.
  • Added : {xxx} ( e.g. {post_title} ) get post property from the now post if querystring setting does't set.
  • Added : Repeat submitting came to be blocked.
  • Bug fix : Fixed translation mistake in admin page.
  • Bug fix : Fixed selected file reset button bug on file field.
  • Bug fix : Fixed bug that not to work rightly when setting noempty validation in image or file field.
Download this release

Release Info

Developer inc2734
Plugin Icon wp plugin MW WP Form
Version 1.6.0
Comparing to
See all releases

Code changes from version 1.5.6 to 1.6.0

form_fields/mw_form_field_back_button.php CHANGED
@@ -74,7 +74,7 @@ class mw_form_field_back_button extends mw_form_field {
74
  public function mwform_tag_generator_dialog() {
75
  ?>
76
  <p>
77
- <strong><?php _e( 'String on the button', MWF_Config::DOMAIN ); ?>(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
78
  <input type="text" name="value" />
79
  </p>
80
  <?php
74
  public function mwform_tag_generator_dialog() {
75
  ?>
76
  <p>
77
+ <strong><?php esc_html_e( 'String on the button', MWF_Config::DOMAIN ); ?>(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
78
  <input type="text" name="value" />
79
  </p>
80
  <?php
form_fields/mw_form_field_button.php CHANGED
@@ -80,7 +80,7 @@ class mw_form_field_button extends mw_form_field {
80
  <input type="text" name="name" />
81
  </p>
82
  <p>
83
- <strong><?php _e( 'String on the button', MWF_Config::DOMAIN ); ?>(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
84
  <input type="text" name="value" />
85
  </p>
86
  <?php
80
  <input type="text" name="name" />
81
  </p>
82
  <p>
83
+ <strong><?php esc_html_e( 'String on the button', MWF_Config::DOMAIN ); ?>(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
84
  <input type="text" name="value" />
85
  </p>
86
  <?php
form_fields/mw_form_field_checkbox.php CHANGED
@@ -96,23 +96,23 @@ class mw_form_field_checkbox extends mw_form_field {
96
  <input type="text" name="name" />
97
  </p>
98
  <p>
99
- <strong>id(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
100
  <input type="text" name="id" />
101
  </p>
102
  <p>
103
- <strong><?php _e( 'Choices', MWF_Config::DOMAIN ); ?>(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
104
  <textarea name="children"></textarea>
105
  <span class="mwf_note">
106
- <?php _e( 'Input one line about one item.', MWF_Config::DOMAIN ); ?>
107
  </span>
108
  </p>
109
  <p>
110
- <strong><?php _e( 'Default value', MWF_Config::DOMAIN ); ?>(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
111
  <input type="text" name="value" />
112
  </p>
113
  <p>
114
- <strong><?php _e( 'Dsiplay error', MWF_Config::DOMAIN ); ?></strong>
115
- <input type="checkbox" name="show_error" value="false" /> <?php _e( 'Don\'t display error.', MWF_Config::DOMAIN ); ?>
116
  </p>
117
  <?php
118
  }
96
  <input type="text" name="name" />
97
  </p>
98
  <p>
99
+ <strong>id(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
100
  <input type="text" name="id" />
101
  </p>
102
  <p>
103
+ <strong><?php esc_html_e( 'Choices', MWF_Config::DOMAIN ); ?>(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
104
  <textarea name="children"></textarea>
105
  <span class="mwf_note">
106
+ <?php esc_html_e( 'Input one line about one item.', MWF_Config::DOMAIN ); ?>
107
  </span>
108
  </p>
109
  <p>
110
+ <strong><?php esc_html_e( 'Default value', MWF_Config::DOMAIN ); ?>(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
111
  <input type="text" name="value" />
112
  </p>
113
  <p>
114
+ <strong><?php esc_html_e( 'Dsiplay error', MWF_Config::DOMAIN ); ?></strong>
115
+ <input type="checkbox" name="show_error" value="false" /> <?php esc_html_e( 'Don\'t display error.', MWF_Config::DOMAIN ); ?>
116
  </p>
117
  <?php
118
  }
form_fields/mw_form_field_confirm_button.php CHANGED
@@ -74,7 +74,7 @@ class mw_form_field_confirm_button extends mw_form_field {
74
  public function mwform_tag_generator_dialog() {
75
  ?>
76
  <p>
77
- <strong><?php _e( 'Default value', MWF_Config::DOMAIN ); ?>(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
78
  <input type="text" name="value" />
79
  </p>
80
  <?php
74
  public function mwform_tag_generator_dialog() {
75
  ?>
76
  <p>
77
+ <strong><?php esc_html_e( 'Default value', MWF_Config::DOMAIN ); ?>(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
78
  <input type="text" name="value" />
79
  </p>
80
  <?php
form_fields/mw_form_field_datepicker.php CHANGED
@@ -118,24 +118,24 @@ class mw_form_field_datepicker extends mw_form_field {
118
  <input type="text" name="name" />
119
  </p>
120
  <p>
121
- <strong>id(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
122
  <input type="text" name="id" />
123
  </p>
124
  <p>
125
- <strong>size(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
126
  <input type="text" name="size" />
127
  </p>
128
  <p>
129
- <strong>JavaScript(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
130
  <input type="text" name="js" />
131
  </p>
132
  <p>
133
- <strong><?php _e( 'Default value', MWF_Config::DOMAIN ); ?>(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
134
  <input type="text" name="value" />
135
  </p>
136
  <p>
137
- <strong><?php _e( 'Dsiplay error', MWF_Config::DOMAIN ); ?></strong>
138
- <input type="checkbox" name="show_error" value="false" /> <?php _e( 'Don\'t display error.', MWF_Config::DOMAIN ); ?>
139
  </p>
140
  <?php
141
  }
118
  <input type="text" name="name" />
119
  </p>
120
  <p>
121
+ <strong>id(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
122
  <input type="text" name="id" />
123
  </p>
124
  <p>
125
+ <strong>size(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
126
  <input type="text" name="size" />
127
  </p>
128
  <p>
129
+ <strong>JavaScript(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
130
  <input type="text" name="js" />
131
  </p>
132
  <p>
133
+ <strong><?php esc_html_e( 'Default value', MWF_Config::DOMAIN ); ?>(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
134
  <input type="text" name="value" />
135
  </p>
136
  <p>
137
+ <strong><?php esc_html_e( 'Dsiplay error', MWF_Config::DOMAIN ); ?></strong>
138
+ <input type="checkbox" name="show_error" value="false" /> <?php esc_html_e( 'Don\'t display error.', MWF_Config::DOMAIN ); ?>
139
  </p>
140
  <?php
141
  }
form_fields/mw_form_field_error.php CHANGED
@@ -79,10 +79,10 @@ class mw_form_field_error extends mw_form_field {
79
  public function mwform_tag_generator_dialog() {
80
  ?>
81
  <p>
82
- <strong><?php _e( 'name of the element which wants to display error', MWF_Config::DOMAIN ); ?></strong>
83
  <textarea name="keys"></textarea>
84
  <span class="mwf_note">
85
- <?php _e( 'Input one line about one item.', MWF_Config::DOMAIN ); ?>
86
  </span>
87
  </p>
88
  <?php
79
  public function mwform_tag_generator_dialog() {
80
  ?>
81
  <p>
82
+ <strong><?php esc_html_e( 'name of the element which wants to display error', MWF_Config::DOMAIN ); ?></strong>
83
  <textarea name="keys"></textarea>
84
  <span class="mwf_note">
85
+ <?php esc_html_e( 'Input one line about one item.', MWF_Config::DOMAIN ); ?>
86
  </span>
87
  </p>
88
  <?php
form_fields/mw_form_field_file.php CHANGED
@@ -109,16 +109,16 @@ class mw_form_field_file extends mw_form_field {
109
  <input type="text" name="name" />
110
  </p>
111
  <p>
112
- <strong>id(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
113
  <input type="text" name="id" />
114
  </p>
115
  <p>
116
- <strong>size(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
117
  <input type="text" name="size" />
118
  </p>
119
  <p>
120
- <strong><?php _e( 'Dsiplay error', MWF_Config::DOMAIN ); ?></strong>
121
- <input type="checkbox" name="show_error" value="false" /> <?php _e( 'Don\'t display error.', MWF_Config::DOMAIN ); ?>
122
  </p>
123
  <?php
124
  }
109
  <input type="text" name="name" />
110
  </p>
111
  <p>
112
+ <strong>id(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
113
  <input type="text" name="id" />
114
  </p>
115
  <p>
116
+ <strong>size(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
117
  <input type="text" name="size" />
118
  </p>
119
  <p>
120
+ <strong><?php esc_html_e( 'Dsiplay error', MWF_Config::DOMAIN ); ?></strong>
121
+ <input type="checkbox" name="show_error" value="false" /> <?php esc_html_e( 'Don\'t display error.', MWF_Config::DOMAIN ); ?>
122
  </p>
123
  <?php
124
  }
form_fields/mw_form_field_hidden.php CHANGED
@@ -90,12 +90,12 @@ class mw_form_field_hidden extends mw_form_field {
90
  <input type="text" name="name" />
91
  </p>
92
  <p>
93
- <strong><?php _e( 'Default value', MWF_Config::DOMAIN ); ?>(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
94
  <input type="text" name="value" />
95
  </p>
96
  <p>
97
- <strong><?php _e( 'Display', MWF_Config::DOMAIN ); ?></strong>
98
- <input type="checkbox" name="echo" value="true" /> <?php _e( 'Display hidden value.', MWF_Config::DOMAIN ); ?>
99
  </p>
100
  <?php
101
  }
90
  <input type="text" name="name" />
91
  </p>
92
  <p>
93
+ <strong><?php esc_html_e( 'Default value', MWF_Config::DOMAIN ); ?>(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
94
  <input type="text" name="value" />
95
  </p>
96
  <p>
97
+ <strong><?php esc_html_e( 'Display', MWF_Config::DOMAIN ); ?></strong>
98
+ <input type="checkbox" name="echo" value="true" /> <?php esc_html_e( 'Display hidden value.', MWF_Config::DOMAIN ); ?>
99
  </p>
100
  <?php
101
  }
form_fields/mw_form_field_image.php CHANGED
@@ -110,16 +110,16 @@ class mw_form_field_image extends mw_form_field {
110
  <input type="text" name="name" />
111
  </p>
112
  <p>
113
- <strong>id(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
114
  <input type="text" name="id" />
115
  </p>
116
  <p>
117
- <strong>size(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
118
  <input type="text" name="size" />
119
  </p>
120
  <p>
121
- <strong><?php _e( 'Dsiplay error', MWF_Config::DOMAIN ); ?></strong>
122
- <input type="checkbox" name="show_error" value="false" /> <?php _e( 'Don\'t display error.', MWF_Config::DOMAIN ); ?>
123
  </p>
124
  <?php
125
  }
110
  <input type="text" name="name" />
111
  </p>
112
  <p>
113
+ <strong>id(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
114
  <input type="text" name="id" />
115
  </p>
116
  <p>
117
+ <strong>size(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
118
  <input type="text" name="size" />
119
  </p>
120
  <p>
121
+ <strong><?php esc_html_e( 'Dsiplay error', MWF_Config::DOMAIN ); ?></strong>
122
+ <input type="checkbox" name="show_error" value="false" /> <?php esc_html_e( 'Don\'t display error.', MWF_Config::DOMAIN ); ?>
123
  </p>
124
  <?php
125
  }
form_fields/mw_form_field_password.php CHANGED
@@ -95,28 +95,28 @@ class mw_form_field_password extends mw_form_field {
95
  <input type="text" name="name" />
96
  </p>
97
  <p>
98
- <strong>id(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
99
  <input type="text" name="id" />
100
  </p>
101
  <p>
102
- <strong>size(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
103
  <input type="text" name="size" />
104
  </p>
105
  <p>
106
- <strong>maxlength(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
107
  <input type="text" name="maxlength" />
108
  </p>
109
  <p>
110
- <strong><?php _e( 'Default value', MWF_Config::DOMAIN ); ?>(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
111
  <input type="text" name="value" />
112
  </p>
113
  <p>
114
- <strong>placeholder(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
115
  <input type="text" name="placeholder" />
116
  </p>
117
  <p>
118
- <strong><?php _e( 'Dsiplay error', MWF_Config::DOMAIN ); ?></strong>
119
- <input type="checkbox" name="show_error" value="false" /> <?php _e( 'Don\'t display error.', MWF_Config::DOMAIN ); ?>
120
  </p>
121
  <?php
122
  }
95
  <input type="text" name="name" />
96
  </p>
97
  <p>
98
+ <strong>id(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
99
  <input type="text" name="id" />
100
  </p>
101
  <p>
102
+ <strong>size(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
103
  <input type="text" name="size" />
104
  </p>
105
  <p>
106
+ <strong>maxlength(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
107
  <input type="text" name="maxlength" />
108
  </p>
109
  <p>
110
+ <strong><?php esc_html_e( 'Default value', MWF_Config::DOMAIN ); ?>(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
111
  <input type="text" name="value" />
112
  </p>
113
  <p>
114
+ <strong>placeholder(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
115
  <input type="text" name="placeholder" />
116
  </p>
117
  <p>
118
+ <strong><?php esc_html_e( 'Dsiplay error', MWF_Config::DOMAIN ); ?></strong>
119
+ <input type="checkbox" name="show_error" value="false" /> <?php esc_html_e( 'Don\'t display error.', MWF_Config::DOMAIN ); ?>
120
  </p>
121
  <?php
122
  }
form_fields/mw_form_field_radio.php CHANGED
@@ -94,23 +94,23 @@ class mw_form_field_radio extends mw_form_field {
94
  <input type="text" name="name" />
95
  </p>
96
  <p>
97
- <strong>id(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
98
  <input type="text" name="id" />
99
  </p>
100
  <p>
101
- <strong><?php _e( 'Choices', MWF_Config::DOMAIN ); ?>(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
102
  <textarea name="children"></textarea>
103
  <span class="mwf_note">
104
- <?php _e( 'Input one line about one item.', MWF_Config::DOMAIN ); ?>
105
  </span>
106
  </p>
107
  <p>
108
- <strong><?php _e( 'Default value', MWF_Config::DOMAIN ); ?>(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
109
  <input type="text" name="value" />
110
  </p>
111
  <p>
112
- <strong><?php _e( 'Dsiplay error', MWF_Config::DOMAIN ); ?></strong>
113
- <input type="checkbox" name="show_error" value="false" /> <?php _e( 'Don\'t display error.', MWF_Config::DOMAIN ); ?>
114
  </p>
115
  <?php
116
  }
94
  <input type="text" name="name" />
95
  </p>
96
  <p>
97
+ <strong>id(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
98
  <input type="text" name="id" />
99
  </p>
100
  <p>
101
+ <strong><?php esc_html_e( 'Choices', MWF_Config::DOMAIN ); ?>(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
102
  <textarea name="children"></textarea>
103
  <span class="mwf_note">
104
+ <?php esc_html_e( 'Input one line about one item.', MWF_Config::DOMAIN ); ?>
105
  </span>
106
  </p>
107
  <p>
108
+ <strong><?php esc_html_e( 'Default value', MWF_Config::DOMAIN ); ?>(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
109
  <input type="text" name="value" />
110
  </p>
111
  <p>
112
+ <strong><?php esc_html_e( 'Dsiplay error', MWF_Config::DOMAIN ); ?></strong>
113
+ <input type="checkbox" name="show_error" value="false" /> <?php esc_html_e( 'Don\'t display error.', MWF_Config::DOMAIN ); ?>
114
  </p>
115
  <?php
116
  }
form_fields/mw_form_field_select.php CHANGED
@@ -94,23 +94,23 @@ class mw_form_field_select extends mw_form_field {
94
  <input type="text" name="name" />
95
  </p>
96
  <p>
97
- <strong>id(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
98
  <input type="text" name="id" />
99
  </p>
100
  <p>
101
- <strong><?php _e( 'Choices', MWF_Config::DOMAIN ); ?>(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
102
  <textarea name="children"></textarea>
103
  <span class="mwf_note">
104
- <?php _e( 'Input one line about one item.', MWF_Config::DOMAIN ); ?>
105
  </span>
106
  </p>
107
  <p>
108
- <strong><?php _e( 'Default value', MWF_Config::DOMAIN ); ?>(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
109
  <input type="text" name="value" />
110
  </p>
111
  <p>
112
- <strong><?php _e( 'Dsiplay error', MWF_Config::DOMAIN ); ?></strong>
113
- <input type="checkbox" name="show_error" value="false" /> <?php _e( 'Don\'t display error.', MWF_Config::DOMAIN ); ?>
114
  </p>
115
  <?php
116
  }
94
  <input type="text" name="name" />
95
  </p>
96
  <p>
97
+ <strong>id(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
98
  <input type="text" name="id" />
99
  </p>
100
  <p>
101
+ <strong><?php esc_html_e( 'Choices', MWF_Config::DOMAIN ); ?>(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
102
  <textarea name="children"></textarea>
103
  <span class="mwf_note">
104
+ <?php esc_html_e( 'Input one line about one item.', MWF_Config::DOMAIN ); ?>
105
  </span>
106
  </p>
107
  <p>
108
+ <strong><?php esc_html_e( 'Default value', MWF_Config::DOMAIN ); ?>(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
109
  <input type="text" name="value" />
110
  </p>
111
  <p>
112
+ <strong><?php esc_html_e( 'Dsiplay error', MWF_Config::DOMAIN ); ?></strong>
113
+ <input type="checkbox" name="show_error" value="false" /> <?php esc_html_e( 'Don\'t display error.', MWF_Config::DOMAIN ); ?>
114
  </p>
115
  <?php
116
  }
form_fields/mw_form_field_submit.php CHANGED
@@ -80,7 +80,7 @@ class mw_form_field_submit extends mw_form_field {
80
  <input type="text" name="name" />
81
  </p>
82
  <p>
83
- <strong><?php _e( 'String on the button', MWF_Config::DOMAIN ); ?>(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
84
  <input type="text" name="value" />
85
  </p>
86
  <?php
80
  <input type="text" name="name" />
81
  </p>
82
  <p>
83
+ <strong><?php esc_html_e( 'String on the button', MWF_Config::DOMAIN ); ?>(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
84
  <input type="text" name="value" />
85
  </p>
86
  <?php
form_fields/mw_form_field_submit_button.php CHANGED
@@ -85,11 +85,11 @@ class mw_form_field_submit_button extends mw_form_field {
85
  <input type="text" name="name" />
86
  </p>
87
  <p>
88
- <strong><?php _e( 'String on the confirm button', MWF_Config::DOMAIN ); ?></strong>
89
  <input type="text" name="confirm_value" />
90
  </p>
91
  <p>
92
- <strong><?php _e( 'String on the submit button', MWF_Config::DOMAIN ); ?></strong>
93
  <input type="text" name="submit_value" />
94
  </p>
95
  <?php
85
  <input type="text" name="name" />
86
  </p>
87
  <p>
88
+ <strong><?php esc_html_e( 'String on the confirm button', MWF_Config::DOMAIN ); ?></strong>
89
  <input type="text" name="confirm_value" />
90
  </p>
91
  <p>
92
+ <strong><?php esc_html_e( 'String on the submit button', MWF_Config::DOMAIN ); ?></strong>
93
  <input type="text" name="submit_value" />
94
  </p>
95
  <?php
form_fields/mw_form_field_tel.php CHANGED
@@ -92,12 +92,12 @@ class mw_form_field_tel extends mw_form_field {
92
  <input type="text" name="name" />
93
  </p>
94
  <p>
95
- <strong><?php _e( 'Dsiplay error', MWF_Config::DOMAIN ); ?></strong>
96
- <input type="checkbox" name="show_error" value="false" /> <?php _e( 'Don\'t display error.', MWF_Config::DOMAIN ); ?>
97
  </p>
98
  <p>
99
- <strong><?php _e( 'Convert half alphanumeric', MWF_Config::DOMAIN ); ?></strong>
100
- <input type="checkbox" name="conv_half_alphanumeric" value="false" /> <?php _e( 'Don\'t Convert.', MWF_Config::DOMAIN ); ?>
101
  </p>
102
  <?php
103
  }
92
  <input type="text" name="name" />
93
  </p>
94
  <p>
95
+ <strong><?php esc_html_e( 'Dsiplay error', MWF_Config::DOMAIN ); ?></strong>
96
+ <input type="checkbox" name="show_error" value="false" /> <?php esc_html_e( 'Don\'t display error.', MWF_Config::DOMAIN ); ?>
97
  </p>
98
  <p>
99
+ <strong><?php esc_html_e( 'Convert half alphanumeric', MWF_Config::DOMAIN ); ?></strong>
100
+ <input type="checkbox" name="conv_half_alphanumeric" value="false" /> <?php esc_html_e( 'Don\'t Convert.', MWF_Config::DOMAIN ); ?>
101
  </p>
102
  <?php
103
  }
form_fields/mw_form_field_text.php CHANGED
@@ -103,32 +103,32 @@ class mw_form_field_text extends mw_form_field {
103
  <input type="text" name="name" />
104
  </p>
105
  <p>
106
- <strong>id(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
107
  <input type="text" name="id" />
108
  </p>
109
  <p>
110
- <strong>size(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
111
  <input type="text" name="size" />
112
  </p>
113
  <p>
114
- <strong>maxlength(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
115
  <input type="text" name="maxlength" />
116
  </p>
117
  <p>
118
- <strong><?php _e( 'Default value', MWF_Config::DOMAIN ); ?>(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
119
  <input type="text" name="value" />
120
  </p>
121
  <p>
122
- <strong>placeholder(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
123
  <input type="text" name="placeholder" />
124
  </p>
125
  <p>
126
- <strong><?php _e( 'Dsiplay error', MWF_Config::DOMAIN ); ?></strong>
127
- <input type="checkbox" name="show_error" value="false" /> <?php _e( 'Don\'t display error.', MWF_Config::DOMAIN ); ?>
128
  </p>
129
  <p>
130
- <strong><?php _e( 'Convert half alphanumeric', MWF_Config::DOMAIN ); ?></strong>
131
- <input type="checkbox" name="conv_half_alphanumeric" value="true" /> <?php _e( 'Convert.', MWF_Config::DOMAIN ); ?>
132
  </p>
133
  <?php
134
  }
103
  <input type="text" name="name" />
104
  </p>
105
  <p>
106
+ <strong>id(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
107
  <input type="text" name="id" />
108
  </p>
109
  <p>
110
+ <strong>size(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
111
  <input type="text" name="size" />
112
  </p>
113
  <p>
114
+ <strong>maxlength(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
115
  <input type="text" name="maxlength" />
116
  </p>
117
  <p>
118
+ <strong><?php esc_html_e( 'Default value', MWF_Config::DOMAIN ); ?>(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
119
  <input type="text" name="value" />
120
  </p>
121
  <p>
122
+ <strong>placeholder(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
123
  <input type="text" name="placeholder" />
124
  </p>
125
  <p>
126
+ <strong><?php esc_html_e( 'Dsiplay error', MWF_Config::DOMAIN ); ?></strong>
127
+ <input type="checkbox" name="show_error" value="false" /> <?php esc_html_e( 'Don\'t display error.', MWF_Config::DOMAIN ); ?>
128
  </p>
129
  <p>
130
+ <strong><?php esc_html_e( 'Convert half alphanumeric', MWF_Config::DOMAIN ); ?></strong>
131
+ <input type="checkbox" name="conv_half_alphanumeric" value="true" /> <?php esc_html_e( 'Convert.', MWF_Config::DOMAIN ); ?>
132
  </p>
133
  <?php
134
  }
form_fields/mw_form_field_textarea.php CHANGED
@@ -97,28 +97,28 @@ class mw_form_field_textarea extends mw_form_field {
97
  <input type="text" name="name" />
98
  </p>
99
  <p>
100
- <strong>id(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
101
  <input type="text" name="id" />
102
  </p>
103
  <p>
104
- <strong>cols(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
105
  <input type="text" name="cols" />
106
  </p>
107
  <p>
108
- <strong>rows(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
109
  <input type="text" name="rows" />
110
  </p>
111
  <p>
112
- <strong><?php _e( 'Default value', MWF_Config::DOMAIN ); ?>(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
113
  <input type="text" name="value" />
114
  </p>
115
  <p>
116
- <strong>placeholder(<?php _e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
117
  <input type="text" name="placeholder" />
118
  </p>
119
  <p>
120
- <strong><?php _e( 'Dsiplay error', MWF_Config::DOMAIN ); ?></strong>
121
- <input type="checkbox" name="show_error" value="false" /> <?php _e( 'Don\'t display error.', MWF_Config::DOMAIN ); ?>
122
  </p>
123
  <?php
124
  }
97
  <input type="text" name="name" />
98
  </p>
99
  <p>
100
+ <strong>id(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
101
  <input type="text" name="id" />
102
  </p>
103
  <p>
104
+ <strong>cols(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
105
  <input type="text" name="cols" />
106
  </p>
107
  <p>
108
+ <strong>rows(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
109
  <input type="text" name="rows" />
110
  </p>
111
  <p>
112
+ <strong><?php esc_html_e( 'Default value', MWF_Config::DOMAIN ); ?>(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
113
  <input type="text" name="value" />
114
  </p>
115
  <p>
116
+ <strong>placeholder(<?php esc_html_e( 'option', MWF_Config::DOMAIN ); ?>)</strong>
117
  <input type="text" name="placeholder" />
118
  </p>
119
  <p>
120
+ <strong><?php esc_html_e( 'Dsiplay error', MWF_Config::DOMAIN ); ?></strong>
121
+ <input type="checkbox" name="show_error" value="false" /> <?php esc_html_e( 'Don\'t display error.', MWF_Config::DOMAIN ); ?>
122
  </p>
123
  <?php
124
  }
form_fields/mw_form_field_zip.php CHANGED
@@ -92,12 +92,12 @@ class mw_form_field_zip extends mw_form_field {
92
  <input type="text" name="name" /></td>
93
  </p>
94
  <p>
95
- <strong><?php _e( 'Dsiplay error', MWF_Config::DOMAIN ); ?></strong>
96
- <input type="checkbox" name="show_error" value="false" /> <?php _e( 'Don\'t display error.', MWF_Config::DOMAIN ); ?>
97
  </p>
98
  <p>
99
- <strong><?php _e( 'Convert half alphanumeric', MWF_Config::DOMAIN ); ?></strong>
100
- <input type="checkbox" name="conv_half_alphanumeric" value="false" /> <?php _e( 'Don\'t Convert.', MWF_Config::DOMAIN ); ?>
101
  </p>
102
  <?php
103
  }
92
  <input type="text" name="name" /></td>
93
  </p>
94
  <p>
95
+ <strong><?php esc_html_e( 'Dsiplay error', MWF_Config::DOMAIN ); ?></strong>
96
+ <input type="checkbox" name="show_error" value="false" /> <?php esc_html_e( 'Don\'t display error.', MWF_Config::DOMAIN ); ?>
97
  </p>
98
  <p>
99
+ <strong><?php esc_html_e( 'Convert half alphanumeric', MWF_Config::DOMAIN ); ?></strong>
100
+ <input type="checkbox" name="conv_half_alphanumeric" value="false" /> <?php esc_html_e( 'Don\'t Convert.', MWF_Config::DOMAIN ); ?>
101
  </p>
102
  <?php
103
  }
js/form.js CHANGED
@@ -21,9 +21,9 @@ jQuery( function( $ ) {
21
  $( this ).css( 'visibility', 'hidden' );
22
  file_field.replaceWith( new_field );
23
 
24
- var img = $( 'img[src="' + hidden_field.val() + '"]' );
25
- hidden_field.remove();
26
- img.remove();
27
  } );
28
  } );
29
  $( document ).on( 'change', '.mw_wp_form input[type="file"]', function() {
@@ -31,5 +31,13 @@ jQuery( function( $ ) {
31
  file_delete.closest( '[data-mwform-file-delete="' + name + '"]' ).css( 'visibility', 'visible' );
32
  } );
33
 
 
 
 
 
 
 
 
 
34
  } );
35
 
21
  $( this ).css( 'visibility', 'hidden' );
22
  file_field.replaceWith( new_field );
23
 
24
+ hidden_field.parent().fadeOut( 100, function() {
25
+ $( this ).remove();
26
+ } );
27
  } );
28
  } );
29
  $( document ).on( 'change', '.mw_wp_form input[type="file"]', function() {
31
  file_delete.closest( '[data-mwform-file-delete="' + name + '"]' ).css( 'visibility', 'visible' );
32
  } );
33
 
34
+ var mw_wp_form_button_no_click = true;
35
+ $( '.mw_wp_form input[type="submit"]' ).click( function() {
36
+ if ( mw_wp_form_button_no_click ) {
37
+ mw_wp_form_button_no_click = false;
38
+ } else {
39
+ $( this ).prop( 'disabled', true );
40
+ }
41
+ } );
42
  } );
43
 
languages/mw-wp-form-ja.mo CHANGED
Binary file
languages/mw-wp-form-ja.po CHANGED
@@ -2,10 +2,10 @@
2
  # This file is distributed under the same license as the MW WP Form package.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: MW WP Form 1.5.4\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/mw-wp-form\n"
7
- "POT-Creation-Date: 2014-04-16 15:48:24+00:00\n"
8
- "PO-Revision-Date: 2014-04-17 00:49+0900\n"
9
  "Last-Translator: Takashi Kitajima <inc@2inc.org>\n"
10
  "Language-Team: Takashi Kitajima <inc@2inc.org>\n"
11
  "Language: ja\n"
@@ -15,7 +15,7 @@ msgstr ""
15
  "Plural-Forms: nplurals=1; plural=0;\n"
16
  "X-Poedit-SourceCharset: UTF-8\n"
17
  "X-Poedit-Basepath: .\n"
18
- "X-Generator: Poedit 1.6.4\n"
19
  "X-Poedit-KeywordsList: __;_e;_x\n"
20
  "X-Poedit-SearchPath-0: ..\n"
21
 
@@ -211,7 +211,7 @@ msgstr "確認ボタンに表示する文字列"
211
  msgid "String on the submit button"
212
  msgstr "送信ボタンに表示する文字列"
213
 
214
- #: form_fields/mw_form_field_tel.php:38 system/mw_wp_form_admin_page.php:518
215
  msgid "Tel"
216
  msgstr "電話番号"
217
 
@@ -236,87 +236,87 @@ msgstr "変換する"
236
  msgid "Textarea"
237
  msgstr "テキストエリア"
238
 
239
- #: form_fields/mw_form_field_zip.php:38 system/mw_wp_form_admin_page.php:517
240
  msgid "Zip Code"
241
  msgstr "郵便番号"
242
 
243
- #: mw-wp-form.php:420
244
  msgid "Validation Object is not a MW Validation Class."
245
  msgstr ""
246
 
247
- #: system/mw_validation.php:80
248
  msgid "This is required."
249
  msgstr "必須項目です。"
250
 
251
- #: system/mw_validation.php:97 system/mw_validation.php:115
252
  msgid "Please enter."
253
  msgstr "未入力です。"
254
 
255
- #: system/mw_validation.php:137
256
  msgid "Please enter with a half-width alphabetic character."
257
  msgstr "半角英字で入力してください。"
258
 
259
- #: system/mw_validation.php:160
260
  msgid "Please enter with a half-width number."
261
  msgstr "半角数字で入力してください。"
262
 
263
- #: system/mw_validation.php:183
264
  msgid "Please enter with a half-width alphanumeric character."
265
  msgstr "半角英数字で入力してください。"
266
 
267
- #: system/mw_validation.php:206
268
  msgid "Please enter with a Japanese Katakana."
269
  msgstr "カタカナで入力してください。"
270
 
271
- #: system/mw_validation.php:229
272
  msgid "Please enter with a Japanese Hiragana."
273
  msgstr "ひらがなで入力してください。"
274
 
275
- #: system/mw_validation.php:248
276
  msgid "This is not the format of a zip code."
277
  msgstr "郵便番号の形式ではありません。"
278
 
279
- #: system/mw_validation.php:271
280
  msgid "This is not the format of a tel number."
281
  msgstr "電話番号の形式ではありません。"
282
 
283
- #: system/mw_validation.php:304
284
  msgid "This is not the format of a mail address."
285
  msgstr "メールアドレスの形式ではありません。"
286
 
287
- #: system/mw_validation.php:327
288
  msgid "This is not the format of a url."
289
  msgstr "URLの形式ではありません。"
290
 
291
- #: system/mw_validation.php:347
292
  msgid "This is not in agreement."
293
  msgstr "一致しません。"
294
 
295
- #: system/mw_validation.php:373
296
  msgid "The number of characters is invalid."
297
  msgstr "文字数が正しくありません。"
298
 
299
- #: system/mw_validation.php:410
300
  msgid "The number of characters is a few."
301
  msgstr "文字数が足りません。"
302
 
303
- #: system/mw_validation.php:435
304
  msgid "This value is invalid."
305
  msgstr "値が不正です。"
306
 
307
- #: system/mw_validation.php:458
308
  msgid "This is not the format of a date."
309
  msgstr "日付の形式ではありません。"
310
 
311
- #: system/mw_validation.php:487
312
  msgid "This file is invalid."
313
  msgstr "許可されたファイルではありません。"
314
 
315
- #: system/mw_validation.php:516
316
  msgid "This file size is too big."
317
  msgstr "ファイルサイズが大きすぎます。"
318
 
319
- #: system/mw_validation.php:535
320
  msgid "The contents which you input were judged with spam."
321
  msgstr "あなたの入力した内容はスパムと判定されました。"
322
 
@@ -448,7 +448,6 @@ msgid "From ( E-mail address )"
448
  msgstr "送信元(E-mailアドレス)"
449
 
450
  #: system/mw_wp_form_admin_page.php:382 system/mw_wp_form_admin_page.php:426
451
- #, fuzzy
452
  msgid "Content"
453
  msgstr "本文"
454
 
@@ -490,87 +489,99 @@ msgstr "完了画面URL"
490
  msgid "Validation Error Page URL"
491
  msgstr "エラー画面URL"
492
 
493
- #: system/mw_wp_form_admin_page.php:500
 
 
 
 
 
 
 
 
 
 
 
 
494
  msgid "Add Validation rule"
495
  msgstr "バリデーションルールを追加"
496
 
497
- #: system/mw_wp_form_admin_page.php:506
498
  msgid "The key which applies validation"
499
  msgstr "バリデーションを適用する項目"
500
 
501
- #: system/mw_wp_form_admin_page.php:510
502
  msgid "No empty"
503
  msgstr "必須項目"
504
 
505
- #: system/mw_wp_form_admin_page.php:511
506
  msgid "No empty( with checkbox )"
507
  msgstr "必須項目(チェックボックス)"
508
 
509
- #: system/mw_wp_form_admin_page.php:512
510
  msgid "Numeric"
511
  msgstr "半角数字"
512
 
513
- #: system/mw_wp_form_admin_page.php:513
514
  msgid "Alphabet"
515
  msgstr "半角英字"
516
 
517
- #: system/mw_wp_form_admin_page.php:514
518
  msgid "Alphabet and Numeric"
519
  msgstr "半角英数字"
520
 
521
- #: system/mw_wp_form_admin_page.php:515
522
  msgid "Japanese Katakana"
523
  msgstr "カタカナ"
524
 
525
- #: system/mw_wp_form_admin_page.php:516
526
  msgid "Japanese Hiragana"
527
  msgstr "ひらがな"
528
 
529
- #: system/mw_wp_form_admin_page.php:519
530
  msgid "E-mail"
531
  msgstr "メールアドレス"
532
 
533
- #: system/mw_wp_form_admin_page.php:520
534
  msgid "URL"
535
  msgstr "URL"
536
 
537
- #: system/mw_wp_form_admin_page.php:521
538
  msgid "Date"
539
  msgstr "日付"
540
 
541
- #: system/mw_wp_form_admin_page.php:525
542
  msgid "The key at same value"
543
  msgstr "一致する項目"
544
 
545
- #: system/mw_wp_form_admin_page.php:529
546
  msgid "The range of the number of characters"
547
  msgstr "文字数の範囲"
548
 
549
- #: system/mw_wp_form_admin_page.php:537
550
  msgid "The number of the minimum characters"
551
  msgstr "最小文字数"
552
 
553
- #: system/mw_wp_form_admin_page.php:541
554
  msgid "Permitted Extension"
555
  msgstr "拡張子制限"
556
 
557
- #: system/mw_wp_form_admin_page.php:542
558
  msgid "Example:jpg or jpg,txt,…"
559
  msgstr "例:jpg もしくは jpg,txt…"
560
 
561
- #: system/mw_wp_form_admin_page.php:545
562
  msgid "Permitted file size"
563
  msgstr "サイズ制限"
564
 
565
- #: system/mw_wp_form_admin_page.php:546
566
  msgid "bytes"
567
  msgstr "バイト"
568
 
569
- #: system/mw_wp_form_admin_page.php:562
570
  msgid "Select Style"
571
  msgstr "スタイルを選択"
572
 
573
- #: system/mw_wp_form_admin_page.php:598
574
  msgid "Add form tag"
575
  msgstr "フォームタグを追加"
576
 
2
  # This file is distributed under the same license as the MW WP Form package.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: MW WP Form 1.6.0\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/mw-wp-form\n"
7
+ "POT-Creation-Date: 2014-04-24 05:39:59+00:00\n"
8
+ "PO-Revision-Date: 2014-04-24 14:41+0900\n"
9
  "Last-Translator: Takashi Kitajima <inc@2inc.org>\n"
10
  "Language-Team: Takashi Kitajima <inc@2inc.org>\n"
11
  "Language: ja\n"
15
  "Plural-Forms: nplurals=1; plural=0;\n"
16
  "X-Poedit-SourceCharset: UTF-8\n"
17
  "X-Poedit-Basepath: .\n"
18
+ "X-Generator: Poedit 1.5.6\n"
19
  "X-Poedit-KeywordsList: __;_e;_x\n"
20
  "X-Poedit-SearchPath-0: ..\n"
21
 
211
  msgid "String on the submit button"
212
  msgstr "送信ボタンに表示する文字列"
213
 
214
+ #: form_fields/mw_form_field_tel.php:38 system/mw_wp_form_admin_page.php:522
215
  msgid "Tel"
216
  msgstr "電話番号"
217
 
236
  msgid "Textarea"
237
  msgstr "テキストエリア"
238
 
239
+ #: form_fields/mw_form_field_zip.php:38 system/mw_wp_form_admin_page.php:521
240
  msgid "Zip Code"
241
  msgstr "郵便番号"
242
 
243
+ #: mw-wp-form.php:442
244
  msgid "Validation Object is not a MW Validation Class."
245
  msgstr ""
246
 
247
+ #: system/mw_validation.php:81
248
  msgid "This is required."
249
  msgstr "必須項目です。"
250
 
251
+ #: system/mw_validation.php:98 system/mw_validation.php:116
252
  msgid "Please enter."
253
  msgstr "未入力です。"
254
 
255
+ #: system/mw_validation.php:138
256
  msgid "Please enter with a half-width alphabetic character."
257
  msgstr "半角英字で入力してください。"
258
 
259
+ #: system/mw_validation.php:161
260
  msgid "Please enter with a half-width number."
261
  msgstr "半角数字で入力してください。"
262
 
263
+ #: system/mw_validation.php:184
264
  msgid "Please enter with a half-width alphanumeric character."
265
  msgstr "半角英数字で入力してください。"
266
 
267
+ #: system/mw_validation.php:207
268
  msgid "Please enter with a Japanese Katakana."
269
  msgstr "カタカナで入力してください。"
270
 
271
+ #: system/mw_validation.php:230
272
  msgid "Please enter with a Japanese Hiragana."
273
  msgstr "ひらがなで入力してください。"
274
 
275
+ #: system/mw_validation.php:249
276
  msgid "This is not the format of a zip code."
277
  msgstr "郵便番号の形式ではありません。"
278
 
279
+ #: system/mw_validation.php:272
280
  msgid "This is not the format of a tel number."
281
  msgstr "電話番号の形式ではありません。"
282
 
283
+ #: system/mw_validation.php:305
284
  msgid "This is not the format of a mail address."
285
  msgstr "メールアドレスの形式ではありません。"
286
 
287
+ #: system/mw_validation.php:328
288
  msgid "This is not the format of a url."
289
  msgstr "URLの形式ではありません。"
290
 
291
+ #: system/mw_validation.php:348
292
  msgid "This is not in agreement."
293
  msgstr "一致しません。"
294
 
295
+ #: system/mw_validation.php:374
296
  msgid "The number of characters is invalid."
297
  msgstr "文字数が正しくありません。"
298
 
299
+ #: system/mw_validation.php:411
300
  msgid "The number of characters is a few."
301
  msgstr "文字数が足りません。"
302
 
303
+ #: system/mw_validation.php:436
304
  msgid "This value is invalid."
305
  msgstr "値が不正です。"
306
 
307
+ #: system/mw_validation.php:459
308
  msgid "This is not the format of a date."
309
  msgstr "日付の形式ではありません。"
310
 
311
+ #: system/mw_validation.php:488
312
  msgid "This file is invalid."
313
  msgstr "許可されたファイルではありません。"
314
 
315
+ #: system/mw_validation.php:517
316
  msgid "This file size is too big."
317
  msgstr "ファイルサイズが大きすぎます。"
318
 
319
+ #: system/mw_validation.php:536
320
  msgid "The contents which you input were judged with spam."
321
  msgstr "あなたの入力した内容はスパムと判定されました。"
322
 
448
  msgstr "送信元(E-mailアドレス)"
449
 
450
  #: system/mw_wp_form_admin_page.php:382 system/mw_wp_form_admin_page.php:426
 
451
  msgid "Content"
452
  msgstr "本文"
453
 
489
  msgid "Validation Error Page URL"
490
  msgstr "エラー画面URL"
491
 
492
+ #: system/mw_wp_form_admin_page.php:467
493
+ msgid ""
494
+ "This urls are the redirection urls at the time of button press. When URL "
495
+ "setting is empty, The page redirect on the same page."
496
+ msgstr ""
497
+ "上記URLはボタン押下時のリダイレクトURLです。URLの設定が空のときは、同一ページ"
498
+ "上でリダイレクトします。"
499
+
500
+ #: system/mw_wp_form_admin_page.php:468
501
+ msgid "When a URL doesn't begin http or https, %s is complemented."
502
+ msgstr "URLが http または https で始まっていない場合は %s が補完されます。"
503
+
504
+ #: system/mw_wp_form_admin_page.php:504
505
  msgid "Add Validation rule"
506
  msgstr "バリデーションルールを追加"
507
 
508
+ #: system/mw_wp_form_admin_page.php:510
509
  msgid "The key which applies validation"
510
  msgstr "バリデーションを適用する項目"
511
 
512
+ #: system/mw_wp_form_admin_page.php:514
513
  msgid "No empty"
514
  msgstr "必須項目"
515
 
516
+ #: system/mw_wp_form_admin_page.php:515
517
  msgid "No empty( with checkbox )"
518
  msgstr "必須項目(チェックボックス)"
519
 
520
+ #: system/mw_wp_form_admin_page.php:516
521
  msgid "Numeric"
522
  msgstr "半角数字"
523
 
524
+ #: system/mw_wp_form_admin_page.php:517
525
  msgid "Alphabet"
526
  msgstr "半角英字"
527
 
528
+ #: system/mw_wp_form_admin_page.php:518
529
  msgid "Alphabet and Numeric"
530
  msgstr "半角英数字"
531
 
532
+ #: system/mw_wp_form_admin_page.php:519
533
  msgid "Japanese Katakana"
534
  msgstr "カタカナ"
535
 
536
+ #: system/mw_wp_form_admin_page.php:520
537
  msgid "Japanese Hiragana"
538
  msgstr "ひらがな"
539
 
540
+ #: system/mw_wp_form_admin_page.php:523
541
  msgid "E-mail"
542
  msgstr "メールアドレス"
543
 
544
+ #: system/mw_wp_form_admin_page.php:524
545
  msgid "URL"
546
  msgstr "URL"
547
 
548
+ #: system/mw_wp_form_admin_page.php:525
549
  msgid "Date"
550
  msgstr "日付"
551
 
552
+ #: system/mw_wp_form_admin_page.php:529
553
  msgid "The key at same value"
554
  msgstr "一致する項目"
555
 
556
+ #: system/mw_wp_form_admin_page.php:533
557
  msgid "The range of the number of characters"
558
  msgstr "文字数の範囲"
559
 
560
+ #: system/mw_wp_form_admin_page.php:541
561
  msgid "The number of the minimum characters"
562
  msgstr "最小文字数"
563
 
564
+ #: system/mw_wp_form_admin_page.php:545
565
  msgid "Permitted Extension"
566
  msgstr "拡張子制限"
567
 
568
+ #: system/mw_wp_form_admin_page.php:546
569
  msgid "Example:jpg or jpg,txt,…"
570
  msgstr "例:jpg もしくは jpg,txt…"
571
 
572
+ #: system/mw_wp_form_admin_page.php:549
573
  msgid "Permitted file size"
574
  msgstr "サイズ制限"
575
 
576
+ #: system/mw_wp_form_admin_page.php:550
577
  msgid "bytes"
578
  msgstr "バイト"
579
 
580
+ #: system/mw_wp_form_admin_page.php:566
581
  msgid "Select Style"
582
  msgstr "スタイルを選択"
583
 
584
+ #: system/mw_wp_form_admin_page.php:602
585
  msgid "Add form tag"
586
  msgstr "フォームタグを追加"
587
 
languages/mw-wp-form.pot CHANGED
@@ -2,9 +2,9 @@
2
  # This file is distributed under the same license as the MW WP Form package.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: MW WP Form 1.5.4\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/mw-wp-form\n"
7
- "POT-Creation-Date: 2014-04-16 15:48:24+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
@@ -210,7 +210,7 @@ msgstr ""
210
  msgid "String on the submit button"
211
  msgstr ""
212
 
213
- #: form_fields/mw_form_field_tel.php:38 system/mw_wp_form_admin_page.php:518
214
  msgid "Tel"
215
  msgstr ""
216
 
@@ -235,87 +235,87 @@ msgstr ""
235
  msgid "Textarea"
236
  msgstr ""
237
 
238
- #: form_fields/mw_form_field_zip.php:38 system/mw_wp_form_admin_page.php:517
239
  msgid "Zip Code"
240
  msgstr ""
241
 
242
- #: mw-wp-form.php:420
243
  msgid "Validation Object is not a MW Validation Class."
244
  msgstr ""
245
 
246
- #: system/mw_validation.php:80
247
  msgid "This is required."
248
  msgstr ""
249
 
250
- #: system/mw_validation.php:97 system/mw_validation.php:115
251
  msgid "Please enter."
252
  msgstr ""
253
 
254
- #: system/mw_validation.php:137
255
  msgid "Please enter with a half-width alphabetic character."
256
  msgstr ""
257
 
258
- #: system/mw_validation.php:160
259
  msgid "Please enter with a half-width number."
260
  msgstr ""
261
 
262
- #: system/mw_validation.php:183
263
  msgid "Please enter with a half-width alphanumeric character."
264
  msgstr ""
265
 
266
- #: system/mw_validation.php:206
267
  msgid "Please enter with a Japanese Katakana."
268
  msgstr ""
269
 
270
- #: system/mw_validation.php:229
271
  msgid "Please enter with a Japanese Hiragana."
272
  msgstr ""
273
 
274
- #: system/mw_validation.php:248
275
  msgid "This is not the format of a zip code."
276
  msgstr ""
277
 
278
- #: system/mw_validation.php:271
279
  msgid "This is not the format of a tel number."
280
  msgstr ""
281
 
282
- #: system/mw_validation.php:304
283
  msgid "This is not the format of a mail address."
284
  msgstr ""
285
 
286
- #: system/mw_validation.php:327
287
  msgid "This is not the format of a url."
288
  msgstr ""
289
 
290
- #: system/mw_validation.php:347
291
  msgid "This is not in agreement."
292
  msgstr ""
293
 
294
- #: system/mw_validation.php:373
295
  msgid "The number of characters is invalid."
296
  msgstr ""
297
 
298
- #: system/mw_validation.php:410
299
  msgid "The number of characters is a few."
300
  msgstr ""
301
 
302
- #: system/mw_validation.php:435
303
  msgid "This value is invalid."
304
  msgstr ""
305
 
306
- #: system/mw_validation.php:458
307
  msgid "This is not the format of a date."
308
  msgstr ""
309
 
310
- #: system/mw_validation.php:487
311
  msgid "This file is invalid."
312
  msgstr ""
313
 
314
- #: system/mw_validation.php:516
315
  msgid "This file size is too big."
316
  msgstr ""
317
 
318
- #: system/mw_validation.php:535
319
  msgid "The contents which you input were judged with spam."
320
  msgstr ""
321
 
@@ -477,87 +477,95 @@ msgstr ""
477
  msgid "Validation Error Page URL"
478
  msgstr ""
479
 
480
- #: system/mw_wp_form_admin_page.php:500
 
 
 
 
 
 
 
 
481
  msgid "Add Validation rule"
482
  msgstr ""
483
 
484
- #: system/mw_wp_form_admin_page.php:506
485
  msgid "The key which applies validation"
486
  msgstr ""
487
 
488
- #: system/mw_wp_form_admin_page.php:510
489
  msgid "No empty"
490
  msgstr ""
491
 
492
- #: system/mw_wp_form_admin_page.php:511
493
  msgid "No empty( with checkbox )"
494
  msgstr ""
495
 
496
- #: system/mw_wp_form_admin_page.php:512
497
  msgid "Numeric"
498
  msgstr ""
499
 
500
- #: system/mw_wp_form_admin_page.php:513
501
  msgid "Alphabet"
502
  msgstr ""
503
 
504
- #: system/mw_wp_form_admin_page.php:514
505
  msgid "Alphabet and Numeric"
506
  msgstr ""
507
 
508
- #: system/mw_wp_form_admin_page.php:515
509
  msgid "Japanese Katakana"
510
  msgstr ""
511
 
512
- #: system/mw_wp_form_admin_page.php:516
513
  msgid "Japanese Hiragana"
514
  msgstr ""
515
 
516
- #: system/mw_wp_form_admin_page.php:519
517
  msgid "E-mail"
518
  msgstr ""
519
 
520
- #: system/mw_wp_form_admin_page.php:520
521
  msgid "URL"
522
  msgstr ""
523
 
524
- #: system/mw_wp_form_admin_page.php:521
525
  msgid "Date"
526
  msgstr ""
527
 
528
- #: system/mw_wp_form_admin_page.php:525
529
  msgid "The key at same value"
530
  msgstr ""
531
 
532
- #: system/mw_wp_form_admin_page.php:529
533
  msgid "The range of the number of characters"
534
  msgstr ""
535
 
536
- #: system/mw_wp_form_admin_page.php:537
537
  msgid "The number of the minimum characters"
538
  msgstr ""
539
 
540
- #: system/mw_wp_form_admin_page.php:541
541
  msgid "Permitted Extension"
542
  msgstr ""
543
 
544
- #: system/mw_wp_form_admin_page.php:542
545
  msgid "Example:jpg or jpg,txt,…"
546
  msgstr ""
547
 
548
- #: system/mw_wp_form_admin_page.php:545
549
  msgid "Permitted file size"
550
  msgstr ""
551
 
552
- #: system/mw_wp_form_admin_page.php:546
553
  msgid "bytes"
554
  msgstr ""
555
 
556
- #: system/mw_wp_form_admin_page.php:562
557
  msgid "Select Style"
558
  msgstr ""
559
 
560
- #: system/mw_wp_form_admin_page.php:598
561
  msgid "Add form tag"
562
  msgstr ""
563
 
2
  # This file is distributed under the same license as the MW WP Form package.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: MW WP Form 1.6.0\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/mw-wp-form\n"
7
+ "POT-Creation-Date: 2014-04-24 05:39:59+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
210
  msgid "String on the submit button"
211
  msgstr ""
212
 
213
+ #: form_fields/mw_form_field_tel.php:38 system/mw_wp_form_admin_page.php:522
214
  msgid "Tel"
215
  msgstr ""
216
 
235
  msgid "Textarea"
236
  msgstr ""
237
 
238
+ #: form_fields/mw_form_field_zip.php:38 system/mw_wp_form_admin_page.php:521
239
  msgid "Zip Code"
240
  msgstr ""
241
 
242
+ #: mw-wp-form.php:442
243
  msgid "Validation Object is not a MW Validation Class."
244
  msgstr ""
245
 
246
+ #: system/mw_validation.php:81
247
  msgid "This is required."
248
  msgstr ""
249
 
250
+ #: system/mw_validation.php:98 system/mw_validation.php:116
251
  msgid "Please enter."
252
  msgstr ""
253
 
254
+ #: system/mw_validation.php:138
255
  msgid "Please enter with a half-width alphabetic character."
256
  msgstr ""
257
 
258
+ #: system/mw_validation.php:161
259
  msgid "Please enter with a half-width number."
260
  msgstr ""
261
 
262
+ #: system/mw_validation.php:184
263
  msgid "Please enter with a half-width alphanumeric character."
264
  msgstr ""
265
 
266
+ #: system/mw_validation.php:207
267
  msgid "Please enter with a Japanese Katakana."
268
  msgstr ""
269
 
270
+ #: system/mw_validation.php:230
271
  msgid "Please enter with a Japanese Hiragana."
272
  msgstr ""
273
 
274
+ #: system/mw_validation.php:249
275
  msgid "This is not the format of a zip code."
276
  msgstr ""
277
 
278
+ #: system/mw_validation.php:272
279
  msgid "This is not the format of a tel number."
280
  msgstr ""
281
 
282
+ #: system/mw_validation.php:305
283
  msgid "This is not the format of a mail address."
284
  msgstr ""
285
 
286
+ #: system/mw_validation.php:328
287
  msgid "This is not the format of a url."
288
  msgstr ""
289
 
290
+ #: system/mw_validation.php:348
291
  msgid "This is not in agreement."
292
  msgstr ""
293
 
294
+ #: system/mw_validation.php:374
295
  msgid "The number of characters is invalid."
296
  msgstr ""
297
 
298
+ #: system/mw_validation.php:411
299
  msgid "The number of characters is a few."
300
  msgstr ""
301
 
302
+ #: system/mw_validation.php:436
303
  msgid "This value is invalid."
304
  msgstr ""
305
 
306
+ #: system/mw_validation.php:459
307
  msgid "This is not the format of a date."
308
  msgstr ""
309
 
310
+ #: system/mw_validation.php:488
311
  msgid "This file is invalid."
312
  msgstr ""
313
 
314
+ #: system/mw_validation.php:517
315
  msgid "This file size is too big."
316
  msgstr ""
317
 
318
+ #: system/mw_validation.php:536
319
  msgid "The contents which you input were judged with spam."
320
  msgstr ""
321
 
477
  msgid "Validation Error Page URL"
478
  msgstr ""
479
 
480
+ #: system/mw_wp_form_admin_page.php:467
481
+ msgid "This urls are the redirection urls at the time of button press. When URL setting is empty, The page redirect on the same page."
482
+ msgstr ""
483
+
484
+ #: system/mw_wp_form_admin_page.php:468
485
+ msgid "When a URL doesn't begin http or https, %s is complemented."
486
+ msgstr ""
487
+
488
+ #: system/mw_wp_form_admin_page.php:504
489
  msgid "Add Validation rule"
490
  msgstr ""
491
 
492
+ #: system/mw_wp_form_admin_page.php:510
493
  msgid "The key which applies validation"
494
  msgstr ""
495
 
496
+ #: system/mw_wp_form_admin_page.php:514
497
  msgid "No empty"
498
  msgstr ""
499
 
500
+ #: system/mw_wp_form_admin_page.php:515
501
  msgid "No empty( with checkbox )"
502
  msgstr ""
503
 
504
+ #: system/mw_wp_form_admin_page.php:516
505
  msgid "Numeric"
506
  msgstr ""
507
 
508
+ #: system/mw_wp_form_admin_page.php:517
509
  msgid "Alphabet"
510
  msgstr ""
511
 
512
+ #: system/mw_wp_form_admin_page.php:518
513
  msgid "Alphabet and Numeric"
514
  msgstr ""
515
 
516
+ #: system/mw_wp_form_admin_page.php:519
517
  msgid "Japanese Katakana"
518
  msgstr ""
519
 
520
+ #: system/mw_wp_form_admin_page.php:520
521
  msgid "Japanese Hiragana"
522
  msgstr ""
523
 
524
+ #: system/mw_wp_form_admin_page.php:523
525
  msgid "E-mail"
526
  msgstr ""
527
 
528
+ #: system/mw_wp_form_admin_page.php:524
529
  msgid "URL"
530
  msgstr ""
531
 
532
+ #: system/mw_wp_form_admin_page.php:525
533
  msgid "Date"
534
  msgstr ""
535
 
536
+ #: system/mw_wp_form_admin_page.php:529
537
  msgid "The key at same value"
538
  msgstr ""
539
 
540
+ #: system/mw_wp_form_admin_page.php:533
541
  msgid "The range of the number of characters"
542
  msgstr ""
543
 
544
+ #: system/mw_wp_form_admin_page.php:541
545
  msgid "The number of the minimum characters"
546
  msgstr ""
547
 
548
+ #: system/mw_wp_form_admin_page.php:545
549
  msgid "Permitted Extension"
550
  msgstr ""
551
 
552
+ #: system/mw_wp_form_admin_page.php:546
553
  msgid "Example:jpg or jpg,txt,…"
554
  msgstr ""
555
 
556
+ #: system/mw_wp_form_admin_page.php:549
557
  msgid "Permitted file size"
558
  msgstr ""
559
 
560
+ #: system/mw_wp_form_admin_page.php:550
561
  msgid "bytes"
562
  msgstr ""
563
 
564
+ #: system/mw_wp_form_admin_page.php:566
565
  msgid "Select Style"
566
  msgstr ""
567
 
568
+ #: system/mw_wp_form_admin_page.php:602
569
  msgid "Add form tag"
570
  msgstr ""
571
 
mw-wp-form.php CHANGED
@@ -3,11 +3,11 @@
3
  * Plugin Name: MW WP Form
4
  * Plugin URI: http://plugins.2inc.org/mw-wp-form/
5
  * Description: MW WP Form can create mail form with a confirmation screen.
6
- * Version: 1.5.6
7
  * Author: Takashi Kitajima
8
  * Author URI: http://2inc.org
9
  * Created : September 25, 2012
10
- * Modified: April 19, 2014
11
  * Text Domain: mw-wp-form
12
  * Domain Path: /languages/
13
  * License: GPL2
@@ -262,8 +262,12 @@ class mw_wp_form {
262
  // $_FILESがあるときは$this->dataに統合
263
  $files = array();
264
  foreach ( $_FILES as $key => $file ) {
265
- if ( $file['error'] == UPLOAD_ERR_OK && is_uploaded_file( $file['tmp_name'] ) ) {
266
- $this->Data->setValue( $key, $file['name'] );
 
 
 
 
267
  $files[$key] = $file;
268
  }
269
  }
@@ -284,7 +288,7 @@ class mw_wp_form {
284
  $this->File = new MW_WP_Form_File();
285
 
286
  // 入力画面(戻る)のとき
287
- if ( $this->Form->isInput() ) {
288
  $this->redirect( $this->input );
289
  }
290
  // 確認画面のとき
@@ -312,7 +316,7 @@ class mw_wp_form {
312
  $this->Data->clearValue( $this->Form->getTokenName() );
313
 
314
  // 手動フォーム対応
315
- $REQUEST_URI = $this->parse_url( $_SERVER['REQUEST_URI'] );
316
  $input = $this->parse_url( $this->input );
317
  $complete = $this->parse_url( $this->complete );
318
  if ( !$this->options_by_formkey && $REQUEST_URI !== $complete && $input !== $complete ) {
@@ -328,6 +332,28 @@ class mw_wp_form {
328
  $this->redirect( $this->input );
329
  }
330
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
331
  }
332
  add_shortcode( 'mwform_formkey', array( $this, '_mwform_formkey' ) );
333
  add_shortcode( 'mwform', array( $this, '_mwform' ) );
@@ -417,7 +443,7 @@ class mw_wp_form {
417
 
418
  $this->Validation = apply_filters( $filterName, $this->Validation, $this->Data->getValues() );
419
  if ( !is_a( $this->Validation, 'MW_Validation' ) ) {
420
- exit( __( 'Validation Object is not a MW Validation Class.', MWF_Config::DOMAIN ) );
421
  }
422
  }
423
 
@@ -724,20 +750,45 @@ class mw_wp_form {
724
  * @param String リダイレクトURL
725
  */
726
  private function redirect( $url ) {
727
- $redirect = ( empty( $url ) ) ? $_SERVER['REQUEST_URI'] : $url;
728
  $redirect = $this->parse_url( $redirect );
729
- $REQUEST_URI = $this->parse_url( $_SERVER['REQUEST_URI'] );
730
  if ( !empty( $_POST ) || $redirect != $REQUEST_URI ) {
 
 
731
  wp_redirect( $redirect );
732
  exit();
733
  }
734
  }
735
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
736
  /**
737
  * parse_url
738
  * http:// からはじまるURLに変換する
739
- * @param String URL
740
- * @return String URL
741
  */
742
  protected function parse_url( $url ) {
743
  if ( empty( $url ) )
@@ -751,8 +802,7 @@ class mw_wp_form {
751
  parse_str( $reg[1], $query_string );
752
  }
753
  if ( !preg_match( '/^https?:\/\//', $url ) ) {
754
- $protocol = ( is_ssl() ) ? 'https://' : 'http://';
755
- $home_url = untrailingslashit( $protocol . $_SERVER['HTTP_HOST'] );
756
  $url = $home_url . $url;
757
  }
758
  $url = preg_replace( '/([^:])\/+/', '$1/', $url );
@@ -822,9 +872,9 @@ class mw_wp_form {
822
  if ( isset( $this->options_by_formkey['querystring'] ) )
823
  $querystring = $this->options_by_formkey['querystring'];
824
  if ( !empty( $querystring ) ) {
825
- $content = preg_replace_callback( '/{(.+?)}/', array( $this, 'get_post_property' ), $content );
826
  } else {
827
- $content = preg_replace( '/{(.+?)}/', '', $content );
828
  }
829
 
830
  $upload_file_keys = $this->Form->getValue( MWF_Config::UPLOAD_FILE_KEYS );
@@ -877,18 +927,18 @@ class mw_wp_form {
877
  }
878
 
879
  /**
880
- * get_post_property
881
  * 引数 post_id が有効の場合、投稿情報を取得するために preg_replace_callback から呼び出される。
882
  * @param Array $matches
883
  * @return String
884
  */
885
- public function get_post_property( $matches ) {
886
  if ( isset( $this->options_by_formkey['querystring'] ) )
887
  $querystring = $this->options_by_formkey['querystring'];
888
  if ( !empty( $querystring ) && isset( $_GET['post_id'] ) && MWF_Functions::is_numeric( $_GET['post_id'] ) ) {
889
  $_post = get_post( $_GET['post_id'] );
890
  if ( empty( $_post->ID ) )
891
- return $matches[0];
892
  if ( isset( $_post->$matches[1] ) ) {
893
  return $_post->$matches[1];
894
  } else {
@@ -901,6 +951,30 @@ class mw_wp_form {
901
  return;
902
  }
903
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
904
  /**
905
  * _mwform_complete_message
906
  * 完了後のメッセージ。
3
  * Plugin Name: MW WP Form
4
  * Plugin URI: http://plugins.2inc.org/mw-wp-form/
5
  * Description: MW WP Form can create mail form with a confirmation screen.
6
+ * Version: 1.6.0
7
  * Author: Takashi Kitajima
8
  * Author URI: http://2inc.org
9
  * Created : September 25, 2012
10
+ * Modified: April 22, 2014
11
  * Text Domain: mw-wp-form
12
  * Domain Path: /languages/
13
  * License: GPL2
262
  // $_FILESがあるときは$this->dataに統合
263
  $files = array();
264
  foreach ( $_FILES as $key => $file ) {
265
+ if ( !isset( $_POST[$key] ) ) {
266
+ if ( $file['error'] == UPLOAD_ERR_OK && is_uploaded_file( $file['tmp_name'] ) ) {
267
+ $this->Data->setValue( $key, $file['name'] );
268
+ } else {
269
+ $this->Data->setValue( $key, '' );
270
+ }
271
  $files[$key] = $file;
272
  }
273
  }
288
  $this->File = new MW_WP_Form_File();
289
 
290
  // 入力画面(戻る)のとき
291
+ if ( $this->Form->isBack() ) {
292
  $this->redirect( $this->input );
293
  }
294
  // 確認画面のとき
316
  $this->Data->clearValue( $this->Form->getTokenName() );
317
 
318
  // 手動フォーム対応
319
+ $REQUEST_URI = $this->parse_url( $this->get_request_uri() );
320
  $input = $this->parse_url( $this->input );
321
  $complete = $this->parse_url( $this->complete );
322
  if ( !$this->options_by_formkey && $REQUEST_URI !== $complete && $input !== $complete ) {
332
  $this->redirect( $this->input );
333
  }
334
  }
335
+ } else {
336
+ // 完了 or 確認画面 or エラーURLが設定済みで
337
+ // 完了 or 確認画面 or エラーに直接アクセスした場合、
338
+ // 入力画面に戻れれば戻る。戻れない場合はトップに戻す
339
+ $REQUEST_URI = $this->parse_url( $this->get_request_uri() );
340
+ $check_urls = array(
341
+ $this->confirm,
342
+ $this->complete,
343
+ );
344
+ $back_url = ( $this->input ) ? $this->input : home_url();
345
+ foreach ( $check_urls as $check_url ) {
346
+ if ( $REQUEST_URI === $check_url ) {
347
+ $this->Data->clearValues();
348
+ $this->redirect( $back_url );
349
+ }
350
+ }
351
+ $this->redirect( $this->input );
352
+
353
+ if ( $this->Validation->check() && $REQUEST_URI == $this->validation_error ) {
354
+ $this->Data->clearValues();
355
+ $this->redirect( $back_url );
356
+ }
357
  }
358
  add_shortcode( 'mwform_formkey', array( $this, '_mwform_formkey' ) );
359
  add_shortcode( 'mwform', array( $this, '_mwform' ) );
443
 
444
  $this->Validation = apply_filters( $filterName, $this->Validation, $this->Data->getValues() );
445
  if ( !is_a( $this->Validation, 'MW_Validation' ) ) {
446
+ exit( esc_html__( 'Validation Object is not a MW Validation Class.', MWF_Config::DOMAIN ) );
447
  }
448
  }
449
 
750
  * @param String リダイレクトURL
751
  */
752
  private function redirect( $url ) {
753
+ $redirect = ( empty( $url ) ) ? $this->get_request_uri() : $url;
754
  $redirect = $this->parse_url( $redirect );
755
+ $REQUEST_URI = $this->parse_url( $this->get_request_uri() );
756
  if ( !empty( $_POST ) || $redirect != $REQUEST_URI ) {
757
+ $redirect = wp_sanitize_redirect( $redirect );
758
+ $redirect = wp_validate_redirect( $redirect, home_url() );
759
  wp_redirect( $redirect );
760
  exit();
761
  }
762
  }
763
 
764
+ /**
765
+ * get_request_uri
766
+ * $_SERVER['REQUEST_URI'] を http:// からはじまるURLに変換する
767
+ * @return string URL
768
+ */
769
+ protected function get_request_uri() {
770
+ $_REQUEST_URI = $_SERVER['REQUEST_URI'];
771
+ if ( !preg_match( '/^https?:\/\//', $_REQUEST_URI ) ) {
772
+ $REQUEST_URI = home_url() . $_REQUEST_URI;
773
+ $parse_url = parse_url( home_url() );
774
+ // サブディレクトリ型の場合
775
+ if ( !empty( $parse_url['path'] ) ) {
776
+ $pettern = preg_quote( $parse_url['path'], '/' );
777
+ if ( preg_match( '/^' . $pettern . '/', $_REQUEST_URI ) ) {
778
+ $REQUEST_URI = preg_replace( '/' . $pettern . '$/', $_REQUEST_URI, home_url() );
779
+ }
780
+ }
781
+ } else {
782
+ $REQUEST_URI = $_REQUEST_URI;
783
+ }
784
+ return $REQUEST_URI;
785
+ }
786
+
787
  /**
788
  * parse_url
789
  * http:// からはじまるURLに変換する
790
+ * @param string URL
791
+ * @return string URL
792
  */
793
  protected function parse_url( $url ) {
794
  if ( empty( $url ) )
802
  parse_str( $reg[1], $query_string );
803
  }
804
  if ( !preg_match( '/^https?:\/\//', $url ) ) {
805
+ $home_url = home_url();
 
806
  $url = $home_url . $url;
807
  }
808
  $url = preg_replace( '/([^:])\/+/', '$1/', $url );
872
  if ( isset( $this->options_by_formkey['querystring'] ) )
873
  $querystring = $this->options_by_formkey['querystring'];
874
  if ( !empty( $querystring ) ) {
875
+ $content = preg_replace_callback( '/{(.+?)}/', array( $this, 'get_post_property_from_querystring' ), $content );
876
  } else {
877
+ $content = preg_replace_callback( '/{(.+?)}/', array( $this, 'get_post_property_from_this' ), $content );
878
  }
879
 
880
  $upload_file_keys = $this->Form->getValue( MWF_Config::UPLOAD_FILE_KEYS );
927
  }
928
 
929
  /**
930
+ * get_post_property_from_querystring
931
  * 引数 post_id が有効の場合、投稿情報を取得するために preg_replace_callback から呼び出される。
932
  * @param Array $matches
933
  * @return String
934
  */
935
+ public function get_post_property_from_querystring( $matches ) {
936
  if ( isset( $this->options_by_formkey['querystring'] ) )
937
  $querystring = $this->options_by_formkey['querystring'];
938
  if ( !empty( $querystring ) && isset( $_GET['post_id'] ) && MWF_Functions::is_numeric( $_GET['post_id'] ) ) {
939
  $_post = get_post( $_GET['post_id'] );
940
  if ( empty( $_post->ID ) )
941
+ return;
942
  if ( isset( $_post->$matches[1] ) ) {
943
  return $_post->$matches[1];
944
  } else {
951
  return;
952
  }
953
 
954
+ /**
955
+ * get_post_property_from_this
956
+ * 引数 post_id が無効の場合、投稿情報を取得するために preg_replace_callback から呼び出される。
957
+ * @param Array $matches
958
+ * @return String
959
+ */
960
+ public function get_post_property_from_this( $matches ) {
961
+ global $post;
962
+ if ( !is_singular() )
963
+ return;
964
+ $post_id = get_the_ID();
965
+ if ( isset( $post->ID ) && MWF_Functions::is_numeric( $post->ID ) ) {
966
+ if ( isset( $post->$matches[1] ) ) {
967
+ return $post->$matches[1];
968
+ } else {
969
+ // post_meta の処理
970
+ $pm = get_post_meta( $post->ID, $matches[1], true );
971
+ if ( !empty( $pm ) )
972
+ return $pm;
973
+ }
974
+ }
975
+ return;
976
+ }
977
+
978
  /**
979
  * _mwform_complete_message
980
  * 完了後のメッセージ。
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: http://www.amazon.co.jp/registry/wishlist/39ANKRNSTNW40
4
  Tags: plugin, form, confirm, preview, shortcode, mail
5
  Requires at least: 3.4
6
  Tested up to: 3.9.0
7
- Stable tag: 1.5.6
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -54,8 +54,18 @@ Do you have questions or issues with MW WP Form? Use these support channels appr
54
 
55
  == Changelog ==
56
 
 
 
 
 
 
 
 
 
 
 
57
  = 1.5.6 =
58
- * Bug fix : Fix Selected file reset button bug in Firefox.
59
  * Changed : Change file field's default size attribute.
60
 
61
  = 1.5.5 =
@@ -77,7 +87,7 @@ Do you have questions or issues with MW WP Form? Use these support channels appr
77
  = 1.5.0 =
78
  * Deleted : Delete qtags.
79
  * Bug fix : Fix inquiery data are not saved when admin mail content is empty.
80
- * Bug fix : Fix bug that don't start a new line.
81
  * Added : Add filter_hook mwform_admin_mail_raw_mw-wp-form-xxx.
82
  * Added : Add filter_hook mwform_auto_mail_raw_mw-wp-form-xxx.
83
  * Deprecated: Deprecated mw_form_field::set_qtags()
4
  Tags: plugin, form, confirm, preview, shortcode, mail
5
  Requires at least: 3.4
6
  Tested up to: 3.9.0
7
+ Stable tag: 1.6.0
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
54
 
55
  == Changelog ==
56
 
57
+ = 1.6.0 =
58
+ * Changed : Changed Redirection flow.
59
+ * Changed : If querystring setting is set and doesn't get post from querystring, return empty.
60
+ * Changed : When a URL doesn't begin http or https in URL settings, home_url() is complemented.
61
+ * Added : {xxx} ( e.g. {post_title} ) get post property from the now post if querystring setting does't set.
62
+ * Added : Repeat submitting came to be blocked.
63
+ * Bug fix : Fixed translation mistake in admin page.
64
+ * Bug fix : Fixed selected file reset button bug on file field.
65
+ * Bug fix : Fixed bug that not to work rightly when setting noempty validation in image or file field.
66
+
67
  = 1.5.6 =
68
+ * Bug fix : Fix selected file reset button bug in Firefox.
69
  * Changed : Change file field's default size attribute.
70
 
71
  = 1.5.5 =
87
  = 1.5.0 =
88
  * Deleted : Delete qtags.
89
  * Bug fix : Fix inquiery data are not saved when admin mail content is empty.
90
+ * Bug fix : Fix bug that doesn't start a new line.
91
  * Added : Add filter_hook mwform_admin_mail_raw_mw-wp-form-xxx.
92
  * Added : Add filter_hook mwform_auto_mail_raw_mw-wp-form-xxx.
93
  * Deprecated: Deprecated mw_form_field::set_qtags()
system/mw_form.php CHANGED
@@ -3,11 +3,11 @@
3
  * Name: MW Form
4
  * URI: http://2inc.org
5
  * Description: フォームクラス
6
- * Version: 1.3.13
7
  * Author: Takashi Kitajima
8
  * Author URI: http://2inc.org
9
  * Created : September 25, 2012
10
- * Modified: April 19, 2014
11
  * License: GPL2
12
  *
13
  * Copyright 2014 Takashi Kitajima (email : inc@2inc.org)
@@ -74,7 +74,7 @@ class MW_Form {
74
  public function __construct( $key = '' ) {
75
  $this->Data = MW_WP_Form_Data::getInstance( $key );
76
  if ( $key ) {
77
- $this->key = $key . '_token';
78
  }
79
  $this->Session = MW_Session::start( $this->key );
80
  $this->modeCheck = $this->modeCheck();
@@ -132,6 +132,17 @@ class MW_Form {
132
  return false;
133
  }
134
 
 
 
 
 
 
 
 
 
 
 
 
135
  /**
136
  * modeCheck
137
  * 表示画面判定
@@ -141,7 +152,7 @@ class MW_Form {
141
  $backButton = $this->getValue( $this->backButton );
142
  $confirmButton = $this->getValue( $this->confirmButton );
143
  if ( isset( $backButton ) ) {
144
- return 'input';
145
  } elseif ( isset( $confirmButton ) ) {
146
  return 'confirm';
147
  } elseif ( !isset( $confirmButton ) && !isset( $backButton ) && $this->check() ) {
3
  * Name: MW Form
4
  * URI: http://2inc.org
5
  * Description: フォームクラス
6
+ * Version: 1.3.14
7
  * Author: Takashi Kitajima
8
  * Author URI: http://2inc.org
9
  * Created : September 25, 2012
10
+ * Modified: April 22, 2014
11
  * License: GPL2
12
  *
13
  * Copyright 2014 Takashi Kitajima (email : inc@2inc.org)
74
  public function __construct( $key = '' ) {
75
  $this->Data = MW_WP_Form_Data::getInstance( $key );
76
  if ( $key ) {
77
+ $this->key = $key . '_key';
78
  }
79
  $this->Session = MW_Session::start( $this->key );
80
  $this->modeCheck = $this->modeCheck();
132
  return false;
133
  }
134
 
135
+ /**
136
+ * isBack
137
+ * 入力画面(戻る)かどうか
138
+ * @return bool
139
+ */
140
+ public function isBack() {
141
+ if ( $this->modeCheck === 'back' )
142
+ return true;
143
+ return false;
144
+ }
145
+
146
  /**
147
  * modeCheck
148
  * 表示画面判定
152
  $backButton = $this->getValue( $this->backButton );
153
  $confirmButton = $this->getValue( $this->confirmButton );
154
  if ( isset( $backButton ) ) {
155
+ return 'back';
156
  } elseif ( isset( $confirmButton ) ) {
157
  return 'confirm';
158
  } elseif ( !isset( $confirmButton ) && !isset( $backButton ) && $this->check() ) {
system/mw_form_field.php CHANGED
@@ -264,7 +264,7 @@ abstract class mw_form_field {
264
  if ( $this->display_name )
265
  $display_name = $this->display_name;
266
  ?>
267
- <option value="<?php echo esc_attr( $this->shortcode_name ); ?>"><?php echo esc_attr( $display_name ); ?></option>
268
  <?php
269
  }
270
  }
264
  if ( $this->display_name )
265
  $display_name = $this->display_name;
266
  ?>
267
+ <option value="<?php echo esc_attr( $this->shortcode_name ); ?>"><?php echo esc_html( $display_name ); ?></option>
268
  <?php
269
  }
270
  }
system/mw_validation.php CHANGED
@@ -3,11 +3,11 @@
3
  * Name: MW Validation
4
  * URI: http://2inc.org
5
  * Description: バリデーションクラス
6
- * Version: 1.6.3
7
  * Author: Takashi Kitajima
8
  * Author URI: http://2inc.org
9
  * Created : July 20, 2012
10
- * Modified: April 2, 2014
11
  * License: GPL2
12
  *
13
  * Copyright 2014 Takashi Kitajima (email : inc@2inc.org)
@@ -73,7 +73,8 @@ class MW_Validation {
73
  */
74
  public function required( $key, $options = array() ) {
75
  $value = $this->getValue( $key );
76
- if ( !is_null( $value ) ) {
 
77
  return;
78
  }
79
  $defaults = array(
3
  * Name: MW Validation
4
  * URI: http://2inc.org
5
  * Description: バリデーションクラス
6
+ * Version: 1.6.4
7
  * Author: Takashi Kitajima
8
  * Author URI: http://2inc.org
9
  * Created : July 20, 2012
10
+ * Modified: April 23, 2014
11
  * License: GPL2
12
  *
13
  * Copyright 2014 Takashi Kitajima (email : inc@2inc.org)
73
  */
74
  public function required( $key, $options = array() ) {
75
  $value = $this->getValue( $key );
76
+ // 値が存在するとき、もしくは存在しないけど他のデータもない(=フォーム送信自体されていない)ときはエラーではない
77
+ if ( !is_null( $value ) || is_null( $value ) && !$this->Data->getValues() ) {
78
  return;
79
  }
80
  $defaults = array(
system/mw_wp_form_admin_page.php CHANGED
@@ -298,8 +298,8 @@ class MW_WP_Form_Admin_Page {
298
  <p>
299
  <span id="formkey_field">[mwform_formkey key="<?php the_ID(); ?>"]</span>
300
  <span class="mwf_note">
301
- <?php _e( 'Copy and Paste this shortcode.', MWF_Config::DOMAIN ); ?><br />
302
- <?php _e( 'The key to use with hook is ', MWF_Config::DOMAIN ); ?><?php echo MWF_Config::NAME; ?>-<?php echo $post->ID; ?>
303
  </span>
304
  </p>
305
  <?php
@@ -313,16 +313,16 @@ class MW_WP_Form_Admin_Page {
313
  global $post;
314
  ?>
315
  <p>
316
- <label><input type="checkbox" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[querystring]" value="1" <?php checked( $this->get_post_data( 'querystring' ), 1 ); ?> /> <?php _e( 'Activate Query string of post', MWF_Config::DOMAIN ); ?></label><br />
317
- <span class="mwf_note"><?php _e( 'If this field is active, MW WP Form get query string. And get post data from query string "post_id". You can use $post\'s property in editor.', MWF_Config::DOMAIN ); ?><br />
318
- <?php _e( 'Example: {ID}, {post_title}, {post_meta} etc...', MWF_Config::DOMAIN ); ?></span>
319
  </p>
320
  <p>
321
- <label><input type="checkbox" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[usedb]" value="1" <?php checked( $this->get_post_data( 'usedb' ), 1 ); ?> /> <?php _e( 'Saving inquiry data in database', MWF_Config::DOMAIN ); ?></label>
322
  </p>
323
  <table border="0" cellpadding="0" cellspacing="0" class="akismet">
324
  <tr>
325
- <th colspan="2"><?php _e( 'Akismet Setting', MWF_Config::DOMAIN ); ?></th>
326
  </tr>
327
  <tr>
328
  <td>author</td>
@@ -337,7 +337,7 @@ class MW_WP_Form_Admin_Page {
337
  <td><input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[akismet_author_url]" value="<?php echo esc_attr( $this->get_post_data( 'akismet_author_url' ) ); ?>" /></td>
338
  </tr>
339
  </table>
340
- <span class="mwf_note"><?php _e( 'Input the key to use Akismet.', MWF_Config::DOMAIN ); ?></span>
341
  <?php
342
  }
343
 
@@ -362,30 +362,30 @@ class MW_WP_Form_Admin_Page {
362
  global $post;
363
  ?>
364
  <p>
365
- <?php _e( '{key} is converted form data.', MWF_Config::DOMAIN ); ?>
366
  </p>
367
  <p>
368
- <b><?php _e( 'Subject', MWF_Config::DOMAIN ); ?></b><br />
369
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[mail_subject]" value="<?php echo esc_attr( $this->get_post_data( 'mail_subject' ) ); ?>" />
370
  </p>
371
  <p>
372
- <b><?php _e( 'Sender', MWF_Config::DOMAIN ); ?></b><br />
373
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[mail_sender]" value="<?php echo esc_attr( $this->get_post_data( 'mail_sender' ) ); ?>" /><br />
374
- <span class="mwf_note"><?php _e( 'If empty:', MWF_Config::DOMAIN ); ?> <?php bloginfo( 'name' ); ?></span>
375
  </p>
376
  <p>
377
- <b><?php _e( 'From ( E-mail address )', MWF_Config::DOMAIN ); ?></b><br />
378
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[mail_from]" value="<?php echo esc_attr( $this->get_post_data( 'mail_from' ) ); ?>" /><br />
379
- <span class="mwf_note"><?php _e( 'If empty:', MWF_Config::DOMAIN ); ?> <?php bloginfo( 'admin_email' ); ?></span>
380
  </p>
381
  <p>
382
- <b><?php _e( 'Content', MWF_Config::DOMAIN ); ?></b><br />
383
  <textarea name="<?php echo esc_attr( MWF_Config::NAME ); ?>[mail_content]" cols="30" rows="10"><?php echo esc_attr( $this->get_post_data( 'mail_content' ) ); ?></textarea>
384
  </p>
385
  <p>
386
- <b><?php _e( 'Automatic reply email', MWF_Config::DOMAIN ); ?></b><br />
387
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[automatic_reply_email]" value="<?php echo esc_attr( $this->get_post_data( 'automatic_reply_email') ); ?>" /><br />
388
- <span class="mwf_note"><?php _e( 'Input the key to use as transmission to automatic reply email. {} is unnecessary.', MWF_Config::DOMAIN ); ?></span>
389
  </p>
390
  <?php
391
  }
@@ -398,32 +398,32 @@ class MW_WP_Form_Admin_Page {
398
  global $post;
399
  ?>
400
  <p>
401
- <?php _e( '{key} is converted form data.', MWF_Config::DOMAIN ); ?>
402
  </p>
403
  <p>
404
- <?php _e( 'If Admin Email Options is a blank, Automatic Replay Email Options is used as Admin Email Options.', MWF_Config::DOMAIN ); ?>
405
  </p>
406
  <p>
407
- <b><?php _e( 'To ( E-mail address )', MWF_Config::DOMAIN ); ?></b><br />
408
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[mail_to]" value="<?php echo esc_attr( $this->get_post_data( 'mail_to' ) ); ?>" /><br />
409
- <span class="mwf_note"><?php _e( 'If empty:', MWF_Config::DOMAIN ); ?> <?php bloginfo( 'admin_email' ); ?></span>
410
  </p>
411
  <p>
412
- <b><?php _e( 'Subject', MWF_Config::DOMAIN ); ?></b><br />
413
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[admin_mail_subject]" value="<?php echo esc_attr( $this->get_post_data( 'admin_mail_subject' ) ); ?>" />
414
  </p>
415
  <p>
416
- <b><?php _e( 'Sender', MWF_Config::DOMAIN ); ?></b><br />
417
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[admin_mail_sender]" value="<?php echo esc_attr( $this->get_post_data( 'admin_mail_sender' ) ); ?>" /><br />
418
- <span class="mwf_note"><?php _e( 'If empty:', MWF_Config::DOMAIN ); ?> <?php bloginfo( 'name' ); ?></span>
419
  </p>
420
  <p>
421
- <b><?php _e( 'From ( E-mail address )', MWF_Config::DOMAIN ); ?></b><br />
422
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[admin_mail_from]" value="<?php echo esc_attr( $this->get_post_data( 'admin_mail_from' ) ); ?>" /><br />
423
- <span class="mwf_note"><?php _e( 'If empty:', MWF_Config::DOMAIN ); ?> <?php bloginfo( 'admin_email' ); ?></span>
424
  </p>
425
  <p>
426
- <b><?php _e( 'Content', MWF_Config::DOMAIN ); ?></b><br />
427
  <textarea name="<?php echo esc_attr( MWF_Config::NAME ); ?>[admin_mail_content]" cols="30" rows="10"><?php echo esc_attr( $this->get_post_data( 'admin_mail_content' ) ); ?></textarea>
428
  </p>
429
  <?php
@@ -437,32 +437,36 @@ class MW_WP_Form_Admin_Page {
437
  global $post;
438
  ?>
439
  <input type="hidden" name="<?php echo esc_attr( MWF_Config::NAME ); ?>_nonce" value="<?php echo wp_create_nonce( MWF_Config::NAME ); ?>" />
440
- <table border="0" cellpadding="0" cellspacing="0">
441
  <tr>
442
- <th><?php _e( 'Input Page URL', MWF_Config::DOMAIN ); ?></th>
443
  <td>
444
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[input_url]" value="<?php echo esc_attr( $this->get_post_data( 'input_url' ) ); ?>" />
445
  </td>
446
  </tr>
447
  <tr>
448
- <th><?php _e( 'Confirmation Page URL', MWF_Config::DOMAIN ); ?></th>
449
  <td>
450
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[confirmation_url]" value="<?php echo esc_attr( $this->get_post_data( 'confirmation_url' ) ); ?>" />
451
  </td>
452
  </tr>
453
  <tr>
454
- <th><?php _e( 'Complete Page URL', MWF_Config::DOMAIN ); ?></th>
455
  <td>
456
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[complete_url]" value="<?php echo esc_attr( $this->get_post_data( 'complete_url' ) ); ?>" />
457
  </td>
458
  </tr>
459
  <tr>
460
- <th><?php _e( 'Validation Error Page URL', MWF_Config::DOMAIN ); ?></th>
461
  <td>
462
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[validation_error_url]" value="<?php echo esc_attr( $this->get_post_data( 'validation_error_url' ) ); ?>" />
463
  </td>
464
  </tr>
465
  </table>
 
 
 
 
466
  <?php
467
  }
468
 
@@ -497,36 +501,36 @@ class MW_WP_Form_Admin_Page {
497
  // 空の隠れバリデーションフィールド(コピー元)を挿入
498
  array_unshift( $postdata, $validation_keys );
499
  ?>
500
- <b id="add-validation-btn"><?php _e( 'Add Validation rule', MWF_Config::DOMAIN ); ?></b>
501
  <?php foreach ( $postdata as $key => $value ) : $value = array_merge( $validation_keys, $value ); ?>
502
  <div class="validation-box"<?php if ( $key === 0 ) : ?> style="display:none"<?php endif; ?>>
503
  <div class="validation-remove"><b>×</b></div>
504
  <div class="validation-btn"><span><?php echo esc_attr( $value['target'] ); ?></span><b>▼</b></div>
505
  <div class="validation-content">
506
- <?php _e( 'The key which applies validation', MWF_Config::DOMAIN ); ?>:<input type="text" class="targetKey" value="<?php echo esc_attr( $value['target'] ); ?>" name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][target]" />
507
  <table border="0" cellpadding="0" cellspacing="0">
508
  <tr>
509
  <td colspan="2">
510
- <label><input type="checkbox" <?php checked( $value['noempty'], 1 ); ?> name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][noempty]" value="1" /><?php _e( 'No empty', MWF_Config::DOMAIN ); ?></label>
511
- <label><input type="checkbox" <?php checked( $value['required'], 1 ); ?> name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][required]" value="1" /><?php _e( 'No empty( with checkbox )', MWF_Config::DOMAIN ); ?></label>
512
- <label><input type="checkbox" <?php checked( $value['numeric'], 1 ); ?> name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][numeric]" value="1" /><?php _e( 'Numeric', MWF_Config::DOMAIN ); ?></label>
513
- <label><input type="checkbox" <?php checked( $value['alpha'], 1 ); ?> name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][alpha]" value="1" /><?php _e( 'Alphabet', MWF_Config::DOMAIN ); ?></label>
514
- <label><input type="checkbox" <?php checked( $value['alphanumeric'], 1 ); ?> name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][alphanumeric]" value="1" /><?php _e( 'Alphabet and Numeric', MWF_Config::DOMAIN ); ?></label>
515
- <label><input type="checkbox" <?php checked( $value['katakana'], 1 ); ?> name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][katakana]" value="1" /><?php _e( 'Japanese Katakana', MWF_Config::DOMAIN ); ?></label>
516
- <label><input type="checkbox" <?php checked( $value['hiragana'], 1 ); ?> name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][hiragana]" value="1" /><?php _e( 'Japanese Hiragana', MWF_Config::DOMAIN ); ?></label>
517
- <label><input type="checkbox" <?php checked( $value['zip'], 1 ); ?> name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][zip]" value="1" /><?php _e( 'Zip Code', MWF_Config::DOMAIN ); ?></label>
518
- <label><input type="checkbox" <?php checked( $value['tel'], 1 ); ?> name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][tel]" value="1" /><?php _e( 'Tel', MWF_Config::DOMAIN ); ?></label>
519
- <label><input type="checkbox" <?php checked( $value['mail'], 1 ); ?> name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][mail]" value="1" /><?php _e( 'E-mail', MWF_Config::DOMAIN ); ?></label>
520
- <label><input type="checkbox" <?php checked( $value['url'], 1 ); ?> name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][url]" value="1" /><?php _e( 'URL', MWF_Config::DOMAIN ); ?></label>
521
- <label><input type="checkbox" <?php checked( $value['date'], 1 ); ?> name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][date]" value="1" /><?php _e( 'Date', MWF_Config::DOMAIN ); ?></label>
522
  </td>
523
  </tr>
524
  <tr>
525
- <td style="width:20%"><?php _e( 'The key at same value', MWF_Config::DOMAIN ); ?></td>
526
  <td><input type="text" value="<?php echo esc_attr( @$value['eq']['target'] ); ?>" name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][eq][target]" /></td>
527
  </tr>
528
  <tr>
529
- <td><?php _e( 'The range of the number of characters', MWF_Config::DOMAIN ); ?></td>
530
  <td>
531
  <input type="text" value="<?php echo esc_attr( @$value['between']['min'] ); ?>" size="3" name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][between][min]" />
532
 
@@ -534,16 +538,16 @@ class MW_WP_Form_Admin_Page {
534
  </td>
535
  </tr>
536
  <tr>
537
- <td><?php _e( 'The number of the minimum characters', MWF_Config::DOMAIN ); ?></td>
538
  <td><input type="text" value="<?php echo esc_attr( @$value['minlength']['min'] ); ?>" size="3" name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][minlength][min]" /></td>
539
  </tr>
540
  <tr>
541
- <td><?php _e( 'Permitted Extension', MWF_Config::DOMAIN ); ?></td>
542
- <td><input type="text" value="<?php echo esc_attr( @$value['fileType']['types'] ); ?>" name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][fileType][types]" /> <span class="mwf_note"><?php _e( 'Example:jpg or jpg,txt,…', MWF_Config::DOMAIN ); ?></span></td>
543
  </tr>
544
  <tr>
545
- <td><?php _e( 'Permitted file size', MWF_Config::DOMAIN ); ?></td>
546
- <td><input type="text" value="<?php echo esc_attr( @$value['fileSize']['bytes'] ); ?>" name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][fileSize][bytes]" /> <span class="mwf_note"><?php _e( 'bytes', MWF_Config::DOMAIN ); ?></span></td>
547
  </tr>
548
  </table>
549
  <!-- end .validation-content --></div>
@@ -559,7 +563,7 @@ class MW_WP_Form_Admin_Page {
559
  ?>
560
  <p>
561
  <select name="<?php echo MWF_Config::NAME; ?>[style]">
562
- <option value=""><?php _e( 'Select Style', MWF_Config::DOMAIN ); ?></option>
563
  <?php foreach ( $this->styles as $style => $css ) : ?>
564
  <option value="<?php echo esc_attr( $style ); ?>" <?php selected( $this->get_post_data( 'style' ), $style ); ?>>
565
  <?php echo esc_html( $style ); ?>
@@ -595,7 +599,7 @@ class MW_WP_Form_Admin_Page {
595
  <select>
596
  <?php do_action( 'mwform_tag_generator_option' ); ?>
597
  </select>
598
- <span class="button"><?php _e( 'Add form tag', MWF_Config::DOMAIN ); ?></span>
599
  </div>
600
  <?php
601
  }
298
  <p>
299
  <span id="formkey_field">[mwform_formkey key="<?php the_ID(); ?>"]</span>
300
  <span class="mwf_note">
301
+ <?php esc_html_e( 'Copy and Paste this shortcode.', MWF_Config::DOMAIN ); ?><br />
302
+ <?php esc_html_e( 'The key to use with hook is ', MWF_Config::DOMAIN ); ?><?php echo MWF_Config::NAME; ?>-<?php echo $post->ID; ?>
303
  </span>
304
  </p>
305
  <?php
313
  global $post;
314
  ?>
315
  <p>
316
+ <label><input type="checkbox" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[querystring]" value="1" <?php checked( $this->get_post_data( 'querystring' ), 1 ); ?> /> <?php esc_html_e( 'Activate Query string of post', MWF_Config::DOMAIN ); ?></label><br />
317
+ <span class="mwf_note"><?php esc_html_e( 'If this field is active, MW WP Form get query string. And get post data from query string "post_id". You can use $post\'s property in editor.', MWF_Config::DOMAIN ); ?><br />
318
+ <?php esc_html_e( 'Example: {ID}, {post_title}, {post_meta} etc...', MWF_Config::DOMAIN ); ?></span>
319
  </p>
320
  <p>
321
+ <label><input type="checkbox" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[usedb]" value="1" <?php checked( $this->get_post_data( 'usedb' ), 1 ); ?> /> <?php esc_html_e( 'Saving inquiry data in database', MWF_Config::DOMAIN ); ?></label>
322
  </p>
323
  <table border="0" cellpadding="0" cellspacing="0" class="akismet">
324
  <tr>
325
+ <th colspan="2"><?php esc_html_e( 'Akismet Setting', MWF_Config::DOMAIN ); ?></th>
326
  </tr>
327
  <tr>
328
  <td>author</td>
337
  <td><input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[akismet_author_url]" value="<?php echo esc_attr( $this->get_post_data( 'akismet_author_url' ) ); ?>" /></td>
338
  </tr>
339
  </table>
340
+ <span class="mwf_note"><?php esc_html_e( 'Input the key to use Akismet.', MWF_Config::DOMAIN ); ?></span>
341
  <?php
342
  }
343
 
362
  global $post;
363
  ?>
364
  <p>
365
+ <?php esc_html_e( '{key} is converted form data.', MWF_Config::DOMAIN ); ?>
366
  </p>
367
  <p>
368
+ <b><?php esc_html_e( 'Subject', MWF_Config::DOMAIN ); ?></b><br />
369
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[mail_subject]" value="<?php echo esc_attr( $this->get_post_data( 'mail_subject' ) ); ?>" />
370
  </p>
371
  <p>
372
+ <b><?php esc_html_e( 'Sender', MWF_Config::DOMAIN ); ?></b><br />
373
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[mail_sender]" value="<?php echo esc_attr( $this->get_post_data( 'mail_sender' ) ); ?>" /><br />
374
+ <span class="mwf_note"><?php esc_html_e( 'If empty:', MWF_Config::DOMAIN ); ?> <?php bloginfo( 'name' ); ?></span>
375
  </p>
376
  <p>
377
+ <b><?php esc_html_e( 'From ( E-mail address )', MWF_Config::DOMAIN ); ?></b><br />
378
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[mail_from]" value="<?php echo esc_attr( $this->get_post_data( 'mail_from' ) ); ?>" /><br />
379
+ <span class="mwf_note"><?php esc_html_e( 'If empty:', MWF_Config::DOMAIN ); ?> <?php bloginfo( 'admin_email' ); ?></span>
380
  </p>
381
  <p>
382
+ <b><?php esc_html_e( 'Content', MWF_Config::DOMAIN ); ?></b><br />
383
  <textarea name="<?php echo esc_attr( MWF_Config::NAME ); ?>[mail_content]" cols="30" rows="10"><?php echo esc_attr( $this->get_post_data( 'mail_content' ) ); ?></textarea>
384
  </p>
385
  <p>
386
+ <b><?php esc_html_e( 'Automatic reply email', MWF_Config::DOMAIN ); ?></b><br />
387
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[automatic_reply_email]" value="<?php echo esc_attr( $this->get_post_data( 'automatic_reply_email') ); ?>" /><br />
388
+ <span class="mwf_note"><?php esc_html_e( 'Input the key to use as transmission to automatic reply email. {} is unnecessary.', MWF_Config::DOMAIN ); ?></span>
389
  </p>
390
  <?php
391
  }
398
  global $post;
399
  ?>
400
  <p>
401
+ <?php esc_html_e( '{key} is converted form data.', MWF_Config::DOMAIN ); ?>
402
  </p>
403
  <p>
404
+ <?php esc_html_e( 'If Admin Email Options is a blank, Automatic Replay Email Options is used as Admin Email Options.', MWF_Config::DOMAIN ); ?>
405
  </p>
406
  <p>
407
+ <b><?php esc_html_e( 'To ( E-mail address )', MWF_Config::DOMAIN ); ?></b><br />
408
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[mail_to]" value="<?php echo esc_attr( $this->get_post_data( 'mail_to' ) ); ?>" /><br />
409
+ <span class="mwf_note"><?php esc_html_e( 'If empty:', MWF_Config::DOMAIN ); ?> <?php bloginfo( 'admin_email' ); ?></span>
410
  </p>
411
  <p>
412
+ <b><?php esc_html_e( 'Subject', MWF_Config::DOMAIN ); ?></b><br />
413
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[admin_mail_subject]" value="<?php echo esc_attr( $this->get_post_data( 'admin_mail_subject' ) ); ?>" />
414
  </p>
415
  <p>
416
+ <b><?php esc_html_e( 'Sender', MWF_Config::DOMAIN ); ?></b><br />
417
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[admin_mail_sender]" value="<?php echo esc_attr( $this->get_post_data( 'admin_mail_sender' ) ); ?>" /><br />
418
+ <span class="mwf_note"><?php esc_html_e( 'If empty:', MWF_Config::DOMAIN ); ?> <?php bloginfo( 'name' ); ?></span>
419
  </p>
420
  <p>
421
+ <b><?php esc_html_e( 'From ( E-mail address )', MWF_Config::DOMAIN ); ?></b><br />
422
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[admin_mail_from]" value="<?php echo esc_attr( $this->get_post_data( 'admin_mail_from' ) ); ?>" /><br />
423
+ <span class="mwf_note"><?php esc_html_e( 'If empty:', MWF_Config::DOMAIN ); ?> <?php bloginfo( 'admin_email' ); ?></span>
424
  </p>
425
  <p>
426
+ <b><?php esc_html_e( 'Content', MWF_Config::DOMAIN ); ?></b><br />
427
  <textarea name="<?php echo esc_attr( MWF_Config::NAME ); ?>[admin_mail_content]" cols="30" rows="10"><?php echo esc_attr( $this->get_post_data( 'admin_mail_content' ) ); ?></textarea>
428
  </p>
429
  <?php
437
  global $post;
438
  ?>
439
  <input type="hidden" name="<?php echo esc_attr( MWF_Config::NAME ); ?>_nonce" value="<?php echo wp_create_nonce( MWF_Config::NAME ); ?>" />
440
+ <table border="0" cellpadding="0" cellspacing="4">
441
  <tr>
442
+ <th><?php esc_html_e( 'Input Page URL', MWF_Config::DOMAIN ); ?></th>
443
  <td>
444
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[input_url]" value="<?php echo esc_attr( $this->get_post_data( 'input_url' ) ); ?>" />
445
  </td>
446
  </tr>
447
  <tr>
448
+ <th><?php esc_html_e( 'Confirmation Page URL', MWF_Config::DOMAIN ); ?></th>
449
  <td>
450
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[confirmation_url]" value="<?php echo esc_attr( $this->get_post_data( 'confirmation_url' ) ); ?>" />
451
  </td>
452
  </tr>
453
  <tr>
454
+ <th><?php esc_html_e( 'Complete Page URL', MWF_Config::DOMAIN ); ?></th>
455
  <td>
456
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[complete_url]" value="<?php echo esc_attr( $this->get_post_data( 'complete_url' ) ); ?>" />
457
  </td>
458
  </tr>
459
  <tr>
460
+ <th><?php esc_html_e( 'Validation Error Page URL', MWF_Config::DOMAIN ); ?></th>
461
  <td>
462
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[validation_error_url]" value="<?php echo esc_attr( $this->get_post_data( 'validation_error_url' ) ); ?>" />
463
  </td>
464
  </tr>
465
  </table>
466
+ <p class="description">
467
+ <?php esc_html_e( 'This urls are the redirection urls at the time of button press. When URL setting is empty, The page redirect on the same page.', MWF_Config::DOMAIN ); ?><br />
468
+ <?php printf( esc_html__( 'When a URL doesn\'t begin http or https, %s is complemented.', MWF_Config::DOMAIN ), '<b>' . home_url() . '</b>' ); ?>
469
+ </p>
470
  <?php
471
  }
472
 
501
  // 空の隠れバリデーションフィールド(コピー元)を挿入
502
  array_unshift( $postdata, $validation_keys );
503
  ?>
504
+ <b id="add-validation-btn"><?php esc_html_e( 'Add Validation rule', MWF_Config::DOMAIN ); ?></b>
505
  <?php foreach ( $postdata as $key => $value ) : $value = array_merge( $validation_keys, $value ); ?>
506
  <div class="validation-box"<?php if ( $key === 0 ) : ?> style="display:none"<?php endif; ?>>
507
  <div class="validation-remove"><b>×</b></div>
508
  <div class="validation-btn"><span><?php echo esc_attr( $value['target'] ); ?></span><b>▼</b></div>
509
  <div class="validation-content">
510
+ <?php esc_html_e( 'The key which applies validation', MWF_Config::DOMAIN ); ?>:<input type="text" class="targetKey" value="<?php echo esc_attr( $value['target'] ); ?>" name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][target]" />
511
  <table border="0" cellpadding="0" cellspacing="0">
512
  <tr>
513
  <td colspan="2">
514
+ <label><input type="checkbox" <?php checked( $value['noempty'], 1 ); ?> name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][noempty]" value="1" /><?php esc_html_e( 'No empty', MWF_Config::DOMAIN ); ?></label>
515
+ <label><input type="checkbox" <?php checked( $value['required'], 1 ); ?> name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][required]" value="1" /><?php esc_html_e( 'No empty( with checkbox )', MWF_Config::DOMAIN ); ?></label>
516
+ <label><input type="checkbox" <?php checked( $value['numeric'], 1 ); ?> name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][numeric]" value="1" /><?php esc_html_e( 'Numeric', MWF_Config::DOMAIN ); ?></label>
517
+ <label><input type="checkbox" <?php checked( $value['alpha'], 1 ); ?> name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][alpha]" value="1" /><?php esc_html_e( 'Alphabet', MWF_Config::DOMAIN ); ?></label>
518
+ <label><input type="checkbox" <?php checked( $value['alphanumeric'], 1 ); ?> name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][alphanumeric]" value="1" /><?php esc_html_e( 'Alphabet and Numeric', MWF_Config::DOMAIN ); ?></label>
519
+ <label><input type="checkbox" <?php checked( $value['katakana'], 1 ); ?> name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][katakana]" value="1" /><?php esc_html_e( 'Japanese Katakana', MWF_Config::DOMAIN ); ?></label>
520
+ <label><input type="checkbox" <?php checked( $value['hiragana'], 1 ); ?> name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][hiragana]" value="1" /><?php esc_html_e( 'Japanese Hiragana', MWF_Config::DOMAIN ); ?></label>
521
+ <label><input type="checkbox" <?php checked( $value['zip'], 1 ); ?> name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][zip]" value="1" /><?php esc_html_e( 'Zip Code', MWF_Config::DOMAIN ); ?></label>
522
+ <label><input type="checkbox" <?php checked( $value['tel'], 1 ); ?> name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][tel]" value="1" /><?php esc_html_e( 'Tel', MWF_Config::DOMAIN ); ?></label>
523
+ <label><input type="checkbox" <?php checked( $value['mail'], 1 ); ?> name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][mail]" value="1" /><?php esc_html_e( 'E-mail', MWF_Config::DOMAIN ); ?></label>
524
+ <label><input type="checkbox" <?php checked( $value['url'], 1 ); ?> name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][url]" value="1" /><?php esc_html_e( 'URL', MWF_Config::DOMAIN ); ?></label>
525
+ <label><input type="checkbox" <?php checked( $value['date'], 1 ); ?> name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][date]" value="1" /><?php esc_html_e( 'Date', MWF_Config::DOMAIN ); ?></label>
526
  </td>
527
  </tr>
528
  <tr>
529
+ <td style="width:20%"><?php esc_html_e( 'The key at same value', MWF_Config::DOMAIN ); ?></td>
530
  <td><input type="text" value="<?php echo esc_attr( @$value['eq']['target'] ); ?>" name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][eq][target]" /></td>
531
  </tr>
532
  <tr>
533
+ <td><?php esc_html_e( 'The range of the number of characters', MWF_Config::DOMAIN ); ?></td>
534
  <td>
535
  <input type="text" value="<?php echo esc_attr( @$value['between']['min'] ); ?>" size="3" name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][between][min]" />
536
 
538
  </td>
539
  </tr>
540
  <tr>
541
+ <td><?php esc_html_e( 'The number of the minimum characters', MWF_Config::DOMAIN ); ?></td>
542
  <td><input type="text" value="<?php echo esc_attr( @$value['minlength']['min'] ); ?>" size="3" name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][minlength][min]" /></td>
543
  </tr>
544
  <tr>
545
+ <td><?php esc_html_e( 'Permitted Extension', MWF_Config::DOMAIN ); ?></td>
546
+ <td><input type="text" value="<?php echo esc_attr( @$value['fileType']['types'] ); ?>" name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][fileType][types]" /> <span class="mwf_note"><?php esc_html_e( 'Example:jpg or jpg,txt,…', MWF_Config::DOMAIN ); ?></span></td>
547
  </tr>
548
  <tr>
549
+ <td><?php esc_html_e( 'Permitted file size', MWF_Config::DOMAIN ); ?></td>
550
+ <td><input type="text" value="<?php echo esc_attr( @$value['fileSize']['bytes'] ); ?>" name="<?php echo MWF_Config::NAME; ?>[validation][<?php echo $key; ?>][fileSize][bytes]" /> <span class="mwf_note"><?php esc_html_e( 'bytes', MWF_Config::DOMAIN ); ?></span></td>
551
  </tr>
552
  </table>
553
  <!-- end .validation-content --></div>
563
  ?>
564
  <p>
565
  <select name="<?php echo MWF_Config::NAME; ?>[style]">
566
+ <option value=""><?php esc_html_e( 'Select Style', MWF_Config::DOMAIN ); ?></option>
567
  <?php foreach ( $this->styles as $style => $css ) : ?>
568
  <option value="<?php echo esc_attr( $style ); ?>" <?php selected( $this->get_post_data( 'style' ), $style ); ?>>
569
  <?php echo esc_html( $style ); ?>
599
  <select>
600
  <?php do_action( 'mwform_tag_generator_option' ); ?>
601
  </select>
602
+ <span class="button"><?php esc_html_e( 'Add form tag', MWF_Config::DOMAIN ); ?></span>
603
  </div>
604
  <?php
605
  }
system/mw_wp_form_contact_data_page.php CHANGED
@@ -135,7 +135,7 @@ class MW_WP_Form_Contact_Data_Page {
135
  ?>
136
  <form id="mw-wp-form_csv" method="post" action="<?php echo esc_url( $action ); ?>">
137
  <input type="hidden" name="test" value="hoge" />
138
- <input type="submit" value="<?php _e( 'CSV Download', MWF_Config::DOMAIN ); ?>" class="button-primary" />
139
  <?php wp_nonce_field( MWF_Config::NAME ); ?>
140
  </form>
141
  <?php
@@ -338,7 +338,7 @@ class MW_WP_Form_Contact_Data_Page {
338
  </tr>
339
  <?php endforeach; ?>
340
  <tr>
341
- <th><?php _e( 'Memo', MWF_Config::DOMAIN ); ?></th>
342
  <td><textarea name="<?php echo $this->POST_DATA_NAME; ?>[memo]" cols="50" rows="5"><?php echo $this->get_post_data( 'memo' ); ?></textarea></td>
343
  </tr>
344
  </table>
@@ -393,23 +393,23 @@ class MW_WP_Form_Contact_Data_Page {
393
  public function inquiry_data_page() {
394
  ?>
395
  <div class="wrap">
396
- <h2><?php _e( 'Inquiry data', MWF_Config::DOMAIN ); ?></h2>
397
  <p>
398
- <?php _e( 'You can see the inquiry data that are saved in the database by clicking on the link below.', MWF_Config::DOMAIN ); ?>
399
  </p>
400
  <table class="wp-list-table widefat fixed" cellspacing="0">
401
  <thead>
402
- <th class="<?php echo MWF_Config::NAME; ?>-table-title"><?php _e( 'Form title', MWF_Config::DOMAIN ); ?></th>
403
- <th class="<?php echo MWF_Config::NAME; ?>-table-count"><?php _e( 'The number of inquiries', MWF_Config::DOMAIN ); ?></th>
404
- <th class="<?php echo MWF_Config::NAME; ?>-table-date"><?php _e( 'Updated date', MWF_Config::DOMAIN ); ?></th>
405
- <th class="<?php echo MWF_Config::NAME; ?>-table-date"><?php _e( 'Created date', MWF_Config::DOMAIN ); ?></th>
406
  </thead>
407
  <tbody>
408
  <?php $i = 0; foreach ( $this->form_post_type as $post_type ) : $i ++; ?>
409
  <?php $post_type_object = get_post_type_object( $post_type ); ?>
410
  <tr <?php if ( $i % 2 == 1 ) echo 'class="alternate"'; ?>>
411
  <td class="<?php echo MWF_Config::NAME; ?>-table-title"><?php echo esc_html( $post_type_object->labels->singular_name ) ; ?></td>
412
- <td class="<?php echo MWF_Config::NAME; ?>-table-count"><a href="edit.php?post_type=<?php echo esc_attr( $post_type ); ?>"><?php echo esc_html( $this->get_count( $post_type ) ) ?> <?php _e( 'cases', MWF_Config::DOMAIN ); ?></a></td>
413
  <td class="<?php echo MWF_Config::NAME; ?>-table-date"><?php echo esc_html( $this->get_modified_datetime( $post_type ) ); ?></td>
414
  <td class="<?php echo MWF_Config::NAME; ?>-table-date"><?php echo esc_html( $this->get_created_datetime( $post_type ) ); ?></td>
415
  </tr>
135
  ?>
136
  <form id="mw-wp-form_csv" method="post" action="<?php echo esc_url( $action ); ?>">
137
  <input type="hidden" name="test" value="hoge" />
138
+ <input type="submit" value="<?php esc_attr_e( 'CSV Download', MWF_Config::DOMAIN ); ?>" class="button-primary" />
139
  <?php wp_nonce_field( MWF_Config::NAME ); ?>
140
  </form>
141
  <?php
338
  </tr>
339
  <?php endforeach; ?>
340
  <tr>
341
+ <th><?php esc_html_e( 'Memo', MWF_Config::DOMAIN ); ?></th>
342
  <td><textarea name="<?php echo $this->POST_DATA_NAME; ?>[memo]" cols="50" rows="5"><?php echo $this->get_post_data( 'memo' ); ?></textarea></td>
343
  </tr>
344
  </table>
393
  public function inquiry_data_page() {
394
  ?>
395
  <div class="wrap">
396
+ <h2><?php esc_html_e( 'Inquiry data', MWF_Config::DOMAIN ); ?></h2>
397
  <p>
398
+ <?php esc_html_e( 'You can see the inquiry data that are saved in the database by clicking on the link below.', MWF_Config::DOMAIN ); ?>
399
  </p>
400
  <table class="wp-list-table widefat fixed" cellspacing="0">
401
  <thead>
402
+ <th class="<?php echo MWF_Config::NAME; ?>-table-title"><?php esc_html_e( 'Form title', MWF_Config::DOMAIN ); ?></th>
403
+ <th class="<?php echo MWF_Config::NAME; ?>-table-count"><?php esc_html_e( 'The number of inquiries', MWF_Config::DOMAIN ); ?></th>
404
+ <th class="<?php echo MWF_Config::NAME; ?>-table-date"><?php esc_html_e( 'Updated date', MWF_Config::DOMAIN ); ?></th>
405
+ <th class="<?php echo MWF_Config::NAME; ?>-table-date"><?php esc_html_e( 'Created date', MWF_Config::DOMAIN ); ?></th>
406
  </thead>
407
  <tbody>
408
  <?php $i = 0; foreach ( $this->form_post_type as $post_type ) : $i ++; ?>
409
  <?php $post_type_object = get_post_type_object( $post_type ); ?>
410
  <tr <?php if ( $i % 2 == 1 ) echo 'class="alternate"'; ?>>
411
  <td class="<?php echo MWF_Config::NAME; ?>-table-title"><?php echo esc_html( $post_type_object->labels->singular_name ) ; ?></td>
412
+ <td class="<?php echo MWF_Config::NAME; ?>-table-count"><a href="edit.php?post_type=<?php echo esc_attr( $post_type ); ?>"><?php echo esc_html( $this->get_count( $post_type ) ) ?> <?php esc_html_e( 'cases', MWF_Config::DOMAIN ); ?></a></td>
413
  <td class="<?php echo MWF_Config::NAME; ?>-table-date"><?php echo esc_html( $this->get_modified_datetime( $post_type ) ); ?></td>
414
  <td class="<?php echo MWF_Config::NAME; ?>-table-date"><?php echo esc_html( $this->get_created_datetime( $post_type ) ); ?></td>
415
  </tr>