Index: openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl,v diff -u -r1.15 -r1.16 --- openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl 17 Sep 2002 03:41:06 -0000 1.15 +++ openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl 18 Sep 2002 21:33:44 -0000 1.16 @@ -1490,7 +1490,7 @@ ad_set_cookie -replace "t" -path "/" user_session_id $cookie_value ad_returnredirect $final_page - template::adp_abort + ad_script_abort } else { # usca_p has been set, but user id is still 0! So, Index: openacs-4/packages/ecommerce/www/account.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/account.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/account.tcl 17 Sep 2002 03:36:34 -0000 1.4 +++ openacs-4/packages/ecommerce/www/account.tcl 18 Sep 2002 21:33:45 -0000 1.5 @@ -15,7 +15,7 @@ if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } set user_session_id [ec_get_user_session_id] 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.2 -r1.3 --- openacs-4/packages/ecommerce/www/address-2.tcl 15 Sep 2002 01:50:50 -0000 1.2 +++ openacs-4/packages/ecommerce/www/address-2.tcl 18 Sep 2002 21:33:45 -0000 1.3 @@ -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 unless they are ordering a @@ -73,7 +73,7 @@ # them to index.tcl ad_returnredirect index.tcl - return + 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.2 -r1.3 --- openacs-4/packages/ecommerce/www/address-international-2.tcl 15 Sep 2002 01:50:50 -0000 1.2 +++ openacs-4/packages/ecommerce/www/address-international-2.tcl 18 Sep 2002 21:33:45 -0000 1.3 @@ -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 != "" } { Index: openacs-4/packages/ecommerce/www/address-international.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/address-international.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/address-international.tcl 17 Sep 2002 03:36:34 -0000 1.4 +++ openacs-4/packages/ecommerce/www/address-international.tcl 18 Sep 2002 21:33:45 -0000 1.5 @@ -23,7 +23,7 @@ if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # user session tracking Index: openacs-4/packages/ecommerce/www/address.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/address.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/address.tcl 17 Sep 2002 03:36:34 -0000 1.4 +++ openacs-4/packages/ecommerce/www/address.tcl 18 Sep 2002 21:33:45 -0000 1.5 @@ -25,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. @@ -41,6 +41,7 @@ if { ![string equal $country_code "US"] } { ad_returnredirect "address-international?[export_url_vars address_id address_type referer]" + ad_script_abort } if { [info exists usps_abbrev] } { Index: openacs-4/packages/ecommerce/www/billing.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/billing.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/billing.tcl 17 Sep 2002 03:36:34 -0000 1.3 +++ openacs-4/packages/ecommerce/www/billing.tcl 18 Sep 2002 21:33:45 -0000 1.4 @@ -19,7 +19,7 @@ if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # user sessions: @@ -46,7 +46,7 @@ # so just redirect them to index.tcl ad_returnredirect [ec_url]index.tcl - return + ad_script_abort } if { $order_owner != $user_id } { @@ -61,7 +61,7 @@ # or they messed w/their user_session_id cookie; ad_returnredirect [ec_securelink [ec_url]checkout.tcl] - return + ad_script_abort } # make sure there's something in their shopping cart, otherwise @@ -73,7 +73,7 @@ from ec_items where order_id=:order_id"] == 0 } { ad_returnredirect [ec_url]shopping-cart - return + ad_script_abort } # Make sure there is an address for this order, otherwise they've @@ -97,7 +97,7 @@ and i.order_id = :order_id group by no_shipping_avail_p"]} { ad_returnredirect [ec_securelink [ec_url]checkout] - return + 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.4 -r1.5 --- openacs-4/packages/ecommerce/www/category-browse.tcl 17 Sep 2002 03:36:34 -0000 1.4 +++ openacs-4/packages/ecommerce/www/category-browse.tcl 18 Sep 2002 21:33:45 -0000 1.5 @@ -28,6 +28,7 @@ if {![info exists category_id] || ([info exists category_id] && [empty_string_p $category_id])} { ad_returnredirect index + ad_script_abort } proc ident {x} { 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.8 -r1.9 --- openacs-4/packages/ecommerce/www/checkout-2.tcl 17 Sep 2002 03:36:34 -0000 1.8 +++ openacs-4/packages/ecommerce/www/checkout-2.tcl 18 Sep 2002 21:33:45 -0000 1.9 @@ -21,7 +21,7 @@ if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # User sessions: @@ -48,7 +48,7 @@ # so just redirect them to index.tcl ad_returnredirect [ec_url]index.tcl - return + ad_script_abort } if { $order_owner != $user_id } { @@ -62,7 +62,7 @@ # If they get here, either they managed to skip past checkout.tcl, # or they messed w/their user_session_id cookie; ad_returnredirect [ec_securelink [ec_url]checkout.tcl] - return + ad_script_abort } # Make sure there's something in their shopping cart, otherwise @@ -74,7 +74,7 @@ from ec_items where order_id=:order_id"] == 0 } { ad_returnredirect [ec_url]shopping-cart - return + ad_script_abort } # Either address_id should be a form variable, or it should already be @@ -97,7 +97,7 @@ and user_id=:user_id"] if {$n_this_address_id_for_this_user == 0} { ad_returnredirect [ec_securelink [ec_url]checkout] - return + ad_script_abort } # It checks out ok @@ -125,7 +125,7 @@ and i.order_id = :order_id group by no_shipping_avail_p"]} { ad_returnredirect [ec_securelink [ec_url]checkout] - return + 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.4 -r1.5 --- openacs-4/packages/ecommerce/www/checkout-3.tcl 17 Sep 2002 03:36:34 -0000 1.4 +++ openacs-4/packages/ecommerce/www/checkout-3.tcl 18 Sep 2002 21:33:45 -0000 1.5 @@ -33,7 +33,7 @@ if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # Make sure they have an in_basket order, otherwise they've probably @@ -52,7 +52,7 @@ # them to index.tcl ad_returnredirect index - return + ad_script_abort } # Make sure there's something in their shopping cart, otherwise @@ -64,7 +64,7 @@ from ec_items where order_id=:order_id"] == 0 } { ad_returnredirect shopping-cart - return + ad_script_abort } # Make sure the order belongs to this user_id, otherwise they managed @@ -77,7 +77,7 @@ where order_id=:order_id"] if { $order_owner != $user_id } { ad_returnredirect checkout - return + ad_script_abort } # Make sure there is an address for this order, otherwise they've @@ -101,7 +101,7 @@ and i.order_id = :order_id group by no_shipping_avail_p"]} { ad_returnredirect [ec_securelink [ec_url]checkout] - return + ad_script_abort } } @@ -139,7 +139,7 @@ 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 - return + ad_script_abort } # Done with all the checks. Their order is ready to go! Now show Index: openacs-4/packages/ecommerce/www/checkout.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/ecommerce/www/checkout.tcl 17 Sep 2002 03:36:34 -0000 1.8 +++ openacs-4/packages/ecommerce/www/checkout.tcl 18 Sep 2002 21:33:45 -0000 1.9 @@ -33,7 +33,7 @@ # them to index.tcl ad_returnredirect index - template::adp_abort + ad_script_abort } else { db_dml update_ec_order_set_uid " update ec_orders @@ -86,6 +86,7 @@ if { $shipping_required == "false" } { set address_id "" ad_returnredirect "checkout-2?[export_url_vars address_id address_type]" + ad_script_abort } set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Completing Your Order"]]] 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.3 -r1.4 --- openacs-4/packages/ecommerce/www/credit-card-correction-2.tcl 26 May 2002 04:36:50 -0000 1.3 +++ openacs-4/packages/ecommerce/www/credit-card-correction-2.tcl 18 Sep 2002 21:33:45 -0000 1.4 @@ -63,7 +63,7 @@ append exception_text [lindex $additional_count_and_text 1] if { $exception_count > 0 } { ad_return_complaint $exception_count $exception_text - return + ad_script_abort } # Then do all the normal checks to make sure nobody is doing url or @@ -75,7 +75,7 @@ if {$user_id == 0} { set return_url "[ad_conn url]?[export_url_vars creditcard_number creditcard_type creditcard_expire_1 creditcard_expire_2]." ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # Make sure they have an in_basket order unlike previous pages, if @@ -110,7 +110,7 @@ } else { ad_returnredirect thank-you } - return + ad_script_abort } # Make sure there's something in their shopping cart, otherwise @@ -122,7 +122,7 @@ from ec_items where order_id=:order_id"] == 0 } { ad_returnredirect shopping-cart - return + ad_script_abort } # Make sure the order belongs to this user_id, otherwise they managed @@ -135,7 +135,7 @@ where order_id=:order_id"] if { $order_owner != $user_id } { ad_returnredirect checkout - return + ad_script_abort } # Done with all the checks! 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.3 -r1.4 --- openacs-4/packages/ecommerce/www/credit-card-correction.tcl 17 Sep 2002 03:36:34 -0000 1.3 +++ openacs-4/packages/ecommerce/www/credit-card-correction.tcl 18 Sep 2002 21:33:46 -0000 1.4 @@ -36,7 +36,7 @@ if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # Make sure they have an in_basket order @@ -52,7 +52,7 @@ and order_state = 'in_basket'" -default ""] if { [empty_string_p $order_id] } { ad_returnredirect index - return + ad_script_abort } # This isn't necessary for security, but might as well do it anyway, @@ -66,7 +66,7 @@ from ec_items where order_id = :order_id"] == 0 } { ad_returnredirect shopping-cart - return + ad_script_abort } # Make sure the order belongs to this user_id, otherwise they managed @@ -79,7 +79,7 @@ where order_id = :order_id"] if { $order_owner != $user_id } { ad_returnredirect checkout - return + ad_script_abort } # Make sure there is a credit card for this order, otherwise they've @@ -94,7 +94,7 @@ and order_id = :order_id and c.billing_address = a.address_id"] == 0 } { ad_returnredirect checkout-2 - return + ad_script_abort } # Check done. Set the credit card variables 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.3 -r1.4 --- openacs-4/packages/ecommerce/www/finalize-order.tcl 26 May 2002 04:36:50 -0000 1.3 +++ openacs-4/packages/ecommerce/www/finalize-order.tcl 18 Sep 2002 21:33:46 -0000 1.4 @@ -43,7 +43,7 @@ set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" - template::adp_abort + ad_script_abort } # make sure they have an in_basket order @@ -84,7 +84,7 @@ } else { ad_returnredirect thank-you } - template::adp_abort + ad_script_abort } # Make sure there's something in their shopping cart, otherwise @@ -98,7 +98,7 @@ from ec_items where order_id = :order_id"] == 0 } { ad_returnredirect shopping-cart - template::adp_abort + ad_script_abort } # Make sure the order belongs to this user_id, otherwise they managed @@ -111,7 +111,7 @@ where order_id = :order_id"] if { $order_owner != $user_id } { ad_returnredirect checkout - template::adp_abort + ad_script_abort } # Make sure there is an address for this order, otherwise they've @@ -135,7 +135,7 @@ and i.order_id = :order_id group by no_shipping_avail_p"]} { ad_returnredirect [ec_securelink [ec_url]checkout] - return + ad_script_abort } } @@ -172,7 +172,7 @@ 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 - template::adp_abort + ad_script_abort } # Done with all the checks! @@ -284,7 +284,7 @@ if { [string equal $result "authorized"] || [string equal $result "no_recommendation"] } { ad_returnredirect thank-you - template::adp_abort + ad_script_abort } elseif { [string equal $result "failed_authorization"] } { # Updates everything that needs to be updated if a @@ -293,7 +293,7 @@ ec_update_state_to_in_basket $order_id ad_returnredirect credit-card-correction - template::adp_abort + ad_script_abort } else { # Then result is probably "invalid_input". This should never @@ -304,6 +304,7 @@

Sorry

There has been an error in the processing of your credit card information. Please contact [ec_system_owner] to report the error.

" + ad_script_abort } } } else { @@ -406,7 +407,7 @@ ec_update_state_to_in_basket $order_id ad_returnredirect credit-card-correction - template::adp_abort + ad_script_abort } else { # Then result is probably "invalid_input". This should never @@ -565,7 +566,7 @@ ec_update_state_to_in_basket $order_id ad_returnredirect credit-card-correction - template::adp_abort + ad_script_abort } else { # Then result is probably "invalid_input". This should never @@ -633,7 +634,7 @@ if { [string equal $result "authorized"] || [string equal $result "no_recommendation"] } { ad_returnredirect thank-you - template::adp_abort + ad_script_abort } elseif { [string equal $result "failed_authorization"] } { # If the gateway returns no recommendation then @@ -668,7 +669,7 @@ ec_update_state_to_in_basket $order_id ad_returnredirect credit-card-correction - template::adp_abort + ad_script_abort } else { # Then result is probably "invalid_input". This should never @@ -793,7 +794,7 @@ ec_update_state_to_in_basket $order_id ad_returnredirect credit-card-correction - template::adp_abort + ad_script_abort } else { Index: openacs-4/packages/ecommerce/www/gift-certificate-billing.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-billing.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/gift-certificate-billing.tcl 17 Sep 2002 03:36:34 -0000 1.3 +++ openacs-4/packages/ecommerce/www/gift-certificate-billing.tcl 18 Sep 2002 21:33:46 -0000 1.4 @@ -25,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 } # Error checking @@ -81,7 +81,7 @@ if { $exception_count > 0 } { ad_return_complaint $exception_count $exception_text - return + ad_script_abort } set saved_addresses " 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.3 -r1.4 --- openacs-4/packages/ecommerce/www/gift-certificate-claim-2.tcl 17 Sep 2002 03:36:34 -0000 1.3 +++ openacs-4/packages/ecommerce/www/gift-certificate-claim-2.tcl 18 Sep 2002 21:33:46 -0000 1.4 @@ -18,7 +18,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 and a user_session_id; this @@ -28,7 +28,7 @@ set user_session_id [ec_get_user_session_id] if { $user_session_id == 0 } { ad_returnredirect "index" - return + ad_script_abort } set order_id [db_string get_order_id " @@ -38,7 +38,7 @@ and order_state='in_basket'" -default ""] if { [empty_string_p $order_id] } { ad_returnredirect "index" - return + ad_script_abort } # See if there's a gift certificate with that claim check @@ -60,7 +60,7 @@ (problem_id, problem_date, problem_details) values (ec_problem_id_sequence.nextval, sysdate,:prob_details )" - return + ad_script_abort } # There is a gift certificate with that claim check; 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.3 -r1.4 --- openacs-4/packages/ecommerce/www/gift-certificate-claim.tcl 17 Sep 2002 03:36:34 -0000 1.3 +++ openacs-4/packages/ecommerce/www/gift-certificate-claim.tcl 18 Sep 2002 21:33:46 -0000 1.4 @@ -15,7 +15,7 @@ if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # Make sure they have an in_basket order and a user_session_id; this @@ -25,7 +25,7 @@ set user_session_id [ec_get_user_session_id] if { $user_session_id == 0 } { ad_returnredirect "index" - return + ad_script_abort } set order_id [db_string get_order_id_for_claim " @@ -35,7 +35,7 @@ and order_state='in_basket'" -default ""] if { [empty_string_p $order_id] } { ad_returnredirect "index" - return + ad_script_abort } set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Claim a Gift Certificate"]]] 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.5 -r1.6 --- openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.tcl 17 Sep 2002 03:36:34 -0000 1.5 +++ openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.tcl 18 Sep 2002 21:33:46 -0000 1.6 @@ -62,7 +62,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 } # first do all the usual checks @@ -134,12 +134,12 @@ if { $exception_count > 0 } { ad_return_complaint $exception_count $exception_text - return + ad_script_abort } if { [empty_string_p $gift_certificate_id] } { ad_returnredirect "gift-certificate-order-4?[export_entire_form_as_url_vars]" - return + ad_script_abort } # User session tracking @@ -168,7 +168,7 @@ # Present a thank you page ad_returnredirect "gift-certificate-thank-you" - return + ad_script_abort } "failed_authorization" { @@ -452,7 +452,7 @@ # Present a thank-you page. ad_returnredirect "gift-certificate-thank-you" - return + ad_script_abort } "success" { @@ -480,7 +480,7 @@ # Present a thank-you page. ad_returnredirect "gift-certificate-thank-you" - return + ad_script_abort } "not_supported" - Index: openacs-4/packages/ecommerce/www/gift-certificate-order-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order-3.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/gift-certificate-order-3.tcl 17 Sep 2002 03:36:34 -0000 1.4 +++ openacs-4/packages/ecommerce/www/gift-certificate-order-3.tcl 18 Sep 2002 21:33:46 -0000 1.5 @@ -32,7 +32,7 @@ if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } set ec_creditcard_widget [ec_creditcard_widget] Index: openacs-4/packages/ecommerce/www/gift-certificate.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/gift-certificate.tcl 17 Sep 2002 03:36:34 -0000 1.3 +++ openacs-4/packages/ecommerce/www/gift-certificate.tcl 18 Sep 2002 21:33:46 -0000 1.4 @@ -22,7 +22,7 @@ set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } Index: openacs-4/packages/ecommerce/www/mailing-list-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/mailing-list-add-2.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/mailing-list-add-2.tcl 17 Sep 2002 03:36:34 -0000 1.3 +++ openacs-4/packages/ecommerce/www/mailing-list-add-2.tcl 18 Sep 2002 21:33:46 -0000 1.4 @@ -25,7 +25,7 @@ if {$user_id == 0} { set return_url "[ad_conn url]?[export_form_vars category_id subcategory_id subsubcategory_id]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # user session tracking Index: openacs-4/packages/ecommerce/www/mailing-list-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/mailing-list-add.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/mailing-list-add.tcl 17 Sep 2002 03:36:34 -0000 1.3 +++ openacs-4/packages/ecommerce/www/mailing-list-add.tcl 18 Sep 2002 21:33:46 -0000 1.4 @@ -25,7 +25,7 @@ set return_url "[ec_url]mailing-list-add-2?[export_url_vars category_id subcategory_id subsubcategory_id]" if {$user_id == 0} { ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # user session tracking @@ -63,7 +63,7 @@ where subsubcategory_id=:subsubcategory_id"]" } else { ad_return_complaint 1 "You haven't specified which mailing list you want to be added to." - return + ad_script_abort } set register_link "/register?[export_url_vars return_url]" Index: openacs-4/packages/ecommerce/www/mailing-list-remove.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/mailing-list-remove.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/mailing-list-remove.tcl 17 Sep 2002 03:36:34 -0000 1.3 +++ openacs-4/packages/ecommerce/www/mailing-list-remove.tcl 18 Sep 2002 21:33:46 -0000 1.4 @@ -21,7 +21,7 @@ if {$user_id == 0} { set return_url "[ad_conn url]?[export_form_vars category_id subcategory_id subsubcategory_id]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # user session tracking @@ -74,7 +74,7 @@ if { ![info exists mailing_list_name] } { ad_return_complaint 1 "You haven't specified which mailing list you want to be removed from." - return + ad_script_abort } db_dml remove_user_from_mailing_list $delete_string Index: openacs-4/packages/ecommerce/www/order.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/order.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/order.tcl 17 Sep 2002 03:36:34 -0000 1.3 +++ openacs-4/packages/ecommerce/www/order.tcl 18 Sep 2002 21:33:46 -0000 1.4 @@ -22,7 +22,7 @@ if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # user session tracking Index: openacs-4/packages/ecommerce/www/payment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/payment.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/payment.tcl 17 Sep 2002 03:36:34 -0000 1.5 +++ openacs-4/packages/ecommerce/www/payment.tcl 18 Sep 2002 21:33:46 -0000 1.6 @@ -22,7 +22,7 @@ if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # Make sure they have an in_basket order, otherwise they've probably @@ -52,7 +52,7 @@ # so just redirect them to index.tcl ad_returnredirect index - return + ad_script_abort } if { $order_owner != $user_id } { @@ -71,7 +71,7 @@ # redirect them to checkout.tcl ad_returnredirect checkout - return + ad_script_abort } if { [empty_string_p $address_id] } { @@ -87,7 +87,7 @@ and i.order_id = :order_id group by no_shipping_avail_p"]} { ad_returnredirect [ec_securelink [ec_url]checkout] - return + ad_script_abort } } @@ -100,7 +100,7 @@ from ec_items where order_id=:order_id"] == 0 } { ad_returnredirect shopping-cart - return + ad_script_abort } # Everything is ok now; the user has a non-empty in_basket order and 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.6 -r1.7 --- openacs-4/packages/ecommerce/www/process-order-quantity-shipping.tcl 15 Sep 2002 01:50:50 -0000 1.6 +++ openacs-4/packages/ecommerce/www/process-order-quantity-shipping.tcl 18 Sep 2002 21:33:46 -0000 1.7 @@ -42,7 +42,7 @@ } set return_url "process-order-quantity-shipping?[export_url_vars creditcard_id creditcard_number creditcard_type creditcard_expire_1 creditcard_expire_2 address_id shipping_method shipping_gateway tax_exempt_p]" ad_returnredirect "shopping-cart-quantities-change?[export_url_vars return_url]&[eval export_url_vars $fullarraynames]" - return + ad_script_abort } # We need them to be logged in @@ -56,7 +56,7 @@ set return_url "[ad_conn url]" } ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # User sessions: @@ -85,7 +85,7 @@ # them to index.tcl ad_returnredirect index - return + ad_script_abort } # Make sure there's something in their shopping cart, otherwise @@ -98,7 +98,7 @@ where order_id = :order_id"] == 0 } { ad_returnredirect shopping-cart db_release_unused_handles - return + ad_script_abort } # Make sure the order belongs to this user_id, otherwise they managed @@ -112,7 +112,7 @@ if { $order_owner != $user_id } { ad_returnredirect checkout - return + ad_script_abort } # Make sure there is an address for this order, otherwise they've @@ -137,7 +137,7 @@ group by no_shipping_avail_p"]} { ad_returnredirect checkout - return + ad_script_abort } } 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.3 -r1.4 --- openacs-4/packages/ecommerce/www/process-payment.tcl 26 May 2002 04:36:50 -0000 1.3 +++ openacs-4/packages/ecommerce/www/process-payment.tcl 18 Sep 2002 21:33:46 -0000 1.4 @@ -47,7 +47,7 @@ if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # User sessions: @@ -75,7 +75,7 @@ # them to index.tcl ad_returnredirect index.tcl - return + ad_script_abort } # Make sure there's something in their shopping cart, otherwise @@ -87,7 +87,7 @@ from ec_items where order_id=:order_id"] == 0 } { ad_returnredirect shopping-cart.tcl - return + ad_script_abort } # Make sure the order belongs to this user_id, otherwise they managed @@ -100,7 +100,7 @@ where order_id=:order_id"] if { $order_owner != $user_id } { ad_returnredirect checkout.tcl - return + ad_script_abort } # Make sure there is an address for this order, otherwise they've @@ -124,7 +124,7 @@ and i.order_id = :order_id group by no_shipping_avail_p"]} { ad_returnredirect [ec_securelink [ec_url]checkout] - return + ad_script_abort } } @@ -138,7 +138,7 @@ where order_id=:order_id"] if { [empty_string_p $shipping_method] } { ad_returnredirect checkout-2.tcl - return + ad_script_abort } # Now do error checking; It is required that either @@ -170,7 +170,7 @@ # have they entered new credit card info ad_return_complaint 1 "
  • You forgot to specify which credit card you'd like to use." - return + ad_script_abort } else { # Then they are using a new credit card and we just have @@ -207,15 +207,15 @@ if { $exception_count > 0 } { ad_return_complaint $exception_count $exception_text - return + ad_script_abort } # A valid credit card number has been provided and thus a # billing address must exist. if {![info exists billing_address_id] || ([info exists billing_address_id] && [empty_string_p $billing_address_id])} { ad_return_complaint 1 "
  • You forgot to provide your billing address.
    • " - return + ad_script_abort } } } else { @@ -229,7 +229,7 @@ # Probably form surgery ad_returnredirect checkout-2.tcl - return + ad_script_abort } set creditcard_owner [db_string get_cc_owner " @@ -241,15 +241,15 @@ # Probably form surgery ad_returnredirect checkout-2.tcl - return + ad_script_abort } # A valid credit card number has been provided and thus a # billing address must exist. if {![info exists billing_address_id] || ([info exists billing_address_id] && [empty_string_p $billing_address_id])} { ad_return_complaint 1 "
  • You forgot to provide your billing address.
    • " - return + ad_script_abort } } Index: openacs-4/packages/ecommerce/www/review-submit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/review-submit-2.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/review-submit-2.tcl 17 Sep 2002 03:36:34 -0000 1.3 +++ openacs-4/packages/ecommerce/www/review-submit-2.tcl 18 Sep 2002 21:33:46 -0000 1.4 @@ -25,7 +25,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 } set exception_text "" @@ -38,7 +38,7 @@ if { $exception_count > 0 } { ad_return_complaint $exception_count $exception_text - return + ad_script_abort } # user session tracking Index: openacs-4/packages/ecommerce/www/review-submit-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/review-submit-3.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/review-submit-3.tcl 17 Sep 2002 03:36:34 -0000 1.4 +++ openacs-4/packages/ecommerce/www/review-submit-3.tcl 18 Sep 2002 21:33:46 -0000 1.5 @@ -31,7 +31,7 @@ set return_url "[ad_conn url]?[export_url_vars product_id rating one_line_summary user_comment comment_id]" } ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # user session tracking Index: openacs-4/packages/ecommerce/www/review-submit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/review-submit.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/review-submit.tcl 17 Sep 2002 03:36:34 -0000 1.4 +++ openacs-4/packages/ecommerce/www/review-submit.tcl 18 Sep 2002 21:33:46 -0000 1.5 @@ -20,7 +20,7 @@ if {$user_id == 0} { set return_url "[ad_conn url]?[export_url_vars product_id usca_p]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # user session tracking Index: openacs-4/packages/ecommerce/www/select-shipping.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/select-shipping.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/ecommerce/www/select-shipping.tcl 17 Sep 2002 03:36:34 -0000 1.6 +++ openacs-4/packages/ecommerce/www/select-shipping.tcl 18 Sep 2002 21:33:46 -0000 1.7 @@ -24,7 +24,7 @@ if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # user sessions: @@ -51,7 +51,7 @@ # so just redirect them to index.tcl ad_returnredirect [ec_url]index - return + ad_script_abort } if { $order_owner != $user_id } { @@ -66,7 +66,7 @@ # or they messed w/their user_session_id cookie; ad_returnredirect [ec_securelink [ec_url]checkout] - return + ad_script_abort } # make sure there's something in their shopping cart, otherwise @@ -78,7 +78,7 @@ from ec_items where order_id=:order_id"] == 0 } { ad_returnredirect [ec_url]shopping-cart - return + ad_script_abort } db_0or1row shipping_avail " @@ -109,7 +109,7 @@ and user_id=:user_id"] if {$n_this_address_id_for_this_user == 0} { ad_returnredirect [ec_securelink [ec_url]checkout] - return + ad_script_abort } # It checks out ok @@ -130,7 +130,7 @@ if {[info exists no_shipping_avail_p] && [string equal $no_shipping_avail_p "f"]} { ad_returnredirect [ec_securelink [ec_url]checkout] - return + ad_script_abort } } } @@ -255,6 +255,7 @@ # process-order-quantity-shipping so that prices # for items can be inserted into ec_items. ad_returnredirect "[ec_securelink [ec_url]process-order-quantity-shipping]" + # JCD: should this fall through??? } Index: openacs-4/packages/ecommerce/www/shopping-cart-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-add.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/shopping-cart-add.tcl 26 May 2002 04:36:50 -0000 1.4 +++ openacs-4/packages/ecommerce/www/shopping-cart-add.tcl 18 Sep 2002 21:33:46 -0000 1.5 @@ -54,7 +54,7 @@

    Sorry, you have an order for which credit card authorization has not yet taken place. Please wait for the authorization to complete before adding new items to your shopping cart.

    Thank you.

    " - return + ad_script_abort } set order_id [db_string get_order_id " @@ -102,7 +102,7 @@ values (ec_problem_id_sequence.nextval, sysdate,:errormsg)" ad_returnredirect "product?[export_url_vars product_id]" - return + ad_script_abort } } @@ -122,4 +122,4 @@ where not exists (select 1 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.tcl?[export_url_vars product_id] +ad_returnredirect shopping-cart?[export_url_vars product_id] 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.2 -r1.3 --- openacs-4/packages/ecommerce/www/shopping-cart-delete-from.tcl 10 Sep 2002 22:22:37 -0000 1.2 +++ openacs-4/packages/ecommerce/www/shopping-cart-delete-from.tcl 18 Sep 2002 21:33:46 -0000 1.3 @@ -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.tcl - return + ad_returnredirect 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.tcl +ad_returnredirect 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.3 -r1.4 --- openacs-4/packages/ecommerce/www/shopping-cart-quantities-change.tcl 12 Sep 2002 21:49:59 -0000 1.3 +++ openacs-4/packages/ecommerce/www/shopping-cart-quantities-change.tcl 18 Sep 2002 21:33:46 -0000 1.4 @@ -41,7 +41,7 @@ [ec_continue_shopping_options] " - return + ad_script_abort } set order_id [db_string get_order_id "select order_id from ec_orders where order_state='in_basket' and user_session_id=:user_session_id" -default ""] @@ -51,7 +51,7 @@ if { [empty_string_p $order_id] } { ad_returnredirect "shopping-cart" - return + ad_script_abort } db_foreach get_products_w_attribs " Index: openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.tcl 17 Sep 2002 03:36:34 -0000 1.4 +++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.tcl 18 Sep 2002 21:33:46 -0000 1.5 @@ -19,7 +19,7 @@ if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # Cases that have to be dealt with: 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.3 -r1.4 --- openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl 17 Sep 2002 03:36:34 -0000 1.3 +++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl 18 Sep 2002 21:33:46 -0000 1.4 @@ -29,7 +29,7 @@ if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # Make sure order exists (they might have discarded it then pushed @@ -40,7 +40,7 @@ from ec_orders where order_id=:order_id"] } { ad_returnredirect shopping-cart - return + ad_script_abort } # Make sure this order is theirs @@ -60,7 +60,7 @@

    The order you have selected either does not exist or does not belong to you. Please contact [ec_system_owner] if this is incorrect.

    [ec_footer]" - return + ad_script_abort } # Make sure the order is still a "saved shopping basket", otherwise @@ -73,7 +73,7 @@ and order_state='in_basket' and saved_p='t'"] } { ad_returnredirect "shopping-cart" - return + ad_script_abort } # End security checks @@ -138,7 +138,7 @@ set ec_system_owner [ec_system_owner] db_release_unused_handles ad_return_template - return + ad_script_abort } elseif { $submit == "Retrieve" } { # First see if they already have a non-empty shopping basket, in @@ -209,7 +209,7 @@ db_release_unused_handles ad_returnredirect "shopping-cart" - return + ad_script_abort } else { # The hard case, either they can merge their saved order with @@ -223,7 +223,7 @@ set ec_system_owner [ec_system_owner] ad_return_template - return + ad_script_abort } } elseif { $submit == "Merge" } { @@ -240,7 +240,7 @@ and order_state='in_basket'" -default ""] if { [empty_string_p $current_basket] } { ad_returnredirect shopping-cart - return + ad_script_abort } db_transaction { db_dml update_order_basket_pr " @@ -290,7 +290,7 @@ db_release_unused_handles ad_returnredirect shopping-cart - return + ad_script_abort } elseif { $submit == "Replace" } { # Delete the items in the current basket and update the items in @@ -306,7 +306,7 @@ and order_state='in_basket'" -default ""] if { [empty_string_p $current_basket] } { ad_returnredirect shopping-cart - return + ad_script_abort } db_transaction { @@ -360,7 +360,7 @@ db_release_unused_handles ad_returnredirect shopping-cart - return + ad_script_abort } elseif { $submit == "Discard" } { if { [info exists discard_confirmed_p] && $discard_confirmed_p == "t" } { db_transaction { @@ -373,7 +373,7 @@ } ad_returnredirect "shopping-cart" - return + ad_script_abort } # Otherwise I have to give them a confirmation page @@ -386,10 +386,10 @@ set ec_system_owner [ec_system_owner] ad_return_template - return + ad_script_abort } elseif { $submit == "Save it for Later" } { ad_returnredirect "shopping-cart-retrieve-2" - return + ad_script_abort } # There shouldn't be any other cases, but log it if there are Index: openacs-4/packages/ecommerce/www/shopping-cart-retrieve.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-retrieve.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/shopping-cart-retrieve.tcl 17 Sep 2002 03:36:34 -0000 1.3 +++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve.tcl 18 Sep 2002 21:33:46 -0000 1.4 @@ -18,7 +18,7 @@ set return_url "[ec_url]shopping-cart-retrieve-2" if {$user_id == 0} { ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # User session tracking Index: openacs-4/packages/ecommerce/www/shopping-cart-save-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-save-2.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/shopping-cart-save-2.tcl 17 Sep 2002 03:36:34 -0000 1.3 +++ openacs-4/packages/ecommerce/www/shopping-cart-save-2.tcl 18 Sep 2002 21:33:46 -0000 1.4 @@ -13,7 +13,7 @@ if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } set user_session_id [ec_get_user_session_id] @@ -32,7 +32,7 @@

    In Microsoft Internet Explorer 4.0 and later, you can enable cookies from View -> Internet Options -> Advanced -> Security.

    [ec_continue_shopping_options]" - return + ad_script_abort } # Set the user_id of the order so that we'll know who it belongs to Index: openacs-4/packages/ecommerce/www/shopping-cart-save.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-save.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/shopping-cart-save.tcl 17 Sep 2002 03:36:34 -0000 1.3 +++ openacs-4/packages/ecommerce/www/shopping-cart-save.tcl 18 Sep 2002 21:33:46 -0000 1.4 @@ -16,7 +16,7 @@ set return_url "[ec_url]shopping-cart-save-2" if {$user_id == 0} { ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } set user_name [db_string get_full_name " 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.3 -r1.4 --- openacs-4/packages/ecommerce/www/thank-you.tcl 17 Sep 2002 03:36:34 -0000 1.3 +++ openacs-4/packages/ecommerce/www/thank-you.tcl 18 Sep 2002 21:33:46 -0000 1.4 @@ -20,7 +20,7 @@ if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "[ad_conn package_url]register?[export_url_vars return_url]" - template::adp_abort + ad_script_abort } # wtem@olywa.net, 2001-03-21 @@ -49,6 +49,7 @@ if { [empty_string_p $order_id] } { ad_returnredirect index + ad_stript_abort } set order_summary [ec_order_summary_for_customer $order_id $user_id] Index: openacs-4/packages/ecommerce/www/track.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/track.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/ecommerce/www/track.tcl 17 Sep 2002 03:36:34 -0000 1.6 +++ openacs-4/packages/ecommerce/www/track.tcl 18 Sep 2002 21:33:46 -0000 1.7 @@ -17,7 +17,7 @@ if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # user session tracking @@ -33,7 +33,7 @@ where o.order_id = s.order_id and s.shipment_id = :shipment_id"] != $user_id } { ad_return_error "Invalid Order ID" "Invalid Order ID" - return + ad_script_abort } db_1row get_order_info " 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.2 -r1.3 --- openacs-4/packages/ecommerce/www/update-user-classes-2.tcl 26 May 2002 04:36:50 -0000 1.2 +++ openacs-4/packages/ecommerce/www/update-user-classes-2.tcl 18 Sep 2002 21:33:46 -0000 1.3 @@ -19,7 +19,7 @@ if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } set user_session_id [ec_get_user_session_id] Index: openacs-4/packages/ecommerce/www/update-user-classes.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/update-user-classes.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/update-user-classes.tcl 17 Sep 2002 03:36:34 -0000 1.4 +++ openacs-4/packages/ecommerce/www/update-user-classes.tcl 18 Sep 2002 21:33:46 -0000 1.5 @@ -15,7 +15,7 @@ if {$user_id == 0} { set return_url "[ad_conn url]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } set user_session_id [ec_get_user_session_id] Index: openacs-4/packages/ecommerce/www/admin/restore-one-id.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/restore-one-id.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/restore-one-id.tcl 10 Sep 2002 22:22:38 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/restore-one-id.tcl 18 Sep 2002 21:33:47 -0000 1.3 @@ -33,7 +33,7 @@ set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # we have to generate audit information Index: openacs-4/packages/ecommerce/www/admin/cat/category-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/category-add-2.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/cat/category-add-2.tcl 10 Sep 2002 22:22:38 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/cat/category-add-2.tcl 18 Sep 2002 21:33:47 -0000 1.4 @@ -27,7 +27,7 @@ set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # see first whether they already entered this category (in case they @@ -39,7 +39,7 @@ if { [db_0or1row get_category_confirmation "select category_id from ec_categories where category_id=:category_id"]==1} { ad_returnredirect "index" - return + ad_script_abort } # now make sure there's no category with that sort key already @@ -57,7 +57,7 @@ perhaps someone has changed the categories since you last reloaded the page. Please go back to the category page, push \"reload\" or \"refresh\" and try again." - return + ad_script_abort } set peeraddr [ns_conn peeraddr] @@ -67,3 +67,4 @@ (:category_id, :category_name, :sort_key, sysdate, :user_id, :peeraddr)" db_release_unused_handles ad_returnredirect "index" +ad_script_abort Index: openacs-4/packages/ecommerce/www/admin/cat/category-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/category-delete-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/cat/category-delete-2.tcl 10 Sep 2002 22:22:38 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/cat/category-delete-2.tcl 18 Sep 2002 21:33:47 -0000 1.3 @@ -23,7 +23,7 @@ set return_url "[ad_conn url]?[export_url_vars category_name category_id subcategory_id]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # What has to be done (in order, so that no constraints are violated): Index: openacs-4/packages/ecommerce/www/admin/cat/category-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/category-edit.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/cat/category-edit.tcl 10 Sep 2002 22:22:38 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/cat/category-edit.tcl 18 Sep 2002 21:33:47 -0000 1.3 @@ -21,7 +21,7 @@ set return_url "[ad_conn url]?[export_url_vars category_name category_id]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } set address [ns_conn peeraddr] Index: openacs-4/packages/ecommerce/www/admin/cat/subcategory-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subcategory-add-2.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/cat/subcategory-add-2.tcl 10 Sep 2002 22:22:38 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/cat/subcategory-add-2.tcl 18 Sep 2002 21:33:47 -0000 1.4 @@ -32,7 +32,7 @@ set return_url "[ad_conn url]?[export_url_vars category_name category_id subcategory_name subcategory_id]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # see first whether they already entered this subcategory (in case they @@ -44,7 +44,7 @@ if { [db_0or1row sub_id_select "select subcategory_id from ec_subcategories where subcategory_id=:subcategory_id"] == 1} { ad_returnredirect "category?[export_url_vars category_id category_name]" - return + ad_script_abort } # now make sure there's no subcategory in this category with that sort key already @@ -64,7 +64,7 @@ perhaps someone has changed the subcategories since you last reloaded the page. Please go back to the $category_name page, push \"reload\" or \"refresh\" and try again." - return + ad_script_abort } set address [ns_conn peeraddr] db_dml ec_subcat_insert "insert into ec_subcategories @@ -73,11 +73,15 @@ (:category_id, :subcategory_id, :subcategory_name, :sort_key, sysdate, :user_id, :address)" } on_error { - db_release_unused_handles ad_return_complaint 1 "Sorry, we couldn't perform your dml request." - return + ad_script_abort } -db_release_unused_handles - ad_returnredirect "category?[export_url_vars category_id category_name]" + + + + + + + Index: openacs-4/packages/ecommerce/www/admin/cat/subcategory-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subcategory-delete-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/cat/subcategory-delete-2.tcl 10 Sep 2002 22:22:38 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/cat/subcategory-delete-2.tcl 18 Sep 2002 21:33:47 -0000 1.3 @@ -20,7 +20,7 @@ set return_url "[ad_conn url]?[export_url_vars subcategory_id]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # What has to be done (in order, so that no constraints are violated): @@ -75,6 +75,4 @@ } -db_release_unused_handles - ad_returnredirect "index" Index: openacs-4/packages/ecommerce/www/admin/cat/subcategory-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subcategory-edit.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/cat/subcategory-edit.tcl 10 Sep 2002 22:22:38 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/cat/subcategory-edit.tcl 18 Sep 2002 21:33:47 -0000 1.3 @@ -27,7 +27,7 @@ set return_url "[ad_conn url]?[export_url_vars category_name category_id subcategory_id subcategory_name]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } set address [ns_conn peeraddr] Index: openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add-2.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add-2.tcl 10 Sep 2002 22:22:38 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-add-2.tcl 18 Sep 2002 21:33:47 -0000 1.4 @@ -35,7 +35,7 @@ set return_url "[ad_conn url]?[export_url_vars category_name category_id subcategory_name subcategory_id subsubcategory_name subsubcategory_id]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # see first whether they already entered this subsubcategory (in case they @@ -49,7 +49,7 @@ ad_returnredirect "subcategory?[export_url_vars category_id category_name subcategory_id subcategory_name]" - return + ad_script_abort } # now make sure there's no subsubcategory in this subcategory with that sort key already @@ -69,16 +69,17 @@ perhaps someone has changed the subcategories since you last reloaded the page. Please go back to the $subcategory_name page, push \"reload\" or \"refresh\" and try again." - return + ad_script_abort } set address [ns_conn peeraddr] db_dml insert_ec_subsubcat "insert into ec_subsubcategories (subcategory_id, subsubcategory_id, subsubcategory_name, sort_key, last_modified, last_modifying_user, modified_ip_address) values (:subcategory_id, :subsubcategory_id, :subsubcategory_name, :sort_key, sysdate, :user_id,:address)" -db_release_unused_handles ad_returnredirect "subcategory?[export_url_vars category_id category_name subcategory_id subcategory_name]" +ad_script_abort + Index: openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-delete-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-delete-2.tcl 10 Sep 2002 22:22:38 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-delete-2.tcl 18 Sep 2002 21:33:47 -0000 1.3 @@ -30,7 +30,7 @@ set return_url "[ad_conn url]?[export_url_vars category_name category_id subcategory_id subcategory_name subsubcategory_id]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # What has to be done (in order, so that no constraints are violated): @@ -59,6 +59,5 @@ ec_audit_delete_row [list $subsubcategory_id] [list subsubcategory_id] ec_subsubcategories_audit } -db_release_unused_handles ad_returnredirect "subcategory?[export_url_vars subcategory_id subcategory_name category_id category_name]" Index: openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-edit.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-edit.tcl 10 Sep 2002 22:22:38 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/cat/subsubcategory-edit.tcl 18 Sep 2002 21:33:47 -0000 1.3 @@ -31,7 +31,7 @@ set return_url "[ad_conn url]?[export_url_vars category_name category_id subcategory_id subcategory_name]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } @@ -42,6 +42,5 @@ last_modifying_user=:user_id, modified_ip_address=:address where subsubcategory_id=:subsubcategory_id" -db_release_unused_handles ad_returnredirect "subsubcategory?[export_url_vars category_id category_name subcategory_id subcategory_name subsubcategory_id subsubcategory_name]" Index: openacs-4/packages/ecommerce/www/admin/customer-reviews/approval-change.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-reviews/approval-change.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/customer-reviews/approval-change.tcl 10 Sep 2002 22:22:40 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/customer-reviews/approval-change.tcl 18 Sep 2002 21:33:48 -0000 1.3 @@ -19,7 +19,7 @@ set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } @@ -30,6 +30,7 @@ modified_ip_address = '[ns_conn peeraddr]' where comment_id=:comment_id"} errMsg] } { ad_return_complaint 1 "Failed to update the comments approval, suspect invalid comment_id" + ad_script_abort } db_release_unused_handles Index: openacs-4/packages/ecommerce/www/admin/customer-service/email-send-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/email-send-2.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/admin/customer-service/email-send-2.tcl 10 Sep 2002 22:22:40 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/customer-service/email-send-2.tcl 18 Sep 2002 21:33:49 -0000 1.5 @@ -37,7 +37,7 @@ if { [db_string check_csa_doubleclick "select count(*) from ec_customer_service_actions where action_id=:action_id"] > 0 } { ad_returnredirect "issue.tcl?[export_url_vars issue_id]" - return + ad_script_abort } # 1. create interaction Index: openacs-4/packages/ecommerce/www/admin/customer-service/email-send.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/email-send.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/admin/customer-service/email-send.tcl 10 Sep 2002 22:22:40 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/customer-service/email-send.tcl 18 Sep 2002 21:33:49 -0000 1.6 @@ -22,7 +22,7 @@ if {$customer_service_rep == 0} { ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } @@ -59,7 +59,7 @@ [ad_admin_footer] " doc_return 200 text/html $doc_body - return + ad_script_abort } Index: openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-add-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-add-2.tcl 10 Sep 2002 22:22:40 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-add-2.tcl 18 Sep 2002 21:33:49 -0000 1.3 @@ -27,7 +27,7 @@ if {$customer_service_rep == 0} { set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } Index: openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-edit.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-edit.tcl 10 Sep 2002 22:22:40 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-edit.tcl 18 Sep 2002 21:33:49 -0000 1.3 @@ -21,7 +21,7 @@ if {$customer_service_rep == 0} { ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } Index: openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-void-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-void-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-void-2.tcl 10 Sep 2002 22:22:40 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-void-2.tcl 18 Sep 2002 21:33:49 -0000 1.3 @@ -20,7 +20,7 @@ if {$customer_service_rep == 0} { set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } Index: openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-void.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-void.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-void.tcl 10 Sep 2002 22:22:40 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/customer-service/gift-certificate-void.tcl 18 Sep 2002 21:33:49 -0000 1.3 @@ -17,7 +17,7 @@ if {$customer_service_rep == 0} { set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } Index: openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-2.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-2.tcl 10 Sep 2002 22:22:40 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-2.tcl 18 Sep 2002 21:33:49 -0000 1.5 @@ -74,7 +74,7 @@ if {$customer_service_rep == 0} { set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } if { ![info exists interaction_id] } { @@ -95,7 +95,7 @@ if { $exception_count > 0 } { ad_return_complaint $exception_count $exception_text - return + ad_script_abort } # done error checking Index: openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3.tcl 10 Sep 2002 22:22:40 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3.tcl 18 Sep 2002 21:33:49 -0000 1.5 @@ -74,7 +74,7 @@ set insert_id 1 ad_returnredirect "interaction-add-2.tcl?[export_url_vars interaction_id interaction_type postal_code c_user_identification_id insert_id interaction_originator]" } - return + ad_script_abort } # the customer service rep must be logged on @@ -84,7 +84,7 @@ if {$customer_service_rep == 0} { set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } # error checking @@ -118,7 +118,7 @@ if { $exception_count > 0 } { ad_return_complaint $exception_count $exception_text - return + ad_script_abort } # now for the painful checks @@ -139,7 +139,7 @@ and i.issue_id=:issue_id"]==0 } { ad_return_complaint 1 "
  • The issue ID that you specified is invalid. Please go back and check the issue ID you entered. If this is a new issue, please leave the issue ID blank.\n" - return + ad_script_abort } @@ -174,7 +174,7 @@ [ad_admin_footer] " - return + ad_script_abort } } elseif { ![info exists d_user_identification_id] || [string compare $d_user_identification_id $issue_user_identification_id] != 0 } { # if d_user_identification_id doesn't match the issue's user_identification_id, give @@ -206,7 +206,7 @@ [ad_admin_footer] " - return + ad_script_abort } } else { @@ -224,10 +224,10 @@ if { [empty_string_p $c_user_id] } { ad_return_complaint 1 "The issue ID you specified belongs to the registered user [db_string get_full_name "select first_names || ' ' || last_name from cc_users where user_id=:issue_user_id"]. However, you haven't associated this interaction with any registered user. You've associated it with the unregistered user [ec_user_identification_summary $c_user_identification_id]. If these are really the same user, match them up by clicking on the \"user info\" link and then you can reload this page without getting this error message." - return + ad_script_abort } elseif { [string compare $c_user_id $issue_user_id] != 0 } { ad_return_complaint 1 "The issue ID you specified does not belong to the user you specified." - return + ad_script_abort } } } @@ -239,7 +239,7 @@ set row_exists_p [db_0or1row get_order_owner "select user_id as order_user_id from ec_orders where order_id=:order_id"] if { $row_exists_p==0 } { ad_return_complaint 1 "
  • The order ID that you specified is invalid. Please go back and check the order ID you entered. If this issue is not about a specific order, please leave the order ID blank.\n" - return + ad_script_abort } @@ -274,7 +274,7 @@ [ad_admin_footer] " - return + ad_script_abort } } else { # interaction_id exists @@ -286,10 +286,10 @@ if { [empty_string_p $c_user_id] } { ad_return_complaint 1 "The order ID you specified belongs to the registered user [db_stringget_user_full_name "select first_names || ' ' || last_name from cc_users where user_id=:order_user_id"]. However, you haven't associated this interaction with any registered user. You've associated it with the unregistered user [ec_user_identification_summary $c_user_identification_id]. If these are really the same user, match them up by clicking on the \"user info\" link and then you can reload this page without getting this error message." - return + ad_script_abort } elseif { [string compare $c_user_id $order_user_id] != 0 } { ad_return_complaint 1 "The order ID you specified does not belong to the user you specified." - return + ad_script_abort } } @@ -446,7 +446,7 @@ } } -db_release_unused_handles + if { $submit == "Interaction Complete" } { if { ![info exists return_to_issue] } { ad_returnredirect interaction-add Index: openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add.tcl 10 Sep 2002 22:22:40 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add.tcl 18 Sep 2002 21:33:49 -0000 1.3 @@ -23,7 +23,7 @@ if {$customer_service_rep == 0} { ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } if { [info exists issue_id] } { Index: openacs-4/packages/ecommerce/www/admin/customer-service/issue-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/issue-edit.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/customer-service/issue-edit.tcl 10 Sep 2002 22:22:40 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/customer-service/issue-edit.tcl 18 Sep 2002 21:33:49 -0000 1.4 @@ -19,7 +19,7 @@ if {$customer_service_rep == 0} { ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } set page_title "Edit Issue #$issue_id" Index: openacs-4/packages/ecommerce/www/admin/customer-service/issue-open-or-close.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/issue-open-or-close.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/customer-service/issue-open-or-close.tcl 10 Sep 2002 22:22:40 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/customer-service/issue-open-or-close.tcl 18 Sep 2002 21:33:49 -0000 1.3 @@ -20,7 +20,7 @@ if {$customer_service_rep == 0} { ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } Index: openacs-4/packages/ecommerce/www/admin/customer-service/issue.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/issue.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/customer-service/issue.tcl 10 Sep 2002 22:22:40 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/customer-service/issue.tcl 18 Sep 2002 21:33:49 -0000 1.3 @@ -19,7 +19,7 @@ if {$customer_service_rep == 0} { ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } Index: openacs-4/packages/ecommerce/www/admin/customer-service/picklist-item-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/picklist-item-add-2.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/customer-service/picklist-item-add-2.tcl 10 Sep 2002 22:22:40 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/customer-service/picklist-item-add-2.tcl 18 Sep 2002 21:33:49 -0000 1.4 @@ -29,7 +29,7 @@ set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register?[export_url_vars return_url]" - return + ad_script_abort } # see first whether they already entered this category (in case they @@ -41,7 +41,7 @@ if { [db_0or1row get_picklist_item_id "select picklist_item_id from ec_picklist_items where picklist_item_id=:picklist_item_id"] == 1 } { ad_returnredirect "picklists" - return + ad_script_abort } # now make sure that there is no picklist_item with the @@ -60,7 +60,7 @@ last reloaded the page. Please go back to the picklist management page, push \"reload\" or \"refresh\" and try again." - return + ad_script_abort } set address [ns_conn peeraddr] db_dml insert_new_picklist_item "insert into ec_picklist_items Index: openacs-4/packages/ecommerce/www/admin/customer-service/spam-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/spam-2.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/admin/customer-service/spam-2.tcl 10 Sep 2002 22:22:41 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/customer-service/spam-2.tcl 18 Sep 2002 21:33:49 -0000 1.6 @@ -35,7 +35,7 @@ if {$customer_service_rep == 0} { ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } append doc_body "[ad_admin_header "Spam Users, Cont."] @@ -93,7 +93,7 @@ set start "" set end "" ad_return_complaint 1 "
  • I could not determine who you wanted to spam. Please go back and make a selection." - return + ad_script_abort } Index: openacs-4/packages/ecommerce/www/admin/customer-service/spam-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/spam-3.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/admin/customer-service/spam-3.tcl 26 May 2002 04:36:50 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/customer-service/spam-3.tcl 18 Sep 2002 21:33:49 -0000 1.5 @@ -66,14 +66,14 @@

    You are seeing this page because you probably either hit reload or pushed the Submit button twice.

    If you wonder whether the users got the spam, just check the customer service issues for one of the users (all mail sent to a user is recorded as a customer service issue).

    [ad_admin_footer]" - return + ad_script_abort } set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" set customer_service_rep [ad_get_user_id] if {$customer_service_rep == 0} { ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } # 1. Write row to spam log Index: openacs-4/packages/ecommerce/www/admin/customer-service/spam.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/spam.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/customer-service/spam.tcl 10 Sep 2002 22:22:41 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/customer-service/spam.tcl 18 Sep 2002 21:33:49 -0000 1.4 @@ -16,7 +16,7 @@ if {$customer_service_rep == 0} { ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } # this proc uses uplevel and assumes the existence of Index: openacs-4/packages/ecommerce/www/admin/customer-service/user-identification.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/user-identification.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/customer-service/user-identification.tcl 10 Sep 2002 22:22:41 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/customer-service/user-identification.tcl 18 Sep 2002 21:33:49 -0000 1.4 @@ -17,7 +17,7 @@ if { ![empty_string_p $user_id] } { ad_returnredirect "[ec_acs_admin_url]users/one.tcl?user_id=$user_id" - return + ad_script_abort } Index: openacs-4/packages/ecommerce/www/admin/email-templates/add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/email-templates/add-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/email-templates/add-2.tcl 10 Sep 2002 22:22:42 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/email-templates/add-2.tcl 18 Sep 2002 21:33:50 -0000 1.3 @@ -26,7 +26,7 @@ set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } # check the entered ADP for functions @@ -36,7 +36,7 @@

    We're sorry, but templates added here cannot have functions in them for security reasons. Only HTML and <%= \$variable %> style code may be used. We found $function in this template" - + ad_script_abort } @@ -49,6 +49,7 @@ values (ec_email_template_id_sequence.nextval, :title, :subject, :message, :variables, :when_sent, :issue_type, sysdate, :user_id, '[DoubleApos [ns_conn peeraddr]]')"} errMsg] } { ad_return_complaint 1 "Failed to add the email template, Suspect double click/ template already created" + ad_script_abort } db_release_unused_handles Index: openacs-4/packages/ecommerce/www/admin/email-templates/edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/email-templates/edit-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/email-templates/edit-2.tcl 10 Sep 2002 22:22:42 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/email-templates/edit-2.tcl 18 Sep 2002 21:33:50 -0000 1.3 @@ -32,7 +32,7 @@ set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } set f [ec_adp_function_p $message] Index: openacs-4/packages/ecommerce/www/admin/mailing-lists/member-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/mailing-lists/member-add-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/mailing-lists/member-add-2.tcl 10 Sep 2002 22:22:42 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/mailing-lists/member-add-2.tcl 18 Sep 2002 21:33:51 -0000 1.3 @@ -27,7 +27,7 @@ set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } Index: openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.tcl 26 May 2002 04:36:50 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/orders/fulfill-3.tcl 18 Sep 2002 21:33:52 -0000 1.5 @@ -53,7 +53,7 @@ from ec_shipments where shipment_id=:shipment_id"] > 0 } { ad_returnredirect "fulfillment" - return + ad_script_abort } set shipping_method [db_string shipping_method_select " @@ -284,7 +284,7 @@

    Warning: the credit card authorization for this shipment (shipment_id $shipment_id) of order_id $order_id failed.

    You may wish to abort the shipment (if possible) until this is issue is resolved. A note has been made in the problems log.

    Continue with order fulfillment.

    " - return + ad_script_abort } if {[string equal $result "failed_p"]} { db_dml transaction_failed_update " Index: openacs-4/packages/ecommerce/www/admin/orders/items-add-4.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/items-add-4.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/orders/items-add-4.tcl 26 May 2002 04:36:50 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/orders/items-add-4.tcl 18 Sep 2002 21:33:52 -0000 1.4 @@ -28,7 +28,7 @@ from ec_items where item_id = :item_id"] > 0 } { ad_returnredirect "one?[export_url_vars order_id]" - return + ad_script_abort } # Must have associated credit card @@ -40,7 +40,7 @@ ad_return_error "Unable to add items to this order." "

    This order does not have an associated credit card, so new items cannot be added.

    Please create a new order instead.

    " - return + ad_script_abort } set shipping_method [db_string shipping_method_select " Index: openacs-4/packages/ecommerce/www/admin/orders/items-return-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/items-return-2.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/ecommerce/www/admin/orders/items-return-2.tcl 10 Sep 2002 22:22:43 -0000 1.5 +++ openacs-4/packages/ecommerce/www/admin/orders/items-return-2.tcl 18 Sep 2002 21:33:52 -0000 1.6 @@ -31,7 +31,7 @@ if {$customer_service_rep == 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 haven't already inserted this refund @@ -42,7 +42,7 @@ where refund_id=:refund_id"] > 0 } { ad_return_complaint 1 "
  • This refund has already been inserted into the database. Are you using an old form? Return to the order." - return + ad_script_abort } set exception_count 0 @@ -63,7 +63,7 @@ if { $exception_count > 0 } { ad_return_complaint 1 $exception_text - return + ad_script_abort } append doc_body " Index: openacs-4/packages/ecommerce/www/admin/problems/resolve-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/problems/resolve-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/problems/resolve-2.tcl 10 Sep 2002 22:22:44 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/problems/resolve-2.tcl 18 Sep 2002 21:33:52 -0000 1.3 @@ -20,7 +20,7 @@ set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } Index: openacs-4/packages/ecommerce/www/admin/products/add-4.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/add-4.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/ecommerce/www/admin/products/add-4.tcl 10 Sep 2002 22:22:45 -0000 1.4 +++ openacs-4/packages/ecommerce/www/admin/products/add-4.tcl 18 Sep 2002 21:33:53 -0000 1.5 @@ -55,7 +55,7 @@ # make sure this product isn't already in the database (implying they pushed reload) if { [db_string doubleclick_select "select count(*) from ec_products where product_id=:product_id"] > 0 } { ad_returnredirect "one?[export_url_vars product_id]" - return + ad_script_abort } set user_class_id_list [db_list user_class_select "select user_class_id from ec_user_classes"] Index: openacs-4/packages/ecommerce/www/admin/products/custom-field-add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/custom-field-add-3.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/admin/products/custom-field-add-3.tcl 26 May 2002 04:36:50 -0000 1.3 +++ openacs-4/packages/ecommerce/www/admin/products/custom-field-add-3.tcl 18 Sep 2002 21:33:53 -0000 1.4 @@ -40,6 +40,7 @@ # custom-fields.tcl ad_returnredirect "custom-fields" + ad_script_abort } if { [catch { db_dml custom_field_insert " @@ -50,7 +51,7 @@ ad_return_error "Unable to Add Field" "

    Sorry, we were unable to add the field you requested.

    Here's the error message: 

    $errmsg

    " - return + ad_script_abort } # Have to alter ec_custom_product_field_values, the corresponding @@ -72,7 +73,7 @@

    The error occurred when adding the column $field_identifier to ec_custom_product_field_values, so we've deleted the row containing $field_identifier from ec_custom_product_fields as well (for consistency).

    Here's the error message: 

    $errmsg

    " - return + ad_script_abort } if {[catch {db_dml alter_ec_custom_field_values_audit_table " @@ -96,7 +97,7 @@ so we've dropped that column from ec_custom_product_field_values and we've deleted the row containing $field_identifier from ec_custom_product_fields as well (for consistency).

    Here's the error message: 

    $errmsg

    " - return + ad_script_abort } # Determine what the new trigger should be Index: openacs-4/packages/ecommerce/www/admin/products/custom-field-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/custom-field-edit-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/products/custom-field-edit-2.tcl 26 May 2002 04:36:50 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/products/custom-field-edit-2.tcl 18 Sep 2002 21:33:53 -0000 1.3 @@ -30,7 +30,7 @@ if { $old_column_type != "char(1)" && $column_type == "char(1)"} { ad_return_complaint 1 "
  • The Kind of Information cannot be changed from non-boolean to boolean.
    • " - return + ad_script_abort } if {[catch { @@ -54,7 +54,7 @@ } } errmsg]} { ad_return_complaint 1 "
  • The modification of Kind of Information failed. Here is the error message that the database gave us:
    $errmsg
    • " - return + ad_script_abort } set peeraddr [ns_conn peeraddr] Index: openacs-4/packages/ecommerce/www/admin/products/delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/delete-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/products/delete-2.tcl 10 Sep 2002 22:22:45 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/products/delete-2.tcl 18 Sep 2002 21:33:53 -0000 1.3 @@ -40,7 +40,7 @@ if { [db_string order_count_select "select count(*) from ec_items where product_id=:product_id"] > 0 } { doc_return 200 text/html "[ad_admin_header "Sorry"]\nSorry, you cannot delete a product for which an order has already been made. Instead, you can Mark It Inactive, which will make it no longer show up in the consumer pages." - return + ad_script_abort } db_transaction { Index: openacs-4/packages/ecommerce/www/admin/products/offer-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/offer-add-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/products/offer-add-2.tcl 10 Sep 2002 22:22:45 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/products/offer-add-2.tcl 18 Sep 2002 21:33:53 -0000 1.3 @@ -32,7 +32,7 @@ if { [db_string doubleclick_select "select count(*) from ec_offers where offer_id=:offer_id"] > 0 } { ad_returnredirect "offers.tcl?[export_url_vars product_id]" - return + ad_script_abort } if { [info exists shipping_unavailable_p] } { Index: openacs-4/packages/ecommerce/www/admin/products/recommendation-add-4.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/recommendation-add-4.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/products/recommendation-add-4.tcl 10 Sep 2002 22:22:45 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/products/recommendation-add-4.tcl 18 Sep 2002 21:33:53 -0000 1.3 @@ -38,7 +38,7 @@ if { $n_occurrences > 0 } { ad_returnredirect "recommendations.tcl" - return + ad_script_abort } set peeraddr [ns_conn peeraddr] Index: openacs-4/packages/ecommerce/www/admin/products/review-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/review-add-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/products/review-add-2.tcl 10 Sep 2002 22:22:45 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/products/review-add-2.tcl 18 Sep 2002 21:33:53 -0000 1.3 @@ -24,7 +24,7 @@ # see if this review is already there if { [db_string doubleclick_select "select count(*) from ec_product_reviews where review_id=:review_id"] > 0 } { ad_returnredirect "reviews.tcl?[export_url_vars product_id]" - return + ad_script_abort } set peeraddr [ns_conn peeraddr] Index: openacs-4/packages/ecommerce/www/admin/products/sale-price-edit-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/sale-price-edit-3.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/products/sale-price-edit-3.tcl 26 May 2002 04:36:50 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/products/sale-price-edit-3.tcl 18 Sep 2002 21:33:53 -0000 1.3 @@ -24,11 +24,11 @@ if {![regexp {^[0-9|.]+$} $sale_price match ] } { ad_return_complaint 1 "
  • Please enter a number for sale price.
    • " - return + ad_script_abort } if {[regexp {^[.]$} $sale_price match ]} { ad_return_complaint 1 "
  • Please enter a number for the sale price.
  • " - return + ad_script_abort } # We need them to be logged in Index: openacs-4/packages/ecommerce/www/admin/products/subsubcategory-property-toggle.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/subsubcategory-property-toggle.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/products/subsubcategory-property-toggle.tcl 10 Sep 2002 22:22:45 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/products/subsubcategory-property-toggle.tcl 18 Sep 2002 21:33:53 -0000 1.3 @@ -33,6 +33,7 @@ if { ![info exists thing_to_update] } { ad_return_complaint 1 "
  • No column to update has been specified.\n" + ad_script_abort } Index: openacs-4/packages/ecommerce/www/admin/retailers/add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/retailers/add-3.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/retailers/add-3.tcl 10 Sep 2002 22:22:46 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/retailers/add-3.tcl 18 Sep 2002 21:33:54 -0000 1.3 @@ -43,7 +43,7 @@ set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } Index: openacs-4/packages/ecommerce/www/admin/retailers/edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/retailers/edit-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/retailers/edit-2.tcl 10 Sep 2002 22:22:46 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/retailers/edit-2.tcl 18 Sep 2002 21:33:54 -0000 1.3 @@ -67,7 +67,7 @@ set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } set audit_update "last_modified=sysdate, last_modifying_user=:user_id, modified_ip_address='[DoubleApos [ns_conn peeraddr]]'" Index: openacs-4/packages/ecommerce/www/admin/sales-tax/edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/sales-tax/edit-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/sales-tax/edit-2.tcl 10 Sep 2002 22:22:48 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/sales-tax/edit-2.tcl 18 Sep 2002 21:33:55 -0000 1.3 @@ -21,7 +21,7 @@ set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } @@ -54,6 +54,7 @@ if { $exception_count > 0 } { ad_return_complaint $exception_count $exception_text + ad_script_abort } set old_states_with_taxes_set [db_list unused "select usps_abbrev from ec_sales_tax_by_state"] Index: openacs-4/packages/ecommerce/www/admin/templates/add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/templates/add-3.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/templates/add-3.tcl 10 Sep 2002 22:22:50 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/templates/add-3.tcl 18 Sep 2002 21:33:56 -0000 1.3 @@ -25,8 +25,8 @@ set return_url "[ad_conn url]?[export_url_vars template_id template_name template]" - ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_returnredirect "/register?[export_url_vars return_url]" + ad_script_abort } set exception_count 0 @@ -44,15 +44,15 @@ if { $exception_count > 0 } { ad_return_complaint $exception_count $exception_text - return + ad_script_abort } # see if the template's already in there, which means they pushed reload if { [db_string get_dclick_temp "select count(*) from ec_templates where template_id=:template_id"] > 0 } { - ad_returnredirect index.tcl - return + ad_returnredirect index + ad_script_abort } db_dml insert_new_template "insert into ec_templates @@ -61,4 +61,4 @@ (:template_id, :template_name, :template, sysdate, :user_id, '[DoubleApos [ns_conn peeraddr]]')" db_release_unused_handles -ad_returnredirect index.tcl +ad_returnredirect index Index: openacs-4/packages/ecommerce/www/admin/templates/category-associate-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/templates/category-associate-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/templates/category-associate-2.tcl 10 Sep 2002 22:22:50 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/templates/category-associate-2.tcl 18 Sep 2002 21:33:56 -0000 1.3 @@ -31,15 +31,15 @@ db_dml insert_cat_temp_map "insert into ec_category_template_map (category_id, template_id) values (:category_id, :template_id)" - ad_returnredirect "index.tcl" - return + ad_returnredirect "index" + ad_script_abort } elseif { [info exists confirmed] && $confirmed == "yes" } { # then the user has confirmed that they want to overwrite old mapping db_dml update_cat_temp_map "update ec_category_template_map set template_id=:template_id where category_id=:category_id" - ad_returnredirect "index.tcl" - return + ad_returnredirect "index" + ad_script_abort } # to get old_template Index: openacs-4/packages/ecommerce/www/admin/templates/delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/templates/delete-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/templates/delete-2.tcl 10 Sep 2002 22:22:50 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/templates/delete-2.tcl 18 Sep 2002 21:33:56 -0000 1.3 @@ -27,7 +27,7 @@ If you want to delete this template, you can do so by first setting a different template to be the default template. (To do this, go to a different template and click \"Make this template be the default template\".)" - return + ad_script_abort } set user_id [ad_verify_and_get_user_id] @@ -36,8 +36,8 @@ set return_url "[ad_conn url]?[export_url_vars template_id]" - ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_returnredirect "/register?[export_url_vars return_url]" + ad_script_abort } @@ -55,5 +55,5 @@ } db_release_unused_handles -ad_returnredirect index.tcl +ad_returnredirect index Index: openacs-4/packages/ecommerce/www/admin/templates/edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/templates/edit-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/templates/edit-2.tcl 10 Sep 2002 22:22:50 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/templates/edit-2.tcl 18 Sep 2002 21:33:56 -0000 1.3 @@ -25,12 +25,12 @@ have functions in them for security reasons. Only HTML and <%= \$variable %> style code may be used. This template appears to contain $f." - return + ad_script_abort } db_dml update_ec_templates "update ec_templates set template_name=:template_name, template=:template where template_id=:template_id" db_release_unused_handles -ad_returnredirect index.tcl +ad_returnredirect index Index: openacs-4/packages/ecommerce/www/admin/templates/make-default-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/templates/make-default-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/templates/make-default-2.tcl 10 Sep 2002 22:22:50 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/templates/make-default-2.tcl 18 Sep 2002 21:33:56 -0000 1.3 @@ -13,8 +13,8 @@ if [catch { db_dml update_set_default_template "update ec_admin_settings set default_template = :template_id" } errmsg] { ad_return_complaint 1 "
  • We couldn't change this to be the default template. Here is the error message that Oracle gave us:
    $errmsg
    " - return + ad_script_abort } db_release_unused_handles -ad_returnredirect index.tcl \ No newline at end of file +ad_returnredirect index \ No newline at end of file Index: openacs-4/packages/ecommerce/www/admin/tools/form-custom.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/tools/Attic/form-custom.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/tools/form-custom.tcl 10 Jul 2002 11:57:19 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/tools/form-custom.tcl 18 Sep 2002 21:33:56 -0000 1.3 @@ -22,17 +22,17 @@ where user_id = $user_id and item = $DBQitem and item_group = $DBQitem_group and item_type = $DBQitem_type"} errmsg]} { ad_return_complaint 1 "
  • I was unable to delete the defaults. The database said 
    $errmsg
    \n" - return + ad_script_abort } - ns_returnredirect "$return_url" - return + ad_returnredirect "$return_url" + ad_script_abort } if {[empty_string_p $item]} { ad_return_complaint 1 "
  • You did not specify a name for this default set." - return + ad_script_abort } set form [ns_getform] @@ -45,7 +45,7 @@ if {[empty_string_p $data]} { ad_return_complaint 1 "
  • You did not specify any default data." - return + ad_script_abort } util_dbq {item item_original item_type value_type item_group} @@ -59,7 +59,7 @@ returning value into :1" $data } { ad_return_complaint 1 "
  • I was unable to insert your defaults. The database said 
    $errmsg
    \n" - return + ad_script_abort } -ns_returnredirect "$return_url" +ad_returnredirect "$return_url" Index: openacs-4/packages/ecommerce/www/admin/tools/sort-custom.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/tools/Attic/sort-custom.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/tools/sort-custom.tcl 10 Jul 2002 11:57:19 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/tools/sort-custom.tcl 18 Sep 2002 21:33:56 -0000 1.3 @@ -3,7 +3,7 @@ # Takes the data generated from ad_table_sort_form function # and inserts into the user_custom table # -# on succes it does an ns_returnredirect to return_url&$item_group=$item +# on succes it does an ad_returnredirect to return_url&$item_group=$item # # davis@xarg.net 20000105 @@ -23,15 +23,15 @@ ad_return_complaint 1 "
  • I was unable to delete the sort. The database said 
    $errmsg
    \n" return } - ns_returnredirect "$return_url" - return + ad_returnredirect "$return_url" + ad_script_abort } if {[empty_string_p $item]} { ad_return_complaint 1 "
  • You did not specify a name for this sort" - return + ad_script_abort } @@ -50,7 +50,7 @@ if {[empty_string_p $col_clean]} { ad_return_complaint 1 "
  • You did not specify any columns to sort by" - return + ad_script_abort } set col_clean [join $col_clean ","] @@ -66,8 +66,8 @@ returning value into :1" $col_clean } { ad_return_complaint 1 "
  • I was unable to insert your table customizations. The database said 
    $errmsg
    \n" - return + ad_script_abort } -ns_returnredirect "$return_url&$item_group=[ns_urlencode $item]" +ad_returnredirect "$return_url&$item_group=[ns_urlencode $item]" Index: openacs-4/packages/ecommerce/www/admin/tools/spell.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/tools/spell.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/ecommerce/www/admin/tools/spell.tcl 26 Aug 2001 23:37:59 -0000 1.1 +++ openacs-4/packages/ecommerce/www/admin/tools/spell.tcl 18 Sep 2002 21:33:56 -0000 1.2 @@ -98,12 +98,12 @@ ns_unlink $tmpfile if { $try == $max_retry } { - ns_return 200 text/html "[ad_header "Spell Checker Error"] + doc_return 200 text/html "[ad_header "Spell Checker Error"]

    Spell Checker Error

    The spell checker was unable to process your document. Please hit \"Reload\" to try again If this message occurs again, please contact [ad_system_owner]. [ad_footer]" - return + ad_script_abort } set ispell_lines [split $ispell_text "\n"] @@ -255,7 +255,7 @@ # set merge_text [ns_urlencode $merge_text] -# ns_returnredirect "$target_url?$var_to_spellcheck=$merge_text&[export_url_vars $form]" +# ad_returnredirect "$target_url?$var_to_spellcheck=$merge_text&[export_url_vars $form]" ReturnHeaders Index: openacs-4/packages/ecommerce/www/admin/tools/table-custom.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/tools/Attic/table-custom.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/tools/table-custom.tcl 10 Jul 2002 11:57:19 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/tools/table-custom.tcl 18 Sep 2002 21:33:56 -0000 1.3 @@ -21,16 +21,16 @@ where user_id = $user_id and item = $DBQitem and item_group = $DBQitem_group and item_type = $DBQitem_type"} errmsg]} { ad_return_complaint 1 "
  • I was unable to delete the view. The database said 
    $errmsg
    \n" - return + ad_script_abort } - ns_returnredirect "$return_url" - return + ad_returnredirect "$return_url" + ad_script_abort } if {[empty_string_p $item]} { ad_return_complaint 1 "
  • You did not specify a name for this table view" - return + ad_script_abort } set col_clean [list] @@ -44,7 +44,7 @@ if {[empty_string_p $col_clean]} { ad_return_complaint 1 "
  • You did not specify any columns to display" - return + ad_script_abort } util_dbq {item item_original item_type value_type item_group} @@ -58,8 +58,8 @@ returning value into :1" $col_clean } { ad_return_complaint 1 "
  • I was unable to insert your table customizations. The database said 
    $errmsg
    \n" - return + ad_script_abort } -ns_returnredirect "$return_url&$item_group=[ns_urlencode $item]" +ad_returnredirect "$return_url&$item_group=[ns_urlencode $item]" Index: openacs-4/packages/ecommerce/www/admin/user-classes/add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/add-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/user-classes/add-2.tcl 10 Sep 2002 22:22:50 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/user-classes/add-2.tcl 18 Sep 2002 21:33:57 -0000 1.3 @@ -22,7 +22,7 @@ set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } # see if it's already in the database, meaning the user pushed reload @@ -31,7 +31,7 @@ if { [db_string get_uc_count "select count(*) from ec_user_classes where user_class_id=:user_class_id"] > 0 } { ad_returnredirect index.tcl - return + ad_script_abort } db_dml insert_new_uc "insert into ec_user_classes Index: openacs-4/packages/ecommerce/www/admin/user-classes/approve-toggle.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/approve-toggle.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/user-classes/approve-toggle.tcl 10 Sep 2002 22:22:51 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/user-classes/approve-toggle.tcl 18 Sep 2002 21:33:57 -0000 1.3 @@ -24,7 +24,7 @@ set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } Index: openacs-4/packages/ecommerce/www/admin/user-classes/delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/delete-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/user-classes/delete-2.tcl 10 Sep 2002 22:22:51 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/user-classes/delete-2.tcl 18 Sep 2002 21:33:57 -0000 1.3 @@ -19,7 +19,7 @@ set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } Index: openacs-4/packages/ecommerce/www/admin/user-classes/member-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/member-add-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/admin/user-classes/member-add-2.tcl 10 Sep 2002 22:22:51 -0000 1.2 +++ openacs-4/packages/ecommerce/www/admin/user-classes/member-add-2.tcl 18 Sep 2002 21:33:57 -0000 1.3 @@ -23,7 +23,7 @@ set return_url "[ad_conn url]?[export_entire_form_as_url_vars]" ad_returnredirect "/register.tcl?[export_url_vars return_url]" - return + ad_script_abort } Index: openacs-4/packages/ecommerce/www/register/awaiting-approval.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/register/Attic/awaiting-approval.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/register/awaiting-approval.tcl 10 Sep 2002 22:22:51 -0000 1.2 +++ openacs-4/packages/ecommerce/www/register/awaiting-approval.tcl 18 Sep 2002 21:33:58 -0000 1.3 @@ -12,7 +12,7 @@ from cc_users where user_id = :user_id and (member_state is null or member_state = 'rejected')"]} { ad_return_error "Couldn't find your record" "User id $user_id is not in the awaiting approval state. This is probably our programming bug." - return +ad_script_abort } @@ -25,10 +25,10 @@ if {$email_verified_p == "t"} { # we don't require email verification ad_returnredirect "index?[export_url_vars email]" - return + ad_script_abort } else { ad_returnredirect "awaiting-email-verification?[export_url_vars user_id]" - return + ad_script_abort } # try to login again with this new state Index: openacs-4/packages/ecommerce/www/register/awaiting-email-verification.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/register/Attic/awaiting-email-verification.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/register/awaiting-email-verification.tcl 10 Sep 2002 22:22:51 -0000 1.3 +++ openacs-4/packages/ecommerce/www/register/awaiting-email-verification.tcl 18 Sep 2002 21:33:58 -0000 1.4 @@ -17,7 +17,7 @@ ns_log Notice "Couldn't find $user_id in /register/awaiting-email-verification.tcl" ad_return_error "Couldn't find your record" "User id $user_id is not found in the need email verification state." - return + ad_script_abort } @@ -31,10 +31,10 @@ if {$member_state == "approved"} { # we don't require administration approval to get to get authorized ad_returnredirect "index.tcl?[export_url_vars email]" - return + ad_script_abort } else { ad_returnredirect "awaiting-approval.tcl?[export_url_vars user_id]" - return + ad_script_abort } } @@ -43,6 +43,7 @@ # we are waiting for the user to verify their email ad_return_template +# continue here! # the user has to come back and activate their account ns_sendmail "$email" "[ad_parameter NewRegistrationEmailAddress "security"]" "Welcome to [ad_system_name]" "To confirm your registration, please go to [ad_url]/register/email-confirm.tcl?[export_url_vars rowid]" Index: openacs-4/packages/ecommerce/www/register/user-login.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/register/Attic/user-login.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/ecommerce/www/register/user-login.tcl 10 Sep 2002 22:22:51 -0000 1.2 +++ openacs-4/packages/ecommerce/www/register/user-login.tcl 18 Sep 2002 21:33:58 -0000 1.3 @@ -28,10 +28,10 @@ # although this technically is not an expired login, we'll # just use it anyway. ad_returnredirect "login-expired" - return + ad_script_abort } elseif { $time < [ns_time] - [ad_parameter -package_id [ad_acs_kernel_id] LoginExpirationTime security 600] } { ad_returnredirect "login-expired" - return + ad_script_abort } # Obtain the user ID corresponding to the provided email address. @@ -47,7 +47,7 @@ ad_set_client_property -persistent "f" register password $password ad_returnredirect "user-new?[ad_export_vars { email return_url persistent_cookie_p }]" - return + ad_script_abort } @@ -57,7 +57,7 @@ "approved" { if { $email_verified_p == "f" } { ad_returnredirect "awaiting-email-verification?user_id=$user_id" - return + ad_script_abort } if { [ad_check_password $user_id $password] } { # The user has provided a correct, non-empty password. Log @@ -81,29 +81,29 @@ ec_create_new_session_if_necessary } ad_returnredirect $return_url - return + ad_script_abort } } "banned" { ad_returnredirect "banned-user?user_id=$user_id" - return + ad_script_abort } "deleted" { ad_returnredirect "deleted-user?user_id=$user_id" - return + ad_script_abort } "rejected" { ad_returnredirect "awaiting-approval?user_id=$user_id" - return + ad_script_abort } "" { ad_returnredirect "awaiting-approval?user_id=$user_id" - return + ad_script_abort } default { ns_log Warning "Problem with registration state machine on user-login.tcl" ad_return_error "Problem with login" "There was a problem authenticating the account: $user_id. Most likely, the database contains users with no user_state." - return + ad_script_abort } } Index: openacs-4/packages/ecommerce/www/register/user-new-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/register/Attic/user-new-2.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/ecommerce/www/register/user-new-2.tcl 10 Sep 2002 22:22:51 -0000 1.3 +++ openacs-4/packages/ecommerce/www/register/user-new-2.tcl 18 Sep 2002 21:33:58 -0000 1.4 @@ -61,7 +61,7 @@ if {$exception_count > 0} { ad_return_complaint $exception_count $exception_text - return + ad_script_abort } # Get whether they requre some sort of approval @@ -97,6 +97,7 @@ } ad_returnredirect $return_url + # continue here since we want to mail below } elseif { $email_verified_p == "f" } { @@ -107,6 +108,7 @@ set title "Please read your email" ad_return_template + } elseif { $member_state == "" } { # this user won't be able to use the system until an admin has