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.5 -r1.6 --- openacs.org-dev/packages/forums/www/message-post.tcl 12 Aug 2002 20:22:37 -0000 1.5 +++ openacs.org-dev/packages/forums/www/message-post.tcl 13 Aug 2002 03:11:26 -0000 1.6 @@ -7,6 +7,7 @@ @version $Id$ } -query { + message_id:optional {forum_id ""} {parent_id ""} } -validate { @@ -16,9 +17,13 @@ } } } - set user_id [ad_verify_and_get_user_id] +if { $user_id == 0 } { + ad_returnredirect "/register/?return_url=[ad_urlencode [ad_conn url]?[ad_conn query]]" +} + + if {![empty_string_p $parent_id]} { # get the parent message information forum::message::get -message_id $parent_id -array parent_message @@ -31,6 +36,8 @@ forum::get -forum_id $forum_id -array forum +set attachments_enabled_p [forum::attachments_enabled_p] + # get the colors from the params set table_border_color [parameter::get -parameter table_border_color] set table_bgcolor [parameter::get -parameter table_bgcolor] @@ -49,24 +56,23 @@ {html {rows 20 cols 60 wrap soft}} } - {parent_id:text(hidden)} + {parent_id:text(hidden) {value $parent_id}} - {forum_id:text(hidden)} - + {forum_id:text(hidden) {value $forum_id}} + {attachments_enabled_p:text(hidden) {value $attachments_enabled_p}} {html_p:text(select) {label Format} {options {{text f} {html t}}} } - {subscribe_p:text(hidden)} -} -validate { content - {[expr {[string equal [set error_message [ad_html_security_check $content]] "" ]}]} $error_message} + {subscribe_p:text(hidden),optional} + +} -validate { {content + {[expr { [string equal [set error_message [ad_html_security_check $content]] ""]}]} ${error_message} } } -new_data { 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 @@ -117,7 +123,6 @@ # Wrap the attachments URL if {$attachments_enabled_p} { - form get_values message attach_p if {$attach_p} { set redirect_url [attachments::add_attachment_url -object_id $message_id -return_url $redirect_url -pretty_name "Forum Posting \"$subject\""] @@ -128,9 +133,8 @@ ad_returnredirect $redirect_url ad_script_abort - } +} -set attachments_enabled_p [forum::attachments_enabled_p] if {$attachments_enabled_p} { @@ -141,6 +145,7 @@ ns_log Notice "FORUMS: attachments not enabled" } + #set message_id [db_nextval acs_object_id_seq] set subject "" @@ -153,5 +158,4 @@ } else { lappend context_bar {Post a Message} } - ad_return_template