From 494087ab1d7d309ebdb7bf25040aff300b7123b0 Mon Sep 17 00:00:00 2001 From: William Knauss Date: Thu, 5 Jun 2014 20:49:49 -0400 Subject: [PATCH] _validate_row_condition --- parsecsv.lib.php | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/parsecsv.lib.php b/parsecsv.lib.php index eff9e6d..ec79f3e 100644 --- a/parsecsv.lib.php +++ b/parsecsv.lib.php @@ -985,19 +985,19 @@ class parseCSV { $operators_regex = array(); - foreach( $operators as $value ) { + foreach ($operators as $value) { $operators_regex[] = preg_quote($value, '/'); } $operators_regex = implode('|', $operators_regex); - if ( preg_match('/^(.+) ('.$operators_regex.') (.+)$/i', trim($condition), $capture) ) { + if (preg_match('/^(.+) ('.$operators_regex.') (.+)$/i', trim($condition), $capture)) { $field = $capture[1]; $op = $capture[2]; $value = $capture[3]; - if ( preg_match('/^([\'\"]{1})(.*)([\'\"]{1})$/i', $value, $capture) ) { - if ( $capture[1] == $capture[3] ) { + if (preg_match('/^([\'\"]{1})(.*)([\'\"]{1})$/i', $value, $capture)) { + if ($capture[1] == $capture[3]) { $value = $capture[2]; $value = str_replace("\\n", "\n", $value); $value = str_replace("\\r", "\r", $value); @@ -1006,29 +1006,29 @@ class parseCSV { } } - if ( array_key_exists($field, $row) ) { - if ( ($op == '=' || $op == 'equals' || $op == 'is') && $row[$field] == $value ) { + if (array_key_exists($field, $row)) { + if (($op == '=' || $op == 'equals' || $op == 'is') && $row[$field] == $value) { return '1'; } - elseif ( ($op == '!=' || $op == 'is not') && $row[$field] != $value ) { + elseif (($op == '!=' || $op == 'is not') && $row[$field] != $value) { return '1'; } - elseif ( ($op == '<' || $op == 'is less than' ) && $row[$field] < $value ) { + elseif (($op == '<' || $op == 'is less than' ) && $row[$field] < $value) { return '1'; } - elseif ( ($op == '>' || $op == 'is greater than') && $row[$field] > $value ) { + elseif (($op == '>' || $op == 'is greater than') && $row[$field] > $value) { return '1'; } - elseif ( ($op == '<=' || $op == 'is less than or equals' ) && $row[$field] <= $value ) { + elseif (($op == '<=' || $op == 'is less than or equals' ) && $row[$field] <= $value) { return '1'; } - elseif ( ($op == '>=' || $op == 'is greater than or equals') && $row[$field] >= $value ) { + elseif (($op == '>=' || $op == 'is greater than or equals') && $row[$field] >= $value) { return '1'; } - elseif ( $op == 'contains' && preg_match('/'.preg_quote($value, '/').'/i', $row[$field]) ) { + elseif ($op == 'contains' && preg_match('/'.preg_quote($value, '/').'/i', $row[$field])) { return '1'; } - elseif ( $op == 'does not contain' && !preg_match('/'.preg_quote($value, '/').'/i', $row[$field]) ) { + elseif ($op == 'does not contain' && !preg_match('/'.preg_quote($value, '/').'/i', $row[$field])) { return '1'; } else {