From e356d80141f0d1c0f5165a3f2e55bb3855c4ef56 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Sun, 12 Jul 2015 19:47:50 +0100
Subject: [PATCH] Updated function and use - generate_smokeping_file

---
 html/includes/graphs/smokeping/in.inc.php |  2 +-
 includes/common.php                       | 19 +++++++------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/html/includes/graphs/smokeping/in.inc.php b/html/includes/graphs/smokeping/in.inc.php
index 8c8024e243..c50d8a7046 100644
--- a/html/includes/graphs/smokeping/in.inc.php
+++ b/html/includes/graphs/smokeping/in.inc.php
@@ -31,7 +31,7 @@ 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);
+$filename_dir = generate_smokeping_file($device);
 if($src['hostname'] == $config['own_hostname'])
 {
     $filename = $filename_dir . $device['hostname'].'.rrd';
diff --git a/includes/common.php b/includes/common.php
index 4885ba9857..ff8a29313a 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();
-        $smokeping_dir = generate_smokeping_dir($device);
+        $smokeping_dir = generate_smokeping_file($device);
         if ($handle = opendir($smokeping_dir)) {
             while (false !== ($file = readdir($handle))) {
                 if ($file != "." && $file != "..") {
@@ -778,18 +778,13 @@ function get_smokeping_files($device) {
 function generate_smokeping_file($device,$file) {
     global $config;
     if ($config['smokeping']['integration'] === true) {
-        return $config['smokeping']['dir'] .'/'. $device['type'] .'/'. $file;
+        $response = $config['smokeping']['dir'] .'/'. $device['type'] .'/';
     } else {
-        return $config['smokeping']['dir'] . $file;
-    }
-}
-
-function generate_smokeping_dir($device) {
-    global $config;
-    if ($config['smokeping']['integration'] === true) {
-        return $config['smokeping']['dir'] .'/'. $device['type'] .'/';
-    } else {
-        return $config['smokeping']['dir'];
+        $response = $config['smokeping']['dir'] . '/';
     }
+    if (!empty($file)) {
+        $response = $response . $file;
+    }
+    return $response;
 }