Wed, 23 Oct 2002 19:06:43 -0400

Update of /cvs-repository/Zope/lib/python/OFS/dtml
In directory cvs.zope.org:/tmp/cvs-serv26857/lib/python/OFS/dtml

Modified Files:
      Tag: efge-death-to-dtml-var-branch
	brokenEdit.dtml documentEdit.dtml documentProxy.dtml 
	editedDialog.dtml fileEdit.dtml findAdv.dtml findForm.dtml 
	findFrame.dtml findResult.dtml history.dtml 
	historyCompare.dtml imageAdd.dtml imageEdit.dtml 
	imageView.dtml importExport.dtml properties.dtml 
	propertyType.dtml propertysheets.dtml renameForm.dtml 
Log Message:
Removed most <dtml-var> to replace them with &dtml-foo;.
This corrects a number of potential XSS holes, and simplifies
auditability of the remaining legitimate <dtml-var>.


=== Zope/lib/python/OFS/dtml/brokenEdit.dtml 1.2 => 1.2.234.1 ===

--- Zope/lib/python/OFS/dtml/brokenEdit.dtml:1.2	Mon Jan  8 17:46:59 2001
+++ Zope/lib/python/OFS/dtml/brokenEdit.dtml	Wed Oct 23 19:06:12 2002
@@ -2,7 +2,7 @@
 
 <p>
 This object is <font color="red">broken</font> because the 
-<strong><dtml-var product_name></strong> product that created it 
+<strong>&dtml-product_name;</strong> product that created it 
 is no longer installed or is installed incorrectly.  Please contact 
 the product maintainer for assistance.
 </p>
@@ -13,7 +13,7 @@
 </p>
 
 <!-- 
-  <dtml-var info> 
+  &dtml-info;
 -->
 
 <dtml-var manage_page_footer>


=== Zope/lib/python/OFS/dtml/documentEdit.dtml 1.8 => 1.8.38.1 ===
--- Zope/lib/python/OFS/dtml/documentEdit.dtml:1.8	Fri Apr 12 16:19:02 2002
+++ Zope/lib/python/OFS/dtml/documentEdit.dtml	Wed Oct 23 19:06:12 2002
@@ -19,7 +19,7 @@
   </td>
   <td align="left" valign="top">
   <input type="text" name="title" size="40" value="<dtml-if 
-   title><dtml-var title html_quote></dtml-if>">
+   title>&dtml-title;</dtml-if>">
   </td>
 </tr>
 
@@ -28,11 +28,11 @@
   <dtml-let cols="REQUEST.get('dtpref_cols', '100%')">
     <dtml-if expr="cols[-1]=='%'">
       <textarea name="data:text" wrap="off" style="width:&dtml-cols;"
-                rows="<dtml-var dtpref_rows missing="20">"
+                rows="<dtml-var dtpref_rows missing="20" html_quote>"
       ><dtml-var __str__></textarea>
     <dtml-else>
       <textarea name="data:text" wrap="off" cols="&dtml-cols;"
-                rows="<dtml-var dtpref_rows missing="20">"
+                rows="<dtml-var dtpref_rows missing="20" html_quote>"
       ><dtml-var __str__></textarea>      
     </dtml-if>
   </dtml-let>


=== Zope/lib/python/OFS/dtml/documentProxy.dtml 1.3 => 1.3.184.1 ===
--- Zope/lib/python/OFS/dtml/documentProxy.dtml:1.3	Tue Apr 17 14:07:58 2001
+++ Zope/lib/python/OFS/dtml/documentProxy.dtml	Wed Oct 23 19:06:12 2002
@@ -27,7 +27,7 @@
   <dtml-if expr="_vars['sequence-item'] != 'Shared'">
   <option <dtml-if 
    expr="manage_haveProxy(_vars['sequence-item'])">selected</dtml-if
-  >><dtml-var sequence-item></option>
+  >>&dtml-sequence-item;</option>
   </dtml-if>
   </dtml-in valid_roles>
   </select>


=== Zope/lib/python/OFS/dtml/editedDialog.dtml 1.2 => 1.2.234.1 ===
--- Zope/lib/python/OFS/dtml/editedDialog.dtml:1.2	Mon Jan  8 17:46:59 2001
+++ Zope/lib/python/OFS/dtml/editedDialog.dtml	Wed Oct 23 19:06:12 2002
@@ -13,7 +13,7 @@
   <div class="std-text">
   <BR><BR>
   <CENTER>
