[vhffs-dev] [1059] Oh my god ! We're again in testing/stable problems!

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

To: vhffs-dev@xxxxxxxxx
Subject: [vhffs-dev] [1059] Oh my god ! We're again in testing/stable problems!
From: subversion@xxxxxxxxxxxxx
Date: Fri, 02 Nov 2007 19:39:13 +0100

Revision: 1059
Author:   beuss
Date:     2007-11-02 18:39:12 +0000 (Fri, 02 Nov 2007)

Log Message:
-----------
Oh my god ! We're again in testing/stable problems!
HTML::Template bundled with etch doesn't take the escape attribute in account
when it's set to 0... So We set it explicitely to 1 except when not needed.

Modified Paths:
--------------
    trunk/vhffs-api/src/Vhffs/Panel/Template.pm
    trunk/vhffs-panel/templates/acl/view.tmpl
    trunk/vhffs-panel/templates/admin/cvs/part.tmpl
    trunk/vhffs-panel/templates/admin/cvs/search.tmpl
    trunk/vhffs-panel/templates/admin/dns/part.tmpl
    trunk/vhffs-panel/templates/admin/dns/search.tmpl
    trunk/vhffs-panel/templates/admin/git/part.tmpl
    trunk/vhffs-panel/templates/admin/git/search.tmpl
    trunk/vhffs-panel/templates/admin/group/part.tmpl
    trunk/vhffs-panel/templates/admin/group/search.tmpl
    trunk/vhffs-panel/templates/admin/mail/part.tmpl
    trunk/vhffs-panel/templates/admin/mail/search.tmpl
    trunk/vhffs-panel/templates/admin/mailinglist/part.tmpl
    trunk/vhffs-panel/templates/admin/mailinglist/search.tmpl
    trunk/vhffs-panel/templates/admin/misc/broadcast.tmpl
    trunk/vhffs-panel/templates/admin/misc/broadcast_list.tmpl
    trunk/vhffs-panel/templates/admin/misc/broadcast_part.tmpl
    trunk/vhffs-panel/templates/admin/misc/broadcast_view.tmpl
    trunk/vhffs-panel/templates/admin/misc/list.tmpl
    trunk/vhffs-panel/templates/admin/misc/mailings_part.tmpl
    trunk/vhffs-panel/templates/admin/misc/moderation.tmpl
    trunk/vhffs-panel/templates/admin/misc/moderation_part.tmpl
    trunk/vhffs-panel/templates/admin/misc/stats.tmpl
    trunk/vhffs-panel/templates/admin/misc/su.tmpl
    trunk/vhffs-panel/templates/admin/mysql/part.tmpl
    trunk/vhffs-panel/templates/admin/mysql/search.tmpl
    trunk/vhffs-panel/templates/admin/object/edit.tmpl
    trunk/vhffs-panel/templates/admin/object/editembedded.tmpl
    trunk/vhffs-panel/templates/admin/object/part.tmpl
    trunk/vhffs-panel/templates/admin/object/search.tmpl
    trunk/vhffs-panel/templates/admin/pgsql/part.tmpl
    trunk/vhffs-panel/templates/admin/pgsql/search.tmpl
    trunk/vhffs-panel/templates/admin/repository/part.tmpl
    trunk/vhffs-panel/templates/admin/repository/search.tmpl
    trunk/vhffs-panel/templates/admin/svn/part.tmpl
    trunk/vhffs-panel/templates/admin/svn/search.tmpl
    trunk/vhffs-panel/templates/admin/user/part.tmpl
    trunk/vhffs-panel/templates/admin/user/search.tmpl
    trunk/vhffs-panel/templates/admin/web/part.tmpl
    trunk/vhffs-panel/templates/admin/web/search.tmpl
    trunk/vhffs-panel/templates/cvs/create.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/group/admin.tmpl
    trunk/vhffs-panel/templates/group/create.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/lost.tmpl
    trunk/vhffs-panel/templates/misc/alert.tmpl
    trunk/vhffs-panel/templates/misc/resubmit.tmpl
    trunk/vhffs-panel/templates/mysql/create.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/svn/create.tmpl
    trunk/vhffs-panel/templates/user/admin.tmpl
    trunk/vhffs-panel/templates/user/create.tmpl
    trunk/vhffs-panel/templates/user/create_complete.tmpl
    trunk/vhffs-panel/templates/web/create.tmpl

Modified: trunk/vhffs-api/src/Vhffs/Panel/Template.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Template.pm	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-api/src/Vhffs/Panel/Template.pm	2007-11-02 18:39:12 UTC (rev 1059)
@@ -70,8 +70,6 @@
         $options{filter} = \&i18n_filter;
     }
     
-    $options{default_escape} = 'HTML' unless(exists $options{default_escape});
-
     return $class->SUPER::new(%options);
 }
 

Modified: trunk/vhffs-panel/templates/acl/view.tmpl
===================================================================
--- trunk/vhffs-panel/templates/acl/view.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/acl/view.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -15,17 +15,17 @@
 <tmpl_loop name="ACL_DEFAULT">
   <form method="post" action="view.pl" accept-charset="utf-8">
     <p>
-      <span><b><TMPL_VAR NAME="TEXT_DEFAULT"></b></span>
+      <span><b><TMPL_VAR ESCAPE=1 NAME="TEXT_DEFAULT"></b></span>
       <span> </span>
-      <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_DENIED">" <tmpl_if expr="perm==VALUE_ACL_DENIED">checked="checked"</tmpl_if>/></span>
-      <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_VIEW">" <tmpl_if expr="perm==VALUE_ACL_VIEW">checked="checked"</tmpl_if>/></span>
-      <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_MODIFY">" <tmpl_if expr="perm==VALUE_ACL_MODIFY">checked="checked"</tmpl_if>/></span>
-      <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_MANAGEACL">" <tmpl_if expr="perm==VALUE_ACL_MANAGEACL">checked="checked"</tmpl_if>/></span>
-      <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR 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 NAME="GRANTED_OID">" />
-        <input type="hidden" NAME="target_oid" VALUE="<TMPL_VAR NAME="TARGET_OID">" />
-        <input type="submit" value="<TMPL_VAR NAME="TEXT_MODIFY">" name="update_acl_submit"/>
+        <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">" />
+        <input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_MODIFY">" name="update_acl_submit"/>
       </span>
     </p>
   </form>
@@ -33,17 +33,17 @@
 <tmpl_loop name="ACL_USERS">
   <form method="post" action="view.pl" accept-charset="utf-8">
     <p>
-      <span><TMPL_VAR NAME="NAME"></span>
-      <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_UNDEF">" <tmpl_if expr="perm==VALUE_ACL_UNDEF">checked="checked"</tmpl_if>/></span>
-      <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_DENIED">" <tmpl_if expr="perm==VALUE_ACL_DENIED">checked="checked"</tmpl_if>/></span>
-      <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_VIEW">" <tmpl_if expr="perm==VALUE_ACL_VIEW">checked="checked"</tmpl_if>/></span>
-      <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_MODIFY">" <tmpl_if expr="perm==VALUE_ACL_MODIFY">checked="checked"</tmpl_if>/></span>
-      <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_MANAGEACL">" <tmpl_if expr="perm==VALUE_ACL_MANAGEACL">checked="checked"</tmpl_if>/></span>
-      <span><input type="radio" name="perm<TMPL_VAR NAME="GRANTED_OID">" value="<TMPL_VAR NAME="VALUE_ACL_DELETE">" <tmpl_if expr="perm==VALUE_ACL_DELETE">checked="checked"</tmpl_if>/></span>
+      <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="hidden" NAME="granted_oid" VALUE="<TMPL_VAR NAME="GRANTED_OID">" />
-        <input type="hidden" NAME="target_oid" VALUE="<TMPL_VAR NAME="TARGET_OID">" />
-        <input type="submit" value="<TMPL_VAR NAME="TEXT_MODIFY">" name="update_acl_submit"/>
+        <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">" />
+        <input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_MODIFY">" name="update_acl_submit"/>
       </span>
     </p>
   </form>

Modified: trunk/vhffs-panel/templates/admin/cvs/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/cvs/part.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/cvs/part.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,16 +1,16 @@
 <TMPL_LOOP NAME="CVSES">
 <tr>
 	<td>
-		<TMPL_VAR NAME="CVSROOT">
+		<TMPL_VAR ESCAPE=1 NAME="CVSROOT">
 	</td>
 	<td>
-		<TMPL_VAR NAME="GROUPNAME"> 
+		<TMPL_VAR ESCAPE=1 NAME="GROUPNAME"> 
 	</td>
 	<td>
-		<TMPL_VAR NAME="STATE"> 
+		<TMPL_VAR ESCAPE=1 NAME="STATE"> 
 	</td>
 	<td>
-		<a href="/cvs/prefs.pl?admin_menu=1&amp;name=<TMPL_VAR NAME="CVSROOT">"><TMPL_VAR NAME="ACTION"></a>
+		<a href="/cvs/prefs.pl?admin_menu=1&amp;name=<TMPL_VAR ESCAPE=1 NAME="CVSROOT">"><TMPL_VAR ESCAPE=1 NAME="ACTION"></a>
 	</td>
 </tr>
 </TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/admin/cvs/search.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/cvs/search.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/cvs/search.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,4 +1,4 @@
-		<h1><TMPL_VAR NAME="TITLE"></h1>
+		<h1><TMPL_VAR ESCAPE=1 NAME="TITLE"></h1>
 		<form method="post" action="list.pl" accept-charset="utf-8">
 			<input type="text" name="NAME" value="" />
 		</form>

Modified: trunk/vhffs-panel/templates/admin/dns/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/dns/part.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/dns/part.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,16 +1,16 @@
 <TMPL_LOOP NAME="DNSES">
 <tr>
 	<td>
-		<TMPL_VAR NAME="DOMAIN">
+		<TMPL_VAR ESCAPE=1 NAME="DOMAIN">
 	</td>
 	<td>
-		<TMPL_VAR NAME="GROUPNAME"> 
+		<TMPL_VAR ESCAPE=1 NAME="GROUPNAME"> 
 	</td>
 	<td>
-		<TMPL_VAR NAME="STATE"> 
+		<TMPL_VAR ESCAPE=1 NAME="STATE"> 
 	</td>
 	<td>
-		<a href="/dns/prefs.pl?admin_menu=1&amp;name=<TMPL_VAR NAME="DOMAIN">"><TMPL_VAR NAME="ACTION"></a>
+		<a href="/dns/prefs.pl?admin_menu=1&amp;name=<TMPL_VAR ESCAPE=1 NAME="DOMAIN">"><TMPL_VAR ESCAPE=1 NAME="ACTION"></a>
 	</td>
 </tr>
 </TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/admin/dns/search.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/dns/search.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/dns/search.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,4 +1,4 @@
-		<h1><TMPL_VAR NAME="TITLE"></h1>
+		<h1><TMPL_VAR ESCAPE=1 NAME="TITLE"></h1>
 		<form method="post" action="list.pl" accept-charset="utf-8">
 			<input type="text" name="NAME" value="" />
 		</form>

Modified: trunk/vhffs-panel/templates/admin/git/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/git/part.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/git/part.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,16 +1,16 @@
 <TMPL_LOOP NAME="GITREPOS">
 <tr>
 	<td>
-		<TMPL_VAR NAME="GITROOT">
+		<TMPL_VAR ESCAPE=1 NAME="GITROOT">
 	</td>
 	<td>
-		<TMPL_VAR NAME="GROUPNAME"> 
+		<TMPL_VAR ESCAPE=1 NAME="GROUPNAME"> 
 	</td>
 	<td>
-		<TMPL_VAR NAME="STATE"> 
+		<TMPL_VAR ESCAPE=1 NAME="STATE"> 
 	</td>
 	<td>
-		<a href="/git/prefs.pl?admin_menu=1&amp;name=<TMPL_VAR NAME="GITROOT">"><TMPL_VAR NAME="ACTION"></a>
+		<a href="/git/prefs.pl?admin_menu=1&amp;name=<TMPL_VAR ESCAPE=1 NAME="GITROOT">"><TMPL_VAR ESCAPE=1 NAME="ACTION"></a>
 	</td>
 </tr>
 </TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/admin/git/search.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/git/search.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/git/search.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,4 +1,4 @@
-		<h1><TMPL_VAR NAME="TITLE"></h1>
+		<h1><TMPL_VAR ESCAPE=1 NAME="TITLE"></h1>
 		<form method="post" action="list.pl" accept-charset="utf-8">
 			<input type="text" name="NAME" value=""/>
 		</form>

Modified: trunk/vhffs-panel/templates/admin/group/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/group/part.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/group/part.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,16 +1,16 @@
 <TMPL_LOOP NAME="GROUPS">
 <tr>
 	<td>
-		<TMPL_VAR NAME="GROUPNAME">
+		<TMPL_VAR ESCAPE=1 NAME="GROUPNAME">
 	</td>
 	<td>
-		<TMPL_VAR NAME="USERNAME"> 
+		<TMPL_VAR ESCAPE=1 NAME="USERNAME"> 
 	</td>
 	<td>
-		<TMPL_VAR NAME="STATE"> 
+		<TMPL_VAR ESCAPE=1 NAME="STATE"> 
 	</td>
 	<td>
-		<a href="/group/prefs.pl?admin_menu=1&amp;project=<TMPL_VAR NAME="GROUPNAME">"><TMPL_VAR NAME="ACTION"></a>
+		<a href="/group/prefs.pl?admin_menu=1&amp;project=<TMPL_VAR ESCAPE=1 NAME="GROUPNAME">"><TMPL_VAR ESCAPE=1 NAME="ACTION"></a>
 	</td>
 </tr>
 </TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/admin/group/search.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/group/search.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/group/search.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,4 +1,4 @@
-		<h1><TMPL_VAR NAME="TITLE"></h1>
+		<h1><TMPL_VAR ESCAPE=1 NAME="TITLE"></h1>
 		<form method="post" action="list.pl" accept-charset="utf-8">
 			<input type="text" name="NAME" value=""/>
 		</form>

Modified: trunk/vhffs-panel/templates/admin/mail/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/mail/part.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/mail/part.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,16 +1,16 @@
 <TMPL_LOOP NAME="MAILS">
 <tr>
 	<td>
-		<TMPL_VAR NAME="DOMAIN">
+		<TMPL_VAR ESCAPE=1 NAME="DOMAIN">
 	</td>
 	<td>
-		<TMPL_VAR NAME="GROUPNAME"> 
+		<TMPL_VAR ESCAPE=1 NAME="GROUPNAME"> 
 	</td>
 	<td>
-		<TMPL_VAR NAME="STATE"> 
+		<TMPL_VAR ESCAPE=1 NAME="STATE"> 
 	</td>
 	<td>
-		<a href="/mail/prefs.pl?admin_menu=1&amp;name=<TMPL_VAR NAME="DOMAIN">"><TMPL_VAR NAME="ACTION"></a>
+		<a href="/mail/prefs.pl?admin_menu=1&amp;name=<TMPL_VAR ESCAPE=1 NAME="DOMAIN">"><TMPL_VAR ESCAPE=1 NAME="ACTION"></a>
 	</td>
 </tr>
 </TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/admin/mail/search.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/mail/search.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/mail/search.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,4 +1,4 @@
-		<h1><TMPL_VAR NAME="TITLE"></h1>
+		<h1><TMPL_VAR ESCAPE=1 NAME="TITLE"></h1>
 		<form method="post" action="list.pl" accept-charset="utf-8">
 			<input type="text" name="NAME" value="" />
 		</form>

Modified: trunk/vhffs-panel/templates/admin/mailinglist/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/mailinglist/part.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/mailinglist/part.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,16 +1,16 @@
 <TMPL_LOOP NAME="LISTS">
 <tr>
 	<td>
-		<TMPL_VAR NAME="LOCAL_PART">@<TMPL_VAR NAME="DOMAIN">
+		<TMPL_VAR ESCAPE=1 NAME="LOCAL_PART">@<TMPL_VAR ESCAPE=1 NAME="DOMAIN">
 	</td>
 	<td>
