Index: openacs-4/packages/ecommerce/lib/checkout-progress.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/lib/checkout-progress.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/lib/checkout-progress.adp	8 Aug 2008 13:03:28 -0000	1.1
+++ openacs-4/packages/ecommerce/lib/checkout-progress.adp	25 Jul 2018 01:52:18 -0000	1.2
@@ -5,7 +5,7 @@
       <td align="center"<if @step@ ge 1>class="altback"</if>><if @step@ ge 1><strong></if><code>---></code><if @step@ ge 1></strong></if></td>
       <td align="center"<if @step@ ge 2>class="altback"</if>><if @step@ ge 2><strong></if>Verify order<if @step@ ge 2></strong></if></td>
       <td align="center"<if @step@ ge 2>class="altback"</if>><if @step@ ge 2><strong></if><code>---></code><if @step@ ge 2></strong></if></td>
-      <if @express_shipping_avail_p@>
+      <if @express_shipping_avail_p;literal@ true>
 	<td align="center"<if @step@ ge 3>class="altback"</if>><if @step@ ge 3><strong></if>Shipping method<if @step@ ge 3></strong></if></td>
         <td align="center"<if @step@ ge 3>class="altback"</if>><if @step@ ge 3><strong></if><code>---></code><if @step@ ge 3></strong></if></td>
       </if>
Index: openacs-4/packages/ecommerce/lib/contextbar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/lib/contextbar.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/lib/contextbar.adp	10 Aug 2008 10:53:36 -0000	1.2
+++ openacs-4/packages/ecommerce/lib/contextbar.adp	25 Jul 2018 01:52:18 -0000	1.3
@@ -1 +1 @@
-<if @ec_admin_p@>[&nbsp;<a href="@ec_admin_link@" title="Administer @ec_system_name;noquote@">Administer</a>&nbsp;] </if>
+<if @ec_admin_p;literal@ true>[&nbsp;<a href="@ec_admin_link@" title="Administer @ec_system_name;noquote@">Administer</a>&nbsp;] </if>
Index: openacs-4/packages/ecommerce/lib/share-bar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/lib/share-bar.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/lib/share-bar.adp	21 Sep 2010 22:54:10 -0000	1.1
+++ openacs-4/packages/ecommerce/lib/share-bar.adp	25 Jul 2018 01:52:18 -0000	1.2
@@ -1,4 +1,4 @@
-<if @icons_p@ true>
+<if @icons_p;literal@ true>
 <span class="share-class">#acs-subsite.Share#: 
 <a href="http://twitter.com/share?url=@url@&amp;text=@title@" target="_blank"><img src="http://twitter.com/favicon.ico" alt="Tweet" width="16" height="16" border="1">Tweet</a> 
 <a href="http://www.facebook.com/sharer.php?u=@url@&amp;t=@title@" target="_blank" title="Share on Facebook" rel="nofollow"><img src="http://www.facebook.com/favicon.ico" alt="Facebook" width="16" height="16" border="1">Facebook</a> 
Index: openacs-4/packages/ecommerce/lib/toolbar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/lib/toolbar.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/lib/toolbar.adp	15 Oct 2010 05:25:32 -0000	1.3
+++ openacs-4/packages/ecommerce/lib/toolbar.adp	25 Jul 2018 01:52:18 -0000	1.4
@@ -2,7 +2,7 @@
     [&nbsp;<a href="@ec_gift_cert_order_link@">gift certificates</a>&nbsp;] 
  </if>
  <if @current_location@ ne "shopping-cart"> 
