Index: openacs-4/packages/ecommerce/tcl/ecommerce-credit-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-credit-procs.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/ecommerce/tcl/ecommerce-credit-procs.tcl	10 Dec 2002 20:06:33 -0000	1.6
+++ openacs-4/packages/ecommerce/tcl/ecommerce-credit-procs.tcl	15 Nov 2003 06:48:11 -0000	1.7
@@ -51,7 +51,7 @@
     # PaymentGateway.
 
     if {[empty_string_p $payment_gateway] || ![acs_sc_binding_exists_p "PaymentGateway" $payment_gateway]} {
-	set outcome(response_code) "failure"
+	set outcome(response_code) "failed_authorization"
 	set outcome(transaction_id) "$transaction_id"
 	return [array get outcome]
     }
Index: openacs-4/packages/ecommerce/www/account.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/account.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/account.adp	22 May 2003 14:48:11 -0000	1.3
+++ openacs-4/packages/ecommerce/www/account.adp	15 Nov 2003 06:48:11 -0000	1.4
@@ -8,9 +8,9 @@
 <blockquote>
   <ul>
     <li><a href="/pvt/home">Your workspace at <%= [ad_system_name] %></a></li>
-    @gift_certificate_sentence_if_nonzero_balance@
+    @gift_certificate_sentence_if_nonzero_balance;noquote@
 
-    @user_classes@
+    @user_classes;noquote@
   </ul>
 
   <h3>Your Order History</h3>
@@ -19,8 +19,8 @@
     @past_orders@
   </ul>
 
-  @purchased_gift_certificates@
+  @purchased_gift_certificates;noquote@
 
-  @mailing_lists@
+  @mailing_lists;noquote@
 
 </blockquote>
Index: openacs-4/packages/ecommerce/www/billing.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/billing.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/billing.adp	22 May 2003 14:48:11 -0000	1.4
+++ openacs-4/packages/ecommerce/www/billing.adp	15 Nov 2003 06:48:11 -0000	1.5
@@ -23,26 +23,26 @@
 	    <tr bgcolor="#eeeeee">
 	  </else>
 	  <td>
-	    @billing_addresses.formatted@
+	    @billing_addresses.formatted;noquote@
 	  </td>
 	  <td>
 	    <table>
 	      <tr>
 		<td>
 		  <form method="post" action="payment">
-		    @billing_addresses.use@
+		    @billing_addresses.use;noquote@
 		    <input type="submit" value="Use"></input>
 		  </form>
 		</td>
 		<td>
 		  <form method="post" action="address">
-		    @billing_addresses.edit@
+		    @billing_addresses.edit;noquote@
 		    <input type="submit" value="Edit"></input>
 		  </form>
 		</td>
 		<td>
 		  <form method="post" action="delete-address">
-		    @billing_addresses.delete@
+		    @billing_addresses.delete;noquote@
 		    <input type="submit" value="Delete"></input>
 		  </form>
 		</td>
@@ -68,15 +68,15 @@
 	      <tr bgcolor="#eeeeee">
 	    </else>
 	    <td>
-	      @shipping_addresses.formatted@
+	      @shipping_addresses.formatted;noquote@
 	    </td>
 	    <td>
 	      <table>
 		<tr>
 		  <td>
 		    <form method="post" action="payment">
 		      <input type="hidden" name="address_type" value="shipping">
-			@shipping_addresses.use@
+			@shipping_addresses.use;noquote@
 			<input type="submit" value="Use"></input>
 		    </form>
 		  </td>
@@ -100,7 +100,7 @@
     <tr>
       <td>
 	<form method="post" action="address">
-	  @hidden_form_vars@
+	  @hidden_form_vars;noquote@
 	  <input type="submit" value="Enter a new U.S. address">
 	</form>
       </td>
@@ -109,7 +109,7 @@
       </td>
       <td>
 	<form method="post" action="address-international">
-	  @hidden_form_vars@
+	  @hidden_form_vars;noquote@
 	  <input type="submit" value="Enter a new INTERNATIONAL address">
 	</form>
       </td>
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.3 -r1.4
--- openacs-4/packages/ecommerce/www/category-browse.adp	22 May 2003 14:48:11 -0000	1.3
+++ openacs-4/packages/ecommerce/www/category-browse.adp	15 Nov 2003 06:48:11 -0000	1.4
@@ -12,23 +12,23 @@
         <td width="50%">
 	  <h4>Browse:</h4>
 	  <ul>
-	    @subcategories@
+	    @subcategories;noquote@
 	  </ul>
         </td>
       </if>
       <if @recommendations@ >
         <td>
 	  <h4>We recommend:</h4>
-	  @recommendations@
+	  @recommendations;noquote@
         </td>
      </if>
     </tr>
   </table>      
 
   <h4>@category_name@ products:</h4>
-  @products@
+  @products;noquote@
 
