GUI improvements.

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

3 files changed, 18 insertions, 18 deletions

diff --git a/frontends/php/include/classes/ctable.inc.php b/frontends/php/include/classes/ctable.inc.php
index 300d53b8..eccdff4b 100644
--- a/frontends/php/include/classes/ctable.inc.php
+++ b/frontends/php/include/classes/ctable.inc.php
@@ -22,11 +22,11 @@
 	class CCol extends CTag
 	{
 /* public */
-		function CCol($item=NULL,$calss=NULL)
+		function CCol($item=NULL,$class=NULL)
 		{
 			parent::CTag("td","yes");
 			$this->AddItem($item);
-			$this->SetClass($calss);
+			$this->SetClass($class);
 		}
 		function SetAlign($value)
 		{
@@ -88,7 +88,7 @@
                         		if(is_a($el,'ccol'))
 					{
                 		        	$ret |= parent::AddItem($el);
-					} else {
+					} elseif(!is_null($el)) {
 						$ret |= parent::AddItem(new CCol($el));
 					}
 				}
diff --git a/frontends/php/include/validate.inc.php b/frontends/php/include/validate.inc.php
index bffbac3d..fe195fa0 100644
--- a/frontends/php/include/validate.inc.php
+++ b/frontends/php/include/validate.inc.php
@@ -105,7 +105,7 @@
 		{
 			if(!isset($fields[$key]))
 			{
-echo "Unset: $key<br>";
+//echo "Unset: $key<br>";
 				unset($_REQUEST[$key]);
 			}
 		}
@@ -119,7 +119,7 @@ echo "Unset: $key<br>";
 
 			if(($flags&P_NZERO)&&(isset($_REQUEST[$field]))&&($_REQUEST[$field]==0))
 			{
-echo "Unset: $field<br>";
+//echo "Unset: $field<br>";
 				unset($_REQUEST[$field]);
 			}
 		}
@@ -134,7 +134,7 @@ echo "Unset: $field<br>";
 			
 			if(($flags&P_ACT)&&(isset($_REQUEST[$field])))
 			{
-echo "Unset:".$field."<br>";
+//echo "Unset:".$field."<br>";
 				unset($_REQUEST[$field]);
 			}
 		}
@@ -144,7 +144,7 @@ echo "Unset:".$field."<br>";
 	{
 		foreach($_REQUEST as $key => $val)
 		{
-echo "Unset:".$key."<br>";
+//echo "Unset:".$key."<br>";
 			unset($_REQUEST[$key]);
 		}
 	}
@@ -236,7 +236,7 @@ echo "Unset:".$key."<br>";
 			if(!isset($_REQUEST[$field]))
 				return ZBX_VALID_OK;
 
-echo "Unset:".$field."<br>";
+//echo "Unset:".$field."<br>";
 			unset($_REQUEST[$field]);
 
 			if($flags&P_SYS)
diff --git a/frontends/php/tr_status.php b/frontends/php/tr_status.php
index a3eef85d..8a8379ea 100644
--- a/frontends/php/tr_status.php
+++ b/frontends/php/tr_status.php
@@ -474,7 +474,7 @@
 	{
 		$header=array_merge($header,array(S_ACTIONS));
 	}
-	$header=array_merge($header,array(S_COMMENTS));
+	array_push($header,S_COMMENTS);
 	$table->setHeader($header);
 	unset($header);
 
@@ -561,23 +561,23 @@
 			$blink2="";
 		}
 		if($row["value"]==0)
-				$value=array("value"=>"$blink1".S_FALSE_BIG."$blink2","class"=>"off");
+				$value=new CSpan("$blink1".S_FALSE_BIG."$blink2","off");
 		else if($row["value"]==2)
-				$value=array("value"=>"$blink1".S_UNKNOWN_BIG."$blink2","class"=>"unknown");
+				$value=new CSpan("$blink1".S_UNKNOWN_BIG."$blink2","unknown");
 		else
-				$value=array("value"=>S_TRUE_BIG,"class"=>"on");
+				$value=new CSpan(S_TRUE_BIG,"on");
 
 		if($row["priority"]==0)		$priority=S_NOT_CLASSIFIED;
 		elseif($row["priority"]==1)	$priority=S_INFORMATION;
 		elseif($row["priority"]==2)	$priority=S_WARNING;
-		elseif($row["priority"]==3)	$priority=array("value"=>S_AVERAGE,"class"=>"average");
-		elseif($row["priority"]==4)	$priority=array("value"=>S_HIGH,"class"=>"high");
-		elseif($row["priority"]==5)	$priority=array("value"=>S_DISASTER,"class"=>"disaster");
+		elseif($row["priority"]==3)	$priority=new CSpan(S_AVERAGE,"average");
+		elseif($row["priority"]==4)	$priority=new CSpan(S_HIGH,"high");
+		elseif($row["priority"]==5)	$priority=new CSpan(S_DISASTER,"disaster");
 		else				$priority=$row["priority"];
 
 		$lastchange="<A HREF=\"alarms.php?triggerid=".$row["triggerid"]."\">".date(S_DATE_FORMAT_YMDHMS,$row["lastchange"])."</a>";
 
-		$actions=array("hide"=>1);
+		$actions=NULL;
 		if($noactions!='true')
 		{
 //			$actions="<A HREF=\"actions.php?triggerid=".$row["triggerid"]."\">".S_SHOW_ACTIONS."</A> - ";
@@ -591,7 +591,7 @@
 				$actions=$actions."<A HREF=\"triggers.php?triggerid=".$row["triggerid"]."#form\">".S_CHANGE."</A>";
 			}
 		}
-		$comments=array("hide"=>1);;
+		$comments=NULL;
 		if($row["comments"] != "")
 		{
 			$comments="<A HREF=\"tr_comments.php?triggerid=".$row["triggerid"]."\">".S_SHOW."</a>";
@@ -601,7 +601,7 @@
 			$comments="<A HREF=\"tr_comments.php?triggerid=".$row["triggerid"]."\">".S_ADD."</a>";
 		}
 
-		$table->addRow(array(
+		$table->AddRow(array(
 				$description,
 				$value,
 				$priority,