- fixed possible zabbix_suckerd crash. It may happen if socket() returns 0.

   (Alexei)
 - added new Host status - Template(3). )Alexei)
 - fixed group "all" in latest.php (Alexei)
 - do not dump "Expression cannot be evaluated" in case if function.lastvalue
   is NULL. Logic was changed a bit, but the message is still there. (Alexei)
 - show who is online in User config form. (Alexei)
 - when ran first time, some triggers becomes TRUE (like files was changed).
   This is already fixed. This bug does not exist. (Alexei)
 - fixed bug in queue.php select statement. Trapper type will not be
   selected. (Alexei)
 - when W2000 with SNMP agent restarted, items will becomes Not Supported.
   There is no such bug in CVS code anymore. (Alexei)
 - map will show host status in case of trigger based on trapper (Alexei)
 - fixed bug in zabbix_suckerd's select statements. Trapper type will not be
   selected. (Alexei)
 - new protocol for Zabbix agents, Support for ZBX_ERROR and ZBX_NOTSUPPORTED.
   (Alexei)
 - about.hph: version of Zabbix was changed to 1.0beta7 (Alexei)
 - items.php: "Delay" renamed to "Update interval". (Alexei)
 - fixed precision issues in zabbix_agent(d) and zabbix_suckerd. All floats
   converted to double. (Alexei)


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

1 files changed, 13 insertions, 1 deletions

diff --git a/frontends/php/hosts.php b/frontends/php/hosts.php
index 2d2308cd..5c9864ce 100644
--- a/frontends/php/hosts.php
+++ b/frontends/php/hosts.php
@@ -83,6 +83,8 @@
 				echo "<a href=\"hosts.php?hostid=".$row["hostid"]."&register=changestatus&status=0\">Not monitored</a>";
 			else if($row["status"] == 2)
 				echo "Unreachable";
+			else if($row["status"] == 3)
+				echo "Template";
 			else
 				echo "Unknown";
 		}
@@ -94,6 +96,8 @@
 				echo "Not monitored";
 			else if($row["status"] == 2)
 				echo "Unreachable";
+			else if($row["status"] == 3)
+				echo "Template";
 			else
 				echo "Unknown";
 		}
@@ -211,11 +215,19 @@
 	{
 		echo "<option value=\"0\" selected>Monitored";
 		echo "<option value=\"1\">Not monitored";
+		echo "<option value=\"3\">Template";
+	}
+	else if($status==3)
+	{
+		echo "<option value=\"0\">Monitored";
+		echo "<option value=\"1\" selected>Not monitored";
+		echo "<option value=\"3\" selected>Template";
 	}
 	else
 	{
 		echo "<option value=\"0\">Monitored";
 		echo "<option value=\"1\" selected>Not monitored";
+		echo "<option value=\"3\">Template";
 	}
 	echo "</select>";
 
@@ -229,7 +241,7 @@
 	show_table2_h_delimiter();
 	echo "<select class=\"biginput\" name=\"host_templateid\" size=\"1\">";
 	echo "<option value=\"0\" selected>...";
-	$result=DBselect("select host,hostid from hosts order by host");
+	$result=DBselect("select host,hostid from hosts where status=3 order by host");
 	while($row=DBfetch($result))
 	{
 		echo "<option value=\"".$row["hostid"]."\">".$row["host"];