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 -r1.12 -r1.13 --- openacs.org-dev/packages/forums/www/message-post.tcl 20 Dec 2002 13:22:58 -0000 1.12 +++ openacs.org-dev/packages/forums/www/message-post.tcl 1 Feb 2003 23:26:01 -0000 1.13 @@ -9,6 +9,7 @@ } -query { {forum_id ""} {parent_id ""} + {html_p "f"} } -validate { forum_id_or_parent_id { if {[empty_string_p $forum_id] && [empty_string_p $parent_id]} { @@ -55,7 +56,7 @@ element create message html_p \ -label Format \ -datatype text \ - -widget select \ + -widget radio \ -options {{text f} {html t}} element create message parent_id \ @@ -102,7 +103,7 @@ 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(subject) [ad_quotehtml $subject] set message(content) $content set message(user_id) $user_id set message(user_name) [db_string select_name {}] @@ -176,15 +177,16 @@ } set message_id [db_nextval acs_object_id_seq] -set subject "" +#set subject "" if {![empty_string_p $parent_id]} { # get the parent message information forum::message::get -message_id $parent_id -array parent_message set forum_id $parent_message(forum_id) + set parent_message(subject) [ad_quotehtml $parent_message(subject)] set subject "Re: $parent_message(subject)" - regsub {^(\s*Re:\s*)*} $subject {Re: } subject - + # trim multiple leading Re: + regsub {^(\s*Re:\s*)*} $subject {Re: } subject } forum::security::require_post_forum -forum_id $forum_id @@ -195,7 +197,10 @@ 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 + # only set subject is this is a reply to a previous message + if {[info exists subject]} { + element set_properties message subject -value $subject + } element set_properties message confirm_p -value 0 element set_properties message subscribe_p -value 0