Index: openacs-4/packages/ecommerce/www/address-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/address-2.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/address-2.tcl 26 Sep 2002 21:28:35 -0000 1.4 +++ openacs-4/packages/ecommerce/www/address-2.tcl 3 Oct 2002 18:12:09 -0000 1.5 @@ -72,7 +72,7 @@ # They probably got here by pushing "Back", so just redirect # them to index.tcl - ad_returnredirect index.tcl + rp_internal_redirect index ad_script_abort } } Index: openacs-4/packages/ecommerce/www/address-international-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/address-international-2.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/address-international-2.tcl 18 Sep 2002 21:33:45 -0000 1.3 +++ openacs-4/packages/ecommerce/www/address-international-2.tcl 3 Oct 2002 18:12:09 -0000 1.4 @@ -66,7 +66,7 @@ # Then they probably got here by pushing "Back", so just redirect # them to index.tcl - ad_returnredirect index + rp_internal_redirect index ad_script_abort } Index: openacs-4/packages/ecommerce/www/billing.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/billing.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/billing.tcl 18 Sep 2002 21:33:45 -0000 1.4 +++ openacs-4/packages/ecommerce/www/billing.tcl 3 Oct 2002 18:12:09 -0000 1.5 @@ -45,7 +45,7 @@ # No rows came back, so they probably got here by pushing "Back", # so just redirect them to index.tcl - ad_returnredirect [ec_url]index.tcl + rp_internal_redirect index ad_script_abort } @@ -72,7 +72,7 @@ select count(*) from ec_items where order_id=:order_id"] == 0 } { - ad_returnredirect [ec_url]shopping-cart + rp_internal_redirect shopping-cart ad_script_abort } Index: openacs-4/packages/ecommerce/www/category-browse.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/category-browse.tcl 18 Sep 2002 21:33:45 -0000 1.5 +++ openacs-4/packages/ecommerce/www/category-browse.tcl 3 Oct 2002 18:12:09 -0000 1.6 @@ -27,7 +27,7 @@ # selected. if {![info exists category_id] || ([info exists category_id] && [empty_string_p $category_id])} { - ad_returnredirect index + rp_internal_redirect index ad_script_abort } Index: openacs-4/packages/ecommerce/www/checkout-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-2.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/ecommerce/www/checkout-2.tcl 18 Sep 2002 21:33:45 -0000 1.9 +++ openacs-4/packages/ecommerce/www/checkout-2.tcl 3 Oct 2002 18:12:09 -0000 1.10 @@ -47,7 +47,7 @@ # No rows came back, so they probably got here by pushing "Back", # so just redirect them to index.tcl - ad_returnredirect [ec_url]index.tcl + rp_internal_redirect index ad_script_abort } @@ -73,7 +73,7 @@ select count(*) from ec_items where order_id=:order_id"] == 0 } { - ad_returnredirect [ec_url]shopping-cart + rp_internal_redirect shopping-cart ad_script_abort } Index: openacs-4/packages/ecommerce/www/checkout-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-3.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/checkout-3.tcl 18 Sep 2002 21:33:45 -0000 1.5 +++ openacs-4/packages/ecommerce/www/checkout-3.tcl 3 Oct 2002 18:12:09 -0000 1.6 @@ -51,7 +51,7 @@ # Then they probably got here by pushing "Back", so just redirect # them to index.tcl - ad_returnredirect index + rp_internal_redirect index ad_script_abort } @@ -63,7 +63,7 @@ select count(*) from ec_items where order_id=:order_id"] == 0 } { - ad_returnredirect shopping-cart + rp_internal_redirect shopping-cart ad_script_abort } @@ -76,7 +76,7 @@ from ec_orders where order_id=:order_id"] if { $order_owner != $user_id } { - ad_returnredirect checkout + rp_internal_redirect checkout ad_script_abort } @@ -138,7 +138,7 @@ from ec_orders where order_id=:order_id" -default ""] if { [empty_string_p $shipping_method] || ([empty_string_p $creditcard_id] && (![info exists gift_certificate_covers_cost_p] || $gift_certificate_covers_cost_p == "f")) } { - ad_returnredirect checkout-2 + rp_internal_redirect checkout-2 ad_script_abort } Index: openacs-4/packages/ecommerce/www/checkout.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/ecommerce/www/checkout.tcl 18 Sep 2002 21:33:45 -0000 1.9 +++ openacs-4/packages/ecommerce/www/checkout.tcl 3 Oct 2002 18:12:09 -0000 1.10 @@ -32,7 +32,7 @@ # Then they probably got here by pushing "Back", so just redirect # them to index.tcl - ad_returnredirect index + rp_internal_redirect index ad_script_abort } else { db_dml update_ec_order_set_uid " Index: openacs-4/packages/ecommerce/www/credit-card-correction-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/credit-card-correction-2.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/credit-card-correction-2.tcl 18 Sep 2002 21:33:45 -0000 1.4 +++ openacs-4/packages/ecommerce/www/credit-card-correction-2.tcl 3 Oct 2002 18:12:09 -0000 1.5 @@ -106,9 +106,9 @@ where o2.user_id = :user_id and o2.confirmed_date is not null)" -default ""] if { [empty_string_p $most_recently_confirmed_order] } { - ad_returnredirect index + rp_internal_redirect index } else { - ad_returnredirect thank-you + rp_internal_redirect thank-you } ad_script_abort } @@ -121,7 +121,7 @@ select count(*) from ec_items where order_id=:order_id"] == 0 } { - ad_returnredirect shopping-cart + rp_internal_redirect shopping-cart ad_script_abort } @@ -134,7 +134,7 @@ from ec_orders where order_id=:order_id"] if { $order_owner != $user_id } { - ad_returnredirect checkout + rp_internal_redirect checkout ad_script_abort } @@ -166,4 +166,4 @@ } db_release_unused_handles -ad_returnredirect finalize-order +rp_internal_redirect finalize-order Index: openacs-4/packages/ecommerce/www/credit-card-correction.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/credit-card-correction.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/credit-card-correction.tcl 18 Sep 2002 21:33:46 -0000 1.4 +++ openacs-4/packages/ecommerce/www/credit-card-correction.tcl 3 Oct 2002 18:12:09 -0000 1.5 @@ -51,7 +51,7 @@ where user_session_id = :user_session_id and order_state = 'in_basket'" -default ""] if { [empty_string_p $order_id] } { - ad_returnredirect index + rp_internal_redirect index ad_script_abort } @@ -65,7 +65,7 @@ select count(*) from ec_items where order_id = :order_id"] == 0 } { - ad_returnredirect shopping-cart + rp_internal_redirect shopping-cart ad_script_abort } @@ -78,7 +78,7 @@ from ec_orders where order_id = :order_id"] if { $order_owner != $user_id } { - ad_returnredirect checkout + rp_internal_redirect checkout ad_script_abort } @@ -93,7 +93,7 @@ where c.creditcard_id = o.creditcard_id and order_id = :order_id and c.billing_address = a.address_id"] == 0 } { - ad_returnredirect checkout-2 + rp_internal_redirect checkout-2 ad_script_abort } Index: openacs-4/packages/ecommerce/www/finalize-order.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/finalize-order.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/finalize-order.tcl 18 Sep 2002 21:33:46 -0000 1.4 +++ openacs-4/packages/ecommerce/www/finalize-order.tcl 3 Oct 2002 18:12:09 -0000 1.5 @@ -80,9 +80,9 @@ and o2.confirmed_date is not null)" -default ""] if { [empty_string_p $most_recently_confirmed_order] } { - ad_returnredirect index + rp_internal_redirect index } else { - ad_returnredirect thank-you + rp_internal_redirect thank-you } ad_script_abort } @@ -97,7 +97,7 @@ select count(*) from ec_items where order_id = :order_id"] == 0 } { - ad_returnredirect shopping-cart + rp_internal_redirect shopping-cart ad_script_abort } @@ -110,7 +110,7 @@ from ec_orders where order_id = :order_id"] if { $order_owner != $user_id } { - ad_returnredirect checkout + rp_internal_redirect checkout ad_script_abort } @@ -171,7 +171,7 @@ from ec_orders where order_id=:order_id" -default ""] if { [empty_string_p $shipping_method] || ([empty_string_p $creditcard_id] && (![info exists gift_certificate_covers_cost_p] || $gift_certificate_covers_cost_p == "f")) } { - ad_returnredirect checkout-2 + rp_internal_redirect checkout-2 ad_script_abort } @@ -246,7 +246,7 @@ # 'authorized'. ec_update_state_to_authorized $order_id - ad_returnredirect thank-you + rp_internal_redirect thank-you } else { @@ -283,7 +283,7 @@ } if { [string equal $result "authorized"] || [string equal $result "no_recommendation"] } { - ad_returnredirect thank-you + rp_internal_redirect thank-you ad_script_abort } elseif { [string equal $result "failed_authorization"] } { @@ -292,7 +292,7 @@ ec_update_state_to_in_basket $order_id - ad_returnredirect credit-card-correction + rp_internal_redirect credit-card-correction ad_script_abort } else { @@ -370,7 +370,7 @@ where transaction_id = :pgw_transaction_id" } - ad_returnredirect thank-you + rp_internal_redirect thank-you } elseif { [string equal $result "failed_authorization"] || [string equal $result "no_recommendation"] } { @@ -406,7 +406,7 @@ ec_update_state_to_in_basket $order_id - ad_returnredirect credit-card-correction + rp_internal_redirect credit-card-correction ad_script_abort } else { @@ -511,7 +511,7 @@ set authorized_date = sysdate where transaction_id = :transaction_id" - ad_returnredirect thank-you + rp_internal_redirect thank-you } elseif {[string equal $result "failed_authorization"] || [string equal $result "no_recommendation"] } { @@ -539,7 +539,7 @@ # confirmed order fails ec_update_state_to_in_basket $order_id - ad_returnredirect credit-card-correction + rp_internal_redirect credit-card-correction } else { @@ -565,7 +565,7 @@ ec_update_state_to_in_basket $order_id - ad_returnredirect credit-card-correction + rp_internal_redirect credit-card-correction ad_script_abort } else { @@ -597,7 +597,7 @@ # 'authorized'. ec_update_state_to_authorized $order_id - ad_returnredirect thank-you + rp_internal_redirect thank-you } else { @@ -633,7 +633,7 @@ } if { [string equal $result "authorized"] || [string equal $result "no_recommendation"] } { - ad_returnredirect thank-you + rp_internal_redirect thank-you ad_script_abort } elseif { [string equal $result "failed_authorization"] } { @@ -668,7 +668,7 @@ ec_update_state_to_in_basket $order_id - ad_returnredirect credit-card-correction + rp_internal_redirect credit-card-correction ad_script_abort } else { @@ -703,7 +703,7 @@ # 'authorized'. ec_update_state_to_authorized $order_id - ad_returnredirect thank-you + rp_internal_redirect thank-you } else { @@ -757,7 +757,7 @@ set marked_date = sysdate where transaction_id = :pgw_transaction_id" } - ad_returnredirect thank-you + rp_internal_redirect thank-you } if {[string equal $result "failed_authorization"] || [string equal $result "no_recommendation"] } { @@ -793,7 +793,7 @@ ec_update_state_to_in_basket $order_id - ad_returnredirect credit-card-correction + rp_internal_redirect credit-card-correction ad_script_abort } else { @@ -820,6 +820,6 @@ # 'authorized'. ec_update_state_to_authorized $order_id - ad_returnredirect thank-you + rp_internal_redirect thank-you } } Index: openacs-4/packages/ecommerce/www/gift-certificate-claim-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-claim-2.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/gift-certificate-claim-2.tcl 18 Sep 2002 21:33:46 -0000 1.4 +++ openacs-4/packages/ecommerce/www/gift-certificate-claim-2.tcl 3 Oct 2002 18:12:09 -0000 1.5 @@ -27,7 +27,7 @@ set user_session_id [ec_get_user_session_id] if { $user_session_id == 0 } { - ad_returnredirect "index" + rp_internal_redirect "index" ad_script_abort } @@ -37,7 +37,7 @@ where user_session_id = :user_session_id and order_state='in_basket'" -default ""] if { [empty_string_p $order_id] } { - ad_returnredirect "index" + rp_internal_redirect "index" ad_script_abort } Index: openacs-4/packages/ecommerce/www/gift-certificate-claim.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-claim.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/gift-certificate-claim.tcl 18 Sep 2002 21:33:46 -0000 1.4 +++ openacs-4/packages/ecommerce/www/gift-certificate-claim.tcl 3 Oct 2002 18:12:09 -0000 1.5 @@ -24,7 +24,7 @@ set user_session_id [ec_get_user_session_id] if { $user_session_id == 0 } { - ad_returnredirect "index" + rp_internal_redirect "index" ad_script_abort } @@ -34,7 +34,7 @@ where user_session_id = :user_session_id and order_state='in_basket'" -default ""] if { [empty_string_p $order_id] } { - ad_returnredirect "index" + rp_internal_redirect "index" ad_script_abort } Index: openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.tcl 18 Sep 2002 21:33:46 -0000 1.6 +++ openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.tcl 3 Oct 2002 18:12:09 -0000 1.7 @@ -167,7 +167,7 @@ # Present a thank you page - ad_returnredirect "gift-certificate-thank-you" + rp_internal_redirect "gift-certificate-thank-you" ad_script_abort } @@ -451,7 +451,7 @@ # Present a thank-you page. - ad_returnredirect "gift-certificate-thank-you" + rp_internal_redirect "gift-certificate-thank-you" ad_script_abort } @@ -479,7 +479,7 @@ # Present a thank-you page. - ad_returnredirect "gift-certificate-thank-you" + rp_internal_redirect "gift-certificate-thank-you" ad_script_abort } Index: openacs-4/packages/ecommerce/www/payment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/payment.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/ecommerce/www/payment.tcl 21 Sep 2002 02:50:32 -0000 1.7 +++ openacs-4/packages/ecommerce/www/payment.tcl 3 Oct 2002 18:12:09 -0000 1.8 @@ -51,7 +51,7 @@ # No rows came back, so they probably got here by pushing "Back", # so just redirect them to index.tcl - ad_returnredirect index + rp_internal_redirect index ad_script_abort } @@ -70,7 +70,7 @@ # otherwise they've probably gotten here via url surgery, so # redirect them to checkout.tcl - ad_returnredirect checkout + rp_internal_redirect checkout ad_script_abort } @@ -99,7 +99,7 @@ select count(*) from ec_items where order_id=:order_id"] == 0 } { - ad_returnredirect shopping-cart + rp_internal_redirect shopping-cart ad_script_abort } Index: openacs-4/packages/ecommerce/www/process-order-quantity-shipping.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/process-order-quantity-shipping.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/ecommerce/www/process-order-quantity-shipping.tcl 18 Sep 2002 21:33:46 -0000 1.7 +++ openacs-4/packages/ecommerce/www/process-order-quantity-shipping.tcl 3 Oct 2002 18:12:09 -0000 1.8 @@ -84,7 +84,7 @@ # Then they probably got here by pushing "Back", so just redirect # them to index.tcl - ad_returnredirect index + rp_internal_redirect index ad_script_abort } @@ -96,7 +96,7 @@ select count(*) from ec_items where order_id = :order_id"] == 0 } { - ad_returnredirect shopping-cart + rp_internal_redirect shopping-cart db_release_unused_handles ad_script_abort } @@ -111,7 +111,7 @@ where order_id = :order_id"] if { $order_owner != $user_id } { - ad_returnredirect checkout + rp_internal_redirect checkout ad_script_abort } @@ -136,7 +136,7 @@ and i.order_id = :order_id group by no_shipping_avail_p"]} { - ad_returnredirect checkout + rp_internal_redirect checkout ad_script_abort } } @@ -284,4 +284,4 @@ where order_id=:order_id" db_release_unused_handles -ad_returnredirect billing +rp_internal_redirect billing Index: openacs-4/packages/ecommerce/www/process-payment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/process-payment.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/process-payment.tcl 18 Sep 2002 21:33:46 -0000 1.4 +++ openacs-4/packages/ecommerce/www/process-payment.tcl 3 Oct 2002 18:12:09 -0000 1.5 @@ -74,7 +74,7 @@ # Then they probably got here by pushing "Back", so just redirect # them to index.tcl - ad_returnredirect index.tcl + rp_internal_redirect index ad_script_abort } @@ -86,7 +86,7 @@ select count(*) from ec_items where order_id=:order_id"] == 0 } { - ad_returnredirect shopping-cart.tcl + rp_internal_redirect shopping-cart ad_script_abort } @@ -99,7 +99,7 @@ from ec_orders where order_id=:order_id"] if { $order_owner != $user_id } { - ad_returnredirect checkout.tcl + rp_internal_redirect checkout ad_script_abort } @@ -137,7 +137,7 @@ from ec_orders where order_id=:order_id"] if { [empty_string_p $shipping_method] } { - ad_returnredirect checkout-2.tcl + rp_internal_redirect checkout-2 ad_script_abort } @@ -228,7 +228,7 @@ # Probably form surgery - ad_returnredirect checkout-2.tcl + rp_internal_redirect checkout-2 ad_script_abort } @@ -240,7 +240,7 @@ # Probably form surgery - ad_returnredirect checkout-2.tcl + rp_internal_redirect checkout-2 ad_script_abort } @@ -307,4 +307,4 @@ } db_release_unused_handles -ad_returnredirect checkout-3.tcl +rp_internal_redirect checkout-3 Index: openacs-4/packages/ecommerce/www/shopping-cart-delete-from.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-delete-from.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/shopping-cart-delete-from.tcl 18 Sep 2002 21:33:46 -0000 1.3 +++ openacs-4/packages/ecommerce/www/shopping-cart-delete-from.tcl 3 Oct 2002 18:12:09 -0000 1.4 @@ -27,11 +27,11 @@ if { [empty_string_p $order_id] } { # then they probably got here by pushing "Back", so just redirect them # into their empty shopping cart - ad_returnredirect shopping-cart + rp_internal_redirect shopping-cart ad_script_abort } db_dml delete_item_from_cart "delete from ec_items where order_id=:order_id and product_id=:product_id and color_choice [ec_decode $color_choice "" "is null" "= :color_choice"] and size_choice [ec_decode $size_choice "" "is null" "= :size_choice"] and style_choice [ec_decode $style_choice "" "is null" "= :style_choice"]" db_release_unused_handles -ad_returnredirect shopping-cart +rp_internal_redirect shopping-cart Index: openacs-4/packages/ecommerce/www/shopping-cart-quantities-change.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-quantities-change.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/shopping-cart-quantities-change.tcl 18 Sep 2002 21:33:46 -0000 1.4 +++ openacs-4/packages/ecommerce/www/shopping-cart-quantities-change.tcl 3 Oct 2002 18:12:09 -0000 1.5 @@ -50,7 +50,7 @@ # so just return them to their empty cart if { [empty_string_p $order_id] } { - ad_returnredirect "shopping-cart" + rp_internal_redirect "shopping-cart" ad_script_abort } @@ -157,7 +157,7 @@ if { [info exists return_url] } { ad_returnredirect $return_url } else { - ad_returnredirect shopping-cart + rp_internal_redirect shopping-cart } Index: openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl 20 Sep 2002 07:07:07 -0000 1.6 +++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl 3 Oct 2002 18:12:09 -0000 1.7 @@ -39,7 +39,7 @@ select count(*) from ec_orders where order_id=:order_id"] } { - ad_returnredirect shopping-cart + rp_internal_redirect shopping-cart ad_script_abort } @@ -69,7 +69,7 @@ where order_id=:order_id and order_state='in_basket' and saved_p='t'"] } { - ad_returnredirect "shopping-cart" + rp_internal_redirect "shopping-cart" ad_script_abort } @@ -205,7 +205,7 @@ } db_release_unused_handles - ad_returnredirect "shopping-cart" + rp_internal_redirect "shopping-cart" ad_script_abort } else { @@ -236,7 +236,7 @@ where user_session_id=:user_session_id and order_state='in_basket'" -default ""] if { [empty_string_p $current_basket] } { - ad_returnredirect shopping-cart + rp_internal_redirect shopping-cart ad_script_abort } db_transaction { @@ -286,7 +286,7 @@ } db_release_unused_handles - ad_returnredirect shopping-cart + rp_internal_redirect shopping-cart ad_script_abort } elseif { $submit == "Replace" } { @@ -302,7 +302,7 @@ where user_session_id=:user_session_id and order_state='in_basket'" -default ""] if { [empty_string_p $current_basket] } { - ad_returnredirect shopping-cart + rp_internal_redirect shopping-cart ad_script_abort } @@ -356,7 +356,7 @@ } db_release_unused_handles - ad_returnredirect shopping-cart + rp_internal_redirect shopping-cart ad_script_abort } elseif { $submit == "Discard" } { if { [info exists discard_confirmed_p] && $discard_confirmed_p == "t" } { @@ -369,7 +369,7 @@ where order_id=:order_id" } - ad_returnredirect "shopping-cart" + rp_internal_redirect "shopping-cart" ad_script_abort } @@ -385,13 +385,13 @@ ad_return_template return } elseif { $submit == "Save it for Later" } { - ad_returnredirect "shopping-cart-retrieve-2" + rp_internal_redirect "shopping-cart-retrieve-2" ad_script_abort } # There shouldn't be any other cases, but log it if there are ns_log Notice "Error: [ec_url]shopping-cart-retrieve-3.tcl was called with an unexpected value of submit: $submit" db_release_unused_handles -ad_returnredirect "shopping-cart" +rp_internal_redirect "shopping-cart" Index: openacs-4/packages/ecommerce/www/thank-you.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/thank-you.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/thank-you.tcl 18 Sep 2002 21:33:46 -0000 1.4 +++ openacs-4/packages/ecommerce/www/thank-you.tcl 3 Oct 2002 18:12:09 -0000 1.5 @@ -48,7 +48,7 @@ and o2.confirmed_date is not null)" -default ""] if { [empty_string_p $order_id] } { - ad_returnredirect index + rp_internal_redirect index ad_stript_abort } Index: openacs-4/packages/ecommerce/www/update-user-classes-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/update-user-classes-2.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/update-user-classes-2.tcl 18 Sep 2002 21:33:46 -0000 1.3 +++ openacs-4/packages/ecommerce/www/update-user-classes-2.tcl 3 Oct 2002 18:12:09 -0000 1.4 @@ -75,4 +75,4 @@ } db_release_unused_handles -ad_returnredirect "account" +rp_internal_redirect "account"