From 56a5e3453ca8651296755d5833aac6becf620fa3 Mon Sep 17 00:00:00 2001 From: artem Date: Wed, 25 Jun 2008 11:52:41 +0000 Subject: - [DEV-137] fix simple graphs error. Tnx to Palmertree. (Artem) - [DEV-137] added profile value_id devision by nodes (Artem) git-svn-id: svn://svn.zabbix.com/trunk@5788 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- frontends/php/include/hosts.inc.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'frontends/php/include/hosts.inc.php') diff --git a/frontends/php/include/hosts.inc.php b/frontends/php/include/hosts.inc.php index bfabd80a..0923fc2b 100644 --- a/frontends/php/include/hosts.inc.php +++ b/frontends/php/include/hosts.inc.php @@ -847,11 +847,11 @@ require_once "include/httptest.inc.php"; if(is_null($group_var)) $group_var = "web.latest.groupid"; if(is_null($host_var)) $host_var = "web.latest.hostid"; - $_REQUEST["groupid"] = get_request("groupid", -1 ); - $_REQUEST["hostid"] = get_request("hostid", get_profile($host_var,0)); + $_REQUEST["groupid"] = get_request("groupid", -1); + $_REQUEST["hostid"] = get_request("hostid", get_profile($host_var, 0, PROFILE_TYPE_ID)); if(-1 == $_REQUEST["groupid"]){ - $_REQUEST["groupid"] = get_profile($group_var,0); + $_REQUEST["groupid"] = get_profile($group_var, 0, PROFILE_TYPE_ID); if(!in_node($_REQUEST["groupid"])) $_REQUEST["groupid"] = 0; @@ -868,8 +868,8 @@ require_once "include/httptest.inc.php"; $_REQUEST["groupid"] = $result["groupid"]; $_REQUEST["hostid"] = $result["hostid"]; - update_profile($host_var,$_REQUEST["hostid"]); - update_profile($group_var,$_REQUEST["groupid"]); + update_profile($host_var,$_REQUEST["hostid"], PROFILE_TYPE_ID); + update_profile($group_var,$_REQUEST["groupid"], PROFILE_TYPE_ID); } /* @@ -885,18 +885,18 @@ require_once "include/httptest.inc.php"; * Modified: by Aly */ function validate_group($perm, $options = array(),$group_var=null){ - if(is_null($group_var)) $group_var = "web.latest.groupid"; - $_REQUEST["groupid"] = get_request("groupid",get_profile($group_var,0)); + if(is_null($group_var)) $group_var = 'web.latest.groupid'; + $_REQUEST["groupid"] = get_request('groupid',get_profile($group_var, 0, PROFILE_TYPE_ID)); - if(!in_node($_REQUEST["groupid"])) $_REQUEST["groupid"] = 0; + if(!in_node($_REQUEST['groupid'])) $_REQUEST['groupid'] = 0; if(str_in_array('always_select_first_group',$options) && ($_REQUEST['groupid'] == 0)) $_REQUEST['groupid'] = -1; $result = get_correct_group_and_host($_REQUEST['groupid'],null,$perm,$options); - $_REQUEST["groupid"] = $result["groupid"]; + $_REQUEST['groupid'] = $result['groupid']; - update_profile($group_var,$_REQUEST["groupid"]); + update_profile($group_var, $_REQUEST['groupid'], PROFILE_TYPE_ID); } /* APPLICATIONS */ -- cgit