Index: openacs-4/packages/forums/lib/message/thread-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/thread-chunk.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/forums/lib/message/thread-chunk.tcl	17 May 2018 07:41:20 -0000	1.14
+++ openacs-4/packages/forums/lib/message/thread-chunk.tcl	15 Jun 2018 19:59:03 -0000	1.15
@@ -8,11 +8,7 @@
 
 }
 
-if {$forum(posting_policy) eq "moderated"} {
-    set forum_moderated_p 1
-} else {
-    set forum_moderated_p 0
-}
+set forum_moderated_p [expr {$forum(posting_policy) eq "moderated"}]
 
 # get the colors from the params
 set table_border_color [parameter::get -parameter table_border_color]
@@ -44,12 +40,6 @@
 #
 #####
 
-if {$forum(presentation_type) eq "flat"} {
-    set order_by "fma.posting_date, fma.tree_sortkey"
-} else {
-    set order_by "fma.tree_sortkey"
-}
-
 set root_message_id $message(root_message_id)
 set message_id_list [db_list select_message_ordering {}]
 
@@ -65,8 +55,7 @@
     set message(parent_root_url) [export_vars -base [ad_conn url] { { message_id $message(parent_id) } }]
 }
 
-set message(open_p) "t"
-set message(reply_p) [expr {$message(open_p) == "t" || $message(user_id) eq [ad_conn user_id]}]
+set message(reply_p) [expr {$message(user_id) == [ad_conn user_id]}]
 set message(tree_level) 0
 
 
@@ -87,17 +76,24 @@
 set old_message_id 0
 set message_ids {}
 
-db_multirow -extend { posting_date_pretty direct_url number parent_number parent_direct_url reply_p viewed_p open_p} responses $query {} {
-    set open_p t
-    set tree_level [min [expr {$tree_level - $message(tree_level)}] 10]
+db_multirow -extend {
+    posting_date_pretty
+    direct_url
+    number
+    parent_number
+    parent_direct_url
+    reply_p
+    viewed_p
+} responses $query {} {    
+    set tree_level [expr {min($tree_level - $message(tree_level), 10)}]
     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 direct_url "$direct_url_base\#msg_$message_id"
     set number [expr {[lsearch $message_id_list $message_id] + 1}]
     set parent_number [expr {[lsearch $message_id_list $parent_id] + 1}]
     set parent_direct_url "$direct_url_base\#msg_$parent_id"
     set parent_root_url [export_vars -base [ad_conn url] {{message_id $parent_id}}]
-    set reply_p [expr {$open_p == "t" || $user_id eq [ad_conn user_id]}]
+    set reply_p [expr {$user_id == [ad_conn user_id]}]
     
     # DEDS: get the response ids the Tcl way or else we need to hit
     # the db for each response to count its children
@@ -132,7 +128,7 @@
 set message(tree_level) 0
 
 if {[info exists alt_template] && $alt_template ne ""} {
-  ad_return_template $alt_template
+    ad_return_template $alt_template
 }
 
 set response_arrays_stub ""