- improved stricted PHP5 supporting (Eugene)

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

1 files changed, 8 insertions, 13 deletions

diff --git a/frontends/php/include/classes/ctable.inc.php b/frontends/php/include/classes/ctable.inc.php
index 79ffc1d4..5001ec30 100644
--- a/frontends/php/include/classes/ctable.inc.php
+++ b/frontends/php/include/classes/ctable.inc.php
@@ -55,18 +55,16 @@
 		{
 			return $this->options['align'] = $value;
 		}
-		function AddItem($item=NULL)
+		function AddItem($item)
 		{
-                        if(is_a($item,'ccol'))
-			{
+			if(strtolower(get_class($item))=='ccol') {
 				parent::AddItem($item);
 			}
 			elseif(is_array($item))
 			{
 				foreach($item as $el)
 				{
-                        		if(is_a($el,'ccol'))
-					{
+                        		if(strtolower(get_class($el))=='ccol') {
                 		        	parent::AddItem($el);
 					} elseif(!is_null($el)) {
 						parent::AddItem('<td>'.unpack_object($el).'</td>');
@@ -82,7 +80,7 @@
 
 	class CTable extends CTag
 	{
-/* protected */
+/* protected *//*
 		var $oddRowClass;
 		var $evenRowClass;
 		var $header;
@@ -91,7 +89,7 @@
 		var $rownum;
 		var $footer;
 		var $footerClass;
-		var $message;
+		var $message;*/
 /* public */
 		function CTable($message=NULL,$class=NULL)
 		{
@@ -136,15 +134,13 @@
 		{
 			if(is_null($item)) return NULL;
 
-			if(is_a($item,'ccol'))
-			{
+			if(strtolower(get_class($item))=='ccol') {
 				if(isset($this->header) && !isset($item->options['colspan']))
 					$item->options['colspan'] = $this->colnum;
 
 				$item = new CRow($item,$rowClass);
 			}
-			elseif(is_a($item,'crow'))
-			{
+			if(strtolower(get_class($item))=='crow') {
 				if(isset($rowClass))
 					$item->SetClass($rowClass);
 			}
@@ -164,8 +160,7 @@
 		{
 			if(is_null($class)) $class = $this->headerClass;
 
-			if(is_a($value,'crow'))
-			{
+			if(strtolower(get_class($value))=='crow') {
 				if(!is_null($class))	$value->SetClass($class);
 			}else{
 				$value = new CRow($value,$class);