Index: openacs-4/packages/dotlrn-ecommerce/lib/user-info.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/user-info.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn-ecommerce/lib/user-info.tcl 31 Aug 2005 09:01:01 -0000 1.10
+++ openacs-4/packages/dotlrn-ecommerce/lib/user-info.tcl 1 Oct 2005 21:44:40 -0000 1.11
@@ -262,6 +262,7 @@
category::map_object -remove_old -object_id $user_id [list $grade]
dotlrn::user_add -user_id $user_id
+ dotlrn_privacy::set_user_guest_p -user_id $user_id -value f
} -after_submit {
if { [string equal [ad_conn account_status] "closed"] } {
auth::verify_account_status
Index: openacs-4/packages/dotlrn-ecommerce/lib/user-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/user-new.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/dotlrn-ecommerce/lib/user-new.tcl 30 Aug 2005 17:42:45 -0000 1.11
+++ openacs-4/packages/dotlrn-ecommerce/lib/user-new.tcl 1 Oct 2005 21:44:40 -0000 1.12
@@ -266,6 +266,7 @@
if { ! [dotlrn::user_p -user_id $user_id] } {
dotlrn::user_add -user_id $user_id
+ dotlrn_privacy::set_user_guest_p -user_id $user_id -value f
}
} -after_submit {
Index: openacs-4/packages/dotlrn-ecommerce/tcl/implementation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/tcl/implementation-procs.tcl,v
diff -u -r1.30 -r1.31
--- openacs-4/packages/dotlrn-ecommerce/tcl/implementation-procs.tcl 24 Sep 2005 21:46:31 -0000 1.30
+++ openacs-4/packages/dotlrn-ecommerce/tcl/implementation-procs.tcl 1 Oct 2005 21:44:40 -0000 1.31
@@ -64,6 +64,7 @@
}]
}
+ ns_log notice "dotlrn_ecommerce::registration::new: User successfully registered: user_id $user_id patron_id $patron_id community_id $community_id"
}
ad_proc -callback ecommerce::after-checkout -impl dotlrn-ecommerce {
@@ -78,6 +79,7 @@
if { [exists_and_not_null patron_id] } {
if { ! [dotlrn::user_p -user_id $patron_id] } {
dotlrn::user_add -user_id $patron_id
+ dotlrn_privacy::set_user_guest_p -user_id $patron_id -value f
}
}
@@ -114,6 +116,7 @@
if { [exists_and_not_null saved_patron_id] } {
if { ! [dotlrn::user_p -user_id $saved_patron_id] } {
dotlrn::user_add -user_id $saved_patron_id
+ dotlrn_privacy::set_user_guest_p -user_id $saved_patron_id -value f
}
}
@@ -131,6 +134,7 @@
foreach user_id $user_ids {
if { ! [dotlrn::user_p -user_id $user_id] } {
dotlrn::user_add -user_id $user_id
+ dotlrn_privacy::set_user_guest_p -user_id $user_id -value f
}
if {$membership_product_p} {
Index: openacs-4/packages/dotlrn-ecommerce/www/application-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/application-confirm.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn-ecommerce/www/application-confirm.tcl 28 Sep 2005 13:38:48 -0000 1.7
+++ openacs-4/packages/dotlrn-ecommerce/www/application-confirm.tcl 1 Oct 2005 21:44:40 -0000 1.8
@@ -26,6 +26,7 @@
# means a new user answered a course application and should be put
# on the approval list
dotlrn::user_add -user_id $user_id
+ dotlrn_privacy::set_user_guest_p -user_id $user_id -value f
# Adding a user removes an existing entry in member_rels and
# creates a new one with the default member_state so set the
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/membership-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/membership-add.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/dotlrn-ecommerce/www/admin/membership-add.tcl 16 Jul 2005 12:51:06 -0000 1.6
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/membership-add.tcl 1 Oct 2005 21:44:39 -0000 1.7
@@ -34,6 +34,7 @@
if { ! [dotlrn::user_p -user_id $user_id] } {
dotlrn::user_add -user_id $user_id
+ dotlrn_privacy::set_user_guest_p -user_id $user_id -value f
}
if { [info exists participant_id] } {
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase-2.tcl 17 Aug 2005 09:31:58 -0000 1.1
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase-2.tcl 1 Oct 2005 21:44:39 -0000 1.2
@@ -23,6 +23,7 @@
if { ! [dotlrn::user_p -user_id $user_id] } {
dotlrn::user_add -user_id $user_id
+ dotlrn_privacy::set_user_guest_p -user_id $user_id -value f
}
# Get section
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase-course.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase-course.tcl,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase-course.tcl 9 Sep 2005 05:01:45 -0000 1.22
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/process-purchase-course.tcl 1 Oct 2005 21:44:39 -0000 1.23
@@ -74,11 +74,13 @@
if { ! [dotlrn::user_p -user_id $user_id] } {
dotlrn::user_add -user_id $user_id
+ dotlrn_privacy::set_user_guest_p -user_id $user_id -value f
}
if { $participant_id } {
if { ! [dotlrn::user_p -user_id $participant_id] } {
dotlrn::user_add -user_id $participant_id
+ dotlrn_privacy::set_user_guest_p -user_id $participant_id -value f
}
}
Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/application-request.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/application-request.tcl,v
diff -u -r1.23 -r1.24
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/application-request.tcl 20 Sep 2005 17:38:28 -0000 1.23
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/application-request.tcl 1 Oct 2005 21:44:39 -0000 1.24
@@ -14,13 +14,16 @@
community_id:integer,notnull
{type full}
next_url:notnull
+
+ return_url:optional
} -properties {
} -validate {
} -errors {
}
if { ! [dotlrn::user_p -user_id $participant_id] } {
dotlrn::user_add -user_id $participant_id
+ dotlrn_privacy::set_user_guest_p -user_id $participant_id -value f
}
set extra_vars [ns_set create]
@@ -159,6 +162,10 @@
insert into dotlrn_ecommerce_application_assessment_map
values (:rel_id, :session_id)
}
+
+ if { [exists_and_not_null return_url] } {
+ set next_url [export_vars -base $next_url { return_url }]
+ }
set return_url [export_vars -base "[ad_conn package_url]ecommerce/application-request-2" { user_id {return_url $next_url} }]
ad_returnredirect [export_vars -base "[apm_package_url_from_id [parameter::get -parameter AssessmentPackage]]assessment" { assessment_id return_url session_id }]
Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/participant-change-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/participant-change-2.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/participant-change-2.tcl 16 Jul 2005 14:23:52 -0000 1.4
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/participant-change-2.tcl 1 Oct 2005 21:44:39 -0000 1.5
@@ -23,6 +23,7 @@
if { ! [dotlrn::user_p -user_id $user_id] } {
dotlrn::user_add -user_id $user_id
+ dotlrn_privacy::set_user_guest_p -user_id $user_id -value f
}
# Get section
Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart-add.tcl,v
diff -u -r1.28 -r1.29
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart-add.tcl 30 Sep 2005 23:02:00 -0000 1.28
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart-add.tcl 1 Oct 2005 21:44:39 -0000 1.29
@@ -140,8 +140,8 @@
}] } {
if { ! [empty_string_p $assessment_id] && $assessment_id != -1 } {
if { $auto_register_p == "t" } {
- set return_url [export_vars -base [ad_conn url] { product_id user_id participant_id override_p offer_code return_url {override_course_application_p 1} }]
- ad_returnredirect [export_vars -base "[apm_package_url_from_id [parameter::get -parameter AssessmentPackage]]assessment" { assessment_id return_url }]
+ set _return_url [export_vars -base [ad_conn url] { product_id user_id participant_id override_p offer_code {override_course_application_p 1} }]
+ ad_returnredirect [export_vars -base application-request { user_id participant_id community_id {next_url $_return_url} { type payment } return_url }]
} else {
set return_url [export_vars -base "[ad_conn package_url]application-confirm" { product_id {member_state "awaiting payment"} }]
ad_returnredirect [export_vars -base application-request { user_id participant_id community_id {next_url $return_url} { type payment } }]
Index: openacs-4/packages/dotlrn-ecommerce/www/register/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/register/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-ecommerce/www/register/index.tcl 20 Jul 2005 03:22:36 -0000 1.2
+++ openacs-4/packages/dotlrn-ecommerce/www/register/index.tcl 1 Oct 2005 21:44:39 -0000 1.3
@@ -38,6 +38,8 @@
# FIXME : put some error handling here
# make sure user is an approved dotlrn user
dotlrn::user_add -user_id $user_id
+ dotlrn_privacy::set_user_guest_p -user_id $user_id -value f
+
# register the user
dotlrn_community::add_user $community_id $user_id
set reg_message "Thank you for registering....
Placeholder for complete message"