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.1 -r1.2
--- openacs-4/packages/ecommerce/www/shopping-cart-retrieve.tcl	20 Apr 2001 20:51:13 -0000	1.1
+++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve.tcl	26 May 2002 04:36:50 -0000	1.2
@@ -1,40 +1,38 @@
-#  www/ecommerce/shopping-cart-retrieve.tcl
 ad_page_contract {
     This page either redirects them to log on or asks them to confirm that they are who we think they are.
 
     @param usca_p User session begun or not
 
     @author
     @creation-date
-    @cvs-id shopping-cart-retrieve.tcl,v 3.1.6.4 2000/07/31 18:00:12 ryanlee Exp
     @author ported by Jerry Asher (jerry@theashergroup.com)
+    @author revised by Bart Teeuwisse <bart.teeuwisse@7-sisters.com>
+    @revision-date April 2002
+
 } {
     usca_p:optional
 }
 
 
 set user_id [ad_verify_and_get_user_id]
-
 set return_url "[ec_url]shopping-cart-retrieve-2"
-
 if {$user_id == 0} {
     ad_returnredirect "/register?[export_url_vars return_url]"
     return
 }
 
-# user session tracking
-set user_session_id [ec_get_user_session_id]
+# User session tracking
 
+set user_session_id [ec_get_user_session_id]
 ec_create_new_session_if_necessary "" shopping_cart_required
-# typeA
-
 ec_log_user_as_user_id_for_this_session
+set user_name [db_string get_user_name "
+    select first_names || ' ' || last_name as user_name 
+    from cc_users 
+    where user_id=:user_id"]
 
-set user_name [db_string get_user_name "select first_names || ' ' || last_name as user_name from cc_users where user_id=:user_id"]
-
 set register_link "/register?[export_url_vars return_url]"
 
 db_release_unused_handles
+ad_return_template
 
-ec_return_template
-