Index: openacs-4/packages/acs-admin/www/apm/version-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-edit.tcl,v
diff -u -r1.14 -r1.14.2.1
--- openacs-4/packages/acs-admin/www/apm/version-edit.tcl	24 Apr 2018 10:49:48 -0000	1.14
+++ openacs-4/packages/acs-admin/www/apm/version-edit.tcl	13 Mar 2019 09:45:46 -0000	1.14.2.1
@@ -77,22 +77,22 @@
 
 <tr>
   <th style="text-align:right; white-space: nowrap">OpenACS Core:</th>
-  <td>[ad_decode $initial_install_p t Yes No]</td>
+  <td>[expr {$initial_install_p ? "Yes" : "No"}]</td>
 </tr>
 
 <tr>
   <th style="text-align:right; white-space: nowrap">Singleton:</th>
-  <td>[ad_decode $singleton_p t Yes No]</td>
+  <td>[expr {$singleton_p ? "Yes" : "No"}]</td>
 </tr>
 
 <tr>
   <th style="text-align:right; white-space: nowrap">Implements Subsite:</th>
-  <td>[ad_decode $implements_subsite_p t Yes No]</td>
+  <td>[expr {$implements_subsite_p ? "Yes" : "No"}]</td>
 </tr>
 
 <tr>
   <th style="text-align:right; white-space: nowrap">Inherit Templates:</th>
-  <td>[ad_decode $inherit_templates_p t Yes No]</td>
+  <td>[expr {$inherit_templates_p ? "Yes" : "No"}]</td>
 </tr>
 
 <tr>
@@ -127,8 +127,8 @@
   <th style="text-align:right"><br>Description:</th>
   <td><textarea name="description" cols="60" rows="5">[ns_quotehtml $description]</textarea><br>
 This description is <select name="description_format">
-<option value="text/html" [ad_decode $description_format "text/plain" "" "selected"]>HTML-formatted.
-<option value="text/plain" [ad_decode $description_format "text/plain" "selected" ""]>plain text.
+<option value="text/html" [expr {$description_format eq "text/plain" ? "" : "selected"}]>HTML-formatted.
+<option value="text/plain" [expr {$description_format eq "text/plain" ? "selected" : ""}]>plain text.
 </select>
 </td>
 </tr>
Index: openacs-4/packages/acs-admin/www/apm/version-i18n.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n.tcl,v
diff -u -r1.15 -r1.15.2.1
--- openacs-4/packages/acs-admin/www/apm/version-i18n.tcl	7 Aug 2017 23:47:45 -0000	1.15
+++ openacs-4/packages/acs-admin/www/apm/version-i18n.tcl	13 Mar 2019 09:47:01 -0000	1.15.2.1
@@ -84,7 +84,7 @@
     }
 }
 
-form create file_list_form -action [ad_decode $file_type adp "version-i18n-process" "version-i18n-process-2"]
+form create file_list_form -action [expr {$file_type eq "adp" ? "version-i18n-process" : "version-i18n-process-2"}]
 
 element create file_list_form version_id \
         -datatype integer \
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-process-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-process-2.tcl,v
diff -u -r1.23 -r1.23.2.1
--- openacs-4/packages/acs-admin/www/apm/version-i18n-process-2.tcl	17 Jul 2018 11:42:26 -0000	1.23
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-process-2.tcl	13 Mar 2019 09:50:36 -0000	1.23.2.1
@@ -50,8 +50,8 @@
 set context_bar [ad_context_bar $page_title]
 
 # Figure out which actions to take on the selected adp:s
-set replace_text_p [ad_decode [lsearch -exact $file_action replace_text] "-1" "0" "1"]
-set replace_tags_p [ad_decode [lsearch -exact $file_action replace_tags] "-1" "0" "1"]
+set replace_text_p [expr {"replace_text" in $file_action}]
+set replace_tags_p [expr {"replace_tags" in $file_action}]
 
 # We need either or both of the actions to be selected
 if { ! $replace_text_p && ! $replace_tags_p } {
Index: openacs-4/packages/acs-admin/www/apm/version-i18n-process.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-i18n-process.tcl,v
diff -u -r1.7 -r1.7.2.1
--- openacs-4/packages/acs-admin/www/apm/version-i18n-process.tcl	8 May 2018 22:37:18 -0000	1.7
+++ openacs-4/packages/acs-admin/www/apm/version-i18n-process.tcl	13 Mar 2019 09:52:04 -0000	1.7.2.1
@@ -21,8 +21,8 @@
 set context_bar [ad_context_bar $page_title]
 
 # Figure out which actions to take on the selected adp:s
-set replace_text_p [ad_decode [lsearch -exact $file_action replace_text] "-1" "0" "1"]
-set replace_tags_p [ad_decode [lsearch -exact $file_action replace_tags] "-1" "0" "1"]
+set replace_text_p [expr {"replace_text" in $file_action}]
+set replace_tags_p [expr {"replace_tags" in $file_action}]
 
 # If no texts should be replaced we need not give the user a choice of keys to use and
 # can go straight to the processing
Index: openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl,v
diff -u -r1.11 -r1.11.2.1
--- openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl	1 Oct 2017 12:16:05 -0000	1.11
+++ openacs-4/packages/acs-admin/www/apm/version-dependencies.tcl	13 Mar 2019 09:53:56 -0000	1.11.2.1
@@ -42,10 +42,10 @@
 	# a *lower* version of the service; if it requires one, show packages providing
 	# a *higher* version.
 
-	set sign [ad_decode $dependency_type "provide" "<=" ">="]
+	set sign [expr {$dependency_type eq "provide" ? "<=" : ">="}]
 
 	set counter 0
-        set other_dependency_in [ad_decode $dependency_type "provide" "'requires','extends','embeds'" "'provides'"]
+        set other_dependency_in [expr {$dependency_type eq "provide" ? "'requires','extends','embeds'" : "'provides'"}]
 	db_foreach apm_specific_version_dependencies {} {
             incr counter
 	    if { $counter == 1 } {