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

6
includes/html/pages/routing/bgp.inc.php
View File

@@ -271,8 +271,8 @@ if (!LegacyAuth::user()->hasGlobalRead()) {
$graph_array = array();
$graph_array['type'] = 'bgp_updates';
$graph_array['id'] = $peer['bgpPeer_id'];
$graph_array['to'] = $config['time']['now'];
$graph_array['from'] = $config['time']['day'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['from'] = \LibreNMS\Config::get('time.day');
$graph_array['height'] = '110';
$graph_array['width'] = $width;
@@ -355,7 +355,7 @@ if (!LegacyAuth::user()->hasGlobalRead()) {
if ($peer['graph']) {
$graph_array['height'] = '100';
$graph_array['width'] = '218';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
echo '<tr></tr><tr class="bgp"'.($bg_image ? ' background="'.$bg_image.'"' : '').'"><td colspan="9">';
include 'includes/html/print-graphrow.inc.php';

8
includes/html/pages/routing/mpls.inc.php
View File

@@ -59,9 +59,9 @@ if ($vars['view'] == 'lsp') {
$device = device_by_id_cache($lsp['device_id']);
if (!is_integer($i / 2)) {
$bg_colour = $config['list_colour']['even'];
$bg_colour = \LibreNMS\Config::get('list_colour.even');
} else {
$bg_colour = $config['list_colour']['odd'];
$bg_colour = \LibreNMS\Config::get('list_colour.odd');
}
$adminstate_status_color = $operstate_status_color = $path_status_color = 'default';
@@ -134,9 +134,9 @@ if ($vars['view'] == 'paths') {
foreach (dbFetchRows('SELECT *, `mplsLspName` FROM `mpls_lsp_paths` AS `p`, `mpls_lsps` AS `l` WHERE `p`.`lsp_id` = `l`.`lsp_id` ORDER BY `p`.`device_id`, `l`.`mplsLspName`') as $path) {
$device = device_by_id_cache($path['device_id']);
if (!is_integer($i / 2)) {
$bg_colour = $config['list_colour']['even'];
$bg_colour = \LibreNMS\Config::get('list_colour.even');
} else {
$bg_colour = $config['list_colour']['odd'];
$bg_colour = \LibreNMS\Config::get('list_colour.odd');
}
$adminstate_status_color = $operstate_status_color = 'default';

4
includes/html/pages/routing/overview.inc.php
View File

@@ -6,9 +6,9 @@ foreach ($datas as $type) {
if (is_file("includes/html/pages/routing/overview/$type.inc.php")) {
$g_i++;
if (!is_integer($g_i / 2)) {
$row_colour = $config['list_colour']['even'];
$row_colour = \LibreNMS\Config::get('list_colour.even');
} else {
$row_colour = $config['list_colour']['odd'];
$row_colour = \LibreNMS\Config::get('list_colour.odd');
}
echo '<div style="background-color: '.$row_colour.';">';

19
includes/html/pages/routing/vrf.inc.php
View File

@@ -1,6 +1,7 @@
<?php
use LibreNMS\Authentication\LegacyAuth;
use LibreNMS\Config;
use LibreNMS\Exceptions\InvalidIpException;
if (!LegacyAuth::user()->hasGlobalRead()) {
@@ -93,9 +94,9 @@ if (!LegacyAuth::user()->hasGlobalRead()) {
$i = '1';
foreach (dbFetchRows('SELECT `vrf_name`, `mplsVpnVrfRouteDistinguisher`, `mplsVpnVrfDescription` FROM `vrfs` GROUP BY `mplsVpnVrfRouteDistinguisher`, `mplsVpnVrfDescription`,`vrf_name`') as $vrf) {
if (($i % 2)) {
$bg_colour = $config['list_colour']['even'];
$bg_colour = Config::get('list_colour.even');
} else {
$bg_colour = $config['list_colour']['odd'];
$bg_colour = Config::get('list_colour.odd');
}
echo "<tr valign=top bgcolor='$bg_colour'>";
@@ -109,15 +110,15 @@ if (!LegacyAuth::user()->hasGlobalRead()) {
foreach ($vrf_devices[$vrf['vrf_name']][$vrf['mplsVpnVrfRouteDistinguisher']] as $device) {
if (($i % 2)) {
if (($x % 2)) {
$dev_colour = $config['list_colour']['even_alt'];
$dev_colour = Config::get('list_colour.even_alt');
} else {
$dev_colour = $config['list_colour']['even_alt2'];
$dev_colour = Config::get('list_colour.even_alt2');
}
} else {
if (($x % 2)) {
$dev_colour = $config['list_colour']['odd_alt2'];
$dev_colour = Config::get('list_colour.odd_alt2');
} else {
$dev_colour = $config['list_colour']['odd_alt'];
$dev_colour = Config::get('list_colour.odd_alt');
}
}
@@ -146,12 +147,12 @@ if (!LegacyAuth::user()->hasGlobalRead()) {
case 'errors':
$port['width'] = '130';
$port['height'] = '30';
$port['from'] = $config['time']['day'];
$port['to'] = $config['time']['now'];
$port['from'] = Config::get('time.day');
$port['to'] = Config::get('time.now');
$port['bg'] = '#'.$bg;
$port['graph_type'] = 'port_'.$vars['graph'];
echo "<div style='display: block; padding: 3px; margin: 3px; min-width: 135px; max-width:135px; min-height:75px; max-height:75px;
text-align: center; float: left; background-color: ".$config['list_colour']['odd_alt2'].";'>
text-align: center; float: left; background-color: " . Config::get('list_colour.odd_alt2') . ";'>
<div style='font-weight: bold;'>".makeshortif($port['ifDescr']).'</div>';
print_port_thumbnail($port);
echo "<div style='font-size: 9px;'>".substr(short_port_descr($port['ifAlias']), 0, 22).'</div>