MW WP Form - Version 2.13.0

Version Description

  • Added : Added the button elements.
  • Added : Added filter hook mwform_custom_mail_tag
  • Added : Added Method MW_WP_Form_Data::get_view_flg()
Download this release

Release Info

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

Code changes from version 2.12.0 to 2.13.0

Files changed (39) hide show
  1. classes/controllers/class.main.php +3 -2
  2. classes/form-fields/class.akismet_error.php +1 -1
  3. classes/form-fields/class.back-button.php +7 -6
  4. classes/form-fields/class.button-back.php +94 -0
  5. classes/form-fields/class.button-button.php +101 -0
  6. classes/form-fields/class.button-confirm.php +94 -0
  7. classes/form-fields/class.button-submit.php +119 -0
  8. classes/form-fields/class.button.php +4 -4
  9. classes/form-fields/class.checkbox.php +1 -1
  10. classes/form-fields/class.confirm-button.php +4 -4
  11. classes/form-fields/class.custom-mail-tag.php +1 -1
  12. classes/form-fields/class.datepicker.php +1 -1
  13. classes/form-fields/class.email.php +1 -1
  14. classes/form-fields/class.error.php +1 -1
  15. classes/form-fields/class.file.php +1 -1
  16. classes/form-fields/class.image.php +1 -1
  17. classes/form-fields/class.number.php +1 -1
  18. classes/form-fields/class.password.php +1 -1
  19. classes/form-fields/class.radio.php +1 -1
  20. classes/form-fields/class.range.php +1 -1
  21. classes/form-fields/class.select.php +1 -1
  22. classes/form-fields/class.submit-button.php +4 -4
  23. classes/form-fields/class.submit.php +4 -4
  24. classes/form-fields/class.tel.php +1 -1
  25. classes/form-fields/class.text.php +1 -1
  26. classes/form-fields/class.textarea.php +1 -1
  27. classes/form-fields/class.url.php +1 -1
  28. classes/form-fields/class.zip.php +1 -1
  29. classes/models/class.abstract-form-field.php +16 -6
  30. classes/models/class.data.php +25 -2
  31. classes/models/class.form.php +50 -2
  32. classes/services/class.mail-parser.php +12 -3
  33. js/admin.js +28 -10
  34. languages/mw-wp-form-ja.mo +0 -0
  35. languages/mw-wp-form-ja.po +90 -37
  36. languages/mw-wp-form.pot +73 -34
  37. mw-wp-form.php +2 -2
  38. readme.txt +6 -1
  39. templates/admin/tag-generator.php +5 -2
classes/controllers/class.main.php CHANGED
@@ -2,11 +2,11 @@
2
  /**
3
  * Name : MW WP Form Main Controller
4
  * Description: フロントエンドにおいて、適切な画面にリダイレクトさせる
5
- * Version : 1.3.1
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : December 23, 2014
9
- * Modified : April 4, 2016
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
@@ -141,6 +141,7 @@ class MW_WP_Form_Main_Controller {
141
  );
142
  $url = $this->Redirected->get_url();
143
  $view_flg = $this->Redirected->get_view_flg();
 
144
 
145
  // confirm もしくは complete のとき
146
  if ( in_array( $post_condition, array( 'confirm', 'complete' ) ) ) {
2
  /**
3
  * Name : MW WP Form Main Controller
4
  * Description: フロントエンドにおいて、適切な画面にリダイレクトさせる
5
+ * Version : 1.4.0
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : December 23, 2014
9
+ * Modified : December 27, 2016
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
141
  );
142
  $url = $this->Redirected->get_url();
143
  $view_flg = $this->Redirected->get_view_flg();
144
+ $this->Data->set_view_flg( $view_flg );
145
 
146
  // confirm もしくは complete のとき
147
  if ( in_array( $post_condition, array( 'confirm', 'complete' ) ) ) {
classes/form-fields/class.akismet_error.php CHANGED
@@ -14,7 +14,7 @@ class MW_WP_Form_Field_Akismet_Error extends MW_WP_Form_Abstract_Form_Field {
14
 
15
  /**
16
  * $type
17
- * フォームタグの種類 input|select|button|error|other
18
  * @var string
19
  */
20
  public $type = 'error';
14
 
15
  /**
16
  * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
  * @var string
19
  */
20
  public $type = 'error';
classes/form-fields/class.back-button.php CHANGED
@@ -2,11 +2,11 @@
2
  /**
3
  * Name : MW WP Form Field Back Button
4
  * Description: 戻るボタンを出力
5
- * Version : 1.6.0
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : December 14, 2012
9
- * Modified : November 14, 2015
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
@@ -14,10 +14,10 @@ class MW_WP_Form_Field_Back_Button extends MW_WP_Form_Abstract_Form_Field {
14
 
15
  /**
16
  * $type
17
- * フォームタグの種類 input|select|button|error|other
18
  * @var string
19
  */
20
- public $type = 'button';
21
 
22
  /**
23
  * set_names
@@ -27,7 +27,7 @@ class MW_WP_Form_Field_Back_Button extends MW_WP_Form_Abstract_Form_Field {
27
  protected function set_names() {
28
  return array(
29
  'shortcode_name' => 'mwform_backButton',
30
- 'display_name' => __( 'Back', 'mw-wp-form' ),
31
  );
32
  }
33
 
@@ -75,7 +75,8 @@ class MW_WP_Form_Field_Back_Button extends MW_WP_Form_Abstract_Form_Field {
75
  </p>
76
  <p>
77
  <strong><?php esc_html_e( 'String on the button', 'mw-wp-form' ); ?></strong>
78
- <input type="text" name="value" />
 
79
  </p>
80
  <?php
81
  }
2
  /**
3
  * Name : MW WP Form Field Back Button
4
  * Description: 戻るボタンを出力
5
+ * Version : 1.6.1
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : December 14, 2012
9
+ * Modified : December 26, 2016
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
14
 
15
  /**
16
  * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
  * @var string
19
  */
20
+ public $type = 'input_button';
21
 
