diff options
| author | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2001-11-22 16:24:31 +0000 |
|---|---|---|
| committer | hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2001-11-22 16:24:31 +0000 |
| commit | 39b87416ba66c4466af16dbd5afd5edd1e9f5cef (patch) | |
| tree | 86d169affe06b77cf4aece34ea5cbbca7a27378f /frontends/php/map.html | |
| parent | bb9bcf963db518e1b439447746d053ef6dc8907c (diff) | |
| download | zabbix-39b87416ba66c4466af16dbd5afd5edd1e9f5cef.tar.gz zabbix-39b87416ba66c4466af16dbd5afd5edd1e9f5cef.tar.xz zabbix-39b87416ba66c4466af16dbd5afd5edd1e9f5cef.zip | |
- character '-' can be used to form server name (Alexei)
- fixed dependencies in functions that delete information for zabbix tables (Alexei)
- fixed select statement for Network Maps. Host status is correct. (Alexei)
- availability report will not show not monitored hosts (Alexei)
- "maxumum" changed to "maximum" in actions.html (Alexei)
- "have been restarted" changed to "has been ..." (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@249 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/map.html')
| -rw-r--r-- | frontends/php/map.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/frontends/php/map.html b/frontends/php/map.html index b61215f5..0a0511aa 100644 --- a/frontends/php/map.html +++ b/frontends/php/map.html @@ -111,12 +111,12 @@ } else { - $result1=DBselect("select count(*) from items i,functions f,triggers t,hosts h where h.hostid=i.hostid and i.hostid=$hostid and i.itemid=f.itemid and f.triggerid=t.triggerid and t.istrue=1 and h.status=0"); + $result1=DBselect("select count(*) from items i,functions f,triggers t,hosts h where h.hostid=i.hostid and i.hostid=$hostid and i.itemid=f.itemid and f.triggerid=t.triggerid and t.istrue=1 and h.status=0 and i.status=0"); $count=DBget_field($result1,0,0); if($count==1) { $color=$red; - $result1=DBselect("select t.description from items i,functions f,triggers t,hosts h where h.hostid=i.hostid and i.hostid=$hostid and i.itemid=f.itemid and f.triggerid=t.triggerid and t.istrue=1 and h.status=0"); + $result1=DBselect("select t.description from items i,functions f,triggers t,hosts h where h.hostid=i.hostid and i.hostid=$hostid and i.itemid=f.itemid and f.triggerid=t.triggerid and t.istrue=1 and h.status=0 and i.status=0"); $label=DBget_field($result1,0,0); } else if($count>1) |