Umstellung der HTML-Vorlagen aus templates/webpages/ustva von HTML::Template auf...
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 1 Nov 2007 12:34:29 +0000 (12:34 +0000)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 1 Nov 2007 12:34:29 +0000 (12:34 +0000)
bin/mozilla/ustva.pl
templates/webpages/ustva/config_step1_de.html
templates/webpages/ustva/config_step1_master.html
templates/webpages/ustva/config_step2_de.html
templates/webpages/ustva/config_step2_master.html
templates/webpages/ustva/generic_taxreport_de.html
templates/webpages/ustva/generic_taxreport_master.html
templates/webpages/ustva/report_de.html
templates/webpages/ustva/report_master.html

index 4229d24..6818a00 100644 (file)
@@ -69,7 +69,7 @@ use SL::User;
 # $locale->text('Nov')
 # $locale->text('Dec')
 
-# $form->parse_html_template('generic/util_hidden_variables');
+# $form->parse_html_template2('generic/util_hidden_variables');
 
 #############################
 
@@ -217,7 +217,7 @@ sub report {
 
   };
   
-  print($form->parse_html_template('ustva/report', $template_ref));
+  print($form->parse_html_template2('ustva/report', $template_ref));
 
 
 
@@ -1161,7 +1161,7 @@ sub config_step1 {
   };
   
   # Ausgabe des Templates
-  print($form->parse_html_template('ustva/config_step1', $template_ref));
+  print($form->parse_html_template2('ustva/config_step1', $template_ref));
 
   $lxdebug->leave_sub();
 }
@@ -1301,7 +1301,7 @@ sub config_step2 {
   };
   
   # Ausgabe des Templates
-  print($form->parse_html_template('ustva/config_step2', $template_ref));
+  print($form->parse_html_template2('ustva/config_step2', $template_ref));
 
 
   $lxdebug->leave_sub();
index 9b05b7c..aa14665 100644 (file)
@@ -1,33 +1,33 @@
-<!--This file is autogenerated,
+[% USE HTML %]<!--This file is autogenerated,
  Edit templates/webpages/ustva/config_step1_master.html
  and run locale/<cc>/locales.pl -->
-  
+
 <body>
-<form name="verzeichnis" method="post" action="<TMPL_VAR script ESCAPE=HTML>">
-<table width=100%>
+<form name="verzeichnis" method="post" action="[% HTML.escape(script) %]">
+<table width="100%">
    <tr>
       <th class="listtop">Finanzamt - Einstellungen</th>
     </tr>
     <tr>
      <td>
        <br />
-<TMPL_IF COA_Germany>
+[%- IF COA_Germany %]
        <fieldset>
        <legend><b>Angaben zum Finanzamt</b></legend>
        <br />
-       <TMPL_VAR select_tax_office>
+       [% select_tax_office %]
        </fieldset>
        <br />
-</TMPL_IF>
+[%- END %]
        <fieldset>
        <legend><b>Versteuerungs Verfahren</b>
        </legend>
        <input name="method" id="accrual" class="radio" type="radio" value="accrual"
-         <TMPL_VAR checked_accrual>>
+         [% checked_accrual %]>
        <label for="accrual">Bilanzierung (Soll-Versteuerung)</label>
        <br>
        <input name="method" id="cash" class="radio" type="radio" value="cash"
-         <TMPL_VAR checked_cash>>
+         [% checked_cash %]>
        <label for="cash">E/Ü-Rechnung (Ist-Versteuerung)</label>
        </fieldset>
        <br>
 
 
            <input name=FA_voranmeld id=month class=radio type=radio value="month"
-             <TMPL_VAR checked_monthly>>
+             [% checked_monthly %]>
            <label for="month">Monatliche Abgabe</label>
            <br>
            <input name="FA_voranmeld" id=quarter class=radio type=radio value="quarter"
-             <TMPL_VAR checked_quarterly>>
+             [% checked_quarterly %]>
            <label for="quarter">Vierteljährliche (quartalsweise) Abgabe</label>
            <br>
            <input name="FA_dauerfrist" id=FA_dauerfrist class=checkbox type=checkbox value="1"
-             <TMPL_VAR checked_dauerfristverlaengerung>>
+             [% checked_dauerfristverlaengerung %]>
            <label for="">Dauerfristverlängerung</label>
-           
+
            </fieldset>
            <br>
            <fieldset>
            <legend><b>Steuerberater/-in</b>
            </legend>
           <!-- <input name="FA_71" id=FA_71 class=checkbox type=checkbox value="X"
-             <TMPL_VAR checked_kz_71>>
+             [% checked_kz_71 %]>
            <label for="FA_71">Verrechnung des Erstattungsbetrages erwünscht (Zeile 71)
     .      </label>
            <br>
            <tr>
            <td>
            <input name="FA_steuerberater_name" id=steuerberater size=25
-             value="<TMPL_VAR FA_steuerberater_name ESCAPE=HTML>">
+             value="[% HTML.escape(FA_steuerberater_name) %]">
            </td>
            <td>
            <input name="FA_steuerberater_street" id=steuerberater size=25
-             value="<TMPL_VAR FA_steuerberater_street ESCAPE=HTML>">
+             value="[% HTML.escape(FA_steuerberater_street) %]">
            </td>
            <td>
            <input name="FA_steuerberater_city" id=steuerberater size=25
-             value="<TMPL_VAR FA_steuerberater_city ESCAPE=HTML>">
+             value="[% HTML.escape(FA_steuerberater_city) %]">
            </td>
            <td>
            <input name="FA_steuerberater_tel" id=steuerberater size=25
-             value="<TMPL_VAR FA_steuerberater_tel ESCAPE=HTML>">
+             value="[% HTML.escape(FA_steuerberater_tel) %]">
            </tr>
            </table>
-           
+
            </fieldset>
 
            <br>
            <hr>
            <!--<input type=submit class=submit name=action value="
            Debug">-->
-           <input type=submit class=submit name=action 
+           <input type=submit class=submit name=action
              value="weiter">
          </td>
        </tr>
      </table>
 
-     <TMPL_LOOP hidden_variables>
-       <input type="hidden" name="<TMPL_VAR variable ESCAPE=HTML>" value="<TMPL_VAR value ESCAPE=HTML>">
-     </TMPL_LOOP>
+     [%- FOREACH var = hidden_variables %]
+       <input type="hidden" name="[% HTML.escape(var.variable) %]" value="[% HTML.escape(var.value) %]">
+     [%- END %]
   </form>
 </body>
