Index: openacs-4/packages/photo-album/www/album.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album.adp,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/photo-album/www/album.adp	3 Jul 2015 11:19:08 -0000	1.8
+++ openacs-4/packages/photo-album/www/album.adp	20 Jan 2018 22:49:15 -0000	1.9
@@ -36,21 +36,21 @@
 <p>#photo-album.lt_This_album_does_not_c#</p>
 </else>
 <ul>
-<if @photo_p@ eq 1>
+<if @photo_p;literal@ true>
   <li><a href="photo-add?album_id=@album_id@">#photo-album.lt_Add_a_single_photo_to#</a></li>
   <li><a href="photos-add?album_id=@album_id@">#photo-album.lt_Add_a_collection_of_p#</a></li>
   <li><a href="photos-edit?album_id=@album_id@&page=@page@">#photo-album.Edit_these_photos#</a></li>
 </if>
-<if @write_p@ eq 1>
+<if @write_p;literal@ true>
   <li><a href="album-edit?album_id=@album_id@">#photo-album.lt_Edit_album_attributes#</a></li>
 </if>
-<if @move_p@ eq 1>
+<if @move_p;literal@ true>
   <li><a href="album-move?album_id=@album_id@">#photo-album.lt_Move_this_album_to_an#</a></li>
 </if>
-<if @admin_p@ eq 1>
+<if @admin_p;literal@ true>
   <li><a href="/permissions/one?object_id=@album_id@">#photo-album.lt_Modify_this_albums_pe#</a></li>
 </if>
-<if @delete_p@ eq 1>
+<if @delete_p;literal@ true>
   <li><a href="album-delete?album_id=@album_id@">#photo-album.Delete_this_album#</a></li>
 </if>
 </ul>
Index: openacs-4/packages/photo-album/www/clipboard-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/clipboard-view.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/photo-album/www/clipboard-view.adp	3 Jul 2015 11:19:08 -0000	1.6
+++ openacs-4/packages/photo-album/www/clipboard-view.adp	20 Jan 2018 22:49:15 -0000	1.7
@@ -10,7 +10,7 @@
 
     <p>
 
-    <if @shutterfly_p@ eq "t">
+    <if @shutterfly_p;literal@ true>
     <form action="http://www.shutterfly.com/c4p/UpdateCart.jsp" method="POST">
       <input type="hidden" name="addim" value="1">
       <input type="hidden" name="protocol" value="SFP,100">
Index: openacs-4/packages/photo-album/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/index.adp,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/photo-album/www/index.adp	3 Jul 2015 11:19:08 -0000	1.11
+++ openacs-4/packages/photo-album/www/index.adp	20 Jan 2018 22:49:15 -0000	1.12
@@ -6,22 +6,22 @@
 <p>@folder_description;noquote@</p>
 </if>
 <div style="float: right"><ul>
-<if @subfolder_p@ eq 1>
+<if @subfolder_p;literal@ true>
   <li><a href="folder-add?parent_id=@folder_id@">#photo-album.Add_a_new_folder#</a></li>
 </if>
-<if @album_p@ eq 1>
+<if @album_p;literal@ true>
   <li><a href="album-add?parent_id=@folder_id@">#photo-album.Add_a_new_album#</a></li>
 </if>
-<if @write_p@ eq 1>
+<if @write_p;literal@ true>
   <li><a href="folder-edit?folder_id=@folder_id@">#photo-album.lt_Edit_folder_informati#</a></li>
 </if>
-<if @move_p@ eq 1>
+<if @move_p;literal@ true>
   <li><a href="folder-move?folder_id=@folder_id@">#photo-album.lt_Move_this_folder_to_a#</a></li>
 </if>
-<if @delete_p@ eq 1>
+<if @delete_p;literal@ true>
   <li><a href="folder-delete?folder_id=@folder_id@">#photo-album.Delete_this_folder#</a></li>
 </if>