-  <dtml-var title_and_id> has been successfully edited.
+  &dtml-title_and_id; has been successfully edited.
   </CENTER>
   </div>
   </TD>


=== Zope/lib/python/OFS/dtml/fileEdit.dtml 1.7 => 1.7.80.1 ===
--- Zope/lib/python/OFS/dtml/fileEdit.dtml:1.7	Thu Jan 24 16:19:57 2002
+++ Zope/lib/python/OFS/dtml/fileEdit.dtml	Wed Oct 23 19:06:12 2002
@@ -10,7 +10,7 @@
 text type and small enough to be edited in a text area.
 </p>
 
-<form action="<dtml-var URL1>" method="post" enctype="multipart/form-data">
+<form action="&dtml-URL1;" method="post" enctype="multipart/form-data">
 <table cellpadding="2" cellspacing="0" width="100%" border="0">
 <tr>
   <td align="left" valign="top">
@@ -20,7 +20,7 @@
   </td>
   <td align="left" valign="top">
   <input type="text" name="title" size="40" value="<dtml-if 
-   title><dtml-var title html_quote></dtml-if>">
+   title>&dtml-title;</dtml-if>">
   </td>
 </tr>
 
@@ -32,7 +32,7 @@
   </td>
   <td align="left" valign="top">
   <input type="text" name="content_type:required" size="40" value="<dtml-if 
-   content_type><dtml-var content_type html_quote></dtml-if>">
+   content_type>&dtml-content_type;</dtml-if>">
   </td>
 </tr>
 
@@ -44,7 +44,7 @@
   </td>
   <td align="left" valign="top">
   <input type="text" name="precondition" size="40" value="<dtml-if 
-   precondition><dtml-var precondition html_quote></dtml-if>">
+   precondition>&dtml-precondition;</dtml-if>">
   </td>
 </tr>
 
@@ -53,10 +53,8 @@
   <td align="left" valign="top" colspan="2">
   <div style="width: 100%;">
   <textarea name="filedata:text" wrap="off" style="width: 100%;"<dtml-if 
-   dtpref_cols> cols="<dtml-var dtpref_cols>"<dtml-else
-   > cols="50"</dtml-if><dtml-if dtpref_rows> rows="<dtml-var 
-   dtpref_rows>"<dtml-else> rows="20"</dtml-if>><dtml-var 
-   __str__ html_quote></textarea>
+   dtpref_cols> cols="&dtml-dtpref_cols;"<dtml-else
+   > cols="50"</dtml-if><dtml-if dtpref_rows> rows="&dtml-dtpref_rows;"<dtml-else> rows="20"</dtml-if>><dtml-var __str__ html_quote></textarea>
   </div>
   </td>
 </tr>


=== Zope/lib/python/OFS/dtml/findAdv.dtml 1.2 => 1.2.234.1 ===
--- Zope/lib/python/OFS/dtml/findAdv.dtml:1.2	Mon Jan  8 17:46:59 2001
+++ Zope/lib/python/OFS/dtml/findAdv.dtml	Wed Oct 23 19:06:12 2002
@@ -16,7 +16,7 @@
   <SELECT NAME="obj_metatypes:list" SIZE="4" MULTIPLE>
   <OPTION VALUE="all" SELECTED> All types
 <dtml-in all_meta_types mapping>
-  <OPTION VALUE="<dtml-var name html_quote>"> <dtml-var name>
+  <OPTION VALUE="&dtml-name;"> &dtml-name;
 </dtml-in>
   </SELECT>
   </div>
@@ -83,7 +83,7 @@
   <div class="form-element">
   <SELECT NAME="obj_roles:list" SIZE="3" MULTIPLE>
 <dtml-in valid_roles>
-  <OPTION VALUE="<dtml-var sequence-item html_quote>"> <dtml-var sequence-item>
+  <OPTION VALUE="&dtml-sequence-item;"> &dtml-sequence-item;
 </dtml-in>
   </SELECT>
   </div>
