[vhffs-dev] [1067] All templates tags are now in uppercase.

[ Thread Index | Date Index | More vhffs.org/vhffs-dev Archives ]

To: vhffs-dev@xxxxxxxxx
Subject: [vhffs-dev] [1067] All templates tags are now in uppercase.
From: subversion@xxxxxxxxxxxxx
Date: Wed, 07 Nov 2007 07:56:30 +0100

Revision: 1067
Author:   beuss
Date:     2007-11-07 06:56:29 +0000 (Wed, 07 Nov 2007)

Log Message:
-----------
All templates tags are now in uppercase.
Fixed additional potential XSS.

Modified Paths:
--------------
    trunk/vhffs-panel/templates/acl/view.tmpl
    trunk/vhffs-panel/templates/admin/index.tmpl
    trunk/vhffs-panel/templates/admin/main/general-modo.tmpl
    trunk/vhffs-panel/templates/admin/main/general.tmpl
    trunk/vhffs-panel/templates/admin/main/main.tmpl
    trunk/vhffs-panel/templates/admin/misc/moderation_applied.tmpl
    trunk/vhffs-panel/templates/cvs/create.tmpl
    trunk/vhffs-panel/templates/cvs/prefs.tmpl
    trunk/vhffs-panel/templates/dns/create.tmpl
    trunk/vhffs-panel/templates/dns/list_a_sub.tmpl
    trunk/vhffs-panel/templates/dns/list_aaaa_sub.tmpl
    trunk/vhffs-panel/templates/dns/list_cname_sub.tmpl
    trunk/vhffs-panel/templates/dns/list_mx_sub.tmpl
    trunk/vhffs-panel/templates/dns/list_ns_sub.tmpl
    trunk/vhffs-panel/templates/dns/list_srv_sub.tmpl
    trunk/vhffs-panel/templates/dns/list_txt_sub.tmpl
    trunk/vhffs-panel/templates/dns/prefs.tmpl
    trunk/vhffs-panel/templates/git/create.tmpl
    trunk/vhffs-panel/templates/git/prefs.tmpl
    trunk/vhffs-panel/templates/git/user_part.tmpl
    trunk/vhffs-panel/templates/group/add_user.tmpl
    trunk/vhffs-panel/templates/group/create.tmpl
    trunk/vhffs-panel/templates/group/history.tmpl
    trunk/vhffs-panel/templates/group/history_part.tmpl
    trunk/vhffs-panel/templates/group/index.tmpl
    trunk/vhffs-panel/templates/group/info.tmpl
    trunk/vhffs-panel/templates/group/list_user.tmpl
    trunk/vhffs-panel/templates/group/prefs.tmpl
    trunk/vhffs-panel/templates/group/prefs_avatar.tmpl
    trunk/vhffs-panel/templates/mail/create.tmpl
    trunk/vhffs-panel/templates/mail/prefs.tmpl
    trunk/vhffs-panel/templates/mail/prefs_boxes.tmpl
    trunk/vhffs-panel/templates/mail/prefs_forwards.tmpl
    trunk/vhffs-panel/templates/mailinglist/create.tmpl
    trunk/vhffs-panel/templates/mailinglist/list_part.tmpl
    trunk/vhffs-panel/templates/mailinglist/prefs.tmpl
    trunk/vhffs-panel/templates/main/auth.tmpl
    trunk/vhffs-panel/templates/main/close.tmpl
    trunk/vhffs-panel/templates/main/lost.tmpl
    trunk/vhffs-panel/templates/main/lost_failed.tmpl
    trunk/vhffs-panel/templates/main/lost_ok.tmpl
    trunk/vhffs-panel/templates/main/main.tmpl
    trunk/vhffs-panel/templates/main/panel.tmpl
    trunk/vhffs-panel/templates/menu/context-modo.tmpl
    trunk/vhffs-panel/templates/menu/context.tmpl
    trunk/vhffs-panel/templates/menu/main.tmpl
    trunk/vhffs-panel/templates/menu/user.tmpl
    trunk/vhffs-panel/templates/misc/errors.tmpl
    trunk/vhffs-panel/templates/misc/group_service.tmpl
    trunk/vhffs-panel/templates/misc/history.tmpl
    trunk/vhffs-panel/templates/misc/history_part.tmpl
    trunk/vhffs-panel/templates/misc/infos.tmpl
    trunk/vhffs-panel/templates/misc/resubmit.tmpl
    trunk/vhffs-panel/templates/misc/service_index.tmpl
    trunk/vhffs-panel/templates/misc/simplemsg.tmpl
    trunk/vhffs-panel/templates/misc/welcome.tmpl
    trunk/vhffs-panel/templates/mysql/create.tmpl
    trunk/vhffs-panel/templates/mysql/prefs.tmpl
    trunk/vhffs-panel/templates/pgsql/create.tmpl
    trunk/vhffs-panel/templates/pgsql/prefs.tmpl
    trunk/vhffs-panel/templates/repository/create.tmpl
    trunk/vhffs-panel/templates/repository/prefs.tmpl
    trunk/vhffs-panel/templates/svn/create.tmpl
    trunk/vhffs-panel/templates/svn/prefs.tmpl
    trunk/vhffs-panel/templates/svn/user_part.tmpl
    trunk/vhffs-panel/templates/user/create.tmpl
    trunk/vhffs-panel/templates/user/create_complete.tmpl
    trunk/vhffs-panel/templates/user/mailuser.tmpl
    trunk/vhffs-panel/templates/user/mailuserspam.tmpl
    trunk/vhffs-panel/templates/user/mailuservirus.tmpl
    trunk/vhffs-panel/templates/user/prefs.tmpl
    trunk/vhffs-panel/templates/user/prefs_avatar.tmpl
    trunk/vhffs-panel/templates/web/create.tmpl
    trunk/vhffs-panel/templates/web/mailuser.tmpl
    trunk/vhffs-panel/templates/web/prefs.tmpl
    trunk/vhffs-public/templates/allwebsites.tmpl
    trunk/vhffs-public/templates/banner.tmpl
    trunk/vhffs-public/templates/lastgroups.tmpl
    trunk/vhffs-public/templates/lastusers.tmpl
    trunk/vhffs-public/templates/misc/cvs-part.tmpl
    trunk/vhffs-public/templates/misc/lastgroups-part.tmpl
    trunk/vhffs-public/templates/misc/lastusers-part.tmpl
    trunk/vhffs-public/templates/misc/svn-part.tmpl
    trunk/vhffs-public/templates/misc/web-part.tmpl
    trunk/vhffs-public/templates/simplemsg.tmpl
    trunk/vhffs-public/templates/user.tmpl
    trunk/vhffs-robots/misc/cvs_viewvc.conf.tmpl
    trunk/vhffs-robots/misc/mhonarc.indexmain.tmpl
    trunk/vhffs-robots/misc/mhonarc.indexpart.tmpl
    trunk/vhffs-robots/misc/svn_viewvc.conf.tmpl

Modified: trunk/vhffs-panel/templates/acl/view.tmpl
===================================================================
--- trunk/vhffs-panel/templates/acl/view.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/acl/view.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,27 +1,27 @@
 <div class="acltable">
 <div class="tableheader">
   <p>
-    <span><tmpl_var name="TEXT_USER"></span>
-    <span><b><tmpl_var name="TEXT_ACL_UNDEF"></b></span>
-    <span><tmpl_var name="TEXT_ACL_DENIED"></span>
-    <span><tmpl_var name="TEXT_ACL_VIEW"></span>
-    <span><tmpl_var name="TEXT_ACL_MODIFY"></span>
-    <span><tmpl_var name="TEXT_ACL_MANAGEACL"></span>
-    <span><tmpl_var name="TEXT_ACL_DELETE"></span>
-    <span><tmpl_var name="TEXT_MODIFY"></span>
+    <span><TMPL_VAR ESCAPE=1 NAME="TEXT_USER"></span>
+    <span><b><TMPL_VAR ESCAPE=1 NAME="TEXT_ACL_UNDEF"></b></span>
+    <span><TMPL_VAR ESCAPE=1 NAME="TEXT_ACL_DENIED"></span>
+    <span><TMPL_VAR ESCAPE=1 NAME="TEXT_ACL_VIEW"></span>
+    <span><TMPL_VAR ESCAPE=1 NAME="TEXT_ACL_MODIFY"></span>
+    <span><TMPL_VAR ESCAPE=1 NAME="TEXT_ACL_MANAGEACL"></span>
+    <span><TMPL_VAR ESCAPE=1 NAME="TEXT_ACL_DELETE"></span>
+    <span><TMPL_VAR ESCAPE=1 NAME="TEXT_MODIFY"></span>
   </p>
 </div>
 <div class="tablebody">
-<tmpl_loop name="ACL_DEFAULT">
+<TMPL_LOOP NAME="ACL_DEFAULT">
   <form method="post" action="view.pl" accept-charset="utf-8">
     <p>
       <span><b><TMPL_VAR ESCAPE=1 NAME="TEXT_DEFAULT"></b></span>
       <span> </span>
-      <span><input type="radio" name="perm<TMPL_VAR ESCAPE=1 NAME="GRANTED_OID">" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_ACL_DENIED">" <tmpl_if expr="perm==VALUE_ACL_DENIED">checked="checked"</tmpl_if>/></span>
-      <span><input type="radio" name="perm<TMPL_VAR ESCAPE=1 NAME="GRANTED_OID">" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_ACL_VIEW">" <tmpl_if expr="perm==VALUE_ACL_VIEW">checked="checked"</tmpl_if>/></span>
-      <span><input type="radio" name="perm<TMPL_VAR ESCAPE=1 NAME="GRANTED_OID">" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_ACL_MODIFY">" <tmpl_if expr="perm==VALUE_ACL_MODIFY">checked="checked"</tmpl_if>/></span>
-      <span><input type="radio" name="perm<TMPL_VAR ESCAPE=1 NAME="GRANTED_OID">" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_ACL_MANAGEACL">" <tmpl_if expr="perm==VALUE_ACL_MANAGEACL">checked="checked"</tmpl_if>/></span>
-      <span><input type="radio" name="perm<TMPL_VAR ESCAPE=1 NAME="GRANTED_OID">" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_ACL_DELETE">" <tmpl_if expr="perm==VALUE_ACL_DELETE">checked="checked"</tmpl_if>/></span>
+      <span><input type="radio" name="perm<TMPL_VAR ESCAPE=1 NAME="GRANTED_OID">" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_ACL_DENIED">" <TMPL_IF EXPR="perm==VALUE_ACL_DENIED">checked="checked"</TMPL_IF>/></span>
+      <span><input type="radio" name="perm<TMPL_VAR ESCAPE=1 NAME="GRANTED_OID">" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_ACL_VIEW">" <TMPL_IF EXPR="perm==VALUE_ACL_VIEW">checked="checked"</TMPL_IF>/></span>
+      <span><input type="radio" name="perm<TMPL_VAR ESCAPE=1 NAME="GRANTED_OID">" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_ACL_MODIFY">" <TMPL_IF EXPR="perm==VALUE_ACL_MODIFY">checked="checked"</TMPL_IF>/></span>
+      <span><input type="radio" name="perm<TMPL_VAR ESCAPE=1 NAME="GRANTED_OID">" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_ACL_MANAGEACL">" <TMPL_IF EXPR="perm==VALUE_ACL_MANAGEACL">checked="checked"</TMPL_IF>/></span>
+      <span><input type="radio" name="perm<TMPL_VAR ESCAPE=1 NAME="GRANTED_OID">" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_ACL_DELETE">" <TMPL_IF EXPR="perm==VALUE_ACL_DELETE">checked="checked"</TMPL_IF>/></span>
       <span>
         <input type="hidden" NAME="granted_oid" VALUE="<TMPL_VAR ESCAPE=1 NAME="GRANTED_OID">" />
         <input type="hidden" NAME="target_oid" VALUE="<TMPL_VAR ESCAPE=1 NAME="TARGET_OID">" />
@@ -29,17 +29,17 @@
       </span>
     </p>
   </form>
-</tmpl_loop>
-<tmpl_loop name="ACL_USERS">
+</TMPL_LOOP>
+<TMPL_LOOP NAME="ACL_USERS">
   <form method="post" action="view.pl" accept-charset="utf-8">
     <p>
       <span><TMPL_VAR ESCAPE=1 NAME="NAME"></span>
-      <span><input type="radio" name="perm<TMPL_VAR ESCAPE=1 NAME="GRANTED_OID">" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_ACL_UNDEF">" <tmpl_if expr="perm==VALUE_ACL_UNDEF">checked="checked"</tmpl_if>/></span>
-      <span><input type="radio" name="perm<TMPL_VAR ESCAPE=1 NAME="GRANTED_OID">" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_ACL_DENIED">" <tmpl_if expr="perm==VALUE_ACL_DENIED">checked="checked"</tmpl_if>/></span>
-      <span><input type="radio" name="perm<TMPL_VAR ESCAPE=1 NAME="GRANTED_OID">" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_ACL_VIEW">" <tmpl_if expr="perm==VALUE_ACL_VIEW">checked="checked"</tmpl_if>/></span>
-      <span><input type="radio" name="perm<TMPL_VAR ESCAPE=1 NAME="GRANTED_OID">" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_ACL_MODIFY">" <tmpl_if expr="perm==VALUE_ACL_MODIFY">checked="checked"</tmpl_if>/></span>
-      <span><input type="radio" name="perm<TMPL_VAR ESCAPE=1 NAME="GRANTED_OID">" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_ACL_MANAGEACL">" <tmpl_if expr="perm==VALUE_ACL_MANAGEACL">checked="checked"</tmpl_if>/></span>
-      <span><input type="radio" name="perm<TMPL_VAR ESCAPE=1 NAME="GRANTED_OID">" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_ACL_DELETE">" <tmpl_if expr="perm==VALUE_ACL_DELETE">checked="checked"</tmpl_if>/></span>
+      <span><input type="radio" name="perm<TMPL_VAR ESCAPE=1 NAME="GRANTED_OID">" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_ACL_UNDEF">" <TMPL_IF EXPR="perm==VALUE_ACL_UNDEF">checked="checked"</TMPL_IF>/></span>
+      <span><input type="radio" name="perm<TMPL_VAR ESCAPE=1 NAME="GRANTED_OID">" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_ACL_DENIED">" <TMPL_IF EXPR="perm==VALUE_ACL_DENIED">checked="checked"</TMPL_IF>/></span>
+      <span><input type="radio" name="perm<TMPL_VAR ESCAPE=1 NAME="GRANTED_OID">" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_ACL_VIEW">" <TMPL_IF EXPR="perm==VALUE_ACL_VIEW">checked="checked"</TMPL_IF>/></span>
+      <span><input type="radio" name="perm<TMPL_VAR ESCAPE=1 NAME="GRANTED_OID">" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_ACL_MODIFY">" <TMPL_IF EXPR="perm==VALUE_ACL_MODIFY">checked="checked"</TMPL_IF>/></span>
+      <span><input type="radio" name="perm<TMPL_VAR ESCAPE=1 NAME="GRANTED_OID">" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_ACL_MANAGEACL">" <TMPL_IF EXPR="perm==VALUE_ACL_MANAGEACL">checked="checked"</TMPL_IF>/></span>
+      <span><input type="radio" name="perm<TMPL_VAR ESCAPE=1 NAME="GRANTED_OID">" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_ACL_DELETE">" <TMPL_IF EXPR="perm==VALUE_ACL_DELETE">checked="checked"</TMPL_IF>/></span>
       <span>
         <input type="hidden" NAME="granted_oid" VALUE="<TMPL_VAR ESCAPE=1 NAME="GRANTED_OID">" />
         <input type="hidden" NAME="target_oid" VALUE="<TMPL_VAR ESCAPE=1 NAME="TARGET_OID">" />
@@ -47,7 +47,7 @@
       </span>
     </p>
   </form>
-</tmpl_loop>
+</TMPL_LOOP>
 <span class="clear">&nbsp;</span>
 </div>
 </div>

Modified: trunk/vhffs-panel/templates/admin/index.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/index.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/admin/index.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,10 +1,10 @@
-<tmpl_loop name="CATEGORIES">
+<TMPL_LOOP NAME="CATEGORIES">
     <fieldset>
-        <legend><tmpl_var name="CATNAME"></legend>
-        <ul class="<tmpl_var name="CATTYPE">List">
-        <tmpl_loop name="ITEMS">
-            <li><a href="<tmpl_var name="LINK">"><tmpl_var name="LABEL"></a></li>
-        </tmpl_loop>
+        <legend><TMPL_VAR ESCAPE=1 NAME="CATNAME"></legend>
+        <ul class="<TMPL_VAR ESCAPE=1 NAME="CATTYPE">List">
+        <TMPL_LOOP NAME="ITEMS">
+            <li><a href="<TMPL_VAR ESCAPE=1 NAME="LINK">"><TMPL_VAR ESCAPE=1 NAME="LABEL"></a></li>
+        </TMPL_LOOP>
         </ul>
     </fieldset>
-</tmpl_loop>
+</TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/admin/main/general-modo.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/main/general-modo.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/admin/main/general-modo.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,15 +1,15 @@
 			<li id="adminHome">
-                		<tmpl_var name="TEXT_ADMIN_GENERAL">
+                		<TMPL_VAR ESCAPE=1 NAME="TEXT_ADMIN_GENERAL">
 				<ul id="adminHomeMenu">
 					<li id="adminHomeStats">
                					 <a href="/admin/stats.pl">
-          				              <tmpl_var name="TEXT_STATS">
+          				              <TMPL_VAR ESCAPE=1 NAME="TEXT_STATS">
       					          </a>
 					</li>
 
 					<li id="adminHomeModeration">
 				                <a href="/admin/moderation.pl">
-                				        <tmpl_var name="TEXT_MODERATION">
+                				        <TMPL_VAR ESCAPE=1 NAME="TEXT_MODERATION">
                					 </a>
 					</li>
 				</ul>

Modified: trunk/vhffs-panel/templates/admin/main/general.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/main/general.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/admin/main/general.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,39 +1,39 @@
 			<li id="adminHome">
-                <a href="#"><tmpl_var name="TEXT_ADMIN_GENERAL"></a>
+                <a href="#"><TMPL_VAR ESCAPE=1 NAME="TEXT_ADMIN_GENERAL"></a>
 				<ul id="adminHomeMenu">
 					<li id="adminHomeStats">
                					 <a href="/admin/stats.pl">
-          				              <tmpl_var name="TEXT_STATS">
+          				              <TMPL_VAR ESCAPE=1 NAME="TEXT_STATS">
       					          </a>
 					</li>
 					<li id="adminHomeSubstituteUser">
                					 <a href="/admin/su.pl">
-          				              <tmpl_var name="TEXT_VHFFSSU">
+          				              <TMPL_VAR ESCAPE=1 NAME="TEXT_VHFFSSU">
       					          </a>
 					</li>
 					<li id="adminHomeModeration">
 				                <a href="/admin/moderation.pl">
-                				        <tmpl_var name="TEXT_MODERATION">
+                				        <TMPL_VAR ESCAPE=1 NAME="TEXT_MODERATION">
                					 </a>
 					</li>
 					<li id="adminHomeObjectList">
 				                <a href="/admin/object/list.pl">
-                				        <tmpl_var name="TEXT_OBJECT_LIST">
+                				        <TMPL_VAR ESCAPE=1 NAME="TEXT_OBJECT_LIST">
                					 </a>
 					</li>
 					<li id="adminHomeObjectSearch">
 				                <a href="/admin/object/search.pl">
-                				        <tmpl_var name="TEXT_OBJECT_SEARCH">
+                				        <TMPL_VAR ESCAPE=1 NAME="TEXT_OBJECT_SEARCH">
                					 </a>
 					</li>
 					<li id="adminHomeMailing">
 				                <a href="/admin/broadcast.pl">
-                				        <tmpl_var name="TEXT_MAILING">
+                				        <TMPL_VAR ESCAPE=1 NAME="TEXT_MAILING">
 						</a>
 					</li>
 					<li id="adminHomeMailingHandling">
 				                <a href="/admin/broadcast_list.pl">
-                				        <tmpl_var name="TEXT_AMAILING">
+                				        <TMPL_VAR ESCAPE=1 NAME="TEXT_AMAILING">
 						</a>
 					</li>
 				</ul>

Modified: trunk/vhffs-panel/templates/admin/main/main.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/main/main.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/admin/main/main.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,16 +1,16 @@
-<a href="#" id="adminMenuTitle"><tmpl_var name="MENU_TITLE"></a>
+<a href="#" id="adminMenuTitle"><TMPL_VAR ESCAPE=1 NAME="MENU_TITLE"></a>
 <ul id="adminMenu">
-	<tmpl_var name="ADMIN_GENERAL">
-	<tmpl_var name="ADMIN_USERS">
-	<tmpl_var name="ADMIN_GROUPS">
-	<tmpl_var name="ADMIN_WEB">
-	<tmpl_var name="ADMIN_MYSQL">
-	<tmpl_var name="ADMIN_POSTGRESQL">
-	<tmpl_var name="ADMIN_CVS">
-	<tmpl_var name="ADMIN_SVN">
-	<tmpl_var name="ADMIN_DNS">
-	<tmpl_var name="ADMIN_MAIL">
-	<tmpl_var name="ADMIN_MAILLINGLIST">
-	<tmpl_var name="ADMIN_REPOSITORY">
+	<TMPL_VAR ESCAPE=1 NAME="ADMIN_GENERAL">
+	<TMPL_VAR ESCAPE=1 NAME="ADMIN_USERS">
+	<TMPL_VAR ESCAPE=1 NAME="ADMIN_GROUPS">
+	<TMPL_VAR ESCAPE=1 NAME="ADMIN_WEB">
+	<TMPL_VAR ESCAPE=1 NAME="ADMIN_MYSQL">
+	<TMPL_VAR ESCAPE=1 NAME="ADMIN_POSTGRESQL">
+	<TMPL_VAR ESCAPE=1 NAME="ADMIN_CVS">
+	<TMPL_VAR ESCAPE=1 NAME="ADMIN_SVN">
+	<TMPL_VAR ESCAPE=1 NAME="ADMIN_DNS">
+	<TMPL_VAR ESCAPE=1 NAME="ADMIN_MAIL">
+	<TMPL_VAR ESCAPE=1 NAME="ADMIN_MAILLINGLIST">
+	<TMPL_VAR ESCAPE=1 NAME="ADMIN_REPOSITORY">
 </ul>
 

Modified: trunk/vhffs-panel/templates/admin/misc/moderation_applied.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/misc/moderation_applied.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/admin/misc/moderation_applied.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,2 +1,2 @@
-		<h1><tmpl_var name="MESSAGE"></h1>
+		<h1><TMPL_VAR ESCAPE=1 NAME="MESSAGE"></h1>
 

Modified: trunk/vhffs-panel/templates/cvs/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/cvs/create.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/cvs/create.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -9,13 +9,13 @@
 		<label for="REPOSITORY_NAME">		
 			<TMPL_VAR ESCAPE=1 NAME="REPOSITORY_NAME">: 
 		</label>	
-		<TMPL_VAR ESCAPE=1 NAME="GROUP">/<input type="text" name="REPOSITORY_NAME" id="REPOSITORY_NAME" value="<tmpl_var name="REPOSITORY_VALUE">"/>
+		<TMPL_VAR ESCAPE=1 NAME="GROUP">/<input type="text" name="REPOSITORY_NAME" id="REPOSITORY_NAME" value="<TMPL_VAR ESCAPE=1 NAME="REPOSITORY_VALUE">"/>
 	</p>
 	<p>
 		<label for="PROJECT_USAGE">		
 			<TMPL_VAR ESCAPE=1 NAME="DESCRIPTION">:
 		</label>	
-		<textarea name="DESCRIPTION" cols="45" rows="15"><tmpl_var name="DESCRIPTION_VALUE"></textarea>
+		<textarea name="DESCRIPTION" cols="45" rows="15"><TMPL_VAR ESCAPE=1 NAME="DESCRIPTION_VALUE"></textarea>
 	</p>
 	<p class="button" id="buttonSend">
 		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" id="cvs_submit" name="cvs_submit" />

Modified: trunk/vhffs-panel/templates/cvs/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/cvs/prefs.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/cvs/prefs.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,75 +1,75 @@
-<h2><tmpl_var name="TEXT_REPONAME"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_REPONAME"></h2>
 
 <form method="post" action="/cvs/prefs.pl" accept-charset="utf-8">
 	<p>
 		<label>
-			<tmpl_var name="TEXT_PUBLIC">
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_PUBLIC">
 		</label>
 		<select name="public" size="2" multiple="multiple">
-		<option value="1" <tmpl_if name="PUBLIC">selected="selected"</tmpl_if>><tmpl_var name="PUBLIC_YES">
-		<option value="0" <tmpl_unless name="PUBLIC">selected="selected"</tmpl_unless>><tmpl_var name="PUBLIC_NO">
+		<option value="1" <TMPL_IF NAME="PUBLIC">selected="selected"</TMPL_IF>><TMPL_VAR ESCAPE=1 NAME="PUBLIC_YES">
+		<option value="0" <tmpl_unless name="PUBLIC">selected="selected"</tmpl_unless>><TMPL_VAR ESCAPE=1 NAME="PUBLIC_NO">
 		</select>
 	</p>
 	
 
 	<p class="button" id="buttonSend">
-		<input type="hidden" name="name" value="<tmpl_var name="TEXT_REPONAME">" />
-		<input type="submit" value="<tmpl_var name="TEXT_SEND">" name="cvs_public_submit"/>
+		<input type="hidden" name="name" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_REPONAME">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_SEND">" name="cvs_public_submit"/>
 	</p>
 </form>
 
 
-<h2><tmpl_var name="PERM_TITLE"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="PERM_TITLE"></h2>
 <form method="post" action="/cvs/prefs.pl" accept-charset="utf-8">
 	<p>
-		<tmpl_var name="PERM_TEXT">
+		<TMPL_VAR ESCAPE=1 NAME="PERM_TEXT">
     </p>
     <p class="button">
-        <input type="submit" value="<tmpl_var name="PERM_BUTTON">" name="cvs_fixperms_submit"/>
-		<input type="hidden" name="name" value="<tmpl_var name="TEXT_REPONAME">" />
+        <input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="PERM_BUTTON">" name="cvs_fixperms_submit"/>
+		<input type="hidden" name="name" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_REPONAME">" />
 	</p>
 </form>
 
 
-<h2><tmpl_var name="TEXT_ACL_ADMIN"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_ACL_ADMIN"></h2>
 
 <form method="post" action="../acl/view.pl" accept-charset="utf-8">
