[Upcase-project-cvs] UpCase/lib uc_sql-mysql.inc,1.1.1.1,1.2

[<jhe...@us...>]

Update of /cvsroot/upcase-project/UpCase/lib
In directory usw-pr-cvs1:/tmp/cvs-serv6046

Modified Files:
	uc_sql-mysql.inc 
Log Message:
Fixed typo's, some requests are simplified, etc ....


Index: uc_sql-mysql.inc
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/lib/uc_sql-mysql.inc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** uc_sql-mysql.inc	16 Jul 2002 15:31:56 -0000	1.1.1.1
--- uc_sql-mysql.inc	5 Aug 2002 08:43:59 -0000	1.2
***************
*** 2,8 ****
  
  // ACCOUNTS AND GROUPS
! $groups_tbl = $uc_config["prefix"] . $uc_config["table"]["groups"];
! $users_tbl = $uc_config["prefix"] . $uc_config["table"]["users"];
! $members_tbl = $uc_config["prefix"] . $uc_config["table"]["memberships"];
  
  $ucsql_groupadd = "INSERT INTO $groups_tbl (groupname) VALUES ('%s')";
--- 2,8 ----
  
  // ACCOUNTS AND GROUPS
! $groups_tbl = $ucConfig->tblPrefix . "groups";
! $users_tbl = $ucConfig->tblPrefix . $ucConfig->dbTables["users"];
! $members_tbl = $ucConfig->tblPrefix . "groupmembers";
  
  $ucsql_groupadd = "INSERT INTO $groups_tbl (groupname) VALUES ('%s')";
***************
*** 14,40 ****
  $ucsql_useradd = "INSERT INTO $users_tbl (username) VALUES ('%s')";
  $ucsql_userdel = "DELETE FROM $users_tbl WHERE username='%s'";
! $ucsql_userget = "SELECT u.*, g.groupname AS gidname"
! 		. " FROM $users_tbl AS u, $groups_tbl AS g"
! 		. " WHERE (u.username='%s' or u.uid='%s')"
! 		. " AND u.groupid = g.gid";
! $ucsql_usergroups = "SELECT $groups_tbl.gid,$groups_tbl.groupname"
! 		. " FROM $users_tbl, $members_tbl, $groups_tbl"
! 		. " WHERE $users_tbl.uid = '%s'"
! 		. " AND $users_tbl.uid = $members_tbl.uid"
! 		. " AND $groups_tbl.gid = $members_tbl.gid";
  $ucsql_usercheckpw = "SELECT * FROM $users_tbl"
  		. " WHERE username = '%s' AND password = '%s'";
  	
! $ucsql_allusers = "SELECT * FROM $users_tbl";
  
  
- $ucsql_memberadd = "INSERT INTO $tbl (gid, uid) VALUES ('%s', '%s')";
- $ucsql_memberdel = "DELETE FROM $tbl WHERE gid = '%s' AND uid = '%s'";
  
  
  
  // OBJECT PERMISSIONS
! $perm_tbl = $uc_config["prefix"] . "permissions";
! $obj_tbl = $uc_config["prefix"] . "objects";
  
  $ucsql_permadd = "INSERT INTO $perm_tbl (oid, gid) VALUES ('%s', '-1')";
--- 14,45 ----
  $ucsql_useradd = "INSERT INTO $users_tbl (username) VALUES ('%s')";
  $ucsql_userdel = "DELETE FROM $users_tbl WHERE username='%s'";
! 
! $ucsql_userget = "SELECT u.* FROM $users_tbl AS u"
! 		. " WHERE (u.username='%s' or u.uid='%s')";
! 		
! $ucsql_usergroups = "SELECT gid"
! 		. " FROM $members_tbl WHERE uid = '%s'";
! 
  $ucsql_usercheckpw = "SELECT * FROM $users_tbl"
  		. " WHERE username = '%s' AND password = '%s'";
  	
! $ucsql_allusers = "SELECT * FROM $users_tbl ORDER BY username";
  
+ $ucsql_usersetlang = "UPDATE $users_tbl"
+ 		. " SET preferred_lang='%s' WHERE uid='%s'";
+ $ucsql_usersetgid = "UPDATE $users_tbl"
+ 		. " SET groupid='%s' WHERE uid='%s'";
+ $ucsql_usersetpw = "UPDATE $users_tbl"
+ 		. " SET password='%s' WHERE uid='%s'";
  
  
+ $ucsql_memberadd = "INSERT INTO $members_tbl (gid, uid) VALUES ('%s', '%s')";
+ $ucsql_memberdel = "DELETE FROM $members_tbl WHERE gid = '%s' AND uid = '%s'";
+ $ucsql_memberrm = "DELETE FROM $members_tbl WHERE uid='%s'";
  
  
  // OBJECT PERMISSIONS
! $perm_tbl = $ucConfig->tblPrefix . "permissions";
! $obj_tbl = $ucConfig->tblPrefix . "objects";
  
  $ucsql_permadd = "INSERT INTO $perm_tbl (oid, gid) VALUES ('%s', '-1')";
***************
*** 55,59 ****
  
  // SESSIONS
! $session_tbl = $uc_config["prefix"] . $uc_config["table"]["sessions"];
  $ucsql_sessionget = "SELECT * FROM $session_tbl WHERE sessid = '%s'";
  $ucsql_sessionlogin = "UPDATE $session_tbl SET logged_in = 1, uid = '%s'"
--- 60,64 ----
  
  // SESSIONS
! $session_tbl = $ucConfig->tblPrefix . $ucConfig->dbTables["sessions"];
  $ucsql_sessionget = "SELECT * FROM $session_tbl WHERE sessid = '%s'";
  $ucsql_sessionlogin = "UPDATE $session_tbl SET logged_in = 1, uid = '%s'"