-           
index 4f5421f..6b827b4 100644 (file)
@@ -1,33 +1,33 @@
-<!--This file is autogenerated,
+[% USE HTML %]<!--This file is autogenerated,
  Edit templates/webpages/ustva/config_step1_master.html
  and run locale/<cc>/locales.pl -->
-  
+
 <body>
-<form name="verzeichnis" method="post" action="<TMPL_VAR script ESCAPE=HTML>">
-<table width=100%>
+<form name="verzeichnis" method="post" action="[% HTML.escape(script) %]">
+<table width="100%">
    <tr>
       <th class="listtop"><translate>Tax Office Preferences</translate></th>
     </tr>
     <tr>
      <td>
        <br />
-<TMPL_IF COA_Germany>
+[%- IF COA_Germany %]
        <fieldset>
        <legend><b><translate>Local Tax Office Preferences</translate></b></legend>
        <br />
-       <TMPL_VAR select_tax_office>
+       [% select_tax_office %]
        </fieldset>
        <br />
-</TMPL_IF>
+[%- END %]
        <fieldset>
        <legend><b><translate>Taxation</translate></b>
        </legend>
        <input name="method" id="accrual" class="radio" type="radio" value="accrual"
-         <TMPL_VAR checked_accrual>>
+         [% checked_accrual %]>
        <label for="accrual"><translate>accrual</translate></label>
        <br>
        <input name="method" id="cash" class="radio" type="radio" value="cash"
-         <TMPL_VAR checked_cash>>
+         [% checked_cash %]>
        <label for="cash"><translate>cash</translate></label>
        </fieldset>
        <br>
 
 
            <input name=FA_voranmeld id=month class=radio type=radio value="month"
-             <TMPL_VAR checked_monthly>>
+             [% checked_monthly %]>
            <label for="month"><translate>month</translate></label>
            <br>
            <input name="FA_voranmeld" id=quarter class=radio type=radio value="quarter"
-             <TMPL_VAR checked_quarterly>>
+             [% checked_quarterly %]>
            <label for="quarter"><translate>quarter</translate></label>
            <br>
            <input name="FA_dauerfrist" id=FA_dauerfrist class=checkbox type=checkbox value="1"
-             <TMPL_VAR checked_dauerfristverlaengerung>>
+             [% checked_dauerfristverlaengerung %]>
            <label for=""><translate>Extension Of Time</translate></label>
-           
+
            </fieldset>
            <br>
            <fieldset>
            <legend><b><translate>Tax Consultant</translate></b>
            </legend>
           <!-- <input name="FA_71" id=FA_71 class=checkbox type=checkbox value="X"
-             <TMPL_VAR checked_kz_71>>
+             [% checked_kz_71 %]>
            <label for="FA_71"><translate>Clearing Tax Received (No 71)</translate>
     .      </label>
            <br>
            <tr>
            <td>
            <input name="FA_steuerberater_name" id=steuerberater size=25
-             value="<TMPL_VAR FA_steuerberater_name ESCAPE=HTML>">
+             value="[% HTML.escape(FA_steuerberater_name) %]">
            </td>
            <td>
            <input name="FA_steuerberater_street" id=steuerberater size=25
-             value="<TMPL_VAR FA_steuerberater_street ESCAPE=HTML>">
+             value="[% HTML.escape(FA_steuerberater_street) %]">
            </td>
            <td>
            <input name="FA_steuerberater_city" id=steuerberater size=25
-             value="<TMPL_VAR FA_steuerberater_city ESCAPE=HTML>">
+             value="[% HTML.escape(FA_steuerberater_city) %]">
            </td>
            <td>
            <input name="FA_steuerberater_tel" id=steuerberater size=25
-             value="<TMPL_VAR FA_steuerberater_tel ESCAPE=HTML>">
+             value="[% HTML.escape(FA_steuerberater_tel) %]">
            </tr>
            </table>
-           
+
            </fieldset>
 
            <br>
            <hr>
            <!--<input type=submit class=submit name=action value="
            <translate>debug</translate>">-->
-           <input type=submit class=submit name=action 
+           <input type=submit class=submit name=action
              value="<translate>continue</translate>">
          </td>
        </tr>
      </table>
 
-     <TMPL_LOOP hidden_variables>
-       <input type="hidden" name="<TMPL_VAR variable ESCAPE=HTML>" value="<TMPL_VAR value ESCAPE=HTML>">
-     </TMPL_LOOP>
+     [%- FOREACH var = hidden_variables %]
+       <input type="hidden" name="[% HTML.escape(var.variable) %]" value="[% HTML.escape(var.value) %]">
+     [%- END %]
   </form>
 </body>
-           
\ No newline at end of file
index 07c0d26..7465d1f 100644 (file)
@@ -1,10 +1,10 @@
-<!--This file is autogenerated, 
+[% USE HTML %]<!--This file is autogenerated,
  Edit templates/webpages/ustva/config_step2_master.html
  and run locale/<cc>/locales.pl -->
 
 
 <body>
-  <form name="elsterform" method="post" action="<TMPL_VAR script>">
+  <form name="elsterform" method="post" action="[% script %]">
     <table width="100%">
        <tr>
          <th colspan="2" class="listtop">
        <tr>
          <td colspan=2>
            <br>
-           <!-- Start Finanzamtdaten --> 
+           <!-- Start Finanzamtdaten -->
            <br>
            <fieldset>
              <legend>
-               <font size="+1">Finanzamt 
-               <TMPL_VAR FA_Name ESCAPE=HTML></font>
+               <font size="+1">Finanzamt
+               [% HTML.escape(FA_Name) %]</font>
              </legend>
              <table width="100%" valign="top">
                 <tr>
                         <tr>
                           <td colspan="2">
                             <input name="FA_Name" size="40" title="FA_Name"
-                              value="<TMPL_VAR FA_Name ESCAPE=HTML>" <TMPL_VAR readonly>>
+                              value="[% HTML.escape(FA_Name) %]" [% readonly %]>
                           <td>
                         </tr>
                         <tr>
                           <td colspan="2">
                             <input name="FA_Strasse" size="40" title="FA_Strasse"
-                              value="<TMPL_VAR FA_Strasse ESCAPE=HTML>" <TMPL_VAR readonly>>
+                              value="[% HTML.escape(FA_Strasse) %]" [% readonly %]>
                           </td width="100%">
                         </tr>
                         <tr>
                           <td width="116px">
                             <input name="FA_PLZ" size="10" title="FA_PLZ"
