Index: openacs-4/packages/dotlrn/www/spam-recipients.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-recipients.adp,v diff -u -N -r1.8.2.1 -r1.8.2.2 --- openacs-4/packages/dotlrn/www/spam-recipients.adp 15 Feb 2007 15:42:44 -0000 1.8.2.1 +++ openacs-4/packages/dotlrn/www/spam-recipients.adp 1 Mar 2007 20:36:03 -0000 1.8.2.2 @@ -26,62 +26,17 @@

#dotlrn.Choose_members_to_receive#

-

- - #dotlrn.Send_to_all#

#dotlrn.Send_to_the_following_roles#

@rel_types_html;noquote@ -

- -#dotlrn.Send_to_the_following_members#:

- - - - - - - - - - - - - - - - - - - - - -
 #dotlrn.First_Name##dotlrn.Last_Name##dotlrn.Email_1#
- - <%=[acs_community_member_link -user_id @current_members.user_id@ -label @current_members.first_names@] %><%=[acs_community_member_link -user_id @current_members.user_id@ -label @current_members.last_name@]%> - - - @current_members.email@ - - - - - @current_members.email@ - - -   - - -
- @exported_vars;noquote@ -

- -
+

+#dotlrn.Send_to_the_following_members#:

-

+ + Index: openacs-4/packages/dotlrn/www/spam-recipients.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-recipients.tcl,v diff -u -N -r1.4.6.1 -r1.4.6.2 --- openacs-4/packages/dotlrn/www/spam-recipients.tcl 15 Feb 2007 15:42:44 -0000 1.4.6.1 +++ openacs-4/packages/dotlrn/www/spam-recipients.tcl 1 Mar 2007 20:36:03 -0000 1.4.6.2 @@ -1,7 +1,7 @@ ad_page_contract { } -query { {community_id ""} - {referer "control-panel"} + {referer ""} } set spam_name [bulk_mail::parameter -parameter PrettyName -default [_ dotlrn.Spam]] @@ -50,8 +50,38 @@ } -db_multirow current_members select_current_members {} +db_multirow -extend {recipients url} current_members select_current_members {} { + set url "/dotlrn/admin/user?user_id=$user_id" + set recipients $user_id +} +template::list::create \ + -name current_members \ + -multirow current_members \ + -key recipients \ + -bulk_actions { + "\#dotlrn.Compose_bulk_message\#" "spam" "\#dotlrn.Compose_bulk_message\#" + } \ + -elements { + first_names { + label "\\#dotlrn.First_Name\\#" + html { width 200 } + link_url_eval {$url} + } + last_name { + label "\\#dotlrn.Last_Name\\#" + html { width 200 } + link_url_eval {$url} + } + email { + label "\\#dotlrn.Email_1\\#" + html { width 200 } + display_template { + @current_members.email@ + } + } + } + set exported_vars [export_vars -form { referer }] ad_return_template Index: openacs-4/packages/dotlrn/www/spam.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.tcl,v diff -u -N -r1.25 -r1.25.2.1 --- openacs-4/packages/dotlrn/www/spam.tcl 8 Aug 2006 21:26:24 -0000 1.25 +++ openacs-4/packages/dotlrn/www/spam.tcl 1 Mar 2007 20:36:03 -0000 1.25.2.1 @@ -24,7 +24,7 @@ {community_id ""} {rel_types:multiple "" } {rel_types_str ""} - {referer "control-panel"} + {referer ""} {spam_all 0} } -validate {