-<if @admin_p@ eq 1>
+<if @admin_p;literal@ true>
   <li><a href="/permissions/one?object_id=@folder_id@">#photo-album.lt_Modify_this_folders_p#</a></li>
   <li><a href="/shared/parameters?@parameter_url_vars@">#photo-album.Modify_this_pack#</a> </li>
 </if>
@@ -57,7 +57,7 @@
 <p><a href="clipboards">#photo-album.lt_View_all_of_your_clip#</a>.</p>
 </if>
 
-<if @shutterfly_p@ eq "t">
+<if @shutterfly_p;literal@ true>
     <p class="hint">
       #photo-album.lt_To_order_prints_of_th#
       <a href="http://shutterfly.com">#photo-album.shutterflycom#</a> #photo-album.lt_for______printing_fro# <a href="clipboards">#photo-album.clipboard#</a> #photo-album.screen#
Index: openacs-4/packages/photo-album/www/photo.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo.adp,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/photo-album/www/photo.adp	3 Jul 2015 11:19:08 -0000	1.13
+++ openacs-4/packages/photo-album/www/photo.adp	20 Jan 2018 22:49:15 -0000	1.14
@@ -11,7 +11,7 @@
       </if><else>
         <img src="images/@path@/@title@" height="@height@" width="@width@" alt="@title@">
       </else>
-	<if @show_html_p@ eq 1>
+	<if @show_html_p;literal@ true>
           <ul style="text-align:left">
             <li>#photo-album.thumbnail_with_link# <code>&lt;a href="@photo_base_url@photo?photo_id=@photo_id@"&gt;&lt;img src="@photo_base_url@images/@path@/@thumb_image_id@" height="@thumb_height@" width="@thumb_width@" alt="@caption@"&gt;&lt;/a&gt;</code>
  
@@ -31,13 +31,13 @@
       <p>#photo-album.Story_story#</p>
     </if>
     <if @write_p@ eq 1 or @move_p@ eq 1 or @delete_p@ eq 1><ul>
-	<if @show_html_p@ eq 1>
+	<if @show_html_p;literal@ true>
           <li><a href="photo.tcl?photo_id=@photo_id@&amp;show_html_p=0">#photo-album.hide_html#</a></li>  
 	</if>
 	<else>
           <li><a href="photo.tcl?photo_id=@photo_id@&amp;show_html_p=1">#photo-album.show_html#</a></li>  
 	</else>
-        <if @write_p@ eq 1>
+        <if @write_p;literal@ true>
           <li><a href="photo-iconic?photo_id=@photo_id@">#photo-album.lt_Make_this_photo_the_i#</a>
             <li><a href="photo-edit?photo_id=@photo_id@">#photo-album.lt_Edit_photo_attributes#</a>
         </if>
@@ -53,7 +53,7 @@
 	      <formwidget id="move_button"></formwidget>
 	    </formtemplate>
         </if>
-        <if @delete_p@ eq 1>
+        <if @delete_p;literal@ true>
           <li><a href="photo-delete?photo_id=@photo_id@">#photo-album.Delete_this_photo#</a>
         </if>
       </ul>
Index: openacs-4/packages/photo-album/www/photo.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/photo-album/www/photo.tcl	26 Jun 2015 20:59:39 -0000	1.13
+++ openacs-4/packages/photo-album/www/photo.tcl	20 Jan 2018 22:49:15 -0000	1.14
@@ -85,6 +85,7 @@
                                  <li>[_ photo-album._For]</li>
                                  <li>[_ photo-album._Your]</li>
                              </ul>"
+    ad_script_abort
 } else {
     set thumb_image_id ""
     set thumb_photo_id ""
@@ -187,4 +188,4 @@
     
     db_multirow clipped get_clips { *SQL* }
     
-}
\ No newline at end of file
+}
Index: openacs-4/packages/photo-album/www/photos-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photos-edit.adp,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/photo-album/www/photos-edit.adp	3 Jul 2015 11:19:08 -0000	1.9
+++ openacs-4/packages/photo-album/www/photos-edit.adp	20 Jan 2018 22:49:15 -0000	1.10
@@ -10,22 +10,22 @@
 <p>#photo-album.Story_story#
 </if>
 <ul>