22
  /**
23
  * set_names
27
  protected function set_names() {
28
  return array(
29
  'shortcode_name' => 'mwform_backButton',
30
+ 'display_name' => __( 'Back Button', 'mw-wp-form' ),
31
  );
32
  }
33
 
75
  </p>
76
  <p>
77
  <strong><?php esc_html_e( 'String on the button', 'mw-wp-form' ); ?></strong>
78
+ <?php $value = $this->get_value_for_generator( 'value', $options ); ?>
79
+ <input type="text" name="value" value="<?php echo esc_attr( $value ); ?>" />
80
  </p>
81
  <?php
82
  }
classes/form-fields/class.button-back.php ADDED
@@ -0,0 +1,94 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Name : MW WP Form Field Button Back
4
+ * Description: 戻るボタン（button）を出力
5
+ * Version : 1.0.0
6
+ * Author : Takashi Kitajima
7
+ * Author URI : http://2inc.org
8
+ * Created : December 26, 2016
9
+ * Modified :
10
+ * License : GPLv2 or later
11
+ * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
+ */
13
+ class MW_WP_Form_Field_Button_Back extends MW_WP_Form_Abstract_Form_Field {
14
+
15
+ /**
16
+ * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
+ * @var string
19
+ */
20
+ public $type = 'button';
21
+
22
+ /**
23
+ * set_names
24
+ * shortcode_name、display_nameを定義。各子クラスで上書きする。
25
+ * @return array shortcode_name, display_name
26
+ */
27
+ protected function set_names() {
28
+ return array(
29
+ 'shortcode_name' => 'mwform_bback',
30
+ 'display_name' => __( 'Back Button', 'mw-wp-form' ),
31
+ );
32
+ }
33
+
34
+ /**
35
+ * set_defaults
36
+ * $this->defaultsを設定し返す
37
+ * @return array defaults
38
+ */
39
+ protected function set_defaults() {
40
+ return array(
41
+ 'class' => null,
42
+ 'value' => 'back',
43
+ 'element_content' => __( 'Back', 'mw-wp-form' ),
44
+ );
45
+ }
46
+
47
+ /**
48
+ * input_page
49
+ * 入力ページでのフォーム項目を返す
50
+ * @return string HTML
51
+ */
52
+ protected function input_page() {
53
+ }
54
+
55
+ /**
56
+ * confirm_page
57
+ * 確認ページでのフォーム項目を返す
58
+ * @return string HTML
59
+ */
60
+ protected function confirm_page() {
61
+ return $this->Form->button_submit(
62
+ MWF_Config::BACK_BUTTON,
63
+ $this->atts['value'],
64
+ array(
65
+ 'class' => $this->atts['class'],
66
+ ),
67
+ $this->element_content
68
+ );
69
+ }
70
+
71
+ /**
72
+ * add_mwform_tag_generator
73
+ * フォームタグジェネレーター
74
+ */
75
+ public function mwform_tag_generator_dialog( array $options = array() ) {
76
+ ?>
77
+ <p>
78
+ <strong>class</strong>
79
+ <?php $class = $this->get_value_for_generator( 'class', $options ); ?>
80
+ <input type="text" name="class" value="<?php echo esc_attr( $class ); ?>" />
81
+ </p>
82
+ <p>
83
+ <strong><?php esc_html_e( 'Value', 'mw-wp-form' ); ?></strong>
84
+ <?php $value = $this->get_value_for_generator( 'value', $options ); ?>
85
+ <input type="text" name="value" value="<?php echo esc_attr( $value ); ?>" />
86
+ </p>
87
+ <p>
88
+ <strong><?php esc_html_e( 'String on the button', 'mw-wp-form' ); ?></strong>
89
+ <?php $element_content = $this->get_value_for_generator( 'element_content', $options ); ?>
90
+ <input type="text" name="element_content" value="<?php echo esc_attr( $element_content ); ?>" />
91
+ </p>
92
+ <?php
93
+ }
94
+ }
classes/form-fields/class.button-button.php ADDED
@@ -0,0 +1,101 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Name : MW WP Form Field Button Button
4
+ * Description: ボタン（button）を出力
5
+ * Version : 1.0.0
6
+ * Author : Takashi Kitajima
7
+ * Author URI : http://2inc.org
8
+ * Created : December 26, 2016
9
+ * Modified :
10
+ * License : GPLv2 or later
11
+ * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
+ */
13
+ class MW_WP_Form_Field_Button_Button extends MW_WP_Form_Abstract_Form_Field {
14
+
15
+ /**
16
+ * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
+ * @var string
19
+ */
20
+ public $type = 'button';
21
+
22
+ /**
23
+ * set_names
24
+ * shortcode_name、display_nameを定義。各子クラスで上書きする。
25
+ * @return array shortcode_name, display_name
26
+ */
27
+ protected function set_names() {
28
+ return array(
29
+ 'shortcode_name' => 'mwform_bbutton',
30
+ 'display_name' => __( 'Button', 'mw-wp-form' ),
31
+ );
32
+ }
33
+
34
+ /**
35
+ * set_defaults
36
+ * $this->defaultsを設定し返す
37
+ * @return array defaults
38
+ */
39
+ protected function set_defaults() {
40
+ return array(
41
+ 'name' => '',
42
+ 'class' => null,
43
+ 'value' => 'button',
44
+ 'element_content' => __( 'button', 'mw-wp-form' ),
45
+ );
46
+ }
47
+
48
+ /**
49
+ * input_page
50
+ * 入力ページでのフォーム項目を返す
51
+ * @return string HTML
52
+ */
53
+ protected function input_page() {
54
+ return $this->Form->button_button(
55
+ $this->atts['name'],
56
+ $this->atts['value'],
57
+ array(
58
+ 'class' => $this->atts['class'],
59
+ ),
60
+ $this->element_content
61
+ );
62
+ }
63
+
64
+ /**
65
+ * confirm_page
66
+ * 確認ページでのフォーム項目を返す
67
+ * @return string HTML
68
+ */
69
+ protected function confirm_page() {
70
+ return $this->input_page();
71
+ }
72
+
73
+ /**
74
+ * add_mwform_tag_generator
75
+ * フォームタグジェネレーター
76
+ */
77
+ public function mwform_tag_generator_dialog( array $options = array() ) {
78
+ ?>
79
+ <p>
80
+ <strong>name<span class="mwf_require">*</span></strong>
81
+ <?php $name = $this->get_value_for_generator( 'name', $options ); ?>
82
+ <input type="text" name="name" value="<?php echo esc_attr( $name ); ?>" />
83
+ </p>
84
+ <p>
85
+ <strong>class</strong>
86
+ <?php $class = $this->get_value_for_generator( 'class', $options ); ?>
87
+ <input type="text" name="class" value="<?php echo esc_attr( $class ); ?>" />
88
+ </p>
89
+ <p>
90
+ <strong><?php esc_html_e( 'Value', 'mw-wp-form' ); ?></strong>
91
+ <?php $value = $this->get_value_for_generator( 'value', $options ); ?>
92
+ <input type="text" name="value" value="<?php echo esc_attr( $value ); ?>" />
93
+ </p>
94
+ <p>
95
+ <strong><?php esc_html_e( 'String on the button', 'mw-wp-form' ); ?></strong>
96
+ <?php $element_content = $this->get_value_for_generator( 'element_content', $options ); ?>
97
+ <input type="text" name="element_content" value="<?php echo esc_attr( $element_content ); ?>" />
98
+ </p>
99
+ <?php
100
+ }
101
+ }
classes/form-fields/class.button-confirm.php ADDED
@@ -0,0 +1,94 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Name : MW WP Form Field Button Confirm
4
+ * Description: 確認ボタン（button）を出力
5
+ * Version : 1.0.0
6
+ * Author : Takashi Kitajima
7
+ * Author URI : http://2inc.org
8
+ * Created : December 26, 2016
9
+ * Modified :
10
+ * License : GPLv2 or later
11
+ * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
+ */
13
+ class MW_WP_Form_Field_Button_Confirm extends MW_WP_Form_Abstract_Form_Field {
14
+
15
+ /**
16
+ * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
+ * @var string
19
+ */
20
+ public $type = 'button';
21
+
22
+ /**
23
+ * set_names
24
+ * shortcode_name、display_nameを定義。各子クラスで上書きする。
25
+ * @return array shortcode_name, display_name
26
+ */
27
+ protected function set_names() {
28
+ return array(
29
+ 'shortcode_name' => 'mwform_bconfirm',
30
+ 'display_name' => __( 'Confirm Button', 'mw-wp-form' ),
31
+ );
32
+ }
33
+
34
+ /**
35
+ * set_defaults
36
+ * $this->defaultsを設定し返す
37
+ * @return array defaults
38
+ */
39
+ protected function set_defaults() {
40
+ return array(
41
+ 'class' => null,
42
+ 'value' => 'confirm',
43
+ 'element_content' => __( 'Confirm', 'mw-wp-form' ),
44
+ );
45
+ }
46
+
47
+ /**
48
+ * input_page
49
+ * 入力ページでのフォーム項目を返す
50
+ * @return string HTML
51
+ */
52
+ protected function input_page() {
53
+ return $this->Form->button_submit(
54
+ MWF_Config::CONFIRM_BUTTON,
55
+ $this->atts['value'],
56
+ array(
57
+ 'class' => $this->atts['class'],
58
+ ),
59
+ $this->element_content
60
+ );
61
+ }
62
+
63
+ /**
64
+ * confirm_page
65
+ * 確認ページでのフォーム項目を返す
66
+ * @return string HTML
67
+ */
68
+ protected function confirm_page() {
69
+ }
70
+
71
+ /**
72
+ * add_mwform_tag_generator
73
+ * フォームタグジェネレーター
74
+ */
75
+ public function mwform_tag_generator_dialog( array $options = array() ) {
76
+ ?>
77
+ <p>
78
+ <strong>class</strong>
79
+ <?php $class = $this->get_value_for_generator( 'class', $options ); ?>
80
+ <input type="text" name="class" value="<?php echo esc_attr( $class ); ?>" />
81
+ </p>
82
+ <p>
83
+ <strong><?php esc_html_e( 'Value', 'mw-wp-form' ); ?></strong>
84
+ <?php $value = $this->get_value_for_generator( 'value', $options ); ?>
85
+ <input type="text" name="value" value="<?php echo esc_attr( $value ); ?>" />
86
+ </p>
87
+ <p>
88
+ <strong><?php esc_html_e( 'String on the button', 'mw-wp-form' ); ?></strong>
89
+ <?php $element_content = $this->get_value_for_generator( 'element_content', $options ); ?>
90
+ <input type="text" name="element_content" value="<?php echo esc_attr( $element_content ); ?>" />
91
+ </p>
92
+ <?php
93
+ }
94
+ }
classes/form-fields/class.button-submit.php ADDED
@@ -0,0 +1,119 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Name : MW WP Form Field Button Submit
4
+ * Description: 送信ボタン（button）を出力
5
+ * Version : 1.0.0
6
+ * Author : Takashi Kitajima
7
+ * Author URI : http://2inc.org
8
+ * Created : December 26, 2016
9
+ * Modified :
10
+ * License : GPLv2 or later
11
+ * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
+ */
13
+ class MW_WP_Form_Field_Button_Submit extends MW_WP_Form_Abstract_Form_Field {
14
+
15
+ /**
16
+ * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
+ * @var string
19
+ */
20
+ public $type = 'button';
21
+
22
+ /**
23
+ * set_names
24
+ * shortcode_name、display_nameを定義。各子クラスで上書きする。
25
+ * @return array shortcode_name, display_name
26
+ */
27
+ protected function set_names() {
28
+ return array(
29
+ 'shortcode_name' => 'mwform_bsubmit',
30
+ 'display_name' => __( 'Submit Button', 'mw-wp-form' ),
31
+ );
32
+ }
33
+
34
+ /**
35
+ * set_defaults
36
+ * $this->defaultsを設定し返す
37
+ * @return array defaults
38
+ */
39
+ protected function set_defaults() {
40
+ return array(
41
+ 'name' => '',
42
+ 'class' => null,
43
+ 'value' => 'send',
44
+ 'element_content' => __( 'Send', 'mw-wp-form' ),
45
+ 'display_input' => 'false',
46
+ );
47
+ }
48
+
49
+ /**
50
+ * input_page
51
+ * 入力ページでのフォーム項目を返す
52
+ * @return string HTML
53
+ */
54
+ protected function input_page() {
55
+ if ( $this->atts['display_input'] === 'false' ) {
56
+ return;
57
+ }
58
+
59
+ return $this->Form->button_submit(
60
+ $this->atts['name'],
61
+ $this->atts['value'],
62
+ array(
63
+ 'class' => $this->atts['class'],
64
+ ),
65
+ $this->element_content
66
+ );
67
+ }
68
+
69
+ /**
70
+ * confirm_page
71
+ * 確認ページでのフォーム項目を返す
72
+ * @return string HTML
73
+ */
74
+ protected function confirm_page() {
75
+ return $this->Form->button_submit(
76
+ $this->atts['name'],
77
+ $this->atts['value'],
78
+ array(
79
+ 'class' => $this->atts['class'],
80
+ ),
81
+ $this->element_content
82
+ );
83
+ }
84
+
85
+ /**
86
+ * add_mwform_tag_generator
87
+ * フォームタグジェネレーター
88
+ */
89
+ public function mwform_tag_generator_dialog( array $options = array() ) {
90
+ ?>
91
+ <p>
92
+ <strong>name<span class="mwf_require">*</span></strong>
93
+ <?php $name = $this->get_value_for_generator( 'name', $options ); ?>
94
+ <input type="text" name="name" value="<?php echo esc_attr( $name ); ?>" />
95
+ </p>
96
+ <p>
97
+ <strong>class</strong>
98
+ <?php $class = $this->get_value_for_generator( 'class', $options ); ?>
99
+ <input type="text" name="class" value="<?php echo esc_attr( $class ); ?>" />
100
+ </p>
101
+ <p>
102
+ <strong><?php esc_html_e( 'Value', 'mw-wp-form' ); ?></strong>
103
+ <?php $value = $this->get_value_for_generator( 'value', $options ); ?>
104
+ <input type="text" name="value" value="<?php echo esc_attr( $value ); ?>" />
105
+ </p>
106
+ <p>
107
+ <strong><?php esc_html_e( 'String on the button', 'mw-wp-form' ); ?></strong>
108
+ <?php $element_content = $this->get_value_for_generator( 'element_content', $options ); ?>
109
+ <input type="text" name="element_content" value="<?php echo esc_attr( $element_content ); ?>" />
110
+ </p>
111
+ <p>
112
+ <strong><?php esc_html_e( 'Display on input page', 'mw-wp-form' ); ?></strong>
113
+ <?php $display_input = $this->get_value_for_generator( 'display_input', $options ); ?>
114
+ <input type="checkbox" name="display_input" value="true" <?php checked( 'true', $display_input ); ?> />
115
+ <?php esc_html_e( 'Display', 'mw-wp-form' ); ?>
116
+ </p>
117
+ <?php
118
+ }
119
+ }
classes/form-fields/class.button.php CHANGED
@@ -2,11 +2,11 @@
2
  /**
3
  * Name : MW WP Form Field Button
4
  * Description: ボタンを出力
5
- * Version : 1.6.0
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : December 14, 2012
9
- * Modified : November 14, 2015
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
@@ -14,10 +14,10 @@ class MW_WP_Form_Field_Button extends MW_WP_Form_Abstract_Form_Field {
14
 
15
  /**
16
  * $type
17
- * フォームタグの種類 input|select|button|error|other
18
  * @var string
19
  */
