summaryrefslogtreecommitdiffstats
path: root/frontends/php/nodes.php
diff options
context:
space:
mode:
authorosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2006-10-26 08:17:13 +0000
committerosmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2006-10-26 08:17:13 +0000
commit1b9fa06acb3c68871d5d87053d047430ff0acbfb (patch)
tree39e1430c9c1e3531d0ec406c883a5643f59e6cb9 /frontends/php/nodes.php
parent4d02efc00fc5a4c076f12c4039197baf080c33d4 (diff)
downloadzabbix-1b9fa06acb3c68871d5d87053d047430ff0acbfb.tar.gz
zabbix-1b9fa06acb3c68871d5d87053d047430ff0acbfb.tar.xz
zabbix-1b9fa06acb3c68871d5d87053d047430ff0acbfb.zip
- developed IP input box (Eugene)
git-svn-id: svn://svn.zabbix.com/trunk@3384 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/nodes.php')
-rw-r--r--frontends/php/nodes.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/frontends/php/nodes.php b/frontends/php/nodes.php
index 89e78a28..2dbc022b 100644
--- a/frontends/php/nodes.php
+++ b/frontends/php/nodes.php
@@ -39,7 +39,7 @@ include_once "include/page_header.php";
"name"=> array(T_ZBX_STR, O_OPT, null, NOT_EMPTY, 'isset({save})'),
"timezone"=> array(T_ZBX_INT, O_OPT, null, BETWEEN(-12,+13),'isset({save})'),
- "ip"=> array(T_ZBX_STR, O_OPT, null, DB_ID, 'isset({save})'),
+ "ip"=> array(T_ZBX_IP, O_OPT, null, null, 'isset({save})'),
"port"=> array(T_ZBX_INT, O_OPT, null, BETWEEN(1,65535),'isset({save})'),
"slave_history"=> array(T_ZBX_INT, O_OPT, null, BETWEEN(0,65535),'isset({save})'),
"slave_trends"=> array(T_ZBX_INT, O_OPT, null, BETWEEN(0,65535),'isset({save})'),
@@ -95,7 +95,7 @@ include_once "include/page_header.php";
$node_data = get_node_by_nodeid($_REQUEST['nodeid']);
$result = delete_node($_REQUEST['nodeid']);
show_messages($result, S_NODE_DELETED, S_CANNOT_DELETE_NODE);
- add_audit_if($result,AUDIT_ACTION_DELETE,'Node ['.$node_data['name'].'] id ['.$node_data['nodeid'].']');
+ add_audit_if($result,AUDIT_ACTION_DELETE,AUDIT_RESOURCE_NODE,'Node ['.$node_data['name'].'] id ['.$node_data['nodeid'].']');
if($result)
{
unset($_REQUEST['form'],$node_data);
@@ -118,7 +118,7 @@ include_once "include/page_header.php";
$db_nodes = DBselect('select * from nodes where nodeid in ('.
get_accessible_nodes_by_user($USER_DETAILS,PERM_READ_LIST).') '.
- ' order by nodetype desc,name ');
+ ' order by nodetype desc, masterid, name ');
while($row=DBfetch($db_nodes))
{