- [ZBX-134] merged rev. 4956:4966 of branches/1.4/ (Artem) (fixes for hostid/groupid validation on Node switch)

git-svn-id: svn://svn.zabbix.com/trunk@4968 97f52cf1-0a1b-0410-bd0e-c28be96e8082

4 files changed, 35 insertions, 20 deletions

diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 2e54580f..24cec730 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -254,9 +254,8 @@ function TODO($msg) { echo "TODO: ".$msg.BR; }  // DEBUG INFO!!!
 		global	$ZBX_CURRENT_NODEID, $ZBX_CURRENT_SUBNODES, $ZBX_WITH_SUBNODES;
 
 		if ( !isset($ZBX_CURRENT_NODEID) )	init_nodes();
-
 		$result = ( is_show_subnodes($forse_with_subnodes) ? $ZBX_CURRENT_SUBNODES : $ZBX_CURRENT_NODEID );
-
+		
 		if ( !is_null($perm) )
 		{
 			global $USER_DETAILS;
diff --git a/frontends/php/include/hosts.inc.php b/frontends/php/include/hosts.inc.php
index 3071e133..2b393934 100644
--- a/frontends/php/include/hosts.inc.php
+++ b/frontends/php/include/hosts.inc.php
@@ -587,7 +587,7 @@ require_once "include/items.inc.php";
 		{
 			fatal_error("Incorrest options for get_correct_group_and_host");
 		}
-
+		
 		global $USER_DETAILS;
 		
 		$first_hostid_in_group = 0;
@@ -605,15 +605,19 @@ require_once "include/items.inc.php";
 
 		if(in_array("with_monitored_items",$options)){
 			$item_table = ",items i";	$with_items = " and h.hostid=i.hostid and i.status=".ITEM_STATUS_ACTIVE;
-		}elseif(in_array("with_items",$options)){
+		}else if(in_array("with_items",$options)){
 			$item_table = ",items i";	$with_items = " and h.hostid=i.hostid";
 		} else {
-			$item_table = "";		$with_items = "";
+			$item_table = "";
+			$with_items = "";
 		}
 
 		$with_node = "";
 
-		$accessed_hosts = get_accessible_hosts_by_user($USER_DETAILS,$perm);
+		$accessed_hosts = get_accessible_hosts_by_user($USER_DETAILS,$perm,null,null,get_current_nodeid(!$only_current_node));
+
+//SDI(get_current_nodeid(!$only_current_node));
+//SDI($accessed_hosts);
 
 		if(is_null($a_groupid))
 		{
@@ -626,7 +630,7 @@ require_once "include/items.inc.php";
 			if($groupid > 0)
 			{
 				$with_node = " and ".DBin_node('g.groupid', get_current_nodeid(!$only_current_node));
-				
+
 				if(!DBfetch(DBselect("select distinct g.groupid from groups g, hosts_groups hg, hosts h".$item_table.
 					" where hg.groupid=g.groupid and h.hostid=hg.hostid and h.hostid in (".$accessed_hosts.") ".
 					" and g.groupid=".$groupid.$with_host_status.$with_items.$with_node)))
@@ -636,6 +640,7 @@ require_once "include/items.inc.php";
 			}
 
 		}
+
 		if(is_null($a_hostid))
 		{
 			$hostid = 0;
@@ -662,7 +667,8 @@ require_once "include/items.inc.php";
 				}
 
 				$with_node = " and ".DBin_node('h.hostid',get_current_nodeid(!$only_current_node));
-				
+//SDI('C: '.$a_groupid.' : '.$a_hostid);
+
 				if($db_host = DBfetch(DBselect("select distinct h.hostid,h.host from hosts h ".$item_table.$group_table.
 					" where h.hostid in (".$accessed_hosts.") "
 					.$with_host_status.$with_items.$witth_group.$with_node.
@@ -682,14 +688,13 @@ require_once "include/items.inc.php";
 							$hostid = 0;
 					}
 				}
-
 				if(($hostid < 0) || ($hostid == 0 && $always_select_first_host == 1)) /* incorrect host */
 				{
 					$hostid = $first_hostid_in_group;
 				}
 			}
 		}
-
+		
 		$group_correct	= ($groupid == $a_groupid) ? 1 : 0;
 		$host_correct	= ($hostid == $a_hostid) ? 1 : 0;
 		return array(
@@ -721,10 +726,12 @@ require_once "include/items.inc.php";
 
 		$_REQUEST["groupid"]    = get_request("groupid", -1 );
 		$_REQUEST["hostid"]     = get_request("hostid", get_profile($host_var,0));
-		
+
 		if($_REQUEST["groupid"] == -1)
 		{
 			$_REQUEST["groupid"] = get_profile($group_var,0);
+			
+			if(!in_node($_REQUEST["groupid"])) $_REQUEST["groupid"] = 0;
 
 			if ($_REQUEST["hostid"] > 0 && !DBfetch(DBselect('select groupid from hosts_groups '.
 				' where hostid='.$_REQUEST["hostid"].' and groupid='.$_REQUEST["groupid"])))
@@ -732,7 +739,7 @@ require_once "include/items.inc.php";
 					$_REQUEST["groupid"] = 0;
 			}
 		}
