- developed group permission system (Eugene)

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

1 files changed, 8 insertions, 9 deletions

diff --git a/frontends/php/include/classes/ctable.inc.php b/frontends/php/include/classes/ctable.inc.php
index a0ab239c..10bb4d87 100644
--- a/frontends/php/include/classes/ctable.inc.php
+++ b/frontends/php/include/classes/ctable.inc.php
@@ -145,8 +145,7 @@
 			}
 			elseif(is_a($item,'crow'))
 			{
-				if(isset($rowClass))
-					$item->options['class'] = $rowClass;
+				$item->SetClass($rowClass);
 			}
 			else
 			{
@@ -154,9 +153,9 @@
 			}
 			if(!isset($item->options['class']))
 			{
-				$item->options['class'] = ($this->rownum % 2) ?
-                                                $this->evenRowClass:
-                                                $this->oddRowClass;
+				$item->SetClass(($this->rownum % 2) ?
+                                                $this->oddRowClass:
+                                                $this->evenRowClass);
 			}/**/
 			return $item->ToString();
 		}
@@ -166,7 +165,7 @@
 
 			if(is_a($value,'crow'))
 			{
-				if(isset($class))	$value->SetClass($class);
+				if(!is_null($class))	$value->SetClass($class);
 			}else{
 				$value = new CRow($value,$class);
 			}
@@ -181,13 +180,14 @@
 		}
 		function AddRow($item,$rowClass=NULL)
 		{
+			$item = $this->AddItem($this->PrepareRow($item,$rowClass));
 			++$this->rownum;
-			return $this->AddItem($this->PrepareRow($item,$rowClass));
+			return $item;
 		}
 		function ShowRow($item,$rowClass=NULL)
 		{
-			++$this->rownum;
 			echo $this->PrepareRow($item,$rowClass);
+			++$this->rownum;
 		}
 /* protected */
 		function GetNumRows()
@@ -206,7 +206,6 @@
 			$ret = "";
 			if($this->rownum == 0 && isset($this->message)) 
 			{
-				++$this->rownum;
 				$ret = $this->PrepareRow(new CCol($this->message,'message'));
 			}
 			$ret .= $this->footer;