Changeset 2256406

Timestamp:

03/07/2020 04:59:28 PM (6 years ago)

Author:

moshensky

Message:

v 2.2.4

Location:

cf7-spreadsheets/trunk

Files:

• CF7-spreadsheets.php (modified) (8 diffs)
• readme.txt (modified) (2 diffs)

cf7-spreadsheets/trunk/CF7-spreadsheets.php

@@ -4 +4 @@
 Plugin URI: https://github.com/moshenskyDV/CF7-spreadsheets
 Description: Send Contact form 7 mail to Google spreadsheets
-Version: 2.2.3
+Version: 2.2.4
 Author: Moshenskyi Danylo
 Author URI: https://github.com/moshenskyDV/
@@ -12 +12 @@
 */
 
-/*  Copyright 2016  Moshenskyi Danylo  (email: moshensky[email protected])
+/*  Copyright 2016  Moshenskyi Danylo  (email: moshensky[email protected])
 
     This program is free software; you can redistribute it and/or modify
@@ -201 +201 @@
     public function main($cf7)
     {
-        if ('on' == get_post_meta($cf7->id(), 'CF7spreadsheets_option_enabled', true)) {
+        if ('on' == get_post_meta($cf7->id, 'CF7spreadsheets_option_enabled', true)) {
             require 'vendor/autoload.php';
 
+            $submission = WPCF7_Submission::get_instance();
+            $posted_data = $submission->get_posted_data();
             $this->client = new Google_Client();
 
@@ -220 +222 @@
             try {
                 // Set the sheet ID
-                $fileId = esc_html(get_post_meta($cf7->id(), 'CF7spreadsheets_option_url', true)); // Copy & paste from a spreadsheet URL
+                $fileId = esc_html(get_post_meta($cf7->id, 'CF7spreadsheets_option_url', true)); // Copy & paste from a spreadsheet URL
                 // Build the CellData array
-                $params_names = json_decode(get_post_meta($cf7->id(), 'CF7spreadsheets_output_tags', true));
-                $params_types = json_decode(get_post_meta($cf7->id(), 'CF7spreadsheets_output_types', true));
+                $params_names = json_decode(get_post_meta($cf7->id, 'CF7spreadsheets_output_tags', true));
+                $params_types = json_decode(get_post_meta($cf7->id, 'CF7spreadsheets_output_types', true));
                 $values = [];
                 foreach ($params_names as $i => $param) {
-                    $d = $this->replace_tags($this->exec_shortcodes($param), $cf7->scan_form_tags());
+                    $d = $this->replace_tags($this->exec_shortcodes($param), $posted_data);
                     $cellData = new Google_Service_Sheets_CellData();
                     $value = new Google_Service_Sheets_ExtendedValue();
@@ -252 +254 @@
                 // Prepare the request
                 $append_request = new Google_Service_Sheets_AppendCellsRequest();
-                $append_request->setSheetId(esc_html(get_post_meta($cf7->id(), 'CF7spreadsheets_option_id', true))); //<-----SHEET ID
+                $append_request->setSheetId(esc_html(get_post_meta($cf7->id, 'CF7spreadsheets_option_id', true))); //<-----SHEET ID
                 $append_request->setRows($rowData);
                 $append_request->setFields('userEnteredValue');
@@ -282 +284 @@
 
             /*after google send option skip email needed*/
-            if ('on' != get_post_meta($cf7->id(), 'CF7spreadsheets_option_mail', true)) {
+            if ('on' != get_post_meta($cf7->id, 'CF7spreadsheets_option_mail', true)) {
                 $cf7->skip_mail = true;
             }
@@ -679 +681 @@
     }
 
-    private function replace_tags($string, $request_form_tags)
-    {
-        $assoc_request_form_tags = [];
-        foreach ($request_form_tags as $tag) {
-            $assoc_request_form_tags[$tag->name] = $tag;
-        }
+    private function replace_tags($string, $request_data)
+    {
         $regexp = '/\[.*\]/U';
         preg_match_all($regexp, $string, $arr);
@@ -697 +695 @@
                 }
 
-                if (!empty($_POST[$clear_tag]) || '0' === $_POST[$clear_tag]) {
+                if (!empty($request_data[$clear_tag]) || '0' === $request_data[$clear_tag]) {
                     /*user tags*/
                     $replace_from[] = '/'.quotemeta($tag).'/';
-                    if (is_array($_POST[$clear_tag])) {
+                    if (is_array($request_data[$clear_tag])) {
                         /*multiselect or checkboxes*/
-                        $replace_to[] = implode(', ', $_POST[$clear_tag]);
+                        $replace_to[] = implode(', ', $request_data[$clear_tag]);
                     } else {
-                        // TODO: pipes affects placeholders
-//                        if (!empty($assoc_request_form_tags[$clear_tag]->pipes->collect_befores())) {
-//                            $index = array_search($_POST[$clear_tag], $assoc_request_form_tags[$clear_tag]->pipes->collect_befores());
-//                            $replace_to[] = $assoc_request_form_tags[$clear_tag]->pipes->collect_afters()[$index];
-//                        } else {
-                            $replace_to[] = $_POST[$clear_tag];
-//                        }
+                        $replace_to[] = $request_data[$clear_tag];
                     }
                 } elseif ($defined = wpcf7_special_mail_tag(false, $clear_tag, false)) {

cf7-spreadsheets/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 4.7
 Tested up to: 5.3.2
-Stable tag: 2.2.3
+Stable tag: 2.2.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -59 +59 @@
 
 == Changelog ==
+
+= 2.2.4 =
+
+* Data source became `WPCF7_Submission` instead of `$_POST` (pipes feature works).
 
 = 2.2.3 =