-  <if @use_paypal_shopping_cart_p@ true>
+  <if @use_paypal_shopping_cart_p;literal@ true>
     [&nbsp;
 <form name="_xclick" target="paypal" action="https://www.paypal.com/us/cgi-bin/webscr" method="post">
 <input type="hidden" name="cmd" value="_cart">
Index: openacs-4/packages/ecommerce/www/checkout-one-form-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-one-form-2.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/ecommerce/www/checkout-one-form-2.tcl	4 Sep 2008 12:24:06 -0000	1.6
+++ openacs-4/packages/ecommerce/www/checkout-one-form-2.tcl	25 Jul 2018 01:52:18 -0000	1.7
@@ -656,7 +656,7 @@
         # have they entered new credit card info
 
         ad_return_complaint 1 "<li> A credit card is required to complete this order."
-            ad_script_abort
+	ad_script_abort
     } else {
 
         # Then they are using a new credit card and we just have
@@ -692,17 +692,17 @@
         }
         
         if { $exception_count > 0 } {
-                ns_log Notice "checkout-one-form-2.tcl,ref(683): $exception_count form input exception(s) for user $user_id"
-        ad_return_complaint $exception_count $exception_text
-                ad_script_abort
+	    ns_log Notice "checkout-one-form-2.tcl,ref(683): $exception_count form input exception(s) for user $user_id"
+	    ad_return_complaint $exception_count $exception_text
+	    ad_script_abort
         }
 
         # A valid credit card number has been provided and thus a
         # billing address must exist.
 
         if {![info exists billing_address_id] || ([info exists billing_address_id] && [empty_string_p $billing_address_id])} {
-        ad_return_complaint 1 "<li> A billing address is required.</li>"
-                ad_script_abort
+	    ad_return_complaint 1 "<li> A billing address is required.</li>"
+	    ad_script_abort
         }
     }
     } else {
@@ -736,7 +736,7 @@
 
     if {![info exists billing_address_id] || ([info exists billing_address_id] && [empty_string_p $billing_address_id])} {
         ad_return_complaint 1 "<li> A billing address is required.</li>"
-            ad_script_abort
+	ad_script_abort
     }
 
     }
Index: openacs-4/packages/ecommerce/www/checkout-one-form.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-one-form.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ecommerce/www/checkout-one-form.adp	6 Sep 2008 04:02:48 -0000	1.5
+++ openacs-4/packages/ecommerce/www/checkout-one-form.adp	25 Jul 2018 01:52:18 -0000	1.6
@@ -107,7 +107,7 @@
 </else>
 
 <if @gift_certificate_covers_whole_order@ false>
-  <if @gift_certificate_p@>
+  <if @gift_certificate_p;literal@ true>
     <p>If you've received a gift certificate, enter the<br>
       Claim Check: <input type="text" name="claim_check" size="20" maxlength="30" tabindex="40"><br>
       to put the funds into your gift certificate account.
Index: openacs-4/packages/ecommerce/www/gift-certificate-claim-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-claim-2.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/gift-certificate-claim-2.adp	7 Sep 2008 06:22:09 -0000	1.4
+++ openacs-4/packages/ecommerce/www/gift-certificate-claim-2.adp	25 Jul 2018 01:52:18 -0000	1.5
@@ -6,7 +6,7 @@
   <include src="/packages/ecommerce/lib/checkout-progress" step="5">
 
     <blockquote>
-      <if @certificate_added_p@>
+      <if @certificate_added_p;literal@ true>
 	<p><%= [ec_pretty_price @amount@] %> has been added to your gift
 	  certificate account!</p>
       </if>
Index: openacs-4/packages/ecommerce/www/payment.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/payment.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/ecommerce/www/payment.adp	7 Sep 2008 06:22:09 -0000	1.9
+++ openacs-4/packages/ecommerce/www/payment.adp	25 Jul 2018 01:52:18 -0000	1.10
@@ -27,7 +27,7 @@
     </else>
 
     <if @gift_certificate_covers_whole_order@ false>
-      <if @gift_certificate_p@>
+      <if @gift_certificate_p;literal@ true>
       <p><a href="gift-certificate-claim?address_id=@billing_address_id@">Click here to claim a
       new gift certificate</a></p>
       </if>