-		<TMPL_VAR NAME="GROUPNAME"> 
+		<TMPL_VAR ESCAPE=1 NAME="GROUPNAME"> 
 	</td>
 	<td>
-		<TMPL_VAR NAME="STATE"> 
+		<TMPL_VAR ESCAPE=1 NAME="STATE"> 
 	</td>
 	<td>
-		<a href="/mailinglist/prefs.pl?admin_menu=1&amp;name=<TMPL_VAR NAME="LOCAL_PART">@<TMPL_VAR NAME="DOMAIN">"><TMPL_VAR NAME="ACTION"></a>
+		<a href="/mailinglist/prefs.pl?admin_menu=1&amp;name=<TMPL_VAR ESCAPE=1 NAME="LOCAL_PART">@<TMPL_VAR ESCAPE=1 NAME="DOMAIN">"><TMPL_VAR ESCAPE=1 NAME="ACTION"></a>
 	</td>
 </tr>
 </TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/admin/mailinglist/search.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/mailinglist/search.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/mailinglist/search.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,4 +1,4 @@
-		<h1><TMPL_VAR NAME="TITLE"></h1>
+		<h1><TMPL_VAR ESCAPE=1 NAME="TITLE"></h1>
 		<form method="post" action="list.pl" accept-charset="utf-8">
 			<input type="text" name="NAME" value="" />
 		</form>

Modified: trunk/vhffs-panel/templates/admin/misc/broadcast.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/misc/broadcast.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/misc/broadcast.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,19 +1,19 @@
-<h1><TMPL_VAR NAME="TITLE"></h1>
+<h1><TMPL_VAR ESCAPE=1 NAME="TITLE"></h1>
 
 <form method="post" action="broadcast_submit.pl" accept-charset="utf-8">
 	<p>
 		<label for="SUBJECT">
-			<TMPL_VAR NAME="TEXT_SUBJECT">: 
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_SUBJECT">: 
 		</label>
 		<input type="text" name="SUBJECT" id="SUBJECT" />
 	</p>
 	<p>
 		<label for="BODY">
-			<TMPL_VAR NAME="TEXT_BODY">: 
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_BODY">: 
 		</label>
 		<textarea name="BODY" id="BODY" cols="60" rows="30"></textarea>
 	</p>
 	<p class="button" id="buttonSend">
-		<input type="submit" value="<TMPL_VAR NAME="TEXT_SUBMIT">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_SUBMIT">" />
 	</p>
 </form>

Modified: trunk/vhffs-panel/templates/admin/misc/broadcast_list.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/misc/broadcast_list.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/misc/broadcast_list.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,3 +1,3 @@
-<h1><TMPL_VAR NAME="TITLE"></h1>
+<h1><TMPL_VAR ESCAPE=1 NAME="TITLE"></h1>
 
-<TMPL_VAR NAME="MAILINGS">
+<TMPL_VAR ESCAPE=1 NAME="MAILINGS">

Modified: trunk/vhffs-panel/templates/admin/misc/broadcast_part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/misc/broadcast_part.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/misc/broadcast_part.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,26 +1,26 @@
 <table>
 <tr>
 	<td>
-		<TMPL_VAR NAME="DATE">
+		<TMPL_VAR ESCAPE=1 NAME="DATE">
 	</td>
 	<td>
-		<TMPL_VAR NAME="SUBJECT"> 
+		<TMPL_VAR ESCAPE=1 NAME="SUBJECT"> 
 	</td>
 	<td class="mainColumn">
-		<TMPL_VAR NAME="BODY"> 
+		<TMPL_VAR ESCAPE=1 NAME="BODY"> 
 	</td>
 	<td>
-		<TMPL_VAR NAME="STATE"> 
+		<TMPL_VAR ESCAPE=1 NAME="STATE"> 
 	</td>
 	<td>
 		<form method="post" action="broadcast_delete.pl" accept-charset="utf-8">
-			<input type="hidden" name="ID" value="<TMPL_VAR NAME="ID">" />
-			<input type="submit" value="<TMPL_VAR NAME="DELETE">" />
+			<input type="hidden" name="ID" value="<TMPL_VAR ESCAPE=1 NAME="ID">" />
+			<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="DELETE">" />
 		</form>
 		<br/>
 		<form method="post" action="broadcast_view.pl" accept-charset="utf-8">
-			<input type="hidden" name="ID" value="<TMPL_VAR NAME="ID">" />
-			<input type="submit" value="<TMPL_VAR NAME="VIEW">" />
+			<input type="hidden" name="ID" value="<TMPL_VAR ESCAPE=1 NAME="ID">" />
+			<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="VIEW">" />
 		</form>
 	</td>
 </tr>

Modified: trunk/vhffs-panel/templates/admin/misc/broadcast_view.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/misc/broadcast_view.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/misc/broadcast_view.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,36 +1,36 @@
-<h1><TMPL_VAR NAME="TITLE"></h1>
+<h1><TMPL_VAR ESCAPE=1 NAME="TITLE"></h1>
 
 <table>
 <tr>
 	<td>
-		<TMPL_VAR NAME="DATE_TEXT">
+		<TMPL_VAR ESCAPE=1 NAME="DATE_TEXT">
 	</td>
 	<td>
-		<TMPL_VAR NAME="DATE"> 
+		<TMPL_VAR ESCAPE=1 NAME="DATE"> 
 	</td>
 </tr>
 <tr>
 	<td>
-		<TMPL_VAR NAME="SUBJECT_TEXT"> 
+		<TMPL_VAR ESCAPE=1 NAME="SUBJECT_TEXT"> 
 	</td>
 	<td>
-		<TMPL_VAR NAME="SUBJECT"> 
+		<TMPL_VAR ESCAPE=1 NAME="SUBJECT"> 
 	</td>
 </tr>
 <tr>
 	<td>
-		<TMPL_VAR NAME="STATE_TEXT"> 
+		<TMPL_VAR ESCAPE=1 NAME="STATE_TEXT"> 
 	</td>
 	<td>
-		<TMPL_VAR NAME="STATE"> 
+		<TMPL_VAR ESCAPE=1 NAME="STATE"> 
 	</td>
 </tr>
 <tr>
 	<td>
-		<TMPL_VAR NAME="BODY_TEXT"> 
+		<TMPL_VAR ESCAPE=1 NAME="BODY_TEXT"> 
 	</td>
 	<td>
-		<TMPL_VAR NAME="BODY"> 
+		<TMPL_VAR ESCAPE=1 NAME="BODY"> 
 	</td>
 </tr>
 </table>

Modified: trunk/vhffs-panel/templates/admin/misc/list.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/misc/list.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/misc/list.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,12 +1,12 @@
-<h1><TMPL_VAR NAME="TITLE"></h1>
+<h1><TMPL_VAR ESCAPE=1 NAME="TITLE"></h1>
 		
 <table>
 		<tr>
-			<th><TMPL_VAR NAME="TEXT_TITLE1"></th>
-			<th><TMPL_VAR NAME="TEXT_TITLE2"></th>
-			<th><TMPL_VAR NAME="TEXT_TITLE3"></th>
-			<th><TMPL_VAR NAME="TEXT_TITLE4"></th>
-			<th><TMPL_VAR NAME="TEXT_TITLE5"></th>
+			<th><TMPL_VAR ESCAPE=1 NAME="TEXT_TITLE1"></th>
+			<th><TMPL_VAR ESCAPE=1 NAME="TEXT_TITLE2"></th>
+			<th><TMPL_VAR ESCAPE=1 NAME="TEXT_TITLE3"></th>
+			<th><TMPL_VAR ESCAPE=1 NAME="TEXT_TITLE4"></th>
+			<th><TMPL_VAR ESCAPE=1 NAME="TEXT_TITLE5"></th>
 		</tr>
-		<TMPL_VAR NAME="LIST">
+		<TMPL_VAR ESCAPE=1 NAME="LIST">
 </table>

Modified: trunk/vhffs-panel/templates/admin/misc/mailings_part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/misc/mailings_part.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/misc/mailings_part.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,32 +1,32 @@
 <tr>
 	<td>
-		<TMPL_VAR NAME="NAME">
+		<TMPL_VAR ESCAPE=1 NAME="NAME">
 	</td>
 	<td>
-		<TMPL_VAR NAME="OWNER"> 
+		<TMPL_VAR ESCAPE=1 NAME="OWNER"> 
 	</td>
 	<td>
-		<TMPL_VAR NAME="GROUP">
+		<TMPL_VAR ESCAPE=1 NAME="GROUP">
 	</td>
 	<td class="mainColumn">
-		<TMPL_VAR NAME="DESCRIPTION"> 
+		<TMPL_VAR ESCAPE=1 NAME="DESCRIPTION"> 
 	</td>
 	<td>
 		<form method="post" action="moderation_submit.pl" accept-charset="utf-8">
-			<input type="hidden" name="OID" value="<TMPL_VAR NAME="OID">" />
-			<input type="hidden" name="UID_ASKER" value="<TMPL_VAR NAME="UID_ASKER">" />
+			<input type="hidden" name="OID" value="<TMPL_VAR ESCAPE=1 NAME="OID">" />
+			<input type="hidden" name="UID_ASKER" value="<TMPL_VAR ESCAPE=1 NAME="UID_ASKER">" />
 			<input type="hidden" name="ACCEPT" value="1" />
-			<input type="submit" value="<TMPL_VAR NAME="ACCEPT">" />
+			<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="ACCEPT">" />
 		</form>
 	</td>
 	<td>
 
 		<form method="post" action="moderation_submit.pl" accept-charset="utf-8">
 			<textarea name="reason" cols="30" rows="4"></textarea>
-			<input type="hidden" name="OID" value="<TMPL_VAR NAME="OID">" />
-			<input type="hidden" name="UID_ASKER" value="<TMPL_VAR NAME="UID_ASKER">" />
+			<input type="hidden" name="OID" value="<TMPL_VAR ESCAPE=1 NAME="OID">" />
+			<input type="hidden" name="UID_ASKER" value="<TMPL_VAR ESCAPE=1 NAME="UID_ASKER">" />
 			<input type="hidden" name="ACCEPT" value="0" />
-			<input type="submit" value="<TMPL_VAR NAME="REFUSE">" />
+			<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="REFUSE">" />
 		</form>
 	</td>
 </tr>

Modified: trunk/vhffs-panel/templates/admin/misc/moderation.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/misc/moderation.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/misc/moderation.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,26 +1,26 @@
 <table>	
 <tr>
 	<th>
-		<TMPL_VAR NAME="HEADER_TYPE">
+		<TMPL_VAR ESCAPE=1 NAME="HEADER_TYPE">
 	</th>
 	<th>
-		<TMPL_VAR NAME="HEADER_NAME">
+		<TMPL_VAR ESCAPE=1 NAME="HEADER_NAME">
 	</th>
 	<th>
-		<TMPL_VAR NAME="HEADER_USER">
+		<TMPL_VAR ESCAPE=1 NAME="HEADER_USER">
         </th>
         <th>
-		<TMPL_VAR NAME="HEADER_GROUP">
+		<TMPL_VAR ESCAPE=1 NAME="HEADER_GROUP">
         </th>
         <th class="mainColumn">
-                <TMPL_VAR NAME="HEADER_DESCRIPTION">
+                <TMPL_VAR ESCAPE=1 NAME="HEADER_DESCRIPTION">
         </th>
         <th>
-                <TMPL_VAR NAME="HEADER_ACCEPT">
+                <TMPL_VAR ESCAPE=1 NAME="HEADER_ACCEPT">
         </th>
         <th>
-                <TMPL_VAR NAME="HEADER_REFUSE">
+                <TMPL_VAR ESCAPE=1 NAME="HEADER_REFUSE">
         </th>
 </tr>
-<TMPL_VAR NAME="MODERATION">
+<TMPL_VAR ESCAPE=1 NAME="MODERATION">
 </table>

Modified: trunk/vhffs-panel/templates/admin/misc/moderation_part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/misc/moderation_part.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/misc/moderation_part.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,40 +1,40 @@
 <tr>
 	<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>
 	
-		<a href="user/show.pl?NAME=<TMPL_VAR NAME="OWNER">"> 
-		<TMPL_VAR NAME="OWNER">
+		<a href="user/show.pl?NAME=<TMPL_VAR ESCAPE=1 NAME="OWNER">"> 
+		<TMPL_VAR ESCAPE=1 NAME="OWNER">
 		</a>
-		(<TMPL_VAR NAME="NOTE">)
+		(<TMPL_VAR ESCAPE=1 NAME="NOTE">)
 
 	</td>
 	<td>
-		<a href="group/show.pl?NAME=<TMPL_VAR NAME="GROUP">"> 
-		<TMPL_VAR NAME="GROUP">
+		<a href="group/show.pl?NAME=<TMPL_VAR ESCAPE=1 NAME="GROUP">"> 
+		<TMPL_VAR ESCAPE=1 NAME="GROUP">
 		</a>
 	</td>
 	<td class="mainColumn">
-		<TMPL_VAR NAME="DESCRIPTION"> 
+		<TMPL_VAR ESCAPE=1 NAME="DESCRIPTION"> 
 	</td>
 	<td>
 		<form method="post" action="moderation_submit.pl" accept-charset="utf-8">
-			<input type="hidden" name="OID" value="<TMPL_VAR NAME="OID">" />
+			<input type="hidden" name="OID" value="<TMPL_VAR ESCAPE=1 NAME="OID">" />
 			<input type="hidden" name="ACCEPT" value="1" />
-			<input type="submit" value="<TMPL_VAR NAME="ACCEPT">" />
+			<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="ACCEPT">" />
 		</form>
 	</td>
 	<td>
 
 		<form method="post" action="moderation_submit.pl" accept-charset="utf-8">
 			<textarea name="reason" cols="30" rows="4"></textarea>
-			<input type="hidden" name="OID" value="<TMPL_VAR NAME="OID">" />
+			<input type="hidden" name="OID" value="<TMPL_VAR ESCAPE=1 NAME="OID">" />
 			<input type="hidden" name="ACCEPT" value="0" />
-			<input type="submit" value="<TMPL_VAR NAME="REFUSE">" />
+			<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="REFUSE">" />
 		</form>
 	</td>
 </tr>

Modified: trunk/vhffs-panel/templates/admin/misc/stats.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/misc/stats.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/misc/stats.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,100 +1,100 @@
-<h1><TMPL_VAR NAME="TITLE"></h1>
+<h1><TMPL_VAR ESCAPE=1 NAME="TITLE"></h1>
 		
 <h2>
-	<TMPL_VAR NAME="TEXT_USERS">: 
+	<TMPL_VAR ESCAPE=1 NAME="TEXT_USERS">: 
 </h2>
 <ul>
-	<li><TMPL_VAR NAME="TEXT_TOTAL_USERS">: <TMPL_VAR NAME="VALUE_TOTAL_USERS"></li>
-	<li><TMPL_VAR NAME="TEXT_TOTAL_USER_ADMIN">: <TMPL_VAR NAME="VALUE_TOTAL_USER_ADMIN"></li>
-	<li><TMPL_VAR NAME="TEXT_TOTAL_USER_MODERATION">: <TMPL_VAR NAME="VALUE_TOTAL_USER_MODERATION"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_TOTAL_USERS">: <TMPL_VAR ESCAPE=1 NAME="VALUE_TOTAL_USERS"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_TOTAL_USER_ADMIN">: <TMPL_VAR ESCAPE=1 NAME="VALUE_TOTAL_USER_ADMIN"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_TOTAL_USER_MODERATION">: <TMPL_VAR ESCAPE=1 NAME="VALUE_TOTAL_USER_MODERATION"></li>
 </ul>
 
 
 <h2>
-	<TMPL_VAR NAME="TEXT_GROUPS">: 
+	<TMPL_VAR ESCAPE=1 NAME="TEXT_GROUPS">: 
 </h2>
 <ul>
