From 1aab1e38b61242d4d19e65719a9682827d92853c Mon Sep 17 00:00:00 2001
From: Pim van den Berg
Date: Wed, 9 Oct 2013 22:46:47 +0200
Subject: 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)
---
 type/Default.class.php        | 2 +-
 type/GenericIO.class.php      | 2 +-
 type/GenericStacked.class.php | 2 +-
 type/Uptime.class.php         | 2 +-
 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 {
 
 		$c = 0;
 		foreach ($sources as $source) {
-			$dsname = (isset($this->ds_names[$source]) && !empty($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 4648294..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 = (isset($this->ds_names[$source]) && !empty($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 42a252a..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 = (isset($this->ds_names[$source]) && !empty($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 6e08b0b..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 = (isset($this->ds_names[$source]) && !empty($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
-- 
cgit v1.1