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.8.2.1 -r1.8.2.2
--- openacs-4/packages/dotlrn/www/spam-2.adp	17 Oct 2002 12:17:40 -0000	1.8.2.1
+++ openacs-4/packages/dotlrn/www/spam-2.adp	14 Jan 2003 20:22:49 -0000	1.8.2.2
@@ -20,37 +20,21 @@
 <property name="title">@spam_name@</property>
 <property name="context_bar">@context_bar@</property>
 
-
-
-
 <p>
   Are you sure you want to send the following @spam_name@ Message?
 </p>
 
-<if @message_type@ eq "html">
   <table class="z_dark" bgcolor="#eeeeee" width="95%" cellpadding="3" cellspacing="3">
     <tr>
       <td width="10%">Subject</td>
-      <td><pre>@subject@</pre></td>
-    </tr>
-    <tr>
-      <td>Message</td>
-      <td>@preview_message@</td>
-    </tr>
-  </table>
-</if>
-<else>
-  <table class="z_dark" bgcolor="#eeeeee" width="95%" cellpadding="3" cellspacing="3">
-    <tr>
-      <td width="10%">Subject</td>
       <td>@subject@</td>
     </tr>
     <tr>
       <td>Message</td>
       <td>        <%= [ad_text_to_html --  "$preview_message"] %></td>
     </tr>
   </table>
-</else>
+
 <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.4.2.1 -r1.4.2.2
--- openacs-4/packages/dotlrn/www/spam-2.tcl	17 Oct 2002 12:17:40 -0000	1.4.2.1
+++ openacs-4/packages/dotlrn/www/spam-2.tcl	14 Jan 2003 20:22:49 -0000	1.4.2.2
@@ -30,20 +30,9 @@
     portal_id:onevalue
 }
 
-form get_values spam_message subject message message_type
+form get_values spam_message subject message
 
-# the following is just to make sure the previewing works ok.
-# in case the user types a html message and chooses the messsage 
-# to be a plain text type or vice-versa.
-if {$message_type == "html"} {
-	if [ad_looks_like_html_p $message] {
-	     set preview_message "<pre>$message</pre>"
-           } else {
-	     set preview_message "$message"
-        }
-} else {
-	set preview_message [ad_quotehtml $message]
-}
+set preview_message [ad_quotehtml $message]
 
 set spam_name [bulk_mail::parameter -parameter PrettyName -default Spam]
 set context_bar [list [list $referer Admin] "$spam_name Community"]
Index: openacs-4/packages/dotlrn/www/spam.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam.tcl,v
diff -u -r1.17.2.1 -r1.17.2.2
--- openacs-4/packages/dotlrn/www/spam.tcl	17 Oct 2002 12:17:40 -0000	1.17.2.1
+++ openacs-4/packages/dotlrn/www/spam.tcl	14 Jan 2003 20:23:00 -0000	1.17.2.2
@@ -75,13 +75,6 @@
     -widget textarea \
     -html {rows 10 cols 80 wrap soft}
 
-element create spam_message message_type \
-    -label "Message Type" \
-    -datatype text \
-    -widget select \
-    -options {{"Plain text" "text"} {HTML "html"}} \
-    -value "text"
-
 element create spam_message send_date \
     -label {Send Date} \
     -datatype date \
@@ -97,7 +90,7 @@
 
 if {[ns_queryexists "form:confirm"]} {
     form get_values spam_message \
-        community_id from rel_type subject message message_type send_date referer
+        community_id from rel_type subject message send_date referer
 
     set segment_id [db_string select_rel_segment_id {}]
     set community_name [dotlrn_community::get_community_name $community_id]
@@ -158,7 +151,6 @@
         -from_addr $from \
         -subject "\[$community_name\] $subject" \
         -message $message \
-        -message_type $message_type \
         -query $query
 
     ad_returnredirect $referer