diff options
author | Benoît Monin | 2013-08-31 11:50:14 +0200 |
---|---|---|
committer | Benoît Monin | 2013-08-31 11:58:49 +0200 |
commit | 0085a4a0cc9ef31a5a26c4d68a621b6f7bc95936 (patch) | |
tree | 673a6ab1f49740c0376e66834d1abeaa3b366456 | |
parent | type/default: fix 'undefined index' in rrd_gen_graph (diff) | |
download | apt-panopticon_cgp-0085a4a0cc9ef31a5a26c4d68a621b6f7bc95936.zip apt-panopticon_cgp-0085a4a0cc9ef31a5a26c4d68a621b6f7bc95936.tar.gz apt-panopticon_cgp-0085a4a0cc9ef31a5a26c4d68a621b6f7bc95936.tar.bz2 apt-panopticon_cgp-0085a4a0cc9ef31a5a26c4d68a621b6f7bc95936.tar.xz |
type: use empty to access ds_names
Fix some potential undefined index errors by using the empty function to
access ds_names in type other than default.
-rw-r--r-- | type/GenericIO.class.php | 2 | ||||
-rw-r--r-- | type/GenericStacked.class.php | 2 | ||||
-rw-r--r-- | type/Uptime.class.php | 2 |
3 files changed, 3 insertions, 3 deletions
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 5d1a556..63d7f33 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 |