From 38dbbc99abc01ab36846d27b254f31526c44d4a5 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Tue, 1 Oct 2024 12:18:41 +0530 Subject: [PATCH 1/3] Added: Validations for backoffice list filters for text fields --- classes/controller/AdminController.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 8115f30b6..41c29fc84 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -931,6 +931,17 @@ class AdminControllerCore extends Controller } } } + } else { + if (isset($field['validation']) && $field['validation'] && method_exists('Validate', $field['validation'])) { + $validation = $field['validation']; + } else { + $validation = 'isValidSearch'; + } + if (isset($value) && ($value !== '' || !$value === 0)) { + if (!Validate::$validation($value)) { + $this->errors[] = sprintf(Tools::displayError('The %s field is invalid'), $field['title']); + } + } } } } From 6bec5387e973613ae9a79ae631831d1acbc6cb47 Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Thu, 3 Oct 2024 20:13:38 +0530 Subject: [PATCH 2/3] update filter validations --- classes/controller/AdminController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 41c29fc84..1ab4dbbd3 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -934,11 +934,11 @@ class AdminControllerCore extends Controller } else { if (isset($field['validation']) && $field['validation'] && method_exists('Validate', $field['validation'])) { $validation = $field['validation']; - } else { - $validation = 'isValidSearch'; } if (isset($value) && ($value !== '' || !$value === 0)) { - if (!Validate::$validation($value)) { + if (preg_match('/¤|\|/', $value)) { + $this->errors[] = sprintf(Tools::displayError('The %s field is invalid'), $field['title']); + } elseif (isset($validation) && !Validate::$validation($value)) { $this->errors[] = sprintf(Tools::displayError('The %s field is invalid'), $field['title']); } } From 8e1d9033b63b6cfc9c172d4dba5d4b4f1f6b16ed Mon Sep 17 00:00:00 2001 From: Shreesh Arora Date: Fri, 4 Oct 2024 11:41:48 +0530 Subject: [PATCH 3/3] update filter validation --- classes/controller/AdminController.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 1ab4dbbd3..97b601140 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -932,14 +932,15 @@ class AdminControllerCore extends Controller } } } else { - if (isset($field['validation']) && $field['validation'] && method_exists('Validate', $field['validation'])) { - $validation = $field['validation']; - } if (isset($value) && ($value !== '' || !$value === 0)) { if (preg_match('/¤|\|/', $value)) { $this->errors[] = sprintf(Tools::displayError('The %s field is invalid'), $field['title']); - } elseif (isset($validation) && !Validate::$validation($value)) { - $this->errors[] = sprintf(Tools::displayError('The %s field is invalid'), $field['title']); + } else { + if (isset($field['validation']) && $field['validation'] && method_exists('Validate', $field['validation'])) { + if (!Validate::{$field['validation']}($value)) { + $this->errors[] = sprintf(Tools::displayError('The %s field is invalid'), $field['title']); + } + } } } }