-	<li><TMPL_VAR NAME="TEXT_TOTAL_GROUPS">: <TMPL_VAR NAME="VALUE_TOTAL_GROUPS"></li>
-	<li><TMPL_VAR NAME="TEXT_TOTAL_GROUPS_ACTIVATED">: <TMPL_VAR NAME="VALUE_TOTAL_GROUPS_ACTIVATED"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_TOTAL_GROUPS">: <TMPL_VAR ESCAPE=1 NAME="VALUE_TOTAL_GROUPS"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_TOTAL_GROUPS_ACTIVATED">: <TMPL_VAR ESCAPE=1 NAME="VALUE_TOTAL_GROUPS_ACTIVATED"></li>
 </ul>
 
 
 <h2>
-	<TMPL_VAR NAME="TEXT_WEB">: 
+	<TMPL_VAR ESCAPE=1 NAME="TEXT_WEB">: 
 </h2>
 <ul>
-	<li><TMPL_VAR NAME="TEXT_TOTAL_WEB_IN_MODERATION">: <TMPL_VAR NAME="VALUE_TOTAL_WEB_IN_MODERATION"></li>
-	<li><TMPL_VAR NAME="TEXT_TOTAL_WEB_ACTIVATED">: <TMPL_VAR NAME="VALUE_TOTAL_WEB_ACTIVATED"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_TOTAL_WEB_IN_MODERATION">: <TMPL_VAR ESCAPE=1 NAME="VALUE_TOTAL_WEB_IN_MODERATION"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_TOTAL_WEB_ACTIVATED">: <TMPL_VAR ESCAPE=1 NAME="VALUE_TOTAL_WEB_ACTIVATED"></li>
 </ul>
 
 
 <h2>
-	<TMPL_VAR NAME="TEXT_DNS">: 
+	<TMPL_VAR ESCAPE=1 NAME="TEXT_DNS">: 
 </h2>
 <ul>
-	<li><TMPL_VAR NAME="TEXT_TOTAL_DNS_IN_MODERATION">: <TMPL_VAR NAME="VALUE_TOTAL_DNS_IN_MODERATION"></li>
-	<li><TMPL_VAR NAME="TEXT_TOTAL_DNS_ACTIVATED">: <TMPL_VAR NAME="VALUE_TOTAL_DNS_ACTIVATED"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_TOTAL_DNS_IN_MODERATION">: <TMPL_VAR ESCAPE=1 NAME="VALUE_TOTAL_DNS_IN_MODERATION"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_TOTAL_DNS_ACTIVATED">: <TMPL_VAR ESCAPE=1 NAME="VALUE_TOTAL_DNS_ACTIVATED"></li>
 </ul>
 
 
 <h2>
-	<TMPL_VAR NAME="TEXT_CVS">: 
+	<TMPL_VAR ESCAPE=1 NAME="TEXT_CVS">: 
 </h2>
 <ul>
-	<li><TMPL_VAR NAME="TEXT_TOTAL_CVS_IN_MODERATION">: <TMPL_VAR NAME="VALUE_TOTAL_CVS_IN_MODERATION"></li>
-	<li><TMPL_VAR NAME="TEXT_TOTAL_CVS_ACTIVATED">: <TMPL_VAR NAME="VALUE_TOTAL_CVS_ACTIVATED"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_TOTAL_CVS_IN_MODERATION">: <TMPL_VAR ESCAPE=1 NAME="VALUE_TOTAL_CVS_IN_MODERATION"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_TOTAL_CVS_ACTIVATED">: <TMPL_VAR ESCAPE=1 NAME="VALUE_TOTAL_CVS_ACTIVATED"></li>
 </ul>
 
 
 <h2>
-	<TMPL_VAR NAME="TEXT_SVN">: 
+	<TMPL_VAR ESCAPE=1 NAME="TEXT_SVN">: 
 </h2>
 <ul>
-	<li><TMPL_VAR NAME="TEXT_TOTAL_SVN_IN_MODERATION">: <TMPL_VAR NAME="VALUE_TOTAL_SVN_IN_MODERATION"></li>
-	<li><TMPL_VAR NAME="TEXT_TOTAL_SVN_ACTIVATED">: <TMPL_VAR NAME="VALUE_TOTAL_SVN_ACTIVATED"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_TOTAL_SVN_IN_MODERATION">: <TMPL_VAR ESCAPE=1 NAME="VALUE_TOTAL_SVN_IN_MODERATION"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_TOTAL_SVN_ACTIVATED">: <TMPL_VAR ESCAPE=1 NAME="VALUE_TOTAL_SVN_ACTIVATED"></li>
 </ul>
 
 <h2>
-	<TMPL_VAR NAME="TEXT_GIT">: 
+	<TMPL_VAR ESCAPE=1 NAME="TEXT_GIT">: 
 </h2>
 <ul>
-	<li><TMPL_VAR NAME="TEXT_TOTAL_GIT_IN_MODERATION">: <TMPL_VAR NAME="VALUE_TOTAL_GIT_IN_MODERATION"></li>
-	<li><TMPL_VAR NAME="TEXT_TOTAL_GIT_ACTIVATED">: <TMPL_VAR NAME="VALUE_TOTAL_GIT_ACTIVATED"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_TOTAL_GIT_IN_MODERATION">: <TMPL_VAR ESCAPE=1 NAME="VALUE_TOTAL_GIT_IN_MODERATION"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_TOTAL_GIT_ACTIVATED">: <TMPL_VAR ESCAPE=1 NAME="VALUE_TOTAL_GIT_ACTIVATED"></li>
 </ul>
 
 <h2>
-	<TMPL_VAR NAME="TEXT_MAIL">: 
+	<TMPL_VAR ESCAPE=1 NAME="TEXT_MAIL">: 
 </h2>
 <ul>
-	<li><TMPL_VAR NAME="TEXT_TOTAL_MAIL_IN_MODERATION">: <TMPL_VAR NAME="VALUE_TOTAL_MAIL_IN_MODERATION"></li>
-	<li><TMPL_VAR NAME="TEXT_TOTAL_MAIL_ACTIVATED">: <TMPL_VAR NAME="VALUE_TOTAL_MAIL_ACTIVATED"></li>
-	<li><TMPL_VAR NAME="TEXT_MAIL_BOXES">: <TMPL_VAR NAME="VALUE_MAIL_BOXES"></li>
-	<li><TMPL_VAR NAME="TEXT_MAIL_FORWARDS">: <TMPL_VAR NAME="VALUE_MAIL_FORWARDS"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_TOTAL_MAIL_IN_MODERATION">: <TMPL_VAR ESCAPE=1 NAME="VALUE_TOTAL_MAIL_IN_MODERATION"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_TOTAL_MAIL_ACTIVATED">: <TMPL_VAR ESCAPE=1 NAME="VALUE_TOTAL_MAIL_ACTIVATED"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_MAIL_BOXES">: <TMPL_VAR ESCAPE=1 NAME="VALUE_MAIL_BOXES"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_MAIL_FORWARDS">: <TMPL_VAR ESCAPE=1 NAME="VALUE_MAIL_FORWARDS"></li>
 </ul>
 
 <h2>
-	<TMPL_VAR NAME="TEXT_MYSQL">: 
+	<TMPL_VAR ESCAPE=1 NAME="TEXT_MYSQL">: 
 </h2>
 <ul>
-	<li><TMPL_VAR NAME="TEXT_TOTAL_MYSQL_IN_MODERATION">: <TMPL_VAR NAME="VALUE_TOTAL_MYSQL_IN_MODERATION"></li>
-	<li><TMPL_VAR NAME="TEXT_TOTAL_MYSQL_ACTIVATED">: <TMPL_VAR NAME="VALUE_TOTAL_MYSQL_ACTIVATED"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_TOTAL_MYSQL_IN_MODERATION">: <TMPL_VAR ESCAPE=1 NAME="VALUE_TOTAL_MYSQL_IN_MODERATION"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_TOTAL_MYSQL_ACTIVATED">: <TMPL_VAR ESCAPE=1 NAME="VALUE_TOTAL_MYSQL_ACTIVATED"></li>
 </ul>
 
 <h2>
-	<TMPL_VAR NAME="TEXT_PGSQL">: 
+	<TMPL_VAR ESCAPE=1 NAME="TEXT_PGSQL">: 
 </h2>
 <ul>
-	<li><TMPL_VAR NAME="TEXT_TOTAL_PGSQL_IN_MODERATION">: <TMPL_VAR NAME="VALUE_TOTAL_PGSQL_IN_MODERATION"></li>
-	<li><TMPL_VAR NAME="TEXT_TOTAL_PGSQL_ACTIVATED">: <TMPL_VAR NAME="VALUE_TOTAL_PGSQL_ACTIVATED"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_TOTAL_PGSQL_IN_MODERATION">: <TMPL_VAR ESCAPE=1 NAME="VALUE_TOTAL_PGSQL_IN_MODERATION"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_TOTAL_PGSQL_ACTIVATED">: <TMPL_VAR ESCAPE=1 NAME="VALUE_TOTAL_PGSQL_ACTIVATED"></li>
 </ul>
 
 
 <h2>
-	<TMPL_VAR NAME="TEXT_LISTS">: 
+	<TMPL_VAR ESCAPE=1 NAME="TEXT_LISTS">: 
 </h2>
 <ul>
-	<li><TMPL_VAR NAME="TEXT_TOTAL_LISTS">: <TMPL_VAR NAME="VALUE_TOTAL_LISTS"></li>
-	<li><TMPL_VAR NAME="TEXT_TOTAL_LISTS_ACTIVATED">: <TMPL_VAR NAME="VALUE_TOTAL_LISTS_ACTIVATED"></li>
-	<li><TMPL_VAR NAME="TEXT_TOTAL_SUBS">: <TMPL_VAR NAME="VALUE_TOTAL_SUBS"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_TOTAL_LISTS">: <TMPL_VAR ESCAPE=1 NAME="VALUE_TOTAL_LISTS"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_TOTAL_LISTS_ACTIVATED">: <TMPL_VAR ESCAPE=1 NAME="VALUE_TOTAL_LISTS_ACTIVATED"></li>
+	<li><TMPL_VAR ESCAPE=1 NAME="TEXT_TOTAL_SUBS">: <TMPL_VAR ESCAPE=1 NAME="VALUE_TOTAL_SUBS"></li>
 </ul>
 

Modified: trunk/vhffs-panel/templates/admin/misc/su.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/misc/su.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/misc/su.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,13 +1,13 @@
-<h1><TMPL_VAR NAME="TITLE"></h1>
+<h1><TMPL_VAR ESCAPE=1 NAME="TITLE"></h1>
 
 <form method="post" action="/admin/su.pl" accept-charset="utf-8">
 	<p>
 		<label for="TEXT">
-			<TMPL_VAR NAME="TEXT">
+			<TMPL_VAR ESCAPE=1 NAME="TEXT">
 		</label>
 		<input type="text" name="user" id="user" />
 	</p>
 	<p class="button" id="buttonSend">
-		<input type="submit" value="<TMPL_VAR NAME="TEXT_SUBMIT">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_SUBMIT">" />
 	</p>
 </form>

Modified: trunk/vhffs-panel/templates/admin/mysql/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/mysql/part.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/mysql/part.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,16 +1,16 @@
 <TMPL_LOOP NAME="DBS">
 <tr>
 	<td>
-		<TMPL_VAR NAME="DBNAME">
+		<TMPL_VAR ESCAPE=1 NAME="DBNAME">
 	</td>
 	<td>
-		<TMPL_VAR NAME="GROUPNAME"> 
+		<TMPL_VAR ESCAPE=1 NAME="GROUPNAME"> 
 	</td>
 	<td>
-		<TMPL_VAR NAME="STATE"> 
+		<TMPL_VAR ESCAPE=1 NAME="STATE"> 
 	</td>
 	<td>
-		<a href="/mysql/prefs.pl?admin_menu=1&amp;name=<TMPL_VAR NAME="DBNAME">"><TMPL_VAR NAME="ACTION"></a>
+		<a href="/mysql/prefs.pl?admin_menu=1&amp;name=<TMPL_VAR ESCAPE=1 NAME="DBNAME">"><TMPL_VAR ESCAPE=1 NAME="ACTION"></a>
 	</td>
 </tr>
 </TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/admin/mysql/search.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/mysql/search.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/mysql/search.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,4 +1,4 @@
-		<h1><TMPL_VAR NAME="TITLE"></h1>
+		<h1><TMPL_VAR ESCAPE=1 NAME="TITLE"></h1>
 		<form method="post" action="list.pl" accept-charset="utf-8">
 			<input type="text" name="NAME" value=""/>
 		</form>

Modified: trunk/vhffs-panel/templates/admin/object/edit.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/object/edit.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/object/edit.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,65 +1,65 @@
-<h1><TMPL_VAR NAME="TITLE"></h1>
+<h1><TMPL_VAR ESCAPE=1 NAME="TITLE"></h1>
 	
 <form method="post" action="edit_submit.pl" accept-charset="utf-8">
 
 	<p>
 		<label>
-			<TMPL_VAR NAME="TEXT_OID">
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_OID">
 		</label>
-		<TMPL_VAR NAME="VALUE_OID">
+		<TMPL_VAR ESCAPE=1 NAME="VALUE_OID">
 	</p>
 	<p>
 		<label for="UID">			
-			<TMPL_VAR NAME="TEXT_UID">
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_UID">
 		</label>
-		<input type="text" name="UID" id="UID" value="<TMPL_VAR NAME="VALUE_UID">" />
-		( <TMPL_VAR NAME="VALUE_USERNAME"> )
+		<input type="text" name="UID" id="UID" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_UID">" />
+		( <TMPL_VAR ESCAPE=1 NAME="VALUE_USERNAME"> )
 	</p>
 	<p>
 		<label>			
-			<TMPL_VAR NAME="TEXT_DATE">
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_DATE">
 		</label>
-			<TMPL_VAR NAME="VALUE_DATE">
+			<TMPL_VAR ESCAPE=1 NAME="VALUE_DATE">
 	</p>
 	<p>
 		<label for="STATUS">			
-			<TMPL_VAR NAME="TEXT_STATUS">
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS">
 		</label>
 			<select name="STATUS" id="STATUS">
-				<option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_VALIDATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_VALIDATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_VALIDATION"></option>
-				<option value="<TMPL_VAR NAME="VALUE_STATUS_VALIDATION_REFUSED">" <TMPL_VAR NAME="SELECTED_STATUS_VALIDATION_REFUSED">> <TMPL_VAR NAME="TEXT_STATUS_VALIDATION_REFUSED"></option>
-				<option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_CREATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_CREATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_CREATION"></option>
-				<option value="<TMPL_VAR NAME="VALUE_STATUS_CREATING_ERROR">" <TMPL_VAR NAME="SELECTED_STATUS_CREATING_ERROR">> <TMPL_VAR NAME="TEXT_STATUS_CREATING_ERROR"></option>
-				<option value="<TMPL_VAR NAME="VALUE_STATUS_CREATED">" <TMPL_VAR NAME="SELECTED_STATUS_CREATED">> <TMPL_VAR NAME="TEXT_STATUS_CREATED"></option>
-				<option value="<TMPL_VAR NAME="VALUE_STATUS_ACTIVATED">" <TMPL_VAR NAME="SELECTED_STATUS_ACTIVATED">> <TMPL_VAR NAME="TEXT_STATUS_ACTIVATED"></option>
-				<option value="<TMPL_VAR NAME="VALUE_STATUS_SUSPENDED">" <TMPL_VAR NAME="SELECTED_STATUS_SUSPENDED">> <TMPL_VAR NAME="TEXT_STATUS_SUSPENDED"></option>
-				<option value="<TMPL_VAR NAME="VALUE_STATUS_SUSPENDED_BEFORE_DELETED">" <TMPL_VAR NAME="SELECTED_STATUS_SUSPENDED_BEFORE_DELETED">> <TMPL_VAR NAME="TEXT_STATUS_SUSPENDED_BEFORE_DELETED"></option>
-				<option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_MODIFICATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_MODIFICATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_MODIFICATION"></option>
-				<option value="<TMPL_VAR NAME="VALUE_STATUS_MODIFICATION_ERROR">" <TMPL_VAR NAME="SELECTED_STATUS_MODIFICATION_ERROR">> <TMPL_VAR NAME="TEXT_STATUS_MODIFICATION_ERROR"></option>
-				<option value="<TMPL_VAR NAME="VALUE_STATUS_MODIFICATION_APPLIED">" <TMPL_VAR NAME="SELECTED_STATUS_MODIFICATION_APPLIED">> <TMPL_VAR NAME="TEXT_STATUS_MODIFICATION_APPLIED"></option>
-				<option value="<TMPL_VAR NAME="VALUE_STATUS_TO_DELETE">" <TMPL_VAR NAME="SELECTED_STATUS_TO_DELETE">> <TMPL_VAR NAME="TEXT_STATUS_TO_DELETE"></option>
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_WAITING_FOR_VALIDATION">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_WAITING_FOR_VALIDATION">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_WAITING_FOR_VALIDATION"></option>
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_VALIDATION_REFUSED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_VALIDATION_REFUSED">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_VALIDATION_REFUSED"></option>
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_WAITING_FOR_CREATION">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_WAITING_FOR_CREATION">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_WAITING_FOR_CREATION"></option>
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_CREATING_ERROR">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_CREATING_ERROR">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_CREATING_ERROR"></option>
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_CREATED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_CREATED">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_CREATED"></option>
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_ACTIVATED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_ACTIVATED">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_ACTIVATED"></option>
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_SUSPENDED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_SUSPENDED">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_SUSPENDED"></option>
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_SUSPENDED_BEFORE_DELETED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_SUSPENDED_BEFORE_DELETED">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_SUSPENDED_BEFORE_DELETED"></option>
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_WAITING_FOR_MODIFICATION">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_WAITING_FOR_MODIFICATION">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_WAITING_FOR_MODIFICATION"></option>
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_MODIFICATION_ERROR">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_MODIFICATION_ERROR">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_MODIFICATION_ERROR"></option>
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_MODIFICATION_APPLIED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_MODIFICATION_APPLIED">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_MODIFICATION_APPLIED"></option>
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_TO_DELETE">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_TO_DELETE">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_TO_DELETE"></option>
 			</select>
 	</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" id="buttonSend">
