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

refactor: Use the Config class includes/discovery (#7299)

Browse Source 
* refactor: use the Config class includes/discovery

* fix issue with $config variable not accessible in include-dir.inc.php

* improved whitespace

* Tidy up discovery_by_ip
This commit is contained in:
Tony Murray
2017-09-11 15:26:41 -05:00
committed by Neil Lathwood
parent 9cafcb6280
commit b18c41b1a9
26 changed files with 192 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
includes/discovery/fdb-table.inc.php
View File

@@ -1,6 +1,8 @@
<?php
// Build a dictionary of vlans in database
use LibreNMS\Config;
$vlans_dict = array();
foreach (dbFetchRows("SELECT `vlan_id`, `vlan_vlan` from `vlans` WHERE `device_id` = ?", array($device['device_id'])) as $vlan_entry) {
$vlans_dict[$vlan_entry['vlan_vlan']] = $vlan_entry['vlan_id'];
@@ -15,13 +17,13 @@ foreach ($sql_result as $entry) {
}
$insert = array(); // populate $insert with database entries
if (file_exists($config['install_dir'] . "/includes/discovery/fdb-table/{$device['os']}.inc.php")) {
require $config['install_dir'] . "/includes/discovery/fdb-table/{$device['os']}.inc.php";
if (file_exists(Config::get('install_dir') . "/includes/discovery/fdb-table/{$device['os']}.inc.php")) {
require Config::get('install_dir') . "/includes/discovery/fdb-table/{$device['os']}.inc.php";
} elseif ($device['os'] == 'ios' || $device['os'] == 'iosxe') {
include $config['install_dir'] . '/includes/discovery/fdb-table/ios.inc.php';
include Config::get('install_dir') . '/includes/discovery/fdb-table/ios.inc.php';
} else {
// Check generic Q-BRIDGE-MIB and BRIDGE-MIB
include $config['install_dir'] . '/includes/discovery/fdb-table/bridge.inc.php';
include Config::get('install_dir') . '/includes/discovery/fdb-table/bridge.inc.php';
}
if (!empty($insert)) {