Index: openacs-4/packages/dotlrn/www/spam-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-2.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/spam-2.adp	16 May 2002 03:56:31 -0000	1.1
+++ openacs-4/packages/dotlrn/www/spam-2.adp	17 May 2002 19:14:00 -0000	1.2
@@ -25,9 +25,20 @@
 <property name="link_control_panel">1</property>
 
 <p>
-  Are you sure you want to send this @spam_name@ Message?
+  Are you sure you want to send the following @spam_name@ Message?
 </p>
 
+<table bgcolor="#ececec" width="95%" cellpadding="3" cellspacing="3">
+  <tr>
+    <td width="10%">Subject</td>
+    <td>@subject@</td>
+  </tr>
+  <tr>
+    <td>Message</td>
+    <td>@message@</td>
+  </tr>
+</table>
+
 <form action="spam" method="post">
   @confirm_data@
   <input type="submit" value="Confirm"></input>
Index: openacs-4/packages/dotlrn/www/spam-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/spam-2.tcl	16 May 2002 03:56:31 -0000	1.1
+++ openacs-4/packages/dotlrn/www/spam-2.tcl	17 May 2002 19:14:00 -0000	1.2
@@ -22,12 +22,16 @@
     @version $Id$
 } -query {
 } -properties {
+    subject:onevalue
+    message:onevalue
     spam_name:onevalue
     context_bar:onevalue
     community_id:onevalue
     portal_id:onevalue
 }
 
+form get_values spam_message subject message
+
 set spam_name [bulk_mail::parameter -parameter PrettyName -default Spam]
 set context_bar [list [list $referer Admin] "$spam_name Community"]
 set community_id [dotlrn_community::get_community_id]