Index: openacs-4/packages/cms/tcl/user-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/Attic/user-procs-postgresql.xql,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/cms/tcl/user-procs-postgresql.xql	20 Aug 2001 04:35:42 -0000	1.3
+++ openacs-4/packages/cms/tcl/user-procs-postgresql.xql	13 Nov 2003 11:54:46 -0000	1.4
@@ -5,8 +5,7 @@
 
 <fullquery name="User::cms_admin_exists.cae_admin_exists">      
       <querytext>
-      
-      select content_permission__cm_admin_exists () 
+      select cms_permission__cm_admin_exists () 
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/cms/tcl/user-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/tcl/Attic/user-procs.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/cms/tcl/user-procs.tcl	18 Sep 2002 12:04:14 -0000	1.5
+++ openacs-4/packages/cms/tcl/user-procs.tcl	13 Nov 2003 11:54:46 -0000	1.6
@@ -53,7 +53,7 @@
   #   on the CMS pages root folder
   ad_proc cms_admin_exists {} {
   
-      set_admin_exists [db_string cae_admin_exists ""]
+      set admin_exists [db_string cae_admin_exists ""]
 
       if { [string equal $admin_exists t] } {
           return 1
Index: openacs-4/packages/cms/www/register-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/Attic/register-oracle.xql,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/cms/www/register-oracle.xql	25 May 2001 02:28:33 -0000	1.1
+++ openacs-4/packages/cms/www/register-oracle.xql	13 Nov 2003 11:54:46 -0000	1.2
@@ -34,18 +34,8 @@
 	  end loop;
 
 	end;
-	
-      </querytext>
-</fullquery>
 
- 
-<fullquery name="get_user_id">      
-      <querytext>
-      
-      select acs_object_id_seq.nextval from dual
-    
       </querytext>
 </fullquery>
 
- 
 </queryset>
Index: openacs-4/packages/cms/www/register-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/Attic/register-postgresql.xql,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/cms/www/register-postgresql.xql	8 Dec 2001 01:18:00 -0000	1.2
+++ openacs-4/packages/cms/www/register-postgresql.xql	13 Nov 2003 11:54:46 -0000	1.3
@@ -35,18 +35,7 @@
 
           return null;
 	end;
-	
       </querytext>
 </fullquery>
 
- 
-<fullquery name="get_user_id">      
-      <querytext>
-      
-      select acs_object_id_seq.nextval 
-    
-      </querytext>
-</fullquery>
-
- 
 </queryset>
Index: openacs-4/packages/cms/www/register.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/Attic/register.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/cms/www/register.tcl	16 Aug 2002 00:20:17 -0000	1.6
+++ openacs-4/packages/cms/www/register.tcl	13 Nov 2003 11:54:46 -0000	1.7
@@ -1,3 +1,4 @@
+# cms/www/register.tcl 
 
 form create register_user -elements {
   user_id -datatype integer -widget hidden
@@ -20,11 +21,10 @@
 }
 
 
-
 if { [form is_request register_user] } {
-    
-    set user_id [db_string get_user_id ""]
 
+    set user_id [db_nextval "acs_object_id_seq"]
+
     set cms_admin_exists [User::cms_admin_exists]
 
     if { $cms_admin_exists == 0 } {
@@ -43,15 +43,10 @@
 	    password screen_name
 
     db_transaction {
-        
-        set user_id [ad_user_new $email $first_name $last_name $password \
-                         "" "" "" "" "" $user_id]
+        array set results [auth::create_user -user_id $user_id -password $password \
+			       -email $email -screen_name $screen_name \
+			       -first_names $first_name -last_name $last_name ]
 
-        db_dml update_users "
-        update users
-        set screen_name = :screen_name
-        where user_id = :user_id"
-
         # if there are no users with the 'cm_admin' privilege 
         #   (the CMS has never been used), then this user will be the admin
         set cms_admin_exists [User::cms_admin_exists]
@@ -64,36 +59,7 @@
         # make admin - grant 'cm_admin' privileges for all content items
         #   and for content modules
         if { [string equal $is_admin t] } {
-            db_dml grant_permissions "
-	declare
-	  cursor c_item_cur is
-	    select item_id from cr_items
-	    connect by parent_id = prior item_id
-	    start with parent_id = 0;
-	
-          cursor c_module_cur is
-	    select module_id from cm_modules;
-
-	begin
-  
-	  for item_row in c_item_cur loop 
-	    acs_permission.grant_permission (
-	        object_id  => item_row.item_id, 
-	        grantee_id => :user_id, 
-	        privilege  => 'cm_admin'
-	    );
-	  end loop;
-
-	  for v_module in c_module_cur loop
-	    acs_permission.grant_permission (
-	        object_id  => v_module.module_id,
-	        grantee_id => :user_id,
-	        privilege  => 'cm_admin'
-            );
-	  end loop;
-
-	end;
-	"
+            db_exec_plsql grant_permissions {*SQL*}
         }
 
         User::login $user_id
Index: openacs-4/packages/cms/www/register.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/cms/www/Attic/register.xql,v
diff -u -N
--- openacs-4/packages/cms/www/register.xql	25 May 2001 02:28:33 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<queryset>
-
-<fullquery name="update_users">      
-      <querytext>
-      
-      update users
-        set screen_name = :screen_name
-        where user_id = :user_id
-      </querytext>
-</fullquery>
-
- 
-</queryset>