-		
+
 		if(in_array("always_select_first_host",$options) && $_REQUEST["hostid"] == 0 && $_REQUEST["groupid"] != 0)
 			$_REQUEST["hostid"] = -1;
 
@@ -740,7 +747,7 @@ require_once "include/items.inc.php";
 
 		$_REQUEST["groupid"]    = $result["groupid"];
 		$_REQUEST["hostid"]     = $result["hostid"];
-
+		
 		update_profile($host_var,$_REQUEST["hostid"]);
 		update_profile($group_var,$_REQUEST["groupid"]);
 	}
@@ -760,11 +767,11 @@ require_once "include/items.inc.php";
 	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(!in_node($_REQUEST["groupid"])) $_REQUEST["groupid"] = 0;
+		
 		$result = get_correct_group_and_host($_REQUEST["groupid"],null,$perm,$options);
-
 		$_REQUEST["groupid"]    = $result["groupid"];
 
 		update_profile($group_var,$_REQUEST["groupid"]);
diff --git a/frontends/php/include/perm.inc.php b/frontends/php/include/perm.inc.php
index f92da482..7dbdbf8c 100644
--- a/frontends/php/include/perm.inc.php
+++ b/frontends/php/include/perm.inc.php
@@ -162,14 +162,16 @@ COpt::counter_up('perm');
 		if(count($where)) 	$where = ' where '.implode(' and ',$where);
 		else			$where = '';
 	
-		$db_hosts = DBselect('select distinct n.nodeid,n.name as node_name,h.hostid,h.host, min(r.permission) as permission,ug.userid '.
+		$sql = 'select distinct n.nodeid,n.name as node_name,h.hostid,h.host, min(r.permission) as permission,ug.userid '.
 			' from hosts h left join hosts_groups hg on hg.hostid=h.hostid '.
 			' left join groups g on g.groupid=hg.groupid '.
 			' left join rights r on r.id=g.groupid and r.type='.RESOURCE_TYPE_GROUP.
 			' left join users_groups ug on ug.usrgrpid=r.groupid and ug.userid='.$userid.
 			' left join nodes n on '.DBid2nodeid('h.hostid').'=n.nodeid '.
 			$where.' group by h.hostid,n.nodeid,n.name,h.host,ug.userid '.
-			' order by n.name,n.nodeid, h.host, permission desc, userid desc');
+			' order by n.name,n.nodeid, h.host, permission desc, userid desc';
+
+		$db_hosts = DBselect($sql);
 
 		$processed = array();
 		while($host_data = DBfetch($db_hosts))
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index 7b958382..c156ea5f 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -676,11 +676,12 @@
 		$expression, $description, $type, $priority, $status,
 		$comments, $url, $deps=array(), $templateid=0)
 	{
+		
 		if( !validate_expression($expression) )
 			return false;
 
 		$triggerid=get_dbid("triggers","triggerid");
-
+		
 		$result=DBexecute("insert into triggers".
 			"  (triggerid,description,type,priority,status,comments,url,value,error,templateid)".
 			" values ($triggerid,".zbx_dbstr($description).",$type,$priority,$status,".zbx_dbstr($comments).",".
@@ -711,6 +712,7 @@
 
 		$trig_hosts = get_hosts_by_triggerid($triggerid);
 		$trig_host = DBfetch($trig_hosts);
+		
 		if($result)
 		{
 			$msg = "Added trigger '".$description."'";
@@ -979,10 +981,15 @@
 				$function	= &$arr[ZBX_EXPRESSION_SIMPLE_EXPRESSION_ID + ZBX_SIMPLE_EXPRESSION_FUNCTION_NAME_ID];
 				$parameter	= &$arr[ZBX_EXPRESSION_SIMPLE_EXPRESSION_ID + ZBX_SIMPLE_EXPRESSION_FUNCTION_PARAM_ID];
 
-				$item = DBfetch(DBselect('select i.itemid from items i,hosts h'.
+				$item_res = DBselect('select i.itemid from items i,hosts h'.
 					' where i.key_='.zbx_dbstr($key).
 					' and h.host='.zbx_dbstr($host).
-					' and h.hostid=i.hostid'));
+					' and h.hostid=i.hostid');
+
+				while(($item = DBfetch($item_res)) && (!in_node($item['itemid']))){
+				}
+				
+				if(!$item) return null;
 
 				$item = $item["itemid"];