- speed improvement for Overview screens (Eugene)

 - developed 'net.if.total[*]' parameter (Eugene)
 - fixed new map link adding (Eugene)
 - fixed host group adding (Eugene)
 - fixed map displaying (Eugene)
 - fixed 'No permissions' for 'Latest data','Triggers','Alarms' screens (Eugene)
 - fixed permision deletion (Eugene)
 - fixed 'get_map_by_sysmapid' function calls(Eugene)
 - improved php code execution speed (Eugene)


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

1 files changed, 17 insertions, 7 deletions

diff --git a/frontends/php/include/classes/cformtable.inc.php b/frontends/php/include/classes/cformtable.inc.php
index 170dc881..fb5640ed 100644
--- a/frontends/php/include/classes/cformtable.inc.php
+++ b/frontends/php/include/classes/cformtable.inc.php
@@ -40,7 +40,7 @@
 			$this->SetHelp();
 
 			$frm_link = new CLink();
-			$frm_link->SetName("formtable");
+//			$frm_link->SetName("formtable");
 			$this->AddItemToTopRow($frm_link);
 			
 			$this->AddVar("form",get_request("form",1));
@@ -59,6 +59,14 @@
 			else
 				return $this->error("Incorrect value for SetAction [$value]");
 		}
+		function SetName($value)
+		{
+			if(!is_string($value))
+			{
+				return $this->error("Incorrect value for SetAlign [$value]");
+			}
+			return $this->AddOption('name',$value);
+		}
 		function SetAlign($value)
 		{
 			if(!is_string($value))
@@ -128,19 +136,17 @@
 			$this->bottom_items->AddItem($value);
 		}
 /* protected */
-		function ShowTagBody()
+		function BodyToString()
 		{
-			parent::ShowTagBody();
+			parent::BodyToString();
 
 			$tbl = new CTable(NULL,'formtable');
+
 			$tbl->SetOddRowClass('form_odd_row');
 			$tbl->SetEvenRowClass('form_even_row');
 			$tbl->SetCellSpacing(0);
 			$tbl->SetCellPadding(1);
 			$tbl->SetAlign($this->align);
-# add center rows
-			foreach($this->center_items as $item)
-			        $tbl->AddRow($item);
 # add first row
 			$col = new CCol(NULL,'form_row_first');
 		        $col->SetColSpan(2);
@@ -150,7 +156,11 @@
 		        $tbl->SetHeader($col);
 # add last row
 		        $tbl->SetFooter($this->bottom_items);
-			$tbl->Show();
+# add center rows
+			foreach($this->center_items as $item)
+			        $tbl->AddRow($item);
+
+			return $tbl->ToString();
 		}
 	}
 ?>