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/device/loadbalancer/ace_rservers.inc.php
View File

@@ -58,9 +58,9 @@ echo "<div style='margin: 5px;'><table border=0 cellspacing=0 cellpadding=0 widt
$i = '0';
foreach (dbFetchRows('SELECT * FROM `loadbalancer_rservers` WHERE `device_id` = ? ORDER BY `farm_id`', array($device['device_id'])) as $rserver) {
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');
}
if ($rserver['StateDescr'] == 'Server is now operational') {
@@ -82,7 +82,7 @@ foreach (dbFetchRows('SELECT * FROM `loadbalancer_rservers` WHERE `device_id` =
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['id'] = $rserver['rserver_id'];
$graph_array['type'] = $graph_type;

6
includes/html/pages/device/loadbalancer/ace_vservers.inc.php
View File

@@ -56,9 +56,9 @@ echo "<div style='margin: 5px;'><table border=0 cellspacing=0 cellpadding=0 widt
$i = '0';
foreach (dbFetchRows('SELECT * FROM `loadbalancer_vservers` WHERE `device_id` = ? ORDER BY `classmap`', array($device['device_id'])) as $vserver) {
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');
}
if ($vserver['serverstate'] == 'inService') {
@@ -80,7 +80,7 @@ foreach (dbFetchRows('SELECT * FROM `loadbalancer_vservers` WHERE `device_id` =
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['id'] = $vserver['classmap_id'];
$graph_array['type'] = $graph_type;

4
includes/html/pages/device/loadbalancer/gtm_pool_all.inc.php
View File

@@ -59,7 +59,7 @@
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_gtm_allpool_requests';
require 'includes/html/print-graphrow.inc.php';
?>
@@ -77,7 +77,7 @@
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_gtm_allpool_dropped';
require 'includes/html/print-graphrow.inc.php';
?>

4
includes/html/pages/device/loadbalancer/gtm_pool_det.inc.php
View File

@@ -31,7 +31,7 @@ if ($components[$vars['gtmpoolid']]['type'] == 'f5-gtm-pool') {
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_gtm_pool_requests';
$graph_array['id'] = $vars['gtmpoolid'];
require 'includes/html/print-graphrow.inc.php';
@@ -49,7 +49,7 @@ if ($components[$vars['gtmpoolid']]['type'] == 'f5-gtm-pool') {
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_gtm_pool_dropped';
$graph_array['id'] = $vars['gtmpoolid'];
require 'includes/html/print-graphrow.inc.php';

6
includes/html/pages/device/loadbalancer/gtm_wide_all.inc.php
View File

@@ -59,7 +59,7 @@
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_gtm_allwide_requests';
require 'includes/html/print-graphrow.inc.php';
?>
@@ -77,7 +77,7 @@
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_gtm_allwide_resolved';
require 'includes/html/print-graphrow.inc.php';
?>
@@ -95,7 +95,7 @@
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_gtm_allwide_dropped';
require 'includes/html/print-graphrow.inc.php';
?>

6
includes/html/pages/device/loadbalancer/gtm_wide_det.inc.php
View File

@@ -31,7 +31,7 @@ if ($components[$vars['wideid']]['type'] == 'f5-gtm-wide') {
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_gtm_wide_requests';
$graph_array['id'] = $vars['wideid'];
require 'includes/html/print-graphrow.inc.php';
@@ -50,7 +50,7 @@ if ($components[$vars['wideid']]['type'] == 'f5-gtm-wide') {
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_gtm_wide_resolved';
$graph_array['id'] = $vars['wideid'];
require 'includes/html/print-graphrow.inc.php';
@@ -68,7 +68,7 @@ if ($components[$vars['wideid']]['type'] == 'f5-gtm-wide') {
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_gtm_wide_dropped';
$graph_array['id'] = $vars['wideid'];
require 'includes/html/print-graphrow.inc.php';

2
includes/html/pages/device/loadbalancer/ltm_pool.inc.php
View File

@@ -29,8 +29,6 @@ foreach ($components as $k => $v) {
}
$components = $keep;
global $config;
if (is_file('includes/html/pages/device/loadbalancer/'.mres($vars['subtype']).'.inc.php')) {
include 'includes/html/pages/device/loadbalancer/'.mres($vars['subtype']).'.inc.php';
} else {

10
includes/html/pages/device/loadbalancer/ltm_pool_details.inc.php
View File

@@ -126,7 +126,7 @@ if ($components[$vars['poolid']]['type'] == 'f5-ltm-pool') {
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_ltm_allpm_conns';
$graph_array['id'] = $vars['poolid'];
require 'includes/html/print-graphrow.inc.php';
@@ -145,7 +145,7 @@ if ($components[$vars['poolid']]['type'] == 'f5-ltm-pool') {
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_ltm_allpm_bytesin';
$graph_array['id'] = $vars['poolid'];
require 'includes/html/print-graphrow.inc.php';
@@ -164,7 +164,7 @@ if ($components[$vars['poolid']]['type'] == 'f5-ltm-pool') {
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_ltm_allpm_bytesout';
$graph_array['id'] = $vars['poolid'];
require 'includes/html/print-graphrow.inc.php';
@@ -183,7 +183,7 @@ if ($components[$vars['poolid']]['type'] == 'f5-ltm-pool') {
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_ltm_allpm_pktsin';
$graph_array['id'] = $vars['poolid'];
require 'includes/html/print-graphrow.inc.php';
@@ -202,7 +202,7 @@ if ($components[$vars['poolid']]['type'] == 'f5-ltm-pool') {
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_ltm_allpm_pktsout';
$graph_array['id'] = $vars['poolid'];
require 'includes/html/print-graphrow.inc.php';

2
includes/html/pages/device/loadbalancer/ltm_vs.inc.php
View File

@@ -29,8 +29,6 @@ foreach ($components as $k => $v) {
}
$components = $keep;
global $config;
$subtype = basename($vars['subtype']);
if (is_file("includes/html/pages/device/loadbalancer/$subtype.inc.php")) {
include "includes/html/pages/device/loadbalancer/$subtype.inc.php";

10
includes/html/pages/device/loadbalancer/ltm_vs_all.inc.php
View File

@@ -76,7 +76,7 @@
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_ltm_allvs_conns';
require 'includes/html/print-graphrow.inc.php';
?>
@@ -94,7 +94,7 @@
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_ltm_allvs_bytesin';
require 'includes/html/print-graphrow.inc.php';
?>
@@ -112,7 +112,7 @@
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_ltm_allvs_bytesout';
require 'includes/html/print-graphrow.inc.php';
?>
@@ -130,7 +130,7 @@
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_ltm_allvs_pktsin';
require 'includes/html/print-graphrow.inc.php';
?>
@@ -148,7 +148,7 @@
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_ltm_allvs_pktsout';
require 'includes/html/print-graphrow.inc.php';
?>

6
includes/html/pages/device/loadbalancer/ltm_vs_det.inc.php
View File

@@ -30,7 +30,7 @@ if ($components[$vars['vsid']]['type'] == 'f5-ltm-vs') {
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_ltm_vs_conns';
$graph_array['id'] = $vars['vsid'];
require 'includes/html/print-graphrow.inc.php';
@@ -49,7 +49,7 @@ if ($components[$vars['vsid']]['type'] == 'f5-ltm-vs') {
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_ltm_vs_bytes';
$graph_array['id'] = $vars['vsid'];
require 'includes/html/print-graphrow.inc.php';
@@ -68,7 +68,7 @@ if ($components[$vars['vsid']]['type'] == 'f5-ltm-vs') {
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_ltm_vs_pkts';
$graph_array['id'] = $vars['vsid'];
require 'includes/html/print-graphrow.inc.php';

10
includes/html/pages/device/loadbalancer/ltm_vs_pool.inc.php
View File

@@ -118,7 +118,7 @@ if ($components[$vars['poolid']]['type'] == 'f5-ltm-pool') {
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_ltm_allpm_conns';
$graph_array['id'] = $vars['poolid'];
require 'includes/html/print-graphrow.inc.php';
@@ -137,7 +137,7 @@ if ($components[$vars['poolid']]['type'] == 'f5-ltm-pool') {
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_ltm_allpm_bytesin';
$graph_array['id'] = $vars['poolid'];
require 'includes/html/print-graphrow.inc.php';
@@ -156,7 +156,7 @@ if ($components[$vars['poolid']]['type'] == 'f5-ltm-pool') {
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_ltm_allpm_bytesout';
$graph_array['id'] = $vars['poolid'];
require 'includes/html/print-graphrow.inc.php';
@@ -175,7 +175,7 @@ if ($components[$vars['poolid']]['type'] == 'f5-ltm-pool') {
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_ltm_allpm_pktsin';
$graph_array['id'] = $vars['poolid'];
require 'includes/html/print-graphrow.inc.php';
@@ -194,7 +194,7 @@ if ($components[$vars['poolid']]['type'] == 'f5-ltm-pool') {
$graph_array['height'] = '100';
$graph_array['width'] = '215';
$graph_array['legend'] = 'no';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['type'] = 'device_bigip_ltm_allpm_pktsout';
$graph_array['id'] = $vars['poolid'];
require 'includes/html/print-graphrow.inc.php';

12
includes/html/pages/device/loadbalancer/netscaler_vsvr.inc.php
View File

@@ -24,9 +24,9 @@ if (is_numeric($vars['vsvr'])) {
$vservers = dbFetchRows('SELECT * FROM `netscaler_vservers` WHERE `device_id` = ? AND `vsvr_id` = ? ORDER BY `vsvr_name`', array($device['device_id'], $vars['vsvr']));
foreach ($vservers as $vsvr) {
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');
}
if ($vsvr['vsvr_state'] == 'up') {
@@ -53,7 +53,7 @@ if (is_numeric($vars['vsvr'])) {
$graph_type = 'netscalervsvr_'.$graph_type;
$graph_array['height'] = '100';
$graph_array['width'] = '213';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['id'] = $vsvr['vsvr_id'];
$graph_array['type'] = $graph_type;
@@ -148,9 +148,9 @@ if (is_numeric($vars['vsvr'])) {
$i = '0';
foreach ($vservers as $vsvr) {
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');
}
if ($vsvr['vsvr_state'] == 'up') {
@@ -175,7 +175,7 @@ if (is_numeric($vars['vsvr'])) {
$graph_type = 'netscalervsvr_'.$vars['graph'];
$graph_array['height'] = '100';
$graph_array['width'] = '213';
$graph_array['to'] = $config['time']['now'];
$graph_array['to'] = \LibreNMS\Config::get('time.now');
$graph_array['id'] = $vsvr['vsvr_id'];
$graph_array['type'] = $graph_type;