Merge pull request #21 from benoit-monin/fix_undefined_index

Fix undefined index for ds_names in type classes
author: Pim van den Berg 2013-10-07 12:35:42 -0700
committer: Pim van den Berg 2013-10-07 12:35:42 -0700
commit: 3a9806235a34f28e0c1ce2521b6720d7c0262f93 (patch)
tree: bbdec43e60cf3118f5c2154c1acc421fc5521b3b /type
parent: type/GenericStacked: make stack NaN-safe using ADDNAN instead of + (diff)
parent: type: use empty to access ds_names (diff)
download: apt-panopticon_cgp-3a9806235a34f28e0c1ce2521b6720d7c0262f93.zip
apt-panopticon_cgp-3a9806235a34f28e0c1ce2521b6720d7c0262f93.tar.gz
apt-panopticon_cgp-3a9806235a34f28e0c1ce2521b6720d7c0262f93.tar.bz2
apt-panopticon_cgp-3a9806235a34f28e0c1ce2521b6720d7c0262f93.tar.xz
4 files changed, 4 insertions, 4 deletions
diff --git a/type/Default.class.php b/type/Default.class.php
index e1b8835..57b505f 100644
--- a/type/Default.class.php
+++ b/type/Default.class.php
@@ -333,7 +333,7 @@ class Type_Default {
                $c = 0;
                foreach ($sources as $source) {
-                        $dsname = $this->ds_names[$source] != '' ? $this->ds_names[$source] : $source;
+                        $dsname = empty($this->ds_names[$source]) ? $source : $this->ds_names[$source];
                        $color = is_array($this->colors) ? (isset($this->colors[$source])?$this->colors[$source]:$this->colors[$c++]): $this->colors;
                        $rrdgraph[] = sprintf('"LINE1:avg_%s#%s:%s"', crc32hex($source), $this->validate_color($color), $this->rrd_escape($dsname));
                        $rrdgraph[] = sprintf('"GPRINT:min_%s:MIN:%s Min,"', crc32hex($source), $this->rrd_format);
diff --git a/type/GenericIO.class.php b/type/GenericIO.class.php
index 3425f3e..231c098 100644
--- a/type/GenericIO.class.php
+++ b/type/GenericIO.class.php
@@ -56,7 +56,7 @@ class Type_GenericIO extends Type_Default {
                $i = 0;
                foreach($sources as $source) {
-                        $dsname = $this->ds_names[$source] != '' ? $this->ds_names[$source] : $source;
+                        $dsname = empty($this->ds_names[$source]) ? $source : $this->ds_names[$source];
                        $rrdgraph[] = sprintf('"LINE1:avg_%s%s#%s:%s"', crc32hex($source), $i == 1 ? '_neg' : '', $this->colors[$source], $this->rrd_escape($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);
diff --git a/type/GenericStacked.class.php b/type/GenericStacked.class.php
index fd6abc7..3f249c7 100644
--- a/type/GenericStacked.class.php
+++ b/type/GenericStacked.class.php
@@ -49,7 +49,7 @@ class Type_GenericStacked extends Type_Default {
                $c = 0;
                foreach ($sources as $source) {
-                        $dsname = $this->ds_names[$source] != '' ? $this->ds_names[$source] : $source;
+                        $dsname = empty($this->ds_names[$source]) ? $source : $this->ds_names[$source];
                        $color = is_array($this->colors) ? (isset($this->colors[$source])?$this->colors[$source]:$this->colors[$c++]) : $this->colors;
                        $rrdgraph[] = sprintf('"LINE1:area_%s#%s:%s"', crc32hex($source), $this->validate_color($color), $this->rrd_escape($dsname));
                        $rrdgraph[] = sprintf('"GPRINT:min_%s:MIN:%s Min,"', crc32hex($source), $this->rrd_format);
diff --git a/type/Uptime.class.php b/type/Uptime.class.php
index 17bcb9a..4ada117 100644
--- a/type/Uptime.class.php
+++ b/type/Uptime.class.php
@@ -41,7 +41,7 @@ class Type_Uptime extends Type_Default {
                $c = 0;
                foreach ($sources as $source) {
-                        $dsname = $this->ds_names[$source] != '' ? $this->ds_names[$source] : $source;
+                        $dsname = empty($this->ds_names[$source]) ? $source : $this->ds_names[$source];
                        $color = is_array($this->colors) ? (isset($this->colors[$source])?$this->colors[$source]:$this->colors[$c++]) : $this->colors;
                        //current value
author	Pim van den Berg	2013-10-07 12:35:42 -0700
committer	Pim van den Berg	2013-10-07 12:35:42 -0700
commit	3a9806235a34f28e0c1ce2521b6720d7c0262f93 (patch)
tree	bbdec43e60cf3118f5c2154c1acc421fc5521b3b /type
parent	type/GenericStacked: make stack NaN-safe using ADDNAN instead of + (diff)
parent	type: use empty to access ds_names (diff)
download	apt-panopticon_cgp-3a9806235a34f28e0c1ce2521b6720d7c0262f93.zip apt-panopticon_cgp-3a9806235a34f28e0c1ce2521b6720d7c0262f93.tar.gz apt-panopticon_cgp-3a9806235a34f28e0c1ce2521b6720d7c0262f93.tar.bz2 apt-panopticon_cgp-3a9806235a34f28e0c1ce2521b6720d7c0262f93.tar.xz

diff --git a/type/Default.class.php b/type/Default.class.php index e1b8835..57b505f 100644 --- a/type/Default.class.php +++ b/type/Default.class.php
@@ -333,7 +333,7 @@ class Type_Default {
333		333
334	$c = 0;	334	$c = 0;
335	foreach ($sources as $source) {	335	foreach ($sources as $source) {
336	$dsname = $this->ds_names[$source] != '' ? $this->ds_names[$source] : $source;	336	$dsname = empty($this->ds_names[$source]) ? $source : $this->ds_names[$source];
337	$color = is_array($this->colors) ? (isset($this->colors[$source])?$this->colors[$source]:$this->colors[$c++]): $this->colors;	337	$color = is_array($this->colors) ? (isset($this->colors[$source])?$this->colors[$source]:$this->colors[$c++]): $this->colors;
338	$rrdgraph[] = sprintf('"LINE1:avg_%s#%s:%s"', crc32hex($source), $this->validate_color($color), $this->rrd_escape($dsname));	338	$rrdgraph[] = sprintf('"LINE1:avg_%s#%s:%s"', crc32hex($source), $this->validate_color($color), $this->rrd_escape($dsname));
339	$rrdgraph[] = sprintf('"GPRINT:min_%s:MIN:%s Min,"', crc32hex($source), $this->rrd_format);	339	$rrdgraph[] = sprintf('"GPRINT:min_%s:MIN:%s Min,"', crc32hex($source), $this->rrd_format);


diff --git a/type/GenericIO.class.php b/type/GenericIO.class.php index 3425f3e..231c098 100644 --- a/type/GenericIO.class.php +++ b/type/GenericIO.class.php
@@ -56,7 +56,7 @@ class Type_GenericIO extends Type_Default {
56		56
57	$i = 0;	57	$i = 0;
58	foreach($sources as $source) {	58	foreach($sources as $source) {
59	$dsname = $this->ds_names[$source] != '' ? $this->ds_names[$source] : $source;	59	$dsname = empty($this->ds_names[$source]) ? $source : $this->ds_names[$source];
60	$rrdgraph[] = sprintf('"LINE1:avg_%s%s#%s:%s"', crc32hex($source), $i == 1 ? '_neg' : '', $this->colors[$source], $this->rrd_escape($dsname));	60	$rrdgraph[] = sprintf('"LINE1:avg_%s%s#%s:%s"', crc32hex($source), $i == 1 ? '_neg' : '', $this->colors[$source], $this->rrd_escape($dsname));
61	$rrdgraph[] = sprintf('"GPRINT:min_%s:MIN:%s Min,"', crc32hex($source), $this->rrd_format);	61	$rrdgraph[] = sprintf('"GPRINT:min_%s:MIN:%s Min,"', crc32hex($source), $this->rrd_format);
62	$rrdgraph[] = sprintf('"GPRINT:avg_%s:AVERAGE:%s Avg,"', crc32hex($source), $this->rrd_format);	62	$rrdgraph[] = sprintf('"GPRINT:avg_%s:AVERAGE:%s Avg,"', crc32hex($source), $this->rrd_format);


diff --git a/type/GenericStacked.class.php b/type/GenericStacked.class.php index fd6abc7..3f249c7 100644 --- a/type/GenericStacked.class.php +++ b/type/GenericStacked.class.php
@@ -49,7 +49,7 @@ class Type_GenericStacked extends Type_Default {
49		49
50	$c = 0;	50	$c = 0;
51	foreach ($sources as $source) {	51	foreach ($sources as $source) {
52	$dsname = $this->ds_names[$source] != '' ? $this->ds_names[$source] : $source;	52	$dsname = empty($this->ds_names[$source]) ? $source : $this->ds_names[$source];
53	$color = is_array($this->colors) ? (isset($this->colors[$source])?$this->colors[$source]:$this->colors[$c++]) : $this->colors;	53	$color = is_array($this->colors) ? (isset($this->colors[$source])?$this->colors[$source]:$this->colors[$c++]) : $this->colors;
54	$rrdgraph[] = sprintf('"LINE1:area_%s#%s:%s"', crc32hex($source), $this->validate_color($color), $this->rrd_escape($dsname));	54	$rrdgraph[] = sprintf('"LINE1:area_%s#%s:%s"', crc32hex($source), $this->validate_color($color), $this->rrd_escape($dsname));
55	$rrdgraph[] = sprintf('"GPRINT:min_%s:MIN:%s Min,"', crc32hex($source), $this->rrd_format);	55	$rrdgraph[] = sprintf('"GPRINT:min_%s:MIN:%s Min,"', crc32hex($source), $this->rrd_format);


diff --git a/type/Uptime.class.php b/type/Uptime.class.php index 17bcb9a..4ada117 100644 --- a/type/Uptime.class.php +++ b/type/Uptime.class.php
@@ -41,7 +41,7 @@ class Type_Uptime extends Type_Default {
41		41
42	$c = 0;	42	$c = 0;
43	foreach ($sources as $source) {	43	foreach ($sources as $source) {
44	$dsname = $this->ds_names[$source] != '' ? $this->ds_names[$source] : $source;	44	$dsname = empty($this->ds_names[$source]) ? $source : $this->ds_names[$source];
45	$color = is_array($this->colors) ? (isset($this->colors[$source])?$this->colors[$source]:$this->colors[$c++]) : $this->colors;	45	$color = is_array($this->colors) ? (isset($this->colors[$source])?$this->colors[$source]:$this->colors[$c++]) : $this->colors;
46		46
47	//current value	47	//current value