Merge branch 'support/2.13.0' into support/2.14.0

pluginsGLPI · Apr 23, 2024 · 33f4a67 · 33f4a67
2 parents 2fbc6bd + d81a43e
commit 33f4a67
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 38 deletions.
diff --git a/ajax/ldap_filter.php b/ajax/ldap_filter.php
@@ -29,6 +29,8 @@
  * ---------------------------------------------------------------------
  */
 
+use Glpi\Toolbox\Sanitizer;
+
 include ('../../../inc/includes.php');
 
 Session::checkRight(PluginFormcreatorForm::$rightname, UPDATE);
@@ -37,4 +39,5 @@
 $authldap->getFromDB($_POST['value']);
 $filter = "(".$authldap->getField("login_field")."=*)";
 $ldap_condition = $authldap->getField('condition');
+$ldap_condition = Sanitizer::decodeHtmlSpecialChars($ldap_condition);
 echo "(& $filter $ldap_condition)";
diff --git a/hook.php b/hook.php
@@ -439,7 +439,7 @@ function plugin_formcreator_MassiveActions($itemtype) {
             PluginFormcreatorForm::class . MassiveAction::CLASS_ACTION_SEPARATOR . 'Duplicate'    => _x('button', 'Duplicate'),
             PluginFormcreatorForm::class . MassiveAction::CLASS_ACTION_SEPARATOR . 'Transfert'    => __('Transfer'),
             PluginFormcreatorForm::class . MassiveAction::CLASS_ACTION_SEPARATOR . 'Export'       => _sx('button', 'Export'),
-            PluginFormcreatorForm::class . MassiveAction::CLASS_ACTION_SEPARATOR . 'AccessRights' => _sx('button', 'Access rights'),
+            PluginFormcreatorForm::class . MassiveAction::CLASS_ACTION_SEPARATOR . 'AccessRights' => _sx('button', 'Access rights', 'formcreator'),
          ];
    }
    return [];

