Index: openacs-4/packages/dotlrn/www/user-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add.tcl,v
diff -u -r1.27 -r1.28
--- openacs-4/packages/dotlrn/www/user-add.tcl	4 Dec 2002 09:51:04 -0000	1.27
+++ openacs-4/packages/dotlrn/www/user-add.tcl	26 Sep 2003 12:56:03 -0000	1.28
@@ -23,7 +23,6 @@
     @creation-date 2002-01-19
     @version $Id$
 } -query {
-    {id ""}
     {type student}
     {can_browse_p 1}
     {read_private_data_p t}
@@ -34,7 +33,7 @@
     context_bar:onevalue
 }
 
-set user_id [ad_maybe_redirect_for_registration]
+set current_user_id [ad_maybe_redirect_for_registration]
 set community_id [dotlrn_community::get_community_id]
 
 if {![empty_string_p $community_id]} {
@@ -47,105 +46,5 @@
     set community_p 0
 }
 
-set target_user_id [db_nextval acs_object_id_seq]
-
-form create add_user
-
-element create add_user target_user_id \
-    -label "[_ dotlrn.User_ID_1]" \
-    -datatype integer \
-    -widget hidden \
-    -value $target_user_id
-
-element create add_user email \
-    -label [_ dotlrn.Email_1] \
-    -datatype text \
-    -widget text \
-    -html {size 50} \
-    -validate [list {expr (([util_email_valid_p $value] == 1) && ([util_email_unique_p $value] == 1))} \
-                    [_ dotlrn.lt_E-mail_address_must_b]]
-
-element create add_user first_names \
-    -label "[_ dotlrn.First_Names]" \
-    -datatype text \
-    -widget text \
-    -html {size 50}
-
-element create add_user last_name \
-    -label "[_ dotlrn.Last_Name]" \
-    -datatype text \
-    -widget text \
-    -html {size 50}
-
-element create add_user referer \
-    -label [_ dotlrn.Referer] \
-    -datatype text \
-    -widget hidden \
-    -value $referer
-
-element create add_user type \
-    -label [_ dotlrn.Type] \
-    -datatype text \
-    -widget hidden \
-    -value $type
-
-element create add_user can_browse_p \
-    -label "[_ dotlrn.Access_Level]" \
-    -datatype text \
-    -widget hidden \
-    -value $can_browse_p
-
-element create add_user read_private_data_p \
-    -label "[_ dotlrn.Guest_1]" \
-    -datatype text \
-    -widget hidden \
-    -value $read_private_data_p
-
-element create add_user add_membership_p \
-    -label "[_ dotlrn.lt_Add_Membership_To_Com]" \
-    -datatype text \
-    -widget hidden \
-    -value $add_membership_p
-
-element create add_user dotlrn_interactive_p \
-    -label "[_ dotlrn.lt_Interactive_setting_o]" \
-    -datatype text \
-    -widget hidden \
-    -value $dotlrn_interactive_p
-
-if {[form is_valid add_user]} {
-    form get_values add_user \
-        target_user_id email first_names last_name referer type can_browse_p read_private_data_p dotlrn_interactive_p
-
-    db_transaction {
-        if {[empty_string_p [cc_email_from_party $target_user_id]]} {
-            # create the ACS user
-            set password [ad_generate_random_string]
-            set target_user_id [ad_user_new $email $first_names $last_name $password "" "" "" t approved $target_user_id]
-        }
-
-        # can this user read private data?
-        acs_privacy::set_user_read_private_data -user_id $target_user_id -object_id [dotlrn::get_package_id] -value $read_private_data_p
-
-        if {!${dotlrn_interactive_p}} {
-            # make the user a dotLRN user
-            dotlrn::user_add -type $type -can_browse\=$can_browse_p -user_id $target_user_id
-        }
-    }
-
-    set redirect "user-add-2?[export_vars {{user_id $target_user_id} email password first_names last_name referer}]"
-    if {[string equal $add_membership_p t] == 1} {
-        set redirect "member-add-2?[export_vars {{user_id $target_user_id} {referer $redirect}}]"
-    }
-
-    if {${dotlrn_interactive_p}} {
-        set redirect "../${redirect}"
-        ad_returnredirect "admin/user-new-2?[export_vars {{user_id $target_user_id} {referer $redirect}}]"
-    } else {
-        ad_returnredirect $redirect
-    }
-
-    ad_script_abort
-}
-
-ad_return_template
+# Export dotlrn-specific vars in the next_url
+set next_url [export_vars -base user-add-2 {type can_browse_p read_private_data_p add_membership_p dotlrn_interactive_p referer}]