Index: openacs-4/packages/ecommerce/www/product.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/product.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/ecommerce/www/product.tcl	12 Feb 2009 06:40:42 -0000	1.15
+++ openacs-4/packages/ecommerce/www/product.tcl	25 Jul 2018 01:52:18 -0000	1.16
@@ -87,7 +87,7 @@
 	<p>Please contact <a href=\"mailto:[ec_system_owner]\">[ec_system_owner]</a> if you think this is an error.</p>
     <p><a href=\"index\">Continue browsing</a>.</p>"
     ns_log Warning "product.tcl,line88: product_id $product_id_temp requested, not found."
-    return
+    ad_script_abort
 }
 
 if { [parameter::get -parameter CacheProductAsFile -default 0] && $current_url eq "[ec_url]product" } {
Index: openacs-4/packages/ecommerce/www/shopping-cart-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-oracle.xql,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ecommerce/www/shopping-cart-oracle.xql	10 Aug 2008 20:30:33 -0000	1.5
+++ openacs-4/packages/ecommerce/www/shopping-cart-oracle.xql	25 Jul 2018 01:52:18 -0000	1.6
@@ -20,14 +20,14 @@
 
   <fullquery name="get_products_in_cart">      
     <querytext>
-    select p.product_name, p.one_line_description, p.no_shipping_avail_p, p.shipping, p.shipping_additonal, p.weight, p.product_id, count(*) as quantity, u.offer_code, i.color_choice, i.size_choice, i.style_choice, '' as price
+    select p.product_name, p.one_line_description, p.no_shipping_avail_p, p.shipping, p.shipping_additional, p.weight, p.product_id, count(*) as quantity, u.offer_code, i.color_choice, i.size_choice, i.style_choice, '' as price
     from ec_orders o, ec_items i, ec_products p, 
         (select product_id, offer_code from ec_user_session_offer_codes usoc where usoc.user_session_id=:user_session_id) u
     where i.product_id=p.product_id
     and o.order_id=i.order_id
     and p.product_id=u.product_id(+)
     and o.user_session_id=:user_session_id and o.order_state='in_basket'
-    group by p.product_name, p.one_line_description, p.no_shipping_avail_p, p.shipping, p.shipping_additonal, p.weight, p.product_id, u.offer_code, i.color_choice, i.size_choice, i.style_choice
+    group by p.product_name, p.one_line_description, p.no_shipping_avail_p, p.shipping, p.shipping_additional, p.weight, p.product_id, u.offer_code, i.color_choice, i.size_choice, i.style_choice
     </querytext>
   </fullquery>
 
Index: openacs-4/packages/ecommerce/www/shopping-cart.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart.adp,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/ecommerce/www/shopping-cart.adp	13 Oct 2010 09:59:24 -0000	1.15
+++ openacs-4/packages/ecommerce/www/shopping-cart.adp	25 Jul 2018 01:52:18 -0000	1.16
@@ -91,7 +91,7 @@
  </td>
       </tr>
 
-      <if @offer_express_shipping_p@ true>
+      <if @offer_express_shipping_p;literal@ true>
         <tr>
         <if @product_counter@ gt 1>
             <td colspan="4">
@@ -110,7 +110,7 @@
         </tr>
       </if>
 
-      <if @offer_pickup_option_p@ true>
+      <if @offer_pickup_option_p;literal@ true>
         <tr>
         <if @product_counter@ gt 1>
             <td colspan="4">
@@ -169,7 +169,7 @@
   </else>
 
   <ul>
-    <if @previous_product_id_p@ eq 1>
+    <if @previous_product_id_p;literal@ true>
       <li> <a href="product?product_id=@previous_product_id@">Continue Shopping</a> </li>
     </if>
     <else>
Index: openacs-4/packages/ecommerce/www/admin/audit-table.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/audit-table.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/admin/audit-table.tcl	25 Aug 2008 12:06:52 -0000	1.4
+++ openacs-4/packages/ecommerce/www/admin/audit-table.tcl	25 Jul 2018 01:52:19 -0000	1.5
@@ -55,6 +55,7 @@
       from dual
      where to_date('$start_date(date)','YYYY-MM-DD HH24:MI:SS')  > to_date('$end_date(date)', 'YYYY-MM-DD HH24:MI:SS')"] == 1 } { 
         ad_return_complaint 1 "Please enter a start date before end date."
+	return
     }
 }
 
