Index: openacs-4/packages/news-portlet/www/news-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/news-portlet.tcl,v diff -u -r1.25 -r1.25.2.1 --- openacs-4/packages/news-portlet/www/news-portlet.tcl 19 Jun 2018 15:47:18 -0000 1.25 +++ openacs-4/packages/news-portlet/www/news-portlet.tcl 1 Mar 2019 10:10:39 -0000 1.25.2.1 @@ -42,7 +42,7 @@ # Should be a list already! XXX rename me! set list_of_package_ids $config(package_id) -set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0] +set one_instance_p [expr {[llength $list_of_package_ids] == 1}] set display_item_content_p [parameter::get_from_package_key \ -package_key news-portlet \ Index: openacs-4/packages/forums/tcl/form-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/form-procs.tcl,v diff -u -r1.13 -r1.13.2.1 --- openacs-4/packages/forums/tcl/form-procs.tcl 8 Nov 2017 12:05:55 -0000 1.13 +++ openacs-4/packages/forums/tcl/form-procs.tcl 1 Mar 2019 10:13:19 -0000 1.13.2.1 @@ -75,7 +75,7 @@ template::element create $form_name ${prefix}anonymous_p \ -label [_ forums.Anonymous] \ -datatype integer \ - -widget [ad_decode $show_anonymous_p 0 "hidden" "checkbox"] \ + -widget [expr {$show_anonymous_p ? "checkbox" : "hidden"}] \ -options $options \ -optional @@ -84,7 +84,7 @@ template::element create $form_name ${prefix}attach_p \ -label [_ forums.Attach] \ -datatype text \ - -widget [ad_decode $show_attachments_p 0 "hidden" "radio"] \ + -widget [expr {$show_attachments_p ? "radio" : "hidden"}] \ -options $options if {$optional_p} { Index: openacs-4/packages/forums/tcl/messages-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/messages-procs.tcl,v diff -u -r1.59 -r1.59.2.1 --- openacs-4/packages/forums/tcl/messages-procs.tcl 23 Oct 2018 20:18:41 -0000 1.59 +++ openacs-4/packages/forums/tcl/messages-procs.tcl 1 Mar 2019 10:15:34 -0000 1.59.2.1 @@ -370,7 +370,7 @@ } { set subject_label "[_ forums.lt_First_post_in_subject]" set child_label "[_ forums.Last_post_in_subject]" - set new_order_by [ad_decode $order_by posting_date last_child_post posting_date] + set new_order_by [expr {$order_by eq "posting_date" ? "last_child_post" : "posting_date"}] set export_vars [export_vars -override [list [list order_by $new_order_by]] {order_by forum_id}] set toggle_url "[ad_conn url]?${export_vars}" Index: openacs-4/packages/forums/tcl/forums-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-callback-procs.tcl,v diff -u -r1.12.2.1 -r1.12.2.2 --- openacs-4/packages/forums/tcl/forums-callback-procs.tcl 14 Feb 2019 16:15:01 -0000 1.12.2.1 +++ openacs-4/packages/forums/tcl/forums-callback-procs.tcl 1 Mar 2019 10:20:30 -0000 1.12.2.2 @@ -87,7 +87,7 @@ if {[permission::permission_p -object_id $forum_id -privilege admin -party_id $user_id]} { lappend actions \ - [list SECTION "Forum $name ([ad_decode $enabled_p t [_ forums.enabled] [_ forums.disabled]])" {}] \ + [list SECTION "Forum $name ([expr {$enabled_p ? [_ forums.enabled] : [_ forums.disabled]}])" {}] \ [list LINK \ [export_vars -base admin/forum-edit forum_id] \ [_ forums.Edit_forum_name] {} {}] \