upcase-project-cvs

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

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

Modified Files:
	uc_sql-mysql.inc 
Log Message:
modified some queries to fit the new account management system


Index: uc_sql-mysql.inc
===================================================================
RCS file: /cvsroot/upcase-project/UpCase/lib/uc_sql-mysql.inc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** uc_sql-mysql.inc	21 Nov 2002 15:17:06 -0000	1.8
--- uc_sql-mysql.inc	28 Nov 2002 14:23:24 -0000	1.9
***************
*** 7,13 ****
  
  $ucsql_groupadd = "INSERT INTO $groups_tbl (groupname) VALUES ('%s')";
! $ucsql_groupdel = "DELETE FROM $groups_tbl WHERE groupname='%s'";
! $ucsql_groupget = "SELECT * FROM $groups_tbl WHERE groupname='%s'";
! $ucsql_allgroups = "SELECT * FROM $groups_tbl";
  $ucsql_primarygroup = "SELECT $groups_tbl.gid FROM $users_tbl, $groups_tbl"
  				. " WHERE $groups_tbl.groupname='%s'"
--- 7,14 ----
  
  $ucsql_groupadd = "INSERT INTO $groups_tbl (groupname) VALUES ('%s')";
! $ucsql_groupdel = "DELETE FROM $groups_tbl WHERE gid='%s'";
! $ucsql_groupget = "SELECT * FROM $groups_tbl"
! 				. " WHERE (groupname = '%s' OR gid = '%s')";
! $ucsql_allgroups = "SELECT * FROM $groups_tbl ORDER BY groupname";
  $ucsql_primarygroup = "SELECT $groups_tbl.gid FROM $users_tbl, $groups_tbl"
  				. " WHERE $groups_tbl.groupname='%s'"
***************
*** 15,20 ****
  
  
! $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"
--- 16,27 ----
  
  
! $ucsql_useradd = "INSERT INTO $users_tbl"
! 				. " (username,groupid,lastname,firstname,preferred_lang,email)"
! 				. " VALUES ('%s','%s','%s','%s','%s','%s')";
! $ucsql_userupdate = "UPDATE $users_tbl SET username = '%s', groupid = '%s',"
! 				. " lastname = '%s', firstname = '%s', preferred_lang = '%s',"
! 				. " email = '%s' WHERE uid = '%s'";
! 				
! $ucsql_userdel = "DELETE FROM $users_tbl WHERE uid='%s'";
  
  $ucsql_userget = "SELECT u.* FROM $users_tbl AS u"
***************
*** 43,50 ****
  		. " SET email='%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_memgrpdel = "DELETE FROM $members_tbl WHERE gid = '%s'";
  $ucsql_memberrm = "DELETE FROM $members_tbl WHERE uid='%s'";
  
  
--- 50,58 ----
  		. " SET email='%s' WHERE uid='%s'";
  
! $ucsql_memberadd = "INSERT INTO $members_tbl (gid, uid) VALUES ";
  $ucsql_memberdel = "DELETE FROM $members_tbl WHERE gid = '%s' AND uid = '%s'";
  $ucsql_memgrpdel = "DELETE FROM $members_tbl WHERE gid = '%s'";
  $ucsql_memberrm = "DELETE FROM $members_tbl WHERE uid='%s'";
+ $ucsql_memberget = "SELECT gid FROM $members_tbl WHERE uid = '%s'";