Merged efge-death-to-dtml-var-branch into HEAD:

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>.

lib/python/AccessControl/dtml/access.dtml

@@ -57,8 +57,7 @@ a permission in addition to selecting to acquire permissions.
   <dtml-in valid_roles>
   <td align="left">
   <div class="list-item">
-  <a href="manage_roleForm?role_to_manage=<dtml-var 
-   sequence-item url_quote>"><dtml-var sequence-item></a>
+  <a href="manage_roleForm?role_to_manage=&dtml.url_quote-sequence-item;">&dtml-sequence-item;</a>
   </div>
   </td>
   </dtml-in valid_roles>
@@ -73,19 +72,17 @@ a permission in addition to selecting to acquire permissions.
 
   <dtml-unless isTopLevelPrincipiaApplicationObject>
   <td align="left" valign="top">
-  <input type="checkbox" name="a<dtml-var sequence-index>" <dtml-var 
-   acquire> />
+  <input type="checkbox" name="a&dtml-sequence-index;" &dtml-acquire; />
   </td>
   </dtml-unless>
   <td align="left" nowrap>
   <div class="list-item">
-  <a href="manage_permissionForm?permission_to_manage=<dtml-var 
-   name url_quote>"><dtml-var name></a>
+  <a href="manage_permissionForm?permission_to_manage=&dtml.url_quote-name;">&dtml-name;</a>
   </div>
   </td>
   <dtml-in roles mapping>
   <td align="center">
-  <input type="checkbox" name="<dtml-var name>" <dtml-var checked> />
+  <input type="checkbox" name="&dtml-name;" &dtml-checked; />
   </td>
   </dtml-in>
 </tr>
@@ -139,7 +136,7 @@ You can define new roles by entering a role name and clicking the
   <div class="form-element">
   <select name="roles:list">
   <dtml-in userdefined_roles>
-  <option value="&dtml-sequence-item;"><dtml-var sequence-item></option>
+  <option value="&dtml-sequence-item;">&dtml-sequence-item;</option>
   </dtml-in userdefined_roles>
   </select>
   </div>

lib/python/AccessControl/dtml/acquiredEdit.dtml

@@ -9,7 +9,7 @@ Select permissions that acquire permission settings:
 <form action="manage_acquiredPermissions" method="post">
 <select name="permissions:list" multiple size="10">
 <dtml-in permission_settings mapping>
-  <option<dtml-if acquire> selected</dtml-if>><dtml-var name></option>
+  <option<dtml-if acquire> selected</dtml-if>>&dtml-name;</option>
 </dtml-in>
 </select>
 <p>

lib/python/AccessControl/dtml/addUser.dtml

@@ -76,8 +76,7 @@ Domains
   <dtml-if expr="_vars['sequence-item'] != 'Authenticated'">
   <dtml-if expr="_vars['sequence-item'] != 'Anonymous'">
   <dtml-if expr="_vars['sequence-item'] != 'Shared'">
-  <option value="<dtml-var sequence-item html_quote>"><dtml-var 
-   sequence-item>
+  <option value="&dtml-sequence-item;">&dtml-sequence-item;
   </dtml-if>
   </dtml-if>
   </dtml-if>

lib/python/AccessControl/dtml/editLocalRoles.dtml

@@ -25,18 +25,17 @@ Save Changes</em> button.
 </tr>
 <tr>
   <td align="left" valign="top">
-  <div class="form-text"><dtml-var userid></div>
+  <div class="form-text">&dtml-userid;</div>
   </td>
   <td align="left" valign="top">
   <div class="form-element">
-  <input type="hidden" name="userid" value="<dtml-var userid html_quote>">
+  <input type="hidden" name="userid" value="&dtml-userid;">
 <dtml-with "_(user_roles=get_local_roles_for_userid(userid))">
   <select name="roles:list" size="5" multiple>
 <dtml-in valid_roles><dtml-if 
 "_vars['sequence-item'] not in ('Anonymous', 'Shared', 'Authenticated')">
-<option value="<dtml-var sequence-item html_quote>"<dtml-if 
-"_['sequence-item'] in user_roles"> selected</dtml-if>><dtml-var 
-sequence-item>
+<option value="&dtml-sequence-item;"<dtml-if 
+"_['sequence-item'] in user_roles"> selected</dtml-if>>&dtml-sequence-item;
 </dtml-if>
 </dtml-in>
   </select>

lib/python/AccessControl/dtml/editUser.dtml

@@ -16,16 +16,14 @@ Name
 </TD>
 <TD VALIGN="TOP">
 <div class="form-text">
-<dtml-var expr="user.name">
+<dtml-var expr="user.name" html_quote>
 </div>
 </TD>
 </TR>
 <TR><TD COLSPAN=2>&nbsp;</TD></TR>
 <dtml-if remote_user_mode__>
-  <INPUT TYPE="HIDDEN" NAME="password" value="<dtml-var 
-   password html_quote>" />
-  <INPUT TYPE="HIDDEN" NAME="confirm"  value="<dtml-var 
-   password html_quote>" />
+  <INPUT TYPE="HIDDEN" NAME="password" value="&dtml-password;" />
+  <INPUT TYPE="HIDDEN" NAME="confirm"  value="&dtml-password;" />
 <dtml-else>
 <TR>
 <TD VALIGN="TOP">
@@ -56,7 +54,7 @@ Domains
 </TD>
 <TD VALIGN="TOP">
 <INPUT TYPE="TEXT" NAME="domains:tokens" SIZE="30"
-  VALUE="<dtml-if expr="user.domains"><dtml-in expr="user.domains"><dtml-var sequence-item html_quote> </dtml-in></dtml-if>" />
+  VALUE="<dtml-if expr="user.domains"><dtml-in expr="user.domains">&dtml-sequence-item; </dtml-in></dtml-if>" />
 </TD>
 </TR>
 
@@ -74,10 +72,9 @@ Roles
 <dtml-if expr="_vars['sequence-item'] != 'Anonymous'">
 <dtml-if expr="_vars['sequence-item'] != 'Shared'">
 <dtml-if expr="_vars['sequence-item'] in user.roles">
-<OPTION VALUE="<dtml-var sequence-item html_quote>" selected><dtml-var 
- sequence-item>
+<OPTION VALUE="&dtml-sequence-item;" selected>&dtml-sequence-item;
 <dtml-else>
-<OPTION VALUE="<dtml-var sequence-item html_quote>"><dtml-var sequence-item>
+<OPTION VALUE="&dtml-sequence-item;">&dtml-sequence-item;
 </dtml-if>
 </dtml-if>
 </dtml-if>
@@ -85,8 +82,7 @@ Roles
 </dtml-in valid_roles>
 </SELECT>
 
-<INPUT TYPE="HIDDEN" NAME="name" VALUE="<dtml-var 
- expr="user.name" html_quote>" />
+<INPUT TYPE="HIDDEN" NAME="name" VALUE="<dtml-var expr="user.name" html_quote>" />
 <br /><br />
 <INPUT class="form-element" TYPE="SUBMIT" NAME="submit" VALUE="Change" />
 </div>

lib/python/AccessControl/dtml/listLocalRoles.dtml

@@ -4,7 +4,7 @@
 </dtml-with>
 <dtml-if stat>
 <hr>
-<font color="red"><dtml-var stat></font>
+<font color="red">&dtml-stat;</font>
 <hr>
 </dtml-if>
 
@@ -25,14 +25,12 @@ and click the <em>Remove</em> button.
 <dtml-in get_local_roles>
 <tr>
   <td align="left" valign="top">
-  <input type="checkbox" name="userids:list" value="<dtml-var 
-   sequence-key html_quote>" />
+  <input type="checkbox" name="userids:list" value="&dtml-sequence-key;" />
   </td>
   <td align="left" valign="top">
   <div class="form-text">
-  <a href="manage_editLocalRoles?userid=<dtml-var sequence-key 
-   fmt="url-quote">"><dtml-var sequence-key></a> (<dtml-in 
-   sequence-item><dtml-var sequence-item><dtml-unless 
+  <a href="manage_editLocalRoles?userid=&dtml.url_quote-sequence-key;">&dtml-sequence-key;</a> (<dtml-in 
+   sequence-item>&dtml-sequence-item;<dtml-unless 
    sequence-end>, </dtml-unless></dtml-in>)
   </div>
   </td>
@@ -77,8 +75,7 @@ roles that should be given to that user from the <em>Roles</em> list.
   <dtml-try>
   <select name="userid" size="5">
   <dtml-in get_valid_userids>
-  <option value="<dtml-var sequence-item html_quote>"><dtml-var 
-   sequence-item></option>
+  <option value="&dtml-sequence-item;">&dtml-sequence-item;</option>
   </dtml-in>
   </select>
   <dtml-except OverflowError>
@@ -93,8 +90,7 @@ roles that should be given to that user from the <em>Roles</em> list.
   <select name="roles:list" size="5" multiple>
 <dtml-in valid_roles><dtml-if 
 "_vars['sequence-item'] not in ('Anonymous', 'Shared', 'Authenticated')">
-<option value="<dtml-var sequence-item html_quote>"><dtml-var 
- sequence-item></option>
+<option value="&dtml-sequence-item;">&dtml-sequence-item;</option>
 </dtml-if>
 </dtml-in>
   </select>

lib/python/AccessControl/dtml/mainUser.dtml

@@ -16,16 +16,13 @@ user to edit that user.
 <tr class="row-hilite">
 </dtml-if>
   <td align="left" valign="top">
-  <input type="checkbox" name="names:list" value="<dtml-var 
-   sequence-item html_quote>" />
+  <input type="checkbox" name="names:list" value="&dtml-sequence-item;" />
   </td>
   <td align="left" valign="top">
   <div class="list-item">
-  <a href="manage_users?name=<dtml-var 
-   sequence-item fmt=url-quote>&submit=Edit"><img src="<dtml-var 
-   BASEPATH1>/p_/User_icon" alt="" border="0" /></a>
-  <a href="manage_users?name=<dtml-var sequence-item 
-   fmt=url-quote>&submit=Edit"><dtml-var sequence-item></a>
+  <a href="manage_users?name=&dtml.url_quote-sequence-item;&submit=Edit"><img src="&dtml-BASEPATH1;/p_/User_icon"
+   alt="" border="0" /></a>
+  <a href="manage_users?name=&dtml.url_quote-sequence-item;&submit=Edit">&dtml-sequence-item;</a>
   </div>
   </td>
 </tr>

lib/python/AccessControl/dtml/methodAccess.dtml

@@ -47,19 +47,18 @@ mappings for this item.
 </dtml-if>
   <td align="left" valign="top">
   <div class="form-text">
-  <dtml-var permission_name>
+  &dtml-permission_name;
   </div>
   </td>
   <td align="left" valign="top">
   <div class="form-element">
-  <input type="hidden" name="permission_names:list" value="<dtml-var 
-   permission_name html_quote>" />
+  <input type="hidden" name="permission_names:list" value="&dtml-permission_name;" />
   <select name="class_permissions:list">
   <option value=""<dtml-unless 
    class_permission> selected</dtml-unless>>(disabled)</option>
   <dtml-in valid>
   <option<dtml-if "_['sequence-item']==class_permission"
