diff options
author | AlexKlimenkov <shurick.klimenkov@gmail.com> | 2015-04-29 22:07:09 +0300 |
---|---|---|
committer | AlexKlimenkov <shurick.klimenkov@gmail.com> | 2015-04-29 22:07:09 +0300 |
commit | 16f6e54edba096c0cdd789edc9fca85d312c2ebb (patch) | |
tree | c21979537b1e0c2fb9622f8e0cd9059bad8b9729 /codebase/connector/db_common.php | |
parent | f56a0475d90af025e92ec4716ff4e5121992b4fe (diff) | |
download | scheduler-16f6e54edba096c0cdd789edc9fca85d312c2ebb.zip scheduler-16f6e54edba096c0cdd789edc9fca85d312c2ebb.tar.gz scheduler-16f6e54edba096c0cdd789edc9fca85d312c2ebb.tar.bz2 |
[fix] version 4.3.1
Diffstat (limited to 'codebase/connector/db_common.php')
-rw-r--r-- | codebase/connector/db_common.php | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/codebase/connector/db_common.php b/codebase/connector/db_common.php index effc291..f6391d2 100644 --- a/codebase/connector/db_common.php +++ b/codebase/connector/db_common.php @@ -793,13 +793,20 @@ abstract class DBDataWrapper extends DataWrapper{ for ($i=0; $i < sizeof($rules); $i++) if (is_string($rules[$i])) array_push($sql,"(".$rules[$i].")"); - else - if ($rules[$i]["value"]!=""){ - if (!$rules[$i]["operation"]) - array_push($sql,$this->escape_name($rules[$i]["name"])." LIKE '%".$this->escape($rules[$i]["value"])."%'"); - else - array_push($sql,$this->escape_name($rules[$i]["name"])." ".$rules[$i]["operation"]." '".$this->escape($rules[$i]["value"])."'"); + else { + $filtervalue = $rules[$i]["value"]; + $filteroperation = $rules[$i]["operation"]; + if ($filtervalue!=""){ + if (!$filteroperation) + array_push($sql,$this->escape_name($rules[$i]["name"])." LIKE '%".$this->escape($filtervalue)."%'"); + else { + if ($filteroperation != "IN") + $filtervalue = "'".$this->escape($filtervalue)."'"; + + array_push($sql,$this->escape_name($rules[$i]["name"])." ".$filteroperation." ".$filtervalue); + } } + } if ($relation !== false && $relation !== ""){ $relsql = $this->escape_name($this->config->relation_id["db_name"])." = '".$this->escape($relation)."'"; @@ -1053,6 +1060,7 @@ class ArrayDBDataWrapper extends DBDataWrapper{ } $relation_id = $this->config->relation_id["db_name"]; + $result = array(); for ($i = 0; $i < count($this->connection); $i++) { $item = $this->connection[$i]; |