Initial integration of distributed monitoring.

Changes 3196:HEAD of branches/distributed


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

1 files changed, 7 insertions, 5 deletions

diff --git a/frontends/php/include/users.inc.php b/frontends/php/include/users.inc.php
index 19ea4281..0bdb19a6 100644
--- a/frontends/php/include/users.inc.php
+++ b/frontends/php/include/users.inc.php
@@ -43,8 +43,10 @@
 		}
 		
 		$passwd=md5($passwd);
-		$sql="insert into users (name,surname,alias,passwd,url,autologout,lang,refresh) values (".zbx_dbstr($name).",".zbx_dbstr($surname).",".zbx_dbstr($alias).",".zbx_dbstr($passwd).",".zbx_dbstr($url).",$autologout,".zbx_dbstr($lang).",$refresh)";
-		return DBexecute($sql);
+		$userid = get_dbid("users","userid");
+		$sql="insert into users (userid,name,surname,alias,passwd,url,autologout,lang,refresh) values ($userid,".zbx_dbstr($name).",".zbx_dbstr($surname).",".zbx_dbstr($alias).",".zbx_dbstr($passwd).",".zbx_dbstr($url).",$autologout,".zbx_dbstr($lang).",$refresh)";
+		DBexecute($sql);
+		return $userid;
 	}
 
 	# Update User definition
@@ -160,15 +162,15 @@
 			return 0;
 		}
 
-		$sql="insert into usrgrp (name) values (".zbx_dbstr($name).")";
+		$usrgrpid=get_dbid("usrgrp","usrgrpid");
+
+		$sql="insert into usrgrp (usrgrpid,name) values ($usrgrpid,".zbx_dbstr($name).")";
 		$result=DBexecute($sql);
 		if(!$result)
 		{
 			return	$result;
 		}
 		
-		$usrgrpid=DBinsert_id($result,"usrgrp","usrgrpid");
-
 		update_user_groups($usrgrpid,$users);
 
 		return $result;