Merge branch 'support/2.13.0' into support/2.14.0

Author: btry

ajax/showfields.php

@@ -58,6 +58,9 @@
 try {
     $visibility = PluginFormcreatorFields::updateVisibility($_POST);
 } catch (Exception $e) {
+    echo json_encode([
+        'error' => $e->getMessage(),
+    ]);
     http_response_code(500);
     exit();
 }

hook.php

@@ -807,11 +807,18 @@ function plugin_formcreator_hook_update_profile(CommonDBTM $item) {
    }
    $dashboardRight = new DashboardRight();
    if ($item->fields['interface'] == 'helpdesk') {
-      $dashboardRight->add([
+      $dashboardRight->getFromDBByCrit([
          'dashboards_dashboards_id' => $dashboard->fields['id'],
          'itemtype' => Profile::getType(),
          'items_id' => $item->getID(),
       ]);
+      if ($dashboardRight->isNewItem()) {
+         $dashboardRight->add([
+            'dashboards_dashboards_id' => $dashboard->fields['id'],
+            'itemtype' => Profile::getType(),
+            'items_id' => $item->getID(),
+         ]);
+      }
    } else {
       $dashboardRight->delete([
          'dashboards_dashboards_id' => $dashboard->fields['id'],

inc/abstractitiltarget.class.php

@@ -443,6 +443,7 @@ protected function setTargetUrgency($data, $formanswer) {
       }
       if (!is_null($urgency) && $urgency != 0) {
          $data['urgency'] = $urgency;
+         $data['priority'] = CommonITILObject::computePriority($data['urgency'], $data['impact']);;
       }
 
       return $data;

inc/fields.class.php

@@ -140,7 +140,8 @@ public static function isVisible(PluginFormcreatorConditionnableInterface $item,
       /** @var CommonDBTM $item */
       $itemtype = get_class($item);
       $itemId = $item->getID();
-      if (!isset(self::$visibility[$itemtype][$itemId])) {
+
+      if (!isset(self::$visibility[$itemtype]) || !array_key_exists($itemId, self::$visibility[$itemtype])) {
          self::$visibility[$itemtype][$itemId] = null;
       } else if (self::$visibility[$itemtype][$itemId] !== null) {
          return self::$visibility[$itemtype][$itemId];

inc/notificationtargetformanswer.class.php

@@ -70,6 +70,13 @@ public function addDataForTemplate($event, $options = []) {
       $this->data['##formcreator.validation_comment##'] = $this->obj->fields['comment'];
       $this->data['##formcreator.validation_link##']    = $link;
       $this->data['##formcreator.request_id##']         = $this->obj->fields['id'];
+
+      $this->getTags();
+      foreach ($this->tag_descriptions[NotificationTarget::TAG_LANGUAGE] as $tag => $values) {
+         if (!isset($this->data[$tag])) {
+            $this->data[$tag] = $values['label'];
+         }
+      }
    }
 
    public function getTags() {

install/install.php

@@ -80,7 +80,8 @@ class PluginFormcreatorInstall {
       '2.13'   => '2.13.1',
       '2.13.1' => '2.13.3',
       '2.13.3' => '2.13.4',
-      '2.13.4' => '2.14',
+      '2.13.4' => '2.13.5',
+      '2.13.5' => '2.14',
    ];
 
    protected bool $resyncIssues = false;

install/mysql/plugin_formcreator_2.13.5_empty.sql

@@ -0,0 +1,74 @@
+<?php
+/**
+ * ---------------------------------------------------------------------
+ * Formcreator is a plugin which allows creation of custom forms of
+ * easy access.
+ * ---------------------------------------------------------------------
+ * LICENSE
+ *
+ * This file is part of Formcreator.
+ *
+ * Formcreator is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Formcreator is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Formcreator. If not, see <http://www.gnu.org/licenses/>.
+ * ---------------------------------------------------------------------
+ * @copyright Copyright © 2011 - 2021 Teclib'
+ * @license   http://www.gnu.org/licenses/gpl.txt GPLv3+
+ * @link      https://github.com/pluginsGLPI/formcreator/
+ * @link      https://pluginsglpi.github.io/formcreator/
+ * @link      http://plugins.glpi-project.org/#/plugin/formcreator
+ * ---------------------------------------------------------------------
+ */
+
+use Glpi\Toolbox\Sanitizer;
+
+class PluginFormcreatorUpgradeTo2_13_5 {
+   /** @var Migration */
+   protected $migration;
+
+   public function isResyncIssuesRequired() {
+      return false;
+   }
+
+   /**
+    * @param Migration $migration
+    */
+   public function upgrade(Migration $migration) {
+      $this->migration = $migration;
+      $this->fixOldRadiosEncoding();
+   }
+
+   public function fixOldRadiosEncoding() {
+      global $DB;
+
+      $table = 'glpi_plugin_formcreator_questions';
+      $questions = $DB->request([
+         'SELECT' => ['id', 'values'],
+         'FROM'  => $table,
+         'WHERE' => ['fieldtype' => 'radios']
+      ]);
+
+      foreach ($questions as $row) {
+         $values = Sanitizer::unsanitize($row['values']);
+         $values = Sanitizer::sanitize($values);
+         $DB->update(
+            $table,
+            [
+               'values' => $values
+            ],
+            [
+               'id' => $row['id']
+            ]
+         );
+      }
+   }
+}