@@ -100,7 +100,7 @@
   <div class="form-element">
   <SELECT NAME="obj_permission">
 <dtml-in permission_settings mapping>
-  <OPTION VALUE="<dtml-var name html_quote>"> <dtml-var name>
+  <OPTION VALUE="&dtml-name;"> &dtml-name;
 </dtml-in>
   </SELECT>
   </div>


=== Zope/lib/python/OFS/dtml/findForm.dtml 1.3 => 1.3.230.1 ===
--- Zope/lib/python/OFS/dtml/findForm.dtml:1.3	Tue Jan 16 11:46:56 2001
+++ Zope/lib/python/OFS/dtml/findForm.dtml	Wed Oct 23 19:06:12 2002
@@ -26,7 +26,7 @@
   </dtml-in>
   <dtml-call "sorted_meta_types.sort()">
   <dtml-in sorted_meta_types>
-  <OPTION VALUE="<dtml-var sequence-item html_quote>"><dtml-var sequence-item>
+  <OPTION VALUE="&dtml-sequence-item;">&dtml-sequence-item;
   </dtml-in>
 </dtml-let>
   </SELECT>


=== Zope/lib/python/OFS/dtml/findFrame.dtml 1.2 => 1.2.234.1 ===
--- Zope/lib/python/OFS/dtml/findFrame.dtml:1.2	Mon Jan  8 17:46:59 2001
+++ Zope/lib/python/OFS/dtml/findFrame.dtml	Wed Oct 23 19:06:12 2002
@@ -5,12 +5,12 @@
 </HEAD>
 <FRAMESET ROWS="52%,*">
 <dtml-if cv_ffaf>
-  <FRAME SRC="<dtml-var URL1>/manage_findAdv" NAME="findForm"
+  <FRAME SRC="&dtml-URL1;/manage_findAdv" NAME="findForm"
 <dtml-else>
-  <FRAME SRC="<dtml-var URL1>/manage_findForm" NAME="findForm"
+  <FRAME SRC="&dtml-URL1;/manage_findForm" NAME="findForm"
 </dtml-if>
    MARGINWIDTH="2" MARGINHEIGHT="2" SCROLLING="auto">
-  <FRAME SRC="<dtml-var URL1>/manage_findResult" NAME="findResult"
+  <FRAME SRC="&dtml-URL1;/manage_findResult" NAME="findResult"
    MARGINWIDTH="2" MARGINHEIGHT="0" SCROLLING="auto">
 </FRAMESET>
 <NOFRAMES>


=== Zope/lib/python/OFS/dtml/findResult.dtml 1.3 => 1.3.22.1 ===
--- Zope/lib/python/OFS/dtml/findResult.dtml:1.3	Thu Aug  1 15:09:28 2002
+++ Zope/lib/python/OFS/dtml/findResult.dtml	Wed Oct 23 19:06:12 2002
@@ -29,8 +29,8 @@
 <p class="std-text">
 Displaying items
 <dtml-in name="results" size=batch_size start=query_start>
-<dtml-if sequence-start><dtml-var sequence-number></dtml-if><dtml-if 
- sequence-end>-<dtml-var sequence-number> of <dtml-var 
+<dtml-if sequence-start>&dtml-sequence-number;</dtml-if><dtml-if 
+ sequence-end>-&dtml-sequence-number; of <dtml-var 
  "_.len(results)"></dtml-if></dtml-in> items matching your query. You can 
 <a href="#form">revise</a> your search terms below.
 </p>
@@ -60,13 +60,13 @@
 <td width="50%">
  <div class="list-item">
  <dtml-in name="results" previous size="batch_size" start="query_start">
- <strong> <a href="<dtml-var name="URL"><dtml-var name="sequence-query">query_start=<dtml-var name="previous-sequence-start-number">">&lt; Previous</a></strong>
+ <strong> <a href="&dtml-URL;<dtml-var name="sequence-query">query_start=<dtml-var name="previous-sequence-start-number">">&lt; Previous</a></strong>
  <dtml-else>&nbsp;</dtml-in></div>
 </td>
 <td align="right" width="50%">
  <div class="list-item">
  <dtml-in name="results" next size=batch_size start=query_start>
