pluginsGLPI · dependabot · Jul 26, 2022 · Jul 26, 2022 · Jul 26, 2022 · Jul 27, 2022
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -6,7 +6,7 @@ on:
 env:
   GLPI_SOURCE: "https://github.com/glpi-project/glpi"
   GLPI_PACKAGE_URL_BASE: "https://nightly.glpi-project.org/glpi"
-  CS: 7.4
+  CS: 8.1
   DB_HOST: 127.0.0.1
   MYSQL_ROOT_USER: root
   DB_USER: glpi
@@ -40,7 +40,7 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        php-versions: [7.4, 8.1, 8.2]
+        php-versions: [8.1, 8.2]
         glpi-branch: [10.0/bugfixes]
         glpi-package: [10.0.tar.gz]
 

diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ vendor/
 .project
 /.gtm/
 lib/
+.vscode/
 
 # Ignore content of data except for the index
 css_compiled/*

diff --git a/.tx/config b/.tx/config
@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[o:teclib:p:glpi-project-plugin-formcreator:r:2_13_0]
+[o:teclib:p:glpi-project-plugin-formcreator:r:2_14_0]
 file_filter = locales/<lang>.po
 source_file = locales/glpi.pot
 source_lang = en_GB

diff --git a/README.md b/README.md
@@ -1,13 +1,15 @@
 # Form Creator
 
+:warning: This plugin reached its end of life. [Read more here](#end-of-life)
+
 ![GLPI Banner](https://user-images.githubusercontent.com/29282308/31666160-8ad74b1a-b34b-11e7-839b-043255af4f58.png)
 
 [![License GPL 3.0](https://img.shields.io/badge/License-GPL%203.0-blue.svg)](https://github.com/pluginsGLPI/formcreator/blob/master/LICENSE.md)
 [![Telegram GLPI](https://img.shields.io/badge/Telegram-GLPI-blue.svg)](https://t.me/glpien)
 [![IRC Chat](https://img.shields.io/badge/IRC-%23GLPI-green.svg)](http://webchat.freenode.net/?channels=GLPI)
 [![Follow Twitter](https://img.shields.io/badge/Twitter-GLPI%20Project-26A2FA.svg)](https://twitter.com/GLPI_PROJECT)
 [![Join the chat at https://gitter.im/TECLIB/formcreator](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/TECLIB/formcreator?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Project Status: Active](http://www.repostatus.org/badges/latest/active.svg)](http://www.repostatus.org/#active)
+[![Project Status: Inactive](http://www.repostatus.org/badges/latest/inactive.svg)](http://www.repostatus.org/#inactive)
 [![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg)](https://conventionalcommits.org)
 [![GitHub All Releases](https://img.shields.io/github/downloads/PluginsGLPI/formcreator/total)](https://github.com/pluginsGLPI/formcreator/releases)
 
@@ -17,6 +19,7 @@ Extend GLPI with Plugins.
 
   - [Form Creator](#form-creator)
   - [Table of Contents](#table-of-contents)
+  - [End of life](#end-of-life)
   - [Synopsis](#synopsis)
   - [Features](#features)
   - [Build Status](#build-status)
@@ -28,6 +31,14 @@ Extend GLPI with Plugins.
   - [Contribute](#contribute)
   - [Copying](#copying)
 
+## End of life
+
+Forms will be implemented in GLPI soon, making Formcreator obsolete soon. Therefore, the very last release of the plugin is 2.13.8, except if a particular event requires a new one. We still fix bugs for our customers and at best effort bugfix for the community.
+
+Any feature request will be ignored. If you need a new feature, you may submit it in GLPI project after the availability of forms in GLPI itself.
+
+Thank you very much for enjoying this plugin, for reporting bugs, submitting features and contributing (features or translations). See you later with native forms. When GLPI beta will be available, do not hesitate to download and test it. 
+
 ## Synopsis
 
 Formcreator is a plugin which allow creation of custom forms of easy access.

diff --git a/RoboFilePlugin.php b/RoboFilePlugin.php
@@ -120,7 +120,7 @@ public function localesPush() {
     * @return void
     */
    public function localesPull($percent = 70) {
-      $this->_exec('tx pull --debug -f -a --minimum-perc=' .$percent);
+      $this->_exec('tx pull -f -a --minimum-perc=' .$percent);
       return $this;
    }
 

diff --git a/ajax/condition.php b/ajax/condition.php
@@ -30,7 +30,7 @@
  */
 
 include ('../../../inc/includes.php');
