Fixed Queue screen and zabbix[queue] (Alexei)

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

1 files changed, 2 insertions, 1 deletions

diff --git a/frontends/php/queue.php b/frontends/php/queue.php
index 5b8a961d..25fdaa20 100644
--- a/frontends/php/queue.php
+++ b/frontends/php/queue.php
@@ -41,7 +41,8 @@
 
 <?php
 	$now=time();
-	$result=DBselect("select i.itemid, i.nextcheck, i.description, h.host,h.hostid from items i,hosts h where i.status=0 and i.type not in (2) and h.status=".HOST_STATUS_MONITORED." and i.hostid=h.hostid and i.nextcheck<$now and i.key_<>'status' order by i.nextcheck");
+
+	$result=DBselect("select i.itemid, i.nextcheck, i.description, h.host,h.hostid from items i,hosts h where i.status=0 and i.type not in (2) and ((h.status=".HOST_STATUS_MONITORED." and h.available!=".HOST_AVAILABLE_FALSE.") or (h.status=".HOST_STATUS_MONITORED." and h.available=".HOST_AVAILABLE_FALSE." and h.disable_until<=$now)) and i.hostid=h.hostid and i.nextcheck<$now and i.key_ not in ('status','icmpping','icmppingsec','zabbix[log]') order by i.nextcheck");
 	table_begin();
 	table_header(array(S_NEXT_CHECK,S_HOST,S_DESCRIPTION));
 	$col=0;