blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-18 07:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

- controllers/api/frontend/v1/Filter->applyFilterFields validate filterFields as an array

Browse Source 
- FilterCmptLib->applyFilterFields evaluate each elements of filterFields as an array
This commit is contained in:
Paolo
2025-01-23 15:40:56 +01:00
parent 781e2dbd15
commit d2cce86131
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/api/frontend/v1/Filter.php
+1 -1
View File
@@ -113,7 +113,7 @@ class Filter extends FHCAPI_Controller
*/
public function applyFilterFields()
{
$this->form_validation->set_rules('filterFields', 'filterFields', 'required');
$this->form_validation->set_rules('filterFields[]', 'filterFields', 'required');
if (!$this->form_validation->run())
$this->terminateWithValidationErrors($this->form_validation->error_array());
application/libraries/FilterCmptLib.php
+10 -10
View File
@@ -371,21 +371,21 @@ class FilterCmptLib
foreach ($filterFields as $filterField)
{
// If not an empty array
if ($filterField != null)
if (!isEmptyArray($filterField))
{
//
if (isset($filterField->name) && isset($filterField->operation) && isset($filterField->condition)
&& !isEmptyString($filterField->name) && !isEmptyString($filterField->operation)
&& !isEmptyString($filterField->condition))
if (isset($filterField['name']) && isset($filterField['operation']) && isset($filterField['condition'])
&& !isEmptyString($filterField['name']) && !isEmptyString($filterField['operation'])
&& !isEmptyString($filterField['condition']))
{
// Fine
$filter = new stdClass();
$filter->name = $filterField->name;
$filter->operation = $filterField->operation;
$filter->condition = $filterField->condition;
if (isset($filterField->option) && !isEmptyString($filterField->option))
$filter->name = $filterField['name'];
$filter->operation = $filterField['operation'];
$filter->condition = $filterField['condition'];
if (isset($filterField['option']) && !isEmptyString($filterField['option']))
{
$filter->option = $filterField->option;
$filter->option = $filterField['option'];
}
else
{
@@ -1173,4 +1173,4 @@ class FilterCmptLib
return $filterName;
}
}
}