-<p><tmpl_var name="EXPLAIN_ADMIN_ACL"></p>
+<p><TMPL_VAR ESCAPE=1 NAME="EXPLAIN_ADMIN_ACL"></p>
 
 	<p class="button" id="buttonSendAcl">
-        <input type="hidden" name="target_oid" value="<tmpl_var name="VALUE_OID">"/>
-        <input type="submit" value="<tmpl_var name="ADMIN_ACL">" />
+        <input type="hidden" name="target_oid" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_OID">"/>
+        <input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="ADMIN_ACL">" />
 	</p>
 </form>
 
 
-<h2><tmpl_var name="TEXT_DELETE_CVS"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_DELETE_CVS"></h2>
 
 <form method="post" action="delete.pl" accept-charset="utf-8">
 	<fieldset class="delete">
-		<legend><tmpl_var name="ASK_DELETE_CVS">:</legend>
+		<legend><TMPL_VAR ESCAPE=1 NAME="ASK_DELETE_CVS">:</legend>
 		
-		<p class="warning"><tmpl_var name="TEXT_BEFORE_DELETE"></p>
+		<p class="warning"><TMPL_VAR ESCAPE=1 NAME="TEXT_BEFORE_DELETE"></p>
 
 		<p>
 			<input type="radio" name="DELETE" id="DELETE_NO" value="0" checked="checked" />
 			<label for="DELETE_NO">
-				<tmpl_var name="NO">
+				<TMPL_VAR ESCAPE=1 NAME="NO">
 			</label>
 		</p>
 		<p>
 			<input type="radio" name="DELETE" id="DELETE_YES" value="1" />	
 			<label for="DELETE_YES">
-				<tmpl_var name="YES">
+				<TMPL_VAR ESCAPE=1 NAME="YES">
 			</label>
 		</p>
 	</fieldset>
 		
 		
 	<p class="button" id="buttonSend">
-		<input type="hidden" name="REPO_NAME" value="<tmpl_var name="TEXT_REPONAME">" />
-		<input type="submit" value="<tmpl_var name="TEXT_DELETE">" />
+		<input type="hidden" name="REPO_NAME" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_REPONAME">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_DELETE">" />
 	</p>
 </form>
 
-<tmpl_var escape=0 name="ADMIN_PART">
+<TMPL_VAR ESCAPE=0 NAME="ADMIN_PART">

Modified: trunk/vhffs-panel/templates/dns/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/dns/create.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/dns/create.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -18,13 +18,13 @@
 		<label for="DOMAIN_NAME">		
 			<TMPL_VAR ESCAPE=1 NAME="DOMAIN_NAME">: 
 		</label>
-		<input type="text" name="DOMAIN_NAME" id="DOMAIN_NAME" value="<tmpl_var name="DOMAIN_NAME_VALUE">"/>
+		<input type="text" name="DOMAIN_NAME" id="DOMAIN_NAME" value="<TMPL_VAR ESCAPE=1 NAME="DOMAIN_NAME_VALUE">"/>
 	</p>
 	<p>
 		<label for="PROJECT_USAGE">		
 			<TMPL_VAR ESCAPE=1 NAME="DESCRIPTION">:
 		</label>
-		<textarea name="DESCRIPTION" id="DESCRIPTION" cols="45" rows="7"><tmpl_var name="DESCRIPTION_VALUE"></textarea>
+		<textarea name="DESCRIPTION" id="DESCRIPTION" cols="45" rows="7"><TMPL_VAR ESCAPE=1 NAME="DESCRIPTION_VALUE"></textarea>
 	</p>
 	<p class="button">
 		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" name="dns_submit" />

Modified: trunk/vhffs-panel/templates/dns/list_a_sub.tmpl
===================================================================
--- trunk/vhffs-panel/templates/dns/list_a_sub.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/dns/list_a_sub.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,16 +1,16 @@
-<p class="help"><tmpl_var name="LIST_HELP"></p>
-<tmpl_loop name="A_RR">
+<p class="help"><TMPL_VAR ESCAPE=1 NAME="LIST_HELP"></p>
+<TMPL_LOOP NAME="A_RR">
 <form method="post" action="prefs.pl" accept-charset="utf-8">
     <p>
-    <label for="data_<tmpl_var name="id">">
+    <label for="data_<TMPL_VAR ESCAPE=1 NAME="id">">
     <TMPL_VAR ESCAPE=1 NAME="NAME">-&gt;
     </label>
-        <input type="text" name="data" id="data_<tmpl_var name="id">" value="<TMPL_VAR ESCAPE=1 NAME="data">" />
+        <input type="text" name="data" id="data_<TMPL_VAR ESCAPE=1 NAME="id">" value="<TMPL_VAR ESCAPE=1 NAME="data">" />
         <input type="hidden" name="domain" value="<TMPL_VAR ESCAPE=1 NAME="DOMAIN">" />
-        <input type="hidden" name="rr_id" value="<tmpl_var name="id">" />
+        <input type="hidden" name="rr_id" value="<TMPL_VAR ESCAPE=1 NAME="id">" />
         <input type="hidden" name="action" value="manage_a"/>
         <input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="MODIFY">" class="autowidth" name="modify_a_submit" />
         <input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="DEL">" name="delete_a_submit" class="autowidth"/>
     </p>
 </form>
-</tmpl_loop>
+</TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/dns/list_aaaa_sub.tmpl
===================================================================
--- trunk/vhffs-panel/templates/dns/list_aaaa_sub.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/dns/list_aaaa_sub.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,16 +1,16 @@
-<p class="help"><tmpl_var name="LIST_HELP"></p>
-<tmpl_loop name="AAAA_RR">
+<p class="help"><TMPL_VAR ESCAPE=1 NAME="LIST_HELP"></p>
+<TMPL_LOOP NAME="AAAA_RR">
 <form method="post" action="prefs.pl" accept-charset="utf-8">
     <p>
-    <label for="data_<tmpl_var name="id">">
+    <label for="data_<TMPL_VAR ESCAPE=1 NAME="id">">
     <TMPL_VAR ESCAPE=1 NAME="name">-&gt;
     </label>
-        <input type="text" name="data" id="data_<tmpl_var name="id">" value="<TMPL_VAR ESCAPE=1 NAME="data">" />
+        <input type="text" name="data" id="data_<TMPL_VAR ESCAPE=1 NAME="id">" value="<TMPL_VAR ESCAPE=1 NAME="data">" />
         <input type="hidden" name="domain" value="<TMPL_VAR ESCAPE=1 NAME="DOMAIN">" />
-        <input type="hidden" name="rr_id" value="<tmpl_var name="id">" />
+        <input type="hidden" name="rr_id" value="<TMPL_VAR ESCAPE=1 NAME="id">" />
         <input type="hidden" name="action" value="manage_aaaa"/>
         <input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="MODIFY">" class="autowidth" name="modify_aaaa_submit" />
         <input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="DEL">" name="delete_aaaa_submit" class="autowidth"/>
     </p>
 </form>
-</tmpl_loop>
+</TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/dns/list_cname_sub.tmpl
===================================================================
--- trunk/vhffs-panel/templates/dns/list_cname_sub.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/dns/list_cname_sub.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,15 +1,15 @@
-<tmpl_loop CNAME_RR>
+<TMPL_LOOP NAME="CNAME_RR">
 <form method="post" action="prefs.pl" accept-charset="utf-8">
 	<p>
-		<label for="data_<tmpl_var name="id">">
+		<label for="data_<TMPL_VAR ESCAPE=1 NAME="id">">
 			<TMPL_VAR ESCAPE=1 NAME="name">-&gt;
 		</label>
-		<input type="text" name="data" id="data_<tmpl_var name="id">"value="<TMPL_VAR ESCAPE=1 NAME="data">" />
+		<input type="text" name="data" id="data_<TMPL_VAR ESCAPE=1 NAME="id">"value="<TMPL_VAR ESCAPE=1 NAME="data">" />
         <input type="hidden" name="action" value="manage_cname" />
-        <input type="hidden" name="rr_id" value="<tmpl_var name="id">"/>
+        <input type="hidden" name="rr_id" value="<TMPL_VAR ESCAPE=1 NAME="id">"/>
 		<input type="hidden" name="domain" value="<TMPL_VAR ESCAPE=1 NAME="DOMAIN">" />
 		<input type="submit" name="modify_cname_submit" value="<TMPL_VAR ESCAPE=1 NAME="MODIFY">" class="autowidth" />
 		<input type="submit" name="delete_cname_submit" value="<TMPL_VAR ESCAPE=1 NAME="DEL">" class="autowidth" />
 	</p>
 </form>
-</tmpl_loop>
+</TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/dns/list_mx_sub.tmpl
===================================================================
--- trunk/vhffs-panel/templates/dns/list_mx_sub.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/dns/list_mx_sub.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,14 +1,14 @@
-<tmpl_loop name="MX_RR">
+<TMPL_LOOP NAME="MX_RR">
 <form method="post" action="prefs.pl" accept-charset="utf-8">
-<p><label for="data_<tmpl_var name="id">">
+<p><label for="data_<TMPL_VAR ESCAPE=1 NAME="id">">
     <TMPL_VAR ESCAPE=1 NAME="TEXT_PRIORITY"><TMPL_VAR ESCAPE=1 NAME="aux">
 </label>
-    <input type="text" name="data"  id="data_<tmpl_var name="id">" value="<TMPL_VAR ESCAPE=1 NAME="data">" />
+    <input type="text" name="data"  id="data_<TMPL_VAR ESCAPE=1 NAME="id">" value="<TMPL_VAR ESCAPE=1 NAME="data">" />
     <input type="hidden" name="domain" value="<TMPL_VAR ESCAPE=1 NAME="DOMAIN">" />
-    <input type="hidden" name="rr_id" value="<tmpl_var name="id">" />
+    <input type="hidden" name="rr_id" value="<TMPL_VAR ESCAPE=1 NAME="id">" />
     <input type="hidden" name="action" value="manage_mx" />
     <input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="MODIFY">" name="modify_mx_submit" class="autowidth"/>
     <input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="DEL">" name="delete_mx_submit" class="autowidth"/>
 </p>
 </form>
-</tmpl_loop>
+</TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/dns/list_ns_sub.tmpl
===================================================================
--- trunk/vhffs-panel/templates/dns/list_ns_sub.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/dns/list_ns_sub.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,4 +1,4 @@
-<tmpl_loop name="NS_RR">
+<TMPL_LOOP NAME="NS_RR">
 <form method="post" action="prefs.pl" accept-charset="utf-8">
 <p>
     <label><TMPL_VAR ESCAPE=1 NAME="data"></label>
@@ -8,4 +8,4 @@
     <input type="submit" name="delete_ns_submit" value="<TMPL_VAR ESCAPE=1 NAME="DEL">" class="autowidth"/>
 </p>
 </form>
-</tmpl_loop>
+</TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/dns/list_srv_sub.tmpl
===================================================================
--- trunk/vhffs-panel/templates/dns/list_srv_sub.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/dns/list_srv_sub.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,18 +1,18 @@
-<tmpl_loop name="SRV_RR">
+<TMPL_LOOP NAME="SRV_RR">
 <form method="post" action="prefs.pl" accept-charset="utf-8">
     <p>
     <label>
     <TMPL_VAR ESCAPE=1 NAME="NAME">-&gt;
     </label>
-    <input type="text" name="host" id="host_<tmpl_var name="id">" value="<tmpl_var name="host">" title="<tmpl_var name="HOST_TXT">"/>
-    <input type="text" name="port" id="port_<tmpl_var name="id">" value="<tmpl_var name="port">" maxlength="5" size="5" style="width:auto" title="<tmpl_var name="PORT_TXT">"/>
-    <input type="text" name="aux" id="aux_<tmpl_var name="id">" value="<tmpl_var name="aux">" maxlength="5" size="5" style="width:auto" title="<tmpl_var name="PRIORITY_TXT">"/>
-    <input type="text" name="weight" id="weight_<tmpl_var name="id">" value="<tmpl_var name="weight">" maxlength="5" size="5" style="width:auto" title="<tmpl_var name="WEIGHT_TXT">"/>
+    <input type="text" name="host" id="host_<TMPL_VAR ESCAPE=1 NAME="id">" value="<TMPL_VAR ESCAPE=1 NAME="host">" title="<TMPL_VAR ESCAPE=1 NAME="HOST_TXT">"/>
+    <input type="text" name="port" id="port_<TMPL_VAR ESCAPE=1 NAME="id">" value="<TMPL_VAR ESCAPE=1 NAME="port">" maxlength="5" size="5" style="width:auto" title="<TMPL_VAR ESCAPE=1 NAME="PORT_TXT">"/>
+    <input type="text" name="aux" id="aux_<TMPL_VAR ESCAPE=1 NAME="id">" value="<TMPL_VAR ESCAPE=1 NAME="aux">" maxlength="5" size="5" style="width:auto" title="<TMPL_VAR ESCAPE=1 NAME="PRIORITY_TXT">"/>
+    <input type="text" name="weight" id="weight_<TMPL_VAR ESCAPE=1 NAME="id">" value="<TMPL_VAR ESCAPE=1 NAME="weight">" maxlength="5" size="5" style="width:auto" title="<TMPL_VAR ESCAPE=1 NAME="WEIGHT_TXT">"/>
         <input type="hidden" name="domain" value="<TMPL_VAR ESCAPE=1 NAME="DOMAIN">"/>
-        <input type="hidden" name="rr_id" value="<tmpl_var name="id">" />
+        <input type="hidden" name="rr_id" value="<TMPL_VAR ESCAPE=1 NAME="id">" />
         <input type="hidden" name="action" value="manage_srv"/>
         <input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="MODIFY">" class="autowidth" name="modify_srv_submit" />
         <input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="DEL">" name="delete_srv_submit" class="autowidth"/>
     </p>
 </form>
-</tmpl_loop>
+</TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/dns/list_txt_sub.tmpl
===================================================================
--- trunk/vhffs-panel/templates/dns/list_txt_sub.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/dns/list_txt_sub.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,16 +1,16 @@
-<p class="help"><tmpl_var name="LIST_HELP"></p>
-<tmpl_loop name="TXT_RR">
+<p class="help"><TMPL_VAR ESCAPE=1 NAME="LIST_HELP"></p>
+<TMPL_LOOP NAME="TXT_RR">
 <form method="post" action="prefs.pl" accept-charset="utf-8">
     <p>
-    <label for="data_<tmpl_var name="id">">
+    <label for="data_<TMPL_VAR ESCAPE=1 NAME="id">">
     <TMPL_VAR ESCAPE=1 NAME="NAME">-&gt;
     </label>
-        <input type="text" name="data" id="data_<tmpl_var name="id">" value="<TMPL_VAR ESCAPE=1 NAME="data">" />
+        <input type="text" name="data" id="data_<TMPL_VAR ESCAPE=1 NAME="id">" value="<TMPL_VAR ESCAPE=1 NAME="data">" />
         <input type="hidden" name="domain" value="<TMPL_VAR ESCAPE=1 NAME="DOMAIN">" />
-        <input type="hidden" name="rr_id" value="<tmpl_var name="id">" />
+        <input type="hidden" name="rr_id" value="<TMPL_VAR ESCAPE=1 NAME="id">" />
         <input type="hidden" name="action" value="manage_txt"/>
         <input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="MODIFY">" class="autowidth" name="modify_txt_submit" />
         <input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="DEL">" name="delete_txt_submit" class="autowidth"/>
     </p>
 </form>
-</tmpl_loop>
+</TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/dns/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/dns/prefs.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/dns/prefs.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -132,22 +132,22 @@
     <input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_SUBMIT">" class="autowidth"/>
 </form>
 
-<h2><tmpl_var name="TEXT_TYPESRV"></h2>
-<h3><tmpl_var name="TEXT_LIST_SRV"></h3>
-<tmpl_var name="LIST_SRV">
-<h3><tmpl_var name="TEXT_ADD_SRV"></h3>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_TYPESRV"></h2>
+<h3><TMPL_VAR ESCAPE=1 NAME="TEXT_LIST_SRV"></h3>
+<TMPL_VAR ESCAPE=1 NAME="LIST_SRV">
+<h3><TMPL_VAR ESCAPE=1 NAME="TEXT_ADD_SRV"></h3>
 <form method="post" action="prefs.pl" accept-charset="utf-8">
-    <p><label for="add_srv_protocol"><tmpl_var name="SRV_PROTOCOL_TEXT"></label>
+    <p><label for="add_srv_protocol"><TMPL_VAR ESCAPE=1 NAME="SRV_PROTOCOL_TEXT"></label>
         <input type="text" name="protocol" id="add_srv_protocol"/></p>
-    <p><label for="add_srv_service"><tmpl_var name="SRV_SERVICE_TEXT"></label>
+    <p><label for="add_srv_service"><TMPL_VAR ESCAPE=1 NAME="SRV_SERVICE_TEXT"></label>
         <input type="text" name="service" id="add_srv_service"/></p>
-   <p><label for="add_srv_data"><tmpl_var name="SRV_HOSTNAME_TEXT"></label>
+   <p><label for="add_srv_data"><TMPL_VAR ESCAPE=1 NAME="SRV_HOSTNAME_TEXT"></label>
         <input type="text" name="host" id="add_srv_data"/></p>
-    <p><label for="add_srv_port"><tmpl_var name="SRV_PORT_TEXT"></label>
+    <p><label for="add_srv_port"><TMPL_VAR ESCAPE=1 NAME="SRV_PORT_TEXT"></label>
         <input type="text" name="port" id="add_srv_port" size="5" maxlength="5"/></p>
-    <p><label for="add_srv_priority"><tmpl_var name="SRV_PRIORITY_TEXT"></label>
+    <p><label for="add_srv_priority"><TMPL_VAR ESCAPE=1 NAME="SRV_PRIORITY_TEXT"></label>
         <input type="text" name="aux" id="add_srv_priority" size="5" maxlength="5"/></p>
-    <p><label for="add_srv_weight"><tmpl_var name="SRV_WEIGHT_TEXT"></label>
+    <p><label for="add_srv_weight"><TMPL_VAR ESCAPE=1 NAME="SRV_WEIGHT_TEXT"></label>
         <input type="text" name="weight" id="add_srv_weight" size="5" maxlength="5"/></p>
     <p class="button">
         <input type="hidden" name="action" value="add_srv" />
@@ -183,45 +183,45 @@
 </form>
 
 
-<h2><tmpl_var name="TEXT_ACL_ADMIN"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_ACL_ADMIN"></h2>
 		
 <form method="post" action="../acl/view.pl" accept-charset="utf-8">
-	<p><tmpl_var name="EXPLAIN_ADMIN_ACL"></p>
+	<p><TMPL_VAR ESCAPE=1 NAME="EXPLAIN_ADMIN_ACL"></p>
 
-	<input type="hidden" name="target_oid" value="<tmpl_var name="VALUE_OID">" />
+	<input type="hidden" name="target_oid" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_OID">" />
 	<p class="button" id="buttonAclAdmin">
-		<input type="submit" value="<tmpl_var name="ADMIN_ACL">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="ADMIN_ACL">" />
 	</p>
 </form>
 
-<h2><tmpl_var name="TEXT_DELETE_DNS"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_DELETE_DNS"></h2>
 
 <form method="post" action="/dns/delete.pl" accept-charset="utf-8">
 	<fieldset class="delete">
 		<legend>
-			<tmpl_var name="ASK_DELETE_DNS">:
+			<TMPL_VAR ESCAPE=1 NAME="ASK_DELETE_DNS">:
 		</legend>
 
-		<p class="warning"><tmpl_var name="TEXT_BEFORE_DELETE"></p>
+		<p class="warning"><TMPL_VAR ESCAPE=1 NAME="TEXT_BEFORE_DELETE"></p>
 		<p>
 			<input type="radio" name="DELETE" id="DELETE_NO"  value="0" checked="checked" />
 			<label for="DELETE_NO">
-				<tmpl_var name="NO">
+				<TMPL_VAR ESCAPE=1 NAME="NO">
 			</label>
 		</p>
 		<p>
 			<input type="radio" name="DELETE" id="DELETE_YES" value="1" />
 			<label for="DELETE_YES">
-				<tmpl_var name="YES">
+				<TMPL_VAR ESCAPE=1 NAME="YES">
 			</label>
 		</p>
 	</fieldset>
 	
 	<p class="button">
-		<input type="hidden" name="name" value="<tmpl_var name="DOMAIN_NAME">" />
-		<input type="submit" value="<tmpl_var name="TEXT_DELETE">" />
+		<input type="hidden" name="name" value="<TMPL_VAR ESCAPE=1 NAME="DOMAIN_NAME">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_DELETE">" />
 	</p>
 				
 </form>
 
-<tmpl_var escape=0 name="ADMIN_PART">
+<TMPL_VAR ESCAPE=0 NAME="ADMIN_PART">

Modified: trunk/vhffs-panel/templates/git/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/git/create.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/git/create.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -9,13 +9,13 @@
 		<label for="reponame">
 			<TMPL_VAR ESCAPE=1 NAME="REPOSITORY_NAME">: 
 		</label>	
-		<TMPL_VAR ESCAPE=1 NAME="GROUP">/<input type="text" name="reponame" id="reponame" value="<tmpl_var name="REPOSITORY_VALUE">"/><TMPL_VAR ESCAPE=1 NAME="GIT_SUFFIX">
+		<TMPL_VAR ESCAPE=1 NAME="GROUP">/<input type="text" name="reponame" id="reponame" value="<TMPL_VAR ESCAPE=1 NAME="REPOSITORY_VALUE">"/><TMPL_VAR ESCAPE=1 NAME="GIT_SUFFIX">
 	</p>
 	<p>
 		<label for="PROJECT_USAGE">
 			<TMPL_VAR ESCAPE=1 NAME="description">:
 		</label>
-		<textarea name="description" id="description"  cols="45" rows="7"><tmpl_var name="DESCRIPTION_VALUE"></textarea>
+		<textarea name="description" id="description"  cols="45" rows="7"><TMPL_VAR ESCAPE=1 NAME="DESCRIPTION_VALUE"></textarea>
 	</p>
 	<p class="button" id="buttonSend">
 		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" name="git_submit"/>

Modified: trunk/vhffs-panel/templates/git/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/git/prefs.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/git/prefs.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,83 +1,83 @@
-<h2><tmpl_var name="TITLE_PUBLIC"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TITLE_PUBLIC"></h2>
 
 
 <form method="post" action="/git/prefs.pl" accept-charset="utf-8">
 	<p>
 		<label for="public">
-			<tmpl_var name="TEXT_PUBLIC"> :
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_PUBLIC"> :
 		</label>
 		<select name="public" id="public">
-			<option value="1" <tmpl_var name="YES_SELECTED">><tmpl_var name="PUBLIC_YES"></option>
-			<option value="0" <tmpl_var name="NO_SELECTED">><tmpl_var name="PUBLIC_NO"></option>
+			<option value="1" <TMPL_VAR ESCAPE=1 NAME="YES_SELECTED">><TMPL_VAR ESCAPE=1 NAME="PUBLIC_YES"></option>
+			<option value="0" <TMPL_VAR ESCAPE=1 NAME="NO_SELECTED">><TMPL_VAR ESCAPE=1 NAME="PUBLIC_NO"></option>
 		</select>
 	</p>
-<h2><tmpl_var name="TITLE_OPT"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TITLE_OPT"></h2>
 	<p>
-		<label for="ml_name"><tmpl_var name="TEXT_OPT_ML"></label>
-                <input type="text" name="ml_name" id="ml_name" value="<tmpl_var name="TEXT_ML_NAME">" />
+		<label for="ml_name"><TMPL_VAR ESCAPE=1 NAME="TEXT_OPT_ML"></label>
+                <input type="text" name="ml_name" id="ml_name" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_ML_NAME">" />
 		<br/>
-		<tmpl_var name="TEXT_OPT_ML_REMINDER">
+		<TMPL_VAR ESCAPE=1 NAME="TEXT_OPT_ML_REMINDER">
 	</p>
 	<p class="button">
-		<input type="hidden" name="name" value="<tmpl_var name="TEXT_REPONAME">" />
-		<input type="submit" value="<tmpl_var name="TEXT_SEND">" name="save_prefs_submit"/>
+		<input type="hidden" name="name" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_REPONAME">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_SEND">" name="save_prefs_submit"/>
 	</p>
 </form>
 
 
-<h2><tmpl_var name="TITLE_PERM"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TITLE_PERM"></h2>
 <form method="post" action="/git/prefs_save.pl" accept-charset="utf-8">
 	<p>
 		<label for="PUBLIC">
-			<tmpl_var name="PERM_TEXT">
+			<TMPL_VAR ESCAPE=1 NAME="PERM_TEXT">
 		</label>
 	</p>
 	<p class="button" id="buttonModify">
-		<input type="hidden" name="REPO_NAME" value="<tmpl_var name="TEXT_REPONAME">" />
-		<input type="submit" value="<tmpl_var name="TEXT_BUTTON_PERM">" />
+		<input type="hidden" name="REPO_NAME" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_REPONAME">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_BUTTON_PERM">" />
 	</p>
 </form>
 
-<h2><tmpl_var name="TEXT_ACL_ADMIN"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_ACL_ADMIN"></h2>
 		
 <form method="post" action="../acl/view.pl" accept-charset="utf-8">
-	<p><tmpl_var name="EXPLAIN_ADMIN_ACL"></p>
+	<p><TMPL_VAR ESCAPE=1 NAME="EXPLAIN_ADMIN_ACL"></p>
 
-	<input type="hidden" name="target_oid" value="<tmpl_var name="VALUE_OID">" />
+	<input type="hidden" name="target_oid" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_OID">" />
 	<p class="button" id="buttonAclAdmin">
-		<input type="submit" value="<tmpl_var name="ADMIN_ACL">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="ADMIN_ACL">" />
 	</p>
 </form>
 
 
-<h2><tmpl_var name="TEXT_DELETE_CVS"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_DELETE_CVS"></h2>
 
 <form method="post" action="delete.pl" accept-charset="utf-8">
 	<fieldset class="delete">
 		<legend>
-			<tmpl_var name="ASK_DELETE_CVS">:
+			<TMPL_VAR ESCAPE=1 NAME="ASK_DELETE_CVS">:
 		</legend>
 
-		<p class="warning"><tmpl_var name="TEXT_BEFORE_DELETE"></p>
+		<p class="warning"><TMPL_VAR ESCAPE=1 NAME="TEXT_BEFORE_DELETE"></p>
 		<p>
 			<input type="radio" name="DELETE" id="DELETE_NO"  value="0" checked="checked" />
 			<label for="DELETE_NO">