-		<input type="hidden" name="OID" value="<TMPL_VAR NAME="VALUE_OID">" />
-		<input type="submit" value="<TMPL_VAR NAME="SEND">" />
+		<input type="hidden" name="OID" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_OID">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" />
 	</p>
 
 </form>
 
-<h2><TMPL_VAR NAME="HISTORY_TITLE"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="HISTORY_TITLE"></h2>
 <table>
-	<TMPL_VAR NAME="HISTORY_PART">
+	<TMPL_VAR ESCAPE=1 NAME="HISTORY_PART">
 </table>
 
-<h2><TMPL_VAR NAME="AVATAR_TITLE"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="AVATAR_TITLE"></h2>
 <ul>
-	<li><a href="delete_avatar.pl?OID=<TMPL_VAR NAME="VALUE_OID">"><TMPL_VAR NAME="DELETE_AVATAR"></a></li>
+	<li><a href="delete_avatar.pl?OID=<TMPL_VAR ESCAPE=1 NAME="VALUE_OID">"><TMPL_VAR ESCAPE=1 NAME="DELETE_AVATAR"></a></li>
 </ul>

Modified: trunk/vhffs-panel/templates/admin/object/editembedded.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/object/editembedded.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/object/editembedded.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,65 +1,65 @@
-<h1><TMPL_VAR NAME="TITLE"></h1>
+<h1><TMPL_VAR ESCAPE=1 NAME="TITLE"></h1>
 	
 <form method="post" action="/admin/object/edit_submit.pl" accept-charset="utf-8">
 
 	<p>
 		<label>
-			<TMPL_VAR NAME="TEXT_OID">
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_OID">
 		</label>
-		<TMPL_VAR NAME="VALUE_OID">
+		<TMPL_VAR ESCAPE=1 NAME="VALUE_OID">
 	</p>
 	<p>
 		<label for="UID">			
-			<TMPL_VAR NAME="TEXT_UID">
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_UID">
 		</label>
-		<input type="text" name="UID" id="UID" value="<TMPL_VAR NAME="VALUE_UID">" />
-		( <TMPL_VAR NAME="VALUE_USERNAME"> )
+		<input type="text" name="UID" id="UID" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_UID">" />
+		( <TMPL_VAR ESCAPE=1 NAME="VALUE_USERNAME"> )
 	</p>
 	<p>
 		<label>			
-			<TMPL_VAR NAME="TEXT_DATE">
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_DATE">
 		</label>
-			<TMPL_VAR NAME="VALUE_DATE">
+			<TMPL_VAR ESCAPE=1 NAME="VALUE_DATE">
 	</p>
 	<p>
 		<label for="STATUS">			
-			<TMPL_VAR NAME="TEXT_STATUS">
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS">
 		</label>
 			<select name="STATUS" id="STATUS">
-				<option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_VALIDATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_VALIDATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_VALIDATION"></option>
-				<option value="<TMPL_VAR NAME="VALUE_STATUS_VALIDATION_REFUSED">" <TMPL_VAR NAME="SELECTED_STATUS_VALIDATION_REFUSED">> <TMPL_VAR NAME="TEXT_STATUS_VALIDATION_REFUSED"></option>
-				<option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_CREATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_CREATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_CREATION"></option>
-				<option value="<TMPL_VAR NAME="VALUE_STATUS_CREATING_ERROR">" <TMPL_VAR NAME="SELECTED_STATUS_CREATING_ERROR">> <TMPL_VAR NAME="TEXT_STATUS_CREATING_ERROR"></option>
-				<option value="<TMPL_VAR NAME="VALUE_STATUS_CREATED">" <TMPL_VAR NAME="SELECTED_STATUS_CREATED">> <TMPL_VAR NAME="TEXT_STATUS_CREATED"></option>
-				<option value="<TMPL_VAR NAME="VALUE_STATUS_ACTIVATED">" <TMPL_VAR NAME="SELECTED_STATUS_ACTIVATED">> <TMPL_VAR NAME="TEXT_STATUS_ACTIVATED"></option>
-				<option value="<TMPL_VAR NAME="VALUE_STATUS_SUSPENDED">" <TMPL_VAR NAME="SELECTED_STATUS_SUSPENDED">> <TMPL_VAR NAME="TEXT_STATUS_SUSPENDED"></option>
-				<option value="<TMPL_VAR NAME="VALUE_STATUS_SUSPENDED_BEFORE_DELETED">" <TMPL_VAR NAME="SELECTED_STATUS_SUSPENDED_BEFORE_DELETED">> <TMPL_VAR NAME="TEXT_STATUS_SUSPENDED_BEFORE_DELETED"></option>
-				<option value="<TMPL_VAR NAME="VALUE_STATUS_WAITING_FOR_MODIFICATION">" <TMPL_VAR NAME="SELECTED_STATUS_WAITING_FOR_MODIFICATION">> <TMPL_VAR NAME="TEXT_STATUS_WAITING_FOR_MODIFICATION"></option>
-				<option value="<TMPL_VAR NAME="VALUE_STATUS_MODIFICATION_ERROR">" <TMPL_VAR NAME="SELECTED_STATUS_MODIFICATION_ERROR">> <TMPL_VAR NAME="TEXT_STATUS_MODIFICATION_ERROR"></option>
-				<option value="<TMPL_VAR NAME="VALUE_STATUS_MODIFICATION_APPLIED">" <TMPL_VAR NAME="SELECTED_STATUS_MODIFICATION_APPLIED">> <TMPL_VAR NAME="TEXT_STATUS_MODIFICATION_APPLIED"></option>
-				<option value="<TMPL_VAR NAME="VALUE_STATUS_TO_DELETE">" <TMPL_VAR NAME="SELECTED_STATUS_TO_DELETE">> <TMPL_VAR NAME="TEXT_STATUS_TO_DELETE"></option>
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_WAITING_FOR_VALIDATION">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_WAITING_FOR_VALIDATION">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_WAITING_FOR_VALIDATION"></option>
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_VALIDATION_REFUSED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_VALIDATION_REFUSED">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_VALIDATION_REFUSED"></option>
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_WAITING_FOR_CREATION">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_WAITING_FOR_CREATION">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_WAITING_FOR_CREATION"></option>
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_CREATING_ERROR">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_CREATING_ERROR">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_CREATING_ERROR"></option>
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_CREATED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_CREATED">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_CREATED"></option>
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_ACTIVATED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_ACTIVATED">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_ACTIVATED"></option>
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_SUSPENDED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_SUSPENDED">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_SUSPENDED"></option>
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_SUSPENDED_BEFORE_DELETED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_SUSPENDED_BEFORE_DELETED">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_SUSPENDED_BEFORE_DELETED"></option>
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_WAITING_FOR_MODIFICATION">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_WAITING_FOR_MODIFICATION">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_WAITING_FOR_MODIFICATION"></option>
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_MODIFICATION_ERROR">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_MODIFICATION_ERROR">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_MODIFICATION_ERROR"></option>
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_MODIFICATION_APPLIED">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_MODIFICATION_APPLIED">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_MODIFICATION_APPLIED"></option>
+				<option value="<TMPL_VAR ESCAPE=1 NAME="VALUE_STATUS_TO_DELETE">" <TMPL_VAR ESCAPE=1 NAME="SELECTED_STATUS_TO_DELETE">> <TMPL_VAR ESCAPE=1 NAME="TEXT_STATUS_TO_DELETE"></option>
 			</select>
 	</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" id="buttonSend">
-		<input type="hidden" name="OID" value="<TMPL_VAR NAME="VALUE_OID">" />
-		<input type="submit" value="<TMPL_VAR NAME="SEND">" />
+		<input type="hidden" name="OID" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_OID">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" />
 	</p>
 
 </form>
 
-<h2><TMPL_VAR NAME="HISTORY_TITLE"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="HISTORY_TITLE"></h2>
 <table>
-	<TMPL_VAR NAME="HISTORY_PART">
+	<TMPL_VAR ESCAPE=1 NAME="HISTORY_PART">
 </table>
 
-<h2><TMPL_VAR NAME="AVATAR_TITLE"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="AVATAR_TITLE"></h2>
 <ul>
-	<li><a href="delete_avatar.pl?OID=<TMPL_VAR NAME="VALUE_OID">"><TMPL_VAR NAME="DELETE_AVATAR"></a></li>
+	<li><a href="delete_avatar.pl?OID=<TMPL_VAR ESCAPE=1 NAME="VALUE_OID">"><TMPL_VAR ESCAPE=1 NAME="DELETE_AVATAR"></a></li>
 </ul>

Modified: trunk/vhffs-panel/templates/admin/object/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/object/part.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/object/part.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,24 +1,24 @@
 <TMPL_LOOP NAME="OBJECTS">
 <tr>
 	<td>
-		<TMPL_VAR NAME="OID"> (<TMPL_VAR NAME="TYPE">)
+		<TMPL_VAR ESCAPE=1 NAME="OID"> (<TMPL_VAR ESCAPE=1 NAME="TYPE">)
 	</td>
 	<td>
-		<TMPL_VAR NAME="USERNAME"> 
+		<TMPL_VAR ESCAPE=1 NAME="USERNAME"> 
 	</td>
 	<td>
-		<TMPL_VAR NAME="GROUPNAME"> 
+		<TMPL_VAR ESCAPE=1 NAME="GROUPNAME"> 
 	</td>
 	<td>
-		<TMPL_VAR NAME="STATE"> 
+		<TMPL_VAR ESCAPE=1 NAME="STATE"> 
 	</td>
 	<td>
-		<a href="../../history.pl?OID=<TMPL_VAR NAME="OID">"><TMPL_VAR NAME="HISTORY"></a> 
+		<a href="../../history.pl?OID=<TMPL_VAR ESCAPE=1 NAME="OID">"><TMPL_VAR ESCAPE=1 NAME="HISTORY"></a> 
 	</td>
 	<td>
 		<form method="post" action="edit.pl" accept-charset="utf-8">
-			<input type="hidden" name="OID" value="<TMPL_VAR NAME="OID">" />
-			<input type="submit" value="<TMPL_VAR NAME="SEND">" />
+			<input type="hidden" name="OID" value="<TMPL_VAR ESCAPE=1 NAME="OID">" />
+			<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" />
 		</form>
 	</td>
 </tr>

Modified: trunk/vhffs-panel/templates/admin/object/search.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/object/search.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/object/search.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,4 +1,4 @@
-		<h1><TMPL_VAR NAME="TITLE"></h1>
+		<h1><TMPL_VAR ESCAPE=1 NAME="TITLE"></h1>
 		<form method="post" action="list.pl" accept-charset="utf-8">
 			<input type="text" name="NAME" value=""/>
 		</form>
\ No newline at end of file

Modified: trunk/vhffs-panel/templates/admin/pgsql/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/pgsql/part.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/pgsql/part.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,16 +1,16 @@
 <TMPL_LOOP NAME="DBS">
 <tr>
 	<td>
-		<TMPL_VAR NAME="DBNAME">
+		<TMPL_VAR ESCAPE=1 NAME="DBNAME">
 	</td>
 	<td>
-		<TMPL_VAR NAME="GROUPNAME"> 
+		<TMPL_VAR ESCAPE=1 NAME="GROUPNAME"> 
 	</td>
 	<td>
-		<TMPL_VAR NAME="STATE"> 
+		<TMPL_VAR ESCAPE=1 NAME="STATE"> 
 	</td>
 	<td>
-		<a href="/pgsql/prefs.pl?admin_menu=1&amp;name=<TMPL_VAR NAME="DBNAME">"><TMPL_VAR NAME="ACTION"></a>
+		<a href="/pgsql/prefs.pl?admin_menu=1&amp;name=<TMPL_VAR ESCAPE=1 NAME="DBNAME">"><TMPL_VAR ESCAPE=1 NAME="ACTION"></a>
 	</td>
 </tr>
 </TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/admin/pgsql/search.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/pgsql/search.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/pgsql/search.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,4 +1,4 @@
-		<h1><TMPL_VAR NAME="TITLE"></h1>
+		<h1><TMPL_VAR ESCAPE=1 NAME="TITLE"></h1>
 		<form method="post" action="list.pl" accept-charset="utf-8">
 			<input type="text" name="NAME" value="" />
 		</form>

Modified: trunk/vhffs-panel/templates/admin/repository/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/repository/part.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/repository/part.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,16 +1,16 @@
 <TMPL_LOOP NAME="REPOSITORIES">
 <tr>
 	<td>
-		<TMPL_VAR NAME="NAME">
+		<TMPL_VAR ESCAPE=1 NAME="NAME">
 	</td>
 	<td>
-		<TMPL_VAR NAME="GROUPNAME"> 
+		<TMPL_VAR ESCAPE=1 NAME="GROUPNAME"> 
 	</td>
 	<td>
-		<TMPL_VAR NAME="STATE"> 
+		<TMPL_VAR ESCAPE=1 NAME="STATE"> 
 	</td>
 	<td>
-		<a href="/repository/prefs.pl?admin_menu=1&amp;name=<TMPL_VAR NAME="NAME">"><TMPL_VAR NAME="ACTION"></a>
+		<a href="/repository/prefs.pl?admin_menu=1&amp;name=<TMPL_VAR ESCAPE=1 NAME="NAME">"><TMPL_VAR ESCAPE=1 NAME="ACTION"></a>
 	</td>
 </tr>
 </TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/admin/repository/search.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/repository/search.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/repository/search.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,4 +1,4 @@
-		<h1><TMPL_VAR NAME="TITLE"></h1>
+		<h1><TMPL_VAR ESCAPE=1 NAME="TITLE"></h1>
 		<form method="post" action="list.pl" accept-charset="utf-8">
 			<input type="text" name="NAME" value="" />
 		</form>

Modified: trunk/vhffs-panel/templates/admin/svn/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/svn/part.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/svn/part.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,16 +1,16 @@
 <TMPL_LOOP NAME="SVNREPOS">
 <tr>
 	<td>
-		<TMPL_VAR NAME="SVNROOT">
+		<TMPL_VAR ESCAPE=1 NAME="SVNROOT">
 	</td>
 	<td>
-		<TMPL_VAR NAME="GROUPNAME"> 
+		<TMPL_VAR ESCAPE=1 NAME="GROUPNAME"> 
 	</td>
 	<td>