-                              value="<TMPL_VAR FA_PLZ ESCAPE=HTML>" <TMPL_VAR readonly>>
+                              value="[% HTML.escape(FA_PLZ) %]" [% readonly %]>
                           </td>
                           <td>
                             <input name="FA_Ort" size="20" title="FA_Ort"
-                              value="<TMPL_VAR FA_Ort ESCAPE=HTML>" <TMPL_VAR readonly>>
+                              value="[% HTML.escape(FA_Ort) %]" [% readonly %]>
                           </td>
                         </tr>
                       </table>
                       </legend>
                         Telefon<br>
                         <input name="FA_Telefon" size="40" title="FA_Telefon"
-                          value="<TMPL_VAR FA_Telefon ESCAPE=HTML>" <TMPL_VAR readonly>>
+                          value="[% HTML.escape(FA_Telefon) %]" [% readonly %]>
+                        <br>
                         <br>
-                        <br> 
                         Fax<br>
                         <input name="FA_Fax" size="40" title="FA_Fax"
-                          value="<TMPL_VAR FA_Fax ESCAPE=HTML>" <TMPL_VAR readonly>>
+                          value="[% HTML.escape(FA_Fax) %]" [% readonly %]>
                         <br>
                         <br>
                         Internet<br>
                         <input name="FA_Email" size="40" title="FA_Email"
-                          value="<TMPL_VAR FA_Email ESCAPE=HTML>" <TMPL_VAR readonly>>
+                          value="[% HTML.escape(FA_Email) %]" [% readonly %]>
                         <br>
                         <br>
                         <input name="FA_Internet" size="40" title="" title="FA_Internet"
-                          value="<TMPL_VAR FA_Internet ESCAPE=HTML>" <TMPL_VAR readonly>>
+                          value="[% HTML.escape(FA_Internet) %]" [% readonly %]>
                         <br>
                     </fieldset>
                   </td>
                     <legend>
                     <b>Öffnungszeiten</b>
                     </legend>
-                    <textarea name="FA_Oeffnungszeiten" rows="4" cols="40" 
-                      <TMPL_VAR readonly>><TMPL_VAR FA_Oeffnungszeiten ESCAPE=HTML></textarea>
+                    <textarea name="FA_Oeffnungszeiten" rows="4" cols="40"
+                      [% readonly %]>[% HTML.escape(FA_Oeffnungszeiten) %]</textarea>
                     </fieldset>
                     <br>
                       <fieldset>
                       <legend>
                         <b>Bankverbindung des Finanzamts</b>
                       <legend>
-                      <table>   
+                      <table>
                       <tr>
                         <td width="40%">
                           Bank
                           <br>
-                          <input name="FA_Bankbezeichnung_1" size="30" 
-                            value="<TMPL_VAR FA_Bankbezeichnung_1 ESCAPE=HTML>" <TMPL_VAR readonly>>
+                          <input name="FA_Bankbezeichnung_1" size="30"
+                            value="[% HTML.escape(FA_Bankbezeichnung_1) %]" [% readonly %]>
                           <br>
                           <br>
                           Kontonummer
                           <br>
-                          <input name="FA_Kontonummer_1" size="15" 
-                            value="<TMPL_VAR FA_Kontonummer_1 ESCAPE=HTML>" <TMPL_VAR readonly>>
+                          <input name="FA_Kontonummer_1" size="15"
+                            value="[% HTML.escape(FA_Kontonummer_1) %]" [% readonly %]>
+                          <br>
                           <br>
-                          <br> 
                           Bankleitzahl (BLZ)
                           <br>
-                          <input name="FA_BLZ_1" size="15" 
-                            value="<TMPL_VAR FA_BLZ_1 ESCAPE=HTML>" <TMPL_VAR readonly>>
+                          <input name="FA_BLZ_1" size="15"
+                            value="[% HTML.escape(FA_BLZ_1) %]" [% readonly %]>
                         </td>
                         <td width="40%">
                           Bank
                           <br>
                           <input name="FA_Bankbezeichnung_oertlich" size="30"
-                            value="<TMPL_VAR FA_Bankbezeichnung_oertlich ESCAPE=HTML>" <TMPL_VAR readonly>>
+                            value="[% HTML.escape(FA_Bankbezeichnung_oertlich) %]" [% readonly %]>
                           <br>
                           <br>
                           Kontonummer
                           <br>
                           <input name="FA_Kontonummer_2" size="15"
-                            value="<TMPL_VAR FA_Kontonummer_2 ESCAPE=HTML>" <TMPL_VAR readonly>>
+                            value="[% HTML.escape(FA_Kontonummer_2) %]" [% readonly %]>
+                          <br>
                           <br>
-                          <br> 
                           Bankleitzahl (BLZ)
                           <br>
                           <input name="FA_BLZ_2" size="15"
-                            value="<TMPL_VAR FA_BLZ_2 ESCAPE=HTML>" <TMPL_VAR readonly>>
+                            value="[% HTML.escape(FA_BLZ_2) %]" [% readonly %]>
                         </td>
                    </tr>
              </table>
            </fieldset>
          </td>
-       </tr>              
+       </tr>
     </table>
   </fieldset>
 
-<!-- Stop Finanzamtdaten  --> 
+<!-- Stop Finanzamtdaten  -->
 
         </td>
        </tr>
            <font size="+1">Steuernummer</font>
            </legend>
            <br>
-<TMPL_IF COA_Germany>
-           <TMPL_VAR input_steuernummer>
-<TMPL_ELSE>
+[%- IF COA_Germany %]
+           [% input_steuernummer %]
+[%- ELSE %]
 Bitte bei den Einstellungen des aktuellen Benutzers im Administrationsmodul
   angeben.
-</TMPL_IF>
+[%- END %]
 
 
            </H2><br>
@@ -173,39 +173,40 @@ Bitte bei den Einstellungen des aktuellen Benutzers im Administrationsmodul
        <tr>
          <td align="left">
 
-          <TMPL_IF callback>
-           <input type="button" name="Verweis" value="Benutzereinstellungen" 
-            onClick="self.location.href='<TMPL_VAR callback>">
-          <TMPL_ELSE>
+          [%- IF callback %]
+           <input type="button" name="Verweis" value="Benutzereinstellungen"
+            onClick="self.location.href='[% callback %]">
+          [%- ELSE %]
             <input type="submit" class="submit" name="action" value="zurück">
