Prepare v11

Author: tsmr

ajax/getEntitiesRights.php

@@ -31,8 +31,6 @@
 
 use GlpiPlugin\Transferticketentity\Entity;
 
-include("../../../inc/includes.php");
-
 header("Content-Type: text/html; charset=UTF-8");
 Html::header_nocache();
 

ajax/showentitygroups.php

@@ -34,7 +34,6 @@
 use GlpiPlugin\Transferticketentity\Ticket;
 
 if (strpos($_SERVER['PHP_SELF'], "showentitygroups.php")) {
-    include('../../../inc/includes.php');
     header("Content-Type: text/html; charset=UTF-8");
     Html::header_nocache();
 } elseif (!defined('GLPI_ROOT')) {

ajax/showentitymandatorygroup.php

@@ -34,7 +34,6 @@
 use GlpiPlugin\Transferticketentity\Entity;
 
 if (strpos($_SERVER['PHP_SELF'], "showentitymandatorygroup.php")) {
-    include('../../../inc/includes.php');
     header("Content-Type: text/html; charset=UTF-8");
     Html::header_nocache();
 } elseif (!defined('GLPI_ROOT')) {

ajax/showentitymandatoryjustification.php

@@ -34,7 +34,6 @@
 use GlpiPlugin\Transferticketentity\Entity;
 
 if (strpos($_SERVER['PHP_SELF'], "showentitymandatoryjustification.php")) {
-    include('../../../inc/includes.php');
     header("Content-Type: text/html; charset=UTF-8");
     Html::header_nocache();
 } elseif (!defined('GLPI_ROOT')) {

front/entity.form.php

@@ -29,12 +29,9 @@
  * --------------------------------------------------------------------------
  */
 
-include('../../../inc/includes.php');
-
 use GlpiPlugin\Transferticketentity\Entity;
 use GlpiPlugin\Transferticketentity\Ticket;
 
-
 Session::checkRight("entity", UPDATE);
 
 $config = new Entity();

front/ticket.form.php

@@ -29,9 +29,6 @@
  * --------------------------------------------------------------------------
  */
 
-
-include('../../../inc/includes.php');
-
 use GlpiPlugin\Transferticketentity\Ticket;
 
 Session::checkRight("plugin_transferticketentity_use", READ);

css/style.css public/css/style.csscss/style.css renamed to public/css/style.css

@@ -33,12 +33,13 @@
 use GlpiPlugin\Transferticketentity\Profile;
 use GlpiPlugin\Transferticketentity\Ticket;
 
+Global $CFG_GLPI;
 
-define('TRANSFERTICKETENTITY_VERSION', '1.1.4');
+define('TRANSFERTICKETENTITY_VERSION', '1.2.0');
 
 if (!defined("PLUGIN_TRANSFERTICKETENTITY_DIR")) {
-    define("PLUGIN_TRANSFERTICKETENTITY_WEBDIR", Plugin::getWebDir("transferticketentity", false));
-    define("PLUGIN_TRANSFERTICKETENTITY_FULLWEBDIR", Plugin::getWebDir("transferticketentity"));
+    $root = $CFG_GLPI['root_doc'] . '/plugins/transferticketentity';
+    define("PLUGIN_TRANSFERTICKETENTITY_WEBDIR", $root);
 }
 function plugin_init_transferticketentity()
 {
@@ -68,8 +69,8 @@ function plugin_version_transferticketentity()
         'homepage'       => 'https://github.com/InfotelGLPI/transferticketentity',
         'requirements'   => [
             'glpi' => [
-                'min' => '10.0',
-                'max' => '11.0',
+                'min' => '11.0',
+                'max' => '12.0',
                 'dev' => false
             ]
         ]];

setup.php

@@ -71,7 +71,7 @@
                             {% do call('Ajax::updateItemOnSelectEvent', [
                                 'dropdown_entity_choice' ~ rand,
                                 'show_entitygroup',
-                                config('root_doc') ~ '/' ~ root_plugin ~ '/ajax/showentitygroups.php',
+                                root_plugin ~ '/ajax/showentitygroups.php',
                                 {
                                     'entity_selection': '__VALUE__',
                                     'rand': rand
@@ -81,7 +81,7 @@
                             {% do call('Ajax::updateItemOnSelectEvent', [
                                 'dropdown_entity_choice' ~ rand,
                                 'showmandatoryjustification',
-                                config('root_doc') ~ '/' ~ root_plugin ~ '/ajax/showentitymandatoryjustification.php',
+                                root_plugin ~ '/ajax/showentitymandatoryjustification.php',
                                 {
                                     'entity_selection': '__VALUE__',
                                     'rand': rand
@@ -91,7 +91,7 @@
                             {% do call('Ajax::updateItemOnSelectEvent', [
                                 'dropdown_entity_choice' ~ rand,
                                 'showmandatorygroup',
-                                config('root_doc') ~ '/' ~ root_plugin ~ '/ajax/showentitymandatorygroup.php',
+                                root_plugin ~ '/ajax/showentitymandatorygroup.php',
                                 {
                                     'entity_selection': '__VALUE__',
                                     'rand': rand