utf8 filename support for all types

Types GenenericIO and GenericStacked were not included in commit:
596dd7d414 [make rrdfiles using utf8 and spaces work]

1 files changed, 11 insertions, 11 deletions

diff --git a/type/GenericStacked.class.php b/type/GenericStacked.class.php
index 7595385..89e9f65 100644
--- a/type/GenericStacked.class.php
+++ b/type/GenericStacked.class.php
@@ -12,32 +12,32 @@ class Type_GenericStacked extends Type_Default {
                 $i=0;
                 foreach ($this->tinstances as $tinstance) {
                         foreach ($this->data_sources as $ds) {
-                                $rrdgraph[] = sprintf('DEF:min_%s=%s:%s:MIN', $sources[$i], $this->files[$tinstance], $ds);
-                                $rrdgraph[] = sprintf('DEF:avg_%s=%s:%s:AVERAGE', $sources[$i], $this->files[$tinstance], $ds);
-                                $rrdgraph[] = sprintf('DEF:max_%s=%s:%s:MAX', $sources[$i], $this->files[$tinstance], $ds);
+                                $rrdgraph[] = sprintf('DEF:min_%s=%s:%s:MIN', crc32hex($sources[$i]), $this->files[$tinstance], $ds);
+                                $rrdgraph[] = sprintf('DEF:avg_%s=%s:%s:AVERAGE', crc32hex($sources[$i]), $this->files[$tinstance], $ds);
+                                $rrdgraph[] = sprintf('DEF:max_%s=%s:%s:MAX', crc32hex($sources[$i]), $this->files[$tinstance], $ds);
                                 $i++;
                         }
                 }
 
                 for ($i=count($sources)-1 ; $i>=0 ; $i--) {
                         if ($i == (count($sources)-1))
-                                $rrdgraph[] = sprintf('CDEF:area_%s=avg_%1$s', $sources[$i]);
+                                $rrdgraph[] = sprintf('CDEF:area_%s=avg_%1$s', crc32hex($sources[$i]));
                         else
-                                $rrdgraph[] = sprintf('CDEF:area_%s=area_%s,avg_%1$s,+', $sources[$i], $sources[$i+1]);
+                                $rrdgraph[] = sprintf('CDEF:area_%s=area_%s,avg_%1$s,+', crc32hex($sources[$i]), crc32hex($sources[$i+1]));
                 }
 
                 foreach ($sources as $source) {
                         $color = $this->get_faded_color($this->colors[$source]);
-                        $rrdgraph[] = sprintf('AREA:area_%s#%s', $source, $color);
+                        $rrdgraph[] = sprintf('AREA:area_%s#%s', crc32hex($source), $color);
                 }
 
                 foreach ($sources as $source) {
                         $dsname = $this->ds_names[$source] != '' ? $this->ds_names[$source] : $source;
-                        $rrdgraph[] = sprintf('LINE1:area_%s#%s:\'%s\'', $source, $this->validate_color($this->colors[$source]), $dsname);
-                        $rrdgraph[] = sprintf('GPRINT:min_%s:MIN:\'%s Min,\'', $source, $this->rrd_format);
-                        $rrdgraph[] = sprintf('GPRINT:avg_%s:AVERAGE:\'%s Avg,\'', $source, $this->rrd_format);
-                        $rrdgraph[] = sprintf('GPRINT:max_%s:MAX:\'%s Max,\'', $source, $this->rrd_format);
-                        $rrdgraph[] = sprintf('GPRINT:avg_%s:LAST:\'%s Last\\l\'', $source, $this->rrd_format);
+                        $rrdgraph[] = sprintf('LINE1:area_%s#%s:\'%s\'', crc32hex($source), $this->validate_color($this->colors[$source]), $dsname);
+                        $rrdgraph[] = sprintf('GPRINT:min_%s:MIN:\'%s Min,\'', crc32hex($source), $this->rrd_format);
+                        $rrdgraph[] = sprintf('GPRINT:avg_%s:AVERAGE:\'%s Avg,\'', crc32hex($source), $this->rrd_format);
+                        $rrdgraph[] = sprintf('GPRINT:max_%s:MAX:\'%s Max,\'', crc32hex($source), $this->rrd_format);
+                        $rrdgraph[] = sprintf('GPRINT:avg_%s:LAST:\'%s Last\\l\'', crc32hex($source), $this->rrd_format);
                 }
 
                 return $rrdgraph;