Index: openacs-4/packages/dotlrn-ecommerce/www/application-approve.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/application-approve.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/packages/dotlrn-ecommerce/www/application-approve.tcl	22 Sep 2005 20:29:44 -0000	1.18
+++ openacs-4/packages/dotlrn-ecommerce/www/application-approve.tcl	24 Sep 2005 21:49:08 -0000	1.19
@@ -44,56 +44,70 @@
 
 
 set actor_id [ad_conn user_id]
-set section_id [db_string section {
-    select section_id
+db_1row section {
+    select section_id, product_id
     from dotlrn_ecommerce_section
     where community_id = :community_id
-}]
+}
 
 dotlrn_ecommerce::section::flush_cache -user_id $user_id $section_id
 
+set allow_free_registration_p [parameter::get -parameter AllowFreeRegistration -default 0]
+set price [dotlrn_ecommerce::section::price $section_id]
+
 if { $user_id == $actor_id } {
 
-    db_transaction {
-	set rels [db_list rels {
-	    select r.rel_id
-	    from acs_rels r,
-	    membership_rels m
-	    where r.rel_id = m.rel_id
-	    and r.object_id_one = :community_id
-	    and r.object_id_two = :user_id
-	    and m.member_state = :old_member_state
-	}]
+    # Application is constrained to be unique for each combination of user and community
+    if { [db_0or1row rels {
+	select r.rel_id, o.creation_user as patron_id
+	from dotlrn_member_rels_full r, acs_objects o
+	where r.rel_id = o.object_id
+	and r.community_id = :community_id
+	and r.user_id = :user_id
+	and r.member_state = :old_member_state
+    }] } {
 
-	db_dml approve_request [subst {
-	    update membership_rels
-	    set member_state = :new_member_state
-	    where rel_id in ([join $rels ,])
-	}]
+	# Approval on free registration gets the user registered immediately
+	if { ![empty_string_p $price] && $price < 0.01 && $allow_free_registration_p } {
 
-	db_dml update_objects [subst {
-	    update acs_objects
-	    set last_modified = current_timestamp
-	    where object_id in ([join $rels ,])
-	}]
+	    dotlrn_ecommerce::registration::new -user_id $user_id -patron_id $patron_id -community_id $community_id
 
-	if { [parameter::get -parameter AllowAheadAccess -default 0] } {
-	    # Dispatch dotlrn applet callbacks
-	    dotlrn_community::applets_dispatch \
-		-community_id $community_id \
-		-op AddUserToCommunity \
-		-list_args [list $community_id $user_id]
-	}	
-    } on_error {
+	} else {
+
+	    db_transaction {
+		db_dml approve_request [subst {
+		    update membership_rels
+		    set member_state = :new_member_state
+		    where rel_id = :rel_id
+		}]
+
+		db_dml update_objects [subst {
+		    update acs_objects
+		    set last_modified = current_timestamp
+		    where object_id = :rel_id
+		}]
+
+		if { [parameter::get -parameter AllowAheadAccess -default 0] } {
+		    # Dispatch dotlrn applet callbacks
+		    dotlrn_community::applets_dispatch \
+			-community_id $community_id \
+			-op AddUserToCommunity \
+			-list_args [list $community_id $user_id]
+		}	
+	    } on_error {
+	    }
+	    
+	    dotlrn_ecommerce::section::flush_cache -user_id $user_id $section_id	    
+	}
     }
     
-    dotlrn_ecommerce::section::flush_cache -user_id $user_id $section_id
     ad_returnredirect $return_url
+    ad_script_abort
 } else {
     if { $type == "prereq" } {
         ad_form \
             -name email_form \
-	    -export { application_type } \
+	    -export { application_type return_url } \
             -form {
                 {user_id:text(hidden)}
                 {community_id:text(hidden)}
@@ -117,115 +131,110 @@
             } \
             -on_submit {
 		
-		db_transaction {
-		    
-		    set rels [db_list rels {
-			select r.rel_id
-			from acs_rels r, 
-			membership_rels m
-			where r.rel_id = m.rel_id
-			and r.object_id_one = :community_id
-			and r.object_id_two = :user_id
-			and m.member_state = :old_member_state
-		    }]
-
-		    db_dml approve_request [subst {
-			update membership_rels
-			set member_state = :new_member_state
-			where rel_id in ([join $rels ,])
-		    }]
-
-		    db_dml update_objects [subst {
-			update acs_objects
-			set last_modified = current_timestamp
-			where object_id in ([join $rels ,])
-		    }]
-		    
-
-		    set rel [lindex $rels 0]
-		    set patron_id [db_string get_patron {
-			select creation_user from
-			acs_objects where object_id = :rel
-		    } -default ""]
-				  
-		} on_error {
-		}
-
-
 		if {$email_reg_info_to == "participant"} {
 		    set email_user_id $user_id
 		}  else {
 		    set email_user_id $patron_id
 		}
-
-
+				
 		dotlrn_community::send_member_email -community_id $community_id -to_user $email_user_id -type $email_type -override_email $reason -override_subject $subject
 
+		if { [db_0or1row rels {
+		    select r.rel_id, o.creation_user as patron_id
+		    from dotlrn_member_rels_full r, acs_objects o
+		    where r.rel_id = o.object_id
+		    and r.community_id = :community_id
+		    and r.user_id = :user_id
+		    and r.member_state = :old_member_state
+		}] } {
+		    
+		    if { ![empty_string_p $price] && $price < 0.01 && $allow_free_registration_p } {
+			
+			dotlrn_ecommerce::registration::new -user_id $user_id -patron_id $patron_id -community_id $community_id
+			
+		    } else {
+			
+			db_transaction {
+			    
+			    db_dml approve_request [subst {
+				update membership_rels
+				set member_state = :new_member_state
+				where rel_id = :rel_id
+			    }]
+			    
+			    db_dml update_objects [subst {
+				update acs_objects
+				set last_modified = current_timestamp
+				where object_id = :rel_id
+			    }]
+			    
+			} on_error {
+			}
+			
+		    }
+		}
+				
             } \
             -after_submit {
 		dotlrn_ecommerce::section::flush_cache -user_id $user_id $section_id
                 ad_returnredirect $return_url
 		ad_script_abort
             }
-
+	
     } else {
-	db_transaction {
-	    set rels [db_list rels {
-		select r.rel_id
-		from acs_rels r,
-		membership_rels m
-		where r.rel_id = m.rel_id
-		and r.object_id_one = :community_id
-		and r.object_id_two = :user_id
-		and m.member_state = :old_member_state
-	    }]
 
-	    db_dml approve_request [subst {
-		update membership_rels
-		set member_state = :new_member_state
-		where rel_id in ([join $rels ,])
-	    }]
+	if { [db_0or1row rels {
+	    select r.rel_id, o.creation_user as patron_id
+	    from dotlrn_member_rels_full r, acs_objects o
+	    where r.rel_id = o.object_id
+	    and r.community_id = :community_id
+	    and r.user_id = :user_id
+	    and r.member_state = :old_member_state
+	}] } {
+	    
+	    # Send email to applicant
+	    set community_name [dotlrn_community::get_community_name $community_id]
 
-	    db_dml update_objects [subst {
-		update acs_objects
-		set last_modified = current_timestamp
-		where object_id in ([join $rels ,])
-	    }]
+	    if {$email_reg_info_to == "participant"} {
+		set email_user_id $user_id
+	    }  else {
+		set email_user_id $patron_id
+	    }
+	    	    
+	    dotlrn_community::send_member_email -community_id $community_id -to_user $email_user_id -type $email_type
 
-	    if { [parameter::get -parameter AllowAheadAccess -default 0] } {
-		# Dispatch dotlrn applet callbacks
-		dotlrn_community::applets_dispatch \
-		    -community_id $community_id \
-		    -op AddUserToCommunity \
-		    -list_args [list $community_id $user_id]
-	    }	
-	} on_error {
-	}
+	    if { ![empty_string_p $price] && $price < 0.01 && $allow_free_registration_p } {
+		
+		dotlrn_ecommerce::registration::new -user_id $user_id -patron_id $patron_id -community_id $community_id
+		
+	    } else {
 
+		db_transaction {
+		    db_dml approve_request [subst {
+			update membership_rels
+			set member_state = :new_member_state
+			where rel_id = :rel_id
+		    }]
 
-	set rel [lindex $rels 0]
-	set patron_id [db_string get_patron {
-	    select creation_user from
-	    acs_objects where object_id = :rel
-	}]
-		       
-	# Send email to applicant
+		    db_dml update_objects [subst {
+			update acs_objects
+			set last_modified = current_timestamp
+			where object_id = :rel_id
+		    }]
 
-	set community_name [dotlrn_community::get_community_name $community_id]
-	if {[exists_and_not_null reason]} {
-	    set override_email $reason
-	} else {
-	    set override_email ""
+		    if { [parameter::get -parameter AllowAheadAccess -default 0] } {
+			# Dispatch dotlrn applet callbacks
+			dotlrn_community::applets_dispatch \
+			    -community_id $community_id \
+			    -op AddUserToCommunity \
+			    -list_args [list $community_id $user_id]
+		    }	
+		} on_error {
+		}
+
+	    }
 	}
-	
-	if {$email_reg_info_to == "participant"} {
-	    set email_user_id $user_id
-	}  else {
-	    set email_user_id $patron_id
-	}
 
-	
-	dotlrn_community::send_member_email -community_id $community_id -to_user $email_user_id -type $email_type -override_email $override_email
 	dotlrn_ecommerce::section::flush_cache -user_id $user_id $section_id
 	ad_returnredirect $return_url
 	ad_script_abort
Index: openacs-4/packages/dotlrn-ecommerce/www/applications.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/applications.tcl,v
diff -u -r1.38 -r1.39
--- openacs-4/packages/dotlrn-ecommerce/www/applications.tcl	22 Sep 2005 20:32:15 -0000	1.38
+++ openacs-4/packages/dotlrn-ecommerce/www/applications.tcl	24 Sep 2005 21:49:08 -0000	1.39
@@ -36,8 +36,6 @@
 
 set enable_applications_p [parameter::get -package_id [ad_conn package_id] -parameter EnableCourseApplicationsP -default 1]
 
-set allow_free_registration_p [parameter::get -parameter AllowFreeRegistration -default 0]
-
 if { [exists_and_not_null type] } {
     set _type $type
 } else {
@@ -252,7 +250,7 @@
 	   and rr.rel_id <= r.rel_id
 	   and rr.community_id = r.community_id
 	   and rr.member_state = r.member_state
-	   order by o.creation_date) r) as number, s.product_id, m.session_id, p.price
+	   order by o.creation_date) r) as number, s.product_id, m.session_id
 
     from dotlrn_member_rels_full r
     left join (select *
@@ -288,13 +286,7 @@
 }] {
     set list_type [ad_decode $member_state "needs approval" full "request approval" prereq "awaiting payment" payment full]
 
-    if { ![empty_string_p $price] && $price < 0.01 && $allow_free_registration_p } {
-	set _return_url [export_vars -base "[ad_conn package_url]ecommerce/shopping-cart-add" { product_id {user_id $patron_id} {participant_id $applicant_user_id} return_url {override_p 1} }]
-    } else {
-	set _return_url $return_url
-    }
-
-    set approve_url [export_vars -base application-approve { community_id {user_id $applicant_user_id} {type $list_type} {return_url $_return_url} }]
+    set approve_url [export_vars -base application-approve { community_id {user_id $applicant_user_id} {type $list_type} return_url }]
 	
     set reject_url [export_vars -base application-reject { community_id {user_id $applicant_user_id} {type $list_type} return_url }]