-          </TMPL_IF>
+          [%- END %]
+
+          [%- IF warnung %]
 
-          <TMPL_IF warnung>
-          
             <input type="hidden" name="nextsub" value="config_step2">
             <input type="submit" class="submit" name="action"
               value="weiter">
-             
+
             <input type="hidden" name="saved" value="Bitte Angaben überprüfen">
 
-          <TMPL_ELSE>
+          [%- ELSE %]
 
             <input type="hidden" name="nextsub" value="save">
             <input type="hidden" name="filename" value="finanzamt.ini">
             <input type="submit" class="submit" name="action" value="Speichern">
 
-          </TMPL_IF>
+          [%- END %]
 
          </td>
          <td align="right">
-           <H2 class="confirm"><TMPL_VAR saved></H2>
+           <H2 class="confirm">[%- saved %]</H2>
          </td>
       </tr>
   </table>
 
-<TMPL_LOOP hidden_variables>  <input type="hidden" name="<TMPL_VAR variable ESCAPE=HTML>" value="<TMPL_VAR value ESCAPE=HTML>">
-</TMPL_LOOP>
-     
+[%- FOREACH var = hidden_variables %]
+  <input type="hidden" name="[% HTML.escape(var.variable) %]" value="[% HTML.escape(var.value) %]">
+[%- END %]
+
 
   </form>
 </body>
index 616a292..548cc23 100644 (file)
@@ -1,10 +1,10 @@
-<!--This file is autogenerated, 
+[% USE HTML %]<!--This file is autogenerated,
  Edit templates/webpages/ustva/config_step2_master.html
  and run locale/<cc>/locales.pl -->
 
 
 <body>
-  <form name="elsterform" method="post" action="<TMPL_VAR script>">
+  <form name="elsterform" method="post" action="[% script %]">
     <table width="100%">
        <tr>
          <th colspan="2" class="listtop">
        <tr>
          <td colspan=2>
            <br>
-           <!-- Start Finanzamtdaten --> 
+           <!-- Start Finanzamtdaten -->
            <br>
            <fieldset>
              <legend>
-               <font size="+1"><translate>Tax Office</translate> 
-               <TMPL_VAR FA_Name ESCAPE=HTML></font>
+               <font size="+1"><translate>Tax Office</translate>
+               [% HTML.escape(FA_Name) %]</font>
              </legend>
              <table width="100%" valign="top">
                 <tr>
                         <tr>
                           <td colspan="2">
                             <input name="FA_Name" size="40" title="FA_Name"
-                              value="<TMPL_VAR FA_Name ESCAPE=HTML>" <TMPL_VAR readonly>>
+                              value="[% HTML.escape(FA_Name) %]" [% readonly %]>
                           <td>
                         </tr>
                         <tr>
                           <td colspan="2">
                             <input name="FA_Strasse" size="40" title="FA_Strasse"
-                              value="<TMPL_VAR FA_Strasse ESCAPE=HTML>" <TMPL_VAR readonly>>
+                              value="[% HTML.escape(FA_Strasse) %]" [% readonly %]>
                           </td width="100%">
                         </tr>
                         <tr>
                           <td width="116px">
                             <input name="FA_PLZ" size="10" title="FA_PLZ"
-                              value="<TMPL_VAR FA_PLZ ESCAPE=HTML>" <TMPL_VAR readonly>>
+                              value="[% HTML.escape(FA_PLZ) %]" [% readonly %]>
                           </td>
                           <td>
                             <input name="FA_Ort" size="20" title="FA_Ort"
-                              value="<TMPL_VAR FA_Ort ESCAPE=HTML>" <TMPL_VAR readonly>>
+                              value="[% HTML.escape(FA_Ort) %]" [% readonly %]>
                           </td>
                         </tr>
                       </table>
                       </legend>
                         <translate>Telephone</translate><br>
                         <input name="FA_Telefon" size="40" title="FA_Telefon"
-                          value="<TMPL_VAR FA_Telefon ESCAPE=HTML>" <TMPL_VAR readonly>>
+                          value="[% HTML.escape(FA_Telefon) %]" [% readonly %]>
+                        <br>
                         <br>
-                        <br> 
                         <translate>Fax</translate><br>
                         <input name="FA_Fax" size="40" title="FA_Fax"
-                          value="<TMPL_VAR FA_Fax ESCAPE=HTML>" <TMPL_VAR readonly>>
+                          value="[% HTML.escape(FA_Fax) %]" [% readonly %]>
                         <br>
                         <br>
                         <translate>Internet</translate><br>
                         <input name="FA_Email" size="40" title="FA_Email"
-                          value="<TMPL_VAR FA_Email ESCAPE=HTML>" <TMPL_VAR readonly>>
+                          value="[% HTML.escape(FA_Email) %]" [% readonly %]>
                         <br>
                         <br>
                         <input name="FA_Internet" size="40" title="" title="FA_Internet"
-                          value="<TMPL_VAR FA_Internet ESCAPE=HTML>" <TMPL_VAR readonly>>
+                          value="[% HTML.escape(FA_Internet) %]" [% readonly %]>
                         <br>
                     </fieldset>
                   </td>
                     <legend>
                     <b><translate>Openings</translate></b>
                     </legend>
-                    <textarea name="FA_Oeffnungszeiten" rows="4" cols="40" 
-                      <TMPL_VAR readonly>><TMPL_VAR FA_Oeffnungszeiten ESCAPE=HTML></textarea>
+                    <textarea name="FA_Oeffnungszeiten" rows="4" cols="40"
+                      [% readonly %]>[% HTML.escape(FA_Oeffnungszeiten) %]</textarea>
                     </fieldset>
                     <br>
                       <fieldset>
                       <legend>
                         <b><translate>Bank Connection Tax Office</translate></b>
                       <legend>
-                      <table>   
+                      <table>
                       <tr>
                         <td width="40%">
                           <translate>Bank</translate>
                           <br>
-                          <input name="FA_Bankbezeichnung_1" size="30" 
-                            value="<TMPL_VAR FA_Bankbezeichnung_1 ESCAPE=HTML>" <TMPL_VAR readonly>>
+                          <input name="FA_Bankbezeichnung_1" size="30"
+                            value="[% HTML.escape(FA_Bankbezeichnung_1) %]" [% readonly %]>
                           <br>
                           <br>
                           <translate>Account Nummer</translate>
                           <br>