-				<tmpl_var name="NO">
+				<TMPL_VAR ESCAPE=1 NAME="NO">
 			</label>
 		</p>
 		<p>
 			<input type="radio" name="DELETE" id="DELETE_YES" value="1" />
 			<label for="DELETE_YES">
-				<tmpl_var name="YES">
+				<TMPL_VAR ESCAPE=1 NAME="YES">
 			</label>
 		</p>
 	</fieldset>
 	
 	<p class="button" id="buttonDelete">
-		<input type="hidden" name="name" value="<tmpl_var name="TEXT_REPONAME">" />
-		<input type="submit" value="<tmpl_var name="TEXT_DELETE">" />
+		<input type="hidden" name="name" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_REPONAME">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_DELETE">" />
 	</p>
 				
 </form>
 
-<tmpl_var escape=0 name="ADMIN_PART">
+<TMPL_VAR ESCAPE=0 NAME="ADMIN_PART">

Modified: trunk/vhffs-panel/templates/git/user_part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/git/user_part.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/git/user_part.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,19 +1,19 @@
 
 <tr>
-	<td><tmpl_var name="VALUE_USERNAME"></td>
+	<td><TMPL_VAR ESCAPE=1 NAME="VALUE_USERNAME"></td>
 	<td>
 		<form method="post" action="git_chpwd.pl" accept-charset="utf-8">
 			<input type="text" name="PASSWORD" value="" />
-			<input type="hidden" name="REPO" value="<tmpl_var name="VALUE_REPONAME">" />
-			<input type="hidden" name="USERNAME" value="<tmpl_var name="VALUE_USERNAME">" />
-			<input type="submit" value="<tmpl_var name="TEXT_BUTTON_CHANGEPWD">" />
+			<input type="hidden" name="REPO" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_REPONAME">" />
+			<input type="hidden" name="USERNAME" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_USERNAME">" />
+			<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_BUTTON_CHANGEPWD">" />
 		</form>
 	</td>
 	<td>
 		<form method="post" action="git_deleteuser.pl" accept-charset="utf-8">
-			<input type="hidden" name="REPO" value="<tmpl_var name="VALUE_REPONAME">" />
-			<input type="hidden" name="USERNAME" value="<tmpl_var name="VALUE_USERNAME">" />
-			<input type="submit" value="<tmpl_var name="TEXT_BUTTON_DELETE">" />
+			<input type="hidden" name="REPO" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_REPONAME">" />
+			<input type="hidden" name="USERNAME" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_USERNAME">" />
+			<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_BUTTON_DELETE">" />
 		</form>
 	</td>
 </tr>

Modified: trunk/vhffs-panel/templates/group/add_user.tmpl
===================================================================
--- trunk/vhffs-panel/templates/group/add_user.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/group/add_user.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,3 +1,3 @@
-<h1><tmpl_var name="TEXT_TITLE"></h1>
+<h1><TMPL_VAR ESCAPE=1 NAME="TEXT_TITLE"></h1>
 			
-<tmpl_var name="MESSAGE">	
+<TMPL_VAR ESCAPE=1 NAME="MESSAGE">	

Modified: trunk/vhffs-panel/templates/group/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/group/create.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/group/create.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -9,26 +9,26 @@
 		<label for="project_name">
 			<TMPL_VAR ESCAPE=1 NAME="PROJECT_NAME">: 
 		</label>
-		<input type="text" size="12" maxlength="12" name="project_name" id="project_name" value="<tmpl_var name="PROJECT_VALUE">"/>
+		<input type="text" size="12" maxlength="12" name="project_name" id="project_name" value="<TMPL_VAR ESCAPE=1 NAME="PROJECT_VALUE">"/>
 		<TMPL_VAR ESCAPE=1 NAME="PROJECT_NAME_EXPLAIN">
 	</p>
 	<p>
 		<label for="realname">
 			<TMPL_VAR ESCAPE=1 NAME="REALNAME_TEXT">: 
 		</label>
-		<input type="text" size="30" maxlength="100" name="realname" id="realname" value="<tmpl_var name="REALNAME_VALUE">"/>
+		<input type="text" size="30" maxlength="100" name="realname" id="realname" value="<TMPL_VAR ESCAPE=1 NAME="REALNAME_VALUE">"/>
 	</p>
 	<p>
 		<label for="description">
 			<TMPL_VAR ESCAPE=1 NAME="DESCRIPTION">:
 		</label>
-		<textarea name="description" id="description" cols="45" rows="7"><tmpl_var name="DESCRIPTION_VALUE"></textarea>
+		<textarea name="description" id="description" cols="45" rows="7"><TMPL_VAR ESCAPE=1 NAME="DESCRIPTION_VALUE"></textarea>
 	</p>
-	<tmpl_if name="WARNING_PUBLIC">
+	<TMPL_IF NAME="WARNING_PUBLIC">
 	<p>
 		<TMPL_VAR ESCAPE=1 NAME="WARNING_PUBLIC">
 	</p>
-	</tmpl_if>
+	</TMPL_IF>
 	<p class="button"  id="buttonSend">
 		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" name="project_submit"/>
 	</p>

Modified: trunk/vhffs-panel/templates/group/history.tmpl
===================================================================
--- trunk/vhffs-panel/templates/group/history.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/group/history.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -2,20 +2,20 @@
 <thead>
 	<tr>
 		<th class="historyDate">
-			<tmpl_var name="HDATE">
+			<TMPL_VAR ESCAPE=1 NAME="HDATE">
 		</th>
 		<th>
-			<tmpl_var name="HTYPE">
+			<TMPL_VAR ESCAPE=1 NAME="HTYPE">
 		</th>
 		<th>
-			<tmpl_var name="HNAME">
+			<TMPL_VAR ESCAPE=1 NAME="HNAME">
 		</th>
 		<th>
-			<tmpl_var name="HEVENT">
+			<TMPL_VAR ESCAPE=1 NAME="HEVENT">
 		</th>
 	</tr>
 </thead>
 <tbody>
-        <tmpl_var name="HISTORY_PART">
+        <TMPL_VAR ESCAPE=1 NAME="HISTORY_PART">
 </tbody>
 </table>

Modified: trunk/vhffs-panel/templates/group/history_part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/group/history_part.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/group/history_part.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,15 +1,15 @@
 	<tr>
 		<td>
-			<tmpl_var name="DATE"><br/>
-            <tmpl_var name="TIME">
+			<TMPL_VAR ESCAPE=1 NAME="DATE"><br/>
+            <TMPL_VAR ESCAPE=1 NAME="TIME">
 		</td>
 		<td>
-			<tmpl_var name="TYPE">
+			<TMPL_VAR ESCAPE=1 NAME="TYPE">
 		</td>
 		<td>
-			<tmpl_var name="NAME">
+			<TMPL_VAR ESCAPE=1 NAME="NAME">
 		</td>
 		<td>
-			<tmpl_var name="EVENT">
+			<TMPL_VAR ESCAPE=1 NAME="EVENT">
 		</td>
 	</tr>

Modified: trunk/vhffs-panel/templates/group/index.tmpl
===================================================================
--- trunk/vhffs-panel/templates/group/index.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/group/index.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,38 +1,38 @@
-<tmpl_if name="OWNED_PROJECTS">
+<TMPL_IF NAME="OWNED_PROJECTS">
 <div id="ownedProjects">
-<h2><tmpl_var name="OWNED_PROJECTS_TEXT"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="OWNED_PROJECTS_TEXT"></h2>
 <ul>
-<tmpl_loop name="OWNED_PROJECTS">
-<tmpl_if name="ACTIVE">
-    <li><a href="/group/view.pl?project=<tmpl_var name="GROUPNAME">"><tmpl_var name="GROUPNAME"></a></li>
+<TMPL_LOOP NAME="OWNED_PROJECTS">
+<TMPL_IF NAME="ACTIVE">
+    <li><a href="/group/view.pl?project=<TMPL_VAR ESCAPE=1 NAME="GROUPNAME">"><TMPL_VAR ESCAPE=1 NAME="GROUPNAME"></a></li>
 <tmpl_else>
-    <li><tmpl_var name="GROUPNAME">&nbsp;&mdash;&nbsp;<tmpl_var name="STATE">
-    <tmpl_if name="REFUSED">
-       - <a href="/object/resubmit.pl?oid=<tmpl_var name="OID">"><tmpl_var name="RESUBMIT_TEXT"></a>
-       - <a href="/object/quickdelete.pl?oid=<tmpl_var name="OID">"><tmpl_var name="DELETE_TEXT"></a>
-    </tmpl_if>
+    <li><TMPL_VAR ESCAPE=1 NAME="GROUPNAME">&nbsp;&mdash;&nbsp;<TMPL_VAR ESCAPE=1 NAME="STATE">
+    <TMPL_IF NAME="REFUSED">
+       - <a href="/object/resubmit.pl?oid=<TMPL_VAR ESCAPE=1 NAME="OID">"><TMPL_VAR ESCAPE=1 NAME="RESUBMIT_TEXT"></a>
+       - <a href="/object/quickdelete.pl?oid=<TMPL_VAR ESCAPE=1 NAME="OID">"><TMPL_VAR ESCAPE=1 NAME="DELETE_TEXT"></a>
+    </TMPL_IF>
     </li>
-</tmpl_if>
-</tmpl_loop>
+</TMPL_IF>
+</TMPL_LOOP>
 </ul>
 </div>
-</tmpl_if>
-<tmpl_if name="CONTRIBUTED_PROJECTS">
+</TMPL_IF>
+<TMPL_IF NAME="CONTRIBUTED_PROJECTS">
 <div id="contribProjects">
-<h2><tmpl_var name="CONTRIBUTED_PROJECTS_TEXT"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="CONTRIBUTED_PROJECTS_TEXT"></h2>
 <ul>
-<tmpl_loop name="CONTRIBUTED_PROJECTS">
-<tmpl_if name="ACTIVE">
-    <li><a href="/group/view.pl?project=<tmpl_var name="GROUPNAME">"><tmpl_var name="GROUPNAME"></a></li>
+<TMPL_LOOP NAME="CONTRIBUTED_PROJECTS">
+<TMPL_IF NAME="ACTIVE">
+    <li><a href="/group/view.pl?project=<TMPL_VAR ESCAPE=1 NAME="GROUPNAME">"><TMPL_VAR ESCAPE=1 NAME="GROUPNAME"></a></li>
 <tmpl_else>
-    <li><tmpl_var name="GROUPNAME">&nbsp;&mdash;&nbsp;<tmpl_var name="STATE"></li>
-    <tmpl_if name="REFUSED">
-       - <a href="/object/resubmit.pl?oid=<tmpl_var name="OID">"><tmpl_var name="RESUBMIT_TEXT"></a>
-       - <a href="/object/quickdelete.pl?oid=<tmpl_var name="OID">"><tmpl_var name="DELETE_TEXT"></a>
-    </tmpl_if>
-</tmpl_if>
-</tmpl_loop>
+    <li><TMPL_VAR ESCAPE=1 NAME="GROUPNAME">&nbsp;&mdash;&nbsp;<TMPL_VAR ESCAPE=1 NAME="STATE"></li>
+    <TMPL_IF NAME="REFUSED">
+       - <a href="/object/resubmit.pl?oid=<TMPL_VAR ESCAPE=1 NAME="OID">"><TMPL_VAR ESCAPE=1 NAME="RESUBMIT_TEXT"></a>
+       - <a href="/object/quickdelete.pl?oid=<TMPL_VAR ESCAPE=1 NAME="OID">"><TMPL_VAR ESCAPE=1 NAME="DELETE_TEXT"></a>
+    </TMPL_IF>
+</TMPL_IF>
+</TMPL_LOOP>
 </ul>
 </div>
-</tmpl_if>
-<a href="/group/create.pl"><tmpl_var name="NEW_PROJECT_TEXT"></a>
+</TMPL_IF>
+<a href="/group/create.pl"><TMPL_VAR ESCAPE=1 NAME="NEW_PROJECT_TEXT"></a>

Modified: trunk/vhffs-panel/templates/group/info.tmpl
===================================================================
--- trunk/vhffs-panel/templates/group/info.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/group/info.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,21 +1,21 @@
-<tmpl_if name="MESSAGE">
-<p class="info"><tmpl_var name="MESSAGE"></p>
-</tmpl_if>
+<TMPL_IF NAME="MESSAGE">
+<p class="info"><TMPL_VAR ESCAPE=1 NAME="MESSAGE"></p>
+</TMPL_IF>
 
 <fieldset>
-    <legend><tmpl_var name="TEXT_GENERAL"></legend>
+    <legend><TMPL_VAR ESCAPE=1 NAME="TEXT_GENERAL"></legend>
     <ul class="generalList">
-	<li><tmpl_var name="QUOTA_TEXT"> &mdash;
+	<li><TMPL_VAR ESCAPE=1 NAME="QUOTA_TEXT"> &mdash;
 		<div id="group_quota">
-		<img src="/themes/<tmpl_var name="THEME">/images/quota_progress.png" width="<tmpl_var name="QUOTA_WIDTH">" alt="<tmpl_var name="QUOTA_WIDTH">"/>
+		<img src="/themes/<TMPL_VAR ESCAPE=1 NAME="THEME">/images/quota_progress.png" width="<TMPL_VAR ESCAPE=1 NAME="QUOTA_WIDTH">" alt="<TMPL_VAR ESCAPE=1 NAME="QUOTA_WIDTH">"/>
 		</div>
 	</li>
-        <li><a href="/group/history.pl"><tmpl_var name="TEXT_FULLHISTORY"></a></li>
-        <li><a href="/group/prefs.pl"><tmpl_var name="TEXT_PREFS"></a></li>
-	<tmpl_if name="HELP_URL">
-        <li><a href="<tmpl_var name="HELP_URL">"><tmpl_var name="HELP_TEXT"></a></li>
-	</tmpl_if>
+        <li><a href="/group/history.pl"><TMPL_VAR ESCAPE=1 NAME="TEXT_FULLHISTORY"></a></li>
+        <li><a href="/group/prefs.pl"><TMPL_VAR ESCAPE=1 NAME="TEXT_PREFS"></a></li>
+	<TMPL_IF NAME="HELP_URL">
+        <li><a href="<TMPL_VAR ESCAPE=1 NAME="HELP_URL">"><TMPL_VAR ESCAPE=1 NAME="HELP_TEXT"></a></li>
+	</TMPL_IF>
     </ul>
 </fieldset>
 
-<tmpl_var name="SERVICES">
+<TMPL_VAR ESCAPE=1 NAME="SERVICES">

Modified: trunk/vhffs-panel/templates/group/list_user.tmpl
===================================================================
--- trunk/vhffs-panel/templates/group/list_user.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/group/list_user.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,7 +1,7 @@
-<tmpl_loop name="USERS">
+<TMPL_LOOP NAME="USERS">
 <form action="#" method="post" accept-charset="utf-8">
-<input type="hidden" name="uid" value="<tmpl_var name="UID">"/>
-<p><label><tmpl_var NAME="USERNAME"> (<tmpl_var name="FIRSTNAME"> <tmpl_var name="LASTNAME">)</label>
-<input type="submit" name="add_user_list_submit" value="<tmpl_var name="TEXT_ADD">"/></p>
+<input type="hidden" name="uid" value="<TMPL_VAR ESCAPE=1 NAME="UID">"/>
+<p><label><TMPL_VAR ESCAPE=1 NAME="USERNAME"> (<TMPL_VAR ESCAPE=1 NAME="FIRSTNAME"> <TMPL_VAR ESCAPE=1 NAME="LASTNAME">)</label>
+<input type="submit" name="add_user_list_submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_ADD">"/></p>
 </form>
-</tmpl_loop>
+</TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/group/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/group/prefs.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/group/prefs.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,105 +1,105 @@
-<p class="info"><tmpl_var name="TEXT_QUOTA"></p>
+<p class="info"><TMPL_VAR ESCAPE=1 NAME="TEXT_QUOTA"></p>
 
-<h2><tmpl_var name="TEXT_PROJECTNAME"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_PROJECTNAME"></h2>
 
 <form method="post" action="#" accept-charset="utf-8">
     <p>
-        <label><tmpl_var name="TEXT_OWNER">:</label>
-        <tmpl_var name="VALUE_OWNER">
+        <label><TMPL_VAR ESCAPE=1 NAME="TEXT_OWNER">:</label>
+        <TMPL_VAR ESCAPE=1 NAME="VALUE_OWNER">
     </p>
-    <p><label for="realname" class="realname"><tmpl_var name="TEXT_REALNAME">:</label><input type="text" size="30" maxlength="100" value="<tmpl_var name="VALUE_REALNAME">" name="realname" id="realname"/></p>
-    <p><label for="description" class="description"><tmpl_var name="TEXT_DESCRIPTION">:</label></p>
-    <p><textarea name="description" id="description" class="description" cols="45" rows="7"><tmpl_var name="VALUE_DESCRIPTION"></textarea></p>
+    <p><label for="realname" class="realname"><TMPL_VAR ESCAPE=1 NAME="TEXT_REALNAME">:</label><input type="text" size="30" maxlength="100" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_REALNAME">" name="realname" id="realname"/></p>
+    <p><label for="description" class="description"><TMPL_VAR ESCAPE=1 NAME="TEXT_DESCRIPTION">:</label></p>
+    <p><textarea name="description" id="description" class="description" cols="45" rows="7"><TMPL_VAR ESCAPE=1 NAME="VALUE_DESCRIPTION"></textarea></p>
     <p class="button" id="buttonModify">
-        <input type="submit" value="<tmpl_var name="TEXT_MODIFY">" name="update_desc_submit"/>
+        <input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_MODIFY">" name="update_desc_submit"/>
     </p>
 </form>
 
-<tmpl_if name="CONTACT_EMAIL_TITLE">
-<h2><tmpl_var name="CONTACT_EMAIL_TITLE"></h2>
+<TMPL_IF NAME="CONTACT_EMAIL_TITLE">
+<h2><TMPL_VAR ESCAPE=1 NAME="CONTACT_EMAIL_TITLE"></h2>
 <p>
-<tmpl_var name="CONTACT_EMAIL_TEXT">
+<TMPL_VAR ESCAPE=1 NAME="CONTACT_EMAIL_TEXT">
 <form action="#" method="post" accept-charset="utf-8">
-Forward emails from <tmpl_var name="CONTACT_EMAIL"> to
-<input type="text" name="contact_email" id="contact_email" value="<tmpl_var name="CONTACT_EMAIL_FORWARD">"/> <input type="submit" value="<tmpl_var name="CONTACT_EMAIL_MODIFY">" name="contact_email_submit"/>
+Forward emails from <TMPL_VAR ESCAPE=1 NAME="CONTACT_EMAIL"> to
+<input type="text" name="contact_email" id="contact_email" value="<TMPL_VAR ESCAPE=1 NAME="CONTACT_EMAIL_FORWARD">"/> <input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="CONTACT_EMAIL_MODIFY">" name="contact_email_submit"/>
 </form>
-<tmpl_if name="HELP_URL">
-<a href="<tmpl_var name="HELP_URL">"><tmpl_var name="HELP_TEXT"></a>
-</tmpl_if>
+<TMPL_IF NAME="HELP_URL">
+<a href="<TMPL_VAR ESCAPE=1 NAME="HELP_URL">"><TMPL_VAR ESCAPE=1 NAME="HELP_TEXT"></a>
+</TMPL_IF>
 </p>
-</tmpl_if>
+</TMPL_IF>
 
-<h2><tmpl_var name="USERS_TEXT"></h2>
-<h3><tmpl_var name="CURRENT_USERS"></h3>
+<h2><TMPL_VAR ESCAPE=1 NAME="USERS_TEXT"></h2>
+<h3><TMPL_VAR ESCAPE=1 NAME="CURRENT_USERS"></h3>
 <tmpl_unless name="USERS">
-<p class="info"><tmpl_var name="NO_USER_TEXT"></p>
+<p class="info"><TMPL_VAR ESCAPE=1 NAME="NO_USER_TEXT"></p>
 </tmpl_unless>
-<tmpl_loop name="USERS">
-<tmpl_if name="ACTIVE">
+<TMPL_LOOP NAME="USERS">
+<TMPL_IF NAME="ACTIVE">
 <form action="#" method="post" accept-charset="utf-8">
-<input type="hidden" name="uid" value="<tmpl_var name="uid">"/>
-<p><label><tmpl_var name="username"></label><input type="submit" value="<tmpl_var name="REMOVE_USER_TEXT">" name="remove_user_submit"/></p>
+<input type="hidden" name="uid" value="<TMPL_VAR ESCAPE=1 NAME="uid">"/>
+<p><label><TMPL_VAR ESCAPE=1 NAME="username"></label><input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="REMOVE_USER_TEXT">" name="remove_user_submit"/></p>
 </form>
 <tmpl_else>
-<p><tmpl_var name="USERNAME"> &mdash; <tmpl_var name="STATE"></p>
-</tmpl_if>
-</tmpl_loop>
+<p><TMPL_VAR ESCAPE=1 NAME="USERNAME"> &mdash; <TMPL_VAR ESCAPE=1 NAME="STATE"></p>
+</TMPL_IF>
+</TMPL_LOOP>
 
 <a name="add_user"></a>
-<h3><tmpl_var name="TEXT_JOIN_GROUP"></h3>
+<h3><TMPL_VAR ESCAPE=1 NAME="TEXT_JOIN_GROUP"></h3>
 
 <form method="post" action="prefs.pl#add_user" accept-charset="utf-8">
 	<p>
 		<label for="username_add">
-			<tmpl_var name="TEXT_USERNAME">	
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_USERNAME">	
 		</label>
 		<input type="text" name="username" id="username_add" />
-		<input type="submit" value="<tmpl_var name="TEXT_SEND">" name="add_user_submit"/>
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_SEND">" name="add_user_submit"/>
 	</p>
 </form>
 
-<tmpl_if name="ADD_USER_MSG"><p class="<tmpl_var name="ADD_USER_MSG_CLASS">"><tmpl_var name="ADD_USER_MSG"></p></tmpl_if>
-<tmpl_var name="USERS_LIST">
+<TMPL_IF NAME="ADD_USER_MSG"><p class="<TMPL_VAR ESCAPE=1 NAME="ADD_USER_MSG_CLASS">"><TMPL_VAR ESCAPE=1 NAME="ADD_USER_MSG"></p></TMPL_IF>
+<TMPL_VAR ESCAPE=1 NAME="USERS_LIST">
 
 <TMPL_VAR ESCAPE=0 name="AVATAR">
 
-<h2><tmpl_var name="TEXT_ACL_ADMIN"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_ACL_ADMIN"></h2>
 
 <form method="post" action="../acl/view.pl" accept-charset="utf-8">
-	<p><tmpl_var name="EXPLAIN_ADMIN_ACL"></p>
+	<p><TMPL_VAR ESCAPE=1 NAME="EXPLAIN_ADMIN_ACL"></p>
 
-	<input type="hidden" name="target_oid" value="<tmpl_var name="VALUE_OID">" />
+	<input type="hidden" name="target_oid" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_OID">" />
 	<p class="button" id="buttonAclAdmin">
-		<input type="submit" value="<tmpl_var name="ADMIN_ACL">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="ADMIN_ACL">" />
 	</p>
 </form>
 
-<h2><tmpl_var name="TEXT_DELETE_PROJECT"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_DELETE_PROJECT"></h2>
 
 <form method="post" action="delete.pl" accept-charset="utf-8">
 	<fieldset class="delete">
 		<legend>
-			<tmpl_var name="ASK_DELETE_PROJECT">:
+			<TMPL_VAR ESCAPE=1 NAME="ASK_DELETE_PROJECT">:
 		</legend>
 
-		<p class="warning"><tmpl_var name="TEXT_BEFORE_DELETE"></p>
+		<p class="warning"><TMPL_VAR ESCAPE=1 NAME="TEXT_BEFORE_DELETE"></p>
 		<p>
 			<input type="radio" name="DELETE" id="DELETE_NO"  value="0" checked="checked" />
 			<label for="DELETE_NO">
-				<tmpl_var name="NO">
+				<TMPL_VAR ESCAPE=1 NAME="NO">
 			</label>
 		</p>
 		<p>
 			<input type="radio" name="DELETE" id="DELETE_YES" value="1" />
 			<label for="DELETE_YES">
-				<tmpl_var name="YES">
+				<TMPL_VAR ESCAPE=1 NAME="YES">
 			</label>
 		</p>
 	</fieldset>
 	
 	<p class="button" id="buttonDelete">
-		<input type="hidden" name="name" value="<tmpl_var name="TEXT_PROJECTNAME">" />
-		<input type="submit" value="<tmpl_var name="TEXT_DELETE">" />
+		<input type="hidden" name="name" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_PROJECTNAME">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_DELETE">" />
 	</p>
 
 </form>

Modified: trunk/vhffs-panel/templates/group/prefs_avatar.tmpl
===================================================================
--- trunk/vhffs-panel/templates/group/prefs_avatar.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/group/prefs_avatar.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,11 +1,11 @@
-<h2><tmpl_var name="TEXT_AVATAR"></h2>
-    <h3><tmpl_var name="CURRENT_AVATAR"></h3>
-        <p><img src="../getavatar.pl?oid=<tmpl_var name="VALUE_OID">" alt="avatar for this group"/></p>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_AVATAR"></h2>
+    <h3><TMPL_VAR ESCAPE=1 NAME="CURRENT_AVATAR"></h3>
+        <p><img src="../getavatar.pl?oid=<TMPL_VAR ESCAPE=1 NAME="VALUE_OID">" alt="avatar for this group"/></p>
 
-    <h3><tmpl_var name="UPDATE_AVATAR"></h3>
+    <h3><TMPL_VAR ESCAPE=1 NAME="UPDATE_AVATAR"></h3>
     <form method="post" action="../object/upavatar.pl" enctype="multipart/form-data" accept-charset="utf-8">
-        <p><tmpl_var name="EXPLAIN_AVATAR"></p>
-        <input type="hidden" name="OID" value="<tmpl_var name="VALUE_OID">"/>
+        <p><TMPL_VAR ESCAPE=1 NAME="EXPLAIN_AVATAR"></p>
+        <input type="hidden" name="OID" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_OID">"/>
         <p><input type="file" name="avatar"/></p>
-        <p><input type="submit" value="<tmpl_var name="SEND_AVATAR">" /></p>
+        <p><input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND_AVATAR">" /></p>
     </form>