-  @prev_link@ @separator@ @next_link@
+  @prev_link;noquote@ @separator;noquote@ @next_link;noquote@
 </blockquote>
 
 <p><a href="mailing-list-add?category_id=@the_category_id@">Add yourself to the @the_category_name@ mailing list!</a></p>
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.4 -r1.5
--- openacs-4/packages/ecommerce/www/checkout-2.adp	22 May 2003 14:48:11 -0000	1.4
+++ openacs-4/packages/ecommerce/www/checkout-2.adp	15 Nov 2003 06:48:11 -0000	1.5
@@ -19,10 +19,10 @@
 	<th align="left">Quantity</th>
 	<th align="left">Item</th>
       </tr>
-      @rows_of_items@
+      @rows_of_items;noquote@
     </table>
     
-    <p>@tax_exempt_options@</p>
+    <p>@tax_exempt_options;noquote@</p>
 
     <center><input type="submit" value="Continue"></center>
 
Index: openacs-4/packages/ecommerce/www/checkout.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/checkout.adp	22 May 2003 14:48:11 -0000	1.4
+++ openacs-4/packages/ecommerce/www/checkout.adp	15 Nov 2003 06:48:11 -0000	1.5
@@ -24,26 +24,26 @@
 	    <tr bgcolor="#eeeeee">
 	  </else>
 	  <td>
-	    @addresses.formatted@
+	    @addresses.formatted;noquote@
 	  </td>
 	  <td>
 	    <table>
 	      <tr>
 		<td>
 		  <form method="post" action="checkout-2">
-		    @addresses.use@
+		    @addresses.use;noquote@
 		    <input type="submit" value="Use"></input>
 		  </form>
 		</td>
 		<td>
 		  <form method="post" action="address">
-		    @addresses.edit@
+		    @addresses.edit;noquote@
 		    <input type="submit" value="Edit"></input>
 		  </form>
 		</td>
 		<td>
 		  <form method="post" action="delete-address">
-		    @addresses.delete@
+		    @addresses.delete;noquote@
 		    <input type="submit" value="Delete"></input>
 		  </form>
 		</td>
Index: openacs-4/packages/ecommerce/www/checkout.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/ecommerce/www/checkout.tcl	10 Dec 2002 20:06:18 -0000	1.11
+++ openacs-4/packages/ecommerce/www/checkout.tcl	15 Nov 2003 06:48:11 -0000	1.12
@@ -10,7 +10,7 @@
     usca_p:optional
 }
 
-ec_redirect_to_https_if_possible_and_necessary
+# ec_redirect_to_https_if_possible_and_necessary
 
 # Make sure they have an in_basket order, otherwise they've probably
 # gotten here by pushing Back, so return them to index.tcl
Index: openacs-4/packages/ecommerce/www/contextbar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/Attic/contextbar.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/contextbar.adp	17 Sep 2002 03:36:34 -0000	1.1
+++ openacs-4/packages/ecommerce/www/contextbar.adp	15 Nov 2003 06:48:11 -0000	1.2
@@ -1 +1 @@
-<table width ="100%"> <tbody> <tr> <td>@context_bar@</td> <if @ec_admin_p@><td align="right">[&nbsp;<a href="@ec_admin_link@" title="Administer @ec_system_name@">Administer</a>&nbsp;]</td></if> </tr> </tbody> </table>
+<table width ="100%"> <tbody> <tr> <td>@context_bar;noquote@</td> <if @ec_admin_p@><td align="right">[&nbsp;<a href="@ec_admin_link@" title="Administer @ec_system_name@">Administer</a>&nbsp;]</td></if> </tr> </tbody> </table>
Index: openacs-4/packages/ecommerce/www/select-shipping.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/select-shipping.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/ecommerce/www/select-shipping.tcl	10 Dec 2002 20:06:18 -0000	1.8
+++ openacs-4/packages/ecommerce/www/select-shipping.tcl	15 Nov 2003 06:48:11 -0000	1.9
@@ -16,7 +16,7 @@
     quantity:array,optional
 }
 
-ec_redirect_to_https_if_possible_and_necessary
+# ec_redirect_to_https_if_possible_and_necessary
 
 # we need them to be logged in
 
Index: openacs-4/packages/ecommerce/www/doc/contextbar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/contextbar.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/doc/contextbar.adp	10 Dec 2002 20:05:21 -0000	1.2
+++ openacs-4/packages/ecommerce/www/doc/contextbar.adp	15 Nov 2003 06:48:11 -0000	1.3
@@ -1 +1 @@
-<table width ="100%"> <tbody> <tr> <td>@context_bar@</td> <if @ec_admin_p@ and @ec_installed_p@><td align="right">[&nbsp;<a href="@ec_admin_link@" title="Administer @ec_system_name@">Administer</a>&nbsp;]</td></if> </tr> </tbody> </table>
+<table width ="100%"> <tbody> <tr> <td>@context_bar;noquote@</td> <if @ec_admin_p@ and @ec_installed_p@><td align="right">[&nbsp;<a href="@ec_admin_link@" title="Administer @ec_system_name@">Administer</a>&nbsp;]</td></if> </tr> </tbody> </table>