This commit is contained in:
2026-01-02 00:35:01 +01:00
parent 5f5023305f
commit 421cee3755

View File

@@ -21,18 +21,18 @@ final class Search
} }
$conditions = []; $conditions = [];
$params = []; $bind = [];
$i = 0; $i = 0;
foreach ($tokens as $tok) { foreach ($tokens as $tok) {
$tok = trim($tok); $tok = trim($tok);
if ($tok === '') continue; if ($tok === '') continue;
$conditions[] = "(title LIKE :t{$i}a OR teaser_public LIKE :t{$i}b OR description LIKE :t{$i}c OR city LIKE :t{$i}d OR region LIKE :t{$i}e OR zip LIKE :t{$i}f)"; $conditions[] = "(title LIKE :t{$i}a OR teaser_public LIKE :t{$i}b OR description LIKE :t{$i}c OR city LIKE :t{$i}d OR region LIKE :t{$i}e OR zip LIKE :t{$i}f)";
$params["t{$i}a"] = '%' . $tok . '%'; $bind[":t{$i}a"] = '%' . $tok . '%';
$params["t{$i}b"] = '%' . $tok . '%'; $bind[":t{$i}b"] = '%' . $tok . '%';
$params["t{$i}c"] = '%' . $tok . '%'; $bind[":t{$i}c"] = '%' . $tok . '%';
$params["t{$i}d"] = '%' . $tok . '%'; $bind[":t{$i}d"] = '%' . $tok . '%';
$params["t{$i}e"] = '%' . $tok . '%'; $bind[":t{$i}e"] = '%' . $tok . '%';
$params["t{$i}f"] = '%' . $tok . '%'; $bind[":t{$i}f"] = '%' . $tok . '%';
$i++; $i++;
} }
@@ -63,13 +63,13 @@ final class Search
$whereParts[] = "(lat IS NOT NULL AND lng IS NOT NULL)"; $whereParts[] = "(lat IS NOT NULL AND lng IS NOT NULL)";
$whereParts[] = "(lat BETWEEN :latMin AND :latMax)"; $whereParts[] = "(lat BETWEEN :latMin AND :latMax)";
$whereParts[] = "(lng BETWEEN :lngMin AND :lngMax)"; $whereParts[] = "(lng BETWEEN :lngMin AND :lngMax)";
$params['glat'] = $lat; $bind[':glat'] = $lat;
$params['glng'] = $lng; $bind[':glng'] = $lng;
$params['latMin'] = $lat - $latRange; $bind[':latMin'] = $lat - $latRange;
$params['latMax'] = $lat + $latRange; $bind[':latMax'] = $lat + $latRange;
$params['lngMin'] = $lng - $lngRange; $bind[':lngMin'] = $lng - $lngRange;
$params['lngMax'] = $lng + $lngRange; $bind[':lngMax'] = $lng + $lngRange;
$params['radius'] = $radius; $bind[':radius'] = $radius;
} }
$where = $whereParts ? ('WHERE ' . implode(' AND ', $whereParts)) : ''; $where = $whereParts ? ('WHERE ' . implode(' AND ', $whereParts)) : '';
@@ -81,22 +81,10 @@ final class Search
$sql .= " ORDER BY starts_at ASC"; $sql .= " ORDER BY starts_at ASC";
} }
$sql .= " LIMIT :lim"; $sql .= " LIMIT :lim";
$bind[':lim'] = (int)$limit;
$stmt = $this->pdo->prepare($sql); $stmt = $this->pdo->prepare($sql);
foreach ($params as $k => $v) { $stmt->execute($bind);
$stmt->bindValue(':' . $k, $v, \PDO::PARAM_STR);
}
$stmt->bindValue(':lim', (int)$limit, \PDO::PARAM_INT);
if ($distanceFiltering) {
$stmt->bindValue(':radius', $params['radius'], \PDO::PARAM_STR);
$stmt->bindValue(':glat', $params['glat'], \PDO::PARAM_STR);
$stmt->bindValue(':glng', $params['glng'], \PDO::PARAM_STR);
$stmt->bindValue(':latMin', $params['latMin'], \PDO::PARAM_STR);
$stmt->bindValue(':latMax', $params['latMax'], \PDO::PARAM_STR);
$stmt->bindValue(':lngMin', $params['lngMin'], \PDO::PARAM_STR);
$stmt->bindValue(':lngMax', $params['lngMax'], \PDO::PARAM_STR);
}
$stmt->execute();
return $stmt->fetchAll(\PDO::FETCH_ASSOC) ?: []; return $stmt->fetchAll(\PDO::FETCH_ASSOC) ?: [];
} }
} }