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

Author: btry

inc/abstractitiltarget.class.php

@@ -983,7 +983,7 @@ protected function showOLASettings() {
 
    protected function showCategorySettings($rand) {
       echo '<tr>';
-      echo '<td width="15%">' . PluginFormcreatorCategory::getTypeName(1) . '</td>';
+      echo '<td width="15%">' . ITILCategory::getTypeName(1) . '</td>';
       echo '<td width="25%">';
       Dropdown::showFromArray(
          'category_rule',

inc/form.class.php

@@ -2456,6 +2456,16 @@ public function setTranslations(string $language, array $translations) : bool {
          return false;
       }
 
+      // CLeanup obsolete strings
+      $existing_strings = $this->getTranslatableStrings();
+      foreach (array_keys($translations) as $original) {
+         if (!in_array($original, $existing_strings['itemlink'])
+            && !in_array($original, $existing_strings['string'])
+            && !in_array($original, $existing_strings['text'])) {
+            unset($translations[$original]);
+         }
+      }
+
       $output = "<?php" . PHP_EOL . "return " . var_export($translations, true) . ";";
       $written = file_put_contents(
          $file,

inc/form_language.class.php

@@ -64,7 +64,13 @@ public function defineTabs($options = []) {
 
    public function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) {
       if ($item instanceof PluginFormcreatorForm) {
-         return self::getTypeName(Session::getPluralNumber());
+         $nb = (new DbUtils())->countElementsInTable(self::getTable(), [
+            'plugin_formcreator_forms_id' => $item->getID(),
+         ]);
+         return self::createTabEntry(
+            self::getTypeName(Session::getPluralNumber()),
+            $nb
+         );
       }
       if ($item->getType() == self::class) {
          $nb = 0;
@@ -350,9 +356,18 @@ public function showTranslations($options = []) {
       echo $header;
       echo '</thead>';
 
+      $all_translated_strings = $form->getTranslatableStrings([
+         'translated' => true,
+         'language'   => $this->fields['name']
+      ]);
+
       echo '<tbody>';
       foreach ($translations as $original => $translated) {
          $id = PluginFormcreatorTranslation::getTranslatableStringId($original);
+         if (!in_array($id, array_keys($all_translated_strings['id']))) {
+            // String is translated but no longer used in the form or its sub objects
+            continue;
+         }
          echo '<tr data-itemtype="PluginFormcreatorTranslation" data-id="' . $id . '">';
          echo '<td>'
          . Html::getCheckbox([

inc/issue.class.php

@@ -507,11 +507,16 @@ public function rawSearchOptions() {
 
       $tab = [];
       $hide_technician = false;
+      $hide_technician_group = false;
       if (!Session::isCron()) {
-         $hide_technician = \Entity::getUsedConfig(
-            'anonymize_support_agents',
-            Session::getActiveEntity()
-         );
+         $user = new User();
+         if (empty($user->getAnonymizedName(Session::getActiveEntity()))) {
+            $hide_technician = true;
+         }
+         $group = new Group();
+         if (empty($group->getAnonymizedName(Session::getActiveEntity()))) {
+            $hide_technician_group = true;
+         }
       }
 
       $tab[] = [
@@ -763,8 +768,8 @@ public function rawSearchOptions() {
             'datatype'           => 'dropdown',
             'forcegroupby'       => true,
             'massiveaction'      => false,
-            'nodisplay'          => $hide_technician,
-            'nosearch'           => $hide_technician,
+            'nodisplay'          => $hide_technician_group,
+            'nosearch'           => $hide_technician_group,
             'condition'          => ['is_assign' => 1],
             'joinparams'         => [
                'beforejoin'         => [

inc/restrictedformcriteria.class.php

@@ -199,7 +199,7 @@ public static function import(
             sprintf(
                __('Failed to add or update the %1$s %2$s', 'formceator'),
                $type_name,
-               $input['name']
+               $input[$item2_input_key]
             )
          );
       }

inc/translation.class.php

@@ -161,7 +161,7 @@ public static function getEditorFieldsHtml(PluginFormcreatorForm_Language $formL
       if (!isset($translatableString['id'][$id])) {
          // Show nothing if string definitively not found
          // Should not happen
-         return '';
+         return '<td colspan="2">' . __('Iternal error : translatable string not found.', 'formcreator') . '</td>';;
       }
 
       $type = $translatableString['id'][$id] ?? 'string';
@@ -174,12 +174,12 @@ public static function getEditorFieldsHtml(PluginFormcreatorForm_Language $formL
       switch ($type) {
          case 'itemlink':
          case 'string':
-            $out .= '<td>' . $original . Html::hidden("id", ['value' => $id]) . '</td>';
+            $out .= '<td width="50%">' . $original . Html::hidden("id", ['value' => $id]) . '</td>';
             $out .= '<td>' . Html::input("value", ['value' => $translatedString]) . '</td>';
             break;
 
          case 'text':
-            $out .= '<td>' . Html::entity_decode_deep($original) . Html::hidden("id", ['value' => $id]) . '</td>';
+            $out .= '<td width="50%">' . Html::entity_decode_deep($original) . Html::hidden("id", ['value' => $id]) . '</td>';
             $out .= '<td>' . Html::textarea([
                'name'  => "value",
                'value' => $translatedString,
@@ -228,7 +228,9 @@ public function add(array $input) : bool {
       $type = $translatableStrings['id'][$input['id']];
       $original = $translatableStrings[$type][$input['id']];
 
-      $translations[$original] = Toolbox::stripslashes_deep($input['value']);
+      $input['value'] = Sanitizer::unsanitize($input['value']);
+      $input['value'] = str_replace('\r\n', '', $input['value']);
+      $translations[$original] = Sanitizer::sanitize($input['value'], false);
 
       if (!$form->setTranslations($formLanguage->fields['name'], $translations)) {
          Session::addMessageAfterRedirect(__('Failed to add the translation.', 'formcreator'), false, ERROR);

js/scripts.js

@@ -1197,6 +1197,7 @@ var plugin_formcreator = new function() {
       var translationId = $(element.closest('[data-itemtype="PluginFormcreatorTranslation"]')).attr('data-id');
       var modal;
       modal = glpi_ajax_dialog({
+         dialogclass: 'modal-xl',
          url: '../ajax/form_language.php',
          params: {
             action: 'translation',
@@ -1205,6 +1206,12 @@ var plugin_formcreator = new function() {
          },
          title: i18n.textdomain('formcreator').__('Update a translation', 'formcreator'),
          close: function () {
+            // Remove unclosed TinyMCE toolbar
+            var tinyToolbar = document.querySelector('.tox-tinymce-aux');
+            if (tinyToolbar) {
+               tinyToolbar.parentNode.removeChild(tinyToolbar);
+            }
+            // Reload the tab
             reloadTab();
          },
          fail: function () {