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.1 -r1.2
--- openacs-4/packages/ecommerce/www/update-user-classes-2.tcl	20 Apr 2001 20:51:13 -0000	1.1
+++ openacs-4/packages/ecommerce/www/update-user-classes-2.tcl	26 May 2002 04:36:50 -0000	1.2
@@ -1,61 +1,55 @@
-#  www/ecommerce/update-user-classes-2.tcl
 ad_page_contract {
     @param user_class_id ID of the user class
     @param usca_p User session begun or not
+
     @author
     @creation-date
-    @cvs-id update-user-classes-2.tcl,v 3.2.2.7 2000/08/18 21:46:37 stevenp Exp
     @author ported by Jerry Asher (jerry@theashergroup.com)
+    @author revised by Bart Teeuwisse <bart.teeuwisse@7-sisters.com>
+    @revision-date April 2002
+
 } {
     user_class_id:multiple
     usca_p:optional
 }
 
 set user_class_id_list $user_class_id
-
 set user_id [ad_verify_and_get_user_id]
-
 set ip_address [ns_conn peeraddr]
-
 if {$user_id == 0} {
-    
     set return_url "[ad_conn url]"
-
     ad_returnredirect "/register?[export_url_vars return_url]"
     return
 }
 
 set user_session_id [ec_get_user_session_id]
-
 ec_create_new_session_if_necessary
-# type1
-
 ec_log_user_as_user_id_for_this_session
 
 # update User Class
 
 db_transaction {
 
     # Get old user_class_ids
-    set old_user_class_id_list [db_list get_old_class_ids "select user_class_id 
-    from ec_user_class_user_map 
-    where user_id = :user_id"]
 
+    set old_user_class_id_list [db_list get_old_class_ids "
+	select user_class_id 
+    	from ec_user_class_user_map 
+    	where user_id = :user_id"]
+
     # Add the user_class if it is not already there
+
     foreach user_class_id $user_class_id_list {
 	if { [lsearch -exact $old_user_class_id_list $user_class_id] == -1 && ![empty_string_p $user_class_id] } {
-	    set sql "insert into 
-	    ec_user_class_user_map (
-	    user_id, user_class_id, user_class_approved_p, last_modified, last_modifying_user, modified_ip_address
-	    ) values (
-	    :user_id, :user_class_id, NULL, sysdate, :user_id, :ip_address)"
-	
-	    if [catch { db_dml insert_into_user_class_map $sql } errmsg] {
+	    if [catch { db_dml insert_user_class "
+		insert into ec_user_class_user_map 
+      		(user_id, user_class_id, user_class_approved_p, last_modified, last_modifying_user, modified_ip_address) 
+      		values 
+      		(:user_id, :user_class_id, null, sysdate, :user_id, :ip_address)" } errmsg] {
 		ad_return_error "Ouch!" "The database choked on our update:
 		<blockquote>
-		$errmsg
-		</blockquote>
-		"
+		  $errmsg
+		</blockquote>"
 	    }
 	}
     }
@@ -66,7 +60,7 @@
 	    set sql "delete from ec_user_class_user_map 
 	    where user_id = :user_id 
 	    and user_class_id = :old_user_class_id"
-	
+	    
 	    if [catch { db_dml delete_from_user_class_map $sql } errmsg] {
 		ad_return_error "Ouch!" "The database choked on our update:
 		<blockquote>