Index: openacs.org-dev/packages/ecommerce/www/address-international-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/ecommerce/www/address-international-2.tcl,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/ecommerce/www/address-international-2.tcl	9 Jul 2002 17:35:05 -0000	1.1.1.1
+++ openacs.org-dev/packages/ecommerce/www/address-international-2.tcl	8 Oct 2002 15:47:06 -0000	1.1.1.2
@@ -8,7 +8,7 @@
     @param country_code
     @param phone
     @param phone_time:optional
-    @param action
+    @param referer
 
     @author
     @creation-date
@@ -27,8 +27,8 @@
     zip_code:optional
     country_code:notnull
     phone
-    phone_time:optional
-    action
+    {phone_time ""}
+    referer
 }
 
 set possible_exception_list [list [list attn name] [list line1 address] [list city city] [list country_code country] [list phone "telephone number"]]
@@ -44,7 +44,7 @@
 
 if { $exception_count > 0 } {
     ad_return_complaint $exception_count $exception_text
-    return
+    ad_script_abort
 }
 
 # We need them to be logged in
@@ -53,7 +53,7 @@
 if {$user_id == 0} {
     set return_url "[ad_conn url]?[export_entire_form_as_url_vars]"
     ad_returnredirect "/register?[export_url_vars return_url]"
-    return
+    ad_script_abort
 }
 
 # Make sure they have an in_basket order, otherwise they've probably
@@ -66,8 +66,8 @@
     # Then they probably got here by pushing "Back", so just redirect
     # them to index.tcl
 
-    ad_returnredirect index.tcl
-    return
+    ad_returnredirect index
+    ad_script_abort
 }
 
 if { [info exists address_id] && $address_id != "" } {
@@ -106,11 +106,7 @@
     db_release_unused_handles
 }
 
-set formatted_address [ec_display_as_html [ec_pretty_mailing_address_from_args $line1 $line2 $city "" $zip_code $country_code \
-						$full_state_name $attn $phone $phone_time]]
-set hidden_form_vars ""
-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]]"
-}
+# Return to the calling page (E.g. checkout, billing,
+# giftcertificate-billing).
+
+rp_internal_redirect $referer