Index: openacs-4/packages/forums/www/message-post.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-post.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/forums/www/message-post.tcl	10 Sep 2002 22:22:56 -0000	1.13
+++ openacs-4/packages/forums/www/message-post.tcl	21 Oct 2002 18:35:57 -0000	1.14
@@ -34,14 +34,29 @@
     -label Subject \
     -datatype text \
     -widget text \
-    -html {size 60}
+    -html {size 60} \
+    -validate { {expr ![empty_string_p [string trim $value]]} {Please enter a subject} }
 
+# we use ns_queryget to get the value of html_p because it won't be defined
+# until the next element -DaveB
+
 element create message content \
     -label Body \
     -datatype text \
     -widget textarea \
-    -html {rows 20 cols 60 wrap soft}
+    -html {rows 20 cols 60 wrap soft} \
+    -validate {
+	empty {expr ![empty_string_p [string trim $value]]} {Please enter a message}
+	html { expr {( [string match [set l_html_p [ns_queryget html_p f]] "t"] && [empty_string_p [set v_message [ad_html_security_check $value]]] ) || [string match $l_html_p "f"] } }
+	     {}	
+	}
 
+element create message html_p \
+    -label Format \
+    -datatype text \
+    -widget select \
+    -options {{text f} {html t}}
+
 element create message parent_id \
     -label "parent ID" \
     -datatype integer \
@@ -53,12 +68,6 @@
     -datatype integer \
     -widget hidden
 
-element create message html_p \
-    -label Format \
-    -datatype text \
-    -widget select \
-    -options {{text f} {html t}}
-
 element create message confirm_p \
     -label "Confirm?" \
     -datatype text \