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

Author: btry

ajax/formanswer.php

@@ -55,7 +55,7 @@
 
 // Save form
 $backup_debug = $_SESSION['glpi_use_mode'];
-$_SESSION['glpi_use_mode'] = \Session::NORMAL_MODE;
+$_SESSION['glpi_use_mode'] = Session::NORMAL_MODE;
 $formAnswer = new PluginFormcreatorFormAnswer();
 if ($formAnswer->add($_POST) === false) {
    http_response_code(400);

front/formanswer.php

@@ -36,6 +36,8 @@
    Html::displayNotFoundError();
 }
 
+Session::checkLoginUser();
+
 if (!PluginFormcreatorFormAnswer::canView()) {
    Html::displayRightError();
 }

inc/field/dropdownfield.class.php

@@ -342,14 +342,15 @@ public function buildParams($rand = null) {
       // Set specific root if defined (CommonTreeDropdown)
       $baseLevel = 0;
       if (isset($decodedValues['show_tree_root'])
-         && (int) $decodedValues['show_tree_root'] > 0
+         && ((int) $decodedValues['show_tree_root'] > 0
+           || $itemtype == Entity::class && (int) $decodedValues['show_tree_root'] > -1)
       ) {
          $sons = (new DBUtils)->getSonsOf(
             $itemtype::getTable(),
             $decodedValues['show_tree_root']
          );
          $decodedValues['selectable_tree_root'] = $decodedValues['selectable_tree_root'] ?? '1';
-         if (!isset($decodedValues['selectable_tree_root']) || $decodedValues['selectable_tree_root'] == '0') {
+         if ($decodedValues['selectable_tree_root'] == '0') {
             unset($sons[$decodedValues['show_tree_root']]);
          }
 

inc/question.class.php

@@ -370,7 +370,6 @@ private function checkBeforeSave($input) : array {
          return [];
       }
       // - field type is compatible with accessibility of the form
-      $form = new PluginFormcreatorForm();
       $section = PluginFormcreatorSection::getById($input[PluginFormcreatorSection::getForeignKeyField()]);
       $form = PluginFormcreatorForm::getByItem($section);
       if ($form->isPublicAccess() && !$this->field->isPublicFormCompatible()) {

setup.php

@@ -343,7 +343,7 @@ function plugin_formcreator_hook(): void {
             Session::getCurrentInterface() == 'helpdesk') {
 
          // Add specific JavaScript
-         $PLUGIN_HOOKS['add_javascript']['formcreator'][] = 'js/scripts.js';
+         $PLUGIN_HOOKS[Hooks::ADD_JAVASCRIPT]['formcreator'][] = 'js/scripts.js';
       }
 
       if (isset($_SESSION['glpiactiveentities_string'])) {