From 2f02b9d0c23fbeb73b8f3d88ee839711e5d776d6 Mon Sep 17 00:00:00 2001 From: sasha Date: Tue, 11 Mar 2008 13:02:45 +0000 Subject: - [DEV-108] GUI git-svn-id: svn://svn.zabbix.com/trunk@5470 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- frontends/php/discoveryconf.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'frontends/php/discoveryconf.php') diff --git a/frontends/php/discoveryconf.php b/frontends/php/discoveryconf.php index 313605d2..1a0af586 100644 --- a/frontends/php/discoveryconf.php +++ b/frontends/php/discoveryconf.php @@ -35,7 +35,7 @@ include_once "include/page_header.php"; $fields=array( "druleid"=> array(T_ZBX_INT, O_OPT, P_SYS, DB_ID, 'isset({form})&&{form}=="update"'), "name"=> array(T_ZBX_STR, O_OPT, null, NOT_EMPTY, 'isset({save})'), - 'proxyid'=> array(T_ZBX_INT, O_OPT, null, DB_ID, 'isset({save})'), + 'proxy_hostid'=>array(T_ZBX_INT, O_OPT, null, DB_ID, 'isset({save})'), "iprange"=> array(T_ZBX_IP_RANGE, O_OPT, null, NOT_EMPTY, 'isset({save})'), "delay"=> array(T_ZBX_INT, O_OPT, null, null, 'isset({save})'), "status"=> array(T_ZBX_INT, O_OPT, null, IN("0,1"), 'isset({save})'), @@ -100,7 +100,7 @@ include_once "include/page_header.php"; $msg_ok = S_DISCOVERY_RULE_UPDATED; $msg_fail = S_CANNOT_UPDATE_DISCOVERY_RULE; - $result = update_discovery_rule($_REQUEST["druleid"], $_REQUEST["proxyid"], $_REQUEST['name'], $_REQUEST['iprange'], + $result = update_discovery_rule($_REQUEST["druleid"], $_REQUEST["proxy_hostid"], $_REQUEST['name'], $_REQUEST['iprange'], $_REQUEST['delay'], $_REQUEST['status'], $_REQUEST['dchecks']); $druleid = $_REQUEST["druleid"]; @@ -110,7 +110,7 @@ include_once "include/page_header.php"; $msg_ok = S_DISCOVERY_RULE_ADDED; $msg_fail = S_CANNOT_ADD_DISCOVERY_RULE; - $druleid = add_discovery_rule($_REQUEST["proxyid"], $_REQUEST['name'], $_REQUEST['iprange'], + $druleid = add_discovery_rule($_REQUEST["proxy_hostid"], $_REQUEST['name'], $_REQUEST['iprange'], $_REQUEST['delay'], $_REQUEST['status'], $_REQUEST['dchecks']); $result = $druleid; @@ -233,9 +233,9 @@ include_once "include/page_header.php"; $description = array(); - if ($rule_data["proxyid"]) { - $proxy = get_proxy_by_proxyid($rule_data["proxyid"]); - array_push($description, $proxy["name"], ":"); + if ($rule_data["proxy_hostid"]) { + $proxy = get_host_by_hostid($rule_data["proxy_hostid"]); + array_push($description, $proxy["host"], ":"); } array_push($description, -- cgit