Fix links with GLPI

Bump version

Author: tsmr

hook.php

@@ -323,6 +323,8 @@ function plugin_manageentities_install()
         }
     }
 
+    $DB->runFile(PLUGIN_MANAGEENTITIES_DIR . "/install/sql/update-4.1.4.sql");
+
     $rep_files_manageentities = GLPI_PLUGIN_DOC_DIR . "/manageentities";
     if (!is_dir($rep_files_manageentities)) {
         mkdir($rep_files_manageentities);

install/sql/update-4.1.3.sql

@@ -0,0 +1,3 @@
+UPDATE `glpi_displaypreferences` SET `itemtype` = 'GlpiPlugin\\Manageentities\\Directhelpdesk' WHERE `glpi_displaypreferences`.`itemtype` = 'PluginManageentitiesDirecthelpdesk';
+UPDATE `glpi_displaypreferences` SET `itemtype` = 'GlpiPlugin\\Manageentities\\Contractday' WHERE `glpi_displaypreferences`.`itemtype` = 'PluginManageentitiesContractday';
+UPDATE `glpi_displaypreferences` SET `itemtype` = 'GlpiPlugin\\Manageentities\\CriType' WHERE `glpi_displaypreferences`.`itemtype` = 'PluginManageentitiesCriType';

install/sql/update-4.1.4.sql

@@ -0,0 +1 @@
+UPDATE `glpi_documents_items` SET `itemtype` = 'GlpiPlugin\\Manageentities\\Company' WHERE `itemtype` = 'PluginManageentitiesCompany';

manageentities.xml

@@ -21,6 +21,11 @@
       <author>Infotel</author>
    </authors>
    <versions>
+       <version>
+           <num>4.1.4</num>
+           <compatibility>~11.0</compatibility>
+           <download_url>https://github.com/InfotelGLPI/manageentities/releases/download/4.1.4/glpi-manageentities-4.1.4.tar.bz2</download_url>
+       </version>
        <version>
            <num>4.1.3</num>
            <compatibility>~11.0</compatibility>

setup.php

@@ -27,7 +27,7 @@
  --------------------------------------------------------------------------
  */
 
-define('PLUGIN_MANAGEENTITIES_VERSION', '4.1.3');
+define('PLUGIN_MANAGEENTITIES_VERSION', '4.1.4');
 
 global $CFG_GLPI;
 
@@ -173,9 +173,12 @@ function plugin_init_manageentities()
 //         $PLUGIN_HOOKS[Hooks::ADD_JAVASCRIPT]['manageentities'][] = 'scripts/manageentities_load_scripts.js';
 //      }
         $PLUGIN_HOOKS['post_init']['manageentities'] = 'plugin_manageentities_postinit';
-
-        $PLUGIN_HOOKS[Hooks::PRE_ITEM_FORM]['manageentities']    = [Contract::class, 'preItemForm'];
-        $PLUGIN_HOOKS[Hooks::PRE_ITEM_LIST]['manageentities']    = [Contract::class, 'preItemForm'];
+        if (Session::haveRightsOr('plugin_manageentities', [READ, UPDATE])
+            && isset($_SESSION['glpiactiveprofile']['interface'])
+            && $_SESSION['glpiactiveprofile']['interface'] == 'central') {
+            $PLUGIN_HOOKS[Hooks::PRE_ITEM_FORM]['manageentities'] = [Contract::class, 'preItemForm'];
+            $PLUGIN_HOOKS[Hooks::PRE_ITEM_LIST]['manageentities'] = [Contract::class, 'preItemForm'];
+        }
     }
 }
 

src/Contract.php

@@ -497,7 +497,8 @@ function displayAlertforEntity($instID)
             ],
             'WHERE' => [
                 'glpi_contracts.is_deleted' => 0,
-                $this->getTable() . '.entities_id' => $instID
+                'NOT'       => [$this->getTable() . '.date_signature' => null],
+                'glpi_contracts.entities_id' => $instID
             ],
             'ORDERBY' => [
                 'glpi_contracts.begin_date',
@@ -766,7 +767,9 @@ static public function preItemForm($params)
             $entities_id = $item->fields['entities_id'];
         }
         $out = "";
-        if (isset($entities_id)) {
+        if (isset($entities_id)
+            && $_SESSION['glpiactiveprofile']['interface'] == 'central'
+            && Session::haveRight('plugin_manageentities', UPDATE)) {
 //            $sons = getSonsOf("glpi_entities", $entities_id);
 //            if (count($sons) > 1) {
 //                return false;