- added link to ZABBIX manual from all forms (Alexei)

 - icmppingsec to return '0' if cannot ping (Alexei)
 - added error reason for unsupported items (Alexei)
 - added error reason for unreachable hosts (Alexei)
 - added hosts.error (Alexei)
 - added items.error (Alexei)
 - added alerts.error (Alexei)
 - added error reason for undelivered alerts (Alexei)
 - added upgrades/dbpatches/1.1alpha3_to_1.1alpha4 (Alexei)
 - fixed empty macros in alert messages if '.' in key (Alexei)
 - do not show menu item if no permissions (Alexei)


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

1 files changed, 13 insertions, 4 deletions

diff --git a/frontends/php/hosts.php b/frontends/php/hosts.php
index 83cb6504..63feab6a 100644
--- a/frontends/php/hosts.php
+++ b/frontends/php/hosts.php
@@ -209,15 +209,15 @@
 
 <?php
 	table_begin();
-	table_header(array(S_ID,S_HOST,S_IP,S_PORT,S_STATUS,S_ACTIONS));
+	table_header(array(S_ID,S_HOST,S_IP,S_PORT,S_STATUS,S_ERROR,S_ACTIONS));
 
 	if(isset($_GET["groupid"]))
 	{
-		$sql="select h.hostid,h.host,h.port,h.status,h.useip,h.ip from hosts h,hosts_groups hg where hg.groupid=".$_GET["groupid"]." and hg.hostid=h.hostid order by h.host";
+		$sql="select h.hostid,h.host,h.port,h.status,h.useip,h.ip,h.error from hosts h,hosts_groups hg where hg.groupid=".$_GET["groupid"]." and hg.hostid=h.hostid order by h.host";
 	}
 	else
 	{
-		$sql="select h.hostid,h.host,h.port,h.status,h.useip,h.ip from hosts h order by h.host";
+		$sql="select h.hostid,h.host,h.port,h.status,h.useip,h.ip,h.error from hosts h order by h.host";
 	}
 	$result=DBselect($sql);
 
@@ -268,6 +268,14 @@
 			else
 				$status=S_UNKNOWN;
 		}
+		if($row["error"] == "")
+		{
+			$error=array("value"=>"&nbsp;","class"=>"off");
+		}
+		else
+		{
+			$error=array("value"=>$row["error"],"class"=>"on");
+		}
         	if(check_right("Host","U",$row["hostid"]))
 		{
 			if($row["status"] != HOST_STATUS_DELETED)
@@ -296,6 +304,7 @@
 			$ip,
 			$row["port"],
 			$status,
+			$error,
 			$actions
 			),$col++);
 	}
@@ -355,7 +364,7 @@
 
 
 	echo "<a name=\"form\"></a>";
-	show_table2_header_begin();
+	show_form_begin("hosts.host");
 	echo S_HOST;
 	$col=0;