From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 31 Oct 2007 14:50:52 +0000 (+0000)
Subject: Umstellung der Vorlagen in templates/webpages/common von HTML::Template auf Template.
X-Git-Tag: release-2.6.0beta1~452
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=1a39394f99bd1a1870fe148cadfe52942096a802;p=kivitendo-erp.git

Umstellung der Vorlagen in templates/webpages/common von HTML::Template auf Template.
---

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index ac973cff9..94fc1928f 100644
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -2706,7 +2706,7 @@ sub show_history_search {
 	$form->{title} = $locale->text("History Search");
     $form->header();
     
-    print $form->parse_html_template("/common/search_history");
+    print $form->parse_html_template2("common/search_history");
 	
 	$lxdebug->leave_sub();
 }
@@ -2785,7 +2785,7 @@ sub show_am_history {
   my ($sort, $sortby) = split(/\-\-/, $form->{order});
   $sort =~ s/.*\.(.*)$/$1/;
 
-	print $form->parse_html_template("/common/show_history", 
+	print $form->parse_html_template2("common/show_history", 
     {"DATEN" => $form->get_history($dbh, $daten, $restriction, $form->{order}),
      "SUCCESS" => ($form->get_history($dbh, $daten, $restriction, $form->{order}) ne "0"),
      "NONEWWINDOW" => 1,
diff --git a/bin/mozilla/ap.pl b/bin/mozilla/ap.pl
index 627cbee87..f05d15823 100644
--- a/bin/mozilla/ap.pl
+++ b/bin/mozilla/ap.pl
@@ -1422,7 +1422,7 @@ sub ap_transactions {
   }
 
   $report->set_options('top_info_text'        => join("\n", @options),
-                       'raw_bottom_info_text' => $form->parse_html_template('ap/ap_transactions_bottom'),
+                       'raw_bottom_info_text' => $form->parse_html_template2('ap/ap_transactions_bottom'),
                        'output_format'        => 'HTML',
                        'title'                => $form->{title},
                        'attachment_basename'  => $locale->text('invoice_list') . strftime('_%Y%m%d', localtime time),
diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index 11a12e440..17db605ca 100644
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -1505,7 +1505,7 @@ sub ar_transactions {
   }
 
   $report->set_options('top_info_text'        => join("\n", @options),
-                       'raw_bottom_info_text' => $form->parse_html_template('ar/ar_transactions_bottom'),
+                       'raw_bottom_info_text' => $form->parse_html_template2('ar/ar_transactions_bottom'),
                        'output_format'        => 'HTML',
                        'title'                => $form->{title},
                        'attachment_basename'  => $locale->text('invoice_list') . strftime('_%Y%m%d', localtime time),
diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl
index dfecb2878..e9a824178 100644
--- a/bin/mozilla/common.pl
+++ b/bin/mozilla/common.pl
@@ -514,7 +514,7 @@ sub show_history {
   
 	$form->{title} = $locale->text("History");
     $form->header();
-    print $form->parse_html_template( "common/show_history", {
+    print $form->parse_html_template2( "common/show_history", {
     	"DATEN" => $form->get_history($dbh,$form->{input_name},"",$form->{order}),
     	"SUCCESS" => ($form->get_history($dbh,$form->{input_name}) ne "0"),
       uc($sort) => 1,
@@ -559,8 +559,8 @@ sub show_vc_details {
   $form->{title} = $form->{vc} eq "customer" ?
     $locale->text("Customer details") : $locale->text("Vendor details");
   $form->header();
-  print($form->parse_html_template("common/show_vc_details",
-                                   { "is_customer" => $form->{vc} eq "customer" }));
+  print($form->parse_html_template2("common/show_vc_details",
+                                    { "is_customer" => $form->{vc} eq "customer" }));
 
 	$lxdebug->leave_sub();
 }
diff --git a/templates/webpages/ap/ap_transactions_bottom_de.html b/templates/webpages/ap/ap_transactions_bottom_de.html
index 3b7faa63b..0e30e4321 100644
--- a/templates/webpages/ap/ap_transactions_bottom_de.html
+++ b/templates/webpages/ap/ap_transactions_bottom_de.html
@@ -1,9 +1,9 @@
- <form method="post" action="ap.pl">
+[% USE HTML %] <form method="post" action="ap.pl">
 
-  <input name="callback" type="hidden" value="<TMPL_VAR callback>">
+  <input name="callback" type="hidden" value="[% callback %]">
 
-  <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
-  <input type="hidden" name="password" value="<TMPL_VAR password ESCAPE=HTML>">
+  <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+  <input type="hidden" name="password" value="[% HTML.escape(password) %]">
 
   Neu erfassen<br>
 
diff --git a/templates/webpages/ap/ap_transactions_bottom_master.html b/templates/webpages/ap/ap_transactions_bottom_master.html
index ed2739564..f864d8734 100644
--- a/templates/webpages/ap/ap_transactions_bottom_master.html
+++ b/templates/webpages/ap/ap_transactions_bottom_master.html
@@ -1,9 +1,9 @@
- <form method="post" action="ap.pl">
+[% USE HTML %] <form method="post" action="ap.pl">
 
-  <input name="callback" type="hidden" value="<TMPL_VAR callback>">
+  <input name="callback" type="hidden" value="[% callback %]">
 
-  <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
-  <input type="hidden" name="password" value="<TMPL_VAR password ESCAPE=HTML>">
+  <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+  <input type="hidden" name="password" value="[% HTML.escape(password) %]">
 
   <translate>Create new</translate><br>
 
diff --git a/templates/webpages/ar/ar_transactions_bottom_de.html b/templates/webpages/ar/ar_transactions_bottom_de.html
index 7a073571b..9c1a17c1c 100644
--- a/templates/webpages/ar/ar_transactions_bottom_de.html
+++ b/templates/webpages/ar/ar_transactions_bottom_de.html
@@ -1,9 +1,9 @@
- <form method="post" action="ar.pl">
+[% USE HTML %] <form method="post" action="ar.pl">
 
-  <input name="callback" type="hidden" value="<TMPL_VAR callback>">
+  <input name="callback" type="hidden" value="[% callback %]">
 
-  <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
-  <input type="hidden" name="password" value="<TMPL_VAR password ESCAPE=HTML>">
+  <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+  <input type="hidden" name="password" value="[% HTML.escape(password) %]">
 
   Neu erfassen<br>
 
diff --git a/templates/webpages/ar/ar_transactions_bottom_master.html b/templates/webpages/ar/ar_transactions_bottom_master.html
index 29c5ece89..887b28827 100644
--- a/templates/webpages/ar/ar_transactions_bottom_master.html
+++ b/templates/webpages/ar/ar_transactions_bottom_master.html
@@ -1,9 +1,9 @@
- <form method="post" action="ar.pl">
+[% USE HTML %] <form method="post" action="ar.pl">
 
-  <input name="callback" type="hidden" value="<TMPL_VAR callback>">
+  <input name="callback" type="hidden" value="[% callback %]">
 
-  <input type="hidden" name="login" value="<TMPL_VAR login ESCAPE=HTML>">
-  <input type="hidden" name="password" value="<TMPL_VAR password ESCAPE=HTML>">
+  <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+  <input type="hidden" name="password" value="[% HTML.escape(password) %]">
 
   <translate>Create new</translate><br>
 
diff --git a/templates/webpages/common/search_history_de.html b/templates/webpages/common/search_history_de.html
index d909ebfe8..447657e35 100644
--- a/templates/webpages/common/search_history_de.html
+++ b/templates/webpages/common/search_history_de.html
@@ -1,4 +1,4 @@
-<style type="text/css">@import url(js/jscalendar/calendar-win2k-1.css);</style>
+[% USE HTML %]<style type="text/css">@import url(js/jscalendar/calendar-win2k-1.css);</style>
 <script type="text/javascript" src="js/jscalendar/calendar.js"></script>
 <script type="text/javascript" src="js/jscalendar/lang/calendar-de.js"></script>
 <script type="text/javascript" src="js/jscalendar/calendar-setup.js"></script>
@@ -6,8 +6,8 @@
 
 <form method="post" onSubmit="javascript:set_history_uri();">
 
-<input type="hidden" name="login" value="<TMPL_VAR NAME=login ESCAPE=HTML>">
-<input type="hidden" name="password" value="<TMPL_VAR NAME=password ESCAPE=HTML>">
+<input type="hidden" name="login" value="[% HTML.escape(login) %]">
+<input type="hidden" name="password" value="[% HTML.escape(password) %]">
 <input type="hidden" name="action" value="show_am_history">
 
 	<table>
@@ -21,10 +21,10 @@
 					<!--
                     function uncheckOther(id) {
 						if(!(
-						    (document.getElementById('non-deleted').checked == false) 
-					    	&& 
-						    (document.getElementById('both').checked == false) 
-						    && 
+						    (document.getElementById('non-deleted').checked == false)
+					    	&&
+						    (document.getElementById('both').checked == false)
+						    &&
 						    (document.getElementById('deleted').checked == false)
 						  )) {
 								if(id == "deleted") {
@@ -41,7 +41,7 @@
 								}
 						}
 					}
-					
+
 					var defaults = new Array('SAVED', 'DELETED', 'ADDED', 'PAYMENT POSTED', 'POSTED', 'POSTED AS NEW', 'SAVED FOR DUNNING', 'DUNNING STARTED', 'PRINTED');
 					var translated = new Object();
 					translated['SAVED'] = 'Gespeichert';
@@ -53,20 +53,20 @@
 					translated['SAVED FOR DUNNING'] = 'Gespeichert';
 					translated['DUNNING STARTED'] = 'Mahnprozess gestartet';
 					translated['PRINTED'] = 'Gedruckt';
-					
+
 					var jscalender = "<table valign=\"top\">"
 									+ "<tr><td colspan=\"2\"><b>Zeitraum:&nbsp;</b></td></tr>"
 									+ "<tr><td>von:&nbsp;"
-									+ "<input name=\"transdate\" id=\"transdate\" size=\"11\" title=\"<TMPL_VAR NAME=myconfig_dateformat ESCAPE=HTML>\" value=\"<TMPL_VAR NAME=transdate ESCAPE=HTML>\" onChange=\"document.getElementById(\'transdate_hidden\').value=this.value;\">"
+									+ "<input name=\"transdate\" id=\"transdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(transdate) %]\" onChange=\"document.getElementById(\'transdate_hidden\').value=this.value;\">"
 									+ "<input type=\"button\" name=\"transdate\" id=\"trigger1\" value=\"?\">"
 									+ "&nbsp;</td><td>bis:&nbsp;"
-									+ "<input name=\"reqdate\" id=\"reqdate\" size=\"11\" title=\"<TMPL_VAR NAME=myconfig_dateformat ESCAPE=HTML>\" value=\"<TMPL_VAR NAME=reqdate ESCAPE=HTML>\" onChange=\"document.getElementById(\'reqdate_hidden\').value=this.value;\">"
+									+ "<input name=\"reqdate\" id=\"reqdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(reqdate) %]\" onChange=\"document.getElementById(\'reqdate_hidden\').value=this.value;\">"
 									+ "<input type=\"button\" name=\"reqdate\" id=\"trigger2\" value=\"?\"></td></tr></table>";
 					var mitarbeiter = "<table valign=\"top\">"
 									+ "<tr><td><b>Mitarbeiter:</b>&nbsp;</td>"
 									+ "<td><input type='text' name='mitarbeiter' id='mitarbeiter' onChange=\"document.getElementById(\'mitarbeiter_hidden\').value=this.value;\"></td>"
 									+ "</tr></table>";
-					
+
 					var tempString = "";
 					function addForm(last, remove) {
 						if(last == "INIT") {
@@ -78,7 +78,7 @@
 							document.getElementById('selectEmployee').innerHTML = mitarbeiter;
 							document.getElementById('selectDate').innerHTML = jscalender;
 							document.getElementById('selectTable').innerHTML = tempString;
-							
+
 							Calendar.setup(
       			    		{
 		                      inputField : "transdate",
@@ -94,7 +94,7 @@
 		                  	  align : "BL",
         		          	  button : "trigger2"
           					});
-						}			
+						}
 						else {
 							defaults.splice(remove,1);
 							document.getElementById('inputText').innerHTML += ((document.getElementById('inputText').innerHTML == "") ? ("<b>Sie haben bereits die folgenden Einschr&auml;nkungen vorgenommen:</b><br>") : ("<br>")) + translated[last];
@@ -112,7 +112,7 @@
 							}
 						}
 					}
-					
+
 					function resetAll() {
 						document.getElementById('selectTable').innerHTML = "<a href=\"javascript:addForm('INIT')\">Ja";
 						document.getElementById('inputText').innerHTML = "";
@@ -142,7 +142,7 @@
 						 Nach welchem <b>Begriff</b> wollen Sie suchen?
 						</td>
 						<td>
-							<input type="text" name="searchid" id="searchid" value="<TMPL_VAR NAME=searchid ESCAPE=HTML>">
+							<input type="text" name="searchid" id="searchid" value="[% HTML.escape(searchid) %]">
 						</td>
 					</tr>
 					<tr>
@@ -185,6 +185,6 @@
 					</tr>
 				</table>
 			</td>
-		</tr>	
+		</tr>
 	</table>
 </form>
diff --git a/templates/webpages/common/search_history_master.html b/templates/webpages/common/search_history_master.html
index d067a0473..72e1fcf7e 100644
--- a/templates/webpages/common/search_history_master.html
+++ b/templates/webpages/common/search_history_master.html
@@ -1,4 +1,4 @@
-<style type="text/css">@import url(js/jscalendar/calendar-win2k-1.css);</style>
+[% USE HTML %]<style type="text/css">@import url(js/jscalendar/calendar-win2k-1.css);</style>
 <script type="text/javascript" src="js/jscalendar/calendar.js"></script>
 <script type="text/javascript" src="js/jscalendar/lang/calendar-de.js"></script>
 <script type="text/javascript" src="js/jscalendar/calendar-setup.js"></script>
@@ -6,8 +6,8 @@
 
 <form method="post" onSubmit="javascript:set_history_uri();">
 
-<input type="hidden" name="login" value="<TMPL_VAR NAME=login ESCAPE=HTML>">
-<input type="hidden" name="password" value="<TMPL_VAR NAME=password ESCAPE=HTML>">
+<input type="hidden" name="login" value="[% HTML.escape(login) %]">
+<input type="hidden" name="password" value="[% HTML.escape(password) %]">
 <input type="hidden" name="action" value="show_am_history">
 
 	<table>
@@ -21,10 +21,10 @@
 					<!--
                     function uncheckOther(id) {
 						if(!(
-						    (document.getElementById('non-deleted').checked == false) 
-					    	&& 
-						    (document.getElementById('both').checked == false) 
-						    && 
+						    (document.getElementById('non-deleted').checked == false)
+					    	&&
+						    (document.getElementById('both').checked == false)
+						    &&
 						    (document.getElementById('deleted').checked == false)
 						  )) {
 								if(id == "deleted") {
@@ -41,7 +41,7 @@
 								}
 						}
 					}
-					
+
 					var defaults = new Array('SAVED', 'DELETED', 'ADDED', 'PAYMENT POSTED', 'POSTED', 'POSTED AS NEW', 'SAVED FOR DUNNING', 'DUNNING STARTED', 'PRINTED');
 					var translated = new Object();
 					translated['SAVED'] = '<translate>SAVED</translate>';
@@ -53,20 +53,20 @@
 					translated['SAVED FOR DUNNING'] = '<translate>SAVED FOR DUNNING</translate>';
 					translated['DUNNING STARTED'] = '<translate>DUNNING STARTED</translate>';
 					translated['PRINTED'] = '<translate>PRINTED</translate>';
-					
+
 					var jscalender = "<table valign=\"top\">"
 									+ "<tr><td colspan=\"2\"><b><translate>Period</translate>:&nbsp;</b></td></tr>"
 									+ "<tr><td><translate>from (time)</translate>:&nbsp;"
-									+ "<input name=\"transdate\" id=\"transdate\" size=\"11\" title=\"<TMPL_VAR NAME=myconfig_dateformat ESCAPE=HTML>\" value=\"<TMPL_VAR NAME=transdate ESCAPE=HTML>\" onChange=\"document.getElementById(\'transdate_hidden\').value=this.value;\">"
+									+ "<input name=\"transdate\" id=\"transdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(transdate) %]\" onChange=\"document.getElementById(\'transdate_hidden\').value=this.value;\">"
 									+ "<input type=\"button\" name=\"transdate\" id=\"trigger1\" value=\"?\">"
 									+ "&nbsp;</td><td><translate>to (time)</translate>:&nbsp;"
-									+ "<input name=\"reqdate\" id=\"reqdate\" size=\"11\" title=\"<TMPL_VAR NAME=myconfig_dateformat ESCAPE=HTML>\" value=\"<TMPL_VAR NAME=reqdate ESCAPE=HTML>\" onChange=\"document.getElementById(\'reqdate_hidden\').value=this.value;\">"
+									+ "<input name=\"reqdate\" id=\"reqdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(reqdate) %]\" onChange=\"document.getElementById(\'reqdate_hidden\').value=this.value;\">"
 									+ "<input type=\"button\" name=\"reqdate\" id=\"trigger2\" value=\"?\"></td></tr></table>";
 					var mitarbeiter = "<table valign=\"top\">"
 									+ "<tr><td><b>Mitarbeiter:</b>&nbsp;</td>"
 									+ "<td><input type='text' name='mitarbeiter' id='mitarbeiter' onChange=\"document.getElementById(\'mitarbeiter_hidden\').value=this.value;\"></td>"
 									+ "</tr></table>";
-					
+
 					var tempString = "";
 					function addForm(last, remove) {
 						if(last == "INIT") {
@@ -78,7 +78,7 @@
 							document.getElementById('selectEmployee').innerHTML = mitarbeiter;
 							document.getElementById('selectDate').innerHTML = jscalender;
 							document.getElementById('selectTable').innerHTML = tempString;
-							
+
 							Calendar.setup(
       			    		{
 		                      inputField : "transdate",
@@ -94,7 +94,7 @@
 		                  	  align : "BL",
         		          	  button : "trigger2"
           					});
-						}			
+						}
 						else {
 							defaults.splice(remove,1);
 							document.getElementById('inputText').innerHTML += ((document.getElementById('inputText').innerHTML == "") ? ("<b><translate>You've already chosen the following limitations:</translate></b><br>") : ("<br>")) + translated[last];
@@ -112,7 +112,7 @@
 							}
 						}
 					}
-					
+
 					function resetAll() {
 						document.getElementById('selectTable').innerHTML = "<a href=\"javascript:addForm('INIT')\"><translate>Yes</translate>";
 						document.getElementById('inputText').innerHTML = "";
@@ -142,7 +142,7 @@
 						 <translate>What's the <b>term</b> you're looking for?</translate>
 						</td>
 						<td>
-							<input type="text" name="searchid" id="searchid" value="<TMPL_VAR NAME=searchid ESCAPE=HTML>">
+							<input type="text" name="searchid" id="searchid" value="[% HTML.escape(searchid) %]">
 						</td>
 					</tr>
 					<tr>
@@ -185,6 +185,6 @@
 					</tr>
 				</table>
 			</td>
-		</tr>	
+		</tr>
 	</table>
 </form>
diff --git a/templates/webpages/common/show_history_de.html b/templates/webpages/common/show_history_de.html
index d0ac5b472..480081a90 100644
--- a/templates/webpages/common/show_history_de.html
+++ b/templates/webpages/common/show_history_de.html
@@ -1,8 +1,8 @@
-<form>
-<input type="hidden" name="login" value="<TMPL_VAR NAME=login ESCAPE=HTML>">
-<input type="hidden" name="password" value="<TMPL_VAR NAME=password ESCAPE=HTML>">
-</form> 
-<TMPL_IF NAME=SUCCESS>
+[% USE HTML %]<form>
+<input type="hidden" name="login" value="[% HTML.escape(login) %]">
+<input type="hidden" name="password" value="[% HTML.escape(password) %]">
+</form>
+[% IF SUCCESS %]
 <script type="text/javascript">
   function orderBy(order,desc) {
     var reg = /\&order\=(.+)\-\-(\d)$/;
@@ -31,18 +31,18 @@
           </td>
           <td valign="top">
             <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" valign="top" border="0">
-              <TMPL_IF NAME=ITIME>
-                <TMPL_IF NAME=ITIMEBY>
+              [% IF ITIME %]
+                [% IF ITIMEBY %]
                   <tr><td><a href="javascript:orderBy('h.itime',0);" title="Reihenfolge" style="border: solid 1px #aaaade;">&and;</a></td></tr>
                   <tr><td><a title="Reihenfolge" style="background: #ccccff; border: solid 1px #aaaade;">&or;</a></td></tr>
-                <TMPL_ELSE>
+                [% ELSE %]
                   <tr><td><a title="Reihenfolge" style="background: #ccccff; border: solid 1px #aaaade;">&and;</a></td></tr>
                   <tr><td><a href="javascript:orderBy('h.itime',1);" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-                </TMPL_IF>
-              <TMPL_ELSE>
+                [% END %]
+              [% ELSE %]
                 <tr><td><a href="javascript:orderBy('h.itime',0);" title="Reihenfolge" style="border: solid 1px #aaaade;">&and;</a></td></tr>
                 <tr><td><a href="javascript:orderBy('h.itime',1);" title="Reihenfolge" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-              </TMPL_IF>
+              [% END %]
             </table>
           </td>
         </tr>
@@ -56,18 +56,18 @@
           </td>
           <td valign="top">
             <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" valign="top" border="0">
-              <TMPL_IF NAME=NAME>
-                <TMPL_IF NAME=NAMEBY>
+              [% IF NAME %]
+                [% IF NAMEBY %]
                   <tr><td height="0" width="0"><a href="javascript:orderBy('emp.name',0);" title="Reihenfolge" style="border: solid 1px #aaaade;">&and;</a></td></tr>
                   <tr><td height="0" width="0"><a title="Reihenfolge" style="background: #ccccff; border: solid 1px #aaaade;">&or;</a></td></tr>
-                <TMPL_ELSE>
+                [% ELSE %]
                   <tr><td><a title="Reihenfolge" style="background: #ccccff; border: solid 1px #aaaade;">&and;</a></td></tr>
                   <tr><td><a href="javascript:orderBy('emp.name',1);" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-                </TMPL_IF>
-              <TMPL_ELSE>
+                [% END %]
+              [% ELSE %]
                 <tr><td><a href="javascript:orderBy('emp.name',0);" title="Reihenfolge" style="border: solid 1px #aaaade;">&and;</a></td></tr>
                 <tr><td><a href="javascript:orderBy('emp.name',1);" title="Reihenfolge" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-              </TMPL_IF>
+              [% END %]
             </table>
           </td>
         </tr>
@@ -99,18 +99,18 @@
           </td>
           <td valign="top">
             <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" valign="top" border="0">
-              <TMPL_IF NAME=TRANS_ID>
-                <TMPL_IF NAME=TRANS_IDBY>
+              [% IF TRANS_ID %]
+                [% IF TRANS_IDBY %]
                   <tr><td height="0" width="0"><a href="javascript:orderBy('h.trans_id',0);" title="Reihenfolge" style="border: solid 1px #aaaade;">&and;</a></td></tr>
                   <tr><td height="0" width="0"><a title="Reihenfolge" style="background: #ccccff; border: solid 1px #aaaade;">&or;</a></td></tr>
-                <TMPL_ELSE>
+                [% ELSE %]
                   <tr><td><a title="Reihenfolge" style="background: #ccccff; border: solid 1px #aaaade;">&and;</a></td></tr>
                   <tr><td><a href="javascript:orderBy('h.trans_id',1);" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-                </TMPL_IF>
-              <TMPL_ELSE>
+                [% END %]
+              [% ELSE %]
                 <tr><td><a href="javascript:orderBy('h.trans_id',0);" title="Reihenfolge" style="border: solid 1px #aaaade;">&and;</a></td></tr>
                 <tr><td><a href="javascript:orderBy('h.trans_id',1);" title="Reihenfolge" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-              </TMPL_IF>
+              [% END %]
             </table>
           </td>
         </tr>
@@ -124,18 +124,18 @@
           </td>
           <td valign="top">
             <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" valign="top" border="0" >
-              <TMPL_IF NAME=SNUMBERS>
-                <TMPL_IF NAME=SNUMBERSBY>
+              [% IF SNUMBERS %]
+                [% IF SNUMBERSBY %]
                   <tr><td height="0" width="0"><a href="javascript:orderBy('h.snumbers',0);" title="Reihenfolge" style="border: solid 1px #aaaade;">&and;</a></td></tr>
                   <tr><td height="0" width="0"><a title="Reihenfolge" style="background: #ccccff; border: solid 1px #aaaade;">&or;</a></td></tr>
-                <TMPL_ELSE>
+                [% ELSE %]
                   <tr><td><a title="Reihenfolge" style="background: #ccccff; border: solid 1px #aaaade;">&and;</a></td></tr>
                   <tr><td><a href="javascript:orderBy('h.snumbers',1);" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-                </TMPL_IF>
-              <TMPL_ELSE>
+                [% END %]
+              [% ELSE %]
                 <tr><td><a href="javascript:orderBy('h.snumbers',0);" title="Reihenfolge" style="border: solid 1px #aaaade;">&and;</a></td></tr>
                 <tr><td><a href="javascript:orderBy('h.snumbers',1);" title="Reihenfolge" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-              </TMPL_IF>
+              [% END %]
             </table>
           </td>
         </tr>
@@ -143,40 +143,40 @@
     </th>
 	</tr>
   <tbody height="380px" width="580px" style="overflow:auto;">
-<TMPL_LOOP NAME=DATEN>
-  <tr class="listrow<TMPL_IF __odd__>1<TMPL_ELSE>0</TMPL_IF>">
+[% FOREACH row = DATEN %]
+  <tr class="listrow[% loop.count % 2 %]">
 		<td nowrap>
-			&nbsp;<TMPL_VAR NAME=itime ESCAPE=HTML>&nbsp;
+			&nbsp;[% HTML.escape(row.itime) %]&nbsp;
 		</td>
 		<td nowrap>
-			&nbsp;<TMPL_VAR NAME=name ESCAPE=HTML>&nbsp;
+			&nbsp;[% HTML.escape(row.name) %]&nbsp;
 		</td>
 		<td>
-			&nbsp;<TMPL_VAR NAME=addition ESCAPE=HTML>&nbsp;
+			&nbsp;[% HTML.escape(row.addition) %]&nbsp;
 		</td>
 		<td>
-      &nbsp;<TMPL_VAR NAME=what_done ESCAPE=HTML>&nbsp;
+      &nbsp;[% HTML.escape(row.what_done) %]&nbsp;
     </td>
     <td>
-      &nbsp;<TMPL_VAR NAME=id ESCAPE=HTML>&nbsp;
+      &nbsp;[% HTML.escape(row.id) %]&nbsp;
     </td>
     <td>
-      &nbsp;<TMPL_VAR NAME=snumbers ESCAPE=HTML>&nbsp;
+      &nbsp;[% HTML.escape(row.snumbers) %]&nbsp;
     </td>
-	</tr>	
-</TMPL_LOOP>
+	</tr>
+[% END %]
 </tbody>
 </table>
 </div>
 <div style="position:absolute; bottom:10px; left:10px;">
-<TMPL_ELSE>
+[% ELSE %]
 <b>Keine Suchergebnisse gefunden!</b><br>
-</TMPL_IF>
+[% END %]
 <p>
-<TMPL_IF NAME=NONEWWINDOW>
+[% IF NONEWWINDOW %]
 <input type="button" onclick="javascript:history.back(-1);" value="zurück">
-<TMPL_ELSE>
+[% ELSE %]
 <input type="button" onclick="javascript:window.close();" value="schließen">
-</TMPL_IF>
+[% END %]
 </p>
 </div>
diff --git a/templates/webpages/common/show_history_master.html b/templates/webpages/common/show_history_master.html
index 2e8904538..9774e81a0 100644
--- a/templates/webpages/common/show_history_master.html
+++ b/templates/webpages/common/show_history_master.html
@@ -1,8 +1,8 @@
-<form>
-<input type="hidden" name="login" value="<TMPL_VAR NAME=login ESCAPE=HTML>">
-<input type="hidden" name="password" value="<TMPL_VAR NAME=password ESCAPE=HTML>">
-</form> 
-<TMPL_IF NAME=SUCCESS>
+[% USE HTML %]<form>
+<input type="hidden" name="login" value="[% HTML.escape(login) %]">
+<input type="hidden" name="password" value="[% HTML.escape(password) %]">
+</form>
+[% IF SUCCESS %]
 <script type="text/javascript">
   function orderBy(order,desc) {
     var reg = /\&order\=(.+)\-\-(\d)$/;
@@ -31,18 +31,18 @@
           </td>
           <td valign="top">
             <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" valign="top" border="0">
-              <TMPL_IF NAME=ITIME>
-                <TMPL_IF NAME=ITIMEBY>
+              [% IF ITIME %]
+                [% IF ITIMEBY %]
                   <tr><td><a href="javascript:orderBy('h.itime',0);" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&and;</a></td></tr>
                   <tr><td><a title="<translate>order</translate>" style="background: #ccccff; border: solid 1px #aaaade;">&or;</a></td></tr>
-                <TMPL_ELSE>
+                [% ELSE %]
                   <tr><td><a title="<translate>order</translate>" style="background: #ccccff; border: solid 1px #aaaade;">&and;</a></td></tr>
                   <tr><td><a href="javascript:orderBy('h.itime',1);" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-                </TMPL_IF>
-              <TMPL_ELSE>
+                [% END %]
+              [% ELSE %]
                 <tr><td><a href="javascript:orderBy('h.itime',0);" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&and;</a></td></tr>
                 <tr><td><a href="javascript:orderBy('h.itime',1);" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-              </TMPL_IF>
+              [% END %]
             </table>
           </td>
         </tr>
@@ -56,18 +56,18 @@
           </td>
           <td valign="top">
             <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" valign="top" border="0">
-              <TMPL_IF NAME=NAME>
-                <TMPL_IF NAME=NAMEBY>
+              [% IF NAME %]
+                [% IF NAMEBY %]
                   <tr><td height="0" width="0"><a href="javascript:orderBy('emp.name',0);" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&and;</a></td></tr>
                   <tr><td height="0" width="0"><a title="<translate>order</translate>" style="background: #ccccff; border: solid 1px #aaaade;">&or;</a></td></tr>
-                <TMPL_ELSE>
+                [% ELSE %]
                   <tr><td><a title="<translate>order</translate>" style="background: #ccccff; border: solid 1px #aaaade;">&and;</a></td></tr>
                   <tr><td><a href="javascript:orderBy('emp.name',1);" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-                </TMPL_IF>
-              <TMPL_ELSE>
+                [% END %]
+              [% ELSE %]
                 <tr><td><a href="javascript:orderBy('emp.name',0);" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&and;</a></td></tr>
                 <tr><td><a href="javascript:orderBy('emp.name',1);" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-              </TMPL_IF>
+              [% END %]
             </table>
           </td>
         </tr>
@@ -99,18 +99,18 @@
           </td>
           <td valign="top">
             <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" valign="top" border="0">
-              <TMPL_IF NAME=TRANS_ID>
-                <TMPL_IF NAME=TRANS_IDBY>
+              [% IF TRANS_ID %]
+                [% IF TRANS_IDBY %]
                   <tr><td height="0" width="0"><a href="javascript:orderBy('h.trans_id',0);" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&and;</a></td></tr>
                   <tr><td height="0" width="0"><a title="<translate>order</translate>" style="background: #ccccff; border: solid 1px #aaaade;">&or;</a></td></tr>
-                <TMPL_ELSE>
+                [% ELSE %]
                   <tr><td><a title="<translate>order</translate>" style="background: #ccccff; border: solid 1px #aaaade;">&and;</a></td></tr>
                   <tr><td><a href="javascript:orderBy('h.trans_id',1);" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-                </TMPL_IF>
-              <TMPL_ELSE>
+                [% END %]
+              [% ELSE %]
                 <tr><td><a href="javascript:orderBy('h.trans_id',0);" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&and;</a></td></tr>
                 <tr><td><a href="javascript:orderBy('h.trans_id',1);" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-              </TMPL_IF>
+              [% END %]
             </table>
           </td>
         </tr>
@@ -124,18 +124,18 @@
           </td>
           <td valign="top">
             <table height="0" width="0" cellpadding="0" cellspacing="0" marginheight="0" marginwidth="0" valign="top" border="0" >
-              <TMPL_IF NAME=SNUMBERS>
-                <TMPL_IF NAME=SNUMBERSBY>
+              [% IF SNUMBERS %]
+                [% IF SNUMBERSBY %]
                   <tr><td height="0" width="0"><a href="javascript:orderBy('h.snumbers',0);" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&and;</a></td></tr>
                   <tr><td height="0" width="0"><a title="<translate>order</translate>" style="background: #ccccff; border: solid 1px #aaaade;">&or;</a></td></tr>
-                <TMPL_ELSE>
+                [% ELSE %]
                   <tr><td><a title="<translate>order</translate>" style="background: #ccccff; border: solid 1px #aaaade;">&and;</a></td></tr>
                   <tr><td><a href="javascript:orderBy('h.snumbers',1);" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-                </TMPL_IF>
-              <TMPL_ELSE>
+                [% END %]
+              [% ELSE %]
                 <tr><td><a href="javascript:orderBy('h.snumbers',0);" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&and;</a></td></tr>
                 <tr><td><a href="javascript:orderBy('h.snumbers',1);" title="<translate>order</translate>" style="border: solid 1px #aaaade;">&or;</a></td></tr>
-              </TMPL_IF>
+              [% END %]
             </table>
           </td>
         </tr>
@@ -143,40 +143,40 @@
     </th>
 	</tr>
   <tbody height="380px" width="580px" style="overflow:auto;">
-<TMPL_LOOP NAME=DATEN>
-  <tr class="listrow<TMPL_IF __odd__>1<TMPL_ELSE>0</TMPL_IF>">
+[% FOREACH row = DATEN %]
+  <tr class="listrow[% loop.count % 2 %]">
 		<td nowrap>
-			&nbsp;<TMPL_VAR NAME=itime ESCAPE=HTML>&nbsp;
+			&nbsp;[% HTML.escape(row.itime) %]&nbsp;
 		</td>
 		<td nowrap>
-			&nbsp;<TMPL_VAR NAME=name ESCAPE=HTML>&nbsp;
+			&nbsp;[% HTML.escape(row.name) %]&nbsp;
 		</td>
 		<td>
-			&nbsp;<TMPL_VAR NAME=addition ESCAPE=HTML>&nbsp;
+			&nbsp;[% HTML.escape(row.addition) %]&nbsp;
 		</td>
 		<td>
-      &nbsp;<TMPL_VAR NAME=what_done ESCAPE=HTML>&nbsp;
+      &nbsp;[% HTML.escape(row.what_done) %]&nbsp;
     </td>
     <td>
-      &nbsp;<TMPL_VAR NAME=id ESCAPE=HTML>&nbsp;
+      &nbsp;[% HTML.escape(row.id) %]&nbsp;
     </td>
     <td>
-      &nbsp;<TMPL_VAR NAME=snumbers ESCAPE=HTML>&nbsp;
+      &nbsp;[% HTML.escape(row.snumbers) %]&nbsp;
     </td>
-	</tr>	
-</TMPL_LOOP>
+	</tr>
+[% END %]
 </tbody>
 </table>
 </div>
 <div style="position:absolute; bottom:10px; left:10px;">
-<TMPL_ELSE>
+[% ELSE %]
 <b><translate>Keine Suchergebnisse gefunden!</translate></b><br>
-</TMPL_IF>
+[% END %]
 <p>
-<TMPL_IF NAME=NONEWWINDOW>
+[% IF NONEWWINDOW %]
 <input type="button" onclick="javascript:history.back(-1);" value="<translate>back</translate>">
-<TMPL_ELSE>
+[% ELSE %]
 <input type="button" onclick="javascript:window.close();" value="<translate>close</translate>">
-</TMPL_IF>
+[% END %]
 </p>
 </div>
diff --git a/templates/webpages/common/show_vc_details_de.html b/templates/webpages/common/show_vc_details_de.html
index bd2a6c7c5..8896c97d6 100644
--- a/templates/webpages/common/show_vc_details_de.html
+++ b/templates/webpages/common/show_vc_details_de.html
@@ -1,12 +1,12 @@
-<body>
+[% USE HTML %]<body>
 
  <div width="100%" class="listtop">
-  <TMPL_IF is_customer>Kundendetails<TMPL_ELSE>Lieferantendetails</TMPL_IF> &quot;<TMPL_VAR name ESCAPE=HTML>&quot;
+  [% IF is_customer %]Kundendetails[% ELSE %]Lieferantendetails[% END %] &quot;[% HTML.escape(name) %]&quot;
  </div>
 
  <p>Springe zu <a href="#billing">Rechnungsadresse</a>
-  <TMPL_LOOP SHIPTO>, <a href="#shipping<TMPL_VAR __counter__>">Lieferadresse &quot;<TMPL_VAR shiptoname ESCAPE=HTML>&quot;</a></TMPL_LOOP>
-  <TMPL_LOOP CONTACTS>, <a href="#contact<TMPL_VAR __counter__>">Ansprechpartner &quot;<TMPL_VAR cp_name ESCAPE=HTML>&quot;</a></TMPL_LOOP></p>
+  [% FOREACH shipto = SHIPTO %], <a href="#shipping[% loop.count %]">Lieferadresse &quot;[% HTML.escape(shipto.shiptoname) %]&quot;</a>[% END %]
+  [% FOREACH contact = CONTACTS %], <a href="#contact[% loop.count %]">Ansprechpartner &quot;[% HTML.escape(contact.cp_name) %]&quot;</a>[% END %]</p>
 
  <hr>
 
@@ -15,119 +15,119 @@
  <table>
   <tr>
    <td align="right">Kundennummer</td>
-   <td><TMPL_VAR customernumber ESCAPE=HTML></td>
+   <td>[% HTML.escape(customernumber) %]</td>
   </tr>
 
   <tr>
    <td align="right">Firmenname</td>
-   <td><TMPL_VAR name ESCAPE=HTML></td>
+   <td>[% HTML.escape(name) %]</td>
   </tr>
 
   <tr>
    <td align="right">Abteilung</td>
-   <td><TMPL_VAR department_1 ESCAPE=HTML><TMPL_IF department_2><TMPL_IF department_1>; </TMPL_IF><TMPL_VAR department_2 ESCAPE=HTML></TMPL_IF></td>
+   <td>[% HTML.escape(department_1) %][% IF department_2 %][% IF department_1 %]; [% END %][% HTML.escape(department_2) %][% END %]</td>
   </tr>
 
   <tr>
    <td align="right">Straße</td>
-   <td><TMPL_VAR street ESCAPE=HTML></td>
+   <td>[% HTML.escape(street) %]</td>
   </tr>
 
   <tr>
    <td align="right">PLZ, Ort</td>
-   <td><TMPL_VAR zipcode ESCAPE=HTML> <TMPL_VAR city ESCAPE=HTML></td>
+   <td>[% HTML.escape(zipcode) %] [% HTML.escape(city) %]</td>
   </tr>
 
   <tr>
    <td align="right">Land</td>
-   <td><TMPL_VAR country ESCAPE=HTML></td>
+   <td>[% HTML.escape(country) %]</td>
   </tr>
 
   <tr>
    <td align="right">Ansprechpartner</td>
-   <td><TMPL_IF greeting><TMPL_VAR greeting ESCAPE=HTML> </TMPL_IF><TMPL_VAR contact ESCAPE=HTML></td>
+   <td>[% IF greeting %][% HTML.escape(greeting) %] [% END %][% HTML.escape(contact) %]</td>
   </tr>
 
   <tr>
    <td align="right">Telefon</td>
-   <td><TMPL_VAR phone ESCAPE=HTML></td>
+   <td>[% HTML.escape(phone) %]</td>
   </tr>
 
   <tr>
    <td align="right">Fax</td>
-   <td><TMPL_VAR fax ESCAPE=HTML></td>
+   <td>[% HTML.escape(fax) %]</td>
   </tr>
 
   <tr>
    <td align="right">eMail</td>
-   <td><TMPL_VAR email ESCAPE=HTML></td>
+   <td>[% HTML.escape(email) %]</td>
   </tr>
 
   <tr>
    <td align="right">Homepage</td>
-   <td><TMPL_VAR homepage ESCAPE=HTML></td>
+   <td>[% HTML.escape(homepage) %]</td>
   </tr>
 
   <tr>
    <td align="right">Kreditlimit</td>
-   <td><TMPL_VAR creditlimit ESCAPE=HTML></td>
+   <td>[% HTML.escape(creditlimit) %]</td>
   </tr>
 
   <tr>
    <td align="right">Rabatt</td>
-   <td><TMPL_VAR discount ESCAPE=HTML>%</td>
+   <td>[% HTML.escape(discount) %]%</td>
   </tr>
 
   <tr>
    <td align="right">Zahlungskonditionen</td>
-   <td><TMPL_VAR payment_terms ESCAPE=HTML></td>
+   <td>[% HTML.escape(payment_terms) %]</td>
   </tr>
 
   <tr>
    <td align="right">Steuernummer</td>
-   <td><TMPL_VAR taxnumber ESCAPE=HTML></td>
+   <td>[% HTML.escape(taxnumber) %]</td>
   </tr>
 
   <tr>
    <td align="right">USt-IdNr.</td>
-   <td><TMPL_VAR ustid ESCAPE=HTML></td>
+   <td>[% HTML.escape(ustid) %]</td>
   </tr>
 
-  <TMPL_IF is_customer>
+  [% IF is_customer %]
    <tr>
     <td align="right">KNr. beim Kunden</td>
-    <td><TMPL_VAR c_vendor_id ESCAPE=HTML></td>
+    <td>[% HTML.escape(c_vendor_id) %]</td>
    </tr>
-  </TMPL_IF>
+  [% END %]
 
   <tr>
    <td align="right">Kontonummer</td>
-   <td><TMPL_VAR account_number ESCAPE=HTML></td>
+   <td>[% HTML.escape(account_number) %]</td>
   </tr>
 
   <tr>
    <td align="right">BLZ</td>
-   <td><TMPL_VAR bank_code ESCAPE=HTML></td>
+   <td>[% HTML.escape(bank_code) %]</td>
   </tr>
 
   <tr>
    <td align="right">Bank</td>
-   <td><TMPL_VAR bank ESCAPE=HTML></td>
+   <td>[% HTML.escape(bank) %]</td>
   </tr>
 
   <tr>
-   <td align="right"><TMPL_IF is_customer>Kundentyp<TMPL_ELSE>Lieferantentyp</TMPL_IF></td>
-   <td><TMPL_VAR business ESCAPE=HTML></td>
+   <td align="right">[% IF is_customer %]Kundentyp[% ELSE %]Lieferantentyp[% END %]</td>
+   <td>[% HTML.escape(business) %]</td>
   </tr>
 
   <tr>
    <td align="right">Sprache</td>
-   <td><TMPL_VAR language ESCAPE=HTML></td>
+   <td>[% HTML.escape(language) %]</td>
   </tr>
 
   <tr>
    <td align="right" valign="top">Bemerkungen</td>
-   <td valign="top"><TMPL_VAR notes ESCAPE=HTML></td>
+   <td valign="top">[% HTML.escape(notes) %]</td>
   </tr>
 
  </table>
@@ -139,66 +139,66 @@
 
 
 
- <TMPL_LOOP SHIPTO>
+ [% FOREACH row = SHIPTO %]
 
   <hr>
 
   <p>Springe zu <a href="#billing">Rechnungsadresse</a>
-   <TMPL_LOOP SHIPTO>, <a href="#shipping<TMPL_VAR __counter__>">Lieferadresse &quot;<TMPL_VAR shiptoname ESCAPE=HTML>&quot;</a></TMPL_LOOP>
-   <TMPL_LOOP CONTACTS>, <a href="#contact<TMPL_VAR __counter__>">Ansprechpartner &quot;<TMPL_VAR cp_name ESCAPE=HTML>&quot;</a></TMPL_LOOP></p>
+   [% FOREACH shipto = SHIPTO %], <a href="#shipping[% loop.count %]">Lieferadresse &quot;[% HTML.escape(shipto.shiptoname) %]&quot;</a>[% END %]
+   [% FOREACH contact = CONTACTS %], <a href="#contact[% loop.count %]">Ansprechpartner &quot;[% HTML.escape(contact.cp_name) %]&quot;</a>[% END %]</p>
 
   <hr>
 
-  <a name="shipping<TMPL_VAR __counter__>"><div class="listheading">Lieferadresse &quot;<TMPL_VAR shiptoname ESCAPE=HTML>&quot;</div></a>
+  <a name="shipping[% loop.count %]"><div class="listheading">Lieferadresse &quot;[% HTML.escape(row.shiptoname) %]&quot;</div></a>
 
   <table>
    <tr>
     <td align="right">Firmenname</td>
-    <td><TMPL_VAR shiptoname ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.shiptoname) %]</td>
    </tr>
 
    <tr>
     <td align="right">Abteilung</td>
-    <td><TMPL_VAR shiptodepartment_1 ESCAPE=HTML><TMPL_IF shiptodepartment_2><TMPL_IF shiptodepartment_1>; </TMPL_IF><TMPL_VAR shiptodepartment_2 ESCAPE=HTML></TMPL_IF></td>
+    <td>[% HTML.escape(row.shiptodepartment_1) %][% IF row.shiptodepartment_2 %][% IF row.shiptodepartment_1 %]; [% END %][% HTML.escape(row.shiptodepartment_2) %][% END %]</td>
    </tr>
 
    <tr>
     <td align="right">Straße</td>
-    <td><TMPL_VAR shiptostreet ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.shiptostreet) %]</td>
    </tr>
 
    <tr>
     <td align="right">PLZ, Ort</td>
-    <td><TMPL_VAR shiptozipcode ESCAPE=HTML> <TMPL_VAR shiptocity ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.shiptozipcode) %] [% HTML.escape(row.shiptocity) %]</td>
    </tr>
 
    <tr>
     <td align="right">Land</td>
-    <td><TMPL_VAR shiptocountry ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.shiptocountry) %]</td>
    </tr>
 
    <tr>
     <td align="right">Ansprechpartner</td>
-    <td><TMPL_VAR shiptocontact ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.shiptocontact) %]</td>
    </tr>
 
    <tr>
     <td align="right">Telefon</td>
-    <td><TMPL_VAR shiptophone ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.shiptophone) %]</td>
    </tr>
 
    <tr>
     <td align="right">Fax</td>