-                          <input name="FA_Kontonummer_1" size="15" 
-                            value="<TMPL_VAR FA_Kontonummer_1 ESCAPE=HTML>" <TMPL_VAR readonly>>
+                          <input name="FA_Kontonummer_1" size="15"
+                            value="[% HTML.escape(FA_Kontonummer_1) %]" [% readonly %]>
+                          <br>
                           <br>
-                          <br> 
                           <translate>Bank Code (long)</translate>
                           <br>
-                          <input name="FA_BLZ_1" size="15" 
-                            value="<TMPL_VAR FA_BLZ_1 ESCAPE=HTML>" <TMPL_VAR readonly>>
+                          <input name="FA_BLZ_1" size="15"
+                            value="[% HTML.escape(FA_BLZ_1) %]" [% readonly %]>
                         </td>
                         <td width="40%">
                           <translate>Bank</translate>
                           <br>
                           <input name="FA_Bankbezeichnung_oertlich" size="30"
-                            value="<TMPL_VAR FA_Bankbezeichnung_oertlich ESCAPE=HTML>" <TMPL_VAR readonly>>
+                            value="[% HTML.escape(FA_Bankbezeichnung_oertlich) %]" [% readonly %]>
                           <br>
                           <br>
                           <translate>Account Nummer</translate>
                           <br>
                           <input name="FA_Kontonummer_2" size="15"
-                            value="<TMPL_VAR FA_Kontonummer_2 ESCAPE=HTML>" <TMPL_VAR readonly>>
+                            value="[% HTML.escape(FA_Kontonummer_2) %]" [% readonly %]>
+                          <br>
                           <br>
-                          <br> 
                           <translate>Bank Code (long)</translate>
                           <br>
                           <input name="FA_BLZ_2" size="15"
-                            value="<TMPL_VAR FA_BLZ_2 ESCAPE=HTML>" <TMPL_VAR readonly>>
+                            value="[% HTML.escape(FA_BLZ_2) %]" [% readonly %]>
                         </td>
                    </tr>
              </table>
            </fieldset>
          </td>
-       </tr>              
+       </tr>
     </table>
   </fieldset>
 
-<!-- Stop Finanzamtdaten  --> 
+<!-- Stop Finanzamtdaten  -->
 
         </td>
        </tr>
            <font size="+1"><translate>Tax Number</translate></font>
            </legend>
            <br>
-<TMPL_IF COA_Germany>
-           <TMPL_VAR input_steuernummer>
-<TMPL_ELSE>
+[%- IF COA_Germany %]
+           [% input_steuernummer %]
+[%- ELSE %]
 <translate>Please enter the taxnumber in the administration menu user
 preferences</translate>
-</TMPL_IF>
+[%- END %]
 
 
            </H2><br>
@@ -173,41 +173,42 @@ preferences</translate>
        <tr>
          <td align="left">
 
-          <TMPL_IF callback>
-           <input type="button" name="Verweis" value="<translate>User Config</translate>" 
-            onClick="self.location.href='<TMPL_VAR callback>">
-          <TMPL_ELSE>
+          [%- IF callback %]
+           <input type="button" name="Verweis" value="<translate>User Config</translate>"
+            onClick="self.location.href='[% callback %]">
+          [%- ELSE %]
             <input type="submit" class="submit" name="action" value="<translate>back</translate>">
-          </TMPL_IF>
+          [%- END %]
+
+          [%- IF warnung %]
 
-          <TMPL_IF warnung>
-          
             <input type="hidden" name="nextsub" value="config_step2">
             <input type="submit" class="submit" name="action"
               value="<translate>continue</translate>">
-             
+
             <input type="hidden" name="saved" value="<translate>Check
               Details</translate>">
 
-          <TMPL_ELSE>
+          [%- ELSE %]
 
             <input type="hidden" name="nextsub" value="save">
             <input type="hidden" name="filename" value="finanzamt.ini">
             <input type="submit" class="submit" name="action" value="<translate>Save</translate>">
 
-          </TMPL_IF>
+          [%- END %]
 
          </td>
          <td align="right">
-           <H2 class="confirm"><TMPL_VAR saved></H2>
+           <H2 class="confirm">[%- saved %]</H2>
          </td>
       </tr>
   </table>
 
-<TMPL_LOOP hidden_variables>  <input type="hidden" name="<TMPL_VAR variable ESCAPE=HTML>" value="<TMPL_VAR value ESCAPE=HTML>">
-</TMPL_LOOP>
-     
+[%- FOREACH var = hidden_variables %]
+  <input type="hidden" name="[% HTML.escape(var.variable) %]" value="[% HTML.escape(var.value) %]">
+[%- END %]
+
 
   </form>
 </body>
-</html>
\ No newline at end of file
+</html>
index cf5a021..bac6610 100644 (file)
     <th>Position</th>
     <th>Betrag</th>
   </tr>
-[% SET row_odd = '1' %]
 [% FOREACH row = USTVA %]
-  <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[%
-SET row_odd = '1' %][% END %]">
+  <tr class="listrow[% loop.count % 2 %]">
 
     <td align="left">[% HTML.escape(row.id) %]</td>
     <td align="right">[% HTML.escape(row.amount) %]</td>
index c93a955..faf3d96 100644 (file)
     <th><translate>Tax Position</translate></th>
     <th><translate>Amount</translate></th>
   </tr>
-[% SET row_odd = '1' %]
 [% FOREACH row = USTVA %]
-  <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[%
-SET row_odd = '1' %][% END %]">
+  <tr class="listrow[% loop.count % 2 %]">
 
     <td align="left">[% HTML.escape(row.id) %]</td>
     <td align="right">[% HTML.escape(row.amount) %]</td>
@@ -23,4 +21,4 @@ SET row_odd = '1' %][% END %]">
 </table>
 
 </html>
-</body>
\ No newline at end of file
+</body>
index e09b74a..5a84c54 100644 (file)
@@ -1,15 +1,15 @@
-<!--This file is autogenerated,
+[% USE HTML %]<!--This file is autogenerated,
  Edit templates/webpages/ustva/report_master.html
  and run locale/<cc>/locales.pl -->
-  
+
  <body>
- <form method="post" action="<TMPL_VAR script ESCAPE=HTML>">
+ <form method="post" action="[% HTML.escape(script) %]">
 
