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.4 -r1.5
--- openacs-4/packages/forums/www/message-chunk.adp	5 Jun 2002 14:43:52 -0000	1.4
+++ openacs-4/packages/forums/www/message-chunk.adp	5 Jun 2002 19:25:37 -0000	1.5
@@ -15,12 +15,14 @@
           [
             <a href="moderate/message-edit?message_id=@message.message_id@">edit</a>
             | <a href="moderate/message-delete?message_id=@message.message_id@">delete</a>
+<if @forum_moderated_p@>
 <if @message.state@ ne approved>
             | <a href="moderate/message-approve?message_id=@message.message_id@">approve</a>
 </if>
 <if @message.state@ ne rejected and @message.max_child_sortkey@ nil>
             | <a href="moderate/message-reject?message_id=@message.message_id@">reject</a>
 </if>
+</if>
           ]
         </small></nobr>
 </if>
Index: openacs-4/packages/forums/www/message-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/message-chunk.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/forums/www/message-chunk.tcl	3 Jun 2002 04:39:05 -0000	1.1
+++ openacs-4/packages/forums/www/message-chunk.tcl	5 Jun 2002 19:25:37 -0000	1.2
@@ -13,3 +13,4 @@
 }
 if {![exists_and_not_null bgcolor]} { set bgcolor "#ffffff" }
 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-4/packages/forums/www/message-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/forums/www/message-view.adp	3 Jun 2002 23:13:52 -0000	1.4
+++ openacs-4/packages/forums/www/message-view.adp	5 Jun 2002 19:25:37 -0000	1.5
@@ -20,7 +20,7 @@
   <br>
 
   <table bgcolor="#cccccc" cellpadding="5" width="95%">
-<include src="message-chunk" bgcolor="#eeeeee" moderate_p=@moderate_p@ &message="message">
+<include src="message-chunk" bgcolor="#eeeeee" forum_moderated_p=@forum_moderated_p@ moderate_p=@moderate_p@ &message="message">
   </table>
 
 <if @responses:rowcount@ gt 0>
@@ -36,10 +36,10 @@
       <td>
         <table align="right" bgcolor="#cccccc" cellpadding="5" width="@width@%">
 <if @responses.rownum@ odd>
-  <include src="message-chunk" bgcolor="#d9e4f9" moderate_p=@moderate_p@ &message="responses">
+  <include src="message-chunk" bgcolor="#d9e4f9" forum_moderated_p=@forum_moderated_p@ moderate_p=@moderate_p@ &message="responses">
 </if>
 <else>
-  <include src="message-chunk" bgcolor="#eeeeee" moderate_p=@moderate_p@ &message="responses">
+  <include src="message-chunk" bgcolor="#eeeeee" forum_moderated_p=@forum_moderated_p@ moderate_p=@moderate_p@ &message="responses">
 </else>
         </table>
       </td>
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.4 -r1.5
--- openacs-4/packages/forums/www/message-view.tcl	5 Jun 2002 19:14:39 -0000	1.4
+++ openacs-4/packages/forums/www/message-view.tcl	5 Jun 2002 19:25:37 -0000	1.5
@@ -38,6 +38,12 @@
     ad_script_abort
 }
 
+if {$forum(posting_policy) == "moderated"} {
+    set forum_moderated_p 1
+} else {
+    set forum_moderated_p 0
+}
+
 # Check preferences for user
 
 # Set some variables for easy SQL access