-		<TMPL_VAR NAME="STATE"> 
+		<TMPL_VAR ESCAPE=1 NAME="STATE"> 
 	</td>
 	<td>
-		<a href="/svn/prefs.pl?admin_menu=1&amp;name=<TMPL_VAR NAME="SVNROOT">"><TMPL_VAR NAME="ACTION"></a>
+		<a href="/svn/prefs.pl?admin_menu=1&amp;name=<TMPL_VAR ESCAPE=1 NAME="SVNROOT">"><TMPL_VAR ESCAPE=1 NAME="ACTION"></a>
 	</td>
 </tr>
 </TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/admin/svn/search.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/svn/search.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/svn/search.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,4 +1,4 @@
-		<h1><TMPL_VAR NAME="TITLE"></h1>
+		<h1><TMPL_VAR ESCAPE=1 NAME="TITLE"></h1>
 		<form method="post" action="list.pl" accept-charset="utf-8">
 			<input type="text" name="NAME" value=""/>
 		</form>

Modified: trunk/vhffs-panel/templates/admin/user/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/user/part.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/user/part.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,16 +1,16 @@
 <TMPL_LOOP NAME="USERS">
 <tr>
 	<td>
-		<TMPL_VAR NAME="USERNAME">
+		<TMPL_VAR ESCAPE=1 NAME="USERNAME">
 	</td>
 	<td>
-		<TMPL_VAR NAME="FIRSTNAME"> <TMPL_VAR NAME="LASTNAME">
+		<TMPL_VAR ESCAPE=1 NAME="FIRSTNAME"> <TMPL_VAR ESCAPE=1 NAME="LASTNAME">
 	</td>
 	<td>
-		<TMPL_VAR NAME="STATE"> 
+		<TMPL_VAR ESCAPE=1 NAME="STATE"> 
 	</td>
 	<td>
-		<a href="/user/prefs.pl?admin_menu=1&amp;name=<TMPL_VAR NAME="USERNAME">"><TMPL_VAR NAME="ACTION"></a>
+		<a href="/user/prefs.pl?admin_menu=1&amp;name=<TMPL_VAR ESCAPE=1 NAME="USERNAME">"><TMPL_VAR ESCAPE=1 NAME="ACTION"></a>
 	</td>
 </tr>
 </TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/admin/user/search.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/user/search.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/user/search.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,4 +1,4 @@
-		<h1><TMPL_VAR NAME="TITLE"></h1>
+		<h1><TMPL_VAR ESCAPE=1 NAME="TITLE"></h1>
 		
 		<form method="post" action="list.pl" accept-charset="utf-8">
 			<input type="text" name="NAME" value=""/>

Modified: trunk/vhffs-panel/templates/admin/web/part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/web/part.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/web/part.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,16 +1,16 @@
 <TMPL_LOOP NAME="WEBS">
 <tr>
 	<td>
-		<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>
 	</td>
 	<td>
-		<TMPL_VAR NAME="GROUPNAME"> 
+		<TMPL_VAR ESCAPE=1 NAME="GROUPNAME"> 
 	</td>
 	<td>
-		<TMPL_VAR NAME="STATE"> 
+		<TMPL_VAR ESCAPE=1 NAME="STATE"> 
 	</td>
 	<td>
-		<a href="/web/prefs.pl?admin_menu=1&amp;name=<TMPL_VAR NAME="SERVERNAME">"><TMPL_VAR NAME="ACTION"></a>
+		<a href="/web/prefs.pl?admin_menu=1&amp;name=<TMPL_VAR ESCAPE=1 NAME="SERVERNAME">"><TMPL_VAR ESCAPE=1 NAME="ACTION"></a>
 	</td>
 </tr>
 </TMPL_LOOP>

Modified: trunk/vhffs-panel/templates/admin/web/search.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/web/search.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/admin/web/search.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,4 +1,4 @@
-		<h1><TMPL_VAR NAME="TITLE"></h1>
+		<h1><TMPL_VAR ESCAPE=1 NAME="TITLE"></h1>
 		<form method="post" action="list.pl" accept-charset="utf-8">
 			<input type="text" name="NAME" value=""/>
 		</form>

Modified: trunk/vhffs-panel/templates/cvs/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/cvs/create.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/cvs/create.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,23 +1,23 @@
 <form method="post" action="create.pl" accept-charset="utf-8">
 	<p>
 		<label>		
-			<TMPL_VAR NAME="GROUP_NAME">: 
+			<TMPL_VAR ESCAPE=1 NAME="GROUP_NAME">: 
 		</label>
-		<TMPL_VAR NAME="GROUP">
+		<TMPL_VAR ESCAPE=1 NAME="GROUP">
 	</p>
 	<p>
 		<label for="REPOSITORY_NAME">		
-			<TMPL_VAR NAME="REPOSITORY_NAME">: 
+			<TMPL_VAR ESCAPE=1 NAME="REPOSITORY_NAME">: 
 		</label>	
-		<TMPL_VAR 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 name="REPOSITORY_VALUE">"/>
 	</p>
 	<p>
 		<label for="PROJECT_USAGE">		
-			<TMPL_VAR NAME="DESCRIPTION">:
+			<TMPL_VAR ESCAPE=1 NAME="DESCRIPTION">:
 		</label>	
 		<textarea name="DESCRIPTION" cols="45" rows="15"><tmpl_var name="DESCRIPTION_VALUE"></textarea>
 	</p>
 	<p class="button" id="buttonSend">
-		<input type="submit" value="<TMPL_VAR NAME="SEND">" id="cvs_submit" name="cvs_submit" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" id="cvs_submit" name="cvs_submit" />
 	</p>
 </form>

Modified: trunk/vhffs-panel/templates/dns/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/dns/create.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/dns/create.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,32 +1,32 @@
 <form method="post" action="create.pl" accept-charset="utf-8">
 	<p>
-		<TMPL_VAR NAME="INFOS_DNS">
+		<TMPL_VAR ESCAPE=1 NAME="INFOS_DNS">
 	</p>
 	<p>
 		<label>			
-			<TMPL_VAR NAME="DNS_SERVER">
+			<TMPL_VAR ESCAPE=1 NAME="DNS_SERVER">
 		</label>
 		see FAQ
 	</p>
 	<p>
 		<label>		
-			<TMPL_VAR NAME="GROUP_NAME">: 
+			<TMPL_VAR ESCAPE=1 NAME="GROUP_NAME">: 
 		</label>
-		<TMPL_VAR NAME="GROUP">
+		<TMPL_VAR ESCAPE=1 NAME="GROUP">
 	</p>
 	<p>
 		<label for="DOMAIN_NAME">		
-			<TMPL_VAR NAME="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">"/>
 	</p>
 	<p>
 		<label for="PROJECT_USAGE">		
-			<TMPL_VAR NAME="DESCRIPTION">:
+			<TMPL_VAR ESCAPE=1 NAME="DESCRIPTION">:
 		</label>
 		<textarea name="DESCRIPTION" id="DESCRIPTION" cols="45" rows="7"><tmpl_var name="DESCRIPTION_VALUE"></textarea>
 	</p>
 	<p class="button">
-		<input type="submit" value="<TMPL_VAR NAME="SEND">" name="dns_submit" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" name="dns_submit" />
 	</p>
 </form>

Modified: trunk/vhffs-panel/templates/dns/list_a_sub.tmpl
===================================================================
--- trunk/vhffs-panel/templates/dns/list_a_sub.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/dns/list_a_sub.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -3,14 +3,14 @@
 <form method="post" action="prefs.pl" accept-charset="utf-8">
     <p>
     <label for="data_<tmpl_var name="id">">
-    <TMPL_VAR NAME="NAME">-&gt;
+    <TMPL_VAR ESCAPE=1 NAME="NAME">-&gt;
     </label>
-        <input type="text" name="data" id="data_<tmpl_var name="id">" value="<TMPL_VAR NAME="data">" />
-        <input type="hidden" name="domain" value="<TMPL_VAR NAME="DOMAIN">" />
+        <input type="text" name="data" id="data_<tmpl_var 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="action" value="manage_a"/>
-        <input type="submit" value="<TMPL_VAR NAME="MODIFY">" class="autowidth" name="modify_a_submit" />
-        <input type="submit" value="<TMPL_VAR NAME="DEL">" name="delete_a_submit" class="autowidth"/>
+        <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>

Modified: trunk/vhffs-panel/templates/dns/list_aaaa_sub.tmpl
===================================================================
--- trunk/vhffs-panel/templates/dns/list_aaaa_sub.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/dns/list_aaaa_sub.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -3,14 +3,14 @@
 <form method="post" action="prefs.pl" accept-charset="utf-8">
     <p>
     <label for="data_<tmpl_var name="id">">
-    <TMPL_VAR NAME="name">-&gt;
+    <TMPL_VAR ESCAPE=1 NAME="name">-&gt;
     </label>
-        <input type="text" name="data" id="data_<tmpl_var name="id">" value="<TMPL_VAR NAME="data">" />
-        <input type="hidden" name="domain" value="<TMPL_VAR NAME="DOMAIN">" />
+        <input type="text" name="data" id="data_<tmpl_var 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="action" value="manage_aaaa"/>
-        <input type="submit" value="<TMPL_VAR NAME="MODIFY">" class="autowidth" name="modify_aaaa_submit" />
-        <input type="submit" value="<TMPL_VAR NAME="DEL">" name="delete_aaaa_submit" class="autowidth"/>
+        <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>

Modified: trunk/vhffs-panel/templates/dns/list_cname_sub.tmpl
===================================================================
--- trunk/vhffs-panel/templates/dns/list_cname_sub.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/dns/list_cname_sub.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -2,14 +2,14 @@
 <form method="post" action="prefs.pl" accept-charset="utf-8">
 	<p>
 		<label for="data_<tmpl_var name="id">">
-			<TMPL_VAR NAME="name">-&gt;
+			<TMPL_VAR ESCAPE=1 NAME="name">-&gt;
 		</label>
-		<input type="text" name="data" id="data_<tmpl_var name="id">"value="<TMPL_VAR NAME="data">" />
+		<input type="text" name="data" id="data_<tmpl_var 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="domain" value="<TMPL_VAR NAME="DOMAIN">" />
-		<input type="submit" name="modify_cname_submit" value="<TMPL_VAR NAME="MODIFY">" class="autowidth" />
-		<input type="submit" name="delete_cname_submit" value="<TMPL_VAR NAME="DEL">" class="autowidth" />
+		<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>

Modified: trunk/vhffs-panel/templates/dns/list_mx_sub.tmpl
===================================================================
--- trunk/vhffs-panel/templates/dns/list_mx_sub.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/dns/list_mx_sub.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,14 +1,14 @@
 <tmpl_loop name="MX_RR">
 <form method="post" action="prefs.pl" accept-charset="utf-8">
 <p><label for="data_<tmpl_var name="id">">
-    <TMPL_VAR NAME="TEXT_PRIORITY"><TMPL_VAR NAME="aux">
+    <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 NAME="data">" />
-    <input type="hidden" name="domain" value="<TMPL_VAR NAME="DOMAIN">" />
+    <input type="text" name="data"  id="data_<tmpl_var 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="action" value="manage_mx" />
-    <input type="submit" value="<TMPL_VAR NAME="MODIFY">" name="modify_mx_submit" class="autowidth"/>
-    <input type="submit" value="<TMPL_VAR NAME="DEL">" name="delete_mx_submit" class="autowidth"/>
+    <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>

Modified: trunk/vhffs-panel/templates/dns/list_ns_sub.tmpl
===================================================================
--- trunk/vhffs-panel/templates/dns/list_ns_sub.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/dns/list_ns_sub.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,11 +1,11 @@
 <tmpl_loop name="NS_RR">
 <form method="post" action="prefs.pl" accept-charset="utf-8">
 <p>
-    <label><TMPL_VAR NAME="data"></label>
+    <label><TMPL_VAR ESCAPE=1 NAME="data"></label>
     <input type="hidden" name="action" value="manage_ns" />
-    <input type="hidden" name="rr_id" value="<TMPL_VAR NAME="id">" />
-    <input type="hidden" name="domain" value="<TMPL_VAR NAME="domain">" />
-    <input type="submit" name="delete_ns_submit" value="<TMPL_VAR NAME="DEL">" class="autowidth"/>
+    <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="delete_ns_submit" value="<TMPL_VAR ESCAPE=1 NAME="DEL">" class="autowidth"/>
 </p>
 </form>
 </tmpl_loop>

Modified: trunk/vhffs-panel/templates/dns/list_srv_sub.tmpl
===================================================================
--- trunk/vhffs-panel/templates/dns/list_srv_sub.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/dns/list_srv_sub.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -2,17 +2,17 @@
 <form method="post" action="prefs.pl" accept-charset="utf-8">
     <p>
     <label>
-    <TMPL_VAR NAME="NAME">-&gt;
+    <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="hidden" name="domain" value="<TMPL_VAR NAME="DOMAIN">"/>
+        <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="action" value="manage_srv"/>
-        <input type="submit" value="<TMPL_VAR NAME="MODIFY">" class="autowidth" name="modify_srv_submit" />
-        <input type="submit" value="<TMPL_VAR NAME="DEL">" name="delete_srv_submit" class="autowidth"/>
+        <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>

Modified: trunk/vhffs-panel/templates/dns/list_txt_sub.tmpl
===================================================================
--- trunk/vhffs-panel/templates/dns/list_txt_sub.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/dns/list_txt_sub.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -3,14 +3,14 @@
 <form method="post" action="prefs.pl" accept-charset="utf-8">
     <p>
     <label for="data_<tmpl_var name="id">">
-    <TMPL_VAR NAME="NAME">-&gt;
+    <TMPL_VAR ESCAPE=1 NAME="NAME">-&gt;
     </label>
-        <input type="text" name="data" id="data_<tmpl_var name="id">" value="<TMPL_VAR NAME="data">" />
-        <input type="hidden" name="domain" value="<TMPL_VAR NAME="DOMAIN">" />
+        <input type="text" name="data" id="data_<tmpl_var 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="action" value="manage_txt"/>
-        <input type="submit" value="<TMPL_VAR NAME="MODIFY">" class="autowidth" name="modify_txt_submit" />
-        <input type="submit" value="<TMPL_VAR NAME="DEL">" name="delete_txt_submit" class="autowidth"/>
+        <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>

Modified: trunk/vhffs-panel/templates/dns/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/dns/prefs.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/dns/prefs.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,135 +1,135 @@
-<h2><TMPL_VAR NAME="TEXT_TYPEA"></h2>
-<h3><TMPL_VAR NAME="TEXT_LIST_A"></h3>
-<TMPL_VAR NAME="LIST_A">
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_TYPEA"></h2>
+<h3><TMPL_VAR ESCAPE=1 NAME="TEXT_LIST_A"></h3>
+<TMPL_VAR ESCAPE=1 NAME="LIST_A">
 
-<h3><TMPL_VAR NAME="TEXT_ADD_A"></h3>
+<h3><TMPL_VAR ESCAPE=1 NAME="TEXT_ADD_A"></h3>
 <form method="post" action="prefs.pl" accept-charset="utf-8">
-    <p class="help"><TMPL_VAR NAME="TEXT_ORIGIN"></p>
+    <p class="help"><TMPL_VAR ESCAPE=1 NAME="TEXT_ORIGIN"></p>
 	<p>
 		<label for="add_a_prefix">
-			<TMPL_VAR NAME="TEXT_DOMAINNAME">
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_DOMAINNAME">
 		</label>
-		<input type="text" name="name"  id="add_a_prefix" /><strong>.<TMPL_VAR NAME="DOMAIN_NAME"></strong>
+		<input type="text" name="name"  id="add_a_prefix" /><strong>.<TMPL_VAR ESCAPE=1 NAME="DOMAIN_NAME"></strong>
 	</p>
-	<p><TMPL_VAR NAME="TEXT_QUESTION_REDIRECTION">:
+	<p><TMPL_VAR ESCAPE=1 NAME="TEXT_QUESTION_REDIRECTION">:
 		<input type="radio" name="redirect" id="redirect_true" value="true" checked="checked"
             onclick="document.getElementById('add_a_ip').style.display='none'"/>
