mirror of
https://github.com/postfixadmin/postfixadmin.git
synced 2024-09-20 03:36:20 +02:00
functions.inc.php:
- db_where_clause(): wrap condition in "(...)" model/PFAHandler.php: - read_from_db(): wrap condition in "(...)" git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1493 a1433add-5e2c-0410-b055-b7f2511e0802
This commit is contained in:
parent
3b7606b654
commit
414c05e678
@ -1651,7 +1651,7 @@ function db_where_clause($condition, $struct) {
|
|||||||
if (isset($struct[$field]) && $struct[$field]['type'] == 'bool') $value = db_get_boolean($value);
|
if (isset($struct[$field]) && $struct[$field]['type'] == 'bool') $value = db_get_boolean($value);
|
||||||
$parts[] = "$field='" . escape_string($value) . "'";
|
$parts[] = "$field='" . escape_string($value) . "'";
|
||||||
}
|
}
|
||||||
$query = " WHERE " . join(" AND ", $parts) . " ";
|
$query = " WHERE ( " . join(" AND ", $parts) . " ) ";
|
||||||
return $query;
|
return $query;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -453,12 +453,10 @@ abstract class PFAHandler {
|
|||||||
$where = db_where_clause($condition, $this->struct);
|
$where = db_where_clause($condition, $this->struct);
|
||||||
} else {
|
} else {
|
||||||
if ($condition == "") $condition = '1=1';
|
if ($condition == "") $condition = '1=1';
|
||||||
$where = " WHERE $condition ";
|
$where = " WHERE ( $condition ) ";
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->domain_field != "") {
|
if ($this->domain_field != "") {
|
||||||
# TODO: wrap where clause in (...) to avoid problems if OR is used?
|
|
||||||
# TODO: Note: this would need a change in db_where_clause not to include the WHERE keyword in the result
|
|
||||||
$where .= " AND " . db_in_clause($this->domain_field, $this->allowed_domains);
|
$where .= " AND " . db_in_clause($this->domain_field, $this->allowed_domains);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user