-    <td><TMPL_VAR shiptofax ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.shiptofax) %]</td>
    </tr>
 
    <tr>
     <td align="right">eMail</td>
-    <td><TMPL_VAR shiptoemail ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.shiptoemail) %]</td>
    </tr>
 
   </table>
- </TMPL_LOOP>
+ [% END %]
 
 
 
@@ -209,107 +209,107 @@
 
 
 
- <TMPL_LOOP CONTACTS>
+ [% FOREACH row = CONTACTS %]
 
   <hr>
 
   <p>Springe zu <a href="#billing">Rechnungsadresse</a>
-   <TMPL_LOOP SHIPTO>, <a href="#shipping<TMPL_VAR __counter__>">Lieferadresse &quot;<TMPL_VAR shiptoname ESCAPE=HTML>&quot;</a></TMPL_LOOP>
-   <TMPL_LOOP CONTACTS>, <a href="#contact<TMPL_VAR __counter__>">Ansprechpartner &quot;<TMPL_VAR cp_name ESCAPE=HTML>&quot;</a></TMPL_LOOP></p>
+   [% FOREACH shipto = SHIPTO %], <a href="#shipping[% loop.count %]">Lieferadresse &quot;[% HTML.escape(shipto.shiptoname) %]&quot;</a>[% END %]
+   [% FOREACH contact = CONTACTS %], <a href="#contact[% loop.count %]">Ansprechpartner &quot;[% HTML.escape(contact.cp_name) %]&quot;</a>[% END %]</p>
 
   <hr>
 