Modified: trunk/vhffs-panel/templates/mail/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mail/create.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/mail/create.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -9,13 +9,13 @@
 		<label for="domain">
 			<TMPL_VAR ESCAPE=1 NAME="DOMAIN_TEXT">: 
 		</label>	
-		<input type="text" name="domain" id="domain" value="<tmpl_var name="DOMAIN_VALUE">"/>
+		<input type="text" name="domain" id="domain" value="<TMPL_VAR ESCAPE=1 NAME="DOMAIN_VALUE">"/>
 	</p>
 	<p>
 		<label for="description">
 			<TMPL_VAR ESCAPE=1 NAME="DESCRIPTION_TEXT">:
 		</label>	
-		<textarea name="description" id="description" cols="45" rows="7"><tmpl_var name="DESCRIPTION_VALUE"></textarea>
+		<textarea name="description" id="description" cols="45" rows="7"><TMPL_VAR ESCAPE=1 NAME="DESCRIPTION_VALUE"></textarea>
 	</p>
 	<p class="button" id="buttonSend">
 		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" name="mail_submit"/>

Modified: trunk/vhffs-panel/templates/mail/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mail/prefs.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/mail/prefs.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,122 +1,122 @@
 <tmpl_unless expr="CATCHALL_TYPE eq 'none'">
-<h2><tmpl_var name="SUBTITLE_CATCHALL"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="SUBTITLE_CATCHALL"></h2>
 
 <form method="post" action="/mail/prefs.pl" accept-charset="utf-8">
-	<p><tmpl_var name="TEXT_CATCHALL_EXPLAIN"></p>
+	<p><TMPL_VAR ESCAPE=1 NAME="TEXT_CATCHALL_EXPLAIN"></p>
 
 	<p>
 		<label for="catchall">
-			<tmpl_var name="TEXT_CATCHALL"> :
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_CATCHALL"> :
 		</label>
-        <tmpl_if expr="CATCHALL_TYPE eq 'open'">
-		<input type="text" name="catchall" id="catchall" value="<tmpl_var name="VALUE_CATCHALL">" />
+        <TMPL_IF EXPR="CATCHALL_TYPE eq 'open'">
+		<input type="text" name="catchall" id="catchall" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_CATCHALL">" />
         <tmpl_else>
         <select name="catchall" id="catchall">
             <option value="">---</option>
-        <tmpl_loop name="boxes">
-            <option <tmpl_if expr="VALUE_CATCHALL eq (sprintf('%s@%s', LOCAL_PART, DOMAIN))">selected="selected"</tmpl_if> value="<TMPL_VAR ESCAPE=1 NAME="LOCAL_PART">"><TMPL_VAR ESCAPE=1 NAME="LOCAL_PART">@<TMPL_VAR ESCAPE=1 NAME="DOMAIN"></option>
-        </tmpl_loop>
+        <TMPL_LOOP NAME="boxes">
+            <option <TMPL_IF EXPR="VALUE_CATCHALL eq (sprintf('%s@%s', LOCAL_PART, DOMAIN))">selected="selected"</TMPL_IF> value="<TMPL_VAR ESCAPE=1 NAME="LOCAL_PART">"><TMPL_VAR ESCAPE=1 NAME="LOCAL_PART">@<TMPL_VAR ESCAPE=1 NAME="DOMAIN"></option>
+        </TMPL_LOOP>
         </select>
-        </tmpl_if>
+        </TMPL_IF>
 	</p>
 	<p class="button" id="buttonModify">
-		<input type="hidden" name="name" value="<tmpl_var name="VALUE_DOMAIN">" />
-		<input type="submit" name="modify_catchall_submit" value="<tmpl_var name="TEXT_CHANGE_CATCHALL">"/>
+		<input type="hidden" name="name" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_DOMAIN">" />
+		<input type="submit" name="modify_catchall_submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_CHANGE_CATCHALL">"/>
 	</p>
 </form>
 </tmpl_unless>
 
-<h2><tmpl_var name="SUBTITLE_ACCOUNTS"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="SUBTITLE_ACCOUNTS"></h2>
 
-<h3><tmpl_var name="TEXT_ACCOUNTS_LIST"></h3>
+<h3><TMPL_VAR ESCAPE=1 NAME="TEXT_ACCOUNTS_LIST"></h3>
 <TMPL_INCLUDE NAME="prefs_boxes.tmpl">
 
-<h3><tmpl_var name="TEXT_ACCOUNTS_ADD"></h3>
+<h3><TMPL_VAR ESCAPE=1 NAME="TEXT_ACCOUNTS_ADD"></h3>
 
 <form method="post" action="prefs.pl" accept-charset="utf-8">
 	<p>
 		<label for="new_box_localpart">
-			<tmpl_var name="TEXT_ACCOUNT_LOCALPART">:
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_ACCOUNT_LOCALPART">:
 		</label>
-		<input type="text" name="localpart" id="new_box_localpart" />@<tmpl_var name="VALUE_DOMAIN">
+		<input type="text" name="localpart" id="new_box_localpart" />@<TMPL_VAR ESCAPE=1 NAME="VALUE_DOMAIN">
 	</p>
 	<p>
 		<label for="new_box_password">
-			<tmpl_var name="TEXT_ACCOUNT_PASSWORD">:
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_ACCOUNT_PASSWORD">:
 		</label>
 		<input type="password" name="box_password" id="new_box_password" />
 	</p>
 	<p class="button">
-		<input type="hidden" name="name" value="<tmpl_var name="VALUE_DOMAIN">" />				
-		<input type="submit" value="<tmpl_var name="TEXT_ADD_ACCOUNT">" name="add_box_submit"/>
+		<input type="hidden" name="name" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_DOMAIN">" />				
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_ADD_ACCOUNT">" name="add_box_submit"/>
 	</p>
 </form>
 
-<h2><tmpl_var name="SUBTITLE_FORWARDS"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="SUBTITLE_FORWARDS"></h2>
 
-<h3><tmpl_var name="TEXT_FORWARD_LIST"></h3>
+<h3><TMPL_VAR ESCAPE=1 NAME="TEXT_FORWARD_LIST"></h3>
 <TMPL_INCLUDE NAME="prefs_forwards.tmpl">
 
-<h3><tmpl_var name="TEXT_FORWARD_ADD"></h3>
+<h3><TMPL_VAR ESCAPE=1 NAME="TEXT_FORWARD_ADD"></h3>
 <form method="post" action="prefs.pl" accept-charset="utf-8">
 	<p>
 		<label for="new_forward_localpart">
-			<tmpl_var name="TEXT_FORWARD_FORM_LOCALPART">:
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_FORWARD_FORM_LOCALPART">:
 		</label>
-		<input type="text" name="localpart" id="new_forward_localpart" />@<tmpl_var name="VALUE_DOMAIN">
+		<input type="text" name="localpart" id="new_forward_localpart" />@<TMPL_VAR ESCAPE=1 NAME="VALUE_DOMAIN">
 	</p>
 	<p>
 		<label for="new_forward_forward">
-			<tmpl_var name="TEXT_FORWARD_FORM_FORWARD">:
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_FORWARD_FORM_FORWARD">:
 		</label>
 		<input type="text" name="forward" id="new_forward_forward" />
 	</p>
 	<p class="button">
-		<input type="hidden" name="name" value="<tmpl_var name="VALUE_DOMAIN">" />
-		<input type="submit" value="<tmpl_var name="TEXT_ADD_FORWARD">" name="add_forward_submit"/>
+		<input type="hidden" name="name" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_DOMAIN">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_ADD_FORWARD">" name="add_forward_submit"/>
 	</p>
 </form>
 
-<h2><tmpl_var name="TEXT_ACL_ADMIN"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_ACL_ADMIN"></h2>
 		
 <form method="post" action="../acl/view.pl" accept-charset="utf-8">
-	<p><tmpl_var name="EXPLAIN_ADMIN_ACL"></p>
+	<p><TMPL_VAR ESCAPE=1 NAME="EXPLAIN_ADMIN_ACL"></p>
 
-	<input type="hidden" name="target_oid" value="<tmpl_var name="VALUE_OID">" />
+	<input type="hidden" name="target_oid" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_OID">" />
 	<p class="button" id="buttonAclAdmin">
-		<input type="submit" value="<tmpl_var name="ADMIN_ACL">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="ADMIN_ACL">" />
 	</p>
 </form>
 
-<h2><tmpl_var name="TEXT_DELETE_MAIL"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_DELETE_MAIL"></h2>
 
 <form method="post" action="delete.pl" accept-charset="utf-8">
 	<fieldset class="delete">
 		<legend>
-			<tmpl_var name="ASK_DELETE_WEB">:
+			<TMPL_VAR ESCAPE=1 NAME="ASK_DELETE_WEB">:
 		</legend>
 
-		<p class="warning"><tmpl_var name="TEXT_BEFORE_DELETE"></p>
+		<p class="warning"><TMPL_VAR ESCAPE=1 NAME="TEXT_BEFORE_DELETE"></p>
 		<p>
 			<input type="radio" name="DELETE" id="DELETE_NO"  value="0" checked="checked" />
 			<label for="DELETE_NO">
-				<tmpl_var name="NO">
+				<TMPL_VAR ESCAPE=1 NAME="NO">
 			</label>
 		</p>
 		<p>
 			<input type="radio" name="DELETE" id="DELETE_YES" value="1" />
 			<label for="DELETE_YES">
-				<tmpl_var name="YES">
+				<TMPL_VAR ESCAPE=1 NAME="YES">
 			</label>
 		</p>
 	</fieldset>
 	
 	<p class="button" id="buttonDelete">
-		<input type="hidden" name="name" value="<tmpl_var name="VALUE_DOMAIN">" />
-		<input type="submit" value="<tmpl_var name="TEXT_DELETE">" />
+		<input type="hidden" name="name" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_DOMAIN">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_DELETE">" />
 	</p>
 				
 </form>
 
 
-<tmpl_var escape=0 name="ADMIN_PART">
+<TMPL_VAR ESCAPE=0 NAME="ADMIN_PART">

Modified: trunk/vhffs-panel/templates/mail/prefs_boxes.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mail/prefs_boxes.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/mail/prefs_boxes.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,25 +1,25 @@
 <TMPL_LOOP NAME="BOXES">
 <fieldset>
 <legend><TMPL_VAR ESCAPE=1 NAME="LOCAL_PART">@<TMPL_VAR ESCAPE=1 NAME="DOMAIN"></legend>
-	<tmpl_if name="ACTIVE">
+	<TMPL_IF NAME="ACTIVE">
 		<form method="post" action="prefs.pl" accept-charset="utf-8">
                 <p><TMPL_I18N KEY="Change Password">: <input type="password" name="box_password" value=""/></p>
-                <tmpl_if name="antispam_feature">
+                <TMPL_IF NAME="antispam_feature">
                 <p><TMPL_I18N KEY="Enable anti-spam">:
-                  <input type="radio" name="use_antispam" <tmpl_if name="nospam">checked="checked"</tmpl_if> value="yes"/>&nbsp;<TMPL_I18N KEY="Yes">
+                  <input type="radio" name="use_antispam" <TMPL_IF NAME="nospam">checked="checked"</TMPL_IF> value="yes"/>&nbsp;<TMPL_I18N KEY="Yes">
                   <input type="radio" name="use_antispam" <tmpl_unless name="nospam">checked="checked"</tmpl_unless> value="no"/>&nbsp;<TMPL_I18N KEY="No"></p>
-                </tmpl_if>
-                <tmpl_if name="antivirus_feature">
+                </TMPL_IF>
+                <TMPL_IF NAME="antivirus_feature">
                 <p><TMPL_I18N KEY="Enable anti-virus">:
-                  <input type="radio" name="use_antivirus" <tmpl_if name="novirus">checked="checked"</tmpl_if> value="yes"/>&nbsp;<TMPL_I18N KEY="Yes">
+                  <input type="radio" name="use_antivirus" <TMPL_IF NAME="novirus">checked="checked"</TMPL_IF> value="yes"/>&nbsp;<TMPL_I18N KEY="Yes">
                   <input type="radio" name="use_antivirus" <tmpl_unless name="novirus">checked="checked"</tmpl_unless> value="no"/>&nbsp;<TMPL_I18N KEY="No"></p>
-                </tmpl_if>
+                </TMPL_IF>
                 <p><input type="submit" name="update_box_submit" value="<TMPL_I18N KEY="Update">"/>&nbsp;<input type="submit" name="delete_box_submit" value="<TMPL_I18N KEY="Delete this mail account">"/></p>
-			<input type="hidden" name="localpart" value="<tmpl_var name="LOCAL_PART">" />
-			<input type="hidden" name="name" value="<tmpl_var name="DOMAIN">" />
+			<input type="hidden" name="localpart" value="<TMPL_VAR ESCAPE=1 NAME="LOCAL_PART">" />
+			<input type="hidden" name="name" value="<TMPL_VAR ESCAPE=1 NAME="DOMAIN">" />
 		</form>
 	<tmpl_else>
-		<tmpl_var name="STATESTR">
-	</tmpl_if>
+		<TMPL_VAR ESCAPE=1 NAME="STATESTR">
+	</TMPL_IF>
 </fieldset>
 </TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/mail/prefs_forwards.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mail/prefs_forwards.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/mail/prefs_forwards.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -3,13 +3,13 @@
 <legend><TMPL_VAR ESCAPE=1 NAME="LOCAL_PART">@<TMPL_VAR ESCAPE=1 NAME="DOMAIN"></legend>
     <form method="post" action="prefs.pl" accept-charset="utf-8">
 		<p>
-            <input type="text" name="forward" value="<tmpl_var name="REMOTE_NAME">" /></p>
+            <input type="text" name="forward" value="<TMPL_VAR ESCAPE=1 NAME="REMOTE_NAME">" /></p>
         <p><input type="submit" value="<TMPL_I18N KEY="Change Forward">"
             name="update_forward_submit"/>&nbsp;<input type="submit"
             value="<TMPL_I18N KEY="Delete this forward">"
             name="delete_forward_submit"/></p>
-		<input type="hidden" name="localpart" value="<tmpl_var name="LOCAL_PART">" />
-		<input type="hidden" name="name" value="<tmpl_var name="DOMAIN">" />
+		<input type="hidden" name="localpart" value="<TMPL_VAR ESCAPE=1 NAME="LOCAL_PART">" />
+		<input type="hidden" name="name" value="<TMPL_VAR ESCAPE=1 NAME="DOMAIN">" />
     </form>
 </fieldset>
 </TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/mailinglist/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mailinglist/create.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/mailinglist/create.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -9,17 +9,17 @@
     </p>
     <div class="clear"></div>
     <p>
-		<input type="text" name="localpart" id="localpart" value="<tmpl_var name="LOCALPART_VALUE">"/>@<select name="domain">
-<tmpl_loop name="DOMAINS">
-<option value="<tmpl_var name="DOMAIN">"<tmpl_if expr="DOMAIN eq DOMAIN_VALUE"> selected="selected"</tmpl_if>><tmpl_var NAME="DOMAIN"></option>
-</tmpl_loop>
+		<input type="text" name="localpart" id="localpart" value="<TMPL_VAR ESCAPE=1 NAME="LOCALPART_VALUE">"/>@<select name="domain">
+<TMPL_LOOP NAME="DOMAINS">
+<option value="<TMPL_VAR ESCAPE=1 NAME="DOMAIN">"<TMPL_IF EXPR="DOMAIN eq DOMAIN_VALUE"> selected="selected"</TMPL_IF>><TMPL_VAR ESCAPE=1 NAME="DOMAIN"></option>
+</TMPL_LOOP>
 </select>
 	</p>
 	<p>
 		<label for="description">
 			<TMPL_VAR ESCAPE=1 NAME="MOTIVATION">:
 		</label>
-		<textarea name="description" id="description" cols="45" rows="7"><tmpl_var name="DESCRIPTION_VALUE"></textarea>
+		<textarea name="description" id="description" cols="45" rows="7"><TMPL_VAR ESCAPE=1 NAME="DESCRIPTION_VALUE"></textarea>
 	</p>
 	<p class="button" id="buttonSend">
 		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" name="mailing_submit"/>

Modified: trunk/vhffs-panel/templates/mailinglist/list_part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mailinglist/list_part.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/mailinglist/list_part.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -9,9 +9,9 @@
             <option value="<TMPL_VAR ESCAPE=1 NAME="ML_RIGHT_SUB_WAITING_FOR_DEL">" <TMPL_IF EXPR="perm==ML_RIGHT_SUB_WAITING_FOR_DEL">selected="selected"</TMPL_IF>> <TMPL_I18N KEY="Waiting for deletion"></option>
             <option value="<TMPL_VAR ESCAPE=1 NAME="ML_RIGHT_ADMIN">" <TMPL_IF EXPR="perm==ML_RIGHT_ADMIN">selected="selected"</TMPL_IF>> <TMPL_I18N KEY="Admin"></option>
        	</select></p>
-        <input type="hidden" name="member" value="<tmpl_var name="MEMBER">" />
-        <input type="hidden" name="local" value="<tmpl_var name="LOCAL_PART">" />
-        <input type="hidden" name="domain" value="<tmpl_var name="DOMAIN">" />
+        <input type="hidden" name="member" value="<TMPL_VAR ESCAPE=1 NAME="MEMBER">" />
+        <input type="hidden" name="local" value="<TMPL_VAR ESCAPE=1 NAME="LOCAL_PART">" />
+        <input type="hidden" name="domain" value="<TMPL_VAR ESCAPE=1 NAME="DOMAIN">" />
         <input type="submit" name="change_rights_submit" value="<TMPL_I18N KEY="Change rights">" />
 		<input type="submit" name="delete_submit" value="<TMPL_I18N KEY="Delete from list">" />
 	</form>

Modified: trunk/vhffs-panel/templates/mailinglist/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mailinglist/prefs.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/mailinglist/prefs.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,46 +1,46 @@
 <form method="post" action="/mailinglist/prefs.pl" accept-charset="utf-8">
 	<fieldset>
 		<legend>
-			<tmpl_var name="SUBTITLE_OPTIONS">
+			<TMPL_VAR ESCAPE=1 NAME="SUBTITLE_OPTIONS">
 		</legend>
 		<p>
-			<tmpl_var name="TEXT_PREFIX">
-			<input type="text" size=20 name="prefix" value="<tmpl_var name="VALUE_PREFIX">"/>
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_PREFIX">
+			<input type="text" size=20 name="prefix" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_PREFIX">"/>
 		</p>
 		<p>
-			<tmpl_var name="TEXT_SUBSCRIBE_CONTROL">
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_SUBSCRIBE_CONTROL">
 			<select name="subscribe_control" id="SUBSCRIBE_CONTROL">
-				<option value="<tmpl_var name="VALUE_SUBSCRIBE_NO_APPROVAL_REQUIRED">" <tmpl_var name="SELECTED_SUBSCRIBE_NO_APPROVAL_REQUIRED">>
-					<tmpl_var name="TEXT_SUBSCRIBE_NO_APPROVAL_REQUIRED">
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_SUBSCRIBE_NO_APPROVAL_REQUIRED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_SUBSCRIBE_NO_APPROVAL_REQUIRED">>
+					<TMPL_VAR ESCAPE=1 NAME="TEXT_SUBSCRIBE_NO_APPROVAL_REQUIRED">
 				</option>
-				<option value="<tmpl_var name="VALUE_SUBSCRIBE_APPROVAL_REQUIRED">" <tmpl_var name="SELECTED_SUBSCRIBE_APPROVAL_REQUIRED">>
-					<tmpl_var name="TEXT_SUBSCRIBE_APPROVAL_REQUIRED">
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_SUBSCRIBE_APPROVAL_REQUIRED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_SUBSCRIBE_APPROVAL_REQUIRED">>
+					<TMPL_VAR ESCAPE=1 NAME="TEXT_SUBSCRIBE_APPROVAL_REQUIRED">
 				</option>
-				<option value="<tmpl_var name="VALUE_SUBSCRIBE_CLOSED">" <tmpl_var name="SELECTED_SUBSCRIBE_CLOSED">>
-					<tmpl_var name="TEXT_SUBSCRIBE_CLOSED">
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_SUBSCRIBE_CLOSED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_SUBSCRIBE_CLOSED">>
+					<TMPL_VAR ESCAPE=1 NAME="TEXT_SUBSCRIBE_CLOSED">
 				</option>
 			</select>
 		</p>
 		<p>
-			<tmpl_var name="TEXT_POSTING_CONTROL">
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_POSTING_CONTROL">
 			<select name="posting_control" id="POSTING_CONTROL">
-				<option value="<tmpl_var name="VALUE_POSTING_OPEN_ALL">" <tmpl_var name="SELECTED_POSTING_OPEN_ALL">>
-					<tmpl_var name="TEXT_POSTING_OPEN_ALL">
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_POSTING_OPEN_ALL">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_POSTING_OPEN_ALL">>
+					<TMPL_VAR ESCAPE=1 NAME="TEXT_POSTING_OPEN_ALL">
 				</option>
-				<option value="<tmpl_var name="VALUE_POSTING_MODERATED_ALL">" <tmpl_var name="SELECTED_POSTING_MODERATED_ALL">>
-					<tmpl_var name="TEXT_POSTING_MODERATED_ALL">
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_POSTING_MODERATED_ALL">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_POSTING_MODERATED_ALL">>
+					<TMPL_VAR ESCAPE=1 NAME="TEXT_POSTING_MODERATED_ALL">
 				</option>
-				<option value="<tmpl_var name="VALUE_POSTING_OPEN_MEMBERS_MODERATED_OTHERS">" <tmpl_var name="SELECTED_POSTING_OPEN_MEMBERS_MODERATED_OTHERS">>
-					<tmpl_var name="TEXT_POSTING_OPEN_MEMBERS_MODERATED_OTHERS">
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_POSTING_OPEN_MEMBERS_MODERATED_OTHERS">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_POSTING_OPEN_MEMBERS_MODERATED_OTHERS">>
+					<TMPL_VAR ESCAPE=1 NAME="TEXT_POSTING_OPEN_MEMBERS_MODERATED_OTHERS">
 				</option>
-				<option value="<tmpl_var name="VALUE_POSTING_MEMBERS_ONLY">" <tmpl_var name="SELECTED_POSTING_MEMBERS_ONLY">>
-					<tmpl_var name="TEXT_POSTING_MEMBERS_ONLY">					
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_POSTING_MEMBERS_ONLY">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_POSTING_MEMBERS_ONLY">>
+					<TMPL_VAR ESCAPE=1 NAME="TEXT_POSTING_MEMBERS_ONLY">					
 				</option>
-				<option value="<tmpl_var name="VALUE_POSTING_MEMBERS_ONLY_MODERATED">" <tmpl_var name="SELECTED_POSTING_MEMBERS_ONLY_MODERATED">>
-					<tmpl_var name="TEXT_POSTING_MEMBERS_ONLY_MODERATED">
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_POSTING_MEMBERS_ONLY_MODERATED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_POSTING_MEMBERS_ONLY_MODERATED">>
+					<TMPL_VAR ESCAPE=1 NAME="TEXT_POSTING_MEMBERS_ONLY_MODERATED">
 				</option>
-				<option value="<tmpl_var name="VALUE_POSTING_ADMINS_ONLY">" <tmpl_var name="SELECTED_POSTING_ADMINS_ONLY">>
-					<tmpl_var name="TEXT_POSTING_ADMINS_ONLY">
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_POSTING_ADMINS_ONLY">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_POSTING_ADMINS_ONLY">>
+					<TMPL_VAR ESCAPE=1 NAME="TEXT_POSTING_ADMINS_ONLY">
 				</option>
 			</select>
 		</p>
@@ -55,29 +55,29 @@
 			<input type="checkbox" name="reply_to"  id="reply_to"
               <TMPL_IF NAME="REPLY_TO">checked="checked" </TMPL_IF>class="labeled" />
 			<label for="reply_to">
-				<tmpl_var name="TEXT_REPLYTO">
+				<TMPL_VAR ESCAPE=1 NAME="TEXT_REPLYTO">
 			</label>
 		</p>
     <p><TMPL_I18N KEY="Signature"></p>
-    <p><textarea name="signature" rows="7" cols="50"><tmpl_var escape=HTML name="VALUE_SIGNATURE"></textarea></p>
-        <input type="hidden" name="domain" value="<tmpl_var name="VALUE_DOMAIN">" />
-		<input type="hidden" name="local" value="<tmpl_var name="VALUE_LOCALPART">" />
-		<input type="submit" name="options_submit" value="<tmpl_var name="TEXT_SUBMIT_PREFS">"/>
+    <p><textarea name="signature" rows="7" cols="50"><TMPL_VAR ESCAPE=1 NAME="VALUE_SIGNATURE"></textarea></p>
+        <input type="hidden" name="domain" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_DOMAIN">" />
+		<input type="hidden" name="local" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_LOCALPART">" />
+		<input type="submit" name="options_submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_SUBMIT_PREFS">"/>
 	</p>
     </fieldset>
 </form>
 
-<h2><tmpl_var name="TITLE_MEMBERS"></h2>
-<h3><tmpl_var name="TITLE_LIST_MEMBERS"> (<tmpl_var name="HOWMANY_MEMBERS">)</h3>
+<h2><TMPL_VAR ESCAPE=1 NAME="TITLE_MEMBERS"></h2>
+<h3><TMPL_VAR ESCAPE=1 NAME="TITLE_LIST_MEMBERS"> (<TMPL_VAR ESCAPE=1 NAME="HOWMANY_MEMBERS">)</h3>
 
 <TMPL_INCLUDE NAME="list_part.tmpl">
 
-<h3><tmpl_var name="TITLE_ADD_MEMBERS"></h3>
+<h3><TMPL_VAR ESCAPE=1 NAME="TITLE_ADD_MEMBERS"></h3>
 
 <form method="post" action="prefs.pl" accept-charset="utf-8">
 
 	<div style="display:none;">
-		<textarea name="projectmembers" id="projectmembers"><tmpl_var name="PROJECT_MEMBERS_LIST"></textarea>
+		<textarea name="projectmembers" id="projectmembers"><TMPL_VAR ESCAPE=1 NAME="PROJECT_MEMBERS_LIST"></textarea>
 	</div>
 
 <script type="text/javascript"><!-- 
@@ -90,61 +90,61 @@
 
 	<p>
 		<label for="USERNAME">
-			<tmpl_var name="TEXT_ADD_MEMBERS">
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_ADD_MEMBERS">
 		</label>
 		<textarea name="members" id="members" rows="7" cols="50"></textarea>
 	</p>
 	<p class="button">
