MW WP Form - Version 2.9.0

Version Description

  • Added : Added the Return-Path setting.
Download this release

Release Info

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

Code changes from version 2.8.3 to 2.9.0

Files changed (8) hide show
  1. classes/controllers/class.admin.php +11 -10
  2. classes/models/class.admin.php +10 -3
  3. classes/models/class.mail.php +24 -4
  4. classes/models/class.setting.php +8 -2
  5. mw-wp-form.php +2 -2
  6. readme.txt +5 -2
  7. templates/admin/admin-mail-options.php +6 -1
  8. templates/admin/mail-options.php +1 -1
classes/controllers/class.admin.php CHANGED
@@ -1,11 +1,11 @@
1
  <?php
2
  /**
3
  * Name : MW WP Form Admin Controller
4
- * Version : 1.1.2
5
  * Author : Takashi Kitajima
6
  * Author URI : http://2inc.org
7
  * Created : December 31, 2014
8
- * Modified : September 1, 2015
9
  * License : GPLv2 or later
10
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
  */
@@ -203,13 +203,14 @@ class MW_WP_Form_Admin_Controller extends MW_WP_Form_Controller {
203
  * 管理者メール設定
204
  */
205
  public function admin_mail_options() {
206
- $this->assign( 'mail_to' , $this->get_option( 'mail_to' ) );
207
- $this->assign( 'mail_cc' , $this->get_option( 'mail_cc' ) );
208
- $this->assign( 'mail_bcc' , $this->get_option( 'mail_bcc' ) );
209
- $this->assign( 'admin_mail_subject', $this->get_option( 'admin_mail_subject' ) );
210
- $this->assign( 'admin_mail_sender' , $this->get_option( 'admin_mail_sender' ) );
211
- $this->assign( 'admin_mail_from' , $this->get_option( 'admin_mail_from' ) );
212
- $this->assign( 'admin_mail_content', $this->get_option( 'admin_mail_content' ) );
 
213
  $this->render( 'admin/admin-mail-options' );
214
  }
215
 
@@ -277,7 +278,7 @@ class MW_WP_Form_Admin_Controller extends MW_WP_Form_Controller {
277
  } else {
278
  $value = $Setting->get( $key );
279
  }
280
-
281
  if ( !empty( $value ) ) {
282
  return $value;
283
  } else {
1
  <?php
2
  /**
3
  * Name : MW WP Form Admin Controller
4
+ * Version : 1.2.0
5
  * Author : Takashi Kitajima
6
  * Author URI : http://2inc.org
7
  * Created : December 31, 2014
8
+ * Modified : August 22, 2016
9
  * License : GPLv2 or later
10
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
  */
203
  * 管理者メール設定
204
  */
205
  public function admin_mail_options() {
206
+ $this->assign( 'mail_to' , $this->get_option( 'mail_to' ) );
207
+ $this->assign( 'mail_cc' , $this->get_option( 'mail_cc' ) );
208
+ $this->assign( 'mail_bcc' , $this->get_option( 'mail_bcc' ) );
209
+ $this->assign( 'admin_mail_subject' , $this->get_option( 'admin_mail_subject' ) );
210
+ $this->assign( 'admin_mail_sender' , $this->get_option( 'admin_mail_sender' ) );
211
+ $this->assign( 'mail_return_path' , $this->get_option( 'mail_return_path' ) );
212
+ $this->assign( 'admin_mail_from' , $this->get_option( 'admin_mail_from' ) );
213
+ $this->assign( 'admin_mail_content' , $this->get_option( 'admin_mail_content' ) );
214
  $this->render( 'admin/admin-mail-options' );
215
  }
216
 
278
  } else {
279
  $value = $Setting->get( $key );
280
  }
281
+
282
  if ( !empty( $value ) ) {
283
  return $value;
284
  } else {
classes/models/class.admin.php CHANGED
@@ -2,11 +2,11 @@
2
  /**
3
  * Name : MW WP Form Admin
4
  * Description: 管理画面クラス
5
- * Version : 2.0.3
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : February 21, 2013
9
- * Modified : May 25, 2015
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
@@ -30,7 +30,14 @@ class MW_WP_Form_Admin {
30
 
31
  $data = $_POST[MWF_Config::NAME];
32
 
33
- $triminglists = array( 'mail_from', 'mail_to', 'mail_cc', 'mail_bcc', 'admin_mail_from' );
 
 
 
 
 
 
 
34
  foreach ( $triminglists as $name ) {
35
  $data[$name] = trim( mb_convert_kana( $data[$name], 's', get_option( 'blog_charset' ) ) );
36
  }
2
  /**
3
  * Name : MW WP Form Admin
4
  * Description: 管理画面クラス
5
+ * Version : 2.1.0
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : February 21, 2013
9
+ * Modified : August 22, 2016
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
30
 
31
  $data = $_POST[MWF_Config::NAME];
32
 
33
+ $triminglists = array(
34
+ 'mail_from',
35
+ 'mail_return_path',
36
+ 'mail_to',
37
+ 'mail_cc',
38
+ 'mail_bcc',
39
+ 'admin_mail_from',
40
+ );
41
  foreach ( $triminglists as $name ) {
42
  $data[$name] = trim( mb_convert_kana( $data[$name], 's', get_option( 'blog_charset' ) ) );
43
  }
classes/models/class.mail.php CHANGED
@@ -2,11 +2,11 @@
2
  /**
3
  * Name : MW WP Form Mail
4
  * Description: メールクラス
5
- * Version : 1.6.0
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : July 20, 2012
9
- * Modified : February 14, 2016
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
@@ -36,6 +36,12 @@ class MW_WP_Form_Mail {
36
  */
37
  public $from;
38
 
 
 
 
 
 
 
39
  /**
40
  * 送信者
41
  * @var string
@@ -144,12 +150,12 @@ class MW_WP_Form_Mail {
144
  }
145
 
146
  /**
147
- * 返信先を設定
148
  *
149
  * @param phpmailer $phpmailer
150
  */
151
  public function set_return_path( $phpmailer ) {
152
- $phpmailer->Sender = $this->from;
153
  }
154
 
155
  /**
@@ -240,6 +246,13 @@ class MW_WP_Form_Mail {
240
  }
241
  $this->from = $admin_mail_from;
242
 
 
 
 
 
 
 
 
243
  // 送信者を指定
244
  $admin_mail_sender = get_bloginfo( 'name' );
245
  if ( $Setting->get( 'mail_sender' ) ) {
@@ -278,6 +291,13 @@ class MW_WP_Form_Mail {
278
  $this->to = $Data->get_post_value_by_key( $automatic_reply_email );
279
  }
280
 
 
 
 
 
 
 
 
281
  // 送信元を指定
282
  $reply_mail_from = get_bloginfo( 'admin_email' );
283
  if ( $Setting->get( 'mail_from' ) ) {
2
  /**
3
  * Name : MW WP Form Mail
4
  * Description: メールクラス
5
+ * Version : 2.0.0
6
  * Author : Takashi Kitajima
7
  * Author URI : http://2inc.org
8
  * Created : July 20, 2012
9
+ * Modified : August 19, 2016
10
  * License : GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
  */
36
  */
37
  public $from;
38
 
39
+ /**
40
+ * Return-Path
41
+ * @var string
42
+ */
43
+ public $return_path;
44
+
45
  /**
46
  * 送信者
47
  * @var string
150
  }
151
 
152
  /**
153
+ * Return-Path を設定
154
  *
155
  * @param phpmailer $phpmailer
156
  */
157
  public function set_return_path( $phpmailer ) {
158
+ $phpmailer->Sender = $this->return_path;
159
  }
160
 
161
  /**
246
  }
247
  $this->from = $admin_mail_from;
248
 
249
+ // Return-Path を指定
250
+ $mail_return_path = get_bloginfo( 'admin_email' );
251
+ if ( $Setting->get( 'mail_return_path' ) ) {
252
+ $mail_return_path = $Setting->get( 'mail_return_path' );
253
+ }
254
+ $this->return_path = $mail_return_path;
255
+
256
  // 送信者を指定
257
  $admin_mail_sender = get_bloginfo( 'name' );
258
  if ( $Setting->get( 'mail_sender' ) ) {
291
  $this->to = $Data->get_post_value_by_key( $automatic_reply_email );
292
  }
293
 
294
+ // Return-Path を指定
295
+ $mail_return_path = get_bloginfo( 'admin_email' );
296
+ if ( $Setting->get( 'mail_return_path' ) ) {
297
+ $mail_return_path = $Setting->get( 'mail_return_path' );
298
+ }
299
+ $this->return_path = $mail_return_path;
300
+
301
  // 送信元を指定
302
  $reply_mail_from = get_bloginfo( 'admin_email' );
303
  if ( $Setting->get( 'mail_from' ) ) {
classes/models/class.setting.php CHANGED
@@ -1,11 +1,11 @@
1
  <?php
2
  /**
3
  * Name : MW WP Form Setting
4
- * Version : 1.0.1
5
  * Author : Takashi Kitajima
6
  * Author URI : http://2inc.org
7
  * Created : December 31, 2014
8
- * Modified : April 15, 2015
9
  * License : GPLv2 or later
10
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
  */
@@ -83,6 +83,12 @@ class MW_WP_Form_Setting {
83
  */
84
  protected $admin_mail_subject = '';
85
 
 
 
 
 
 
 
86
  /**
87
  * 管理者メールの送信元
88
  * @var string
1
  <?php
2
  /**
3
  * Name : MW WP Form Setting
4
+ * Version : 1.2.0
5
  * Author : Takashi Kitajima
6
  * Author URI : http://2inc.org
7
  * Created : December 31, 2014
8
+ * Modified : August 22, 2016
9
  * License : GPLv2 or later
10
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
  */
83
  */
84
  protected $admin_mail_subject = '';
85
 
86
+ /**
87
+ * Return-Path
88
+ * @var string
89
+ */
90
+ protected $mail_return_path = '';
91
+
92
  /**
93
  * 管理者メールの送信元
94
  * @var string
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.8.3
7
  * Author: Takashi Kitajima
8
  * Author URI: http://2inc.org
9
  * Created : September 25, 2012
10
- * Modified: July 6, 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.9.0
7
  * Author: Takashi Kitajima
8
  * Author URI: http://2inc.org
9
  * Created : September 25, 2012
10
+ * Modified: August 22, 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.5.3
7
- Stable tag: 2.8.3
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -80,6 +80,9 @@ Do you have questions or issues with MW WP Form? Use these support channels appr
80
 
81
  == Changelog ==
82
 
 
 
 
83
  = 2.8.3 =
84
  * Added : Added the upload failure of the error message in filesize validation.
85
 
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.6.0
7
+ Stable tag: 2.9.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.9.0 =
84
+ * Added : Added the Return-Path setting.
85
+
86
  = 2.8.3 =
87
  * Added : Added the upload failure of the error message in filesize validation.
88
 
templates/admin/admin-mail-options.php CHANGED
@@ -30,6 +30,11 @@
30
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[admin_mail_sender]" value="<?php echo esc_attr( $admin_mail_sender ); ?>" /><br />
31
  <span class="mwf_note"><?php esc_html_e( 'If empty:', 'mw-wp-form' ); ?> <?php bloginfo( 'name' ); ?></span>
32
  </p>
 
 
 
 
 
33
  <p>
34
  <b><?php esc_html_e( 'From ( E-mail address )', 'mw-wp-form' ); ?></b><br />
35
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[admin_mail_from]" value="<?php echo esc_attr( $admin_mail_from ); ?>" /><br />
@@ -38,4 +43,4 @@
38
  <p>
39
  <b><?php esc_html_e( 'Content', 'mw-wp-form' ); ?></b><br />
40
  <textarea name="<?php echo esc_attr( MWF_Config::NAME ); ?>[admin_mail_content]" cols="30" rows="10"><?php echo esc_attr( $admin_mail_content ); ?></textarea>
41
- </p>
30
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[admin_mail_sender]" value="<?php echo esc_attr( $admin_mail_sender ); ?>" /><br />
31
  <span class="mwf_note"><?php esc_html_e( 'If empty:', 'mw-wp-form' ); ?> <?php bloginfo( 'name' ); ?></span>
32
  </p>
33
+ <p>
34
+ <b><?php esc_html_e( 'Return-Path ( E-mail address )', 'mw-wp-form' ); ?></b><br />
35
+ <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[mail_return_path]" value="<?php echo esc_attr( $mail_return_path ); ?>" /><br />
36
+ <span class="mwf_note"><?php esc_html_e( 'If empty:', 'mw-wp-form' ); ?> <?php bloginfo( 'admin_email' ); ?></span>
37
+ </p>
38
  <p>
39
  <b><?php esc_html_e( 'From ( E-mail address )', 'mw-wp-form' ); ?></b><br />
40
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[admin_mail_from]" value="<?php echo esc_attr( $admin_mail_from ); ?>" /><br />
43
  <p>
44
  <b><?php esc_html_e( 'Content', 'mw-wp-form' ); ?></b><br />
45
  <textarea name="<?php echo esc_attr( MWF_Config::NAME ); ?>[admin_mail_content]" cols="30" rows="10"><?php echo esc_attr( $admin_mail_content ); ?></textarea>
46
+ </p>
templates/admin/mail-options.php CHANGED
@@ -27,4 +27,4 @@
27
  <b><?php esc_html_e( 'Automatic reply email', 'mw-wp-form' ); ?></b><br />
28
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[automatic_reply_email]" value="<?php echo esc_attr( $automatic_reply_email ); ?>" /><br />
29
  <span class="mwf_note"><?php esc_html_e( 'Input the key to use as transmission to automatic reply email. {} is unnecessary.', 'mw-wp-form' ); ?></span>
30
- </p>
27
  <b><?php esc_html_e( 'Automatic reply email', 'mw-wp-form' ); ?></b><br />
28
  <input type="text" name="<?php echo esc_attr( MWF_Config::NAME ); ?>[automatic_reply_email]" value="<?php echo esc_attr( $automatic_reply_email ); ?>" /><br />
29
  <span class="mwf_note"><?php esc_html_e( 'Input the key to use as transmission to automatic reply email. {} is unnecessary.', 'mw-wp-form' ); ?></span>
30
+ </p>