-        <label for="redirect_true" style="display:inline;float:none"><TMPL_VAR NAME="TEXT_YES"></label>
+        <label for="redirect_true" style="display:inline;float:none"><TMPL_VAR ESCAPE=1 NAME="TEXT_YES"></label>
         <input type="radio" name="redirect" value="false" id="redirect_false"
             onclick="document.getElementById('add_a_ip').style.display='block'"/>
-        <label for="redirect_false" style="display:inline;float:none"><TMPL_VAR NAME="TEXT_NO"></label>
+        <label for="redirect_false" style="display:inline;float:none"><TMPL_VAR ESCAPE=1 NAME="TEXT_NO"></label>
     </p>
 	<p id="add_a_ip" style="display:none">
 		<label for="add_a_data">
-		<TMPL_VAR NAME="TEXT_ADDIP">
+		<TMPL_VAR ESCAPE=1 NAME="TEXT_ADDIP">
 		</label>
 		<input type="text" name="data" id="add_a_data" />
 	</p>
 	<p class="button">
-		<input type="hidden" name="domain" value="<TMPL_VAR NAME="DOMAIN_NAME">" />
+		<input type="hidden" name="domain" value="<TMPL_VAR ESCAPE=1 NAME="DOMAIN_NAME">" />
         <input type="hidden" name="action" value="add_a"/>
-		<input type="submit" value="<TMPL_VAR NAME="TEXT_SUBMIT">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_SUBMIT">" />
 	</p>
 </form>
 
-<h2><TMPL_VAR NAME="TEXT_TYPEAAAA"></h2>
-<h3><TMPL_VAR NAME="TEXT_LIST_AAAA"></h3>
-<TMPL_VAR NAME="LIST_AAAA">
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_TYPEAAAA"></h2>
+<h3><TMPL_VAR ESCAPE=1 NAME="TEXT_LIST_AAAA"></h3>
+<TMPL_VAR ESCAPE=1 NAME="LIST_AAAA">
 
-<h3><TMPL_VAR NAME="TEXT_ADD_AAAA"></h3>
+<h3><TMPL_VAR ESCAPE=1 NAME="TEXT_ADD_AAAA"></h3>
 <form method="post" action="prefs.pl" accept-charset="utf-8">
-    <p class="help"><TMPL_VAR NAME="TEXT_ORIGIN"></p>
+    <p class="help"><TMPL_VAR ESCAPE=1 NAME="TEXT_ORIGIN"></p>
 	<p>
 		<label for="add_aaaa_prefix">
-			<TMPL_VAR NAME="TEXT_DOMAINNAME">
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_DOMAINNAME">
 		</label>
-		<input type="text" name="name" id="add_aaaa_prefix" /><strong>.<TMPL_VAR NAME="DOMAIN_NAME"></strong>
+		<input type="text" name="name" id="add_aaaa_prefix" /><strong>.<TMPL_VAR ESCAPE=1 NAME="DOMAIN_NAME"></strong>
 	</p>
-	<p><TMPL_VAR NAME="TEXT_QUESTION_REDIRECTION">:
+	<p><TMPL_VAR ESCAPE=1 NAME="TEXT_QUESTION_REDIRECTION">:
 		<input type="radio" name="redirect" id="redirect_aaaa_true" value="true" checked="checked"
             onclick="document.getElementById('add_aaaa_ip').style.display='none'"/>
-        <label for="redirect_aaaa_true" style="display:inline;float:none"><TMPL_VAR NAME="TEXT_YES"></label>
+        <label for="redirect_aaaa_true" style="display:inline;float:none"><TMPL_VAR ESCAPE=1 NAME="TEXT_YES"></label>
         <input type="radio" name="redirect" value="false" id="redirect_aaaa_false"
             onclick="document.getElementById('add_aaaa_ip').style.display='block'"/>
-        <label for="redirect_aaaa_false" style="display:inline;float:none"><TMPL_VAR NAME="TEXT_NO"></label>
+        <label for="redirect_aaaa_false" style="display:inline;float:none"><TMPL_VAR ESCAPE=1 NAME="TEXT_NO"></label>
     </p>
 	<p id="add_aaaa_ip" style="display:none">
 		<label for="add_aaaa_data">
-		<TMPL_VAR NAME="TEXT_ADDIP">
+		<TMPL_VAR ESCAPE=1 NAME="TEXT_ADDIP">
 		</label>
 		<input type="text" name="data" id="add_aaaa_data" />
 	</p>
 	<p class="button">
-		<input type="hidden" name="domain" value="<TMPL_VAR NAME="DOMAIN_NAME">" />
+		<input type="hidden" name="domain" value="<TMPL_VAR ESCAPE=1 NAME="DOMAIN_NAME">" />
         <input type="hidden" name="action" value="add_aaaa"/>
-		<input type="submit" value="<TMPL_VAR NAME="TEXT_SUBMIT">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_SUBMIT">" />
 	</p>
 </form>
 
 
-<h2><TMPL_VAR NAME="TEXT_TYPEMX"></h2>
-<h3><TMPL_VAR NAME="TEXT_LIST_MX"></h3>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_TYPEMX"></h2>
+<h3><TMPL_VAR ESCAPE=1 NAME="TEXT_LIST_MX"></h3>
 
-<TMPL_VAR NAME="LIST_MX">
+<TMPL_VAR ESCAPE=1 NAME="LIST_MX">
 
-<h3><TMPL_VAR NAME="TEXT_ADD_MX"></h3>
+<h3><TMPL_VAR ESCAPE=1 NAME="TEXT_ADD_MX"></h3>
 <form method="post" action="prefs.pl" accept-charset="utf-8">
 	<p>
 		<label for="add_mx_data">
-			<TMPL_VAR NAME="MX_NAME">
+			<TMPL_VAR ESCAPE=1 NAME="MX_NAME">
 		</label>
 		<input type="text" name="data" id="add_mx_data" />
 	</p>
 	<p>
 		<label for="add_mx_aux">
-			<TMPL_VAR NAME="MX_PRIORITY">
+			<TMPL_VAR ESCAPE=1 NAME="MX_PRIORITY">
 		</label>
 		<input type="text" name="aux" id="add_mx_aux" />
 	</p>
 	<p class="button">
         <input type="hidden" name="action" value="add_mx" />
-		<input type="hidden" name="domain" value="<TMPL_VAR NAME="DOMAIN_NAME">" />
-		<input type="submit" value="<TMPL_VAR name="TEXT_SUBMIT">" />
+		<input type="hidden" name="domain" value="<TMPL_VAR ESCAPE=1 NAME="DOMAIN_NAME">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 name="TEXT_SUBMIT">" />
 	</p>
 </form>
 
 
-<h2><TMPL_VAR NAME="TEXT_TYPECNAME"></h2>
-<h3><TMPL_VAR NAME="TEXT_LIST_CNAME"></h3>
-<TMPL_VAR NAME="LIST_CNAME">
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_TYPECNAME"></h2>
+<h3><TMPL_VAR ESCAPE=1 NAME="TEXT_LIST_CNAME"></h3>
+<TMPL_VAR ESCAPE=1 NAME="LIST_CNAME">
 
-<h3><TMPL_VAR NAME="TEXT_ADD_CNAME"></h3>
+<h3><TMPL_VAR ESCAPE=1 NAME="TEXT_ADD_CNAME"></h3>
 
 <form method="post" action="prefs.pl" accept-charset="utf-8">
 	<p>
 		<label for="add_cname_name">
-			<TMPL_VAR NAME="CNAME_PREFIX">
+			<TMPL_VAR ESCAPE=1 NAME="CNAME_PREFIX">
 		</label>
-		<input type="text" name="name" id="add_cname_name" /><strong>.<TMPL_VAR NAME="DOMAIN_NAME"></strong>
+		<input type="text" name="name" id="add_cname_name" /><strong>.<TMPL_VAR ESCAPE=1 NAME="DOMAIN_NAME"></strong>
 	</p>
 	<p>
 		<label for="add_cname_data">
-    		<TMPL_VAR NAME="CNAME_DESTINATION">
+    		<TMPL_VAR ESCAPE=1 NAME="CNAME_DESTINATION">
 		</label>
 			<input type="text" name="data" id="add_cname_data" />
 	</p>
 	<p class="button">
         <input type="hidden" name="action" value="add_cname" />
-		<input type="hidden" name="domain" value="<TMPL_VAR NAME="DOMAIN_NAME">" />
-		<input type="submit" value="<TMPL_VAR NAME="TEXT_SUBMIT">" />
+		<input type="hidden" name="domain" value="<TMPL_VAR ESCAPE=1 NAME="DOMAIN_NAME">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_SUBMIT">" />
 	</p>
 </form>
 
-<h2><TMPL_VAR NAME="TEXT_TYPENS"></h2>
-<h3><TMPL_VAR NAME="TEXT_LIST_NS"></h3>
-<TMPL_VAR NAME="LIST_NS">
-<h3><TMPL_VAR NAME="TEXT_ADD_NS"></h3>
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_TYPENS"></h2>
+<h3><TMPL_VAR ESCAPE=1 NAME="TEXT_LIST_NS"></h3>
+<TMPL_VAR ESCAPE=1 NAME="LIST_NS">
+<h3><TMPL_VAR ESCAPE=1 NAME="TEXT_ADD_NS"></h3>
 <form method="post" action="prefs.pl" accept-charset="utf-8">
-    <label for="add_ns_data"><TMPL_VAR NAME="NS_HOSTNAME_TEXT"></label>
+    <label for="add_ns_data"><TMPL_VAR ESCAPE=1 NAME="NS_HOSTNAME_TEXT"></label>
     <input type="text" name="data" id="add_ns_data"/>
     <input type="hidden" name="action" value="add_ns"/>
-    <input type="hidden" name="domain" value="<TMPL_VAR NAME="DOMAIN_NAME">"/>
-    <input type="submit" value="<TMPL_VAR NAME="TEXT_SUBMIT">" class="autowidth"/>
+    <input type="hidden" name="domain" value="<TMPL_VAR ESCAPE=1 NAME="DOMAIN_NAME">"/>
+    <input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_SUBMIT">" class="autowidth"/>
 </form>
 
 <h2><tmpl_var name="TEXT_TYPESRV"></h2>
@@ -151,34 +151,34 @@
         <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" />
-        <input type="hidden" name="domain" value="<TMPL_VAR NAME="DOMAIN_NAME">" />
-        <input type="submit" value="<TMPL_VAR NAME="TEXT_SUBMIT">" />
+        <input type="hidden" name="domain" value="<TMPL_VAR ESCAPE=1 NAME="DOMAIN_NAME">" />
+        <input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_SUBMIT">" />
     </p>
 </form>
 
-<h2><TMPL_VAR NAME="TEXT_TYPETXT"></h2>
-<h3><TMPL_VAR NAME="TEXT_LIST_TXT"></h3>
-<TMPL_VAR NAME="LIST_TXT">
+<h2><TMPL_VAR ESCAPE=1 NAME="TEXT_TYPETXT"></h2>
+<h3><TMPL_VAR ESCAPE=1 NAME="TEXT_LIST_TXT"></h3>
+<TMPL_VAR ESCAPE=1 NAME="LIST_TXT">
 
-<h3><TMPL_VAR NAME="TEXT_ADD_TXT"></h3>
+<h3><TMPL_VAR ESCAPE=1 NAME="TEXT_ADD_TXT"></h3>
 <form method="post" action="prefs.pl" accept-charset="utf-8">
-    <p class="help"><TMPL_VAR NAME="TEXT_ORIGIN"></p>
+    <p class="help"><TMPL_VAR ESCAPE=1 NAME="TEXT_ORIGIN"></p>
 	<p>
 		<label for="add_txt_prefix">
-			<TMPL_VAR NAME="TXT_NAME_TEXT">
+			<TMPL_VAR ESCAPE=1 NAME="TXT_NAME_TEXT">
 		</label>
-		<input type="text" name="name"  id="add_txt_prefix" /><strong>.<TMPL_VAR NAME="DOMAIN_NAME"></strong>
+		<input type="text" name="name"  id="add_txt_prefix" /><strong>.<TMPL_VAR ESCAPE=1 NAME="DOMAIN_NAME"></strong>
 	</p>
 	<p>
 		<label for="add_txt_data">
-		<TMPL_VAR NAME="TXT_DATA_TEXT">
+		<TMPL_VAR ESCAPE=1 NAME="TXT_DATA_TEXT">
 		</label>
 		<textarea name="data" id="add_txt_data"></textarea>
 	</p>
 	<p class="button">
-		<input type="hidden" name="domain" value="<TMPL_VAR NAME="DOMAIN_NAME">" />
+		<input type="hidden" name="domain" value="<TMPL_VAR ESCAPE=1 NAME="DOMAIN_NAME">" />
         <input type="hidden" name="action" value="add_txt"/>
-		<input type="submit" value="<TMPL_VAR NAME="TEXT_SUBMIT">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="TEXT_SUBMIT">" />
 	</p>
 </form>
 

Modified: trunk/vhffs-panel/templates/git/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/git/create.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/git/create.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,23 +1,23 @@
 <form method="post" action="#" accept-charset="utf-8">
 	<p>
 		<label>		
-			<TMPL_VAR NAME="GROUP_NAME">: 
+			<TMPL_VAR ESCAPE=1 NAME="GROUP_NAME">: 
 		</label>
-		<TMPL_VAR NAME="GROUP">
+		<TMPL_VAR ESCAPE=1 NAME="GROUP">
 	</p>
 	<p>
 		<label for="reponame">
-			<TMPL_VAR NAME="REPOSITORY_NAME">: 
+			<TMPL_VAR ESCAPE=1 NAME="REPOSITORY_NAME">: 
 		</label>	
-		<TMPL_VAR NAME="GROUP">/<input type="text" name="reponame" id="reponame" value="<tmpl_var name="REPOSITORY_VALUE">"/><TMPL_VAR NAME="GIT_SUFFIX">
+		<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">
 	</p>
 	<p>
 		<label for="PROJECT_USAGE">
-			<TMPL_VAR NAME="description">:
+			<TMPL_VAR ESCAPE=1 NAME="description">:
 		</label>
 		<textarea name="description" id="description"  cols="45" rows="7"><tmpl_var name="DESCRIPTION_VALUE"></textarea>
 	</p>
 	<p class="button" id="buttonSend">
-		<input type="submit" value="<TMPL_VAR NAME="SEND">" name="git_submit"/>
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" name="git_submit"/>
 	</p>
 </form>

Modified: trunk/vhffs-panel/templates/group/admin.tmpl
===================================================================
--- trunk/vhffs-panel/templates/group/admin.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/group/admin.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,7 +1,7 @@
 <h2><TMPL_I18N KEY="Group Quota"></h2>
 <form method="post" action="#">
-    <p><label><TMPL_I18N KEY="Used Quota">:</label><TMPL_VAR NAME="USED_QUOTA">/<TMPL_VAR NAME="QUOTA">&nbsp;<TMPL_I18N KEY="MB"></p>
+    <p><label><TMPL_I18N KEY="Used Quota">:</label><TMPL_VAR ESCAPE=1 NAME="USED_QUOTA">/<TMPL_VAR ESCAPE=1 NAME="QUOTA">&nbsp;<TMPL_I18N KEY="MB"></p>
     <p><label for="new_quota"><TMPL_I18N KEY="New Quota">:</label>
-        <input type="text" name="new_quota" id="new_quota" value="<TMPL_VAR NAME="QUOTA">"/>&nbsp;<TMPL_I18N KEY="MB"></p>
+        <input type="text" name="new_quota" id="new_quota" value="<TMPL_VAR ESCAPE=1 NAME="QUOTA">"/>&nbsp;<TMPL_I18N KEY="MB"></p>
     <p><input type="submit" name="update_quota_submit" value="<TMPL_I18N KEY="Update Quota">"/></p>
 </form>

Modified: trunk/vhffs-panel/templates/group/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/group/create.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/group/create.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,35 +1,35 @@
 <form method="post" action="#" accept-charset="utf-8">
 	<p>
 		<label>