- <strong><a href="<dtml-var URL><dtml-var sequence-query>query_start=<dtml-var next-sequence-start-number>">Next &gt;</a></strong>
+ <strong><a href="&dtml-URL;<dtml-var sequence-query>query_start=<dtml-var next-sequence-start-number>">Next &gt;</a></strong>
  <dtml-else>&nbsp;</dtml-in></div>
 </td>
 </tr>
@@ -82,7 +82,7 @@
   <TD ALIGN="LEFT" VALIGN="TOP" WIDTH="16">
   <A HREF="&dtml.url_quote-sequence-key;/manage_workspace">
   <IMG SRC="&dtml-BASEPATH1;/&dtml-icon;"
-   ALT="[<dtml-var meta_type>]" BORDER="0"></A>
+   ALT="[&dtml-meta_type;]" BORDER="0"></A>
   </TD>
   <TD ALIGN="LEFT" VALIGN="TOP">
   <div class="list-item">
@@ -114,7 +114,7 @@
   <SELECT NAME="obj_metatypes:list" SIZE="4" MULTIPLE>
   <OPTION VALUE="all" <dtml-in obj_metatypes><dtml-if "_['sequence-item'] == 'all'">SELECTED</dtml-if></dtml-in>> All types
 <dtml-in all_meta_types mapping>
-  <OPTION VALUE="<dtml-var name html_quote>" <dtml-in obj_metatypes><dtml-if "_['sequence-item'] == _['name']">SELECTED</dtml-if></dtml-in>><dtml-var name>
+  <OPTION VALUE="&dtml-name;" <dtml-in obj_metatypes><dtml-if "_['sequence-item'] == _['name']">SELECTED</dtml-if></dtml-in>>&dtml-name;
 </dtml-in>
   </SELECT>
   </div>
@@ -130,7 +130,7 @@
   <TD ALIGN="LEFT" VALIGN="TOP">
   <INPUT TYPE="TEXT" NAME="obj_ids:tokens" SIZE="30" VALUE="<dtml-unless "REQUEST.obj_ids == []">
 <dtml-in expr="REQUEST.obj_ids">
-<dtml-var sequence-item>&nbsp;
+&dtml-sequence-item;&nbsp;
 
 </dtml-in>
 </dtml-unless>">
@@ -144,7 +144,7 @@
   </div>
   </TD>
   <TD ALIGN="LEFT" VALIGN="TOP">
-  <INPUT TYPE="TEXT" NAME="obj_searchterm" SIZE="30" VALUE="<dtml-var "REQUEST.obj_searchterm">">
+  <INPUT TYPE="TEXT" NAME="obj_searchterm" SIZE="30" VALUE="<dtml-var "REQUEST.obj_searchterm" html_quote>">
   </TD>
 </TR>
 
@@ -156,7 +156,7 @@
   </div>
   </TD>
   <TD ALIGN="LEFT" VALIGN="TOP">
-  <TEXTAREA NAME="obj_expr" ROWS="4" COLS="30"><dtml-var obj_expr></TEXTAREA>
+  <TEXTAREA NAME="obj_expr" ROWS="4" COLS="30">&dtml-obj_expr;</TEXTAREA>
   </TD>
 </TR>
 </dtml-if>


=== Zope/lib/python/OFS/dtml/history.dtml 1.3 => 1.3.194.1 ===
--- Zope/lib/python/OFS/dtml/history.dtml:1.3	Wed Mar 21 10:37:59 2001
+++ Zope/lib/python/OFS/dtml/history.dtml	Wed Oct 23 19:06:12 2002
@@ -47,7 +47,7 @@
         <td align="left" valign="top">
         <div class="list-item">
 	<a href="&dtml-absolute_url;/HistoricalRevisions/&dtml-key;/manage_workspace"><dtml-var time fmt="%Y-%m-%d %H:%M"><dtml-if 
-        user_name> (<dtml-var user_name> )</dtml-if></a>
+        user_name> (&dtml-user_name;)</dtml-if></a>
         <br>&dtml-description;
 	<dtml-if revision>
         <br>revision: <em>&dtml-revision;</em>


=== Zope/lib/python/OFS/dtml/historyCompare.dtml 1.3 => 1.3.194.1 ===
--- Zope/lib/python/OFS/dtml/historyCompare.dtml:1.3	Wed Mar 21 10:37:59 2001
+++ Zope/lib/python/OFS/dtml/historyCompare.dtml	Wed Oct 23 19:06:12 2002
@@ -6,7 +6,7 @@
 <tr>
   <td align="left" valign="top">
   <div class="form-label">