-		<input type="hidden" name="domain" value="<tmpl_var name="VALUE_DOMAIN">" />
-		<input type="hidden" name="local" value="<tmpl_var name="VALUE_LOCALPART">" />
-		<input type="submit" value="<tmpl_var name="BUTTON_ADD_MEMBERS">" name="add_members_submit" />
+		<input type="hidden" name="domain" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_DOMAIN">" />
+		<input type="hidden" name="local" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_LOCALPART">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="BUTTON_ADD_MEMBERS">" name="add_members_submit" />
 		<input type="button" name="fill_members" id="fill_members" value="<TMPL_I18N KEY="Fill with project's members emails">" onclick="javascript:fill_with_project_members();"/>
     </p>
     <p>
 	</p>
 </form>
 
-<h2><tmpl_var name="TEXT_ACL_ADMIN"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_ACL_ADMIN"></h2>
 		
 <form method="post" action="../acl/view.pl" accept-charset="utf-8">
-	<p><tmpl_var name="EXPLAIN_ADMIN_ACL"></p>
+	<p><TMPL_VAR ESCAPE=1 NAME="EXPLAIN_ADMIN_ACL"></p>
 
-	<input type="hidden" name="target_oid" value="<tmpl_var name="VALUE_OID">" />
+	<input type="hidden" name="target_oid" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_OID">" />
 	<p class="button" id="buttonAclAdmin">
-		<input type="submit" value="<tmpl_var name="ADMIN_ACL">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="ADMIN_ACL">" />
 	</p>
 </form>
 
 
-<h2><tmpl_var name="TEXT_DELETE_LIST"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_DELETE_LIST"></h2>
 
 <form method="post" action="delete.pl" accept-charset="utf-8">
 	<fieldset class="delete">
 		<legend>
-			<tmpl_var name="ASK_DELETE_WEB">:
+			<TMPL_VAR ESCAPE=1 NAME="ASK_DELETE_WEB">:
 		</legend>
 
-		<p class="warning"><tmpl_var name="TEXT_BEFORE_DELETE"></p>
+		<p class="warning"><TMPL_VAR ESCAPE=1 NAME="TEXT_BEFORE_DELETE"></p>
 		<p>
 			<input type="radio" name="DELETE" id="DELETE_NO"  value="0" checked="checked" />
 			<label for="DELETE_NO">
-				<tmpl_var name="NO">
+				<TMPL_VAR ESCAPE=1 NAME="NO">
 			</label>
 		</p>
 		<p>
 			<input type="radio" name="DELETE" id="DELETE_YES" value="1" />
 			<label for="DELETE_YES">
-				<tmpl_var name="YES">
+				<TMPL_VAR ESCAPE=1 NAME="YES">
 			</label>
 		</p>
 	</fieldset>
 	
 	<p class="button" id="buttonDelete">
-		<input type="hidden" name="local" value="<tmpl_var name="VALUE_LOCALPART">" />
-		<input type="hidden" name="domain" value="<tmpl_var name="VALUE_DOMAIN">" />
-		<input type="submit" value="<tmpl_var name="TEXT_DELETE">" />
+		<input type="hidden" name="local" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_LOCALPART">" />
+		<input type="hidden" name="domain" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_DOMAIN">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_DELETE">" />
 	</p>
 
 </form>
 
-<tmpl_var escape=0 name="ADMIN_PART">
+<TMPL_VAR ESCAPE=0 NAME="ADMIN_PART">

Modified: trunk/vhffs-panel/templates/main/auth.tmpl
===================================================================
--- trunk/vhffs-panel/templates/main/auth.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/main/auth.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,45 +1,45 @@
 		<div id="chooselang">
-			<tmpl_var name="LANGS">
+			<TMPL_VAR ESCAPE=1 NAME="LANGS">
 		</div>
 
 		<div class="logo">
 		</div>
 		
 		<div class="misc" id="misc">
-				<h1><tmpl_var name="TEXT_WELCOME"></h1>
+				<h1><TMPL_VAR ESCAPE=1 NAME="TEXT_WELCOME"></h1>
 		
 
 			
 			<form action="/auth.pl" method="post" accept-charset="utf-8">
-			<h2><tmpl_var name="TEXT_PLEASEIDENTIFY"></h2>
-                <tmpl_var name="errors">
-                <tmpl_var name="infos">
+			<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_PLEASEIDENTIFY"></h2>
+                <TMPL_VAR ESCAPE=1 NAME="errors">
+                <TMPL_VAR ESCAPE=1 NAME="infos">
 				<p>
 					<label for="username">
-						<tmpl_var name="TEXT_USERNAME">
+						<TMPL_VAR ESCAPE=1 NAME="TEXT_USERNAME">
 					</label>
-					<input type="text" name="username" id="username" maxlength="32" value="<tmpl_var name="VALUE_USERNAME">"/>
+					<input type="text" name="username" id="username" maxlength="32" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_USERNAME">"/>
 				</p>
 				<p>
 					<label for="password">
-						<tmpl_var name="TEXT_PASSWORD">
+						<TMPL_VAR ESCAPE=1 NAME="TEXT_PASSWORD">
 					</label>
 						<input type="password" name="password" id="password" maxlength="32" />
 				</p>
 				<p class="button">
-					<input type="submit" value="<tmpl_var name="TEXT_LOGIN">" id="login_submit" name="login_submit"/>
+					<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_LOGIN">" id="login_submit" name="login_submit"/>
 				</p>
 			</form>
 			<div id="sub_opts">
 			<ul>
 				<li>
 				<a class="loginLinks" href="/subscribe.pl">
-					<tmpl_var name="TEXT_SUBSCRIBE">
+					<TMPL_VAR ESCAPE=1 NAME="TEXT_SUBSCRIBE">
 				</a>
 				</li>
 				<li>
 				<a class="loginLinks" href="/lost.pl">
-					<tmpl_var name="TEXT_LOSTPASSWORD">
+					<TMPL_VAR ESCAPE=1 NAME="TEXT_LOSTPASSWORD">
 				</a>
 				</li>
 			</ul>
@@ -48,14 +48,14 @@
 
 		<div class="foothome">
 		<p>
-			<tmpl_var name="TEXT_STATS">
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_STATS">
 		</p>
 		<p>
-			<a href="<tmpl_var name="URL_PUBLIC">"><tmpl_var name="TEXT_PUBLIC"></a>
+			<a href="<TMPL_VAR ESCAPE=1 NAME="URL_PUBLIC">"><TMPL_VAR ESCAPE=1 NAME="TEXT_PUBLIC"></a>
 		</p>
 		</div>
 
 
 		<div id="footer">
-			<a href="http://www.vhffs.org";><tmpl_var name="VHFFS_INFO"></a>
+			<a href="http://www.vhffs.org";><TMPL_VAR ESCAPE=1 NAME="VHFFS_INFO"></a>
 		</div>

Modified: trunk/vhffs-panel/templates/main/close.tmpl
===================================================================
--- trunk/vhffs-panel/templates/main/close.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/main/close.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,5 +1,5 @@
 		<div id="chooselang">
-			<tmpl_var name="LANGS">
+			<TMPL_VAR ESCAPE=1 NAME="LANGS">
 		</div>
 
 		<div class="logo">
@@ -7,10 +7,10 @@
 		
 		<div class="misc" id="misc">
 		
-			<h1><tmpl_var name="TEXT_CLOSE"></h1>
+			<h1><TMPL_VAR ESCAPE=1 NAME="TEXT_CLOSE"></h1>
 		</div>
 
 		<div class="explain">
 
-			<tmpl_var name="TEXT_EXPLAIN">
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_EXPLAIN">
 		</div>

Modified: trunk/vhffs-panel/templates/main/lost.tmpl
===================================================================
--- trunk/vhffs-panel/templates/main/lost.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/main/lost.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -3,18 +3,18 @@
 
 <div class="misc" id="misc">
 		
-<h1><tmpl_var name="TEXT_LOSTPASS"></h1>
+<h1><TMPL_VAR ESCAPE=1 NAME="TEXT_LOSTPASS"></h1>
 
 <form action="/lost_ack.pl" method="post" accept-charset="utf-8">
-<h2><tmpl_var name="TEXT_BLABLA"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_BLABLA"></h2>
 <p>
 	<label for="username">
-	<tmpl_var name="TEXT_USERNAME">
+	<TMPL_VAR ESCAPE=1 NAME="TEXT_USERNAME">
 	</label>
 	<input type="text" name="username" id="username" maxlength="32"/>
 </p>
 <p class="button">
-	<input type="submit" value="<tmpl_var name="TEXT_BUTTON">" />
+	<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_BUTTON">" />
 </p>
 </form>
 

Modified: trunk/vhffs-panel/templates/main/lost_failed.tmpl
===================================================================
--- trunk/vhffs-panel/templates/main/lost_failed.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/main/lost_failed.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,5 +1,5 @@
 <div class="logo"></div>
 <div class="misc" id="misc">
-<h1><tmpl_var name="TEXT_FAILED"></h1>
-<p class="button"><a href="/auth.pl"><tmpl_var name="TEXT_LOGIN"></a></p>
+<h1><TMPL_VAR ESCAPE=1 NAME="TEXT_FAILED"></h1>
+<p class="button"><a href="/auth.pl"><TMPL_VAR ESCAPE=1 NAME="TEXT_LOGIN"></a></p>
 </div>

Modified: trunk/vhffs-panel/templates/main/lost_ok.tmpl
===================================================================
--- trunk/vhffs-panel/templates/main/lost_ok.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/main/lost_ok.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,5 +1,5 @@
 <div class="logo"></div>
 <div class="misc" id="misc">
-<h1><tmpl_var name="TEXT_WAITPASS"></h1>
-<p class="button"><a href="/auth.pl"><tmpl_var name="TEXT_LOGIN"></a></p>
+<h1><TMPL_VAR ESCAPE=1 NAME="TEXT_WAITPASS"></h1>
+<p class="button"><a href="/auth.pl"><TMPL_VAR ESCAPE=1 NAME="TEXT_LOGIN"></a></p>
 </div>

Modified: trunk/vhffs-panel/templates/main/main.tmpl
===================================================================
--- trunk/vhffs-panel/templates/main/main.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/main/main.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,18 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
 <html xmlns="http://www.w3.org/1999/xhtml";>
 <head>
-	<title><tmpl_var name="TITLE"></title>
-	<link rel="stylesheet" type="text/css" href="/themes/<tmpl_var name="THEME">/main.css"/>
+	<title><TMPL_VAR ESCAPE=1 NAME="TITLE"></title>
+	<link rel="stylesheet" type="text/css" href="/themes/<TMPL_VAR ESCAPE=1 NAME="THEME">/main.css"/>
 	<meta http-equiv="Pragma" content="no-cache"/>
 	<meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
-	<tmpl_if name="REFRESH_URL">
-	<meta http-equiv="refresh" content="<tmpl_var name="REFRESH_TIME">; url=<tmpl_var name="REFRESH_URL">">
-	</tmpl_if>
-	<tmpl_loop name="JSCRIPTS">
-	<script language="javascript" type="text/javascript" charset="utf-8" src="<tmpl_var name="SCRIPT">"></script>
-	</tmpl_loop>
+	<TMPL_IF NAME="REFRESH_URL">
+	<meta http-equiv="refresh" content="<TMPL_VAR ESCAPE=1 NAME="REFRESH_TIME">; url=<TMPL_VAR ESCAPE=1 NAME="REFRESH_URL">">
+	</TMPL_IF>
+	<TMPL_LOOP NAME="JSCRIPTS">
+	<script language="javascript" type="text/javascript" charset="utf-8" src="<TMPL_VAR ESCAPE=1 NAME="SCRIPT">"></script>
+	</TMPL_LOOP>
 </head>
 <body>
-<tmpl_var name="CONTENT">
+<TMPL_VAR ESCAPE=1 NAME="CONTENT">
 </body>
 </html>

Modified: trunk/vhffs-panel/templates/main/panel.tmpl
===================================================================
--- trunk/vhffs-panel/templates/main/panel.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/main/panel.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,18 +1,18 @@
 <!-- Header Part-->	
 
-<tmpl_var name="HEADER">
+<TMPL_VAR ESCAPE=1 NAME="HEADER">
 
 <!-- Page Content -->
 
 <div class="main" id="main">
-	<h1><tmpl_var name="TITLE"></h1>
-	<tmpl_var name="ERRORS">
-	<tmpl_var name="INFOS">
-	<tmpl_var name="CONTENT">
+	<h1><TMPL_VAR ESCAPE=1 NAME="TITLE"></h1>
+	<TMPL_VAR ESCAPE=1 NAME="ERRORS">
+	<TMPL_VAR ESCAPE=1 NAME="INFOS">
+	<TMPL_VAR ESCAPE=1 NAME="CONTENT">
 </div>
 <div id="help">
-	<h1><img src="/themes/<tmpl_var name="THEME">/images/help.png" alt="help"/><tmpl_var name="TEXT_HELP"></h1>
+	<h1><img src="/themes/<TMPL_VAR ESCAPE=1 NAME="THEME">/images/help.png" alt="help"/><TMPL_VAR ESCAPE=1 NAME="TEXT_HELP"></h1>
 	<div id="help_content">
-	<p><tmpl_var name="TEXT_HELP_CONTENT"></p>
+	<p><TMPL_VAR ESCAPE=1 NAME="TEXT_HELP_CONTENT"></p>
 	</div>
 </div>

Modified: trunk/vhffs-panel/templates/menu/context-modo.tmpl
===================================================================
--- trunk/vhffs-panel/templates/menu/context-modo.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/menu/context-modo.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,3 +1,3 @@
-<tmpl_loop name="MENU_ITEMS">
-<a href="/<tmpl_var name="PATH">"><tmpl_var name="LABEL"></a>
-</tmpl_loop>
+<TMPL_LOOP NAME="MENU_ITEMS">
+<a href="/<TMPL_VAR ESCAPE=1 NAME="PATH">"><TMPL_VAR ESCAPE=1 NAME="LABEL"></a>
+</TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/menu/context.tmpl
===================================================================
--- trunk/vhffs-panel/templates/menu/context.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/menu/context.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,3 +1,3 @@
-<tmpl_loop name="MENU_ITEMS">
-<a href="/<tmpl_var name="PATH">/index.pl"><tmpl_var name="LABEL"></a>
-</tmpl_loop>
+<TMPL_LOOP NAME="MENU_ITEMS">
+<a href="/<TMPL_VAR ESCAPE=1 NAME="PATH">/index.pl"><TMPL_VAR ESCAPE=1 NAME="LABEL"></a>
+</TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/menu/main.tmpl
===================================================================
--- trunk/vhffs-panel/templates/menu/main.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/menu/main.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,48 +1,48 @@
 <div id="header">
-    <tmpl_if name="GROUPNAME">
+    <TMPL_IF NAME="GROUPNAME">
     <div id="group_menu">
-        <span id="groupname"><a href="/group/view.pl?project=<tmpl_var name="GROUPNAME">"><img src="/themes/<tmpl_var name="THEME">/images/projectcurrent.png" title="<tmpl_var name="PROJECT_HOME_TEXT">" alt="<tmpl_var name="PROJECT_HOME_TEXT">" onmouseover="javascript:this.timer=helpTimeout('user_project');" onmouseout="javascript:window.clearTimeout(this.timer);"/></a>&nbsp;<tmpl_var name="CURRENT_GROUP_TEXT"> <tmpl_var name="GROUPNAME"></span>
+        <span id="groupname"><a href="/group/view.pl?project=<TMPL_VAR ESCAPE=1 NAME="GROUPNAME">"><img src="/themes/<TMPL_VAR ESCAPE=1 NAME="THEME">/images/projectcurrent.png" title="<TMPL_VAR ESCAPE=1 NAME="PROJECT_HOME_TEXT">" alt="<TMPL_VAR ESCAPE=1 NAME="PROJECT_HOME_TEXT">" onmouseover="javascript:this.timer=helpTimeout('user_project');" onmouseout="javascript:window.clearTimeout(this.timer);"/></a>&nbsp;<TMPL_VAR ESCAPE=1 NAME="CURRENT_GROUP_TEXT"> <TMPL_VAR ESCAPE=1 NAME="GROUPNAME"></span>
     </div>
-    </tmpl_if>
+    </TMPL_IF>
     <div id="top_menu">
         <div id="userToolBox">
-            <a  href="/panel.pl" title="<tmpl_var name="TEXT_HOME">">
-                <img src="/themes/<tmpl_var name="THEME">/images/home.png" title="<tmpl_var name="TEXT_HOME">" alt="<tmpl_var name="TEXT_HOME">" onmouseover="javascript:this.timer=helpTimeout('home_page');" onmouseout="javascript:window.clearTimeout(this.timer);"/>
+            <a  href="/panel.pl" title="<TMPL_VAR ESCAPE=1 NAME="TEXT_HOME">">
+                <img src="/themes/<TMPL_VAR ESCAPE=1 NAME="THEME">/images/home.png" title="<TMPL_VAR ESCAPE=1 NAME="TEXT_HOME">" alt="<TMPL_VAR ESCAPE=1 NAME="TEXT_HOME">" onmouseover="javascript:this.timer=helpTimeout('home_page');" onmouseout="javascript:window.clearTimeout(this.timer);"/>
             </a>
-            <a  href="/user/prefs.pl" title="<tmpl_var name="TEXT_PREFS">">
-                <img src="/themes/<tmpl_var name="THEME">/images/prefs.png" title="<tmpl_var name="TEXT_PREFS">" alt="<tmpl_var name="TEXT_PREFS">" onmouseover="javascript:this.timer=helpTimeout('user_preferences');" onmouseout="javascript:window.clearTimeout(this.timer);"/>
+            <a  href="/user/prefs.pl" title="<TMPL_VAR ESCAPE=1 NAME="TEXT_PREFS">">
+                <img src="/themes/<TMPL_VAR ESCAPE=1 NAME="THEME">/images/prefs.png" title="<TMPL_VAR ESCAPE=1 NAME="TEXT_PREFS">" alt="<TMPL_VAR ESCAPE=1 NAME="TEXT_PREFS">" onmouseover="javascript:this.timer=helpTimeout('user_preferences');" onmouseout="javascript:window.clearTimeout(this.timer);"/>
             </a>
-            <a href="/group/index.pl" title="<tmpl_var name="TEXT_PROJECTS">">
-                <img src="/themes/<tmpl_var name="THEME">/images/projects.png" title="<tmpl_var name="TEXT_PROJECTS">" alt="<tmpl_var name="TEXT_PROJECTS">" onmouseover="javascript:this.timer=helpTimeout('user_projects');" onmouseout="javascript:window.clearTimeout(this.timer);"/>
+            <a href="/group/index.pl" title="<TMPL_VAR ESCAPE=1 NAME="TEXT_PROJECTS">">
+                <img src="/themes/<TMPL_VAR ESCAPE=1 NAME="THEME">/images/projects.png" title="<TMPL_VAR ESCAPE=1 NAME="TEXT_PROJECTS">" alt="<TMPL_VAR ESCAPE=1 NAME="TEXT_PROJECTS">" onmouseover="javascript:this.timer=helpTimeout('user_projects');" onmouseout="javascript:window.clearTimeout(this.timer);"/>
             </a>
-            <tmpl_if name="TEXT_ADMIN">
-            <a href="/admin/index.pl" title="<tmpl_var name="TEXT_ADMIN">">
-                <img src="/themes/<tmpl_var name="THEME">/images/admin.png" title="<tmpl_var name="TEXT_ADMIN">" alt="<tmpl_var name="TEXT_ADMIN">
+            <TMPL_IF NAME="TEXT_ADMIN">
+            <a href="/admin/index.pl" title="<TMPL_VAR ESCAPE=1 NAME="TEXT_ADMIN">">
+                <img src="/themes/<TMPL_VAR ESCAPE=1 NAME="THEME">/images/admin.png" title="<TMPL_VAR ESCAPE=1 NAME="TEXT_ADMIN">" alt="<TMPL_VAR ESCAPE=1 NAME="TEXT_ADMIN">
                 " onmouseover="javascript:this.timer=helpTimeout('user_admin');" onmouseout="javascript:window.clearTimeout(this.timer);"/>
             </a>
-            </tmpl_if>
-            <a href="<tmpl_var name="HELP_URL">" title="<tmpl_var name="TEXT_HELP">">
-                <img src="/themes/<tmpl_var name="THEME">/images/help.png" title="<tmpl_var name="TEXT_HELP">" alt="<tmpl_var name="TEXT_HELP">" onmouseover="javascript:this.timer=helpTimeout('user_help');" onmouseout="javascript:window.clearTimeout(this.timer);"/>
+            </TMPL_IF>
+            <a href="<TMPL_VAR ESCAPE=1 NAME="HELP_URL">" title="<TMPL_VAR ESCAPE=1 NAME="TEXT_HELP">">
+                <img src="/themes/<TMPL_VAR ESCAPE=1 NAME="THEME">/images/help.png" title="<TMPL_VAR ESCAPE=1 NAME="TEXT_HELP">" alt="<TMPL_VAR ESCAPE=1 NAME="TEXT_HELP">" onmouseover="javascript:this.timer=helpTimeout('user_help');" onmouseout="javascript:window.clearTimeout(this.timer);"/>
             </a>
-            <a href="/alert.pl" title="<tmpl_var name="TEXT_SUBMITBUG">">
-                <img src="/themes/<tmpl_var name="THEME">/images/bug.png" title="<tmpl_var name="TEXT_SUBMITBUG">" alt="<tmpl_var name="TEXT_SUBMITBUG">" onmouseover="javascript:this.timer=helpTimeout('user_bug');" onmouseout="javascript:window.clearTimeout(this.timer);"/>
+            <a href="/alert.pl" title="<TMPL_VAR ESCAPE=1 NAME="TEXT_SUBMITBUG">">
+                <img src="/themes/<TMPL_VAR ESCAPE=1 NAME="THEME">/images/bug.png" title="<TMPL_VAR ESCAPE=1 NAME="TEXT_SUBMITBUG">" alt="<TMPL_VAR ESCAPE=1 NAME="TEXT_SUBMITBUG">" onmouseover="javascript:this.timer=helpTimeout('user_bug');" onmouseout="javascript:window.clearTimeout(this.timer);"/>
             </a>
-            <a href="/auth.pl?logout=1" title="<tmpl_var name="TEXT_LOGOUT">">
-                <img src="/themes/<tmpl_var name="THEME">/images/logout.png" title="<tmpl_var name="TEXT_LOGOUT">" alt="<tmpl_var name="TEXT_LOGOUT">" onmouseover="javascript:this.timer=helpTimeout('user_logout');" onmouseout="javascript:window.clearTimeout(this.timer);"/>
+            <a href="/auth.pl?logout=1" title="<TMPL_VAR ESCAPE=1 NAME="TEXT_LOGOUT">">
+                <img src="/themes/<TMPL_VAR ESCAPE=1 NAME="THEME">/images/logout.png" title="<TMPL_VAR ESCAPE=1 NAME="TEXT_LOGOUT">" alt="<TMPL_VAR ESCAPE=1 NAME="TEXT_LOGOUT">" onmouseover="javascript:this.timer=helpTimeout('user_logout');" onmouseout="javascript:window.clearTimeout(this.timer);"/>
             </a>
         </div>
-        <span id="username" title="<tmpl_var name="TEXT_ACCOUNT">"><tmpl_var name="USERNAME"></span>
+        <span id="username" title="<TMPL_VAR ESCAPE=1 NAME="TEXT_ACCOUNT">"><TMPL_VAR ESCAPE=1 NAME="USERNAME"></span>
     </div>
 </div>
-<tmpl_if name="CONTEXTUAL_MENU">
+<TMPL_IF NAME="CONTEXTUAL_MENU">
 <div id="contextual_menu">
 <p>
-<tmpl_var name="CONTEXTUAL_MENU">
+<TMPL_VAR ESCAPE=1 NAME="CONTEXTUAL_MENU">
 </p>
 </div>
-</tmpl_if>
+</TMPL_IF>
 <div id="logo">
     <a class="logomenu" href="/panel.pl">
-        <img src="/themes/<tmpl_var name="THEME">/images/logo.png" alt="logo"/>
+        <img src="/themes/<TMPL_VAR ESCAPE=1 NAME="THEME">/images/logo.png" alt="logo"/>
     </a>
 </div>

Modified: trunk/vhffs-panel/templates/menu/user.tmpl
===================================================================
--- trunk/vhffs-panel/templates/menu/user.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/menu/user.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,25 +1,25 @@
-            <a href="#" id="userMenuTitle"><tmpl_var name="MENU_TITLE"></a>
+            <a href="#" id="userMenuTitle"><TMPL_VAR ESCAPE=1 NAME="MENU_TITLE"></a>
             <ul id="userMenu">
 				<li id="user">
-					<a  href="/user/prefs.pl" title="<tmpl_var name="TEXT_PREFS">">
-						<tmpl_var name="TEXT_PREFS">
+					<a  href="/user/prefs.pl" title="<TMPL_VAR ESCAPE=1 NAME="TEXT_PREFS">">
+						<TMPL_VAR ESCAPE=1 NAME="TEXT_PREFS">
 					</a>
 				</li>
 				<li id="help">
-					<a href="<tmpl_var name="HELP_URL">" title="<tmpl_var name="TEXT_HELP">">
-						<tmpl_var name="TEXT_HELP">
+					<a href="<TMPL_VAR ESCAPE=1 NAME="HELP_URL">" title="<TMPL_VAR ESCAPE=1 NAME="TEXT_HELP">">
+						<TMPL_VAR ESCAPE=1 NAME="TEXT_HELP">
 					</a>
 				</li>
 				<li id="bug">
-					<a href="/alert.pl" title="<tmpl_var name="TEXT_SUBMITBUG">">
-						<tmpl_var name="TEXT_SUBMITBUG">
+					<a href="/alert.pl" title="<TMPL_VAR ESCAPE=1 NAME="TEXT_SUBMITBUG">">
+						<TMPL_VAR ESCAPE=1 NAME="TEXT_SUBMITBUG">
 					</a>
 				</li>
 				<li id="logout">
-					<a href="/auth.pl?logout=1" title="<tmpl_var name="TEXT_LOGOUT">">
-						<tmpl_var name="TEXT_LOGOUT">
+					<a href="/auth.pl?logout=1" title="<TMPL_VAR ESCAPE=1 NAME="TEXT_LOGOUT">">
+						<TMPL_VAR ESCAPE=1 NAME="TEXT_LOGOUT">
 					</a>
 				</li>