-Session::checkRight('entity', UPDATE);
+Session::checkRight(PluginFormcreatorForm::$rightname, UPDATE);
 
 // integrity check
 if (!isset($_POST['itemtype']) || !isset($_POST['items_id'])) {

diff --git a/ajax/dropdown_values.php b/ajax/dropdown_values.php
@@ -31,7 +31,7 @@
 
 include ('../../../inc/includes.php');
 
-Session::checkRight('entity', UPDATE);
+Session::checkRight(PluginFormcreatorForm::$rightname, UPDATE);
 
 if (!isset($_REQUEST['dropdown_itemtype'])
     || $_REQUEST['dropdown_itemtype'] == '0'

diff --git a/ajax/edit_translation.php b/ajax/edit_translation.php
@@ -41,6 +41,8 @@
    die();
 }
 
+Session::checkRight('entity', UPDATE);
+
 // if (!isset($_POST['plugin_formcreator_translations_id'])) {
 //    http_response_code(400);
 //    die();

diff --git a/ajax/form.php b/ajax/form.php
@@ -30,12 +30,12 @@
  */
 
 include ('../../../inc/includes.php');
-if (!Session::haveRight('entity', UPDATE)) {
+if (!Session::haveRight(PluginFormcreatorForm::$rightname, UPDATE)) {
    http_response_code(403);
    die();
 }
 
-$form = PluginFormcreatorCommon::getForm();
+$form = new PluginFormcreatorForm;
 
 if (!isset($_REQUEST['id']) || !isset($_REQUEST['action'])) {
    http_response_code(400);

diff --git a/ajax/form_delete_target.php b/ajax/form_delete_target.php
@@ -42,7 +42,7 @@
     die();
 }
 
-Session::checkRight('entity', UPDATE);
-if (!PluginFormcreatorCommon::getForm()->deleteTarget($_REQUEST)) {
+Session::checkRight(PluginFormcreatorForm::$rightname, UPDATE);
+if (!(new PluginFormcreatorForm())->deleteTarget($_REQUEST)) {
     http_response_code(500);
 }
diff --git a/ajax/form_duplicate_target.php b/ajax/form_duplicate_target.php
@@ -43,6 +43,6 @@
 }
 
 Session::checkRight('entity', UPDATE);
-if (!PluginFormcreatorCommon::getForm()->duplicateTarget($_REQUEST)) {
+if (!(new PluginFormcreatorForm())->duplicateTarget($_REQUEST)) {
     http_response_code(500);
 }
diff --git a/front/formaccesstype.form.php → ajax/form_validator.php b/front/formaccesstype.form.php → ajax/form_validator.php
@@ -31,52 +31,30 @@
 
 include ('../../../inc/includes.php');
 
-Session::checkRight('entity', UPDATE);
-
 // Check if plugin is activated...
-if (!(new Plugin())->isActivated('formcreator')) {
-   Html::displayNotFoundError();
+if (!Plugin::isPluginActive('formcreator')) {
+   http_response_code(404);
+   die();
 }
 
-// Get target form
-$form_id = $_POST[PluginFormcreatorForm::getForeignKeyField()] ?? null;
-if (is_null($form_id)) {
+if (!isset($_REQUEST['id']) || !isset($_REQUEST['action'])) {
    http_response_code(400);
-   die;
-}
-
-// No update if `access_rights` is not modified, keeping the save behavior as
-// the previous form_profile.form.php file
-if (!isset($_POST['access_rights'])) {
-   Html::back();
-   die;
+   die();
 }
 
-// Try to load form
-$form = PluginFormcreatorForm::getById($form_id);
-if (!$form) {
-   Html::displayNotFoundError();
+$item = new PluginFormcreatorForm_Validator();
+
+if ($_POST['action'] == 'delete') {
+   if (!Session::haveRight(PluginFormcreatorForm::$rightname, UPDATE)) {
+      http_response_code(403);
+      die();
+   }
+   if (!$item->delete($_POST)) {
+      http_response_code(500);
+      die();
+   }
+   http_response_code(204);
+   die();
 }
 
-// Prepare input
-$input = [
-   'id'                 => (int) $form_id,
-   'is_captcha_enabled' => $_POST['is_captcha_enabled'] ?? false,
-   'access_rights'      => (int) $_POST['access_rights'],
-   'users'              => [],
-   'groups'             => [],
-   'profiles'           => [],
-   'entities'           => [],
-];
-
-$restrictions = $_POST['restrictions'] ?? null;
-if (!is_null($restrictions)) {
-   $input['users']    = AbstractRightsDropdown::getPostedIds($restrictions, User::class);
-   $input['groups']   = AbstractRightsDropdown::getPostedIds($restrictions, Group::class);
-   $input['profiles'] = AbstractRightsDropdown::getPostedIds($restrictions, Profile::class);
-}
-
-// Update form
-$form->update($input);
-
-Html::back();
+http_response_code(400);
diff --git a/ajax/formanswer.php b/ajax/formanswer.php
@@ -42,7 +42,7 @@
    die();
 }
 
-$form = PluginFormcreatorCommon::getForm();
+$form = new PluginFormcreatorForm();
 if (!$form->getFromDB($_POST['plugin_formcreator_forms_id'])) {
    http_response_code(500);
    die();
@@ -56,7 +56,7 @@
 // Save form
 $backup_debug = $_SESSION['glpi_use_mode'];
 $_SESSION['glpi_use_mode'] = Session::NORMAL_MODE;
-$formAnswer = PluginFormcreatorCommon::getFormAnswer();
+$formAnswer = new PluginFormcreatorFormAnswer();
 if ($formAnswer->add($_POST) === false) {
    http_response_code(400);
    if ($_SESSION['glpiname'] == 'formcreator_temp_user') {
@@ -74,6 +74,23 @@
 $form->increaseUsageCount();
 $_SESSION['glpi_use_mode'] = $backup_debug;
 
+if (!PluginFormcreatorForm::isNewID($form->fields['plugin_formcreator_forms_id'])) {
+   $nextForm = new PluginFormcreatorForm();
+   $nextForm->getFromDBByCrit([
+      'id'         => $form->fields['plugin_formcreator_forms_id'],
+      'is_active'  => 1,
+      'is_deleted' => 0,
+   ]);
+   if (!$nextForm->isNewItem()) {
+      echo json_encode(
+         [
+            'redirect' => 'formdisplay.php?id=' . $nextForm->getID(),
+         ], JSON_FORCE_OBJECT
+      );
+      die();
+   }
+}
+
 if ($_SESSION['glpiname'] == 'formcreator_temp_user') {
    // Form was saved by an annymous user
    unset($_SESSION['glpiname']);

diff --git a/ajax/get_form_tags.php b/ajax/get_form_tags.php
@@ -0,0 +1,52 @@
+<?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
+ * ---------------------------------------------------------------------
+ */
+
+include ('../../../inc/includes.php');
+
+// Check if plugin is activated...
+if (!Plugin::isPluginActive('formcreator')) {
+   http_response_code(404);
+   die();
+}
+
+if (!Session::haveRight(PluginFormcreatorForm::$rightname, UPDATE)) {
+   http_response_code(403);
+   die();
+}
+
+$form = new PluginFormcreatorForm();
+if (!$form->getFromDB($_POST['id'])) {
+   http_response_code(500);
+   die();
+}
+
+$tags = $form->getTags($_POST['searchText']);
+echo json_encode($tags, JSON_UNESCAPED_UNICODE);
diff --git a/ajax/get_validator_itemtype_dropdown.php b/ajax/get_validator_itemtype_dropdown.php
@@ -0,0 +1,54 @@
+<?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\Application\View\TemplateRenderer;
+
+include ('../../../inc/includes.php');
+
+// Check if plugin is activated...
+if (!Plugin::isPluginActive('formcreator')) {
+   http_response_code(404);
+   die();
+}
+
+if (!Session::haveRight(PluginFormcreatorForm::$rightname, UPDATE)) {
+    http_response_code(403);
+    die();
+}
+
+if (!isset($_POST['itemtype'])) {
+    http_response_code(400);
+    die();
+}
+
+TemplateRenderer::getInstance()->display('@formcreator/components/form/form_validator.validator_type.html.twig', [
+    'type' => $_POST['itemtype'],
+]);
diff --git a/ajax/homepage_forms.php b/ajax/homepage_forms.php
@@ -30,5 +30,5 @@
  */
 include ('../../../inc/includes.php');
 
-$form = PluginFormcreatorCommon::getForm();
+$form = new PluginFormcreatorForm();
 $form->showForCentral();
diff --git a/ajax/ldap_filter.php b/ajax/ldap_filter.php
@@ -31,7 +31,7 @@
 
 include ('../../../inc/includes.php');
 
-Session::checkRight('entity', UPDATE);
+Session::checkRight(PluginFormcreatorForm::$rightname, UPDATE);
 
 $authldap = new AuthLdap();
 $authldap->getFromDB($_POST['value']);