Index: openacs-4/packages/acs-templating/tcl/parse-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/parse-procs.tcl,v diff -u -r1.15 -r1.16 --- openacs-4/packages/acs-templating/tcl/parse-procs.tcl 22 May 2003 13:44:54 -0000 1.15 +++ openacs-4/packages/acs-templating/tcl/parse-procs.tcl 20 Jun 2003 15:24:24 -0000 1.16 @@ -413,15 +413,15 @@ # variable references. # substitute array variable references - if { [lsearch -exact {new-portals foobar forums} [ad_conn package_key]] == -1 } { + if { [lsearch -exact {new-portals foobar} [ad_conn package_key]] == -1 } { while {[regsub -all [template::adp_array_variable_regexp] $code {\1[ad_quotehtml $\2(\3)]} code]} {} } else { while {[regsub -all [template::adp_array_variable_regexp] $code {\1${\2(\3)}} code]} {} } while {[regsub -all [template::adp_array_variable_regexp_noquote] $code {\1$\2(\3)} code]} {} # substitute simple variable references - if { [lsearch -exact {new-portals forums} [ad_conn package_key]] == -1 } { + if { [lsearch -exact {new-portals} [ad_conn package_key]] == -1 } { while {[regsub -all [template::adp_variable_regexp] $code {\1[ad_quotehtml ${\2}]} code]} {} } else { while {[regsub -all [template::adp_variable_regexp] $code {\1${\2}} code]} {} 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.17 -r1.18 --- openacs-4/packages/forums/www/forum-view.tcl 17 May 2003 10:43:31 -0000 1.17 +++ openacs-4/packages/forums/www/forum-view.tcl 20 Jun 2003 15:24:24 -0000 1.18 @@ -69,10 +69,10 @@ db_multirow -extend { last_child_post_pretty } messages $query {} { set last_child_post_pretty [lc_time_fmt $last_child_post_ansi "%x %X"] - set subject [ad_quotehtml $subject] - set user_name [ad_quotehtml $user_name] } +# Need to quote forum(name) since it is noquoted on display as part of an +# HTML fragment. set notification_chunk [notification::display::request_widget \ -type forums_forum_notif \ -object_id $forum_id \ Index: openacs-4/packages/forums/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/index.adp,v diff -u -r1.18 -r1.19 --- openacs-4/packages/forums/www/index.adp 22 May 2003 14:56:35 -0000 1.18 +++ openacs-4/packages/forums/www/index.adp 20 Jun 2003 15:24:24 -0000 1.19 @@ -52,7 +52,7 @@ -
@forums.charter@ +
@forums.charter;noquote@ Index: openacs-4/packages/forums/www/message-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/message-chunk.adp,v diff -u -r1.16 -r1.17 --- openacs-4/packages/forums/www/message-chunk.adp 22 May 2003 14:56:35 -0000 1.16 +++ openacs-4/packages/forums/www/message-chunk.adp 20 Jun 2003 15:24:24 -0000 1.17 @@ -4,7 +4,7 @@ - @message.subject;noquote@ + @message.subject@ @message.subject@ 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.6 -r1.7 --- openacs-4/packages/forums/www/message-email.tcl 30 Nov 2002 17:35:39 -0000 1.6 +++ openacs-4/packages/forums/www/message-email.tcl 20 Jun 2003 15:24:24 -0000 1.7 @@ -65,7 +65,7 @@ element set_properties message subject -value "\[[_ forums.Fwd] $message(subject)\]" element set_properties message message_id -value $message_id -set message(subject) [ad_quotehtml $message(subject)] +set message(subject) set context [list [list "./forum-view?forum_id=$message(forum_id)" "$message(forum_name)"]] if {![empty_string_p $message(parent_id)]} { 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.21 -r1.22 --- openacs-4/packages/forums/www/message-post.tcl 17 May 2003 10:43:31 -0000 1.21 +++ openacs-4/packages/forums/www/message-post.tcl 20 Jun 2003 15:24:24 -0000 1.22 @@ -104,7 +104,7 @@ 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) [ad_quotehtml $subject] + set message(subject) $subject set message(content) $content set message(user_id) $user_id set message(user_name) [db_string select_name {}] @@ -181,7 +181,6 @@ forum::message::get -message_id $parent_id -array parent_message set forum_id $parent_message(forum_id) set subject "[_ forums.Re] $parent_message(subject)" - set parent_message(subject) [ad_quotehtml $parent_message(subject)] # trim multiple leading Re: regsub {^(\s*Re:\s*)*} $subject {Re: } subject 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.18 -r1.19 --- openacs-4/packages/forums/www/message-view.tcl 17 May 2003 10:43:31 -0000 1.18 +++ openacs-4/packages/forums/www/message-view.tcl 20 Jun 2003 15:24:24 -0000 1.19 @@ -19,7 +19,6 @@ # Load up the message information forum::message::get -message_id $message_id -array message -set message(subject) [ad_quotehtml $message(subject)] # Check if the user has admin on the message set moderate_p [forum::security::can_moderate_message_p -message_id $message_id] @@ -90,7 +89,6 @@ } db_multirow -extend { posting_date_pretty } responses $query {} { - set subject [ad_quotehtml $subject] set posting_date_pretty [lc_time_fmt $posting_date_ansi "%x %X"] } @@ -141,5 +139,3 @@ ad_return_template } - - Index: openacs-4/packages/forums/www/search-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/search-postgresql.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/forums/www/search-postgresql.xql 4 Dec 2002 09:46:40 -0000 1.3 +++ openacs-4/packages/forums/www/search-postgresql.xql 20 Jun 2003 15:24:24 -0000 1.4 @@ -7,7 +7,7 @@ select forums_messages.*, person__name(forums_messages.user_id) as user_name, - to_char(forums_messages.posting_date_ansi, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi, + to_char(forums_messages.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi, 100 as the_score from forums_messages, forums_forums @@ -27,7 +27,7 @@ select forums_messages.*, person__name(forums_messages.user_id) as user_name, - to_char(forums_messages.posting_date_ansi, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi, + to_char(forums_messages.posting_date, 'YYYY-MM-DD HH24:MI:SS') as posting_date_ansi, 100 as the_score from forums_messages, forums_forums Index: openacs-4/packages/forums/www/search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/search.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/packages/forums/www/search.tcl 20 Jan 2003 12:56:19 -0000 1.10 +++ openacs-4/packages/forums/www/search.tcl 20 Jun 2003 15:24:24 -0000 1.11 @@ -39,14 +39,13 @@ db_multirow messages $query {} { set posting_date_pretty [lc_time_fmt $posting_date_ansi "%x %X"] - set subject [ad_quotehtml $subject] } } else { set messages:rowcount 0 } -set context "[_ forums.Search]" +set context [list [_ forums.Search_1]] ad_return_template 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.9 -r1.10 --- openacs-4/packages/forums/www/user-history.tcl 20 Jan 2003 12:56:19 -0000 1.9 +++ openacs-4/packages/forums/www/user-history.tcl 20 Jun 2003 15:24:24 -0000 1.10 @@ -38,7 +38,7 @@ set dimensional_chunk [ad_dimensional $dimensional_list] -set context "[_ forums.Posting_History]" +set context [list [_ forums.Posting_History]] ad_return_template 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.8 -r1.9 --- openacs-4/packages/forums/www/moderate/message-delete.tcl 30 Nov 2002 17:36:14 -0000 1.8 +++ openacs-4/packages/forums/www/moderate/message-delete.tcl 20 Jun 2003 15:24:24 -0000 1.9 @@ -19,7 +19,6 @@ # Select the stuff forum::message::get -message_id $message_id -array message -set message(subject) [ad_quotehtml $message(subject)] # Confirmed? if {$confirm_p} { 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.6 -r1.7 --- openacs-4/packages/forums/www/moderate/message-edit.tcl 19 Feb 2003 15:41:53 -0000 1.6 +++ openacs-4/packages/forums/www/moderate/message-edit.tcl 20 Jun 2003 15:24:24 -0000 1.7 @@ -64,7 +64,6 @@ element set_properties message content -value $message(content) element set_properties message html_p -value $message(html_p) -set message(subject) [ad_quotehtml $message(subject)] ad_return_template