20
- public $type = 'button';
21
 
22
  /**
23
  * set_names
2
  /**
3
  * Name : MW WP Form Field Button
4
  * Description: ボタンを出力
5
+ * Version : 1.6.1
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : December 14, 2012
9
+ * Modified : December 26, 2016
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
14
 
15
  /**
16
  * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
  * @var string
19
  */
20
+ public $type = 'input_button';
21
 
22
  /**
23
  * set_names
classes/form-fields/class.checkbox.php CHANGED
@@ -14,7 +14,7 @@ class MW_WP_Form_Field_Checkbox extends MW_WP_Form_Abstract_Form_Field {
14
 
15
  /**
16
  * $type
17
- * フォームタグの種類 input|select|button|error|other
18
  * @var string
19
  */
20
  public $type = 'select';
14
 
15
  /**
16
  * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
  * @var string
19
  */
20
  public $type = 'select';
classes/form-fields/class.confirm-button.php CHANGED
@@ -2,11 +2,11 @@
2
  /**
3
  * Name : MW WP Form Field Confirm Button
4
  * Description: 確認ボタンを出力
5
- * Version : 1.6.0
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : December 14, 2012
9
- * Modified : November 14, 2015
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
@@ -14,10 +14,10 @@ class MW_WP_Form_Field_Confirm_Button extends MW_WP_Form_Abstract_Form_Field {
14
 
15
  /**
16
  * $type
17
- * フォームタグの種類 input|select|button|error|other
18
  * @var string
19
  */
20
- public $type = 'button';
21
 
22
  /**
23
  * set_names
2
  /**
3
  * Name : MW WP Form Field Confirm Button
4
  * Description: 確認ボタンを出力
5
+ * Version : 1.6.1
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : December 14, 2012
9
+ * Modified : December 26, 2016
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
14
 
15
  /**
16
  * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
  * @var string
19
  */
20
+ public $type = 'input_button';
21
 
22
  /**
23
  * set_names
classes/form-fields/class.custom-mail-tag.php CHANGED
@@ -14,7 +14,7 @@ class MW_WP_Form_Field_Custom_Mail_Tag extends MW_WP_Form_Abstract_Form_Field {
14
 
15
  /**
16
  * $type
17
- * フォームタグの種類 input|select|button|error|other
18
  * @var string
19
  */
20
  public $type = 'other';
14
 
15
  /**
16
  * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
  * @var string
19
  */
20
  public $type = 'other';
