Minor change.

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

9 files changed, 121 insertions, 97 deletions

diff --git a/frontends/php/actions.php b/frontends/php/actions.php
index 0e6240f0..b11caa89 100644
--- a/frontends/php/actions.php
+++ b/frontends/php/actions.php
@@ -244,8 +244,9 @@
 	echo "<br>";
 	show_table2_header_begin();
 	echo nbsp(S_NEW_ACTION);
+	$col=0;
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo "<form method=\"get\" action=\"actions.php\">";
 	echo "<input name=\"triggerid\" type=\"hidden\" value=".$_GET["triggerid"].">";
 	if(isset($_GET["actionid"]))
@@ -262,7 +263,7 @@
 
 	if($recipient==RECIPIENT_TYPE_GROUP)
 	{
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo nbsp(S_GROUP);
 		show_table2_h_delimiter();
 		echo "<select class=\"biginput\" name=\"usrgrpid\" size=\"1\">";
@@ -285,7 +286,7 @@
 	}
 	else
 	{
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo nbsp(S_USER);
 		show_table2_h_delimiter();
 		echo "<select class=\"biginput\" name=\"userid\" size=\"1\">";
@@ -306,7 +307,7 @@
 		echo "</select>";
 	}
 	
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo nbsp(S_WHEN_TRIGGER_BECOMES);
 	show_table2_h_delimiter();
 	echo "<select class=\"biginput\" name=\"good\" size=1>";
@@ -315,22 +316,22 @@
 	echo "<OPTION VALUE=\"2\""; if($good==2) echo "SELECTED"; echo ">".S_ON_OR_OFF;
 	echo "</SELECT>";
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo nbsp(S_DELAY_BETWEEN_MESSAGES_IN_SEC);
 	show_table2_h_delimiter();
 	echo "<input class=\"biginput\" name=\"delay\" value=\"$delay\" size=5>";
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo S_SUBJECT;
 	show_table2_h_delimiter();
 	echo "<input class=\"biginput\" name=\"subject\" value=\"$subject\" size=70>";
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo S_MESSAGE;
 	show_table2_h_delimiter();
  	echo "<textarea class=\"biginput\" name=\"message\" cols=70 ROWS=\"7\" wrap=\"soft\">$message</TEXTAREA>";
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo S_SCOPE;
 	show_table2_h_delimiter();
 	echo "<select class=\"biginput\" name=\"scope\" size=1 onChange=\"submit()\">";
