From 0e45bad17320b0e0ef6d30cb23cbd5fd7077917c Mon Sep 17 00:00:00 2001 From: laf Date: Fri, 10 Jul 2015 16:28:47 +0100 Subject: [PATCH] Fixed issue with using dir --- html/includes/graphs/smokeping/in.inc.php | 3 ++- includes/common.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/html/includes/graphs/smokeping/in.inc.php b/html/includes/graphs/smokeping/in.inc.php index 3114d61936..8c8024e243 100644 --- a/html/includes/graphs/smokeping/in.inc.php +++ b/html/includes/graphs/smokeping/in.inc.php @@ -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'"; } +$filename_dir = generate_smokeping_dir($device); 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')) { // Try with dots in hostname replaced by underscores diff --git a/includes/common.php b/includes/common.php index f931793f7b..4885ba9857 100644 --- a/includes/common.php +++ b/includes/common.php @@ -751,7 +751,7 @@ function get_smokeping_files($device) { global $config; if (isset($config['smokeping']['dir'])) { $smokeping_files = array(); - $filename_dir = generate_smokeping_dir($device); + $smokeping_dir = generate_smokeping_dir($device); if ($handle = opendir($smokeping_dir)) { while (false !== ($file = readdir($handle))) { if ($file != "." && $file != "..") {