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 -N -r1.13 -r1.14
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart-add.tcl	16 Aug 2005 16:18:01 -0000	1.13
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/shopping-cart-add.tcl	17 Aug 2005 17:13:49 -0000	1.14
@@ -94,7 +94,7 @@
 		limit 1
 	    }] } {
 		if { ! [empty_string_p $assessment_id] && $assessment_id != -1 } {
-		    set return_url [export_vars -base "[apm_package_url_from_key dotlrn-ecommerce]application-confirm" { product_id {member_state "awaiting payment"} }]
+		    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 { participant_id community_id {next_url $return_url} { type payment } }]
 		    ad_script_abort
 		    
@@ -112,9 +112,9 @@
 		# waiting list
 		
 		if { $admin_p && $user_id != [ad_conn user_id] } {
-		    set cancel_url [set return_url [export_vars -base ../admin/process-purchase-course { user_id }]]
+		    set cancel_url [set return_url [export_vars -base [ad_conn package_url]admin/process-purchase-course { user_id }]]
 		} else {
-		    set return_url [export_vars -base "[apm_package_url_from_key dotlrn-ecommerce]application-confirm" { product_id {member_state "needs approval"} }]
+		    set return_url [export_vars -base [ad_conn package_url]application-confirm { product_id {member_state "needs approval"} }]
 		    set cancel_url ..
 		}
 		ad_returnredirect [export_vars -base waiting-list-confirm { product_id user_id participant_id return_url cancel_url }]
@@ -163,10 +163,10 @@
 	    if { $prereq_not_met > 0 } {
 		ns_log notice "DEBUG:: prerequisites not met"
 		if { $admin_p && $user_id != [ad_conn user_id] } {
-		    set cancel_url [set return_url [export_vars -base ../admin/process-purchase-course { user_id }]]
+		    set cancel_url [set return_url [export_vars -base [ad_conn package_url]admin/process-purchase-course { user_id }]]
 		} else {
-		    set return_url [export_vars -base "[apm_package_url_from_key dotlrn-ecommerce]application-confirm" { product_id {member_state "request approval"} }]
-		    set cancel_url ..
+		    set return_url [export_vars -base [ad_conn package_url]ecommerce/application-confirm { product_id {member_state "request approval"} }]
+		    set cancel_url [ad_conn package_url]
 		}
 		ad_returnredirect [export_vars -base prerequisite-confirm { product_id user_id participant_id return_url cancel_url }]
 		ad_script_abort