+
+
+
<%= [ad_text_to_html -- "$message(content)"] %>
Index: openacs.org-dev/packages/forums/www/message-post-confirm-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/message-post-confirm-postgresql.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs.org-dev/packages/forums/www/message-post-confirm-postgresql.xql 20 Aug 2002 19:20:53 -0000 1.1
@@ -0,0 +1,12 @@
+
+
+
+ postgresql7.1
+
+
+
+ select to_char(current_timestamp, 'Mon DD YYYY HH24:MI:SS')
+
+
+
+
Index: openacs.org-dev/packages/forums/www/message-post-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/Attic/message-post-confirm.tcl,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs.org-dev/packages/forums/www/message-post-confirm.tcl 20 Aug 2002 19:20:53 -0000 1.1
@@ -0,0 +1,56 @@
+ad_page_contract {
+} -properties {
+ __form_contents__:multirow
+}
+
+set __return_url__ [ad_conn url]
+
+# The basic idea here is to build a multirow holding the form contents, which then get
+# passed back to the form handler transparently as a submission, as though the confirm
+# step never happened.
+
+# There's one exception - we set the special form element "__confirmed_p" true. This
+# informs ad_form that the use has indeed confirmed the submission.
+
+multirow create __form_contents__ __key__ __value__
+
+if { ![empty_string_p [set __form__ [ns_getform]]] } {
+
+ set __form_size__ [ns_set size $__form__]
+ set __form_counter__ 0
+
+ while { $__form_counter__ < $__form_size__ } {
+ if { [string equal [ns_set key $__form__ $__form_counter__] __confirmed_p] } {
+ multirow append __form_contents__ __confirmed_p 1
+ } else {
+ multirow append __form_contents__ [ns_set key $__form__ $__form_counter__] \
+ [template::util::quote_html [ns_set value $__form__ $__form_counter__]]
+ }
+ incr __form_counter__
+ }
+
+}
+
+# moved stuff over here from message-post --DaveB
+set user_id [ad_conn user_id]
+
+ set message(html_p) $html_p
+ set message(subject) $subject
+ set message(content) $content
+ set message(user_id) $user_id
+ set message(user_name) [db_string select_name {}]
+ set message(posting_date) [db_string select_date {}]
+
+ # Let's check if this person is subscribed to the forum
+ # in case we might want to subscribe them to the thread
+ if {[empty_string_p $parent_id]} {
+ if {![empty_string_p [notification::request::get_request_id \
+ -type_id [notification::type::get_type_id -short_name forums_forum_notif] \
+ -object_id $forum_id \
+ -user_id [ad_conn user_id]]]} {
+ set forum_notification_p 1
+ } else {
+ set forum_notification_p 0
+ }
+ }
+
Index: openacs.org-dev/packages/forums/www/message-post-confirm.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/message-post-confirm.xql,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs.org-dev/packages/forums/www/message-post-confirm.xql 20 Aug 2002 19:20:53 -0000 1.1
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+ select first_names || ' ' || last_name
+ from persons
+ where person_id = :user_id
+
+
+
+
+
+ select forum_id
+ from forums_messages
+ where message_id = :parent_id
+
+
+
+
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 -r1.6 -r1.7
--- openacs.org-dev/packages/forums/www/message-post.tcl 13 Aug 2002 03:11:26 -0000 1.6
+++ openacs.org-dev/packages/forums/www/message-post.tcl 20 Aug 2002 19:20:53 -0000 1.7
@@ -67,7 +67,7 @@
{subscribe_p:text(hidden),optional}
} -validate { {content
- {[expr { [string equal [set error_message [ad_html_security_check $content]] ""]}]} ${error_message} }
+ {[expr { [string equal [set error_message [ad_html_security_check $content]] ""]}]} "$error_message" }
} -new_data {
forum::get -forum_id $forum_id -array forum
Index: openacs.org-dev/packages/forums/www/search-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/search-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs.org-dev/packages/forums/www/search-postgresql.xql 9 Jul 2002 17:35:09 -0000 1.1
+++ openacs.org-dev/packages/forums/www/search-postgresql.xql 20 Aug 2002 19:20:53 -0000 1.2
@@ -1,7 +1,7 @@
- oracle8.1.6
+ postgresql7.1
@@ -16,7 +16,7 @@
and forums_messages.state = 'approved'
and ( forums_messages.subject like ('%' || :search_text || '%')
or forums_messages.content like ('%' || :search_text || '%')
- or user_name like ('%' || :search_text || '%')
+ or person__name(forums_messages.user_id) like ('%' || :search_text || '%')
)
order by the_score desc,
forums_messages.posting_date desc
@@ -37,7 +37,7 @@
and forums_messages.state = 'approved'
and ( forums_messages.subject like ('%' || :search_text || '%')
or forums_messages.content like ('%' || :search_text || '%')
- or user_name like ('%' || :search_text || '%')
+ or person__name(forums_messages.user_id) like ('%' || :search_text || '%')
)
order by the_score desc,
forums_messages.posting_date desc