Merge branch 'support/2.13.0' into support/2.14.0

Author: btry

.github/workflows/tests.yml

@@ -40,7 +40,7 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        php-versions: [8.1]
+        php-versions: [8.1, 8.2]
         glpi-branch: [10.0/bugfixes]
         glpi-package: [10.0.tar.gz]
 

front/formdisplay.php

@@ -87,7 +87,7 @@
       unset($_SESSION['glpiname']);
    }
 } else if (isset($_GET['answer_saved'])) {
-   $message = __("The form has been successfully saved!");
+   $message = __("The form has been successfully saved!", "formcreator");
    Html::displayTitle($CFG_GLPI['root_doc']."/pics/ok.png", $message, $message);
 }
 

inc/command/cleanticketscommand.class.php

@@ -43,7 +43,7 @@ class CleanTicketsCommand extends Command
 {
    protected function configure() {
       $this
-         ->setName('glpi:plugins:formcreator:clean_tickets')
+         ->setName('plugins:formcreator:clean_tickets')
          ->setDescription("Clean Tickets having visible HTML tags in their content");
    }
 

inc/command/compilescsscommand.class.php

@@ -53,7 +53,7 @@ class CompileScssCommand extends Command
    protected function configure() {
 
       $this
-         ->setName('glpi:plugins:formcreator:scss')
+         ->setName('plugins:formcreator:scss')
          ->setDescription("Compile SCSS");
    }
 

inc/command/syncissuescommand.class.php

@@ -42,7 +42,7 @@ protected function configure() {
       $table = PluginFormcreatorIssue::getTable();
 
       $this
-         ->setName('glpi:plugins:formcreator:syncissues')
+         ->setName('plugins:formcreator:syncissues')
          ->setDescription("Rebuild `$table` table.");
    }
 

inc/field/textareafield.class.php

@@ -211,7 +211,6 @@ public function serializeValue(PluginFormcreatorFormAnswer $formanswer): string
          );
          $input[$key] = $this->value; // Restore the text because we don't want image converted into A + IMG tags
          // $this->value = $input[$key];
-         $this->value = Sanitizer::unsanitize($this->value);
          foreach ($input['_tag'] as $docKey => $tag) {
             $newTag = $this->uploads['dedup'][$tag];
             $regex = '/<img[^>]+' . preg_quote($tag, '/') . '[^<]+>/im';
@@ -225,7 +224,7 @@ public function serializeValue(PluginFormcreatorFormAnswer $formanswer): string
 
    public function deserializeValue($value) {
       $this->value = ($value !== null && $value !== '')
-         ? $value
+         ? Sanitizer::unsanitize($value)
          : '';
    }
 

inc/form.class.php

@@ -509,7 +509,7 @@ public function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) {
                $item->countTargets()
             ),
             2 => __('Preview'),
-            3 => PluginFormcreatorFormAnswer::getTypeName(1) . ' ' .__('properties', 'formcreator'),
+            3 => __('Form answer properties', 'formcreator'),
          ];
       }
       if ($item->getType() == Central::class) {

install/install.php

@@ -187,7 +187,7 @@ public function upgrade(Migration $migration, $args = []): bool {
             }
             if (!$checkResult) {
                $message = sprintf(
-                  __('The database schema is not consistent with the installed Formcreator %s. To see the logs run the command %s', 'formcreator'),
+                  __('The database schema is not consistent with the previous version of Formcreator %s. To see the logs run the command %s', 'formcreator'),
                   $oldVersion,
                   'bin/console glpi:plugin:install formcreator -f'
                );
@@ -283,7 +283,7 @@ public function upgrade(Migration $migration, $args = []): bool {
       );
       if (!$checkResult) {
          $message = sprintf(
-            __('The database schema is not consistent with the installed Formcreator %s. To see the logs enable the plugin and run the command %s', 'formcreator'),
+            __('The database schema is not consistent with the current version of Formcreator %s. To see the logs enable the plugin and run the command %s', 'formcreator'),
             PLUGIN_FORMCREATOR_VERSION,
             'bin/console glpi:database:check_schema_integrity -p formcreator'
          );