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.4 -r1.5
--- openacs-4/packages/download/www/admin/approve-or-reject.adp	6 Sep 2002 21:50:32 -0000	1.4
+++ openacs-4/packages/download/www/admin/approve-or-reject.adp	22 May 2003 14:46:43 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@pretty_noun@ @archive_name@ @version_name@</property>
-<property name="context">@pretty_noun@</property>
+<property name="title">@pretty_noun;noquote@ @archive_name;noquote@ @version_name;noquote@</property>
+<property name="context">@pretty_noun;noquote@</property>
 
   <table>
   <form action=approve-or-reject-2.tcl>
Index: openacs-4/packages/download/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/download/www/admin/index.adp	6 Sep 2002 21:50:32 -0000	1.3
+++ openacs-4/packages/download/www/admin/index.adp	22 May 2003 14:46:43 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@title@ Repository Administration</property>
+<property name="title">@title;noquote@ Repository Administration</property>
 <property name="context"></property>
 
 @description@
Index: openacs-4/packages/download/www/admin/report-by-ip.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-by-ip.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/download/www/admin/report-by-ip.adp	16 Jan 2003 13:46:20 -0000	1.6
+++ openacs-4/packages/download/www/admin/report-by-ip.adp	22 May 2003 14:46:43 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Downloads by IP</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 <p>
 <form method="post" action="spam-users">
@@ -9,5 +9,5 @@
 </form>
 </p>
 
-@dimensional_html@
+@dimensional_html;noquote@
 @table@
\ No newline at end of file
Index: openacs-4/packages/download/www/admin/report-by-user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-by-user.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/download/www/admin/report-by-user.adp	16 Jan 2003 13:46:20 -0000	1.5
+++ openacs-4/packages/download/www/admin/report-by-user.adp	22 May 2003 14:46:43 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
 <property name="title">Downloads by User</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 <p>
 <form method="post" action="spam-users">
@@ -9,5 +9,5 @@
 </form>
 </p>
 
-@dimensional_html@
+@dimensional_html;noquote@
 @table@
\ No newline at end of file
Index: openacs-4/packages/download/www/admin/report-one-ip.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-one-ip.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/download/www/admin/report-one-ip.adp	16 Jan 2003 13:46:20 -0000	1.5
+++ openacs-4/packages/download/www/admin/report-one-ip.adp	22 May 2003 14:46:43 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-<property name="title">Downloads by IP @download_ip@</property>
-<property name="context">@context@</property>
+<property name="title">Downloads by IP @download_ip;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <p>
 <form method="post" action="spam-users">
@@ -9,5 +9,5 @@
 </form>
 </p>
 
-@dimensional_html@
+@dimensional_html;noquote@
 @table@
\ No newline at end of file
Index: openacs-4/packages/download/www/admin/report-one-user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-one-user.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/download/www/admin/report-one-user.adp	6 Sep 2002 21:50:32 -0000	1.4
+++ openacs-4/packages/download/www/admin/report-one-user.adp	22 May 2003 14:46:43 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="title">Downloads by User @first_names@ @last_name@</property>
-<property name="context">@context@</property>
+<property name="title">Downloads by User @first_names;noquote@ @last_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
-@dimensional_html@
+@dimensional_html;noquote@
 @table@
\ No newline at end of file
Index: openacs-4/packages/download/www/admin/report-version-downloads.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-version-downloads.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/download/www/admin/report-version-downloads.adp	16 Jan 2003 13:46:20 -0000	1.5
+++ openacs-4/packages/download/www/admin/report-version-downloads.adp	22 May 2003 14:46:43 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@archive_name@ Download History</property>
-<property name="context">@context@</property>
+<property name="title">@archive_name;noquote@ Download History</property>
+<property name="context">@context;noquote@</property>
 
 <p>
 <form method="post" action="spam-users">
@@ -9,7 +9,7 @@
 </form>
 </p>
 
-@dimensional_html@
+@dimensional_html;noquote@
 <center><strong>Total downloads listed: @current_count@; Overall Total for @archive_name@: @total_count@</strong>
 </center>
 @table@
\ No newline at end of file
Index: openacs-4/packages/download/www/admin/repository-metadata.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-metadata.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/download/www/admin/repository-metadata.adp	6 Sep 2002 21:50:32 -0000	1.3
+++ openacs-4/packages/download/www/admin/repository-metadata.adp	22 May 2003 14:46:43 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@title@</property>
-<property name="context">@context@</property>
+<property name="title">@title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <formtemplate id="add_metadata"></formtemplate>
 
Index: openacs-4/packages/download/www/admin/repository-reasons-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-reasons-edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/download/www/admin/repository-reasons-edit.adp	6 Sep 2002 21:50:32 -0000	1.3
+++ openacs-4/packages/download/www/admin/repository-reasons-edit.adp	22 May 2003 14:46:43 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@title@</property>
-<property name="context">@context@</property>
+<property name="title">@title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <formtemplate id="edit_reason"></formtemplate>
Index: openacs-4/packages/download/www/admin/repository-reasons.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-reasons.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/download/www/admin/repository-reasons.adp	6 Sep 2002 21:50:32 -0000	1.3
+++ openacs-4/packages/download/www/admin/repository-reasons.adp	22 May 2003 14:46:43 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@title@</property>
-<property name="context">@context@</property>
+<property name="title">@title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <h3>Add a new Download Reason</h3>
 
Index: openacs-4/packages/download/www/admin/repository-types-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-types-edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/download/www/admin/repository-types-edit.adp	6 Sep 2002 21:50:32 -0000	1.3
+++ openacs-4/packages/download/www/admin/repository-types-edit.adp	22 May 2003 14:46:43 -0000	1.4
@@ -1,5 +1,5 @@
 <master>
-<property name="title">@title@</property>
-<property name="context">@context@</property>
+<property name="title">@title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <formtemplate id="edit_type"></formtemplate>
Index: openacs-4/packages/download/www/admin/repository-types.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-types.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/download/www/admin/repository-types.adp	6 Sep 2002 21:50:32 -0000	1.3
+++ openacs-4/packages/download/www/admin/repository-types.adp	22 May 2003 14:46:43 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@title@</property>
-<property name="context">@context@</property>
+<property name="title">@title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <formtemplate id="add_type"></formtemplate>
 
Index: openacs-4/packages/ecommerce/www/account.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/account.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/account.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/account.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Your account</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar" current_location="your-account">
 
Index: openacs-4/packages/ecommerce/www/address-international.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/address-international.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ecommerce/www/address-international.adp	19 Sep 2002 03:25:32 -0000	1.5
+++ openacs-4/packages/ecommerce/www/address-international.adp	22 May 2003 14:48:11 -0000	1.6
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Enter Your Address</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
 <if @address_type@ eq "shipping">
   <include src="checkout-progress" step="1">
Index: openacs-4/packages/ecommerce/www/address.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/address.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ecommerce/www/address.adp	17 Sep 2002 03:36:34 -0000	1.5
+++ openacs-4/packages/ecommerce/www/address.adp	22 May 2003 14:48:11 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
 <if @address_type@ eq "shipping">
   <property name="title">Enter Your Shipping Address</property>
Index: openacs-4/packages/ecommerce/www/billing.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/billing.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/billing.adp	17 Sep 2002 03:36:34 -0000	1.3
+++ openacs-4/packages/ecommerce/www/billing.adp	22 May 2003 14:48:11 -0000	1.4
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Completing Your Order</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="checkout-progress" step="4">
 
Index: openacs-4/packages/ecommerce/www/category-browse-subcategory.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse-subcategory.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/category-browse-subcategory.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/category-browse-subcategory.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
-  <property name="title">@subcategory_name@</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="title">@subcategory_name;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar">
 
