Index: openacs-4/packages/dotlrn/www/spam.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.tcl,v
diff -u -r1.39 -r1.40
--- openacs-4/packages/dotlrn/www/spam.tcl	29 Jun 2018 17:27:19 -0000	1.39
+++ openacs-4/packages/dotlrn/www/spam.tcl	3 Sep 2024 15:37:37 -0000	1.40
@@ -24,7 +24,7 @@
     {community_id:integer ""}
     {rel_types:multiple "" }
     {rel_types_str ""}
-    {referer ""}
+    {referer:localurl ""}
     {spam_all 0}
 } -validate {
 
@@ -81,7 +81,11 @@
 
 set registered_users_id [acs_magic_object "registered_users"]
 
-set spam_name [bulk_mail::parameter -parameter PrettyName -default [_ dotlrn.Spam_]]
+set spam_name [parameter::get \
+                   -localize \
+                   -package_id [bulk_mail::package_id] \
+                   -parameter pretty_name \
+                   -default [_ dotlrn.Spam]]
 set context [list [list $referer [_ dotlrn.Admin]] "$spam_name [_ dotlrn.Community]"]
 
 if {$community_id eq ""} {
@@ -176,13 +180,13 @@
     set community_url "[parameter::get -package_id [ad_acs_kernel_id] -parameter SystemURL][dotlrn_community::get_community_url $community_id]"
 
     if { $recipients_str ne "" } {
-	set recipients_str [join [split $recipients_str] ,]
+	set recipients_str [ns_dbquotelist [split $recipients_str]]
  	append who_will_receive_this_clause [db_map recipients_clause]
     } 
 
 
     if { $rel_types_str ne "" } {
-	set rel_types_str "'[join [split $rel_types_str] ',']'"
+	set rel_types_str [ns_dbquotelist [split $rel_types_str]]
  	append who_will_receive_this_clause [db_map rel_types_clause]
     }
 
@@ -213,8 +217,13 @@
 	set message_type "text"
     }
 
+    set bm_package_id [lindex [site_node::get_children \
+                                   -package_key [bulk_mail::package_key] \
+                                   -element object_id \
+                                   -node_id [ad_conn node_id]] 0]
+
     bulk_mail::new \
-        -package_id [site_node_apm_integration::get_child_package_id -package_key [bulk_mail::package_key]] \
+        -package_id $bm_package_id \
         -send_date [template::util::date::get_property linear_date $send_date] \
         -date_format "YYYY MM DD HH24 MI SS" \
         -from_addr $from \