- Frontend improvements (Eugene)

git-svn-id: svn://svn.zabbix.com/trunk@2565 97f52cf1-0a1b-0410-bd0e-c28be96e8082

1 files changed, 12 insertions, 4 deletions

diff --git a/frontends/php/include/classes/ccombobox.inc.php b/frontends/php/include/classes/ccombobox.inc.php
index e05c8ea5..cecb45c3 100644
--- a/frontends/php/include/classes/ccombobox.inc.php
+++ b/frontends/php/include/classes/ccombobox.inc.php
@@ -46,17 +46,25 @@
 		}
 		function SetEnable($value='yes')
 		{
-			if($value == 'yes' || $value == 'enabled' || $value=='on')
+			if(is_null($value))
+				return 0;
+			elseif((is_string($value) && ($value == 'yes' || $value == 'enabled' || $value=='on'))
+				|| (is_int($value) && $value<>0))
 				return $this->DelOption('disabled');
-			elseif($value == 'no' || $value == 'disabled' || $value=='off' || $value == NULL)
+			elseif((is_string($value) && ($value == 'no' || $value == 'disabled' || $value=='off'))
+				|| (is_int($value) && $value==0))
 				return $this->AddOption('disabled','disabled');
 			return $this->error("Incorrect value for SetEnable [$value]");
 		}
 		function SetSelected($value='yes')
 		{
-			if($value == 'yes' || $value == "selected" || $value=='on')
+			if(is_null($value))
+				return 0;
+			elseif((is_string($value) && ($value == 'yes' || $value == "selected" || $value=='on'))
+				|| (is_int($value) && $value<>0))
 				return $this->AddOption('selected','selected');
-			elseif($value == 'no' || $value=='off' || $value == NULL)
+			elseif((is_string($value) && ($value == 'no' || $value=='off'))
+				|| (is_int($value) && $value==0))
 				return $this->DelOption('selected');
 			return $this->error("Incorrect value for SetSelected [$value]");
 		}