diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-07-10 10:12:25 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-07-10 10:12:25 +0000 |
| commit | 7799a89f4f5d08509b1eb609fff82bd214138055 (patch) | |
| tree | 3681fffb10d7d4b13fed0e181188c24ac96e1970 /frontends/php/include/users.inc.php | |
| parent | 7fc9fb655a1a9483f6a9a51b149cfa6b3c2ad031 (diff) | |
| download | zabbix-7799a89f4f5d08509b1eb609fff82bd214138055.tar.gz zabbix-7799a89f4f5d08509b1eb609fff82bd214138055.tar.xz zabbix-7799a89f4f5d08509b1eb609fff82bd214138055.zip | |
- [DEV-137] removed unnecessary column rights.type (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5823 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/users.inc.php')
| -rw-r--r-- | frontends/php/include/users.inc.php | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/frontends/php/include/users.inc.php b/frontends/php/include/users.inc.php index 402eafb6..2cf72f69 100644 --- a/frontends/php/include/users.inc.php +++ b/frontends/php/include/users.inc.php @@ -97,8 +97,7 @@ # Update User definition - function update_user($userid,$name,$surname,$alias,$passwd,$url,$autologin,$autologout,$lang,$theme,$refresh,$user_type,$user_groups,$user_medias) - { + function update_user($userid,$name,$surname,$alias,$passwd,$url,$autologin,$autologout,$lang,$theme,$refresh,$user_type,$user_groups,$user_medias){ if(DBfetch(DBselect("select * from users where alias=".zbx_dbstr($alias)." and userid<>$userid and ".DBin_node('userid', get_current_nodeid(false))))){ error("User '$alias' already exists"); return 0; @@ -276,10 +275,9 @@ USER GROUPS **************************/ - function add_user_group($name,$users_status,$gui_access,$users=array(),$rights=array()){ + function add_user_group($name,$users_status,$gui_access,$users=array(),$rights=array()){ - if(DBfetch(DBselect('select * from usrgrp where name='.zbx_dbstr($name).' and '.DBin_node('usrgrpid', get_current_nodeid(false))))) - { + if(DBfetch(DBselect('select * from usrgrp where name='.zbx_dbstr($name).' and '.DBin_node('usrgrpid', get_current_nodeid(false))))){ error("Group '$name' already exists"); return 0; } @@ -303,8 +301,8 @@ $result=DBexecute("delete from rights where groupid=".$usrgrpid); foreach($rights as $right){ $id = get_dbid('rights','rightid'); - $result=DBexecute('insert into rights (rightid,groupid,type,permission,id)'. - ' values ('.$id.','.$usrgrpid.','.$right['type'].','.$right['permission'].','.$right['id'].')'); + $result=DBexecute('insert into rights (rightid,groupid,permission,id)'. + ' values ('.$id.','.$usrgrpid.','.$right['permission'].','.$right['id'].')'); if(!$result) return $result; } @@ -312,7 +310,7 @@ return $result; } - function update_user_group($usrgrpid,$name,$users_status,$gui_access,$users=array(),$rights=array()){ + function update_user_group($usrgrpid,$name,$users_status,$gui_access,$users=array(),$rights=array()){ global $USER_DETAILS; if(DBfetch(DBselect('select * from usrgrp where name='.zbx_dbstr($name). @@ -350,13 +348,13 @@ $result=DBexecute("delete from rights where groupid=".$usrgrpid); foreach($rights as $right){ $id = get_dbid('rights','rightid'); - $result=DBexecute('insert into rights (rightid,groupid,type,permission,id)'. - ' values ('.$id.','.$usrgrpid.','.$right['type'].','.$right['permission'].','.$right['id'].')'); + $result=DBexecute('insert into rights (rightid,groupid,permission,id)'. + ' values ('.$id.','.$usrgrpid.','.$right['permission'].','.$right['id'].')'); if(!$result) return $result; } - return $result; + return $result; } function delete_user_group($usrgrpid){ |