Index: openacs-4/packages/download/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/index.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/download/www/index.adp	5 Sep 2015 09:06:56 -0000	1.17
+++ openacs-4/packages/download/www/index.adp	11 Oct 2017 12:04:41 -0000	1.18
@@ -3,14 +3,14 @@
 <property name="doc(title)">@title;literal@</property>
 <property name="context"></property>
 
-<if @master_admin_p@ eq 1>
+<if @master_admin_p;literal@ true>
 <div style='float:right; padding:5px;'><a href="admin/">#download.Administration#</a></div>
 </if>
 <div style='float:right; padding:5px;'><a href="help">#download.Help#</a></div>
 <br>
 
 @description@
-<if 0>
+<if 0 true>
     <if @user_id@ eq 0>
       <p>#download.You_must# <strong><a href="@register_url;noi18n@">register</a></strong>
          #download.lt_before_you_can_downlo#
@@ -22,7 +22,7 @@
 
 <listtemplate name="download_list" style="table-2third"></listtemplate>
 
-<if @write_p@ eq 1>
+<if @write_p;literal@ true>
 <h3 style="margin-top: 1em">#download.lt_Upload_a_New_Version_#</h3>
 <ul>
 <multiple name=types>
@@ -37,7 +37,7 @@
 <ul>
 <multiple name=my_revisions>
   <li><a href="one-revision?revision_id=@my_revisions.revision_id@">@my_revisions.archive_name@ @my_revisions.version_name@</a></li>
-  <if @my_revisions.approved_p@ eq f>
+  <if @my_revisions.approved_p;literal@ false>
   #download.lt_Disapproved_my_revisi#
   </if>
   <if @my_revisions.approved_p@ eq "">
Index: openacs-4/packages/download/www/one-archive.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/one-archive.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/download/www/one-archive.adp	3 Jul 2015 11:19:05 -0000	1.9
+++ openacs-4/packages/download/www/one-archive.adp	11 Oct 2017 12:04:41 -0000	1.10
@@ -2,7 +2,7 @@
 <property name="doc(title)">One Archive: @archive_name;noquote@</property>
 <property name="context">@context;literal@</property>
 
-<if @master_admin_p@ eq 1>
+<if @master_admin_p;literal@ true>
 <table align="right"><tr><td><a href="admin/">#download.Administration#</a></td></tr></table>
 </if>
 <table align="right"><tr><td><a href="help">#download.Help#</a></td></tr></table>
@@ -22,7 +22,7 @@
      <td>@description;noquote@</td>
  </tr>
 
- <if @admin_p@ eq 1>
+ <if @admin_p;literal@ true>
  <tr>
      <td align="right" valign="top"><a href="admin/report-version-downloads?archive_id=@archive_id@&versions=current">#download.lt_View_Download_History#</a>
  </tr>
@@ -44,7 +44,7 @@
 <if @pending_count@ gt 0>
   #download.lt_pending_count_pending#
 </if>
-<if @write_p@ eq 1>
+<if @write_p;literal@ true>
 <p><li><a href="archive-version-add?archive_id=@archive_id@">#download.add_a_version#</a>
 </if>
 </tr>
Index: openacs-4/packages/download/www/one-revision.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/one-revision.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/download/www/one-revision.adp	3 Jul 2015 11:19:05 -0000	1.13
+++ openacs-4/packages/download/www/one-revision.adp	11 Oct 2017 12:04:41 -0000	1.14
@@ -2,7 +2,7 @@
 <property name="doc(title)">One Revision: @archive_name;noquote@ ver. @version_name;noquote@</property>
 <property name="context">@context;literal@</property>
 
-<if @master_admin_p@ eq 1>
+<if @master_admin_p;literal@ true>
 <table align="right"><tr><td><a href="admin/">#download.Administration#</a></td></tr></table>
 </if>
 <table align="right"><tr><td><a href="help">#download.Help#</a></td></tr></table>
@@ -21,7 +21,7 @@
  <tr><td align="right" valign="top">#download.Description#</td>
      <td>@description;noquote@</td>
  </tr>
-<if @admin_p@ eq 1>
+<if @admin_p;literal@ true>
  <tr><td align="right" valign="top"><p><a href="/permissions/one?object_id=@revision_id@"><b>#download.lt_Edit_Permissions_on_T#</b></a> 
      <td> <font size=-1>(<a href="help#permissions">#download.lt_permission_descriptio#</a>)</font>
  </tr>
@@ -34,7 +34,7 @@
 <tr>
  <td align="right">#download.Downloads#</td>
  <td>@downloads@
-     <if @admin_p@ eq 1>
+     <if @admin_p;literal@ true>
      (<a href="admin/report-version-downloads?archive_id=@archive_id@&versions=all">#download.download_history#</a>)
      </if>
 
Index: openacs-4/packages/download/www/admin/approve-or-reject.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/approve-or-reject.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/download/www/admin/approve-or-reject.adp	3 Jul 2015 11:19:05 -0000	1.10
+++ openacs-4/packages/download/www/admin/approve-or-reject.adp	11 Oct 2017 12:04:42 -0000	1.11
@@ -10,7 +10,7 @@
   </tr>
   <tr><th colspan="2">
       <font size=+1><a href="../one-revision?revision_id=@revision_id@">@archive_name@</a></font> 
-      <if @current_version_p@ eq "t"> (current version)
+      <if @current_version_p;literal@ true> (current version)
       </if>
   <tr><td colspane=2></td>
   </tr>
Index: openacs-4/packages/forums/lib/forums/forums-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/forums/forums-chunk.tcl,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/forums/lib/forums/forums-chunk.tcl	15 Sep 2017 07:18:03 -0000	1.17
+++ openacs-4/packages/forums/lib/forums/forums-chunk.tcl	11 Oct 2017 12:07:52 -0000	1.18
@@ -43,7 +43,7 @@
             label {\#forums.Forum_Name\#}
             link_url_col forum_view_url
             display_template {
-                <if @useReadingInfo@>
+                <if @useReadingInfo;literal@ true>
                   <if @forums.count_unread@ gt 0>
                     <strong>
                   </if>
@@ -71,7 +71,7 @@
             label {\#forums.Threads\#}
             display_col n_threads_pretty
             display_template {
-                <if @useReadingInfo@>
+                <if @useReadingInfo;literal@ true>
                   <if  @forums.count_unread@ gt 0>
                     <strong>@forums.count_unread@ new</strong> of
                   </if>