Cleaned up the host and user bulk loader a bit.

	bulkloader.php
	include/bulkloader.inc.php
	include/hosts.inc.php


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

2 files changed, 22 insertions, 5 deletions

diff --git a/frontends/php/include/bulkloader.inc.php b/frontends/php/include/bulkloader.inc.php
index a8a1a9aa..c03be61b 100644
--- a/frontends/php/include/bulkloader.inc.php
+++ b/frontends/php/include/bulkloader.inc.php
@@ -28,8 +28,7 @@ include_once    "include/config.inc.php";
 	//  Returns: 0 if unable to create, otherwise it returns the groupID
 	function        create_Host_Group($group)
 	{
-		$sql="select * from groups where name='$group'";
-		$result=DBselect("select distinct(groupid) from groups where name='$name'");
+		$result=DBselect("select distinct(groupid) from groups where name='$group'");
 		if(DBnum_rows($result)>0)
 		{
 			$row=DBfetch($result);
@@ -47,11 +46,26 @@ include_once    "include/config.inc.php";
 		}
 	}
 
+	//  This function adds host to a host group based on ID numbers.
+	//  Returns: 0 on failure, otherwise it returns 1
+	function	add_Host_To_Group($groupid=0,$hostid=0)
+	{
+		if($groupid==0||$hostid==0)
+		{
+			return 0;
+		}
+		$result=DBexecute("insert into hosts_groups (groupid,hostid) values ($groupid,$hostid)");
+		if($result)
+		{
+			return 1;
+		}
+		return 0;	
+	}
+
 	//  This function takes a user group name and populates the database.
 	//  Returns: 0 if unable to create, otherwise it returns the groupID
 	function        create_User_Group($group)
 	{
-		$sql="select * from groups where name='$group'";
 		$result=DBselect("select distinct(usrgrpid) from usrgrp where name='$group'");
 		if(DBnum_rows($result)>0)
 		{
@@ -66,7 +80,7 @@ include_once    "include/config.inc.php";
 		}
 		else
 		{
-		return 0;
+			return 0;
 		}
 	}
 
diff --git a/frontends/php/include/hosts.inc.php b/frontends/php/include/hosts.inc.php
index d3ce51a8..87f67db6 100644
--- a/frontends/php/include/hosts.inc.php
+++ b/frontends/php/include/hosts.inc.php
@@ -67,7 +67,10 @@
 			add_templates_to_host($hostid,$host_templateid);
 			sync_host_with_templates($hostid);
 		}
-		update_host_groups($hostid,$groups);
+		if($groups != "")
+		{
+			update_host_groups($hostid,$groups);
+		}
 		if($newgroup != "")
 		{
 			add_group_to_host($hostid,$newgroup);