From d2cce8613108d633d774fda040377e0167c0f326 Mon Sep 17 00:00:00 2001 From: Paolo Date: Thu, 23 Jan 2025 15:40:56 +0100 Subject: [PATCH] - controllers/api/frontend/v1/Filter->applyFilterFields validate filterFields as an array - FilterCmptLib->applyFilterFields evaluate each elements of filterFields as an array --- .../controllers/api/frontend/v1/Filter.php | 2 +- application/libraries/FilterCmptLib.php | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/application/controllers/api/frontend/v1/Filter.php b/application/controllers/api/frontend/v1/Filter.php index 45838fc5f..b195e0012 100644 --- a/application/controllers/api/frontend/v1/Filter.php +++ b/application/controllers/api/frontend/v1/Filter.php @@ -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()); diff --git a/application/libraries/FilterCmptLib.php b/application/libraries/FilterCmptLib.php index c1a2b47cb..bb5d01fae 100644 --- a/application/libraries/FilterCmptLib.php +++ b/application/libraries/FilterCmptLib.php @@ -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; } -} \ No newline at end of file +}