-<if @photo_p@ eq 1>
+<if @photo_p;literal@ true>
   <li><a href="photo-add?album_id=@album_id@">#photo-album.lt_Add_a_single_photo_to#</a>
 </if>
-<if @photo_p@ eq 1>
+<if @photo_p;literal@ true>
   <li><a href="photos-add?album_id=@album_id@">#photo-album.lt_Add_a_collection_of_p#</a>
 </if>
-<if @write_p@ eq 1>
+<if @write_p;literal@ true>
   <li><a href="album-edit?album_id=@album_id@">#photo-album.lt_Edit_album_attributes#</a>
 </if>
-<if @move_p@ eq 1>
+<if @move_p;literal@ true>
   <li><a href="album-move?album_id=@album_id@">#photo-album.lt_Move_album_to_another#</a>
 </if>
-<if @delete_p@ eq 1>
+<if @delete_p;literal@ true>
   <li><a href="album-delete?album_id=@album_id@">#photo-album.Delete_this_album#</a>
 </if>
-<if @admin_p@ eq 1>
+<if @admin_p;literal@ true>
   <li><a href="/permissions/one?object_id=@album_id@">#photo-album.lt_Modify_album_permissi#</a>
 </if>
 </ul>
Index: openacs-4/packages/chat/lib/transcripts.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/lib/transcripts.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/chat/lib/transcripts.tcl	7 Aug 2017 23:48:07 -0000	1.4
+++ openacs-4/packages/chat/lib/transcripts.tcl	20 Jan 2018 22:56:50 -0000	1.5
@@ -41,7 +41,7 @@
             label "#chat.actions#"
             html { align "center" }
             display_template {
-                <if @transcript_delete_p@ eq "1">
+                <if @transcript_delete_p;literal@ true>
                   <a href="@chat_transcripts.delete_url@">
                     <img src="/shared/images/Delete16.gif" alt="#chat.Delete_transcript#">
                   </a>
Index: openacs-4/packages/chat/www/chat-transcript.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/chat-transcript.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/chat/www/chat-transcript.tcl	20 Jun 2016 08:37:04 -0000	1.5
+++ openacs-4/packages/chat/www/chat-transcript.tcl	20 Jan 2018 22:56:50 -0000	1.6
@@ -21,6 +21,7 @@
 
 if { [catch {set room_name [chat_room_name $room_id]} errmsg] } {
     ad_return_complaint 1 "[_ chat.Room_not_found]"
+    ad_script_abort
 }
 
 template::head::add_style -style "#messages { 
@@ -37,3 +38,4 @@
 #messages .line {margin:0px;}"
 
 ad_return_template
+
Index: openacs-4/packages/chat/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/index.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/chat/www/index.tcl	7 Aug 2017 23:48:07 -0000	1.13
+++ openacs-4/packages/chat/www/index.tcl	20 Jan 2018 22:56:50 -0000	1.14
@@ -55,7 +55,7 @@
             label "#chat.Active#"
             html { style "text-align: center" }
             display_template {
-                <if @rooms.active_p@ eq t>
+                <if @rooms.active_p;literal@ true>
                 <img src="/resources/chat/active.png" alt="#chat.Room_active#">
                 </if>
                 <else>
@@ -66,7 +66,7 @@
         pretty_name {
             label "#chat.Room_name#"
             display_template {
-                <if @rooms.active_p@ eq t>
+                <if @rooms.active_p;literal@ true>
                 <a href="@rooms.room_url;noquote@">@rooms.pretty_name@</a>&nbsp;\[<a href="@rooms.room_html_url;noquote@">#chat.HTML_chat#</a>\]
                 </if>
                 <else>
@@ -89,7 +89,7 @@
             label "#chat.actions#"
             display_template {
                 <a href="chat-transcripts?room_id=@rooms.room_id@" class=button>#chat.Transcripts#</a>
-                <if @room_create_p@ eq 1>
+                <if @room_create_p;literal@ true>
                 <a href="@rooms.base_url@room?room_id=@rooms.room_id@" class=button>#chat.room_admin#</a>
                 </if>
             }
Index: openacs-4/packages/chat/www/room-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room-edit.tcl,v
diff -u -N -r1.13 -r1.14
--- openacs-4/packages/chat/www/room-edit.tcl	7 Aug 2017 23:48:07 -0000	1.13
+++ openacs-4/packages/chat/www/room-edit.tcl	20 Jan 2018 22:56:50 -0000	1.14
@@ -89,7 +89,7 @@
 			 -creation_ip          [ad_conn peeraddr] $pretty_name]
     } errmsg]} {
         ad_return_complaint 1 "[_ chat.Create_new_room_failed]: $errmsg"
-        break
+        ad_script_abort
     }
     set comm_id ""
     if {[info commands dotlrn_community::get_community_id] ne ""} {
@@ -119,7 +119,7 @@
 	set messages_time_window $r(messages_time_window)
     } errmsg]} {
 	ad_return_complaint 1 "[_ chat.Room_not_found]."
-        break
+        ad_script_abort
     }
 } -edit_data {
     if {[catch {
@@ -137,7 +137,7 @@
 	    $messages_time_window
     } errmsg]} {
         ad_return_complaint 1 "[_ chat.Could_not_update_room]: $errmsg"
-        break
+        ad_script_abort
     }
 } -after_submit {
     ad_returnredirect "room?room_id=$room_id"
Index: openacs-4/packages/chat/www/transcript-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-edit-2.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/chat/www/transcript-edit-2.tcl	7 Aug 2017 23:48:07 -0000	1.9
+++ openacs-4/packages/chat/www/transcript-edit-2.tcl	20 Jan 2018 22:56:50 -0000	1.10
@@ -17,6 +17,8 @@
 
 if { [catch {chat_transcript_edit $transcript_id $transcript_name $description $contents} errmsg] } {
     ad_return_complaint 1 "[_ chat.Could_not_update_transcript]: $errmsg"
+    ad_script_abort
 }
 
-ad_returnredirect "transcript-view?transcript_id=$transcript_id&room_id=$room_id"
\ No newline at end of file
+ad_returnredirect "transcript-view?transcript_id=$transcript_id&room_id=$room_id"
+ad_script_abort
Index: openacs-4/packages/forums/lib/message/attachment-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/attachment-list.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/forums/lib/message/attachment-list.tcl	7 Aug 2017 23:48:11 -0000	1.5
+++ openacs-4/packages/forums/lib/message/attachment-list.tcl	20 Jan 2018 22:56:50 -0000	1.6
@@ -8,6 +8,7 @@
 
 if {![array exists message]} {
     ad_return_complaint 1 "[_ forums.lt_need_to_provide_a_mes]"
+    ad_script_abort
 }
 
 if {(![info exists bgcolor] || $bgcolor eq "")} {
@@ -24,7 +25,7 @@
 
 set attachment_graphic [attachments::graphic_url]
 
-if {([info exists alt_template] && $alt_template ne "")} {
+if {[info exists alt_template] && $alt_template ne ""} {
   ad_return_template $alt_template
 }
 
Index: openacs-4/packages/general-comments/www/comment-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-edit.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/general-comments/www/comment-edit.tcl	7 Aug 2017 23:48:12 -0000	1.7
+++ openacs-4/packages/general-comments/www/comment-edit.tcl	20 Jan 2018 22:56:50 -0000	1.8
@@ -47,6 +47,7 @@
            r.revision_id = :revision_id
 }] } {
     ad_return_complaint 1 "The comment_id does not refer to a valid comment."
+    ad_script_abort
 }
 
 set page_title "[_ general-comments.Edit_comment_on]: [acs_object_name $object_id]"
