Index: openacs-4/packages/forums/lib/message/post.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/post.tcl,v
diff -u -N -r1.1 -r1.1.1.1
--- openacs-4/packages/forums/lib/message/post.tcl	17 Dec 2003 15:45:29 -0000	1.1
+++ openacs-4/packages/forums/lib/message/post.tcl	28 Jun 2006 20:30:28 -0000	1.1.1.1
@@ -67,8 +67,9 @@
     set init_msg(attach_p) 0
 
     form set_values message init_msg
-
+    
 } elseif {[form is_valid message]} {
+
     ##############################
     # Form processing
     #
@@ -77,26 +78,31 @@
         forum_id \
         parent_id \
         subject \
-        content \
-        html_p \
+        message_body \
         confirm_p \
         subscribe_p \
-        anonymous_p 
-    
+        anonymous_p \
+        attach_p
+
+    if { [empty_string_p $anonymous_p] } { set anonymous_p 0 }
+
     set action [template::form::get_button message]
     set displayed_user_id [ad_decode \
         [expr {$anonymous_allowed_p && $anonymous_p}] \
             0 $user_id \
             0]
 
     if { [string equal $action "preview"] } {
+
         set confirm_p 1
         set subject.spellcheck ":nospell:"
         set content.spellcheck ":nospell:"
-        set content [string trimright $content]
-        set exported_vars [export_form_vars message_id forum_id parent_id subject content html_p confirm_p subject.spellcheck content.spellcheck anonymous_p attach_p]
+        set content [template::util::richtext::get_property content $message_body]
+        set format [template::util::richtext::get_property format $message_body]
+	
+        set exported_vars [export_vars -form {message_id forum_id parent_id subject {message_body $content} {message_body.format $format} confirm_p subject.spellcheck content.spellcheck anonymous_p attach_p}]
         
-        set message(html_p) $html_p
+        set message(format) $format
         set message(subject) $subject
         set message(content) $content
         set message(user_id) $displayed_user_id
@@ -117,20 +123,26 @@
             }
         }
 
-        ad_return_template "/message/post-confirm"
+        ad_return_template "/packages/forums/lib/message/post-confirm"
         return
     }
 
     if { [string equal $action "post"] } {
-      forum::message::new \
+        set content [template::util::richtext::get_property content $message_body]
+        set format [template::util::richtext::get_property format $message_body]
+        forum::message::new \
           -forum_id $forum_id \
           -message_id $message_id \
           -parent_id $parent_id \
           -subject $subject \
           -content $content \
-          -html_p $html_p \
+	  -format $format \
           -user_id $displayed_user_id
 
+      # DRB: Black magic cache flush call which will disappear when list builder is
+      # rewritten to paginate internally rather than use the template paginator.
+      cache flush "messages,forum_id=$forum_id*"
+
       if {[empty_string_p $parent_id]} {
           set redirect_url "[ad_conn package_url]message-view?message_id=$message_id"
       } else {
@@ -151,8 +163,6 @@
 
       # Wrap the attachments URL
       if {$attachments_enabled_p} {
-          form get_values message attach_p
-
           if { ![empty_string_p $attach_p] && $attach_p} {
               set redirect_url [attachments::add_attachment_url -object_id $message_id -return_url $redirect_url -pretty_name "[_ forums.Forum_Posting] \"$subject\""]
           }