-Changes to <dtml-var id> as of
+Changes to &dtml-id; as of
   </div>
   </td>
   <td align="left" valign="top">
@@ -18,7 +18,7 @@
 <tr>
   <td align="left" valign="top">
   <div class="form-label">
-  to get to <dtml-var id> as of
+  to get to &dtml-id; as of
   </div>
   </td>
   <td align="left" valign="top">


=== Zope/lib/python/OFS/dtml/imageAdd.dtml 1.2 => 1.2.234.1 ===
--- Zope/lib/python/OFS/dtml/imageAdd.dtml:1.2	Mon Jan  8 17:46:59 2001
+++ Zope/lib/python/OFS/dtml/imageAdd.dtml	Wed Oct 23 19:06:12 2002
@@ -11,7 +11,7 @@
 <em>Browse</em> button.
 </p>
 
-<form action="manage_add<dtml-var Kind>" method="post"
+<form action="manage_add&dtml-Kind;" method="post"
       enctype="multipart/form-data">
 <table cellspacing="0" cellpadding="2" border="0">
   <tr>


=== Zope/lib/python/OFS/dtml/imageEdit.dtml 1.8 => 1.8.118.1 ===
--- Zope/lib/python/OFS/dtml/imageEdit.dtml:1.8	Wed Oct 17 11:14:59 2001
+++ Zope/lib/python/OFS/dtml/imageEdit.dtml	Wed Oct 23 19:06:12 2002
@@ -3,13 +3,12 @@
 
 
 <p class="form-help">
-You can update the data for this <dtml-var kind> using the form below. 
+You can update the data for this &dtml-kind; using the form below. 
 Select a data file from your local computer by clicking the <em>browse</em> 
-button and click <em>upload</em> to update the contents of the <dtml-var 
-kind>.
+button and click <em>upload</em> to update the contents of the &dtml-kind;.
 </p>
 
-<form action="<dtml-var URL1>/manage_edit" method="post"
+<form action="&dtml-URL1;/manage_edit" method="post"
   enctype="multipart/form-data">
 <table cellpadding="2" cellspacing="0" width="100%" border="0">
 <tr>
@@ -20,7 +19,7 @@
   </td>
   <td align="left" valign="top">
   <input type="text" name="title" size="40" value="<dtml-if 
-   title><dtml-var title html_quote></dtml-if>">
+   title>&dtml-title;</dtml-if>">
   </td>
 </tr>
 
@@ -32,7 +31,7 @@
   </td>
   <td align="left" valign="top">
   <input type="text" name="content_type:required" size="40" value="<dtml-if 
-   content_type><dtml-var content_type html_quote></dtml-if>">
+   content_type>&dtml-content_type;</dtml-if>">
   </td>
 </tr>
 
@@ -96,7 +95,7 @@
 </table>
 </form>
 
-<form action="<dtml-var URL1>/manage_upload" method="post"
+<form action="&dtml-URL1;/manage_upload" method="post"
   enctype="multipart/form-data">
 <table cellpadding="2" cellspacing="0" width="100%" border="0">
 <tr>


=== Zope/lib/python/OFS/dtml/imageView.dtml 1.2 => 1.2.234.1 ===
--- Zope/lib/python/OFS/dtml/imageView.dtml:1.2	Mon Jan  8 17:46:59 2001
+++ Zope/lib/python/OFS/dtml/imageView.dtml	Wed Oct 23 19:06:12 2002
@@ -2,10 +2,10 @@
 <dtml-var manage_tabs>
 
 <p>
-<img src="<dtml-var absolute_url>" <dtml-if 
- width>width="<dtml-var width>" </dtml-if><dtml-if 
- height>height="<dtml-var height>" </dtml-if
- > alt="<dtml-var title_or_id>" />
+<img src="&dtml-absolute_url;" <dtml-if 
+ width>width="&dtml-width;" </dtml-if><dtml-if 
+ height>height="&dtml-height;" </dtml-if
+ > alt="&dtml-title_or_id;" />
 </p>
 
 <dtml-var manage_page_footer>