-  <a name="contact<TMPL_VAR __counter__>"><div class="listheading">Ansprechpartner &quot;<TMPL_VAR cp_name ESCAPE=HTML>&quot;</div></a>
+  <a name="contact[% loop.count %]"><div class="listheading">Ansprechpartner &quot;[% HTML.escape(row.cp_name) %]&quot;</div></a>
 
   <table>
    <tr>
     <td align="right">Anrede</td>
-    <td><TMPL_VAR cp_greeting ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_greeting) %]</td>
    </tr>
 
    <tr>
     <td align="right">Titel</td>
-    <td><TMPL_VAR cp_title ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_title) %]</td>
    </tr>
 
    <tr>
     <td align="right">Vorname</td>
-    <td><TMPL_VAR cp_givenname ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_givenname) %]</td>
    </tr>
 
    <tr>
     <td align="right">Name</td>
-    <td><TMPL_VAR cp_name ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_name) %]</td>
    </tr>
 
    <tr>
     <td align="right">Abteilung</td>
-    <td><TMPL_VAR cp_abteilung ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_abteilung) %]</td>
    </tr>
 
    <tr>
     <td align="right">Telefon 1 </td>
-    <td><TMPL_VAR cp_phone1 ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_phone1) %]</td>
    </tr>
 
    <tr>
     <td align="right">Telefon 2</td>
