Fix regex for strange datadirs

If a datadir would contain characters with a special meaning in regex
(e.g. `/tmp/logs (new)`), then the function would blow up.

1 files changed, 4 insertions, 1 deletions

diff --git a/type/Base.class.php b/type/Base.class.php
index c3741bd..e18d27a 100644
--- a/type/Base.class.php
+++ b/type/Base.class.php
@@ -165,6 +165,7 @@ class Type_Base {
                 $this->files = array();
                 $this->identifiers = array();
 
+                $datadir_prefix = preg_quote($this->datadir, '#');
                 foreach($files as $filename) {
                         $basename=basename($filename,'.rrd');
                         $instance = strpos($basename,'-')
@@ -173,7 +174,9 @@ class Type_Base {
 
                         $this->tinstances[] = $instance;
                         $this->files[$instance] = $filename;
-                        $this->identifiers[$instance] = preg_replace("#^$this->datadir/(.*)\.rrd$#", '$1', $filename);
+                        $this->identifiers[$instance] = preg_replace(
+                                "#^{$datadir_prefix}/(.*)\.rrd$#", '$1',
+                                $filename);
                 }
 
                 sort($this->tinstances);