Index: openacs-4/packages/ecommerce/www/category-browse-subsubcategory.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse-subsubcategory.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/category-browse-subsubcategory.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/category-browse-subsubcategory.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
-  <property name="title">@subsubcategory_name@</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="title">@subsubcategory_name;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar">
 
Index: openacs-4/packages/ecommerce/www/category-browse.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/category-browse.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/category-browse.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
-  <property name="title">@the_category_name@</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="title">@the_category_name;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar">
 
Index: openacs-4/packages/ecommerce/www/checkout-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-2.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/checkout-2.adp	17 Sep 2002 03:36:34 -0000	1.3
+++ openacs-4/packages/ecommerce/www/checkout-2.adp	22 May 2003 14:48:11 -0000	1.4
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Completing Your Order</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="checkout-progress" step="2">
 
Index: openacs-4/packages/ecommerce/www/checkout-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-3.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/checkout-3.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/checkout-3.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Completing Your Order</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="checkout-progress" step="6">
 
Index: openacs-4/packages/ecommerce/www/checkout.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/checkout.adp	17 Sep 2002 03:36:34 -0000	1.3
+++ openacs-4/packages/ecommerce/www/checkout.adp	22 May 2003 14:48:11 -0000	1.4
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Completing Your Order</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="checkout-progress" step="1">
 
Index: openacs-4/packages/ecommerce/www/credit-card-correction.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/credit-card-correction.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/credit-card-correction.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/credit-card-correction.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Completing Your Order</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="checkout-progress" step="6">
 
Index: openacs-4/packages/ecommerce/www/gift-certificate-billing.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-billing.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/gift-certificate-billing.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/gift-certificate-billing.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Completing Your Order</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar" current_location="gift-certificate">
 
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.1 -r1.2
--- openacs-4/packages/ecommerce/www/gift-certificate-claim-2.adp	17 Sep 2002 03:37:50 -0000	1.1
+++ openacs-4/packages/ecommerce/www/gift-certificate-claim-2.adp	22 May 2003 14:48:11 -0000	1.2
@@ -1,7 +1,7 @@
 <master>
-  <property name="title">@title@</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="title">@title;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="checkout-progress" step="5">
 
Index: openacs-4/packages/ecommerce/www/gift-certificate-claim.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-claim.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/gift-certificate-claim.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/gift-certificate-claim.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Claim a Gift Certificate</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="checkout-progress" step="5">
 
Index: openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,9 +1,9 @@
 <master>
-  <property name="title">@title@</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="title">@title;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar" current_location="gift-certificate">
 
-@page@
+@page;noquote@
 
Index: openacs-4/packages/ecommerce/www/gift-certificate-order-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/gift-certificate-order-2.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/gift-certificate-order-2.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Your Gift Certificate Order</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar" current_location="gift-certificate">
 
Index: openacs-4/packages/ecommerce/www/gift-certificate-order-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order-3.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/gift-certificate-order-3.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/gift-certificate-order-3.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Payment Info</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar" current_location="gift-certificate">
 
Index: openacs-4/packages/ecommerce/www/gift-certificate-order-4.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order-4.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/gift-certificate-order-4.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/gift-certificate-order-4.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Please Confirm Your Gift Certificate Order</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar" current_location="gift-certificate">
 
Index: openacs-4/packages/ecommerce/www/gift-certificate-order.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/gift-certificate-order.adp	30 Nov 2002 17:31:29 -0000	1.3
+++ openacs-4/packages/ecommerce/www/gift-certificate-order.adp	22 May 2003 14:48:11 -0000	1.4
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Gift Certificates</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar" current_location="gift-certificate">
 
Index: openacs-4/packages/ecommerce/www/gift-certificate-thank-you.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-thank-you.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/gift-certificate-thank-you.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/gift-certificate-thank-you.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Thank You For Your Gift Certificate Order</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar" current_location="gift-certificate">
 
Index: openacs-4/packages/ecommerce/www/gift-certificate.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/gift-certificate.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/gift-certificate.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Your Gift Certificate</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar" current_location="gift-certificate">
 
Index: openacs-4/packages/ecommerce/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/index.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/index.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
   <property name="title">Welcome</property>
-  <property name="context_bar">@context_bar@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
 
   <include src="toolbar">
 
@@ -14,7 +14,7 @@
 
       <include src="browse-categories">
 
-      <if @recommendations_if_there_are_any@>
+      <if @recommendations_if_there_are_any;noquote@>
 	<h4>We recommend:</h4>
 	@recommendations_if_there_are_any@
       </if>
Index: openacs-4/packages/ecommerce/www/mailing-list-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/mailing-list-add-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/mailing-list-add-2.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/mailing-list-add-2.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
-  <property name="title">@title@</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="title">@title;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar">
 
Index: openacs-4/packages/ecommerce/www/mailing-list-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/mailing-list-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/mailing-list-add.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/mailing-list-add.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
-  <property name="title">@title@</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="title">@title;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
 <blockquote>
   We think that you are @user_name@.  If not, please <a href="@register_link@">log in</a>.  Otherwise,
Index: openacs-4/packages/ecommerce/www/mailing-list-remove.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/mailing-list-remove.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/mailing-list-remove.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/mailing-list-remove.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
   <property name="title">$title</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar">
 
Index: openacs-4/packages/ecommerce/www/order.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/order.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/order.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/order.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Your Order</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar">
 
Index: openacs-4/packages/ecommerce/www/payment.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/payment.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/payment.adp	17 Sep 2002 03:36:34 -0000	1.3
+++ openacs-4/packages/ecommerce/www/payment.adp	22 May 2003 14:48:11 -0000	1.4
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Completing Your Order</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="checkout-progress" step="5">
 
Index: openacs-4/packages/ecommerce/www/product-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/product-search.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/product-search.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/product-search.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
-  <property name="title">@category_name@</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="title">@category_name;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar">
 
Index: openacs-4/packages/ecommerce/www/product.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/product.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/product.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/product.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,8 +1,8 @@
 <master>
-  <property name="title">@product_name@</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="title">@product_name;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar">
 
-  @formatted_product@
+  @formatted_product;noquote@
Index: openacs-4/packages/ecommerce/www/review-submit-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/review-submit-2.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/review-submit-2.adp	17 Sep 2002 03:36:34 -0000	1.3
+++ openacs-4/packages/ecommerce/www/review-submit-2.adp	22 May 2003 14:48:11 -0000	1.4
@@ -1,7 +1,7 @@
 <master>
-  <property name="title">Check Your Review of @product_name@</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="title">Check Your Review of @product_name;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar">
 
Index: openacs-4/packages/ecommerce/www/review-submit-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/review-submit-3.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/review-submit-3.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/review-submit-3.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
-  <property name="title">Thank You For Your Review of @product_name@</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="title">Thank You For Your Review of @product_name;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar">
 
Index: openacs-4/packages/ecommerce/www/review-submit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/review-submit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/review-submit.adp	7 Dec 2002 01:53:28 -0000	1.4
+++ openacs-4/packages/ecommerce/www/review-submit.adp	22 May 2003 14:48:11 -0000	1.5
@@ -1,7 +1,7 @@
 <master>
-  <property name="title">Write Your Own Review of @product_name@</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="title">Write Your Own Review of @product_name;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar">
 
Index: openacs-4/packages/ecommerce/www/select-shipping.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/select-shipping.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/select-shipping.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/select-shipping.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Completing Your Order</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="checkout-progress" step="3">
 
Index: openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Select Shopping Cart</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar" current_location="shopping-cart">
 
Index: openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.adp	19 Sep 2002 03:02:19 -0000	1.4
+++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.adp	22 May 2003 14:48:11 -0000	1.5
@@ -1,7 +1,7 @@
 <master>
-  <property name="title">@page_title@</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="title">@page_title;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar" current_location="shopping-cart">
 
