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

14
tests/mocks/mock.snmp.inc.php
View File

@@ -23,6 +23,8 @@
* @author Tony Murray <murraytony@gmail.com>
*/
use LibreNMS\Config;
$snmpMockCache = array();
/**
@@ -33,13 +35,13 @@ $snmpMockCache = array();
*/
function cache_snmprec($file)
{
global $config, $snmpMockCache;
global $snmpMockCache;
if (isset($snmpMockCache[$file])) {
return;
}
$snmpMockCache[$file] = array();
$data = file_get_contents($config['install_dir'] . "/tests/snmpsim/$file.snmprec");
$data = file_get_contents(Config::get('install_dir') . "/tests/snmpsim/$file.snmprec");
$line = strtok($data, "\r\n");
while ($line !== false) {
list($oid, $type, $data) = explode('|', $line, 3);
@@ -108,8 +110,6 @@ function snmprec_get_oid($community, $oid)
*/
function snmp_translate_number($oid, $mib = null, $mibdir = null)
{
global $config;
// optimizations (35s -> 1.6s on my laptop)
if ($oid == 'SNMPv2-MIB::sysDescr.0') {
return '1.3.6.1.2.1.1.1.0';
@@ -139,7 +139,7 @@ function snmp_translate_number($oid, $mib = null, $mibdir = null)
}
$cmd = "snmptranslate -IR -On $oid";
$cmd .= ' -M ' . (isset($mibdir) ? $config['mib_dir'] . ":".$config['mib_dir']."/$mibdir" : $config['mib_dir']);
$cmd .= ' -M ' . (isset($mibdir) ? Config::get('mib_dir') . ":" . Config::get('mib_dir') . "/$mibdir" : Config::get('mib_dir'));
if (isset($mib) && $mib) {
$cmd .= " -m $mib";
}
@@ -155,10 +155,8 @@ function snmp_translate_number($oid, $mib = null, $mibdir = null)
function snmp_translate_type($oid, $mib = null, $mibdir = null)
{
global $config;
$cmd = "snmptranslate -IR -Td $oid";
$cmd .= ' -M ' . (isset($mibdir) ? $config['mib_dir'] . ":".$config['mib_dir']."/$mibdir" : $config['mib_dir']);
$cmd .= ' -M ' . (isset($mibdir) ? Config::get('mib_dir') . ":" . Config::get('mib_dir') . "/$mibdir" : Config::get('mib_dir'));
if (isset($mib) && $mib) {
$cmd .= " -m $mib";
}