aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorPim van den Berg2013-10-09 22:46:47 +0200
committerPim van den Berg2013-10-09 22:46:47 +0200
commit1aab1e38b61242d4d19e65719a9682827d92853c (patch)
treebbdec43e60cf3118f5c2154c1acc421fc5521b3b
parenttype: fix undefined index in ds_names[$source] before empty check (diff)
downloadapt-panopticon_cgp-1aab1e38b61242d4d19e65719a9682827d92853c.zip
apt-panopticon_cgp-1aab1e38b61242d4d19e65719a9682827d92853c.tar.gz
apt-panopticon_cgp-1aab1e38b61242d4d19e65719a9682827d92853c.tar.bz2
apt-panopticon_cgp-1aab1e38b61242d4d19e65719a9682827d92853c.tar.xz
Revert "type: fix undefined index in ds_names[$source] before empty check"
From the docs: "No warning is generated if the variable does not exist. That means empty() is essentially the concise equivalent to !isset($var) || $var == false." This reverts commit f2a4593558b3a3ec696e9cc1de93fa898b9521bb. Reported-By: Benoit Monin (https://github.com/pommi/CGP/commit/f2a4593)
-rw-r--r--type/Default.class.php2
-rw-r--r--type/GenericIO.class.php2
-rw-r--r--type/GenericStacked.class.php2
-rw-r--r--type/Uptime.class.php2
4 files changed, 4 insertions, 4 deletions
diff --git a/type/Default.class.php b/type/Default.class.php
index 8ef58ad..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 = (isset($this->ds_names[$source]) && !empty($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 4648294..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 = (isset($this->ds_names[$source]) && !empty($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 42a252a..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 = (isset($this->ds_names[$source]) && !empty($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 6e08b0b..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 = (isset($this->ds_names[$source]) && !empty($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