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

Fixed issue with using dir

Browse Source
This commit is contained in:
laf
2015-07-10 16:28:47 +01:00
parent 2d78c7d3e0
commit 0e45bad173
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
html/includes/graphs/smokeping/in.inc.php
View File

@@ -31,9 +31,10 @@ if($width > "500")
$rrd_options .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+5),0,$descr_len+5)." RTT Loss SDev RTT\:SDev \l'"; $rrd_options .= " COMMENT:'".substr(str_pad($unit_text, $descr_len+5),0,$descr_len+5)." RTT Loss SDev RTT\:SDev \l'";
} }
$filename_dir = generate_smokeping_dir($device);
if($src['hostname'] == $config['own_hostname']) if($src['hostname'] == $config['own_hostname'])
{ {
$filename_dir = generate_smokeping_dir($device); $filename = $filename_dir . $device['hostname'].'.rrd';
if (!file_exists($filename_dir.$device['hostname'].'.rrd')) if (!file_exists($filename_dir.$device['hostname'].'.rrd'))
{ {
// Try with dots in hostname replaced by underscores // Try with dots in hostname replaced by underscores

2
includes/common.php
View File

@@ -751,7 +751,7 @@ function get_smokeping_files($device) {
global $config; global $config;
if (isset($config['smokeping']['dir'])) { if (isset($config['smokeping']['dir'])) {
$smokeping_files = array(); $smokeping_files = array();
$filename_dir = generate_smokeping_dir($device); $smokeping_dir = generate_smokeping_dir($device);
if ($handle = opendir($smokeping_dir)) { if ($handle = opendir($smokeping_dir)) {
while (false !== ($file = readdir($handle))) { while (false !== ($file = readdir($handle))) {
if ($file != "." && $file != "..") { if ($file != "." && $file != "..") {