- added support for real delta. item.delta=2. (Alexei)

 - new selection for triggers.php (Alexei)
 - new selection for items.php (Alexei)
 - removed helpdesk.php (Alexei)
 - fixed check of permissions for screenedit.php (Alexei)
 - new selection for graphs in charts.php (Alexei)
 - new selection of maps in maps.php (Alexei)
 - new selection of group and host for latest.php (Alexei)
 - added support for macro {IPADDRESS} (Alexei)


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

1 files changed, 44 insertions, 32 deletions

diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 35750a99..65be722b 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -21,59 +21,39 @@
 <?php
 	include_once 	"include/defines.inc.php";
 	include_once 	"include/db.inc.php";
+	include_once 	"include/html.inc.php";
 	include_once 	"include/local_en.inc.php";
 
 	$USER_DETAILS	="";
 	$ERROR_MSG	="";
 
-	function	nbsp($str)
-	{
-		return str_replace(" ","&nbsp;",$str);;
-	}
-
-	function url1_param($parameter)
+	function getmicrotime()
 	{
-		global $HTTP_GET_VARS;
-	
-		if(isset($HTTP_GET_VARS[$parameter]))
-		{
-			return "$parameter=".$HTTP_GET_VARS[$parameter];
-		}
-		else
-		{
-			return "";
-		}
-	}
+		list($usec, $sec) = explode(" ",microtime()); 
+		return ((float)$usec + (float)$sec); 
+	} 
 
-	function url_param($parameter)
+	function	iif($bool,$a,$b)
 	{
-		global $HTTP_GET_VARS;
-	
-		if(isset($HTTP_GET_VARS[$parameter]))
+		if($bool)
 		{
-			return "&$parameter=".$HTTP_GET_VARS[$parameter];
+			return $a;
 		}
 		else
 		{
-			return "";
+			return $b;
 		}
 	}
 
-	function getmicrotime()
-	{
-		list($usec, $sec) = explode(" ",microtime()); 
-		return ((float)$usec + (float)$sec); 
-	} 
-
-	function	iif($bool,$a,$b)
+	function	iif_echo($bool,$a,$b)
 	{
 		if($bool)
 		{
-			return $a;
+			echo $a;
 		}
 		else
 		{
-			return $b;
+			echo $b;
 		}
 	}
 
@@ -3414,6 +3394,19 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid";
 		cr();
 	}
 
+	function	show_table3_h_delimiter()
+	{
+//		echo "</font>";
+		cr();
+		echo "</td>";
+		cr();
+		echo "<td width=%10 colspan=1 bgcolor=99AABB align=right valign=\"top\">";
+		cr();
+//		echo "	<font size=-1>";
+		cr();
+	}
+
+
 	function	show_table_v_delimiter()
 	{
 //		echo "</font>";
@@ -3517,6 +3510,25 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid";
 		cr();
 	}
 
+	function	show_table3_header_begin()
+	{
+		echo "<table border=0 align=center cellspacing=0 cellpadding=0 width=100% bgcolor=000000>";
+		cr();
+		echo "<tr>";
+		cr();
+		echo "<td valign=\"top\">";
+		cr();
+		echo "<table width=100% border=0 cellspacing=1 cellpadding=3>";
+		cr();
+		echo "<tr>";
+		cr();
+		echo "<td colspan=1 bgcolor=99AABB align=left valign=\"top\">";
+		cr();
+//		echo "	<font size=+1>";
+		cr();
+	}
+
+
 	function	show_table2_header_end()
 	{
 //		echo "	</font>";