type/Default: merge file2identifier function into rrd_files

1 files changed, 2 insertions, 12 deletions

diff --git a/type/Default.class.php b/type/Default.class.php
index c4fa8a9..2cd8560 100644
--- a/type/Default.class.php
+++ b/type/Default.class.php
@@ -34,7 +34,6 @@ class Type_Default {
                 $this->cache = $config['cache'];
                 $this->parse_get();
                 $this->rrd_files();
-                $this->identifiers = $this->file2identifier($this->files);
                 $this->width = GET('x');
                 if (empty($this->width)) $this->width = $config['width'];
                 $this->height = GET('y');
@@ -143,10 +142,12 @@ class Type_Default {
 
                         $this->tinstances[] = $instance;
                         $this->files[$instance] = $filename;
+                        $this->identifiers[$instance] = preg_replace("#^$this->datadir/(.*)\.rrd$#", '$1', $filename);
                 }
 
                 sort($this->tinstances);
                 ksort($this->files);
+                ksort($this->identifiers);
         }
 
         function get_filenames() {
@@ -166,17 +167,6 @@ class Type_Default {
                 return $files;
         }
 
-        function file2identifier($files) {
-                foreach($files as $key => $file) {
-                        if (is_file($file)) {
-                                $files[$key] = preg_replace("#^$this->datadir/#u", '', $files[$key]);
-                                $files[$key] = preg_replace('#\.rrd$#', '', $files[$key]);
-                        }
-                }
-
-                return $files;
-        }
-
         function rrd_graph($debug = false) {
                 if (!$this->colors)
                         $this->rainbow_colors();