-    <td><TMPL_VAR cp_phone2 ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_phone2) %]</td>
    </tr>
 
    <tr>
     <td align="right">Fax</td>
-    <td><TMPL_VAR cp_fax ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_fax) %]</td>
    </tr>
 
    <tr>
     <td align="right">Mobile 1</td>
-    <td><TMPL_VAR cp_mobile1 ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_mobile1) %]</td>
    </tr>
 
    <tr>
     <td align="right">Mobile 2</td>
-    <td><TMPL_VAR cp_mobile2 ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_mobile2) %]</td>
    </tr>
 
    <tr>
     <td align="right">Sat. Tel.</td>
-    <td><TMPL_VAR cp_satphone ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_satphone) %]</td>
    </tr>
 
    <tr>
     <td align="right">Sat. Fax</td>
-    <td><TMPL_VAR cp_satfax ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_satfax) %]</td>
    </tr>
 
    <tr>
     <td align="right">Projekt</td>
-    <td><TMPL_VAR cp_project ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_project) %]</td>
    </tr>
 
    <tr>
     <td align="right">eMail</td>
-    <td><TMPL_VAR cp_email ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_email) %]</td>
    </tr>
 
    <tr>
     <td align="right">Privates Tel.</td>
-    <td><TMPL_VAR cp_privatphone ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_privatphone) %]</td>
    </tr>
 
    <tr>
     <td align="right">Private eMail</td>
