Index: openacs-4/packages/dotlrn/dotlrn.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v diff -u -r1.113 -r1.114 --- openacs-4/packages/dotlrn/dotlrn.info 9 Oct 2003 08:31:00 -0000 1.113 +++ openacs-4/packages/dotlrn/dotlrn.info 28 Oct 2003 17:30:40 -0000 1.114 @@ -6,58 +6,61 @@ dotLRN f f - - - - oracle - postgresql - + + OpenForce dotLRN A Course Management System 2001-10-03 OpenForce Course Management - + + - + + + + + + + + - - - - - - - - - + + + + + + - - - + + - - - - - - - + + + + + + + + - - + + + - + + Index: openacs-4/packages/dotlrn/www/index-not-a-user.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index-not-a-user.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/dotlrn/www/index-not-a-user.tcl 3 Oct 2003 20:02:49 -0000 1.12 +++ openacs-4/packages/dotlrn/www/index-not-a-user.tcl 28 Oct 2003 17:30:40 -0000 1.13 @@ -22,12 +22,48 @@ @version $Id$ } +if { [dotlrn::user_p -user_id $user_id] } { + # Already a user + ad_returnredirect . + ad_script_abort +} + if { [dotlrn::admin_p] } { set return_url [export_vars -base "[dotlrn::get_admin_url]/user-new-2" { { user_id {[ad_conn user_id]} } { referer "[dotlrn::get_url]/"} }] set self_approve_url [export_vars -base "[apm_package_url_from_key "acs-admin"]users/member-state-change" { { user_id {[ad_conn user_id]} } { member_state approved} return_url }] ad_returnredirect $self_approve_url ad_script_abort -} +} elseif { [parameter::get -parameter AutoAddUsersP -package_id [dotlrn::get_package_id] -default 0] } { + set user_id [auth::require_login] + set type [parameter::get \ + -parameter AutoUserType \ + -package_id [dotlrn::get_package_id] \ + -default "student"] + + set can_browse_p [parameter::get \ + -parameter AutoUserAccessLevel \ + -package_id [dotlrn::get_package_id] \ + -default 1] + + set read_private_data_p [parameter::get \ + -parameter AutoUserReadPrivateDataP \ + -package_id [dotlrn::get_package_id] \ + -default 1] + db_transaction { + dotlrn::user_add \ + -type $type \ + -can_browse=$can_browse_p \ + -user_id $user_id + + acs_privacy::set_user_read_private_data \ + -user_id $user_id \ + -object_id [dotlrn::get_package_id] \ + -value $read_private_data_p + } + + ad_returnredirect . + ad_script_abort +}