Index: openacs-4/packages/ecommerce/www/shopping-cart-retrieve.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-retrieve.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/shopping-cart-retrieve.adp	17 Sep 2002 03:36:34 -0000	1.3
+++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve.adp	22 May 2003 14:48:11 -0000	1.4
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Retrieve Shopping Cart</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar" current_location="shopping-cart">
 
Index: openacs-4/packages/ecommerce/www/shopping-cart-save-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-save-2.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/shopping-cart-save-2.adp	17 Sep 2002 03:36:34 -0000	1.3
+++ openacs-4/packages/ecommerce/www/shopping-cart-save-2.adp	22 May 2003 14:48:11 -0000	1.4
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Your Shopping Cart Has Been Saved</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar" current_location="shopping-cart">
 
Index: openacs-4/packages/ecommerce/www/shopping-cart-save.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-save.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/shopping-cart-save.adp	17 Sep 2002 03:36:34 -0000	1.3
+++ openacs-4/packages/ecommerce/www/shopping-cart-save.adp	22 May 2003 14:48:11 -0000	1.4
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Save Shopping Cart</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar" current_location="your-account">
 
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.5 -r1.6
--- openacs-4/packages/ecommerce/www/shopping-cart.adp	19 Sep 2002 03:24:55 -0000	1.5
+++ openacs-4/packages/ecommerce/www/shopping-cart.adp	22 May 2003 14:48:11 -0000	1.6
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Your Shopping Cart</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar" current_location="shopping-cart">
 
Index: openacs-4/packages/ecommerce/www/thank-you.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/thank-you.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/thank-you.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/thank-you.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Thank You For Your Order</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="checkout-progress" step="6">
 
Index: openacs-4/packages/ecommerce/www/track.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/track.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/track.adp	17 Sep 2002 03:36:34 -0000	1.2
+++ openacs-4/packages/ecommerce/www/track.adp	22 May 2003 14:48:11 -0000	1.3
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Your Shipment</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar" current_location="shopping-cart">
 
Index: openacs-4/packages/ecommerce/www/update-user-classes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/update-user-classes.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/update-user-classes.adp	17 Sep 2002 03:36:34 -0000	1.3
+++ openacs-4/packages/ecommerce/www/update-user-classes.adp	22 May 2003 14:48:11 -0000	1.4
@@ -1,7 +1,7 @@
 <master>
   <property name="title">Your Account</property>
-  <property name="context_bar">@context_bar@</property>
-  <property name="signatory">@ec_system_owner@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="toolbar" current_location="your-account">
 
Index: openacs-4/packages/ecommerce/www/doc/audit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/audit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/doc/audit.adp	19 Sep 2002 03:02:18 -0000	1.4
+++ openacs-4/packages/ecommerce/www/doc/audit.adp	22 May 2003 14:49:34 -0000	1.5
@@ -1,7 +1,7 @@
 <master>
   <property name=title>Audit Trail Package</property>
-  <property name="signatory">@signatory@</property>
-  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@signatory;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
 
   <h2>The Big Picture</h2>
 
Index: openacs-4/packages/ecommerce/www/doc/ecommerce-customer-service.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-customer-service.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/doc/ecommerce-customer-service.adp	10 Dec 2002 20:05:21 -0000	1.4
+++ openacs-4/packages/ecommerce/www/doc/ecommerce-customer-service.adp	22 May 2003 14:49:34 -0000	1.5
@@ -1,7 +1,7 @@
 <master>
-  <property name=title>@title@</property>
-  <property name="signatory">@signatory@</property>
-  <property name="context_bar">@context_bar@</property>
+  <property name=title>@title;noquote@</property>
+  <property name="signatory">@signatory;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
 
   <p>The Customer Service Module can be found at <if @package_url@ not nil><a
    href="@package_url@admin/customer-service/">@package_url@</if>admin/customer-service/<if @package_url@ not nil></a></if>
Index: openacs-4/packages/ecommerce/www/doc/ecommerce-features.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-features.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/doc/ecommerce-features.adp	19 Sep 2002 03:02:18 -0000	1.3
+++ openacs-4/packages/ecommerce/www/doc/ecommerce-features.adp	22 May 2003 14:49:34 -0000	1.4
@@ -1,7 +1,7 @@
 <master>
-  <property name=title>@title@</property>
-  <property name="signatory">@signatory@</property>
-  <property name="context_bar">@context_bar@</property>
+  <property name=title>@title;noquote@</property>
+  <property name="signatory">@signatory;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
 
   <h2>Some of the high-level features of the @package_name@:</h2>
 
Index: openacs-4/packages/ecommerce/www/doc/ecommerce-for-mbas.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-for-mbas.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/doc/ecommerce-for-mbas.adp	19 Sep 2002 03:02:18 -0000	1.3
+++ openacs-4/packages/ecommerce/www/doc/ecommerce-for-mbas.adp	22 May 2003 14:49:34 -0000	1.4
@@ -1,7 +1,7 @@
 <master>
-  <property name=title>@title@</property>
-  <property name="signatory">@signatory@</property>
-  <property name="context_bar">@context_bar@</property>
+  <property name=title>@title;noquote@</property>
+  <property name="signatory">@signatory;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
 
   <p>The big decision:</p>
 
Index: openacs-4/packages/ecommerce/www/doc/ecommerce-operation.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-operation.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/doc/ecommerce-operation.adp	10 Dec 2002 20:05:21 -0000	1.4
+++ openacs-4/packages/ecommerce/www/doc/ecommerce-operation.adp	22 May 2003 14:49:34 -0000	1.5
@@ -1,7 +1,7 @@
 <master>
   <property name=title>Operation of the Ecommerce Module</property>
-  <property name="signatory">@signatory@</property>
-  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@signatory;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
 
   <p>Before reading this, make sure that you have read about <a
    href="ecommerce-setup">setting up your ecommerce module</a>.  This
Index: openacs-4/packages/ecommerce/www/doc/ecommerce-setup.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-setup.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/doc/ecommerce-setup.adp	10 Dec 2002 20:05:21 -0000	1.4
+++ openacs-4/packages/ecommerce/www/doc/ecommerce-setup.adp	22 May 2003 14:49:34 -0000	1.5
@@ -1,7 +1,7 @@
 <master>
   <property name=title>Setup of the Ecommerce Module</property>
-  <property name="signatory">@signatory@</property>
-  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@signatory;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
 
   <p>This is intended to be a guide for the content administrators of
     @package_name@.  Content administrators are not assumed to have any
Index: openacs-4/packages/ecommerce/www/doc/ecommerce-technical.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-technical.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/doc/ecommerce-technical.adp	19 Sep 2002 03:02:18 -0000	1.4
+++ openacs-4/packages/ecommerce/www/doc/ecommerce-technical.adp	22 May 2003 14:49:34 -0000	1.5
@@ -1,7 +1,7 @@
 <master>
-  <property name=title>@title@</property>
-  <property name="signatory">@signatory@</property>
-  <property name="context_bar">@context_bar@</property>
+  <property name=title>@title;noquote@</property>
+  <property name="signatory">@signatory;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
 
   <h2>Setup</h2>
 
Index: openacs-4/packages/ecommerce/www/doc/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/index.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ecommerce/www/doc/index.adp	10 Dec 2002 20:05:21 -0000	1.5
+++ openacs-4/packages/ecommerce/www/doc/index.adp	22 May 2003 14:49:34 -0000	1.6
@@ -1,7 +1,7 @@
 <master>
-  <property name="title">@title@</property>
-  <property name="signatory">@signatory@</property>
-  <property name="context_bar">@context_bar@</property>
+  <property name="title">@title;noquote@</property>
+  <property name="signatory">@signatory;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
 
   <p>@package_name@ implements all the IT needs for a standard
     business-to-consumer web service.  Most importantly, it is tightly
