Index: openacs-4/packages/forums/lib/message/content-updater-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/Attic/content-updater-oracle.xql,v diff -u -N --- openacs-4/packages/forums/lib/message/content-updater-oracle.xql 28 Jun 2006 20:30:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,46 +0,0 @@ - - - - oracle8.1.6 - - - - select message_id, - 0 as n_attachments, - subject, - content, - format, - person.name(user_id) as user_name, - to_char(posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi, - tree.tree_level(tree_sortkey) as tree_level, - state, - user_id, - parent_id - from $table_name - where forum_id = :forum_id - and tree_sortkey between tree.left(:tree_sortkey) and tree.right(:tree_sortkey) - order by $order_by - - - - - - select message_id, - (select count(*) from attachments where object_id = message_id) as n_attachments, - subject, - content, - format, - person.name(user_id) as user_name, - to_char(posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi, - tree.tree_level(tree_sortkey) as tree_level, - state, - user_id, - parent_id - from $table_name - where forum_id = :forum_id - and tree_sortkey between tree.left(:tree_sortkey) and tree.right(:tree_sortkey) - order by $order_by - - - - Index: openacs-4/packages/forums/lib/message/content-updater-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/Attic/content-updater-postgresql.xql,v diff -u -N --- openacs-4/packages/forums/lib/message/content-updater-postgresql.xql 28 Jun 2006 20:30:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,51 +0,0 @@ - - - - postgresql7.1 - - - - select message_id, - 0 as n_attachments, - subject, - content, - format, - person__name(user_id) as user_name, - to_char(posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi, - tree_level(tree_sortkey) as tree_level, - state, - user_id, - parent_id, - open_p, - max_child_sortkey - from $table_name - where forum_id = :forum_id - and tree_sortkey between tree_left(:tree_sortkey) and tree_right(:tree_sortkey) - order by $order_by - - - - - - select message_id, - (select count(*) from attachments where object_id = message_id) as n_attachments, - subject, - content, - format, - person__name(user_id) as user_name, - to_char(posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi, - tree_level(tree_sortkey) as tree_level, - state, - user_id, - parent_id, - open_p, - max_child_sortkey - from $table_name - where forum_id = :forum_id - and tree_sortkey between tree_left(:tree_sortkey) and tree_right(:tree_sortkey) - order by $order_by - - - - - Index: openacs-4/packages/forums/lib/message/content-updater.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/Attic/content-updater.adp,v diff -u -N --- openacs-4/packages/forums/lib/message/content-updater.adp 28 Jun 2006 20:30:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,8 +0,0 @@ -@message.content;noquote@ - -
- #forums.Attachments# - -
-
- Index: openacs-4/packages/forums/lib/message/content-updater.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/Attic/content-updater.tcl,v diff -u -N --- openacs-4/packages/forums/lib/message/content-updater.tcl 7 Aug 2017 23:48:11 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,45 +0,0 @@ -ad_page_contract { - - Gets the content of an specified message - - @author Veronica De La Cruz (veronica@viaro.net) - @creation-date 2006-04-21 - - -} - - - - -# Set some sql variables - -set forum_id $message(forum_id) -set tree_sortkey $message(tree_sortkey) - -if {[forum::attachments_enabled_p]} { - set query select_message_responses_attachments -} else { - set query select_message_responses -} - -# Find the ordering of messages so it can be consistent -# with the code that is in thread-chunk - -if {$forum(presentation_type) eq "flat"} { - set order_by "fma.posting_date, fma.tree_sortkey" -} else { - set order_by "fma.tree_sortkey" -} - - -set message(content) [ad_html_text_convert -from $message(format) -to text/html -- $message(content)] - -# convert emoticons to images if the parameter is set -if { [string is true [parameter::get -parameter DisplayEmoticonsAsImagesP -default 0]] } { - set message(content) [forum::format::emoticons -content $message(content)]} - -# Local variables: -# mode: tcl -# tcl-indent-level: 4 -# indent-tabs-mode: nil -# End: Index: openacs-4/packages/forums/www/load-message-content.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/load-message-content.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/forums/www/load-message-content.adp 28 Jun 2006 20:30:29 -0000 1.1 +++ openacs-4/packages/forums/www/load-message-content.adp 15 Jun 2018 20:26:34 -0000 1.2 @@ -1,4 +1 @@ - +@message.content;noquote@ 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 -N -r1.3 -r1.4 --- openacs-4/packages/forums/www/load-message-content.tcl 7 Aug 2017 23:48:11 -0000 1.3 +++ openacs-4/packages/forums/www/load-message-content.tcl 15 Jun 2018 20:26:34 -0000 1.4 @@ -8,7 +8,6 @@ } { message_id:naturalnum,notnull - {table_name "forums_messages" } } @@ -19,9 +18,16 @@ ad_script_abort } -# Load up the forum information -forum::get -forum_id $message(forum_id) -array forum +set message(content) [ad_html_text_convert \ + -from $message(format) \ + -to text/html -- $message(content)] +# convert emoticons to images if the parameter is set +if { [string is true [parameter::get -parameter DisplayEmoticonsAsImagesP -default 0]] } { + set message(content) [forum::format::emoticons \ + -content $message(content)] +} + # Local variables: # mode: tcl # tcl-indent-level: 4