-    <td><TMPL_VAR cp_privatemail ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_privatemail) %]</td>
    </tr>
 
    <tr>
     <td align="right">Geburtstag</td>
-    <td><TMPL_VAR cp_birthday ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_birthday) %]</td>
    </tr>
 
   </table>
 
- </TMPL_LOOP>
+ [% END %]
 
 </body>
 </html>
diff --git a/templates/webpages/common/show_vc_details_master.html b/templates/webpages/common/show_vc_details_master.html
index 8264712fd..ca6fca25f 100644
--- a/templates/webpages/common/show_vc_details_master.html
+++ b/templates/webpages/common/show_vc_details_master.html
@@ -1,12 +1,12 @@
-<body>
+[% USE HTML %]<body>
 
  <div width="100%" class="listtop">
-  <TMPL_IF is_customer><translate>Customer details</translate><TMPL_ELSE><translate>Vendor details</translate></TMPL_IF> &quot;<TMPL_VAR name ESCAPE=HTML>&quot;
+  [% IF is_customer %]<translate>Customer details</translate>[% ELSE %]<translate>Vendor details</translate>[% END %] &quot;[% HTML.escape(name) %]&quot;
  </div>
 
  <p><translate>Jump to</translate> <a href="#billing"><translate>Billing Address</translate></a>
