Index: openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml,v diff -u -N -r1.13 -r1.14 --- openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml 22 Sep 2003 18:29:03 -0000 1.13 +++ openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml 3 Oct 2003 18:26:31 -0000 1.14 @@ -1,6 +1,5 @@ - - + Active Forums Administer @@ -37,6 +36,7 @@ enable it enabled Entire Thread + First Post Flat Format Forum @@ -50,7 +50,7 @@ Forums: Posting history for forward Fwd: - html + HTML Last Post Last post in subject Email a copy of the following message: @@ -70,6 +70,7 @@ Manage Forum: Manage/Moderate Message ID + Moderate moderated Name New Forum @@ -85,6 +86,7 @@ open Parameters parent ID + Pending Pending Threads Post a Message Post a New Message @@ -98,6 +100,7 @@ Presentation Re: reject + Rejected Replies reply Search: @@ -106,7 +109,7 @@ Search Forums Subject Subscribe? - text + Plain text This forum is Threaded Threads Index: openacs-4/packages/forums/sql/oracle/forums-search-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/oracle/forums-search-create.sql,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/forums/sql/oracle/forums-search-create.sql 3 Oct 2003 11:37:06 -0000 1.6 +++ openacs-4/packages/forums/sql/oracle/forums-search-create.sql 3 Oct 2003 18:26:31 -0000 1.7 @@ -57,24 +57,24 @@ show errors -- as ctxsys -connect ctxsys/ctxsys; +connect ctxsys/catssuck; create or replace procedure s_index_message ( rid in rowid, tlob in out NOCOPY clob ) is begin - yon.index_message(rid, tlob); + openacs_4_ora.index_message(rid, tlob); end; / show errors -grant execute on s_index_message to yon; -grant execute on ctx_ddl to yon; +grant execute on s_index_message to openacs_4_ora; +grant execute on ctx_ddl to openacs_4_ora; -- as normal user -connect yon/yon; +connect openacs_4_ora/catssuck; execute ctx_ddl.create_preference('forums_user_datastore', 'user_datastore'); execute ctx_ddl.set_attribute('forums_user_datastore', 'procedure', 's_index_message'); @@ -97,7 +97,7 @@ show errors -- as normal user -connect yon/yon; +connect openacs_4_ora/catssuck; -- ripped off from site-wide-search @@ -264,3 +264,8 @@ end; / show errors; + + +-- LARS TODO: +-- update apm_parameters ... set UseIntermediaForSearchP = 1 for all forums instances ? +-- or set some other flag somehow Index: openacs-4/packages/forums/www/forum-view-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/forum-view-oracle.xql,v diff -u -N -r1.8 -r1.9 --- openacs-4/packages/forums/www/forum-view-oracle.xql 10 Jan 2003 15:13:11 -0000 1.8 +++ openacs-4/packages/forums/www/forum-view-oracle.xql 3 Oct 2003 18:26:31 -0000 1.9 @@ -8,7 +8,7 @@ fm.subject, fm.user_id, person.name(fm.user_id) as user_name, - fm.posting_date, + to_char(fm.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi, fm.state, (select count(*) from forums_messages_approved fm1 @@ -19,7 +19,7 @@ from forums_messages_approved fm where fm.forum_id = :forum_id and fm.parent_id is null - order by fm.${order_by} desc + [template::list::orderby_clause -orderby -name "messages"] @@ -29,7 +29,7 @@ fm.subject, fm.user_id, person.name(fm.user_id) as user_name, - fm.posting_date, + to_char(fm.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi, fm.state, (select count(*) from forums_messages fm1 @@ -40,7 +40,7 @@ from forums_messages fm where fm.forum_id = :forum_id and fm.parent_id is null - order by fm.${order_by} desc + [template::list::orderby_clause -orderby -name "messages"] Index: openacs-4/packages/forums/www/forum-view-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/forum-view-postgresql.xql,v diff -u -N -r1.10 -r1.11 --- openacs-4/packages/forums/www/forum-view-postgresql.xql 20 Jun 2003 13:26:30 -0000 1.10 +++ openacs-4/packages/forums/www/forum-view-postgresql.xql 3 Oct 2003 18:26:31 -0000 1.11 @@ -8,7 +8,7 @@ fm.subject, fm.user_id, person__name(fm.user_id) as user_name, - fm.posting_date, + to_char(fm.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi, fm.state, (select count(*) from forums_messages_approved fm1 @@ -19,7 +19,7 @@ from forums_messages_approved fm where fm.forum_id = :forum_id and fm.parent_id is null - order by fm.${order_by} desc + [template::list::orderby_clause -orderby -name "messages"] @@ -29,7 +29,7 @@ fm.subject, fm.user_id, person__name(fm.user_id) as user_name, - fm.posting_date, + to_char(fm.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi, fm.state, (select count(*) from forums_messages fm1 @@ -40,7 +40,7 @@ from forums_messages_approved fm where fm.forum_id = :forum_id and fm.parent_id is null - order by fm.${order_by} desc + [template::list::orderby_clause -orderby -name "messages"] Index: openacs-4/packages/forums/www/forum-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view.adp,v diff -u -N -r1.22 -r1.23 --- openacs-4/packages/forums/www/forum-view.adp 21 Sep 2003 19:58:58 -0000 1.22 +++ openacs-4/packages/forums/www/forum-view.adp 3 Oct 2003 18:26:31 -0000 1.23 @@ -1,88 +1,40 @@ -#forums.Forum_1# @forum.name;noquote@ -@context;noquote@ + @page_title;noquote@ + @context;noquote@ -
- - [ - - #forums.Administer# | - - #forums.ManageModerate# - ] - - -
- + 		@notification_chunk;noquote@ -
- - - [ #forums.Post_a_New_Message# ] + +

+ » #forums.Post_a_New_Message# +

-
-
- - Sort by: [ @sort_filter;noquote@ ] - 		#forums.Search#  + +
+ [ + + #forums.Administer# + | + + + #forums.ManageModerate# + + ]
+
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#forums.Subject##forums.Author##forums.Replies##forums.Last_Post#
- - - - @messages.subject@ - - - - - (@messages.state@) - - @messages.user_name@@messages.n_messages@@messages.last_child_post_pretty@
#forums.No_Messages#
+ +

+ 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 -N -r1.18 -r1.19 --- openacs-4/packages/forums/www/forum-view.tcl 20 Jun 2003 15:24:24 -0000 1.18 +++ openacs-4/packages/forums/www/forum-view.tcl 3 Oct 2003 18:26:31 -0000 1.19 @@ -8,7 +8,7 @@ } -query { forum_id:integer,notnull - {order_by "posting_date"} + {orderby "posting_date,desc"} } @@ -20,12 +20,11 @@ set table_other_bgcolor [parameter::get -parameter table_other_bgcolor] set package_id [ad_conn package_id] -set user_id [ad_verify_and_get_user_id] set admin_p [forum::security::can_admin_forum_p -forum_id $forum_id] -if {!${admin_p}} { +if { !$admin_p } { set moderate_p [forum::security::can_moderate_forum_p -forum_id $forum_id] - if {!${moderate_p}} { + if { !$moderate_p } { set post_p [expr { [ad_conn user_id] == 0 || [forum::security::can_post_forum_p -forum_id $forum_id] }] } else { set post_p 1 @@ -67,8 +66,102 @@ set query messages_select_moderator } -db_multirow -extend { last_child_post_pretty } messages $query {} { +set admin_url [export_vars -base "admin/forum-edit" { forum_id {return_url [ad_return_url]}}] +set moderate_url [export_vars -base "moderate/forum" { forum_id }] +set post_url [export_vars -base "message-post" { forum_id }] + +template::list::create \ + -name messages \ + -multirow messages \ + -pass_properties { moderate_p } \ + -elements { + subject { + label "#forums.Subject#" + link_url_col message_url + display_template { + @messages.subject@ + @messages.subject@ + } + } + state_pretty { + label "\#forums.Moderate\#" + hide_p {[ad_decode $moderate_p 1 0 1]} + } + user_name { + label "#forums.Author#" + link_url_col user_url + } + n_messages { + label "#forums.Replies#" + display_col n_messages_pretty + html { align right } + } + posting_date { + label "#forums.First_Post#" + display_col posting_date_pretty + } + last_child_post { + label "#forums.Last_Post#" + display_col last_child_post_pretty + } + } -orderby { + posting_date { + label "#forums.First_Post#" + orderby posting_date + default_direction desc + } + last_child_post { + label "#forums.Last_Post#" + orderby last_child_post + default_direction desc + } + subject { + label "#forums.Subject#" + orderby upper(subject) + } + user_name { + label "#forums.Author#" + orderby_asc {upper(user_name) asc, posting_date desc} + orderby_desc {upper(user_name) desc, posting_date desc} + } + n_messages { + label "#forums.Replies#" + orderby_asc {n_messages asc, posting_date desc} + orderby_desc {n_messages desc, posting_date desc} + } + } -filters { + forum_id {} + } + +db_multirow -extend { + last_child_post_pretty + posting_date_pretty + message_url + user_url + n_messages_pretty + state_pretty +} messages $query {} { + set last_child_post_ansi [lc_time_system_to_conn $last_child_post_ansi] set last_child_post_pretty [lc_time_fmt $last_child_post_ansi "%x %X"] + + set posting_date_ansi [lc_time_system_to_conn $posting_date_ansi] + set posting_date_pretty [lc_time_fmt $posting_date_ansi "%x %X"] + + set message_url [export_vars -base "message-view" { message_id }] + set user_url [export_vars -base "user-history" { user_id }] + set n_messages_pretty [lc_numeric $n_messages] + + switch $state { + pending { + set state_pretty [_ forums.Pending] + } + rejected { + set state_pretty [_ forums.Rejected] + } + default { + set state_pretty {} + } + } } # Need to quote forum(name) since it is noquoted on display as part of an @@ -80,9 +173,8 @@ -url [ad_conn url]?forum_id=$forum_id \ ] +set page_title "[_ forums.Forum_1] $forum(name)" set context [list $forum(name)] -# Sort by first or last posting in a thread (subject) -set sort_filter [forum::message::subject_sort_filter -forum_id $forum_id -order_by $order_by] -ad_return_template + 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 -N -r1.5 -r1.6 --- openacs-4/packages/forums/www/admin/forum-disable.tcl 25 Oct 2002 13:00:03 -0000 1.5 +++ openacs-4/packages/forums/www/admin/forum-disable.tcl 3 Oct 2003 18:26:31 -0000 1.6 @@ -12,7 +12,7 @@ forum::disable -forum_id $forum_id -ad_returnredirect "./forum-edit?forum_id=$forum_id" +ad_returnredirect "." 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 -N -r1.12 -r1.13 --- openacs-4/packages/forums/www/admin/forum-edit.tcl 21 Sep 2003 19:58:58 -0000 1.12 +++ openacs-4/packages/forums/www/admin/forum-edit.tcl 3 Oct 2003 18:26:31 -0000 1.13 @@ -8,10 +8,14 @@ } { forum_id:integer,notnull + {return_url "."} } form create forum +element create forum return_url \ + -datatype text -widget hidden -optional + element create forum forum_id \ -label [_ forums.Forum_ID] -datatype integer -widget hidden @@ -31,7 +35,7 @@ -label [_ forums.lt_Users_Can_Create_New_] -datatype integer -widget radio -options {{Yes 1} {No 0}} if {[form is_valid forum]} { - template::form get_values forum forum_id name charter presentation_type posting_policy new_threads_p + template::form get_values forum return_url forum_id name charter presentation_type posting_policy new_threads_p forum::edit -forum_id $forum_id \ -name $name \ @@ -49,7 +53,7 @@ forum::new_questions_deny -forum_id $forum_id } - ad_returnredirect "../forum-view?forum_id=$forum_id" + ad_returnredirect $return_url ad_script_abort } @@ -67,12 +71,11 @@ set context [list [_ forums.Edit_forum]] if { [form is_request forum] } { + element set_properties forum return_url -value $return_url element set_properties forum forum_id -value $forum_id element set_properties forum name -value $forum(name) element set_properties forum charter -value $forum(charter) element set_properties forum presentation_type -value $forum(presentation_type) element set_properties forum posting_policy -value $forum(posting_policy) element set_properties forum new_threads_p -value [forum::new_questions_allowed_p -forum_id $forum_id] } - -ad_return_template 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 -N -r1.5 -r1.6 --- openacs-4/packages/forums/www/admin/forum-enable.tcl 25 Oct 2002 13:00:03 -0000 1.5 +++ openacs-4/packages/forums/www/admin/forum-enable.tcl 3 Oct 2003 18:26:31 -0000 1.6 @@ -12,7 +12,7 @@ forum::enable -forum_id $forum_id -ad_returnredirect "./forum-edit?forum_id=$forum_id" +ad_returnredirect "." Index: openacs-4/packages/forums/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/index.adp,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/forums/www/admin/index.adp 3 Oct 2003 11:52:37 -0000 1.7 +++ openacs-4/packages/forums/www/admin/index.adp 3 Oct 2003 18:26:31 -0000 1.8 @@ -3,28 +3,18 @@

#forums.Forums#

- Index: openacs-4/packages/forums/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/index.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/forums/www/admin/index.tcl 22 Sep 2003 18:29:04 -0000 1.5 +++ openacs-4/packages/forums/www/admin/index.tcl 3 Oct 2003 18:26:31 -0000 1.6 @@ -8,11 +8,63 @@ } -# scoping -set package_id [ad_conn package_id] +template::list::create \ + -name forums \ + -multirow forums \ + -elements { + edit { + label {} + sub_class narrow + display_template { + + } + link_url_col edit_url + } + name { + label "#forums.Forum_Name#" + link_url_col view_url + } + enabled { + label "Enabled" + html { align center } + display_template { + + \#forums.disable\# + + + \#forums.enable\# + + } + } + permissions { + label "#acs-subsite.Permissions#" + display_template "#acs-subsite.Permissions#" + link_url_col permissions_url + } + } + # List of forums -db_multirow forums select_forums {} +set package_id [ad_conn package_id] +db_multirow -extend { + view_url + edit_url + permissions_url + enable_url + disable_url +} forums select_forums {} { + if { [template::util::is_true $enabled_p] } { + set view_url [export_vars -base "[ad_conn package_url]forum-view" { forum_id }] + } else { + set view_url {} + } + set edit_url [export_vars -base "forum-edit" { forum_id }] + set permissions_url [export_vars -base permissions { { object_id $forum_id } }] + set enable_url [export_vars -base "forum-enable" { forum_id }] + set disable_url [export_vars -base "forum-disable" { forum_id }] +} -set parameters_url "/shared/parameters?[export_vars { { return_url [ad_return_url] } { package_id {[ad_conn package_id]} } }]" +set parameters_url [export_vars -base "/shared/parameters" { { return_url [ad_return_url] } { package_id {[ad_conn package_id]} } }] +set permissions_url [export_vars -base "permissions" { { 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 -N -r1.1 -r1.2 --- openacs-4/packages/forums/www/admin/permissions.tcl 21 Sep 2003 19:58:58 -0000 1.1 +++ openacs-4/packages/forums/www/admin/permissions.tcl 3 Oct 2003 18:26:31 -0000 1.2 @@ -8,9 +8,12 @@ object_id:integer } -forum::get -forum_id $object_id -array forum +if { $object_id == [ad_conn package_id] } { + set page_title "Permissions" +} else { + forum::get -forum_id $object_id -array forum + set page_title "$forum(name) Permissions" +} -set page_title "$forum(name) Permissions" - set context [list $page_title]