fix(selectfield,multiselectfield): fix possible encoding problem

pluginsGLPI · Jun 19, 2023 · 8aaec8a · 8aaec8a
1 parent e9badc4
commit 8aaec8a
Show file tree

Hide file tree

Showing 6 changed files with 446 additions and 4 deletions.
diff --git a/inc/field/multiselectfield.class.php b/inc/field/multiselectfield.class.php
@@ -34,6 +34,7 @@
 
 use Dropdown;
 use Html;
+use Glpi\Toolbox\Sanitizer;
 
 class MultiSelectField extends CheckboxesField
 {
@@ -55,8 +56,10 @@ public function getRenderedHtml($domain, $canEdit = true): string {
       $fieldName = 'formcreator_field_' . $id;
       $values    = $this->getAvailableValues();
       $translatedValues = [];
+
       foreach ($values as $key => $value) {
-         $translatedValues[$key] = __($value, $domain);
+         $unsanitized = Sanitizer::unsanitize(__($value, $domain));
+         $translatedValues[$key] = $unsanitized;
       }
       if (!empty($values)) {
          $html .= Dropdown::showFromArray($fieldName, $translatedValues, [

diff --git a/inc/formanswer.class.php b/inc/formanswer.class.php
@@ -1423,7 +1423,7 @@ protected function validateFormAnswer($input): bool {
                   );
                }
 
-              $this->isAnswersValid = false;
+               $this->isAnswersValid = false;
             }
          }
       }

diff --git a/install/install.php b/install/install.php
@@ -82,6 +82,7 @@ class PluginFormcreatorInstall {
       '2.13.3' => '2.13.4',
       '2.13.4' => '2.13.5',
       '2.13.5' => '2.13.6',
+      '2.13.6' => '2.13.7',
    ];
 
    protected bool $resyncIssues = false;
-Original file line number
+Diff line change
@@ Expand Up / @@ -1423,7 +1423,7 @@ protected function validateFormAnswer($input): bool { @@
                       );
                    }
-                  $this->isAnswersValid = false;
+                   $this->isAnswersValid = false;
                 }
              }
           }
@@ Expand Down @@