-			<TMPL_VAR NAME="TEXT_OWNER">:
+			<TMPL_VAR ESCAPE=1 NAME="TEXT_OWNER">:
 		</label>
-		<TMPL_VAR NAME="OWNER">
+		<TMPL_VAR ESCAPE=1 NAME="OWNER">
 	</p>
 	<p>
 		<label for="project_name">
-			<TMPL_VAR NAME="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">"/>
-		<TMPL_VAR NAME="PROJECT_NAME_EXPLAIN">
+		<TMPL_VAR ESCAPE=1 NAME="PROJECT_NAME_EXPLAIN">
 	</p>
 	<p>
 		<label for="realname">
-			<TMPL_VAR NAME="REALNAME_TEXT">: 
+			<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">"/>
 	</p>
 	<p>
 		<label for="description">
-			<TMPL_VAR NAME="DESCRIPTION">:
+			<TMPL_VAR ESCAPE=1 NAME="DESCRIPTION">:
 		</label>
 		<textarea name="description" id="description" cols="45" rows="7"><tmpl_var name="DESCRIPTION_VALUE"></textarea>
 	</p>
 	<tmpl_if name="WARNING_PUBLIC">
 	<p>
-		<TMPL_VAR NAME="WARNING_PUBLIC">
+		<TMPL_VAR ESCAPE=1 NAME="WARNING_PUBLIC">
 	</p>
 	</tmpl_if>
 	<p class="button"  id="buttonSend">
-		<input type="submit" value="<TMPL_VAR NAME="SEND">" name="project_submit"/>
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" name="project_submit"/>
 	</p>
 </form>

Modified: trunk/vhffs-panel/templates/mail/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mail/create.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/mail/create.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,23 +1,23 @@
 <form method="post" action="#" accept-charset="utf-8">
 	<p>
 		<label>		
-			<TMPL_VAR NAME="GROUP_NAME">: 
+			<TMPL_VAR ESCAPE=1 NAME="GROUP_NAME">: 
 		</label>
-		<TMPL_VAR NAME="GROUP">
+		<TMPL_VAR ESCAPE=1 NAME="GROUP">
 	</p>
 	<p>
 		<label for="domain">
-			<TMPL_VAR NAME="DOMAIN_TEXT">: 
+			<TMPL_VAR ESCAPE=1 NAME="DOMAIN_TEXT">: 
 		</label>	
 		<input type="text" name="domain" id="domain" value="<tmpl_var name="DOMAIN_VALUE">"/>
 	</p>
 	<p>
 		<label for="description">
-			<TMPL_VAR NAME="DESCRIPTION_TEXT">:
+			<TMPL_VAR ESCAPE=1 NAME="DESCRIPTION_TEXT">:
 		</label>	
 		<textarea name="description" id="description" cols="45" rows="7"><tmpl_var name="DESCRIPTION_VALUE"></textarea>
 	</p>
 	<p class="button" id="buttonSend">
-		<input type="submit" value="<TMPL_VAR NAME="SEND">" name="mail_submit"/>
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" name="mail_submit"/>
 	</p>
 </form>

Modified: trunk/vhffs-panel/templates/mail/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mail/prefs.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/mail/prefs.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -14,7 +14,7 @@
         <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 NAME="LOCAL_PART">"><TMPL_VAR NAME="LOCAL_PART">@<TMPL_VAR NAME="DOMAIN"></option>
+            <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>

Modified: trunk/vhffs-panel/templates/mail/prefs_boxes.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mail/prefs_boxes.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/mail/prefs_boxes.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,6 +1,6 @@
 <TMPL_LOOP NAME="BOXES">
 <fieldset>
-<legend><TMPL_VAR NAME="LOCAL_PART">@<TMPL_VAR NAME="DOMAIN"></legend>
+<legend><TMPL_VAR ESCAPE=1 NAME="LOCAL_PART">@<TMPL_VAR ESCAPE=1 NAME="DOMAIN"></legend>
 	<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>

Modified: trunk/vhffs-panel/templates/mail/prefs_forwards.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mail/prefs_forwards.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/mail/prefs_forwards.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,6 +1,6 @@
 <TMPL_LOOP NAME="FORWARDS">
 <fieldset>
-<legend><TMPL_VAR NAME="LOCAL_PART">@<TMPL_VAR NAME="DOMAIN"></legend>
+<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>

Modified: trunk/vhffs-panel/templates/mailinglist/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mailinglist/create.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/mailinglist/create.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,10 +1,10 @@
 <form method="post" action="#" class="largeLabel" accept-charset="utf-8">
 	<p>
-		<TMPL_VAR NAME="GROUP_NAME">:<TMPL_VAR NAME="GROUP">
+		<TMPL_VAR ESCAPE=1 NAME="GROUP_NAME">:<TMPL_VAR ESCAPE=1 NAME="GROUP">
 	</p>
 	<p>
 		<label for="localpart">
-			<TMPL_VAR NAME="LIST_TEXT">: 
+			<TMPL_VAR ESCAPE=1 NAME="LIST_TEXT">: 
 		</label>
     </p>
     <div class="clear"></div>
@@ -17,11 +17,11 @@
 	</p>
 	<p>
 		<label for="description">
-			<TMPL_VAR NAME="MOTIVATION">:
+			<TMPL_VAR ESCAPE=1 NAME="MOTIVATION">:
 		</label>
 		<textarea name="description" id="description" cols="45" rows="7"><tmpl_var name="DESCRIPTION_VALUE"></textarea>
 	</p>
 	<p class="button" id="buttonSend">
-		<input type="submit" value="<TMPL_VAR NAME="SEND">" name="mailing_submit"/>
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" name="mailing_submit"/>
 	</p>
 </form>

Modified: trunk/vhffs-panel/templates/mailinglist/list_part.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mailinglist/list_part.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/mailinglist/list_part.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,13 +1,13 @@
 <TMPL_LOOP NAME="MEMBERS">
 <fieldset>
-<legend><TMPL_VAR NAME="MEMBER"></legend>
+<legend><TMPL_VAR ESCAPE=1 NAME="MEMBER"></legend>
     <form method="post" action="prefs.pl" accept-charset="utf-8">
         <p><select name="right">
-            <option value="<TMPL_VAR NAME="ML_RIGHT_SUB_WAITING_FOR_REPLY">" <TMPL_IF EXPR="perm==ML_RIGHT_SUB_WAITING_FOR_REPLY">selected="selected"</TMPL_IF>><TMPL_I18N KEY="Waiting for confirmation"></option>
-            <option value="<TMPL_VAR NAME="ML_SUB_WAITING_FOR_VALIDATION">" <TMPL_IF EXPR="perm==ML_RIGHT_SUB_WAITING_FOR_VALIDATION">selected="selected"</TMPL_IF>><TMPL_I18N KEY="Waiting for validation"></option>
-            <option value="<TMPL_VAR NAME="ML_RIGHT_SUB">" <TMPL_IF EXPR="perm==ML_RIGHT_SUB">selected="selected"</TMPL_IF>><TMPL_I18N KEY="Subscribed"></option>
-            <option value="<TMPL_VAR 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 NAME="ML_RIGHT_ADMIN">" <TMPL_IF EXPR="perm==ML_RIGHT_ADMIN">selected="selected"</TMPL_IF>> <TMPL_I18N KEY="Admin"></option>
+            <option value="<TMPL_VAR ESCAPE=1 NAME="ML_RIGHT_SUB_WAITING_FOR_REPLY">" <TMPL_IF EXPR="perm==ML_RIGHT_SUB_WAITING_FOR_REPLY">selected="selected"</TMPL_IF>><TMPL_I18N KEY="Waiting for confirmation"></option>
+            <option value="<TMPL_VAR ESCAPE=1 NAME="ML_SUB_WAITING_FOR_VALIDATION">" <TMPL_IF EXPR="perm==ML_RIGHT_SUB_WAITING_FOR_VALIDATION">selected="selected"</TMPL_IF>><TMPL_I18N KEY="Waiting for validation"></option>
+            <option value="<TMPL_VAR ESCAPE=1 NAME="ML_RIGHT_SUB">" <TMPL_IF EXPR="perm==ML_RIGHT_SUB">selected="selected"</TMPL_IF>><TMPL_I18N KEY="Subscribed"></option>
+            <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">" />

Modified: trunk/vhffs-panel/templates/mailinglist/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mailinglist/prefs.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/mailinglist/prefs.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -48,7 +48,7 @@
 			<input type="checkbox" name="public_archive" id="public_archive"
                 <TMPL_IF NAME="PUBLIC_ARCHIVE">checked="checked" </TMPL_IF>class="labeled"/>
 			<label for="public_archive">
-				<TMPL_VAR NAME="TEXT_OPENARCHIVE">
+				<TMPL_VAR ESCAPE=1 NAME="TEXT_OPENARCHIVE">
 			</label>
 		</p>
 		<p>

Modified: trunk/vhffs-panel/templates/main/lost.tmpl
===================================================================
--- trunk/vhffs-panel/templates/main/lost.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/main/lost.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -19,7 +19,7 @@
 </form>
 
 <p>
-	<a href="/auth.pl"><TMPL_VAR NAME="TEXT_BACK"></a>
+	<a href="/auth.pl"><TMPL_VAR ESCAPE=1 NAME="TEXT_BACK"></a>
 </p>
 
 </div>

Modified: trunk/vhffs-panel/templates/misc/alert.tmpl
===================================================================
--- trunk/vhffs-panel/templates/misc/alert.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/misc/alert.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,17 +1,17 @@
-<h1><TMPL_VAR NAME="TITLE"></h1>
+<h1><TMPL_VAR ESCAPE=1 NAME="TITLE"></h1>
 
-<h2><TMPL_VAR NAME="EXPLAIN"></h2>
+<h2><TMPL_VAR ESCAPE=1 NAME="EXPLAIN"></h2>
 
 <form method="post" action="alert_submit.pl" accept-charset="utf-8">
 	<p>
 		<label for="MESSAGE" style="float:none">
-			<TMPL_VAR NAME="YOUR_MESSAGE_TEXT">:
+			<TMPL_VAR ESCAPE=1 NAME="YOUR_MESSAGE_TEXT">:
 		</label>
     </p>
     <p>
 		<textarea name="MESSAGE" id="MESSAGE" cols="90" rows="15" style="width:auto"></textarea>
 	</p>
 	<p class="button" id="sendButton">
-		<input type="submit" value="<TMPL_VAR NAME="SEND">" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" />
 	</p>
 </form>

Modified: trunk/vhffs-panel/templates/misc/resubmit.tmpl
===================================================================
--- trunk/vhffs-panel/templates/misc/resubmit.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/misc/resubmit.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,26 +1,26 @@
 <form method="post" action="" class="largeLabel" accept-charset="utf-8">
 	<p>
-		<label><TMPL_VAR NAME="OBJECTTYPE_TEXT">:</label> <TMPL_VAR NAME="OBJECTTYPE">
+		<label><TMPL_VAR ESCAPE=1 NAME="OBJECTTYPE_TEXT">:</label> <TMPL_VAR ESCAPE=1 NAME="OBJECTTYPE">
 	</p>
 	<p>
-		<label><TMPL_VAR NAME="OBJECTNAME_TEXT">:</label> <TMPL_VAR NAME="OBJECTNAME">
+		<label><TMPL_VAR ESCAPE=1 NAME="OBJECTNAME_TEXT">:</label> <TMPL_VAR ESCAPE=1 NAME="OBJECTNAME">
 	</p>
 	<p>
-		<label><TMPL_VAR NAME="REFUSEREASON_TEXT">:</label> <TMPL_VAR NAME="REFUSEREASON">
+		<label><TMPL_VAR ESCAPE=1 NAME="REFUSEREASON_TEXT">:</label> <TMPL_VAR ESCAPE=1 NAME="REFUSEREASON">
 	</p>
 	<p>
 		<label for="description">
-			<TMPL_VAR NAME="DESCRIPTION_TEXT">:
+			<TMPL_VAR ESCAPE=1 NAME="DESCRIPTION_TEXT">:
 		</label>
 		<textarea name="description" id="description" cols="45" rows="7"><tmpl_var name="DESCRIPTION"></textarea>
 	</p>
 	<tmpl_if name="WARNING_PUBLIC">
 	<p>
-		<TMPL_VAR NAME="WARNING_PUBLIC">
+		<TMPL_VAR ESCAPE=1 NAME="WARNING_PUBLIC">
 	</p>
 	</tmpl_if>
 	<input type="hidden" name="oid" value="<tmpl_var name="OID">" />
 	<p class="button" id="buttonSend">
-		<input type="submit" value="<TMPL_VAR NAME="SEND">" name="submitted" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" name="submitted" />
 	</p>
 </form>

Modified: trunk/vhffs-panel/templates/mysql/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mysql/create.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/mysql/create.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,30 +1,30 @@
 <form method="post" action="#" class="largeLabel" accept-charset="utf-8">
-    <p class="info"><TMPL_VAR NAME="INFOS"></p>
+    <p class="info"><TMPL_VAR ESCAPE=1 NAME="INFOS"></p>
 	<p>
 		<label>		
-			<TMPL_VAR NAME="GROUP_NAME">: 
+			<TMPL_VAR ESCAPE=1 NAME="GROUP_NAME">: 
 		</label>
-		<TMPL_VAR NAME="GROUP">
+		<TMPL_VAR ESCAPE=1 NAME="GROUP">
 	</p>
 	<p>
         <label for="db_suffix">
-            <TMPL_VAR NAME="DB_SUFFIX">: 
+            <TMPL_VAR ESCAPE=1 NAME="DB_SUFFIX">: 
         </label>
-		<TMPL_VAR 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 name="DB_SUFFIX_VALUE">"/>
 	</p>
 	<p>
 		<label for="db_pass">
-			<TMPL_VAR NAME="DB_PASS">: 
+			<TMPL_VAR ESCAPE=1 NAME="DB_PASS">: 
 		</label>
 		<input type="PASSWORD" name="db_pass" id="db_pass"/>
 	</p>
 	<p>
 		<label for="description">
-			<TMPL_VAR NAME="DESCRIPTION">:
+			<TMPL_VAR ESCAPE=1 NAME="DESCRIPTION">:
 		</label>
 		<textarea name="description" id="description" cols="45" rows="7"><tmpl_var name="DESCRIPTION_VALUE"></textarea>
 	</p>
 	<p class="button" id="buttonSend">
-		<input type="submit" value="<TMPL_VAR NAME="SEND">" name="mysql_submit"/>
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" name="mysql_submit"/>
 	</p>
 </form>

Modified: trunk/vhffs-panel/templates/pgsql/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/pgsql/create.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/pgsql/create.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,30 +1,30 @@
 <form method="post" action="#" class="largeLabel" accept-charset="utf-8">
-    <p class="info"><TMPL_VAR NAME="INFOS"></p>
+    <p class="info"><TMPL_VAR ESCAPE=1 NAME="INFOS"></p>
 	<p>
 		<label>		
-			<TMPL_VAR NAME="GROUP_NAME">: 
+			<TMPL_VAR ESCAPE=1 NAME="GROUP_NAME">: 
 		</label>
-		<TMPL_VAR NAME="GROUP">
+		<TMPL_VAR ESCAPE=1 NAME="GROUP">
 	</p>
 	<p>
         <label for="db_suffix">
-            <TMPL_VAR NAME="DB_SUFFIX">: 
+            <TMPL_VAR ESCAPE=1 NAME="DB_SUFFIX">: 
         </label>
-		<TMPL_VAR 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 name="DB_SUFFIX_VALUE">"/>
 	</p>
 	<p>
 		<label for="db_pass">
-			<TMPL_VAR NAME="DB_PASS">: 
+			<TMPL_VAR ESCAPE=1 NAME="DB_PASS">: 
 		</label>
 		<input type="PASSWORD" name="db_pass" id="db_pass"/>
 	</p>
 	<p>
 		<label for="description">