@@ -341,7 +342,7 @@
 
 	if($scope>0)
 	{
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo nbsp(S_USE_IF_TRIGGER_SEVERITY);
 		show_table2_h_delimiter();
 		echo "<select class=\"biginput\" name=\"severity\" size=1>";
diff --git a/frontends/php/config.php b/frontends/php/config.php
index 6029e281..754ccb35 100644
--- a/frontends/php/config.php
+++ b/frontends/php/config.php
@@ -93,16 +93,18 @@
 
 
 <?php
+
+	$col=0;
 	show_table2_header_begin();
 	echo S_CONFIGURATION;
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo "<form method=\"get\" action=\"config.php\">";
 	echo nbsp(S_DO_NOT_KEEP_ALERTS_OLDER_THAN);
 	show_table2_h_delimiter();
 	echo "<input class=\"biginput\" name=\"alert_history\" value=\"".$config["alert_history"]."\" size=8>";
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo nbsp(S_DO_NOT_KEEP_ALARMS_OLDER_THAN);
 	show_table2_h_delimiter();
 	echo "<input class=\"biginput\" name=\"alarm_history\" value=\"".$config["alarm_history"]."\" size=8>";
@@ -181,7 +183,9 @@
 	show_table2_header_begin();
 	echo S_MEDIA;
 
-	show_table2_v_delimiter();
+	$col=0;
+
+	show_table2_v_delimiter($col++);
 	echo "<form name=\"selForm\" method=\"get\" action=\"config.php\">";
 	if(isset($mediatypeid))
 	{
@@ -192,7 +196,7 @@
 	show_table2_h_delimiter();
 	echo "<input class=\"biginput\" name=\"description\" value=\"".$description."\" size=30>";
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo S_TYPE;
 	show_table2_h_delimiter();
 //	echo "<select class=\"biginput\" name=\"type\" size=\"1\" onChange=\"doSelect(this,'sel_dmk')\">";
@@ -213,17 +217,17 @@
 	{
 		echo "<input class=\"biginput\" name=\"exec_path\" type=\"hidden\" value=\"$exec_path\">";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo nbsp(S_SMTP_SERVER);
 		show_table2_h_delimiter();
 		echo "<input class=\"biginput\" name=\"smtp_server\" value=\"".$smtp_server."\" size=30>";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo nbsp(S_SMTP_HELO);
 		show_table2_h_delimiter();
 		echo "<input class=\"biginput\" name=\"smtp_helo\" value=\"".$smtp_helo."\" size=30>";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo nbsp(S_SMTP_EMAIL);
 		show_table2_h_delimiter();
 		echo "<input class=\"biginput\" name=\"smtp_email\" value=\"".$smtp_email."\" size=30>";
@@ -234,7 +238,7 @@
 		echo "<input class=\"biginput\" name=\"smtp_helo\" type=\"hidden\" value=\"$smtp_helo\">";
 		echo "<input class=\"biginput\" name=\"smtp_email\" type=\"hidden\" value=\"$smtp_email\">";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo S_SCRIPT_NAME;
 		show_table2_h_delimiter();
 		echo "<input class=\"biginput\" name=\"exec_path\" value=\"".$exec_path."\" size=50>";
diff --git a/frontends/php/hosts.php b/frontends/php/hosts.php
index 7bc2ca02..409ecc15 100644
--- a/frontends/php/hosts.php
+++ b/frontends/php/hosts.php
@@ -339,8 +339,9 @@
 	echo "<a name=\"form\"></a>";
 	show_table2_header_begin();
 	echo S_HOST;
+	$col=0;
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo "<form method=\"get\" action=\"hosts.php#form\">";
 	if(isset($_GET["hostid"]))
 	{
@@ -354,7 +355,7 @@
 	show_table2_h_delimiter();
 	echo "<input class=\"biginput\" name=\"host\" value=\"$host\" size=20>";
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo S_GROUPS;
 	show_table2_h_delimiter();
 	echo "<select multiple class=\"biginput\" name=\"groups[]\" size=\"5\">";
@@ -382,12 +383,12 @@
 	}
 	echo "</select>";
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo nbsp(S_NEW_GROUP);
 	show_table2_h_delimiter();
 	echo "<input class=\"biginput\" name=\"newgroup\" size=20 value=\"$newgroup\">";
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo nbsp(S_USE_IP_ADDRESS);
 	show_table2_h_delimiter();
 // onChange does not work on some browsers: MacOS, KDE browser
@@ -396,7 +397,7 @@
 
 	if($useip=="checked")
 	{
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo S_IP_ADDRESS;
 		show_table2_h_delimiter();
 		echo "<input class=\"biginput\" name=\"ip\" value=\"$ip\" size=15>";
@@ -406,12 +407,12 @@
 		echo "<input class=\"biginput\" type=\"hidden\"name=\"ip\" value=\"$ip\" size=15>";
 	}
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo S_PORT;
 	show_table2_h_delimiter();
 	echo "<input class=\"biginput\" name=\"port\" size=6 value=\"$port\">";
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo S_STATUS;
 	show_table2_h_delimiter();
 	echo "<select class=\"biginput\" name=\"status\" size=\"1\">";
@@ -435,7 +436,7 @@
 	}
 	echo "</select>";
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo nbsp(S_USE_THE_HOST_AS_A_TEMPLATE);
 	show_table2_h_delimiter();
 	echo "<select class=\"biginput\" name=\"host_templateid\" size=\"1\">";
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 53c721e2..ff9e3a9d 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -1611,13 +1611,13 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid";
 	$menu=array(
 		"view"=>array(
 				"label"=>"View",
-				"pages"=>array("latest.php","tr_status.php","queue.php","latestalarms.php","alerts.php","maps.php","charts.php","screens.php","srv_status.php"),
+				"pages"=>array("latest.php","tr_status.php","queue.php","latestalarms.php","alerts.php","maps.php","charts.php","screens.php","srv_status.php","alarms.php"),
 				"level2"=>array(
 					array("label"=>"Latest data","url"=>"latest.php"),
 					array("label"=>"Triggers","url"=>"tr_status.php?onlytrue=true&noactions=true&compact=true"),
 					array("label"=>"Queue","url"=>"queue.php"),
-					array("label"=>"Actions","url"=>"latestalarms.php"),
-					array("label"=>"Alerts","url"=>"alerts.php"),
+					array("label"=>"Events","url"=>"latestalarms.php"),
+					array("label"=>"Actions","url"=>"alerts.php"),
 					array("label"=>"Maps","url"=>"maps.php"),
 					array("label"=>"Graphs","url"=>"charts.php"),
 					array("label"=>"Screens","url"=>"screens.php"),
@@ -1626,14 +1626,15 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid";
 				),
 		"reports"=>array(
 				"label"=>"Reports",
-				"pages"=>array("report2.php"),
+				"pages"=>array("report1.php","report2.php"),
 				"level2"=>array(
+					array("label"=>"Status of ZABBIX","url"=>"report1.php"),
 					array("label"=>"Availability report","url"=>"report2.php")
 					)
 				),
 		"configuration"=>array(
 				"label"=>"Configuration",
-				"pages"=>array("config.php","users.php","audit.php","hosts.php","items.php","triggers.php","sysmaps.php","graphs.php","screenconf.php","services.php","sysmap.php","media.php"),
+				"pages"=>array("config.php","users.php","audit.php","hosts.php","items.php","triggers.php","sysmaps.php","graphs.php","screenconf.php","services.php","sysmap.php","media.php","screenedit.php","actions.php"),
 				"level2"=>array(
 					array("label"=>"General","url"=>"config.php"),
 					array("label"=>"Users","url"=>"users.php"),
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 17effa9d..0ca6b7ba 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -163,8 +163,9 @@
 
 		show_table2_header_begin();
 		echo S_ITEM;
- 
-		show_table2_v_delimiter();
+
+		$col=0; 
+		show_table2_v_delimiter($col++);
 		echo "<form method=\"get\" action=\"items.php\">";
 		if(isset($_GET["itemid"]))
 		{
@@ -174,7 +175,7 @@
 		show_table2_h_delimiter();
 		echo "<input class=\"biginput\" name=\"description\" value=\"$description\"size=40>";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo S_HOST;
 		show_table2_h_delimiter();
 		echo "<select class=\"biginput\" name=\"hostid\" value=\"3\">";
@@ -194,7 +195,7 @@
 	        }
 		echo "</select>";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo S_TYPE;
 		show_table2_h_delimiter();
 
@@ -231,17 +232,17 @@
 
 		if(($type==ITEM_TYPE_SNMPV1)||($type==ITEM_TYPE_SNMPV2C))
 		{ 
-			show_table2_v_delimiter();
+			show_table2_v_delimiter($col++);
 			echo nbsp(S_SNMP_COMMUNITY);
 			show_table2_h_delimiter();
 			echo "<input class=\"biginput\" name=\"snmp_community\" value=\"$snmp_community\" size=16>";
 
-			show_table2_v_delimiter();
+			show_table2_v_delimiter($col++);
 			echo nbsp(S_SNMP_OID);
 			show_table2_h_delimiter();
 			echo "<input class=\"biginput\" name=\"snmp_oid\" value=\"$snmp_oid\" size=40>";
 
-			show_table2_v_delimiter();
+			show_table2_v_delimiter($col++);
 			echo nbsp(S_SNMP_PORT);
 			show_table2_h_delimiter();
 			echo "<input class=\"biginput\" name=\"snmp_port\" value=\"$snmp_port\" size=5>";
@@ -253,17 +254,17 @@
 		}
 		else if($type==ITEM_TYPE_SNMPV3)
 		{
-			show_table2_v_delimiter();
+			show_table2_v_delimiter($col++);
 			echo nbsp(S_SNMP_OID);
 			show_table2_h_delimiter();
 			echo "<input class=\"biginput\" name=\"snmp_oid\" value=\"$snmp_oid\" size=40>";
 
-			show_table2_v_delimiter();
+			show_table2_v_delimiter($col++);
 			echo nbsp(S_SNMPV3_SECURITY_NAME);
 			show_table2_h_delimiter();
 			echo "<input class=\"biginput\" name=\"snmpv3_securityname\" value=\"$snmpv3_securityname\" size=64>";
 
-			show_table2_v_delimiter();
+			show_table2_v_delimiter($col++);
 			echo nbsp(S_SNMPV3_SECURITY_LEVEL);
 			show_table2_h_delimiter();
 			echo "<SELECT class=\"biginput\" NAME=\"snmpv3_securitylevel\" value=\"$snmpv3_securitylevel\" size=\"1\">";
@@ -281,17 +282,17 @@
 
 			echo "</SELECT>";
 
-			show_table2_v_delimiter();
+			show_table2_v_delimiter($col++);
 			echo nbsp(S_SNMPV3_AUTH_PASSPHRASE);
 			show_table2_h_delimiter();
 			echo "<input class=\"biginput\" name=\"snmpv3_authpassphrase\" value=\"$snmpv3_authpassphrase\" size=64>";
 
-			show_table2_v_delimiter();
+			show_table2_v_delimiter($col++);
 			echo nbsp(S_SNMPV3_PRIV_PASSPHRASE);
 			show_table2_h_delimiter();
 			echo "<input class=\"biginput\" name=\"snmpv3_privpassphrase\" value=\"$snmpv3_privpassphrase\" size=64>";
 
-			show_table2_v_delimiter();
+			show_table2_v_delimiter($col++);
 			echo nbsp(S_SNMP_PORT);
 			show_table2_h_delimiter();
 			echo "<input class=\"biginput\" name=\"snmp_port\" value=\"$snmp_port\" size=5>";
@@ -310,17 +311,17 @@
 			echo "<input class=\"biginput\" name=\"snmpv3_privpassphrase\" type=hidden value=\"$snmpv3_privpassphrase\">";
 		}
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo S_KEY;
 		show_table2_h_delimiter();
 		echo "<input class=\"biginput\" name=\"key\" value=\"$key\" size=40>";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo S_UNITS;
 		show_table2_h_delimiter();
 		echo "<input class=\"biginput\" name=\"units\" value=\"$units\" size=10>";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo S_USE_MULTIPLIER;
 		show_table2_h_delimiter();
 		echo "<SELECT class=\"biginput\" NAME=\"multiplier\" value=\"$multiplier\" size=\"1\" onChange=\"submit()\">";
@@ -330,7 +331,7 @@
 
 		if($multiplier == 1)
 		{
-			show_table2_v_delimiter();
+			show_table2_v_delimiter($col++);
 			echo nbsp(S_CUSTOM_MULTIPLIER);
 			show_table2_h_delimiter();
 			echo "<input class=\"biginput\" name=\"formula\" value=\"$formula\" size=40>";
@@ -342,7 +343,7 @@
 
 		if($type!=2)
 		{
-			show_table2_v_delimiter();
+			show_table2_v_delimiter($col++);
 			echo nbsp(S_UPDATE_INTERVAL_IN_SEC);
 			show_table2_h_delimiter();
 			echo "<input class=\"biginput\" name=\"delay\" value=\"$delay\" size=5>";
@@ -352,17 +353,17 @@
 			echo "<input class=\"biginput\" name=\"delay\" type=hidden value=\"$delay\">";
 		}
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo nbsp(S_KEEP_HISTORY_IN_DAYS);
 		show_table2_h_delimiter();
 		echo "<input class=\"biginput\" name=\"history\" value=\"$history\" size=8>";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo nbsp(S_KEEP_TRENDS_IN_DAYS);
 		show_table2_h_delimiter();
 		echo "<input class=\"biginput\" name=\"trends\" value=\"$trends\" size=8>";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo S_STATUS;
 		show_table2_h_delimiter();
 		echo "<SELECT class=\"biginput\" NAME=\"status\" value=\"$status\" size=\"1\">";
@@ -380,7 +381,7 @@
 		echo ">".S_NOT_SUPPORTED;
 		echo "</SELECT>";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo nbsp(S_TYPE_OF_INFORMATION);
 		show_table2_h_delimiter();
 		echo "<SELECT class=\"biginput\" NAME=\"value_type\" value=\"$value_type\" size=\"1\">";
@@ -392,7 +393,7 @@
 		echo ">".S_CHARACTER;
 		echo "</SELECT>";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo nbsp(S_STORE_VALUE);
 		show_table2_h_delimiter();
 		echo "<SELECT class=\"biginput\" NAME=\"delta\" value=\"$delta\" size=\"1\">";
@@ -403,7 +404,7 @@
 
 		if($type==2)
 		{
-			show_table2_v_delimiter();
+			show_table2_v_delimiter($col++);
 			echo nbsp(S_ALLOWED_HOSTS);
 			show_table2_h_delimiter();
 			echo "<input class=\"biginput\" name=\"trapper_hosts\" value=\"$trapper_hosts\" size=40>";
@@ -431,6 +432,8 @@
 	{
 		global  $_GET;
 
+		$col=0;
+
 		if(isset($groupid))
 		{
 			$groupid=get_group_by_groupid($groupid);
@@ -445,7 +448,7 @@
 		show_table2_header_begin();
 		echo S_HOST_GROUP;
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo "<form method=\"get\" action=\"hosts.php\">";
 		if(isset($_GET["groupid"]))
 		{
@@ -455,7 +458,7 @@
 		show_table2_h_delimiter();
 		echo "<input class=\"biginput\" name=\"name\" value=\"$name\" size=30>";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo S_HOSTS;
 		show_table2_h_delimiter();
 		echo "<select multiple class=\"biginput\" name=\"hosts[]\" size=\"5\">";
@@ -499,6 +502,8 @@
 	{
 		global  $_GET;
 
+		$col=0;
+
 		if(isset($usrgrpid))
 		{
 			$usrgrp=get_usergroup_by_usrgrpid($usrgrpid);
@@ -513,7 +518,7 @@
 		show_table2_header_begin();
 		echo S_USER_GROUP;
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo "<form method=\"get\" action=\"users.php\">";
 		if(isset($usrgrpid))
 		{
@@ -523,7 +528,7 @@
 		show_table2_h_delimiter();
 		echo "<input class=\"biginput\" name=\"name\" value=\"$name\" size=30>";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo S_USERS;
 		show_table2_h_delimiter();
 		echo "<select multiple class=\"biginput\" name=\"users[]\" size=\"5\">";
@@ -615,10 +620,12 @@
 	{
 		global	$_GET;
 
+		$col=0;
+
 		show_table2_header_begin();
 		echo "Login";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo "<form method=\"post\" action=\"index.php\">";
 
 		echo "Login name";
@@ -626,7 +633,7 @@
 //		echo "<input name=\"name\" value=\"".$_GET["name"]."\" size=20>";
 		echo "<input class=\"biginput\" name=\"name\" value=\"\" size=20>";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo "Password";
 		show_table2_h_delimiter();
 //		echo "<input type=\"password\" name=\"password\" value=\"$password\" size=20>";
@@ -689,6 +696,8 @@
 	# Insert form for Trigger
 	function	insert_trigger_form($hostid,$triggerid)
 	{
+		$col=0;
+
 		if(isset($triggerid))
 		{
 			$trigger=get_trigger_by_triggerid($triggerid);
@@ -715,7 +724,7 @@
 		show_table2_header_begin();
 		echo "Trigger configuration";
  
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		if(isset($hostid))
 		{
 			echo "<form method=\"get\" action=\"triggers.php?hostid=$hostid\">";
@@ -729,12 +738,12 @@
 		show_table2_h_delimiter();
 		echo "<input class=\"biginput\" name=\"description\" value=\"$description\" size=70>";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo "Expression";
 		show_table2_h_delimiter();
 		echo "<input class=\"biginput\" name=\"expression\" value=\"$expression\" size=70>";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo "Severity";
 		show_table2_h_delimiter();
 		echo "<SELECT class=\"biginput\" NAME=\"priority\" size=\"1\">";
@@ -746,17 +755,17 @@
 		echo "<OPTION VALUE=\"5\" "; if($priority==5) echo "SELECTED"; echo ">Disaster";
 		echo "</SELECT>";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo "Comments";
 		show_table2_h_delimiter();
  		echo "<TEXTAREA class=\"biginput\" NAME=\"comments\" COLS=70 ROWS=\"7\" WRAP=\"SOFT\">$comments</TEXTAREA>";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo "URL";
 		show_table2_h_delimiter();
 		echo "<input class=\"biginput\" name=\"url\" value=\"$url\" size=70>";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo "Disabled";
 		show_table2_h_delimiter();
 		echo "<INPUT TYPE=\"CHECKBOX\" ";
diff --git a/frontends/php/screenconf.php b/frontends/php/screenconf.php
index ee8d36b8..c181e87f 100644
--- a/frontends/php/screenconf.php
+++ b/frontends/php/screenconf.php
@@ -113,8 +113,9 @@
 	echo "<br>";
 	show_table2_header_begin();
 	echo S_SCREEN;
+	$col=0;
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo "<form method=\"get\" action=\"screenconf.php\">";
 	if(isset($_GET["screenid"]))
 	{
@@ -124,12 +125,12 @@
 	show_table2_h_delimiter();
 	echo "<input class=\"biginput\" name=\"name\" value=\"$name\" size=32>";
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo S_COLUMNS;
 	show_table2_h_delimiter();
 	echo "<input class=\"biginput\" name=\"cols\" size=5 value=\"$cols\">";
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo S_ROWS;
 	show_table2_h_delimiter();
 	echo "<input class=\"biginput\" name=\"rows\" size=5 value=\"$rows\">";
diff --git a/frontends/php/services.php b/frontends/php/services.php
index 6598ea65..5df52115 100644
--- a/frontends/php/services.php
+++ b/frontends/php/services.php
@@ -228,8 +228,9 @@
 	echo "<a name=\"form\"></a>";
 	show_table2_header_begin();
 	echo S_SERVICE;
+	$col=0;
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo "<form method=\"get\" action=\"services.php\">";
 	if(isset($_GET["serviceid"]))
 	{
@@ -239,7 +240,7 @@
 	show_table2_h_delimiter();
 	echo "<input class=\"biginput\" name=\"name\" value=\"$name\" size=32>";
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo nbsp(S_STATUS_CALCULATION_ALGORITHM);
 	show_table2_h_delimiter();
 	echo "<select class=\"biginput\" name=\"algorithm\" size=1>";
@@ -275,7 +276,7 @@
 	}
 	echo "</SELECT>";
 
-        show_table2_v_delimiter();
+        show_table2_v_delimiter($col++);
         echo nbsp(S_SHOW_SLA);
         show_table2_h_delimiter();
 	if($showsla==1)
@@ -288,12 +289,12 @@
         	echo "<INPUT class=\"biginput\" TYPE=\"CHECKBOX\" NAME=\"showsla\">";
 	}
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo nbsp(S_ACCEPTABLE_SLA_IN_PERCENT);
 	show_table2_h_delimiter();
 	echo "<input class=\"biginput\" name=\"goodsla\" value=\"$goodsla\" size=6>";
 
-        show_table2_v_delimiter();
+        show_table2_v_delimiter($col++);
         echo nbsp(S_LINK_TO_TRIGGER_Q);
         show_table2_h_delimiter();
 	if(isset($triggerid)&&($triggerid!=""))
@@ -305,7 +306,7 @@
         	echo "<INPUT class=\"biginput\" TYPE=\"CHECKBOX\" NAME=\"linktrigger\">";
 	}
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo S_TRIGGER;
 	show_table2_h_delimiter();
         $result=DBselect("select triggerid,description from triggers order by description");
@@ -330,7 +331,7 @@
         }
         echo "</SELECT>";
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo nbsp(S_SORT_ORDER_0_999);
 	show_table2_h_delimiter();
 	echo "<input class=\"biginput\" name=\"sortorder\" value=\"$sortorder\" size=3>";
@@ -366,8 +367,9 @@
 	echo "<br>";
 	show_table2_header_begin();
 	echo nbsp(S_LINK_TO);
+	$col=0;
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo "<form method=\"post\" action=\"services.php\">";
 	if(isset($_GET["serviceid"]))
 	{
@@ -397,7 +399,7 @@
         }
         echo "</SELECT>";
 
-        show_table2_v_delimiter();
+        show_table2_v_delimiter($col++);
         echo nbsp(S_SOFT_LINK_Q);
         show_table2_h_delimiter();
 //	if(isset($_GET["softlink"])&&($_GET["triggerid"]!=""))
@@ -423,8 +425,9 @@
 	echo "<br>";
 	show_table2_header_begin();
 	echo nbsp(S_ADD_SERVER_DETAILS);
+	$col=0;
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo "<form method=\"post\" action=\"services.php\">";
 	if(isset($_GET["serviceid"]))
 	{
diff --git a/frontends/php/sysmap.php b/frontends/php/sysmap.php
index 7f73d1f2..1df56b1b 100644
--- a/frontends/php/sysmap.php
+++ b/frontends/php/sysmap.php
@@ -193,8 +193,9 @@
 
 	show_table2_header_begin();
 	echo "New host to display";
+	$col=0;
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo "<form method=\"get\" action=\"sysmap.php\">";
 	if(isset($_GET["shostid"]))
 	{
@@ -224,7 +225,7 @@
 	}
 	echo "</SELECT>";
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo "Icon (OFF)";
 	show_table2_h_delimiter();
 	echo "<select class=\"biginput\" name=\"icon\" size=1>";
@@ -243,7 +244,7 @@
 	}
 	echo "</SELECT>";
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo "Icon (ON)";
 	show_table2_h_delimiter();
 	echo "<select class=\"biginput\" name=\"icon_on\" size=1>";
@@ -262,22 +263,22 @@
 	}
 	echo "</SELECT>";
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo "Label";
 	show_table2_h_delimiter();
 	echo "<input class=\"biginput\" name=\"label\" size=32 value=\"$label\">";
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo nbsp("Coordinate X");
 	show_table2_h_delimiter();
 	echo "<input class=\"biginput\" name=\"x\" size=5 value=\"$x\">";
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo nbsp("Coordinate Y");
 	show_table2_h_delimiter();
 	echo "<input class=\"biginput\" name=\"y\" size=5 value=\"$y\">";
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo nbsp("URL");
 	show_table2_h_delimiter();
 	echo "<input class=\"biginput\" name=\"url\" size=64 value=\"$url\">";
@@ -299,8 +300,9 @@
 	{
 		show_table2_header_begin();
 		echo "New connector";
+		$col=0;
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo "<form method=\"post\" action=\"sysmap.php?sysmapid=".$_GET["sysmapid"]."\">";
 		echo nbsp("Host 1");
 		show_table2_h_delimiter();
@@ -321,7 +323,7 @@
 		}
 		echo "</SELECT>";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 //		echo "<form method=\"get\" action=\"sysmap.php?sysmapid=".$_GET["sysmapid"].">";
 		echo nbsp("Host 2");
 		show_table2_h_delimiter();
@@ -334,7 +336,7 @@
 		}
 		echo "</SELECT>";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo nbsp("Link status indicator");
 		show_table2_h_delimiter();
 	        $result=DBselect("select triggerid,description from triggers order by description");
@@ -352,7 +354,7 @@
 	        }
 	        echo "</SELECT>";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo "Type (OFF)";
 		show_table2_h_delimiter();
 		echo "<select name=\"drawtype_off\" size=1>";
@@ -363,7 +365,7 @@
 		echo "<OPTION VALUE='4' ".iif(isset($drawtype_off)&&($drawtype_off==4),"SELECTED","").">".get_drawtype_description(4);
 		echo "</SELECT>";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo "Color (OFF)";
 		show_table2_h_delimiter();
 		echo "<select name=\"color_off\" size=1>";
@@ -380,7 +382,7 @@
 		echo "<OPTION VALUE='Yellow' ".iif(isset($color_off)&&($color_off=="Yellow"),"SELECTED","").">Yellow";
 		echo "</SELECT>";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo "Type (ON)";
 		show_table2_h_delimiter();
 		echo "<select name=\"drawtype_on\" size=1>";
@@ -391,7 +393,7 @@
 		echo "<OPTION VALUE='4' ".iif(isset($drawtype_on)&&($drawtype_on==4),"SELECTED","").">".get_drawtype_description(4);
 		echo "</SELECT>";
 
-		show_table2_v_delimiter();
+		show_table2_v_delimiter($col++);
 		echo "Color (ON)";
 		show_table2_h_delimiter();
 		echo "<select name=\"color_on\" size=1>";
diff --git a/frontends/php/sysmaps.php b/frontends/php/sysmaps.php
index bde13f2d..7103861d 100644
--- a/frontends/php/sysmaps.php
+++ b/frontends/php/sysmaps.php
@@ -118,7 +118,9 @@
 	show_table2_header_begin();
 	echo "New system map";
 
-	show_table2_v_delimiter();
+	$col=0;
+
+	show_table2_v_delimiter($col++);
 	echo "<form method=\"get\" enctype=\"multipart/form-data\" action=\"sysmaps.php\">";
 	if(isset($_GET["sysmapid"]))
 	{
@@ -128,17 +130,17 @@
 	show_table2_h_delimiter();
 	echo "<input class=\"biginput\" name=\"name\" value=\"$name\" size=32>";
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo "Width";
 	show_table2_h_delimiter();
 	echo "<input class=\"biginput\" name=\"width\" size=5 value=\"$width\">";
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo "Height";
 	show_table2_h_delimiter();
 	echo "<input class=\"biginput\" name=\"height\" size=5 value=\"$height\">";
 
-	show_table2_v_delimiter();
+	show_table2_v_delimiter($col++);
 	echo "Background image";
 	show_table2_h_delimiter();
 	echo "<select class=\"biginput\" name=\"background\" size=1>";