Index: openacs.org-dev/packages/forums/www/message-post.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/message-post.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs.org-dev/packages/forums/www/message-post.tcl	9 Jul 2002 17:35:09 -0000	1.1
+++ openacs.org-dev/packages/forums/www/message-post.tcl	12 Aug 2002 19:58:07 -0000	1.2
@@ -19,81 +19,58 @@
 
 set user_id [ad_verify_and_get_user_id]
 
-form create message
+# get the colors from the params
+set table_border_color [parameter::get -parameter table_border_color]
+set table_bgcolor [parameter::get -parameter table_bgcolor]
 
-element create message message_id \
-    -label "Message ID" \
-    -datatype integer \
-    -widget hidden
+ad_form -name message -confirm_template message-post-confirm -form {
 
-element create message subject \
-    -label Subject \
-    -datatype text \
-    -widget text \
-    -html {size 60}
+    message_id:key
 
-element create message content \
-    -label Body \
-    -datatype text \
-    -widget textarea \
-    -html {rows 20 cols 60 wrap soft}
+    {subject:text(text)
+	{label Subject}
+	{html {size 60}}
+    }
 
-element create message parent_id \
-    -label "parent ID" \
-    -datatype integer \
-    -widget hidden \
-    -optional
+    {content:text(textarea)
+	{label Body}
+	{html {rows 20 cols 60 wrap soft}}
+    }
 
-element create message forum_id \
-    -label "forum ID" \
-    -datatype integer \
-    -widget hidden
+    {parent_id:text(hidden)}
 
-element create message html_p \
-    -label Format \
-    -datatype text \
-    -widget select \
-    -options {{text f} {html t}}
+    {forum_id:text(hidden)}
 
-element create message confirm_p \
-    -label "Confirm?" \
-    -datatype text \
-    -widget hidden
+    {html_p:text(select)
+	{label Format}
+	{options {{text f} {html t}}}
+    }
+    {subscribe_p:text(hidden)}
+}
 
-element create message subscribe_p \
-    -label "Subscribe?" \
-    -datatype text \
-    -widget hidden \
-    -optional
-
 set attachments_enabled_p [forum::attachments_enabled_p]
 
 if {$attachments_enabled_p} {
-    ns_log Notice "FORUMS: attachments enabled"
-    element create message attach_p \
-            -label "Attach?" \
-            -datatype text \
-            -widget hidden \
-            -optional
+
+    ad_form -extend -name message -form {
+	{attach_p:text(hidden)}
+    }
 } else {
     ns_log Notice "FORUMS: attachments not enabled"
-}
+} -new_data {
 
-if {[form is_valid message]} {
-    form get_values message \
-        message_id forum_id parent_id subject content html_p confirm_p subscribe_p
-
-    if {!$confirm_p} {
         forum::get -forum_id $forum_id -array forum
 
         set confirm_p 1
+        set content [string trimright $content]
         set exported_vars [export_form_vars message_id forum_id parent_id subject content html_p confirm_p]
         
+        set message(html_p) $html_p
         set message(subject) $subject
         set message(content) $content
         set message(user_id) $user_id
-        set message(user_name) [db_string select_name {select first_names || ' ' || last_name from persons where person_id = :user_id}]
-        set message(posting_date) [db_string select_date {select to_char(sysdate, 'Mon DD YYYY HH24:MI:SS') from dual}]
+        set message(user_name) [db_string select_name {}]
+        set message(posting_date) [db_string select_date {}]
 
         # Let's check if this person is subscribed to the forum
         # in case we might want to subscribe them to the thread
@@ -108,13 +85,6 @@
             }
         }
 
-        set context_bar [list [list "./forum-view?forum_id=$forum_id" "$forum(name)"]]
-        lappend context_bar {Post a Message}
-
-        ad_return_template message-post-confirm
-        return
-    }
-
     forum::message::new \
         -forum_id $forum_id \
         -message_id $message_id \
@@ -155,9 +125,12 @@
     ad_returnredirect $redirect_url
 
     ad_script_abort
-}
+    } -validate { content
+	{[expr {[string equal [set error_message [ad_html_security_check $content]] "" ]}]
+	} $error_message
+    }
 
-set message_id [db_nextval acs_object_id_seq]
+#set message_id [db_nextval acs_object_id_seq]
 set subject ""
 
 if {![empty_string_p $parent_id]} {
@@ -173,12 +146,6 @@
 forum::get -forum_id $forum_id -array forum
 
 # Prepare the other data 
-element set_properties message forum_id -value $forum_id
-element set_properties message parent_id -value $parent_id
-element set_properties message message_id -value $message_id
-element set_properties message subject -value $subject
-element set_properties message confirm_p -value 0
-element set_properties message subscribe_p -value 0
 
 set context_bar [list [list "./forum-view?forum_id=$forum_id" "$forum(name)"]]
 if {![empty_string_p $parent_id]} {