-			<TMPL_VAR NAME="DESCRIPTION">:
+			<TMPL_VAR ESCAPE=1 NAME="DESCRIPTION">:
 		</label>
 		<textarea name="description" id="description" cols="45" rows="7"><tmpl_var name="DESCRIPTION_VALUE"></textarea>
 	</p>
 	<p class="button" id="buttonSend">
-		<input type="submit" value="<TMPL_VAR NAME="SEND">" name="pgsql_submit"/>
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" name="pgsql_submit"/>
 	</p>
 </form>

Modified: trunk/vhffs-panel/templates/pgsql/prefs.tmpl
===================================================================
--- trunk/vhffs-panel/templates/pgsql/prefs.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/pgsql/prefs.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -21,7 +21,7 @@
 		<input type="password" name="newpassword" id="newpassword" value="<tmpl_var name="VALUE_DBPASS">"/>
 	</p>
 	<p class="button">
-        <input type="hidden" name="name" value="<TMPL_VAR NAME="value_dbname">"/>
+        <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"/>
 	</p>
 </form>

Modified: trunk/vhffs-panel/templates/repository/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/repository/create.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/repository/create.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,23 +1,23 @@
 <form method="post" action="#" accept-charset="utf-8">
 	<p>
 		<label>		
-			<TMPL_VAR NAME="GROUP_NAME">: 
+			<TMPL_VAR ESCAPE=1 NAME="GROUP_NAME">: 
 		</label>
-		<TMPL_VAR NAME="GROUP">
+		<TMPL_VAR ESCAPE=1 NAME="GROUP">
 	</p>
 	<p>
 		<label for="REPOSITORY_NAME">
-			<TMPL_VAR NAME="REPOSITORY_NAME">: 
+			<TMPL_VAR ESCAPE=1 NAME="REPOSITORY_NAME">: 
 		</label>	
-		<TMPL_VAR NAME="NAME">
+		<TMPL_VAR ESCAPE=1 NAME="NAME">
 	</p>
 	<p>
 		<label for="description">
-			<TMPL_VAR NAME="DESCRIPTION">:
+			<TMPL_VAR ESCAPE=1 NAME="DESCRIPTION">:
 		</label>	
 		<textarea name="description" id="description" cols="45" rows="7"><tmpl_var name="DESCRIPTION_VALUE"></textarea>
 	</p>
 	<p class="button" id="buttonSend">
-		<input type="submit" value="<TMPL_VAR NAME="SEND">" name="repo_submit"/>
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" name="repo_submit"/>
 	</p>
 </form>

Modified: trunk/vhffs-panel/templates/svn/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/svn/create.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/svn/create.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,23 +1,23 @@
 <form method="post" action="#" accept-charset="utf-8">
 	<p>
 		<label>		
-			<TMPL_VAR NAME="GROUP_NAME">: 
+			<TMPL_VAR ESCAPE=1 NAME="GROUP_NAME">: 
 		</label>
-		<TMPL_VAR NAME="GROUP">
+		<TMPL_VAR ESCAPE=1 NAME="GROUP">
 	</p>
 	<p>
 		<label for="reponame">
-			<TMPL_VAR NAME="REPOSITORY_NAME">: 
+			<TMPL_VAR ESCAPE=1 NAME="REPOSITORY_NAME">: 
 		</label>	
-		<TMPL_VAR 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 name="REPOSITORY_VALUE">"/>
 	</p>
 	<p>
 		<label for="PROJECT_USAGE">
-			<TMPL_VAR NAME="description">:
+			<TMPL_VAR ESCAPE=1 NAME="description">:
 		</label>
 		<textarea name="description" id="description"  cols="45" rows="7"><tmpl_var name="DESCRIPTION_VALUE"></textarea>
 	</p>
 	<p class="button" id="buttonSend">
-		<input type="submit" value="<TMPL_VAR NAME="SEND">" name="svn_submit"/>
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" name="svn_submit"/>
 	</p>
 </form>

Modified: trunk/vhffs-panel/templates/user/admin.tmpl
===================================================================
--- trunk/vhffs-panel/templates/user/admin.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/user/admin.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,11 +1,11 @@
 <h2><TMPL_I18N KEY="User's Permissions"></h2>
 <form method="post" action="#">
-    <input type="hidden" name="name" value="<TMPL_VAR NAME="VALUE_USERNAME">"/>
+    <input type="hidden" name="name" value="<TMPL_VAR ESCAPE=1 NAME="VALUE_USERNAME">"/>
     <p><label for="user_permissions"><TMPL_I18N KEY="User's permissions">:</label>
     <select name="permissions" id="user_permissions">
-        <option value="<TMPL_VAR NAME="USER_NORMAL">" <TMPL_IF EXPR="PERMISSIONS == USER_NORMAL">selected="selected"</TMPL_IF>><TMPL_I18N KEY="Normal"></option>
-        <option value="<TMPL_VAR NAME="USER_MODERATOR">" <TMPL_IF EXPR="PERMISSIONS == USER_MODERATOR">selected="selected"</TMPL_IF>><TMPL_I18N KEY="Moderator"></option>
-        <option value="<TMPL_VAR NAME="USER_ADMIN">" <TMPL_IF EXPR="PERMISSIONS == USER_ADMIN">selected="selected"</TMPL_IF>><TMPL_I18N KEY="Administrator"></option>
+        <option value="<TMPL_VAR ESCAPE=1 NAME="USER_NORMAL">" <TMPL_IF EXPR="PERMISSIONS == USER_NORMAL">selected="selected"</TMPL_IF>><TMPL_I18N KEY="Normal"></option>
+        <option value="<TMPL_VAR ESCAPE=1 NAME="USER_MODERATOR">" <TMPL_IF EXPR="PERMISSIONS == USER_MODERATOR">selected="selected"</TMPL_IF>><TMPL_I18N KEY="Moderator"></option>
+        <option value="<TMPL_VAR ESCAPE=1 NAME="USER_ADMIN">" <TMPL_IF EXPR="PERMISSIONS == USER_ADMIN">selected="selected"</TMPL_IF>><TMPL_I18N KEY="Administrator"></option>
     </select>
     </p>
     <p><input type="submit" name="update_permissions_submit" value="<TMPL_I18N KEY="Update Permissions">"/></p>

Modified: trunk/vhffs-panel/templates/user/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/user/create.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/user/create.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -14,67 +14,67 @@
 
 				<p>
 					<label for="USERNAME">
-						<TMPL_VAR NAME="USERNAME_TEXT">
+						<TMPL_VAR ESCAPE=1 NAME="USERNAME_TEXT">
 					</label>
-					<span><input type="text" name="USERNAME" id="USERNAME" maxlength="12" value="<TMPL_VAR 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 name="THEME">/images/tip.png" alt="tip" id="username_tip_trigger"/>
                 </p>
 				<p>
 					<label for="MAIL">
-						<TMPL_VAR NAME="MAIL_TEXT">
+						<TMPL_VAR ESCAPE=1 NAME="MAIL_TEXT">
 					</label>
-					<span><input type="text" name="MAIL" id="MAIL" maxlength="200" value="<TMPL_VAR 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 name="THEME">/images/tip.png" alt="tip" id="email_tip_trigger"/>
 				</p>
 				<p>
 					<label for="FIRSTNAME">
-						<TMPL_VAR NAME="FIRSTNAME_TEXT">
+						<TMPL_VAR ESCAPE=1 NAME="FIRSTNAME_TEXT">
 					</label>
-                    <span><input type="text" name="FIRSTNAME" id="FIRSTNAME" maxlength="256" value="<TMPL_VAR NAME="FIRSTNAME_VALUE">" onkeyup="javascript:check('FIRSTNAME', validString);" />&nbsp;</span>
+                    <span><input type="text" name="FIRSTNAME" id="FIRSTNAME" maxlength="256" value="<TMPL_VAR ESCAPE=1 NAME="FIRSTNAME_VALUE">" onkeyup="javascript:check('FIRSTNAME', validString);" />&nbsp;</span>
 				</p>
 				<p>
 					<label for="LASTNAME">
-						<TMPL_VAR NAME="LASTNAME_TEXT">
+						<TMPL_VAR ESCAPE=1 NAME="LASTNAME_TEXT">
 					</label>
-                    <span><input type="text" name="LASTNAME" id="LASTNAME" maxlength="256" value="<TMPL_VAR NAME="LASTNAME_VALUE">" onkeyup="javascript:check('LASTNAME', validString);"/>&nbsp;</span>
+                    <span><input type="text" name="LASTNAME" id="LASTNAME" maxlength="256" value="<TMPL_VAR ESCAPE=1 NAME="LASTNAME_VALUE">" onkeyup="javascript:check('LASTNAME', validString);"/>&nbsp;</span>
 				</p>
 				<p>
 					<label for="ADDRESS">
-						<TMPL_VAR NAME="ADDRESS_TEXT">
+						<TMPL_VAR ESCAPE=1 NAME="ADDRESS_TEXT">
 					</label>
-                    <span><input type="text" name="ADDRESS" id="ADDRESS" maxlength="512" value="<TMPL_VAR NAME="ADDRESS_VALUE">" onkeyup="javascript:check('ADDRESS', validString);"/>&nbsp;</span>
+                    <span><input type="text" name="ADDRESS" id="ADDRESS" maxlength="512" value="<TMPL_VAR ESCAPE=1 NAME="ADDRESS_VALUE">" onkeyup="javascript:check('ADDRESS', validString);"/>&nbsp;</span>
 				</p>
 				<p>
 					<label for="CITY">
-						<TMPL_VAR NAME="CITY_TEXT">
+						<TMPL_VAR ESCAPE=1 NAME="CITY_TEXT">
 					</label>
-                    <span><input type="text" name="CITY" id="CITY" maxlength="64" value="<TMPL_VAR NAME="CITY_VALUE">" onkeyup="javascript:check('CITY', validString);"/>&nbsp;</span>
+                    <span><input type="text" name="CITY" id="CITY" maxlength="64" value="<TMPL_VAR ESCAPE=1 NAME="CITY_VALUE">" onkeyup="javascript:check('CITY', validString);"/>&nbsp;</span>
 				</p>
 				<p>
 					<label for="COUNTRY">
-						<TMPL_VAR NAME="COUNTRY_TEXT">
+						<TMPL_VAR ESCAPE=1 NAME="COUNTRY_TEXT">
 					</label>
-                    <span><input type="text" name="COUNTRY" id="COUNTRY" maxlength="32" value="<TMPL_VAR NAME="COUNTRY_VALUE">" onkeyup="javascript:check('COUNTRY', validString);"/>&nbsp;</span>
+                    <span><input type="text" name="COUNTRY" id="COUNTRY" maxlength="32" value="<TMPL_VAR ESCAPE=1 NAME="COUNTRY_VALUE">" onkeyup="javascript:check('COUNTRY', validString);"/>&nbsp;</span>
 				</p>
 				<p>
 					<label for="ZIPCODE">
-						<TMPL_VAR NAME="ZIPCODE_TEXT">
+						<TMPL_VAR ESCAPE=1 NAME="ZIPCODE_TEXT">
 					</label>
-					<span><input type="text" name="ZIPCODE" id="ZIPCODE" maxlength="16" value="<TMPL_VAR NAME="ZIPCODE_VALUE">" onkeyup="javascript:check(this.id, validZip);" onchange="javascript:check(this.id, validZip);"/>&nbsp;</span>
+					<span><input type="text" name="ZIPCODE" id="ZIPCODE" maxlength="16" value="<TMPL_VAR ESCAPE=1 NAME="ZIPCODE_VALUE">" onkeyup="javascript:check(this.id, validZip);" onchange="javascript:check(this.id, validZip);"/>&nbsp;</span>
 				</p>
 				<p>
 					<label for="CONFIRMATION">
-						<TMPL_VAR NAME="CONFIRMATION_TEXT">
+						<TMPL_VAR ESCAPE=1 NAME="CONFIRMATION_TEXT">
 					</label>
-						<img src="show_code.pl?code=<TMPL_VAR 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 name="CONFIRMATION_ALT">"/>
 				</p>
 				<p>
 					<label for="CONFIRMATION">
-						<TMPL_VAR NAME="REPEAT_CONFIRMATION_TEXT">
+						<TMPL_VAR ESCAPE=1 NAME="REPEAT_CONFIRMATION_TEXT">
 					</label>
 					<input type="text" name="CONFIRMATION"  id="CONFIRMATION" maxlength="16"/>
 				</p>
-					<input type="hidden" name="MD5_CODE" id="MD5_CODE" value="<TMPL_VAR NAME="MD5_CODE">"/>
+					<input type="hidden" name="MD5_CODE" id="MD5_CODE" value="<TMPL_VAR ESCAPE=1 NAME="MD5_CODE">"/>
 				<p class="button">
-					<input type="submit" value="<TMPL_VAR NAME="SEND">" name="CREATE_SUBMIT"/>
+					<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" name="CREATE_SUBMIT"/>
 				</p>
 			</form>
 			</div>

Modified: trunk/vhffs-panel/templates/user/create_complete.tmpl
===================================================================
--- trunk/vhffs-panel/templates/user/create_complete.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/user/create_complete.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,8 +1,8 @@
 <div class="logo"></div>
 <div class="login">
-<h1><TMPL_VAR NAME="TITLE"></h1>
-<h2><TMPL_VAR NAME="GOOD_NEWS"></h2>
-<h2><TMPL_VAR NAME="GOOD_NEWS2"></h2>
-<h2 class="error"><TMPL_VAR NAME="BAD_NEWS"></h2>
+<h1><TMPL_VAR ESCAPE=1 NAME="TITLE"></h1>
+<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>
 </div>

Modified: trunk/vhffs-panel/templates/web/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/web/create.tmpl	2007-11-02 15:52:35 UTC (rev 1058)
+++ trunk/vhffs-panel/templates/web/create.tmpl	2007-11-02 18:39:12 UTC (rev 1059)
@@ -1,31 +1,31 @@
 <form method="post" action="#" class="largeLabel" accept-charset="utf-8">
 	<p>
 		<label>		
-			<TMPL_VAR NAME="GROUP_NAME">: 
+			<TMPL_VAR ESCAPE=1 NAME="GROUP_NAME">: 
 		</label>
-		<TMPL_VAR NAME="GROUP">
+		<TMPL_VAR ESCAPE=1 NAME="GROUP">
 	</p>
 	<p>
 		<label for="servername">		
-			<TMPL_VAR NAME="SERVERNAME_TEXT">:
+			<TMPL_VAR ESCAPE=1 NAME="SERVERNAME_TEXT">:
 		</label>
-		<input type="text" name="servername" id="servername" value="<TMPL_VAR NAME="SERVERNAME_VALUE">"/>
+		<input type="text" name="servername" id="servername" value="<TMPL_VAR ESCAPE=1 NAME="SERVERNAME_VALUE">"/>
 	</p>
 	<p class="warning">
-		<TMPL_VAR NAME="SERVERNAME_WARNING">
+		<TMPL_VAR ESCAPE=1 NAME="SERVERNAME_WARNING">
 	</p>
 	<p>
 		<label for="description">		
-			<TMPL_VAR NAME="DESCRIPTION">:
+			<TMPL_VAR ESCAPE=1 NAME="DESCRIPTION">:
 		</label>
 		<textarea name="description" id="description" cols="45" rows="7"><tmpl_var name="DESCRIPTION_VALUE"></textarea>
 	</p>
 	<tmpl_if name="WARNING_PUBLIC">
 	<p>
-		<TMPL_VAR NAME="WARNING_PUBLIC">
+		<TMPL_VAR ESCAPE=1 NAME="WARNING_PUBLIC">
 	</p>
 	</tmpl_if>
 	<p class="button" id="buttonSend">
-		<input type="submit" value="<TMPL_VAR NAME="SEND">" name="web_submit" />
+		<input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" name="web_submit" />
 	</p>
 </form>

Messages sorted by: [ date | thread ]
Prev by Date: [vhffs-dev] [1058] Added missing files (not used right now).
Next by Date: [vhffs-dev] [1060] History is no more escaped.
Previous by thread: [vhffs-dev] [1058] Added missing files (not used right now).
Next by thread: [vhffs-dev] [1060] History is no more escaped.

Mail converted by MHonArc 2.6.19+

http://listengine.tuxfamily.org/