mirror/postfixadmin
0
0
Fork 0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2024-09-19 19:22:14 +02:00
Code

functions.inc.php:

Browse Source 
- 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:
Christian Boltz 2013-06-23 20:02:05 +00:00
parent 3b7606b654
commit 414c05e678
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
functions.inc.php
View File

@ -1651,7 +1651,7 @@ function db_where_clause($condition, $struct) {
if (isset($struct[$field]) && $struct[$field]['type'] == 'bool') $value = db_get_boolean($value);
$parts[] = "$field='" . escape_string($value) . "'";
}
$query = " WHERE " . join(" AND ", $parts) . " ";
$query = " WHERE ( " . join(" AND ", $parts) . " ) ";
return $query;
}

4
model/PFAHandler.php
View File

@ -453,12 +453,10 @@ abstract class PFAHandler {
$where = db_where_clause($condition, $this->struct);
} else {
if ($condition == "") $condition = '1=1';
$where = " WHERE $condition ";
$where = " WHERE ( $condition ) ";
}
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);
}