-  > selected</dtml-if>><dtml-var sequence-item></option>
+  > selected</dtml-if>>&dtml-sequence-item;</option>
   </dtml-in>
   </select>
   </div>

lib/python/AccessControl/dtml/permissionEdit.dtml

@@ -3,18 +3,16 @@
 <dtml-if manage_tabs><dtml-var manage_tabs></dtml-if manage_tabs>
 </dtml-with>
 <p class="form-text">
-Roles assigned to the permission <strong><dtml-var 
-permission_to_manage></strong>
+Roles assigned to the permission <strong>&dtml-permission_to_manage;</strong>
 </p>
 
 <form action="manage_permission" method="post">
 <p>
-<input type="hidden" name="permission_to_manage" value="<dtml-var 
- permission_to_manage html_quote>" />
+<input type="hidden" name="permission_to_manage" value="&dtml-permission_to_manage;" />
 <div class="form-element">
 <select name="roles:list" multiple size="10">
 <dtml-in expr="rolesOfPermission(permission_to_manage)" mapping=1>
-  <option <dtml-var selected>><dtml-var name></option>
+  <option &dtml-selected;>&dtml-name;</option>
 </dtml-in>
 </select>
 </div>
@@ -23,8 +21,7 @@ permission_to_manage></strong>
 <dtml-unless isTopLevelPrincipiaApplicationObject>
 <p>
 <div class="form-text">
-<input type="checkbox" name="acquire" <dtml-var 
-expr="acquiredRolesAreUsedBy(permission_to_manage)">> 
+<input type="checkbox" name="acquire" <dtml-var expr="acquiredRolesAreUsedBy(permission_to_manage)">> 
 Also use roles acquired from folders containing this object
 </p>
 </dtml-unless>

lib/python/AccessControl/dtml/roleEdit.dtml

@@ -2,17 +2,16 @@
 <dtml-if manage_tabs><dtml-var manage_tabs></dtml-if manage_tabs>
 
 <p class="form-text">
-Permissions assigned to the role <strong><dtml-var role_to_manage></strong>
+Permissions assigned to the role <strong>&dtml-role_to_manage;</strong>
 </p>
 
 <form action="manage_role" method="post">
 <p>
-<input type=hidden name=role_to_manage value="<dtml-var 
- role_to_manage html_quote>">
+<input type=hidden name=role_to_manage value="&dtml-role_to_manage;">
 <div class="form-element">
 <select name="permissions:list" multiple size="10">
 <dtml-in expr="permissionsOfRole(role_to_manage)" mapping=1>
-  <option <dtml-var selected>><dtml-var name></option>
+  <option &dtml-selected;>&dtml-name;</option>
 </dtml-in>
 </select>
 </div>

lib/python/App/dtml/addFactory.dtml

@@ -61,7 +61,7 @@ objects in the product, typically a Python Script or DTML object.
     <select name="initial">
 <dtml-in objectItems>
 <dtml-if "meta_type != 'Principia Factory'">
-    <option><dtml-var sequence-key></option>
+    <option>&dtml-sequence-key;</option>
 </dtml-if>
 </dtml-in>
      </select>

lib/python/App/dtml/cacheGC.dtml

@@ -17,7 +17,7 @@
   Remove all objects from all ZODB in-memory caches
   </td>
   <td>
-  <form action="<dtml-var URL1>/manage_minimize" method=GET>
+  <form action="&dtml-URL1;/manage_minimize" method=GET>
   <div class="form-element">
   <input type="submit" name="submit" value="Minimize" />
   </div>
@@ -32,8 +32,8 @@
 <table>
 
 <dtml-in cacheStatistics>
-<tr><th align=left><dtml-var sequence-key></th>
-    <td><dtml-var sequence-item></td>
+<tr><th align=left>&dtml-sequence-key;</th>
+    <td>&dtml-sequence-item;</td>
 </tr>
 </dtml-in>
 
@@ -45,7 +45,7 @@
 
   <table border><tr><th>Object Class</th><th>Count</th></tr>
     <dtml-in cache_detail>
-      <tr><td><dtml-var sequence-key></td><td><dtml-var sequence-item></td></tr>
+      <tr><td>&dtml-sequence-key;</td><td>&dtml-sequence-item;</td></tr>
     </dtml-in>
   </table>
 </dtml-if>
@@ -59,10 +59,10 @@
              <th>References</th>
           </tr>
     <dtml-in cache_extreme_detail mapping>
-      <tr><td><dtml-var oid></td>
-          <td><dtml-var klass></td>
-          <td><dtml-var rc></td>
-          <td><dtml-var references></td>
+      <tr><td>&dtml-oid;</td>
+          <td>&dtml-klass;</td>
+          <td>&dtml-rc;</td>
+          <td>&dtml-references;</td>
       </tr>
     </dtml-in>
   </table>

lib/python/App/dtml/cacheParameters.dtml

@@ -10,7 +10,7 @@
   </td>
   <td>
   <div class="form-text">
-  <dtml-var database_size>
+  &dtml-database_size;
   </div>
   </td>
 </tr>
@@ -23,7 +23,7 @@
   </td>
   <td>
   <div class="form-text">
-  <dtml-var cache_length>
+  &dtml-cache_length;
   </div>
   </td>
 </tr>
@@ -35,9 +35,8 @@
   </div>
   </td>
   <td>
-  <form action="<dtml-var URL1>/manage_cache_size" method="get">
-  <input type="text" name="value:int" value="<dtml-var 
-   cache_size html_quote>" size="6" />
+  <form action="&dtml-URL1;/manage_cache_size" method="get">
+  <input type="text" name="value:int" value="&dtml-cache_size;" size="6" />
   <span class="form-element">
   <input type="submit" name="submit" value="Change">
   </span>
@@ -49,10 +48,10 @@
 <dtml-in cacheStatistics>
 <tr>
   <th align=left>
-  <dtml-var sequence-key>
+  &dtml-sequence-key;
   </th>
   <td>
-  <dtml-var sequence-item>
+  &dtml-sequence-item;
   </td>
 </tr>
 </dtml-in>
@@ -73,14 +72,14 @@
 <dtml-in cache_detail_length mapping>
 <dtml-if name="sequence-odd"><tr class="row-normal">
 <dtml-else><tr class="row-hilite"></dtml-if>
-    <td><div class="form-text"><dtml-var connection html_quote></div></td>
-    <td><div class="form-text"><dtml-var ngsize></div></td>
-    <td><div class="form-text"><dtml-var size></div></td>
+    <td><div class="form-text">&dtml-connection;</div></td>
+    <td><div class="form-text">&dtml-ngsize;</div></td>
+    <td><div class="form-text">&dtml-size;</div></td>
 </tr>
 </dtml-in>
 <tr class="row-hilite">
     <td><div class="list-item">Total</div></td>
-    <td><div class="list-item"><dtml-var cache_length></div></td>
+    <td><div class="list-item">&dtml-cache_length;</div></td>
     <td><div class="list-item"></div></td>
 </tr>
 
@@ -91,8 +90,7 @@
 
   <table border><tr><th>Object Class</th><th>Count</th></tr>
     <dtml-in cache_detail>
-      <tr><td><dtml-var sequence-key></td><td><dtml-var 
-      sequence-item></td></tr>
+      <tr><td>&dtml-sequence-key;</td><td>&dtml-sequence-item;</td></tr>
     </dtml-in>
   </table>
 </dtml-if>
@@ -106,10 +104,10 @@
              <th>References</th>
           </tr>
     <dtml-in cache_extreme_detail mapping>
-      <tr><td><dtml-var oid></td>
-          <td><dtml-var klass></td>
-          <td><dtml-var rc></td>
-          <td><dtml-var references></td>
+      <tr><td>&dtml-oid;</td>
+          <td>&dtml-klass;</td>
+          <td>&dtml-rc;</td>
+          <td>&dtml-references;</td>
       </tr>
     </dtml-in>
   </table>

lib/python/App/dtml/cpContents.dtml

@@ -6,7 +6,7 @@ The Control Panel provides access to system information and management
 functions such as database and product management.  
 </p>
 
-<form action="<dtml-var URL1>" method="post" onSubmit="">
+<form action="&dtml-URL1;" method="post" onSubmit="">
 <table cellspacing="0" cellpadding="2" border="0">
 <tr>
   <td align="left" valign="top">
@@ -16,7 +16,7 @@ functions such as database and product management.
   </td>
   <td align="left" valign="top">
   <div class="form-text">
-  <dtml-var version_txt>
+  &dtml-version_txt;
   </div>
   </td>
 </tr>
@@ -28,7 +28,7 @@ functions such as database and product management.
   </td>
   <td align="left" valign="top">
   <div class="form-text">
-  <dtml-var sys_version>
+  &dtml-sys_version;
   </div>
   </td>
 </tr>
@@ -40,7 +40,7 @@ functions such as database and product management.
   </td>
   <td align="left" valign="top">
   <div class="form-text">
-  <dtml-var sys_platform>
+  &dtml-sys_platform;
   </div>
   </td>
 </tr>
@@ -52,7 +52,7 @@ functions such as database and product management.
   </td>
   <td align="left" valign="top">
   <div class="form-text">
-  <dtml-var getSOFTWARE_HOME>
+  &dtml-getSOFTWARE_HOME;
   </div>
   </td>
 </tr>
@@ -64,7 +64,7 @@ functions such as database and product management.
   </td>
   <td align="left" valign="top">
   <div class="form-text">
-  <dtml-var getZOPE_HOME>
+  &dtml-getZOPE_HOME;
   </div>
   </td>
 </tr>
@@ -76,7 +76,7 @@ functions such as database and product management.
   </td>
   <td align="left" valign="top">
   <div class="form-text">
-  <dtml-var getINSTANCE_HOME>
+  &dtml-getINSTANCE_HOME;
   </div>
   </td>
 </tr>
@@ -88,7 +88,7 @@ functions such as database and product management.
   </td>
   <td align="left" valign="top">
   <div class="form-text">
-  <dtml-var getCLIENT_HOME>
+  &dtml-getCLIENT_HOME;
   </div>
   </td>
 </tr>
@@ -100,7 +100,7 @@ functions such as database and product management.
   </td>
   <td align="left" valign="top">
   <div class="form-text">
-  <dtml-var process_id> (<dtml-var thread_get_ident>)
+  &dtml-process_id; (&dtml-thread_get_ident;)
   </div>
   </td>
 </tr>
@@ -112,7 +112,7 @@ functions such as database and product management.
   </td>
   <td align="left" valign="top">
   <div class="form-text">
-  <dtml-var process_time>
+  &dtml-process_time;
   </div>
   </td>
 </tr>
@@ -138,13 +138,13 @@ functions such as database and product management.
 <dtml-in objectItems>
 <tr>
   <td width="16" align="left" valign="top">
-  <a href="<dtml-var sequence-key url_quote>/manage_workspace">
-  <img src="&dtml-BASEPATH1;/<dtml-var icon>" alt="" border="0" /></a>
+  <a href="&dtml.url_quote-sequence-key;/manage_workspace">
+  <img src="&dtml-BASEPATH1;/&dtml-icon;" alt="" border="0" /></a>
   </td>
   <td align="left" valign="top">
   <div class="list-item">