Index: openacs-4/packages/ecommerce/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/index.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/ecommerce/www/admin/index.adp	9 Sep 2008 12:36:59 -0000	1.8
+++ openacs-4/packages/ecommerce/www/admin/index.adp	25 Jul 2018 01:52:19 -0000	1.9
@@ -39,7 +39,7 @@
 <li><a href="user-classes/">User Classes</a> <font size=-1>(@n_not_yet_approved@ not yet approved user@n_not_yet_approved_plural@)</font></li>
 </if>
 
-<if @multiple_retailers_p@>
+<if @multiple_retailers_p;literal@ true>
 <li><a href="retailers/">Retailers</a></li>
 </if><else>
 <li><a href="shipping-costs/">Shipping Costs</a></li>
Index: openacs-4/packages/ecommerce/www/admin/customer-reviews/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-reviews/one.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/admin/customer-reviews/one.tcl	18 Aug 2008 11:41:43 -0000	1.4
+++ openacs-4/packages/ecommerce/www/admin/customer-reviews/one.tcl	25 Jul 2018 01:52:19 -0000	1.5
@@ -21,6 +21,7 @@
 and c. user_id = u.user_id 
 and c.comment_id=:comment_id"] } {
     ad_return_complaint 1 "Invalid Comment ID passed in"
+    return
 }
 
 set comment_date_html [util_AnsiDatetoPrettyDate $comment_date]
Index: openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3.tcl	24 Aug 2008 11:00:43 -0000	1.9
+++ openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3.tcl	25 Jul 2018 01:52:19 -0000	1.10
@@ -330,7 +330,7 @@
     (issue_id, user_identification_id, order_id, open_date, close_date, closed_by)
     values
     (:issue_id, :uiid_to_insert, :order_id, $date_string, $close_date, $customer_service_rep_bit)"
