- | @message.subject@ |
+ @message.subject@ |
@message.user_name@ |
@message.posting_date@ |
Index: openacs-4/packages/forums/www/message-post-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-post-confirm.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/forums/www/message-post-confirm.adp 3 Jun 2002 05:53:55 -0000 1.3
+++ openacs-4/packages/forums/www/message-post-confirm.adp 2 Jul 2002 19:42:19 -0000 1.4
@@ -24,5 +24,12 @@
+
+ Would you like to attach a file to this message?
+ No
+ Yes
+
+
+
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.6 -r1.7
--- openacs-4/packages/forums/www/message-post.tcl 3 Jun 2002 05:53:55 -0000 1.6
+++ openacs-4/packages/forums/www/message-post.tcl 2 Jul 2002 19:42:19 -0000 1.7
@@ -66,6 +66,19 @@
-widget hidden \
-optional
+set attachments_enabled_p [forum::attachments_enabled_p]
+
+if {$attachments_enabled_p} {
+ ns_log Notice "FORUMS: attachments enabled"
+ element create message attach_p \
+ -label "Attach?" \
+ -datatype text \
+ -widget hidden \
+ -optional
+} else {
+ ns_log Notice "FORUMS: attachments not enabled"
+}
+
if {[form is_valid message]} {
form get_values message \
message_id forum_id parent_id subject content html_p confirm_p subscribe_p
@@ -111,26 +124,36 @@
-html_p $html_p
if {[empty_string_p $parent_id]} {
- set message_view_url "[ad_conn package_url]message-view?message_id=$message_id"
+ set redirect_url "[ad_conn package_url]message-view?message_id=$message_id"
} else {
- set message_view_url "[ad_conn package_url]message-view?message_id=$parent_id"
+ set redirect_url "[ad_conn package_url]message-view?message_id=$parent_id"
}
+ # Wrap the notifications URL
if {![empty_string_p $subscribe_p] && $subscribe_p && [empty_string_p $parent_id]} {
set notification_url [notification::display::subscribe_url \
-type forums_message_notif \
-object_id $message_id \
- -url $message_view_url \
+ -url $redirect_url \
-user_id [ad_conn user_id] \
]
# redirect to notification stuff
- ad_returnredirect $notification_url
- } else {
- # redirect to viewing the message
- ad_returnredirect $message_view_url
+ set redirect_url $notification_url
}
+ # Wrap the attachments URL
+ if {$attachments_enabled_p} {
+ form get_values message attach_p
+
+ if {$attach_p} {
+ set redirect_url [attachments::add_attachment_url -object_id $message_id -return_url $redirect_url -pretty_name "Forum Posting \"$subject\""]
+ }
+ }
+
+ # Do the redirection
+ ad_returnredirect $redirect_url
+
ad_script_abort
}
Index: openacs-4/packages/forums/www/message-view-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/forums/www/message-view-oracle.xql 3 Jun 2002 04:39:05 -0000 1.2
+++ openacs-4/packages/forums/www/message-view-oracle.xql 2 Jul 2002 19:42:19 -0000 1.3
@@ -5,69 +5,38 @@
select message_id,
+ 0 as n_attachments,
subject,
content,
person.name(user_id) as user_name,
to_char(posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date,
tree.tree_level(tree_sortkey) as tree_level,
state,
user_id
- from forums_messages_approved
+ from $table_name
where forum_id = :forum_id
and tree_sortkey between tree.left(:tree_sortkey) and tree.right(:tree_sortkey)
- order by tree_sortkey
+ order by $order_by
-
+
select message_id,
+ (select count(*) from attachments where object_id = message_id) as n_attachments,
subject,
content,
person.name(user_id) as user_name,
to_char(posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date,
tree.tree_level(tree_sortkey) as tree_level,
state,
user_id
- from forums_messages_approved
+ from $table_name
where forum_id = :forum_id
and tree_sortkey between tree.left(:tree_sortkey) and tree.right(:tree_sortkey)
- order by posting_date, tree_sortkey
+ order by $order_by
-
-
- select message_id,
- subject,
- content,
- person.name(user_id) as user_name,
- to_char(posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date,
- tree.tree_level(tree_sortkey) as tree_level,
- state,
- user_id
- from forums_messages
- where forum_id = :forum_id
- and tree_sortkey between tree.left(:tree_sortkey) and tree.right(:tree_sortkey)
- order by tree_sortkey
-
-
-
-
- select message_id,
- subject,
- content,
- person.name(user_id) as user_name,
- to_char(posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date,
- tree.tree_level(tree_sortkey) as tree_level,
- state,
- user_id
- from forums_messages
- where forum_id = :forum_id
- and tree_sortkey between tree.left(:tree_sortkey) and tree.right(:tree_sortkey)
- order by posting_date, tree_sortkey
-
-
-
Index: openacs-4/packages/forums/www/message-view-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/forums/www/message-view-postgresql.xql 19 Jun 2002 15:11:46 -0000 1.3
+++ openacs-4/packages/forums/www/message-view-postgresql.xql 2 Jul 2002 19:42:19 -0000 1.4
@@ -6,69 +6,38 @@
select message_id,
+ 0 as n_attachments,
subject,
content,
person__name(user_id) as user_name,
to_char(posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date,
tree_level(tree_sortkey) as tree_level,
state,
user_id
- from forums_messages_approved
+ from $table_name
where forum_id = :forum_id
and tree_sortkey between tree_left(:tree_sortkey) and tree_right(:tree_sortkey)
- order by tree_sortkey
+ order by $order_by
-
+
select message_id,
+ (select count(*) from attachments where object_id = message_id) as n_attachments,
subject,
content,
person__name(user_id) as user_name,
to_char(posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date,
tree_level(tree_sortkey) as tree_level,
state,
user_id
- from forums_messages_approved
+ from $table_name
where forum_id = :forum_id
and tree_sortkey between tree_left(:tree_sortkey) and tree_right(:tree_sortkey)
- order by posting_date, tree_sortkey
+ order by $order_by
-
-
- select message_id,
- subject,
- content,
- person__name(user_id) as user_name,
- to_char(posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date,
- tree_level(tree_sortkey) as tree_level,
- state,
- user_id
- from forums_messages
- where forum_id = :forum_id
- and tree_sortkey between tree_left(:tree_sortkey) and tree_right(:tree_sortkey)
- order by tree_sortkey
-
-
-
-
- select message_id,
- subject,
- content,
- person__name(user_id) as user_name,
- to_char(posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date,
- tree_level(tree_sortkey) as tree_level,
- state,
- user_id
- from forums_messages
- where forum_id = :forum_id
- and tree_sortkey between tree_left(:tree_sortkey) and tree_right(:tree_sortkey)
- order by posting_date, tree_sortkey
-
-
-
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.6 -r1.7
--- openacs-4/packages/forums/www/message-view.tcl 2 Jul 2002 02:00:01 -0000 1.6
+++ openacs-4/packages/forums/www/message-view.tcl 2 Jul 2002 19:42:19 -0000 1.7
@@ -64,13 +64,24 @@
set forum_id $message(forum_id)
set tree_sortkey $message(tree_sortkey)
-set query select_message_responses
+if {[forum::attachments_enabled_p]} {
+ set query select_message_responses_attachments
+} else {
+ set query select_message_responses
+}
+
+# We set a Tcl variable for moderation now (Ben)
if {$moderate_p} {
- set query select_message_responses_moderator
+ set table_name "forums_messages"
+} else {
+ set table_name "forums_messages_approved"
}
+# More Tcl vars (we might as well use them - Ben)
if {[string equal $forum(presentation_type) flat]} {
- append query "_flat"
+ set order_by "posting_date, tree_sortkey"
+} else {
+ set order_by "tree_sortkey"
}
db_multirow responses $query {}
|