- 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, 6 insertions, 56 deletions

diff --git a/frontends/php/include/classes/ctableinfo.inc.php b/frontends/php/include/classes/ctableinfo.inc.php
index 4826eeba..34d35ddf 100644
--- a/frontends/php/include/classes/ctableinfo.inc.php
+++ b/frontends/php/include/classes/ctableinfo.inc.php
@@ -22,65 +22,15 @@
 	class CTableInfo extends CTable
 	{
 /* public */
-		var $sortby;
-
 		function CTableInfo($message='...',$class='tableinfo')
 		{
 			parent::CTable($message,$class);
-			$this->SetOddRowClass('odd_row');
-			$this->SetEvenRowClass('even_row');
-			$this->SetCellSpacing(1);
-			$this->SetCellPadding(3);
-			
-			$this->sortby = null;
-		}
-		function SetHeader($value=NULL,$class='header')
-		{
-			parent::SetHeader($value,$class);
-		}
-		function SetFooter($value=NULL,$class='footer')
-		{
-			parent::SetFooter($value,$class);
-		}
-		function SortBy($value = NULL)
-		{
-			if(!is_numeric($value) && !is_null($value))
-			{
-				return $this->error("Incorrect value for SortBy [$value]"); 
-			}
-			$this->sortby = $value;
-		}
-		function ShowHeader()
-		{
-			if(isset($this->header))
-			{
-				// create a copy of real header
-				$header = $this->header;
-
-				if(!is_null($this->sortby)) 
-				{
-					$i = 1;
-					foreach($header->items as $id => $col)
-					{
-						$sort = new CSpan();
-						$down = "_off";
-						$up = "_off";
-
-						if(($i-$this->sortby) == 0) $down = "";
-						if(($i+$this->sortby) == 0) $up = "";
-
-						$sort->AddItem(array(
-							new CImg("images/general/sortup$up.gif"),
-							new CImg("images/general/sortdown$down.gif"),
-							SPACE));
-						$sort->AddOption("style","float:left");
-
-						$header->items[$id]->AddItem($sort);
-						$i++;
-					}
-				}
-				$header->Show();
-			}
+			$this->oddRowClass = 'odd_row';
+			$this->evenRowClass = 'even_row';
+			$this->options['cellpadding'] = 3;
+			$this->options['cellspacing'] = 1;
+			$this->headerClass = 'header';
+			$this->footerClass = 'footer';
 		}
 	}
 ?>