-  <a href="<dtml-var sequence-key url_quote>/manage_workspace">
-  <dtml-var title> 
+  <a href="&dtml.url_quote-sequence-key;/manage_workspace">
+  &dtml-title;
   </a>
   <dtml-if locked_in_version>
     <dtml-if modified_in_version>

lib/python/App/dtml/dbMain.dtml

@@ -16,7 +16,7 @@ and cache management.
   </td>
   <td align="left" valign="top">
   <div class="form-text">
-  <dtml-var db_name>
+  &dtml-db_name;
   </div>
   </td>
 </tr>
@@ -28,7 +28,7 @@ and cache management.
   </td>
   <td align="left" valign="top">
   <div class="form-text">
-  <dtml-var db_size>
+  &dtml-db_size;
   </div>
   </td>
 </tr>

lib/python/App/dtml/debug.dtml

 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html>
 <head>
-<title><dtml-if title><dtml-var title></dtml-if></title>
-<link rel="stylesheet" type="text/css" href="<dtml-var BASEPATH1>/manage_page_style.css">
+<title><dtml-if title>&dtml-title;</dtml-if></title>
+<link rel="stylesheet" type="text/css" href="&dtml-BASEPATH1;/manage_page_style.css">
 <dtml-if debug_auto_reload>
 <meta HTTP-EQUIV="Refresh"
   CONTENT="&dtml-debug_auto_reload;;URL=&dtml-URL;?debug_auto_reload=&dtml-debug_auto_reload;">
@@ -38,20 +38,20 @@ font-size: 10pt;
 <form action="&dtml-URL;" method="GET">
 <p>
 <ul>
-<li>Zope version: <dtml-var version_txt>
-<li>Python version: <dtml-var sys_version>
-<li>System Platform: <dtml-var sys_platform>
-<li>SOFTWARE_HOME: <dtml-var getSOFTWARE_HOME>
-<li>INSTANCE_HOME: <dtml-var getINSTANCE_HOME>
-<li>CLIENT_HOME: <dtml-var getCLIENT_HOME>
-<li>Process ID: <dtml-var process_id> (<dtml-var thread_get_ident>)
-<li>Running for: <dtml-var process_time>
+<li>Zope version: &dtml-version_txt;
+<li>Python version: &dtml-sys_version;
+<li>System Platform: &dtml-sys_platform;
+<li>SOFTWARE_HOME: &dtml-getSOFTWARE_HOME;
+<li>INSTANCE_HOME: &dtml-getINSTANCE_HOME;
+<li>CLIENT_HOME: &dtml-getCLIENT_HOME;
+<li>Process ID: &dtml-process_id; (&dtml-thread_get_ident;)
+<li>Running for: &dtml-process_time;
 <li>sys.path: <dtml-in manage_getSysPath><br />&nbsp;
    &dtml-sequence-item;
   </dtml-in>
 <li>Top Refcounts:<br><select name="foo" size="5"><dtml-in
-    "refcount(100)"><option><dtml-var 
-    sequence-item>: <dtml-var sequence-key></option></dtml-in
+    "refcount(100)"><option>&dtml-sequence-item;:
+      &dtml-sequence-key;</option></dtml-in
     ></select><br><br>
 
 <table border="1">
@@ -74,16 +74,16 @@ Delta
 </dtml-if>
 <tr>
 <td class="cell" align="left" valign="top">
-<dtml-var name>
+&dtml-name;
 </td>
 <td class="cell" align="left" valign="top">
-<dtml-var pc> 
+&dtml-pc;
 </td>
 <td class="cell" align="left" valign="top">
-<dtml-var rc>
+&dtml-rc;
 </td>
 <td class="cell" align="left" valign="top">
-+<dtml-var delta>
++&dtml-delta;
 </td>
 </tr>
 </dtml-in>
@@ -92,11 +92,11 @@ Delta
 <p><a href="../Database/cache_detail">Cache detail</a> |
 <a href="../Database/cache_extreme_detail">Cache extreme detail</a>
 </p>
-<p><a href="<dtml-var URL>?update_snapshot=1">Update Snapshot</a> | 
+<p><a href="&dtml-URL;?update_snapshot=1">Update Snapshot</a> | 
 <dtml-if debug_auto_reload>
-  <a href="<dtml-var URL>">Stop auto refresh</a>
+  <a href="&dtml-URL;">Stop auto refresh</a>
 <dtml-else>
-  <a href="<dtml-var URL>">Refresh</a> |
+  <a href="&dtml-URL;">Refresh</a> |
   Auto refresh interval (seconds):
   <input type="text" name="debug_auto_reload" size="3" value="10">
   <input type="submit" value="Start auto refresh">

lib/python/App/dtml/distributionView.dtml

@@ -15,7 +15,7 @@ distributed to other Zope users using the form below.
   </div>
   </td>
   <td align="left" valign="top">
-  <input type="text" name="version" value="<dtml-var new_version html_quote>">
+  <input type="text" name="version" value="&dtml-new_version;">
   </td>
 </tr>
 <tr>
@@ -41,9 +41,9 @@ distributed to other Zope users using the form below.
   <td align="left" valign="top">
   <select name="configurable_objects:list" size=10 multiple>
   <dtml-in objectItems>
-  <option value="<dtml-var sequence-key html_quote>" <dtml-
+  <option value="&dtml-sequence-key;" <dtml-
    if "_['sequence-key'] in configurable_objects_"
-   >SELECTED</dtml-if>><dtml-var title_and_id></option>
+   >SELECTED</dtml-if>>&dtml-title_and_id;</option>
   </dtml-in>
   </select>
   </td>

lib/python/App/dtml/editFactory.dtml

@@ -17,7 +17,7 @@ product, typically a Document.
   </td>
   <td align="left" valign="top">
   <div class="form-text">
-  <dtml-var id>
+  &dtml-id;
   </div>
   </td>
 </tr>
@@ -29,8 +29,7 @@ product, typically a Document.
   </div>
   </td>
   <td align="left" valign="top">
-  <input type="TEXT" name="title"size="40" value="<dtml-var 
-   title html_quote>" />
+  <input type="TEXT" name="title"size="40" value="&dtml-title;" />
   </td>
 </tr>
   
@@ -41,8 +40,7 @@ product, typically a Document.
   </div>
   </td>
   <td align="left" valign="top">
-  <input type="TEXT" name="object_type" size="40" value="<dtml-var 
-   object_type html_quote>" />
+  <input type="TEXT" name="object_type" size="40" value="&dtml-object_type;" />
   </td>
 </tr>
   
@@ -58,7 +56,7 @@ product, typically a Document.
 <dtml-in objectIds>
   <option <dtml-if 
    expr="_.string.strip(_['sequence-item'])==initial"> selected</dtml-if
-  >><dtml-var sequence-item></option>
+  >>&dtml-sequence-item;</option>
 </dtml-in>
   </select>
   </div>
@@ -77,7 +75,7 @@ product, typically a Document.
 <dtml-in possible_permissions>
   <option <dtml-if 
    "_['sequence-item']==permission">selected</dtml-if
-   >><dtml-var sequence-item></option>
+   >>&dtml-sequence-item;</option>
 </dtml-in>
   </select>
   </td>

lib/python/App/dtml/editPermission.dtml

@@ -11,7 +11,7 @@
   </td>
   <td align="left" valign="top">
   <div class="form-text">
-  <dtml-var id>
+  &dtml-id;
   </div>
   </td>
 </tr>
@@ -23,8 +23,7 @@
   </div>
   </td>
   <td align="left" valign="top">
-  <input type="text" name="title"size="40" value="<dtml-var 
-   title html_quote>" />
+  <input type="text" name="title"size="40" value="&dtml-title;" />
   </td>
 </tr>
 
@@ -35,8 +34,7 @@
   </div>
   </td>
   <td align="left" valign="top">
-  <input type="text" name="name" size="40" value="<dtml-var 
-   name html_quote>" />
+  <input type="text" name="name" size="40" value="&dtml-name;" />
   </td>
 </tr>
 

lib/python/App/dtml/manage.dtml

 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html>
 <head>