-        set issue_type_list [concat $issue_type_list $issue_type]
+        lappend issue_type_list {*}$issue_type
 
         foreach issue_type $issue_type_list {
             db_dml insert_into_issue_tm "insert into ec_cs_issue_type_map
Index: openacs-4/packages/ecommerce/www/admin/customer-service/issue-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/issue-edit-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/customer-service/issue-edit-2.tcl	10 Sep 2002 22:22:40 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/customer-service/issue-edit-2.tcl	25 Jul 2018 01:52:19 -0000	1.4
@@ -20,7 +20,7 @@
 # Another hack to make this crap code work. The foreach below loops only over
 # the list of issue type already assigned to the issue. Hence, to make this work
 # the new list is concatenated to the old list.
-set issue_type_list [concat $issue_type_list $issue_type]
+lappend issue_type_list {*}$issue_type
 
 db_transaction {
     db_dml delete_from_issue_type_map "delete from ec_cs_issue_type_map where issue_id=:issue_id"
Index: openacs-4/packages/ecommerce/www/admin/customer-service/issues-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/issues-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/customer-service/issues-postgresql.xql	4 Apr 2018 18:51:56 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/customer-service/issues-postgresql.xql	25 Jul 2018 01:52:19 -0000	1.4
@@ -51,7 +51,7 @@
 	JOIN ec_user_identification id using (user_identification_id)
 	LEFT JOIN cc_users u on (id.user_id = u.user_id)
 	-- gilbertw
-	-- removed this and used a normal where constraint so I dont have to
+	-- removed this and used a normal where constraint so I don't have to
 	-- worry about setting up the correct and/where statement for the
 	-- dynamic queries
 	-- JOIN ec_cs_issue_type_map m on (i.issue_id = m.issue_id)
Index: openacs-4/packages/ecommerce/www/admin/email-templates/edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/email-templates/edit-2.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/admin/email-templates/edit-2.tcl	1 Mar 2005 00:01:32 -0000	1.4
+++ openacs-4/packages/ecommerce/www/admin/email-templates/edit-2.tcl	25 Jul 2018 01:52:19 -0000	1.5
@@ -41,7 +41,7 @@
     <P>We're sorry, but templates added here cannot
     have functions in them for security reasons. Only HTML and 
     <%= \$variable %> style code may be used.  We found <tt>$function</tt> in this template"
-
+    ad_script_abort
 }
 
 
@@ -65,3 +65,4 @@
 db_release_unused_handles
 
 ad_returnredirect "index.tcl"
+ad_script_abort
Index: openacs-4/packages/ecommerce/www/admin/email-templates/edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/email-templates/edit.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ecommerce/www/admin/email-templates/edit.tcl	19 Aug 2008 11:33:05 -0000	1.5
+++ openacs-4/packages/ecommerce/www/admin/email-templates/edit.tcl	25 Jul 2018 01:52:19 -0000	1.6
@@ -19,6 +19,7 @@
 
 if { ![db_0or1row unused "select * from ec_email_templates where email_template_id=:email_template_id"] } {
     ad_return_complaint 1 "Invalid email_template_id passed in"
+    return
 }
 
 db_release_unused_handles
Index: openacs-4/packages/ecommerce/www/admin/mailing-lists/member-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/mailing-lists/member-add.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/mailing-lists/member-add.adp	19 Aug 2008 11:29:03 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/mailing-lists/member-add.adp	25 Jul 2018 01:52:19 -0000	1.2
@@ -3,7 +3,7 @@
   <property name="context">@context;noquote@</property>
 <h2>@title@</h2>
 
- <if @last_name_p@ true>
+ <if @last_name_p;literal@ true>
   <h3>Users whose last name contains '@last_name@':</h3>
 </if><else>
   <h3>Users whose email contains '@email@':</h3>
Index: openacs-4/packages/ecommerce/www/admin/orders/gift-certificate.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/gift-certificate.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/orders/gift-certificate.adp	18 Aug 2008 10:45:37 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/orders/gift-certificate.adp	25 Jul 2018 01:52:19 -0000	1.2
@@ -3,7 +3,7 @@
   <property name="context">@context;noquote@</property>
 <h2>@title@</h2>
 
-<if @found_p@ false>
+<if @found_p;literal@ false>
 <p>Gift certificate not found.</p>
 </if><else>
   <table>
Index: openacs-4/packages/ecommerce/www/admin/products/add-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/add-3.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/products/add-3.adp	13 Aug 2008 12:16:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/products/add-3.adp	25 Jul 2018 01:52:19 -0000	1.2
@@ -32,7 +32,7 @@
 @categorization_html;noquote@
 </td>
 </tr>
-<if @multiple_retailers_p@ true>
+<if @multiple_retailers_p;literal@ true>
 
 
 </if><else>
Index: openacs-4/packages/ecommerce/www/admin/products/add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/admin/products/add.adp	25 Aug 2008 12:15:52 -0000	1.2
+++ openacs-4/packages/ecommerce/www/admin/products/add.adp	25 Jul 2018 01:52:19 -0000	1.3
@@ -23,7 +23,7 @@
 <td>Choose as many categories as you like.  The product will
 be displayed on the web site in each of the categories you select.</td>
 </tr>
-<if @multiple_retailers_p@ false>
+<if @multiple_retailers_p;literal@ false>
 <tr>
     <td>Regular Price</td>
     <td><input type=text size=6 name=price></td>
Index: openacs-4/packages/ecommerce/www/admin/products/custom-field.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/custom-field.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/products/custom-field.adp	14 Aug 2008 21:48:24 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/products/custom-field.adp	25 Jul 2018 01:52:19 -0000	1.2
@@ -31,7 +31,7 @@
 <ul>
 <li><a href="custom-field-edit?field_identifier=@field_identifier@">Edit</a>
 
-<if @active_p@ true>
+<if @active_p;literal@ true>
 <li><a href="custom-field-status-change?field_identifier=@field_identifier@&active_p=f">Make Inactive</a>
 </if><else>
 <li><a href="custom-field-status-change?field_identifier=@field_identifier@&active_p=t">Reactivate</a>
Index: openacs-4/packages/ecommerce/www/admin/products/edit-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/edit-2.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/products/edit-2.adp	13 Aug 2008 21:22:03 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/products/edit-2.adp	25 Jul 2018 01:52:19 -0000	1.2
@@ -36,7 +36,7 @@
 @categorization_html;noquote@
 </td>
 </tr>
-<if @multiple_retailers_p@ true>
+<if @multiple_retailers_p;literal@ true>
 @stock_status_html;noquote@
 </if><else>
    <tr>
Index: openacs-4/packages/ecommerce/www/admin/products/edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/edit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/admin/products/edit.adp	28 Sep 2008 09:21:33 -0000	1.4
+++ openacs-4/packages/ecommerce/www/admin/products/edit.adp	25 Jul 2018 01:52:19 -0000	1.5
@@ -24,7 +24,7 @@
 <td>Choose as many categories as you like.  The product will
 be displayed on the web site in each of the categories you select.</td>
 </tr>
-<if @multiple_retailers_p@ true>
+<if @multiple_retailers_p;literal@ true>
      @stock_status_html;noquote@
 </if><else>
 <tr>
Index: openacs-4/packages/ecommerce/www/admin/products/offer-edit-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/offer-edit-2.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/products/offer-edit-2.adp	15 Aug 2008 12:46:06 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/products/offer-edit-2.adp	25 Jul 2018 01:52:19 -0000	1.2
@@ -28,7 +28,7 @@
 <td>Offer Expires</td>
 <td>@offer_ends_html;noquote@</td>
 </tr>
-<if @special_offer_p@ true>
+<if @special_offer_p;literal@ true>
 <tr><td>Special Offer:</td><td>@special_offer_html;noquote@</td></tr>
 </if>
 </table>
Index: openacs-4/packages/ecommerce/www/admin/products/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/one.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/products/one.adp	14 Aug 2008 11:33:03 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/products/one.adp	25 Jul 2018 01:52:19 -0000	1.4
@@ -14,7 +14,7 @@
        <a href="edit?@export_product_id_var;noquote@">Edit This Item</a>
 
     <blockquote>
-<if @active_p@ false>
+<if @active_p;literal@ false>
 <p><b>This product is discontinued.</b></p>
 </if>
 
@@ -57,7 +57,7 @@
       </td>
     </tr>
 
-  <if @multiple_retailers_p@ true>
+  <if @multiple_retailers_p;literal@ true>
 
 @stock_status_html;noquote@
 <ul>
Index: openacs-4/packages/ecommerce/www/admin/retailers/add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/retailers/add.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ecommerce/www/admin/retailers/add.tcl	9 Mar 2004 00:59:52 -0000	1.5
+++ openacs-4/packages/ecommerce/www/admin/retailers/add.tcl	25 Jul 2018 01:52:19 -0000	1.6
@@ -132,3 +132,5 @@
 "
 
 doc_return  200 text/html $page_html
+ad_script_abort
+
Index: openacs-4/packages/ecommerce/www/admin/retailers/edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/retailers/edit.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ecommerce/www/admin/retailers/edit.tcl	9 Mar 2004 00:59:52 -0000	1.5
+++ openacs-4/packages/ecommerce/www/admin/retailers/edit.tcl	25 Jul 2018 01:52:19 -0000	1.6
@@ -163,3 +163,4 @@
 
 
 doc_return  200 text/html $page_html
+ad_script_abort
Index: openacs-4/packages/ecommerce/www/admin/retailers/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/retailers/index.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/retailers/index.tcl	9 Mar 2004 00:59:52 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/retailers/index.tcl	25 Jul 2018 01:52:19 -0000	1.4
@@ -48,3 +48,4 @@
 "
 
 doc_return  200 text/html $page_html
+ad_script_abort
Index: openacs-4/packages/ecommerce/www/admin/retailers/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/retailers/one.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/retailers/one.tcl	9 Mar 2004 00:59:52 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/retailers/one.tcl	25 Jul 2018 01:52:19 -0000	1.4
@@ -185,11 +185,4 @@
 
 
 doc_return  200 text/html $page_html
-
-
-
-
-
-
-
-
+ad_script_abort
Index: openacs-4/packages/ecommerce/www/admin/templates/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/templates/one.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/admin/templates/one.adp	5 Apr 2018 14:44:09 -0000	1.2
+++ openacs-4/packages/ecommerce/www/admin/templates/one.adp	25 Jul 2018 01:52:19 -0000	1.3
@@ -3,7 +3,7 @@
   <property name="context">@context;noquote@</property>
 <h2>@title@</h2>
 
-<if @default_template_p@ true>
+<if @default_template_p;literal@ true>
   <p>This is the default template used for product display.</p>
 </if>
 <h3>The template: @template_name@</h3>
@@ -16,7 +16,7 @@
   <li><a href="edit?@export_url_vars_html@">Edit</a></li>
   <li><a href="add?based_on=@template_id@">Create new template based
   on this one</a></li>
- <if @default_template_p@ false>
+ <if @default_template_p;literal@ false>
   <li><a href="make-default?@export_url_vars_html@">Make this template be the default template</a></li>
   <li><a href="delete?@export_url_vars_html@">Delete</a></li>
 </if><else>
Index: openacs-4/packages/ecommerce/www/admin/user-classes/member-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/user-classes/member-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/admin/user-classes/member-add.adp	25 Aug 2008 13:11:36 -0000	1.2
+++ openacs-4/packages/ecommerce/www/admin/user-classes/member-add.adp	25 Jul 2018 01:52:19 -0000	1.3
@@ -3,7 +3,7 @@
   <property name="context">@context;noquote@</property>
 <h2>@title@</h2>
 
-<if @last_name_search_p@ true>
+<if @last_name_search_p;literal@ true>
   <h3>Users whose last name contains '@last_name@':</h3>
 </if><else>
   <h3>Users whose email contains '@email@':</h3>
Index: openacs-4/packages/ecommerce/www/doc/contextbar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/contextbar.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/doc/contextbar.adp	15 Nov 2003 06:48:11 -0000	1.3
+++ openacs-4/packages/ecommerce/www/doc/contextbar.adp	25 Jul 2018 01:52:19 -0000	1.4
@@ -1 +1 @@
-<table width ="100%"> <tbody> <tr> <td>@context_bar;noquote@</td> <if @ec_admin_p@ and @ec_installed_p@><td align="right">[&nbsp;<a href="@ec_admin_link@" title="Administer @ec_system_name@">Administer</a>&nbsp;]</td></if> </tr> </tbody> </table>
+<table width ="100%"> <tbody> <tr> <td>@context_bar;noquote@</td> <if @ec_admin_p;literal@ true and @ec_installed_p;literal@ true><td align="right">[&nbsp;<a href="@ec_admin_link@" title="Administer @ec_system_name@">Administer</a>&nbsp;]</td></if> </tr> </tbody> </table>