Merge branch 'ConstructionConsent/fix-addr-search' into 'master'
fixed address search See merge request fronk/thetool!1224
This commit is contained in:
@@ -510,8 +510,19 @@ FROM ConstructionConsent
|
||||
|
||||
if(array_key_exists("address", $filter)) {
|
||||
$address = FronkDB::singleton()->escape($filter["address"]);
|
||||
if($address) {
|
||||
$where .= " AND (vs.name LIKE '%$address%' OR vh.strasse LIKE '%$address%' OR vh.hausnummer LIKE '%$address%' OR vh.plz LIKE '%$address%' OR vh.ortschaft LIKE '%$address%' OR vh.gemeinde LIKE '%$address%')";
|
||||
if ($address) {
|
||||
$address = trim($address);
|
||||
$searchTerms = explode(' ', $address);
|
||||
$conditions = [];
|
||||
|
||||
foreach ($searchTerms as $term) {
|
||||
$term = '%' . $term . '%';
|
||||
$conditions[] = "(vs.name LIKE '$term' OR vh.strasse LIKE '$term' OR vh.hausnummer LIKE '$term' OR vh.plz LIKE '$term' OR vh.ortschaft LIKE '$term' OR vh.gemeinde LIKE '$term')";
|
||||
}
|
||||
|
||||
if (!empty($conditions)) {
|
||||
$where .= " AND (" . implode(' AND ', $conditions) . ")";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user