![](" . $CFG_GLPI["root_doc"] . "/plugins/ocsinventoryng/pics/ocsinventoryng.png "OCS Inventory NG")
";
@@ -361,10 +349,10 @@ static function ipDiscoverMenu()
foreach ($DB->request($query) as $data) {
$ocsservers[] = $data['id'];
}
- Dropdown::show('PluginOcsinventoryngOcsServer', array("condition" => "`id` IN ('" . implode("','", $ocsservers) . "')",
+ Dropdown::show('PluginOcsinventoryngOcsServer', ["condition" => "`id` IN ('" . implode("','", $ocsservers) . "')",
"value" => $_SESSION["plugin_ocsinventoryng_ocsservers_id"],
"on_change" => "this.form.submit()",
- "display_emptychoice" => false));
+ "display_emptychoice" => false]);
echo "";
echo "" . __('Subnet') . " " . $subnet_name . " (" . $ipAdress . ") - " . $status_name; echo " "; $refresh = $CFG_GLPI['root_doc'] . "/plugins/ocsinventoryng/front/ipdiscover.import.php?" . $reload; - Html::showSimpleForm($refresh, 'refresh', _sx('button', 'Refresh'), array(), $CFG_GLPI["root_doc"] . "/plugins/ocsinventoryng/pics/synchro.png"); + Html::showSimpleForm($refresh, 'refresh', _sx('button', 'Refresh'), [], $CFG_GLPI["root_doc"] . "/plugins/ocsinventoryng/pics/synchro.png"); echo "
"; echo ""; @@ -1437,12 +1407,12 @@ static function showHardware($hardware, $lim, $start = 0, $ipAdress, $status, $s $iplist = ""; $ip = new IPAddress(); // Update IPAddress - foreach ($DB->request('glpi_networkports', array('itemtype' => $hardware[$i]["itemtype"], - 'items_id' => $hardware[$i]["items_id"])) as $netname) { - foreach ($DB->request('glpi_networknames', array('itemtype' => 'NetworkPort', - 'items_id' => $netname['id'])) as $dataname) { - foreach ($DB->request('glpi_ipaddresses', array('itemtype' => 'NetworkName', - 'items_id' => $dataname['id'])) as $data) { + foreach ($DB->request('glpi_networkports', ['itemtype' => $hardware[$i]["itemtype"], + 'items_id' => $hardware[$i]["items_id"]]) as $netname) { + foreach ($DB->request('glpi_networknames', ['itemtype' => 'NetworkPort', + 'items_id' => $netname['id']]) as $dataname) { + foreach ($DB->request('glpi_ipaddresses', ['itemtype' => 'NetworkName', + 'items_id' => $dataname['id']]) as $data) { $ip->getFromDB($data['id']); $iplist .= $ip->getName() . ""; } @@ -1471,7 +1441,7 @@ static function showHardware($hardware, $lim, $start = 0, $ipAdress, $status, $s break; case "noninventoried" : - $ocsTypes = array("id" => array(Dropdown::EMPTY_VALUE), "name" => array(Dropdown::EMPTY_VALUE)); + $ocsTypes = ["id" => [Dropdown::EMPTY_VALUE], "name" => [Dropdown::EMPTY_VALUE]]; $link = $CFG_GLPI['root_doc'] . "/plugins/ocsinventoryng/front/ipdiscover.php"; $target = $CFG_GLPI['root_doc'] . "/plugins/ocsinventoryng/front/ipdiscover.import.php" . $backValues; $macConstructor = ""; @@ -1508,11 +1478,11 @@ static function showHardware($hardware, $lim, $start = 0, $ipAdress, $status, $s echo Search::showHeaderItem($output_type, __(' '), $header_num); echo Search::showEndLine($output_type); $row_num = 1; - $ocstypes = array(); + $ocstypes = []; foreach ($ocsTypes["name"] as $items) { $ocstypes[$items] = $items; } - $itemstypes = array(Dropdown::EMPTY_VALUE); + $itemstypes = [Dropdown::EMPTY_VALUE]; foreach (self::$hardwareItemTypes as $items) { $class = getItemForItemtype($items); $itemstypes[$items] = $class->getTypeName(); @@ -1546,7 +1516,7 @@ static function showHardware($hardware, $lim, $start = 0, $ipAdress, $status, $s echo "
";
- echo Html::image($CFG_GLPI["root_doc"] . "/pics/warning.png", array('alt' => __('Warning')));
+ echo Html::image($CFG_GLPI["root_doc"] . "/pics/warning.png", ['alt' => __('Warning')]);
echo "
"; echo "
"; echo "
";
echo __('No OCSNG server defined', 'ocsinventoryng');
@@ -248,9 +246,9 @@ static function displayTabContentForItem(CommonGLPI $item, $tabnum = 0, $withtem
*
* @return array
*/
- function defineTabs($options = array()) {
+ function defineTabs($options = []) {
- $ong = array();
+ $ong = [];
$this->addStandardTab(__CLASS__, $ong, $options);
diff --git a/inc/ministat.class.php b/inc/ministat.class.php
index 3edcfeed..8eeb4572 100644
--- a/inc/ministat.class.php
+++ b/inc/ministat.class.php
@@ -10,7 +10,7 @@
-------------------------------------------------------------------------
LICENSE
-
+
This file is part of ocsinventoryng.
ocsinventoryng is free software; you can redistribute it and/or modify
@@ -54,56 +54,49 @@ class PluginOcsinventoryngMiniStat
/**
*
*/
- function Reset()
- {
+ function Reset() {
$this->Min = $this->Max = $this->Tot = $this->Nb = 0;
}
/**
* @return int
*/
- function GetMinimum()
- {
+ function GetMinimum() {
return $this->Min;
}
/**
* @return int
*/
- function GetMaximum()
- {
+ function GetMaximum() {
return $this->Max;
}
/**
* @return int
*/
- function GetTotal()
- {
+ function GetTotal() {
return $this->Tot;
}
/**
* @return int
*/
- function GetCount()
- {
+ function GetCount() {
return $this->Nb;
}
/**
* @return float|int
*/
- function GetAverage()
- {
+ function GetAverage() {
return $this->Nb > 0 ? $this->Tot / $this->Nb : 0;
}
/**
* @param $Value
*/
- function AddValue($Value)
- {
+ function AddValue($Value) {
if ($this->Nb > 0) {
if ($Value < $this->Min) {
@@ -120,4 +113,4 @@ function AddValue($Value)
}
}
-}
\ No newline at end of file
+}
diff --git a/inc/networkport.class.php b/inc/networkport.class.php
index e1e372ee..a8643c00 100644
--- a/inc/networkport.class.php
+++ b/inc/networkport.class.php
@@ -9,7 +9,7 @@
-------------------------------------------------------------------------
LICENSE
-
+
This file is part of ocsinventoryng.
ocsinventoryng is free software; you can redistribute it and/or modify
@@ -91,7 +91,7 @@ static private function updateNetworkPort($mac, $name, $computers_id, $instantia
$ports = $DB->request($query);
if ($ports->numrows() == 0) {
- $port_input = array('name' => $name,
+ $port_input = ['name' => $name,
'mac' => $mac,
'items_id' => $computers_id,
'itemtype' => 'Computer',
@@ -99,9 +99,9 @@ static private function updateNetworkPort($mac, $name, $computers_id, $instantia
'instantiation_type' => $instantiation_type,
'_create_children' => 1,
'is_dynamic' => 1,
- 'is_deleted' => 0);
+ 'is_deleted' => 0];
- $networkports_id = $network_port->add($port_input, array(), $dohistory);
+ $networkports_id = $network_port->add($port_input, [], $dohistory);
if ($networkports_id === false) {
return -1;
}
@@ -115,9 +115,9 @@ static private function updateNetworkPort($mac, $name, $computers_id, $instantia
$networkports_id = $line['id'];
$network_port->getFromDB($networkports_id);
if ((!$check_name) && ($network_port->fields['name'] != $name)) {
- $port_input = array('id' => $network_port->getID(),
+ $port_input = ['id' => $network_port->getID(),
'name' => $name,
- 'is_dynamic' => 1);
+ 'is_dynamic' => 1];
$network_port->update($port_input);
}
if (($network_port->fields['instantiation_type'] != $instantiation_type)
@@ -156,12 +156,12 @@ static private function updateNetworkPort($mac, $name, $computers_id, $instantia
} else {
$names = $DB->request($query);
if ($names->numrows() == 0) {
- $name_input = array('itemtype' => 'NetworkPort',
+ $name_input = ['itemtype' => 'NetworkPort',
'items_id' => $networkports_id,
'is_dynamic' => 1,
'is_deleted' => 0,
'_no_history' => !$dohistory,
- 'name' => 'OCS-INVENTORY-NG');
+ 'name' => 'OCS-INVENTORY-NG'];
$networknames_id = $network_name->add($name_input);
} else {
$line = $names->next();
@@ -174,7 +174,7 @@ static private function updateNetworkPort($mac, $name, $computers_id, $instantia
}
$ip_address = new IPAddress();
- $already_known_addresses = array();
+ $already_known_addresses = [];
$query = "SELECT `id`, `name`, `is_dynamic`, `mainitems_id`
FROM `glpi_ipaddresses`
WHERE `itemtype` = 'NetworkName'
@@ -184,8 +184,8 @@ static private function updateNetworkPort($mac, $name, $computers_id, $instantia
if (in_array($line['name'], $ips)
&& !empty($line['mainitems_id'])) {
$already_known_addresses[] = $line['id'];
- $ips = array_diff($ips, array($line['name']));
- } elseif ($line['is_dynamic'] == 1) {
+ $ips = array_diff($ips, [$line['name']]);
+ } else if ($line['is_dynamic'] == 1) {
$ip_address->delete($line, true, $dohistory);
}
}
@@ -202,7 +202,7 @@ static private function updateNetworkPort($mac, $name, $computers_id, $instantia
AND `gateway`='" . $gateway . "'
AND `entities_id`='" . $entities_id . "'") == 0) {
- $input = array(
+ $input = [
'name' => $subnet . '/' .
$mask . ' - ' .
$gateway,
@@ -211,21 +211,21 @@ static private function updateNetworkPort($mac, $name, $computers_id, $instantia
'gateway' => $gateway,
'addressable' => 1,
'entities_id' => $entities_id
- );
+ ];
$IPNetwork->networkUpdate = true;
- $IPNetwork->add($input, array(), !$dohistory);
+ $IPNetwork->add($input, [], !$dohistory);
}
}
if ($ips) {
foreach ($ips as $ip) {
- $ip_input = array('name' => $ip,
+ $ip_input = ['name' => $ip,
'itemtype' => 'NetworkName',
'items_id' => $networknames_id,
'_no_history' => !$dohistory,
'is_dynamic' => 1,
- 'is_deleted' => 0);
+ 'is_deleted' => 0];
$ip_address->add($ip_input);
}
}
@@ -245,26 +245,26 @@ static function importNetwork($cfg_ocs, $ocsComputer, $computers_id, $entities_i
// Group by DESCRIPTION, MACADDR, TYPE, TYPEMIB, SPEED, VIRTUALDEV
// to get an array in IPADDRESS
- $ocsNetworks = array();
+ $ocsNetworks = [];
foreach ($ocsComputer as $ocsNetwork) {
$key = $ocsNetwork['DESCRIPTION'] . $ocsNetwork['MACADDR'] . $ocsNetwork['TYPE']
. $ocsNetwork['TYPEMIB'] . $ocsNetwork['SPEED'] . $ocsNetwork['VIRTUALDEV'];
if (!isset($ocsNetworks[$key])) {
$ocsNetworks[$key] = $ocsNetwork;
- $ocsNetworks[$key]['IPADDRESS'] = array($ocsNetwork['IPADDRESS']);
+ $ocsNetworks[$key]['IPADDRESS'] = [$ocsNetwork['IPADDRESS']];
} else {
$ocsNetworks[$key]['IPADDRESS'] [] = $ocsNetwork['IPADDRESS'];
}
}
- $network_ports = array();
- $network_ifaces = array();
+ $network_ports = [];
+ $network_ifaces = [];
foreach ($ocsNetworks as $line) {
$line = Toolbox::clean_cross_side_scripting_deep(Toolbox::addslashes_deep($line));
$mac = $line['MACADDR'];
if (!isset($network_ports[$mac])) {
- $network_ports[$mac] = array('virtual' => array());
+ $network_ports[$mac] = ['virtual' => []];
}
$name = PluginOcsinventoryngOcsServer::encodeOcsDataInUtf8($cfg_ocs["ocs_db_utf8"],
$line['DESCRIPTION']);
@@ -281,10 +281,10 @@ static function importNetwork($cfg_ocs, $ocsComputer, $computers_id, $entities_i
$networkport_type->fields['speed'] = $speed;
}
- $values = array('name' => $name,
+ $values = ['name' => $name,
'type' => (array_push($network_ifaces, $networkport_type) - 1),
'ip' => $ip,
- 'result' => $line);
+ 'result' => $line];
// Virtual dev can be :
// 1°) specifically defined from OCS
@@ -299,8 +299,8 @@ static function importNetwork($cfg_ocs, $ocsComputer, $computers_id, $entities_i
}
}
- $already_known_ports = array();
- $already_known_ifaces = array();
+ $already_known_ports = [];
+ $already_known_ifaces = [];
foreach ($network_ports as $mac => $ports) {
if (isset($ports['main'])) {
$main = $ports['main'];
@@ -318,21 +318,21 @@ static function importNetwork($cfg_ocs, $ocsComputer, $computers_id, $entities_i
// If not found, then, create it
if ($item_device->isNewItem()) {
$deviceNetworkCard = new DeviceNetworkCard();
- $device_input = array('designation' => $main['name'],
+ $device_input = ['designation' => $main['name'],
'bandwidth' => $type->fields['speed'],
- 'entities_id' => $entities_id);
+ 'entities_id' => $entities_id];
$net_id = $deviceNetworkCard->import($device_input);
if ($net_id) {
- $item_device->add(array('items_id' => $computers_id,
+ $item_device->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'entities_id' => $entities_id,
'devicenetworkcards_id' => $net_id,
'mac' => $mac,
'_no_history' => !$cfg_ocs['history_network'],
'is_dynamic' => 1,
- 'is_deleted' => 0));
+ 'is_deleted' => 0]);
}
}
if (!$item_device->isNewItem()) {
@@ -341,13 +341,13 @@ static function importNetwork($cfg_ocs, $ocsComputer, $computers_id, $entities_i
if ($type->fields['instantiation_type'] == __CLASS__) {
$result = $main['result'];
- $inst_input = array('TYPE' => $result['TYPE'],
+ $inst_input = ['TYPE' => $result['TYPE'],
'TYPEMIB' => $result['TYPEMIB'],
- 'speed' => $result['SPEED']);
+ 'speed' => $result['SPEED']];
} else {
$inst_input = $type->fields;
- foreach (array('id', 'name', 'OCS_TYPE', 'OCS_TYPEMIB',
- 'instantiation_type', 'comment') as $field) {
+ foreach (['id', 'name', 'OCS_TYPE', 'OCS_TYPEMIB',
+ 'instantiation_type', 'comment'] as $field) {
unset($inst_input[$field]);
}
}
@@ -377,7 +377,7 @@ static function importNetwork($cfg_ocs, $ocsComputer, $computers_id, $entities_i
$gateway = $port['result']['IPGATEWAY'];
$subnet = $port['result']['IPSUBNET'];
- $inst_input = array('networkports_id_alias' => $networkports_id);
+ $inst_input = ['networkports_id_alias' => $networkports_id];
$id = self::updateNetworkPort($mac, $port['name'], $computers_id,
'NetworkPortAlias', $inst_input, $port['ip'],
true, $cfg_ocs['history_network'], $already_known_ports, $mask, $gateway, $subnet, $entities_id);
@@ -420,7 +420,7 @@ static function importNetwork($cfg_ocs, $ocsComputer, $computers_id, $entities_i
* @param array $options
* @param list $recursiveItems
*/
- function showInstantiationForm(NetworkPort $netport, $options = array(), $recursiveItems) {
+ function showInstantiationForm(NetworkPort $netport, $options = [], $recursiveItems) {
if (!$options['several']) {
echo "\n";
@@ -456,11 +456,11 @@ function showInstantiationForm(NetworkPort $netport, $options = array(), $recurs
* @return null|the
*/
function getInstantiationHTMLTableHeaders(HTMLTableGroup $group, HTMLTableSuperHeader $super,
- HTMLTableSuperHeader $internet_super = NULL,
- HTMLTableHeader $father = NULL,
- array $options = array()) {
+ HTMLTableSuperHeader $internet_super = null,
+ HTMLTableHeader $father = null,
+ array $options = []) {
- DeviceNetworkCard::getHTMLTableHeader('NetworkPortWifi', $group, $super, NULL,
+ DeviceNetworkCard::getHTMLTableHeader('NetworkPortWifi', $group, $super, null,
$options);
$group->addHeader('TYPE', __('OCS TYPE', 'ocsinventoryng'), $super);
@@ -468,7 +468,7 @@ function getInstantiationHTMLTableHeaders(HTMLTableGroup $group, HTMLTableSuperH
$group->addHeader('Generate', __('Create a mapping', 'ocsinventoryng'), $super);
parent::getInstantiationHTMLTableHeaders($group, $super, $internet_super, $father, $options);
- return NULL;
+ return null;
}
@@ -483,9 +483,9 @@ function getInstantiationHTMLTableHeaders(HTMLTableGroup $group, HTMLTableSuperH
* @return null|the
*/
function getInstantiationHTMLTable(NetworkPort $netport, HTMLTableRow $row,
- HTMLTableCell $father = NULL, array $options = array()) {
+ HTMLTableCell $father = null, array $options = []) {
- DeviceNetworkCard::getHTMLTableCellsForItem($row, $this, NULL, $options);
+ DeviceNetworkCard::getHTMLTableCellsForItem($row, $this, null, $options);
$row->addCell($row->getHeaderByName('Instantiation', 'TYPE'), $this->fields['TYPE']);
$row->addCell($row->getHeaderByName('Instantiation', 'TYPEMIB'), $this->fields['TYPEMIB']);
@@ -494,7 +494,7 @@ function getInstantiationHTMLTable(NetworkPort $netport, HTMLTableRow $row,
$row->addCell($row->getHeaderByName('Instantiation', 'Generate'), $value);
parent::getInstantiationHTMLTable($netport, $row, $father, $options);
- return NULL;
+ return null;
}
@@ -513,7 +513,7 @@ function transformAccordingTypes() {
$instantiation = $networkport->getInstantiation();
$input2 = $networkport_type->fields;
unset($input2['id']);
- foreach (array('networkports_id', 'items_devicenetworkcards_id') as $field) {
+ foreach (['networkports_id', 'items_devicenetworkcards_id'] as $field) {
if (isset($this->fields[$field])) {
$input2[$field] = $this->fields[$field];
}
@@ -523,7 +523,7 @@ function transformAccordingTypes() {
['speed'], false);
}
if ($instantiation->add($input2)) {
- $this->delete(array(static::getIndexName() => $this->getID()));
+ $this->delete([static::getIndexName() => $this->getID()]);
return true;
}
}
@@ -563,18 +563,18 @@ static function displayInvalidList() {
echo " ";
echo "" .
self::getTextualType($type['TYPE']) . " ";
- $first = True;
+ $first = true;
foreach ($typemib_results as $typemib) {
if (!$first) {
echo " ";
} else {
- $first = False;
+ $first = false;
}
echo "" . self::getTextualType($typemib['TYPEMIB']) . " ";
// Normalize speeds ...
- $speeds = array();
+ $speeds = [];
foreach (explode('#', $typemib['speed']) as $speed) {
$speed = NetworkPortEthernet::transformPortSpeed($speed, false);
if (($speed !== false) and (!in_array($speed, $speeds))) {
@@ -582,7 +582,7 @@ static function displayInvalidList() {
}
}
asort($speeds);
- $printable_speeds = array();
+ $printable_speeds = [];
foreach ($speeds as $speed) {
$printable_speeds[] = NetworkPortEthernet::transformPortSpeed($speed, true);
}
@@ -612,7 +612,7 @@ static function displayInvalidList() {
*
* @return an
*/
- function getSpecificMassiveActions($checkitem = NULL) {
+ function getSpecificMassiveActions($checkitem = null) {
$actions = parent::getSpecificMassiveActions($checkitem);
@@ -643,7 +643,7 @@ static function showMassiveActionsSubForm(MassiveAction $ma) {
switch ($ma->getAction()) {
case 'plugin_ocsinventoryng_update_networkport_type':
echo " " .
- Html::submit(_x('button', 'Post'), array('name' => 'massiveaction'));
+ Html::submit(_x('button', 'Post'), ['name' => 'massiveaction']);
return true;
}
return parent::showMassiveActionsSubForm($ma);
@@ -684,4 +684,4 @@ static function processMassiveActionsForOneItemtype(MassiveAction $ma, CommonDBT
}
parent::processMassiveActionsForOneItemtype($ma, $item, $ids);
}
-}
\ No newline at end of file
+}
diff --git a/inc/networkporttype.class.php b/inc/networkporttype.class.php
index 5204629e..9155919e 100644
--- a/inc/networkporttype.class.php
+++ b/inc/networkporttype.class.php
@@ -9,7 +9,7 @@
-------------------------------------------------------------------------
LICENSE
-
+
This file is part of ocsinventoryng.
ocsinventoryng is free software; you can redistribute it and/or modify
@@ -44,8 +44,7 @@ class PluginOcsinventoryngNetworkPortType extends CommonDropdown
* @param int $nb
* @return translated
*/
- static function getTypeName($nb = 0)
- {
+ static function getTypeName($nb = 0) {
return _n('Network port type', 'Network port types', $nb, 'ocsinventoryng');
}
@@ -53,8 +52,7 @@ static function getTypeName($nb = 0)
/**
* @return bool|booleen
*/
- function canUpdateItem()
- {
+ function canUpdateItem() {
if ((isset($this->fields['OCS_TYPE'])) && ($this->fields['OCS_TYPE'] == '*')
&& (isset($this->fields['OCS_TYPEMIB'])) && ($this->fields['OCS_TYPEMIB'] == '*')
) {
@@ -67,8 +65,7 @@ function canUpdateItem()
/**
* @return bool|booleen
*/
- function canDeleteItem()
- {
+ function canDeleteItem() {
if ((isset($this->fields['OCS_TYPE'])) && ($this->fields['OCS_TYPE'] == '*')
&& (isset($this->fields['OCS_TYPEMIB'])) && ($this->fields['OCS_TYPEMIB'] == '*')
) {
@@ -82,8 +79,7 @@ function canDeleteItem()
/**
*
*/
- function post_addItem()
- {
+ function post_addItem() {
global $DB;
if (isset($this->input['transform_unknown_ports_that_match']) &&
@@ -109,19 +105,18 @@ function post_addItem()
* @param $ID
* @param array $field
*/
- function displaySpecificTypeField($ID, $field = array())
- {
+ function displaySpecificTypeField($ID, $field = []) {
switch ($field['type']) {
case 'instantiation_type' :
Dropdown::showFromArray($field['name'],
NetworkPort::getNetworkPortInstantiationsWithNames(),
- array('value' => $this->fields[$field['name']]));
+ ['value' => $this->fields[$field['name']]]);
break;
case 'type' :
Dropdown::showFromArray('type', NetworkPortEthernet::getPortTypeName(),
- array('value' => $this->fields[$field['name']]));
+ ['value' => $this->fields[$field['name']]]);
break;
case 'readonly_text' :
$value = $this->fields[$field['name']];
@@ -131,9 +126,9 @@ function displaySpecificTypeField($ID, $field = array())
case 'MIB or wildcard':
$name = $field['name'];
$value = $this->fields[$name];
- $values = array($value => $value,
- '*' => __('Any kind', 'ocsinventoryng'));
- Dropdown::showFromArray($name, $values, array('value' => $value));
+ $values = [$value => $value,
+ '*' => __('Any kind', 'ocsinventoryng')];
+ Dropdown::showFromArray($name, $values, ['value' => $value]);
break;
case 'speed' :
$standard_speeds = NetworkPortEthernet::getPortSpeed();
@@ -145,13 +140,13 @@ function displaySpecificTypeField($ID, $field = array())
$speed = true;
}
Dropdown::showFromArray('speed', $standard_speeds,
- array('value' => $this->fields['speed'],
- 'other' => $speed));
+ ['value' => $this->fields['speed'],
+ 'other' => $speed]);
break;
case 'version' :
Dropdown::showFromArray('version', WifiNetwork::getWifiCardVersion(),
- array('value' => $this->fields['version']));
+ ['value' => $this->fields['version']]);
break;
}
@@ -161,33 +156,32 @@ function displaySpecificTypeField($ID, $field = array())
/**
* @return array
*/
- function getAdditionalFields()
- {
+ function getAdditionalFields() {
- $result = array('TYPE' => array('name' => 'OCS_TYPE',
+ $result = ['TYPE' => ['name' => 'OCS_TYPE',
'label' => __('OCS TYPE', 'ocsinventoryng'),
- 'type' => 'text'),
- 'TYPEMIB' => array('name' => 'OCS_TYPEMIB',
+ 'type' => 'text'],
+ 'TYPEMIB' => ['name' => 'OCS_TYPEMIB',
'label' => __('OCS TYPE MIB', 'ocsinventoryng'),
- 'type' => 'text'),
- array('name' => 'instantiation_type',
+ 'type' => 'text'],
+ ['name' => 'instantiation_type',
'label' => __('Corresponding Network Port type', 'ocsinventoryng'),
- 'type' => 'instantiation_type'),
- array('name' => 'type',
+ 'type' => 'instantiation_type'],
+ ['name' => 'type',
'label' => __('Ethernet medium type', 'ocsinventoryng'),
- 'type' => 'type'),
- array('name' => 'speed',
+ 'type' => 'type'],
+ ['name' => 'speed',
'label' => __('Ethernet medium speed', 'ocsinventoryng'),
- 'type' => 'speed'),
- array('name' => 'version',
+ 'type' => 'speed'],
+ ['name' => 'version',
'label' => __('Wifi card Version', 'ocsinventoryng'),
- 'type' => 'version'));
+ 'type' => 'version']];
if ($this->isNewItem()) {
$this->fields['transform_unknown_ports_that_match'] = 1;
- $result[] = array('name' => 'transform_unknown_ports_that_match',
+ $result[] = ['name' => 'transform_unknown_ports_that_match',
'label' => __('Transform unknown ports that match', 'ocsinventoryng'),
- 'type' => 'bool');
+ 'type' => 'bool'];
if (isset($_GET['TYPE']) && isset($_GET['TYPEMIB'])) {
$this->fields['OCS_TYPE'] = $_GET['TYPE'];
@@ -211,8 +205,7 @@ function getAdditionalFields()
* @param array $fields
* @return string
*/
- static function getLinkToCreateFromTypeAndTypeMIB(array $fields = array())
- {
+ static function getLinkToCreateFromTypeAndTypeMIB(array $fields = []) {
$link = static::getFormURL() . '?TYPE=' . $fields['TYPE'] . '&TYPEMIB=' . $fields['TYPEMIB'];
if (!empty($fields['speed'])) {
$speed = NetworkPortEthernet::transformPortSpeed($fields['speed'], false);
@@ -222,7 +215,7 @@ static function getLinkToCreateFromTypeAndTypeMIB(array $fields = array())
}
$link .= '&rand=1'; // To reload main window
- Ajax::createIframeModalWindow('create_network', $link, array('title' => __('Create', 'ocsinventoryng')));
+ Ajax::createIframeModalWindow('create_network', $link, ['title' => __('Create', 'ocsinventoryng')]);
return "" . __('Create', 'ocsinventoryng') . "";
}
@@ -232,22 +225,21 @@ static function getLinkToCreateFromTypeAndTypeMIB(array $fields = array())
* @param array $fields
* @return bool|true
*/
- function getFromTypeAndTypeMIB(array $fields = array())
- {
+ function getFromTypeAndTypeMIB(array $fields = []) {
$TYPEMIB = (empty($fields['TYPEMIB']) ? '' : $fields['TYPEMIB']);
$TYPE = (empty($fields['TYPE']) ? '' : $fields['TYPE']);
// First, try with TYPE AND TYPE MIB
if ($this->getFromDBByQuery("WHERE `OCS_TYPE`='$TYPE' AND `OCS_TYPEMIB`='$TYPEMIB'")) {
- return True;
+ return true;
}
// Else, try with TYPE and wildcard as Type MIB
if ($this->getFromDBByQuery("WHERE `OCS_TYPE`='$TYPE' AND `OCS_TYPEMIB`='*'")) {
- return True;
+ return true;
}
// Endly, return the default element
return $this->getFromDBByQuery("WHERE `OCS_TYPE`='*' AND `OCS_TYPEMIB`='*'");
}
-}
\ No newline at end of file
+}
diff --git a/inc/networkshare.class.php b/inc/networkshare.class.php
index 15c02a8f..5bc5655d 100644
--- a/inc/networkshare.class.php
+++ b/inc/networkshare.class.php
@@ -9,7 +9,7 @@
-------------------------------------------------------------------------
LICENSE
-
+
This file is part of ocsinventoryng.
ocsinventoryng is free software; you can redistribute it and/or modify
@@ -46,7 +46,7 @@ static function getTypeName($nb = 0) {
function cleanDBonPurge() {
$self = new self();
- $self->deleteByCriteria(array('computers_id' => $this->fields['id']));
+ $self->deleteByCriteria(['computers_id' => $this->fields['id']]);
}
@@ -110,7 +110,7 @@ static function showForComputer(Computer $comp, $withtemplate = '') {
echo " ";
@@ -1344,7 +1341,7 @@ function showForm($ID, $options = array()) {
echo "";
echo "" . __('Use automatic action for clean old agents & drop from OCSNG software', 'ocsinventoryng') . " ";
echo "";
- Dropdown::showYesNo("use_cleancron", $this->fields["use_cleancron"], -1, array('on_change' => 'hide_show_cleancron(this.value);'));
+ Dropdown::showYesNo("use_cleancron", $this->fields["use_cleancron"], -1, ['on_change' => 'hide_show_cleancron(this.value);']);
echo " ";
echo Html::scriptBlock("
function hide_show_cleancron(val) {
@@ -1361,7 +1358,7 @@ function hide_show_cleancron(val) {
echo "" . __("Action") . " ";
$actions = self::getValuesActionCron();
echo "";
- Dropdown::showFromArray("action_cleancron", $actions, array('value' => $this->fields["action_cleancron"]));
+ Dropdown::showFromArray("action_cleancron", $actions, ['value' => $this->fields["action_cleancron"]]);
echo " ";
echo " ";
echo "" . __('Use automatic action restore deleted computer', 'ocsinventoryng') . " ";
echo "";
- Dropdown::showYesNo("use_restorationcron", $this->fields["use_restorationcron"], -1, array('on_change' => 'hide_show_restorecron(this.value);'));
+ Dropdown::showYesNo("use_restorationcron", $this->fields["use_restorationcron"], -1, ['on_change' => 'hide_show_restorecron(this.value);']);
echo " ";
echo Html::scriptBlock("
@@ -1386,7 +1383,7 @@ function hide_show_restorecron(val) {
echo "" . __("Number of days for the restoration of computers from the date of last inventory", "ocsinventoryng") . " ";
echo "";
- Dropdown::showNumber("delay_restorationcron", array('value' => $this->fields["delay_restorationcron"]));
+ Dropdown::showNumber("delay_restorationcron", ['value' => $this->fields["delay_restorationcron"]]);
echo " ";
echo " " . __('Manual import mode', 'ocsinventoryng') . " ";
if ($advanced) {
- Html::showSimpleForm($target, 'change_import_mode', __('Disable preview', 'ocsinventoryng'), array('id' => 'false'));
+ Html::showSimpleForm($target, 'change_import_mode', __('Disable preview', 'ocsinventoryng'), ['id' => 'false']);
} else {
- Html::showSimpleForm($target, 'change_import_mode', __('Enable preview', 'ocsinventoryng'), array('id' => 'true'));
+ Html::showSimpleForm($target, 'change_import_mode', __('Enable preview', 'ocsinventoryng'), ['id' => 'true']);
}
echo " " .
@@ -4506,7 +4501,7 @@ static function showComputersToAdd($serverId, $advanced, $check, $start, $entity
_sx('button', 'Link', 'ocsinventoryng') . "\">";
echo " ";
- } elseif (!$tolinked && $caneditimport) {
+ } else if (!$tolinked && $caneditimport) {
echo "";
}
@@ -4514,7 +4509,7 @@ static function showComputersToAdd($serverId, $advanced, $check, $start, $entity
echo " ";
if ($usecheckbox) {
- echo " ";
+ echo " ";
}
echo "" . __('Name') . " \n";
echo "" . __('Manufacturer') . " \n";
@@ -4536,21 +4531,21 @@ static function showComputersToAdd($serverId, $advanced, $check, $start, $entity
foreach ($hardware as $ID => $tab) {
//$comp = new Computer();
//$comp->fields["id"] = $tab["id"];
- $data = array();
+ $data = [];
echo " ";
if ($usecheckbox) {
- echo "";
- echo "";
+ echo "";
- echo " ";
+ echo "";
}
if ($advanced && !$tolinked) {
$location = isset($tab["locations_id"]) ? $tab["locations_id"] : 0;
- $data = $rule->processAllRules(array('ocsservers_id' => $serverId,
+ $data = $rule->processAllRules(['ocsservers_id' => $serverId,
'_source' => 'ocsinventoryng',
'locations_id' => $location
- ), array('locations_id' => $location), array('ocsid' => $tab["id"]));
+ ], ['locations_id' => $location], ['ocsid' => $tab["id"]]);
}
echo "" . $tab["name"] . " \n";
echo "" . $tab["manufacturer"] . " ";
@@ -4631,18 +4626,18 @@ static function showComputersToAdd($serverId, $advanced, $check, $start, $entity
}
echo "";
$ent = "toimport_entities[" . $tab["id"] . "]";
- Entity::dropdown(array('name' => $ent,
+ Entity::dropdown(['name' => $ent,
'value' => $data['entities_id'],
- 'comments' => 0));
+ 'comments' => 0]);
echo " \n";
echo "";
if (!isset($data['locations_id'])) {
$data['locations_id'] = 0;
}
$loc = "toimport_locations[" . $tab["id"] . "]";
- Location::dropdown(array('name' => $loc,
+ Location::dropdown(['name' => $loc,
'value' => $data['locations_id'],
- 'comments' => 0));
+ 'comments' => 0]);
echo " \n";
}
@@ -4651,13 +4646,13 @@ static function showComputersToAdd($serverId, $advanced, $check, $start, $entity
echo "";
$tab['entities_id'] = $entity;
$rulelink = new RuleImportComputerCollection();
- $params = array('entities_id' => $entity,
+ $params = ['entities_id' => $entity,
'plugin_ocsinventoryng_ocsservers_id'
- => $serverId);
- $rulelink_results = $rulelink->processAllRules(Toolbox::stripslashes_deep($tab), array(), $params);
+ => $serverId];
+ $rulelink_results = $rulelink->processAllRules(Toolbox::stripslashes_deep($tab), [], $params);
//Look for the computer using automatic link criterias as defined in OCSNG configuration
- $options = array('name' => "tolink[" . $tab["id"] . "]");
+ $options = ['name' => "tolink[" . $tab["id"] . "]"];
$show_dropdown = true;
//If the computer is not explicitly refused by a rule
if (!isset($rulelink_results['action'])
@@ -4717,7 +4712,7 @@ static function showComputersToAdd($serverId, $advanced, $check, $start, $entity
Html::closeForm();
if ($usecheckbox) {
- self::checkBox($target);
+ self::checkBox($target);
}
Html::printPager($start, $numrows, $target, $parameters);
@@ -4772,7 +4767,7 @@ static function showComputersToAdd($serverId, $advanced, $check, $start, $entity
*/
static function migrateImportDevice($import_device) {
- $new_import_device = array(self::IMPORT_TAG_078);
+ $new_import_device = [self::IMPORT_TAG_078];
if (count($import_device)) {
foreach ($import_device as $key => $val) {
$tmp = explode(self::FIELD_SEPARATOR, $val);
@@ -4800,9 +4795,9 @@ static function migrateImportDevice($import_device) {
*/
static function migrateComputerUpdates($computers_id, $computer_update) {
- $new_computer_update = array(self::IMPORT_TAG_078);
+ $new_computer_update = [self::IMPORT_TAG_078];
- $updates = array('ID' => 'id',
+ $updates = ['ID' => 'id',
'FK_entities' => 'entities_id',
'tech_num' => 'users_id_tech',
'comments' => 'comment',
@@ -4823,7 +4818,7 @@ static function migrateComputerUpdates($computers_id, $computer_update) {
'ocs_import' => 'is_dynamic',
'FK_users' => 'users_id',
'FK_groups' => 'groups_id',
- 'state' => 'states_id');
+ 'state' => 'states_id'];
if (count($computer_update)) {
foreach ($computer_update as $field) {
@@ -4958,11 +4953,11 @@ static function updateDevices($devicetype, $computers_id, $ocsComputer, $cfg_ocs
$DeviceBios = new DeviceFirmware();
$bios_id = $DeviceBios->import($bios);
if ($bios_id) {
- $CompDevice->add(array('items_id' => $computers_id,
+ $CompDevice->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'devicefirmwares_id' => $bios_id,
'is_dynamic' => 1,
- 'entities_id' => $entities_id), array(), $cfg_ocs['history_devices']);
+ 'entities_id' => $entities_id], [], $cfg_ocs['history_devices']);
}
} else {
$tmp = array_search(stripslashes($prevalue . $bios["designation"]), $import_device);
@@ -5004,19 +4999,19 @@ static function updateDevices($devicetype, $computers_id, $ocsComputer, $cfg_ocs
$DeviceMemory = new DeviceMemory();
$ram_id = $DeviceMemory->import($ram);
if ($ram_id) {
- $CompDevice->add(array('items_id' => $computers_id,
+ $CompDevice->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'entities_id' => $entities_id,
'devicememories_id' => $ram_id,
'size' => $line2["CAPACITY"],
- 'is_dynamic' => 1), array(), $cfg_ocs['history_devices']);
+ 'is_dynamic' => 1], [], $cfg_ocs['history_devices']);
}
} else {
$tmp = array_search(stripslashes($prevalue . $ram["designation"]), $import_device);
list($type, $id) = explode(self::FIELD_SEPARATOR, $tmp);
- $CompDevice->update(array('id' => $id,
- 'size' => $line2["CAPACITY"]), $cfg_ocs['history_devices']);
+ $CompDevice->update(['id' => $id,
+ 'size' => $line2["CAPACITY"]], $cfg_ocs['history_devices']);
unset($import_device[$tmp]);
}
}
@@ -5048,20 +5043,20 @@ static function updateDevices($devicetype, $computers_id, $ocsComputer, $cfg_ocs
$DeviceHardDrive = new DeviceHardDrive();
$dd_id = $DeviceHardDrive->import($dd);
if ($dd_id) {
- $CompDevice->add(array('items_id' => $computers_id,
+ $CompDevice->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'entities_id' => $entities_id,
'deviceharddrives_id' => $dd_id,
'serial' => $line2["SERIALNUMBER"],
'capacity' => $line2["DISKSIZE"],
- 'is_dynamic' => 1), array(), $cfg_ocs['history_devices']);
+ 'is_dynamic' => 1], [], $cfg_ocs['history_devices']);
}
} else {
$tmp = array_search(stripslashes($prevalue . $dd["designation"]), $import_device);
list($type, $id) = explode(self::FIELD_SEPARATOR, $tmp);
- $CompDevice->update(array('id' => $id,
+ $CompDevice->update(['id' => $id,
'capacity' => $line2["DISKSIZE"],
- 'serial' => $line2["SERIALNUMBER"]), $cfg_ocs['history_devices']);
+ 'serial' => $line2["SERIALNUMBER"]], $cfg_ocs['history_devices']);
unset($import_device[$tmp]);
}
}
@@ -5089,11 +5084,11 @@ static function updateDevices($devicetype, $computers_id, $ocsComputer, $cfg_ocs
$DeviceDrive = new DeviceDrive();
$stor_id = $DeviceDrive->import($stor);
if ($stor_id) {
- $CompDevice->add(array('items_id' => $computers_id,
+ $CompDevice->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'entities_id' => $entities_id,
'devicedrives_id' => $stor_id,
- 'is_dynamic' => 1), array(), $cfg_ocs['history_devices']);
+ 'is_dynamic' => 1], [], $cfg_ocs['history_devices']);
}
} else {
$tmp = array_search(stripslashes($prevalue . $stor["designation"]), $import_device);
@@ -5120,11 +5115,11 @@ static function updateDevices($devicetype, $computers_id, $ocsComputer, $cfg_ocs
$DevicePci = new DevicePci();
$mdm_id = $DevicePci->import($mdm);
if ($mdm_id) {
- $CompDevice->add(array('items_id' => $computers_id,
+ $CompDevice->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'entities_id' => $entities_id,
'devicepcis_id' => $mdm_id,
- 'is_dynamic' => 1), array(), $cfg_ocs['history_devices']);
+ 'is_dynamic' => 1], [], $cfg_ocs['history_devices']);
}
} else {
$tmp = array_search(stripslashes($prevalue . $mdm["designation"]), $import_device);
@@ -5155,11 +5150,11 @@ static function updateDevices($devicetype, $computers_id, $ocsComputer, $cfg_ocs
$DevicePci = new DevicePci();
$port_id = $DevicePci->import($port);
if ($port_id) {
- $CompDevice->add(array('items_id' => $computers_id,
+ $CompDevice->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'entities_id' => $entities_id,
'devicepcis_id' => $port_id,
- 'is_dynamic' => 1), array(), $cfg_ocs['history_devices']);
+ 'is_dynamic' => 1], [], $cfg_ocs['history_devices']);
}
} else {
$tmp = array_search(stripslashes($prevalue . $port["designation"]), $import_device);
@@ -5189,11 +5184,11 @@ static function updateDevices($devicetype, $computers_id, $ocsComputer, $cfg_ocs
$DevicePci = new DevicePci();
$pci_id = $DevicePci->import($pci);
if ($pci_id) {
- $CompDevice->add(array('items_id' => $computers_id,
+ $CompDevice->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'entities_id' => $entities_id,
'devicepcis_id' => $pci_id,
- 'is_dynamic' => 1), array(), $cfg_ocs['history_devices']);
+ 'is_dynamic' => 1], [], $cfg_ocs['history_devices']);
}
} else {
$id = array_search(stripslashes($prevalue . $pci["designation"]), $import_device);
@@ -5209,7 +5204,7 @@ static function updateDevices($devicetype, $computers_id, $ocsComputer, $cfg_ocs
$do_clean = true;
foreach ($ocsComputer as $line2) {
$line2 = Toolbox::clean_cross_side_scripting_deep(Toolbox::addslashes_deep($line2));
- $processor = array();
+ $processor = [];
$processor["designation"] = $line2["TYPE"];
if (!is_numeric($line2["SPEED"])) {
$line2["SPEED"] = 0;
@@ -5224,18 +5219,18 @@ static function updateDevices($devicetype, $computers_id, $ocsComputer, $cfg_ocs
$DeviceProcessor = new DeviceProcessor();
$proc_id = $DeviceProcessor->import($processor);
if ($proc_id) {
- $CompDevice->add(array('items_id' => $computers_id,
+ $CompDevice->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'entities_id' => $entities_id,
'deviceprocessors_id' => $proc_id,
'frequency' => $line2["SPEED"],
- 'is_dynamic' => 1), array(), $cfg_ocs['history_devices']);
+ 'is_dynamic' => 1], [], $cfg_ocs['history_devices']);
}
} else {
$tmp = array_search(stripslashes($prevalue . $processor["designation"]), $import_device);
list($type, $id) = explode(self::FIELD_SEPARATOR, $tmp);
- $CompDevice->update(array('id' => $id,
- 'frequency' => $line2["SPEED"]), $cfg_ocs['history_devices']);
+ $CompDevice->update(['id' => $id,
+ 'frequency' => $line2["SPEED"]], $cfg_ocs['history_devices']);
unset($import_device[$tmp]);
}
}
@@ -5263,18 +5258,18 @@ static function updateDevices($devicetype, $computers_id, $ocsComputer, $cfg_ocs
$DeviceGraphicCard = new DeviceGraphicCard();
$video_id = $DeviceGraphicCard->import($video);
if ($video_id) {
- $CompDevice->add(array('items_id' => $computers_id,
+ $CompDevice->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'entities_id' => $entities_id,
'devicegraphiccards_id' => $video_id,
'memory' => $line2["MEMORY"],
- 'is_dynamic' => 1), array(), $cfg_ocs['history_devices']);
+ 'is_dynamic' => 1], [], $cfg_ocs['history_devices']);
}
} else {
$tmp = array_search(stripslashes($prevalue . $video["designation"]), $import_device);
list($type, $id) = explode(self::FIELD_SEPARATOR, $tmp);
- $CompDevice->update(array('id' => $id,
- 'memory' => $line2["MEMORY"]), $cfg_ocs['history_devices']);
+ $CompDevice->update(['id' => $id,
+ 'memory' => $line2["MEMORY"]], $cfg_ocs['history_devices']);
unset($import_device[$tmp]);
}
}
@@ -5300,11 +5295,11 @@ static function updateDevices($devicetype, $computers_id, $ocsComputer, $cfg_ocs
$DeviceSoundCard = new DeviceSoundCard();
$snd_id = $DeviceSoundCard->import($snd);
if ($snd_id) {
- $CompDevice->add(array('items_id' => $computers_id,
+ $CompDevice->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'entities_id' => $entities_id,
'devicesoundcards_id' => $snd_id,
- 'is_dynamic' => 1), array(), $cfg_ocs['history_devices']);
+ 'is_dynamic' => 1], [], $cfg_ocs['history_devices']);
}
} else {
$id = array_search(stripslashes($prevalue . $snd["designation"]), $import_device);
@@ -5328,12 +5323,12 @@ static function updateDevices($devicetype, $computers_id, $ocsComputer, $cfg_ocs
$devicemotherboards_id = $DeviceMB->import($mb);
if ($devicemotherboards_id) {
$serial = $ocsComputer["MSN"];
- $CompDevice->add(array('items_id' => $computers_id,
+ $CompDevice->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'devicemotherboards_id' => $devicemotherboards_id,
'is_dynamic' => 1,
'serial' => $serial,
- 'entities_id' => $entities_id), array(), $cfg_ocs['history_devices']);
+ 'entities_id' => $entities_id], [], $cfg_ocs['history_devices']);
}
} else {
$tmp = array_search(stripslashes($prevalue . $mb["designation"]), $import_device);
@@ -5363,11 +5358,11 @@ static function updateDevices($devicetype, $computers_id, $ocsComputer, $cfg_ocs
$DeviceControl = new DeviceControl();
$ctrl_id = $DeviceControl->import($ctrl);
if ($ctrl_id) {
- $CompDevice->add(array('items_id' => $computers_id,
+ $CompDevice->add(['items_id' => $computers_id,
'itemtype' => 'Computer',
'entities_id' => $entities_id,
'devicecontrols_id' => $ctrl_id,
- 'is_dynamic' => 1), array(), $cfg_ocs['history_devices']);
+ 'is_dynamic' => 1], [], $cfg_ocs['history_devices']);
}
} else {
$id = array_search(stripslashes($prevalue . $ctrl["designation"]), $import_device);
@@ -5384,8 +5379,8 @@ static function updateDevices($devicetype, $computers_id, $ocsComputer, $cfg_ocs
if (!(strpos($key, $devicetype . '$$') === false)) {
list($type, $id) = explode(self::FIELD_SEPARATOR, $key);
$CompDevice = new $devicetype();
- $CompDevice->delete(array('id' => $id,
- '_no_history' => !$cfg_ocs['history_devices']), true, $cfg_ocs['history_devices']);
+ $CompDevice->delete(['id' => $id,
+ '_no_history' => !$cfg_ocs['history_devices']], true, $cfg_ocs['history_devices']);
}
}
}
@@ -5395,8 +5390,8 @@ static function updateDevices($devicetype, $computers_id, $ocsComputer, $cfg_ocs
foreach ($import_ip as $key => $val) {
if ($key > 0) {
$netport = new NetworkPort();
- $netport->delete(array('id' => $key,
- '_no_history' => !$cfg_ocs['history_network']), 0, $cfg_ocs['history_network']);
+ $netport->delete(['id' => $key,
+ '_no_history' => !$cfg_ocs['history_network']], 0, $cfg_ocs['history_network']);
}
}
}
@@ -5457,18 +5452,17 @@ static function getComputerLinkToOcsConsole($plugin_ocsinventoryng_ocsservers_id
static function getGeneralIpAddress($plugin_ocsinventoryng_ocsservers_id, $computers_id) {
self::checkOCSconnection($plugin_ocsinventoryng_ocsservers_id);
$ocsClient = self::getDBocs($plugin_ocsinventoryng_ocsservers_id);
- $options = array(
- 'DISPLAY' => array(
+ $options = [
+ 'DISPLAY' => [
'CHECKSUM' => PluginOcsinventoryngOcsClient::CHECKSUM_HARDWARE
- )
- );
+ ]
+ ];
$computer = $ocsClient->getComputer($computers_id, $options);
$ipaddress = $computer["HARDWARE"]["IPADDR"];
if ($ipaddress) {
return $ipaddress;
}
-
return '';
}
@@ -5562,7 +5556,7 @@ static function getFormServerAction($ID, $templateid) {
*/
static function getColumnListFromAccountInfoTable($ID, $table) {
- $listColumn = array("0" => __('No import'));
+ $listColumn = ["0" => __('No import')];
if ($ID != -1) {
if (self::checkOCSconnection($ID)) {
$ocsClient = self::getDBocs($ID);
@@ -5676,9 +5670,9 @@ static function resetDevices($glpi_computers_id, $itemtype, $cfg_ocs) {
$linktype = 'Item_' . $itemtype;
$item = new $linktype();
- $item->deleteByCriteria(array('items_id' => $glpi_computers_id,
+ $item->deleteByCriteria(['items_id' => $glpi_computers_id,
'itemtype' => 'Computer',
- 'is_dynamic' => 1), 1, $cfg_ocs['history_devices']);
+ 'is_dynamic' => 1], 1, $cfg_ocs['history_devices']);
}
@@ -5697,10 +5691,10 @@ static function resetOS($glpi_computers_id, $itemtype, $cfg_ocs) {
$linktype = 'Item_' . $itemtype;
$item = new $linktype();
- $item->deleteByCriteria(array('items_id' => $glpi_computers_id,
+ $item->deleteByCriteria(['items_id' => $glpi_computers_id,
'itemtype' => 'Computer',
'is_dynamic' => 1
- ), 1, $cfg_ocs['history_hardware']
+ ], 1, $cfg_ocs['history_hardware']
);
}
@@ -5749,7 +5743,7 @@ static function resetDropdown($glpi_computers_id, $field, $table) {
static function resetRegistry($glpi_computers_id) {
$registry = new PluginOcsinventoryngRegistryKey();
- $registry->deleteByCriteria(array('computers_id' => $glpi_computers_id), 1);
+ $registry->deleteByCriteria(['computers_id' => $glpi_computers_id], 1);
}
/**
@@ -5764,8 +5758,8 @@ static function resetRegistry($glpi_computers_id) {
static function resetAntivirus($glpi_computers_id, $cfg_ocs) {
$av = new ComputerAntivirus();
- $av->deleteByCriteria(array('computers_id' => $glpi_computers_id,
- 'is_dynamic' => 1), 1, 1);
+ $av->deleteByCriteria(['computers_id' => $glpi_computers_id,
+ 'is_dynamic' => 1], 1, 1);
}
@@ -5781,7 +5775,7 @@ static function resetAntivirus($glpi_computers_id, $cfg_ocs) {
static function resetWinupdatestate($glpi_computers_id, $cfg_ocs) {
$win = new PluginOcsinventoryngWinupdate();
- $win->deleteByCriteria(array('computers_id' => $glpi_computers_id), 1);
+ $win->deleteByCriteria(['computers_id' => $glpi_computers_id], 1);
}
@@ -5798,7 +5792,7 @@ static function resetWinupdatestate($glpi_computers_id, $cfg_ocs) {
static function resetOSInstall($glpi_computers_id, $cfg_ocs) {
$os = new PluginOcsinventoryngOsinstall();
- $os->deleteByCriteria(array('computers_id' => $glpi_computers_id), 1);
+ $os->deleteByCriteria(['computers_id' => $glpi_computers_id], 1);
}
@@ -5814,7 +5808,7 @@ static function resetOSInstall($glpi_computers_id, $cfg_ocs) {
static function resetProxysetting($glpi_computers_id, $cfg_ocs) {
$proxy = new PluginOcsinventoryngProxysetting();
- $proxy->deleteByCriteria(array('computers_id' => $glpi_computers_id), 1);
+ $proxy->deleteByCriteria(['computers_id' => $glpi_computers_id], 1);
}
@@ -5830,7 +5824,7 @@ static function resetProxysetting($glpi_computers_id, $cfg_ocs) {
static function resetNetworkshare($glpi_computers_id, $cfg_ocs) {
$share = new PluginOcsinventoryngNetworkshare();
- $share->deleteByCriteria(array('computers_id' => $glpi_computers_id), 1);
+ $share->deleteByCriteria(['computers_id' => $glpi_computers_id], 1);
}
@@ -5846,7 +5840,7 @@ static function resetNetworkshare($glpi_computers_id, $cfg_ocs) {
static function resetService($glpi_computers_id, $cfg_ocs) {
$service = new PluginOcsinventoryngService();
- $service->deleteByCriteria(array('computers_id' => $glpi_computers_id), 1);
+ $service->deleteByCriteria(['computers_id' => $glpi_computers_id], 1);
}
@@ -5862,7 +5856,7 @@ static function resetService($glpi_computers_id, $cfg_ocs) {
static function resetRunningProcess($glpi_computers_id, $cfg_ocs) {
$runningprocess = new PluginOcsinventoryngRunningprocess();
- $runningprocess->deleteByCriteria(array('computers_id' => $glpi_computers_id), 1);
+ $runningprocess->deleteByCriteria(['computers_id' => $glpi_computers_id], 1);
}
@@ -5878,7 +5872,7 @@ static function resetRunningProcess($glpi_computers_id, $cfg_ocs) {
static function resetWinuser($glpi_computers_id, $cfg_ocs) {
$wuser = new PluginOcsinventoryngWinuser();
- $wuser->deleteByCriteria(array('computers_id' => $glpi_computers_id), 1);
+ $wuser->deleteByCriteria(['computers_id' => $glpi_computers_id], 1);
}
@@ -5894,7 +5888,7 @@ static function resetWinuser($glpi_computers_id, $cfg_ocs) {
static function resetTeamviewer($glpi_computers_id, $cfg_ocs) {
$team = new PluginOcsinventoryngTeamviewer();
- $team->deleteByCriteria(array('computers_id' => $glpi_computers_id), 1);
+ $team->deleteByCriteria(['computers_id' => $glpi_computers_id], 1);
}
@@ -5931,14 +5925,14 @@ static function resetOfficePack($glpi_computers_id) {
if ($DB->result($result3, 0, 0) == 1) {
$soft = new Software();
- $soft->delete(array('id' => $license->fields['softwares_id']), 1);
+ $soft->delete(['id' => $license->fields['softwares_id']], 1);
}
- $license->delete(array("id" => $data['softwarelicenses_id']));
+ $license->delete(["id" => $data['softwarelicenses_id']]);
}
}
$computer_softwarelicenses = new Computer_SoftwareVersion();
- $computer_softwarelicenses->deleteByCriteria(array('computers_id' => $glpi_computers_id));
+ $computer_softwarelicenses->deleteByCriteria(['computers_id' => $glpi_computers_id]);
}
}
@@ -5965,7 +5959,7 @@ static function resetPrinters($glpi_computers_id, $cfg_ocs) {
$conn = new Computer_Item();
while ($data = $DB->fetch_assoc($result)) {
- $conn->delete(array('id' => $data['id'], '_no_history' => !$cfg_ocs['history_printer']), true, $cfg_ocs['history_printer']);
+ $conn->delete(['id' => $data['id'], '_no_history' => !$cfg_ocs['history_printer']], true, $cfg_ocs['history_printer']);
$query2 = "SELECT COUNT(*)
FROM `glpi_computers_items`
@@ -5975,7 +5969,7 @@ static function resetPrinters($glpi_computers_id, $cfg_ocs) {
$printer = new Printer();
if ($DB->result($result2, 0, 0) == 1) {
- $printer->delete(array('id' => $data['items_id'], '_no_history' => !$cfg_ocs['history_printer']), true, $cfg_ocs['history_printer']);
+ $printer->delete(['id' => $data['items_id'], '_no_history' => !$cfg_ocs['history_printer']], true, $cfg_ocs['history_printer']);
}
}
}
@@ -6006,7 +6000,7 @@ static function resetMonitors($glpi_computers_id, $cfg_ocs) {
while ($data = $DB->fetch_assoc($result)) {
- $conn->delete(array('id' => $data['id'], '_no_history' => !$cfg_ocs['history_monitor']), true, $cfg_ocs['history_monitor']);
+ $conn->delete(['id' => $data['id'], '_no_history' => !$cfg_ocs['history_monitor']], true, $cfg_ocs['history_monitor']);
$query2 = "SELECT COUNT(*)
FROM `glpi_computers_items`
@@ -6015,7 +6009,7 @@ static function resetMonitors($glpi_computers_id, $cfg_ocs) {
$result2 = $DB->query($query2);
if ($DB->result($result2, 0, 0) == 1) {
- $mon->delete(array('id' => $data['items_id'], '_no_history' => !$cfg_ocs['history_monitor']), true, $cfg_ocs['history_monitor']);
+ $mon->delete(['id' => $data['items_id'], '_no_history' => !$cfg_ocs['history_monitor']], true, $cfg_ocs['history_monitor']);
}
}
}
@@ -6044,7 +6038,7 @@ static function resetPeripherals($glpi_computers_id, $cfg_ocs) {
if ($DB->numrows($result) > 0) {
$conn = new Computer_Item();
while ($data = $DB->fetch_assoc($result)) {
- $conn->delete(array('id' => $data['id'], '_no_history' => !$cfg_ocs['history_peripheral']), true, $cfg_ocs['history_peripheral']);
+ $conn->delete(['id' => $data['id'], '_no_history' => !$cfg_ocs['history_peripheral']], true, $cfg_ocs['history_peripheral']);
$query2 = "SELECT COUNT(*)
FROM `glpi_computers_items`
@@ -6053,7 +6047,7 @@ static function resetPeripherals($glpi_computers_id, $cfg_ocs) {
$result2 = $DB->query($query2);
if ($DB->result($result2, 0, 0) == 1) {
- $per->delete(array('id' => $data['items_id'], '_no_history' => !$cfg_ocs['history_peripheral']), true, $cfg_ocs['history_peripheral']);
+ $per->delete(['id' => $data['items_id'], '_no_history' => !$cfg_ocs['history_peripheral']], true, $cfg_ocs['history_peripheral']);
}
}
}
@@ -6094,16 +6088,15 @@ static function resetSoftwares($glpi_computers_id, $cfg_ocs) {
if ($DB->result($result3, 0, 0) == 1) {
$soft = new Software();
- $soft->delete(array('id' => $vers->fields['softwares_id'], '_no_history' => !$cfg_ocs['history_software']), true, $cfg_ocs['history_software']);
+ $soft->delete(['id' => $vers->fields['softwares_id'], '_no_history' => !$cfg_ocs['history_software']], true, $cfg_ocs['history_software']);
}
- $vers->delete(array("id" => $data['softwareversions_id'], '_no_history' => !$cfg_ocs['history_software']), true, $cfg_ocs['history_software']);
+ $vers->delete(["id" => $data['softwareversions_id'], '_no_history' => !$cfg_ocs['history_software']], true, $cfg_ocs['history_software']);
}
}
-
$csv = new Computer_SoftwareVersion();
- $csv->deleteByCriteria(array('computers_id' => $glpi_computers_id,
- 'is_dynamic' => 1), 1, $cfg_ocs['history_software']);
+ $csv->deleteByCriteria(['computers_id' => $glpi_computers_id,
+ 'is_dynamic' => 1], 1, $cfg_ocs['history_software']);
}
}
@@ -6120,8 +6113,8 @@ static function resetSoftwares($glpi_computers_id, $cfg_ocs) {
static function resetDisks($glpi_computers_id, $cfg_ocs) {
$dd = new ComputerDisk();
- $dd->deleteByCriteria(array('computers_id' => $glpi_computers_id,
- 'is_dynamic' => 1), 1, $cfg_ocs['history_drives']);
+ $dd->deleteByCriteria(['computers_id' => $glpi_computers_id,
+ 'is_dynamic' => 1], 1, $cfg_ocs['history_drives']);
}
@@ -6193,7 +6186,7 @@ static function importVersion($cfg_ocs, $software, $version, $comments) {
$input["softwares_id"] = $software;
$input["name"] = $version;
$input["comment"] = $comments;
- $isNewVers = $vers->add($input, array(), $cfg_ocs['history_software']);
+ $isNewVers = $vers->add($input, [], $cfg_ocs['history_software']);
}
return ($isNewVers);
@@ -6214,7 +6207,7 @@ static function importVersion($cfg_ocs, $software, $version, $comments) {
*/
static function updateVirtualMachines($computers_id, $ocsComputer, $ocsservers_id, $cfg_ocs) {
global $DB;
- $already_processed = array();
+ $already_processed = [];
$virtualmachine = new ComputerVirtualMachine();
$ocsVirtualmachines = $ocsComputer;
@@ -6222,7 +6215,7 @@ static function updateVirtualMachines($computers_id, $ocsComputer, $ocsservers_i
if (count($ocsVirtualmachines) > 0) {
foreach ($ocsVirtualmachines as $ocsVirtualmachine) {
$ocsVirtualmachine = Toolbox::clean_cross_side_scripting_deep(Toolbox::addslashes_deep($ocsVirtualmachine));
- $vm = array();
+ $vm = [];
$vm['name'] = $ocsVirtualmachine['NAME'];
$vm['vcpu'] = $ocsVirtualmachine['VCPU'];
$vm['ram'] = $ocsVirtualmachine['MEMORY'];
@@ -6253,7 +6246,7 @@ static function updateVirtualMachines($computers_id, $ocsComputer, $ocsservers_i
}
if (!$id) {
$virtualmachine->reset();
- $id_vm = $virtualmachine->add($vm, array(), $cfg_ocs['history_vm']);
+ $id_vm = $virtualmachine->add($vm, [], $cfg_ocs['history_vm']);
if ($id_vm) {
$already_processed[] = $id_vm;
}
@@ -6277,8 +6270,8 @@ static function updateVirtualMachines($computers_id, $ocsComputer, $ocsservers_i
}
foreach ($DB->request($query) as $data) {
//Delete all connexions
- $virtualmachine->delete(array('id' => $data['id'],
- '_ocsservers_id' => $ocsservers_id, '_no_history' => !$cfg_ocs['history_vm']), true, $cfg_ocs['history_vm']);
+ $virtualmachine->delete(['id' => $data['id'],
+ '_ocsservers_id' => $ocsservers_id, '_no_history' => !$cfg_ocs['history_vm']], true, $cfg_ocs['history_vm']);
}
}
@@ -6326,8 +6319,8 @@ static function updateOfficePack($computers_id, $softwares_id, $softwares_name,
AND `softwareversions_id_use` = " . $softwareversions_id)
) {
- $software_licenses->update(array('id' => $software_licenses->getID(),
- 'comment' => $ocsOfficePack['NOTE']));
+ $software_licenses->update(['id' => $software_licenses->getID(),
+ 'comment' => $ocsOfficePack['NOTE']]);
if (!$computer_softwarelicenses->getFromDBByQuery("WHERE `computers_id` = " . $computers_id . "
AND `softwarelicenses_id` = " . $software_licenses->getID())
) {
@@ -6337,8 +6330,8 @@ static function updateOfficePack($computers_id, $softwares_id, $softwares_name,
$computer_soft_l['is_dynamic'] = -1;
$computer_softwarelicenses->add($computer_soft_l);
//Update for validity
- $software_licenses->update(array('id' => $software_licenses->getID(),
- 'is_valid' => 1));
+ $software_licenses->update(['id' => $software_licenses->getID(),
+ 'is_valid' => 1]);
}
}
}
@@ -6356,7 +6349,7 @@ static function updateOfficePack($computers_id, $softwares_id, $softwares_name,
$id_software_licenses = $software_licenses->getID();
} else {
$software_licenses->fields['softwares_id'] = $softwares_id;
- $id_software_licenses = $software_licenses->add($soft_l, array(), $cfg_ocs['history_software']);
+ $id_software_licenses = $software_licenses->add($soft_l, [], $cfg_ocs['history_software']);
}
if ($id_software_licenses) {
@@ -6370,8 +6363,8 @@ static function updateOfficePack($computers_id, $softwares_id, $softwares_name,
$computer_softwarelicenses->add($computer_soft_l);
}
//Update for validity
- $software_licenses->update(array('id' => $id_software_licenses,
- 'is_valid' => 1));
+ $software_licenses->update(['id' => $id_software_licenses,
+ 'is_valid' => 1]);
}
}
}
@@ -6397,7 +6390,7 @@ static function updateOfficePack($computers_id, $softwares_id, $softwares_name,
static function updateDisk($computers_id, $ocsComputer, $ocsservers_id, $cfg_ocs) {
global $DB;
- $already_processed = array();
+ $already_processed = [];
$logical_drives = $ocsComputer;
$d = new ComputerDisk();
@@ -6407,21 +6400,21 @@ static function updateDisk($computers_id, $ocsComputer, $ocsservers_id, $cfg_ocs
// Only not empty disk
if ($logical_drive['TOTAL'] > 0) {
- $disk = array();
+ $disk = [];
$disk['computers_id'] = $computers_id;
$disk['is_dynamic'] = 1;
// TYPE : vxfs / ufs : VOLUMN = mount / FILESYSTEM = device
- if (in_array($logical_drive['TYPE'], array("vxfs", "ufs"))) {
+ if (in_array($logical_drive['TYPE'], ["vxfs", "ufs"])) {
$disk['name'] = $logical_drive['VOLUMN'];
$disk['mountpoint'] = $logical_drive['VOLUMN'];
$disk['device'] = $logical_drive['FILESYSTEM'];
$disk['filesystems_id'] = Dropdown::importExternal('Filesystem', $logical_drive["TYPE"]);
- } else if (in_array($logical_drive['FILESYSTEM'], array('ext2', 'ext3', 'ext4', 'ffs',
+ } else if (in_array($logical_drive['FILESYSTEM'], ['ext2', 'ext3', 'ext4', 'ffs',
'fuseblk', 'fusefs', 'hfs', 'jfs',
'jfs2', 'Journaled HFS+', 'nfs',
'smbfs', 'reiserfs', 'vmfs', 'VxFS',
- 'ufs', 'xfs', 'zfs'))) {
+ 'ufs', 'xfs', 'zfs'])) {
// Try to detect mount point : OCS database is dirty
$disk['mountpoint'] = $logical_drive['VOLUMN'];
$disk['device'] = $logical_drive['TYPE'];
@@ -6438,7 +6431,7 @@ static function updateDisk($computers_id, $ocsComputer, $ocsservers_id, $cfg_ocs
$disk['name'] = $disk['mountpoint'];
}
$disk['filesystems_id'] = Dropdown::importExternal('Filesystem', $logical_drive["FILESYSTEM"]);
- } else if (in_array($logical_drive['FILESYSTEM'], array('FAT', 'FAT32', 'NTFS'))) {
+ } else if (in_array($logical_drive['FILESYSTEM'], ['FAT', 'FAT32', 'NTFS'])) {
if (!empty($logical_drive['VOLUMN'])) {
$disk['name'] = $logical_drive['VOLUMN'];
} else {
@@ -6468,7 +6461,7 @@ static function updateDisk($computers_id, $ocsComputer, $ocsservers_id, $cfg_ocs
if (!$id) {
$d->reset();
$disk['is_dynamic'] = 1;
- $id_disk = $d->add($disk, array(), $cfg_ocs['history_drives']);
+ $id_disk = $d->add($disk, [], $cfg_ocs['history_drives']);
$already_processed[] = $id_disk;
} else {
// Only update if needed
@@ -6504,8 +6497,8 @@ static function updateDisk($computers_id, $ocsComputer, $ocsservers_id, $cfg_ocs
}
foreach ($DB->request($query) as $data) {
//Delete all connexions
- $d->delete(array('id' => $data['id'],
- '_ocsservers_id' => $ocsservers_id, '_no_history' => !$cfg_ocs['history_drives']), true, $cfg_ocs['history_drives']);
+ $d->delete(['id' => $data['id'],
+ '_ocsservers_id' => $ocsservers_id, '_no_history' => !$cfg_ocs['history_drives']], true, $cfg_ocs['history_drives']);
}
}
@@ -6533,11 +6526,11 @@ static function installSoftwareVersion($computers_id, $softwareversions_id, $ins
}
$tmp = new Computer_SoftwareVersion();
- return $tmp->add(array('computers_id' => $computers_id,
+ return $tmp->add(['computers_id' => $computers_id,
'softwareversions_id' => $softwareversions_id,
'date_install' => $installdate,
'is_dynamic' => 1,
- 'is_deleted' => 0), array(), $dohistory);
+ 'is_deleted' => 0], [], $dohistory);
}
return 0;
}
@@ -6566,10 +6559,9 @@ static function updateSoftwareVersion($computers_id, $softwareversions_id, $inst
$data = $DB->fetch_array($result);
$tmp = new Computer_SoftwareVersion();
-
- $input = array('id' => $data['id'],
+ $input = ['id' => $data['id'],
'_no_history' => !$dohistory,
- 'date_install' => $installdate);
+ 'date_install' => $installdate];
return $tmp->update($input);
}
@@ -6596,9 +6588,9 @@ static function updateSoftware($cfg_ocs, $computers_id, $ocsComputer, $entity, $
$is_utf8 = $cfg_ocs["ocs_db_utf8"];
$computer_softwareversion = new Computer_SoftwareVersion();
- $softwares = array();
+ $softwares = [];
//---- Get all the softwares for this machine from OCS -----//
- $softwares = (isset($ocsComputer["SOFTWARES"]) ? $ocsComputer["SOFTWARES"] : array());
+ $softwares = (isset($ocsComputer["SOFTWARES"]) ? $ocsComputer["SOFTWARES"] : []);
$soft = new Software();
@@ -6613,8 +6605,7 @@ static function updateSoftware($cfg_ocs, $computers_id, $ocsComputer, $entity, $
ON `glpi_softwares`.`id`= `glpi_softwareversions`.`softwares_id`
WHERE `glpi_computers_softwareversions`.`computers_id`='$computers_id'
AND `is_dynamic`";
- $imported = array();
-
+ $imported = [];
foreach ($DB->request($query) as $data) {
$imported[$data['id']] = strtolower($data['sname'] . self::FIELD_SEPARATOR . $data['vname']);
@@ -6635,7 +6626,7 @@ static function updateSoftware($cfg_ocs, $computers_id, $ocsComputer, $entity, $
ON `glpi_softwarelicenses`.`softwareversions_id_use` = `glpi_softwareversions`.`id`
WHERE `glpi_computers_softwarelicenses`.`computers_id`='$computers_id'
AND `is_dynamic`";
- $imported_licences = array();
+ $imported_licences = [];
foreach ($DB->request($query) as $data) {
$imported_licences[$data['id']] = strtolower($data['vid']);
@@ -6648,7 +6639,7 @@ static function updateSoftware($cfg_ocs, $computers_id, $ocsComputer, $entity, $
//As we cannot be sure that data coming from OCS are in utf8, let's try to encode them
//if possible
- foreach (array('NAME', 'PUBLISHER', 'VERSION') as $field) {
+ foreach (['NAME', 'PUBLISHER', 'VERSION'] as $field) {
if (isset($software[$field])) {
$software[$field] = self::encodeOcsDataInUtf8($is_utf8, $software[$field]);
}
@@ -6671,15 +6662,15 @@ static function updateSoftware($cfg_ocs, $computers_id, $ocsComputer, $entity, $
$modified_name = $name;
$modified_version = $version;
$version_comments = $software['COMMENTS'];
- $is_helpdesk_visible = NULL;
+ $is_helpdesk_visible = null;
if (!$cfg_ocs["use_soft_dict"]) {
//Software dictionnary
- $params = array("name" => $name,
+ $params = ["name" => $name,
"manufacturer" => $manufacturer,
"old_version" => $version,
- "entities_id" => $entity);
+ "entities_id" => $entity];
$rulecollection = new RuleDictionnarySoftwareCollection();
- $res_rule = $rulecollection->processAllRules(Toolbox::stripslashes_deep($params), array(), Toolbox::stripslashes_deep(array('version' => $version)));
+ $res_rule = $rulecollection->processAllRules(Toolbox::stripslashes_deep($params), [], Toolbox::stripslashes_deep(['version' => $version]));
if (isset($res_rule["name"])
&& $res_rule["name"]
@@ -6763,7 +6754,7 @@ static function updateSoftware($cfg_ocs, $computers_id, $ocsComputer, $entity, $
}
foreach ($imported as $id => $unused) {
- $computer_softwareversion->delete(array('id' => $id, '_no_history' => !$cfg_ocs['history_software']), true, $cfg_ocs['history_software']);
+ $computer_softwareversion->delete(['id' => $id, '_no_history' => !$cfg_ocs['history_software']], true, $cfg_ocs['history_software']);
// delete cause a getFromDB, so fields contains values
$verid = $computer_softwareversion->getField('softwareversions_id');
@@ -6779,14 +6770,14 @@ static function updateSoftware($cfg_ocs, $computers_id, $ocsComputer, $entity, $
// 1 is the current to be removed
$soft->putInTrash($vers->fields['softwares_id'], __('Software deleted by OCSNG synchronization', 'ocsinventoryng'));
}
- $vers->delete(array("id" => $verid, '_no_history' => !$cfg_ocs['history_software']), true, $cfg_ocs['history_software']);
+ $vers->delete(["id" => $verid, '_no_history' => !$cfg_ocs['history_software']], true, $cfg_ocs['history_software']);
}
}
if ($officepack) {
$computer_softwarelicenses = new Computer_SoftwareLicense();
foreach ($imported_licences as $id => $unused) {
- $computer_softwarelicenses->delete(array('id' => $id), true, $cfg_ocs['history_software']);
+ $computer_softwarelicenses->delete(['id' => $id], true, $cfg_ocs['history_software']);
// delete cause a getFromDB, so fields contains values
$verid = $computer_softwarelicenses->getField('softwareversions_id');
@@ -6796,9 +6787,9 @@ static function updateSoftware($cfg_ocs, $computers_id, $ocsComputer, $entity, $
if ($vers->getFromDB($verid)
&& countElementsInTable('glpi_softwarelicenses', "softwares_id = '" . $vers->fields['softwares_id'] . "'") == 0) {
$soft = new Software();
- $soft->delete(array('id' => $vers->fields['softwares_id']), 1);
+ $soft->delete(['id' => $vers->fields['softwares_id']], 1);
}
- $vers->delete(array("id" => $verid));
+ $vers->delete(["id" => $verid]);
}
}
}
@@ -6824,13 +6815,13 @@ static function updateRegistry($computers_id, $ocsComputer) {
//update data
foreach ($ocsComputer as $registry) {
$registry = Toolbox::clean_cross_side_scripting_deep(Toolbox::addslashes_deep($registry));
- $input = array();
+ $input = [];
$input["computers_id"] = $computers_id;
$input["hive"] = $registry["regtree"];
$input["value"] = $registry["regvalue"];
$input["path"] = $registry["regkey"];
$input["ocs_name"] = $registry["name"];
- $reg->add($input, array('disable_unicity_check' => true));
+ $reg->add($input, ['disable_unicity_check' => true]);
$reg->fields = [];
}
@@ -6855,7 +6846,7 @@ static function updateAntivirus($computers_id, $ocsComputer, $cfg_ocs) {
foreach ($ocsComputer as $anti) {
$antivirus = Toolbox::clean_cross_side_scripting_deep(Toolbox::addslashes_deep($anti));
- $input = array();
+ $input = [];
if ($antivirus["category"] == "AntiVirus") {
$input["computers_id"] = $computers_id;
@@ -6865,7 +6856,7 @@ static function updateAntivirus($computers_id, $ocsComputer, $cfg_ocs) {
$input["is_active"] = $antivirus["enabled"];
$input["is_uptodate"] = $antivirus["uptodate"];
$input["is_dynamic"] = 1;
- $av->add($input, array('disable_unicity_check' => true), 0);
+ $av->add($input, ['disable_unicity_check' => true], 0);
$av->fields = [];
}
}
@@ -6892,7 +6883,7 @@ static function updateWinupdatestate($computers_id, $ocsComputer, $cfg_ocs) {
foreach ($ocsComputer as $wup) {
$wupdate = Toolbox::clean_cross_side_scripting_deep(Toolbox::addslashes_deep($wup));
- $input = array();
+ $input = [];
$input["computers_id"] = $computers_id;
$computer = new Computer;
@@ -6905,7 +6896,7 @@ static function updateWinupdatestate($computers_id, $ocsComputer, $cfg_ocs) {
$input["detectsuccesstime"] = $wupdate["DETECTSUCCESSTIME"];
$input["downloadsuccesstime"] = $wupdate["DOWNLOADSUCCESSTIME"];
- $CompWupdate->add($input, array('disable_unicity_check' => true), 0);
+ $CompWupdate->add($input, ['disable_unicity_check' => true], 0);
$CompWupdate->fields = [];
}
@@ -6930,7 +6921,7 @@ static function updateOSInstall($computers_id, $ocsComputer, $cfg_ocs) {
foreach ($ocsComputer as $osi) {
$os = Toolbox::clean_cross_side_scripting_deep(Toolbox::addslashes_deep($osi));
- $input = array();
+ $input = [];
$input["computers_id"] = $computers_id;
$computer = new Computer;
@@ -6945,7 +6936,7 @@ static function updateOSInstall($computers_id, $ocsComputer, $cfg_ocs) {
$input["oslanguage"] = $os["OSLANGUAGE"];
$input["curtimezone"] = $os["CURTIMEZONE"];
$input["locale"] = $os["LOCALE"];
- $osinstall->add($input, array('disable_unicity_check' => true), 0);
+ $osinstall->add($input, ['disable_unicity_check' => true], 0);
$osinstall->fields = [];
}
@@ -6972,7 +6963,7 @@ static function updateProxysetting($computers_id, $ocsComputer, $cfg_ocs) {
foreach ($ocsComputer as $prox) {
$proxy = Toolbox::clean_cross_side_scripting_deep(Toolbox::addslashes_deep($prox));
- $input = array();
+ $input = [];
$input["computers_id"] = $computers_id;
$computer = new Computer;
@@ -6988,7 +6979,7 @@ static function updateProxysetting($computers_id, $ocsComputer, $cfg_ocs) {
if (isset($proxy["OVERRIDE"])) {
$input["override"] = $proxy["OVERRIDE"];
}
- $ProxySetting->add($input, array('disable_unicity_check' => true), 0);
+ $ProxySetting->add($input, ['disable_unicity_check' => true], 0);
$ProxySetting->fields = [];
}
@@ -7016,7 +7007,7 @@ static function updateNetworkshare($computers_id, $ocsComputer, $cfg_ocs) {
foreach ($ocsComputer as $share) {
$sha = Toolbox::clean_cross_side_scripting_deep(Toolbox::addslashes_deep($share));
- $input = array();
+ $input = [];
$input["computers_id"] = $computers_id;
$computer = new Computer;
@@ -7028,7 +7019,7 @@ static function updateNetworkshare($computers_id, $ocsComputer, $cfg_ocs) {
$input["size"] = $sha["SIZE"];
$input["freespace"] = $sha["FREESPACE"];
$input["quota"] = $sha["QUOTA"];
- $Shares->add($input, array('disable_unicity_check' => true), 0);
+ $Shares->add($input, ['disable_unicity_check' => true], 0);
$Shares->fields = [];
}
@@ -7058,7 +7049,7 @@ static function updateRunningprocess($computers_id, $ocsComputer, $cfg_ocs) {
$input = array_change_key_case($process, CASE_LOWER);
$input["computers_id"] = $computers_id;
- $Runningprocess->add($input, array('disable_unicity_check' => true), 0);
+ $Runningprocess->add($input, ['disable_unicity_check' => true], 0);
$Runningprocess->fields = [];
}
@@ -7087,7 +7078,7 @@ static function updateService($computers_id, $ocsComputer, $cfg_ocs) {
$input = array_change_key_case($service, CASE_LOWER);
$input["computers_id"] = $computers_id;
- $Service->add($input, array('disable_unicity_check' => true), 0);
+ $Service->add($input, ['disable_unicity_check' => true], 0);
$Service->fields = [];
}
@@ -7112,7 +7103,7 @@ static function updateWinuser($computers_id, $ocsComputer, $cfg_ocs) {
foreach ($ocsComputer as $wusers) {
$wuser = Toolbox::clean_cross_side_scripting_deep(Toolbox::addslashes_deep($wusers));
- $input = array();
+ $input = [];
$input["computers_id"] = $computers_id;
$computer = new Computer;
@@ -7126,7 +7117,7 @@ static function updateWinuser($computers_id, $ocsComputer, $cfg_ocs) {
$input["disabled"] = (isset($wuser["TYPE"]) ? $wuser["DISABLED"] : '');
$input["sid"] = (isset($wuser["TYPE"]) ? $wuser["SID"]: '');
- $winusers->add($input, array('disable_unicity_check' => true), 0);
+ $winusers->add($input, ['disable_unicity_check' => true], 0);
}
$winusers->fields = [];
}
@@ -7148,7 +7139,7 @@ static function updateTeamviewer($computers_id, $ocsComputer, $cfg_ocs) {
self::resetTeamviewer($computers_id, $cfg_ocs);
$CompTeam = new PluginOcsinventoryngTeamviewer();
- $input = array();
+ $input = [];
$input["computers_id"] = $computers_id;
$computer = new Computer;
@@ -7158,7 +7149,7 @@ static function updateTeamviewer($computers_id, $ocsComputer, $cfg_ocs) {
$input["version"] = $ocsComputer["VERSION"];
$input["twid"] = $ocsComputer["TWID"];
- $CompTeam->add($input, array('disable_unicity_check' => true), 0);
+ $CompTeam->add($input, ['disable_unicity_check' => true], 0);
return;
}
@@ -7211,12 +7202,12 @@ static function updateAdministrativeInfo($computers_id, $ocsid, $plugin_ocsinven
$result = $DB->query($queryListUpdate);
if ($DB->numrows($result) > 0) {
- $options = array(
- "DISPLAY" => array(
+ $options = [
+ "DISPLAY" => [
"CHECKSUM" => PluginOcsinventoryngOcsClient::CHECKSUM_BIOS,
"WANTED" => PluginOcsinventoryngOcsClient::WANTED_ACCOUNTINFO,
- )
- );
+ ]
+ ];
$computer = $ocsClient->getComputer($ocsid, $options);
if ($computer) {
@@ -7253,7 +7244,7 @@ static function updateAdministrativeInfo($computers_id, $ocsid, $plugin_ocsinven
break;
}
- $input = array();
+ $input = [];
$input[$glpi_column] = $var;
$input["id"] = $computers_id;
$input["entities_id"] = $entities_id;
@@ -7270,7 +7261,7 @@ static function updateAdministrativeInfo($computers_id, $ocsid, $plugin_ocsinven
if (isset($computer["BIOS"]["ASSETTAG"])
&& !empty($computer["BIOS"]["ASSETTAG"])
) {
- $input = array();
+ $input = [];
$input[$glpi_column] = $var;
$input["id"] = $computers_id;
$input["entities_id"] = $entities_id;
@@ -7312,7 +7303,6 @@ static function updateAdministrativeInfoUseDate($computers_id, $plugin_ocsinvent
if ($DB->numrows($result) > 0) {
-
if (isset($ocsComputer['HARDWARE'])) {
$metas = $ocsComputer['HARDWARE'];
foreach ($metas as $key => $meta) {
@@ -7337,7 +7327,6 @@ static function updateAdministrativeInfoUseDate($computers_id, $plugin_ocsinvent
$computer_updates = PluginOcsinventoryngOcsAdminInfosLink::addInfocomsForComputer($computers_id, $date, $computer_updates);
break;
-
}
}
}
@@ -7356,13 +7345,13 @@ static function cronInfo($name) {
// no translation for the name of the project
switch ($name) {
case 'ocsng':
- return array('description' => __('OCSNG', 'ocsinventoryng') . " - " . __('Launch OCSNG synchronization script', 'ocsinventoryng'));
+ return ['description' => __('OCSNG', 'ocsinventoryng') . " - " . __('Launch OCSNG synchronization script', 'ocsinventoryng')];
break;
case 'CleanOldAgents':
- return array('description' => __('OCSNG', 'ocsinventoryng') . " - " . __('Clean old agents & drop from OCSNG software', 'ocsinventoryng'));
+ return ['description' => __('OCSNG', 'ocsinventoryng') . " - " . __('Clean old agents & drop from OCSNG software', 'ocsinventoryng')];
break;
case 'RestoreOldAgents':
- return array('description' => __('OCSNG', 'ocsinventoryng') . " - " . __('Restore computers from the date of last inventory', 'ocsinventoryng'));
+ return ['description' => __('OCSNG', 'ocsinventoryng') . " - " . __('Restore computers from the date of last inventory', 'ocsinventoryng')];
break;
}
}
@@ -7398,7 +7387,7 @@ static function cronCleanOldAgents($task) {
if ($config['action_cleancron'] == self::ACTION_PURGE_COMPUTER) {
//action purge agents OCSNG
- $computers = array();
+ $computers = [];
if (count($agents) > 0) {
$nb = $ocsClient->deleteOldAgents($agents);
@@ -7472,7 +7461,6 @@ static function cronRestoreOldAgents($task) {
WHERE `glpi_computers`.`is_deleted` = 1
AND ( unix_timestamp(ocslink.`last_ocs_update`) >= UNIX_TIMESTAMP(NOW() - INTERVAL $delay DAY))";
-
$result = $DB->query($query);
if ($DB->numrows($result) > 0) {
$computer = new Computer();
@@ -7480,7 +7468,7 @@ static function cronRestoreOldAgents($task) {
$computer->fields['id'] = $data['id'];
$computer->fields['is_deleted'] = 0;
$computer->fields['date_mod'] = $_SESSION['glpi_currenttime'];
- $computer->updateInDB(array('is_deleted', 'date_mod'));
+ $computer->updateInDB(['is_deleted', 'date_mod']);
//add history
$changes[0] = 0;
$changes[2] = "";
@@ -7594,25 +7582,25 @@ static function analizePrinterPorts(&$printer_infos, $port = '') {
*/
static function getAvailableStatistics($snmp = false, $ipdiscover = false) {
- $stats = array('imported_machines_number' => __('Computers imported', 'ocsinventoryng'),
+ $stats = ['imported_machines_number' => __('Computers imported', 'ocsinventoryng'),
'synchronized_machines_number' => __('Computers synchronized', 'ocsinventoryng'),
'linked_machines_number' => __('Computers linked', 'ocsinventoryng'),
'notupdated_machines_number' => __('Computers not updated', 'ocsinventoryng'),
'failed_rules_machines_number' => __("Computers don't check any rule", 'ocsinventoryng'),
'not_unique_machines_number' => __('Duplicate computers', 'ocsinventoryng'),
- 'link_refused_machines_number' => __('Computers whose import is refused by a rule', 'ocsinventoryng'));
+ 'link_refused_machines_number' => __('Computers whose import is refused by a rule', 'ocsinventoryng')];
if ($snmp) {
- $stats = array('imported_snmp_number' => __('SNMP objects imported', 'ocsinventoryng'),
+ $stats = ['imported_snmp_number' => __('SNMP objects imported', 'ocsinventoryng'),
'synchronized_snmp_number' => __('SNMP objects synchronized', 'ocsinventoryng'),
'linked_snmp_number' => __('SNMP objects linked', 'ocsinventoryng'),
'notupdated_snmp_number' => __('SNMP objects not updated', 'ocsinventoryng'),
- 'failed_imported_snmp_number' => __("SNMP objects not imported", 'ocsinventoryng'));
+ 'failed_imported_snmp_number' => __("SNMP objects not imported", 'ocsinventoryng')];
}
if ($ipdiscover) {
- $stats = array('imported_ipdiscover_number' => __('IPDISCOVER objects imported', 'ocsinventoryng'),
+ $stats = ['imported_ipdiscover_number' => __('IPDISCOVER objects imported', 'ocsinventoryng'),
'synchronized_ipdiscover_number' => __('IPDISCOVER objects synchronized', 'ocsinventoryng'),
'notupdated_ipdiscover_number' => __('IPDISCOVER objects not updated', 'ocsinventoryng'),
- 'failed_imported_ipdiscover_number' => __("IPDISCOVER objects not imported", 'ocsinventoryng'));
+ 'failed_imported_ipdiscover_number' => __("IPDISCOVER objects not imported", 'ocsinventoryng')];
}
return $stats;
@@ -7624,7 +7612,7 @@ static function getAvailableStatistics($snmp = false, $ipdiscover = false) {
* @param bool $snmp
* @param bool $ipdiscover
*/
- static function manageImportStatistics(&$statistics = array(), $action = false, $snmp = false, $ipdiscover = false) {
+ static function manageImportStatistics(&$statistics = [], $action = false, $snmp = false, $ipdiscover = false) {
if (empty($statistics)) {
foreach (self::getAvailableStatistics($snmp, $ipdiscover) as $field => $label) {
@@ -7705,7 +7693,7 @@ static function manageImportStatistics(&$statistics = array(), $action = false,
* @param bool $snmp
* @param bool $ipdiscover
*/
- static function showStatistics($statistics = array(), $finished = false, $snmp = false, $ipdiscover = false) {
+ static function showStatistics($statistics = [], $finished = false, $snmp = false, $ipdiscover = false) {
echo "
";
- if ($result = $DB->request('glpi_plugin_ocsinventoryng_networkshares', array('computers_id' => $ID, 'ORDER' => 'drive'))) {
+ if ($result = $DB->request('glpi_plugin_ocsinventoryng_networkshares', ['computers_id' => $ID, 'ORDER' => 'drive'])) {
echo "";
$colspan = 6;
echo "
";
Html::closeForm();
@@ -473,8 +459,7 @@ static function showActions(PluginOcsinventoryngNotimportedcomputer $notimported
* @return bool
* @return bool
*/
- static function computerImport($params = array())
- {
+ static function computerImport($params = []) {
if (isset($params['id'])) {
$notimported = new PluginOcsinventoryngNotimportedcomputer;
@@ -490,18 +475,17 @@ static function computerImport($params = array())
}
if (in_array($result['status'],
- array(PluginOcsinventoryngOcsServer::COMPUTER_IMPORTED,
+ [PluginOcsinventoryngOcsServer::COMPUTER_IMPORTED,
PluginOcsinventoryngOcsServer::COMPUTER_LINKED,
- PluginOcsinventoryngOcsServer::COMPUTER_SYNCHRONIZED))) {
- $notimported->delete(array('id' => $params['id']));
+ PluginOcsinventoryngOcsServer::COMPUTER_SYNCHRONIZED])) {
+ $notimported->delete(['id' => $params['id']]);
//If serial has been changed in order to import computer
if (in_array('serial', $changes)) {
PluginOcsinventoryngOcsServer::mergeOcsArray($result['computers_id'],
- array('serial'), "computer_update");
+ ['serial'], "computer_update");
}
-
return true;
} else {
Session::addMessageAfterRedirect(self::getReason($result['status']),
@@ -526,8 +510,7 @@ static function computerImport($params = array())
/**
* @param $params array
**/
- static function linkComputer($params = array())
- {
+ static function linkComputer($params = []) {
if (isset($params['id'])) {
$notimported = new PluginOcsinventoryngNotimportedcomputer;
@@ -538,10 +521,10 @@ static function linkComputer($params = array())
$notimported->fields['plugin_ocsinventoryng_ocsservers_id'],
$params['computers_id'])
) {
- $notimported->delete(array('id' => $params['id']));
+ $notimported->delete(['id' => $params['id']]);
//If serial has been changed in order to import computer
if (in_array('serial', $changes)) {
- PluginOcsinventoryngOcsServer::mergeOcsArray($params['id'], array('serial'),
+ PluginOcsinventoryngOcsServer::mergeOcsArray($params['id'], ['serial'],
"computer_update");
}
}
@@ -555,17 +538,16 @@ static function linkComputer($params = array())
* @return array
* @return array
*/
- static function getOcsComputerInfos($params = array())
- {
+ static function getOcsComputerInfos($params = []) {
PluginOcsinventoryngOcsServer::checkOCSconnection($params['plugin_ocsinventoryng_ocsservers_id']);
$ocsClient = PluginOcsinventoryngOcsServer::getDBocs($params['plugin_ocsinventoryng_ocsservers_id']);
- $options = array(
- "DISPLAY" => array(
+ $options = [
+ "DISPLAY" => [
"CHECKSUM" => PluginOcsinventoryngOcsClient::CHECKSUM_BIOS
- )
- );
+ ]
+ ];
$computer = $ocsClient->getComputer($params['ocsid'], $options);
- $changes = array();
+ $changes = [];
if ($computer) {
$ocs_serial = $computer["BIOS"]["SSN"];
@@ -587,15 +569,14 @@ static function getOcsComputerInfos($params = array())
/**
* @return int
*/
- static function sendAlert()
- {
+ static function sendAlert() {
global $DB, $CFG_GLPI;
if (!$CFG_GLPI["notifications_mailing"]) {
return 0;
}
- $items_infos = array();
+ $items_infos = [];
$query = "SELECT `glpi_plugin_ocsinventoryng_notimportedcomputers`.*
FROM `glpi_plugin_ocsinventoryng_notimportedcomputers`
@@ -611,8 +592,8 @@ static function sendAlert()
foreach ($items_infos as $entity => $items) {
if (NotificationEvent::raiseEvent('not_imported', new PluginOcsinventoryngNotimportedcomputer(),
- array('entities_id' => $entity,
- 'notimported' => $items))
+ ['entities_id' => $entity,
+ 'notimported' => $items])
) {
$alert = new Alert();
$input["itemtype"] = 'PluginOcsinventoryngNotimportedcomputer';
@@ -633,8 +614,7 @@ static function sendAlert()
/**
*
*/
- function cleanDBonPurge()
- {
+ function cleanDBonPurge() {
global $DB;
$query = "DELETE
@@ -649,20 +629,18 @@ function cleanDBonPurge()
* @param $name
* @return array
*/
- static function cronInfo($name)
- {
+ static function cronInfo($name) {
switch ($name) {
case "SendAlerts" :
- return array('description' => __('OCSNG', 'ocsinventoryng') . " - " . __('Not imported computers alert', 'ocsinventoryng'));
+ return ['description' => __('OCSNG', 'ocsinventoryng') . " - " . __('Not imported computers alert', 'ocsinventoryng')];
}
}
/**
* @param $task
*/
- static function cronSendAlerts($task)
- {
+ static function cronSendAlerts($task) {
self::sendAlert();
$task->setVolume(1);
}
@@ -674,8 +652,7 @@ static function cronSendAlerts($task)
* @param null $checkitem
* @return an
*/
- function getSpecificMassiveActions($checkitem = NULL)
- {
+ function getSpecificMassiveActions($checkitem = null) {
$actions = parent::getSpecificMassiveActions($checkitem);
@@ -685,8 +662,7 @@ function getSpecificMassiveActions($checkitem = NULL)
/**
* @return an|array
*/
- function getForbiddenStandardMassiveAction()
- {
+ function getForbiddenStandardMassiveAction() {
$forbidden = parent::getForbiddenStandardMassiveAction();
$forbidden[] = 'update';
@@ -700,14 +676,13 @@ function getForbiddenStandardMassiveAction()
* @param MassiveAction $ma
* @return bool|false
*/
- static function showMassiveActionsSubForm(MassiveAction $ma)
- {
+ static function showMassiveActionsSubForm(MassiveAction $ma) {
switch ($ma->getAction()) {
case 'plugin_ocsinventoryng_import':
- Entity::dropdown(array('name' => 'entity'));
+ Entity::dropdown(['name' => 'entity']);
echo " " .
- Html::submit(_x('button', 'Post'), array('name' => 'massiveaction'));
+ Html::submit(_x('button', 'Post'), ['name' => 'massiveaction']);
return true;
/*case 'plugin_ocsinventoryng_link':
Computer::dropdown(array('name' => 'computers_id'));
@@ -717,7 +692,7 @@ static function showMassiveActionsSubForm(MassiveAction $ma)
case 'plugin_ocsinventoryng_replayrules':
case 'plugin_ocsinventoryng_delete':
echo " " .
- Html::submit(_x('button', 'Post'), array('name' => 'massiveaction'));
+ Html::submit(_x('button', 'Post'), ['name' => 'massiveaction']);
return true;
}
return parent::showMassiveActionsSubForm($ma);
@@ -734,8 +709,7 @@ static function showMassiveActionsSubForm(MassiveAction $ma)
* @return nothing|void
*/
static function processMassiveActionsForOneItemtype(MassiveAction $ma, CommonDBTM $item,
- array $ids)
- {
+ array $ids) {
$notimport = new PluginOcsinventoryngNotimportedcomputer();
@@ -744,9 +718,9 @@ static function processMassiveActionsForOneItemtype(MassiveAction $ma, CommonDBT
$input = $ma->getInput();
foreach ($ids as $id) {
- if (PluginOcsinventoryngNotimportedcomputer::computerImport(array('id' => $id,
+ if (PluginOcsinventoryngNotimportedcomputer::computerImport(['id' => $id,
'force' => true,
- 'entity' => $input['entity']))
+ 'entity' => $input['entity']])
) {
$ma->itemDone($item->getType(), $id, MassiveAction::ACTION_OK);
} else {
@@ -758,7 +732,7 @@ static function processMassiveActionsForOneItemtype(MassiveAction $ma, CommonDBT
case "plugin_ocsinventoryng_replayrules" :
foreach ($ids as $id) {
- if (PluginOcsinventoryngNotimportedcomputer::computerImport(array('id' => $id))) {
+ if (PluginOcsinventoryngNotimportedcomputer::computerImport(['id' => $id])) {
$ma->itemDone($item->getType(), $id, MassiveAction::ACTION_OK);
} else {
$ma->itemDone($item->getType(), $ids, MassiveAction::ACTION_KO);
@@ -778,4 +752,4 @@ static function processMassiveActionsForOneItemtype(MassiveAction $ma, CommonDBT
}
parent::processMassiveActionsForOneItemtype($ma, $item, $ids);
}
-}
\ No newline at end of file
+}
diff --git a/inc/ocsadmininfoslink.class.php b/inc/ocsadmininfoslink.class.php
index f94d10eb..53f5baba 100644
--- a/inc/ocsadmininfoslink.class.php
+++ b/inc/ocsadmininfoslink.class.php
@@ -9,7 +9,7 @@
-------------------------------------------------------------------------
LICENSE
-
+
This file is part of ocsinventoryng.
ocsinventoryng is free software; you can redistribute it and/or modify
@@ -40,11 +40,10 @@ class PluginOcsinventoryngOcsAdminInfosLink extends CommonDBTM
/**
* @param $ID
*/
- function cleanForOcsServer($ID)
- {
+ function cleanForOcsServer($ID) {
$temp = new self();
- $temp->deleteByCriteria(array('plugin_ocsinventoryng_ocsservers_id' => $ID));
+ $temp->deleteByCriteria(['plugin_ocsinventoryng_ocsservers_id' => $ID]);
}
@@ -53,8 +52,7 @@ function cleanForOcsServer($ID)
* @param $glpi_column
* @return true
*/
- function getFromDBbyOcsServerIDAndGlpiColumn($plugin_ocsinventoryng_ocsservers_id, $glpi_column)
- {
+ function getFromDBbyOcsServerIDAndGlpiColumn($plugin_ocsinventoryng_ocsservers_id, $glpi_column) {
return $this->getFromDBByQuery("WHERE `" . $this->getTable() . "`.`plugin_ocsinventoryng_ocsservers_id` = '$plugin_ocsinventoryng_ocsservers_id' AND `" . $this->getTable() . "`.`glpi_column` = '$glpi_column'");
@@ -66,8 +64,7 @@ function getFromDBbyOcsServerIDAndGlpiColumn($plugin_ocsinventoryng_ocsservers_i
* @param $computer_updates
* @return array
*/
- static function addInfocomsForComputer($computers_id, $date, $computer_updates)
- {
+ static function addInfocomsForComputer($computers_id, $date, $computer_updates) {
global $DB;
$infocom = new Infocom();
@@ -77,11 +74,11 @@ static function addInfocomsForComputer($computers_id, $date, $computer_updates)
|| $infocom->fields['use_date'] == 'NULL'
) {
//add use_date
- $infocom->update(array('id' => $infocom->fields['id'], 'use_date' => $use_date));
+ $infocom->update(['id' => $infocom->fields['id'], 'use_date' => $use_date]);
}
} else {
//add infocom
- $infocom->add(array('items_id' => $computers_id, 'itemtype' => 'Computer', 'use_date' => $use_date));
+ $infocom->add(['items_id' => $computers_id, 'itemtype' => 'Computer', 'use_date' => $use_date]);
}
@@ -100,4 +97,4 @@ static function addInfocomsForComputer($computers_id, $date, $computer_updates)
return $computer_updates;
}
-}
\ No newline at end of file
+}
diff --git a/inc/ocsclient.class.php b/inc/ocsclient.class.php
index 7498e86c..ef772137 100644
--- a/inc/ocsclient.class.php
+++ b/inc/ocsclient.class.php
@@ -9,7 +9,7 @@
-------------------------------------------------------------------------
LICENSE
-
+
This file is part of ocsinventoryng.
ocsinventoryng is free software; you can redistribute it and/or modify
@@ -72,15 +72,14 @@ abstract class PluginOcsinventoryngOcsClient
const PLUGINS_SERVICE = 0x00010;
const PLUGINS_RUNNINGPROCESS = 0x00011;
const PLUGINS_ALL = 0x00012;
-
+
private $id;
/**
* PluginOcsinventoryngOcsClient constructor.
* @param $id
*/
- public function __construct($id)
- {
+ public function __construct($id) {
$this->id = $id;
}
@@ -280,8 +279,7 @@ abstract public function getOCSComputers();
* @param array $options
* @return mixed|null
*/
- public function getOcsComputer($id, $tables = array())
- {
+ public function getOcsComputer($id, $tables = []) {
$result = $this->getComputerRule($id, $tables);
@@ -344,8 +342,7 @@ abstract public function updateTag($tag, $id);
/* IMPLEMENTED FUNCTIONS */
/* * ********************** */
- public function getId()
- {
+ public function getId() {
return $this->id;
}
@@ -354,13 +351,12 @@ public function getId()
* @param array $options
* @return mixed|null
*/
- public function getComputer($id, $options = array())
- {
-
+ public function getComputer($id, $options = []) {
+
//if (!isset($options['COMPLETE'])) {
// $options['COMPLETE'] = 0;
//}
-
+
//if (!isset($options['FILTER'])) {
// $options['FILTER'] = array();
//}
@@ -368,7 +364,6 @@ public function getComputer($id, $options = array())
//$options['FILTER']['IDS'] = array($id);
$result = $this->getComputers($options, $id);
-
if (!isset($result['TOTAL_COUNT']) || $result['TOTAL_COUNT'] < 1 || empty($result['COMPUTERS'])) {
return null;
}
@@ -380,16 +375,14 @@ public function getComputer($id, $options = array())
* @param array $options
* @return mixed|null
*/
- public function getSnmpDevice($id, $options = array())
- {
+ public function getSnmpDevice($id, $options = []) {
if (!isset($options['FILTER'])) {
- $options['FILTER'] = array();
+ $options['FILTER'] = [];
}
- $options['FILTER']['IDS'] = array($id);
+ $options['FILTER']['IDS'] = [$id];
$result = $this->getSnmp($options);
-
if (!isset($result['TOTAL_COUNT']) || $result['TOTAL_COUNT'] < 1 || empty($result['SNMP'])) {
return null;
}
@@ -403,8 +396,7 @@ public function getSnmpDevice($id, $options = array())
* @param string $key The name of the config item to return
* @return integer
*/
- public function getIntConfig($key)
- {
+ public function getIntConfig($key) {
$config = $this->getConfig($key);
return $config['IVALUE'];
}
@@ -416,8 +408,7 @@ public function getIntConfig($key)
* @param string $key The name of the config item to return
* @return string
*/
- public function getTextConfig($key)
- {
+ public function getTextConfig($key) {
$config = $this->getConfig($key);
return $config['TVALUE'];
}
@@ -425,142 +416,141 @@ public function getTextConfig($key)
/**
* @return array
*/
- public function getOcsMap()
- {
- $DATA_MAP = array(
- 'hardware' => array(
+ public function getOcsMap() {
+ $DATA_MAP = [
+ 'hardware' => [
'checksum' => self::CHECKSUM_HARDWARE,
'multi' => 0,
- ),
- 'bios' => array(
+ ],
+ 'bios' => [
'checksum' => self::CHECKSUM_BIOS,
'multi' => 0,
- ),
- 'memories' => array(
+ ],
+ 'memories' => [
'checksum' => self::CHECKSUM_MEMORY_SLOTS,
'multi' => 1,
- ),
- 'slots' => array(
+ ],
+ 'slots' => [
'checksum' => self::CHECKSUM_SYSTEM_SLOTS,
'multi' => 1,
- ),
- 'registry' => array(
+ ],
+ 'registry' => [
'checksum' => self::CHECKSUM_REGISTRY,
'multi' => 1,
- ),
- 'securitycenter' => array(
+ ],
+ 'securitycenter' => [
'plugins' => self::PLUGINS_SECURITY,
'multi' => 1,
- ),
- 'uptime' => array(
+ ],
+ 'uptime' => [
'plugins' => self::PLUGINS_UPTIME,
'multi' => 0,
- ),
- 'winupdatestate' => array(
+ ],
+ 'winupdatestate' => [
'plugins' => self::PLUGINS_WUPDATE,
'multi' => 0,
- ),
- 'osinstall' => array(
+ ],
+ 'osinstall' => [
'plugins' => self::PLUGINS_OSINSTALL,
'multi' => 0,
- ),
- 'networkshare' => array(
+ ],
+ 'networkshare' => [
'plugins' => self::PLUGINS_NETWORKSHARE,
'multi' => 1,
- ),
- 'runningprocess' => array(
+ ],
+ 'runningprocess' => [
'plugins' => self::PLUGINS_RUNNINGPROCESS,
'multi' => 1,
- ),
- 'service' => array(
+ ],
+ 'service' => [
'plugins' => self::PLUGINS_SERVICE,
'multi' => 1,
- ),
- 'navigatorproxysetting' => array(
+ ],
+ 'navigatorproxysetting' => [
'plugins' => self::PLUGINS_PROXYSETTING,
'multi' => 1,
- ),
- 'winusers' => array(
+ ],
+ 'winusers' => [
'plugins' => self::PLUGINS_WINUSERS,
'multi' => 1,
- ),
- 'teamviewer' => array(
+ ],
+ 'teamviewer' => [
'plugins' => self::PLUGINS_TEAMVIEWER,
'multi' => 0,
- ),
- 'officepack' => array(
+ ],
+ 'officepack' => [
'plugins' => self::PLUGINS_OFFICE,
'multi' => 1,
- ),
- 'controllers' => array(
+ ],
+ 'controllers' => [
'checksum' => self::CHECKSUM_SYSTEM_CONTROLLERS,
'multi' => 1,
- ),
- 'monitors' => array(
+ ],
+ 'monitors' => [
'checksum' => self::CHECKSUM_MONITORS,
'multi' => 1,
- ),
- 'ports' => array(
+ ],
+ 'ports' => [
'checksum' => self::CHECKSUM_SYSTEM_PORTS,
'multi' => 1,
- ),
- 'storages' => array(
+ ],
+ 'storages' => [
'checksum' => self::CHECKSUM_STORAGE_PERIPHERALS,
'multi' => 1,
- ),
- 'drives' => array(
+ ],
+ 'drives' => [
'checksum' => self::CHECKSUM_LOGICAL_DRIVES,
'multi' => 1,
- ),
- 'inputs' => array(
+ ],
+ 'inputs' => [
'checksum' => self::CHECKSUM_INPUT_DEVICES,
'multi' => 1,
- ),
- 'modems' => array(
+ ],
+ 'modems' => [
'checksum' => self::CHECKSUM_MODEMS,
'multi' => 1,
- ),
- 'networks' => array(
+ ],
+ 'networks' => [
'checksum' => self::CHECKSUM_NETWORK_ADAPTERS,
'multi' => 1,
- ),
- 'printers' => array(
+ ],
+ 'printers' => [
'checksum' => self::CHECKSUM_PRINTERS,
'multi' => 1,
- ),
- 'sounds' => array(
+ ],
+ 'sounds' => [
'checksum' => self::CHECKSUM_SOUND_ADAPTERS,
'multi' => 1,
- ),
- 'videos' => array(
+ ],
+ 'videos' => [
'checksum' => self::CHECKSUM_VIDEO_ADAPTERS,
'multi' => 1,
- ),
- 'softwares' => array(
+ ],
+ 'softwares' => [
'checksum' => self::CHECKSUM_SOFTWARE,
'multi' => 1,
- ),
- 'virtualmachines' => array(
+ ],
+ 'virtualmachines' => [
'checksum' => self::CHECKSUM_VIRTUAL_MACHINES,
'multi' => 1,
- ),
- 'cpus' => array(
+ ],
+ 'cpus' => [
'checksum' => self::CHECKSUM_CPUS,
'multi' => 1,
- ),
- 'sim' => array(
+ ],
+ 'sim' => [
'checksum' => self::CHECKSUM_SIM,
'multi' => 1,
- ),
- 'accountinfo' => array(
+ ],
+ 'accountinfo' => [
'wanted' => self::WANTED_ACCOUNTINFO,
'multi' => 1,
- ),
- 'dico_soft' => array(
+ ],
+ 'dico_soft' => [
'wanted' => self::WANTED_DICO_SOFT,
'multi' => 0,
- ),
- );
+ ],
+ ];
return $DATA_MAP;
}
@@ -569,8 +559,7 @@ public function getOcsMap()
* @param $tables
* @return int
*/
- public function getChecksumForTables($tables)
- {
+ public function getChecksumForTables($tables) {
$ocsMap = $this->getOcsMap();
$checksum = self::CHECKSUM_NONE;
@@ -587,8 +576,7 @@ public function getChecksumForTables($tables)
* @param $tables
* @return int
*/
- public function getWantedForTables($tables)
- {
+ public function getWantedForTables($tables) {
$ocsMap = $this->getOcsMap();
$wanted = self::WANTED_NONE;
@@ -605,8 +593,7 @@ public function getWantedForTables($tables)
* @param $tables
* @return int
*/
- public function getPluginsForTables($tables)
- {
+ public function getPluginsForTables($tables) {
$ocsMap = $this->getOcsMap();
$plugins = self::PLUGINS_NONE;
@@ -622,9 +609,8 @@ public function getPluginsForTables($tables)
/**
* @return string
*/
- public function getConnectionType()
- {
+ public function getConnectionType() {
return get_class($this);
}
-}
\ No newline at end of file
+}
diff --git a/inc/ocsdbclient.class.php b/inc/ocsdbclient.class.php
index 3f195c98..45fc53d8 100644
--- a/inc/ocsdbclient.class.php
+++ b/inc/ocsdbclient.class.php
@@ -10,7 +10,7 @@
-------------------------------------------------------------------------
LICENSE
-
+
This file is part of ocsinventoryng.
ocsinventoryng is free software; you can redistribute it and/or modify
@@ -59,8 +59,8 @@ public function getDB() {
return $this->db;
}
- public function getComputerRule($id, $tables = array()) {
- $computers = array();
+ public function getComputerRule($id, $tables = []) {
+ $computers = [];
$query = "SELECT `hardware`.*,`accountinfo`.`TAG` FROM `hardware`
INNER JOIN `accountinfo` ON (`hardware`.`id` = `accountinfo`.`HARDWARE_ID`)
@@ -87,7 +87,6 @@ public function getComputerRule($id, $tables = array()) {
}
-
foreach ($tables as $table) {
if ($table == "accountinfo") {
@@ -151,7 +150,6 @@ public function getComputerRule($id, $tables = array()) {
**/
function OcsTableExists($tablename) {
-
// Get a list of tables contained within the database.
$result = $this->db->list_tables("%" . $tablename . "%");
@@ -183,7 +181,7 @@ function OcsTableExists($tablename) {
private function getComputerSections($ids, $checksum, $wanted, $plugins, $complete = 0) {
$OCS_MAP = self::getOcsMap();
- $DATA_MAP = array();
+ $DATA_MAP = [];
foreach ($OCS_MAP as $table => $value) {
if ($table == "dico_soft") {
@@ -197,12 +195,12 @@ private function getComputerSections($ids, $checksum, $wanted, $plugins, $comple
if ($check & $checksum) {
$DATA_MAP[$table] = $value;
}
- } elseif (isset($value['wanted'])) {
+ } else if (isset($value['wanted'])) {
$check = $value['wanted'];
if ($wanted & self::WANTED_ACCOUNTINFO) {
$DATA_MAP[$table] = $value;
}
- } elseif (isset($value['plugins'])) {
+ } else if (isset($value['plugins'])) {
$check = $value['plugins'];
if (self::OcsTableExists($table) && (($check & $plugins) || $plugins == self::PLUGINS_ALL)) {
$DATA_MAP[$table] = $value;
@@ -223,9 +221,9 @@ private function getComputerSections($ids, $checksum, $wanted, $plugins, $comple
}
if (isset($value['checksum'])) {
$check = $value['checksum'];
- } elseif (isset($value['wanted'])) {
+ } else if (isset($value['wanted'])) {
$check = $value['wanted'];
- } elseif (isset($value['plugins'])) {
+ } else if (isset($value['plugins'])) {
$check = $value['plugins'];
}
$multi = $value['multi'];
@@ -269,7 +267,7 @@ private function getComputerSections($ids, $checksum, $wanted, $plugins, $comple
}
}
}
- } elseif ($table == "softwares") {
+ } else if ($table == "softwares") {
if (($check & $checksum) || $complete > 0) {
if (self::WANTED_DICO_SOFT & $wanted) {
@@ -318,7 +316,7 @@ private function getComputerSections($ids, $checksum, $wanted, $plugins, $comple
$computers[$software['HARDWARE_ID']]["SOFTWARES"][] = $software;
}
}
- } elseif ($table == "registry") {
+ } else if ($table == "registry") {
if (($check & $checksum) || $complete > 0) {
$query = "SELECT `registry`.`NAME` AS name,
@@ -338,7 +336,7 @@ private function getComputerSections($ids, $checksum, $wanted, $plugins, $comple
}
}
}
- } elseif (self::OcsTableExists("securitycenter") && $table == "securitycenter") {
+ } else if (self::OcsTableExists("securitycenter") && $table == "securitycenter") {
if (($check & $plugins) || $plugins == self::PLUGINS_ALL || $complete > 0) {
$query = "SELECT `securitycenter`.`SCV` AS scv,
@@ -360,7 +358,7 @@ private function getComputerSections($ids, $checksum, $wanted, $plugins, $comple
}
}
}
- } elseif (self::OcsTableExists("uptime") && $table == "uptime") {
+ } else if (self::OcsTableExists("uptime") && $table == "uptime") {
if (($check & $plugins) || $plugins == self::PLUGINS_ALL || $complete > 0) {
$query = "SELECT `uptime`.`TIME` AS time,
@@ -372,7 +370,7 @@ private function getComputerSections($ids, $checksum, $wanted, $plugins, $comple
$computers[$up['HARDWARE_ID']][strtoupper($table)] = $up;
}
}
- } elseif (self::OcsTableExists("officepack") && $table == "officepack") {
+ } else if (self::OcsTableExists("officepack") && $table == "officepack") {
$query = "SELECT `officepack`.* FROM `hardware`
INNER JOIN `officepack` ON (`hardware`.`id` = `officepack`.`HARDWARE_ID`)
@@ -387,7 +385,7 @@ private function getComputerSections($ids, $checksum, $wanted, $plugins, $comple
}
- } elseif (self::OcsTableExists("winupdatestate") && $table == "winupdatestate") {
+ } else if (self::OcsTableExists("winupdatestate") && $table == "winupdatestate") {
$query = "SELECT `winupdatestate`.* FROM `hardware`
INNER JOIN `winupdatestate` ON (`hardware`.`id` = `winupdatestate`.`HARDWARE_ID`)
@@ -402,7 +400,7 @@ private function getComputerSections($ids, $checksum, $wanted, $plugins, $comple
}
- } elseif (self::OcsTableExists("osinstall") && $table == "osinstall") {
+ } else if (self::OcsTableExists("osinstall") && $table == "osinstall") {
$query = "SELECT `osinstall`.* FROM `hardware`
INNER JOIN `osinstall` ON (`hardware`.`id` = `osinstall`.`HARDWARE_ID`)
@@ -419,7 +417,7 @@ private function getComputerSections($ids, $checksum, $wanted, $plugins, $comple
}
- } elseif (self::OcsTableExists("networkshare") && $table == "networkshare") {
+ } else if (self::OcsTableExists("networkshare") && $table == "networkshare") {
$query = "SELECT `networkshare`.* FROM `hardware`
INNER JOIN `networkshare` ON (`hardware`.`id` = `networkshare`.`HARDWARE_ID`)
@@ -433,7 +431,7 @@ private function getComputerSections($ids, $checksum, $wanted, $plugins, $comple
$computers[$meta['HARDWARE_ID']][strtoupper($table)][$meta['ID']]["QUOTA"] = $meta["QUOTA"];
}
- } elseif (self::OcsTableExists("runningprocess") && $table == "runningprocess") {
+ } else if (self::OcsTableExists("runningprocess") && $table == "runningprocess") {
$query = "SELECT `runningprocess`.* FROM `hardware`
INNER JOIN `runningprocess` ON (`hardware`.`id` = `runningprocess`.`HARDWARE_ID`)
@@ -453,7 +451,7 @@ private function getComputerSections($ids, $checksum, $wanted, $plugins, $comple
$computers[$meta['HARDWARE_ID']][strtoupper($table)][$meta['ID']]["COMPANY"] = $meta["COMPANY"];
}
- } elseif (self::OcsTableExists("service") && $table == "service") {
+ } else if (self::OcsTableExists("service") && $table == "service") {
$query = "SELECT `service`.* FROM `hardware`
INNER JOIN `service` ON (`hardware`.`id` = `service`.`HARDWARE_ID`)
@@ -471,7 +469,7 @@ private function getComputerSections($ids, $checksum, $wanted, $plugins, $comple
$computers[$meta['HARDWARE_ID']][strtoupper($table)][$meta['ID']]["SVCSPECEXITCODE"] = $meta["SVCSPECEXITCODE"];
}
- } elseif ($table == "hardware") {
+ } else if ($table == "hardware") {
$query = "SELECT `hardware`.*,`accountinfo`.`TAG` FROM `hardware`
INNER JOIN `accountinfo` ON (`hardware`.`id` = `accountinfo`.`HARDWARE_ID`)
@@ -528,7 +526,7 @@ private function getComputerSections($ids, $checksum, $wanted, $plugins, $comple
*/
private function getSnmpSections($ids, $complete = 1) {
- $snmp = array();
+ $snmp = [];
// Check for basics snmp infos
$query = "SELECT * FROM `snmp` WHERE `ID` IN (" . implode(',', $ids) . ")";
@@ -661,32 +659,31 @@ public function checkConnection() {
public function searchComputers($field, $value) {
if ($field == "id" || $field == "ID") {
- $options = array(
- "FILTER" => array(
- 'IDS' => array(
+ $options = [
+ "FILTER" => [
+ 'IDS' => [
$value
- )
- )
- );
- } elseif ($field == "tag" || $field == "TAG") {
- $options = array(
- "FILTER" => array(
- 'TAGS' => array(
+ ]
+ ]
+ ];
+ } else if ($field == "tag" || $field == "TAG") {
+ $options = [
+ "FILTER" => [
+ 'TAGS' => [
$value
- )
- )
- );
- } elseif ($field == "deviceid" || $field == "DEVICEID") {
- $options = array(
- "FILTER" => array(
- 'DEVICEIDS' => array(
+ ]
+ ]
+ ];
+ } else if ($field == "deviceid" || $field == "DEVICEID") {
+ $options = [
+ "FILTER" => [
+ 'DEVICEIDS' => [
$value
- )
- )
- );
+ ]
+ ]
+ ];
}
-
$res = $this->getComputers($options);
return $res;
}
@@ -722,7 +719,6 @@ public function updateTag($tag, $id) {
*/
public function countComputers($options, $id = 0) {
-
if (isset($options['OFFSET'])) {
$offset = "OFFSET " . $options['OFFSET'];
} else {
@@ -819,7 +815,6 @@ public function countComputers($options, $id = 0) {
$where_before = "";
}
-
if (isset($filters['CHECKSUM']) and $filters['CHECKSUM']) {
$checksum = $filters['CHECKSUM'];
@@ -864,7 +859,7 @@ public function countComputers($options, $id = 0) {
return $hardwareids;
} else {
- return array();
+ return [];
}
return $res;
@@ -879,7 +874,6 @@ public function countComputers($options, $id = 0) {
*/
public function getComputers($options, $id = 0) {
-
if (isset($options['OFFSET'])) {
$offset = "OFFSET " . $options['OFFSET'];
} else {
@@ -976,7 +970,6 @@ public function getComputers($options, $id = 0) {
$where_before = "";
}
-
if (isset($filters['CHECKSUM']) and $filters['CHECKSUM']) {
$checksum = $filters['CHECKSUM'];
@@ -994,7 +987,6 @@ public function getComputers($options, $id = 0) {
$where_condition = "";
}
-
/*$query = "SELECT * FROM `hardware`, `accountinfo`
WHERE `hardware`.`DEVICEID` NOT LIKE '\\_%'
AND `hardware`.`ID` = `accountinfo`.`HARDWARE_ID`
@@ -1022,7 +1014,7 @@ public function getComputers($options, $id = 0) {
$where_condition
ORDER BY $order
$max_records $offset";
-
+
$request = $this->db->query($query);*/
$this->getAccountInfoColumns();
while ($hardwareid = $this->db->fetch_assoc($request)) {
@@ -1055,7 +1047,7 @@ public function getComputers($options, $id = 0) {
} else {
- $res = array();
+ $res = [];
}
return $res;
@@ -1145,7 +1137,7 @@ public function getComputersToUpdate($cfg_ocs, $max_date) {
LIMIT " . intval($cfg_ocs["cron_sync_number"]);
$res = $this->db->query($query);
- $data = array();
+ $data = [];
if ($res->num_rows > 0) {
while ($num = $this->db->fetch_assoc($res)) {
@@ -1162,7 +1154,7 @@ public function getOCSComputers() {
$query = "SELECT `ID`, `DEVICEID`
FROM `hardware`";
$res = $this->db->query($query);
- $data = array();
+ $data = [];
if ($res->num_rows > 0) {
while ($num = $this->db->fetch_assoc($res)) {
@@ -1196,7 +1188,7 @@ public function getOldAgents() {
AND ( unix_timestamp(LASTCOME) <= UNIX_TIMESTAMP(NOW() - INTERVAL $delay DAY))
AND deviceid <> '_SYSTEMGROUP_' AND deviceid <> '_DOWNLOADGROUP_'";
$res = $this->db->query($query);
- $data = array();
+ $data = [];
if ($res->num_rows > 0) {
while ($num = $this->db->fetch_assoc($res)) {
@@ -1228,7 +1220,7 @@ public function deleteOldAgents($agents) {
$did = $num["deviceid"];
if ($did) {
- $tables = array("accesslog",
+ $tables = ["accesslog",
"accountinfo",
"bios",
"controllers",
@@ -1262,7 +1254,7 @@ public function deleteOldAgents($agents) {
"virtualmachines",
"cpus",
"sim"
- );
+ ];
if (isset($tables) and is_array($tables)) {
foreach ($tables as $table) {
if (self::OcsTableExists($table)) {
@@ -1314,7 +1306,7 @@ public function getDeletedComputers() {
$count++;
}
} else {
- $res = array();
+ $res = [];
}
$_SESSION["ocs_deleted_equiv"]["deleted"] = 0;
if (empty($_SESSION["ocs_deleted_equiv"]["total"])) {
@@ -1368,7 +1360,7 @@ public function getAccountInfoColumns($table = 'accountinfo') {
while ($column = $this->db->fetch_assoc($columns)) {
$res[$column['Field']] = $column['Field'];
}
- } elseif ($table == 'hardware') {
+ } else if ($table == 'hardware') {
$res['DEVICEID'] = 'DEVICEID';
}
return $res;
@@ -1384,7 +1376,6 @@ public function getAccountInfoColumns($table = 'accountinfo') {
*/
public function getSnmp($options) {
-
if (isset($options['OFFSET'])) {
$offset = "OFFSET " . $options['OFFSET'];
} else {
@@ -1458,7 +1449,6 @@ public function getSnmp($options) {
$where_before = "";
}
-
if (isset($filters['CHECKSUM']) and $filters['CHECKSUM']) {
$checksum = $filters['CHECKSUM'];
$where_checksum = " AND ('" . $checksum . "' & snmp.CHECKSUM) ";
@@ -1470,7 +1460,6 @@ public function getSnmp($options) {
$where_condition = "";
}
-
$query = "SELECT DISTINCT snmp.ID FROM snmp, snmp_accountinfo
WHERE snmp.SNMPDEVICEID NOT LIKE '\\_%'
AND snmp.ID = snmp_accountinfo.SNMP_ID
@@ -1479,7 +1468,6 @@ public function getSnmp($options) {
if ($this->db->numrows($request)) {
-
$count = $this->db->numrows($request);
$query = "SELECT DISTINCT snmp.ID, snmp.NAME FROM snmp, snmp_accountinfo
WHERE snmp.SNMPDEVICEID NOT LIKE '\\_%'
@@ -1510,8 +1498,7 @@ public function getSnmp($options) {
$res["SNMP"] = $this->getSnmpSections($snmpids, $complete);
} else {
-
- $res = array();
+ $res = [];
}
return $res;
diff --git a/inc/ocslink.class.php b/inc/ocslink.class.php
index c76e8594..a0b92476 100644
--- a/inc/ocslink.class.php
+++ b/inc/ocslink.class.php
@@ -9,7 +9,7 @@
-------------------------------------------------------------------------
LICENSE
-
+
This file is part of ocsinventoryng.
ocsinventoryng is free software; you can redistribute it and/or modify
@@ -84,7 +84,7 @@ static function showSimpleForItem(CommonDBTM $item) {
$target = Toolbox::getItemTypeFormURL(__CLASS__);
- if (in_array($item->getType(), array('Computer'))) {
+ if (in_array($item->getType(), ['Computer'])) {
$items_id = $item->getField('id');
if (!empty($items_id)
@@ -135,7 +135,6 @@ static function showSimpleForItem(CommonDBTM $item) {
echo "";
echo "" . __('OCSNG TAG', 'ocsinventoryng') .
" ";
@@ -188,8 +187,8 @@ static function showSimpleForItem(CommonDBTM $item) {
echo "";
Html::showSimpleForm($target, 'force_ocs_resynch',
_sx('button', 'Force synchronization', 'ocsinventoryng'),
- array('id' => $items_id,
- 'resynch_id' => $data["id"]));
+ ['id' => $items_id,
+ 'resynch_id' => $data["id"]]);
echo " ";
} else {
@@ -221,10 +220,10 @@ static function showSimpleForItem(CommonDBTM $item) {
echo "";
Html::showSimpleForm($target, 'force_ocssnmp_resynch',
_sx('button', 'Force SNMP synchronization', 'ocsinventoryng'),
- array('items_id' => $items_id,
+ ['items_id' => $items_id,
'itemtype' => $item->getType(),
'id' => $data["id"],
- 'plugin_ocsinventoryng_ocsservers_id' => $data["plugin_ocsinventoryng_ocsservers_id"]));
+ 'plugin_ocsinventoryng_ocsservers_id' => $data["plugin_ocsinventoryng_ocsservers_id"]]);
echo " ";
}
@@ -232,12 +231,12 @@ static function showSimpleForItem(CommonDBTM $item) {
$linked_ids [] = $data['ocs_id'];
$ocsClient = PluginOcsinventoryngOcsServer::getDBocs($data['plugin_ocsinventoryng_ocsservers_id']);
- $ocsResult = $ocsClient->getSnmp(array(
+ $ocsResult = $ocsClient->getSnmp([
'MAX_RECORDS' => 1,
- 'FILTER' => array(
+ 'FILTER' => [
'IDS' => $linked_ids,
- )
- ));
+ ]
+ ]);
if (isset($ocsResult['SNMP'])) {
if (count($ocsResult['SNMP']) > 0) {
foreach ($ocsResult['SNMP'] as $snmp) {
@@ -312,7 +311,7 @@ static function showForItem(CommonDBTM $item) {
$target = Toolbox::getItemTypeFormURL(__CLASS__);
- if (in_array($item->getType(), array('Computer'))) {
+ if (in_array($item->getType(), ['Computer'])) {
$items_id = $item->getField('id');
if (!empty($items_id)
@@ -400,14 +399,14 @@ static function showForItem(CommonDBTM $item) {
if ($_SESSION['glpi_use_mode'] == Session::DEBUG_MODE) {
$ocsClient = PluginOcsinventoryngOcsServer::getDBocs($data["plugin_ocsinventoryng_ocsservers_id"]);
- $options = array(
- 'DISPLAY' => array(
+ $options = [
+ 'DISPLAY' => [
'CHECKSUM' => PluginOcsinventoryngOcsClient::CHECKSUM_HARDWARE,
'PLUGINS' => PluginOcsinventoryngOcsClient::PLUGINS_ALL
- ),
+ ],
'COMPLETE' => 1
- );
- $computer = array();
+ ];
+ $computer = [];
$checksum_client = 0;
$computer = $ocsClient->getComputer($data["ocsid"], $options);
echo "
";
@@ -618,10 +617,10 @@ static function addComputer_Item(CommonDBTM $item) {
**/
static function purgeComputer(Computer $comp) {
$link = new self();
- $link->deleteByCriteria(array('computers_id' => $comp->getField("id")));
+ $link->deleteByCriteria(['computers_id' => $comp->getField("id")]);
$reg = new PluginOcsinventoryngRegistryKey();
- $reg->deleteByCriteria(array('computers_id' => $comp->getField("id")));
+ $reg->deleteByCriteria(['computers_id' => $comp->getField("id")]);
}
@@ -655,7 +654,6 @@ static function purgeComputer_Item(Computer_Item $comp) {
// 2 : a deconnection's status have been defined
// 3 : unique with serial
-
if (($mode >= 2)
&& (strlen($decoConf) > 0)
) {
@@ -710,7 +708,7 @@ function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) {
switch ($item->getType()) {
case 'Computer' :
if (!$withtemplate) {
- return array('1' => _n('OCSNG link', 'OCSNG links', 1, 'ocsinventoryng'));
+ return ['1' => _n('OCSNG link', 'OCSNG links', 1, 'ocsinventoryng')];
}
}
}
@@ -816,4 +814,4 @@ static function getOCSServerForItem(CommonDBTM $item) {
return false;
}
}
-}
\ No newline at end of file
+}
diff --git a/inc/ocsserver.class.php b/inc/ocsserver.class.php
index 8bb80268..e5cb8872 100644
--- a/inc/ocsserver.class.php
+++ b/inc/ocsserver.class.php
@@ -38,7 +38,7 @@
*/
class PluginOcsinventoryngOcsServer extends CommonDBTM {
- static $types = array('Computer');
+ static $types = ['Computer'];
static $rightname = "plugin_ocsinventoryng";
// From CommonDBTM
public $dohistory = true;
@@ -145,7 +145,6 @@ function getTabNameForItem(CommonGLPI $item, $withtemplate = 0) {
return $ong;
}
-
}
return '';
}
@@ -190,9 +189,9 @@ static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtem
*
* @return array
*/
- function defineTabs($options = array()) {
+ function defineTabs($options = []) {
- $ong = array();
+ $ong = [];
$this->addDefaultFormTab($ong);
$this->addStandardTab(__CLASS__, $ong, $options);
$this->addStandardTab('PluginOcsinventoryngSnmpOcslink', $ong, $options);
@@ -206,7 +205,7 @@ function defineTabs($options = array()) {
*/
function getSearchOptions() {
- $tab = array();
+ $tab = [];
$tab['common'] = self::getTypeName();
@@ -265,7 +264,7 @@ function getSearchOptions() {
static function setupMenu($plugin_ocsinventoryng_ocsservers_id) {
global $CFG_GLPI, $DB;
$name = "";
- $ocsservers = array();
+ $ocsservers = [];
//echo "
";
@@ -1052,10 +1049,10 @@ function form_init_all(form, value) {
}
JAVASCRIPT;
- Dropdown::showYesNo('init_all', 0, -1, array(
+ Dropdown::showYesNo('init_all', 0, -1, [
'width' => '10%',
'on_change' => "form_init_all(this.form, this.selectedIndex);"
- ));
+ ]);
echo " ";
echo "
" . __('General history', 'ocsinventoryng') .
@@ -1178,14 +1175,14 @@ function ocsFormImportOptions($ID) {
echo " " . __('Default status', 'ocsinventoryng') .
" \n";
- State::dropdown(array('name' => 'states_id_default',
- 'value' => $this->fields["states_id_default"]));
+ State::dropdown(['name' => 'states_id_default',
+ 'value' => $this->fields["states_id_default"]]);
echo " " . __('Behavior when disconnecting', 'ocsinventoryng') . " \n";
- Dropdown::showFromArray("deconnection_behavior", array('' => __('Preserve link', 'ocsinventoryng'),
+ Dropdown::showFromArray("deconnection_behavior", ['' => __('Preserve link', 'ocsinventoryng'),
"trash" => __('Put the link in dustbin and add a lock', 'ocsinventoryng'),
- "delete" => __('Delete the link permanently', 'ocsinventoryng')), array('value' => $this->fields["deconnection_behavior"]));
+ "delete" => __('Delete the link permanently', 'ocsinventoryng')], ['value' => $this->fields["deconnection_behavior"]]);
echo " ";
echo __("Define the action to do on link with other objects when computer is disconnecting from them", 'ocsinventoryng');
@@ -1201,9 +1198,9 @@ function ocsFormImportOptions($ID) {
echo " " .
__('Number of items to synchronize via the automatic OCSNG action', 'ocsinventoryng') .
" \n";
- Dropdown::showNumber('cron_sync_number', array('value' => $this->fields['cron_sync_number'],
+ Dropdown::showNumber('cron_sync_number', ['value' => $this->fields['cron_sync_number'],
'min' => 1,
- 'toadd' => array(0 => __('None'))));
+ 'toadd' => [0 => __('None')]]);
echo " ";
@@ -1220,7 +1217,7 @@ function ocsFormImportOptions($ID) {
foreach (getAllDatasFromTable('glpi_states') as $state) {
$actions['STATE_' . $state['id']] = sprintf(__('Change to state %s', 'ocsinventoryng'), $state['name']);
}
- Dropdown::showFromArray('deleted_behavior', $actions, array('value' => $this->fields['deleted_behavior']));
+ Dropdown::showFromArray('deleted_behavior', $actions, ['value' => $this->fields['deleted_behavior']]);
echo " ";
@@ -1255,26 +1252,26 @@ function post_getEmpty() {
*
* @return Nothing (display)
* */
- function showForm($ID, $options = array()) {
+ function showForm($ID, $options = []) {
$this->initForm($ID, $options);
$this->showFormHeader($options);
- $conn_type_values = array(
+ $conn_type_values = [
0 => __('Database', 'ocsinventoryng'),
//1 => __('Webservice (SOAP)', 'ocsinventoryng'),
- );
+ ];
- $sync_method_values = array(
+ $sync_method_values = [
0 => __("Standard (allow manual actions)", "ocsinventoryng"),
1 => __("Expert (Fully automatic, for large configuration)", "ocsinventoryng")
- );
+ ];
echo " ";
echo "" . __('Connection type', 'ocsinventoryng') . " ";
echo "";
- Dropdown::showFromArray('conn_type', $conn_type_values, array('value' => $this->fields['conn_type'],
- 'on_change' => "form_init_all(this.form, this.selectedIndex);"));
+ Dropdown::showFromArray('conn_type', $conn_type_values, ['value' => $this->fields['conn_type'],
+ 'on_change' => "form_init_all(this.form, this.selectedIndex);"]);
echo " ";
echo "" . __("Active") . " ";
echo "";
@@ -1296,7 +1293,7 @@ function showForm($ID, $options = array()) {
echo " ";
Html::showSimpleForm(Toolbox::getItemTypeFormURL("PluginOcsinventoryngOcsServer"), 'force_checksum',
_sx('button', 'Reload Checksum', 'ocsinventoryng'),
- array('id' => $ID));
+ ['id' => $ID]);
}
echo " ";
echo " ";
@@ -1309,7 +1306,7 @@ function showForm($ID, $options = array()) {
echo "";
echo "" . __("Synchronisation method", "ocsinventoryng") . " ";
echo "";
- Dropdown::showFromArray('use_massimport', $sync_method_values, array('value' => $this->fields['use_massimport']));
+ Dropdown::showFromArray('use_massimport', $sync_method_values, ['value' => $this->fields['use_massimport']]);
echo " ";
echo "
| " . self::getTypeName($result->numrows()) . @@ -137,15 +137,15 @@ static function showForComputer(Computer $comp, $withtemplate = '') { echo " | ||||
|---|---|---|---|---|
| " . $data['drive'] . " | "; echo "" . $data['path'] . " | "; - $tmp = Toolbox::getSize(str_replace(",",".", $data['size']) * 1024 * 1024 * 1024 * 1024); + $tmp = Toolbox::getSize(str_replace(",", ".", $data['size']) * 1024 * 1024 * 1024 * 1024); echo "" . $tmp . " | "; - $tmp = Toolbox::getSize(str_replace(",",".", $data['freespace']) * 1024 * 1024 * 1024 * 1024); + $tmp = Toolbox::getSize(str_replace(",", ".", $data['freespace']) * 1024 * 1024 * 1024 * 1024); echo "" . $tmp . " | "; echo "";
$percent = 0;
- $total = str_replace(",",".", $data['size']);
- $free = str_replace(",",".", $data['freespace']);
+ $total = str_replace(",", ".", $data['size']);
+ $free = str_replace(",", ".", $data['freespace']);
if ($total > 0) {
$percent = round(100*$free/$total);
}
@@ -165,4 +165,4 @@ static function showForComputer(Computer $comp, $withtemplate = '') {
}
echo "";
}
-}
\ No newline at end of file
+}
diff --git a/inc/notificationtargetnotimportedcomputer.class.php b/inc/notificationtargetnotimportedcomputer.class.php
index ae5f5a80..bf0bd9f9 100644
--- a/inc/notificationtargetnotimportedcomputer.class.php
+++ b/inc/notificationtargetnotimportedcomputer.class.php
@@ -9,7 +9,7 @@
-------------------------------------------------------------------------
LICENSE
-
+
This file is part of ocsinventoryng.
ocsinventoryng is free software; you can redistribute it and/or modify
@@ -41,10 +41,9 @@ class PluginOcsinventoryngNotificationTargetNotImportedcomputer extends Notifica
/**
* @return array
*/
- function getEvents()
- {
- return array('not_imported' => __('Computers not imported by automatic actions',
- 'ocsinventoryng'));
+ function getEvents() {
+ return ['not_imported' => __('Computers not imported by automatic actions',
+ 'ocsinventoryng')];
}
@@ -52,15 +51,14 @@ function getEvents()
* @param $event
* @param array $options
*/
- function getDatasForTemplate($event, $options = array())
- {
+ function getDatasForTemplate($event, $options = []) {
global $CFG_GLPI;
$this->datas['##notimported.entity##'] = Dropdown::getDropdownName('glpi_entities',
$options['entities_id']);
foreach ($options['notimported'] as $id => $item) {
- $tmp = array();
+ $tmp = [];
$tmp['##notimported.name##'] = $item['name'];
$tmp['##notimported.serial##'] = $item['serial'];
@@ -89,10 +87,9 @@ function getDatasForTemplate($event, $options = array())
/**
*
*/
- function getTags()
- {
+ function getTags() {
- $tags = array('notimported.id' => __('ID'),
+ $tags = ['notimported.id' => __('ID'),
'notimported.url' => __('Web link'),
'notimported.tag' => __('OCSNG TAG', 'ocsinventoryng'),
'notimported.name' => __('Name'),
@@ -101,12 +98,12 @@ function getTags()
'notimported.ocsid' => __('OCSNG ID', 'ocsinventoryng'),
'notimported.deviceid' => __('Device ID', 'ocsinventoryng'),
'notimported.reason' => __('Reason of rejection'),
- 'notimported.serial' => __('Serial number'));
+ 'notimported.serial' => __('Serial number')];
foreach ($tags as $tag => $label) {
- $this->addTagToList(array('tag' => $tag, 'label' => $label,
- 'value' => true));
+ $this->addTagToList(['tag' => $tag, 'label' => $label,
+ 'value' => true]);
}
asort($this->tag_descriptions);
}
-}
\ No newline at end of file
+}
diff --git a/inc/notificationtargetruleimportentity.class.php b/inc/notificationtargetruleimportentity.class.php
index 7f308fef..71000384 100644
--- a/inc/notificationtargetruleimportentity.class.php
+++ b/inc/notificationtargetruleimportentity.class.php
@@ -35,38 +35,36 @@
* Class PluginOcsinventoryngNotificationRuleImportEntity
*/
class PluginOcsinventoryngNotificationTargetRuleImportEntity extends NotificationTarget {
-
+
/**
* @param int $nb
* @return translated
*/
- static function getTypeName($nb = 0)
- {
+ static function getTypeName($nb = 0) {
return __('Elements not match with the rule', 'ocsinventoryng');
}
/**
* @see NotificationTarget::getEvents()
*/
- function getEvents()
- {
- return array('checkruleimportentity' => __('Elements not match with the rule by automatic actions', 'ocsinventoryng'));
+ function getEvents() {
+ return ['checkruleimportentity' => __('Elements not match with the rule by automatic actions', 'ocsinventoryng')];
}
/**
* @see NotificationTarget::getDatasForTemplate()
*/
- function getDatasForTemplate($event, $options = array()) {
+ function getDatasForTemplate($event, $options = []) {
global $CFG_GLPI;
$this->datas['##checkruleimportentity.date##'] = Html::convDateTime(date('Y-m-d H:i:s'));
$this->datas['##checkruleimportentity.title##'] = __('Verification of assignment rules for entities and locations', 'ocsinventoryng');
- $this->datas['##checkruleimportentity.entity##'] = Dropdown::getDropdownName('glpi_entities',$options['entities_id']);
+ $this->datas['##checkruleimportentity.entity##'] = Dropdown::getDropdownName('glpi_entities', $options['entities_id']);
foreach ($options['items'] as $id => $item) {
- if(!empty($item)) {
- $tmp = array();
+ if (!empty($item)) {
+ $tmp = [];
$tmp['##checkruleimportentity.entity##'] = Dropdown::getDropdownName('glpi_entities', $item['entities_id']);
$tmp['##checkruleimportentity.computer##'] = $item['name'];
@@ -81,7 +79,7 @@ function getDatasForTemplate($event, $options = array()) {
foreach ($item['error'] as $key => $data) {
- if($data === PluginOcsinventoryngRuleImportEntity::NO_RULE){
+ if ($data === PluginOcsinventoryngRuleImportEntity::NO_RULE) {
$tmp['##checkruleimportentity.error##'] .= __('No rules match', 'ocsinventoryng');
} else {
$tmp['##checkruleimportentity.error##'] .= __($data) . "\n";
@@ -116,26 +114,26 @@ function getDatasForTemplate($event, $options = array()) {
*/
function getTags() {
- $tags = array('checkruleimportentity.date' => __('Date'),
+ $tags = ['checkruleimportentity.date' => __('Date'),
'checkruleimportentity.url' => __('Link'),
'checkruleimportentity.entity' => __('Entity'),
'checkruleimportentity.computer' => __('Computer'),
'checkruleimportentity.location' => __('Location'),
'checkruleimportentity.error' => __('Error'),
'checkruleimportentity.name_rule' => __('Rule'),
- 'checkruleimportentity.dataerror' => __('Data error', 'ocsinventoryng'));
+ 'checkruleimportentity.dataerror' => __('Data error', 'ocsinventoryng')];
foreach ($tags as $tag => $label) {
- $this->addTagToList(array('tag' => $tag,
+ $this->addTagToList(['tag' => $tag,
'label' => $label,
- 'value' => true));
+ 'value' => true]);
}
- $this->addTagToList(array('tag' => 'checkruleimportentityitems',
+ $this->addTagToList(['tag' => 'checkruleimportentityitems',
'label' => _n('Item', 'Items', 2),
'value' => false,
'foreach' => true,
- 'events' => array('checkruleimportentity')));
+ 'events' => ['checkruleimportentity']]);
asort($this->tag_descriptions);
}
-}
\ No newline at end of file
+}
diff --git a/inc/notimportedcomputer.class.php b/inc/notimportedcomputer.class.php
index adb9a8ad..9dc21a69 100644
--- a/inc/notimportedcomputer.class.php
+++ b/inc/notimportedcomputer.class.php
@@ -10,7 +10,7 @@
-------------------------------------------------------------------------
LICENSE
-
+
This file is part of ocsinventoryng.
ocsinventoryng is free software; you can redistribute it and/or modify
@@ -45,8 +45,7 @@ class PluginOcsinventoryngNotimportedcomputer extends CommonDropdown
* @param int $nb
* @return translated
*/
- static function getTypeName($nb = 0)
- {
+ static function getTypeName($nb = 0) {
return _n('Computer not imported', 'Computers not imported', $nb, 'ocsinventoryng');
}
@@ -54,44 +53,43 @@ static function getTypeName($nb = 0)
/**
* @return array
*/
- function getAdditionalFields()
- {
+ function getAdditionalFields() {
$can_update = PluginOcsinventoryngConfig::canUpdateOCS();
- return array(array('name' => 'reason',
+ return [['name' => 'reason',
'label' => __('Reason of rejection'),
- 'type' => 'reason'),
- array('name' => 'rules_id',
+ 'type' => 'reason'],
+ ['name' => 'rules_id',
'label' => __('Verified rules', 'ocsinventoryng'),
- 'type' => 'echo_rule'),
- array('name' => 'ocsid',
+ 'type' => 'echo_rule'],
+ ['name' => 'ocsid',
'label' => __('OCSNG ID', 'ocsinventoryng'),
- 'type' => 'echo'),
- array('name' => 'plugin_ocsinventoryng_ocsservers_id',
+ 'type' => 'echo'],
+ ['name' => 'plugin_ocsinventoryng_ocsservers_id',
'label' => __('Server'),
'type' => 'echo_dropdown',
- 'table' => 'glpi_plugin_ocsinventoryng_ocsservers'),
- array('name' => 'ocs_deviceid',
+ 'table' => 'glpi_plugin_ocsinventoryng_ocsservers'],
+ ['name' => 'ocs_deviceid',
'label' => __('Device ID', 'ocsinventoryng'),
- 'type' => 'echo'),
- array('name' => 'serial',
+ 'type' => 'echo'],
+ ['name' => 'serial',
'label' => __('Serial number'),
- 'type' => ($can_update ? 'text' : 'echo')),
- array('name' => 'tag',
+ 'type' => ($can_update ? 'text' : 'echo')],
+ ['name' => 'tag',
'label' => __('OCSNG TAG', 'ocsinventoryng'),
- 'type' => ($can_update ? 'text' : 'echo')),
- array('name' => 'useragent',
+ 'type' => ($can_update ? 'text' : 'echo')],
+ ['name' => 'useragent',
'label' => __('Inventory agent', 'ocsinventoryng'),
- 'type' => 'echo'),
- array('name' => 'ipaddr',
+ 'type' => 'echo'],
+ ['name' => 'ipaddr',
'label' => __('IP'),
- 'type' => 'echo'),
- array('name' => 'domain',
+ 'type' => 'echo'],
+ ['name' => 'domain',
'label' => __('Domain'),
- 'type' => 'echo'),
- array('name' => 'last_inventory',
+ 'type' => 'echo'],
+ ['name' => 'last_inventory',
'label' => __('Last OCSNG inventory date', 'ocsinventoryng'),
- 'type' => 'echo_datetime'));
+ 'type' => 'echo_datetime']];
}
@@ -101,10 +99,9 @@ function getAdditionalFields()
* @internal param array $options
*
*/
- function defineMoreTabs()
- {
+ function defineMoreTabs() {
- $ong = array();
+ $ong = [];
if (PluginOcsinventoryngOcsServer::getComputerLinkToOcsConsole($this->fields['plugin_ocsinventoryng_ocsservers_id'],
$this->fields['ocsid'], '',
true) != ''
@@ -126,8 +123,7 @@ function defineMoreTabs()
* @internal param array $field the item's fields
*
*/
- function displaySpecificTypeField($ID, $field = array())
- {
+ function displaySpecificTypeField($ID, $field = []) {
switch ($field['type']) {
case 'echo' :
@@ -164,10 +160,9 @@ function displaySpecificTypeField($ID, $field = array())
* @return string
* @return string
*/
- static function getRuleMatchedMessage($rule_list)
- {
+ static function getRuleMatchedMessage($rule_list) {
- $message = array();
+ $message = [];
if ($rule_list != '') {
foreach (json_decode($rule_list, true) as $key => $value) {
if ($rule = getItemForItemtype($key)) {
@@ -185,8 +180,7 @@ static function getRuleMatchedMessage($rule_list)
}
- function displayOcsConsole()
- {
+ function displayOcsConsole() {
$url = PluginOcsinventoryngOcsServer::getComputerLinkToOcsConsole($this->fields['plugin_ocsinventoryng_ocsservers_id'],
$this->fields['ocsid'], '',
@@ -204,8 +198,7 @@ function displayOcsConsole()
*
* @param $tab
**/
- function displayMoreTabs($tab)
- {
+ function displayMoreTabs($tab) {
switch ($tab) {
case 1 :
@@ -231,10 +224,9 @@ function displayMoreTabs($tab)
/**
* @return array
*/
- function getSearchOptions()
- {
+ function getSearchOptions() {
- $tab = array();
+ $tab = [];
$tab['common'] = _n('Computer not imported', 'Computers not imported', 2,
'ocsinventoryng');
@@ -311,21 +303,19 @@ function getSearchOptions()
* @param $ocsid
* @param $reason
**/
- function logNotImported($ocsservers_id, $ocsid, $reason)
- {
+ function logNotImported($ocsservers_id, $ocsid, $reason) {
global $DB;
PluginOcsinventoryngOcsServer::checkOCSconnection($ocsservers_id);
$ocsClient = PluginOcsinventoryngOcsServer::getDBocs($ocsservers_id);
- $options = array(
- "DISPLAY" => array(
+ $options = [
+ "DISPLAY" => [
"CHECKSUM" => PluginOcsinventoryngOcsClient::CHECKSUM_HARDWARE
| PluginOcsinventoryngOcsClient::CHECKSUM_BIOS
- )
- );
+ ]
+ ];
$computer = $ocsClient->getComputer($ocsid, $options);
-
if ((isset($computer["HARDWARE"]) && $computer["HARDWARE"])
&& (isset($computer["BIOS"]) && $computer["BIOS"])) {
$input["_ocs"] = true;
@@ -370,8 +360,7 @@ function logNotImported($ocsservers_id, $ocsid, $reason)
* @return int|number
* @return int|number
*/
- function cleanNotImported($ocsservers_id = -1, $ocsid = -1)
- {
+ function cleanNotImported($ocsservers_id = -1, $ocsid = -1) {
global $DB;
$first = true;
@@ -405,8 +394,7 @@ function cleanNotImported($ocsservers_id = -1, $ocsid = -1)
* @internal param if $not_imported_id of the computer that is not imported in GLPI
*
*/
- function deleteNotImportedComputer($not_imported_id)
- {
+ function deleteNotImportedComputer($not_imported_id) {
if ($this->getFromDB($not_imported_id)) {
PluginUninstallUninstall::deleteComputerInOCS($this->fields["ocsid"],
@@ -423,8 +411,7 @@ function deleteNotImportedComputer($not_imported_id)
* @return string|translated
* @return string|translated
*/
- static function getReason($reason)
- {
+ static function getReason($reason) {
switch ($reason) {
case PluginOcsinventoryngOcsServer::COMPUTER_FAILED_IMPORT :
@@ -445,8 +432,7 @@ static function getReason($reason)
/**
* @param $notimported PluginOcsinventoryngNotimportedcomputer object
**/
- static function showActions(PluginOcsinventoryngNotimportedcomputer $notimported)
- {
+ static function showActions(PluginOcsinventoryngNotimportedcomputer $notimported) {
echo " ";
echo " |
| "; echo __('If you not find your OCSNG server in this dropdown, please check if your profile can access it !', 'ocsinventoryng'); @@ -383,7 +382,7 @@ static function setupMenu($plugin_ocsinventoryng_ocsservers_id) { static function importMenu($plugin_ocsinventoryng_ocsservers_id) { global $CFG_GLPI, $DB; $name = ""; - $ocsservers = array(); + $ocsservers = []; $numberActiveServers = countElementsInTable('glpi_plugin_ocsinventoryng_ocsservers', "`is_active`='1'"); if ($numberActiveServers > 0) { echo " | ||||||||||||||||||||||
| "; echo __('If you not find your OCSNG server in this dropdown, please check if your profile can access it !', 'ocsinventoryng'); @@ -595,16 +594,15 @@ function form_init_all(form, value) { } JAVASCRIPT; - Dropdown::showYesNo('init_all', 0, -1, array( + Dropdown::showYesNo('init_all', 0, -1, [ 'width' => '10%', 'on_change' => "form_init_all(this.form, this.selectedIndex);" - )); + ]); echo " | ||||||||||||||||||||||
\n";
-
echo $JS = <<| " . __('Linked objects', 'ocsinventoryng') . " | \n";
- $import_array = array("0" => __('No import'),
+ $import_array = ["0" => __('No import'),
"1" => __('Global import', 'ocsinventoryng'),
- "2" => __('Unit import', 'ocsinventoryng'));
+ "2" => __('Unit import', 'ocsinventoryng')];
- $import_array2 = array("0" => __('No import'),
+ $import_array2 = ["0" => __('No import'),
"1" => __('Global import', 'ocsinventoryng'),
"2" => __('Unit import', 'ocsinventoryng'),
"3" => __('Unit import on serial number', 'ocsinventoryng'),
- "4" => __('Unit import serial number only', 'ocsinventoryng'));
+ "4" => __('Unit import serial number only', 'ocsinventoryng')];
$periph = $this->fields["import_periph"];
$monitor = $this->fields["import_monitor"];
@@ -806,23 +804,23 @@ function accordion(id, openall) {
$software = $this->fields["import_software"];
echo "" . _n('Device', 'Devices', 2) . " | \n";
- Dropdown::showFromArray("import_periph", $import_array, array('value' => $periph));
+ Dropdown::showFromArray("import_periph", $import_array, ['value' => $periph]);
echo " | \n";
echo "" . _n('Monitor', 'Monitors', 2) . " | \n";
- Dropdown::showFromArray("import_monitor", $import_array2, array('value' => $monitor));
+ Dropdown::showFromArray("import_monitor", $import_array2, ['value' => $monitor]);
echo " | " . __('Comments') . " " . _n('Monitor', 'Monitors', 2) . " | \n";
Dropdown::showYesNo("import_monitor_comment", $this->fields["import_monitor_comment"]);
echo " | \n";
echo "" . _n('Printer', 'Printers', 2) . " | \n";
- Dropdown::showFromArray("import_printer", $import_array, array('value' => $printer));
+ Dropdown::showFromArray("import_printer", $import_array, ['value' => $printer]);
echo " | " . _n('Software', 'Software', 2) . " | \n";
- $import_array = array("0" => __('No import'),
- "1" => __('Unit import', 'ocsinventoryng'));
- Dropdown::showFromArray("import_software", $import_array, array('value' => $software));
+ $import_array = ["0" => __('No import'),
+ "1" => __('Unit import', 'ocsinventoryng')];
+ Dropdown::showFromArray("import_software", $import_array, ['value' => $software]);
echo " | \n";
echo "" . _n('Volume', 'Volumes', 2) . " | \n";
Dropdown::showYesNo("import_disk", $this->fields["import_disk"]);
@@ -883,7 +881,6 @@ function accordion(id, openall) {
Html::showToolTip(nl2br(__('Winupdate Plugin for OCSNG (https://github.com/PluginsOCSInventory-NG/winupdate) must be installed', 'ocsinventoryng')));
echo " | " . __('Teamviewer', 'ocsinventoryng') . " | \n";
Dropdown::showYesNo("import_teamviewer", $this->fields["import_teamviewer"]);
echo " ";
@@ -946,8 +943,8 @@ function accordion(id, openall) {
$link->getFromDBbyOcsServerIDAndGlpiColumn($ID, "otherserial");
$value = (isset($link->fields["ocs_column"]) ? $link->fields["ocs_column"] : "");
- Dropdown::showFromArray("import_otherserial", $oserial, array('value' => $value,
- 'width' => '100%'));
+ Dropdown::showFromArray("import_otherserial", $oserial, ['value' => $value,
+ 'width' => '100%']);
echo " | \n";
echo "" . __('Location') . " | \n";
echo "";
@@ -955,8 +952,8 @@ function accordion(id, openall) {
$link->getFromDBbyOcsServerIDAndGlpiColumn($ID, "locations_id");
$value = (isset($link->fields["ocs_column"]) ? $link->fields["ocs_column"] : "");
- Dropdown::showFromArray("import_location", $opt, array('value' => $value,
- 'width' => '100%'));
+ Dropdown::showFromArray("import_location", $opt, ['value' => $value,
+ 'width' => '100%']);
echo " | " . __('Group') . " | \n";
@@ -965,8 +962,8 @@ function accordion(id, openall) {
$link->getFromDBbyOcsServerIDAndGlpiColumn($ID, "groups_id");
$value = (isset($link->fields["ocs_column"]) ? $link->fields["ocs_column"] : "");
- Dropdown::showFromArray("import_group", $opt, array('value' => $value,
- 'width' => '100%'));
+ Dropdown::showFromArray("import_group", $opt, ['value' => $value,
+ 'width' => '100%']);
echo "\n";
echo "" . __('Alternate username number') . " | \n";
@@ -975,8 +972,8 @@ function accordion(id, openall) {
$link->getFromDBbyOcsServerIDAndGlpiColumn($ID, "contact_num");
$value = (isset($link->fields["ocs_column"]) ? $link->fields["ocs_column"] : "");
- Dropdown::showFromArray("import_contact_num", $opt, array('value' => $value,
- 'width' => '100%'));
+ Dropdown::showFromArray("import_contact_num", $opt, ['value' => $value,
+ 'width' => '100%']);
echo " | \n";
$opt_date = self::getColumnListFromAccountInfoTable($ID, 'hardware');
@@ -997,8 +994,8 @@ function accordion(id, openall) {
$link->getFromDBbyOcsServerIDAndGlpiColumn($ID, "use_date");
$value = (isset($link->fields["ocs_column"]) ? $link->fields["ocs_column"] : "");
- Dropdown::showFromArray("import_use_date", $opt_date, array('value' => $value,
- 'width' => '100%'));
+ Dropdown::showFromArray("import_use_date", $opt_date, ['value' => $value,
+ 'width' => '100%']);
echo "|||
";
echo "";
@@ -7773,14 +7761,14 @@ static function transferComputer($line_links) {
// Get all rules for the current plugin_ocsinventoryng_ocsservers_id
$rule = new RuleImportEntityCollection();
- $data = $rule->processAllRules(array('ocsservers_id' => $line_links["plugin_ocsinventoryng_ocsservers_id"],
+ $data = $rule->processAllRules(['ocsservers_id' => $line_links["plugin_ocsinventoryng_ocsservers_id"],
'_source' => 'ocsinventoryng',
'locations_id' => $locations_id,
'groups_id' => $groups_id
- ), array(
+ ], [
'locations_id' => $locations_id,
'groups_id' => $groups_id
- ), array('ocsid' => $line_links["ocsid"]));
+ ], ['ocsid' => $line_links["ocsid"]]);
// If entity is changing move items to the new entities_id
if (isset($data['entities_id']) && $data['entities_id'] > -1 && $data['entities_id'] != $line_links['entities_id']) {
@@ -7792,8 +7780,8 @@ static function transferComputer($line_links) {
$transfer = new Transfer();
$transfer->getFromDB($CFG_GLPI['transfers_id_auto']);
- $item_to_transfer = array("Computer" => array($line_links['computers_id']
- => $line_links['computers_id']));
+ $item_to_transfer = ["Computer" => [$line_links['computers_id']
+ => $line_links['computers_id']]];
$transfer->moveItems($item_to_transfer, $data['entities_id'], $transfer->fields);
}
@@ -7810,7 +7798,7 @@ static function transferComputer($line_links) {
*
* @return array|int
*/
- static private function getUserGroup ($entity, $userid, $filter='', $first=true) {
+ static private function getUserGroup ($entity, $userid, $filter = '', $first = true) {
global $DB;
$query = "SELECT `glpi_groups`.`id`
@@ -7918,7 +7906,7 @@ static function getLocksForComputer($ID) {
$query = "SELECT *
FROM `glpi_plugin_ocsinventoryng_ocslinks`
WHERE `computers_id` = '$ID'";
- $locks = array();
+ $locks = [];
$result = $DB->query($query);
if ($DB->numrows($result) == 1) {
$data = $DB->fetch_assoc($result);
@@ -8037,7 +8025,7 @@ static function getTypes($all = false) {
*/
static function getLockableFields() {
- return array("name" => __('Name'),
+ return ["name" => __('Name'),
"computertypes_id" => __('Type'),
"manufacturers_id" => __('Manufacturer'),
"computermodels_id" => __('Model'),
@@ -8057,7 +8045,7 @@ static function getLockableFields() {
"users_id" => __('User'),
"locations_id" => __('Location'),
"use_date" => __('Startup date'),
- "groups_id" => __('Group'));
+ "groups_id" => __('Group')];
}
/**
@@ -8125,12 +8113,12 @@ static function getFirstServer() {
static function importMonitor($cfg_ocs, $computers_id, $ocsservers_id, $ocsComputer, $entity) {
global $DB, $CFG_GLPI;
- $already_processed = array();
+ $already_processed = [];
$do_clean = true;
$m = new Monitor();
$conn = new Computer_Item();
- $monitors = array();
+ $monitors = [];
$checkserial = true;
// First pass - check if all serial present
@@ -8151,7 +8139,7 @@ static function importMonitor($cfg_ocs, $computers_id, $ocsservers_id, $ocsCompu
foreach ($monitors as $monitor) {
- $mon = array();
+ $mon = [];
if (!empty($monitor["CAPTION"])) {
$mon["name"] = self::encodeOcsDataInUtf8($cfg_ocs["ocs_db_utf8"], $monitor["CAPTION"]);
$mon["monitormodels_id"] = Dropdown::importExternal('MonitorModel', $monitor["CAPTION"]);
@@ -8221,7 +8209,7 @@ static function importMonitor($cfg_ocs, $computers_id, $ocsservers_id, $ocsCompu
$input["states_id"] = $cfg_ocs["states_id_default"];
}
$input["entities_id"] = $entity;
- $id_monitor = $m->add($input, array(), $cfg_ocs['history_monitor']);
+ $id_monitor = $m->add($input, [], $cfg_ocs['history_monitor']);
}
} else if ($cfg_ocs["import_monitor"] >= 2) {
//Config says : manage monitors as single units
@@ -8270,28 +8258,27 @@ static function importMonitor($cfg_ocs, $computers_id, $ocsservers_id, $ocsCompu
}
}
-
if (!$id_monitor) {
$input = $mon;
if ($cfg_ocs["states_id_default"] > 0) {
$input["states_id"] = $cfg_ocs["states_id_default"];
}
$input["entities_id"] = $entity;
- $id_monitor = $m->add($input, array(), $cfg_ocs['history_monitor']);
+ $id_monitor = $m->add($input, [], $cfg_ocs['history_monitor']);
}
} // ($cfg_ocs["import_monitor"] >= 2)
if ($id_monitor) {
//Import unique : Disconnect monitor on other computer done in Connect function
- $connID = $conn->add(array('computers_id' => $computers_id,
+ $connID = $conn->add(['computers_id' => $computers_id,
'itemtype' => 'Monitor',
'items_id' => $id_monitor,
'is_dynamic' => 1,
- 'is_deleted' => 0), array(), $cfg_ocs['history_monitor']);
+ 'is_deleted' => 0], [], $cfg_ocs['history_monitor']);
$already_processed[] = $id_monitor;
//Update column "is_deleted" set value to 0 and set status to default
- $input = array();
+ $input = [];
$old = new Monitor();
if ($old->getFromDB($id_monitor)) {
if ($old->fields["is_deleted"]) {
@@ -8386,14 +8373,14 @@ static function importMonitor($cfg_ocs, $computers_id, $ocsservers_id, $ocsCompu
static function importPrinter($cfg_ocs, $computers_id, $ocsservers_id, $ocsComputer, $entity) {
global $DB, $CFG_GLPI;
- $already_processed = array();
+ $already_processed = [];
$conn = new Computer_Item();
$p = new Printer();
foreach ($ocsComputer as $printer) {
$printer = Toolbox::clean_cross_side_scripting_deep(Toolbox::addslashes_deep($printer));
- $print = array();
+ $print = [];
// TO TEST : PARSE NAME to have real name.
$print['name'] = self::encodeOcsDataInUtf8($cfg_ocs["ocs_db_utf8"], $printer['NAME']);
@@ -8411,7 +8398,7 @@ static function importPrinter($cfg_ocs, $computers_id, $ocsservers_id, $ocsCompu
if (!empty($print["name"])) {
$rulecollection = new RuleDictionnaryPrinterCollection();
- $res_rule = Toolbox::addslashes_deep($rulecollection->processAllRules(Toolbox::stripslashes_deep($params), array(), array()));
+ $res_rule = Toolbox::addslashes_deep($rulecollection->processAllRules(Toolbox::stripslashes_deep($params), [], []));
if (!isset($res_rule["_ignore_import"]) || !$res_rule["_ignore_import"]) {
@@ -8478,7 +8465,7 @@ static function importPrinter($cfg_ocs, $computers_id, $ocsservers_id, $ocsCompu
$input["states_id"] = $cfg_ocs["states_id_default"];
}
$input["entities_id"] = $entity;
- $id_printer = $p->add($input, array(), $cfg_ocs['history_printer']);
+ $id_printer = $p->add($input, [], $cfg_ocs['history_printer']);
}
} else if ($management_process == 2) {
//Config says : manage printers as single units
@@ -8491,18 +8478,18 @@ static function importPrinter($cfg_ocs, $computers_id, $ocsservers_id, $ocsCompu
}
$input["entities_id"] = $entity;
$input['is_dynamic'] = 1;
- $id_printer = $p->add($input, array(), $cfg_ocs['history_printer']);
+ $id_printer = $p->add($input, [], $cfg_ocs['history_printer']);
}
if ($id_printer) {
$already_processed[] = $id_printer;
$conn = new Computer_Item();
- $connID = $conn->add(array('computers_id' => $computers_id,
+ $connID = $conn->add(['computers_id' => $computers_id,
'itemtype' => 'Printer',
'items_id' => $id_printer,
- 'is_dynamic' => 1), array(), $cfg_ocs['history_printer']);
+ 'is_dynamic' => 1], [], $cfg_ocs['history_printer']);
//Update column "is_deleted" set value to 0 and set status to default
- $input = array();
+ $input = [];
$input["id"] = $id_printer;
$input["is_deleted"] = 0;
$input["entities_id"] = $entity;
@@ -8582,11 +8569,11 @@ static function importPrinter($cfg_ocs, $computers_id, $ocsservers_id, $ocsCompu
static function importPeripheral($cfg_ocs, $computers_id, $ocsservers_id, $ocsComputer, $entity) {
global $DB, $CFG_GLPI;
- $already_processed = array();
+ $already_processed = [];
$p = new Peripheral();
$conn = new Computer_Item();
- $peripherals = array();
+ $peripherals = [];
foreach ($ocsComputer as $peripheral) {
@@ -8597,7 +8584,7 @@ static function importPeripheral($cfg_ocs, $computers_id, $ocsservers_id, $ocsCo
if (count($peripherals) > 0) {
foreach ($peripherals as $peripheral) {
$peripheral = Toolbox::clean_cross_side_scripting_deep(Toolbox::addslashes_deep($peripheral));
- $periph = array();
+ $periph = [];
$periph["name"] = self::encodeOcsDataInUtf8($cfg_ocs["ocs_db_utf8"], $peripheral["CAPTION"]);
//Look for a monitor with the same name (and serial if possible) already connected
//to this computer
@@ -8648,7 +8635,7 @@ static function importPeripheral($cfg_ocs, $computers_id, $ocsservers_id, $ocsCo
$input["states_id"] = $cfg_ocs["states_id_default"];
}
$input["entities_id"] = $entity;
- $id_periph = $p->add($input, array(), $cfg_ocs['history_peripheral']);
+ $id_periph = $p->add($input, [], $cfg_ocs['history_peripheral']);
}
} else if ($cfg_ocs["import_periph"] == 2) {
//Config says : manage peripherals as single units
@@ -8659,19 +8646,19 @@ static function importPeripheral($cfg_ocs, $computers_id, $ocsservers_id, $ocsCo
$input["states_id"] = $cfg_ocs["states_id_default"];
}
$input["entities_id"] = $entity;
- $id_periph = $p->add($input, array(), $cfg_ocs['history_peripheral']);
+ $id_periph = $p->add($input, [], $cfg_ocs['history_peripheral']);
}
if ($id_periph) {
$already_processed[] = $id_periph;
$conn = new Computer_Item();
- if ($connID = $conn->add(array('computers_id' => $computers_id,
+ if ($connID = $conn->add(['computers_id' => $computers_id,
'itemtype' => 'Peripheral',
'items_id' => $id_periph,
- 'is_dynamic' => 1), array(), $cfg_ocs['history_peripheral'])
+ 'is_dynamic' => 1], [], $cfg_ocs['history_peripheral'])
) {
//Update column "is_deleted" set value to 0 and set status to default
- $input = array();
+ $input = [];
$input["id"] = $id_periph;
$input["is_deleted"] = 0;
$input["entities_id"] = $entity;
@@ -8743,7 +8730,7 @@ static function importPeripheral($cfg_ocs, $computers_id, $ocsservers_id, $ocsCo
*
* @return an
*/
- function getSpecificMassiveActions($checkitem = NULL) {
+ function getSpecificMassiveActions($checkitem = null) {
$actions = parent::getSpecificMassiveActions($checkitem);
@@ -8764,21 +8751,21 @@ static function showMassiveActionsSubForm(MassiveAction $ma) {
switch ($ma->getAction()) {
case 'plugin_ocsinventoryng_force_ocsng_update':
echo " " .
- Html::submit(_x('button', 'Post'), array('name' => 'massiveaction'));
+ Html::submit(_x('button', 'Post'), ['name' => 'massiveaction']);
return true;
case 'plugin_ocsinventoryng_lock_ocsng_field':
$fields['all'] = __('All');
$fields += self::getLockableFields();
Dropdown::showFromArray("field", $fields);
echo " " .
- Html::submit(_x('button', 'Post'), array('name' => 'massiveaction'));
+ Html::submit(_x('button', 'Post'), ['name' => 'massiveaction']);
return true;
case 'plugin_ocsinventoryng_unlock_ocsng_field':
$fields['all'] = __('All');
$fields += self::getLockableFields();
Dropdown::showFromArray("field", $fields);
echo " " .
- Html::submit(_x('button', 'Post'), array('name' => 'massiveaction'));
+ Html::submit(_x('button', 'Post'), ['name' => 'massiveaction']);
return true;
}
return parent::showMassiveActionsSubForm($ma);
@@ -8840,7 +8827,7 @@ static function processMassiveActionsForOneItemtype(MassiveAction $ma, CommonDBT
$ma->itemDone($item->getType(), $id, MassiveAction::ACTION_KO);
}
} else {
- if (self::addToOcsArray($id, array($_POST['field']), "computer_update")) {
+ if (self::addToOcsArray($id, [$_POST['field']], "computer_update")) {
$ma->itemDone($item->getType(), $id, MassiveAction::ACTION_OK);
} else {
$ma->itemDone($item->getType(), $id, MassiveAction::ACTION_KO);
@@ -8858,7 +8845,7 @@ static function processMassiveActionsForOneItemtype(MassiveAction $ma, CommonDBT
foreach ($ids as $id) {
if ($_POST['field'] == 'all') {
- if (self::replaceOcsArray($id, array(), "computer_update")) {
+ if (self::replaceOcsArray($id, [], "computer_update")) {
$ma->itemDone($item->getType(), $id, MassiveAction::ACTION_OK);
} else {
$ma->itemDone($item->getType(), $id, MassiveAction::ACTION_KO);
diff --git a/inc/ocsserver_profile.class.php b/inc/ocsserver_profile.class.php
index 709e88db..37680aa4 100644
--- a/inc/ocsserver_profile.class.php
+++ b/inc/ocsserver_profile.class.php
@@ -9,7 +9,7 @@
-------------------------------------------------------------------------
LICENSE
-
+
This file is part of ocsinventoryng.
ocsinventoryng is free software; you can redistribute it and/or modify
@@ -40,4 +40,4 @@ class PluginOcsinventoryngOcsserver_Profile extends CommonDBTM
static $rightname = "profile";
-}
\ No newline at end of file
+}
diff --git a/inc/ocssoapclient.class.php b/inc/ocssoapclient.class.php
index 5ee8e531..c28f8d29 100644
--- a/inc/ocssoapclient.class.php
+++ b/inc/ocssoapclient.class.php
@@ -10,7 +10,7 @@
-------------------------------------------------------------------------
LICENSE
-
+
This file is part of ocsinventoryng.
ocsinventoryng is free software; you can redistribute it and/or modify
@@ -45,11 +45,10 @@ class PluginOcsinventoryngOcsSoapClient extends PluginOcsinventoryngOcsClient
* @param $user
* @param $pass
*/
- public function __construct($id, $url, $user, $pass)
- {
+ public function __construct($id, $url, $user, $pass) {
parent::__construct($id);
- $options = array(
+ $options = [
'location' => "$url/ocsinterface",
'uri' => "$url/Apache/Ocsinventory/Interface",
'login' => $user,
@@ -57,7 +56,7 @@ public function __construct($id, $url, $user, $pass)
'trace' => true,
'soap_version' => SOAP_1_1,
'exceptions' => 0
- );
+ ];
$this->soapClient = new SoapClient(null, $options);
}
@@ -65,8 +64,7 @@ public function __construct($id, $url, $user, $pass)
/**
* @see PluginOcsinventoryngOcsClient::checkConnection()
*/
- public function checkConnection()
- {
+ public function checkConnection() {
return !is_soap_fault($this->soapClient->ocs_config_V2('LOGLEVEL'));
}
@@ -75,16 +73,15 @@ public function checkConnection()
* @param mixed $value
* @return array
*/
- public function searchComputers($field, $value)
- {
- $xml = $this->callSoap('search_computers_V1', array($field, $value));
+ public function searchComputers($field, $value) {
+ $xml = $this->callSoap('search_computers_V1', [$field, $value]);
$computerObjs = simplexml_load_string($xml);
- $computers = array();
+ $computers = [];
if (count($computerObjs) > 0) {
foreach ($computerObjs as $obj) {
- $computers [] = array(
+ $computers [] = [
'ID' => (int)$obj->DATABASEID,
'CHECKSUM' => (int)$obj->CHECKSUM,
'DEVICEID' => (string)$obj->DEVICEID,
@@ -92,7 +89,7 @@ public function searchComputers($field, $value)
'LASTDATE' => (string)$obj->LASTDATE,
'NAME' => (string)$obj->NAME,
'TAG' => (string)$obj->TAG
- );
+ ];
}
}
return $computers;
@@ -103,8 +100,7 @@ public function searchComputers($field, $value)
* @param array $options
* @return array
*/
- public function getComputers($options)
- {
+ public function getComputers($options) {
$offset = $originalOffset = isset($options['OFFSET']) ? (int)$options['OFFSET'] : 0;
$maxRecords = isset($options['MAX_RECORDS']) ? (int)$options['MAX_RECORDS'] : null;
$checksum = isset($options['CHECKSUM']) ? (int)$options['CHECKSUM'] : 131071;
@@ -115,7 +111,7 @@ public function getComputers($options)
$originalEnd = isset($options['MAX_RECORDS']) ? $originalOffset + $maxRecords : null;
$ocsMap = $this->getOcsMap();
- $computers = array();
+ $computers = [];
do {
$options['ENGINE'] = $engine;
@@ -128,7 +124,7 @@ public function getComputers($options)
$xml = $this->callSoap('get_computers_V1', new PluginOcsinventoryngOcsSoapRequest($options));
- $computerObjs = array();
+ $computerObjs = [];
$computerObjs = simplexml_load_string($xml);
if (count($computerObjs) > 0) {
@@ -139,8 +135,8 @@ public function getComputers($options)
$meta = $obj->META;
- $computer = array(
- 'META' => array(
+ $computer = [
+ 'META' => [
'ID' => (int)$meta->DATABASEID,
'CHECKSUM' => (int)$meta->CHECKSUM,
'DEVICEID' => (string)$meta->DEVICEID,
@@ -148,13 +144,12 @@ public function getComputers($options)
'LASTDATE' => (string)$meta->LASTDATE,
'NAME' => (string)$meta->NAME,
'TAG' => (string)$meta->TAG
- )
- );
-
+ ]
+ ];
foreach ($obj->children() as $sectionName => $sectionObj) {
- $section = array();
- $special_sections = array('ACCOUNTINFO', 'DICO_SOFT');
+ $section = [];
+ $special_sections = ['ACCOUNTINFO', 'DICO_SOFT'];
foreach ($sectionObj as $key => $val) {
if (in_array($sectionName, $special_sections)) {
$section[(string)$val->attributes()->Name] = (string)$val;
@@ -163,7 +158,7 @@ public function getComputers($options)
}
}
if (!isset($computer[$sectionName])) {
- $computer[$sectionName] = array();
+ $computer[$sectionName] = [];
}
$lowerSectionName = strtolower($sectionName);
@@ -194,10 +189,10 @@ public function getComputers($options)
} while ($options['OFFSET'] + $computerObjs['MAX_RECORDS'] < $end);
//toolbox::logdebug($computers);
- return array(
+ return [
'TOTAL_COUNT' => $totalCount,
'COMPUTERS' => $computers
- );
+ ];
}
/**
@@ -206,19 +201,18 @@ public function getComputers($options)
* @param int $wanted
* @return array
*/
- public function getComputerSections($ids, $checksum = self::CHECKSUM_ALL, $wanted = self::WANTED_ALL)
- {
- $xml = $this->callSoap('get_computer_sections_V1', array($ids, $checksum, $wanted));
+ public function getComputerSections($ids, $checksum = self::CHECKSUM_ALL, $wanted = self::WANTED_ALL) {
+ $xml = $this->callSoap('get_computer_sections_V1', [$ids, $checksum, $wanted]);
$computerObjs = simplexml_load_string($xml);
- $computers = array();
+ $computers = [];
foreach ($computerObjs as $obj) {
$id = (int)$obj['ID'];
- $computer = array();
+ $computer = [];
foreach ($obj as $sectionName => $sectionObj) {
- $computer[$sectionName] = array();
+ $computer[$sectionName] = [];
foreach ($sectionObj as $key => $val) {
$computer[$sectionName][$key] = (string)$val;
}
@@ -233,8 +227,7 @@ public function getComputerSections($ids, $checksum = self::CHECKSUM_ALL, $wante
/**
* @param $id
*/
- public function getAccountInfo($id)
- {
+ public function getAccountInfo($id) {
}
@@ -284,24 +277,22 @@ public function getAccountInfo($id)
* )
* )
*/
- public function getSnmp($options)
- {
+ public function getSnmp($options) {
}
-
+
/**
* @see PluginOcsinventoryngOcsClient::getConfig()
* @param string $key
* @return array|bool|mixed
*/
- public function getConfig($key)
- {
+ public function getConfig($key) {
$xml = $this->callSoap('ocs_config_V2', $key);
if (!is_soap_fault($xml)) {
$configObj = simplexml_load_string($xml);
- $config = array(
+ $config = [
'IVALUE' => (int)$configObj->IVALUE,
'TVALUE' => (string)$configObj->TVALUE
- );
+ ];
return $config;
}
return false;
@@ -313,13 +304,12 @@ public function getConfig($key)
* @param int $ivalue
* @param string $tvalue
*/
- public function setConfig($key, $ivalue, $tvalue)
- {
- $this->callSoap('ocs_config_V2', array(
+ public function setConfig($key, $ivalue, $tvalue) {
+ $this->callSoap('ocs_config_V2', [
$key,
$ivalue,
$tvalue
- ));
+ ]);
}
/**
@@ -329,8 +319,7 @@ public function setConfig($key, $ivalue, $tvalue)
* @param $max_date
* @return array $data the computers to update
*/
- public function getComputersToUpdate($cfg_ocs, $max_date)
- {
+ public function getComputersToUpdate($cfg_ocs, $max_date) {
}
/**
@@ -338,19 +327,17 @@ public function getComputersToUpdate($cfg_ocs, $max_date)
*
* @return array $data the list of computers
*/
- public function getOCSComputers()
- {
+ public function getOCSComputers() {
}
-
+
/**
*
*/
- public function getDeletedComputers()
- {
- $deletedObjs = array();
+ public function getDeletedComputers() {
+ $deletedObjs = [];
//$xml = $this->callSoap('get_deleted_computers_V1', new PluginOcsinventoryngOcsSoapRequest(array()));
//$deletedObjs = simplexml_load_string($xml);
- $res = array();
+ $res = [];
/* if (is_array($deletedObjs) && count($deletedObjs) > 0) {
foreach ($deletedObjs as $obj) {
@@ -368,20 +355,19 @@ public function getDeletedComputers()
* @param null $equiv
* @return mixed|void
*/
- public function removeDeletedComputers($deleted, $equiv = null)
- {
+ public function removeDeletedComputers($deleted, $equiv = null) {
$count = 0;
if (is_array($deleted)) {
foreach ($deleted as $del) {
- $this->callSoap('remove_deleted_computer_V1', array($del));
+ $this->callSoap('remove_deleted_computer_V1', [$del]);
$count++;
}
} else {
if ($equiv) {
- $this->callSoap('remove_deleted_computer_V1', array($deleted, $equiv));
+ $this->callSoap('remove_deleted_computer_V1', [$deleted, $equiv]);
$count++;
} else {
- $this->callSoap('remove_deleted_computer_V1', array($deleted));
+ $this->callSoap('remove_deleted_computer_V1', [$deleted]);
$count++;
}
}
@@ -397,35 +383,31 @@ public function removeDeletedComputers($deleted, $equiv = null)
* 'DELETED' => 'EQUIV'
* )
*/
- public function getOldAgents()
- {
+ public function getOldAgents() {
}
-
+
/**
* @param $columns
* @param $table
* @param $conditions
* @param $sort
*/
- public function getUnique($columns, $table, $conditions, $sort)
- {
+ public function getUnique($columns, $table, $conditions, $sort) {
}
/**
* @param int $checksum
* @param int $id
*/
- public function setChecksum($checksum, $id)
- {
- $this->callSoap('reset_checksum_V1', array($checksum, $id));
+ public function setChecksum($checksum, $id) {
+ $this->callSoap('reset_checksum_V1', [$checksum, $id]);
}
/**
* @param int $id
* @return int
*/
- public function getChecksum($id)
- {
+ public function getChecksum($id) {
$xml = $this->callSoap('get_checksum_V1', $id);
return (int)simplexml_load_string($xml);
}
@@ -436,13 +418,12 @@ public function getChecksum($id)
* @param $table
* @return array
*/
- public function getAccountInfoColumns($table)
- {
+ public function getAccountInfoColumns($table) {
$xml = $this->callSoap('_get_account_fields_V1', new PluginOcsinventoryngOcsSoapRequest());
- $res = array(
+ $res = [
'HARDWARE_ID' => 'HARDWARE_ID',
'TAG' => 'TAG'
- );
+ ];
$res = array_merge($res, (array)$xml);
return $res;
}
@@ -459,9 +440,7 @@ public function getAccountInfoColumns($table)
* @param int $ssn
* @param int $id
*/
- public function updateBios($ssn, $id)
- {
-
+ public function updateBios($ssn, $id) {
}
@@ -470,8 +449,7 @@ public function updateBios($ssn, $id)
* @param int $tag
* @param int $id
*/
- public function updateTag($tag, $id)
- {
+ public function updateTag($tag, $id) {
}
@@ -566,15 +544,14 @@ public function updateTag($tag, $id)
* @param mixed $request
* @return mixed
*/
- private function callSoap($method, $request)
- {
+ private function callSoap($method, $request) {
if ($request instanceof PluginOcsinventoryngOcsSoapRequest) {
$res = $this->soapClient->$method($request->toXml());
} else if (is_array($request)) {
- $res = call_user_func_array(array(
+ $res = call_user_func_array([
$this->soapClient,
$method
- ), $request);
+ ], $request);
} else {
$res = $this->soapClient->$method($request);
}
@@ -585,4 +562,4 @@ private function callSoap($method, $request)
return is_string($res) ? trim($res) : $res;
}
-}
\ No newline at end of file
+}
diff --git a/inc/ocssoaprequest.class.php b/inc/ocssoaprequest.class.php
index e967dd5d..ff9a7af0 100644
--- a/inc/ocssoaprequest.class.php
+++ b/inc/ocssoaprequest.class.php
@@ -10,7 +10,7 @@
-------------------------------------------------------------------------
LICENSE
-
+
This file is part of ocsinventoryng.
ocsinventoryng is free software; you can redistribute it and/or modify
@@ -41,16 +41,14 @@ class PluginOcsinventoryngOcsSoapRequest
/**
* @param mixed $params
*/
- public function __construct($params)
- {
+ public function __construct($params) {
$this->params = $params;
}
/**
* @return string
*/
- public function toXml()
- {
+ public function toXml() {
return $this->_toXml('REQUEST', $this->params);
}
@@ -59,8 +57,7 @@ public function toXml()
* @param $value
* @return string
*/
- private function _toXml($tagName, $value)
- {
+ private function _toXml($tagName, $value) {
$xml = '';
if (is_array($value)) {
@@ -86,8 +83,7 @@ private function _toXml($tagName, $value)
* @param $array
* @return bool
*/
- private function isIndexed($array)
- {
+ private function isIndexed($array) {
return (bool)count(array_filter(array_keys($array), 'is_numeric'));
}
-}
\ No newline at end of file
+}
diff --git a/inc/osinstall.class.php b/inc/osinstall.class.php
index a135f99a..5846e930 100644
--- a/inc/osinstall.class.php
+++ b/inc/osinstall.class.php
@@ -9,7 +9,7 @@
-------------------------------------------------------------------------
LICENSE
-
+
This file is part of ocsinventoryng.
ocsinventoryng is free software; you can redistribute it and/or modify
@@ -46,7 +46,7 @@ static function getTypeName($nb = 0) {
function cleanDBonPurge() {
$self = new self();
- $self->deleteByCriteria(array('computers_id' => $this->fields['id']));
+ $self->deleteByCriteria(['computers_id' => $this->fields['id']]);
}
@@ -67,13 +67,12 @@ public static function showForItem_OperatingSystem($params) {
PluginOcsinventoryngOcsServer::checkOCSconnection($plugin_ocsinventoryng_ocsservers_id);
$cfg_ocs = PluginOcsinventoryngOcsServer::getConfig($plugin_ocsinventoryng_ocsservers_id);
// can exists for template
- if (
-// ($item->getType() == 'Item_OperatingSystem')
+ if (// ($item->getType() == 'Item_OperatingSystem')
// && Computer::canView()
-// &&
+ // &&
$cfg_ocs["import_osinstall"]
) {
- if ($result = $DB->request('glpi_plugin_ocsinventoryng_osinstalls', array('computers_id' => $computer->getID()))) {
+ if ($result = $DB->request('glpi_plugin_ocsinventoryng_osinstalls', ['computers_id' => $computer->getID()])) {
echo "";
$colspan = 4;
echo "
";
Html::closeForm();
- if (($canedit = Session::haveRightsOr(self::$rightname, array(CREATE, UPDATE, PURGE)))
+ if (($canedit = Session::haveRightsOr(self::$rightname, [CREATE, UPDATE, PURGE]))
&& $openform
) {
@@ -282,18 +282,17 @@ function showForm($profiles_id = 0, $openform = TRUE, $closeform = TRUE) {
$rights = $this->getAllRights();
- $profile->displayRightsChoiceMatrix($rights, array('canedit' => $canedit,
+ $profile->displayRightsChoiceMatrix($rights, ['canedit' => $canedit,
'default_class' => 'tab_bg_2',
- 'title' => __('General')));
-
+ 'title' => __('General')]);
if ($canedit
&& $closeform
) {
echo "
| " . self::getTypeName($result->numrows()) .
@@ -118,4 +117,4 @@ public static function showForItem_OperatingSystem($params) {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/inc/profile.class.php b/inc/profile.class.php
index a3fcfeb3..2937c255 100644
--- a/inc/profile.class.php
+++ b/inc/profile.class.php
@@ -9,7 +9,7 @@
-------------------------------------------------------------------------
LICENSE
-
+
This file is part of ocsinventoryng.
ocsinventoryng is free software; you can redistribute it and/or modify
@@ -74,14 +74,14 @@ static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtem
$prof = new self();
self::addDefaultProfileInfos($ID,
- array('plugin_ocsinventoryng' => 0,
+ ['plugin_ocsinventoryng' => 0,
'plugin_ocsinventoryng_sync' => 0,
'plugin_ocsinventoryng_view' => 0,
'plugin_ocsinventoryng_import' => 0,
'plugin_ocsinventoryng_link' => 0,
'plugin_ocsinventoryng_clean' => 0,
'plugin_ocsinventoryng_rule' => 0
- ));
+ ]);
$prof->showForm($ID);
}
return true;
@@ -94,13 +94,13 @@ static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtem
static function createFirstAccess($ID) {
//85
self::addDefaultProfileInfos($ID,
- array('plugin_ocsinventoryng' => READ + CREATE + UPDATE + PURGE,
+ ['plugin_ocsinventoryng' => READ + CREATE + UPDATE + PURGE,
'plugin_ocsinventoryng_sync' => READ + UPDATE,
'plugin_ocsinventoryng_view' => READ,
'plugin_ocsinventoryng_import' => READ + UPDATE,
'plugin_ocsinventoryng_link' => READ + UPDATE,
'plugin_ocsinventoryng_clean' => READ + UPDATE,
- 'plugin_ocsinventoryng_rule' => READ + UPDATE), true);
+ 'plugin_ocsinventoryng_rule' => READ + UPDATE], true);
}
@@ -118,7 +118,7 @@ static function addDefaultProfileInfos($profiles_id, $rights, $drop_existing = f
if (countElementsInTable('glpi_profilerights',
"`profiles_id`='$profiles_id' AND `name`='$right'") && $drop_existing
) {
- $profileRight->deleteByCriteria(array('profiles_id' => $profiles_id, 'name' => $right));
+ $profileRight->deleteByCriteria(['profiles_id' => $profiles_id, 'name' => $right]);
}
if (!countElementsInTable('glpi_profilerights',
"`profiles_id`='$profiles_id' AND `name`='$right'")
@@ -192,7 +192,7 @@ static function addDefaultProfileInfos($profiles_id, $rights, $drop_existing = f
* @internal param int $items_id id of the profile
* @internal param value $target url of target
*/
- function showForm($profiles_id = 0, $openform = TRUE, $closeform = TRUE) {
+ function showForm($profiles_id = 0, $openform = true, $closeform = true) {
global $DB, $CFG_GLPI;
$profile = new Profile();
@@ -200,7 +200,7 @@ function showForm($profiles_id = 0, $openform = TRUE, $closeform = TRUE) {
echo " ";
- if (($canedit = Session::haveRightsOr(self::$rightname, array(CREATE, UPDATE, PURGE)))
+ if (($canedit = Session::haveRightsOr(self::$rightname, [CREATE, UPDATE, PURGE]))
&& $openform
) {
echo " | ";
echo "
|---|
| " . sprintf(__('%1$s : %2$s'), _n('Allowed OCSNG server', 'Allowed OCSNG servers', 2, 'ocsinventoryng'), " "); //$profile = $this->fields['id']; - $crit = array('profiles_id' => $profiles_id); + $crit = ['profiles_id' => $profiles_id]; foreach ($DB->request("glpi_plugin_ocsinventoryng_ocsservers_profiles", $crit) as $data) { $used[$data['plugin_ocsinventoryng_ocsservers_id']] = $data['plugin_ocsinventoryng_ocsservers_id']; $configid[$data['plugin_ocsinventoryng_ocsservers_id']] = $data['id']; @@ -273,7 +273,7 @@ function showForm($profiles_id = 0, $openform = TRUE, $closeform = TRUE) { echo " |
";
- echo Html::hidden('id', array('value' => $profiles_id));
+ echo Html::hidden('id', ['value' => $profiles_id]);
echo Html::submit(_sx('button', 'Save'),
- array('name' => 'update'));
+ ['name' => 'update']);
echo "
\n";
Html::closeForm();
}
@@ -383,11 +382,11 @@ static function migrateOneProfile($profiles_id) {
foreach ($DB->request('glpi_plugin_ocsinventoryng_profiles',
"`profiles_id`='$profiles_id'") as $profile_data) {
- $matching = array('ocsng' => 'plugin_ocsinventoryng',
+ $matching = ['ocsng' => 'plugin_ocsinventoryng',
'sync_ocsng' => 'plugin_ocsinventoryng_sync',
'view_ocsng' => 'plugin_ocsinventoryng_view',
'clean_ocsng' => 'plugin_ocsinventoryng_clean',
- 'rule_ocs' => 'plugin_ocsinventoryng_rule');
+ 'rule_ocs' => 'plugin_ocsinventoryng_rule'];
$current_rights = ProfileRight::getProfileRights($profiles_id, array_values($matching));
foreach ($matching as $old => $new) {
if (!isset($current_rights[$old])) {
@@ -412,7 +411,7 @@ static function initProfile() {
if (countElementsInTable("glpi_profilerights",
"`name` = '" . $data['field'] . "'") == 0
) {
- ProfileRight::addProfileRights(array($data['field']));
+ ProfileRight::addProfileRights([$data['field']]);
}
}
@@ -457,4 +456,4 @@ static function addAllServers($profile) {
$newID = $profservers->add($input);
}
}
-}
\ No newline at end of file
+}
diff --git a/inc/proxysetting.class.php b/inc/proxysetting.class.php
index 8be4b9bf..51d13700 100644
--- a/inc/proxysetting.class.php
+++ b/inc/proxysetting.class.php
@@ -9,7 +9,7 @@
-------------------------------------------------------------------------
LICENSE
-
+
This file is part of ocsinventoryng.
ocsinventoryng is free software; you can redistribute it and/or modify
@@ -46,7 +46,7 @@ static function getTypeName($nb = 0) {
function cleanDBonPurge() {
$self = new self();
- $self->deleteByCriteria(array('computers_id' => $this->fields['id']));
+ $self->deleteByCriteria(['computers_id' => $this->fields['id']]);
}
@@ -111,7 +111,7 @@ static function showForComputer(Computer $comp, $withtemplate = '') {
echo "";
- if ($result = $DB->request('glpi_plugin_ocsinventoryng_proxysettings', array('computers_id' => $ID, 'ORDER' => 'user'))) {
+ if ($result = $DB->request('glpi_plugin_ocsinventoryng_proxysettings', ['computers_id' => $ID, 'ORDER' => 'user'])) {
echo "";
$colspan = 5;
echo "
| " . self::getTypeName($result->numrows()) .
@@ -152,4 +152,4 @@ static function showForComputer(Computer $comp, $withtemplate = '') {
}
echo "";
}
-}
\ No newline at end of file
+}
diff --git a/inc/registrykey.class.php b/inc/registrykey.class.php
index 19d19859..1b75485b 100644
--- a/inc/registrykey.class.php
+++ b/inc/registrykey.class.php
@@ -9,7 +9,7 @@
-------------------------------------------------------------------------
LICENSE
-
+
This file is part of ocsinventoryng.
ocsinventoryng is free software; you can redistribute it and/or modify
@@ -55,7 +55,7 @@ static function getTypeName($nb = 0) {
function cleanDBonPurge() {
$self = new self();
- $self->deleteByCriteria(array('computers_id' => $this->fields['id']));
+ $self->deleteByCriteria(['computers_id' => $this->fields['id']]);
}
@@ -74,12 +74,12 @@ static function showForComputer($ID) {
}
//REGISTRY HIVE
- $REGISTRY_HIVE = array("HKEY_CLASSES_ROOT",
+ $REGISTRY_HIVE = ["HKEY_CLASSES_ROOT",
"HKEY_CURRENT_USER",
"HKEY_LOCAL_MACHINE",
"HKEY_USERS",
"HKEY_CURRENT_CONFIG",
- "HKEY_DYN_DATA");
+ "HKEY_DYN_DATA"];
$query = "SELECT *
FROM `glpi_plugin_ocsinventoryng_registrykeys`
@@ -176,7 +176,7 @@ static function displayTabContentForItem(CommonGLPI $item, $tabnum = 1, $withtem
function getSearchOptions() {
- $tab = array();
+ $tab = [];
$tab['common'] = self::getTypeName(2);
@@ -185,7 +185,6 @@ function getSearchOptions() {
$tab[1]['name'] = __('ID');
$tab[1]['datatype'] = 'integer';
-
return $tab;
}
-}
\ No newline at end of file
+}
diff --git a/inc/ruleimportentity.class.php b/inc/ruleimportentity.class.php
index a5455763..7f9377f6 100644
--- a/inc/ruleimportentity.class.php
+++ b/inc/ruleimportentity.class.php
@@ -58,7 +58,7 @@ static function cronInfo($name) {
switch ($name) {
case "CheckRuleImportEntity" :
- return array('description' => __('OCSNG', 'ocsinventoryng') . " - " . __('Alerts on computers that no longer respond the rules for assigning an item to an entity', 'ocsinventoryng'));
+ return ['description' => __('OCSNG', 'ocsinventoryng') . " - " . __('Alerts on computers that no longer respond the rules for assigning an item to an entity', 'ocsinventoryng')];
}
}
@@ -72,7 +72,7 @@ static function cronInfo($name) {
*/
static function cronCheckRuleImportEntity($task) {
global $DB, $CFG_GLPI;
-
+
ini_set("memory_limit", "-1");
ini_set("max_execution_time", "0");
@@ -98,7 +98,7 @@ static function cronCheckRuleImportEntity($task) {
if ($plugin_ocsinventoryng_ocsservers_id > 0) {
$computers = self::checkRuleImportEntity($plugin_ocsinventoryng_ocsservers_id);
-
+
foreach ($computers as $entities_id => $items) {
$message = $plugin_ocsinventoryng_ocsservers_name . ": " . sprintf(__('Items that do not meet the allocation rules for the entity %s: %s', 'ocsinventoryng'), @@ -107,9 +107,9 @@ static function cronCheckRuleImportEntity($task) { if (NotificationEvent::raiseEvent("CheckRuleImportEntity", new PluginOcsinventoryngRuleImportEntity(), - array('entities_id' => $entities_id, - 'items' => $items))) { - + ['entities_id' => $entities_id, + 'items' => $items])) { + $cron_status = 1; if ($task) { $task->addVolume(1); @@ -143,16 +143,16 @@ static function cronCheckRuleImportEntity($task) { */ static function checkRuleImportEntity($plugin_ocsinventoryng_ocsservers_id) { - $data = array(); + $data = []; $computers = self::getComputerOcsLink($plugin_ocsinventoryng_ocsservers_id); $ruleCollection = new RuleImportEntityCollection(); - $fields = array(); + $fields = []; foreach ($computers as $computer) { $computer['_source'] = 'ocsinventoryng'; - $fields = $ruleCollection->processAllRules($computer, $fields, array('ocsid' => $computer['ocsid'])); + $fields = $ruleCollection->processAllRules($computer, $fields, ['ocsid' => $computer['ocsid']]); //case pc matched with a rule if (isset($fields['_ruleid'])) { @@ -163,7 +163,7 @@ static function checkRuleImportEntity($plugin_ocsinventoryng_ocsservers_id) { || isset($fields['locations_id']) && $fields['locations_id'] != $computer['locations_id']) { if (!isset($data[$entities_id])) { - $data[$entities_id] = array(); + $data[$entities_id] = []; } $data[$entities_id][$computer['id']] = $computer; @@ -181,7 +181,7 @@ static function checkRuleImportEntity($plugin_ocsinventoryng_ocsservers_id) { if (isset($fields['entities_id']) && $fields['entities_id'] != $entities_id) { if (!isset($data[$fields['entities_id']])) { - $data[$fields['entities_id']] = array(); + $data[$fields['entities_id']] = []; } $data[$entities_id][$computer['id']]['error'][] = 'Entity'; @@ -195,7 +195,7 @@ static function checkRuleImportEntity($plugin_ocsinventoryng_ocsservers_id) { $entities_id = $computer['entities_id']; if (!isset($data[$entities_id])) { - $data[$entities_id] = array(); + $data[$entities_id] = []; } $data[$entities_id][$computer['id']] = $computer; $data[$entities_id][$computer['id']]['error'][] = self::NO_RULE; @@ -216,7 +216,7 @@ static function getComputerOcsLink($plugin_ocsinventoryng_ocsservers_id) { $ocslinks = $ocslink->find("`plugin_ocsinventoryng_ocsservers_id` = $plugin_ocsinventoryng_ocsservers_id", "entities_id"); - $computers = array(); + $computers = []; foreach ($ocslinks as $ocs) { $computer = new Computer(); if ($computer->getFromDB($ocs['computers_id'])) { @@ -231,4 +231,4 @@ static function getComputerOcsLink($plugin_ocsinventoryng_ocsservers_id) { } -} \ No newline at end of file +} diff --git a/inc/runningprocess.class.php b/inc/runningprocess.class.php index 890d7376..51201f75 100644 --- a/inc/runningprocess.class.php +++ b/inc/runningprocess.class.php @@ -46,7 +46,7 @@ static function getTypeName($nb = 0) { function cleanDBonPurge() { $self = new self(); - $self->deleteByCriteria(array('computers_id' => $this->fields['id'])); + $self->deleteByCriteria(['computers_id' => $this->fields['id']]); } @@ -111,7 +111,7 @@ static function showForComputer(Computer $comp, $withtemplate = '') { echo " ";
if ($result = $DB->request('glpi_plugin_ocsinventoryng_runningprocesses',
- array('computers_id' => $ID, 'ORDER' => 'processname'))) {
+ ['computers_id' => $ID, 'ORDER' => 'processname'])) {
echo "
";
echo "
| ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|