diff options
| author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-13 08:22:32 +0000 |
|---|---|---|
| committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-08-13 08:22:32 +0000 |
| commit | abaab90a1c9d3367f1ef636557cfe8e661716749 (patch) | |
| tree | 3e266e5523a635c45a7e7ef6d4571e7323f26065 /frontends/php/actionconf.php | |
| parent | 8901654871973b4267f106a97183001189189c82 (diff) | |
| download | zabbix-abaab90a1c9d3367f1ef636557cfe8e661716749.tar.gz zabbix-abaab90a1c9d3367f1ef636557cfe8e661716749.tar.xz zabbix-abaab90a1c9d3367f1ef636557cfe8e661716749.zip | |
- 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
Diffstat (limited to 'frontends/php/actionconf.php')
| -rw-r--r-- | frontends/php/actionconf.php | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/frontends/php/actionconf.php b/frontends/php/actionconf.php index f3035e1d..a7ea548d 100644 --- a/frontends/php/actionconf.php +++ b/frontends/php/actionconf.php @@ -107,9 +107,9 @@ include_once "include/page_header.php"; } elseif(isset($_REQUEST['save'])) { - global $USER_DETAILS, $ZBX_CURNODEID; + global $USER_DETAILS; - 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(); $conditions = get_request('conditions', array()); @@ -146,9 +146,9 @@ include_once "include/page_header.php"; } elseif(inarr_isset(array('delete','actionid'))) { - global $USER_DETAILS, $ZBX_CURNODEID; + global $USER_DETAILS; - 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(); $action_data = DBfetch(DBselect('select name from actions where actionid='.$_REQUEST['actionid'])); @@ -229,13 +229,13 @@ include_once "include/page_header.php"; /* GROUP ACTIONS */ elseif(isset($_REQUEST['group_enable'])&&isset($_REQUEST['g_actionid'])) { - global $USER_DETAILS, $ZBX_CURNODEID; + global $USER_DETAILS; - if(count(get_accessible_nodes_by_user($USER_DETAILS,PERM_READ_WRITE,PERM_MODE_LT,PERM_RES_IDS_ARRAY,$ZBX_CURNODEID))) + if(count($nodes = get_accessible_nodes_by_user($USER_DETAILS,PERM_READ_WRITE,PERM_MODE_LT,PERM_RES_IDS_ARRAY,get_current_nodeid()))) access_deny(); $result=DBselect('select distinct actionid from actions'. - ' where '.DBid2nodeid('actionid').'='.$ZBX_CURNODEID. + ' where '.DBin_node('actionid',$nodes). ' and actionid in ('.implode(',',$_REQUEST['g_actionid']).') ' ); @@ -254,13 +254,13 @@ include_once "include/page_header.php"; } elseif(isset($_REQUEST['group_disable'])&&isset($_REQUEST['g_actionid'])) { - global $USER_DETAILS, $ZBX_CURNODEID; + global $USER_DETAILS; - if(count(get_accessible_nodes_by_user($USER_DETAILS,PERM_READ_WRITE,PERM_MODE_LT,PERM_RES_IDS_ARRAY,$ZBX_CURNODEID))) + if(count($nodes = get_accessible_nodes_by_user($USER_DETAILS,PERM_READ_WRITE,PERM_MODE_LT,PERM_RES_IDS_ARRAY,get_current_nodeid()))) access_deny(); $result=DBselect('select distinct actionid from actions'. - ' where '.DBid2nodeid('actionid').'='.$ZBX_CURNODEID. + ' where '.DBin_node('actionid',$nodes). ' and actionid in ('.implode(',',$_REQUEST['g_actionid']).') ' ); $actionids = array(); @@ -278,13 +278,13 @@ include_once "include/page_header.php"; } elseif(isset($_REQUEST['group_delete'])&&isset($_REQUEST['g_actionid'])) { - global $USER_DETAILS, $ZBX_CURNODEID; + global $USER_DETAILS; - if(count(get_accessible_nodes_by_user($USER_DETAILS,PERM_READ_WRITE,PERM_MODE_LT,PERM_RES_IDS_ARRAY,$ZBX_CURNODEID))) + if(count($nodes = get_accessible_nodes_by_user($USER_DETAILS,PERM_READ_WRITE,PERM_MODE_LT,PERM_RES_IDS_ARRAY,get_current_nodeid()))) access_deny(); $result=DBselect('select distinct actionid from actions'. - ' where '.DBid2nodeid('actionid').'='.$ZBX_CURNODEID. + ' where '.DBin_node('actionid',$nodes). ' and actionid in ('.implode(',',$_REQUEST['g_actionid']).') ' ); $actionids = array(); @@ -340,7 +340,7 @@ include_once "include/page_header.php"; S_STATUS)); $db_actions = DBselect('select * from actions where eventsource='.$_REQUEST['eventsource']. - ' and '.DBid2nodeid('actionid').'='.$ZBX_CURNODEID.' order by name,actionid'); + ' and '.DBin_node('actionid').' order by name,actionid'); while($action_data = DBfetch($db_actions)) { if(!action_accessiable($action_data['actionid'], PERM_READ_WRITE)) continue; |