- <input type="hidden" name="title" value="<TMPL_VAR title ESCAPE=HTML>">
+ <input type="hidden" name="title" value="[% HTML.escape(title) %]">
 
  <table width="100%">
   <tr>
-    <th class="listtop"><TMPL_VAR title ESCAPE=HTML></th>
+    <th class="listtop">[% HTML.escape(title) %]</th>
   </tr>
   <tr height="5"></tr>
   <tr>
             <legend>
             <b>Firma</b>
             </legend>
-            
-            <TMPL_VAR company_given>
-            <TMPL_VAR address_given>
-            
+
+            [% company_given %]
+            [% address_given %]
+
             <br />
             <br />
             Tel.:&nbsp;
-            <TMPL_VAR co_tel ESCAPE=HTML>
+            [% HTML.escape(co_tel) %]
             <br />
             Fax.:&nbsp;
-            <TMPL_VAR co_fax ESCAPE=HTML>
+            [% HTML.escape(co_fax) %]
             <br />
             <br />
-            <TMPL_VAR co_email ESCAPE=HTML>
+            [% HTML.escape(co_email) %]
             <br />
             <br />
 
             Steuernummer:&nbsp;
-<TMPL_IF COA_Germany>
-            <TMPL_VAR taxnumber_given>
+[%- IF COA_Germany %]
+            [% taxnumber_given %]
             <br />
             ELSTER-Steuernummer:&nbsp;
-            <TMPL_VAR elstersteuernummer ESCAPE=HTML>
+            [% HTML.escape(elstersteuernummer) %]
             <br />
             <br />
-<TMPL_ELSE>
-            <TMPL_VAR taxnumber>
-</TMPL_IF>
+[%- ELSE %]
+            [% taxnumber %]
+[%- END %]
             </fieldset>
             <br />
-            
-            <TMPL_IF FA_steuerberater_name>
+
+            [%- IF FA_steuerberater_name %]
               <fieldset>
               <legend>
-                <input checked="checked" 
+                <input checked="checked"
                  title="Beraterdaten in UStVA übernehmen?"
-                 name="FA_steuerberater" 
-                 id="steuerberater" 
-                 class="checkbox" 
+                 name="FA_steuerberater"
+                 id="steuerberater"
+                 class="checkbox"
                  type="checkbox"
                  value="1" >
                  &nbsp;<b>Steuerberater/-in</b>
                 </legend>
-                
-                <TMPL_VAR FA_steuerberater_name ESCAPE=HTML><br />
-                <TMPL_VAR FA_steuerberater_street ESCAPE=HTML><br />
-                <TMPL_VAR FA_steuerberater_city ESCAPE=HTML><br />
-                Telefon <TMPL_VAR FA_steuerberater_tel ESCAPE=HTML><br />
+
+                [% HTML.escape(FA_steuerberater_name) %]<br />
+                [% HTML.escape(FA_steuerberater_street) %]<br />
+                [% HTML.escape(FA_steuerberater_city) %]<br />
+                Telefon [% HTML.escape(FA_steuerberater_tel) %]<br />
               </fieldset>
               <br />
-            </TMPL_IF>
+            [%- END %]
 
             <fieldset>
             <legend>
             <b>Voranmeldungszeitraum</b>
             </legend>
-            <TMPL_VAR select_year> <TMPL_VAR ustva_vorauswahl>
-            <TMPL_VAR checkbox_kz_10>
+            [% select_year %] [% ustva_vorauswahl %]
+            [% checkbox_kz_10 %]
             <br />
-            <TMPL_IF FA_voranmeld>
+            [%- IF FA_voranmeld %]
               <br />
-              <TMPL_VAR period_local>
-              <TMPL_IF FA_dauerfrist>
+              [% period_local %]
+              [%- IF FA_dauerfrist %]
                 mit Dauerfristverlängerung
-              </TMPL_IF>
+              [%- END %]
               <br />
-            </TMPL_IF>
-            
-            <TMPL_IF method_local>
-              Verfahren: <TMPL_VAR method_local>
-            </TMPL_IF>
+            [%- END %]
+
+            [%- IF method_local %]
+              Verfahren: [% method_local %]
+            [%- END %]
             </fieldset>
           </td>
-          <td width="50%" valign="top">          
+          <td width="50%" valign="top">
               <fieldset>
               <legend>
                  <b>Finanzamt</b>
               </legend>
-              <h3><TMPL_VAR FA_Name ESCAPE=HTML></h3>
-            
-              <TMPL_VAR FA_Strasse ESCAPE=HTML>
+              <h3>[% HTML.escape(FA_Name) %]</h3>
+
+              [% HTML.escape(FA_Strasse) %]
               <br>
-              <TMPL_VAR FA_PLZ ESCAPE=HTML>&nbsp; &nbsp;<TMPL_VAR FA_Ort
-                ESCAPE=HTML>
+              [% HTML.escape(FA_PLZ) %]&nbsp; &nbsp;[% HTML.escape(FA_Ort) %]
               <br>
               <br>
               Tel.:&nbsp;
-              <TMPL_VAR FA_Telefon ESCAPE=HTML>
-              <br> 
+              [% HTML.escape(FA_Telefon) %]
+              <br>
               Fax.:&nbsp;
-              <TMPL_VAR FA_Fax ESCAPE=HTML>
+              [% HTML.escape(FA_Fax) %]
               <br>
               <br>
               <!-- Mailto alles Maskieren! -->
-              <a href="mailto:<TMPL_VAR FA_Email ESCAPE=HTML>
-                ?subject=&quot;<TMPL_VAR steuernummer ESCAPE=HTML>:&quot;
-                &amp;bcc=&quot;<TMPL_VAR email ESCAPE=HTML>&quot;
+              <a href="mailto:[% HTML.escape(FA_Email) %]
+                ?subject=&quot;[% HTML.escape(steuernummer) %]:&quot;
+                &amp;bcc=&quot;[% HTML.escape(email) %]&quot;
                 &amp;body=&quot;Sehr%20geehrte%20Damen%20und%20Herren,
                 %0D%0A%0D%0A%0D%0AMit%20freundlichen%20Gr&uuml;&szlig;en
-                %0D%0A%0D%0A<TMPL_VAR signature ESCAPE=HTML>&quot;">
-              <TMPL_VAR FA_Email ESCAPE=HTML>
+                %0D%0A%0D%0A[% HTML.escape(signature) %]&quot;">
+              [% HTML.escape(FA_Email) %]
               </a>
               <br>
