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

Use Config helper (#10339)

Browse Source 
remove usage of global variable
This commit is contained in:
Tony Murray
2019-06-23 00:29:12 -05:00
committed by GitHub
parent 342acf50f1
commit f3ba8947f7
367 changed files with 1589 additions and 1857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
includes/rewrites.php
View File

@@ -1,15 +1,12 @@
<?php
use LibreNMS\Config;
use LibreNMS\Util\Rewrite;
function rewrite_location($location)
{
// FIXME -- also check the database for rewrites?
global $config, $debug;
if (is_array($config['location_map_regex'])) {
foreach ($config['location_map_regex'] as $reg => $val) {
if (is_array(Config::get('location_map_regex'))) {
foreach (Config::get('location_map_regex') as $reg => $val) {
if (preg_match($reg, $location)) {
$location = $val;
break;
@@ -17,8 +14,8 @@ function rewrite_location($location)
}
}
if (is_array($config['location_map_regex_sub'])) {
foreach ($config['location_map_regex_sub'] as $reg => $val) {
if (is_array(Config::get('location_map_regex_sub'))) {
foreach (Config::get('location_map_regex_sub') as $reg => $val) {
if (preg_match($reg, $location)) {
$location = preg_replace($reg, $val, $location);
break;
@@ -26,8 +23,8 @@ function rewrite_location($location)
}
}
if (isset($config['location_map'][$location])) {
$location = $config['location_map'][$location];
if (Config::has("location_map.$location")) {
$location = Config::get("location_map.$location");
}
return $location;
@@ -76,8 +73,6 @@ function rewrite_entity_descr($descr)
*/
function cleanPort($interface, $device = null)
{
global $config;
$interface['ifAlias'] = display($interface['ifAlias']);
$interface['ifName'] = display($interface['ifName']);
$interface['ifDescr'] = display($interface['ifDescr']);
@@ -88,17 +83,17 @@ function cleanPort($interface, $device = null)
$os = strtolower($device['os']);
if (isset($config['os'][$os]['ifname'])) {
if (Config::get("os.$os.ifname")) {
$interface['label'] = $interface['ifName'];
if ($interface['ifName'] == '') {
$interface['label'] = $interface['ifDescr'];
}
} elseif (isset($config['os'][$os]['ifalias'])) {
} elseif (Config::get("os.$os.ifalias")) {
$interface['label'] = $interface['ifAlias'];
} else {
$interface['label'] = $interface['ifDescr'];
if (isset($config['os'][$os]['ifindex'])) {
if (Config::get("os.$os.ifindex")) {
$interface['label'] = $interface['label'].' '.$interface['ifIndex'];
}
}
@@ -107,16 +102,16 @@ function cleanPort($interface, $device = null)
list($interface['label']) = explode('thomson', $interface['label']);
}
if (is_array($config['rewrite_if'])) {
foreach ($config['rewrite_if'] as $src => $val) {
if (is_array(Config::get('rewrite_if'))) {
foreach (Config::get('rewrite_if') as $src => $val) {
if (stristr($interface['label'], $src)) {
$interface['label'] = $val;
}
}
}
if (is_array($config['rewrite_if_regexp'])) {
foreach ($config['rewrite_if_regexp'] as $reg => $val) {
if (is_array(Config::get('rewrite_if_regexp'))) {
foreach (Config::get('rewrite_if_regexp') as $reg => $val) {
if (preg_match($reg.'i', $interface['label'])) {
$interface['label'] = preg_replace($reg.'i', $val, $interface['label']);
}