=== Zope/lib/python/OFS/dtml/importExport.dtml 1.3 => 1.3.24.1 ===
--- Zope/lib/python/OFS/dtml/importExport.dtml:1.3	Sat Jul 13 16:02:00 2002
+++ Zope/lib/python/OFS/dtml/importExport.dtml	Wed Oct 23 19:06:12 2002
@@ -21,8 +21,7 @@
   </div>
   </td>
   <td align="left" valign="top">
-  <input type="text" name="id" size="25" value="<dtml-if ids><dtml-var 
-  "ids[0]" html_quote></dtml-if>" class="form-element"/>
+  <input type="text" name="id" size="25" value="<dtml-if ids><dtml-var "ids[0]" html_quote></dtml-if>" class="form-element"/>
   </td>
 </tr>
 <tr>


=== Zope/lib/python/OFS/dtml/properties.dtml 1.9 => 1.9.8.1 ===
--- Zope/lib/python/OFS/dtml/properties.dtml:1.9	Tue Oct  1 08:23:06 2002
+++ Zope/lib/python/OFS/dtml/properties.dtml	Wed Oct 23 19:06:12 2002
@@ -7,11 +7,11 @@
 
 <dtml-if Principia-Version>
 <p>
-<em>You are currently working in version <dtml-var Principia-Version></em>
+<em>You are currently working in version &dtml-Principia-Version;</em>
 </p>
 </dtml-if Principia-Version>
 
-<form action="<dtml-var URL1>" method="post">
+<form action="&dtml-URL1;" method="post">
 <dtml-if propertyMap>
 <p class="form-help">
 Properties allow you to assign simple values to Zope objects. To change 
@@ -44,72 +44,69 @@
 <tr>
   <td align="left" valign="top" width="16">
   <dtml-if "'d' in _['sequence-item'].get('mode', 'awd')">
-  <input type="checkbox" name="_ids:utf8:string:list" value="<dtml-var id html_quote>"
-   id="cb-<dtml-var id>">
+  <input type="checkbox" name="_ids:utf8:string:list" value="&dtml-id;"
+   id="cb-&dtml-id;">
   <dtml-else>
   </dtml-if>
   </td>
   <td align="left" valign="top">
   <div class="form-label">
-  <label for="cb-<dtml-var id>"><dtml-var "propertyLabel(id)"></label>
+  <label for="cb-&dtml-id;"><dtml-var "propertyLabel(id)" html_quote></label>
   </div>
   </td>
   <td align="left" valign="top">
 
   <dtml-if "'w' in _['sequence-item'].get('mode', 'awd')">
   <dtml-if "type == 'int'">
-  <input type="text" name="<dtml-var id>:<dtml-var 
-   type>" size="35" value="<dtml-if "hasProperty(id)"><dtml-var 
-   "'%s' % getProperty(id)" html_quote></dtml-if>">
+  <input type="text" name="&dtml-id;:&dtml-type;"
+   size="35" value="<dtml-if "hasProperty(id)"><dtml-var "'%s' % getProperty(id)" html_quote></dtml-if>">
   <dtml-elif "type == 'long'">
-  <input type="text" name="<dtml-var id>:<dtml-var type>" size="35"
-   value="<dtml-if "hasProperty(id)"><dtml-var 
-   "('%s' % getProperty(id))" html_quote></dtml-if>">
+  <input type="text" name="&dtml-id;:&dtml-type;" size="35"
+   value="<dtml-if "hasProperty(id)"><dtml-var "('%s' % getProperty(id))" html_quote></dtml-if>">
   <dtml-elif "type in ('float', 'date')">
-  <input type="text" name="<dtml-var id>:utf8:<dtml-var type>" size="35"
+  <input type="text" name="&dtml-id;:utf8:&dtml-type;" size="35"
    value="<dtml-var "getProperty(id)" html_quote>">
   <dtml-elif "type in ['string','ustring']">
-  <input type="text" name="<dtml-var id>:utf8:<dtml-var type>" size="35"
+  <input type="text" name="&dtml-id;:utf8:&dtml-type;" size="35"
    value="<dtml-var "getProperty(id)" html_quote>">
   <dtml-elif "type=='boolean'">
