From 451c3a0981f1973eb13834ae8adbe355df28366a Mon Sep 17 00:00:00 2001 From: laf Date: Mon, 13 Jul 2015 09:37:48 +0100 Subject: [PATCH] Updated to use Pauls code --- includes/common.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/includes/common.php b/includes/common.php index ff8a29313..4af63c71d 100644 --- a/includes/common.php +++ b/includes/common.php @@ -775,16 +775,12 @@ function get_smokeping_files($device) { return $smokeping_files; } -function generate_smokeping_file($device,$file) { +function generate_smokeping_file($device,$file='') { global $config; if ($config['smokeping']['integration'] === true) { - $response = $config['smokeping']['dir'] .'/'. $device['type'] .'/'; + return $config['smokeping']['dir'] .'/'. $device['type'] .'/' . $file; } else { - $response = $config['smokeping']['dir'] . '/'; + return $config['smokeping']['dir'] . '/' . $file; } - if (!empty($file)) { - $response = $response . $file; - } - return $response; }