Index: openacs-4/packages/dotlrn/www/member-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-confirm.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/dotlrn/www/member-confirm.adp	8 Aug 2005 10:30:58 -0000	1.1.2.1
+++ openacs-4/packages/dotlrn/www/member-confirm.adp	11 Aug 2005 01:42:04 -0000	1.1.2.2
@@ -2,6 +2,6 @@
 <property name="title">@page_title@</property>
 <property name="context">"@page_title@"</property>
 
-<p>Are you sure you want to delete all members with the role @role_prettyname;noquote@ ?
+<p>@confirm_message;noquote@
 <br /><br />
-<input type="button" value="Yes" onClick="window.location='members?reset=1&reltype=@role_shortname@'">&nbsp;<input type="button" value="No" onClick="javascript: history.go(-1)">
\ No newline at end of file
+<input type="button" value="Yes" onClick="window.location='@action_url;noquote@'">&nbsp;<input type="button" value="No" onClick="javascript: history.go(-1)">
\ No newline at end of file
Index: openacs-4/packages/dotlrn/www/member-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-confirm.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/dotlrn/www/member-confirm.tcl	8 Aug 2005 10:30:58 -0000	1.1.2.1
+++ openacs-4/packages/dotlrn/www/member-confirm.tcl	11 Aug 2005 01:42:04 -0000	1.1.2.2
@@ -5,17 +5,30 @@
     @creation-date August 8,2005
 
 } {
+    {user_id:optional}
     {reset:optional}
     {reltype:optional}
+    {referer "./"}
 }
 
 set community_id [dotlrn_community::get_community_id]
-set page_title "Remove Members"
 
-set rel_types [dotlrn_community::get_roles -community_id $community_id]
-foreach role $rel_types {
-	if { [string equal $reltype [lindex $role 0]] } { 
-		set role_shortname [lang::util::localize [lindex $role 0]]
-		set role_prettyname [lang::util::localize [lindex $role 2]] 
+if { [exists_and_not_null user_id] } {
+	# we're dropping just one user
+	set page_title "Drop Membership"
+	set confirm_message "Are you sure you want to remove this user from this community ?"
+	set action_url "deregister?user_id=$user_id&referer=$referer"
+} else {
+	# we're dropping a group of members
+	set rel_types [dotlrn_community::get_roles -community_id $community_id]
+	foreach role $rel_types {
+		if { [string equal $reltype [lindex $role 0]] } { 
+			set role_shortname [lang::util::localize [lindex $role 0]]
+			set role_prettyname [lang::util::localize [lindex $role 2]] 
+		}
 	}
+	set page_title "Remove Members"	
+	set confirm_message "Are you sure you want to delete all members with the role $role_prettyname ?"
+	set action_url "members?reset=1&reltype=$role_shortname"
+
 }
\ No newline at end of file
Index: openacs-4/packages/dotlrn/www/members.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.tcl,v
diff -u -r1.23.2.3 -r1.23.2.4
--- openacs-4/packages/dotlrn/www/members.tcl	8 Aug 2005 11:03:31 -0000	1.23.2.3
+++ openacs-4/packages/dotlrn/www/members.tcl	11 Aug 2005 01:42:04 -0000	1.23.2.4
@@ -118,8 +118,8 @@
 	    html "align left"
 	    display_template {
 		<if @members.user_id@ ne "">
-		<a href="deregister?user_id=@members.user_id@&referer=@members.referer@">#dotlrn.Drop_Membership#</a> | 
-		<a href="member-add-2?user_id=@members.user_id@&referer=@members.referer@">#dotlrn.User_Admin_Page#</a>
+		<a href="member-confirm?user_id=@members.user_id@&referer=@members.member_referer@">#dotlrn.Drop_Membership#</a> | 
+		<a href="member-add-2?user_id=@members.user_id@&referer=@members.member_referer@">#dotlrn.User_Admin_Page#</a>
 		</if>
 	    }
 	}
@@ -136,13 +136,10 @@
 
 set member_page [acs_community_member_page]
 
-
-
-db_multirow -extend { update_bio_p member_url referer } members select_current_members {} {
+db_multirow -extend { update_bio_p member_url member_referer } members select_current_members {} {
     set member_url "$member_page?user_id=$user_id"
-    set referer $referer
+    set member_referer $referer
 
-
     set update_bio_p $admin_p
     set role [dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type $rel_type]
 }
@@ -164,13 +161,12 @@
     multirow append members "" "" "" "" "" $selection
 }
 
-
 set user_ids ""
-db_multirow -extend { member_url referer } pending_users select_pending_users {} {
+db_multirow -extend { member_url pending_user_referer } pending_users select_pending_users {} {
     set role [dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type $rel_type]
     append user_ids "user_id=$user_id&"
     set member_url "$member_page?user_id=$user_id"
-    set referer $referer
+    set pending_user_referer $referer
 }
 
 
@@ -211,8 +207,8 @@
 	label "[_ dotlrn.Actions]"
             html "align left"
 	display_template {
-                <a href="approve?user_id=@pending_users.user_id@&referer=@pending_users.referer@">#dotlrn.Approve#</a> |
-                <a href="reject?user_id=@pending_users.user_id@&referer=@pending_users.referer@">#dotlrn.Reject#</a>
+                <a href="approve?user_id=@pending_users.user_id@&referer=@pending_users.pending_user_referer@">#dotlrn.Approve#</a> |
+                <a href="reject?user_id=@pending_users.user_id@&referer=@pending_users.pending_user_referer@">#dotlrn.Reject#</a>
 	}
     }
 }