-  <TMPL_LOOP SHIPTO>, <a href="#shipping<TMPL_VAR __counter__>"><translate>Shipping Address</translate> &quot;<TMPL_VAR shiptoname ESCAPE=HTML>&quot;</a></TMPL_LOOP>
-  <TMPL_LOOP CONTACTS>, <a href="#contact<TMPL_VAR __counter__>"><translate>Contact Person</translate> &quot;<TMPL_VAR cp_name ESCAPE=HTML>&quot;</a></TMPL_LOOP></p>
+  [% FOREACH shipto = SHIPTO %], <a href="#shipping[% loop.count %]"><translate>Shipping Address</translate> &quot;[% HTML.escape(shipto.shiptoname) %]&quot;</a>[% END %]
+  [% FOREACH contact = CONTACTS %], <a href="#contact[% loop.count %]"><translate>Contact Person</translate> &quot;[% HTML.escape(contact.cp_name) %]&quot;</a>[% END %]</p>
 
  <hr>
 
@@ -15,119 +15,119 @@
  <table>
   <tr>
    <td align="right"><translate>Customer Number</translate></td>
-   <td><TMPL_VAR customernumber ESCAPE=HTML></td>
+   <td>[% HTML.escape(customernumber) %]</td>
   </tr>
 
   <tr>
    <td align="right"><translate>Company Name</translate></td>