Index: openacs-4/packages/general-comments/www/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/delete.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/general-comments/www/delete.tcl	7 Aug 2017 23:48:12 -0000	1.4
+++ openacs-4/packages/general-comments/www/delete.tcl	20 Jan 2018 22:56:50 -0000	1.5
@@ -43,6 +43,7 @@
 
 if { ![db_0or1row get_comment $sql] } {
     ad_return_complaint 1 "[_ general-comments.lt_The_comment_id_does_n]"
+    ad_script_abort
 }
 
 set author [person::name -person_id $creation_user]
Index: openacs-4/packages/general-comments/www/file-download.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/file-download.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/general-comments/www/file-download.tcl	7 Aug 2017 23:48:12 -0000	1.5
+++ openacs-4/packages/general-comments/www/file-download.tcl	20 Jan 2018 22:56:50 -0000	1.6
@@ -17,6 +17,7 @@
 permission::require_permission -object_id $item_id -privilege read
 
 cr_write_content -item_id $item_id
+ad_script_abort
 
 # Local variables:
 #    mode: tcl
Index: openacs-4/packages/general-comments/www/url-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/url-edit.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/general-comments/www/url-edit.tcl	7 Aug 2017 23:48:12 -0000	1.6
+++ openacs-4/packages/general-comments/www/url-edit.tcl	20 Jan 2018 22:56:50 -0000	1.7
@@ -1,5 +1,3 @@
-# /packages/general-comments/www/url-edit.tcl
-
 ad_page_contract {
     Edits a url comment
 
@@ -31,6 +29,7 @@
            where extlink_id = :attach_id
 }] } {
     ad_return_complaint 1 "The attach_id does not refer to a valid url attachment."
+    ad_script_abort
 }
 
 set page_title "[_ general-comments.lt_Edit_url_attachment_o] #$parent_id"
