Use Config helper (#10339)

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

View File

@@ -25,13 +25,13 @@ if (isset($options['d'])) {
}
if ($options['f'] === 'update') {
if (!$config['update']) {
if (!Config::get('base_url')) {
exit(0);
}
if ($config['update_channel'] == 'master') {
if (Config::get('base_url') == 'master') {
exit(1);
} elseif ($config['update_channel'] == 'release') {
} elseif (Config::get('base_url') == 'release') {
exit(3);
}
exit(0);
@@ -243,11 +243,11 @@ if ($options['f'] === 'purgeusers') {
}
$purge = 0;
if (is_numeric($config['radius']['users_purge']) && $config['auth_mechanism'] === 'radius') {
$purge = $config['radius']['users_purge'];
if (is_numeric(\LibreNMS\Config::get('radius.users_purge')) && Config::get('base_url') === 'radius') {
$purge = \LibreNMS\Config::get('radius.users_purge');
}
if (is_numeric($config['active_directory']['users_purge']) && $config['auth_mechanism'] === 'active_directory') {
$purge = $config['active_directory']['users_purge'];
if (is_numeric(\LibreNMS\Config::get('active_directory.users_purge')) && Config::get('base_url') === 'active_directory') {
$purge = \LibreNMS\Config::get('active_directory.users_purge');
}
if ($purge > 0) {
foreach (dbFetchRows("SELECT DISTINCT(`user`) FROM `authlog` WHERE `datetime` >= DATE_SUB(NOW(), INTERVAL ? DAY)", array($purge)) as $user) {
@@ -309,9 +309,9 @@ if ($options['f'] === 'refresh_device_groups') {
}
if ($options['f'] === 'notify') {
if (isset($config['alert']['default_mail'])) {
if (\LibreNMS\Config::has('alert.default_mail')) {
send_mail(
$config['alert']['default_mail'],
\LibreNMS\Config::get('alert.default_mail'),
'[LibreNMS] Auto update has failed for ' . Config::get('distributed_poller_name'),
"We just attempted to update your install but failed. The information below should help you fix this.\r\n\r\n" . $options['o']
);