classes/form-fields/class.datepicker.php CHANGED
@@ -14,7 +14,7 @@ class MW_WP_Form_Field_Datepicker extends MW_WP_Form_Abstract_Form_Field {
14
 
15
  /**
16
  * $type
17
- * フォームタグの種類 input|select|button|error|other
18
  * @var string
19
  */
20
  public $type = 'input';
14
 
15
  /**
16
  * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
  * @var string
19
  */
20
  public $type = 'input';
classes/form-fields/class.email.php CHANGED
@@ -14,7 +14,7 @@ class MW_WP_Form_Field_Email extends MW_WP_Form_Abstract_Form_Field {
14
 
15
  /**
16
  * $type
17
- * フォームタグの種類 input|select|button|error|other
18
  * @var string
19
  */
20
  public $type = 'input';
14
 
15
  /**
16
  * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
  * @var string
19
  */
20
  public $type = 'input';
classes/form-fields/class.error.php CHANGED
@@ -14,7 +14,7 @@ class MW_WP_Form_Field_Error extends MW_WP_Form_Abstract_Form_Field {
14
 
15
  /**
16
  * $type
17
- * フォームタグの種類 input|select|button|error|other
18
  * @var string
19
  */
20
  public $type = 'error';
14
 
15
  /**
16
  * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
  * @var string
19
  */
20
  public $type = 'error';
classes/form-fields/class.file.php CHANGED
@@ -14,7 +14,7 @@ class MW_WP_Form_Field_File extends MW_WP_Form_Abstract_Form_Field {
14
 
15
  /**
16
  * $type
17
- * フォームタグの種類 input|select|button|error|other
18
  * @var string
19
  */
20
  public $type = 'input';
14
 
15
  /**
16
  * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
  * @var string
19
  */
20
  public $type = 'input';
classes/form-fields/class.image.php CHANGED
@@ -14,7 +14,7 @@ class MW_WP_Form_Field_Image extends MW_WP_Form_Abstract_Form_Field {
14
 
15
  /**
16
  * $type
17
- * フォームタグの種類 input|select|button|error|other
18
  * @var string
19
  */
20
  public $type = 'input';
14
 
15
  /**
16
  * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
  * @var string
19
  */
20
  public $type = 'input';
classes/form-fields/class.number.php CHANGED
@@ -14,7 +14,7 @@ class MW_WP_Form_Field_Number extends MW_WP_Form_Abstract_Form_Field {
14
 
15
  /**
16
  * $type
17
- * フォームタグの種類 input|select|button|error|other
18
  * @var string
19
  */
20
  public $type = 'input';
14
 
15
  /**
16
  * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
  * @var string
19
  */
20
  public $type = 'input';
classes/form-fields/class.password.php CHANGED
@@ -14,7 +14,7 @@ class MW_WP_Form_Field_Password extends MW_WP_Form_Abstract_Form_Field {
14
 
15
  /**
16
  * $type
17
- * フォームタグの種類 input|select|button|error|other
18
  * @var string
19
  */
20
  public $type = 'input';
14
 
15
  /**
16
  * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
  * @var string
19
  */
20
  public $type = 'input';
classes/form-fields/class.radio.php CHANGED
@@ -14,7 +14,7 @@ class MW_WP_Form_Field_Radio extends MW_WP_Form_Abstract_Form_Field {
14
 
15
  /**
16
  * $type
17
- * フォームタグの種類 input|select|button|error|other
18
  * @var string
19
  */
20
  public $type = 'select';
14
 
15
  /**
16
  * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
  * @var string
19
  */
20
  public $type = 'select';
classes/form-fields/class.range.php CHANGED
@@ -14,7 +14,7 @@ class MW_WP_Form_Field_Range extends MW_WP_Form_Abstract_Form_Field {
14
 
15
  /**
16
  * $type
17
- * フォームタグの種類 input|select|button|error|other
18
  * @var string
19
  */
20
  public $type = 'input';
14
 
15
  /**
16
  * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
  * @var string
19
  */
20
  public $type = 'input';
classes/form-fields/class.select.php CHANGED
@@ -14,7 +14,7 @@ class MW_WP_Form_Field_Select extends MW_WP_Form_Abstract_Form_Field {
14
 
15
  /**
16
  * $type
17
- * フォームタグの種類 input|select|button|error|other
18
  * @var string
19
  */
20
  public $type = 'select';
14
 
15
  /**
16
  * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
  * @var string
19
  */
20
  public $type = 'select';
classes/form-fields/class.submit-button.php CHANGED
@@ -2,11 +2,11 @@
2
  /**
3
  * Name : MW WP Form Field Submit Button
4
  * Description: 確認ボタンと送信ボタンを自動出力
5
- * Version : 1.6.0
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : December 14, 2012
9
- * Modified : November 14, 2015
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
@@ -14,10 +14,10 @@ class MW_WP_Form_Field_Submit_Button extends MW_WP_Form_Abstract_Form_Field {
14
 
15
  /**
16
  * $type
17
- * フォームタグの種類 input|select|button|error|other
18
  * @var string
19
  */
20
- public $type = 'button';
21
 
22
  /**
23
  * set_names
2
  /**
3
  * Name : MW WP Form Field Submit Button
4
  * Description: 確認ボタンと送信ボタンを自動出力
5
+ * Version : 1.6.1
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : December 14, 2012
9
+ * Modified : December 26, 2016
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
14
 
15
  /**
16
  * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
  * @var string
19
  */
20
+ public $type = 'input_button';
21
 
22
  /**
23
  * set_names
classes/form-fields/class.submit.php CHANGED
@@ -2,11 +2,11 @@
2
  /**
3
  * Name : MW WP Form Field Submit
4
  * Description: 送信ボタンを出力
5
- * Version : 1.6.0
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : December 14, 2012
9
- * Modified : November 14, 2015
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
@@ -14,10 +14,10 @@ class MW_WP_Form_Field_Submit extends MW_WP_Form_Abstract_Form_Field {
14
 
15
  /**
16
  * $type
17
- * フォームタグの種類 input|select|button|error|other
18
  * @var string
19
  */
20
- public $type = 'button';
21
 
22
  /**
23
  * set_names
2
  /**
3
  * Name : MW WP Form Field Submit
4
  * Description: 送信ボタンを出力
5
+ * Version : 1.6.1
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : December 14, 2012
9
+ * Modified : December 26, 2016
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
14
 
15
  /**
16
  * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
  * @var string
19
  */
20
+ public $type = 'input_button';
21
 
22
  /**
23
  * set_names
classes/form-fields/class.tel.php CHANGED
@@ -14,7 +14,7 @@ class MW_WP_Form_Field_Tel extends MW_WP_Form_Abstract_Form_Field {
14
 
15
  /**
16
  * $type
17
- * フォームタグの種類 input|select|button|error|other
18
  * @var string
19
  */
20
  public $type = 'input';
14
 
15
  /**
16
  * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
  * @var string
19
  */
20
  public $type = 'input';
classes/form-fields/class.text.php CHANGED
@@ -14,7 +14,7 @@ class MW_WP_Form_Field_Text extends MW_WP_Form_Abstract_Form_Field {
14
 
15
  /**
16
  * $type
17
- * フォームタグの種類 input|select|button|error|other
18
  * @var string
19
  */
20
  public $type = 'input';
14
 
15
  /**
16
  * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
  * @var string
19
  */
20
  public $type = 'input';
classes/form-fields/class.textarea.php CHANGED
@@ -14,7 +14,7 @@ class MW_WP_Form_Field_Textarea extends MW_WP_Form_Abstract_Form_Field {
14
 
15
  /**
16
  * $type
17
- * フォームタグの種類 input|select|button|error|other
18
  * @var string
19
  */
20
  public $type = 'input';
14
 
15
  /**
16
  * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
  * @var string
19
  */
20
  public $type = 'input';
classes/form-fields/class.url.php CHANGED
@@ -14,7 +14,7 @@ class MW_WP_Form_Field_Url extends MW_WP_Form_Abstract_Form_Field {
14
 
15
  /**
16
  * $type
17
- * フォームタグの種類 input|select|button|error|other
18
  * @var string
19
  */
20
  public $type = 'input';
14
 
15
  /**
16
  * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
  * @var string
19
  */
20
  public $type = 'input';
classes/form-fields/class.zip.php CHANGED
@@ -14,7 +14,7 @@ class MW_WP_Form_Field_Zip extends MW_WP_Form_Abstract_Form_Field {
14
 
15
  /**
16
  * $type
17
- * フォームタグの種類 input|select|button|error|other
18
  * @var string
19
  */
20
  public $type = 'input';
14
 
15
  /**
16
  * $type
17
+ * フォームタグの種類 input|select|button|input_button|error|other
18
  * @var string
19
  */
20
  public $type = 'input';
classes/models/class.abstract-form-field.php CHANGED
@@ -2,11 +2,11 @@
2
  /**
3
  * Name : MW WP Form Abstract Form Field
4
  * Description: フォームフィールドの抽象クラス
5
- * Version : 1.7.5
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : December 14, 2012
9
- * Modified : November 17, 2015
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
@@ -65,7 +65,7 @@ abstract class MW_WP_Form_Abstract_Form_Field {
65
 
66
  /**
67
  * $type
68
- * フォームタグの種類 input|select|button|error|other
69
  * @var string
70
  */
71
  protected $type = 'other';
@@ -82,6 +82,12 @@ abstract class MW_WP_Form_Abstract_Form_Field {
82
  'arg2' => '',
83
  );
84
 
 
 
 
 
 
 
85
  /**
86
  * __construct
87
  */
@@ -156,10 +162,12 @@ abstract class MW_WP_Form_Abstract_Form_Field {
156
  * input_page
157
  * 入力ページでのフォーム項目を返す
158
  * @param array $atts
 
159
  * @return string HTML
160
  */
161
  abstract protected function input_page();
162
- public function _input_page( $atts ) {
 
163
  if ( array_key_exists( 'value', $this->defaults ) && isset( $atts['name'] ) && !isset( $atts['value'] ) ) {
164
  $atts['value'] = apply_filters(
165
  'mwform_value_' . $this->form_key,
@@ -175,10 +183,12 @@ abstract class MW_WP_Form_Abstract_Form_Field {
175
  * confirm_page
176
  * 確認ページでのフォーム項目を返す
177
  * @param array $atts
 
178
  * @return string HTML
179
  */
180
  abstract protected function confirm_page();
181
- public function _confirm_page( $atts ) {
 
182
  $this->atts = shortcode_atts( $this->defaults, $atts );
183
  return $this->confirm_page();
184
  }
@@ -271,7 +281,7 @@ abstract class MW_WP_Form_Abstract_Form_Field {
271
  ?>
272
  <div id="dialog-<?php echo esc_attr( $this->shortcode_name ); ?>" class="mwform-dialog" title="<?php echo esc_attr( $this->shortcode_name ); ?>">
273
  <div class="form">
274
- <?php $this->mwform_tag_generator_dialog(); ?>
275
  </div>
276
  </div>
277
  <?php
2
  /**
3
  * Name : MW WP Form Abstract Form Field
4
  * Description: フォームフィールドの抽象クラス
5
+ * Version : 1.7.6
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : December 14, 2012
9
+ * Modified : December 26, 2016
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
65
 
66
  /**
67
  * $type
68
+ * フォームタグの種類 input|select|button|input_button|error|other
69
  * @var string
70
  */
71
  protected $type = 'other';
82
  'arg2' => '',
83
  );
84
 
85
+ /**
86
+ * 囲み型ショートコードのコンテンツ
87
+ * @var string
88
+ */
89
+ protected $element_content = null;
90
+
91
  /**
92
  * __construct
93
  */
162
  * input_page
163
  * 入力ページでのフォーム項目を返す
164
  * @param array $atts
165
+ * @param string $element_content
166
  * @return string HTML
167
  */
168
  abstract protected function input_page();
169
+ public function _input_page( $atts, $element_content = null ) {
170
+ $this->element_content = $element_content;
171
  if ( array_key_exists( 'value', $this->defaults ) && isset( $atts['name'] ) && !isset( $atts['value'] ) ) {
172
  $atts['value'] = apply_filters(
173
  'mwform_value_' . $this->form_key,
183
  * confirm_page
184
  * 確認ページでのフォーム項目を返す
185
  * @param array $atts
186
+ * @param string $element_content
187
  * @return string HTML
188
  */
189
  abstract protected function confirm_page();
190
+ public function _confirm_page( $atts, $element_content = null ) {
191
+ $this->element_content = $element_content;
192
  $this->atts = shortcode_atts( $this->defaults, $atts );
193
  return $this->confirm_page();
194
  }
281
  ?>
282
  <div id="dialog-<?php echo esc_attr( $this->shortcode_name ); ?>" class="mwform-dialog" title="<?php echo esc_attr( $this->shortcode_name ); ?>">
283
  <div class="form">
284
+ <?php $this->mwform_tag_generator_dialog( $this->defaults ); ?>
285
  </div>
286
  </div>
287
  <?php
classes/models/class.data.php CHANGED
@@ -2,11 +2,11 @@
2
  /**
3
  * Name : MW WP Form Data
4
  * Description: MW WP Form のデータ操作用
5
- * Version : 1.5.1
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : October 10, 2013
9
- * Modified : April 4, 2016
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
@@ -44,6 +44,11 @@ class MW_WP_Form_Data {
44
  */
45
  protected $FILES = array();
46
 
 
 
 
 
 
47
  /**
48
  * __construct
49
  *
@@ -518,4 +523,22 @@ class MW_WP_Form_Data {
518
  }
519
  }
520
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
521
  }
2
  /**
3
  * Name : MW WP Form Data
4
  * Description: MW WP Form のデータ操作用
5
+ * Version : 1.6.0
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : October 10, 2013
9
+ * Modified : December 27, 2016
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
44
  */
45
  protected $FILES = array();
46
 
47
+ /**
48
+ * @var string null|input|confirm|complete
49
+ */
50
+ protected $view_flg = null;
51
+
52
  /**
53
  * __construct
54
  *
523
  }
524
  }
525
  }
526
+
527
+ /**
528
+ * 表示すべき画面を示すフラグを設定
529
+ *
530
+ * @param string $this->view_flg
531
+ */
532
+ public function set_view_flg( $view_flg ) {
533
+ $this->view_flg = $view_flg;
534
+ }
535
+
536
+ /**
537
+ * 表示すべき画面を示すフラグを返す
538
+ *
539
+ * @return string $this->view_flg
540
+ */
541
+ public function get_view_flg() {
542
+ return $this->view_flg;
543
+ }
544
  }
classes/models/class.form.php CHANGED
@@ -2,11 +2,11 @@
2
  /**
3
  * Name : MW WP Form Form
4
  * Description: フォームヘルパー
5
- * Version : 1.8.2
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : September 25, 2012
9
- * Modified : March 26, 2016
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
@@ -676,6 +676,30 @@ class MW_WP_Form_Form {
676
  );
677
  }
678
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
679
  /**
680
  * ボタン生成
681
  *
@@ -698,6 +722,30 @@ class MW_WP_Form_Form {
698
  );
699
  }
700
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
701
  /**
702
  * datepicker生成
703
  *
2
  /**
3
  * Name : MW WP Form Form
4
  * Description: フォームヘルパー
5
+ * Version : 1.9.0
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : September 25, 2012
9
+ * Modified : December 26, 2016
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
676
  );
677
  }
678
 
679
+ /**
680
+ * submitボタン(button)生成
681
+ *
682
+ * @param string $name name属性
683
+ * @param string $value value属性
684
+ * @param array $options
685
+ * @param string $element_content
686
+ * @return string submitボタン(button)
687
+ */
688
+ public function button_submit( $name, $value, $options = array(), $element_content = '' ) {
689
+ $defaults = array(
690
+ 'class' => null,
691
+ );
692
+ $options = array_merge( $defaults, $options );
693
+ $attributes = $this->generate_attributes( $options );
694
+ return sprintf(
695
+ '<button type="submit" name="%1$s" value="%2$s"%3$s>%4$s</button>',
696
+ esc_attr( $name ),
697
+ esc_attr( $value ),
698
+ $attributes,
699
+ wp_kses_post( $element_content )
700
+ );
701
+ }
702
+
703
  /**
704
  * ボタン生成
705
  *
722
  );
723
  }
724
 
725
+ /**
726
+ * ボタン(button)生成
727
+ *
728
+ * @param string $name name属性
729
+ * @param string $value value属性
730
+ * @param array $options
731
+ * @param string $element_content
732
+ * @return string ボタン(button)
733
+ */
734
+ public function button_button( $name, $value, $options = array(), $element_content = '' ) {
735
+ $defaults = array(
736
+ 'class' => null,
737
+ );
738
+ $options = array_merge( $defaults, $options );
739
+ $attributes = $this->generate_attributes( $options );
740
+ return sprintf(
741
+ '<button type="button" name="%1$s" value="%2$s"%3$s>%4$s</button>',
742
+ esc_attr( $name ),
743
+ esc_attr( $value ),
744
+ $attributes,
745
+ wp_kses_post( $element_content )
746
+ );
747
+ }
748
+
749
  /**
750
  * datepicker生成
751
  *
classes/services/class.mail-parser.php CHANGED
@@ -2,11 +2,11 @@
2
  /**
3
  * Name : MW WP Form Mail Parser
4
  * Description: メールパーサー
5
- * Version : 1.1.1
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : April 14, 2015
9
- * Modified : March 18, 2016
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
@@ -208,11 +208,20 @@ class MW_WP_Form_Mail_Parser {
208
  * @return string
209
  */
210
  protected function apply_filters_mwform_custom_mail_tag( $form_key, $value, $match ) {
211
- return apply_filters(
 
 
 
 
 
 
 
212
  'mwform_custom_mail_tag_' . $form_key,
213
  $value,
214
  $match,
215
  $this->saved_mail_id
216
  );
 
 
217
  }
218
  }
2
  /**
3
  * Name : MW WP Form Mail Parser
4
  * Description: メールパーサー
5
+ * Version : 1.2.0
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : April 14, 2015
9
+ * Modified : December 27, 2016
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
208
  * @return string
209
  */
210
  protected function apply_filters_mwform_custom_mail_tag( $form_key, $value, $match ) {
211
+ $value = apply_filters(
212
+ 'mwform_custom_mail_tag',
213
+ $value,
214
+ $match,
215
+ $this->saved_mail_id
216
+ );
217
+
218
+ $value = apply_filters(
219
  'mwform_custom_mail_tag_' . $form_key,
220
  $value,
221
  $match,
222
  $this->saved_mail_id
223
  );
224
+
225
+ return $value;
226
  }
227
  }
js/admin.js CHANGED
@@ -13,13 +13,19 @@ jQuery( function( $ ) {
13
  * フォームタグジェネレータ
14
  */
15
  function mwform_create_shortcode( dialog_id ) {
16
- var shortcode = [];
17
- var shortcode_name = dialog_id.replace( 'dialog-', '' );
 
18
 
19
  $( '#' + dialog_id + ':first' ).find( 'input, textarea' ).each( function( i, e ) {
20
  var val;
21
  var name = $( e ).attr( 'name' );
22
 
 
 
 
 
 
23
  if ( $( e )[0].tagName.toLowerCase() == 'textarea' ) {
24
  val = $( e ).val().split( /\r\n|\r|\n/ );
25
  val = val.join( ',' );
@@ -32,21 +38,32 @@ jQuery( function( $ ) {
32
  }
33
 
34
  if ( name == 'name' && !val ) {
35
- val = shortcode_name + '-' + Math.floor( Math.random() * 1000 )
36
  }
37
  if ( val ) {
38
  var attribute = name + '=\"' + val + '\"';
39
- shortcode.push( attribute );
40
  }
41
  } );
42
- shortcode = shortcode.join( ' ' );
43
- if ( shortcode ) {
44
- var shortcode2 = '[' + shortcode_name + ' ' + shortcode + ']';
 
45
  } else {
46
- var shortcode2 = '[' + shortcode_name + ']';
 
 
 
 
47
  }
48
- return shortcode2;
 
 
 
 
 
49
  }
 
50
  $( '.mwform-dialog' ).dialog( {
51
  bgiframe: true,
52
  autoOpen: false,
@@ -64,6 +81,7 @@ jQuery( function( $ ) {
64
  open: function() {
65
  }
66
  } );
 
67
  $( '.add-mwform-btn .button' ).click( function() {
68
  var select = $( '.add-mwform-btn select' ).val();
69
  $( '#dialog-' + select ).dialog( 'open' );
@@ -89,4 +107,4 @@ jQuery( function( $ ) {
89
  tracking_number_field.attr( 'disabled', 'disabled' );
90
  }
91
  } );
92
- } );
13
  * フォームタグジェネレータ
14
  */
15
  function mwform_create_shortcode( dialog_id ) {
16
+ var attributes = [];
17
+ var shortcode_name = dialog_id.replace( 'dialog-', '' );
18
+ var element_content = null;
19
 
20
  $( '#' + dialog_id + ':first' ).find( 'input, textarea' ).each( function( i, e ) {
21
  var val;
22
  var name = $( e ).attr( 'name' );
23
 
24
+ if ( name == 'element_content' ) {
25
+ element_content = $( e ).val();
26
+ return true; // continue
27
+ }
28
+
29
  if ( $( e )[0].tagName.toLowerCase() == 'textarea' ) {
30
  val = $( e ).val().split( /\r\n|\r|\n/ );
31
  val = val.join( ',' );
38
  }
39
 
40
  if ( name == 'name' && !val ) {
41
+ val = generate_random_shortcode_name( shortcode_name );
42
  }
43
  if ( val ) {
44
  var attribute = name + '=\"' + val + '\"';
45
+ attributes.push( attribute );
46
  }
47
  } );
48
+
49
+ attributes = attributes.join( ' ' );
50
+ if ( attributes ) {
51
+ var shortcode = '[' + shortcode_name + ' ' + attributes + ']';
52
  } else {
53
+ var shortcode = '[' + shortcode_name + ']';
54
+ }
55
+
56
+ if ( element_content !== null ) {
57
+ shortcode += element_content + '[/' + shortcode_name + ']'
58
  }
59
+
60
+ return shortcode;
61
+ }
62
+
63
+ function generate_random_shortcode_name( shortcode_name ) {
64
+ return shortcode_name + '-' + Math.floor( Math.random() * 1000 );
65
  }
66
+
67
  $( '.mwform-dialog' ).dialog( {
68
  bgiframe: true,
69
  autoOpen: false,
81
  open: function() {
82
  }
83
  } );
84
+
85
  $( '.add-mwform-btn .button' ).click( function() {
86
  var select = $( '.add-mwform-btn select' ).val();
87
  $( '#dialog-' + select ).dialog( 'open' );
107
  tracking_number_field.attr( 'disabled', 'disabled' );
108
  }
109
  } );
110
+ } );
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 2.8.3\n"
6
  "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/mw-wp-form\n"
7
- "POT-Creation-Date: 2016-07-06 14:18+0900\n"
8
- "PO-Revision-Date: 2016-07-06 14:18+0900\n"
9
  "Last-Translator: inc2734 <inc@2inc.org>\n"
10
  "Language-Team: Takashi Kitajima <inc@2inc.org>\n"
11
  "Language: ja\n"
@@ -82,21 +82,73 @@ msgid "Akismet Error"
82
  msgstr "Akismetエラー"
83
 
84
  #: classes/form-fields/class.back-button.php:30
 
 
 
 
85
  #: classes/form-fields/class.back-button.php:42
 
86
  msgid "Back"
87
  msgstr "戻る"
88
 
89
  #: classes/form-fields/class.back-button.php:77
 
 
 
 
90
  #: classes/form-fields/class.button.php:84
91
  #: classes/form-fields/class.confirm-button.php:77
92
  #: classes/form-fields/class.submit.php:84
93
  msgid "String on the button"
94
  msgstr "ボタンに表示する文字列"
95
 
 
 
 
 
 
 
 
 
96
  #: classes/form-fields/class.button.php:30
97
  msgid "Button"
98
  msgstr "ボタン"
99
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
100
  #: classes/form-fields/class.checkbox.php:30
101
  msgid "Checkbox"
102
  msgstr "チェックボックス"
@@ -208,15 +260,6 @@ msgstr "エラー表示"
208
  msgid "Don't display error."
209
  msgstr "エラーを表示しない"
210
 
211
- #: classes/form-fields/class.confirm-button.php:30
212
- msgid "Confirm Button"
213
- msgstr "確認ボタン"
214
-
215
- #: classes/form-fields/class.confirm-button.php:42
216
- #: classes/form-fields/class.submit-button.php:43
217
- msgid "Confirm"
218
- msgstr "確認画面へ"
219
-
220
  #: classes/form-fields/class.custom-mail-tag.php:30
221
  msgid "Custom Mail Tag"
222
  msgstr "カスタムメールタグ"
@@ -261,10 +304,6 @@ msgstr "アップロードしました。"
261
  msgid "Hidden"
262
  msgstr "hiddenフィールド"
263
 
264
- #: classes/form-fields/class.hidden.php:89
265
- msgid "Display"
266
- msgstr "表示する"
267
-
268
  #: classes/form-fields/class.hidden.php:91
269
  msgid "Display hidden value."
270
  msgstr "hiddenの値を表示"
@@ -297,11 +336,6 @@ msgstr "セレクトボックス"
297
  msgid "Confirm &amp; Submit"
298
  msgstr "確認・送信"
299
 
300
- #: classes/form-fields/class.submit-button.php:44
301
- #: classes/form-fields/class.submit.php:43
302
- msgid "Send"
303
- msgstr "送信する"
304
-
305
  #: classes/form-fields/class.submit-button.php:92
306
  msgid "String on the confirm button"
307
  msgstr "確認ボタンに表示する文字列"
@@ -310,10 +344,6 @@ msgstr "確認ボタンに表示する文字列"
310
  msgid "String on the submit button"
311
  msgstr "送信ボタンに表示する文字列"
312
 
313
- #: classes/form-fields/class.submit.php:30
314
- msgid "Submit Button"
315
- msgstr "送信ボタン"
316
-
317
  #: classes/form-fields/class.tel.php:30
318
  #: classes/validation-rules/class.tel.php:56
319
  msgid "Tel"
@@ -409,19 +439,19 @@ msgstr "一致しません。"
409
  msgid "The key at same value"
410
  msgstr "一致する項目"
411
 
412
- #: classes/validation-rules/class.filesize.php:35
413
- msgid "This file size is too big."
414
- msgstr "ファイルサイズが大きすぎます。"
415
-
416
- #: classes/validation-rules/class.filesize.php:42
417
  msgid "Failed to upload the file."
418
  msgstr "ファイルのアップロードに失敗しました。"
419
 
420
- #: classes/validation-rules/class.filesize.php:61
 
 
 
 
421
  msgid "Permitted file size"
422
  msgstr "サイズ制限"
423
 
424
- #: classes/validation-rules/class.filesize.php:62
425
  msgid "bytes"
426
  msgstr "バイト"
427
 
@@ -627,6 +657,7 @@ msgstr "送信先（E-mailアドレス）"
627
  #: templates/admin/admin-mail-options.php:14
628
  #: templates/admin/admin-mail-options.php:31
629
  #: templates/admin/admin-mail-options.php:36
 
630
  #: templates/admin/mail-options.php:15 templates/admin/mail-options.php:20
631
  msgid "If empty:"
632
  msgstr "未入力の場合:"
@@ -649,11 +680,15 @@ msgid "Sender"
649
  msgstr "送信者"
650
 
651
  #: templates/admin/admin-mail-options.php:34
 
 
 
 
652
  #: templates/admin/mail-options.php:18
653
  msgid "From ( E-mail address )"
654
  msgstr "送信元（E-mailアドレス）"
655
 
656
- #: templates/admin/admin-mail-options.php:39
657
  #: templates/admin/mail-options.php:23
658
  msgid "Content"
659
  msgstr "本文"
@@ -734,18 +769,22 @@ msgid "Select fields"
734
  msgstr "選択項目"
735
 
736
  #: templates/admin/tag-generator.php:13
737
- msgid "Button fields"
738
- msgstr "ボタン項目"
739
 
740
  #: templates/admin/tag-generator.php:16
 
 
 
 
741
  msgid "Error fields"
742
  msgstr "エラー項目"
743
 
744
- #: templates/admin/tag-generator.php:19
745
  msgid "Other fields"
746
  msgstr "その他の項目"
747
 
748
- #: templates/admin/tag-generator.php:23
749
  msgid "Add form tag"
750
  msgstr "フォームタグを追加"
751
 
@@ -880,6 +919,20 @@ msgstr "Takashi Kitajima"
880
  msgid "http://2inc.org"
881
  msgstr "http://2inc.org"
882
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
883
  #~ msgid "MW WP Form can create mail form with a confirmation screen."
884
  #~ msgstr ""
885
  #~ "MW WP Formは確認画面付きのフォームを作成しメールを送信することができます。"
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 2.13.0\n"
6
  "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/mw-wp-form\n"
7
+ "POT-Creation-Date: 2016-12-27 01:19+0900\n"
8
+ "PO-Revision-Date: 2016-12-27 01:19+0900\n"
9
  "Last-Translator: inc2734 <inc@2inc.org>\n"
10
  "Language-Team: Takashi Kitajima <inc@2inc.org>\n"
11
  "Language: ja\n"
82
  msgstr "Akismetエラー"
83
 
84
  #: classes/form-fields/class.back-button.php:30
85
+ #: classes/form-fields/class.button-back.php:30
86
+ msgid "Back Button"
87
+ msgstr "戻るボタン"
88
+
89
  #: classes/form-fields/class.back-button.php:42
90
+ #: classes/form-fields/class.button-back.php:43
91
  msgid "Back"
92
  msgstr "戻る"
93
 
94
  #: classes/form-fields/class.back-button.php:77
95
+ #: classes/form-fields/class.button-back.php:88
96
+ #: classes/form-fields/class.button-button.php:95
97
+ #: classes/form-fields/class.button-confirm.php:88
98
+ #: classes/form-fields/class.button-submit.php:107
99
  #: classes/form-fields/class.button.php:84
100
  #: classes/form-fields/class.confirm-button.php:77
101
  #: classes/form-fields/class.submit.php:84
102
  msgid "String on the button"
103
  msgstr "ボタンに表示する文字列"
104
 
105
+ #: classes/form-fields/class.button-back.php:83
106
+ #: classes/form-fields/class.button-button.php:90
107
+ #: classes/form-fields/class.button-confirm.php:83
108
+ #: classes/form-fields/class.button-submit.php:102
109
+ msgid "Value"
110
+ msgstr "value"
111
+
112
+ #: classes/form-fields/class.button-button.php:30
113
  #: classes/form-fields/class.button.php:30
114
  msgid "Button"
115
  msgstr "ボタン"
116
 
117
+ #: classes/form-fields/class.button-button.php:44
118
+ msgid "button"
119
+ msgstr "ボタン"
120
+
121
+ #: classes/form-fields/class.button-confirm.php:30
122
+ #: classes/form-fields/class.confirm-button.php:30
123
+ msgid "Confirm Button"
124
+ msgstr "確認ボタン"
125
+
126
+ #: classes/form-fields/class.button-confirm.php:43
127
+ #: classes/form-fields/class.confirm-button.php:42
128
+ #: classes/form-fields/class.submit-button.php:43
129
+ msgid "Confirm"
130
+ msgstr "確認画面へ"
131
+
132
+ #: classes/form-fields/class.button-submit.php:30
133
+ #: classes/form-fields/class.submit.php:30
134
+ msgid "Submit Button"
135
+ msgstr "送信ボタン"
136
+
137
+ #: classes/form-fields/class.button-submit.php:44
138
+ #: classes/form-fields/class.submit-button.php:44
139
+ #: classes/form-fields/class.submit.php:43
140
+ msgid "Send"
141
+ msgstr "送信する"
142
+
143
+ #: classes/form-fields/class.button-submit.php:112
144
+ msgid "Display on input page"
145
+ msgstr "入力画面での表示"
146
+
147
+ #: classes/form-fields/class.button-submit.php:115
148
+ #: classes/form-fields/class.hidden.php:89
149
+ msgid "Display"
150
+ msgstr "表示する"
151
+
152
  #: classes/form-fields/class.checkbox.php:30
153
  msgid "Checkbox"
154
  msgstr "チェックボックス"
260
  msgid "Don't display error."
261
  msgstr "エラーを表示しない"
262
 
 
 
 
 
 
 
 
 
 
263
  #: classes/form-fields/class.custom-mail-tag.php:30
264
  msgid "Custom Mail Tag"
265
  msgstr "カスタムメールタグ"
304
  msgid "Hidden"
305
  msgstr "hiddenフィールド"
306
 
 
 
 
 
307
  #: classes/form-fields/class.hidden.php:91
308
  msgid "Display hidden value."
309
  msgstr "hiddenの値を表示"
336
  msgid "Confirm &amp; Submit"
337
  msgstr "確認・送信"
338
 
 
 
 
 
 
339
  #: classes/form-fields/class.submit-button.php:92
340
  msgid "String on the confirm button"
341
  msgstr "確認ボタンに表示する文字列"
344
  msgid "String on the submit button"
345
  msgstr "送信ボタンに表示する文字列"
346
 
 
 
 
 
347
  #: classes/form-fields/class.tel.php:30
348
  #: classes/validation-rules/class.tel.php:56
349
  msgid "Tel"
439
  msgid "The key at same value"
440
  msgstr "一致する項目"
441
 
442
+ #: classes/validation-rules/class.filesize.php:38
 
 
 
 
443
  msgid "Failed to upload the file."
444
  msgstr "ファイルのアップロードに失敗しました。"
445
 
446
+ #: classes/validation-rules/class.filesize.php:72
447
+ msgid "This file size is too big."
448
+ msgstr "ファイルサイズが大きすぎます。"
449
+
450
+ #: classes/validation-rules/class.filesize.php:94
451
  msgid "Permitted file size"
452
  msgstr "サイズ制限"
453
 
454
+ #: classes/validation-rules/class.filesize.php:95
455
  msgid "bytes"
456
  msgstr "バイト"
457
 
657
  #: templates/admin/admin-mail-options.php:14
658
  #: templates/admin/admin-mail-options.php:31
659
  #: templates/admin/admin-mail-options.php:36
660
+ #: templates/admin/admin-mail-options.php:41
661
  #: templates/admin/mail-options.php:15 templates/admin/mail-options.php:20
662
  msgid "If empty:"
663
  msgstr "未入力の場合:"
680
  msgstr "送信者"
681
 
682
  #: templates/admin/admin-mail-options.php:34
683
+ msgid "Return-Path ( E-mail address )"
684
+ msgstr "送信元（E-mailアドレス）"
685
+
686
+ #: templates/admin/admin-mail-options.php:39
687
  #: templates/admin/mail-options.php:18
688
  msgid "From ( E-mail address )"
689
  msgstr "送信元（E-mailアドレス）"
690
 
691
+ #: templates/admin/admin-mail-options.php:44
692
  #: templates/admin/mail-options.php:23
693
  msgid "Content"
694
  msgstr "本文"
769
  msgstr "選択項目"
770
 
771
  #: templates/admin/tag-generator.php:13
772
+ msgid "Button fields (button)"
773
+ msgstr "ボタン項目（button）"
774
 
775
  #: templates/admin/tag-generator.php:16
776
+ msgid "Button fields (input)"
777
+ msgstr "ボタン項目（input）"
778
+
779
+ #: templates/admin/tag-generator.php:19
780
  msgid "Error fields"
781
  msgstr "エラー項目"
782
 
783
+ #: templates/admin/tag-generator.php:22
784
  msgid "Other fields"
785
  msgstr "その他の項目"
786
 
787
+ #: templates/admin/tag-generator.php:26
788
  msgid "Add form tag"
789
  msgstr "フォームタグを追加"
790
 
919
  msgid "http://2inc.org"
920
  msgstr "http://2inc.org"
921
 
922
+ #, fuzzy
923
+ #~ msgctxt "value"
924
+ #~ msgid "Back"
925
+ #~ msgstr "戻る"
926
+
927
+ #~ msgid "Button (button)"
928
+ #~ msgstr "ボタン（button）"
929
+
930
+ #~ msgid "Confirm Button (button)"
931
+ #~ msgstr "確認ボタン（button）"
932
+
933
+ #~ msgid "Submit Button (button)"
934
+ #~ msgstr "送信ボタン（button）"
935
+
936
  #~ msgid "MW WP Form can create mail form with a confirmation screen."
937
  #~ msgstr ""
938
  #~ "MW WP Formは確認画面付きのフォームを作成しメールを送信することができます。"
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 2.8.3\n"
6
  "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/mw-wp-form\n"
7
- "POT-Creation-Date: 2016-07-06 05:17:47+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
@@ -75,21 +75,73 @@ msgid "Akismet Error"
75
  msgstr ""
76
 
77
  #: classes/form-fields/class.back-button.php:30
 
 
 
 
78
  #: classes/form-fields/class.back-button.php:42
 
79
  msgid "Back"
80
  msgstr ""
81
 
82
  #: classes/form-fields/class.back-button.php:77
 
 
 
 
83
  #: classes/form-fields/class.button.php:84
84
  #: classes/form-fields/class.confirm-button.php:77
85
  #: classes/form-fields/class.submit.php:84
86
  msgid "String on the button"
87
  msgstr ""
88
 
 
 
 
 
 
 
 
 
89
  #: classes/form-fields/class.button.php:30
90
  msgid "Button"
91
  msgstr ""
92
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
93
  #: classes/form-fields/class.checkbox.php:30
94
  msgid "Checkbox"
95
  msgstr ""
@@ -196,15 +248,6 @@ msgstr ""
196
  msgid "Don't display error."
197
  msgstr ""
198
 
199
- #: classes/form-fields/class.confirm-button.php:30
200
- msgid "Confirm Button"
201
- msgstr ""
202
-
203
- #: classes/form-fields/class.confirm-button.php:42
204
- #: classes/form-fields/class.submit-button.php:43
205
- msgid "Confirm"
206
- msgstr ""
207
-
208
  #: classes/form-fields/class.custom-mail-tag.php:30
209
  msgid "Custom Mail Tag"
210
  msgstr ""
@@ -249,10 +292,6 @@ msgstr ""
249
  msgid "Hidden"
250
  msgstr ""
251
 
252
- #: classes/form-fields/class.hidden.php:89
253
- msgid "Display"
254
- msgstr ""
255
-
256
  #: classes/form-fields/class.hidden.php:91
257
  msgid "Display hidden value."
258
  msgstr ""
@@ -285,11 +324,6 @@ msgstr ""
285
  msgid "Confirm &amp; Submit"
286
  msgstr ""
287
 
288
- #: classes/form-fields/class.submit-button.php:44
289
- #: classes/form-fields/class.submit.php:43
290
- msgid "Send"
291
- msgstr ""
292
-
293
  #: classes/form-fields/class.submit-button.php:92
294
  msgid "String on the confirm button"
295
  msgstr ""
@@ -298,10 +332,6 @@ msgstr ""
298
  msgid "String on the submit button"
299
  msgstr ""
300
 
301
- #: classes/form-fields/class.submit.php:30
302
- msgid "Submit Button"
303
- msgstr ""
304
-
305
  #: classes/form-fields/class.tel.php:30
306
  #: classes/validation-rules/class.tel.php:56
307
  msgid "Tel"
@@ -397,19 +427,19 @@ msgstr ""
397
  msgid "The key at same value"
398
  msgstr ""
399
 
400
- #: classes/validation-rules/class.filesize.php:35
401
- msgid "This file size is too big."
402
  msgstr ""
403
 
404
- #: classes/validation-rules/class.filesize.php:42
405
- msgid "Failed to upload the file."
406
  msgstr ""
407
 
408
- #: classes/validation-rules/class.filesize.php:61
409
  msgid "Permitted file size"
410
  msgstr ""
411
 
412
- #: classes/validation-rules/class.filesize.php:62
413
  msgid "bytes"
414
  msgstr ""
415
 
@@ -611,6 +641,7 @@ msgstr ""
611
  #: templates/admin/admin-mail-options.php:14
612
  #: templates/admin/admin-mail-options.php:31
613
  #: templates/admin/admin-mail-options.php:36
 
614
  #: templates/admin/mail-options.php:15 templates/admin/mail-options.php:20
615
  msgid "If empty:"
616
  msgstr ""
@@ -633,11 +664,15 @@ msgid "Sender"
633
  msgstr ""
634
 
635
  #: templates/admin/admin-mail-options.php:34
 
 
 
 
636
  #: templates/admin/mail-options.php:18
637
  msgid "From ( E-mail address )"
638
  msgstr ""
639
 
640
- #: templates/admin/admin-mail-options.php:39
641
  #: templates/admin/mail-options.php:23
642
  msgid "Content"
643
  msgstr ""
@@ -711,18 +746,22 @@ msgid "Select fields"
711
  msgstr ""
712
 
713
  #: templates/admin/tag-generator.php:13
714
- msgid "Button fields"
715
  msgstr ""
716
 
717
  #: templates/admin/tag-generator.php:16
718
- msgid "Error fields"
719
  msgstr ""
720
 
721
  #: templates/admin/tag-generator.php:19
 
 
 
 
722
  msgid "Other fields"
723
  msgstr ""
724
 
725
- #: templates/admin/tag-generator.php:23
726
  msgid "Add form tag"
727
  msgstr ""
728
 
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 2.13.0\n"
6
  "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/mw-wp-form\n"
7
+ "POT-Creation-Date: 2016-12-26 16:19:22+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
75
  msgstr ""
76
 
77
  #: classes/form-fields/class.back-button.php:30
78
+ #: classes/form-fields/class.button-back.php:30
79
+ msgid "Back Button"
80
+ msgstr ""
81
+
82
  #: classes/form-fields/class.back-button.php:42
83
+ #: classes/form-fields/class.button-back.php:43
84
  msgid "Back"
85
  msgstr ""
86
 
87
  #: classes/form-fields/class.back-button.php:77
88
+ #: classes/form-fields/class.button-back.php:88
89
+ #: classes/form-fields/class.button-button.php:95
90
+ #: classes/form-fields/class.button-confirm.php:88
91
+ #: classes/form-fields/class.button-submit.php:107
92
  #: classes/form-fields/class.button.php:84
93
  #: classes/form-fields/class.confirm-button.php:77
94
  #: classes/form-fields/class.submit.php:84
95
  msgid "String on the button"
96
  msgstr ""
97
 
98
+ #: classes/form-fields/class.button-back.php:83
99
+ #: classes/form-fields/class.button-button.php:90
100
+ #: classes/form-fields/class.button-confirm.php:83
101
+ #: classes/form-fields/class.button-submit.php:102
102
+ msgid "Value"
103
+ msgstr ""
104
+
105
+ #: classes/form-fields/class.button-button.php:30
106
  #: classes/form-fields/class.button.php:30
107
  msgid "Button"
108
  msgstr ""
109
 
110
+ #: classes/form-fields/class.button-button.php:44
111
+ msgid "button"
112
+ msgstr ""
113
+
114
+ #: classes/form-fields/class.button-confirm.php:30
115
+ #: classes/form-fields/class.confirm-button.php:30
116
+ msgid "Confirm Button"
117
+ msgstr ""
118
+
119
+ #: classes/form-fields/class.button-confirm.php:43
120
+ #: classes/form-fields/class.confirm-button.php:42
121
+ #: classes/form-fields/class.submit-button.php:43
122
+ msgid "Confirm"
123
+ msgstr ""
124
+
125
+ #: classes/form-fields/class.button-submit.php:30
126
+ #: classes/form-fields/class.submit.php:30
127
+ msgid "Submit Button"
128
+ msgstr ""
129
+
130
+ #: classes/form-fields/class.button-submit.php:44
131
+ #: classes/form-fields/class.submit-button.php:44
132
+ #: classes/form-fields/class.submit.php:43
133
+ msgid "Send"
134
+ msgstr ""
135
+
136
+ #: classes/form-fields/class.button-submit.php:112
137
+ msgid "Display on input page"
138
+ msgstr ""
139
+
140
+ #: classes/form-fields/class.button-submit.php:115
141
+ #: classes/form-fields/class.hidden.php:89
142
+ msgid "Display"
143
+ msgstr ""
144
+
145
  #: classes/form-fields/class.checkbox.php:30
146
  msgid "Checkbox"
147
  msgstr ""
248
  msgid "Don't display error."
249
  msgstr ""
250
 
 
 
 
 
 
 
 
 
 
251
  #: classes/form-fields/class.custom-mail-tag.php:30
252
  msgid "Custom Mail Tag"
253
  msgstr ""
292
  msgid "Hidden"
293
  msgstr ""
294
 
 
 
 
 
295
  #: classes/form-fields/class.hidden.php:91
296
  msgid "Display hidden value."
297
  msgstr ""
324
  msgid "Confirm &amp; Submit"
325
  msgstr ""
326
 
 
 
 
 
 
327
  #: classes/form-fields/class.submit-button.php:92
328
  msgid "String on the confirm button"
329
  msgstr ""
332
  msgid "String on the submit button"
333
  msgstr ""
334
 
 
 
 
 
335
  #: classes/form-fields/class.tel.php:30
336
  #: classes/validation-rules/class.tel.php:56
337
  msgid "Tel"
427
  msgid "The key at same value"
428
  msgstr ""
429
 
430
+ #: classes/validation-rules/class.filesize.php:38
431
+ msgid "Failed to upload the file."
432
  msgstr ""
433
 
434
+ #: classes/validation-rules/class.filesize.php:72
435
+ msgid "This file size is too big."
436
  msgstr ""
437
 
438
+ #: classes/validation-rules/class.filesize.php:94
439
  msgid "Permitted file size"
440
  msgstr ""
441
 
442
+ #: classes/validation-rules/class.filesize.php:95
443
  msgid "bytes"
444
  msgstr ""
445
 
641
  #: templates/admin/admin-mail-options.php:14
642
  #: templates/admin/admin-mail-options.php:31
643
  #: templates/admin/admin-mail-options.php:36
644
+ #: templates/admin/admin-mail-options.php:41
645
  #: templates/admin/mail-options.php:15 templates/admin/mail-options.php:20
646
  msgid "If empty:"
647
  msgstr ""
664
  msgstr ""
665
 
666
  #: templates/admin/admin-mail-options.php:34
667
+ msgid "Return-Path ( E-mail address )"
668
+ msgstr ""
669
+
670
+ #: templates/admin/admin-mail-options.php:39
671
  #: templates/admin/mail-options.php:18
672
  msgid "From ( E-mail address )"
673
  msgstr ""
674
 
675
+ #: templates/admin/admin-mail-options.php:44
676
  #: templates/admin/mail-options.php:23
677
  msgid "Content"
678
  msgstr ""
746
  msgstr ""
747
 
748
  #: templates/admin/tag-generator.php:13
749
+ msgid "Button fields (button)"
750
  msgstr ""
751
 
752
  #: templates/admin/tag-generator.php:16
753
+ msgid "Button fields (input)"
754
  msgstr ""
755
 
756
  #: templates/admin/tag-generator.php:19
757
+ msgid "Error fields"
758
+ msgstr ""
759
+
760
+ #: templates/admin/tag-generator.php:22
761
  msgid "Other fields"
762
  msgstr ""
763
 
764
+ #: templates/admin/tag-generator.php:26
765
  msgid "Add form tag"
766
  msgstr ""
767
 
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 is shortcode base contact form plugin. This plugin have many feature. For example you can use many validation rules, contact data saving, and chart aggregation using saved contact data.
6
- * Version: 2.12.0
7
  * Author: Takashi Kitajima
8
  * Author URI: http://2inc.org
9
  * Created : September 25, 2012
10
- * Modified: December 21, 2016
11
  * Text Domain: mw-wp-form
12
  * Domain Path: /languages/
13
  * License: GPLv2 or later
3
  * Plugin Name: MW WP Form
4
  * Plugin URI: http://plugins.2inc.org/mw-wp-form/
5
  * Description: MW WP Form is shortcode base contact form plugin. This plugin have many feature. For example you can use many validation rules, contact data saving, and chart aggregation using saved contact data.
6
+ * Version: 2.13.0
7
  * Author: Takashi Kitajima
8
  * Author URI: http://2inc.org
9
  * Created : September 25, 2012
10
+ * Modified: December 26, 2016
11
  * Text Domain: mw-wp-form
12
  * Domain Path: /languages/
13
  * License: GPLv2 or later
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, chart, graph, html, contact form, form creation, form creator, form manager, form builder, custom form
5
  Requires at least: 4.0
6
  Tested up to: 4.7.0
7
- Stable tag: 2.12.0
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -80,6 +80,11 @@ Do you have questions or issues with MW WP Form? Use these support channels appr
80
 
81
  == Changelog ==
82
 
 
 
 
 
 
83
  = 2.12.0 =
84
  * Added : Added filter hook mwform_complete_content_mw-wp-form-xxx
85
  * Changed : Changed to pass MW_WP_Form_Data object as the 2nd argument of mwform_post_content_mw-wp-form-xxx hook.
4
  Tags: plugin, form, confirm, preview, shortcode, mail, chart, graph, html, contact form, form creation, form creator, form manager, form builder, custom form
5
  Requires at least: 4.0
6
  Tested up to: 4.7.0
7
+ Stable tag: 2.13.0
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
80
 
81
  == Changelog ==
82
 
83
+ = 2.13.0 =
84
+ * Added : Added the button elements.
85
+ * Added : Added filter hook mwform_custom_mail_tag
86
+ * Added : Added Method MW_WP_Form_Data::get_view_flg()
87
+
88
  = 2.12.0 =
89
  * Added : Added filter hook mwform_complete_content_mw-wp-form-xxx
90
  * Changed : Changed to pass MW_WP_Form_Data object as the 2nd argument of mwform_post_content_mw-wp-form-xxx hook.
templates/admin/tag-generator.php CHANGED
@@ -10,9 +10,12 @@ do_action( 'mwform_tag_generator_dialog' );
10
  <optgroup label="<?php echo esc_attr_e( 'Select fields', 'mw-wp-form' ); ?>">
11
  <?php do_action( 'mwform_tag_generator_select_option' ); ?>
12
  </optgroup>
13
- <optgroup label="<?php echo esc_attr_e( 'Button fields', 'mw-wp-form' ); ?>">
14
  <?php do_action( 'mwform_tag_generator_button_option' ); ?>
15
  </optgroup>
 
 
 
16
  <optgroup label="<?php echo esc_attr_e( 'Error fields', 'mw-wp-form' ); ?>">
17
  <?php do_action( 'mwform_tag_generator_error_option' ); ?>
18
  </optgroup>
@@ -21,4 +24,4 @@ do_action( 'mwform_tag_generator_dialog' );
21
  </optgroup>
22
  </select>
23
  <span class="button"><?php esc_html_e( 'Add form tag', 'mw-wp-form' ); ?></span>
24
- </div>
10
  <optgroup label="<?php echo esc_attr_e( 'Select fields', 'mw-wp-form' ); ?>">
11
  <?php do_action( 'mwform_tag_generator_select_option' ); ?>
12
  </optgroup>
13
+ <optgroup label="<?php echo esc_attr_e( 'Button fields (button)', 'mw-wp-form' ); ?>">
14
  <?php do_action( 'mwform_tag_generator_button_option' ); ?>
15
  </optgroup>
16
+ <optgroup label="<?php echo esc_attr_e( 'Button fields (input)', 'mw-wp-form' ); ?>">
17
+ <?php do_action( 'mwform_tag_generator_input_button_option' ); ?>
18
+ </optgroup>
19
  <optgroup label="<?php echo esc_attr_e( 'Error fields', 'mw-wp-form' ); ?>">
20
  <?php do_action( 'mwform_tag_generator_error_option' ); ?>
21
  </optgroup>
24
  </optgroup>
25
  </select>
26
  <span class="button"><?php esc_html_e( 'Add form tag', 'mw-wp-form' ); ?></span>
27
+ </div>