Index: openacs-4/packages/bm-portlet/www/bm-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bm-portlet/www/bm-portlet.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bm-portlet/www/bm-portlet.tcl	15 May 2002 22:11:37 -0000	1.1
+++ openacs-4/packages/bm-portlet/www/bm-portlet.tcl	16 May 2002 00:41:45 -0000	1.2
@@ -38,6 +38,6 @@
 set admin_p [permission::permission_p -object_id $package_id -privilege "admin"]
 
 set spam_name [bulk_mail::parameter -parameter PrettyName -default Spam]
-set spam_url [portal::mapping::get_url -object_id $package_id]
+set spam_url [site_nodes::get_url_from_package_id -package_id $package_id]
 
-ad_return_template 
+ad_return_template
Index: openacs-4/packages/bulk-mail/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/www/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bulk-mail/www/index.tcl	15 May 2002 22:07:52 -0000	1.1
+++ openacs-4/packages/bulk-mail/www/index.tcl	16 May 2002 00:41:44 -0000	1.2
@@ -13,13 +13,16 @@
 }
 
 set package_id [ad_conn package_id]
+
+permission::require_permission -object_id $package_id -privilege admin
+
 set title [bulk_mail::pretty_name]
 set context_bar {All}
 
 set table_def {
     {send_date {Send Date} {bulk_mail_messages.send_date $order} {<td width="10%">[util_AnsiDatetoPrettyDate $send_date]</td>}}
     {from_addr From {bulk_mail_messages.from_addr $order} {<td width="15%">$from_addr</td>}}
-    {subject Subject {bulk_mail_messages.subject $order} {<td><a href="[portal::mapping::get_url -object_id $package_id]one?bulk_mail_id=$bulk_mail_id">$subject</a></td>}}
+    {subject Subject {bulk_mail_messages.subject $order} {<td><a href="[site_nodes::get_url_from_package_id -package_id $package_id]one?bulk_mail_id=$bulk_mail_id">$subject</a></td>}}
     {sent_p {Sent?} {bulk_mail_messages.sent_p $order} {<td width="10%" align="center">[ad_decode $sent_p t Yes No]</td>}}
 }
 
Index: openacs-4/packages/bulk-mail/www/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/www/one.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bulk-mail/www/one.tcl	15 May 2002 22:07:52 -0000	1.1
+++ openacs-4/packages/bulk-mail/www/one.tcl	16 May 2002 00:41:44 -0000	1.2
@@ -7,10 +7,12 @@
 } -query {
     bulk_mail_id:integer,notnull
 } -properties {
-    bulk_mail_name:onevalue
+    title:onevalue
     context_bar:onevalue
 }
 
+permission::require_permission -object_id $bulk_mail_id -privilege admin
+
 set package_id [ad_conn package_id]
 
 db_1row select_message_info {}
Index: openacs-4/packages/dotlrn-bm/tcl/dotlrn-bm-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bm/tcl/dotlrn-bm-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-bm/tcl/dotlrn-bm-procs.tcl	15 May 2002 22:12:16 -0000	1.1
+++ openacs-4/packages/dotlrn-bm/tcl/dotlrn-bm-procs.tcl	16 May 2002 00:41:45 -0000	1.2
@@ -82,10 +82,6 @@
                 -url [package_key] \
                 -directory_p "t"]
 
-            portal::mapping::new \
-                -object_id $package_id \
-                -node_id [site_nodes::get_node_id_from_package_id -package_id $package_id]
-
             dotlrn_applet::add_applet_to_dotlrn -applet_key [applet_key]
 
             dotlrn_applet::mount -package_key "dotlrn-bm" -url "bm" -pretty_name "Bulk Mail"