-  <input type="checkbox" name="<dtml-var id>:boolean" size="35"
+  <input type="checkbox" name="&dtml-id;:boolean" size="35"
    <dtml-if "getProperty(id)">CHECKED</dtml-if>>
   <dtml-elif "type in ['tokens','utokens']">
-  <input type="text" name="<dtml-var id>:utf8:<dtml-var type>" size="35"
-   value="<dtml-in "getProperty(id)"><dtml-var sequence-item html_quote> </dtml-in>">
+  <input type="text" name="&dtml-id;:utf8:&dtml-type;" size="35"
+   value="<dtml-in "getProperty(id)">&dtml-sequence-item; </dtml-in>">
   <dtml-elif "type in ['text','utext']">
-  <textarea name="<dtml-var id>:utf8:<dtml-var type>" rows="6" cols="35"><dtml-var
-   "getProperty(id)" html_quote></textarea>
+  <textarea name="&dtml-id;:utf8:&dtml-type;" rows="6" cols="35"><dtml-var "getProperty(id)" html_quote></textarea>
   <dtml-elif "type in ['lines','ulines']">
-  <textarea name="<dtml-var id>:utf8:<dtml-var type>" rows="6" cols="35"><dtml-in
-  "getProperty(id)"><dtml-var sequence-item html_quote><dtml-if
+  <textarea name="&dtml-id;:utf8:&dtml-type;" rows="6" cols="35"><dtml-in
+  "getProperty(id)">&dtml-sequence-item;<dtml-if
    sequence-end><dtml-else><dtml-var "'\n'"></dtml-if></dtml-in></textarea>
 
   <dtml-elif "type=='selection'">
 
     <dtml-if "hasProperty(select_variable)">
     <div class="form-element">
-    <select name="<dtml-var id>:utf8:text">
+    <select name="&dtml-id;:utf8:text">
       <dtml-in "getProperty(select_variable)">
          <option
           <dtml-if "_['sequence-item']==getProperty(id)">SELECTED</dtml-if>
-          ><dtml-var sequence-item html_quote></option>
+          >&dtml-sequence-item;</option>
       </dtml-in>
     </select>
     </div>
     <dtml-elif "_.has_key(select_variable)">
     <div class="form-element">
-    <select name="<dtml-var id>:utf8:text">
+    <select name="&dtml-id;:utf8:text">
       <dtml-in "_[select_variable]">
          <option
           <dtml-if "_['sequence-item']==getProperty(id)">SELECTED</dtml-if>
-          ><dtml-var sequence-item html_quote></option>
+          >&dtml-sequence-item;</option>
       </dtml-in>
     </select>
     </div>
     <dtml-else>
     <div class="form-text">
-       No value for <dtml-var select_variable>.
+       No value for &dtml-select_variable;.
     </div>
     </dtml-if>
 
@@ -117,31 +114,31 @@
 
     <dtml-if "hasProperty(select_variable)">
     <div class="form-element">
-    <select name="<dtml-var id>:utf8:list" multiple
+    <select name="&dtml-id;:utf8:list" multiple
       size="<dtml-var "_.min(7, _.len(getProperty(select_variable)))">">
       <dtml-in "getProperty(select_variable)">
          <option<dtml-if 
          "getProperty(id) and (_['sequence-item'] in getProperty(id))"
          > SELECTED</dtml-if
-         >><dtml-var sequence-item html_quote></option>
+         >>&dtml-sequence-item;</option>
       </dtml-in>
     </select>
     </div>
     <dtml-elif "_.has_key(select_variable)">
     <div class="form-element">
-    <select name="<dtml-var id>:utf8:list" multiple
+    <select name="&dtml-id;:utf8:list" multiple
       size="<dtml-var "_.min(7, _.len(_[select_variable]))">">
       <dtml-in "_[select_variable]">
          <option<dtml-if 
          "getProperty(id) and (_['sequence-item'] in getProperty(id))"
          > SELECTED</dtml-if
-         >><dtml-var sequence-item html_quote></option>
+         >>&dtml-sequence-item;</option>
       </dtml-in>
     </select>
     </div>
     <dtml-else>
     <div class="form-text">
-    No value for <dtml-var select_variable>.
+    No value for &dtml-select_variable;.
     </div>
     </dtml-if>
   <dtml-else>