Index: openacs-4/packages/general-comments/www/view-comment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/view-comment.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/general-comments/www/view-comment.tcl	7 Aug 2017 23:48:12 -0000	1.11
+++ openacs-4/packages/general-comments/www/view-comment.tcl	20 Jan 2018 22:56:50 -0000	1.12
@@ -52,12 +52,14 @@
     # get revision data from the database
     if { ![db_0or1row get_revision_comment {}] } {
         ad_return_complaint 1 "[_ general-comments.lt_The_comment_id_does_n]"
+        ad_script_abort
     }
 
 } else {
     # get live revision data from the database
     if { ![db_0or1row get_comment {}] } {
         ad_return_complaint 1 "[_ general-comments.lt_The_comment_id_does_n]"
+        ad_script_abort
     }
 }
 
Index: openacs-4/packages/general-comments/www/admin/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/delete.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/general-comments/www/admin/delete.tcl	7 Aug 2017 23:48:12 -0000	1.6
+++ openacs-4/packages/general-comments/www/admin/delete.tcl	20 Jan 2018 22:56:50 -0000	1.7
@@ -42,6 +42,7 @@
 
 if { ![db_0or1row get_comment $sql] } {
     ad_return_complaint 1 "[_ general-comments.lt_The_comment_id_does_n]"
+    ad_script_abort
 }
 
 set page_title "[_ general-comments.Delete_a_comment]"
Index: openacs-4/packages/general-comments/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/index.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/general-comments/www/admin/index.tcl	7 Aug 2017 23:48:12 -0000	1.7
+++ openacs-4/packages/general-comments/www/admin/index.tcl	20 Jan 2018 22:56:50 -0000	1.8
@@ -73,7 +73,7 @@
 	    label "#general-comments.Actions#"
 	    display_template {
 		<a href="toggle-approval?comment_id=@comments.comment_id@&return_url=@comments.return_url@">
-		<if @comments.approved_p@>#general-comments.reject#</if><else>#general-comments.approve#</else></a> |
+		<if @comments.approved_p;literal@ true>#general-comments.reject#</if><else>#general-comments.approve#</else></a> |
 		<a href="delete?comment_id=@comments.comment_id@&return_url=@comments.return_url@">[_ general-comments.delete]</a>
 	    }
 	}