MW WP Form - Version 2.6.4

Version Description

  • Added : Add filter hook mwform_content_wpautop_mw-wp-form-xxx
  • Added : Add argument at mwform_after_send_mw-wp-form-xxx
  • Added : Add method MW_WP_Form_Data::get_form_key()
Download this release

Release Info

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

Code changes from version 2.6.3 to 2.6.4

Files changed (5) hide show
  1. classes/controllers/class.main.php +4 -1
  2. classes/models/class.data.php +11 -2
  3. classes/services/class.exec-shortcode.php +27 -2
  4. mw-wp-form.php +2 -2
  5. readme.txt +8 -3
classes/controllers/class.main.php CHANGED
@@ -148,7 +148,10 @@ class MW_WP_Form_Main_Controller {
148
  if ( !$this->is_complete_twice() ) {
149
  $this->send();
150
 
151
- do_action( 'mwform_after_send_' . $form_key );
 
 
 
152
  }
153
  // 手動フォームの場合は完了画面に ExecShortcode が無く footer の clear_values が
154
  // 効かないためここで消す
148
  if ( !$this->is_complete_twice() ) {
149
  $this->send();
150
 
151
+ do_action(
152
+ 'mwform_after_send_' . $form_key,
153
+ $this->Data
154
+ );
155
  }
156
  // 手動フォームの場合は完了画面に ExecShortcode が無く footer の clear_values が
157
  // 効かないためここで消す
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.3.10
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : October 10, 2013
9
- * Modified : November 14, 2015
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
@@ -84,6 +84,15 @@ class MW_WP_Form_Data {
84
  }
85
  exit( 'MW_WP_Form_Data instantiation error.' );
86
  }
 
 
 
 
 
 
 
 
 
87
 
88
  /**
89
  * $_POST をセット
2
  /**
3
  * Name : MW WP Form Data
4
  * Description: MW WP Form のデータ操作用
5
+ * Version : 1.4.0
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : October 10, 2013
9
+ * Modified : January 4, 2016
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
84
  }
85
  exit( 'MW_WP_Form_Data instantiation error.' );
86
  }
87
+
88
+ /**
89
+ * Return form key
90
+ *
91
+ * @return string
92
+ */
93
+ public function get_form_key() {
94
+ return $this->form_key;
95
+ }
96
 
97
  /**
98
  * $_POST をセット
classes/services/class.exec-shortcode.php CHANGED
@@ -318,9 +318,21 @@ class MW_WP_Form_Exec_Shortcode {
318
  $post = get_post( $post_id );
319
  setup_postdata( $post );
320
  $content = apply_filters( 'mwform_post_content_raw_' . $form_key, get_the_content() );
 
 
321
  if ( has_filter( 'the_content', 'wpautop' ) ) {
 
 
 
 
 
 
 
 
 
322
  $content = wpautop( $content );
323
  }
 
324
  $content = sprintf(
325
  '[mwform]%s[/mwform]',
326
  apply_filters( 'mwform_post_content_' . $form_key, $content )
@@ -345,11 +357,24 @@ class MW_WP_Form_Exec_Shortcode {
345
  * @return string $content
346
  */