@@ -198,7 +195,7 @@
 
 <dtml-if property_extensible_schema__>
 
-<form action="<dtml-var URL1>/manage_addProperty" method="post">
+<form action="&dtml-URL1;/manage_addProperty" method="post">
 
 <p class="form-help">
 To add a new property, enter a name, type and value for the new 


=== Zope/lib/python/OFS/dtml/propertyType.dtml 1.2 => 1.2.234.1 ===
--- Zope/lib/python/OFS/dtml/propertyType.dtml:1.2	Mon Jan  8 17:46:59 2001
+++ Zope/lib/python/OFS/dtml/propertyType.dtml	Wed Oct 23 19:06:12 2002
@@ -8,7 +8,7 @@
 
 <dtml-if Principia-Version>
 <p>
-<em>You are currently working in version <dtml-var Principia-Version></em>
+<em>You are currently working in version &dtml-Principia-Version;</em>
 </p>
 </dtml-if Principia-Version>
 
@@ -26,7 +26,7 @@
   </dtml-if>
 </dtml-unless>
 
-<form action="<dtml-var URL1>" method="POST">
+<form action="&dtml-URL1;" method="POST">
 <dtml-if old_ids>
 <p>
 To change property names and values, edit them and click
@@ -85,7 +85,7 @@
       </dtml-in>
     </select>
     <dtml-else>
-       No value for <dtml-var select_variable>.
+       No value for &dtml-select_variable;.
     </dtml-if>
   <dtml-elif "new_type=='multiple selection'">
     <dtml-if "_.has_key(select_variable)">
@@ -94,11 +94,11 @@
       <dtml-in "_[select_variable]">
          <option<dtml-if
          "_['sequence-item'] in new_value"> SELECTED</dtml-if
-         >><dtml-var sequence-item html_quote></option>
+         >>&dtml-sequence-item;</option>
       </dtml-in>
     </select>
     <dtml-else>
-    No value for <dtml-var select_variable>.
+    No value for &dtml-select_variable;.
     </dtml-if>
   <dtml-else>
   <em>Unknown property type</em>


=== Zope/lib/python/OFS/dtml/propertysheets.dtml 1.2 => 1.2.234.1 ===
--- Zope/lib/python/OFS/dtml/propertysheets.dtml:1.2	Mon Jan  8 17:46:59 2001
+++ Zope/lib/python/OFS/dtml/propertysheets.dtml	Wed Oct 23 19:06:12 2002
@@ -1,7 +1,7 @@
 <dtml-var manage_page_header>
 <dtml-var manage_tabs>
 
-<form action="<dtml-var URL1>" method="post">
+<form action="&dtml-URL1;" method="post">
 <table cellspacing="0" cellpadding="2" border="0">
 <dtml-in items sort>
 <dtml-with "_(REQUEST=REQUEST, item=_['sequence-item'].aq_base)" only>
@@ -9,7 +9,7 @@
 <dtml-if id>
 <tr>
   <td align="left" valign="top">
-  <a href="&dtml-id;">&dtml-id; (<dtml-var xml_namespace>)</a>
+  <a href="&dtml-id;">&dtml-id; (&dtml-xml_namespace;)</a>
   <dtml-if locked_in_session>
     <dtml-if modified_in_session>
       <img src="&dtml-BASEPATH1;/p_/locked"


=== Zope/lib/python/OFS/dtml/renameForm.dtml 1.4 => 1.4.142.1 ===
--- Zope/lib/python/OFS/dtml/renameForm.dtml:1.4	Mon Jul 23 19:57:48 2001
+++ Zope/lib/python/OFS/dtml/renameForm.dtml	Wed Oct 23 19:06:12 2002
@@ -23,8 +23,7 @@
 <dtml-if cb_isMoveable>
   <span class="form-text">to:</span>
   <input type="hidden" name="ids:list" value="&dtml-id;" />
-  <input type="text" name="new_ids:list" size="<dtml-var 
-   "_.max(40,_.len(getId())+4)">" value="&dtml-id;" />
+  <input type="text" name="new_ids:list" size="<dtml-var "_.max(40,_.len(getId())+4)">" value="&dtml-id;" />
 <dtml-else>
   <span class="form-text">
   may not be renamed.