-              <a href="<TMPL_VAR FA_Internet>">
-              <TMPL_VAR FA_Internet ESCAPE=HTML>
+              <a href="[% FA_Internet %]">
+              [% HTML.escape(FA_Internet) %]
               </a>
               <br>
               <br>
               Öffnungszeiten
               <br>
-              <TMPL_VAR openings>
+              [% openings %]
               <br>
               <br>
               Bankverbindungen
               <table>
               <tr>
 
-              <TMPL_LOOP NAME="tax_office_banks">
+              [%- FOREACH row = "tax_office_banks" %]
                   <td width="40%">
-                  <TMPL_VAR Bankbezeichnung ESCAPE=HTML>
-                  <br>                  
+                  [% HTML.escape(row.Bankbezeichnung) %]
+                  <br>
                   Konto:&nbsp;
-                  <TMPL_VAR Kontonummer ESCAPE=HTML>
+                  [% HTML.escape(row.Kontonummer) %]
                   <br>
                   BLZ:&nbsp;
-                  <TMPL_VAR BLZ ESCAPE=HTML>
+                  [% HTML.escape(row.BLZ) %]
                   </td>
-              </TMPL_LOOP>
+              [%- END %]
 
               </tr>
               </table>
               <br>
               </fieldset>
-              
-              <br> 
-              
+
+              <br>
+
               <fieldset>
               <legend>
               <b>Ausgabeformat</b>
               </legend>
-<TMPL_IF COA_Germany>
-              <TMPL_VAR select_options>
-<TMPL_ELSE>
+[%- IF COA_Germany %]
+              [% select_options %]
+[%- ELSE %]
               <SELECT name="format">
                 <option value="generic">Druckvorschau</option>
               </SELECT>
-</TMPL_if>
+[%- END %]
 
               </fieldset>
           </td>
   </table>
 
   <br>
-  <input type="hidden" name="address" value="<TMPL_VAR address>">
+  <input type="hidden" name="address" value="[% HTML.escape(address) %]">
   <input type="hidden" name="reporttype" value="custom">
-  <input type="hidden" name="co_street" value="<TMPL_VAR co_street>">
-  <input type="hidden" name="co_city" value="<TMPL_VAR co_city>">
-  <input type="hidden" name="login" value="<TMPL_VAR login>">
-  <input type="hidden" name="password" value="<TMPL_VAR password>">
+  <input type="hidden" name="co_street" value="[% HTML.escape(co_street) %]">
+  <input type="hidden" name="co_city" value="[% HTML.escape(co_city) %]">
+  <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+  <input type="hidden" name="password" value="[% HTML.escape(password) %]">
   <table width="100%">
   <tr>
    <td align="left">
     -->
    </td>
   </tr>
-  </table>   
+  </table>
 </body>
 </html>
-            
-            
-          
-          
-          
index 5e2687e..dbde625 100644 (file)
@@ -1,15 +1,15 @@
-<!--This file is autogenerated,
+[% USE HTML %]<!--This file is autogenerated,
  Edit templates/webpages/ustva/report_master.html
  and run locale/<cc>/locales.pl -->
-  
+
  <body>
- <form method="post" action="<TMPL_VAR script ESCAPE=HTML>">
+ <form method="post" action="[% HTML.escape(script) %]">
 
- <input type="hidden" name="title" value="<TMPL_VAR title ESCAPE=HTML>">
+ <input type="hidden" name="title" value="[% HTML.escape(title) %]">
 
  <table width="100%">
   <tr>
-    <th class="listtop"><TMPL_VAR title ESCAPE=HTML></th>
+    <th class="listtop">[% HTML.escape(title) %]</th>
   </tr>
   <tr height="5"></tr>
   <tr>
             <legend>
             <b><translate>Company</translate></b>
             </legend>
-            
-            <TMPL_VAR company_given>
-            <TMPL_VAR address_given>
-            
+
+            [% company_given %]
+            [% address_given %]
+
             <br />
             <br />
             <translate>Tel</translate>.:&nbsp;
-            <TMPL_VAR co_tel ESCAPE=HTML>
+            [% HTML.escape(co_tel) %]
             <br />
             <translate>Fax</translate>.:&nbsp;
-            <TMPL_VAR co_fax ESCAPE=HTML>
+            [% HTML.escape(co_fax) %]
             <br />
             <br />
-            <TMPL_VAR co_email ESCAPE=HTML>
+            [% HTML.escape(co_email) %]
             <br />
             <br />
 
             <translate>Tax Number</translate>:&nbsp;
-<TMPL_IF COA_Germany>
-            <TMPL_VAR taxnumber_given>
+[%- IF COA_Germany %]
+            [% taxnumber_given %]
             <br />
             <translate>ELSTER Tax Number</translate>:&nbsp;
-            <TMPL_VAR elstersteuernummer ESCAPE=HTML>
+            [% HTML.escape(elstersteuernummer) %]
             <br />
             <br />
-<TMPL_ELSE>
-            <TMPL_VAR taxnumber>
-</TMPL_IF>
+[%- ELSE %]
+            [% taxnumber %]
+[%- END %]
             </fieldset>
             <br />
-            
-            <TMPL_IF FA_steuerberater_name>
+
+            [%- IF FA_steuerberater_name %]
               <fieldset>
               <legend>
-                <input checked="checked" 
+                <input checked="checked"
                  title="<translate>Assume Tax Consultant Data in Tax Computation?</translate>"
-                 name="FA_steuerberater" 
-                 id="steuerberater" 
-                 class="checkbox" 
+                 name="FA_steuerberater"
+                 id="steuerberater"
+                 class="checkbox"
                  type="checkbox"
                  value="1" >
                  &nbsp;<b><translate>Tax Consultant</translate></b>
                 </legend>
-                
-                <TMPL_VAR FA_steuerberater_name ESCAPE=HTML><br />
-                <TMPL_VAR FA_steuerberater_street ESCAPE=HTML><br />
-                <TMPL_VAR FA_steuerberater_city ESCAPE=HTML><br />
-                <translate>Tel.</translate> <TMPL_VAR FA_steuerberater_tel ESCAPE=HTML><br />
+
+                [% HTML.escape(FA_steuerberater_name) %]<br />
+                [% HTML.escape(FA_steuerberater_street) %]<br />
+                [% HTML.escape(FA_steuerberater_city) %]<br />
+                <translate>Tel.</translate> [% HTML.escape(FA_steuerberater_tel) %]<br />
               </fieldset>
               <br />