-				<tmpl_var name="GROUP">
+				<TMPL_VAR ESCAPE=1 NAME="GROUP">
 				
 			</ul>

Modified: trunk/vhffs-panel/templates/misc/errors.tmpl
===================================================================
--- trunk/vhffs-panel/templates/misc/errors.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/misc/errors.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,5 +1,5 @@
 <div id="errors">
-<tmpl_loop name="errors">
-<p class="error"><tmpl_var name="msg"></p>
-</tmpl_loop>
+<TMPL_LOOP NAME="errors">
+<p class="error"><TMPL_VAR ESCAPE=1 NAME="msg"></p>
+</TMPL_LOOP>
 </div>

Modified: trunk/vhffs-panel/templates/misc/group_service.tmpl
===================================================================
--- trunk/vhffs-panel/templates/misc/group_service.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/misc/group_service.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,3 +1,3 @@
 <li>
-<tmpl_var name="VALUE"> - <a href="/<tmpl_var name="SERVICE">/prefs.pl?name=<tmpl_var name="VALUE">"><tmpl_var name="TEXT"></a> - <a href="/history.pl?OID=<tmpl_var name="OID">"><tmpl_var name="HISTORY"></a>
+<TMPL_VAR ESCAPE=1 NAME="VALUE"> - <a href="/<TMPL_VAR ESCAPE=1 NAME="SERVICE">/prefs.pl?name=<TMPL_VAR ESCAPE=1 NAME="VALUE">"><TMPL_VAR ESCAPE=1 NAME="TEXT"></a> - <a href="/history.pl?OID=<TMPL_VAR ESCAPE=1 NAME="OID">"><TMPL_VAR ESCAPE=1 NAME="HISTORY"></a>
 </li>

Modified: trunk/vhffs-panel/templates/misc/history.tmpl
===================================================================
--- trunk/vhffs-panel/templates/misc/history.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/misc/history.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,3 +1,3 @@
 <table>
-	<tmpl_var name="HISTORY_PART">
+	<TMPL_VAR ESCAPE=1 NAME="HISTORY_PART">
 </table>

Modified: trunk/vhffs-panel/templates/misc/history_part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/misc/history_part.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/misc/history_part.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,8 +1,8 @@
 	<tr>
 		<td>
-			<tmpl_var name="DATE">
+			<TMPL_VAR ESCAPE=1 NAME="DATE">
 		</td>
 		<td>
-			<tmpl_var name="EVENT">
+			<TMPL_VAR ESCAPE=1 NAME="EVENT">
 		</td>
 	</tr>

Modified: trunk/vhffs-panel/templates/misc/infos.tmpl
===================================================================
--- trunk/vhffs-panel/templates/misc/infos.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/misc/infos.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,5 +1,5 @@
 <div id="infos">
-<tmpl_loop name="infos">
-<p class="info"><tmpl_var name="msg"></p>
-</tmpl_loop>
+<TMPL_LOOP NAME="infos">
+<p class="info"><TMPL_VAR ESCAPE=1 NAME="msg"></p>
+</TMPL_LOOP>
 </div>

Modified: trunk/vhffs-panel/templates/misc/resubmit.tmpl
===================================================================
--- trunk/vhffs-panel/templates/misc/resubmit.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/misc/resubmit.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -12,14 +12,14 @@
 		<label for="description">
 			<TMPL_VAR ESCAPE=1 NAME="DESCRIPTION_TEXT">:
 		</label>
-		<textarea name="description" id="description" cols="45" rows="7"><tmpl_var name="DESCRIPTION"></textarea>
+		<textarea name="description" id="description" cols="45" rows="7"><TMPL_VAR ESCAPE=1 NAME="DESCRIPTION"></textarea>
 	</p>
-	<tmpl_if name="WARNING_PUBLIC">
+	<TMPL_IF NAME="WARNING_PUBLIC">
 	<p>
 		<TMPL_VAR ESCAPE=1 NAME="WARNING_PUBLIC">
 	</p>
-	</tmpl_if>
-	<input type="hidden" name="oid" value="<tmpl_var name="OID">" />
+	</TMPL_IF>
+	<input type="hidden" name="oid" value="<TMPL_VAR ESCAPE=1 NAME="OID">" />
 	<p class="button" id="buttonSend">
 		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" name="submitted" />
 	</p>

Modified: trunk/vhffs-panel/templates/misc/service_index.tmpl
===================================================================
--- trunk/vhffs-panel/templates/misc/service_index.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/misc/service_index.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,27 +1,27 @@
 <fieldset>
-    <legend><tmpl_var name="TEXT_TITLE"></legend>
-    <ul class="<tmpl_var name="SERVICE">List">
-<tmpl_if name="SERVICES">
-        <tmpl_loop name="SERVICES">
-        <li><tmpl_var name="DISPLAYNAME">
-<tmpl_if name="active">
-    &mdash; <a href="/<tmpl_var name="SERVICE">/prefs.pl?name=<tmpl_var name="DISPLAYNAME">"><tmpl_var name="ADMIN_TEXT"></a> -
+    <legend><TMPL_VAR ESCAPE=1 NAME="TEXT_TITLE"></legend>
+    <ul class="<TMPL_VAR ESCAPE=1 NAME="SERVICE">List">
+<TMPL_IF NAME="SERVICES">
+        <TMPL_LOOP NAME="SERVICES">
+        <li><TMPL_VAR ESCAPE=1 NAME="DISPLAYNAME">
+<TMPL_IF NAME="active">
+    &mdash; <a href="/<TMPL_VAR ESCAPE=1 NAME="SERVICE">/prefs.pl?name=<TMPL_VAR ESCAPE=1 NAME="DISPLAYNAME">"><TMPL_VAR ESCAPE=1 NAME="ADMIN_TEXT"></a> -
 <tmpl_else>
-    (<tmpl_var name="state">) &mdash;
-    <tmpl_if name="refused">
-       <a href="/object/resubmit.pl?oid=<tmpl_var name="OID">"><tmpl_var name="RESUBMIT_TEXT"></a> -
-       <a href="/object/quickdelete.pl?oid=<tmpl_var name="OID">"><tmpl_var name="DELETE_TEXT"></a> -
-    </tmpl_if>
-</tmpl_if>
-<a href="/history.pl?OID=<tmpl_var name="OID">"><tmpl_var name="HISTORY_TEXT"></a>
+    (<TMPL_VAR ESCAPE=1 NAME="state">) &mdash;
+    <TMPL_IF NAME="refused">
+       <a href="/object/resubmit.pl?oid=<TMPL_VAR ESCAPE=1 NAME="OID">"><TMPL_VAR ESCAPE=1 NAME="RESUBMIT_TEXT"></a> -
+       <a href="/object/quickdelete.pl?oid=<TMPL_VAR ESCAPE=1 NAME="OID">"><TMPL_VAR ESCAPE=1 NAME="DELETE_TEXT"></a> -
+    </TMPL_IF>
+</TMPL_IF>
+<a href="/history.pl?OID=<TMPL_VAR ESCAPE=1 NAME="OID">"><TMPL_VAR ESCAPE=1 NAME="HISTORY_TEXT"></a>
 </li>
-        </tmpl_loop>
+        </TMPL_LOOP>
 <tmpl_else>
-        <li><tmpl_var name="NO_SERVICE_TEXT"></li>
-</tmpl_if>
-        <li><a href="/<tmpl_var name="SERVICE">/create.pl"><tmpl_var name="NEW"></a></li>
-        <tmpl_if name="HELP_URL">
-        <li><a href="<tmpl_var name="HELP_URL">"><tmpl_var name="HELP_TEXT"></a></li>
-        </tmpl_if>
+        <li><TMPL_VAR ESCAPE=1 NAME="NO_SERVICE_TEXT"></li>
+</TMPL_IF>
+        <li><a href="/<TMPL_VAR ESCAPE=1 NAME="SERVICE">/create.pl"><TMPL_VAR ESCAPE=1 NAME="NEW"></a></li>
+        <TMPL_IF NAME="HELP_URL">
+        <li><a href="<TMPL_VAR ESCAPE=1 NAME="HELP_URL">"><TMPL_VAR ESCAPE=1 NAME="HELP_TEXT"></a></li>
+        </TMPL_IF>
     </ul>
 </fieldset>

Modified: trunk/vhffs-panel/templates/misc/simplemsg.tmpl
===================================================================
--- trunk/vhffs-panel/templates/misc/simplemsg.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/misc/simplemsg.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,2 +1,2 @@
-<h1 class="message"><tmpl_var name="MESSAGE"></h1>
+<h1 class="message"><TMPL_VAR ESCAPE=1 NAME="MESSAGE"></h1>
 

Modified: trunk/vhffs-panel/templates/misc/welcome.tmpl
===================================================================
--- trunk/vhffs-panel/templates/misc/welcome.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/misc/welcome.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,11 +1,11 @@
-<tmpl_var name="TEXT_WELCOME">
-<tmpl_if name="OVER_QUOTA">
+<TMPL_VAR ESCAPE=1 NAME="TEXT_WELCOME">
+<TMPL_IF NAME="OVER_QUOTA">
 <div id="overQuota">
-<h2><tmpl_var name="OVER_QUOTA_TEXT"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="OVER_QUOTA_TEXT"></h2>
 <ul>
-<tmpl_loop name="OVER_QUOTA">
-    <li><a href="/group/view.pl?project=<tmpl_var name="GROUPNAME">"><tmpl_var name="GROUPNAME"></a></li>
-</tmpl_loop>
+<TMPL_LOOP NAME="OVER_QUOTA">
+    <li><a href="/group/view.pl?project=<TMPL_VAR ESCAPE=1 NAME="GROUPNAME">"><TMPL_VAR ESCAPE=1 NAME="GROUPNAME"></a></li>
+</TMPL_LOOP>
 </ul>
 </div>
-</tmpl_if>
+</TMPL_IF>

Modified: trunk/vhffs-panel/templates/mysql/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mysql/create.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/mysql/create.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -10,7 +10,7 @@
         <label for="db_suffix">
             <TMPL_VAR ESCAPE=1 NAME="DB_SUFFIX">: 
         </label>
-		<TMPL_VAR ESCAPE=1 NAME="DB_PREFIX"><input type="text" name="db_suffix" id="db_suffix" value="<tmpl_var name="DB_SUFFIX_VALUE">"/>
+		<TMPL_VAR ESCAPE=1 NAME="DB_PREFIX"><input type="text" name="db_suffix" id="db_suffix" value="<TMPL_VAR ESCAPE=1 NAME="DB_SUFFIX_VALUE">"/>
 	</p>
 	<p>
 		<label for="db_pass">
@@ -22,7 +22,7 @@
 		<label for="description">
 			<TMPL_VAR ESCAPE=1 NAME="DESCRIPTION">:
 		</label>
-		<textarea name="description" id="description" cols="45" rows="7"><tmpl_var name="DESCRIPTION_VALUE"></textarea>
+		<textarea name="description" id="description" cols="45" rows="7"><TMPL_VAR ESCAPE=1 NAME="DESCRIPTION_VALUE"></textarea>
 	</p>
 	<p class="button" id="buttonSend">
 		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" name="mysql_submit"/>

Modified: trunk/vhffs-panel/templates/mysql/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mysql/prefs.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/mysql/prefs.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -3,73 +3,73 @@
 <form method="post" action="/mysql/prefs.pl" accept-charset="utf-8">
 	<p>
 		<label for="name">
-			<tmpl_var name="TEXT_DBNAME"> :
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_DBNAME"> :
 		</label>
-		<tmpl_var name="VALUE_DBNAME">
-		<input type="hidden" name="name" id="name" value="<tmpl_var name="VALUE_DBNAME">"/>
+		<TMPL_VAR ESCAPE=1 NAME="VALUE_DBNAME">
+		<input type="hidden" name="name" id="name" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_DBNAME">"/>
 	</p>
 	<p>
 		<label for="DBUSER">
-			<tmpl_var name="TEXT_DBUSER"> :
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_DBUSER"> :
 		</label>
-		<tmpl_var name="VALUE_DBUSER">
-		<input type="hidden" name="DBUSER" id="DBUSER" value="<tmpl_var name="VALUE_DBUSER">"/>
+		<TMPL_VAR ESCAPE=1 NAME="VALUE_DBUSER">
+		<input type="hidden" name="DBUSER" id="DBUSER" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_DBUSER">"/>
 	</p>
 	<p class="info">
         <TMPL_I18N KEY="Warning, password change isn't immediate, you've to check periodically to see if it's done">
 	</p>
 	<p>
 		<label for="newpassword">
-			<tmpl_var name="TEXT_DBPASS"> :
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_DBPASS"> :
 		</label>
-		<input type="password" name="newpassword" id="newpassword" value="<tmpl_var name="VALUE_DBPASS">"/>
+		<input type="password" name="newpassword" id="newpassword" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_DBPASS">"/>
 	</p>
 	<p class="button">
-		<input type="submit" value="<tmpl_var name="TEXT_SEND">" name="save_prefs_submit"/>
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_SEND">" name="save_prefs_submit"/>
 	</p>
 </form>
 </fieldset>
 
-<h2><tmpl_var name="TEXT_ACL_ADMIN"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_ACL_ADMIN"></h2>
 		
 <form method="post" action="../acl/view.pl" accept-charset="utf-8">
-	<p><tmpl_var name="EXPLAIN_ADMIN_ACL"></p>
+	<p><TMPL_VAR ESCAPE=1 NAME="EXPLAIN_ADMIN_ACL"></p>
 
-	<input type="hidden" name="target_oid" value="<tmpl_var name="VALUE_OID">" />
+	<input type="hidden" name="target_oid" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_OID">" />
 	<p class="button" id="buttonAclAdmin">
-		<input type="submit" value="<tmpl_var name="ADMIN_ACL">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="ADMIN_ACL">" />
 	</p>
 </form>
 
 
-<h2><tmpl_var name="TEXT_DELETE_MYSQL"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_DELETE_MYSQL"></h2>
 
 <form method="post" action="delete.pl" accept-charset="utf-8">
 	<fieldset class="delete">
 		<legend>
-			<tmpl_var name="ASK_DELETE_MYSQL">:
+			<TMPL_VAR ESCAPE=1 NAME="ASK_DELETE_MYSQL">:
 		</legend>
 
-		<p class="warning"><tmpl_var name="TEXT_BEFORE_DELETE"></p>
+		<p class="warning"><TMPL_VAR ESCAPE=1 NAME="TEXT_BEFORE_DELETE"></p>
 		<p>
 			<input type="radio" name="DELETE" id="DELETE_NO"  value="0" checked="checked" />
 			<label for="DELETE_NO">
-				<tmpl_var name="NO">
+				<TMPL_VAR ESCAPE=1 NAME="NO">
 			</label>
 		</p>
 		<p>
 			<input type="radio" name="DELETE" id="DELETE_YES" value="1" />
 			<label for="DELETE_YES">
-				<tmpl_var name="YES">
+				<TMPL_VAR ESCAPE=1 NAME="YES">
 			</label>
 		</p>
 	</fieldset>
 	
 	<p class="button" id="buttonDelete">
-		<input type="hidden" name="DBNAME" value="<tmpl_var name="VALUE_DBNAME">" />
-		<input type="submit" value="<tmpl_var name="TEXT_DELETE">" />
+		<input type="hidden" name="DBNAME" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_DBNAME">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_DELETE">" />
 	</p>
 				
 </form>
 
-<tmpl_var escape=0 name="ADMIN_PART">
+<TMPL_VAR ESCAPE=0 NAME="ADMIN_PART">

Modified: trunk/vhffs-panel/templates/pgsql/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/pgsql/create.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/pgsql/create.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -10,7 +10,7 @@
         <label for="db_suffix">
             <TMPL_VAR ESCAPE=1 NAME="DB_SUFFIX">: 
         </label>
-		<TMPL_VAR ESCAPE=1 NAME="DB_PREFIX"><input type="text" name="db_suffix" id="db_suffix" value="<tmpl_var name="DB_SUFFIX_VALUE">"/>
+		<TMPL_VAR ESCAPE=1 NAME="DB_PREFIX"><input type="text" name="db_suffix" id="db_suffix" value="<TMPL_VAR ESCAPE=1 NAME="DB_SUFFIX_VALUE">"/>
 	</p>
 	<p>
 		<label for="db_pass">
@@ -22,7 +22,7 @@
 		<label for="description">
 			<TMPL_VAR ESCAPE=1 NAME="DESCRIPTION">:
 		</label>
-		<textarea name="description" id="description" cols="45" rows="7"><tmpl_var name="DESCRIPTION_VALUE"></textarea>
+		<textarea name="description" id="description" cols="45" rows="7"><TMPL_VAR ESCAPE=1 NAME="DESCRIPTION_VALUE"></textarea>
 	</p>
 	<p class="button" id="buttonSend">
 		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" name="pgsql_submit"/>

Modified: trunk/vhffs-panel/templates/pgsql/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/pgsql/prefs.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/pgsql/prefs.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,71 +1,71 @@
 <form method="post" action="/pgsql/prefs.pl" accept-charset="utf-8">
 	<p>
 		<label>
-			<tmpl_var name="TEXT_DBNAME"> :
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_DBNAME"> :
 		</label>
-		<tmpl_var name="VALUE_DBNAME">
+		<TMPL_VAR ESCAPE=1 NAME="VALUE_DBNAME">
 	</p>
 	<p>
 		<label>
-			<tmpl_var name="TEXT_DBUSER"> :
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_DBUSER"> :
 		</label>
-		<tmpl_var name="VALUE_DBUSER">
+		<TMPL_VAR ESCAPE=1 NAME="VALUE_DBUSER">
 	</p>
     <p class="info">
         <TMPL_I18N KEY="Warning, password change isn't immediate, you've to check periodically to see if it's done">
     </p>
 	<p>
 		<label for="newpassword">
-			<tmpl_var name="TEXT_DBPASS"> :
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_DBPASS"> :
 		</label>
-		<input type="password" name="newpassword" id="newpassword" value="<tmpl_var name="VALUE_DBPASS">"/>
+		<input type="password" name="newpassword" id="newpassword" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_DBPASS">"/>
 	</p>
 	<p class="button">
         <input type="hidden" name="name" value="<TMPL_VAR ESCAPE=1 NAME="value_dbname">"/>
-		<input type="submit" value="<tmpl_var name="TEXT_SEND">" name="save_prefs_submit"/>
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_SEND">" name="save_prefs_submit"/>
 	</p>
 </form>
 
-<h2><tmpl_var name="TEXT_ACL_ADMIN"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_ACL_ADMIN"></h2>
 		
 <form method="post" action="../acl/view.pl" accept-charset="utf-8">
-	<p><tmpl_var name="EXPLAIN_ADMIN_ACL"></p>
+	<p><TMPL_VAR ESCAPE=1 NAME="EXPLAIN_ADMIN_ACL"></p>
 
-	<input type="hidden" name="target_oid" value="<tmpl_var name="VALUE_OID">" />
+	<input type="hidden" name="target_oid" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_OID">" />
 	<p class="button" id="buttonAclAdmin">
-		<input type="submit" value="<tmpl_var name="ADMIN_ACL">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="ADMIN_ACL">" />
 	</p>
 </form>
 
 
-<h2><tmpl_var name="TEXT_DELETE_PGSQL"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_DELETE_PGSQL"></h2>
 
 <form method="post" action="delete.pl" accept-charset="utf-8">
 	<fieldset class="delete">
 		<legend>
-			<tmpl_var name="ASK_DELETE_PGSQL">:
+			<TMPL_VAR ESCAPE=1 NAME="ASK_DELETE_PGSQL">:
 		</legend>
 
-		<p class="warning"><tmpl_var name="TEXT_BEFORE_DELETE"></p>
+		<p class="warning"><TMPL_VAR ESCAPE=1 NAME="TEXT_BEFORE_DELETE"></p>
 		<p>
 			<input type="radio" name="DELETE" id="DELETE_NO"  value="0" checked="checked" />
 			<label for="DELETE_NO">
-				<tmpl_var name="NO">
+				<TMPL_VAR ESCAPE=1 NAME="NO">
 			</label>
 		</p>
 		<p>
 			<input type="radio" name="DELETE" id="DELETE_YES" value="1" />
 			<label for="DELETE_YES">
-				<tmpl_var name="YES">
+				<TMPL_VAR ESCAPE=1 NAME="YES">
 			</label>
 		</p>
 	</fieldset>
 	
 	<p class="button" id="buttonDelete">
-		<input type="hidden" name="DBNAME" value="<tmpl_var name="VALUE_DBNAME">" />
-		<input type="submit" value="<tmpl_var name="TEXT_DELETE">" />
+		<input type="hidden" name="DBNAME" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_DBNAME">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_DELETE">" />
 	</p>
 				
 </form>
 
-<tmpl_var escape=0 name="ADMIN_PART">
+<TMPL_VAR ESCAPE=0 NAME="ADMIN_PART">

Modified: trunk/vhffs-panel/templates/repository/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/repository/create.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/repository/create.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -15,7 +15,7 @@
 		<label for="description">
 			<TMPL_VAR ESCAPE=1 NAME="DESCRIPTION">:
 		</label>	
-		<textarea name="description" id="description" cols="45" rows="7"><tmpl_var name="DESCRIPTION_VALUE"></textarea>
+		<textarea name="description" id="description" cols="45" rows="7"><TMPL_VAR ESCAPE=1 NAME="DESCRIPTION_VALUE"></textarea>
 	</p>
 	<p class="button" id="buttonSend">
 		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" name="repo_submit"/>

Modified: trunk/vhffs-panel/templates/repository/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/repository/prefs.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/repository/prefs.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,53 +1,53 @@
-<h2><tmpl_var name="TEXT_REPONAME"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_REPONAME"></h2>
 
 <div class="info_quota">
     <div id="repo_quota">
-        <img src="/themes/<tmpl_var name="THEME">/images/quota_progress.png" width="<tmpl_var name="QUOTA_WIDTH">" alt="<tmpl_var name="QUOTA_WIDTH">"/>
+        <img src="/themes/<TMPL_VAR ESCAPE=1 NAME="THEME">/images/quota_progress.png" width="<TMPL_VAR ESCAPE=1 NAME="QUOTA_WIDTH">" alt="<TMPL_VAR ESCAPE=1 NAME="QUOTA_WIDTH">"/>
     </div>
-    <p><tmpl_var name="QUOTA_VALUE"></p>
+    <p><TMPL_VAR ESCAPE=1 NAME="QUOTA_VALUE"></p>
 </div>
 
-<h2><tmpl_var name="TEXT_ACL_ADMIN"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_ACL_ADMIN"></h2>
 
 <form method="post" action="../acl/view.pl" accept-charset="utf-8">
-<p><tmpl_var name="EXPLAIN_ADMIN_ACL"></p>
+<p><TMPL_VAR ESCAPE=1 NAME="EXPLAIN_ADMIN_ACL"></p>
 
 	<p class="button" id="buttonSendAcl">
-        <input type="hidden" name="target_oid" value="<tmpl_var name="VALUE_OID">" />
-        <input type="submit" value="<tmpl_var name="ADMIN_ACL">" />
+        <input type="hidden" name="target_oid" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_OID">" />
+        <input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="ADMIN_ACL">" />
 	</p>
 </form>
 
 
-<h2><tmpl_var name="TEXT_DELETE_REPOSITORY"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_DELETE_REPOSITORY"></h2>
 
 <form method="post" action="delete.pl" accept-charset="utf-8">
 	<fieldset class="delete">
 		<legend>
-			<tmpl_var name="ASK_DELETE_REPOSITORY">:
+			<TMPL_VAR ESCAPE=1 NAME="ASK_DELETE_REPOSITORY">:
 		</legend>
 		
-		<p class="warning"><tmpl_var name="TEXT_BEFORE_DELETE"></p>
+		<p class="warning"><TMPL_VAR ESCAPE=1 NAME="TEXT_BEFORE_DELETE"></p>
 
 		<p>
 			<input type="radio" name="DELETE" id="DELETE_NO" value="0" checked="checked" />
 			<label for="DELETE_NO">
-				<tmpl_var name="NO">
+				<TMPL_VAR ESCAPE=1 NAME="NO">
 			</label>
 		</p>
 		<p>
 			<input type="radio" name="DELETE" id="DELETE_YES" value="1" />	
 			<label for="DELETE_YES">
-				<tmpl_var name="YES">
+				<TMPL_VAR ESCAPE=1 NAME="YES">
 			</label>
 		</p>
 	</fieldset>
 		
 		
 	<p class="button" id="buttonSend">
-		<input type="hidden" name="REPO_NAME" value="<tmpl_var name="TEXT_REPONAME">" />
-		<input type="submit" value="<tmpl_var name="TEXT_DELETE">" />
+		<input type="hidden" name="REPO_NAME" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_REPONAME">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_DELETE">" />
 	</p>
 </form>
 
-<tmpl_var escape=0 name="ADMIN_PART">
+<TMPL_VAR ESCAPE=0 NAME="ADMIN_PART">

Modified: trunk/vhffs-panel/templates/svn/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/svn/create.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/svn/create.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -9,13 +9,13 @@
 		<label for="reponame">
 			<TMPL_VAR ESCAPE=1 NAME="REPOSITORY_NAME">: 
 		</label>	
-		<TMPL_VAR ESCAPE=1 NAME="GROUP">/<input type="text" name="reponame" id="reponame" value="<tmpl_var name="REPOSITORY_VALUE">"/>
+		<TMPL_VAR ESCAPE=1 NAME="GROUP">/<input type="text" name="reponame" id="reponame" value="<TMPL_VAR ESCAPE=1 NAME="REPOSITORY_VALUE">"/>
 	</p>
 	<p>
 		<label for="PROJECT_USAGE">
 			<TMPL_VAR ESCAPE=1 NAME="description">:
 		</label>
-		<textarea name="description" id="description"  cols="45" rows="7"><tmpl_var name="DESCRIPTION_VALUE"></textarea>
+		<textarea name="description" id="description"  cols="45" rows="7"><TMPL_VAR ESCAPE=1 NAME="DESCRIPTION_VALUE"></textarea>
 	</p>
 	<p class="button" id="buttonSend">
 		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" name="svn_submit"/>

Modified: trunk/vhffs-panel/templates/svn/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/svn/prefs.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/svn/prefs.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,67 +1,67 @@
 <form method="post" action="/svn/prefs.pl" accept-charset="utf-8">
