Index: openacs-4/packages/assessment/sql/oracle/assessment-actions-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/oracle/assessment-actions-package-create.sql,v diff -u -N -r1.5 -r1.5.2.1 --- openacs-4/packages/assessment/sql/oracle/assessment-actions-package-create.sql 13 Mar 2005 22:08:44 -0000 1.5 +++ openacs-4/packages/assessment/sql/oracle/assessment-actions-package-create.sql 21 Jun 2005 15:14:24 -0000 1.5.2.1 @@ -179,9 +179,26 @@ name => 'Add to Community', description => 'Add user to a community', tcl_code => 'set user_id [ad_conn user_id] +if { [exists_and_not_null subject_id] } { + set user_id $subject_id +} dotlrn_privacy::set_user_guest_p -user_id $user_id -value "t" dotlrn::user_add -can_browse -user_id $user_id -dotlrn_community::add_user_to_community -community_id $community_id -user_id $user_id', +dotlrn_community::add_user_to_community -community_id $community_id -user_id $user_id +set community_name [db_string get_community_name { select pretty_name from dotlrn_communities where community_id = :community_id}] + +set subject "Your $community_name membership has been approved" +set message "Your $community_name membership has been approved. Please return to [ad_url] to log into [ad_system_name]." + +set email_from [ad_parameter -package_id [ad_acs_kernel_id] SystemOwner] + +db_1row select_user_info { select email, first_names, last_name from registered_users where user_id = :user_id} + +if [catch {ns_sendmail $email $email_from $subject $message} errmsg] { + ad_return_error \ + "Error sending mail" \ + "There was an error sending email to $email." +}', context_id => context_id, creation_user => creation_user ); Index: openacs-4/packages/assessment/sql/postgresql/assessment-actions-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/sql/postgresql/assessment-actions-create.sql,v diff -u -N -r1.7.2.1 -r1.7.2.2 --- openacs-4/packages/assessment/sql/postgresql/assessment-actions-create.sql 10 Jun 2005 18:53:30 -0000 1.7.2.1 +++ openacs-4/packages/assessment/sql/postgresql/assessment-actions-create.sql 21 Jun 2005 15:14:24 -0000 1.7.2.2 @@ -221,9 +221,27 @@ ''Add to Community'', ''Add user to a community'', ''set user_id [ad_conn user_id] +if { [exists_and_not_null subject_id] } { + set user_id $subject_id +} dotlrn_privacy::set_user_guest_p -user_id $user_id -value "t" dotlrn::user_add -can_browse -user_id $user_id -dotlrn_community::add_user_to_community -community_id $community_id -user_id $user_id'', +dotlrn_community::add_user_to_community -community_id $community_id -user_id $user_id + +set community_name [db_string get_community_name { select pretty_name from dotlrn_communities where community_id = :community_id}] + +set subject "Your $community_name membership has been approved" +set message "Your $community_name membership has been approved. Please return to [ad_url] to log into [ad_system_name]." + +set email_from [ad_parameter -package_id [ad_acs_kernel_id] SystemOwner] + +db_1row select_user_info { select email, first_names, last_name from registered_users where user_id = :user_id} + +if [catch {ns_sendmail $email $email_from $subject $message} errmsg] { + ad_return_error \ + "Error sending mail" \ + "There was an error sending email to $email." +}'', new__package_id, new__creation_user, new__package_id Index: openacs-4/packages/assessment/tcl/as-apm-param-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/tcl/as-apm-param-procs.tcl,v diff -u -N -r1.2 -r1.2.2.1 --- openacs-4/packages/assessment/tcl/as-apm-param-procs.tcl 30 Mar 2005 17:38:38 -0000 1.2 +++ openacs-4/packages/assessment/tcl/as-apm-param-procs.tcl 21 Jun 2005 15:14:24 -0000 1.2.2.1 @@ -11,12 +11,12 @@ {-node_id ""} } { } { - set exist_assessment [parameter::get -parameter AsmForRegisterId] + set exist_assessment [parameter::get -parameter RegistrationId] if { $exist_assessment != 0} { set par_package_id [db_string package_id {select package_id from cr_folders where folder_id=(select context_id from acs_objects where object_id=:exist_assessment)} -default 0] if { $package_id == $par_package_id } { - parameter::set_value -package_id [ad_conn package_id] -parameter AsmForRegisterId -value 0 + parameter::set_value -package_id [ad_conn package_id] -parameter RegistrationId -value 0 } } } Index: openacs-4/packages/assessment/www/finish.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/finish.tcl,v diff -u -N -r1.6.2.3 -r1.6.2.4 --- openacs-4/packages/assessment/www/finish.tcl 15 Jun 2005 18:07:50 -0000 1.6.2.3 +++ openacs-4/packages/assessment/www/finish.tcl 21 Jun 2005 15:14:25 -0000 1.6.2.4 @@ -15,10 +15,7 @@ } set user_id [ad_conn user_id] -if { $user_id != 0} { - db_dml update_session {update as_sessions set subject_id=:user_id where session_id=:session_id} - -} +db_dml update_session {update as_sessions set subject_id=:user_id where session_id=:session_id} @@ -29,7 +26,7 @@ ad_returnredirect "assessment?assessment_id=$next_asm" } -set value [parameter::get -parameter "AsmForRegisterId" -package_id [subsite::main_site_id]] +set value [parameter::get -parameter "RegistrationId" -package_id [subsite::main_site_id]] if {[info exists return_url]} { if { $return_url != ""} { Index: openacs-4/packages/assessment/www/admin/set-reg-assessment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/admin/set-reg-assessment.tcl,v diff -u -N -r1.1.2.2 -r1.1.2.3 --- openacs-4/packages/assessment/www/admin/set-reg-assessment.tcl 10 Jun 2005 18:53:31 -0000 1.1.2.2 +++ openacs-4/packages/assessment/www/admin/set-reg-assessment.tcl 21 Jun 2005 15:14:25 -0000 1.1.2.3 @@ -13,7 +13,7 @@ set asm_instance [ad_conn package_id] if {![exists_and_not_null assessment_id]} { - set value [parameter::get -parameter AsmForRegisterId -package_id $subsite_id] + set value [parameter::get -parameter RegistrationId -package_id $subsite_id] set assessment_id $value } @@ -46,7 +46,8 @@ ad_returnredirect "${url}asm-admin/one-a?assessment_id=$assessment_id®_p=1&asm_instance=$asm_instance" } } else { - parameter::set_value -package_id [subsite::main_site_id] -parameter AsmForRegisterId -value $assessment_id + parameter::set_value -package_id [subsite::main_site_id] -parameter RegistrationId -value $assessment_id + parameter::set_value -package_id [subsite::main_site_id] -parameter RegistrationImplName -value "asm_url" ad_returnredirect "" } } Index: openacs-4/packages/assessment/www/asm-admin/one-a.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/one-a.tcl,v diff -u -N -r1.9.2.1 -r1.9.2.2 --- openacs-4/packages/assessment/www/asm-admin/one-a.tcl 10 Jun 2005 18:53:31 -0000 1.9.2.1 +++ openacs-4/packages/assessment/www/asm-admin/one-a.tcl 21 Jun 2005 15:14:25 -0000 1.9.2.2 @@ -30,7 +30,7 @@ set url [apm_package_url_from_id $subsite_id] set anonymous_p [db_string has_privilege {} -default "f"] set read_p [permission::permission_p -object_id $assessment_id -privilege read -party_id -1] -set value [parameter::get -parameter AsmForRegisterId -package_id $subsite_id] +set value [parameter::get -parameter RegistrationId -package_id $subsite_id] if { [exists_and_not_null asm_instance]} { set reg_url "[apm_package_url_from_id $asm_instance]admin"