- 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, 3 insertions, 3 deletions

diff --git a/frontends/php/screenconf.php b/frontends/php/screenconf.php
index 3b7055fc..fa98c33b 100644
--- a/frontends/php/screenconf.php
+++ b/frontends/php/screenconf.php
@@ -96,7 +96,7 @@ include_once "include/page_header.php";
 				$audit_action = AUDIT_ACTION_UPDATE;
 				show_messages($result, S_SCREEN_UPDATED, S_CANNOT_UPDATE_SCREEN);
 			} else {
-				if(count(get_accessible_nodes_by_user($USER_DETAILS,PERM_READ_WRITE,PERM_MODE_LT,PERM_RES_IDS_ARRAY,$ZBX_CURNODEID)))
+				if(count(get_accessible_nodes_by_user($USER_DETAILS,PERM_READ_WRITE,PERM_MODE_LT,PERM_RES_IDS_ARRAY,get_current_nodeid())))
 					access_deny();
 
 				$result=add_screen($_REQUEST["name"],$_REQUEST["hsize"],$_REQUEST["vsize"]);
@@ -247,7 +247,7 @@ include_once "include/page_header.php";
 			$table = new CTableInfo(S_NO_SCREENS_DEFINED);
 			$table->SetHeader(array(S_NAME,S_DIMENSION_COLS_ROWS,S_SCREEN));
 
-			$result=DBselect("select screenid,name,hsize,vsize from screens where ".DBid2nodeid("screenid")."=".$ZBX_CURNODEID.
+			$result=DBselect('select screenid,name,hsize,vsize from screens where '.DBin_node('screenid').
 					" order by name");
 			while($row=DBfetch($result))
 			{
@@ -278,7 +278,7 @@ include_once "include/page_header.php";
 
 			$db_slides = DBselect('select s.slideshowid, s.name, s.delay, count(*) as cnt '.
 				' from slideshows s left join slides sl on sl.slideshowid=s.slideshowid '.
-				' where '.DBid2nodeid('s.slideshowid').'='.$ZBX_CURNODEID.
+				' where '.DBin_node('s.slideshowid').
 				' group by s.slideshowid,s.name,s.delay '.
 				' order by s.name,s.slideshowid');
 			while($slide_data = DBfetch($db_slides))