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 -r1.13 -r1.13.2.1 --- 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 22 Oct 2002 14:42:42 -0000 1.13.2.1 @@ -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 \ @@ -161,7 +170,7 @@ } set message_id [db_nextval acs_object_id_seq] -set subject "" +#set subject "" if {![empty_string_p $parent_id]} { # get the parent message information @@ -179,7 +188,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 Index: openacs-4/packages/forums/www/admin/forum-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/forum-edit.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/forums/www/admin/forum-edit.tcl 10 Sep 2002 22:22:57 -0000 1.7 +++ openacs-4/packages/forums/www/admin/forum-edit.tcl 22 Oct 2002 14:42:45 -0000 1.7.2.1 @@ -16,7 +16,8 @@ -label "Forum ID" -datatype integer -widget hidden element create forum name \ - -label "Name" -datatype text -widget text -html {size 60} + -label "Name" -datatype text -widget text -html {size 60} -validate { {expr ![empty_string_p [string trim $value]]} {Forum Name can not be blank} + } element create forum charter \ -label "Charter" -datatype text -widget textarea -html {cols 60 rows 10 wrap soft} -optional Index: openacs-4/packages/forums/www/admin/forum-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/forum-new.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/forums/www/admin/forum-new.tcl 20 Sep 2002 21:31:28 -0000 1.8 +++ openacs-4/packages/forums/www/admin/forum-new.tcl 22 Oct 2002 14:42:45 -0000 1.8.2.1 @@ -23,7 +23,9 @@ -label Name \ -datatype text \ -widget text \ - -html {size 60} + -html {size 60} \ + -validate { {expr ![empty_string_p [string trim $value]]} {Forum Name can not be blank} + } element create forum charter \ -label Charter \