-   <td><TMPL_VAR name ESCAPE=HTML></td>
+   <td>[% HTML.escape(name) %]</td>
   </tr>
 
   <tr>
    <td align="right"><translate>Department</translate></td>
-   <td><TMPL_VAR department_1 ESCAPE=HTML><TMPL_IF department_2><TMPL_IF department_1>; </TMPL_IF><TMPL_VAR department_2 ESCAPE=HTML></TMPL_IF></td>
+   <td>[% HTML.escape(department_1) %][% IF department_2 %][% IF department_1 %]; [% END %][% HTML.escape(department_2) %][% END %]</td>
   </tr>
 
   <tr>
    <td align="right"><translate>Street</translate></td>
-   <td><TMPL_VAR street ESCAPE=HTML></td>
+   <td>[% HTML.escape(street) %]</td>
   </tr>
 
   <tr>
    <td align="right"><translate>Zip, City</translate></td>
-   <td><TMPL_VAR zipcode ESCAPE=HTML> <TMPL_VAR city ESCAPE=HTML></td>
+   <td>[% HTML.escape(zipcode) %] [% HTML.escape(city) %]</td>
   </tr>
 
   <tr>
    <td align="right"><translate>Country</translate></td>
-   <td><TMPL_VAR country ESCAPE=HTML></td>
+   <td>[% HTML.escape(country) %]</td>
   </tr>
 
   <tr>
    <td align="right"><translate>Contact Person</translate></td>
-   <td><TMPL_IF greeting><TMPL_VAR greeting ESCAPE=HTML> </TMPL_IF><TMPL_VAR contact ESCAPE=HTML></td>
+   <td>[% IF greeting %][% HTML.escape(greeting) %] [% END %][% HTML.escape(contact) %]</td>
   </tr>
 
   <tr>
    <td align="right"><translate>Phone</translate></td>
-   <td><TMPL_VAR phone ESCAPE=HTML></td>
+   <td>[% HTML.escape(phone) %]</td>
   </tr>
 
   <tr>
    <td align="right"><translate>Fax</translate></td>
-   <td><TMPL_VAR fax ESCAPE=HTML></td>
+   <td>[% HTML.escape(fax) %]</td>
   </tr>
 
   <tr>
    <td align="right"><translate>E-mail</translate></td>
-   <td><TMPL_VAR email ESCAPE=HTML></td>
+   <td>[% HTML.escape(email) %]</td>
   </tr>
 
   <tr>
    <td align="right"><translate>Homepage</translate></td>
-   <td><TMPL_VAR homepage ESCAPE=HTML></td>
+   <td>[% HTML.escape(homepage) %]</td>
   </tr>
 
   <tr>
    <td align="right"><translate>Credit Limit</translate></td>
-   <td><TMPL_VAR creditlimit ESCAPE=HTML></td>
+   <td>[% HTML.escape(creditlimit) %]</td>
   </tr>
 
   <tr>
    <td align="right"><translate>Discount</translate></td>
-   <td><TMPL_VAR discount ESCAPE=HTML>%</td>
+   <td>[% HTML.escape(discount) %]%</td>
   </tr>
 
   <tr>
    <td align="right"><translate>Payment Terms</translate></td>
-   <td><TMPL_VAR payment_terms ESCAPE=HTML></td>
+   <td>[% HTML.escape(payment_terms) %]</td>
   </tr>
 
   <tr>
    <td align="right"><translate>Tax Number</translate></td>
-   <td><TMPL_VAR taxnumber ESCAPE=HTML></td>
+   <td>[% HTML.escape(taxnumber) %]</td>
   </tr>
 
   <tr>
    <td align="right"><translate>USt-IdNr.</translate></td>
-   <td><TMPL_VAR ustid ESCAPE=HTML></td>
+   <td>[% HTML.escape(ustid) %]</td>
   </tr>
 
-  <TMPL_IF is_customer>
+  [% IF is_customer %]
    <tr>
     <td align="right"><translate>KNr. beim Kunden</translate></td>
-    <td><TMPL_VAR c_vendor_id ESCAPE=HTML></td>
+    <td>[% HTML.escape(c_vendor_id) %]</td>
    </tr>
-  </TMPL_IF>
+  [% END %]
 
   <tr>
    <td align="right"><translate>Account Number</translate></td>
-   <td><TMPL_VAR account_number ESCAPE=HTML></td>
+   <td>[% HTML.escape(account_number) %]</td>
   </tr>
 
   <tr>
    <td align="right"><translate>Bank Code</translate></td>
-   <td><TMPL_VAR bank_code ESCAPE=HTML></td>
+   <td>[% HTML.escape(bank_code) %]</td>
   </tr>
 
   <tr>
    <td align="right"><translate>Bank</translate></td>
-   <td><TMPL_VAR bank ESCAPE=HTML></td>
+   <td>[% HTML.escape(bank) %]</td>
   </tr>
 
   <tr>
-   <td align="right"><TMPL_IF is_customer><translate>Customer type</translate><TMPL_ELSE><translate>Vendor type</translate></TMPL_IF></td>
-   <td><TMPL_VAR business ESCAPE=HTML></td>
+   <td align="right">[% IF is_customer %]<translate>Customer type</translate>[% ELSE %]<translate>Vendor type</translate>[% END %]</td>
+   <td>[% HTML.escape(business) %]</td>
   </tr>
 
   <tr>
    <td align="right"><translate>Language</translate></td>
-   <td><TMPL_VAR language ESCAPE=HTML></td>
+   <td>[% HTML.escape(language) %]</td>
   </tr>
 
   <tr>
    <td align="right" valign="top"><translate>Notes</translate></td>
-   <td valign="top"><TMPL_VAR notes ESCAPE=HTML></td>
+   <td valign="top">[% HTML.escape(notes) %]</td>
   </tr>
 
  </table>
