Index: openacs-4/packages/forums/lib/message/threads-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/threads-chunk.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/forums/lib/message/threads-chunk.tcl	26 May 2005 12:22:38 -0000	1.4
+++ openacs-4/packages/forums/lib/message/threads-chunk.tcl	8 Aug 2006 21:26:50 -0000	1.5
@@ -22,32 +22,36 @@
 
 set actions [list]
 
+if {![exists_and_not_null page_size]} {
+    set page_size 30
+}
+
+if {![exists_and_not_null base_url]} {
+    set base_url ""
+}
+
 # new postings are allowed if
 
 # 1. Users can create new threads AND the posting policy is open or
 # moderated 2. User is a moderator or adminsitrator
 
-if {([forum::new_questions_allowed_p \
-	  -forum_id $forum_id] 
-     && ($forum(posting_policy) == "open" || $forum(posting_policy) == "moderated")) || [template::util::is_true $admin_p] || [template::util::is_true $moderate_p]} {
-    lappend actions [_ forums.Post_a_New_Message] [export_vars \
-						       -base "${base_url}message-post" {forum_id}] {}
+if {([forum::new_questions_allowed_p -forum_id $forum_id] && ($forum(posting_policy) == "open" || $forum(posting_policy) == "moderated")) ||  [template::util::is_true $permissions(admin_p)] ||  [template::util::is_true $permissions(moderate_p)]  } {
+    lappend actions [_ forums.Post_a_New_Message] [export_vars -base "${base_url}message-post" { forum_id }] {}
 }
 
 if {[template::util::is_true $admin_p]} {
     lappend actions [_ forums.Administer] [export_vars \
 					       -base "${base_url}admin/forum-edit" {forum_id {return_url [ad_return_url]}}] {}
 }
 
-if {[template::util::is_true $moderate_p]} {
-    lappend actions [_ forums.ManageModerate] [export_vars \
-						   -base "${base_url}moderate/forum" {forum_id}] {}
+if { [template::util::is_true $permissions(moderate_p)] } {
+    lappend actions [_ forums.ManageModerate] [export_vars -base "${base_url}moderate/forum" { forum_id }] {}
 }
 
 template::list::create \
     -name messages \
     -multirow messages \
-    -page_size 30 \
+    -page_size $page_size \
     -page_query_name messages_select_paginate \
     -pass_properties {moderate_p} \
     -actions $actions \
@@ -114,32 +118,31 @@
     message_url
     user_url
     n_messages_pretty
-    state_pretty} messages messages_select {} {
-	set last_child_post_ansi [lc_time_system_to_conn $last_child_post_ansi]
-	set last_child_post_pretty [lc_time_fmt $last_child_post_ansi "%x %X"]
+    state_pretty
+} messages messages_select {} {
+    set last_child_post_ansi [lc_time_system_to_conn $last_child_post_ansi]
+    set last_child_post_pretty [lc_time_fmt $last_child_post_ansi "%x %X"]
 
-	set posting_date_ansi [lc_time_system_to_conn $posting_date_ansi]
-	set posting_date_pretty [lc_time_fmt $posting_date_ansi "%x %X"]
+    set posting_date_ansi [lc_time_system_to_conn $posting_date_ansi]
+    set posting_date_pretty [lc_time_fmt $posting_date_ansi "%x %X"]
 
-	set message_url [export_vars \
-			     -base "${base_url}message-view" {message_id}]
-	set user_url [export_vars \
-			  -base "${base_url}user-history" {user_id}]
-	set n_messages_pretty [lc_numeric $n_messages]
+    set message_url [export_vars -base "${base_url}message-view" { message_id }]
+    set user_url [export_vars -base "${base_url}user-history" { user_id }]
+    set n_messages_pretty [lc_numeric $n_messages]
 
-	switch $state {
-	    pending {
-		set state_pretty [_ forums.Pending]
-	    }
-	    rejected {
-		set state_pretty [_ forums.Rejected]
-	    }
-	    default {
-		set state_pretty {}
-	    }
-	}
+    switch $state {
+        pending {
+            set state_pretty [_ forums.Pending]
+        }
+        rejected {
+            set state_pretty [_ forums.Rejected]
+        }
+        default {
+            set state_pretty {}
+        }
     }
 
 if {[exists_and_not_null alt_template]} {
     ad_return_template $alt_template
 }
+