feat(dropdownfield): allow regex comparison

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Feb 17, 2021 · 9fd8c1a · 9fd8c1a
1 parent 2de33ed
commit 9fd8c1a
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/inc/field/dropdownfield.class.php b/inc/field/dropdownfield.class.php
@@ -651,7 +651,18 @@ public function lessThan($value): bool {
    }
 
    public function regex($value): bool {
-      throw new ComparisonException('Meaningless comparison');
+      $value = html_entity_decode($value);
+      $itemtype = $this->getSubItemtype($this->question->fields['values']);
+      $dropdown = new $itemtype();
+      if (!$dropdown->getFromDB($this->value)) {
+         throw new ComparisonException('Item not found for comparison');
+      }
+      if ($dropdown instanceof CommonTreeDropdown) {
+         $fieldValue = $dropdown->getField($dropdown->getCompleteNameField());
+      } else {
+         $fieldValue = $dropdown->getField($dropdown->getNameField());
+      }
+      return preg_match($value, Toolbox::stripslashes_deep($fieldValue)) ? true : false;
    }
 
    public function parseAnswerValues($input, $nonDestructive = false): bool {