@@ -139,66 +139,66 @@
 
 
 
- <TMPL_LOOP SHIPTO>
+ [% FOREACH row = SHIPTO %]
 
   <hr>
 
   <p><translate>Jump to</translate> <a href="#billing"><translate>Billing Address</translate></a>
-   <TMPL_LOOP SHIPTO>, <a href="#shipping<TMPL_VAR __counter__>"><translate>Shipping Address</translate> &quot;<TMPL_VAR shiptoname ESCAPE=HTML>&quot;</a></TMPL_LOOP>
-   <TMPL_LOOP CONTACTS>, <a href="#contact<TMPL_VAR __counter__>"><translate>Contact Person</translate> &quot;<TMPL_VAR cp_name ESCAPE=HTML>&quot;</a></TMPL_LOOP></p>
+   [% FOREACH shipto = SHIPTO %], <a href="#shipping[% loop.count %]"><translate>Shipping Address</translate> &quot;[% HTML.escape(shipto.shiptoname) %]&quot;</a>[% END %]
+   [% FOREACH contact = CONTACTS %], <a href="#contact[% loop.count %]"><translate>Contact Person</translate> &quot;[% HTML.escape(contact.cp_name) %]&quot;</a>[% END %]</p>
 
   <hr>
 
-  <a name="shipping<TMPL_VAR __counter__>"><div class="listheading"><translate>Shipping Address</translate> &quot;<TMPL_VAR shiptoname ESCAPE=HTML>&quot;</div></a>
+  <a name="shipping[% loop.count %]"><div class="listheading"><translate>Shipping Address</translate> &quot;[% HTML.escape(row.shiptoname) %]&quot;</div></a>
 
   <table>
    <tr>
     <td align="right"><translate>Company Name</translate></td>
-    <td><TMPL_VAR shiptoname ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.shiptoname) %]</td>
    </tr>
 
    <tr>
     <td align="right"><translate>Department</translate></td>
-    <td><TMPL_VAR shiptodepartment_1 ESCAPE=HTML><TMPL_IF shiptodepartment_2><TMPL_IF shiptodepartment_1>; </TMPL_IF><TMPL_VAR shiptodepartment_2 ESCAPE=HTML></TMPL_IF></td>
+    <td>[% HTML.escape(row.shiptodepartment_1) %][% IF row.shiptodepartment_2 %][% IF row.shiptodepartment_1 %]; [% END %][% HTML.escape(row.shiptodepartment_2) %][% END %]</td>
    </tr>
 
    <tr>
     <td align="right"><translate>Street</translate></td>
-    <td><TMPL_VAR shiptostreet ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.shiptostreet) %]</td>
    </tr>
 
    <tr>
     <td align="right"><translate>Zip, City</translate></td>
-    <td><TMPL_VAR shiptozipcode ESCAPE=HTML> <TMPL_VAR shiptocity ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.shiptozipcode) %] [% HTML.escape(row.shiptocity) %]</td>
    </tr>
 
    <tr>
     <td align="right"><translate>Country</translate></td>
-    <td><TMPL_VAR shiptocountry ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.shiptocountry) %]</td>
    </tr>
 
    <tr>
     <td align="right"><translate>Contact Person</translate></td>
-    <td><TMPL_VAR shiptocontact ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.shiptocontact) %]</td>
    </tr>
 
    <tr>
     <td align="right"><translate>Phone</translate></td>
-    <td><TMPL_VAR shiptophone ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.shiptophone) %]</td>
    </tr>
 
    <tr>
     <td align="right"><translate>Fax</translate></td>
-    <td><TMPL_VAR shiptofax ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.shiptofax) %]</td>
    </tr>
 
    <tr>
     <td align="right"><translate>E-mail</translate></td>
-    <td><TMPL_VAR shiptoemail ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.shiptoemail) %]</td>
    </tr>
 
   </table>
- </TMPL_LOOP>
+ [% END %]
 
 
 
@@ -209,107 +209,107 @@
 
 
 
- <TMPL_LOOP CONTACTS>
+ [% FOREACH row = CONTACTS %]
 
   <hr>
 
   <p><translate>Jump to</translate> <a href="#billing"><translate>Billing Address</translate></a>
-   <TMPL_LOOP SHIPTO>, <a href="#shipping<TMPL_VAR __counter__>"><translate>Shipping Address</translate> &quot;<TMPL_VAR shiptoname ESCAPE=HTML>&quot;</a></TMPL_LOOP>
-   <TMPL_LOOP CONTACTS>, <a href="#contact<TMPL_VAR __counter__>"><translate>Contact Person</translate> &quot;<TMPL_VAR cp_name ESCAPE=HTML>&quot;</a></TMPL_LOOP></p>
+   [% FOREACH shipto = SHIPTO %], <a href="#shipping[% loop.count %]"><translate>Shipping Address</translate> &quot;[% HTML.escape(shipto.shiptoname) %]&quot;</a>[% END %]
+   [% FOREACH contact = CONTACTS %], <a href="#contact[% loop.count %]"><translate>Contact Person</translate> &quot;[% HTML.escape(contact.cp_name) %]&quot;</a>[% END %]</p>
 
   <hr>
 
-  <a name="contact<TMPL_VAR __counter__>"><div class="listheading"><translate>Contact Person</translate> &quot;<TMPL_VAR cp_name ESCAPE=HTML>&quot;</div></a>
+  <a name="contact[% loop.count %]"><div class="listheading"><translate>Contact Person</translate> &quot;[% HTML.escape(row.cp_name) %]&quot;</div></a>
 
   <table>
    <tr>
     <td align="right"><translate>Greeting</translate></td>
-    <td><TMPL_VAR cp_greeting ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_greeting) %]</td>
    </tr>
 
    <tr>
     <td align="right"><translate>Title</translate></td>
-    <td><TMPL_VAR cp_title ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_title) %]</td>
    </tr>
 
    <tr>
     <td align="right"><translate>Given Name</translate></td>
-    <td><TMPL_VAR cp_givenname ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_givenname) %]</td>
    </tr>
 
    <tr>
     <td align="right"><translate>Name</translate></td>
-    <td><TMPL_VAR cp_name ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_name) %]</td>
    </tr>
 
    <tr>
     <td align="right"><translate>Department</translate></td>
-    <td><TMPL_VAR cp_abteilung ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_abteilung) %]</td>
    </tr>
 
    <tr>
     <td align="right"><translate>Phone1</translate></td>
-    <td><TMPL_VAR cp_phone1 ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_phone1) %]</td>
    </tr>
 
    <tr>
     <td align="right"><translate>Phone2</translate></td>
-    <td><TMPL_VAR cp_phone2 ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_phone2) %]</td>
    </tr>
 
    <tr>
     <td align="right"><translate>Fax</translate></td>
-    <td><TMPL_VAR cp_fax ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_fax) %]</td>
    </tr>
 
    <tr>
     <td align="right"><translate>Mobile1</translate></td>
-    <td><TMPL_VAR cp_mobile1 ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_mobile1) %]</td>
    </tr>
 
    <tr>
     <td align="right"><translate>Mobile2</translate></td>
-    <td><TMPL_VAR cp_mobile2 ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_mobile2) %]</td>
    </tr>
 
    <tr>
     <td align="right"><translate>Sat. Phone</translate></td>
-    <td><TMPL_VAR cp_satphone ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_satphone) %]</td>
    </tr>
 
    <tr>
     <td align="right"><translate>Sat. Fax</translate></td>
-    <td><TMPL_VAR cp_satfax ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_satfax) %]</td>
    </tr>
 
    <tr>
     <td align="right"><translate>Project</translate></td>
-    <td><TMPL_VAR cp_project ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_project) %]</td>
    </tr>
 
    <tr>
     <td align="right"><translate>E-mail</translate></td>
-    <td><TMPL_VAR cp_email ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_email) %]</td>
    </tr>
 
    <tr>
     <td align="right"><translate>Private Phone</translate></td>
-    <td><TMPL_VAR cp_privatphone ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_privatphone) %]</td>
    </tr>
 
    <tr>
     <td align="right"><translate>Private E-mail</translate></td>
-    <td><TMPL_VAR cp_privatemail ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_privatemail) %]</td>
    </tr>
 
    <tr>
     <td align="right"><translate>Birthday</translate></td>
-    <td><TMPL_VAR cp_birthday ESCAPE=HTML></td>
+    <td>[% HTML.escape(row.cp_birthday) %]</td>
    </tr>
 
   </table>
 
- </TMPL_LOOP>
+ [% END %]
 
 </body>
 </html>