nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-28 16:04:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Formatting + scrut updates

Browse Source
This commit is contained in:
laf
2015-07-16 16:01:51 +01:00
parent 7eed295897
commit 6ec525c222
4 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/common.php
+12 -10
View File
@@ -701,21 +701,22 @@ function get_graph_subtypes($type) {
function get_smokeping_files($device) {
global $config;
$smokeping_files = array();
if (isset($config['smokeping']['dir'])) {
$smokeping_files = array();
$smokeping_dir = generate_smokeping_file($device);
if ($handle = opendir($smokeping_dir)) {
while (false !== ($file = readdir($handle))) {
if ($file != "." && $file != "..") {
if (eregi(".rrd", $file)) {
if (eregi("~", $file)) {
list($target,$slave) = explode("~", str_replace(".rrd", "", $file));
$target = str_replace("_", ".", $target);
if ($file != '.' && $file != '..') {
if (eregi('.rrd', $file)) {
if (eregi('~', $file)) {
list($target,$slave) = explode('~', str_replace('.rrd', '', $file));
$target = str_replace('_', '.', $target);
$smokeping_files['in'][$target][$slave] = $file;
$smokeping_files['out'][$slave][$target] = $file;
} else {
$target = str_replace(".rrd", "", $file);
$target = str_replace("_", ".", $target);
}
else {
$target = str_replace('.rrd', '', $file);
$target = str_replace('_', '.', $target);
$smokeping_files['in'][$target][$config['own_hostname']] = $file;
$smokeping_files['out'][$config['own_hostname']][$target] = $file;
}
@@ -731,7 +732,8 @@ function generate_smokeping_file($device,$file='') {
global $config;
if ($config['smokeping']['integration'] === true) {
return $config['smokeping']['dir'] .'/'. $device['type'] .'/' . $file;
} else {
}
else {
return $config['smokeping']['dir'] . '/' . $file;
}
}