Index: openacs.org-dev/packages/forums/forums.info
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/forums.info,v
diff -u -r1.2 -r1.3
--- openacs.org-dev/packages/forums/forums.info 20 Aug 2002 19:24:12 -0000 1.2
+++ openacs.org-dev/packages/forums/forums.info 5 Sep 2002 17:27:43 -0000 1.3
@@ -47,15 +47,12 @@
-
-
-
@@ -86,17 +83,12 @@
-
-
-
-
-
@@ -121,7 +113,9 @@
-
+
+
+
Index: openacs.org-dev/packages/forums/sql/oracle/forums-search-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/sql/oracle/forums-search-create.sql,v
diff -u -r1.1 -r1.2
--- openacs.org-dev/packages/forums/sql/oracle/forums-search-create.sql 9 Jul 2002 17:35:09 -0000 1.1
+++ openacs.org-dev/packages/forums/sql/oracle/forums-search-create.sql 5 Sep 2002 17:27:45 -0000 1.2
@@ -1,5 +1,5 @@
--
--- Copyright (C) 2001, 2002 OpenForce, Inc.
+-- Copyright (C) 2001, 2002 MIT
--
-- This file is part of dotLRN.
--
@@ -71,6 +71,7 @@
show errors
grant execute on s_index_message to yon;
+grant execute on ctx_ddl to yon;
-- as normal user
connect yon/yon;
@@ -88,13 +89,16 @@
begin
dbms_job.submit(
job => v_job,
- what => 'ctx_ddl.sync_index(''forums_content_idx'');',
+ what => 'ctxsys.ctx_ddl.sync_index(''forums_content_idx'');',
interval => 'sysdate + 1/24'
);
end;
/
show errors
+-- as normal user
+connect yon/yon;
+
-- ripped off from site-wide-search
-- if we pass in a very long string to im_convert, we will end up with internal
@@ -106,47 +110,48 @@
-- 2. increase the max length from 256 to 1024
-- mbryzek@arsdigita.com, 7/6/2000
create or replace procedure im_convert_length_check (
- p_string IN varchar2,
- p_number_chars_to_append IN number,
- p_max_length IN number,
- p_variable_name IN varchar2
+ p_string in varchar2,
+ p_number_chars_to_append in number,
+ p_max_length in number,
+ p_variable_name in varchar2
)
is
begin
- if nvl(length(p_string),0) + p_number_chars_to_append > p_max_length then
+ if nvl(length(p_string),0) + p_number_chars_to_append > p_max_length
+ then
raise_application_error(-20000, 'Variable "' || p_variable_name || '" exceeds ' || p_max_length || ' character declaration');
end if;
end;
/
show errors;
--- Query to take free text user entered query and from it into something
--- that will make interMedia happy. Provided by Oracle.
+-- this proc takes user supplied free text and transforms it into an interMedia
+-- friendly query string. (provided by oracle).
create or replace function im_convert (
query in varchar2 default null
) return varchar2
is
- i number :=0;
- len number :=0;
+ i number := 0;
+ len number := 0;
char varchar2(1);
minusString varchar2(256) := '';
plusString varchar2(256) := '';
mainString varchar2(256) := '';
mainAboutString varchar2(500) := '';
finalString varchar2(500) := '';
- hasMain number :=0;
- hasPlus number :=0;
- hasMinus number :=0;
+ hasMain number := 0;
+ hasPlus number := 0;
+ hasMinus number := 0;
token varchar2(256);
- tokenStart number :=1;
- tokenFinish number :=0;
- inPhrase number :=0;
- inPlus number :=0;
- inWord number :=0;
- inMinus number :=0;
- completePhrase number :=0;
- completeWord number :=0;
- code number :=0;
+ tokenStart number := 1;
+ tokenFinish number := 0;
+ inPhrase number := 0;
+ inPlus number := 0;
+ inWord number := 0;
+ inMinus number := 0;
+ completePhrase number := 0;
+ completeWord number := 0;
+ code number := 0;
begin
len := length(query);
Index: openacs.org-dev/packages/forums/sql/oracle/forums-search-drop.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/sql/oracle/forums-search-drop.sql,v
diff -u -r1.1 -r1.2
--- openacs.org-dev/packages/forums/sql/oracle/forums-search-drop.sql 9 Jul 2002 17:35:09 -0000 1.1
+++ openacs.org-dev/packages/forums/sql/oracle/forums-search-drop.sql 5 Sep 2002 17:27:45 -0000 1.2
@@ -1,5 +1,5 @@
--
--- Copyright (C) 2001, 2002 OpenForce, Inc.
+-- Copyright (C) 2001, 2002 MIT
--
-- This file is part of dotLRN.
--
@@ -37,7 +37,7 @@
begin
for row in (select job
from user_jobs
- where what like '%forums_content_idx%')
+ where what like '%yon.forums_content_idx%')
loop
dbms_job.remove(job => row.job);
end loop;
Index: openacs.org-dev/packages/forums/sql/postgresql/forums-messages-package-create.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/sql/postgresql/forums-messages-package-create.sql,v
diff -u -r1.4 -r1.5
--- openacs.org-dev/packages/forums/sql/postgresql/forums-messages-package-create.sql 11 Aug 2002 22:38:13 -0000 1.4
+++ openacs.org-dev/packages/forums/sql/postgresql/forums-messages-package-create.sql 5 Sep 2002 17:27:46 -0000 1.5
@@ -182,7 +182,7 @@
where message_id = p_message_id;
-- if it is already deleted
- if NOT FOUND
+ if v_forum_id is null
then return 0;
end if;
@@ -191,10 +191,10 @@
-- that we never delete a parent before its child
-- sortkeys are beautiful
for v_message in select *
- from forums_messages
- where forum_id = v_forum_id
- and tree_sortkey between tree_left(v_sortkey) and tree_right(v_sortkey)
- order by tree_sortkey desc
+ from forums_messages
+ where forum_id = v_forum_id
+ and tree_sortkey between tree_left(v_sortkey) and tree_right(v_sortkey)
+ order by tree_sortkey desc
loop
perform forums_message__delete(v_message.message_id);
end loop;
Index: openacs.org-dev/packages/forums/tcl/forums-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/tcl/forums-procs.tcl,v
diff -u -r1.1 -r1.2
--- openacs.org-dev/packages/forums/tcl/forums-procs.tcl 9 Jul 2002 17:35:09 -0000 1.1
+++ openacs.org-dev/packages/forums/tcl/forums-procs.tcl 5 Sep 2002 17:27:47 -0000 1.2
@@ -42,7 +42,9 @@
}
ad_proc -public attachments_enabled_p {} {
- return [apm_package_registered_p attachments]
+ set package_id [site_node_apm_integration::child_package_exists_p \
+ -package_key attachments
+ ]
}
ad_proc -public list_forums {
Index: openacs.org-dev/packages/forums/tcl/messages-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/tcl/messages-procs-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs.org-dev/packages/forums/tcl/messages-procs-postgresql.xql 14 Aug 2002 01:45:38 -0000 1.4
+++ openacs.org-dev/packages/forums/tcl/messages-procs-postgresql.xql 5 Sep 2002 17:27:47 -0000 1.5
@@ -10,7 +10,7 @@
party__email(forums_messages.user_id) as user_email,
forums_forum__name(forums_messages.forum_id) as forum_name,
forums_message__root_message_id(forums_messages.message_id) as root_message_id,
- (
+ (
select forums_message__get_subject(forums_message__root_message_id(forums_messages.message_id))) as root_subject,
to_char(forums_messages.posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date
from forums_messages
@@ -26,7 +26,8 @@
party__email(forums_messages.user_id) as user_email,
forums_forum__name(forums_messages.forum_id) as forum_name,
forums_message__root_message_id(forums_messages.message_id) as root_message_id,
- (select forums_message__get_subject(forums_message__root_message_id(forums_messages.message_id))) as root_subject,
+ (
+ select forums_message__get_subject(forums_message__root_message_id(forums_messages.message_id))) as root_subject,
to_char(forums_messages.posting_date, 'Mon DD YYYY HH24:MI:SS') as posting_date
from forums_messages
where forums_messages.message_id= :message_id
@@ -45,23 +46,19 @@
- select forums_message__delete_thread(:message_id)
+ select forums_message__delete_thread(:message_id);
- declare begin
- forums_message__thread_close(:message_id);
- end;
+ select forums_message__thread_close(:message_id);
- declare begin
- forums_message__thread_open(:message_id);
- end;
+ select forums_message__thread_open(:message_id);
Index: openacs.org-dev/packages/forums/tcl/messages-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/tcl/messages-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs.org-dev/packages/forums/tcl/messages-procs.tcl 29 Aug 2002 05:07:40 -0000 1.6
+++ openacs.org-dev/packages/forums/tcl/messages-procs.tcl 5 Sep 2002 17:27:47 -0000 1.7
@@ -18,7 +18,6 @@
{-content:required}
{-html_p "f"}
{-user_id ""}
- {-posting_date ""}
} {
create a new message
} {
@@ -30,14 +29,13 @@
# Prepare the variables for instantiation
set extra_vars [ns_set create]
- oacs_util::vars_to_ns_set -ns_set $extra_vars -var_list {forum_id message_id parent_id subject content html_p user_id posting_date}
+ oacs_util::vars_to_ns_set -ns_set $extra_vars -var_list {forum_id message_id parent_id subject content html_p user_id}
db_transaction {
set message_id [package_instantiate_object -extra_vars $extra_vars forums_message]
get -message_id $message_id -array message
if {[info exists message(state)] && [string equal $message(state) approved]} {
-# DaveB take this out after migration!!
do_notifications -message_id $message_id
}
}
Index: openacs.org-dev/packages/forums/tcl/messages-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/tcl/messages-procs.xql,v
diff -u -r1.3 -r1.4
--- openacs.org-dev/packages/forums/tcl/messages-procs.xql 14 Aug 2002 01:45:38 -0000 1.3
+++ openacs.org-dev/packages/forums/tcl/messages-procs.xql 5 Sep 2002 17:27:47 -0000 1.4
@@ -33,4 +33,5 @@
where object_id=:message_id or response_id=:message_id
+
Index: openacs.org-dev/packages/forums/www/forum-view-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/forum-view-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs.org-dev/packages/forums/www/forum-view-oracle.xql 9 Aug 2002 18:11:22 -0000 1.2
+++ openacs.org-dev/packages/forums/www/forum-view-oracle.xql 5 Sep 2002 17:27:48 -0000 1.3
@@ -11,12 +11,12 @@
fm.posting_date,
fm.state,
(select count(*)
- from $forums_table fm1
+ from forums_messages_approved fm1
where fm1.forum_id = :forum_id
and fm1.tree_sortkey between tree.left(fm.tree_sortkey) and tree.right(fm.tree_sortkey)) as n_messages,
to_char(acs_objects.last_modified, 'Mon DD YYYY HH24:MI:SS') as last_modified,
case when acs_objects.last_modified > (sysdate - 1) then 't' else 'f' end as new_p
- from $forums_table fm,
+ from forums_messages_approved fm,
acs_objects
where fm.forum_id = :forum_id
and fm.parent_id is null
@@ -25,7 +25,7 @@
-
+
select fm.message_id,
fm.subject,
@@ -34,19 +34,18 @@
fm.posting_date,
fm.state,
(select count(*)
- from $forums_table fm1
+ from forums_messages fm1
where fm1.forum_id = :forum_id
and fm1.tree_sortkey between tree.left(fm.tree_sortkey) and tree.right(fm.tree_sortkey)) as n_messages,
to_char(acs_objects.last_modified, 'Mon DD YYYY HH24:MI:SS') as last_modified,
case when acs_objects.last_modified > (sysdate - 1) then 't' else 'f' end as new_p
- from $forums_table fm,
+ from forums_messages fm,
acs_objects
where fm.forum_id = :forum_id
and fm.parent_id is null
and fm.message_id = acs_objects.object_id
- and fm.message_id IN (CURRENT_PAGE_SET)
order by fm.posting_date desc
-
+
Index: openacs.org-dev/packages/forums/www/forum-view-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/forum-view-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs.org-dev/packages/forums/www/forum-view-postgresql.xql 9 Aug 2002 18:11:22 -0000 1.2
+++ openacs.org-dev/packages/forums/www/forum-view-postgresql.xql 5 Sep 2002 17:27:48 -0000 1.3
@@ -11,12 +11,12 @@
fm.posting_date,
fm.state,
(select count(*)
- from $forums_table fm1
+ from forums_messages_approved fm1
where fm1.forum_id = :forum_id
and fm1.tree_sortkey between tree_left(fm.tree_sortkey) and tree_right(fm.tree_sortkey)) as n_messages,
to_char(acs_objects.last_modified, 'Mon DD YYYY HH24:MI:SS') as last_modified,
case when acs_objects.last_modified > (now() - 1) then 't' else 'f' end as new_p
- from $forums_table fm,
+ from forums_messages_approved fm,
acs_objects
where fm.forum_id = :forum_id
and fm.parent_id is null
@@ -25,7 +25,7 @@
-
+
select fm.message_id,
fm.subject,
@@ -34,19 +34,18 @@
fm.posting_date,
fm.state,
(select count(*)
- from $forums_table fm1
+ from forums_messages fm1
where fm1.forum_id = :forum_id
and fm1.tree_sortkey between tree_left(fm.tree_sortkey) and tree_right(fm.tree_sortkey)) as n_messages,
to_char(acs_objects.last_modified, 'Mon DD YYYY HH24:MI:SS') as last_modified,
case when acs_objects.last_modified > (now() - 1) then 't' else 'f' end as new_p
- from $forums_table fm,
+ from forums_messages fm,
acs_objects
where fm.forum_id = :forum_id
and fm.parent_id is null
and fm.message_id = acs_objects.object_id
- and fm.message_id IN (CURRENT_PAGE_SET)
order by fm.posting_date desc
-
+
Index: openacs.org-dev/packages/forums/www/forum-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/forum-view.adp,v
diff -u -r1.4 -r1.5
--- openacs.org-dev/packages/forums/www/forum-view.adp 13 Aug 2002 03:11:25 -0000 1.4
+++ openacs.org-dev/packages/forums/www/forum-view.adp 5 Sep 2002 17:27:48 -0000 1.5
@@ -21,7 +21,9 @@
@notification_chunk@
- [ Post a New Message ]
+
+ [ Post a New Message ]
+
Index: openacs.org-dev/packages/forums/www/forum-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/forum-view.tcl,v
diff -u -r1.3 -r1.4
--- openacs.org-dev/packages/forums/www/forum-view.tcl 13 Aug 2002 03:11:26 -0000 1.3
+++ openacs.org-dev/packages/forums/www/forum-view.tcl 5 Sep 2002 17:27:48 -0000 1.4
@@ -7,7 +7,7 @@
@creation-date 2002-05-24
@version $Id$
-} {
+} -query {
{page 1}
forum_id:integer,notnull
}
@@ -26,14 +26,14 @@
if {!${admin_p}} {
set moderate_p [forum::security::can_moderate_forum_p -forum_id $forum_id]
-# if {!${moderate_p}} {
-# set post_p [forum::security::can_post_forum_p -forum_id $forum_id]
-# } else {
-# set post_p 1
-# }
+ if {!${moderate_p}} {
+ set post_p [forum::security::can_post_forum_p -forum_id $forum_id]
+ } else {
+ set post_p 1
+ }
} else {
set moderate_p 1
-# set post_p 1
+ set post_p 1
}
form create search -action search
@@ -59,10 +59,9 @@
}
set query messages_select
-set forums_table forums_messages_approved
if {$moderate_p} {
- set forums_table forums_messages
+ set query messages_select_moderator
}
# paginator stuff
Index: openacs.org-dev/packages/forums/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs.org-dev/packages/forums/www/index.tcl 9 Jul 2002 17:35:09 -0000 1.1
+++ openacs.org-dev/packages/forums/www/index.tcl 5 Sep 2002 17:27:48 -0000 1.2
@@ -12,13 +12,17 @@
set user_id [ad_verify_and_get_user_id]
set admin_p [permission::permission_p -party_id $user_id -object_id $package_id -privilege admin]
+# get the colors from the params
+set table_border_color [parameter::get -parameter table_border_color]
+set table_bgcolor [parameter::get -parameter table_bgcolor]
+set table_other_bgcolor [parameter::get -parameter table_other_bgcolor]
+
form create search -action search
element create search search_text \
-label Search \
-datatype text \
- -widget text \
- -html {size 60}
+ -widget text
element create search forum_id \
-label ForumID \
Index: openacs.org-dev/packages/forums/www/message-attachment-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/message-attachment-chunk.tcl,v
diff -u -r1.1 -r1.2
--- openacs.org-dev/packages/forums/www/message-attachment-chunk.tcl 9 Jul 2002 17:35:09 -0000 1.1
+++ openacs.org-dev/packages/forums/www/message-attachment-chunk.tcl 5 Sep 2002 17:27:48 -0000 1.2
@@ -1,4 +1,3 @@
-
ad_page_contract {
a message attachment chunk to be included to display attachments
@@ -11,6 +10,10 @@
ad_return_complaint 1 "need to provide a message to display attachments!"
}
+if {![exists_and_not_null bgcolor]} {
+ set bgcolor "#ffffff"
+}
+
# get the attachments
set attachments [attachments::get_attachments -object_id $message(message_id)]
Index: openacs.org-dev/packages/forums/www/message-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/message-chunk.adp,v
diff -u -r1.3 -r1.4
--- openacs.org-dev/packages/forums/www/message-chunk.adp 20 Aug 2002 19:20:53 -0000 1.3
+++ openacs.org-dev/packages/forums/www/message-chunk.adp 5 Sep 2002 17:27:48 -0000 1.4
@@ -46,17 +46,14 @@
-
+ |
-
+ |
-
-
-
- <%= [ad_text_to_html -- "$message(content)"] %>
-
+
+ <%= [ad_text_to_html -- "$message(content)"] %>
@message.content@
Index: openacs.org-dev/packages/forums/www/message-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/message-chunk.tcl,v
diff -u -r1.2 -r1.3
--- openacs.org-dev/packages/forums/www/message-chunk.tcl 13 Aug 2002 03:11:26 -0000 1.2
+++ openacs.org-dev/packages/forums/www/message-chunk.tcl 5 Sep 2002 17:27:48 -0000 1.3
@@ -23,4 +23,3 @@
if {![exists_and_not_null moderate_p]} { set moderate_p 0 }
if {![exists_and_not_null forum_moderated_p]} {set forum_moderated_p 0}
-
Index: openacs.org-dev/packages/forums/www/message-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/message-view.adp,v
diff -u -r1.2 -r1.3
--- openacs.org-dev/packages/forums/www/message-view.adp 13 Aug 2002 03:11:26 -0000 1.2
+++ openacs.org-dev/packages/forums/www/message-view.adp 5 Sep 2002 17:27:48 -0000 1.3
@@ -11,9 +11,11 @@
@notification_chunk@
+
[ Post a New Message. ]
+
|
Index: openacs.org-dev/packages/forums/www/message-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/message-view.tcl,v
diff -u -r1.2 -r1.3
--- openacs.org-dev/packages/forums/www/message-view.tcl 12 Aug 2002 22:59:59 -0000 1.2
+++ openacs.org-dev/packages/forums/www/message-view.tcl 5 Sep 2002 17:27:48 -0000 1.3
@@ -95,7 +95,7 @@
set notification_chunk [notification::display::request_widget \
-type forums_message_notif \
-object_id $message_id \
- -pretty_name "this message" \
+ -pretty_name $message(subject) \
-url [ad_conn url]?message_id=$message_id \
]
} else {
Index: openacs.org-dev/packages/forums/www/admin/forum-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/admin/forum-edit.tcl,v
diff -u -r1.1 -r1.2
--- openacs.org-dev/packages/forums/www/admin/forum-edit.tcl 9 Jul 2002 17:35:09 -0000 1.1
+++ openacs.org-dev/packages/forums/www/admin/forum-edit.tcl 5 Sep 2002 17:27:49 -0000 1.2
@@ -19,7 +19,7 @@
-label "Name" -datatype text -widget text -html {size 60}
element create forum charter \
- -label "Charter" -datatype text -widget textarea -html {cols 60 rows 10 wrap soft}
+ -label "Charter" -datatype text -widget textarea -html {cols 60 rows 10 wrap soft} -optional
element create forum presentation_type \
-label "Presentation" -datatype text -widget select -options {{Flat flat} {Threaded threaded}}
@@ -61,11 +61,15 @@
ad_script_abort
}
-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]
+set context_bar [list "Edit forum"]
+
+if { [form is_request forum] } {
+ 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.org-dev/packages/forums/www/admin/forum-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/admin/forum-new.tcl,v
diff -u -r1.1 -r1.2
--- openacs.org-dev/packages/forums/www/admin/forum-new.tcl 9 Jul 2002 17:35:09 -0000 1.1
+++ openacs.org-dev/packages/forums/www/admin/forum-new.tcl 5 Sep 2002 17:27:49 -0000 1.2
@@ -73,11 +73,15 @@
ad_script_abort
}
-# Pre-fetch the forum_id
-set forum_id [db_nextval acs_object_id_seq]
-element set_properties forum forum_id -value $forum_id
-element set_properties forum name -value $name
-element set_properties forum presentation_type -value threaded
-element set_properties forum new_threads_p -value 1
+set context_bar [list "Create New Forum"]
+if { [form is_request forum] } {
+ # Pre-fetch the forum_id
+ set forum_id [db_nextval acs_object_id_seq]
+ element set_properties forum forum_id -value $forum_id
+ element set_properties forum name -value $name
+ element set_properties forum presentation_type -value threaded
+ element set_properties forum new_threads_p -value 1
+}
+
ad_return_template
Index: openacs.org-dev/packages/forums/www/moderate/message-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/moderate/message-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs.org-dev/packages/forums/www/moderate/message-delete.adp 9 Jul 2002 17:35:09 -0000 1.1
+++ openacs.org-dev/packages/forums/www/moderate/message-delete.adp 5 Sep 2002 17:27:49 -0000 1.2
@@ -2,19 +2,20 @@
Confirm Delete: @message.subject@
-Are you sure you want to delete this message?
-
-@message.subject@
+
+
+ Are you sure you want to delete this message and all replies to it?
+
+
+
+
+
+
+ Yes
+
+ No
+
-
-
-
-@message.content@
-
-
-
-
-Yes
-
-No
-
+
Index: openacs.org-dev/packages/forums/www/moderate/message-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/forums/www/moderate/message-delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs.org-dev/packages/forums/www/moderate/message-delete.tcl 9 Jul 2002 17:35:09 -0000 1.1
+++ openacs.org-dev/packages/forums/www/moderate/message-delete.tcl 5 Sep 2002 17:27:49 -0000 1.2
@@ -12,6 +12,8 @@
{confirm_p 0}
}
+set table_border_color [parameter::get -parameter table_border_color]
+
# Check that the user can moderate the forum
forum::security::require_moderate_message -message_id $message_id
| | | |