Changeset 2246438

Timestamp:

02/18/2020 09:49:02 PM (6 years ago)

Author:

moshensky

Message:

v 2.2.2

Location:

cf7-spreadsheets/trunk

Files:

• CF7-spreadsheets.php (modified) (5 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.1
+Version: 2.2.2
 Author: Moshenskyi Danylo
 Author URI: https://github.com/moshenskyDV/
@@ -132 +132 @@
     }
 
+    /**
+     * Regex similar to contact-form-7/includes/form-tags-manager.php:262.
+     *
+     * @param $meta
+     *
+     * @return bool|mixed
+     */
     public function get_fields($meta)
     {
-        $regexp = '/\[.*\]/';
+        $allowed_tags_string = implode(
+            '|',
+            array_merge(
+                $this->allowed_tags,
+                array_map(function ($tag) { return $tag.'\*'; }, $this->allowed_tags),
+                $this->predefined_mail,
+                $this->predefined_post,
+                $this->predefined_site,
+                $this->predefined_user,
+                array_keys($this->obsolete_predefined_tags)
+            )
+        );
+        $regexp = '/(\[?)'
+            .'\[('.$allowed_tags_string.')(?:[\r\n\t ](.*?))?(?:[\r\n\t ](\/))?\]'
+            .'(?:([^[]*?)\[\/\2\])?'
+            .'(\]?)/s';
         $arr = [];
         if (false == preg_match_all($regexp, $meta, $arr)) {
@@ -204 +226 @@
                 $values = [];
                 foreach ($params_names as $i => $param) {
-                    $d = $this->replace_tags($this->exec_shortcodes($param));
+                    $d = $this->replace_tags($this->exec_shortcodes($param), $cf7->scan_form_tags());
                     $cellData = new Google_Service_Sheets_CellData();
                     $value = new Google_Service_Sheets_ExtendedValue();
@@ -657 +679 @@
     }
 
-    private function replace_tags($string)
-    {
+    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;
+        }
         $regexp = '/\[.*\]/U';
         preg_match_all($regexp, $string, $arr);
@@ -678 +704 @@
                         $replace_to[] = implode(', ', $_POST[$clear_tag]);
                     } else {
-                        $replace_to[] = $_POST[$clear_tag];
+                        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];
+                        }
                     }
                 } 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.2.1
-Stable tag: 2.2.1
+Stable tag: 2.2.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -60 +60 @@
 == Changelog ==
 
-= 2.2.1 =
+= 2.2.2 =
 
-* Fixed broken packages
+* Fixed regexp, responsible for parsing text message (multiline tags and couple of tags in one line works well now)
+* Added [pipes feature](https://contactform7.com/selectable-recipient-with-pipes/)
 
 = 2.2.0 =