Index: openacs-4/packages/dotlrn/www/members.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.tcl,v
diff -u -r1.27.2.5 -r1.27.2.6
--- openacs-4/packages/dotlrn/www/members.tcl	22 Aug 2008 11:33:17 -0000	1.27.2.5
+++ openacs-4/packages/dotlrn/www/members.tcl	22 Aug 2008 13:31:15 -0000	1.27.2.6
@@ -32,6 +32,7 @@
 set community_id [dotlrn_community::get_community_id]
 set spam_p [dotlrn::user_can_spam_community_p -user_id [ad_get_user_id] -community_id $community_id]
 set approval_policy_p [string eq [group::join_policy -group_id $community_id] "needs approval"]
+set subcomm_p [dotlrn_community::subcommunity_p -community_id $community_id]
 
 set referer [ns_conn url]
 set return_url "[ns_conn url]?[ns_conn query]"
@@ -46,19 +47,6 @@
     set admin_p 1
 }
 
-# make it so that only course admins 
-# and site wide admins can read this page 
-# if { !$admin_p } {
-#        ad_return_forbidden  "Permission Denied"  "<blockquote>
-#    You don't have permission to view this page.
-#    </blockquote>"
-#        ad_script_abort
-#}
-
-if {$admin_p} {
-    set add_member_url [export_vars -base user-add { {can_browse_p 1} {read_private_data_p t} {referer $return_url} }]
-}
-
 if {![exists_and_not_null referer]} {
     if {[string equal $admin_p t] == 1} {
         set referer "one-community-admin"
@@ -77,10 +65,20 @@
 if {$admin_p && !$csv_p} {
     set bulk_actions [list "[_ dotlrn.Drop_Membership]" "deregister" "[_ dotlrn.Drop_Membership]"]
     set bulk_actions_export_vars [list "user_id" "referer" "reset"]
-    set actions [list "CSV" "members?csv=yes" "[_ dotlrn.Comma_Separated_Values]"]
+
+    if { !$subcomm_p } {
+        lappend actions [_ dotlrn.Create_and_add_a_member] [export_vars -base user-add { {can_browse_p 1} {read_private_data_p t} {referer $return_url} }] [_ dotlrn.Create_and_add_a_member]
+    }
+
+    if { $spam_p } {
+        lappend actions [_ dotlrn.Email_Members] [export_vars -base "spam-recipients" {community_id}] [_ dotlrn.Email_Members]
+    }
+
+    lappend actions "CSV" "members?csv=yes" [_ dotlrn.Export_members_list_to_CSV]
+
     foreach role $rel_types {
-        # lappend actions "[_ dotlrn.Remove_all] [lang::util::localize [lindex $role 3]]" "members?reset=1&reltype=[lindex $role 0]" "[lang::util::localize [lindex $role 2]]"
-        lappend actions "[_ dotlrn.Remove_all] [lang::util::localize [lindex $role 3]]" "member-confirm?reset=1&reltype=[lindex $role 0]" "[lang::util::localize [lindex $role 2]]"
+        set action_label "[_ dotlrn.Remove_all] [lang::util::localize [lindex $role 3]]" 
+        lappend actions  $action_label "member-confirm?reset=1&reltype=[lindex $role 0]" $action_label
     }
 }
 
@@ -125,8 +123,8 @@
         html "align left"
         display_template {
         <if @members.user_id@ ne \"\">
-            <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>
+            <a href="member-confirm?user_id=@members.user_id@&amp;referer=@members.member_referer@">#dotlrn.Drop_Membership#</a> | 
+            <a href="member-add-2?user_id=@members.user_id@&amp;referer=@members.member_referer@">#dotlrn.User_Admin_Page#</a>
         </if>
         }
     }
@@ -159,19 +157,6 @@
     template::list::write_output -name members
 }
 
-# # Bulk action User Admin Page
-# # Depending on the community_type, we have allowable rel_types
-# set rel_types [dotlrn_community::get_roles -community_id $community_id]
-# set selection "<select name=\"rel_type\">"
-# foreach role $rel_types {
-#     append selection "<option value=\"[lindex $role 0]\">[lang::util::localize [lindex $role 2]]</option>"
-# }
-# append selection "</select>"
-# set size [multirow size members]
-# if { $size > 0 } {
-#     multirow append members "" "" "" "" "" $selection
-# }
-
 set user_ids ""
 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]
@@ -224,8 +209,6 @@
     }
 }
 
-set subcomm_p [dotlrn_community::subcommunity_p -community_id $community_id]
-
 if {$subcomm_p} {
 
     form create parent_users_form