-<title>Zope on <dtml-var BASE0></title>
+<title>Zope on &dtml-BASE0;</title>
 <script type="text/javascript">
 <!--
 function update_menu() {   
@@ -19,14 +19,14 @@ function update_menu() {
   <dtml-else>
   <frameset rows="34, *">
   </dtml-if>
-  <frame src="<dtml-var URL1>/manage_top_frame" name="manage_top_frame"
+  <frame src="&dtml-URL1;/manage_top_frame" name="manage_top_frame"
    marginheight="0" scrolling="no"/>
 </dtml-if>
 
   <frameset cols="175,*">
-    <frame src="<dtml-var URL1>/manage_menu" name="manage_menu"
+    <frame src="&dtml-URL1;/manage_menu" name="manage_menu"
      marginwidth="2" marginheight="2" scrolling="auto"/>
-    <frame src="<dtml-var URL1>/manage_workspace" name="manage_main"
+    <frame src="&dtml-URL1;/manage_workspace" name="manage_main"
      marginwidth="2" marginheight="2" scrolling="auto"/>
   </frameset>
 

lib/python/App/dtml/manage_form_title.dtml

@@ -3,7 +3,7 @@
 <tr class="location-bar">
   <td align="left" valign="top">
   <div class="form-title">
-  <dtml-var form_title>
+  &dtml-form_title;
   </div>
   </td>
   <td align="right" valign="top">

lib/python/App/dtml/manage_page_header.dtml

@@ -4,9 +4,9 @@
 <dtml-unless management_page_charset>
 <dtml-call "REQUEST.set('management_page_charset','iso-8859-1')">
 </dtml-unless>
-<meta http-equiv="content-type" content="text/html;charset=<dtml-var management_page_charset>">
+<meta http-equiv="content-type" content="text/html;charset=&dtml-management_page_charset;">
 <dtml-call "RESPONSE.setHeader('content-type','text/html;charset='+management_page_charset)">
-<title><dtml-if title><dtml-var title></dtml-if></title>
+<title><dtml-if title>&dtml-title;</dtml-if></title>
 <dtml-let ag="REQUEST.get('HTTP_USER_AGENT', '')"
      is_nav4="ag[:9] == 'Mozilla/4' and _.string.find(ag, 'MSIE') < 0"
      use_css="REQUEST.get('zmi_use_css', '1')"
@@ -21,8 +21,7 @@
 -->
 </style>
 <dtml-else>
-<link rel="stylesheet" type="text/css" href="<dtml-var 
- BASEPATH1>/manage_page_style.css">
+<link rel="stylesheet" type="text/css" href="&dtml-BASEPATH1;/manage_page_style.css">
 </dtml-if>
 </dtml-if>
 </dtml-let>

lib/python/App/dtml/manage_style_test.dtml

@@ -2,11 +2,11 @@
 <html lang="en">
 <head>
 <title>System Stylesheet Test</title>
-<link rel="stylesheet" type="text/css" href="<dtml-var SCRIPT_NAME>/manage_style_css">
+<link rel="stylesheet" type="text/css" href="&dtml.url_quote-SCRIPT_NAME;/manage_style_css">
 </head>
 <body bgcolor="#ffffff" link="#000099" alink="#000099" vlink="#555555">
 
-<dtml-var HTTP_USER_AGENT>
+&dtml-HTTP_USER_AGENT;
 
 <h3>Text Styles</h3>
 

lib/python/App/dtml/manage_tabs.dtml

@@ -59,16 +59,14 @@
    size="1" color="#000000">&nbsp;<a <dtml-if 
    action>href="&dtml-action;"<dtml-else>href="&dtml-URL1;"</dtml-if
    ><dtml-if target> target="&dtml-target;"</dtml-if
-   >><span style="color: #000000;"><strong><dtml-var 
-   label></strong></span></a>&nbsp;</font></td>
+   >><span style="color: #000000;"><strong>&dtml-label;</strong></span></a>&nbsp;</font></td>
 <dtml-else>
   <td bgcolor="#efefef" valign="bottom" class="tab-small" 
    align="center"><font face="Verdana, Arial, Helvetica" 
    size="1" color="#000000">&nbsp;<a <dtml-if 
    action>href="&dtml-action;"<dtml-else>href="&dtml-URL1;"</dtml-if
    ><dtml-if target> target="&dtml-target;"</dtml-if
-   >><span style="color: #000000;"><strong><dtml-var 
-   label></strong></span></a>&nbsp;</font></td>
+   >><span style="color: #000000;"><strong>&dtml-label;</strong></span></a>&nbsp;</font></td>
 </dtml-if>
 </dtml-in>
 </tr>
@@ -127,7 +125,7 @@
       <dtml-else>
         <img src="&dtml-BASEPATH1;/p_/lockedo"
          alt="This item has been modified in another version" />
-              (<em><dtml-var locked_in_version html_quote></em>)
+              (<em>&dtml-locked_in_version;</em>)
       </dtml-if>
     </dtml-if>
     <dtml-if wl_isLocked>
@@ -161,7 +159,7 @@
 
 <dtml-if Zope-Version>
 <div class="system-msg">
-<em>You are currently working in version <a href="&dtml-SERVER_URL;&dtml-Zope-Version;/manage_main"><dtml-var Zope-Version html_quote></a></em>
+<em>You are currently working in version <a href="&dtml-SERVER_URL;&dtml-Zope-Version;/manage_main">&dtml-Zope-Version;</a></em>
 </div>
 </dtml-if>
 </dtml-unless>

lib/python/App/dtml/manage_top_frame.dtml

@@ -2,8 +2,7 @@
 <html>
 <head>
 <title></title>
-<link rel="stylesheet" type="text/css" href="<dtml-var 
- BASEPATH1>/manage_page_style.css">
+<link rel="stylesheet" type="text/css" href="&dtml-BASEPATH1;/manage_page_style.css">
 </head>
 <body bgcolor="#6699cc" link="#000099" alink="#000099" vlink="#000099" 
  marginwidth="0" marginheight="0">
@@ -11,14 +10,13 @@
 <table width="100%" cellpadding="0" cellspacing="0" border="0">
 <tr>
 <td width="180" align="left" valign="top"><a 
-href="http://www.zope.org/" target="_new"><img src="<dtml-var 
-BASEPATH1>/p_/zopelogo_jpg" height="32" width="90" border="0" alt="" />
+href="http://www.zope.org/" target="_new"><img src="&dtml-BASEPATH1;/p_/zopelogo_jpg"
+height="32" width="90" border="0" alt="" />
 </td>
 <td align="right" valign="top">
 <div class="form-element">
-<form action="<dtml-var BASEPATH1>/" method="POST" target="manage_main">
-<span class="std-text">Logged in as <strong><dtml-var 
- AUTHENTICATED_USER></strong></span> &nbsp;&nbsp;
+<form action="&dtml-BASEPATH1;/" method="POST" target="manage_main">
+<span class="std-text">Logged in as <strong>&dtml-AUTHENTICATED_USER;</strong></span> &nbsp;&nbsp;
 
 <select class="form-element" name=":action" onChange="window.parent.manage_main.location.href='&dtml-BASEPATH1;/'+this.options[this.selectedIndex].value">
 <option value="zope_quick_start">Zope Quick Start</option>

lib/python/App/dtml/menu.dtml

@@ -26,7 +26,7 @@ td {
   <dtml-if expr="URLPATH1==BASEPATH1">
   Root Folder
   <dtml-else>
-  <dtml-var id>
+  &dtml-id;
   </dtml-if>
   </font>
   </a>
@@ -36,11 +36,11 @@ td {
 </table>
 <dtml-tree nowrap=1>
 <dtml-if icon>
-<a href="<dtml-var tree-item-url fmt=url-quote>/manage_workspace" 
+<a href="&dtml.url_quote-tree-item-url;/manage_workspace" 
  target="manage_main"><img src="&dtml-BASEPATH1;/&dtml-icon;" border="0"
  title="Click to open this item" alt="&dtml-meta_type;" /></a> 
 </dtml-if>
-<a href="<dtml-var tree-item-url fmt=url-quote>/manage_workspace" 
+<a href="&dtml.url_quote-tree-item-url;/manage_workspace" 
  target="manage_main">&dtml-id;</a>
 </dtml-tree>
 <table cellspacing="0">
@@ -69,9 +69,8 @@ td {
 <tr>
 <td valign="top" align="center">
 <div class="form-element">
-<form action="<dtml-var BASEPATH1>/" method="POST" target="manage_main">
-<span class="std-text">Logged in as <strong><dtml-var 
- AUTHENTICATED_USER></strong></span> &nbsp;&nbsp;
+<form action="&dtml-BASEPATH1;/" method="POST" target="manage_main">
+<span class="std-text">Logged in as <strong>&dtml-AUTHENTICATED_USER;</strong></span> &nbsp;&nbsp;
 <br />
 <select class="form-element" name=":action" onChange="window.parent.manage_main.location.href='&dtml-BASEPATH1;/'+this.options[this.selectedIndex].value">
 <option value="zope_quick_start">Zope Quick Start</option>

lib/python/App/dtml/profile.dtml

@@ -14,7 +14,7 @@ see the <a href="http://www.python.org/doc/current/lib/module-profile.html">
 Python profiler documentation</a>.
 </p>
 <br />
-<form action="<dtml-var URL>" method="POST">
+<form action="&dtml-URL;" method="POST">
 <table>
 <tr>
 <td><strong>Sort</strong>: 
@@ -22,18 +22,16 @@ Python profiler documentation</a>.
     <dtml-in "('time', 'cumulative', 'calls', 'pcalls',
               'name', 'file', 'module', 'line',
               'nfl', 'stdname')">
-    <option value="<dtml-var sequence-item>"<dtml-if 
-     "sort==_['sequence-item']"> selected</dtml-if>><dtml-var 
-    sequence-item>
+    <option value="&dtml-sequence-item;"<dtml-if 
+     "sort==_['sequence-item']"> selected</dtml-if>>&dtml-sequence-item;
     </dtml-in>
     </select>
 </td>
 <td><strong>Limit</strong>: 
     <select name="limit:int">
     <dtml-in "(100, 200, 300, 400, 500)">
-    <option value="<dtml-var sequence-item>"<dtml-if 
-     "limit==_['sequence-item']"> selected</dtml-if>><dtml-var 
-    sequence-item>
+    <option value="&dtml-sequence-item;"<dtml-if 
+     "limit==_['sequence-item']"> selected</dtml-if>>&dtml-sequence-item;
     </dtml-in>
     </select>
 </td>
@@ -58,7 +56,7 @@ Python profiler documentation</a>.
 </form>
 <hr>
 <pre>
-<dtml-var stats>
+&dtml-stats;
 </pre>
 
 <dtml-else>

lib/python/App/dtml/traceback.dtml

@@ -3,6 +3,6 @@
 
 <h3>Import Traceback</h3>
 
-<pre><dtml-var import_error_></pre>
+<pre>&dtml-import_error_;</pre>
 
 <dtml-var manage_page_footer>

lib/python/App/dtml/undo.dtml

@@ -28,11 +28,8 @@ modified objects that were modified by a selected transaction.
     <td align="left" valign="top">
     <div class="list-nav">
 <dtml-if first_transaction>
-    <a href="manage_UndoForm?first_transaction:int=<dtml-var
-     expr="first_transaction*2-last_transaction"
-     >&last_transaction:int=<dtml-var first_transaction
-     >&PrincipiaUndoBatchSize:int=<dtml-var PrincipiaUndoBatchSize
-     >"
+    <a href="manage_UndoForm?first_transaction:int=<dtml-var expr="first_transaction*2-last_transaction"
+     >&last_transaction:int=&dtml-first_transaction;&PrincipiaUndoBatchSize:int=&dtml-PrincipiaUndoBatchSize;"
      onMouseOver="window.status='View later transactions'; return true"
      onMouseOut="window.status=''; return true">&lt; Later Transactions</a>
 <dtml-else>
@@ -44,11 +41,8 @@ modified objects that were modified by a selected transaction.
     <td align="right" valign="top" nowrap>
     <div class="list-nav">
 <dtml-if expr="_.len(undoable_transactions) == PrincipiaUndoBatchSize">
-    <a href="manage_UndoForm?first_transaction:int=<dtml-var 
-     last_transaction>&last_transaction:int=<dtml-var
-     expr="last_transaction+PrincipiaUndoBatchSize"
-     >&PrincipiaUndoBatchSize:int=<dtml-var PrincipiaUndoBatchSize
-     >"
+    <a href="manage_UndoForm?first_transaction:int=&dtml-last_transaction;&last_transaction:int=<dtml-var expr="last_transaction+PrincipiaUndoBatchSize"
+     >&PrincipiaUndoBatchSize:int=&dtml-PrincipiaUndoBatchSize;"
      onMouseOver="window.status='View earlier transactions'; return true"
      onMouseOut="window.status=''; return true">Earlier Transactions &gt;</a>
  <dtml-else>
@@ -72,8 +66,8 @@ modified objects that were modified by a selected transaction.
     </td>
     <td align="left" valign="top">
     <div class="list-item">
-    <dtml-var description html_quote> by <strong><dtml-if 
-     user_name><dtml-var user_name html_quote><dtml-else
+    &dtml-description; by <strong><dtml-if 
+     user_name>&dtml-user_name;<dtml-else
      ><em>Zope</em></dtml-if></strong>
     </div>
     </td>

lib/python/App/dtml/zope_quick_start.dtml

@@ -14,8 +14,7 @@
 -->
 </style>
 <dtml-else>
-<link rel="stylesheet" type="text/css" href="<dtml-var 
- BASEPATH1>/manage_page_style.css">
+<link rel="stylesheet" type="text/css" href="&dtml-BASEPATH1;/manage_page_style.css">
 </dtml-if>
 </dtml-let>
 </head>
@@ -88,7 +87,7 @@ the various kinds of components you'll find in Zope.
 
 <li>
 <p>
-Go directly to the <a href="<dtml-var BASEPATH1>/manage" target="_top">
+Go directly to the <a href="&dtml-BASEPATH1;/manage" target="_top">
 Zope Management Interface</a> if you'd like to start working with Zope 
 right away.  <strong>NOTE:  Some versions of Microsoft Internet Explorer,
 (specifically IE 5.01 and early versions of IE 5.5) may have problems

lib/python/HelpSys/dtml/APIHelpView.dtml

@@ -7,7 +7,7 @@
 <dl><dd>
 <h2 class="api">
 <dtml-in apis>
-<a href="#<dtml-var name>"><dtml-var name></a>
+<a href="#&dtml.url_quote-name;">&dtml-name;</a>
 <dtml-unless sequence-end> , </dtml-unless>
 </dtml-in>
 </h2>
@@ -19,7 +19,7 @@
 <dl><dd>
 <h2 class="api">
 <dtml-in funcs>
-<a href="#<dtml-var name>"><dtml-var name></a>
+<a href="#&dtml.url_quote-name;">&dtml-name;</a>
 <dtml-unless sequence-end> , </dtml-unless>
 </dtml-in>
 </h2>

lib/python/HelpSys/dtml/APIView.dtml

-<a name="<dtml-var name>"></a>
+<a name="&dtml-name;"></a>
 <h2 class="api">class
-  <dtml-var name><dtml-if extends>
+  &dtml-name;<dtml-if extends>
 (<dtml-in extends>
-<a href="/Control_Panel/Products/<dtml-var sequence-item>"><dtml-var
-sequence-key></a><dtml-unless sequence-end>, </dtml-unless>
+<a href="/Control_Panel/Products/&dtml-sequence-item;">&dtml-sequence-key;</a><dtml-unless sequence-end>, </dtml-unless>
 </dtml-in>)
 </dtml-if>
 </h2>

lib/python/HelpSys/dtml/attributeView.dtml

 <a name="&dtml-name;"></a>
-<h2 class="attribute"><dtml-var name> = <dtml-var value>
+<h2 class="attribute">&dtml-name; = &dtml-value;
 </h2>

lib/python/HelpSys/dtml/button.dtml

@@ -9,9 +9,9 @@
 //-->
 </SCRIPT>
 <font face="Verdana, Arial, Helvetica" size="1">
-<FORM ACTION="<dtml-var absolute_url>" METHOD="get" target="zope_help" 
- onSubmit="return openHelpWindow('<dtml-var absolute_url>?help_url=<dtml-var helpURL>');">
-<input type="hidden" name="help_url" value="<dtml-var helpURL>">
+<FORM ACTION="&dtml-absolute_url;" METHOD="get" target="zope_help" 
+ onSubmit="return openHelpWindow('&dtml-absolute_url;?help_url=&dtml.url_quote_plus-helpURL;');">
+<input type="hidden" name="help_url" value="&dtml-helpURL;">
 <input type="submit" name="submit" value=" Help ">
 </FORM>
 </font>

lib/python/HelpSys/dtml/frame.dtml

@@ -7,7 +7,7 @@
 MARGINWIDTH="2" MARGINHEIGHT="2" SCROLLING="auto">
 <FRAME
 <dtml-if "_.has_key('help_url')">
-SRC="<dtml-var help_url>"
+SRC="&dtml.url_quote-help_url;"
 <dtml-else>
 SRC="main"
 </dtml-if>

lib/python/HelpSys/dtml/helpsys_main.dtml

@@ -36,7 +36,7 @@ services provided by high-level objects such as Documents
 and Folders. Other references will be added soon.
 </p>
 <ul>
-<li> <a href="<dtml-var BASE1>/HelpSys/ObjectRef/hs_main">
+<li> <a href="&dtml-BASE1;/HelpSys/ObjectRef/hs_main">
      Object Reference
      </a>
 

lib/python/HelpSys/dtml/menu.dtml

@@ -4,9 +4,9 @@
 
 <dtml-tree sort=id>
 <dtml-if "meta_type =='Help Topic'">
-  <a href="<dtml-var absolute_url>" target="help_main"><dtml-var title_or_id></a>
+  <a href="&dtml-absolute_url;" target="help_main">&dtml-title_or_id;</a>
 <dtml-else>
-  <dtml-var title>
+  &dtml-title;
 </dtml-if>
 </dtml-tree>
 

lib/python/HelpSys/dtml/menu_header.dtml

 <html>
 <head>
-  <title><dtml-var title></title>
+  <title>&dtml-title;</title>
 </head>
 <body bgcolor="#FFFFFF">

lib/python/HelpSys/dtml/methodView.dtml

 <a name="&dtml-name;"></a>
-<h2 class="method"><dtml-var name>(<dtml-in required><dtml-var sequence-item><dtml-if sequence-end>
+<h2 class="method">&dtml-name;(<dtml-in required>&dtml-sequence-item;<dtml-if sequence-end>
 <dtml-if optional>, </dtml-if>
 <dtml-else>,
 </dtml-if>
 </dtml-in>
 <dtml-in optional>
-<dtml-var sequence-key>=<dtml-var sequence-item><dtml-unless sequence-end>, </dtml-unless>
+&dtml-sequence-key;=&dtml-sequence-item;<dtml-unless sequence-end>, </dtml-unless>
 </dtml-in>
-<dtml-if varargs>, *<dtml-var varargs></dtml-if>
-<dtml-if kwargs>, **<dtml-var kwargs></dtml-if>):
+<dtml-if varargs>, *&dtml-varargs;</dtml-if>
+<dtml-if kwargs>, **&dtml-kwargs;</dtml-if>):
 </h2>
 
 <dl><dd>

lib/python/HelpSys/dtml/objectitem.dtml

@@ -13,14 +13,14 @@ Object Reference
 
 
 
-<h3><dtml-if icon><img src="&dtml-BASEPATH1;/<dtml-var icon>" height="16" width="16" alt=""></dtml-if> <dtml-var meta_type></h3>
+<h3><dtml-if icon><img src="&dtml-BASEPATH1;/&dtml-icon;" height="16" width="16" alt=""></dtml-if> &dtml-meta_type;</h3>
 
 <code>
 <dtml-var get_docstring_html>
 </code>
 
 
-<h3><dtml-var meta_type> methods</h3>
+<h3>&dtml-meta_type; methods</h3>
 
 <dtml-call "REQUEST.set('cached_method_list', get_method_list())">
 <dtml-call "REQUEST.set('row_max', _.len(cached_method_list)/2)">
@@ -33,14 +33,14 @@ Object Reference
 <td align="left" valign="top">
 <code>
 <dtml-in "cached_method_list[:row_max]">
-<a href="#<dtml-var get_name>"><dtml-var get_name></a><br>
+<a href="#&dtml.url_quote-get_name;">&dtml-get_name;</a><br>
 </dtml-in>
 </code>
 </td>
 <td align="left" valign="top">
 <code>
 <dtml-in "cached_method_list[row_max:]">
-<a href="#<dtml-var get_name>"><dtml-var get_name></a><br>
+<a href="#&dtml.url_quote-get_name;">&dtml-get_name;</a><br>
 </dtml-in>
 </code>
 </td>
@@ -51,13 +51,13 @@ Object Reference
 <dl>
 <dtml-in cached_method_list>
 <dt><code>
-    <a name="<dtml-var get_name>">
-    <strong><dtml-var get_signature></strong>
+    <a name="&dtml-get_name;">
+    <strong>&dtml-get_signature;</strong>
     </code>
 </dt>
 <dd><code>
 <dtml-if permission>
-    <strong>Permission:</strong> <dtml-var permission><br><br>
+    <strong>Permission:</strong> &dtml-permission;<br><br>
 </dtml-if>
 
 <dtml-if get_docstring_html>

lib/python/HelpSys/dtml/results.dtml

@@ -3,7 +3,7 @@
 <dtml-call "REQUEST.set('management_view', 'Search')">
 <dtml-var manage_tabs>
 
-<p>Help topics matching <b><dtml-var SearchableText></b>:</p>
+<p>Help topics matching <b>&dtml-SearchableText;</b>:</p>
 <p>
 <dtml-in "searchResults(REQUEST)">
 <a href="&dtml-BASEPATH1;&dtml-url;" target="help_main">&dtml-title_or_id;</a><br>

lib/python/HelpSys/dtml/topic_header.dtml

 <html>
 <head>
-<title><dtml-var title></title>
+<title>&dtml-title;</title>
 
 <style type="text/css">
 

lib/python/OFS/dtml/brokenEdit.dtml

@@ -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 @@ and will be accessible again if the product is reinstalled.
 </p>
 
 <!-- 
-  <dtml-var info> 
+  &dtml-info;
 -->
 
 <dtml-var manage_page_footer>

lib/python/OFS/dtml/documentEdit.dtml

@@ -19,7 +19,7 @@ the <em>browse</em> button to select a local file to upload.
   </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 @@ the <em>browse</em> button to select a local file to upload.
   <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>

lib/python/OFS/dtml/documentProxy.dtml

@@ -27,7 +27,7 @@ the list below.
   <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>

lib/python/OFS/dtml/editedDialog.dtml

@@ -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>

lib/python/OFS/dtml/fileEdit.dtml

@@ -10,7 +10,7 @@ file. You may also edit the file content directly if the content is a
 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 @@ text type and small enough to be edited in a text area.
   </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 @@ text type and small enough to be edited in a text area.
   </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 @@ text type and small enough to be edited in a text area.
   </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 @@ text type and small enough to be edited in a text area.
   <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>

lib/python/OFS/dtml/findAdv.dtml

@@ -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>

lib/python/OFS/dtml/findForm.dtml

@@ -26,7 +26,7 @@ find option.
   </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>

lib/python/OFS/dtml/findFrame.dtml

@@ -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>

lib/python/OFS/dtml/findResult.dtml

@@ -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 @@ your search terms below.
 <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 @@ your search terms below.
   <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 @@ your search terms below.
   <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 @@ your search terms below.
   <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 @@ your search terms below.
   </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 @@ your search terms below.
   </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>

lib/python/OFS/dtml/history.dtml

@@ -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>

lib/python/OFS/dtml/historyCompare.dtml

@@ -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 @@ Changes to <dtml-var id> as of
 <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">

lib/python/OFS/dtml/imageAdd.dtml

@@ -11,7 +11,7 @@ Select a file to upload from your local computer by clicking the
 <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>

lib/python/OFS/dtml/imageEdit.dtml

@@ -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 @@ kind>.
   </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 @@ kind>.
   </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 @@ kind>.
 </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>

lib/python/OFS/dtml/imageView.dtml

@@ -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>

lib/python/OFS/dtml/importExport.dtml

@@ -21,8 +21,7 @@ on the server.
   </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>

lib/python/OFS/dtml/properties.dtml

@@ -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 @@ property values, edit the values and click &quot;Save Changes&quot;.
 <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 @@ property values, edit the values and click &quot;Save Changes&quot;.
 
     <dtml-if "hasProperty(select_variable)">
     <div class="form-element">
-    <select name="<dtml-var id>:utf8:list:string" multiple
+    <select name="&dtml-id;:utf8:list:string" 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:string" multiple
+    <select name="&dtml-id;:utf8:list:string" 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 @@ and value and click the &quot;Add&quot; button.
 
 <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 

lib/python/OFS/dtml/propertyType.dtml

@@ -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 @@ select the new types and click &quot;Edit with new Types&quot;
       </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 @@ select the new types and click &quot;Edit with new Types&quot;
       <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>

lib/python/OFS/dtml/propertysheets.dtml

 <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"

lib/python/OFS/dtml/renameForm.dtml

@@ -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.

lib/python/Products/ExternalMethod/dtml/methodEdit.dtml

@@ -10,7 +10,7 @@
     </div>
     </td>
     <td align="left" valign="top">
-     <dtml-var name="id" html_quote>
+     &dtml-id;
     </td>
   </tr>
   <tr>
@@ -21,7 +21,7 @@
     </td>
     <td align="left" valign="top">
     <input type="text" name="title" size="40"
-     value="<dtml-var title html_quote>" />
+     value="&dtml-title;" />
     </td>
   </tr>
   <tr>
@@ -32,7 +32,7 @@
     </td>
     <td align="left" valign="top">
     <input type="text" name="module" size="40"
-     value="<dtml-var module html_quote>" />
+     value="&dtml-module;" />
     </td>
   </tr>
   <tr>
@@ -43,7 +43,7 @@
     </td>
     <td align="left" valign="top">
     <input type="text" name="function" size="40"
-     value="<dtml-var function html_quote>" />
+     value="&dtml-function;" />
     </td>
   </tr>
   <tr>

lib/python/Products/MailHost/dtml/manageMailHost.dtml

@@ -11,7 +11,7 @@
     </td>
     <td align="left" valign="top">
     <div class="form-text">
-    <dtml-var id>
+    &dtml-id;
     </div>
     </td>
   </tr>
@@ -23,7 +23,7 @@
     </td>
     <td align="left" valign="top">
     <input type="text" name="title" size="40" 
-     value="<dtml-var title html_quote>"/>
+     value="&dtml-title;"/>
     </td>
   </tr>
   <tr>
@@ -34,7 +34,7 @@
     </td>
     <td align="left" valign="top">
     <input type="text" name="smtp_host" size="40"
-     value="<dtml-var smtp_host html_quote>"/>
+     value="&dtml-smtp_host;"/>
     </td>
   </tr>
   <tr>
@@ -45,7 +45,7 @@
     </td>
     <td align="left" valign="top">
     <input type="text" name="smtp_port:int" size="4"
-     value="<dtml-var smtp_port html_quote>"/>
+     value="&dtml-smtp_port;"/>
     </td>
   </tr>
   <tr>

lib/python/Products/OFSP/dtml/draftAdd.dtml

@@ -33,11 +33,11 @@ the original object.
     <select name="baseid" size="7">
   <dtml-in objectValues sort=title_or_id>
     <dtml-unless "meta_type in ('Version', 'Principia Draft', 'User Folder')">
-      <option value="<dtml-var id html_quote>">
+      <option value="&dtml-id;">
       <dtml-if title>
-	<dtml-var title size="25"> (<dtml-var id>)
+	<dtml-var title size="25" html_quote> (&dtml-id;)
       <dtml-else>
-	<dtml-var id>
+	&dtml-id;
       </dtml-if>
       </option>
     </dtml-unless>

lib/python/Products/OFSP/dtml/draftApprove.dtml

@@ -6,7 +6,7 @@
 <h3>Approve</h3>
 
 <p class="form-text">
-You can make work done in <dtml-var id> (<dtml-var title>) permanent by 
+You can make work done in &dtml-id; (&dtml-title;) permanent by 
 entering a remark in the space below and then clicking on the <em>approve</em> 
 button.
 <br />
@@ -19,7 +19,7 @@ button.
 <h3>Discard</h3>
   
 <p class="form-text">
-You can throw away work done in <dtml-var id> (<dtml-var title>) by 
+You can throw away work done in &dtml-id; (&dtml-title;) by 
 clicking on the <em>discard</em> button.
 <br />
 <input type=submit value="Discard">

lib/python/Products/OFSP/dtml/version.dtml

@@ -8,15 +8,15 @@
 
   <p class="form-text">
   You cannot start working in this version while another version, 
-  <strong><dtml-var Zope-Version></strong> is active. 
-  Leave <strong><dtml-var Zope-Version></strong> first and then 
+  <strong>&dtml-Zope-Version;</strong> is active. 
+  Leave <strong>&dtml-Zope-Version;</strong> first and then 
   you may work in this version.
   </p>
 
   <div class="form-element">
   <form action="leave_another" method="post">
   <input class="form-element" type="submit" name="submit" 
-   value="Quit working in <dtml-var Zope-Version html_quote>">
+   value="Quit working in &dtml-Zope-Version;">
   </form>
   </div>
 
@@ -25,13 +25,13 @@
 
   <p class="form-text">
   You <strong>are</strong> currently working in the
-  <dtml-var Zope-Version> version. 
+  &dtml-Zope-Version; version. 
   </p>
 
   <div class="form-element">
   <form action="leave" method="post">
   <input class="form-element" type="submit" name="submit" 
-   value="Quit working in <dtml-var Zope-Version html_quote>">
+   value="Quit working in &dtml-Zope-Version;">
   </form>
   </div>
   </dtml-if>
@@ -41,14 +41,14 @@
 
   <p class="form-text">
   You <strong>are not</strong> currently working in the
-  <dtml-var title_and_id>
+  &dtml-title_and_id;
   version.
   </p>
 
   <div class="form-element">
   <form action="enter" method="POST">      
   <input class="form-element" type="submit" name="submit" 
-   value="Start working in <dtml-var title_or_id html_quote>">
+   value="Start working in &dtml-title_or_id;">
     </form>
   </div>
 

lib/python/Products/OFSP/dtml/versionEdit.dtml

@@ -11,7 +11,7 @@
     </td>
     <td align="left" valign="top">
     <div class="form-text">
-    <dtml-var id>
+    &dtml-id;
     </div>
     </td>
   </tr>
@@ -23,7 +23,7 @@
     </td>
     <td align="left" valign="top">
     <input type="text" name="title" size="40" 
-     value="<dtml-var title html_quote>" />
+     value="&dtml-title;" />
     </td>
   </tr>
   <tr>

lib/python/Products/OFSP/dtml/versionEnd.dtml

@@ -4,11 +4,11 @@
 <dtml-if nonempty>
 <p class="form-help">
 To save work done in version 
-<dtml-var id><dtml-if Zope-Version><dtml-if "_vars['Zope-Version'] != cookie">
+&dtml-id;<dtml-if Zope-Version><dtml-if "_vars['Zope-Version'] != cookie">
  <strong>to version 
-<em><dtml-var Zope-Version></em></strong></dtml-if></dtml-if>,
+<em>&dtml-Zope-Version;</em></strong></dtml-if></dtml-if>,
 click on the &quot;Save&quot; button. To discard work done in
-version <dtml-var id>, click on the &quot;Discard&quot; button.
+version &dtml-id;, click on the &quot;Discard&quot; button.
 In either case, enter a comment to document the reason for 
 saving or discarding the version.
 </p>

lib/python/Products/PluginIndexes/TextIndex/dtml/addTextIndex.dtml

@@ -45,7 +45,7 @@ from the most relevant to the lest relevant.
         <select name="extra.vocabulary:record">  
           <dtml-in expr="superValues('Vocabulary')">
             <option value="&dtml-id;">
-              &dtml-id; <dtml-var title fmt="(%s)" null>
+              &dtml-id; <dtml-var title fmt="(%s)" null html_quote>
             </option>
           </dtml-in>
         </select>

lib/python/Products/PluginIndexes/TextIndex/dtml/manageTextIndex.dtml

@@ -15,11 +15,11 @@
       <dtml-in "superValues('Vocabulary')">
         <dtml-if "getId()==vocabulary_id">
           <option value="&dtml-id;" selected>
-            &dtml-id; <dtml-var title fmt="(%s)" null>
+            &dtml-id; <dtml-var title fmt="(%s)" null html_quote>
           </option> 
         <dtml-else>
           <option value="&dtml-id;">
-            &dtml-id; <dtml-var title fmt="(%s)" null>
+            &dtml-id; <dtml-var title fmt="(%s)" null html_quote>
           </option> 
         </dtml-if>
       </dtml-in>

lib/python/Products/PluginIndexes/TextIndex/dtml/manage_vocab.dtml

@@ -15,7 +15,7 @@
     </dtml-try>
 
     <dtml-if useSplitter>
-     , Splitter is <em><dtml-var useSplitter></em>   
+     , Splitter is <em>&dtml-useSplitter;</em>   
     </dtml-if>
 
     <dtml-try>
@@ -34,21 +34,20 @@
 <dtml-if words>
 
 <p class="form-text">
-<dtml-var id> contains <em><dtml-var 
- words fmt=collection-length thousands_commas></em>
+&dtml-id; contains <em><dtml-var words fmt=collection-length thousands_commas></em>
  word(s).
 </p>
 
 <dtml-in words previous size=20 start=query_start >
   <span class="list-nav">
-  <a href="<dtml-var URL>?query_start=<dtml-var previous-sequence-start-number>">
+  <a href="&dtml-URL;?query_start=<dtml-var previous-sequence-start-number>">
     [Previous <dtml-var previous-sequence-size> entries]
   </a>
   </span>
 </dtml-in>
 <dtml-in words next size=20 start=query_start >
   <span class="list-nav">
-  <a href="<dtml-var URL>?query_start=<dtml-var next-sequence-start-number>">
+  <a href="&dtml-URL;?query_start=<dtml-var next-sequence-start-number>">
     [Next <dtml-var next-sequence-size> entries]
   </a>
   </span>
@@ -71,7 +70,7 @@
       <dtml-if "_.same_type(_['sequence-key'], 'x')">
         &dtml-sequence-key;
       <dtml-else>
-        <dtml-var "_['sequence-key'].encode('utf-8')"> 
+        <dtml-var "_['sequence-key'].encode('utf-8')" html_quote>
       </dtml-if>
       </div>
     </td>
@@ -84,7 +83,7 @@
 
 <dtml-in words previous size=20 start=query_start >
   <div class="list-nav">
-  <a href="<dtml-var URL>?query_start=<dtml-var previous-sequence-start-number>">
+  <a href="&dtml-URL;?query_start=<dtml-var previous-sequence-start-number>">
     [Previous <dtml-var previous-sequence-size> entries]
   </a>
   </div>
@@ -92,7 +91,7 @@
 
 <dtml-in words next size=20 start=query_start >
   <div class="list-nav">
-  <a href="<dtml-var URL>?query_start=<dtml-var next-sequence-start-number>">
+  <a href="&dtml-URL;?query_start=<dtml-var next-sequence-start-number>">
     [Next <dtml-var next-sequence-size> entries]
   </a>
   </div>

lib/python/Products/PluginIndexes/TopicIndex/dtml/editFilteredSet.dtml

@@ -5,7 +5,7 @@
 <dtml-with "filteredSets[filteredSet]">
 
 <form action="manage_saveFilteredSet" method="post" enctype="multipart/form-data">
-<input type="hidden" name="filterId" value="<dtml-var getId url_quote>" >
+<input type="hidden" name="filterId" value="&dtml-getId;" >
 
 <table cellspacing="0" cellpadding="2" border="1" width="90%" align="center">
 
@@ -17,19 +17,19 @@
   <tr>
     <th>FilteredSet Id</th>
     <td> 
-      <dtml-var getId>
+      &dtml-getId;
     </td>
   </tr>
 
   <tr>
     <th>FilteredSet Type</th>
-    <td><dtml-var getType></td>
+    <td>&dtml-getType;</td>
   </tr>
 
   <tr>
     <th>FilteredSet Expression</th>
     <td>
-     <textarea name="expr" cols="60" rows="5"><dtml-var getExpression></textarea>
+     <textarea name="expr" cols="60" rows="5">&dtml-getExpression;</textarea>
     </td>
   </tr>
 

lib/python/Products/PluginIndexes/TopicIndex/dtml/manageTopicIndex.dtml

@@ -27,24 +27,24 @@
       <tr>
 
         <td align="center"> 
-        <input type="checkbox" name="filterIds:list" value="<dtml-var "fs.getId()">"> 
+        <input type="checkbox" name="filterIds:list" value="<dtml-var "fs.getId()" html_quote>">
         </td>
 
         <td align="center" valign="top">
         <div class="form-label">
-         <a href="editFilteredSet?filteredSet=&dtml-id;"><dtml-var getId> </a>
+         <a href="editFilteredSet?filteredSet=&dtml-id;">&dtml-getId; </a>
         </div>
         </td>
 
         <td align="center" valign="top">
         <div class="form-label">
-         <dtml-var getType> 
+         &dtml-getType;
         </div>
         </td>
 
         <td align="left" valign="top">
         <div class="form-label">
-         <dtml-var getExpression> 
+         &dtml-getExpression;
         </div>
         </td>
 

lib/python/Products/PythonScripts/www/pyScriptProxy.dtml

@@ -24,7 +24,7 @@ this object from the list below.
   <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>

lib/python/Products/Sessions/dtml/manageIdManager.dtml

@@ -89,7 +89,7 @@
   </TD>
   <TD ALIGN="LEFT" VALIGN="TOP">
     <INPUT TYPE="TEXT" NAME="cookiepath" SIZE="20"
-     value="<dtml-var getCookiePath html_quote>">
+     value="&dtml-getCookiePath;">
   </TD>
 </TR>
 <TR>
@@ -105,7 +105,7 @@
   </TD>
   <TD ALIGN="LEFT" VALIGN="TOP">
     <INPUT TYPE="TEXT" NAME="cookiedomain" SIZE="20"
-     value="<dtml-var getCookieDomain html_quote>">
+     value="&dtml-getCookieDomain;">
   </TD>
 </TR>
 <TR>
@@ -120,7 +120,7 @@
   </TD>
   <TD ALIGN="LEFT" VALIGN="TOP">
     <INPUT TYPE="TEXT" NAME="cookielifedays:int" SIZE="20"
-     value="<dtml-var getCookieLifeDays html_quote>">
+     value="&dtml-getCookieLifeDays;">
   </TD>
 </TR>
 <TR>

lib/python/Products/SiteAccess/www/manage_edit.dtml

@@ -29,9 +29,8 @@ probably need to manage Zope using its raw IP address to fix things.
   or a set of hosts (<strong>*.host/path</strong>).
   <div style="width: 100%;">
   <textarea name="map_text: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-in 
+   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-in 
    lines>&dtml-sequence-item;
 </dtml-in></textarea>
   </div>

lib/python/Products/Transience/dtml/manageTransientObjectContainer.dtml

@@ -19,7 +19,7 @@ Transient data will persist, but only for a user-specified period of time
 <dtml-let l=getLen>
 <dtml-if l>
   <dtml-if "l == 1">1 item is in this transient object container.
-  <dtml-else><dtml-var l> items are in this transient object container.
+  <dtml-else>&dtml-l; items are in this transient object container.
   </dtml-if>
 <dtml-else>
   There are no items in this transient object container.

lib/python/Products/ZCTextIndex/dtml/addLexicon.dtml

@@ -53,7 +53,7 @@
             </select>
           <dtml-else>
             <input type="checkbox" name="elements.name:records" 
-                   value="<dtml-var expr="elements[0]">" checked />
+                   value="<dtml-var expr="elements[0]" html_quote>" checked />
           </dtml-if>
         </td>
       </tr>

lib/python/Products/ZCTextIndex/dtml/addZCTextIndex.dtml

@@ -65,7 +65,7 @@ from the most relevant to the least relevant.
         <select name="extra.lexicon_id:record">
       </dtml-if>
       <option value="&dtml-id;">
-        &dtml-id; <dtml-var name="title" fmt="(%s)" null>
+        &dtml-id; <dtml-var name="title" fmt="(%s)" null html_quote>
       </option>
       <dtml-if sequence-end>
         </select>

lib/python/Products/ZCTextIndex/dtml/manageZCTextIndex.dtml

@@ -3,17 +3,17 @@
 
 <p class="form-help">
   Name of attribute indexed: 
-  <em><dtml-var getFieldName></em>
+  <em>&dtml-getFieldName;</em>
 </p>
 <p class="form-help">
   Index type: 
-  <em><dtml-var getIndexType></em>
+  <em>&dtml-getIndexType;</em>
 </p>
 <p class="form-help">
   ZCTextIndex Lexicon used: 
   <dtml-if getLexiconURL>
-    <a href="<dtml-var getLexiconURL>/manage_main"
-    ><dtml-var getLexiconURL></a>
+    <a href="&dtml.url_quote-getLexiconURL;/manage_main"
+    >&dtml-getLexiconURL;</a>
   <dtml-else>
     <em>(Lexicon Not Found)</em>
   </dtml-if>

lib/python/Products/ZCatalog/dtml/addIndexForm.dtml

@@ -11,7 +11,7 @@ help for adding indexes....
 </p>
 
 <form action="manage_addIndex" method="post">
-<input type=hidden name="type" value="<dtml-var index_type>">
+<input type=hidden name="type" value="&dtml-index_type;">
 
 <table cellspacing="0" cellpadding="2" border="0">
   <tr>

lib/python/Products/ZCatalog/dtml/catalogAddRowForm.dtml

 <dtml-var manage_page_header>
 <dtml-var manage_tabs>
 
-<form action="<dtml-var URL1>">
+<form action="&dtml-URL1;">
 
 
 

lib/python/Products/ZCatalog/dtml/catalogAdvanced.dtml

@@ -18,7 +18,7 @@
   </p>
   </td>
   <td align="right" valign="top">
-<form action="<dtml-var URL1>">
+<form action="&dtml-URL1;">
 <input class="form-element" type="submit" 
  name="manage_catalogReindex:method" value=" Update Catalog ">
 </form>
@@ -30,7 +30,7 @@
   </p>
   </td>
   <td align="right" valign="top">
-<form action="<dtml-var URL1>">
+<form action="&dtml-URL1;">
 <input class="form-element" type="submit" 
  name="manage_catalogClear:method" value=" Clear Catalog ">
 </form>
@@ -80,7 +80,7 @@
       </dtml-if></p>
   </td>
   <td align="right" valign="top">
-    <form action="<dtml-var URL1>" method="POST">
+    <form action="&dtml-URL1;" method="POST">
     <div class="form-element">
       <dtml-if threshold>
 	<input class="form-element" type="submit" 
@@ -109,8 +109,7 @@
   <td align="right" valign="top">
     <form action="manage_edit" method=POST>
      <div class="form-element">
-      <input name="threshold:int" value="<dtml-var
-      threshold html_quote>" />
+      <input name="threshold:int" value="&dtml-threshold;" />
       <input type="submit" name="submit" value="Set Threshold">
       </div>
     </form>

lib/python/Products/ZCatalog/dtml/catalogFind.dtml

@@ -19,7 +19,7 @@ are found will be automatically added to the catalog.
   <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>
@@ -85,7 +85,7 @@ are found will be automatically added to the catalog.
   <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>
@@ -101,7 +101,7 @@ are found will be automatically added to the catalog.
   <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>

lib/python/Products/ZCatalog/dtml/catalogIndexes.dtml

@@ -142,11 +142,11 @@ function toggleSelect() {
     <td>
     <div class="list-item">
       <dtml-if "_.string.find(_.str(_.getattr(this(),'__implements__','old')),'PluggableIndexInterface')>-1">
-        <dtml-var meta_type>
+        &dtml-meta_type;
       <dtml-else>
          <dtml-call "REQUEST.set('oldidx',1)">
          (pre-2.4 index)
-         <dtml-var meta_type>
+         &dtml-meta_type;
       </dtml-if>
     </div>
     </td>

lib/python/Products/ZCatalog/dtml/catalogObjectInformation.dtml

@@ -10,7 +10,7 @@
 <tr class="location-bar">
   <td colspan="2" align="left">
   <div class="std-text">
-  <strong>Catalog record at <dtml-var expr="getpath(_.int(rid))"></strong>
+  <strong>Catalog record at <dtml-var expr="getpath(_.int(rid))" html_quote></strong>
   </div>
   </td>
 </tr>

lib/python/Products/ZCatalog/dtml/catalogSchema.dtml

@@ -22,18 +22,17 @@ the text contents, which is configured in the <b>Indexes</b> View
 tab).  This way, the summary data may be shown in the search results.
 </p>
 
-<form action="<dtml-var URL1>">
+<form action="&dtml-URL1;">
 
 <table cellspacing="0" cellpadding="2" border="0">
 <dtml-in schema sort=sequence-item>
   <tr>
     <td align="left" valign="top">
-    <input type="checkbox" name="names:list" value="<dtml-var 
-     sequence-item html_quote>" />
+    <input type="checkbox" name="names:list" value="&dtml-sequence-item;" />
     </td>
     <td align="left" valign="top">
     <div class="form-text">
-    <dtml-var sequence-item>
+    &dtml-sequence-item;
     </div>
     </td>
   </tr>

lib/python/Products/ZCatalog/dtml/catalogStatus.dtml

@@ -26,7 +26,7 @@
 	<font color="red"><b>Disabled</b></font>
       </dtml-if></h3>
 
-    <form action="<dtml-var URL1>" method="POST">
+    <form action="&dtml-URL1;" method="POST">
     <div class="form-element">
       <dtml-if threshold>
 	<input class="form-element" type="submit" 
@@ -49,8 +49,7 @@
       memory.  If this number is higher, the Catalog will index
       quickly but consume much more memory.</p>
 
-      Subtransaction threshold: <input name="threshold:int" value="<dtml-var
-      threshold html_quote>" />
+      Subtransaction threshold: <input name="threshold:int" value="&dtml-threshold;" />
       <br>
       <div class="form-element">
       <input type="submit" name="submit" value="Save Changes">
@@ -65,7 +64,7 @@
       <dtml-in index_objects sort=id>
       <li>
 	<dtml-var "_.len(_['sequence-item'])"> 
-	object are indexed in <b><dtml-var "_['sequence-item'].id"></b>
+	object are indexed in <b><dtml-var "_['sequence-item'].id" html_quote></b>
       </li>
       </dtml-in>
     </ul>

lib/python/Products/ZCatalog/dtml/catalogView.dtml

@@ -28,20 +28,19 @@ function toggleSelect() {
 //-->
 </script>
 
-<form action="<dtml-var name="URL1">" name="objectItems">
+<form action="&dtml-URL1;" name="objectItems">
 
 <p class="form-text">
-<dtml-var id> contains <dtml-var 
- searchResults fmt=collection-length thousands_commas> record(s).
+&dtml-id; contains <dtml-var searchResults fmt=collection-length thousands_commas> record(s).
 </p>
   <div class="form-text">
   <dtml-in searchResults previous size=20 start=query_start >
-    <a href="<dtml-var URL>?query_start=<dtml-var previous-sequence-start-number>">
+    <a href="&dtml-URL;?query_start=<dtml-var previous-sequence-start-number>">
       [Previous <dtml-var previous-sequence-size> entries]
     </a>
   </dtml-in>
   <dtml-in searchResults next size=20 start=query_start >
-    <a href="<dtml-var URL>?query_start=<dtml-var next-sequence-start-number>">
+    <a href="&dtml-URL;?query_start=<dtml-var next-sequence-start-number>">
       [Next <dtml-var next-sequence-size> entries]
     </a>
   </dtml-in>
@@ -72,7 +71,7 @@ function toggleSelect() {
     <td align="left" valign="top">
     <div class="form-text">
       <dtml-if expr="has_key('meta_type') and meta_type">
-        <dtml-var name="meta_type" size="15">
+        <dtml-var name="meta_type" size="15" html_quote>
       <dtml-else>
         <i>Unknown</i>
       </dtml-if>

lib/python/Products/ZCatalog/dtml/editCatalogerForm.dtml

@@ -12,7 +12,7 @@ unindex itself to.
 <span class="form-label">
 Use Catalog: 
 </span>
-<input name="default" value="<dtml-var default_catalog html_quote>">
+<input name="default" value="&dtml-default_catalog;">
 <br>
 <div class="form-element">
 <input class="form-element" type="submit" value="Save Changes">

lib/python/Products/ZCatalog/dtml/manage_vocab.dtml

@@ -4,21 +4,20 @@
 <dtml-if words>
 
 <p class="form-text">
-<dtml-var id> contains <em><dtml-var 
- words fmt=collection-length thousands_commas></em>
+&dtml-id; contains <em><dtml-var words fmt=collection-length thousands_commas></em>
  word(s).
 </p>
 
 <dtml-in words previous size=20 start=query_start >
   <span class="list-nav">
-  <a href="<dtml-var URL>?query_start=<dtml-var previous-sequence-start-number>">
+  <a href="&dtml-URL;?query_start=<dtml-var previous-sequence-start-number>">
     [Previous <dtml-var previous-sequence-size> entries]
   </a>
   </span>
 </dtml-in>
 <dtml-in words next size=20 start=query_start >
   <span class="list-nav">
-  <a href="<dtml-var URL>?query_start=<dtml-var next-sequence-start-number>">
+  <a href="&dtml-URL;?query_start=<dtml-var next-sequence-start-number>">
     [Next <dtml-var next-sequence-size> entries]
   </a>
   </span>
@@ -48,7 +47,7 @@
 
 <dtml-in words previous size=20 start=query_start >
   <div class="list-nav">
-  <a href="<dtml-var URL>?query_start=<dtml-var previous-sequence-start-number>">
+  <a href="&dtml-URL;?query_start=<dtml-var previous-sequence-start-number>">
     [Previous <dtml-var previous-sequence-size> entries]
   </a>
   </div>
@@ -56,7 +55,7 @@
 
 <dtml-in words next size=20 start=query_start >
   <div class="list-nav">
-  <a href="<dtml-var URL>?query_start=<dtml-var next-sequence-start-number>">
+  <a href="&dtml-URL;?query_start=<dtml-var next-sequence-start-number>">
     [Next <dtml-var next-sequence-size> entries]
   </a>
   </div>

lib/python/Products/ZCatalog/dtml/vocab_manage_main.dtml

 <dtml-var manage_page_header>
 <dtml-var manage_tabs>
 
-<h2>Edit <dtml-var id></h2>
+<h2>Edit &dtml-id;</h2>
 
 <!--
 

lib/python/Products/ZGadflyDA/dtml/connectionAdd.dtml

@@ -6,7 +6,7 @@
 
 <dtml-if data_sources>
     
-<form action="manage_addZ<dtml-var database_type>Connection" method="post">
+<form action="manage_addZ&dtml-database_type;Connection" method="post">
 <table cellspacing="0" cellpadding="2" border="0">
   <tr>
     <td align="left" valign="top">
@@ -46,9 +46,7 @@
     <div class="form-element">
     <select name="connection" size="5">
     <dtml-in data_sources>
-    <option value="<dtml-var sequence-key html_quote>"><dtml-var 
-     sequence-key><dtml-if sequence-item>, <dtml-var 
-     sequence-item></dtml-if></option>
+    <option value="&dtml-sequence-key;">&dtml-sequence-key;<dtml-if sequence-item>, &dtml-sequence-item;</dtml-if></option>
     </dtml-in>
     </select>
     </div>
@@ -80,8 +78,8 @@
 <dtml-else>
 
 <p class="form-help">
-Sorry, you cannot create any Zope <dtml-var database_type> Database 
-Connections because no <dtml-var database_type> databases exist, or 
+Sorry, you cannot create any Zope &dtml-database_type; Database 
+Connections because no &dtml-database_type; databases exist, or 
 all of the existing databases are in use. 
 </p>
 </dtml-if>

lib/python/Products/ZGadflyDA/dtml/connectionEdit.dtml

@@ -11,7 +11,7 @@
     </td>
     <td align="left" valign="top">
     <div class="form-text">
-    <dtml-var id>
+    &dtml-id;
     </div>
     </td>
   </tr>
@@ -23,7 +23,7 @@
     </td>
     <td align="left" valign="top">
     <input type="text" name="title" size="40" 
-     value="<dtml-var title html_quote>" />
+     value="&dtml-title;" />
     </td>
   </tr>
   <tr>
@@ -43,10 +43,8 @@
     <div class="form-element">
     <select name="connection_string" size="5">
     <dtml-in data_sources>
-    <option value="<dtml-var sequence-key html_quote>"<dtml-if 
-     "_['sequence-key']==connection_string"> selected</dtml-if>><dtml-var 
-     sequence-key><dtml-if sequence-item>, <dtml-var 
-     sequence-item></dtml-if></option>
+    <option value="&dtml-sequence-key;"<dtml-if 
+     "_['sequence-key']==connection_string"> selected</dtml-if>>&dtml-sequence-key;<dtml-if sequence-item>, &dtml-sequence-item;</dtml-if></option>
     </dtml-in>
     </select>
     </div>

lib/python/Products/ZGadflyDA/dtml/table_info.dtml

 <dtml-var standard_html_header>
 
-<dtml-var TABLE_TYPE><dtml-if TABLE_OWNER>
-owned by <dtml-var TABLE_OWNER></dtml-if>
-<dtml-if REMARKS><br><dtml-var REMARKS></dtml-if>
+&dtml-TABLE_TYPE;<dtml-if TABLE_OWNER>
+owned by &dtml-TABLE_OWNER;</dtml-if>
+<dtml-if REMARKS><br>&dtml-REMARKS;</dtml-if>
 
 <dtml-var standard_html_footer>

lib/python/Products/ZGadflyDA/dtml/table_menu.dtml

 <dtml-var standard_html_header>
-<a href="tableNamed/<dtml-var Name>/manage_designInput">Design Input *</a>
-<a href="tableNamed/<dtml-var Name>/manage_designUpdate">Design Update *</a>
-<a href="tableNamed/<dtml-var Name>/manage_designDelete">Design Delete</a>
+<a href="tableNamed/&dtml.url_quote-Name;/manage_designInput">Design Input *</a>
+<a href="tableNamed/&dtml.url_quote-Name;/manage_designUpdate">Design Update *</a>
+<a href="tableNamed/&dtml.url_quote-Name;/manage_designDelete">Design Delete</a>
 <dtml-var standard_html_footer>

lib/python/Products/ZGadflyDA/dtml/tables.dtml

 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html lang="en">
-  <head><title><dtml-var title_or_id> tables</title></head>
+  <head><title>&dtml-title_or_id; tables</title></head>
   <body bgcolor="#FFFFFF" link="#000099" vlink="#555555" alink="#77003B">
     <dtml-var manage_tabs>
     
-    <h2><dtml-var title_or_id> tables</h2>
+    <h2>&dtml-title_or_id; tables</h2>
     
     <form action="manage_wizard" method="POST">
       <table cellspacing="2">
@@ -14,8 +14,8 @@
 	  <td align="LEFT" valign="TOP">
              <select name="tables:list" size=9 multiple>
                <dtml-in table_info>
-                 <option value="<dtml-var sequence-key html_quote>">
-                   <dtml-var sequence-key> <dtml-var sequence-item>
+                 <option value="&dtml-sequence-key;">
+                   &dtml-sequence-key; &dtml-sequence-item;
                  </option>
                </dtml-in>
              </select>

lib/python/Products/ZSQLMethods/dtml/add.dtml

@@ -53,7 +53,7 @@ statement which the SQL Method will execute.
     <select name="connection_id">
               <dtml-in SQLConnectionIDs>
                 <option value="&dtml-sequence-item;">
-                <dtml-var sequence-key></option>
+                &dtml-sequence-key;</option>
               </dtml-in>
     </select>
     </div>

lib/python/Products/ZSQLMethods/dtml/edit.dtml

@@ -23,7 +23,7 @@
   </td>
   <td align="left" valign="top">
   <input type="text" name="title" size="40" value="<dtml-if 
-   title><dtml-var title></dtml-if>">
+   title>&dtml-title;</dtml-if>">
   </td>
 </tr>
   <tr>
@@ -39,7 +39,7 @@
                 <option value="&dtml-sequence-item;"<dtml-if 
                  expr="connection_id==_vars['sequence-item']">
                  selected</dtml-if>>
-                <dtml-var sequence-key></option>
+                &dtml-sequence-key;</option>
               </dtml-in>
     </select>
     </div>
@@ -60,8 +60,7 @@
   <div style="width: 100%;">
   <textarea name="template:text" wrap="off" style="width: 100%;"
    cols=<dtml-var sql_pref__cols html_quote missing="60">
-   rows=<dtml-var sql_pref__rows html_quote missing="20">><dtml-var
-   src fmt="html-quote"></textarea>
+   rows=<dtml-var sql_pref__rows html_quote missing="20">>&dtml-src;</textarea>
   </div>
     </td>
   </tr>

lib/python/Products/ZopeTutorial/dtml/glossaryView.dtml

@@ -27,12 +27,12 @@ PRE {
 }
 </style>
 
-<h2><dtml-var title></h2>
+<h2>&dtml-title;</h2>
 
 <dtml-var expr="formatted_content(REQUEST)">
 
 <p class="feedback">Comments on this lesson?
-<a href="mailto:zdp@zope.org?subject=<dtml-var title>">Email feedback</a>.
+<a href="mailto:zdp@zope.org?subject=&dtml.url_quote_plus-title;">Email feedback</a>.
 </p>
 
 <dtml-var standard_html_footer>