Index: openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.xql	1 Dec 2001 23:16:27 -0000	1.4
+++ openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.xql	8 Feb 2002 20:50:57 -0000	1.5
@@ -2,28 +2,39 @@
 
 <queryset>
 
-<fullquery name="dotlrn::get_user_types.select_user_types">
-<querytext>
-select type, type_id from dotlrn_user_types order by type
-</querytext>
-</fullquery>
+  <fullquery name="dotlrn::get_user_types.select_user_types">
+    <querytext>
+      select pretty_name,
+             type
+      from dotlrn_user_types
+      order by pretty_name
+    </querytext>
+  </fullquery>
 
-<fullquery name="dotlrn::user_remove.select_rel_id">
-<querytext>
-select rel_id from dotlrn_users where user_id= :user_id
-</querytext>
-</fullquery>
+  <fullquery name="dotlrn::user_remove.select_rel_id">
+    <querytext>
+      select rel_id
+      from dotlrn_users
+      where user_id = :user_id
+    </querytext>
+  </fullquery>
 
-<fullquery name="dotlrn::user_get_type.select_user_type">
-<querytext>
-select type from dotlrn_users, dotlrn_user_types where dotlrn_user_rels.type_id= dotlrn_user_types.type_id and user_id= :user_id
-</querytext>>
-</fullquery>
+  <fullquery name="dotlrn::user_get_type.select_user_type">
+    <querytext>
+      select type
+      from dotlrn_users
+      where user_id = :user_id
+    </querytext>>
+  </fullquery>
 
-<fullquery name="dotlrn::user_add.update_user_portal_id">
-<querytext>
-update dotlrn_full_user_rels set portal_id= :portal_id where rel_id = (select rel_id from dotlrn_full_users where user_id= :user_id)
-</querytext>
-</fullquery>
+  <fullquery name="dotlrn::user_add.update_user_portal_id">
+    <querytext>
+      update dotlrn_full_user_profile_rels
+      set portal_id = :portal_id
+      where rel_id = (select rel_id
+                      from dotlrn_full_users
+                      where user_id = :user_id)
+    </querytext>
+  </fullquery>
 
 </queryset>