-<h2><tmpl_var name="TITLE_PUBLIC"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TITLE_PUBLIC"></h2>
 	<p>
 		<label for="public">
-			<tmpl_var name="TEXT_PUBLIC"> :
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_PUBLIC"> :
 		</label>
 		<select name="public" id="public">
-			<option value="1" <tmpl_var name="YES_SELECTED">><tmpl_var name="PUBLIC_YES"></option>
-			<option value="0" <tmpl_var name="NO_SELECTED">><tmpl_var name="PUBLIC_NO"></option>
+			<option value="1" <TMPL_VAR ESCAPE=1 NAME="YES_SELECTED">><TMPL_VAR ESCAPE=1 NAME="PUBLIC_YES"></option>
+			<option value="0" <TMPL_VAR ESCAPE=1 NAME="NO_SELECTED">><TMPL_VAR ESCAPE=1 NAME="PUBLIC_NO"></option>
 		</select>
 	</p>
-<h2><tmpl_var name="TITLE_OPT"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TITLE_OPT"></h2>
 	<p>
-		<label for="option"><tmpl_var name="TEXT_OPT_ML"></label>
-                <input type="text" name="ml_name" value="<tmpl_var name="TEXT_ML_NAME">" />
+		<label for="option"><TMPL_VAR ESCAPE=1 NAME="TEXT_OPT_ML"></label>
+                <input type="text" name="ml_name" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_ML_NAME">" />
 		<br/>
-		<tmpl_var name="TEXT_OPT_ML_REMINDER">
+		<TMPL_VAR ESCAPE=1 NAME="TEXT_OPT_ML_REMINDER">
 	</p>
 	<p class="button">
-		<input type="hidden" name="name" value="<tmpl_var name="TEXT_REPONAME">" />
-		<input type="submit" value="<tmpl_var name="TEXT_SEND">" name="prefs_save_submit"/>
+		<input type="hidden" name="name" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_REPONAME">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_SEND">" name="prefs_save_submit"/>
 	</p>
 </form>
 
-<h2><tmpl_var name="TEXT_ACL_ADMIN"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_ACL_ADMIN"></h2>
 		
 <form method="post" action="../acl/view.pl" accept-charset="utf-8">
-	<p><tmpl_var name="EXPLAIN_ADMIN_ACL"></p>
+	<p><TMPL_VAR ESCAPE=1 NAME="EXPLAIN_ADMIN_ACL"></p>
 
-	<input type="hidden" name="target_oid" value="<tmpl_var name="VALUE_OID">" />
+	<input type="hidden" name="target_oid" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_OID">" />
 	<p class="button" id="buttonAclAdmin">
-		<input type="submit" value="<tmpl_var name="ADMIN_ACL">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="ADMIN_ACL">" />
 	</p>
 </form>
 
 
-<h2><tmpl_var name="TEXT_DELETE_CVS"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_DELETE_CVS"></h2>
 
 <form method="post" action="delete.pl" accept-charset="utf-8">
 	<fieldset class="delete">
 		<legend>
-			<tmpl_var name="ASK_DELETE_CVS">:
+			<TMPL_VAR ESCAPE=1 NAME="ASK_DELETE_CVS">:
 		</legend>
 
-		<p class="warning"><tmpl_var name="TEXT_BEFORE_DELETE"></p>
+		<p class="warning"><TMPL_VAR ESCAPE=1 NAME="TEXT_BEFORE_DELETE"></p>
 		<p>
 			<input type="radio" name="DELETE" id="DELETE_NO"  value="0" checked="checked" />
 			<label for="DELETE_NO">
-				<tmpl_var name="NO">
+				<TMPL_VAR ESCAPE=1 NAME="NO">
 			</label>
 		</p>
 		<p>
 			<input type="radio" name="DELETE" id="DELETE_YES" value="1" />
 			<label for="DELETE_YES">
-				<tmpl_var name="YES">
+				<TMPL_VAR ESCAPE=1 NAME="YES">
 			</label>
 		</p>
 	</fieldset>
 	
 	<p class="button" id="buttonDelete">
-		<input type="hidden" name="name" value="<tmpl_var name="TEXT_REPONAME">" />
-		<input type="submit" value="<tmpl_var name="TEXT_DELETE">" />
+		<input type="hidden" name="name" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_REPONAME">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_DELETE">" />
 	</p>
 				
 </form>
 
-<tmpl_var escape=0 name="ADMIN_PART">
+<TMPL_VAR ESCAPE=0 NAME="ADMIN_PART">

Modified: trunk/vhffs-panel/templates/svn/user_part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/svn/user_part.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/svn/user_part.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,19 +1,19 @@
 
 <tr>
-	<td><tmpl_var name="VALUE_USERNAME"></td>
+	<td><TMPL_VAR ESCAPE=1 NAME="VALUE_USERNAME"></td>
 	<td>
 		<form method="post" action="svn_chpwd.pl" accept-charset="utf-8">
 			<input type="text" name="PASSWORD" value="" />
-			<input type="hidden" name="REPO" value="<tmpl_var name="VALUE_REPONAME">" />
-			<input type="hidden" name="USERNAME" value="<tmpl_var name="VALUE_USERNAME">" />
-			<input type="submit" value="<tmpl_var name="TEXT_BUTTON_CHANGEPWD">" />
+			<input type="hidden" name="REPO" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_REPONAME">" />
+			<input type="hidden" name="USERNAME" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_USERNAME">" />
+			<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_BUTTON_CHANGEPWD">" />
 		</form>
 	</td>
 	<td>
 		<form method="post" action="svn_deleteuser.pl" accept-charset="utf-8">
-			<input type="hidden" name="REPO" value="<tmpl_var name="VALUE_REPONAME">" />
-			<input type="hidden" name="USERNAME" value="<tmpl_var name="VALUE_USERNAME">" />
-			<input type="submit" value="<tmpl_var name="TEXT_BUTTON_DELETE">" />
+			<input type="hidden" name="REPO" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_REPONAME">" />
+			<input type="hidden" name="USERNAME" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_USERNAME">" />
+			<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_BUTTON_DELETE">" />
 		</form>
 	</td>
 </tr>

Modified: trunk/vhffs-panel/templates/user/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/user/create.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/user/create.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -2,27 +2,27 @@
 </div>
 <div id="subscribe">		
 		<div id="content">
-			<h1><tmpl_var name="TEXT_SUBSCRIBE"></h1>
-                <p class="info"><tmpl_var name="TEXT_INFOS"></p>
+			<h1><TMPL_VAR ESCAPE=1 NAME="TEXT_SUBSCRIBE"></h1>
+                <p class="info"><TMPL_VAR ESCAPE=1 NAME="TEXT_INFOS"></p>
                 <div class="subscribe">
                 <form method="post" action="subscribe.pl" accept-charset="utf-8">
                 <div id="errors">
-                    <tmpl_loop name="ERRORS">
-                        <p class="error"><tmpl_var name="ERROR"></p>
-                    </tmpl_loop>
+                    <TMPL_LOOP NAME="ERRORS">
+                        <p class="error"><TMPL_VAR ESCAPE=1 NAME="ERROR"></p>
+                    </TMPL_LOOP>
                 </div>
 
 				<p>
 					<label for="USERNAME">
 						<TMPL_VAR ESCAPE=1 NAME="USERNAME_TEXT">
 					</label>
-					<span><input type="text" name="USERNAME" id="USERNAME" maxlength="12" value="<TMPL_VAR ESCAPE=1 NAME="USERNAME_VALUE">" onchange="javascript:check(this.id, validIdentifier, 12);" onkeyup="javascript:check(this.id, validIdentifier, 12);"/>&nbsp;</span>&nbsp;<img src="/themes/<tmpl_var name="THEME">/images/tip.png" alt="tip" id="username_tip_trigger"/>
+					<span><input type="text" name="USERNAME" id="USERNAME" maxlength="12" value="<TMPL_VAR ESCAPE=1 NAME="USERNAME_VALUE">" onchange="javascript:check(this.id, validIdentifier, 12);" onkeyup="javascript:check(this.id, validIdentifier, 12);"/>&nbsp;</span>&nbsp;<img src="/themes/<TMPL_VAR ESCAPE=1 NAME="THEME">/images/tip.png" alt="tip" id="username_tip_trigger"/>
                 </p>
 				<p>
 					<label for="MAIL">
 						<TMPL_VAR ESCAPE=1 NAME="MAIL_TEXT">
 					</label>
-					<span><input type="text" name="MAIL" id="MAIL" maxlength="200" value="<TMPL_VAR ESCAPE=1 NAME="MAIL_VALUE">" onkeyup="javascript:check(this.id, validEmail);"/>&nbsp;</span>&nbsp;<img src="/themes/<tmpl_var name="THEME">/images/tip.png" alt="tip" id="email_tip_trigger"/>
+					<span><input type="text" name="MAIL" id="MAIL" maxlength="200" value="<TMPL_VAR ESCAPE=1 NAME="MAIL_VALUE">" onkeyup="javascript:check(this.id, validEmail);"/>&nbsp;</span>&nbsp;<img src="/themes/<TMPL_VAR ESCAPE=1 NAME="THEME">/images/tip.png" alt="tip" id="email_tip_trigger"/>
 				</p>
 				<p>
 					<label for="FIRSTNAME">
@@ -64,7 +64,7 @@
 					<label for="CONFIRMATION">
 						<TMPL_VAR ESCAPE=1 NAME="CONFIRMATION_TEXT">
 					</label>
-						<img src="show_code.pl?code=<TMPL_VAR ESCAPE=1 NAME="MD5_CODE">" alt="<tmpl_var name="CONFIRMATION_ALT">"/>
+						<img src="show_code.pl?code=<TMPL_VAR ESCAPE=1 NAME="MD5_CODE">" alt="<TMPL_VAR ESCAPE=1 NAME="CONFIRMATION_ALT">"/>
 				</p>
 				<p>
 					<label for="CONFIRMATION">
@@ -78,10 +78,10 @@
 				</p>
 			</form>
 			</div>
-		    <p class="home"><a href="/auth.pl"><tmpl_var name="BACK"></a></p>
+		    <p class="home"><a href="/auth.pl"><TMPL_VAR ESCAPE=1 NAME="BACK"></a></p>
 		</div>
-        <div id="email_tooltip" class="tooltip"><tmpl_var name="EMAIL_TIP_TEXT"></div>
-        <div id="username_tooltip" class="tooltip"><tmpl_var name="USERNAME_TIP_TEXT"></div>
+        <div id="email_tooltip" class="tooltip"><TMPL_VAR ESCAPE=1 NAME="EMAIL_TIP_TEXT"></div>
+        <div id="username_tooltip" class="tooltip"><TMPL_VAR ESCAPE=1 NAME="USERNAME_TIP_TEXT"></div>
         <script type="text/javascript">
             new Tooltip('username_tip_trigger', 'username_tooltip', { delta_x: 5, delta_y: 5 });
             new Tooltip('email_tip_trigger', 'email_tooltip', { delta_x: 5, delta_y: 5 });

Modified: trunk/vhffs-panel/templates/user/create_complete.tmpl
===================================================================
--- trunk/vhffs-panel/templates/user/create_complete.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/user/create_complete.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -4,5 +4,5 @@
 <h2><TMPL_VAR ESCAPE=1 NAME="GOOD_NEWS"></h2>
 <h2><TMPL_VAR ESCAPE=1 NAME="GOOD_NEWS2"></h2>
 <h2 class="error"><TMPL_VAR ESCAPE=1 NAME="BAD_NEWS"></h2>
-<p class="button"><a href="/auth.pl"><tmpl_var name="TEXT_BACK"></a></p>
+<p class="button"><a href="/auth.pl"><TMPL_VAR ESCAPE=1 NAME="TEXT_BACK"></a></p>
 </div>

Modified: trunk/vhffs-panel/templates/user/mailuser.tmpl
===================================================================
--- trunk/vhffs-panel/templates/user/mailuser.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/user/mailuser.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,6 +1,6 @@
 				<fieldset id="chooseMailMode">
 					<legend>
-						<tmpl_var name="TEXT_LEGEND">
+						<TMPL_VAR ESCAPE=1 NAME="TEXT_LEGEND">
 					</legend>
 					
 		<tmpl_unless name="STATUSSTR">
@@ -8,33 +8,33 @@
 					<p>
 						<input name="mail_activate" id="mail_activate" class="labeled"
                             type="checkbox"
-                            <tmpl_if name="ACTIV_CHECKED">checked="checked"</tmpl_if>
+                            <TMPL_IF NAME="ACTIV_CHECKED">checked="checked"</TMPL_IF>
                             onchange="javascript:Element.toggle('mail_prefs');"/>
-                            <label for="mail_activate"><tmpl_var name="TEXT_MAILACTIV"></label>
+                            <label for="mail_activate"><TMPL_VAR ESCAPE=1 NAME="TEXT_MAILACTIV"></label>
 					</p>
                     <div id="mail_prefs"<tmpl_unless name="ACTIV_CHECKED">style="display:none"</tmpl_unless>>
-					<p><tmpl_var name="TEXT_MAILINFO2"></p>
+					<p><TMPL_VAR ESCAPE=1 NAME="TEXT_MAILINFO2"></p>
 					
 					<p>
 						<input name="mail_usage" id="mail_usage_box" value="1" type="radio"
-                            class="labeled" <tmpl_if name="POP_CHECKED">checked="checked"</tmpl_if>
+                            class="labeled" <TMPL_IF NAME="POP_CHECKED">checked="checked"</TMPL_IF>
                             onchange="javascript:document.getElementById('mbox_options').style.display='';"/>
-						<label for="mail_usage_box" ><tmpl_var name="TEXT_MAILBOX"></label>
+						<label for="mail_usage_box" ><TMPL_VAR ESCAPE=1 NAME="TEXT_MAILBOX"></label>
 					</p>
 					<div id="mbox_options" <tmpl_unless name="POP_CHECKED">style="display:none"</tmpl_unless>>
-<tmpl_var name="MAILUSER_OPTIONS">
+<TMPL_VAR ESCAPE=1 NAME="MAILUSER_OPTIONS">
 					</div>
 					<p>
 						<input name="mail_usage" 
                             id="mail_usage_foward" value="2" class="labeled"
-                            type="radio" <tmpl_if name="FWD_CHECKED">checked="checked"</tmpl_if>
+                            type="radio" <TMPL_IF NAME="FWD_CHECKED">checked="checked"</TMPL_IF>
                             onchange="javascript:document.getElementById('mbox_options').style.display='none';" />
-						<label for="mail_usage_foward"><tmpl_var name="TEXT_MAILFORWARD"></label>
+						<label for="mail_usage_foward"><TMPL_VAR ESCAPE=1 NAME="TEXT_MAILFORWARD"></label>
 					</p>
 					</div>
 
 
 		<tmpl_else>
-				<tmpl_var name="STATUSSTR">
+				<TMPL_VAR ESCAPE=1 NAME="STATUSSTR">
 		</tmpl_unless>
 				</fieldset>

Modified: trunk/vhffs-panel/templates/user/mailuserspam.tmpl
===================================================================
--- trunk/vhffs-panel/templates/user/mailuserspam.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/user/mailuserspam.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,3 +1,3 @@
 <p><input name="mail_nospam" id="mail_nospam" type="checkbox"
-    class="labeled" <tmpl_var name="ACTIV_CHECKED">/>
-    <label for="mail_nospam"><tmpl_var name="TEXT_NOSPAM"></label></p>
+    class="labeled" <TMPL_VAR ESCAPE=1 NAME="ACTIV_CHECKED">/>
+    <label for="mail_nospam"><TMPL_VAR ESCAPE=1 NAME="TEXT_NOSPAM"></label></p>

Modified: trunk/vhffs-panel/templates/user/mailuservirus.tmpl
===================================================================
--- trunk/vhffs-panel/templates/user/mailuservirus.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/user/mailuservirus.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,3 +1,3 @@
 <p><input name="mail_novirus" id="mail_novirus" type="checkbox"
-    class="labeled" <tmpl_var name="ACTIV_CHECKED">/>
-    <label for="mail_novirus"><tmpl_var name="TEXT_VIRUS"></label></p>
+    class="labeled" <TMPL_VAR ESCAPE=1 NAME="ACTIV_CHECKED">/>
+    <label for="mail_novirus"><TMPL_VAR ESCAPE=1 NAME="TEXT_VIRUS"></label></p>

Modified: trunk/vhffs-panel/templates/user/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/user/prefs.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/user/prefs.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,114 +1,114 @@
 
 			<form method="post" action="/user/prefs.pl" accept-charset="utf-8">
 				<p>
-					<label><tmpl_var name="TEXT_USERNAME"> :</label>
-					<span class="formInput"><tmpl_var name="VALUE_USERNAME"></span>
+					<label><TMPL_VAR ESCAPE=1 NAME="TEXT_USERNAME"> :</label>
+					<span class="formInput"><TMPL_VAR ESCAPE=1 NAME="VALUE_USERNAME"></span>
 				</p>
 	
 				<p>
-					<label for="FIRSTNAME"><tmpl_var name="TEXT_FIRSTNAME"> :</label>
-					<input name="FIRSTNAME" id="FIRSTNAME" value="<tmpl_var name="VALUE_FIRSTNAME">" type="text" />
+					<label for="FIRSTNAME"><TMPL_VAR ESCAPE=1 NAME="TEXT_FIRSTNAME"> :</label>
+					<input name="FIRSTNAME" id="FIRSTNAME" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_FIRSTNAME">" type="text" />
 				</p>
 				
 				<p>
-					<label for="LASTNAME"><tmpl_var name="TEXT_LASTNAME"> :</label>
-					<input name="LASTNAME" id="LASTNAME"  value="<tmpl_var name="VALUE_LASTNAME">" type="text" />
+					<label for="LASTNAME"><TMPL_VAR ESCAPE=1 NAME="TEXT_LASTNAME"> :</label>
+					<input name="LASTNAME" id="LASTNAME"  value="<TMPL_VAR ESCAPE=1 NAME="VALUE_LASTNAME">" type="text" />
 				</p>
 			
 				<p>
-					<label for="MAIL"><tmpl_var name="TEXT_MAIL"> :</label>
-					<input name="MAIL" id="MAIL" maxlength="200" value="<tmpl_var name="VALUE_MAIL">" type="text" />
+					<label for="MAIL"><TMPL_VAR ESCAPE=1 NAME="TEXT_MAIL"> :</label>
+					<input name="MAIL" id="MAIL" maxlength="200" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_MAIL">" type="text" />
 				</p>
 				
 				<p>
-					<label for="ADDRESS"><tmpl_var name="TEXT_ADDRESS"> :</label>
-					<input name="ADDRESS" id="ADDRESS" value="<tmpl_var name="VALUE_ADDRESS">" type="text" />
+					<label for="ADDRESS"><TMPL_VAR ESCAPE=1 NAME="TEXT_ADDRESS"> :</label>
+					<input name="ADDRESS" id="ADDRESS" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_ADDRESS">" type="text" />
 				</p>
 
 				<p>
-					<label for="CITY"><tmpl_var name="TEXT_CITY"> :</label>
-					<input name="CITY" id="CITY" value="<tmpl_var name="VALUE_CITY">" type="text" />
+					<label for="CITY"><TMPL_VAR ESCAPE=1 NAME="TEXT_CITY"> :</label>
+					<input name="CITY" id="CITY" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_CITY">" type="text" />
 				</p>
 
 				<p>
-					<label for="ZIPCODE"><tmpl_var name="TEXT_ZIPCODE"> :</label>
-					<input name="ZIPCODE" id="ZIPCODE" value="<tmpl_var name="VALUE_ZIPCODE">" type="text" />
+					<label for="ZIPCODE"><TMPL_VAR ESCAPE=1 NAME="TEXT_ZIPCODE"> :</label>
+					<input name="ZIPCODE" id="ZIPCODE" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_ZIPCODE">" type="text" />
 				</p>
 	
 				<p>
-					<label for="COUNTRY"><tmpl_var name="TEXT_COUNTRY"> :</label>
-					<input name="COUNTRY" id="COUNTRY" value="<tmpl_var name="VALUE_COUNTRY">" type="text" />
+					<label for="COUNTRY"><TMPL_VAR ESCAPE=1 NAME="TEXT_COUNTRY"> :</label>
+					<input name="COUNTRY" id="COUNTRY" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_COUNTRY">" type="text" />
 				</p>
 
 				<p>
-					<label for="PASSWORD1"><tmpl_var name="TEXT_PASSWORD1"> :</label>
+					<label for="PASSWORD1"><TMPL_VAR ESCAPE=1 NAME="TEXT_PASSWORD1"> :</label>
 					<input name="PASSWORD1" id="PASSWORD1" value="" type="password" />
 				</p>
 				
 				<p>
-					<label for="PASSWORD2"><tmpl_var name="TEXT_PASSWORD2"> :</label>
+					<label for="PASSWORD2"><TMPL_VAR ESCAPE=1 NAME="TEXT_PASSWORD2"> :</label>
 					<input name="PASSWORD2" id="PASSWORD2" value="" type="password" />
 				</p>
 
 				<p>
-					<label for="LANG"><tmpl_var name="TEXT_LANG"> :</label>
+					<label for="LANG"><TMPL_VAR ESCAPE=1 NAME="TEXT_LANG"> :</label>
 					<select name="LANG" id="LANG">
-						<tmpl_var escape=0 name="LANG_LIST">
+						<TMPL_VAR ESCAPE=0 NAME="LANG_LIST">
 					</select>
 				</p>
 
 				<p>
-					<label for="THEME"><tmpl_var name="TEXT_THEME"> :</label>
+					<label for="THEME"><TMPL_VAR ESCAPE=1 NAME="TEXT_THEME"> :</label>
 					<select name="THEME" id="THEME">
-						<tmpl_var escape=0 name="THEME_LIST">
+						<TMPL_VAR ESCAPE=0 NAME="THEME_LIST">
 					</select>
 				</p>
 
 				<p>
-					<label for="SHELL"><tmpl_var name="TEXT_SHELL"> :</label>
+					<label for="SHELL"><TMPL_VAR ESCAPE=1 NAME="TEXT_SHELL"> :</label>
 					<select name="SHELL" id="SHELL">
-						<tmpl_var escape=0 name="SHELL_LIST">
+						<TMPL_VAR ESCAPE=0 NAME="SHELL_LIST">
 					</select>
 				</p>
 				
-				<tmpl_var escape=0 name="MAILUSER">
+				<TMPL_VAR ESCAPE=0 NAME="MAILUSER">
 				
 				<p class="button" id="buttonModify">
-					<tmpl_if name="HELP_URL">
-					<a href="<tmpl_var name="HELP_URL">"><tmpl_var name="HELP_TEXT"></a>
-					</tmpl_if>
-					<input  type="submit"  value="<tmpl_var name="TEXT_SEND">" name="prefs_submit" id="prefs_submit"/>
+					<TMPL_IF NAME="HELP_URL">
+					<a href="<TMPL_VAR ESCAPE=1 NAME="HELP_URL">"><TMPL_VAR ESCAPE=1 NAME="HELP_TEXT"></a>
+					</TMPL_IF>
+					<input  type="submit"  value="<TMPL_VAR ESCAPE=1 NAME="TEXT_SEND">" name="prefs_submit" id="prefs_submit"/>
 				</p>
 
-				<input type="hidden" name="name" value="<tmpl_var name="VALUE_USERNAME">" />
+				<input type="hidden" name="name" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_USERNAME">" />
 			</form>
 
-			<tmpl_var escape=0 name="AVATAR">
+			<TMPL_VAR ESCAPE=0 NAME="AVATAR">
 			
-			<h2><tmpl_var name="TEXT_DELETE_USER"></h2>
+			<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_DELETE_USER"></h2>
 			
 			<form method="post" action="/user/delete.pl" accept-charset="utf-8">
 			
-				<p><tmpl_var name="TEXT_BEFORE_DELETE"></p>
+				<p><TMPL_VAR ESCAPE=1 NAME="TEXT_BEFORE_DELETE"></p>
 				
 				<fieldset id="deleteUser" class="delete">
 					<legend>
-						<tmpl_var name="ASK_DELETE_USER"> :
+						<TMPL_VAR ESCAPE=1 NAME="ASK_DELETE_USER"> :
 					</legend>
 					
 					<p>
 						<input type="radio" name="DELETE" id="DELETENo" value="0" checked="checked" />
-						<label for="DELETENo"><tmpl_var name="NO"></label>
+						<label for="DELETENo"><TMPL_VAR ESCAPE=1 NAME="NO"></label>
 					</p>
 					<p>
 						<input type="radio" name="DELETE" id="DELETEYes" value="1" />
-						<label for="DELETEYes"><tmpl_var name="YES"></label>
+						<label for="DELETEYes"><TMPL_VAR ESCAPE=1 NAME="YES"></label>
 					</p>
 				</fieldset>
 				
 				<p class="button" id="buttonDelete">
-					<input type="hidden" name="name" value="<tmpl_var name="VALUE_USERNAME">" />
-					<input type="submit" value="<tmpl_var name="TEXT_DELETE">" />
+					<input type="hidden" name="name" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_USERNAME">" />
+					<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_DELETE">" />
 				</p>
                                 
 			</form>

Modified: trunk/vhffs-panel/templates/user/prefs_avatar.tmpl
===================================================================
--- trunk/vhffs-panel/templates/user/prefs_avatar.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/user/prefs_avatar.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,14 +1,14 @@
-			<h2><tmpl_var name="TEXT_AVATAR"></h2>
+			<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_AVATAR"></h2>
 			<form method="post" action="../object/upavatar.pl" enctype="multipart/form-data" accept-charset="utf-8">
-				<h3><tmpl_var name="CURRENT_AVATAR"></h3>
-				<img alt="avatar for your user" src="/getavatar.pl?oid=<tmpl_var name="VALUE_OID">"/>
+				<h3><TMPL_VAR ESCAPE=1 NAME="CURRENT_AVATAR"></h3>
+				<img alt="avatar for your user" src="/getavatar.pl?oid=<TMPL_VAR ESCAPE=1 NAME="VALUE_OID">"/>
 				<p>
-				<tmpl_var name="EXPLAIN_AVATAR">
+				<TMPL_VAR ESCAPE=1 NAME="EXPLAIN_AVATAR">
 				</p>
-		        <input type="hidden" name="OID" value="<tmpl_var name="VALUE_OID">"/>
+		        <input type="hidden" name="OID" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_OID">"/>
 
 				<input type="file" name="avatar" tabindex="1" size="45"/>
 				<br/>
