From 1ed51dad6511e7a2af309200c3d69fba9ed5baa6 Mon Sep 17 00:00:00 2001
From: f0o <f0o@librenms.org>
Date: Fri, 8 May 2015 12:55:00 +0000
Subject: [PATCH] Force relative rrd-paths by prefixing rrd_dir with './' Allow
 empty string as rrdcached_dir values

---
 includes/rrdtool.inc.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/includes/rrdtool.inc.php b/includes/rrdtool.inc.php
index e8f0fd4f1d..a2a6fcc02c 100644
--- a/includes/rrdtool.inc.php
+++ b/includes/rrdtool.inc.php
@@ -108,8 +108,8 @@ function rrdtool_graph($graph_file, $options)
     if ($config['rrdcached'])
     {
       if (isset($config['rrdcached_dir']) && $config['rrdcached_dir'] !== FALSE) {
-          $options = str_replace($config['rrd_dir']."/",$config['rrdcached_dir']."/",$options);
-          $options = str_replace($config['rrd_dir']    ,$config['rrdcached_dir']."/",$options);
+          $options = str_replace($config['rrd_dir']."/","./".$config['rrdcached_dir']."/",$options);
+          $options = str_replace($config['rrd_dir']    ,"./".$config['rrdcached_dir']."/",$options);
       }
       fwrite($rrd_pipes[0], "graph --daemon " . $config['rrdcached'] . " $graph_file $options");
     } else {
@@ -157,8 +157,8 @@ function rrdtool($command, $filename, $options)
   if ($command != "create" && $config['rrdcached'])
   {
       if (isset($config['rrdcached_dir']) && $config['rrdcached_dir'] !== FALSE) {
-          $filename = str_replace($config['rrd_dir']."/",$config['rrdcached_dir']."/",$filename);
-          $filename = str_replace($config['rrd_dir']    ,$config['rrdcached_dir']."/",$filename);
+          $filename = str_replace($config['rrd_dir']."/","./".$config['rrdcached_dir']."/",$filename);
+          $filename = str_replace($config['rrd_dir']    ,"./".$config['rrdcached_dir']."/",$filename);
       }
       $cmd = "$command $filename $options --daemon " . $config['rrdcached'];
   } else {