Contact Form 7 add confirm - Version 1.3.9.3

Version Description

Download this release

Release Info

Developer Yuichiro ABE
Plugin Icon wp plugin Contact Form 7 add confirm
Version 1.3.9.3
Comparing to
See all releases

Code changes from version 1.3.9.2 to 1.3.9.3

Files changed (3) hide show
  1. contact-form-7-confirm.php +2 -2
  2. includes/controller.php +19 -3
  3. readme.txt +11 -3
contact-form-7-confirm.php CHANGED
@@ -7,7 +7,7 @@ Author: Yuichiro ABE
7
  Author URI: http://www.eyeta.jp/
8
  Text Domain: contact-form-7-confirm
9
  Domain Path: /languages/
10
- Version: 1.3.9.2
11
  */
12
 
13
  /* Copyright 2014- Yuichiro ABE (email: y.abe at eyeta.jp)
@@ -44,7 +44,7 @@ Version: 1.3.9.2
44
  　戻って編集ボタンのデフォルトテキストが英語だった件を修正
45
  以降、readme.txtに記述
46
  */
47
- define( 'WPCF7C_VERSION', '1.3.9.1' );
48
 
49
  if ( ! defined( 'WPCF7C_PLUGIN_BASENAME' ) )
50
  define( 'WPCF7C_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
7
  Author URI: http://www.eyeta.jp/
8
  Text Domain: contact-form-7-confirm
9
  Domain Path: /languages/
10
+ Version: 1.3.9.3
11
  */
12
 
13
  /* Copyright 2014- Yuichiro ABE (email: y.abe at eyeta.jp)
44
  　戻って編集ボタンのデフォルトテキストが英語だった件を修正
45
  以降、readme.txtに記述
46
  */
47
+ define( 'WPCF7C_VERSION', '1.3.9.3' );
48
 
49
  if ( ! defined( 'WPCF7C_PLUGIN_BASENAME' ) )
50
  define( 'WPCF7C_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
includes/controller.php CHANGED
@@ -24,10 +24,13 @@ function wpcf7c_ajax_json_echo() {
24
  if (isset($_POST['_wpcf7c'])) switch($_POST["_wpcf7c"]) {
25
  case "step1":
26
  // $result = apply_filters( 'wpcf7_before_send_mail', $result );
27
- if(WPCF7_VERSION >= 3.9) {
28
  add_filter( 'wpcf7_acceptance', 'wpcf7c_acceptance_filter', 11, 1 );
 
 
29
  } else {
30
  add_action("wpcf7_before_send_mail", "wpcf7c_before_send_mail_step1", 10, 2);
 
31
  }
32
 
33
  //$items = apply_filters( 'wpcf7_ajax_json_echo', $items, $result );
@@ -96,16 +99,25 @@ function wpcf7c_before_send_mail_step1(&$cls) {
96
  $cls->skip_mail = true;
97
  }
98
 
 
99
  function wpcf7c_ajax_json_echo_step1($items, $result) {
100
  global $wpcf7_confflag;
101
 
102
  $flag = false;
103
- if(WPCF7_VERSION >= 3.9) {
 
104
  $flag = $wpcf7_confflag;
 
 
 
 
105
  } else {
106
  $flag = $result['mail_sent'];
107
  }
108
 
 
 
 
109
  if($flag) {
110
  if(!isset($items["onSubmit"]) || $items["onSubmit"] == null) {
111
  $items["onSubmit"] = array("wpcf7c_step1('" . $_POST['_wpcf7_unit_tag'] . "');");
@@ -175,12 +187,16 @@ function wpcf7c_captcha_validation_filter( $result, $tag ) {
175
  function wpcf7c_ajax_json_echo_step2($items, $result) {
176
  //eyeta_log("wpcf7c_ajax_json_echo_step1");
177
  $flag = false;
178
- if(WPCF7_VERSION >= 3.9) {
 
 
 
179
  $flag = $items['mailSent'];
180
  } else {
181
  $flag = $result['mail_sent'];
182
  }
183
 
 
184
  if($flag) {
185
  if(!isset($items["onSubmit"]) || $items["onSubmit"] == null) {
186
  $items["onSubmit"] = array("wpcf7c_step2('" . $_POST['_wpcf7_unit_tag'] . "');");
24
  if (isset($_POST['_wpcf7c'])) switch($_POST["_wpcf7c"]) {
25
  case "step1":
26
  // $result = apply_filters( 'wpcf7_before_send_mail', $result );
27
+ if(WPCF7_VERSION == '3.9' || WPCF7_VERSION == '3.9.1') {
28
  add_filter( 'wpcf7_acceptance', 'wpcf7c_acceptance_filter', 11, 1 );
29
+ } else if(WPCF7_VERSION >= "3.9.2"){
30
+ add_filter("wpcf7_skip_mail", '__return_true', 10, 2);
31
  } else {
32
  add_action("wpcf7_before_send_mail", "wpcf7c_before_send_mail_step1", 10, 2);
33
+ //add_filter( 'wpcf7_acceptance', 'wpcf7c_acceptance_filter', 11, 1 );
34
  }
35
 
36
  //$items = apply_filters( 'wpcf7_ajax_json_echo', $items, $result );
99
  $cls->skip_mail = true;
100
  }
101
 
102
+
103
  function wpcf7c_ajax_json_echo_step1($items, $result) {
104
  global $wpcf7_confflag;
105
 
106
  $flag = false;
107
+
108
+ if(WPCF7_VERSION == '3.9' || WPCF7_VERSION == '3.9.1') {
109
  $flag = $wpcf7_confflag;
110
+ } else if(WPCF7_VERSION >= "3.9.2"){
111
+ if('mail_sent' == $result['status']) {
112
+ $flag = true;
113
+ }
114
  } else {
115
  $flag = $result['mail_sent'];
116
  }
117
 
118
+
119
+
120
+
121
  if($flag) {
122
  if(!isset($items["onSubmit"]) || $items["onSubmit"] == null) {
123
  $items["onSubmit"] = array("wpcf7c_step1('" . $_POST['_wpcf7_unit_tag'] . "');");
187
  function wpcf7c_ajax_json_echo_step2($items, $result) {
188
  //eyeta_log("wpcf7c_ajax_json_echo_step1");
189
  $flag = false;
190
+
191
+ if(WPCF7_VERSION == '3.9' || WPCF7_VERSION == '3.9.1') {
192
+ $flag = $items['mailSent'];
193
+ } else if(WPCF7_VERSION >= "3.9.2"){
194
  $flag = $items['mailSent'];
195
  } else {
196
  $flag = $result['mail_sent'];
197
  }
198
 
199
+
200
  if($flag) {
201
  if(!isset($items["onSubmit"]) || $items["onSubmit"] == null) {
202
  $items["onSubmit"] = array("wpcf7c_step2('" . $_POST['_wpcf7_unit_tag'] . "');");
readme.txt CHANGED
@@ -3,8 +3,8 @@ Contributors: Yuichiro ABE
3
  Donate link:
4
  Tags: contact, form, contact form
5
  Requires at least: 3.8
6
- Tested up to: 3.9.2
7
- Stable tag: 1.3.9.2
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -77,8 +77,16 @@ An answer to that question.
77
  input type="text"などについて、disabledは付けずにreadonlyのみにしました。
78
  textareaについて、入力内容が縦幅より大きい場合、確認画面で高さを伸ばすようにしました。
79
 
80
- == Upgrade notice ==
81
  1.3.9.2
82
  エラーメッセージ表示のDIVが確認画面から編集画面に戻る際に
83
  display: blockのままだったものをnoneにするように修正
84
 
 
 
 
 
 
 
 
 
 
3
  Donate link:
4
  Tags: contact, form, contact form
5
  Requires at least: 3.8
6
+ Tested up to: 4.0
7
+ Stable tag: 1.3.9.3
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
77
  input type="text"などについて、disabledは付けずにreadonlyのみにしました。
78
  textareaについて、入力内容が縦幅より大きい場合、確認画面で高さを伸ばすようにしました。
79
 
 
80
  1.3.9.2
81
  エラーメッセージ表示のDIVが確認画面から編集画面に戻る際に
82
  display: blockのままだったものをnoneにするように修正
83
 
84
+ 1.3.9.3
85
+ WordPress4.0
86
+ Contact Form 7 3.9.2に対応
87
+
88
+ == Upgrade notice ==
89
+ 1.3.9.3
90
+ WordPress4.0
91
+ Contact Form 7 3.9.2に対応
92
+