Index: openacs.org-dev/packages/ecommerce/www/address.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/ecommerce/www/address.tcl,v
diff -u -r1.1.1.2 -r1.1.1.3
--- openacs.org-dev/packages/ecommerce/www/address.tcl	5 Aug 2002 21:38:45 -0000	1.1.1.2
+++ openacs.org-dev/packages/ecommerce/www/address.tcl	8 Oct 2002 15:47:06 -0000	1.1.1.3
@@ -2,6 +2,7 @@
     @param address_type
     @param usca_p:optional
     @param address_id:optional
+    @param referer
 
     @author
     @creation-date
@@ -13,6 +14,7 @@
     address_type
     usca_p:optional
     address_id:optional
+    referer
 }
 
 ec_redirect_to_https_if_possible_and_necessary
@@ -23,7 +25,7 @@
 if {$user_id == 0} {
     set return_url "[ad_conn url]"
     ad_returnredirect "/register?[export_url_vars return_url]"
-    return
+    ad_script_abort
 }
 
 # Retrieve the saved address with address_id. 
@@ -38,7 +40,8 @@
     # outside the United States.
 
     if { ![string equal $country_code "US"] } {
-	ad_returnredirect "address-international?[export_url_vars address_id address_type]"
+	ad_returnredirect "address-international?[export_url_vars address_id address_type referer]"
+        ad_script_abort
     }
 
     if { [info exists usps_abbrev] } {
@@ -64,23 +67,24 @@
 ec_create_new_session_if_necessary
 ec_log_user_as_user_id_for_this_session
 
-# Get the location from which delete-address was called.
+# Get the location from which address was called.
 
-set header_set [ns_conn headers]
-set action [ns_set get [ns_conn headers] Referer]
-# This will set "action" to be "foo" out of "http://bar.com/baz/foo"
-set action [string range $action [expr [string last "/" $action] + 1] end]
+# set header_set [ns_conn headers]
+# set referer [ns_set get [ns_conn headers] Referer]
+# # This will set "referer" to be "foo" out of "http://bar.com/baz/foo"
+# set referer [string range $referer [expr [string last "/" $referer] + 1] end]
 
 # Get the form vars that were passed on delete-address so that they
 # can be passed back to the calling url. gift-certificate-billing has
 # a bunch of form vars that should not be lost.
 
-set hidden_form_vars "[export_form_vars action]"
 set form_set [ns_getform]
 for {set i 0} {$i < [ns_set size $form_set]} {incr i} {
     set [ns_set key $form_set $i] [ns_set value $form_set $i]
     append hidden_form_vars "[export_form_vars [ns_set key $form_set $i]]"
 }
 
 set user_name_with_quotes_escaped [ad_quotehtml $attn]
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Completing Your Order"]]]
+set ec_system_owner [ec_system_owner]
 db_release_unused_handles