aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/type/GenericIO.class.php
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 /type/GenericIO.class.php
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)
Diffstat (limited to 'type/GenericIO.class.php')
-rw-r--r--type/GenericIO.class.php2
1 files changed, 1 insertions, 1 deletions
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);