Index: openacs-4/packages/dotlrn/dotlrn.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v
diff -u -r1.81 -r1.82
--- openacs-4/packages/dotlrn/dotlrn.info	16 May 2002 01:12:11 -0000	1.81
+++ openacs-4/packages/dotlrn/dotlrn.info	16 May 2002 03:56:31 -0000	1.82
@@ -378,6 +378,8 @@
             <file type="content_page" path="www/register.tcl"/>
             <file type="content_page" path="www/reject-link.adp"/>
             <file type="content_page" path="www/reject.tcl"/>
+            <file type="content_page" path="www/spam-2.adp"/>
+            <file type="content_page" path="www/spam-2.tcl"/>
             <file type="content_page" path="www/spam-variables.adp"/>
             <file type="content_page" path="www/spam.adp"/>
             <file type="content_page" path="www/spam.tcl"/>
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/spam-2.adp	16 May 2002 03:56:31 -0000	1.1
@@ -0,0 +1,34 @@
+<!--
+
+  Copyright (C) 2001, 2002 OpenForce, Inc.
+
+  This file is part of dotLRN.
+
+  dotLRN is free software; you can redistribute it and/or modify it under the
+  terms of the GNU General Public License as published by the Free Software
+  Foundation; either version 2 of the License, or (at your option) any later
+  version.
+
+  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+  details.
+
+-->
+
+<master src="dotlrn-master">
+<property name="title">@spam_name@ Community</property>
+<property name="context_bar">@context_bar@</property>
+<property name="portal_id">@portal_id@</property>
+<property name="show_control_panel">1</property>
+<property name="control_panel_text">Group Admin</property>
+<property name="link_control_panel">1</property>
+
+<p>
+  Are you sure you want to send this @spam_name@ Message?
+</p>
+
+<form action="spam" method="post">
+  @confirm_data@
+  <input type="submit" value="Confirm"></input>
+</form>
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
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/dotlrn/www/spam-2.tcl	16 May 2002 03:56:31 -0000	1.1
@@ -0,0 +1,34 @@
+#
+#  Copyright (C) 2001, 2002 OpenForce, Inc.
+#
+#  This file is part of dotLRN.
+#
+#  dotLRN is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU General Public License as published by the Free Software
+#  Foundation; either version 2 of the License, or (at your option) any later
+#  version.
+#
+#  dotLRN is distributed in the hope that it will be useful, but WITHOUT ANY
+#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+#  details.
+#
+
+# dotlrn/www/spam-2.tcl
+
+ad_page_contract {
+    @author yon (yon@openforce.net)
+    @creation-date 2002-05-13
+    @version $Id: spam-2.tcl,v 1.1 2002/05/16 03:56:31 yon Exp $
+} -query {
+} -properties {
+    spam_name:onevalue
+    context_bar:onevalue
+    community_id:onevalue
+    portal_id:onevalue
+}
+
+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]
+set portal_id [dotlrn_community::get_portal_id -community_id $community_id]
Index: openacs-4/packages/dotlrn/www/spam.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/dotlrn/www/spam.adp	29 Mar 2002 19:14:46 -0000	1.11
+++ openacs-4/packages/dotlrn/www/spam.adp	16 May 2002 03:56:31 -0000	1.12
@@ -19,7 +19,7 @@
 %>
 
 <master src="dotlrn-master">
-<property name="title">Spam Community</property>
+<property name="title">@spam_name@ Community</property>
 <property name="context_bar">@context_bar@</property>
 <property name="portal_id">@portal_id@</property>
 <property name="show_control_panel">1</property>
Index: openacs-4/packages/dotlrn/www/spam.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/dotlrn/www/spam.tcl	16 May 2002 01:22:46 -0000	1.12
+++ openacs-4/packages/dotlrn/www/spam.tcl	16 May 2002 03:56:31 -0000	1.13
@@ -90,7 +90,7 @@
     -widget hidden \
     -value $referer
 
-if {[form is_valid spam_message]} {
+if {[ns_queryexists "form:confirm"]} {
     form get_values spam_message \
         community_id from rel_type subject message send_date referer
 
@@ -147,4 +147,12 @@
     ad_script_abort
 }
 
+if {[form is_valid spam_message]} {
+
+    set confirm_data [form export]
+    append confirm_data {<input type="hidden" name="form:confirm" value="confirm">}
+    template::set_file "[file dir $__adp_stub]/spam-2"
+
+}
+
 ad_return_template