| ".__('Size', 'fusioninventory')." | "; echo ""; - $a_data = $this->find("`plugin_fusioninventory_collects_files_id`='".$collects_files_id."'", - "`pathfile`"); + $a_data = $this->find(['plugin_fusioninventory_collects_files_id' => $collects_files_id], + ['pathfile']); foreach ($a_data as $data) { echo "|||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
';
diff --git a/inc/collect_registry_content.class.php b/inc/collect_registry_content.class.php
index 989b018ff0..eea6437fb0 100644
--- a/inc/collect_registry_content.class.php
+++ b/inc/collect_registry_content.class.php
@@ -155,9 +155,8 @@ function updateComputer($computers_id, $registry_data, $collects_registries_id)
function showForComputer($computers_id) {
$pfCollect_Registry = new PluginFusioninventoryCollect_Registry();
echo "
| |||||||||||||||||||||||||||||||||||||||||||||||
| "; - Html::checkAllAsCheckbox("checksList$rand", mt_rand()); + echo Html::getCheckAllAsCheckbox("checksList$rand", mt_rand()); echo " | |||||||||||||||||||||||||||||||||||||||||||||||
| "; if ($networkPort->fields['instantiation_type'] == 'NetworkPortEthernet') { - $npes = $networkPortEthernet->find("`networkports_id`='".$networkPort->fields['id']."'", '', 1); + $npes = $networkPortEthernet->find(['networkports_id' => $networkPort->fields['id']], [], 1); foreach ($npes as $npe) { echo Dropdown::getDropdownName("glpi_netpoints", $npe["netpoints_id"]); } diff --git a/inc/networkinventory.class.php b/inc/networkinventory.class.php index da510e8384..c17cfdf138 100644 --- a/inc/networkinventory.class.php +++ b/inc/networkinventory.class.php @@ -291,9 +291,10 @@ function prepareRun($taskjobs_id) { $a_devicesubnet[$ip_subnet]['NetworkEquipment'][$items_id] = 1; } foreach ($a_Printer as $items_id) { - $a_ports = $NetworkPort->find("`itemtype`='Printer' - AND `items_id`='".$items_id."' - AND `ip`!='127.0.0.1'"); + $a_ports = $NetworkPort->find( + ['itemtype' => 'Printer', + 'items_id' => $items_id, + ['ip'] => ['!=', '127.0.0.1']]); foreach ($a_ports as $a_port) { $a_ip = explode(".", $a_port['ip']); $ip_subnet = $a_ip[0].".".$a_ip[1].".".$a_ip[2]."."; @@ -574,6 +575,7 @@ function run($jobstate) { $pfTaskjoblog = new PluginFusioninventoryTaskjoblog(); $pfConfigSecurity = new PluginFusioninventoryConfigSecurity(); $pfToolbox = new PluginFusioninventoryToolbox(); + $pfConfig = new PluginFusioninventoryConfig(); $current = $jobstate; $pfAgent->getFromDB($current->fields['plugin_fusioninventory_agents_id']); @@ -592,10 +594,22 @@ function run($jobstate) { $sxml_option = $this->message->addChild('OPTION'); $sxml_option->addChild('NAME', 'SNMPQUERY'); $sxml_param = $sxml_option->addChild('PARAM'); - $sxml_param->addAttribute('THREADS_QUERY', - $pfAgent->fields["threads_networkinventory"]); - $sxml_param->addAttribute('TIMEOUT', - $pfAgent->fields["timeout_networkinventory"]); + // Use general config when threads number is set to 0 on the agent + if ($pfAgent->fields["threads_networkinventory"] == 0) { + $sxml_param->addAttribute('THREADS_QUERY', + $pfConfig->getValue('threads_networkinventory')); + } else { + $sxml_param->addAttribute('THREADS_QUERY', + $pfAgent->fields["threads_networkinventory"]); + } + // Use general config when timeout is set to 0 on the agent + if ($pfAgent->fields["timeout_networkinventory"] == 0) { + $sxml_param->addAttribute('TIMEOUT', + $pfConfig->getValue('timeout_networkinventory')); + } else { + $sxml_param->addAttribute('TIMEOUT', + $pfAgent->fields["timeout_networkinventory"]); + } $sxml_param->addAttribute('PID', $current->fields['id']); $changestate = 0; @@ -606,11 +620,11 @@ function run($jobstate) { if ($jobstate->fields['itemtype'] == 'Printer') { $sxml_device->addAttribute('TYPE', 'PRINTER'); $pfPrinter = new PluginFusioninventoryPrinter(); - $a_extended = current($pfPrinter->find("`printers_id`='".$jobstate->fields['items_id']."'", '', 1)); + $a_extended = current($pfPrinter->find(['printers_id' => $jobstate->fields['items_id']], [], 1)); } else if ($jobstate->fields['itemtype'] == 'NetworkEquipment') { $sxml_device->addAttribute('TYPE', 'NETWORKING'); $pfNetworkEquipment = new PluginFusioninventoryNetworkEquipment(); - $a_extended = current($pfNetworkEquipment->find("`networkequipments_id`='".$jobstate->fields['items_id']."'", '', 1)); + $a_extended = current($pfNetworkEquipment->find(['networkequipments_id' => $jobstate->fields['items_id']], [], 1)); } $sxml_device->addAttribute('ID', $jobstate->fields['items_id']); diff --git a/inc/networkport.class.php b/inc/networkport.class.php index 2b54d29016..519365c0bd 100644 --- a/inc/networkport.class.php +++ b/inc/networkport.class.php @@ -220,7 +220,7 @@ function loadNetworkport($networkports_id) { $networkport->getFromDB($networkports_id); $this->portDB = $networkport->fields; - $a_fusports = $this->find("`networkports_id`='".$networkports_id."'", "", 1); + $a_fusports = $this->find(['networkports_id' => $networkports_id], [], 1); if (count($a_fusports) > 0) { $a_fusport = current($a_fusports); foreach ($a_fusport as $key=>$value) { @@ -332,358 +332,6 @@ function getNetworkPortsID() { } - /** - * Search networkport with IP and ifdescr - * - * @global object $DB - * @param string $IP - * @param string $ifDescr - * @param string $sysdescr - * @param string $sysname - * @param string $model - * @return integer - */ - function getPortIDfromDeviceIP($IP, $ifDescr, $sysdescr, $sysname, $model) { - global $DB; - - $pfUnmanaged = new PluginFusioninventoryUnmanaged(); - $NetworkPort = new NetworkPort(); - $networkName = new NetworkName(); - $iPAddress = new IPAddress(); - - $PortID = ""; - - // search port have ifdescr + ip (in most cases not find it) - $queryPort = "SELECT `glpi_networkports`.`id` - FROM `glpi_plugin_fusioninventory_networkports` - LEFT JOIN `glpi_networkports` - ON `glpi_plugin_fusioninventory_networkports`.`networkports_id`= - `glpi_networkports`.`id` - LEFT JOIN `glpi_networknames` - ON `glpi_networknames`.`items_id`=`glpi_networkports`.`id` - AND `glpi_networknames`.`itemtype`='NetworkPort' - LEFT JOIN `glpi_ipaddresses` - ON `glpi_ipaddresses`.`items_id`=`glpi_networknames`.`id` - AND `glpi_ipaddresses`.`itemtype`='NetworkName' - - WHERE (`ifdescr`='".$ifDescr."' - OR `glpi_networkports`.`name`='".$ifDescr."') - AND `glpi_networkports`.`itemtype`='NetworkEquipment' - AND `glpi_ipaddresses`.`name`='".$IP."'"; - $resultPort = $DB->query($queryPort); - if ($DB->numrows($resultPort) == 0) { - // Search a management port of networkequipment have this IP - $queryManagement = "SELECT `glpi_networkports`.`itemtype`, - `glpi_networkports`.`items_id` FROM `glpi_networkports` - LEFT JOIN `glpi_networknames` - ON `glpi_networknames`.`items_id`=`glpi_networkports`.`id` - AND `glpi_networknames`.`itemtype`='NetworkPort' - LEFT JOIN `glpi_ipaddresses` - ON `glpi_ipaddresses`.`items_id`=`glpi_networknames`.`id` - AND `glpi_ipaddresses`.`itemtype`='NetworkName' - - WHERE `glpi_ipaddresses`.`name`='".$IP."' - AND `instantiation_type`='NetworkPortAggregate' - LIMIT 1"; - $resultManagement = $DB->query($queryManagement); - if ($DB->numrows($resultManagement) == 1) { - $dataManagement = $DB->fetch_assoc($resultManagement); - // Seach a port have this ifdescr for this same networkequipment - $queryPort = "SELECT `glpi_networkports`.`id` - FROM `glpi_plugin_fusioninventory_networkports` - LEFT JOIN `glpi_networkports` - ON `glpi_plugin_fusioninventory_networkports`.`networkports_id`= - `glpi_networkports`.`id` - WHERE `glpi_networkports`.`itemtype`='".$dataManagement['itemtype']."' - AND `glpi_networkports`.`items_id`='".$dataManagement['items_id']."' - AND (`ifdescr`='".$ifDescr."' - OR `glpi_networkports`.`name`='".$ifDescr."') - LIMIT 1"; - $resultPort = $DB->query($queryPort); - if ($DB->numrows($resultPort) == 1) { - $dataPort = $DB->fetch_assoc($resultPort); - $PortID = $dataPort["id"]; - } - } - } else { - $dataPort = $DB->fetch_assoc($resultPort); - $PortID = $dataPort['id']; - } - - // Detect IP Phone - if ($PortID == "") { - if (strstr($model, "Phone") - || $model == '') { - $queryPort = "SELECT glpi_networkports.* FROM `glpi_phones` - LEFT JOIN `glpi_networkports` - ON `glpi_phones`.`id`=`glpi_networkports`.`items_id` - LEFT JOIN `glpi_networknames` - ON `glpi_networknames`.`items_id`=`glpi_networkports`.`id` - AND `glpi_networknames`.`itemtype`='NetworkPort' - LEFT JOIN `glpi_ipaddresses` - ON `glpi_ipaddresses`.`items_id`=`glpi_networknames`.`id` - AND `glpi_ipaddresses`.`itemtype`='NetworkName' - - WHERE `glpi_ipaddresses`.`name`='".$IP."' - AND `glpi_networkports`.`itemtype`='Phone' - AND `glpi_phones`.`name`='".$sysname."' - LIMIT 1"; - $resultPort = $DB->query($queryPort); - if ($DB->numrows($resultPort) == 1) { - $dataPort = $DB->fetch_assoc($resultPort); - if (isset($dataPort['id'])) { - $PortID = $dataPort["id"]; - } - } - } - } - - if ($PortID == "") { - $query = "SELECT * FROM `glpi_plugin_fusioninventory_unmanageds` - WHERE `ip`='".$IP."' - LIMIT 1"; - $result = $DB->query($query); - if ($DB->numrows($result) == "1") { - $data = $DB->fetch_assoc($result); - // Search port and add if required - $query1 = "SELECT * - FROM `glpi_networkports` - WHERE `itemtype`='PluginFusioninventoryUnmanaged' - AND `items_id`='".$data['id']."' - AND `name`='".$ifDescr."' - LIMIT 1"; - $result1 = $DB->query($query1); - if ($DB->numrows($result1) == "1") { - $data1 = $DB->fetch_assoc($result1); - $PortID = $data1['id']; - } else { - // Add port - $input = []; - $input['items_id'] = $data['id']; - $input['itemtype'] = 'PluginFusioninventoryUnmanaged'; - $input['ip'] = $IP; - $input['name'] = $ifDescr; - $input['instantiation_type'] = 'NetworkPortEthernet'; - $PortID = $NetworkPort->add($input); - } - // Update unmanaged device - $input = []; - $input['id'] = $data['id']; - $input['ip'] = $IP; - if (strstr($model, "Phone")) { - $input['item_type'] = 'Phone'; - } - if ($sysname != '') { - $input['name'] = $sysname; - } - if ($sysdescr != '') { - $input['sysdescr'] = $sysdescr; - } - $pfUnmanaged->update($input); - return $PortID; - } - - $query0 = "SELECT `glpi_networkports`.* FROM `glpi_networkports` - LEFT JOIN `glpi_networknames` - ON `glpi_networknames`.`items_id`=`glpi_networkports`.`id` - AND `glpi_networknames`.`itemtype`='NetworkPort' - LEFT JOIN `glpi_ipaddresses` - ON `glpi_ipaddresses`.`items_id`=`glpi_networknames`.`id` - AND `glpi_ipaddresses`.`itemtype`='NetworkName' - - WHERE `glpi_networkports`.`itemtype`='PluginFusioninventoryUnmanaged' - AND `glpi_ipaddresses`.`name`='".$IP."' - LIMIT 1"; - $result0 = $DB->query($query0); - if ($DB->numrows($result0) == 1) { - $data0 = $DB->fetch_assoc($result0); - // Search port and add if required - $query1 = "SELECT * - FROM `glpi_networkports` - WHERE `itemtype`='PluginFusioninventoryUnmanaged' - AND `items_id`='".$data0['items_id']."' - AND `name`='".$ifDescr."' - LIMIT 1"; - $result1 = $DB->query($query1); - if ($DB->numrows($result1) == "1") { - $data1 = $DB->fetch_assoc($result1); - $PortID = $data1['id']; - } else { - // Add port - $input = []; - $input['items_id'] = $data0['items_id']; - $input['itemtype'] = 'PluginFusioninventoryUnmanaged'; - $input['name'] = $ifDescr; - $input['instantiation_type'] = 'NetworkPortEthernet'; - $PortID = $NetworkPort->add($input); - - $input = []; - $input['itemtype'] = 'NetworkPort'; - $input['items_id'] = $PortID; - $networknames_id = $networkName->add($input); - - $input = []; - $input['itemtype'] = 'NetworkName'; - $input['items_id'] = $networknames_id; - $input['name'] = $IP; - $iPAddress->add($input); - } - return $PortID; - } - // Add unmanaged device - $input = []; - $input['ip'] = $IP; - if (strstr($model, "Phone")) { - $input['item_type'] = 'Phone'; - } - if ($sysname != '') { - $input['name'] = $sysname; - } - if ($model != '') { - $input['comment'] = $model; - } - if (isset($_SESSION["plugin_fusioninventory_entity"])) { - $input['entities_id'] = $_SESSION["plugin_fusioninventory_entity"]; - } - if ($sysdescr != '') { - $input['sysdescr'] = $sysdescr; - } - $unkonwn_id = $pfUnmanaged->add($input); - // Add port - $input = []; - $input['items_id'] = $unkonwn_id; - $input['itemtype'] = 'PluginFusioninventoryUnmanaged'; - $input['name'] = $ifDescr; - $input['instantiation_type'] = 'NetworkPortEthernet'; - $PortID = $NetworkPort->add($input); - - $input = []; - $input['itemtype'] = 'NetworkPort'; - $input['items_id'] = $PortID; - $networknames_id = $networkName->add($input); - - $input = []; - $input['itemtype'] = 'NetworkName'; - $input['items_id'] = $networknames_id; - $input['name'] = $IP; - $iPAddress->add($input); - - return $PortID; - } - return $PortID; - } - - - /** - * Find a port of a device with MAC address and port number (from LLDP - * information) - * - * @global object $DB - * @param string $sysmac - * @param integer $ifnumber - * @param array $params - * @return integer - */ - function getPortIDfromSysmacandPortnumber($sysmac, $ifnumber, $params = []) { - global $DB; - - $PortID = ''; - $queryPort = "SELECT * - FROM `glpi_networkports` - WHERE `mac`='".$sysmac."' - AND `itemtype`='NetworkEquipment' - AND `logical_number`='".$ifnumber."' - LIMIT 1"; - $resultPort = $DB->query($queryPort); - if ($DB->numrows($resultPort) == "1") { - $dataPort = $DB->fetch_assoc($resultPort); - $PortID = $dataPort['id']; - } - - if ($PortID == '') { - // case where mac is of switch and not of the port (like Procurve) - $queryPort = "SELECT * - FROM `glpi_plugin_fusioninventory_networkports` - LEFT JOIN `glpi_networkports` - ON `glpi_plugin_fusioninventory_networkports`.`networkports_id`= - `glpi_networkports`.`id` - LEFT JOIN `glpi_networkequipments` - ON `glpi_networkports`.`items_id`= - `glpi_networkequipments`.`id` - WHERE `glpi_networkports`.`mac`='".$sysmac."' - AND `glpi_networkports`.`itemtype`='NetworkEquipment' - AND `logical_number`='".$ifnumber."' - LIMIT 1"; - $resultPort = $DB->query($queryPort); - $dataPort = $DB->fetch_assoc($resultPort); - if ($DB->numrows($resultPort) == "1") { - $PortID = $dataPort['networkports_id']; - } - } - - // In case of mac is mac of switch, not a port - if ($PortID == '') { - $queryPort = "SELECT * - FROM `glpi_networkports` - WHERE `logical_number`='".$ifnumber."' - AND `itemtype`='NetworkEquipment' - AND `items_id` IN - (SELECT `items_id` - FROM `glpi_networkports` - WHERE `instantiation_type`='NetworkPortAggregate' - AND `mac`='".$sysmac."') - LIMIT 1"; - $resultPort = $DB->query($queryPort); - $dataPort = $DB->fetch_assoc($resultPort); - if (isset($dataPort['id'])) { - $PortID = $dataPort['id']; - } - } - - if ($PortID == "") { - $NetworkPort = new NetworkPort(); - $PluginFusioninventoryUnmanaged = new PluginFusioninventoryUnmanaged(); - - $query = "SELECT * - FROM `glpi_networkports` - WHERE `itemtype`='PluginFusioninventoryUnmanaged' - AND `mac`='".$sysmac."' - LIMIT 1"; - $result = $DB->query($query); - if ($DB->numrows($result) == "1") { - $data = $DB->fetch_assoc($result); - return $data['id']; - } - // Add unmanaged device because not find device - $input = []; - $input['mac'] = $sysmac; - if (isset($params['sysname'])) { - $input['name'] = $params['sysname']; - } - if (isset($_SESSION["plugin_fusioninventory_entity"])) { - $input['entities_id'] = $_SESSION["plugin_fusioninventory_entity"]; - } - if (isset($params['sysdescr'])) { - $input['sysdescr'] = $params['sysdescr']; - } - $unkonwn_id = $PluginFusioninventoryUnmanaged->add($input); - // Add port - $input = []; - $input['items_id'] = $unkonwn_id; - $input['itemtype'] = 'PluginFusioninventoryUnmanaged'; - $input['mac'] = $sysmac; - if (isset($params['ifdescr'])) { - $input['name'] = $params['ifdescr']; - } - $input['instantiation_type'] = 'NetworkPortEthernet'; - $PortID = $NetworkPort->add($input); - return $PortID; - } - - return $PortID; - } - - /** * Function used to detect if port has multiple mac connected * diff --git a/inc/networkporttype.class.php b/inc/networkporttype.class.php index 0fee118012..d631932f7e 100644 --- a/inc/networkporttype.class.php +++ b/inc/networkporttype.class.php @@ -383,10 +383,12 @@ function isImportType($type) { $type = str_replace("-", "", $type); } - $a_ports = $this->find("(`number`='".$type."' - OR `name`='".$type."' - OR `othername`='".$type."') - AND `import`='1'"); + $a_ports = $this->find( + ['OR' => + ['number' => $type, + 'name' => $type, + 'othername' => $type], + 'import' => 1]); if (count($a_ports) > 0) { return true; } @@ -400,8 +402,8 @@ function isImportType($type) { */ function showNetworkporttype() { - $a_notimports = $this->find("`import` = '0'"); - $a_imports = $this->find("`import` = '1'"); + $a_notimports = $this->find(['import' => 0]); + $a_imports = $this->find(['import' => 1]); echo " |