347
  protected function get_complete_page_content() {
348
- $Setting = $this->Setting;
349
- $content = $Setting->get( 'complete_message' );
 
 
 
350
  if ( has_filter( 'the_content', 'wpautop' ) ) {
 
 
 
 
 
 
 
 
 
351
  $content = wpautop( $content );
352
  }
 
353
  $content = sprintf(
354
  '[mwform_complete_message]%s[/mwform_complete_message]',
355
  $content
318
  $post = get_post( $post_id );
319
  setup_postdata( $post );
320
  $content = apply_filters( 'mwform_post_content_raw_' . $form_key, get_the_content() );
321
+
322
+ $has_wpautop = false;
323
  if ( has_filter( 'the_content', 'wpautop' ) ) {
324
+ $has_wpautop = true;
325
+ }
326
+ $has_wpautop = apply_filters(
327
+ 'mwform_content_wpautop_' . $form_key,
328
+ $has_wpautop,
329
+ $this->view_flg
330
+ );
331
+
332
+ if ( $has_wpautop ) {
333
  $content = wpautop( $content );
334
  }
335
+
336
  $content = sprintf(
337
  '[mwform]%s[/mwform]',
338
  apply_filters( 'mwform_post_content_' . $form_key, $content )
357
  * @return string $content
358
  */
359
  protected function get_complete_page_content() {
360
+ $form_key = $this->get( 'key' );
361
+ $Setting = $this->Setting;
362
+ $content = $Setting->get( 'complete_message' );
363
+
364
+ $has_wpautop = false;
365
  if ( has_filter( 'the_content', 'wpautop' ) ) {
366
+ $has_wpautop = true;
367
+ }
368
+ $has_wpautop = apply_filters(
369
+ 'mwform_content_wpautop_' . $form_key,
370
+ $has_wpautop,
371
+ $this->view_flg
372
+ );
373
+
374
+ if ( $has_wpautop ) {
375
  $content = wpautop( $content );
376
  }
377
+
378
  $content = sprintf(
379
  '[mwform_complete_message]%s[/mwform_complete_message]',
380
  $content
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.6.3
7
  * Author: Takashi Kitajima
8
  * Author URI: http://2inc.org
9
  * Created : September 25, 2012
10
- * Modified: December 3, 2015
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.6.4
7
  * Author: Takashi Kitajima
8
  * Author URI: http://2inc.org
9
  * Created : September 25, 2012
10
+ * Modified: January 4, 2016
11
  * Text Domain: mw-wp-form
12
  * Domain Path: /languages/
13
  * License: GPLv2 or later
readme.txt CHANGED
@@ -3,8 +3,8 @@ Contributors: inc2734, ryu263, tomothumb, nanniku, mt8.biz, NExt-Season, kuck1u,
3
  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.3.1
7
- Stable tag: 2.6.3
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -52,7 +52,7 @@ Source: https://developers.google.com/chart/
52
  * [Kazuto Takeshita](http://mt8.biz/) ( [moto hachi](https://profiles.wordpress.org/mt8biz/) )
53
  * [Atsushi Ando](http://www.next-season.net/) ( [NExt-Season](https://profiles.wordpress.org/next-season/) )
54
  * [Kazuki Tomiyasu](http://visualive.jp/) ( [KUCKLU](https://profiles.wordpress.org/kuck1u/) )
55
- * [Key Nomura](http://mypacecreator.net/) ( [mypacecreator](https://profiles.wordpress.org/mypacecreator/) )
56
  * [mh35](https://profiles.wordpress.org/mh35)
57
 
58
  == Installation ==
@@ -78,6 +78,11 @@ Do you have questions or issues with MW WP Form? Use these support channels appr
78
 
79
  == Changelog ==
80
 
 
 
 
 
 
81
  = 2.6.3 =
82
  * Bugfix : Fixed a eq validation bug.
83
 
3
  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.4.0
7
+ Stable tag: 2.6.4
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
52
  * [Kazuto Takeshita](http://mt8.biz/) ( [moto hachi](https://profiles.wordpress.org/mt8biz/) )
53
  * [Atsushi Ando](http://www.next-season.net/) ( [NExt-Season](https://profiles.wordpress.org/next-season/) )
54
  * [Kazuki Tomiyasu](http://visualive.jp/) ( [KUCKLU](https://profiles.wordpress.org/kuck1u/) )
55
+ * [Kei Nomura](http://mypacecreator.net/) ( [mypacecreator](https://profiles.wordpress.org/mypacecreator/) )
56
  * [mh35](https://profiles.wordpress.org/mh35)
57
 
58
  == Installation ==
78
 
79
  == Changelog ==
80
 
81
+ = 2.6.4 =
82
+ * Added : Add filter hook mwform_content_wpautop_mw-wp-form-xxx
83
+ * Added : Add argument at mwform_after_send_mw-wp-form-xxx
84
+ * Added : Add method MW_WP_Form_Data::get_form_key()
85
+
86
  = 2.6.3 =
87
  * Bugfix : Fixed a eq validation bug.
88