Contact Form 7 add confirm - Version 4.1

Version Description

Download this release

Release Info

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

Code changes from version 1.3.9.6 to 4.1

Files changed (3) hide show
  1. contact-form-7-confirm.php +2 -2
  2. includes/controller.php +16 -2
  3. readme.txt +13 -4
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.6
11
  */
12
 
13
  /* Copyright 2014- Yuichiro ABE (email: y.abe at eyeta.jp)
@@ -44,7 +44,7 @@ Version: 1.3.9.6
44
  　戻って編集ボタンのデフォルトテキストが英語だった件を修正
45
  以降、readme.txtに記述
46
  */
47
- define( 'WPCF7C_VERSION', '1.3.9.6' );
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: 4.1
11
  */
12
 
13
  /* Copyright 2014- Yuichiro ABE (email: y.abe at eyeta.jp)
44
  　戻って編集ボタンのデフォルトテキストが英語だった件を修正
45
  以降、readme.txtに記述
46
  */
47
+ define( 'WPCF7C_VERSION', '4.1' );
48
 
49
  if ( ! defined( 'WPCF7C_PLUGIN_BASENAME' ) )
50
  define( 'WPCF7C_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
includes/controller.php CHANGED
@@ -21,6 +21,7 @@ function wpcf7c_control_init() {
21
 
22
 
23
  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 );
@@ -42,15 +43,28 @@ function wpcf7c_ajax_json_echo() {
42
  // Contact Form DB対策
43
  //remove_action( 'wpcf7_before_send_mail', 'wpcf7_flamingo_submit');
44
  global $wp_filter, $merged_filters;
45
-
46
  //error_log(print_r($wp_filter, true));
47
  if(isset($wp_filter["wpcf7_before_send_mail"])) {
48
  foreach($wp_filter["wpcf7_before_send_mail"] as $priority => $actions) {
49
  foreach($actions as $key => $action) {
50
  if(is_array($action["function"])) {
51
  if(is_object($action["function"][0])) {
 
52
  if(get_class($action["function"][0]) == "CF7DBPlugin") {
53
- //error_log(print_r($action, true));
 
 
 
 
 
 
 
 
 
 
 
 
54
  if($action["function"][1] == "saveFormData") {
55
  unset($wp_filter["wpcf7_before_send_mail"][$priority][$key]);
56
  if ( empty($wp_filter["wpcf7_before_send_mail"][$priority]) )
21
 
22
 
23
  function wpcf7c_ajax_json_echo() {
24
+ //error_log("wpcf7c_ajax_json_echo: " . $_POST['_wpcf7c']);
25
  if (isset($_POST['_wpcf7c'])) switch($_POST["_wpcf7c"]) {
26
  case "step1":
27
  // $result = apply_filters( 'wpcf7_before_send_mail', $result );
43
  // Contact Form DB対策
44
  //remove_action( 'wpcf7_before_send_mail', 'wpcf7_flamingo_submit');
45
  global $wp_filter, $merged_filters;
46
+ //error_log(print_r($wp_filter,true));
47
  //error_log(print_r($wp_filter, true));
48
  if(isset($wp_filter["wpcf7_before_send_mail"])) {
49
  foreach($wp_filter["wpcf7_before_send_mail"] as $priority => $actions) {
50
  foreach($actions as $key => $action) {
51
  if(is_array($action["function"])) {
52
  if(is_object($action["function"][0])) {
53
+ error_log(print_r($action["function"][0], true));
54
  if(get_class($action["function"][0]) == "CF7DBPlugin") {
55
+
56
+ if($action["function"][1] == "saveFormData") {
57
+ unset($wp_filter["wpcf7_before_send_mail"][$priority][$key]);
58
+ if ( empty($wp_filter["wpcf7_before_send_mail"][$priority]) )
59
+ unset($wp_filter["wpcf7_before_send_mail"][$priority]);
60
+ unset($merged_filters["wpcf7_before_send_mail"]);
61
+ } else if($action["function"][1] == "saveCF7FormData") {
62
+ unset($wp_filter["wpcf7_before_send_mail"][$priority][$key]);
63
+ if ( empty($wp_filter["wpcf7_before_send_mail"][$priority]) )
64
+ unset($wp_filter["wpcf7_before_send_mail"][$priority]);
65
+ unset($merged_filters["wpcf7_before_send_mail"]);
66
+ }
67
+ } else if(get_class($action["function"][0]) == 'CFDBIntegrationContactForm7') {
68
  if($action["function"][1] == "saveFormData") {
69
  unset($wp_filter["wpcf7_before_send_mail"][$priority][$key]);
70
  if ( empty($wp_filter["wpcf7_before_send_mail"][$priority]) )
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: 4.0
7
- Stable tag: 1.3.9.6
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -93,6 +93,15 @@ An answer to that question.
93
 
94
  1.3.9.5
95
  バグFIXデバックログ出力が残っていたものを削除
96
- == Upgrade notice ==
97
  1.3.9.6
98
- Noticeが出ていた箇所を修正
 
 
 
 
 
 
 
 
 
3
  Donate link:
4
  Tags: contact, form, contact form
5
  Requires at least: 3.8
6
+ Tested up to: 4.1
7
+ Stable tag: 4.1
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
93
 
94
  1.3.9.5
95
  バグFIXデバックログ出力が残っていたものを削除
96
+
97
  1.3.9.6
98
+ Noticeが出ていた箇所を修正
99
+
100
+ 4.1
101
+ バージョンのカウント方法をcontact form 7とwordpressに合わせました。
102
+ contact form DBプラグインの2.8.26以降で二重登録される不具合に対応。
103
+
104
+ == Upgrade notice ==
105
+ 4.1
106
+ バージョンのカウント方法をcontact form 7とwordpressに合わせました。
107
+ contact form DBプラグインの2.8.26以降で二重登録される不具合に対応。