Index: openacs-4/packages/ecommerce/www/doc/license.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/license.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/doc/license.adp	19 Sep 2002 03:02:18 -0000	1.2
+++ openacs-4/packages/ecommerce/www/doc/license.adp	22 May 2003 14:49:34 -0000	1.3
@@ -1,8 +1,8 @@
 <master>
-  <property name="title">@title@</property>
-  <property name="signatory">@signatory@</property>
+  <property name="title">@title;noquote@</property>
+  <property name="signatory">@signatory;noquote@</property>
   <property name="header_stuff"><link href="index.css" type="text/css" rel="stylesheet"></property>
-  <property name="context_bar">@context_bar@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
 
   <h2>GNU General Public License</h2>
 
Index: openacs-4/packages/ecommerce/www/doc/porting-diary.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/porting-diary.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/doc/porting-diary.adp	19 Sep 2002 03:02:18 -0000	1.4
+++ openacs-4/packages/ecommerce/www/doc/porting-diary.adp	22 May 2003 14:49:34 -0000	1.5
@@ -1,7 +1,7 @@
 <master>
-  <property name=title>@title@</property>
-  <property name="signatory">@signatory@</property>
-  <property name="context_bar">@context_bar@</property>
+  <property name=title>@title;noquote@</property>
+  <property name="signatory">@signatory;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
 
   <h2>Diary</h2>
   
Index: openacs-4/packages/ecommerce/www/doc/release.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/release.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/doc/release.adp	19 Sep 2002 03:02:18 -0000	1.3
+++ openacs-4/packages/ecommerce/www/doc/release.adp	22 May 2003 14:49:34 -0000	1.4
@@ -1,7 +1,7 @@
 <master>
-  <property name=title>@title@</property>
-  <property name="signatory">@signatory@</property>
-  <property name="context_bar">@context_bar@</property>
+  <property name=title>@title;noquote@</property>
+  <property name="signatory">@signatory;noquote@</property>
+  <property name="context_bar">@context_bar;noquote@</property>
     
   <h2>Features</h2>
 
Index: openacs-4/packages/ecommerce/www/register/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/register/Attic/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/register/index.adp	20 Apr 2001 20:51:14 -0000	1.1
+++ openacs-4/packages/ecommerce/www/register/index.adp	22 May 2003 14:50:13 -0000	1.2
@@ -17,7 +17,7 @@
 complete your registration.</p>
 
 <FORM method=post action=user-login name=login>
-@export_vars@
+@export_vars;noquote@
 <table>
 <tr><td>Your email address:</td><td><INPUT type=text name=email value="@email@"></tr>
 
Index: openacs-4/packages/ecommerce/www/register/restore-user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/register/Attic/restore-user.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/register/restore-user.adp	15 Sep 2002 01:50:46 -0000	1.2
+++ openacs-4/packages/ecommerce/www/register/restore-user.adp	22 May 2003 14:50:13 -0000	1.3
@@ -13,7 +13,7 @@
 <p>
 
 <form action="user-login" method=post>
-@export_vars@
+@export_vars;noquote@
 Password:  <input type=password name=password size=20>
 <input type=submit value="Login">
 </form>
Index: openacs-4/packages/ecommerce/www/register/user-new-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/register/Attic/user-new-2.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/register/user-new-2.adp	20 Apr 2001 20:51:14 -0000	1.1
+++ openacs-4/packages/ecommerce/www/register/user-new-2.adp	22 May 2003 14:50:13 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-<property name=title>@title@</property>
+<property name=title>@title;noquote@</property>
 
 <if @email_verified_p@ eq f>
 
Index: openacs-4/packages/ecommerce/www/register/user-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/register/Attic/user-new.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/register/user-new.adp	20 Apr 2001 20:51:14 -0000	1.1
+++ openacs-4/packages/ecommerce/www/register/user-new.adp	22 May 2003 14:50:13 -0000	1.2
@@ -8,7 +8,7 @@
 <hr>
 
 <form method=post action="user-new-2">
-@export_vars@
+@export_vars;noquote@
 
 <if @no_require_password_p@ eq 0>
 
Index: openacs-4/packages/edit-this-page/templates/article-content.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/article-content.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/templates/article-content.adp	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/templates/article-content.adp	22 May 2003 14:51:35 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="../www/etp-master">
-<property name="title">@pa.title@</property>
-<property name="context_bar">@pa.context_bar@</property>
+<property name="title">@pa.title;noquote@</property>
+<property name="context_bar">@pa.context_bar;noquote@</property>
 
 @pa.content@
\ No newline at end of file
Index: openacs-4/packages/edit-this-page/templates/article-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/article-index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/templates/article-index.adp	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/templates/article-index.adp	22 May 2003 14:51:35 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="../www/etp-master">
-<property name="title">@pa.title@</property>
-<property name="context_bar">@pa.context_bar@</property>
+<property name="title">@pa.title;noquote@</property>
+<property name="context_bar">@pa.context_bar;noquote@</property>
 
 <if @pa.content@ not nil>
 @pa.content@
Index: openacs-4/packages/edit-this-page/templates/faq-content.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/faq-content.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/templates/faq-content.adp	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/templates/faq-content.adp	22 May 2003 14:51:35 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="/packages/edit-this-page/www/etp-master">
-<property name="title">@pa.title@</property>
-<property name="context_bar">@pa.context_bar@</property>
+<property name="title">@pa.title;noquote@</property>
+<property name="context_bar">@pa.context_bar;noquote@</property>
 
 <blockquote>
 <b>Q:</b> <em>@pa.title@</em>
Index: openacs-4/packages/edit-this-page/templates/faq-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/faq-index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/templates/faq-index.adp	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/templates/faq-index.adp	22 May 2003 14:51:35 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="/packages/edit-this-page/www/etp-master">
-<property name="title">@pa.title@</property>
-<property name="context_bar">@pa.context_bar@</property>
+<property name="title">@pa.title;noquote@</property>
+<property name="context_bar">@pa.context_bar;noquote@</property>
 
 <p>
 
Index: openacs-4/packages/edit-this-page/templates/journal-article.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/journal-article.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/templates/journal-article.adp	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/templates/journal-article.adp	22 May 2003 14:51:35 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="../www/etp-master">
-<property name="title">@pa.title@</property>
-<property name="context_bar">@pa.context_bar@</property>
+<property name="title">@pa.title;noquote@</property>
+<property name="context_bar">@pa.context_bar;noquote@</property>
 
 @pa.content@
Index: openacs-4/packages/edit-this-page/templates/journal-issue.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/journal-issue.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/templates/journal-issue.adp	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/templates/journal-issue.adp	22 May 2003 14:51:35 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="../www/etp-master">
-<property name="title">@pa.title@</property>
-<property name="context_bar">@pa.context_bar@</property>
+<property name="title">@pa.title;noquote@</property>
+<property name="context_bar">@pa.context_bar;noquote@</property>
 
 <if @pa.content@ not nil>
 @pa.content@
Index: openacs-4/packages/edit-this-page/templates/news-content.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/news-content.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/templates/news-content.adp	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/templates/news-content.adp	22 May 2003 14:51:35 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="../www/etp-master">
-<property name="title">@pa.title@</property>
-<property name="context_bar">@pa.context_bar@</property>
+<property name="title">@pa.title;noquote@</property>
+<property name="context_bar">@pa.context_bar;noquote@</property>
 
 <if @pa.subtitle@ not nil>
 <blockquote><b>@pa.subtitle@</b></blockquote>
Index: openacs-4/packages/edit-this-page/templates/news-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/templates/news-index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/edit-this-page/templates/news-index.adp	18 Dec 2001 19:28:00 -0000	1.2
+++ openacs-4/packages/edit-this-page/templates/news-index.adp	22 May 2003 14:51:35 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="../www/etp-master">
-<property name="title">@pa.title@</property>
-<property name="context_bar">@pa.context_bar@</property>
+<property name="title">@pa.title;noquote@</property>
+<property name="context_bar">@pa.context_bar;noquote@</property>
 
 <if @pa.content@ not nil>
 @pa.content@
