Skip to content

Parse comma in filter #1985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jessevz merged 2 commits into from
Mar 17, 2026
Merged

Parse comma in filter #1985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3731418
Made it possible to use a ',' for filters with 1 value
Mar 16, 2026
6d8acb5
Fixed bug in pagination filter when used at tasks table, becasause of…
Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/dba/PaginationFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ function getQueryString(AbstractModelFactory $factory, bool $includeTable = fals
//ex. SELECT hashTypeId, description, isSalted, isSlowHash FROM HashType
// where (HashType.isSalted < 1) OR (HashType.isSalted = 1 and HashType.hashTypeId < 12600)
// ORDER BY HashType.isSalted DESC, HashType.hashTypeId DESC LIMIT 25;
$queryString = "(" . $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . $this->operator . "?" . ") OR (" . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . "=" . "?"
. " AND " . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->tieBreakerKey) . $this->operator . "?";
$queryString = "(" . $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . $this->operator . "?" . ") OR (" . $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . "=" . "?"
. " AND " . $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->tieBreakerKey) . $this->operator . "?";
if (count($this->filters) > 0) {
$queryString = $queryString . " AND " . implode(" AND ", $parts);
}
Expand Down
7 changes: 5 additions & 2 deletions src/inc/apiv2/common/AbstractBaseAPI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,7 +1150,11 @@ protected function makeFilter(array $filters, object $apiClass, array &$joinFilt
throw new HttpForbidden("Filter parameter '" . $filter . "' is not valid (key not valid field)");
};

$valueList = explode(",", $value);
// Only __in and __nin support comma-separated multiple values;
// all other operators treat the value as a literal string.
$operator = $matches['operator'];
$isListOperator = in_array($operator, ['__in', '__nin']);
$valueList = $isListOperator ? explode(",", $value) : [$value];

// TODO Merge/Combine with validate parameters
foreach ($valueList as &$value) {
Expand Down Expand Up @@ -1178,7 +1182,6 @@ protected function makeFilter(array $filters, object $apiClass, array &$joinFilt

$amount_values = count($valueList);
$single_val = $valueList[0];
$operator = $matches['operator'];
$query_operator = "";
switch (true) {
case (($operator == '__eq' | $operator == '') && $amount_values == 1):
Expand Down
Loading