Merge remote-tracking branch 'origin/support/2.13.0' into support/2.14.0

Author: btry

inc/abstracttarget.class.php

@@ -217,11 +217,11 @@ protected function prepareTemplate($template, PluginFormcreatorFormAnswer $formA
    /**
     * Append fields data to input
     *
-    * @param PluginFormcreatorFormanswer $formanswer the source formanswer
     * @param array $input data of the generated target
-    * @return void
+    * @param PluginFormcreatorFormanswer $formanswer the source formanswer
+    * @return array
     */
-   protected function appendFieldsData(PluginFormcreatorFormanswer $formanswer, &$input): void {
+   protected function appendFieldsData(array$input, PluginFormcreatorFormanswer $formanswer): array {
       global $DB;
 
       //get all PluginFormcreatorAnswer
@@ -262,6 +262,8 @@ protected function appendFieldsData(PluginFormcreatorFormanswer $formanswer, &$i
          }
          $input['c_id'] = $blocks_field;
       }
+
+      return $input;
    }
 
 

inc/field/textfield.class.php

@@ -109,11 +109,7 @@ public function getValueForDesign(): string {
    }
 
    public function getValueForTargetText($domain, $richText): ?string {
-      if ($richText) {
-         return Sanitizer::encodeHtmlSpecialChars($this->value);
-      }
-
-      return $this->value;
+      return Sanitizer::encodeHtmlSpecialChars($this->value);
    }
 
    public function moveUploads() {

inc/question.class.php

@@ -308,8 +308,6 @@ public function getRenderedHtml($domain, $canEdit = true, ?PluginFormcreatorForm
          return '';
       }
 
-      $html = '';
-
       $field = $this->getSubField();
       if (!$field->isPrerequisites()) {
          return '';
@@ -321,7 +319,7 @@ public function getRenderedHtml($domain, $canEdit = true, ?PluginFormcreatorForm
       $x = $this->fields['col'];
       $width = $this->fields['width'];
       $hiddenAttribute = $isVisible ? '' : 'hidden=""';
-      $html .= '<div'
+      $html = '<div'
          . ' gs-x="' . $x . '"'
          . ' gs-w="' . $width . '"'
          . ' data-itemtype="' . self::class . '"'

inc/targetticket.class.php

@@ -877,7 +877,7 @@ public function save(PluginFormcreatorFormAnswer $formanswer): ?CommonDBTM {
 
       $data = $this->prepareUploadedFiles($data, $formanswer);
 
-      $this->appendFieldsData($formanswer, $data);
+      $data = $this->appendFieldsData($data, $formanswer);
 
       // Cleanup actors array
       $data = $this->cleanActors($data);

install/upgrade_to_2.13.6.php

@@ -71,7 +71,7 @@ public function migrateToRichText() {
 
       foreach ($tables as $table => $fields) {
          $request = [
-            'SELECT' => ['id'] + $fields,
+            'SELECT' => array_merge(['id'], $fields),
             'FROM'   => $table
          ];
          foreach ($DB->request($request) as $row) {

tests/3-unit/GlpiPlugin/Formcreator/Field/TextField.php

@@ -401,7 +401,7 @@ public function providerGetValueForTargetText() {
             'question' => $this->getQuestion(),
             'value' => '"><img src=x onerror="alert(1337)" x=x>',
             'expected' => true,
-            'expectedValue' => '"><img src=x onerror="alert(1337)" x=x>',
+            'expectedValue' => '"&#62;&#60;img src=x onerror="alert(1337)" x=x&#62;',
          ],
       ];
    }