Index: openacs-4/packages/edit-this-page/www/etp-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-create.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/edit-this-page/www/etp-create.adp	4 Sep 2002 13:01:46 -0000	1.2
+++ openacs-4/packages/edit-this-page/www/etp-create.adp	22 May 2003 14:52:16 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="etp-master">
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <form method="post" action="etp-create-2">
 <table width="100%" cellspacing="0" cellpadding="6">
Index: openacs-4/packages/edit-this-page/www/etp-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/www/etp-delete.adp	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/www/etp-delete.adp	22 May 2003 14:52:16 -0000	1.2
@@ -1,10 +1,10 @@
 <master src="etp-master">
-<property name="title">Confirm delete operation for @name@</property>
+<property name="title">Confirm delete operation for @name;noquote@</property>
 Are you sure you want to delete the page "@title@" at @page_url@ ?
 This operation cannot be undone.
 <p>
 <form method="post" action="etp-delete">
-@form_vars@
+@form_vars;noquote@
 <input type="submit" value="Yes, I'm sure">
 </form>
 
Index: openacs-4/packages/edit-this-page/www/etp-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/edit-this-page/www/etp-edit.adp	4 Sep 2002 13:01:46 -0000	1.2
+++ openacs-4/packages/edit-this-page/www/etp-edit.adp	22 May 2003 14:52:16 -0000	1.3
@@ -1,12 +1,12 @@
 <master src="etp-master">
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <form method="post" action="etp-edit-2">
-@form_vars@
+@form_vars;noquote@
 <table>
 <tr><td>
-@widget@
+@notification_chunk;noquote@
 </td></tr>
 <tr><td align=center>
 <input type="submit" value="Submit">
Index: openacs-4/packages/edit-this-page/www/etp-extlink.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-extlink.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/edit-this-page/www/etp-extlink.adp	4 Sep 2002 13:01:46 -0000	1.2
+++ openacs-4/packages/edit-this-page/www/etp-extlink.adp	22 May 2003 14:52:16 -0000	1.3
@@ -1,9 +1,9 @@
 <master src="etp-master">
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <form method="post" action="etp-extlink">
-@form_vars@
+@form_vars;noquote@
 <table width="100%" cellspacing="0" cellpadding="6">
 <tr>
 <td valign="top">
Index: openacs-4/packages/edit-this-page/www/etp-history.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-history.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/edit-this-page/www/etp-history.adp	4 Apr 2003 15:59:38 -0000	1.3
+++ openacs-4/packages/edit-this-page/www/etp-history.adp	22 May 2003 14:52:16 -0000	1.4
@@ -1,6 +1,6 @@
 <master src="etp-master">
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <table width="100%">
   <tr>
Index: openacs-4/packages/edit-this-page/www/etp-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-master.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/edit-this-page/www/etp-master.adp	6 Sep 2002 21:50:34 -0000	1.3
+++ openacs-4/packages/edit-this-page/www/etp-master.adp	22 May 2003 14:52:16 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@title@</property>
-<property name="context">@context@</property>
+<property name="title">@title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <slave>
 
Index: openacs-4/packages/edit-this-page/www/etp-revert.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-revert.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/www/etp-revert.adp	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/www/etp-revert.adp	22 May 2003 14:52:16 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="etp-master">
-<property name="title">Confirm revert operation for @name@</property>
+<property name="title">Confirm revert operation for @name;noquote@</property>
 Are you sure you want to go back to version @version_number@?
 In order to do so, the <b>
 <if @revision_count@ eq 1>
@@ -11,7 +11,7 @@
 will be deleted</b>.
 <p>
 <form method="post" action="etp-revert">
-@form_vars@
+@form_vars;noquote@
 <input type="submit" value="Yes, I'm sure">
 </form>
 
Index: openacs-4/packages/edit-this-page/www/etp-revision-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-revision-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/edit-this-page/www/etp-revision-delete.adp	4 Apr 2003 15:59:38 -0000	1.2
+++ openacs-4/packages/edit-this-page/www/etp-revision-delete.adp	22 May 2003 14:52:16 -0000	1.3
@@ -1,12 +1,12 @@
 <master src="etp-master">
- <property name="title">Confirm revert operation for @name@</property>
+ <property name="title">Confirm revert operation for @name;noquote@</property>
 
 <p>
   Are you sure you want to delete version @version_number@?
 </p>
 
 <form method="post" action="etp-revision-delete">
-  @form_vars@
+  @form_vars;noquote@
   <input type="submit" value="Yes, I'm sure">
 </form>
 
Index: openacs-4/packages/edit-this-page/www/etp-setup.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-setup.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/edit-this-page/www/etp-setup.adp	4 Sep 2002 13:01:46 -0000	1.2
+++ openacs-4/packages/edit-this-page/www/etp-setup.adp	22 May 2003 14:52:16 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="etp-master">
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 The ETP application in use for a content section determines the
 appearance and content of its pages.  You may also specify the
Index: openacs-4/packages/edit-this-page/www/etp-subtopic-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-subtopic-create.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/edit-this-page/www/etp-subtopic-create.adp	4 Sep 2002 13:01:46 -0000	1.2
+++ openacs-4/packages/edit-this-page/www/etp-subtopic-create.adp	22 May 2003 14:52:16 -0000	1.3
@@ -1,9 +1,9 @@
 <master src="etp-master">
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <form method="post" action="etp-subtopic-create">
-@form_vars@
+@form_vars;noquote@
 <table width="100%" cellspacing="0" cellpadding="6">
 <tr>
 <td valign="top">
Index: openacs-4/packages/edit-this-page/www/etp-symlink.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-symlink.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/edit-this-page/www/etp-symlink.adp	4 Sep 2002 13:01:46 -0000	1.2
+++ openacs-4/packages/edit-this-page/www/etp-symlink.adp	22 May 2003 14:52:16 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="etp-master">
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <multiple name="all_pages">
 @all_pages.indent@
Index: openacs-4/packages/edit-this-page/www/etp.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/edit-this-page/www/etp.adp	4 Sep 2002 13:01:46 -0000	1.2
+++ openacs-4/packages/edit-this-page/www/etp.adp	22 May 2003 14:52:16 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="etp-master">
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <table width="100%"><tr>
 <td valign="top">
Index: openacs-4/packages/faq/templates/first/one-faq.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/templates/first/one-faq.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/faq/templates/first/one-faq.adp	7 Nov 2002 08:13:52 -0000	1.4
+++ openacs-4/packages/faq/templates/first/one-faq.adp	22 May 2003 14:53:33 -0000	1.5
@@ -1,6 +1,6 @@
 <master src="master">
-<property name="context_bar">@context_bar@</property>
-<property name="title">@faq_name@</property>
+<property name="context_bar">@context_bar;noquote@</property>
+<property name="title">@faq_name;noquote@</property>
 
 <if @one_question:rowcount@ eq 0>
  <i>#faq.lt_no_questions#</i><p>
Index: openacs-4/packages/faq/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/index.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/faq/www/index.adp	7 Nov 2002 08:13:53 -0000	1.6
+++ openacs-4/packages/faq/www/index.adp	22 May 2003 14:54:15 -0000	1.7
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 <property name="title">#faq.FAQs#</property>
 
 <if @admin_p@ eq 1>
Index: openacs-4/packages/faq/www/one-faq.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-faq.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/faq/www/one-faq.adp	7 Nov 2002 08:13:53 -0000	1.6
+++ openacs-4/packages/faq/www/one-faq.adp	22 May 2003 14:54:15 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context@</property>
-<property name="title">@faq_name@</property>
+<property name="context">@context;noquote@</property>
+<property name="title">@faq_name;noquote@</property>
 
 <if @one_question:rowcount@ eq 0>
   <i>#faq.lt_no_questions#</i>