-            </TMPL_IF>
+            [%- END %]
 
             <fieldset>
             <legend>
             <b><translate>Tax Period</translate></b>
             </legend>
-            <TMPL_VAR select_year> <TMPL_VAR ustva_vorauswahl>
-            <TMPL_VAR checkbox_kz_10>
+            [% select_year %] [% ustva_vorauswahl %]
+            [% checkbox_kz_10 %]
             <br />
-            <TMPL_IF FA_voranmeld>
+            [%- IF FA_voranmeld %]
               <br />
-              <TMPL_VAR period_local>
-              <TMPL_IF FA_dauerfrist>
+              [% period_local %]
+              [%- IF FA_dauerfrist %]
                 <translate>With Extension Of Time</translate>
-              </TMPL_IF>
+              [%- END %]
               <br />
-            </TMPL_IF>
-            
-            <TMPL_IF method_local>
-              <translate>Method</translate>: <TMPL_VAR method_local>
-            </TMPL_IF>
+            [%- END %]
+
+            [%- IF method_local %]
+              <translate>Method</translate>: [% method_local %]
+            [%- END %]
             </fieldset>
           </td>
-          <td width="50%" valign="top">          
+          <td width="50%" valign="top">
               <fieldset>
               <legend>
                  <b><translate>Tax Office</translate></b>
               </legend>
-              <h3><TMPL_VAR FA_Name ESCAPE=HTML></h3>
-            
-              <TMPL_VAR FA_Strasse ESCAPE=HTML>
+              <h3>[% HTML.escape(FA_Name) %]</h3>
+
+              [% HTML.escape(FA_Strasse) %]
               <br>
-              <TMPL_VAR FA_PLZ ESCAPE=HTML>&nbsp; &nbsp;<TMPL_VAR FA_Ort
-                ESCAPE=HTML>
+              [% HTML.escape(FA_PLZ) %]&nbsp; &nbsp;[% HTML.escape(FA_Ort) %]
               <br>
               <br>
               <translate>Tel</translate>.:&nbsp;
-              <TMPL_VAR FA_Telefon ESCAPE=HTML>
-              <br> 
+              [% HTML.escape(FA_Telefon) %]
+              <br>
               <translate>Fax</translate>.:&nbsp;
-              <TMPL_VAR FA_Fax ESCAPE=HTML>
+              [% HTML.escape(FA_Fax) %]
               <br>
               <br>
               <!-- Mailto alles Maskieren! -->
-              <a href="mailto:<TMPL_VAR FA_Email ESCAPE=HTML>
-                ?subject=&quot;<TMPL_VAR steuernummer ESCAPE=HTML>:&quot;
-                &amp;bcc=&quot;<TMPL_VAR email ESCAPE=HTML>&quot;
+              <a href="mailto:[% HTML.escape(FA_Email) %]
+                ?subject=&quot;[% HTML.escape(steuernummer) %]:&quot;
+                &amp;bcc=&quot;[% HTML.escape(email) %]&quot;
                 &amp;body=&quot;Sehr%20geehrte%20Damen%20und%20Herren,
                 %0D%0A%0D%0A%0D%0AMit%20freundlichen%20Gr&uuml;&szlig;en
-                %0D%0A%0D%0A<TMPL_VAR signature ESCAPE=HTML>&quot;">
-              <TMPL_VAR FA_Email ESCAPE=HTML>
+                %0D%0A%0D%0A[% HTML.escape(signature) %]&quot;">
+              [% HTML.escape(FA_Email) %]
               </a>
               <br>
-              <a href="<TMPL_VAR FA_Internet>">
-              <TMPL_VAR FA_Internet ESCAPE=HTML>
+              <a href="[% FA_Internet %]">
+              [% HTML.escape(FA_Internet) %]
               </a>
               <br>
               <br>
               <translate>Openings</translate>
               <br>
-              <TMPL_VAR openings>
+              [% openings %]
               <br>
               <br>
               <translate>Bank Connections</translate>
               <table>
               <tr>
 
-              <TMPL_LOOP NAME="tax_office_banks">
+              [%- FOREACH row = "tax_office_banks" %]
                   <td width="40%">
-                  <TMPL_VAR Bankbezeichnung ESCAPE=HTML>
-                  <br>                  
+                  [% HTML.escape(row.Bankbezeichnung) %]
+                  <br>
                   <translate>Account</translate>:&nbsp;
-                  <TMPL_VAR Kontonummer ESCAPE=HTML>
+                  [% HTML.escape(row.Kontonummer) %]
                   <br>
                   <translate>Bank Code</translate>:&nbsp;
-                  <TMPL_VAR BLZ ESCAPE=HTML>
+                  [% HTML.escape(row.BLZ) %]
                   </td>
-              </TMPL_LOOP>
+              [%- END %]
 
               </tr>
               </table>
               <br>
               </fieldset>
-              
-              <br> 
-              
+
+              <br>
+
               <fieldset>
               <legend>
               <b><translate>Outputformat</translate></b>
               </legend>
-<TMPL_IF COA_Germany>
-              <TMPL_VAR select_options>
-<TMPL_ELSE>
+[%- IF COA_Germany %]
+              [% select_options %]
+[%- ELSE %]
               <SELECT name="format">
                 <option value="generic"><translate>Preview</translate></option>
               </SELECT>
-</TMPL_if>
+[%- END %]
 
               </fieldset>
           </td>
   </table>
 
   <br>
-  <input type="hidden" name="address" value="<TMPL_VAR address>">
+  <input type="hidden" name="address" value="[% HTML.escape(address) %]">
   <input type="hidden" name="reporttype" value="custom">
-  <input type="hidden" name="co_street" value="<TMPL_VAR co_street>">
-  <input type="hidden" name="co_city" value="<TMPL_VAR co_city>">
-  <input type="hidden" name="login" value="<TMPL_VAR login>">
-  <input type="hidden" name="password" value="<TMPL_VAR password>">
+  <input type="hidden" name="co_street" value="[% HTML.escape(co_street) %]">
+  <input type="hidden" name="co_city" value="[% HTML.escape(co_city) %]">
+  <input type="hidden" name="login" value="[% HTML.escape(login) %]">
+  <input type="hidden" name="password" value="[% HTML.escape(password) %]">
   <table width="100%">
   <tr>
    <td align="left">
     -->
    </td>
   </tr>
-  </table>   
+  </table>
 </body>
 </html>
-            
-            
-          
-          
-