Index: openacs-4/packages/bm-portlet/www/bm-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bm-portlet/www/bm-portlet.adp,v
diff -u -r1.3 -r1.3.6.1
--- openacs-4/packages/bm-portlet/www/bm-portlet.adp	29 Oct 2002 18:02:48 -0000	1.3
+++ openacs-4/packages/bm-portlet/www/bm-portlet.adp	21 Jun 2004 19:55:37 -0000	1.3.6.1
@@ -20,5 +20,5 @@
 
 <ul>
   <li><a href="@spam_url@">#bm-portlet.spam_name_History#</a></li>
-  <li><a href="spam?referer=one-community-admin">#bm-portlet.New_spam_name#</a></li>
+  <li><a href="spam-recipients?referer=one-community-admin">#bm-portlet.New_spam_name#</a></li>
 </ul>
Index: openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml,v
diff -u -r1.33.2.6.4.1 -r1.33.2.6.4.2
--- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	4 May 2004 13:42:22 -0000	1.33.2.6.4.1
+++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	21 Jun 2004 19:55:38 -0000	1.33.2.6.4.2
@@ -65,6 +65,7 @@
   <msg key="Bulk_Uploading">Bulk uploading in progress.</msg>
   <msg key="cannot_be_removed">cannot be removed</msg>
   <msg key="Change_Locale">Change Locale</msg>
+  <msg key="Choose_members_to_receive">Choose the members of %community_name% to receive this message:</msg>
   <msg key="class_instance_portal_pretty_name">Classes</msg>
   <msg key="class_instances_pretty_name">Class</msg>
   <msg key="class_instances_pretty_plural">Classes</msg>
@@ -97,6 +98,7 @@
   <msg key="Community_Type">Community Type</msg>
   <msg key="Community_Types">Community Types</msg>
   <msg key="Communitys_Name">Community's Name</msg>
+  <msg key="Compose_bulk_message">Compose Bulk Message</msg>
   <msg key="Configure_Element">Configure Element</msg>
   <description key="Configure_Element">Used in title on page for configuring a portal element, i.e. a portal application mini window.
 </description>
@@ -209,6 +211,7 @@
   <msg key="Header_Logo_Alt_Text">Header Logo Alt Text</msg>
   <msg key="Header_Logo_Item_ID">Header Logo Item ID</msg>
   <msg key="help">Help</msg>
+  <msg key="HTML">HTML</msg>
   <msg key="ID">ID:</msg>
   <msg key="ID_1">ID</msg>
   <msg key="instructor_role_pretty_name">Professor</msg>
@@ -388,7 +391,9 @@
   <msg key="Memberships">Memberships</msg>
   <msg key="Memberships_1">Memberships:</msg>
   <msg key="Message">Message</msg>
+  <msg key="Message_Type">Message Type</msg>
   <msg key="must_have_values">Field must have one of the following values:</msg>
+  <msg key="Must_specify_recipients">You must specify at least one recipient for your message</msg>
   <msg key="My_Communities">My Communities</msg>
   <msg key="NA">N/A</msg>
   <msg key="Name">Name</msg>
@@ -444,6 +449,7 @@
   <msg key="Person_name">Name</msg>
   <msg key="Personal_home_page">Personal home page:</msg>
   <msg key="Personal_Options">Personal Options</msg>
+  <msg key="Plain_Text">Plain Text</msg>
   <msg key="portal_templates">Portal Templates</msg>
   <msg key="Portrait">Portrait:</msg>
   <msg key="Portrait_1">Portrait</msg>
@@ -492,6 +498,7 @@
   <msg key="seconds">seconds.</msg>
   <msg key="Send_Date">Send Date</msg>
   <msg key="send_email">Send Email</msg>
+  <msg key="Send_to_all">Send to everyone in the group</msg>
   <msg key="Shared_Files">Shared Files</msg>
   <msg key="silver">silver</msg>
   <msg key="Site-wide_Admin">Site-wide Admin?</msg>
Index: openacs-4/packages/dotlrn/www/members.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.adp,v
diff -u -r1.20 -r1.20.6.1
--- openacs-4/packages/dotlrn/www/members.adp	15 Jun 2003 01:24:00 -0000	1.20
+++ openacs-4/packages/dotlrn/www/members.adp	21 Jun 2004 19:55:37 -0000	1.20.6.1
@@ -26,6 +26,6 @@
 
 <if @spam_p@ true>
   <ul>
-    <li>        <a href="spam?community_id=@community_id@&referer=@return_url@">#dotlrn.Email_Members#</a>
+    <li>        <a href="spam-recipients?community_id=@community_id@&referer=@return_url@">#dotlrn.Email_Members#</a>
   </ul>
 </if>
