Some fixes

Author: David Durieux

fusioninventory/hook.php

@@ -620,7 +620,6 @@ function plugin_fusioninventory_giveItem($type, $id, $data, $num) {
          }
          break;
 
-      // * Detail of ports history (plugins/fusinvsnmp/report/switch_ports.history.php)
       case 'PluginFusioninventoryNetworkPortLog' :
          switch ($table.'.'.$field) {
 
@@ -2525,7 +2524,6 @@ function plugin_fusioninventory_addWhere($link, $nott, $type, $id, $val) {
 
          break;
 
-      // * Detail of ports history (plugins/fusinvsnmp/report/switch_ports.history.php)
       case 'PluginFusioninventoryNetworkPortLog' :
          switch ($table.".".$field) {
 

fusioninventory/inc/networkportlog.class.php

@@ -513,11 +513,6 @@ static function showHistory($ID_port) {
          }
       }
 
-      $text .= "<tr class='tab_bg_1'>";
-      $text .= "<th colspan='8'>";
-      $text .= "<a href='".$CFG_GLPI['root_doc']."/plugins/fusioninventory/report/switch_ports.history.php?networkports_id=".$ID_port."'>Voir l'historique complet</a>";
-      $text .= "</th>";
-      $text .= "</tr>";
       $text .= "</table>";
       return $text;
    }

fusioninventory/setup.php

@@ -467,7 +467,6 @@ function plugin_fusioninventory_check_prerequisites() {
 
    if (version_compare(GLPI_VERSION, '0.84', 'lt') || version_compare(GLPI_VERSION, '0.85', 'ge')) {
       echo __('Your GLPI version not compatible, require 0.84', 'fusioninventory');
-
       return false;
    }
    $plugin = new Plugin();
@@ -485,15 +484,16 @@ function plugin_fusioninventory_check_prerequisites() {
    }
 
    $crontask = new CronTask();
-   if ((TableExists("glpi_plugin_fusioninventory_agents")
-           AND !FieldExists("glpi_plugin_fusioninventory_agents", "tag"))
-        OR ($crontask->getFromDBbyName('PluginFusioninventoryTaskjobstatus', 'cleantaskjob'))
-        OR (TableExists("glpi_plugin_fusioninventory_agentmodules")
-           AND FieldExists("glpi_plugin_fusioninventory_agentmodules", "url"))) {
-      $DB->query("UPDATE `glpi_plugin_fusioninventory_configs` SET `value`='0.80+1.4' WHERE `type`='version'");
-      $DB->query("UPDATE `glpi_plugins` SET `version`='0.80+1.4' WHERE `directory` LIKE 'fusi%'");
+   if ($plugin->isActivated("fusioninventory")) {
+      if ((TableExists("glpi_plugin_fusioninventory_agents")
+              AND !FieldExists("glpi_plugin_fusioninventory_agents", "tag"))
+           OR ($crontask->getFromDBbyName('PluginFusioninventoryTaskjobstatus', 'cleantaskjob'))
+           OR (TableExists("glpi_plugin_fusioninventory_agentmodules")
+              AND FieldExists("glpi_plugin_fusioninventory_agentmodules", "url"))) {
+         $DB->query("UPDATE `glpi_plugin_fusioninventory_configs` SET `value`='0.80+1.4' WHERE `type`='version'");
+         $DB->query("UPDATE `glpi_plugins` SET `version`='0.80+1.4' WHERE `directory` LIKE 'fusi%'");
+      }
    }
-
    return true;
 }