Changeset 1361997

Timestamp:

03/01/2016 06:31:15 PM (11 years ago)

Author:

msimpson

Message:

Better parsing of comma-delimited option values when they have regex with commas and escape characters in them

Location:

contact-form-7-to-database-extension/trunk

Files:

• CF7DBPlugin.php (modified) (3 diffs)
• phpunit/ParseFieldMatchesTest.php (added)

contact-form-7-to-database-extension/trunk/CF7DBPlugin.php

@@ -1149 +1149 @@
      */
     public function getNoSaveFields() {
-        return preg_split('/,|;/', $this->getOption('NoSaveFields'), -1, PREG_SPLIT_NO_EMPTY);
+        return $this->parseOption($this->getOption('NoSaveFields'));
     }
 
@@ -1156 +1156 @@
      */
     public function getNoSaveForms() {
-        return preg_split('/,|;/', $this->getOption('NoSaveForms'), -1, PREG_SPLIT_NO_EMPTY);
+        return $this->parseOption($this->getOption('NoSaveForms'));
+    }
+
+    /**
+     * Parse option string that is a comma-delimited set of stings (some of which may be regex's with commas in them)
+     * @param $option string
+     * @return array
+     */
+    public function parseOption($option) {
+//        return preg_split('/,|;/', $option, -1, PREG_SPLIT_NO_EMPTY);
+        $values = array();
+        if ($option) {
+            $regex = false;
+            $esc = false;
+            $value = '';
+            $len = strlen($option);
+            for ($i = 0; $i < $len; $i++) {
+
+                if ($regex && !$esc && $option[$i] == '\\') {
+                    $esc = true;
+                    $value .= $option[$i];
+                    continue;
+                }
+
+                if (!$value && $option[$i] == '/') {
+                    $regex = true;
+                    $value .= $option[$i];
+                    continue;
+                }
+
+                if (!$regex) {
+                    if ($option[$i] == ',') {
+                        if ($value) {
+                            $values[] = $value;
+                        }
+                        $value = '';
+                    } else {
+                        $value .= $option[$i];
+                    }
+                } else {
+                    if ($option[$i] == '/' && !$esc) {
+                        $regex = false;
+                    }
+                    $value .= $option[$i];
+                }
+                $esc = false;
+            }
+            if ($value) {
+                $values[] = $value;
+            }
+        }
+        return $values;
     }
 
@@ -1163 +1214 @@
      */
     public function getSaveCookies() {
-        return preg_split('/,|;/', $this->getOption('SaveCookieNames'), -1, PREG_SPLIT_NO_EMPTY);
+        return $this->parseOption($this->getOption('SaveCookieNames'));
     }