diff --git a/inc/field/dropdownfield.class.php b/inc/field/dropdownfield.class.php
@@ -265,40 +265,11 @@ public function buildParams($rand = null) {
             if (Session::haveRight("ticket", Ticket::READALL)) {
                break;
             }
-            $currentUser = Session::getLoginUserID();
             if (!Session::haveRight(Ticket::$rightname, Ticket::READMY) && !Session::haveRight(Ticket::$rightname, Ticket::READGROUP)) {
                // No right to view any ticket, then force the dropdown to be empty
                $dparams_cond_crit['OR'] = new QueryExpression('0=1');
                break;
             }
-            $tickets_filter = ['users_id_recipient' => $currentUser];
-
-            if (Session::haveRight(Ticket::$rightname, Ticket::READMY)) {
-               $requestersObserversQuery = new QuerySubQuery([
-                  'SELECT' => 'tickets_id',
-                  'FROM' => Ticket_User::getTable(),
-                  'WHERE' => [
-                     'users_id' => $currentUser,
-                     'type' => [CommonITILActor::REQUESTER, CommonITILActor::OBSERVER]
-                  ],
-               ]);
-               $tickets_filter[] = [
-                  Ticket::getTableField('id') => $requestersObserversQuery,
-               ];
-            }
-
-            if (Session::haveRight(Ticket::$rightname, Ticket::READGROUP) && count($_SESSION['glpigroups']) > '0') {
-               $requestersObserversGroupsQuery = new QuerySubQuery([
-                  'SELECT' => 'tickets_id',
-                  'FROM' => Group_Ticket::getTable(),
-                  'WHERE' => [
-                     'type' => [CommonITILActor::REQUESTER, CommonITILActor::OBSERVER],
-                     'groups_id' => $_SESSION['glpigroups'],
-                  ],
-               ]);
-               $tickets_filter[] = ['id' => $requestersObserversGroupsQuery];
-            }
-            $dparams_cond_crit['OR'] = $tickets_filter;
             break;
 
          default:

diff --git a/inc/field/fieldsfield.class.php b/inc/field/fieldsfield.class.php
@@ -484,7 +484,7 @@ public function isValidValue($value): bool {
    public function isValid(): bool {
       if (!is_null($this->getField())) {
          // If the field is required it can't be empty
-         if ($this->getField()->fields['mandatory'] && $this->value == '') {
+         if ($this->isAdditionalFieldEmpty()) {
             Session::addMessageAfterRedirect(
                __('A required field is empty:', 'formcreator') . ' ' . $this->getLabel(),
                false,
@@ -499,6 +499,20 @@ public function isValid(): bool {
       return true;
    }
 
+   /**
+    * Undocumented function
+    *
+    * @return boolean
+    */
+   private function isAdditionalFieldEmpty(): bool {
+      switch ($this->getField()->fields['type']) {
+         case 'dropdown':
+            return $this->getField()->fields['mandatory'] && $this->value == 0;
+      }
+
+      return $this->getField()->fields['mandatory'] && $this->value == '';
+   }
+
    public function moveUploads() {
 
    }

diff --git a/inc/form.class.php b/inc/form.class.php
@@ -670,8 +670,8 @@ public static function getFormList(int $rootCategory = 0, string $keywords = '',
 
       $table_cat      = getTableForItemType(PluginFormcreatorCategory::class);
       $table_form     = getTableForItemType(PluginFormcreatorForm::class);
-      $table_section  = getTableForItemType(PluginFormcreatorSections::class);
-      $table_question = getTableForItemType(PluginFormcreatorQuestions::class);
+      $table_section  = getTableForItemType(PluginFormcreatorSection::class);
+      $table_question = getTableForItemType(PluginFormcreatorQuestion::class);
 
       $categoryFk = PluginFormcreatorCategory::getForeignKeyField();
 
@@ -797,7 +797,7 @@ public static function getFormList(int $rootCategory = 0, string $keywords = '',
          foreach ($result_faqs as $faq) {
             $formList[] = [
                'id'               => $faq['id'],
-               'name'             => $faq['name'],
+               'name'             => $faq['transname'] ?? $faq['name'],
                'icon'             => '',
                'icon_color'       => '',
                'background_color' => '',

diff --git a/inc/knowbase.class.php b/inc/knowbase.class.php
@@ -222,7 +222,7 @@ public static function getFaqItems($rootCategory = 0, $keywords = '') {
       foreach ($result_faqs as $faq) {
          $formList[] = [
             'id'           => $faq['id'],
-            'name'         => $faq['name'],
+            'name'         => $faq['transname'] ?? $faq['name'],
             'icon'         => '',
             'icon_color'   => '',
             'background_color'   => '',

diff --git a/inc/target_actor.class.php b/inc/target_actor.class.php
@@ -285,20 +285,23 @@ public function export(bool $remove_uuid = false) : array {
          case self::ACTOR_TYPE_PERSON:
          case self::ACTOR_TYPE_AUTHORS_SUPERVISOR:
             $user = new User;
+            $field = $idToRemove == 'uuid' ? 'id' : 'completename';
             if ($user->getFromDB($target_actor['actor_value'])) {
-               $target_actor['actor_value'] = $user->fields['name'];
+               $target_actor['actor_value'] = $user->fields[$field];
             }
             break;
          case self::ACTOR_TYPE_GROUP:
             $group = new Group;
+            $field = $idToRemove == 'uuid' ? 'id' : 'completename';
             if ($group->getFromDB($target_actor['actor_value'])) {
-               $target_actor['actor_value'] = $group->fields['completename'];
+               $target_actor['actor_value'] = $group->fields[$field];
             }
             break;
          case self::ACTOR_TYPE_SUPPLIER:
             $supplier = new Supplier;
+            $field = $idToRemove == 'uuid' ? 'id' : 'completename';
             if ($supplier->getFromDB($target_actor['actor_value'])) {
-               $target_actor['actor_value'] = $supplier->fields['name'];
+               $target_actor['actor_value'] = $supplier->fields[$field];
             }
             break;
       }

diff --git a/inc/targetticket.class.php b/inc/targetticket.class.php
@@ -885,6 +885,14 @@ public function save(PluginFormcreatorFormAnswer $formanswer): ?CommonDBTM {
       // Cleanup actors array
       $data = $this->cleanActors($data);
 
+      // Specific format for actors in tickets
+      // @see CommonITILObject::setTechAndGroupFromItilCategory()
+      if ($data['_users_id_assign'] === 0) {
+         $data['_users_id_assign'] = [];
+         $data['_users_id_assign_notif']['use_notification'] = [];
+         $data['_users_id_assign_notif']['alternative_email'] = [];
+      }
+
       // Create the target ticket
       $data['_auto_import'] = true;
       $data['_skip_sla_assign'] = true;