-				<input type="submit" value="<tmpl_var name="SEND_AVATAR">" />
+				<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND_AVATAR">" />
 				<input type="hidden" name=".cgifields" value="type"  />
 			</form>

Modified: trunk/vhffs-panel/templates/web/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/web/create.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/web/create.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -18,13 +18,13 @@
 		<label for="description">		
 			<TMPL_VAR ESCAPE=1 NAME="DESCRIPTION">:
 		</label>
-		<textarea name="description" id="description" cols="45" rows="7"><tmpl_var name="DESCRIPTION_VALUE"></textarea>
+		<textarea name="description" id="description" cols="45" rows="7"><TMPL_VAR ESCAPE=1 NAME="DESCRIPTION_VALUE"></textarea>
 	</p>
-	<tmpl_if name="WARNING_PUBLIC">
+	<TMPL_IF NAME="WARNING_PUBLIC">
 	<p>
 		<TMPL_VAR ESCAPE=1 NAME="WARNING_PUBLIC">
 	</p>
-	</tmpl_if>
+	</TMPL_IF>
 	<p class="button" id="buttonSend">
 		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" name="web_submit" />
 	</p>

Modified: trunk/vhffs-panel/templates/web/mailuser.tmpl
===================================================================
--- trunk/vhffs-panel/templates/web/mailuser.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/web/mailuser.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,25 +1,25 @@
 				<fieldset id="chooseMailMode">
 					<legend>
-						<tmpl_var name="TEXT_MAILINFO1">
+						<TMPL_VAR ESCAPE=1 NAME="TEXT_MAILINFO1">
 					</legend>
 					
 					<p>
-						<input name="mail_activate" id="mail_activate" type="checkbox" /> <label for="mail_activate"><tmpl_var name="TEXT_MAILACTIV"></label>
+						<input name="mail_activate" id="mail_activate" type="checkbox" /> <label for="mail_activate"><TMPL_VAR ESCAPE=1 NAME="TEXT_MAILACTIV"></label>
 					</p>
 
 					<p>
 						<label for="mail_usage">
-							<tmpl_var name="TEXT_MAILINFO2">
+							<TMPL_VAR ESCAPE=1 NAME="TEXT_MAILINFO2">
 						</label>
 					</p>
 					
 					<p>
 						<input name="mail_usage" id="mail_usage_box" value="mail_box" type="radio" />
-						<label for="mail_usage_box" ><tmpl_var name="TEXT_MAILBOX"></label>
+						<label for="mail_usage_box" ><TMPL_VAR ESCAPE=1 NAME="TEXT_MAILBOX"></label>
 					</p>
 					<p>
 						<input name="mail_usage" id="mail_usage_foward" value="mail_forward" type="radio" />
-						<label for="mail_usage_foward"><tmpl_var name="TEXT_MAILFORWARD"></label>
+						<label for="mail_usage_foward"><TMPL_VAR ESCAPE=1 NAME="TEXT_MAILFORWARD"></label>
 					</p>
 					
 				</fieldset>

Modified: trunk/vhffs-panel/templates/web/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/web/prefs.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-panel/templates/web/prefs.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,68 +1,68 @@
-<h1><tmpl_var name="TEXT_TITLE"></h1>
+<h1><TMPL_VAR ESCAPE=1 NAME="TEXT_TITLE"></h1>
 	
 <form method="post" action="/web/prefs.pl" accept-charset="utf-8">
 	<p>
 		<label>
-			<tmpl_var name="TEXT_SERVERNAME"> :
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_SERVERNAME"> :
 		</label>
-		<tmpl_var name="VALUE_SERVERNAME">
-		<input type="hidden" name="name" id="name" value="<tmpl_var name="VALUE_SERVERNAME">" />
+		<TMPL_VAR ESCAPE=1 NAME="VALUE_SERVERNAME">
+		<input type="hidden" name="name" id="name" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_SERVERNAME">" />
 	</p>
 
 	<p>
 	<label>
-		<tmpl_var name="TEXT_DESCRIPTION"> :
+		<TMPL_VAR ESCAPE=1 NAME="TEXT_DESCRIPTION"> :
 	</label>
-	 <textarea name="description" id="description" cols="45" rows="7"><tmpl_var name="VALUE_DESCRIPTION"></textarea>
+	 <textarea name="description" id="description" cols="45" rows="7"><TMPL_VAR ESCAPE=1 NAME="VALUE_DESCRIPTION"></textarea>
 	</p>
 
 	<p class="button">
-		<input value="<tmpl_var name="TEXT_SEND">" type="submit"
+		<input value="<TMPL_VAR ESCAPE=1 NAME="TEXT_SEND">" type="submit"
         name="save_prefs_submit"/>
 	</p>
 
 </form>
 
-<h2><tmpl_var name="TEXT_ACL_ADMIN"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_ACL_ADMIN"></h2>
 		
 <form method="post" action="../acl/view.pl" accept-charset="utf-8">
-	<p><tmpl_var name="EXPLAIN_ADMIN_ACL"></p>
+	<p><TMPL_VAR ESCAPE=1 NAME="EXPLAIN_ADMIN_ACL"></p>
 
-	<input type="hidden" name="target_oid" value="<tmpl_var name="VALUE_OID">" />
+	<input type="hidden" name="target_oid" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_OID">" />
 	<p class="button" id="buttonAclAdmin">
-		<input type="submit" value="<tmpl_var name="ADMIN_ACL">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="ADMIN_ACL">" />
 	</p>
 </form>
 
-<h2><tmpl_var name="TEXT_DELETE_WEB"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_DELETE_WEB"></h2>
 
 <form method="post" action="/web/delete.pl" accept-charset="utf-8">
 	<fieldset class="delete">
 		<legend>
-			<tmpl_var name="ASK_DELETE_WEB">:
+			<TMPL_VAR ESCAPE=1 NAME="ASK_DELETE_WEB">:
 		</legend>
 
-		<p class="warning"><tmpl_var name="TEXT_BEFORE_DELETE"></p>
+		<p class="warning"><TMPL_VAR ESCAPE=1 NAME="TEXT_BEFORE_DELETE"></p>
 		<p>
 			<input type="radio" name="DELETE" id="DELETE_NO"  value="0" checked="checked" />
 			<label for="DELETE_NO">
-				<tmpl_var name="NO">
+				<TMPL_VAR ESCAPE=1 NAME="NO">
 			</label>
 		</p>
 		<p>
 			<input type="radio" name="DELETE" id="DELETE_YES" value="1" />
 			<label for="DELETE_YES">
-				<tmpl_var name="YES">
+				<TMPL_VAR ESCAPE=1 NAME="YES">
 			</label>
 		</p>
 	</fieldset>
 	
 	<p class="button" id="buttonDelete">
-		<input type="hidden" name="name" value="<tmpl_var name="VALUE_SERVERNAME">" />
-		<input type="submit" value="<tmpl_var name="TEXT_DELETE">" />
+		<input type="hidden" name="name" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_SERVERNAME">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_DELETE">" />
 	</p>
 				
 </form>
 
 
-<tmpl_var escape=0 name="ADMIN_PART">
+<TMPL_VAR ESCAPE=0 NAME="ADMIN_PART">

Modified: trunk/vhffs-public/templates/allwebsites.tmpl
===================================================================
--- trunk/vhffs-public/templates/allwebsites.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-public/templates/allwebsites.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,12 +1,12 @@
 <TMPL_INCLUDE NAME="banner.tmpl">
 
 <div id="public">
-<h1><TMPL_VAR NAME="TEXT_TITLE"></h1>
+<h1><TMPL_VAR ESCAPE=1 NAME="TEXT_TITLE"></h1>
 <p style="text-align:center">
 <TMPL_LOOP name="LETTERS">
-[<a href="/allwebsites.pl?letter=<TMPL_VAR name="letter">" title="<TMPL_VAR name="count"> <TMPL_I18N KEY="website(s)">"><TMPL_VAR name="letter"></a>]&nbsp;
+[<a href="/allwebsites.pl?letter=<TMPL_VAR ESCAPE=1 name="letter">" title="<TMPL_VAR ESCAPE=1 name="count"> <TMPL_I18N KEY="website(s)">"><TMPL_VAR ESCAPE=1 name="letter"></a>]&nbsp;
 </TMPL_LOOP>
-[<a href="/allwebsites.pl?letter=all"><TMPL_VAR name="ALL"></a>]
+[<a href="/allwebsites.pl?letter=all"><TMPL_VAR ESCAPE=1 name="ALL"></a>]
 </p>
 <TMPL_IF NAME="WEBSITES">
 <TMPL_INCLUDE NAME="misc/web-part.tmpl">

Modified: trunk/vhffs-public/templates/banner.tmpl
===================================================================
--- trunk/vhffs-public/templates/banner.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-public/templates/banner.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,7 +1,7 @@
 <div id="header">
     <div id="top_menu">
         <div id="userToolBox">
-            <a href="<tmpl_var name="URL_PANEL">"><img src="/themes/vhffs/images/login.png" alt="<TMPL_I18N KEY="Back to login page">" title="<TMPL_I18N KEY="Back to login page">"/></a>
+            <a href="<TMPL_VAR ESCAPE=1 NAME="URL_PANEL">"><img src="/themes/vhffs/images/login.png" alt="<TMPL_I18N KEY="Back to login page">" title="<TMPL_I18N KEY="Back to login page">"/></a>
             <a href="/index.pl"><img src="/themes/vhffs/images/home.png" alt="<TMPL_I18N KEY="Homepage of public area">" title="<TMPL_I18N KEY="Homepage of public area">"/></a>
             <a href="/lastusers.pl"><img src="/themes/vhffs/images/users.png" alt="<TMPL_I18N KEY="Last Users">" title="<TMPL_I18N KEY="Last Users">"/></a>
             <a href="/lastgroups.pl"><img src="/themes/vhffs/images/projects.png" alt="<TMPL_I18N KEY="Last Groups">" title="<TMPL_I18N KEY="Last Groups">"/></a>

Modified: trunk/vhffs-public/templates/lastgroups.tmpl
===================================================================
--- trunk/vhffs-public/templates/lastgroups.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-public/templates/lastgroups.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,16 +1,16 @@
 <TMPL_INCLUDE NAME="banner.tmpl">
 
 <div id="public">
-<h1><TMPL_VAR NAME="TEXT_TITLE"></h1>
+<h1><TMPL_VAR ESCAPE=1 NAME="TEXT_TITLE"></h1>
 <TMPL_IF NAME="LETTERS">
 <p style="text-align:center">
 <TMPL_LOOP NAME="LETTERS">
-[<a href="/allgroups.pl?letter=<TMPL_VAR NAME="letter">"><TMPL_VAR NAME="letter"></a>]&nbsp;
+[<a href="/allgroups.pl?letter=<TMPL_VAR ESCAPE=1 NAME="letter">"><TMPL_VAR ESCAPE=1 NAME="letter"></a>]&nbsp;
 </TMPL_LOOP>
-[<a href="/allgroups.pl?letter=all"><TMPL_VAR NAME="ALL"></a>]
+[<a href="/allgroups.pl?letter=all"><TMPL_VAR ESCAPE=1 NAME="ALL"></a>]
 </p>
 <TMPL_IF NAME="MESSAGE">
-<p style="text-align:center;font-weight:bold;"><TMPL_VAR NAME="MESSAGE"></p>
+<p style="text-align:center;font-weight:bold;"><TMPL_VAR ESCAPE=1 NAME="MESSAGE"></p>
 </TMPL_IF>
 </TMPL_IF>
 <TMPL_INCLUDE NAME="misc/lastgroups-part.tmpl">

Modified: trunk/vhffs-public/templates/lastusers.tmpl
===================================================================
--- trunk/vhffs-public/templates/lastusers.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-public/templates/lastusers.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -2,22 +2,21 @@
 
 <div id="public">
 
-<h1><tmpl_var name="TEXT_TITLE"></h1>
+<h1><TMPL_VAR ESCAPE=1 NAME="TEXT_TITLE"></h1>
 <TMPL_LOOP NAME="USERS">
-<h2><tmpl_var name="USERNAME"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="USERNAME"></h2>
 <TMPL_IF NAME="USE_AVATAR">
-<img src="/getavatar.pl?oid=<tmpl_var name="OBJECT_ID">" alt="<tmpl_var
-name="USERNAME"> avatar" class="avatar"/>
+<img src="/getavatar.pl?oid=<TMPL_VAR ESCAPE=1 NAME="OBJECT_ID">" alt="<TMPL_VAR ESCAPE=1 NAME="USERNAME"> avatar" class="avatar"/>
 </TMPL_IF>
 <ul>
 <li>
-<TMPL_I18N KEY="Username">: <tmpl_var name="USERNAME">
+<TMPL_I18N KEY="Username">: <TMPL_VAR ESCAPE=1 NAME="USERNAME">
 </li>
 <li>
-<TMPL_I18N KEY="Firstname">: <tmpl_var name="FIRSTNAME">
+<TMPL_I18N KEY="Firstname">: <TMPL_VAR ESCAPE=1 NAME="FIRSTNAME">
 </li>
 <li>
-<TMPL_I18N KEY="Lastname">: <tmpl_var name="LASTNAME">
+<TMPL_I18N KEY="Lastname">: <TMPL_VAR ESCAPE=1 NAME="LASTNAME">
 </li>
 <li>
 <TMPL_INCLUDE NAME="group_part.tmpl">

Modified: trunk/vhffs-public/templates/misc/cvs-part.tmpl
===================================================================
--- trunk/vhffs-public/templates/misc/cvs-part.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-public/templates/misc/cvs-part.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,5 +1,5 @@
 <ul>
 <TMPL_LOOP NAME="CVSREPOS">
-<li><a href="<TMPL_VAR ESCAPE=1 NAME="WEBCVS">/<TMPL_VAR ESCAPE=1 NAME="CVSROOT">"><tmpl_var name="CVSROOT"></a> &mdash; <tmpl_var name="DESCRIPTION"></li>
+<li><a href="<TMPL_VAR ESCAPE=1 NAME="WEBCVS">/<TMPL_VAR ESCAPE=1 NAME="CVSROOT">"><TMPL_VAR ESCAPE=1 NAME="CVSROOT"></a> &mdash; <TMPL_VAR ESCAPE=1 NAME="DESCRIPTION"></li>
 </TMPL_LOOP>
 </ul>

Modified: trunk/vhffs-public/templates/misc/lastgroups-part.tmpl
===================================================================
--- trunk/vhffs-public/templates/misc/lastgroups-part.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-public/templates/misc/lastgroups-part.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,5 +1,5 @@
 <TMPL_LOOP NAME="GROUPS">
-<h2><a href="group.pl?name=<tmpl_var name="GROUPNAME">"><tmpl_var name="REALNAME"></a></h2>
+<h2><a href="group.pl?name=<TMPL_VAR ESCAPE=1 NAME="GROUPNAME">"><TMPL_VAR ESCAPE=1 NAME="REALNAME"></a></h2>
 <ul>
 <li><TMPL_I18N KEY="Groupname">: <TMPL_VAR ESCAPE=1 NAME="GROUPNAME"></li>
 <li><TMPL_I18N KEY="Users">: <TMPL_INCLUDE NAME="../user_part.tmpl"></li>

Modified: trunk/vhffs-public/templates/misc/lastusers-part.tmpl
===================================================================
--- trunk/vhffs-public/templates/misc/lastusers-part.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-public/templates/misc/lastusers-part.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,24 +1,24 @@
 <div class="public_user">
-<h2><tmpl_var name="TEXT_TITLE"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_TITLE"></h2>
 <TMPL_IF NAME="USE_AVATAR">
-<img src="/getavatar.pl?oid=<tmpl_var name="VALUE_OID">" alt="<tmpl_var name="VALUE_USERNAME"> avatar" class="avatar"/>
+<img src="/getavatar.pl?oid=<TMPL_VAR ESCAPE=1 NAME="VALUE_OID">" alt="<TMPL_VAR ESCAPE=1 NAME="VALUE_USERNAME"> avatar" class="avatar"/>
 </TMPL_IF>
 <ul>
 <li>
-<tmpl_var name="TEXT_USERNAME">
-<tmpl_var name="VALUE_USERNAME">
+<TMPL_VAR ESCAPE=1 NAME="TEXT_USERNAME">
+<TMPL_VAR ESCAPE=1 NAME="VALUE_USERNAME">
 </li>
 <li>
-<tmpl_var name="TEXT_FIRSTNAME">
-<tmpl_var name="VALUE_FIRSTNAME">
+<TMPL_VAR ESCAPE=1 NAME="TEXT_FIRSTNAME">
+<TMPL_VAR ESCAPE=1 NAME="VALUE_FIRSTNAME">
 </li>
 <li>
-<tmpl_var name="TEXT_LASTNAME">
-<tmpl_var name="VALUE_LASTNAME">
+<TMPL_VAR ESCAPE=1 NAME="TEXT_LASTNAME">
+<TMPL_VAR ESCAPE=1 NAME="VALUE_LASTNAME">
 </li>
 <li>
-<tmpl_var name="TEXT_GROUPS">
-<tmpl_var name="VALUE_GROUPS">
+<TMPL_VAR ESCAPE=1 NAME="TEXT_GROUPS">
+<TMPL_VAR ESCAPE=1 NAME="VALUE_GROUPS">
 </li>
 </ul>
 <div class="clear"></div>

Modified: trunk/vhffs-public/templates/misc/svn-part.tmpl
===================================================================
--- trunk/vhffs-public/templates/misc/svn-part.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-public/templates/misc/svn-part.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -2,8 +2,8 @@
     <TMPL_LOOP NAME="SVNREPOS">
     <li><a href="<TMPL_VAR ESCAPE=1 NAME="WEBSVN">/<TMPL_VAR ESCAPE=1 NAME="REPONAME">"><TMPL_VAR ESCAPE=1 NAME="REPONAME"></a>
     <TMPL_IF NAME="GROUPNAME">
-        &mdash; <TMPL_I18N KEY="Owned by"> <a href="group.pl?name=<tmpl_var name="GROUPNAME">"><tmpl_var name="GROUPNAME"></a>
+        &mdash; <TMPL_I18N KEY="Owned by"> <a href="group.pl?name=<TMPL_VAR ESCAPE=1 NAME="GROUPNAME">"><TMPL_VAR ESCAPE=1 NAME="GROUPNAME"></a>
     </TMPL_IF>
-    &mdash; <tmpl_var name="DESCRIPTION"></li>
+    &mdash; <TMPL_VAR ESCAPE=1 NAME="DESCRIPTION"></li>
     </TMPL_LOOP>
 </ul>

Modified: trunk/vhffs-public/templates/misc/web-part.tmpl
===================================================================
--- trunk/vhffs-public/templates/misc/web-part.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-public/templates/misc/web-part.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,11 +1,11 @@
 <ul>
 <TMPL_LOOP NAME="WEBSITES">
 <li>
-<a href="http://<tmpl_var name="SERVERNAME">"><tmpl_var name="SERVERNAME"></a>
+<a href="http://<TMPL_VAR ESCAPE=1 NAME="SERVERNAME">"><TMPL_VAR ESCAPE=1 NAME="SERVERNAME"></a>
 <TMPL_IF NAME="GROUPNAME">
 &mdash; <TMPL_I18N KEY="Owned by"> <a href="/group.pl?name=<TMPL_VAR ESCAPE=1 NAME="GROUPNAME">"><TMPL_VAR ESCAPE=1 NAME="GROUPNAME"></a>
 </TMPL_IF>
-&mdash; <tmpl_var name="DESCRIPTION">
+&mdash; <TMPL_VAR ESCAPE=1 NAME="DESCRIPTION">
 </li>
 </TMPL_LOOP>
 </ul>

Modified: trunk/vhffs-public/templates/simplemsg.tmpl
===================================================================
--- trunk/vhffs-public/templates/simplemsg.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-public/templates/simplemsg.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -2,5 +2,5 @@
         </div>
 
         <div class="misc" id="misc">
-            <h1 class="message"><tmpl_var name="MESSAGE"></h1>
+            <h1 class="message"><TMPL_VAR ESCAPE=1 NAME="MESSAGE"></h1>
         </div>

Modified: trunk/vhffs-public/templates/user.tmpl
===================================================================
--- trunk/vhffs-public/templates/user.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-public/templates/user.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,15 +1,15 @@
 <TMPL_INCLUDE NAME="banner.tmpl">
 
 <div id="public">
-<h1><tmpl_var name="VALUE_USERNAME"></h1>
+<h1><TMPL_VAR ESCAPE=1 NAME="VALUE_USERNAME"></h1>
 <TMPL_IF NAME="USE_AVATAR">
 <img src="/getavatar.pl?oid=<TMPL_VAR ESCAPE=1 NAME="VALUE_OID">" alt="<TMPL_VAR ESCAPE=1 NAME="VALUE_USERNAME">" class="avatar"/>
 </TMPL_IF>
-<tmpl_var escape=0 name="IMG_AVATAR">
+<TMPL_VAR ESCAPE=0 NAME="IMG_AVATAR">
 <ul>
-    <li><TMPL_I18N KEY="Username">: <tmpl_var name="VALUE_USERNAME"></li>
-    <li><TMPL_I18N KEY="Firstname">: <tmpl_var name="VALUE_FIRSTNAME"></li>
-    <li><TMPL_I18N KEY="Lastname">: <tmpl_var name="VALUE_LASTNAME"></li>
+    <li><TMPL_I18N KEY="Username">: <TMPL_VAR ESCAPE=1 NAME="VALUE_USERNAME"></li>
+    <li><TMPL_I18N KEY="Firstname">: <TMPL_VAR ESCAPE=1 NAME="VALUE_FIRSTNAME"></li>
+    <li><TMPL_I18N KEY="Lastname">: <TMPL_VAR ESCAPE=1 NAME="VALUE_LASTNAME"></li>
     <li><TMPL_INCLUDE NAME="group_part.tmpl"></li>
 </ul>
 </div>

Modified: trunk/vhffs-robots/misc/cvs_viewvc.conf.tmpl
===================================================================
--- trunk/vhffs-robots/misc/cvs_viewvc.conf.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-robots/misc/cvs_viewvc.conf.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -69,7 +69,7 @@
 # names to them. Each root should be given by a "name: path" value. Multiple
 # roots should be separated by commas and can be placed on separate lines.
 #
-cvs_roots = <tmpl_var name="CVSROOTS">
+cvs_roots = <TMPL_VAR ESCAPE=1 NAME="CVSROOTS">
 
 #
 # This setting specifies each of the Subversion roots (repositories)

Modified: trunk/vhffs-robots/misc/mhonarc.indexmain.tmpl
===================================================================
--- trunk/vhffs-robots/misc/mhonarc.indexmain.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-robots/misc/mhonarc.indexmain.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd";>
 <html xmlns="http://www.w3.org/1999/xhtml";>
 <head>
-	<title><tmpl_var name="NAME"> mailing list</title>
+	<title><TMPL_VAR ESCAPE=1 NAME="NAME"> mailing list</title>
 	<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
 	<style type="text/css">
 	body {
@@ -40,7 +40,7 @@
 	</style>
 </head>
 <body>
-<h1><tmpl_var name="NAME"> mailing list index page</h1>
+<h1><TMPL_VAR ESCAPE=1 NAME="NAME"> mailing list index page</h1>
 <table>
 <thead>
 	<tr>
@@ -51,7 +51,7 @@
 	</tr>
 </thead>
 <tbody>
-<tmpl_var name="BODY">
+<TMPL_VAR ESCAPE=1 NAME="BODY">
 </tbody>
 </table>
 </body>

Modified: trunk/vhffs-robots/misc/mhonarc.indexpart.tmpl
===================================================================
--- trunk/vhffs-robots/misc/mhonarc.indexpart.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-robots/misc/mhonarc.indexpart.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -1,6 +1,6 @@
-	<tr class="row<tmpl_var name="ODDOREVEN">">
-		<td><tmpl_var name="YEAR">-<tmpl_var name="MONTH"></td>
-		<td><a href="<tmpl_var name="YEAR">/<tmpl_var name="MONTH">/threads.html">[ Thread ]</a> or <a href="<tmpl_var name="YEAR">/<tmpl_var name="MONTH">/maillist.html">[ Date ]</a></td>
-		<td class="alignright"><tmpl_var name="NUMBER"></td>
-		<td class="alignright"><tmpl_var name="SIZE"> <tmpl_var name="SIZEUNIT"></td>
+	<tr class="row<TMPL_VAR ESCAPE=1 NAME="ODDOREVEN">">
+		<td><TMPL_VAR ESCAPE=1 NAME="YEAR">-<TMPL_VAR ESCAPE=1 NAME="MONTH"></td>
+		<td><a href="<TMPL_VAR ESCAPE=1 NAME="YEAR">/<TMPL_VAR ESCAPE=1 NAME="MONTH">/threads.html">[ Thread ]</a> or <a href="<TMPL_VAR ESCAPE=1 NAME="YEAR">/<TMPL_VAR ESCAPE=1 NAME="MONTH">/maillist.html">[ Date ]</a></td>
+		<td class="alignright"><TMPL_VAR ESCAPE=1 NAME="NUMBER"></td>
+		<td class="alignright"><TMPL_VAR ESCAPE=1 NAME="SIZE"> <TMPL_VAR ESCAPE=1 NAME="SIZEUNIT"></td>
 	</tr>

Modified: trunk/vhffs-robots/misc/svn_viewvc.conf.tmpl
===================================================================
--- trunk/vhffs-robots/misc/svn_viewvc.conf.tmpl	2007-11-07 06:50:11 UTC (rev 1066)
+++ trunk/vhffs-robots/misc/svn_viewvc.conf.tmpl	2007-11-07 06:56:29 UTC (rev 1067)
@@ -77,7 +77,7 @@
 # by a "name: path" value. Multiple roots should be separated by
 # commas and can be placed on separate lines.
 #
-svn_roots = <tmpl_var name="SVNROOTS">
+svn_roots = <TMPL_VAR ESCAPE=1 NAME="SVNROOTS">
 
 # The 'root_parents' setting specifies a list of directories in which
 # any number of repositories may reside.  Rather than force you to add

Messages sorted by: [ date | thread ]
Prev by Date: [vhffs-dev] [1066] Websites list & all groups list are working again.
Next by Date: [vhffs-dev] [1068] Hem, it seems that I've ESCAPE'd too much things...
Previous by thread: [vhffs-dev] [1066] Websites list & all groups list are working again.
Next by thread: [vhffs-dev] [1068] Hem, it seems that I've ESCAPE'd too much things...

Mail converted by MHonArc 2.6.19+

http://listengine.tuxfamily.org/