Index: openacs-4/packages/faq/www/one-question.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-question.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/faq/www/one-question.adp	7 Nov 2002 08:13:53 -0000	1.4
+++ openacs-4/packages/faq/www/one-question.adp	22 May 2003 14:54:15 -0000	1.5
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 <property name="title">#faq.One_Question#</property>
 
 <b>#faq.Q#</b> @question@
Index: openacs-4/packages/faq/www/admin/faq-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-edit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/faq/www/admin/faq-edit.adp	7 Nov 2002 08:13:54 -0000	1.4
+++ openacs-4/packages/faq/www/admin/faq-edit.adp	22 May 2003 14:54:51 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="context">@context@</property>
-<property name="title">@title@</property>
+<property name="context">@context;noquote@</property>
+<property name="title">@title;noquote@</property>
 
 <form action="@action@">
  <input type="hidden" name="faq_id" value="@faq_id@">
Index: openacs-4/packages/faq/www/admin/faq-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-new.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/faq/www/admin/faq-new.adp	7 Nov 2002 08:13:54 -0000	1.4
+++ openacs-4/packages/faq/www/admin/faq-new.adp	22 May 2003 14:54:51 -0000	1.5
@@ -1,6 +1,6 @@
 <master></master>
-<property name="context">@context@</property>
-<property name="title">@title@</property>
+<property name="context">@context;noquote@</property>
+<property name="title">@title;noquote@</property>
   
 <form action="@action@">
   <input type="hidden" name="faq_id" value="@faq_id@">
Index: openacs-4/packages/faq/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/index.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/faq/www/admin/index.adp	17 May 2003 10:35:15 -0000	1.5
+++ openacs-4/packages/faq/www/admin/index.adp	22 May 2003 14:54:51 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 <property name="title">#faq.FAQ_Admin#</property>
 
 <if @faqs:rowcount@ eq 0>
Index: openacs-4/packages/faq/www/admin/one-faq.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/one-faq.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/faq/www/admin/one-faq.adp	7 Nov 2002 08:13:54 -0000	1.7
+++ openacs-4/packages/faq/www/admin/one-faq.adp	22 May 2003 14:54:51 -0000	1.8
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 <property name="title">#faq.faq_name_Admin#</property>
 
 <b>#faq.Title#</b> @faq_name@ (<a href=faq-edit?faq_id=@faq_id@>#faq.edit#</a>)
Index: openacs-4/packages/faq/www/admin/one-question.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/one-question.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/faq/www/admin/one-question.adp	7 Nov 2002 08:13:54 -0000	1.5
+++ openacs-4/packages/faq/www/admin/one-question.adp	22 May 2003 14:54:51 -0000	1.6
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 <property name="title">#faq.One_Question#</property>
 
 <b>#faq.Q#</b> @question@
Index: openacs-4/packages/faq/www/admin/q_and_a-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q_and_a-edit.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/faq/www/admin/q_and_a-edit.adp	7 Nov 2002 08:13:54 -0000	1.6
+++ openacs-4/packages/faq/www/admin/q_and_a-edit.adp	22 May 2003 14:54:51 -0000	1.7
@@ -1,5 +1,5 @@
 <master>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 <property name="title">#faq.One_Question#</property>
 
 <form action="@action@" method=post>
Index: openacs-4/packages/faq/www/admin/q_and_a-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q_and_a-new.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/faq/www/admin/q_and_a-new.adp	7 Nov 2002 08:13:54 -0000	1.6
+++ openacs-4/packages/faq/www/admin/q_and_a-new.adp	22 May 2003 14:54:51 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context">@context@</property>
+<property name="title">@page_title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <form action="@target@">
  <input type="hidden" name="insert_p" value="@insert_p@">
Index: openacs-4/packages/file-storage/www/file-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-add.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/file-storage/www/file-add.adp	5 Nov 2002 17:19:59 -0000	1.7
+++ openacs-4/packages/file-storage/www/file-add.adp	22 May 2003 14:55:53 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
 <property name="title">#file-storage.Upload_New_File#</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 <form enctype=multipart/form-data method=POST action="file-add-2">
 <input type=hidden name="folder_id" value="@folder_id@">
Index: openacs-4/packages/file-storage/www/file-copy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-copy.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/file-storage/www/file-copy.adp	5 Nov 2002 17:19:59 -0000	1.5
+++ openacs-4/packages/file-storage/www/file-copy.adp	22 May 2003 14:55:53 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
 <property name="title">#file-storage.Copy#</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 <P>Select the folder that you would like to copy "@file_name@" to
 
Index: openacs-4/packages/file-storage/www/file-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-delete.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/file-storage/www/file-delete.adp	5 Nov 2002 17:19:59 -0000	1.5
+++ openacs-4/packages/file-storage/www/file-delete.adp	22 May 2003 14:55:53 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-<property name="title">Delete @title@</property>
-<property name="context">@context@</property>
+<property name="title">Delete @title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <if @blocked_p@ eq "t">
 
Index: openacs-4/packages/file-storage/www/file-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-edit.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/file-storage/www/file-edit.adp	5 Nov 2002 17:19:59 -0000	1.5
+++ openacs-4/packages/file-storage/www/file-edit.adp	22 May 2003 14:55:53 -0000	1.6
@@ -1,7 +1,7 @@
 <master>
-<property name="title">Rename @title@</property>
-<property name="header">Rename @title@</property>
-<property name="context">@context@</property>
+<property name="title">Rename @title;noquote@</property>
+<property name="header">Rename @title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <form method=POST action=file-edit-2.tcl>
 <input type=hidden name="file_id" value="@file_id@">
Index: openacs-4/packages/file-storage/www/file-move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-move.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/file-storage/www/file-move.adp	5 Nov 2002 17:19:59 -0000	1.5
+++ openacs-4/packages/file-storage/www/file-move.adp	22 May 2003 14:55:53 -0000	1.6
@@ -1,13 +1,13 @@
 <master>
 <property name="title">#file-storage.Move#</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 <P>Select the folder that you would like to move "@file_name@" under
 
 <form method=GET action="file-move-2">
 <input type=hidden name=file_id value="@file_id@">
 
-<include src="folder-list" file_id="@file_id@">
+<include src="folder-list" file_id="@file_id;noquote@">
 <p>
 <input type=submit value="#file-storage.Move#">
 </form>
Index: openacs-4/packages/file-storage/www/file.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/file-storage/www/file.adp	9 Dec 2002 22:48:54 -0000	1.11
+++ openacs-4/packages/file-storage/www/file.adp	22 May 2003 14:55:53 -0000	1.12
@@ -1,7 +1,7 @@
 <master>
