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

Author: btry

inc/category.class.php

@@ -160,6 +160,7 @@ public static function getCategoryTree(): array {
             'icon',
             'icon_color',
             'background_color',
+            'comment',
             "$categoryFk as parent",
             'level',
             new QueryExpression(

inc/common.class.php

@@ -785,14 +785,14 @@ public static function hookRedefineMenu($menus) {
       $iterator = $DB->request($criteria);
       $hasReminder = $iterator->count() > 0;
 
-	  if (Reminder::canView() && $hasReminder) {
+      if (Reminder::canView() && $hasReminder) {
          $newMenu['reminders'] = [
             'default' => Plugin::getWebDir('formcreator', false) . '/front/wizardreminders.php',
             'title'   => __('Consult reminders', 'formcreator'),
             'icon'    => 'fa fa-sticky-note',
          ];
       }
-      
+
       $rssFeedTable = RSSFeed::getTable();
       $criteria = [
          'SELECT'   => "$rssFeedTable.*",

inc/formanswer.class.php

@@ -32,6 +32,7 @@
 use Glpi\Application\View\TemplateRenderer;
 use Glpi\Toolbox\Sanitizer;
 use GlpiPlugin\Formcreator\Field\DropdownField;
+use Glpi\Application\ErrorHandler;
 
 if (!defined('GLPI_ROOT')) {
    die("Sorry. You can't access this file directly");
@@ -845,7 +846,7 @@ function plugin_formcreator_checkComment(field) {
     * @return array the modified $input array
     */
    public function prepareInputForAdd($input) {
-      global $DB;
+      global $DB, $GLPI;
 
       // A requester submits his answers to a form
       if (!isset($input['plugin_formcreator_forms_id'])) {
@@ -868,8 +869,15 @@ public function prepareInputForAdd($input) {
          }
       }
 
-      if (!$this->validateFormAnswer($input)) {
-         // Validation of answers failed
+      try {
+         if (!$this->validateFormAnswer($input)) {
+            // Validation of answers failed
+            return false;
+         }
+      } catch (Exception $e) {
+         // A fatal error caught during validation of answers
+         $GLPI->getErrorHandler()->handleException($e, false);
+         Session::addMessageAfterRedirect(__('An internal error occured when verifying your answers. Please report it to your administrator.', 'formcreator'), false, ERROR);
          return false;
       }
       if (!$this->validateCaptcha($input)) {
@@ -881,7 +889,14 @@ public function prepareInputForAdd($input) {
          return false;
       }
 
-      $input['name'] = $DB->escape($this->parseTags($form->fields['formanswer_name']));
+      try {
+         $input['name'] = $DB->escape($this->parseTags($form->fields['formanswer_name']));
+      } catch (Exception $e) {
+         // A fatal error caught during parsing of tags
+         $GLPI->getErrorHandler()->handleException($e, false);
+         Session::addMessageAfterRedirect(__('An internal error occured when verifying your answers. Please report it to your administrator.', 'formcreator'), false, ERROR);
+         return false;
+      }
 
       $input = $this->setValidator($input, $form);
 

inc/knowbase.class.php

@@ -129,6 +129,7 @@ public static function getCategoryTree() {
          'SELECT' => [
             KnowbaseItemCategory::getTableField('id'),
             KnowbaseItemCategory::getTableField('name'),
+            KnowbaseItemCategory::getTableField('comment'),
             KnowbaseItemCategory::getTableField($cat_fk),
             $items_subquery,
          ],

inc/notificationtargetformanswer.class.php

@@ -71,6 +71,16 @@ public function addDataForTemplate($event, $options = []) {
       $this->data['##formcreator.validation_link##']    = $link;
       $this->data['##formcreator.request_id##']         = $this->obj->fields['id'];
 
+      $this->data['##lang.formcreator.form_id##']            = __('Form ID', 'formcreator');
+      $this->data['##lang.formcreator.form_name##']          = __('Form name', 'formcreator');
+      $this->data['##lang.formcreator.form_requester##']     = __('Requester', 'formcreator');
+      $this->data['##lang.formcreator.form_validator##']     = __('Validator', 'formcreator');
+      $this->data['##lang.formcreator.form_creation_date##'] = __('Creation date', 'formcreator');
+      $this->data['##lang.formcreator.form_full_answers##']  = __('Full form answers', 'formcreator');
+      $this->data['##lang.formcreator.validation_comment##'] = __('Validation comment', 'formcreator');
+      $this->data['##lang.formcreator.validation_link##']    = __('Validation link', 'formcreator');
+      $this->data['##lang.formcreator.request_id##']         = __('Request ID', 'formcreator');
+
       $this->getTags();
       foreach ($this->tag_descriptions[NotificationTarget::TAG_LANGUAGE] as $tag => $values) {
          if (!isset($this->data[$tag])) {

js/scripts.js

@@ -347,7 +347,8 @@ function buildKbCategoryList(tree) {
    if (tree.id != 0) {
       html += '<a href="#" data-parent-category-id="' + tree.parent +'"'
          + ' data-category-id="' + tree.id + '"'
-         + ' onclick="plugin_formcreator.updateKbitemsView(this)">'
+         + ' onclick="plugin_formcreator.updateKbitemsView(this)"'
+         + ' title="' + tree.comment + '">'
          + tree.name
          + '</a>';
    }
@@ -382,7 +383,7 @@ function buildCategoryList(tree) {
          + ' data-category-id="' + tree.id + '"'
          + ' onclick="plugin_formcreator.updateWizardFormsView(this)"'
          + ' style="background-color: ' + tree.background_color + '"'
-         + ' title="' + tree.name + '">'
+         + ' title="' + tree.comment + '">'
          + icon
          + tree.name
          + '</a>';