- 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, 18 insertions, 4 deletions

diff --git a/frontends/php/screens.php b/frontends/php/screens.php
index 04b3aa9a..7de91574 100644
--- a/frontends/php/screens.php
+++ b/frontends/php/screens.php
@@ -107,26 +107,40 @@ include_once "include/page_header.php";
 
 	if( 0 == $config )
 	{
-		$result = DBselect("select screenid as elementid,name from screens where ".DBid2nodeid("screenid")."=".$ZBX_CURNODEID." order by name");
+		$result = DBselect('select screenid as elementid,name '.
+				' from screens '.
+				' where '.DBin_node('screenid').
+				' order by name'
+				);
 		while($row=DBfetch($result))
 		{
 			if(!screen_accessiable($row["elementid"], PERM_READ_ONLY))
 				continue;
 
-			$cmbElements->AddItem($row["elementid"],$row["name"]);
+			$cmbElements->AddItem(
+					$row['elementid'],
+					get_node_name_by_elid($row['elementid']).$row["name"]
+					);
 			if($elementid == $row["elementid"]) $element_correct = 1;
 			if(!isset($first_element)) $first_element = $row["elementid"];
 		}
 	}
 	else
 	{
-		$result = DBselect("select slideshowid as elementid,name from slideshows where ".DBid2nodeid("slideshowid")."=".$ZBX_CURNODEID." order by name");
+		$result = DBselect('select slideshowid as elementid,name '.
+				' from slideshows '.
+				' where '.DBin_node('slideshowid').
+				' order by name'
+				);
 		while($row=DBfetch($result))
 		{
 			if(!slideshow_accessiable($row["elementid"], PERM_READ_ONLY))
 				continue;
 
-			$cmbElements->AddItem($row["elementid"],$row["name"]);
+			$cmbElements->AddItem(
+					$row['elementid'],
+					get_node_name_by_elid($row['elementid']).$row['name']
+					);
 			if($elementid == $row["elementid"]) $element_correct = 1;
 			if(!isset($first_element)) $first_element = $row["elementid"];
 		}