mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Apply fixes from StyleCI (#12120)

Browse Source
This commit is contained in:
Jellyfrog
2020-09-21 15:40:17 +02:00
committed by GitHub
parent 77c531527c
commit 82f43cb98d
1733 changed files with 18337 additions and 18540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
includes/discovery/vlans.inc.php
View File

@@ -4,7 +4,7 @@
use LibreNMS\Config;
$vlans_db = [];
$vlans_db_raw = dbFetchRows('SELECT * FROM `vlans` WHERE `device_id` = ?', array($device['device_id']));
$vlans_db_raw = dbFetchRows('SELECT * FROM `vlans` WHERE `device_id` = ?', [$device['device_id']]);
foreach ($vlans_db_raw as $vlan_db) {
$vlans_db[$vlan_db['vlan_domain']][$vlan_db['vlan_vlan']] = $vlan_db;
}
@@ -13,13 +13,13 @@ unset(
);
// Create an empty array to record what VLANs we discover this session.
$device['vlans'] = array();
$per_vlan_data = array(); // fill this with data for each vlan
$valid_vlan_port = array();
$device['vlans'] = [];
$per_vlan_data = []; // fill this with data for each vlan
$valid_vlan_port = [];
// get a map of base port to ifIndex and the inverse
$base_to_index = array();
$tmp_base_indexes = snmpwalk_cache_oid($device, 'dot1dBasePortIfIndex', array(), 'BRIDGE-MIB');
$base_to_index = [];
$tmp_base_indexes = snmpwalk_cache_oid($device, 'dot1dBasePortIfIndex', [], 'BRIDGE-MIB');
// flatten the array
foreach ($tmp_base_indexes as $index => $array) {
$base_to_index[$index] = $array['dot1dBasePortIfIndex'];
@@ -44,30 +44,30 @@ foreach ($device['vlans'] as $domain_id => $vlans) {
echo "VLAN $vlan_id \n";
if ($vlan_data) {
echo str_pad('dot1d id', 10).str_pad('ifIndex', 10).str_pad('Port Name', 25).str_pad('Priority', 10).str_pad('State', 15).str_pad('Cost', 10)."\n";
echo str_pad('dot1d id', 10) . str_pad('ifIndex', 10) . str_pad('Port Name', 25) . str_pad('Priority', 10) . str_pad('State', 15) . str_pad('Cost', 10) . "\n";
}
foreach ((array)$vlan_data as $ifIndex => $vlan_port) {
foreach ((array) $vlan_data as $ifIndex => $vlan_port) {
$port = get_port_by_index_cache($device['device_id'], $ifIndex);
echo str_pad($vlan_port_id, 10).str_pad($ifIndex, 10).str_pad($port['ifDescr'], 25).str_pad($vlan_port['dot1dStpPortPriority'], 10).str_pad($vlan_port['dot1dStpPortState'], 15).str_pad($vlan_port['dot1dStpPortPathCost'], 10);
echo str_pad($vlan_port_id, 10) . str_pad($ifIndex, 10) . str_pad($port['ifDescr'], 25) . str_pad($vlan_port['dot1dStpPortPriority'], 10) . str_pad($vlan_port['dot1dStpPortState'], 15) . str_pad($vlan_port['dot1dStpPortPathCost'], 10);
$db_w = array(
$db_w = [
'device_id' => $device['device_id'],
'port_id' => $port['port_id'],
'vlan' => $vlan_id,
);
];
$db_a['baseport'] = $index_to_base[$ifIndex];
$db_a['priority'] = isset($vlan_port['dot1dStpPortPriority']) ? $vlan_port['dot1dStpPortPriority'] : 0;
$db_a['state'] = isset($vlan_port['dot1dStpPortState']) ? $vlan_port['dot1dStpPortState'] : 'unknown';
$db_a['cost'] = isset($vlan_port['dot1dStpPortPathCost']) ? $vlan_port['dot1dStpPortPathCost'] : 0;
$db_a['state'] = isset($vlan_port['dot1dStpPortState']) ? $vlan_port['dot1dStpPortState'] : 'unknown';
$db_a['cost'] = isset($vlan_port['dot1dStpPortPathCost']) ? $vlan_port['dot1dStpPortPathCost'] : 0;
$db_a['untagged'] = isset($vlan_port['untagged']) ? $vlan_port['untagged'] : 0;
$from_db = dbFetchRow('SELECT * FROM `ports_vlans` WHERE device_id = ? AND port_id = ? AND `vlan` = ?', array($device['device_id'], $port['port_id'], $vlan_id));
$from_db = dbFetchRow('SELECT * FROM `ports_vlans` WHERE device_id = ? AND port_id = ? AND `vlan` = ?', [$device['device_id'], $port['port_id'], $vlan_id]);
if ($from_db['port_vlan_id']) {
$db_id = $from_db['port_vlan_id'];
dbUpdate($db_a, 'ports_vlans', '`port_vlan_id` = ?', array($db_id));
dbUpdate($db_a, 'ports_vlans', '`port_vlan_id` = ?', [$db_id]);
echo 'Updated';
} else {
$db_id = dbInsert(array_merge($db_w, $db_a), 'ports_vlans');
@@ -84,13 +84,13 @@ foreach ($device['vlans'] as $domain_id => $vlans) {
foreach ($vlans_db as $domain_id => $vlans) {
foreach ($vlans as $vlan_id => $vlan) {
if (empty($device['vlans'][$domain_id][$vlan_id])) {
dbDelete('vlans', '`device_id` = ? AND vlan_domain = ? AND vlan_vlan = ?', array($device['device_id'], $domain_id, $vlan_id));
dbDelete('vlans', '`device_id` = ? AND vlan_domain = ? AND vlan_vlan = ?', [$device['device_id'], $domain_id, $vlan_id]);
}
}
}
// remove non-existent port-vlan mappings
if (!empty($valid_vlan_port)) {
if (! empty($valid_vlan_port)) {
$num = dbDelete('ports_vlans', '`device_id`=? AND `port_vlan_id` NOT IN ' . dbGenPlaceholders(count($valid_vlan_port)), array_merge([$device['device_id']], $valid_vlan_port));
d_echo("Deleted $num vlan mappings\n");
}