-<property name="title">@title@</property>
-<property name="header">@title@</property>
-<property name="context">@context@</property>
+<property name="title">@title;noquote@</property>
+<property name="header">@title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <ul>
   <li>Title: @title@ <if @write_p@ true>(<a href="file-edit?file_id=@file_id@">#file-storage.edit#</a>)</if>
Index: openacs-4/packages/file-storage/www/folder-contents.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/folder-contents.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/file-storage/www/folder-contents.adp	30 Nov 2002 17:34:29 -0000	1.5
+++ openacs-4/packages/file-storage/www/folder-contents.adp	22 May 2003 14:55:53 -0000	1.6
@@ -1,7 +1,7 @@
 <master>
-<property name="title">@folder_name@</property>
-<property name="header">@folder_name@</property>
-<property name="context">@context@</property>
+<property name="title">@folder_name;noquote@</property>
+<property name="header">@folder_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <table>
   <tr>
Index: openacs-4/packages/file-storage/www/folder-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-create.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/file-storage/www/folder-create.adp	17 May 2003 10:39:54 -0000	1.5
+++ openacs-4/packages/file-storage/www/folder-create.adp	22 May 2003 14:55:53 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
 <property name="title">#file-storage.Create_New_Folder#</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 <property name="focus">folder.folder_name</property>
 
 
Index: openacs-4/packages/file-storage/www/folder-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-delete.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/file-storage/www/folder-delete.adp	5 Nov 2002 17:19:59 -0000	1.4
+++ openacs-4/packages/file-storage/www/folder-delete.adp	22 May 2003 14:55:53 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="title">Delete @folder_name@</property>
-<property name="context">@context@</property>
+<property name="title">Delete @folder_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <if @blocked_p@ eq "t">
 
Index: openacs-4/packages/file-storage/www/folder-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-storage/www/folder-edit.adp	5 Nov 2002 17:19:59 -0000	1.2
+++ openacs-4/packages/file-storage/www/folder-edit.adp	22 May 2003 14:55:53 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
 <property name="title">#file-storage.Edit_Folder#</property>
-<property name="context">@context_bar@</property>
+<property name="context">@context_bar;noquote@</property>
 
 
 <form method=POST action=folder-edit-2>
Index: openacs-4/packages/file-storage/www/folder-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/folder-list.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-storage/www/folder-list.adp	5 Nov 2002 17:19:59 -0000	1.2
+++ openacs-4/packages/file-storage/www/folder-list.adp	22 May 2003 14:55:53 -0000	1.3
@@ -4,7 +4,7 @@
 <select name="parent_id" size=@folder:rowcount@>
 </else>
 <multiple name="folder">
-<option value="@folder.new_parent@">@folder.spaces@ @folder.label@</option>
+<option value="@folder.new_parent@">@folder.spaces;noquote@ @folder.label@</option>
 </multiple>
 </select>
 
Index: openacs-4/packages/file-storage/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/index.adp,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/file-storage/www/index.adp	17 May 2003 10:39:54 -0000	1.19
+++ openacs-4/packages/file-storage/www/index.adp	22 May 2003 14:55:53 -0000	1.20
@@ -1,7 +1,7 @@
 <master>
-<property name="title">@folder_name@</property>
-<property name="header">@folder_name@</property>
-<property name="context">@context@</property>
+<property name="title">@folder_name;noquote@</property>
+<property name="header">@folder_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 
 <table width="100%" border="0">
@@ -49,7 +49,7 @@
 </table>
 
 
-<include src="folder-chunk" folder_id=@folder_id@ viewing_user_id=@user_id@ n_past_days=@n_past_days@>
+<include src="folder-chunk" folder_id=@folder_id;noquote@ viewing_user_id=@user_id;noquote@ n_past_days=@n_past_days;noquote@>
 
 <p>
       <a href="download-archive/index?object_id=@folder_id@">
Index: openacs-4/packages/file-storage/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/search.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/file-storage/www/search.adp	5 Nov 2002 17:19:59 -0000	1.4
+++ openacs-4/packages/file-storage/www/search.adp	22 May 2003 14:55:53 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
 <property name="title">#file-storage.Search_Results#</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 <if @results:rowcount@ eq 0>
 <p>Your search on "@query@" did not return any results.
Index: openacs-4/packages/file-storage/www/simple-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/simple-add.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/file-storage/www/simple-add.adp	17 May 2003 10:39:54 -0000	1.6
+++ openacs-4/packages/file-storage/www/simple-add.adp	22 May 2003 14:55:53 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
-<property name="title">Create @pretty_name@</property>
-<property name="context">@context@</property>
+<property name="title">Create @pretty_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <form method=POST action="simple-add-2">
 <input type=hidden name="folder_id" value="@folder_id@">
Index: openacs-4/packages/file-storage/www/simple-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/simple-edit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/file-storage/www/simple-edit.adp	5 Nov 2002 17:19:59 -0000	1.4
+++ openacs-4/packages/file-storage/www/simple-edit.adp	22 May 2003 14:55:53 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-<property name="title">Edit @pretty_name@</property>
-<property name="context">@context@</property>
+<property name="title">Edit @pretty_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <form method=POST action="simple-edit-2">
 <input type=hidden name="object_id" value="@object_id@">
Index: openacs-4/packages/file-storage/www/version-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/version-add.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/file-storage/www/version-add.adp	5 Nov 2002 17:19:59 -0000	1.5
+++ openacs-4/packages/file-storage/www/version-add.adp	22 May 2003 14:55:53 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-<property name="title">Upload New Version of @title@</property>
-<property name="context">@context@</property>
+<property name="title">Upload New Version of @title;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <form enctype=multipart/form-data method=POST action=version-add-2>
 <input type=hidden name=file_id value="@file_id@">
Index: openacs-4/packages/file-storage/www/version-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/version-delete.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/file-storage/www/version-delete.adp	5 Nov 2002 17:19:59 -0000	1.5
+++ openacs-4/packages/file-storage/www/version-delete.adp	22 May 2003 14:55:53 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-<property name="title">Delete @version_name@</property>
-<property name="context">@context@</property>
+<property name="title">Delete @version_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <form method=POST action=version-delete>
 <input type=hidden name=version_id value=@version_id@>
Index: openacs-4/packages/forums/www/forum-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view.adp,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/forums/www/forum-view.adp	26 Jan 2003 19:52:35 -0000	1.19
+++ openacs-4/packages/forums/www/forum-view.adp	22 May 2003 14:56:35 -0000	1.20
@@ -1,6 +1,6 @@
 <master>
-<property name="title">#forums.Forum_1# @forum.name@</property>
-<property name="context">@context@</property>
+<property name="title">#forums.Forum_1# @forum.name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <center>
 
@@ -18,7 +18,7 @@
 
         <br>
   
-        @notification_chunk@
+        @notification_chunk;noquote@
   
         <br>
   
@@ -29,7 +29,7 @@
         <br>
         <br>
         
-        Sort by: [ @sort_filter@ ]
+        Sort by: [ @sort_filter;noquote@ ]
 
       </td>
       <td align="right">
Index: openacs-4/packages/forums/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/index.adp,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/forums/www/index.adp	13 Dec 2002 15:49:18 -0000	1.17
+++ openacs-4/packages/forums/www/index.adp	22 May 2003 14:56:35 -0000	1.18
@@ -1,6 +1,6 @@
 <master>
 <property name="title">#forums.Forums#</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 <center>
   <table width="95%">
Index: openacs-4/packages/forums/www/message-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/message-chunk.adp,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/forums/www/message-chunk.adp	7 Jan 2003 18:58:09 -0000	1.15
+++ openacs-4/packages/forums/www/message-chunk.adp	22 May 2003 14:56:35 -0000	1.16
@@ -4,7 +4,7 @@
   <td align=left style="padding-left: 1em">
     <strong>
       <if @preview@ nil>
-        <a href="message-view?message_id=@message.message_id@">@message.subject@</a>
+        <a href="message-view?message_id=@message.message_id@">@message.subject;noquote@</a>
       </if>
       <else>
         @message.subject@
@@ -55,15 +55,15 @@
 
     <if @message.html_p@ false>
     <div align="left">
-      @message.content@
+      @message.content;noquote@
     </div>
     </if>
     <else>
-      @message.content@
+      @message.content;noquote@
     </else>
   </td>
 </tr>
 
 <if @message.n_attachments@ not nil and @message.n_attachments@ gt 0>
-  <include src="message-attachment-chunk" &message="message" bgcolor=@table_bgcolor@>
+  <include src="message-attachment-chunk" &message="message" bgcolor=@table_bgcolor;noquote@>
 </if>
Index: openacs-4/packages/forums/www/message-email.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-email.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/forums/www/message-email.adp	25 Oct 2002 13:00:02 -0000	1.6
+++ openacs-4/packages/forums/www/message-email.adp	22 May 2003 14:56:35 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
-<property name="title">#forums.Email_Message# @message.forum_name@ - @message.subject@</property>
-<property name="context">@context@</property>
+<property name="title">#forums.Email_Message# @message.forum_name;noquote@ - @message.subject;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <p>#forums.lt_Email_a_copy_of_the_f#</p>
 
Index: openacs-4/packages/forums/www/message-post-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-post-confirm.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/forums/www/message-post-confirm.adp	25 Oct 2002 13:00:02 -0000	1.8
+++ openacs-4/packages/forums/www/message-post-confirm.adp	22 May 2003 14:56:35 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
-<property name="title">#forums.Confirm_Post_to_Forum# @forum.name@</property>
-<property name="context">@context@</property>
+<property name="title">#forums.Confirm_Post_to_Forum# @forum.name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <p>#forums.lt_Please_confirm_the_fo#</p>
 
@@ -14,7 +14,7 @@
 
 <form action="message-post" method="post">
   <input type="hidden" name="form:id" value="message">
-  @exported_vars@
+  @exported_vars;noquote@
 
   <br>
 
Index: openacs-4/packages/forums/www/message-post.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-post.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/forums/www/message-post.adp	25 Oct 2002 13:00:02 -0000	1.7
+++ openacs-4/packages/forums/www/message-post.adp	22 May 2003 14:56:35 -0000	1.8
@@ -1,11 +1,11 @@
 <master>
-<property name="title">#forums.Post_to_Forum# @forum.name@</property>
-<property name="context">@context@</property>
+<property name="title">#forums.Post_to_Forum# @forum.name;noquote@</property>
+<property name="context">@context;noquote@</property>
 <property name="focus">message.subject</property>
 
 <if @parent_id@ ne "">
   <table style="color: black; background-color: @table_border_color@;"  width="100%">
-    <include src="message-chunk" bgcolor="@table_bgcolor@" &message="parent_message" preview=1>
+    <include src="message-chunk" bgcolor="@table_bgcolor;noquote@" &message="parent_message" preview=1>
   </table>
   <br>
 </if>
Index: openacs-4/packages/forums/www/message-view-flat.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/message-view-flat.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/forums/www/message-view-flat.adp	26 Jan 2003 19:52:35 -0000	1.9
+++ openacs-4/packages/forums/www/message-view-flat.adp	22 May 2003 14:56:35 -0000	1.10
@@ -1,21 +1,21 @@
 <master>
-<property name="title">#forums.Forum# @forum.name@: @message.subject@</property>
-<property name="context">@context@</property>
+<property name="title">#forums.Forum# @forum.name;noquote@: @message.subject;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <center>
 
   <table cellpadding="5" width="95%">
     <tr>
       <td colspan="4">
-        <nobr>@notification_chunk@</nobr>
+        <nobr>@notification_chunk;noquote@</nobr>
       </td>
     </tr>
   </table>
 
   <br>
 
   <table bgcolor="#cccccc" cellpadding="5" width="95%">
-<include src="message-chunk" bgcolor="#eeeeee" moderate_p=@moderate_p@ &message="message">
+<include src="message-chunk" bgcolor="#eeeeee" moderate_p=@moderate_p;noquote@ &message="message">
   </table>
 
 <if @responses:rowcount@ gt 0>
@@ -26,10 +26,10 @@
 <multiple name="responses">
 
 <if @responses.rownum@ odd>
-  <include src="message-chunk" bgcolor="#d9e4f9" moderate_p=@moderate_p@ &message="responses" root_subject="@message.root_subject@">
+  <include src="message-chunk" bgcolor="#d9e4f9" moderate_p=@moderate_p;noquote@ &message="responses" root_subject="@message.root_subject;noquote@">
 </if>
 <else>
-  <include src="message-chunk" bgcolor="#eeeeee" moderate_p=@moderate_p@ &message="responses" root_subject="@message.root_subject@">
+  <include src="message-chunk" bgcolor="#eeeeee" moderate_p=@moderate_p;noquote@ &message="responses" root_subject="@message.root_subject;noquote@">
 </else>
 
 </multiple>
Index: openacs-4/packages/forums/www/message-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/forums/www/message-view.adp	26 Jan 2003 19:52:35 -0000	1.14
+++ openacs-4/packages/forums/www/message-view.adp	22 May 2003 14:56:35 -0000	1.15
@@ -1,6 +1,6 @@
 <master>
-<property name="title">#forums.Forum# @forum.name@: @message.subject@</property>
-<property name="context">@context@</property>
+<property name="title">#forums.Forum# @forum.name;noquote@: @message.subject;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <br>
 
@@ -9,7 +9,7 @@
 <table width="95%">
   <tr style="white-space: normal">
     <td align=left>
-      @notification_chunk@
+      @notification_chunk;noquote@
     </td>
     <td align=right>
       <formtemplate id="search">
@@ -24,9 +24,9 @@
 
 <table bgcolor="@table_border_color@" width="95%">
   <include src="message-chunk" 
-           bgcolor="@table_bgcolor@" 
-           forum_moderated_p=@forum_moderated_p@ 
-           moderate_p=@moderate_p@ 
+           bgcolor="@table_bgcolor;noquote@" 
+           forum_moderated_p=@forum_moderated_p;noquote@ 
+           moderate_p=@moderate_p;noquote@ 
            &message="message">
 </table>
 
@@ -43,16 +43,16 @@
         <table align="right" bgcolor="@table_border_color@" width="@width@%">
           <if @responses.rownum@ odd>
             <include src="message-chunk" 
-                     bgcolor="@table_other_bgcolor@" 
-                     forum_moderated_p=@forum_moderated_p@ 
-                     moderate_p=@moderate_p@ 
+                     bgcolor="@table_other_bgcolor;noquote@" 
+                     forum_moderated_p=@forum_moderated_p;noquote@ 
+                     moderate_p=@moderate_p;noquote@ 
                      &message="responses">
           </if>
           <else>
             <include src="message-chunk" 
-                     bgcolor="@table_bgcolor@"
-                     forum_moderated_p=@forum_moderated_p@
-                     moderate_p=@moderate_p@
+                     bgcolor="@table_bgcolor;noquote@"
+                     forum_moderated_p=@forum_moderated_p;noquote@
+                     moderate_p=@moderate_p;noquote@
                      &message="responses">
           </else>
         </table>
Index: openacs-4/packages/forums/www/not-allowed.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/not-allowed.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/forums/www/not-allowed.adp	30 Nov 2002 17:35:39 -0000	1.2
+++ openacs-4/packages/forums/www/not-allowed.adp	22 May 2003 14:56:35 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
 <property name="title">Action Not Allowed</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 We're sorry, but it appears that you do not have the permission to perform this operation.
\ No newline at end of file
Index: openacs-4/packages/forums/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/search.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/forums/www/search.adp	25 Oct 2002 13:00:02 -0000	1.4
+++ openacs-4/packages/forums/www/search.adp	22 May 2003 14:56:35 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
 <property name="title">#forums.Search_Forums#</property>
-<property name="context">@context@</property>
+<property name="context">@context;noquote@</property>
 
 <center>
 
Index: openacs-4/packages/forums/www/user-history.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/user-history.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/forums/www/user-history.adp	18 Nov 2002 18:01:08 -0000	1.8
+++ openacs-4/packages/forums/www/user-history.adp	22 May 2003 14:56:35 -0000	1.9
@@ -1,6 +1,6 @@
 <master>
-<property name="title">#forums.Forums_Posting_hist_lt# @user.full_name@</property>
-<property name="context">@context@</property>
+<property name="title">#forums.Forums_Posting_hist_lt# @user.full_name;noquote@</property>
+<property name="context">@context;noquote@</property>
 
 <p>
   #forums.Posting_history_for#
@@ -17,7 +17,7 @@
 
 <p>
 <center>
-@dimensional_chunk@
+@dimensional_chunk;noquote@
 </center>
 </p>