Index: openacs-4/packages/forums/forums.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/forums.info,v diff -u -r1.56.2.17 -r1.56.2.18 --- openacs-4/packages/forums/forums.info 3 Oct 2021 18:20:38 -0000 1.56.2.17 +++ openacs-4/packages/forums/forums.info 15 Jul 2022 16:19:55 -0000 1.56.2.18 @@ -9,7 +9,7 @@ f t - + OpenACS Online discussion forums. 2021-09-15 @@ -19,9 +19,9 @@ 2 #forums.Forums# - + - + Index: openacs-4/packages/forums/lib/forums-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/forums-portlet.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/forums/lib/forums-portlet.tcl 6 Jun 2018 14:34:18 -0000 1.7 +++ openacs-4/packages/forums/lib/forums-portlet.tcl 15 Jul 2022 16:19:55 -0000 1.7.2.1 @@ -9,7 +9,7 @@ @param cache cache interval, seconds, 0 for no cache (default 0) @param show_empty_p if set, show even if there are no contents (default 1) } { - {package_id:integer ""} + {package_id:object_type(apm_package) ""} {base_url:localurl ""} {n:naturalnum,notnull 2} {class:word ""} Index: openacs-4/packages/forums/lib/forums/new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/forums/new.tcl,v diff -u -r1.9.2.3 -r1.9.2.4 --- openacs-4/packages/forums/lib/forums/new.tcl 19 Jun 2019 17:26:58 -0000 1.9.2.3 +++ openacs-4/packages/forums/lib/forums/new.tcl 15 Jul 2022 16:19:55 -0000 1.9.2.4 @@ -1,4 +1,4 @@ -ad_page_contract { +ad_include_contract { Create a Forum By default redirects to the level above as that is prolly where the index page is @@ -7,12 +7,10 @@ @creation-date 2002-05-25 @cvs-id $Id$ +} { + {name ""} } -if { ![info exists name] } { - set name {} -} - set package_id [ad_conn package_id] form create forum Index: openacs-4/packages/forums/lib/message/post.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/post.tcl,v diff -u -r1.30.2.9 -r1.30.2.10 --- openacs-4/packages/forums/lib/message/post.tcl 28 Apr 2022 15:06:44 -0000 1.30.2.9 +++ openacs-4/packages/forums/lib/message/post.tcl 15 Jul 2022 16:19:56 -0000 1.30.2.10 @@ -8,8 +8,8 @@ } { message_id:object_id,optional - forum_id:object_id,notnull - {parent_id:object_id ""} + forum_id:object_type(forums_forum) + {parent_id:object_type(forums_message) ""} {subject:printable,string_length(max|200) ""} {message_body:printable ""} {message_body.format:token ""} Index: openacs-4/packages/forums/lib/message/row.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/row.tcl,v diff -u -r1.16.2.4 -r1.16.2.5 --- openacs-4/packages/forums/lib/message/row.tcl 15 Jul 2019 14:48:36 -0000 1.16.2.4 +++ openacs-4/packages/forums/lib/message/row.tcl 15 Jul 2022 16:19:56 -0000 1.16.2.5 @@ -8,7 +8,7 @@ @cvs-id $Id$ } { - {rownum:integer 1} + {rownum:naturalnum 1} {presentation_type:word ""} {forum_moderated_p:boolean 0} {moderate_p:boolean 0} Index: openacs-4/packages/forums/lib/message/threads-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/threads-chunk.tcl,v diff -u -r1.32 -r1.32.2.1 --- openacs-4/packages/forums/lib/message/threads-chunk.tcl 14 Sep 2018 07:58:26 -0000 1.32 +++ openacs-4/packages/forums/lib/message/threads-chunk.tcl 15 Jul 2022 16:19:56 -0000 1.32.2.1 @@ -5,7 +5,7 @@ @creation-date 2002-05-24 @cvs-id $Id$ } { - forum_id:naturalnum,notnull + forum_id:object_type(forums_forum) {orderby:token,notnull "last_child_post,desc"} {flush_p:boolean,notnull 0} {page_size:naturalnum,notnull 30} Index: openacs-4/packages/forums/lib/search/search-form.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/search/search-form.tcl,v diff -u -r1.3.2.1 -r1.3.2.2 --- openacs-4/packages/forums/lib/search/search-form.tcl 20 Dec 2019 16:58:27 -0000 1.3.2.1 +++ openacs-4/packages/forums/lib/search/search-form.tcl 15 Jul 2022 16:19:56 -0000 1.3.2.2 @@ -5,7 +5,7 @@ @creation-date 2007-12-23 @cvs-id $Id$ } { - forum_id:naturalnum,optional + forum_id:object_type(forums_forum) } form create search -action search -has_submit 0 Index: openacs-4/packages/forums/lib/user/post-history-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/user/post-history-chunk.tcl,v diff -u -r1.10.2.2 -r1.10.2.3 --- openacs-4/packages/forums/lib/user/post-history-chunk.tcl 12 Oct 2021 09:32:52 -0000 1.10.2.2 +++ openacs-4/packages/forums/lib/user/post-history-chunk.tcl 15 Jul 2022 16:19:56 -0000 1.10.2.3 @@ -7,7 +7,7 @@ @cvs-id $Id$ } { - user_id:naturalnum,notnull + user_id:object_type(user) {groupby:word "forum_name"} {view:word "date"} {alt_template ""} Index: openacs-4/packages/forums/www/forum-view-statistic.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view-statistic.tcl,v diff -u -r1.3 -r1.3.2.1 --- openacs-4/packages/forums/www/forum-view-statistic.tcl 7 Aug 2017 23:48:11 -0000 1.3 +++ openacs-4/packages/forums/www/forum-view-statistic.tcl 15 Jul 2022 16:19:56 -0000 1.3.2.1 @@ -6,7 +6,7 @@ @creation-date 2005-03-17 } { - forum_id:naturalnum,notnull + forum_id:object_type(forums_forum) } # Get user information Index: openacs-4/packages/forums/www/forum-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view.tcl,v diff -u -r1.38.2.4 -r1.38.2.5 --- openacs-4/packages/forums/www/forum-view.tcl 26 Sep 2020 12:10:23 -0000 1.38.2.4 +++ openacs-4/packages/forums/www/forum-view.tcl 15 Jul 2022 16:19:56 -0000 1.38.2.5 @@ -7,27 +7,18 @@ @cvs-id $Id$ } -query { - forum_id:naturalnum,notnull + forum_id:object_type(forums_forum) {orderby:token,notnull "last_child_post,desc"} {flush_p:boolean,notnull 0} page:naturalnum,optional,notnull page_size:naturalnum,optional,notnull } -ad_try { - # - # Get forum data - # - forum::get -forum_id $forum_id -array forum +# +# Get forum data +# +forum::get -forum_id $forum_id -array forum -} trap NOT_FOUND {} { - ns_returnnotfound - ad_script_abort - -} on error {errMsg} { - error $errMsg $::errorInfo $::errorCode -} - # If disabled! if {$forum(enabled_p) != "t"} { ad_returnredirect "./" Index: openacs-4/packages/forums/www/load-message-content.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/load-message-content.tcl,v diff -u -r1.6.2.1 -r1.6.2.2 --- openacs-4/packages/forums/www/load-message-content.tcl 10 Mar 2019 22:06:40 -0000 1.6.2.1 +++ openacs-4/packages/forums/www/load-message-content.tcl 15 Jul 2022 16:19:56 -0000 1.6.2.2 @@ -6,16 +6,12 @@ @creation-date 2006-04-21 } { - message_id:naturalnum,notnull + message_id:object_type(forums_message) } # Get the message information forum::message::get -message_id $message_id -array message -if {![array exists message]} { - ns_returnnotfound - ad_script_abort -} set message(content) [ad_html_text_convert \ -from $message(format) \ Index: openacs-4/packages/forums/www/mark-all-read.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/mark-all-read.tcl,v diff -u -r1.5.2.1 -r1.5.2.2 --- openacs-4/packages/forums/www/mark-all-read.tcl 8 Feb 2021 12:27:14 -0000 1.5.2.1 +++ openacs-4/packages/forums/www/mark-all-read.tcl 15 Jul 2022 16:19:56 -0000 1.5.2.2 @@ -6,7 +6,7 @@ @creation-date 2004-09-06 } { - forum_id:naturalnum,notnull + forum_id:object_type(forums_forum) } set user_id [ad_conn user_id] Index: openacs-4/packages/forums/www/message-email.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-email.tcl,v diff -u -r1.19.2.1 -r1.19.2.2 --- openacs-4/packages/forums/www/message-email.tcl 12 Apr 2022 12:27:40 -0000 1.19.2.1 +++ openacs-4/packages/forums/www/message-email.tcl 15 Jul 2022 16:19:56 -0000 1.19.2.2 @@ -7,21 +7,15 @@ @cvs-id $Id$ } { - message_id:naturalnum,notnull -} -validate { - valid_message_id -requires {message_id:naturalnum} { - # Load up the message information - forum::message::get -message_id $message_id -array message - if {![array exists message]} { - ad_complain "Invalid message_id" - } - } + message_id:object_type(forums_message) } # require login to avoid abuse from spammers auth::require_login +forum::message::get -message_id $message_id -array message + # Get the message information forum::security::require_read_forum -forum_id $message(forum_id) set message(tree_level) 0 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.48.2.2 -r1.48.2.3 --- openacs-4/packages/forums/www/message-post.tcl 5 Oct 2019 13:17:05 -0000 1.48.2.2 +++ openacs-4/packages/forums/www/message-post.tcl 15 Jul 2022 16:19:56 -0000 1.48.2.3 @@ -7,25 +7,20 @@ @cvs-id $Id$ } -query { - {forum_id:integer ""} - {parent_id:integer ""} + {forum_id:object_type(forums_forum) ""} + {parent_id:object_type(forums_message) ""} } -validate { forum_id_or_parent_id { if {$forum_id eq "" && $parent_id eq ""} { ad_complain [_ forums.lt_You_either_have_to] } - if {$forum_id ne "" && ![forum::valid_forum_id_p -forum_id $forum_id]} { - ad_complain [_ acs-templating.Invalid_integer] - } - if {$parent_id ne ""} { - forum::message::get -message_id $parent_id -array parent_message - if {![info exists parent_message]} { - ad_complain [_ acs-templating.Invalid_integer] - } - } } } +if {$parent_id ne ""} { + forum::message::get -message_id $parent_id -array parent_message +} + if { [ns_queryget formbutton:post] ne "" } { set action post } elseif { [ns_queryget formbutton:preview] ne "" } { Index: openacs-4/packages/forums/www/message-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.tcl,v diff -u -r1.57.2.4 -r1.57.2.5 --- openacs-4/packages/forums/www/message-view.tcl 14 Feb 2021 21:17:57 -0000 1.57.2.4 +++ openacs-4/packages/forums/www/message-view.tcl 15 Jul 2022 16:19:56 -0000 1.57.2.5 @@ -7,16 +7,8 @@ @cvs-id $Id$ } { - message_id:naturalnum,notnull + message_id:object_type(forums_message) {display_mode:word ""} -} -validate { - valid_message_id -requires {message_id:naturalnum} { - # Load up the message information - forum::message::get -message_id $message_id -array message - if {![array exists message]} { - ad_complain "Invalid message_id" - } - } } ####################### @@ -25,6 +17,8 @@ # ####################### +# Load up the message information +forum::message::get -message_id $message_id -array message # Load up the forum information forum::get -forum_id $message(forum_id) -array forum Index: openacs-4/packages/forums/www/messages-get.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/messages-get.tcl,v diff -u -r1.3.2.1 -r1.3.2.2 --- openacs-4/packages/forums/www/messages-get.tcl 12 Apr 2022 12:14:11 -0000 1.3.2.1 +++ openacs-4/packages/forums/www/messages-get.tcl 15 Jul 2022 16:19:56 -0000 1.3.2.2 @@ -1,6 +1,6 @@ ad_page_contract { } { - cid:integer + cid:object_type(forums_message) {op noop} {sid nosid} {dynamicmode:integer} Index: openacs-4/packages/forums/www/search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/search.tcl,v diff -u -r1.15 -r1.15.2.1 --- openacs-4/packages/forums/www/search.tcl 7 Aug 2017 23:48:11 -0000 1.15 +++ openacs-4/packages/forums/www/search.tcl 15 Jul 2022 16:19:56 -0000 1.15.2.1 @@ -6,7 +6,7 @@ @cvs-id $Id$ } -query { - {forum_id:integer ""} + {forum_id:object_type(forums_forum) ""} } set page_title [_ forums.Search_Forums] Index: openacs-4/packages/forums/www/user-history.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/user-history.tcl,v diff -u -r1.16.2.2 -r1.16.2.3 --- openacs-4/packages/forums/www/user-history.tcl 15 Mar 2022 12:29:46 -0000 1.16.2.2 +++ openacs-4/packages/forums/www/user-history.tcl 15 Jul 2022 16:19:56 -0000 1.16.2.3 @@ -7,15 +7,9 @@ @cvs-id $Id$ } { - user_id:naturalnum,object_id,notnull + user_id:object_type(user) {view:word "date"} {groupby "forum_name"} -} -validate { - valid_user -requires user_id { - if {$user_id == 0 || ![person::person_p -party_id $user_id]} { - ad_complain "Invalid user_id" - } - } } # Get username Index: openacs-4/packages/forums/www/admin/forum-disable.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/forum-disable.tcl,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/forums/www/admin/forum-disable.tcl 19 Jan 2018 14:20:33 -0000 1.9 +++ openacs-4/packages/forums/www/admin/forum-disable.tcl 15 Jul 2022 16:19:56 -0000 1.9.2.1 @@ -7,7 +7,7 @@ @cvs-id $Id$ } { - forum_id:naturalnum,notnull + forum_id:object_type(forums_forum) } forum::disable -forum_id $forum_id 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.16.2.1 -r1.16.2.2 --- openacs-4/packages/forums/www/admin/forum-edit.tcl 29 Dec 2021 16:56:40 -0000 1.16.2.1 +++ openacs-4/packages/forums/www/admin/forum-edit.tcl 15 Jul 2022 16:19:56 -0000 1.16.2.2 @@ -7,7 +7,7 @@ @cvs-id $Id$ } { - forum_id:naturalnum,notnull + forum_id:object_type(forums_forum) {return_url:localurl "."} } Index: openacs-4/packages/forums/www/admin/forum-enable.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/forum-enable.tcl,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/forums/www/admin/forum-enable.tcl 19 Jan 2018 14:20:33 -0000 1.9 +++ openacs-4/packages/forums/www/admin/forum-enable.tcl 15 Jul 2022 16:19:56 -0000 1.9.2.1 @@ -7,7 +7,7 @@ @cvs-id $Id$ } { - forum_id:naturalnum,notnull + forum_id:object_type(forums_forum) } forum::enable -forum_id $forum_id Index: openacs-4/packages/forums/www/admin/permissions-user-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/permissions-user-add.tcl,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/forums/www/admin/permissions-user-add.tcl 7 Aug 2017 23:48:12 -0000 1.5 +++ openacs-4/packages/forums/www/admin/permissions-user-add.tcl 15 Jul 2022 16:19:56 -0000 1.5.2.1 @@ -5,7 +5,7 @@ @creation-date 2003-06-13 @cvs-id $Id$ } { - object_id:naturalnum,notnull + object_id:object_type(apm_package|forums_forum) } if { $object_id == [ad_conn package_id] } { Index: openacs-4/packages/forums/www/admin/permissions.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/permissions.tcl,v diff -u -r1.4 -r1.4.2.1 --- openacs-4/packages/forums/www/admin/permissions.tcl 7 Aug 2017 23:48:12 -0000 1.4 +++ openacs-4/packages/forums/www/admin/permissions.tcl 15 Jul 2022 16:19:56 -0000 1.4.2.1 @@ -5,7 +5,7 @@ @creation-date 2003-06-13 @cvs-id $Id$ } { - object_id:naturalnum,notnull + object_id:object_type(apm_package|forums_forum) } if { $object_id == [ad_conn package_id] } { Index: openacs-4/packages/forums/www/admin/subscribe-others-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/subscribe-others-2.tcl,v diff -u -r1.11.2.2 -r1.11.2.3 --- openacs-4/packages/forums/www/admin/subscribe-others-2.tcl 1 Sep 2020 17:30:27 -0000 1.11.2.2 +++ openacs-4/packages/forums/www/admin/subscribe-others-2.tcl 15 Jul 2022 16:19:56 -0000 1.11.2.3 @@ -7,14 +7,14 @@ @cvs-id $Id$ } { - forum_id:naturalnum,notnull - type_id:naturalnum,notnull + forum_id:object_type(forums_forum) + type_id:object_type(notification_type) {lines} {return_url:localurl "."} - interval:notnull - delivery_method:notnull + interval:object_type(notification_interval) + delivery_method:object_type(notification_delivery_method) {emails ""} - {subscriber_ids:integer,multiple} + {subscriber_ids:object_type(user),multiple} {create_new_users_p:boolean "f"} } Index: openacs-4/packages/forums/www/admin/subscribe-others.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/subscribe-others.tcl,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/forums/www/admin/subscribe-others.tcl 24 Apr 2018 14:28:56 -0000 1.6 +++ openacs-4/packages/forums/www/admin/subscribe-others.tcl 15 Jul 2022 16:19:56 -0000 1.6.2.1 @@ -7,7 +7,7 @@ @cvs-id $Id$ } { - forum_id:naturalnum,notnull + forum_id:object_type(forums_forum) {return_url:localurl "."} } Index: openacs-4/packages/forums/www/moderate/forum.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/forum.tcl,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/forums/www/moderate/forum.tcl 7 Aug 2017 23:48:12 -0000 1.7 +++ openacs-4/packages/forums/www/moderate/forum.tcl 15 Jul 2022 16:19:56 -0000 1.7.2.1 @@ -7,7 +7,7 @@ @cvs-id $Id$ } { - forum_id:naturalnum,notnull + forum_id:object_type(forums_forum) } # Check that the user can moderate the forum Index: openacs-4/packages/forums/www/moderate/message-approve.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/message-approve.tcl,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/forums/www/moderate/message-approve.tcl 26 Jun 2018 14:21:39 -0000 1.9 +++ openacs-4/packages/forums/www/moderate/message-approve.tcl 15 Jul 2022 16:19:56 -0000 1.9.2.1 @@ -7,7 +7,7 @@ @cvs-id $Id$ } { - message_id:naturalnum,notnull + message_id:object_type(forums_message) {return_url:localurl "../message-view"} } Index: openacs-4/packages/forums/www/moderate/message-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/message-delete.tcl,v diff -u -r1.18.2.1 -r1.18.2.2 --- openacs-4/packages/forums/www/moderate/message-delete.tcl 14 Feb 2019 15:00:15 -0000 1.18.2.1 +++ openacs-4/packages/forums/www/moderate/message-delete.tcl 15 Jul 2022 16:19:56 -0000 1.18.2.2 @@ -7,7 +7,7 @@ @cvs-id $Id$ } { - message_id:naturalnum,notnull,verify + message_id:object_type(forums_message),verify {return_url:localurl "../message-view"} {confirm_p:boolean 0} } Index: openacs-4/packages/forums/www/moderate/message-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/message-edit.tcl,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/forums/www/moderate/message-edit.tcl 7 Aug 2017 23:48:12 -0000 1.10 +++ openacs-4/packages/forums/www/moderate/message-edit.tcl 15 Jul 2022 16:19:56 -0000 1.10.2.1 @@ -7,7 +7,7 @@ @cvs-id $Id$ } { - message_id:naturalnum,notnull + message_id:object_type(forums_message) {return_url:localurl "../message-view"} } Index: openacs-4/packages/forums/www/moderate/message-move.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/message-move.tcl,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/forums/www/moderate/message-move.tcl 27 Sep 2017 11:07:52 -0000 1.5 +++ openacs-4/packages/forums/www/moderate/message-move.tcl 15 Jul 2022 16:19:56 -0000 1.5.2.1 @@ -6,7 +6,7 @@ @creation-date 2005-03-14 } { - message_id:naturalnum,notnull + message_id:object_type(forums_message) {return_url:localurl "../message-view"} {confirm_p:boolean 0} } Index: openacs-4/packages/forums/www/moderate/message-reject.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/message-reject.tcl,v diff -u -r1.8 -r1.8.2.1 --- openacs-4/packages/forums/www/moderate/message-reject.tcl 19 Jan 2018 14:20:33 -0000 1.8 +++ openacs-4/packages/forums/www/moderate/message-reject.tcl 15 Jul 2022 16:19:56 -0000 1.8.2.1 @@ -7,7 +7,7 @@ @cvs-id $Id$ } { - message_id:naturalnum,notnull + message_id:object_type(forums_message) {return_url:localurl "../message-view"} } Index: openacs-4/packages/forums/www/moderate/move-thread-thread.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/move-thread-thread.tcl,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/forums/www/moderate/move-thread-thread.tcl 7 Apr 2018 19:07:31 -0000 1.9 +++ openacs-4/packages/forums/www/moderate/move-thread-thread.tcl 15 Jul 2022 16:19:56 -0000 1.9.2.1 @@ -6,8 +6,8 @@ @creation-date 2005-03-29 } { - msg_id:naturalnum,notnull - selected_message:integer,notnull + msg_id:object_type(forums_message) + selected_message:object_type(forums_message) {confirm_p:boolean 0} } Index: openacs-4/packages/forums/www/moderate/move-thread.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/move-thread.tcl,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/forums/www/moderate/move-thread.tcl 13 Nov 2017 15:22:26 -0000 1.10 +++ openacs-4/packages/forums/www/moderate/move-thread.tcl 15 Jul 2022 16:19:56 -0000 1.10.2.1 @@ -6,8 +6,8 @@ @creation-date 2005-03-14 } { - msg_id:naturalnum,notnull - selected_message:integer,notnull + msg_id:object_type(forums_message) + selected_message:object_type(forums_message) {confirm_p:boolean 0} } Index: openacs-4/packages/forums/www/moderate/move.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/move.tcl,v diff -u -r1.10 -r1.10.2.1 --- openacs-4/packages/forums/www/moderate/move.tcl 13 Nov 2017 15:35:09 -0000 1.10 +++ openacs-4/packages/forums/www/moderate/move.tcl 15 Jul 2022 16:19:56 -0000 1.10.2.1 @@ -6,8 +6,8 @@ @creation-date 2005-03-14 } { - message_id:naturalnum,notnull - selected_forum:integer,notnull + message_id:object_type(forums_message) + selected_forum:object_type(forums_forum) {confirm_p:boolean 0} } Index: openacs-4/packages/forums/www/moderate/thread-move-thread.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/thread-move-thread.tcl,v diff -u -r1.5 -r1.5.2.1 --- openacs-4/packages/forums/www/moderate/thread-move-thread.tcl 27 Sep 2017 11:07:52 -0000 1.5 +++ openacs-4/packages/forums/www/moderate/thread-move-thread.tcl 15 Jul 2022 16:19:56 -0000 1.5.2.1 @@ -6,7 +6,7 @@ @creation-date 2005-03-14 } { - message_id:naturalnum,notnull + message_id:object_type(forums_message) {return_url:localurl "../message-view"} {confirm_p:boolean 0} } Index: openacs-4/packages/forums/www/moderate/thread-move.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/thread-move.tcl,v diff -u -r1.6 -r1.6.2.1 --- openacs-4/packages/forums/www/moderate/thread-move.tcl 27 Sep 2017 11:07:52 -0000 1.6 +++ openacs-4/packages/forums/www/moderate/thread-move.tcl 15 Jul 2022 16:19:56 -0000 1.6.2.1 @@ -6,7 +6,7 @@ @creation-date 2005-03-14 } { - message_id:naturalnum,notnull + message_id:object_type(forums_message) {return_url:localurl "../message-view"} {confirm_p:boolean 0} }