Index: openacs-4/contrib/obsolete-packages/bboard/www/message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/message.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/bboard/www/message.tcl	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/bboard/www/message.tcl	29 Jun 2001 20:37:18 -0000	1.2
@@ -15,47 +15,40 @@
     forum_id:onevalue
     message:onerow
     replies:multirow
-    subscribe_p:onevalue
     subscribed_p:onevalue
+    moderate_p:onevalue
 }
 
-ad_require_permission $message_id bboard_read_message
+ad_require_permission $message_id bboard_read_forum
 
 set user_id [ad_verify_and_get_user_id]
 
-set subscribed_p 0
-set subscribe_p 0
+if [string equal [bboard_message_subscribed_p -direct $user_id $message_id] "t"] {
+    set subscribed_p 1
+} else {
+    set subscribed_p 0
+}
 
-if [ad_permission_p $forum_id bboard_create_message] {
-    set subscribe_p 1
-
-    if [string equal [bboard_message_subscribed_p -direct $user_id $message_id] "t"] {
-	set subscribed_p 1
-    } else {
-	set subscribed_p 0
-    }
+db_1row forum_short_name {
+    select short_name as forum_name,
+       acs_permission.permission_p(:forum_id, :user_id, 'admin') as admin_p,
+       acs_permission.permission_p(:forum_id, :user_id, 'bboard_moderate_forum') 
+         as moderate_p
+      from bboard_forums
+      where forum_id = :forum_id
 }
 
 db_1row message_info {
   select message_id, reply_to, title, 
       to_char(sent_date, 'Month DD, YYYY HH:Mi am') as pretty_date, sender as user_id,
       mime_type, content, first_names||' '||last_name as full_name,
       acs_permission.permission_p(message_id, :user_id,
-                                  'bboard_write_message') as write_p,
-      acs_permission.permission_p(message_id, :user_id,
-                                  'bboard_delete_message') as delete_p
+                                  'bboard_write_message') as write_p
     from acs_messages_all m, persons p
     where message_id = :message_id
       and person_id = sender
 } -column_array message
 
-set message_create_p [ad_permission_p $forum_id bboard_create_message]
-
-db_1row forum_short_name {
-    select short_name as forum_name from bboard_forums
-      where forum_id = :forum_id
-}
-
 set context_bar [list [list "forum?[export_url_vars forum_id]" $forum_name] \
 		      "One Message"]
                    
@@ -65,12 +58,10 @@
          p.first_names||' '||p.last_name as full_name, 
          mt.depth - 1 as thread_depth, rownum,
          acs_permission.permission_p(m.message_id, :user_id,
-                                     'bboard_write_message') as write_p,
-         acs_permission.permission_p(m.message_id, :user_id,
-                                  'bboard_delete_message') as delete_p
+                                  'bboard_write_message') as write_p
         from acs_messages_all m, persons p,
             (select message_id, level as depth, rownum as seqnum
-                from acs_messages
+                from acs_messages im
                 connect by prior message_id = reply_to
                 start with message_id = :message_id) mt
         where m.message_id <> :message_id
@@ -79,10 +70,6 @@
             and m.message_id in (select bfmm.message_id 
                                      from bboard_forum_message_map bfmm
                                      where bfmm.forum_id = :forum_id)
-            and exists (select 1 from acs_object_party_privilege_map
-                            where object_id = m.message_id
-                                and party_id in (:user_id, -1)
-                                and privilege = 'bboard_read_message')
     order by m.sent_date
 }