Index: openacs-4/packages/dotlrn/www/spam-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/spam-oracle.xql,v
diff -u -r1.2 -r1.2.6.1
--- openacs-4/packages/dotlrn/www/spam-oracle.xql	29 May 2003 18:05:01 -0000	1.2
+++ openacs-4/packages/dotlrn/www/spam-oracle.xql	21 Jun 2004 19:55:37 -0000	1.2.6.1
@@ -46,6 +46,7 @@
                                         membership_rels.rel_id
                                      and membership_rels.member_state 
                                         = 'approved')
+            $extra_where_clause
         </querytext>
     </fullquery>
 
Index: openacs-4/packages/dotlrn/www/spam-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/spam-postgresql.xql,v
diff -u -r1.2 -r1.2.6.1
--- openacs-4/packages/dotlrn/www/spam-postgresql.xql	29 May 2003 18:05:01 -0000	1.2
+++ openacs-4/packages/dotlrn/www/spam-postgresql.xql	21 Jun 2004 19:55:37 -0000	1.2.6.1
@@ -58,6 +58,7 @@
                                         membership_rels.rel_id
                                      and membership_rels.member_state 
                                         = 'approved')
+            $extra_where_clause
         </querytext>
     </fullquery>
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/spam-recipients.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/spam-recipients.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/spam-recipients.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/dotlrn/www/spam.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.tcl,v
diff -u -r1.21.6.1 -r1.21.6.2
--- openacs-4/packages/dotlrn/www/spam.tcl	17 Jun 2004 15:05:24 -0000	1.21.6.1
+++ openacs-4/packages/dotlrn/www/spam.tcl	21 Jun 2004 19:55:37 -0000	1.21.6.2
@@ -19,9 +19,23 @@
     @creation-date Jan 19, 2002
     @version $Id$
 } -query {
+    {recipients:integer,multiple ""}
+    {recipients_str ""}
     {community_id ""}
     {rel_type "dotlrn_member_rel"}
     {referer "control-panel"}
+    {spam_all 0}
+} -validate {
+    recipients_specified {
+      if { ![info exists recipients_str] && ![info exists recipients] } {
+        ad_complain "[_ dotlrn.Must_specify_recipients]"
+      }
+    }
+    recipients_split {
+      if { [info exists recipients_str] && ![info exists recipients] } {
+        set recipients [split $recipients_str]
+      }
+    }
 } -properties {
     context_bar:onevalue
     portal_id:onevalue
@@ -60,6 +74,7 @@
     -label [_ dotlrn.From] \
     -datatype text \
     -widget hidden \
+    -html {size 60} \
     -value $sender_email
 
 element create spam_message rel_type \
@@ -82,10 +97,10 @@
     -html {rows 10 cols 80 wrap soft}
 
 element create spam_message message_type \
-    -label "Message Type" \
+    -label "[_ dotlrn.Message_Type]" \
     -datatype text \
     -widget select \
-    -options {{"Plain text" "text"} {HTML "html"}} \
+    -options {{"[_ dotlrn.Plain_Text]" "text"} {"[_ dotlrn.HTML]" "html"}} \
     -value "text"
 
 element create spam_message send_date \
@@ -101,16 +116,34 @@
     -widget hidden \
     -value $referer
 
+element create spam_message recipients_str \
+    -label Recipients \
+    -datatype text \
+    -widget hidden \
+    -value $recipients
+
+element create spam_message spam_all \
+    -label spam \
+    -datatype text \
+    -widget hidden \
+    -value $spam_all
+
 if {[ns_queryexists "form:confirm"]} {
     form get_values spam_message \
-        community_id from rel_type subject message message_type send_date referer
+        community_id from rel_type subject message message_type send_date referer recipients_str spam_all
 
     set segment_id [db_string select_rel_segment_id {}]
     set community_name [dotlrn_community::get_community_name $community_id]
     set community_url "[ad_parameter -package_id [ad_acs_kernel_id] SystemURL][dotlrn_community::get_community_url $community_id]"
+    set recipients_str [join [split $recipients_str] ,]
 
     set safe_community_name [db_quote $community_name]
 
+    if { $spam_all } {
+      set extra_where_clause ""
+    } else {
+      set extra_where_clause "and parties.party_id in ($recipients_str)"
+    }
     set query [db_map sender_info]
 
 ns_log notice "query: $query"
Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp,v
diff -u -r1.13.2.1.4.1 -r1.13.2.1.4.2
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp	13 May 2004 15:10:41 -0000	1.13.2.1.4.1
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.adp	21 Jun 2004 19:55:38 -0000	1.13.2.1.4.2
@@ -60,7 +60,7 @@
 <if @spam_p@ true>
 <p>
 <ul>
-  <li><a href="spam?community_id=@community_id@&referer=@referer@">#dotlrn-portlet.Email_Members#</a></li>
+  <li><a href="spam-recipients?community_id=@community_id@&referer=@referer@">#dotlrn-portlet.Email_Members#</a></li>
 </ul>
 </p>
 </if>