NameSpace Migration

Twig for config & profile

Author: tsmr

ajax/getEntitiesRights.php

@@ -29,13 +29,15 @@
  * --------------------------------------------------------------------------
  */
 
+use GlpiPlugin\Transferticketentity\Entity;
+
 include("../../../inc/includes.php");
 
 header("Content-Type: text/html; charset=UTF-8");
 Html::header_nocache();
 
 Session::checkLoginUser();
 
-$getEntitiesRights = PluginTransferticketentityEntity::getEntitiesRights();
+$getEntitiesRights = Entity::getEntitiesRights();
 
 echo json_encode($getEntitiesRights);

ajax/showentitygroups.php

@@ -31,6 +31,8 @@
  * -------------------------------------------------------------------------
  */
 
+use GlpiPlugin\Transferticketentity\Ticket;
+
 if (strpos($_SERVER['PHP_SELF'], "showentitygroups.php")) {
     include('../../../inc/includes.php');
     header("Content-Type: text/html; charset=UTF-8");
@@ -42,7 +44,7 @@
 if (isset($_POST['entity_selection'])) {
     $entitites_id = $_POST['entity_selection'];
 
-    $getGroupEntities = PluginTransferticketentityTicket::getGroupEntities($entitites_id);
+    $getGroupEntities = Ticket::getGroupEntities($entitites_id);
 
     $groups[0] = Dropdown::EMPTY_VALUE;
     foreach ($getGroupEntities as $key => $group) {

ajax/showentitymandatorygroup.php

@@ -31,6 +31,8 @@
  * -------------------------------------------------------------------------
  */
 
+use GlpiPlugin\Transferticketentity\Entity;
+
 if (strpos($_SERVER['PHP_SELF'], "showentitymandatorygroup.php")) {
     include('../../../inc/includes.php');
     header("Content-Type: text/html; charset=UTF-8");
@@ -43,7 +45,7 @@
     $entitites_id = $_POST['entity_selection'];
 
     $params['entity_choice'] = $entitites_id;
-    $getEntitiesRights = PluginTransferticketentityEntity::checkEntityRight($params);
+    $getEntitiesRights = Entity::checkEntityRight($params);
 
     if ($getEntitiesRights['allow_entity_only_transfer'] == 1) {
         echo "<span class='text-danger'>";

ajax/showentitymandatoryjustification.php

@@ -31,6 +31,8 @@
  * -------------------------------------------------------------------------
  */
 
+use GlpiPlugin\Transferticketentity\Entity;
+
 if (strpos($_SERVER['PHP_SELF'], "showentitymandatoryjustification.php")) {
     include('../../../inc/includes.php');
     header("Content-Type: text/html; charset=UTF-8");
@@ -43,7 +45,7 @@
     $entitites_id = $_POST['entity_selection'];
 
     $params['entity_choice'] = $entitites_id;
-    $getEntitiesRights = PluginTransferticketentityEntity::checkEntityRight($params);
+    $getEntitiesRights = Entity::checkEntityRight($params);
 
     if ($getEntitiesRights['justification_transfer'] == 1) {
         echo "<span class='text-danger'>";

front/entity.form.php

@@ -31,9 +31,13 @@
 
 include('../../../inc/includes.php');
 
+use GlpiPlugin\Transferticketentity\Entity;
+use GlpiPlugin\Transferticketentity\Ticket;
+
+
 Session::checkRight("entity", UPDATE);
 
-$config = new PluginTransferticketentityEntity();
+$config = new Entity();
 
 if (isset($_POST["update"])) {
     $config_data = $config::getInstance($_POST['entities_id']);
@@ -44,14 +48,12 @@
         if ($_POST['allow_transfer'] == 0) {
             $config->delete(['id' => $_POST['id']]);
         } else {
-
             $params['entity_choice'] = $_POST['entities_id'];
-            $checkMandatoryCategory = PluginTransferticketentityTicket::checkMandatoryCategory($params);
+            $checkMandatoryCategory = Ticket::checkMandatoryCategory($params);
 
             if ($checkMandatoryCategory
                 && $_POST['keep_category'] == 0
                 && $_POST['itilcategories_id'] == 0) {
-
                 Session::addMessageAfterRedirect(
                     __(
                         "The category is mandatory in the ticket template assigned to the entity",

front/ticket.form.php

@@ -29,19 +29,27 @@
  * --------------------------------------------------------------------------
  */
 
+
 include('../../../inc/includes.php');
 
-$ticket = new PluginTransferticketentityTicket();
+use GlpiPlugin\Transferticketentity\Ticket;
+
+Session::checkRight("plugin_transferticketentity_use", READ);
+
+$ticket = new Ticket();
 
 if (isset($_POST['transfertticket'])) {
-    if (isset($_POST['entity_choice']) && $_POST['entity_choice'] > 0) {
+    if (isset($_POST['entity_choice'])
+        && $_POST['entity_choice'] > 0) {
         $ticket->launchTicketTransfer($_POST);
     } else {
         Session::addMessageAfterRedirect(
             __("Please select a valid entity", 'transferticketentity'),
             true,
             ERROR
         );
+        Html::back();
     }
 }
+
 Html::back();

hook.php

@@ -29,6 +29,8 @@
  --------------------------------------------------------------------------
 */
 
+use GlpiPlugin\Transferticketentity\Profile;
+
 /**
  * Install hook
  *
@@ -38,7 +40,7 @@ function plugin_transferticketentity_install()
 {
     global $DB;
 
-    PluginTransferticketentityProfile::createFirstAccess($_SESSION["glpiactiveprofile"]["id"]);
+    Profile::createFirstAccess($_SESSION["glpiactiveprofile"]["id"]);
 
     $default_charset = DBConnection::getDefaultCharset();
     $default_collation = DBConnection::getDefaultCollation();
@@ -81,7 +83,7 @@ function plugin_transferticketentity_uninstall()
 
     //Delete rights associated with the plugin
     $profileRight = new ProfileRight();
-    foreach (PluginTransferticketentityProfile::getAllRights() as $right) {
+    foreach (Profile::getAllRights() as $right) {
         $profileRight->deleteByCriteria(['name' => $right['field']]);
     }
     return true;

js/entitySettings.js

@@ -29,6 +29,11 @@
  --------------------------------------------------------------------------
 */
 
+use GlpiPlugin\Transferticketentity\Entity;
+use GlpiPlugin\Transferticketentity\Profile;
+use GlpiPlugin\Transferticketentity\Ticket;
+
+
 define('TRANSFERTICKETENTITY_VERSION', '1.1.4');
 
 if (!defined("PLUGIN_TRANSFERTICKETENTITY_DIR")) {
@@ -40,12 +45,12 @@ function plugin_init_transferticketentity()
     global $PLUGIN_HOOKS;
 
     // Add a tab for profiles and tickets
-    Plugin::registerClass('PluginTransferticketentityTicket', ['addtabon' => 'Ticket']);
-    Plugin::registerClass('PluginTransferticketentityEntity', ['addtabon' => 'Entity']);
+    Plugin::registerClass(Ticket::class, ['addtabon' => 'Ticket']);
+    Plugin::registerClass(Entity::class, ['addtabon' => 'Entity']);
 
-    $PLUGIN_HOOKS['change_profile']['transferticketentity'] = ['PluginTransferticketentityProfile', 'initProfile'];
+    $PLUGIN_HOOKS['change_profile']['transferticketentity'] = [Profile::class, 'initProfile'];
 
-    Plugin::registerClass('PluginTransferticketentityProfile', ['addtabon' => ['Profile']]);
+    Plugin::registerClass(Profile::class, ['addtabon' => ['Profile']]);
 
     $PLUGIN_HOOKS['add_css']['transferticketentity'][] = "css/style.css";