- merger rev. 4546:4547 of branches/1.4.j [developed data monitoring of multiple nodes]

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

1 files changed, 10 insertions, 4 deletions

diff --git a/frontends/php/queue.php b/frontends/php/queue.php
index 8795809e..20ad52c1 100644
--- a/frontends/php/queue.php
+++ b/frontends/php/queue.php
@@ -74,7 +74,7 @@ include_once "include/page_header.php";
 		" 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]') ".
-		" and h.hostid in (".get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY,null,null,$ZBX_CURNODEID).")".
+		" and h.hostid in (".get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_ONLY,null,null,get_current_nodeid()).")".
 		" order by i.nextcheck,h.host,i.description,i.key_");
 
 	$table = new CTableInfo(S_THE_QUEUE_IS_EMPTY);
@@ -115,13 +115,19 @@ include_once "include/page_header.php";
 	}
 	else
 	{
-		$table->SetHeader(array(S_NEXT_CHECK,S_HOST,S_DESCRIPTION));
+		$table->SetHeader(array(
+				S_NEXT_CHECK,
+				is_show_subnodes() ? S_NODE : null,
+				S_HOST,
+				S_DESCRIPTION
+				));
 		while($row=DBfetch($result))
 		{
 			$table->AddRow(array(
 				date("m.d.Y H:i:s",
-				$row["nextcheck"]),
-				$row["host"],
+					$row["nextcheck"]),
+				get_node_name_by_elid($row['hostid']),
+				$row['host'],
 				item_description($row["description"],$row["key_"])
 				));
 		}