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 -N -r1.9 -r1.10 --- openacs-4/packages/forums/lib/message/thread-chunk.tcl 23 Dec 2007 14:50:15 -0000 1.9 +++ openacs-4/packages/forums/lib/message/thread-chunk.tcl 20 Sep 2008 12:10:28 -0000 1.10 @@ -8,7 +8,7 @@ } -if {$forum(posting_policy) == "moderated"} { +if {$forum(posting_policy) eq "moderated"} { set forum_moderated_p 1 } else { set forum_moderated_p 0 @@ -44,7 +44,7 @@ # ##### -if { [string equal $forum(presentation_type) flat] } { +if {$forum(presentation_type) eq "flat"} { set order_by "fma.posting_date, fma.tree_sortkey" } else { set order_by "fma.tree_sortkey" @@ -56,17 +56,17 @@ set direct_url_base [export_vars -base [ad_conn url] { { message_id $message(root_message_id) } }] set message(direct_url) "$direct_url_base\#msg_$message(message_id)" -set message(number) [expr [lsearch $message_id_list $message(message_id)] + 1] +set message(number) [expr {[lsearch $message_id_list $message(message_id)] + 1}] set message(parent_number) {} set message(parent_direct_url) "" if { [exists_and_not_null message(parent_id)] } { - set message(parent_number) [expr [lsearch $message_id_list $message(parent_id)] + 1] + set message(parent_number) [expr {[lsearch $message_id_list $message(parent_id)] + 1}] set message(parent_direct_url) "$direct_url_base\#msg_$message(parent_id)" 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 [string equal $message(open_p) "t"] || [string equal $message(user_id) [ad_conn user_id]]] +set message(reply_p) [expr {$message(open_p) eq "t" || $message(user_id) eq [ad_conn user_id]}] set message(tree_level) 0 @@ -77,7 +77,7 @@ ##### # More Tcl vars (we might as well use them - Ben) -if { [string equal $forum(presentation_type) flat] } { +if {$forum(presentation_type) eq "flat"} { set order_by "t.posting_date, tree_sortkey" } else { set order_by "tree_sortkey" @@ -93,11 +93,11 @@ 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 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 [string equal $open_p "t"] || [string equal $user_id [ad_conn user_id]]] + set reply_p [expr {$open_p eq "t" || $user_id eq [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 @@ -113,7 +113,7 @@ } } elseif {$tree_level < $old_tree_level} { # decrease in level. let us pop the last id. - set message_ids_last [expr [llength $message_ids] - 1] + set message_ids_last [expr {[llength $message_ids] - 1}] set message_ids [lreplace $message_ids $message_ids_last $message_ids_last] } else { foreach one_parent_id $message_ids {