type: escape colons in filenames used in rrd commandline

A colon ':' in a legend argument will mark the end of the legend:
http://oss.oetiker.ch/rrdtool/doc/rrdgraph_graph.en.html#INOTES_on_legend_arguments

Reported-by: Benjamin Dupuis <poil@quake.fr>

4 files changed, 15 insertions, 11 deletions

diff --git a/type/Default.class.php b/type/Default.class.php
index cc1818a..eaf2e8e 100644
--- a/type/Default.class.php
+++ b/type/Default.class.php
@@ -98,6 +98,10 @@ class Type_Default {
                 return $c['r'].$c['g'].$c['b'];
         }
 
+        function rrd_escape($value) {
+                return str_replace(':', '\:', $value);
+        }
+
         function rrd_files() {
                 $files = $this->get_filenames();
 
@@ -234,9 +238,9 @@ class Type_Default {
                 $i=0;
                 foreach ($this->tinstances as $tinstance) {
                         foreach ($this->data_sources as $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);
+                                $rrdgraph[] = sprintf('DEF:min_%s="%s":%s:MIN', crc32hex($sources[$i]), $this->rrd_escape($this->files[$tinstance]), $ds);
+                                $rrdgraph[] = sprintf('DEF:avg_%s="%s":%s:AVERAGE', crc32hex($sources[$i]), $this->rrd_escape($this->files[$tinstance]), $ds);
+                                $rrdgraph[] = sprintf('DEF:max_%s="%s":%s:MAX', crc32hex($sources[$i]), $this->rrd_escape($this->files[$tinstance]), $ds);
                                 $i++;
                         }
                 }
diff --git a/type/GenericIO.class.php b/type/GenericIO.class.php
index 18a27ea..bc0fdef 100644
--- a/type/GenericIO.class.php
+++ b/type/GenericIO.class.php
@@ -14,9 +14,9 @@ class Type_GenericIO extends Type_Default {
                 $i=0;
                 foreach ($this->tinstances as $tinstance) {
                         foreach ($this->data_sources as $ds) {
-                                $rrdgraph[] = sprintf('DEF:min_%s%s=%s:%s:MIN', crc32hex($sources[$i]), $raw, $this->files[$tinstance], $ds);
-                                $rrdgraph[] = sprintf('DEF:avg_%s%s=%s:%s:AVERAGE', crc32hex($sources[$i]), $raw, $this->files[$tinstance], $ds);
-                                $rrdgraph[] = sprintf('DEF:max_%s%s=%s:%s:MAX', crc32hex($sources[$i]), $raw, $this->files[$tinstance], $ds);
+                                $rrdgraph[] = sprintf('DEF:min_%s%s="%s":%s:MIN', crc32hex($sources[$i]), $raw, $this->rrd_escape($this->files[$tinstance]), $ds);
+                                $rrdgraph[] = sprintf('DEF:avg_%s%s="%s":%s:AVERAGE', crc32hex($sources[$i]), $raw, $this->rrd_escape($this->files[$tinstance]), $ds);
+                                $rrdgraph[] = sprintf('DEF:max_%s%s="%s":%s:MAX', crc32hex($sources[$i]), $raw, $this->rrd_escape($this->files[$tinstance]), $ds);
                                 $rrdgraph[] = sprintf('VDEF:tot_%1$s=avg_%1$s%2$s,TOTAL', crc32hex($sources[$i]), $raw);
                                 $i++;
                         }
diff --git a/type/GenericStacked.class.php b/type/GenericStacked.class.php
index e9213de..f47af2a 100644
--- a/type/GenericStacked.class.php
+++ b/type/GenericStacked.class.php
@@ -12,9 +12,9 @@ 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', 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);
+                                $rrdgraph[] = sprintf('DEF:min_%s="%s":%s:MIN', crc32hex($sources[$i]), $this->rrd_escape($this->files[$tinstance]), $ds);
+                                $rrdgraph[] = sprintf('DEF:avg_%s="%s":%s:AVERAGE', crc32hex($sources[$i]), $this->rrd_escape($this->files[$tinstance]), $ds);
+                                $rrdgraph[] = sprintf('DEF:max_%s="%s":%s:MAX', crc32hex($sources[$i]), $this->rrd_escape($this->files[$tinstance]), $ds);
                                 $i++;
                         }
                 }
diff --git a/type/Uptime.class.php b/type/Uptime.class.php
index 04033a9..cadb8dd 100644
--- a/type/Uptime.class.php
+++ b/type/Uptime.class.php
@@ -12,8 +12,8 @@ class Type_Uptime extends Type_Default {
                 $i=0;
                 foreach ($this->tinstances as $tinstance) {
                         foreach ($this->data_sources as $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);
+                                $rrdgraph[] = sprintf('DEF:avg_%s="%s":%s:AVERAGE', crc32hex($sources[$i]), $this->rrd_escape($this->files[$tinstance]), $ds);
+                                $rrdgraph[] = sprintf('DEF:max_%s="%s":%s:MAX', crc32hex($sources[$i]), $this->rrd_escape($this->files[$tinstance]), $ds);
 
                                 $rrdgraph[] = sprintf('CDEF:c_avg_%s=avg_%1$s,86400,/', crc32hex($sources[$i]));
                                 $rrdgraph[] = sprintf('CDEF:c_max_%s=max_%1$s,86400,/', crc32hex($sources[$i]));