HTML-Vorlagen, die von admin.pl aus verwendet werden, auf die Benutzung des Template...

diff --git a/bin/mozilla/admin.pl b/bin/mozilla/admin.pl
index b8ec2f7..8cd34c3 100644 (file)
--- a/bin/mozilla/admin.pl
+++ b/bin/mozilla/admin.pl
@@ -115,7 +115,7 @@ sub adminlogin {
     qq|Lx-Office ERP $form->{version} | . $locale->text('Administration');
 
   $form->header();
-  print $form->parse_html_template('admin/adminlogin');
+  print $form->parse_html_template2('admin/adminlogin');
 }
 
 sub login {
@@ -155,7 +155,7 @@ sub list_users {
   $form->{MEMBERS} = [ @members{sort { lc $a cmp lc $b } keys %members} ];
 
   $form->header();
-  print $form->parse_html_template("admin/list_users");
+  print $form->parse_html_template2("admin/list_users");
 }
 
 sub add_user {
@@ -313,7 +313,7 @@ sub edit_user_form {
   chop $form->{all_acs};
 
   $form->header();
-  print $form->parse_html_template("admin/edit_user");
+  print $form->parse_html_template2("admin/edit_user");
 }
 
 sub save {
@@ -520,7 +520,7 @@ sub change_admin_password {
     . $locale->text('Change Admin Password');
 
   $form->header();
-  print $form->parse_html_template("admin/change_admin_password");
+  print $form->parse_html_template2("admin/change_admin_password");
 }
 
 sub change_password {
@@ -572,7 +572,7 @@ sub dbselect_source {
   $form->{ALLOW_DBBACKUP} = "$pg_dump_exe" ne "DISABLED";
 
   $form->header();
-  print $form->parse_html_template("admin/dbadmin");
+  print $form->parse_html_template2("admin/dbadmin");
 }
 
 sub continue {
@@ -594,7 +594,7 @@ sub update_dataset {
   $form->{ALL_UPDATED}  = !scalar @need_updates;
 
   $form->header();
-  print $form->parse_html_template("admin/update_dataset");
+  print $form->parse_html_template2("admin/update_dataset");
 }
 
 sub dbupdate {
@@ -609,7 +609,7 @@ sub dbupdate {
 
   $| = 1;
 
-  print $form->parse_html_template("admin/dbupgrade_all_header");
+  print $form->parse_html_template2("admin/dbupgrade_all_header");
 
   foreach my $i (@update_rows) {
     restore_form($saved_form);
@@ -618,7 +618,7 @@ sub dbupdate {
 
     my $controls = parse_dbupdate_controls($form, $form->{dbdriver});
 
-    print $form->parse_html_template("admin/dbupgrade_header");
+    print $form->parse_html_template2("admin/dbupgrade_header");
 
     $form->{dbupdate}        = $form->{dbname};
     $form->{$form->{dbname}} = 1;
@@ -626,10 +626,10 @@ sub dbupdate {
     User->dbupdate($form);
     User->dbupdate2($form, $controls);
 
-    print $form->parse_html_template("admin/dbupgrade_footer");
+    print $form->parse_html_template2("admin/dbupgrade_footer");
   }
 
-  print $form->parse_html_template("admin/dbupgrade_all_done");
+  print $form->parse_html_template2("admin/dbupgrade_all_done");
 }
 
 sub create_dataset {
@@ -663,7 +663,7 @@ sub create_dataset {
     . $locale->text('Create Dataset');
 
   $form->header();
-  print $form->parse_html_template("admin/create_dataset");
+  print $form->parse_html_template2("admin/create_dataset");
 }
 
 sub dbcreate {
@@ -677,7 +677,7 @@ sub dbcreate {
     . $locale->text('Create Dataset');
 
   $form->header();
-  print $form->parse_html_template("admin/dbcreate");
+  print $form->parse_html_template2("admin/dbcreate");
 }
 
 sub delete_dataset {
@@ -691,7 +691,7 @@ sub delete_dataset {
   $form->{DBSOURCES} = [ map { { "name", $_ } } sort @dbsources ];
 
   $form->header();
-  print $form->parse_html_template("admin/delete_dataset");
+  print $form->parse_html_template2("admin/delete_dataset");
 }
 
 sub dbdelete {
@@ -707,7 +707,7 @@ sub dbdelete {
     . $locale->text('Database Administration') . " / "
     . $locale->text('Delete Dataset');
   $form->header();
-  print $form->parse_html_template("admin/dbdelete");
+  print $form->parse_html_template2("admin/dbdelete");
 }
 
 sub backup_dataset {
@@ -729,7 +729,7 @@ sub backup_dataset {
   $form->{from} = "Lx-Office Admin <${username}\@${hostname}>";
 
   $form->header();
-  print $form->parse_html_template("admin/backup_dataset");
+  print $form->parse_html_template2("admin/backup_dataset");
 }
 
 sub backup_dataset_start {
@@ -818,7 +818,7 @@ sub backup_dataset_start {
       . $locale->text('Backup Dataset');
 
     $form->header();
-    print $form->parse_html_template("admin/backup_dataset_email_done");
+    print $form->parse_html_template2("admin/backup_dataset_email_done");
   }
 }
 
@@ -844,7 +844,7 @@ sub restore_dataset {
   }
 
   $form->header();
-  print $form->parse_html_template("admin/restore_dataset");
+  print $form->parse_html_template2("admin/restore_dataset");
 }
 
 sub restore_dataset_start {
@@ -956,7 +956,7 @@ sub restore_dataset_start {
   $AUTOFLUSH = 1;
 
   $form->header();
-  print $form->parse_html_template("admin/restore_dataset_start_header");
+  print $form->parse_html_template2("admin/restore_dataset_start_header");
 
   while (my $line = <$in>) {
     print $line;
@@ -964,7 +964,7 @@ sub restore_dataset_start {
   $in->close();
 
   $form->{retval} = $CHILD_ERROR >> 8;
-  print $form->parse_html_template("admin/restore_dataset_start_footer");
+  print $form->parse_html_template2("admin/restore_dataset_start_footer");
 
   unlink "${tmpdir}/.pgpass", $tmp;
   rmdir $tmpdir;

diff --git a/locale/de/all b/locale/de/all
index b4aa531..6c52b72 100644 (file)
--- a/locale/de/all
+++ b/locale/de/all
@@ -1095,12 +1095,12 @@ aktualisieren wollen?',
   'The base unit does not exist.' => 'Die Basiseinheit existiert nicht.',
   'The base unit relations must not contain loops (e.g. by saying that unit A\'s base unit is B, B\'s base unit is C and C\'s base unit is A) in row %d.' => 'Die Beziehungen der Einheiten dürfen keine Schleifen beinhalten (z.B. wenn gesagt wird, dass Einheit As Basiseinheit B, Bs Basiseinheit C und Cs Basiseinheit A ist) in Zeile %d.',
   'The columns "Dunning Duedate", "Total Fees" and "Interest" show data for the previous dunning created for this invoice.' => 'Die Spalten "Zahlbar bis", "Kumulierte Gebühren" und "Zinsen" zeigen Daten der letzten für diese Rechnung erzeugten Mahnung.',
-  'The database <TMPL_VAR db ESCAPE=HTML> has been successfully deleted.' => 'Die Datenbank <TMPL_VAR db ESCAPE=HTML> wurde erfolgreich gel&ouml;scht.',
+  'The database [% HTML.escape(db) %] has been successfully deleted.' => 'Die Datenbank [% HTML.escape(db) %] wurde erfolgreich gel&ouml;scht.',
   'The database update/creation did not succeed. The file <TMPL_VAR file ESCAPE=HTML> contained the following error:' => 'Die Datenbankaktualisierung/erstellung schlug fehl. Die Datei <TMPL_VAR file ESCAPE=HTML> enthielt den folgenden Fehler:',
   'The database upgrade for the introduction of Buchungsgruppen is now complete.' => 'Das Datenbankupgrade f&uuml;r die Einf&uuml;hrung von Buchungsgruppen ist jetzt beendet.',
   'The database upgrade for the introduction of units is now complete.' => 'Das Datenbankupgrade zwecks Einf&uuml;hrung von Einheiten ist nun beendet.',
-  'The dataset <TMPL_VAR db ESCAPE=HTML> has been successfully created.' => 'Die Datenbank <TMPL_VAR db ESCAPE=HTML> wurde erfolgreich erstellt.',
-  'The dataset backup has been sent via email to <TMPL_VAR to ESCAPE=HTML>.' => 'Die Datenbanksicherung wurde an <TMPL_VAR to ESCAPE=HTML> per Email verschickt.',
+  'The dataset [% HTML.escape(db) %] has been successfully created.' => 'Die Datenbank [% HTML.escape(db) %] wurde erfolgreich angelegt.',
+  'The dataset backup has been sent via email to [% HTML.escape(to) %].' => 'Die Datenbanksicherung wurde per Email an [% HTML.escape(to) %] verschickt.',
   'The dataset has to exist before a restoration can be started.' => 'Die Datenbank muss vor der Wiederherstellung bereits angelegt worden sein.',
   'The dataset name is missing.' => 'Der Datenbankname fehlt.',
   'The directory %s does not exist.' => 'Das Verzeichnis %s existiert nicht.',
@@ -1126,7 +1126,7 @@ aktualisieren wollen?',
   'The pg_dump process could not be started.' => 'Der pg_dump-Prozess konnte nicht gestartet werden.',
   'The pg_restore process could not be started.' => 'Der pg_restore-Prozess konnte nicht gestartet werden.',
   'The preferred one is to install packages provided by your operating system distribution (e.g. Debian or RPM packages).' => 'Die bevorzugte Art, ein Perl-Modul zu installieren, ist durch Installation eines von Ihrem Betriebssystem zur Verf&uuml;gung gestellten Paketes (z.B. Debian-Pakete oder RPM).',
-  'The program\'s exit code was <TMPL_VAR retval ESCAPE=HTML> (&quot;0&quot; usually means that everything went OK).' => 'Der Exitcode des Programms war <TMPL_VAR retval ESCAPE=HTML> (&quot;0&quot; bedeutet normalerweise, dass die Wiederherstellung erfolgreich war).',
+  'The program\'s exit code was [% HTML.escape(retval) %] (&quot;0&quot; usually means that everything went OK).' => 'Der Exitcode des Programms war [% HTML.escape(retval) %] (&quot;0&quot; bedeutet normalerweise, dass die Wiederherstellung erfolgreich war).',
   'The restoration process has started. Here\'s the output of the &quot;pg_restore&quot; command:' => 'Der Wiederherstellungsprozess wurde gestartet. Hier ist die Ausgabe des &quot;pg_restore&quot;-Programmes:',
   'The restoration process is complete. Please review &quot;pg_restore&quot;\'s output to find out if the restoration was successful.' => 'Die Wiederherstellung ist abgeschlossen. Bitte sehen Sie sich die Ausgabe von &quot;pg_restore&quot; an, um festzustellen, ob die Wiederherstellung erfolgreich war.',
   'The second way is to use Perl\'s CPAN module and let it download and install the module for you.' => 'Die zweite Variante besteht darin, Perls CPAN-Modul zu benutzen und es das Modul f&uuml;r Sie installieren zu lassen.',

diff --git a/templates/webpages/admin/adminlogin_de.html b/templates/webpages/admin/adminlogin_de.html
index 012625e..196ef8f 100644 (file)
--- a/templates/webpages/admin/adminlogin_de.html
+++ b/templates/webpages/admin/adminlogin_de.html
@@ -1,10 +1,10 @@
-<body class="admin" onload="document.getElementById('rpw').focus()">
+[% USE HTML %]<body class="admin" onload="document.getElementById('rpw').focus()">
 
  <div align="center">
 
   <a href="http://www.lx-office.org"><img src="image/lx-office-erp.png" border="0"></a>
 
-  <h1 class="login">Version <TMPL_VAR version ESCAPE=HTML></h1>
+  <h1 class="login">Version [% HTML.escape(version) %]</h1>
 
   <h2>Administration</h2>
 

diff --git a/templates/webpages/admin/adminlogin_master.html b/templates/webpages/admin/adminlogin_master.html
index 0353914..ad32c48 100644 (file)
--- a/templates/webpages/admin/adminlogin_master.html
+++ b/templates/webpages/admin/adminlogin_master.html
@@ -1,10 +1,10 @@
-<body class="admin" onload="document.getElementById('rpw').focus()">
+[% USE HTML %]<body class="admin" onload="document.getElementById('rpw').focus()">
 
  <div align="center">
 
   <a href="http://www.lx-office.org"><img src="image/lx-office-erp.png" border="0"></a>
 
-  <h1 class="login"><translate>Version</translate> <TMPL_VAR version ESCAPE=HTML></h1>
+  <h1 class="login"><translate>Version</translate> [% HTML.escape(version) %]</h1>
 
   <h2><translate>Administration</translate></h2>
 

diff --git a/templates/webpages/admin/backup_dataset_de.html b/templates/webpages/admin/backup_dataset_de.html
index 6ee0fc7..5fc9b76 100644 (file)
--- a/templates/webpages/admin/backup_dataset_de.html
+++ b/templates/webpages/admin/backup_dataset_de.html
@@ -1,4 +1,4 @@
-<body class="admin" onload="set_subject(); document.getElementsByName('to')[0].focus(); ">
+[% USE HTML %]<body class="admin" onload="set_subject(); document.getElementsByName('to')[0].focus(); ">
 
  <script type="text/javascript">
   <!--
@@ -13,24 +13,24 @@
     -->
  </script>
 
- <h2><TMPL_VAR title></h2>
+ <h2>[% title %]</h2>
 
- <TMPL_IF NO_DATABSES>
+ [% IF NO_DATABSES %]
   Auf diesem Server wurden keine Datenbanken gefunden.
 
-  <TMPL_ELSE>
+  [% ELSE %]
 
   <form name="Form" method="post" action="admin.pl">
 
    <input type="hidden" name="dbdriver" value="Pg">
-   <input type="hidden" name="dbhost" value="<TMPL_VAR dbhost ESCAPE=HTML>">
-   <input type="hidden" name="dbport" value="<TMPL_VAR dbport ESCAPE=HTML>">
-   <input type="hidden" name="dbuser" value="<TMPL_VAR dbuser ESCAPE=HTML>">
-   <input type="hidden" name="dbpasswd" value="<TMPL_VAR dbpasswd ESCAPE=HTML>">
+   <input type="hidden" name="dbhost" value="[% HTML.escape(dbhost) %]">
+   <input type="hidden" name="dbport" value="[% HTML.escape(dbport) %]">
+   <input type="hidden" name="dbuser" value="[% HTML.escape(dbuser) %]">
+   <input type="hidden" name="dbpasswd" value="[% HTML.escape(dbpasswd) %]">
 
    <p>
     Bitte w&auml;hlen Sie die zu sichernde Datenbank gefunden:
-    <select name="dbname" onchange="set_subject()"><TMPL_LOOP DATABASES><option><TMPL_VAR dbname ESCAPE=HTML></option></TMPL_LOOP></select>
+    <select name="dbname" onchange="set_subject()">[% FOREACH row = DATABASES %]<option>[% HTML.escape(row.dbname) %]</option>[% END %]</select>
    </p>
 
    <table>
@@ -47,7 +47,7 @@
       <table>
        <tr>
         <td valign="top" align="right">Von</td>
-        <td valign="top"><input name="from" size="40" value="<TMPL_VAR from ESCAPE=HTML>"></td>
+        <td valign="top"><input name="from" size="40" value="[% HTML.escape(from) %]"></td>
        </tr>
 
        <tr>
@@ -77,8 +77,8 @@
 
    </table>
 
-   <input name="callback" type="hidden" value="admin.pl?action=list_users&rpw=<TMPL_VAR rpw ESCAPE=URL>">
-   <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+   <input name="callback" type="hidden" value="admin.pl?action=list_users&rpw=[% HTML.url(rpw) %]">
+   <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
    <input type="hidden" name="nextsub" value="backup_dataset_start">
    <input type="hidden" name="back_nextsub" value="list_users">
 
@@ -91,7 +91,7 @@
 
   </form>
 
- </TMPL_IF>
+ [% END %]
 
 </body>
 </html>

diff --git a/templates/webpages/admin/backup_dataset_email_done_de.html b/templates/webpages/admin/backup_dataset_email_done_de.html
index e8eec51..1d50653 100644 (file)
--- a/templates/webpages/admin/backup_dataset_email_done_de.html
+++ b/templates/webpages/admin/backup_dataset_email_done_de.html
@@ -1,11 +1,11 @@
-<body class="admin">
+[% USE HTML %]<body class="admin">
 
- <h2><TMPL_VAR title></h2>
+ <h2>[% title %]</h2>
 
- <p>Die Datenbanksicherung wurde an <TMPL_VAR to ESCAPE=HTML> per Email verschickt.</p>
+ <p>Die Datenbanksicherung wurde per Email an [% HTML.escape(to) %] verschickt.</p>
 
  <form method="post" action="admin.pl">
-  <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+  <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
   <input type="hidden" name="nextsub" value="list_users">
   <input type="submit" name="action" value="Weiter">
  </form>

diff --git a/templates/webpages/admin/backup_dataset_email_done_master.html b/templates/webpages/admin/backup_dataset_email_done_master.html
index 268045a..71d5577 100644 (file)
--- a/templates/webpages/admin/backup_dataset_email_done_master.html
+++ b/templates/webpages/admin/backup_dataset_email_done_master.html
@@ -1,11 +1,11 @@
-<body class="admin">
+[% USE HTML %]<body class="admin">
 
- <h2><TMPL_VAR title></h2>
+ <h2>[% title %]</h2>
 
- <p><translate>The dataset backup has been sent via email to <TMPL_VAR to ESCAPE=HTML>.</translate></p>
+ <p><translate>The dataset backup has been sent via email to [% HTML.escape(to) %].</translate></p>
 
  <form method="post" action="admin.pl">
-  <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+  <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
   <input type="hidden" name="nextsub" value="list_users">
   <input type="submit" name="action" value="<translate>Continue</translate>">
  </form>

diff --git a/templates/webpages/admin/backup_dataset_master.html b/templates/webpages/admin/backup_dataset_master.html
index 41dc331..23f674c 100644 (file)
--- a/templates/webpages/admin/backup_dataset_master.html
+++ b/templates/webpages/admin/backup_dataset_master.html
@@ -1,4 +1,4 @@
-<body class="admin" onload="set_subject(); document.getElementsByName('to')[0].focus(); ">
+[% USE HTML %]<body class="admin" onload="set_subject(); document.getElementsByName('to')[0].focus(); ">
 
  <script type="text/javascript">
   <!--
@@ -13,24 +13,24 @@
     -->
  </script>
 
- <h2><TMPL_VAR title></h2>
+ <h2>[% title %]</h2>
 
- <TMPL_IF NO_DATABSES>
+ [% IF NO_DATABSES %]
   <translate>No databases have been found on this server.</translate>
 
-  <TMPL_ELSE>
+  [% ELSE %]
 
   <form name="Form" method="post" action="admin.pl">
 
    <input type="hidden" name="dbdriver" value="Pg">
-   <input type="hidden" name="dbhost" value="<TMPL_VAR dbhost ESCAPE=HTML>">
-   <input type="hidden" name="dbport" value="<TMPL_VAR dbport ESCAPE=HTML>">
-   <input type="hidden" name="dbuser" value="<TMPL_VAR dbuser ESCAPE=HTML>">
-   <input type="hidden" name="dbpasswd" value="<TMPL_VAR dbpasswd ESCAPE=HTML>">
+   <input type="hidden" name="dbhost" value="[% HTML.escape(dbhost) %]">
+   <input type="hidden" name="dbport" value="[% HTML.escape(dbport) %]">
+   <input type="hidden" name="dbuser" value="[% HTML.escape(dbuser) %]">
+   <input type="hidden" name="dbpasswd" value="[% HTML.escape(dbpasswd) %]">
 
    <p>
     <translate>Please select the database you want to backup</translate>:
-    <select name="dbname" onchange="set_subject()"><TMPL_LOOP DATABASES><option><TMPL_VAR dbname ESCAPE=HTML></option></TMPL_LOOP></select>
+    <select name="dbname" onchange="set_subject()">[% FOREACH row = DATABASES %]<option>[% HTML.escape(row.dbname) %]</option>[% END %]</select>
    </p>
 
    <table>
@@ -47,7 +47,7 @@
       <table>
        <tr>
         <td valign="top" align="right"><translate>From</translate></td>
-        <td valign="top"><input name="from" size="40" value="<TMPL_VAR from ESCAPE=HTML>"></td>
+        <td valign="top"><input name="from" size="40" value="[% HTML.escape(from) %]"></td>
        </tr>
 
        <tr>
@@ -77,8 +77,8 @@
 
    </table>
 
-   <input name="callback" type="hidden" value="admin.pl?action=list_users&rpw=<TMPL_VAR rpw ESCAPE=URL>">
-   <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+   <input name="callback" type="hidden" value="admin.pl?action=list_users&rpw=[% HTML.url(rpw) %]">
+   <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
    <input type="hidden" name="nextsub" value="backup_dataset_start">
    <input type="hidden" name="back_nextsub" value="list_users">
 
@@ -91,7 +91,7 @@
 
   </form>
 
- </TMPL_IF>
+ [% END %]
 
 </body>
 </html>

diff --git a/templates/webpages/admin/change_admin_password_de.html b/templates/webpages/admin/change_admin_password_de.html
index 3c7aa55..39469ae 100644 (file)
--- a/templates/webpages/admin/change_admin_password_de.html
+++ b/templates/webpages/admin/change_admin_password_de.html
@@ -1,4 +1,4 @@
-<body class="admin">
+[% USE HTML %]<body class="admin">
 
  <h2>Administratorpasswort ändern</h2>
 
@@ -16,10 +16,9 @@
    </tr>
   </table>
 
-  <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+  <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
 
-  <p>
-   <input type="submit" class="submit" name="action" value="Passwort ändern"></p>
+  <p><input type="submit" class="submit" name="action" value="Passwort ändern"></p>
 
  </form>
 

diff --git a/templates/webpages/admin/change_admin_password_master.html b/templates/webpages/admin/change_admin_password_master.html
index cc316b3..fb41f9f 100644 (file)
--- a/templates/webpages/admin/change_admin_password_master.html
+++ b/templates/webpages/admin/change_admin_password_master.html
@@ -1,4 +1,4 @@
-<body class="admin">
+[% USE HTML %]<body class="admin">
 
  <h2><translate>Change Admin Password</translate></h2>
 
@@ -16,10 +16,9 @@
    </tr>
   </table>
 
-  <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+  <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
 
-  <p>
-   <input type="submit" class="submit" name="action" value="<translate>Change Password</translate>"></p>
+  <p><input type="submit" class="submit" name="action" value="<translate>Change Password</translate>"></p>
 
  </form>
 

diff --git a/templates/webpages/admin/create_dataset_de.html b/templates/webpages/admin/create_dataset_de.html
index 1ddd1af..55ff4ea 100644 (file)
--- a/templates/webpages/admin/create_dataset_de.html
+++ b/templates/webpages/admin/create_dataset_de.html
@@ -1,13 +1,13 @@
-<body class="admin">
+[% USE HTML %]<body class="admin">
 
-  <h2><TMPL_VAR title></h2>
+  <h2>[% title %]</h2>
 
   <form method="post" action="admin.pl">
 
    <table>
     <tr>
      <th valign="top" align="right" nowrap>existierende Datenbanken</th>
-     <td valign="top"><TMPL_VAR dbsources ESCAPE=HTML></td>
+     <td valign="top">[% HTML.escape(dbsources) %]</td>
     </tr>
 
     <tr>
@@ -19,7 +19,7 @@
      <th align="right" nowrap>Schriftsatz</th>
      <td>
       <select name="encoding">
-       <TMPL_LOOP DBENCODINGS><option value="<TMPL_VAR dbencoding ESCAPE=HTML>" <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR label ESCAPE=HTML></option></TMPL_LOOP>
+       [% FOREACH row = DBENCODINGS %]<option value="[% HTML.escape(row.dbencoding) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
       </select>
      </td>
     </tr>
@@ -28,22 +28,22 @@
      <th valign="top" align="right" nowrap>Kontenplan anlegen</th>
      <td>
       <select name="chart">
-       <TMPL_LOOP CHARTS><option <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR name ESCAPE=HTML></option></TMPL_LOOP>
+       [% FOREACH row = CHARTS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>[% END %]
       </select>
      </td>
     </tr>
 
    </table>
 
-   <input type="hidden" name="dbdriver"  value="<TMPL_VAR dbdriver ESCAPE=HTML>">
-   <input type="hidden" name="dbuser"    value="<TMPL_VAR dbuser ESCAPE=HTML>">
-   <input type="hidden" name="dbhost"    value="<TMPL_VAR dbhost ESCAPE=HTML>">
-   <input type="hidden" name="dbport"    value="<TMPL_VAR dbport ESCAPE=HTML>">
-   <input type="hidden" name="dbpasswd"  value="<TMPL_VAR dbpasswd ESCAPE=HTML>">
-   <input type="hidden" name="dbdefault" value="<TMPL_VAR dbdefault ESCAPE=HTML>">
+   <input type="hidden" name="dbdriver"  value="[% HTML.escape(dbdriver) %]">
+   <input type="hidden" name="dbuser"    value="[% HTML.escape(dbuser) %]">
+   <input type="hidden" name="dbhost"    value="[% HTML.escape(dbhost) %]">
+   <input type="hidden" name="dbport"    value="[% HTML.escape(dbport) %]">
+   <input type="hidden" name="dbpasswd"  value="[% HTML.escape(dbpasswd) %]">
+   <input type="hidden" name="dbdefault" value="[% HTML.escape(dbdefault) %]">
 
-   <input type="hidden" name="callback" value="admin.pl?action=list_users&rpw=<TMPL_VAR rpw ESCAPE=URL>">
-   <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+   <input type="hidden" name="callback" value="admin.pl?action=list_users&rpw=[% HTML.url(rpw) %]">
+   <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
 
    <input type="hidden" name="nextsub" value="dbcreate">
 

diff --git a/templates/webpages/admin/create_dataset_master.html b/templates/webpages/admin/create_dataset_master.html
index 9f494cc..5d480cc 100644 (file)
--- a/templates/webpages/admin/create_dataset_master.html
+++ b/templates/webpages/admin/create_dataset_master.html
@@ -1,13 +1,13 @@
-<body class="admin">
+[% USE HTML %]<body class="admin">
 
-  <h2><TMPL_VAR title></h2>
+  <h2>[% title %]</h2>
 
   <form method="post" action="admin.pl">
 
    <table>
     <tr>
      <th valign="top" align="right" nowrap><translate>Existing Datasets</translate></th>
-     <td valign="top"><TMPL_VAR dbsources ESCAPE=HTML></td>
+     <td valign="top">[% HTML.escape(dbsources) %]</td>
     </tr>
 
     <tr>
@@ -19,7 +19,7 @@
      <th align="right" nowrap><translate>Multibyte Encoding</translate></th>
      <td>
       <select name="encoding">
-       <TMPL_LOOP DBENCODINGS><option value="<TMPL_VAR dbencoding ESCAPE=HTML>" <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR label ESCAPE=HTML></option></TMPL_LOOP>
+       [% FOREACH row = DBENCODINGS %]<option value="[% HTML.escape(row.dbencoding) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
       </select>
      </td>
     </tr>
@@ -28,22 +28,22 @@
      <th valign="top" align="right" nowrap><translate>Create Chart of Accounts</translate></th>
      <td>
       <select name="chart">
-       <TMPL_LOOP CHARTS><option <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR name ESCAPE=HTML></option></TMPL_LOOP>
+       [% FOREACH row = CHARTS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>[% END %]
       </select>
      </td>
     </tr>
 
    </table>
 
-   <input type="hidden" name="dbdriver"  value="<TMPL_VAR dbdriver ESCAPE=HTML>">
-   <input type="hidden" name="dbuser"    value="<TMPL_VAR dbuser ESCAPE=HTML>">
-   <input type="hidden" name="dbhost"    value="<TMPL_VAR dbhost ESCAPE=HTML>">
-   <input type="hidden" name="dbport"    value="<TMPL_VAR dbport ESCAPE=HTML>">
-   <input type="hidden" name="dbpasswd"  value="<TMPL_VAR dbpasswd ESCAPE=HTML>">
-   <input type="hidden" name="dbdefault" value="<TMPL_VAR dbdefault ESCAPE=HTML>">
+   <input type="hidden" name="dbdriver"  value="[% HTML.escape(dbdriver) %]">
+   <input type="hidden" name="dbuser"    value="[% HTML.escape(dbuser) %]">
+   <input type="hidden" name="dbhost"    value="[% HTML.escape(dbhost) %]">
+   <input type="hidden" name="dbport"    value="[% HTML.escape(dbport) %]">
+   <input type="hidden" name="dbpasswd"  value="[% HTML.escape(dbpasswd) %]">
+   <input type="hidden" name="dbdefault" value="[% HTML.escape(dbdefault) %]">
 
-   <input type="hidden" name="callback" value="admin.pl?action=list_users&rpw=<TMPL_VAR rpw ESCAPE=URL>">
-   <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+   <input type="hidden" name="callback" value="admin.pl?action=list_users&rpw=[% HTML.url(rpw) %]">
+   <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
 
    <input type="hidden" name="nextsub" value="dbcreate">
 

diff --git a/templates/webpages/admin/dbadmin_de.html b/templates/webpages/admin/dbadmin_de.html
index 615c74e..94796d7 100644 (file)
--- a/templates/webpages/admin/dbadmin_de.html
+++ b/templates/webpages/admin/dbadmin_de.html
@@ -1,6 +1,6 @@
-<body class="admin">
+[% USE HTML %]<body class="admin">
 
-  <h2><TMPL_VAR title></h2>
+  <h2>[% title %]</h2>
 
   <form method="post" action="admin.pl">
 
@@ -10,7 +10,7 @@
 
       <table>
 
-       <input type="hidden" name="dbdriver" value="<TMPL_VAR dbdriver ESCAPE=HTML>">
+       <input type="hidden" name="dbdriver" value="[% HTML.escape(dbdriver) %]">
 
        <tr>
         <td>
@@ -19,16 +19,16 @@
           <tr>
 
            <th align="right">Datenbankcomputer</th>
-           <td><input name="dbhost" size="25" value="<TMPL_VAR dbhost ESCAPE=HTML>"></td>
+           <td><input name="dbhost" size="25" value="[% HTML.escape(dbhost) %]"></td>
            <th align="right">Port</th>
-           <td><input name="dbport" size="5" value="<TMPL_VAR dbport ESCAPE=HTML>"></td>
+           <td><input name="dbport" size="5" value="[% HTML.escape(dbport) %]"></td>
 
           </tr>
 
           <tr>
 
            <th align="right">Benutzer</th>
-           <td><input name="dbuser" size="10" value="<TMPL_VAR dbuser ESCAPE=HTML>"></td>
+           <td><input name="dbuser" size="10" value="[% HTML.escape(dbuser) %]"></td>
            <th align="right">Passwort</th>
            <td><input type="password" name="dbpasswd" size="10"></td>
 
@@ -37,7 +37,7 @@
           <tr>
 
            <th align="right">Datenbankvorlage</th>
-           <td colspan="3"><input name="dbdefault" size="10" value="<TMPL_VAR dbdefault ESCAPE=HTML>"></td>
+           <td colspan="3"><input name="dbdefault" size="10" value="[% HTML.escape(dbdefault) %]"></td>
 
           </tr>
 
@@ -47,18 +47,18 @@
        </tr>
       </table>
 
-      <input name="callback" type="hidden" value="admin.pl?action=list_users&rpw=<TMPL_VAR rpw ESCAPE=URL>">
-      <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+      <input name="callback" type="hidden" value="admin.pl?action=list_users&rpw=[% HTML.url(rpw) %]">
+      <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
 
       <br>
 
       <input type="submit" class="submit" name="action" value="Datenbank anlegen">
       <input type="submit" class="submit" name="action" value="Datenbank aktualisieren">
       <input type="submit" class="submit" name="action" value="Datenbank löschen">
-      <TMPL_IF ALLOW_DBBACKUP>
+      [% IF ALLOW_DBBACKUP %]
        <input type="submit" class="submit" name="action" value="Datenbank sichern">
        <input type="submit" class="submit" name="action" value="Datenbank wiederherstellen">
-      </TMPL_IF>
+      [% END %]
      </td>
     </tr>
    </table>

diff --git a/templates/webpages/admin/dbadmin_master.html b/templates/webpages/admin/dbadmin_master.html
index 2123f80..a1306f0 100644 (file)
--- a/templates/webpages/admin/dbadmin_master.html
+++ b/templates/webpages/admin/dbadmin_master.html
@@ -1,6 +1,6 @@
-<body class="admin">
+[% USE HTML %]<body class="admin">
 
-  <h2><TMPL_VAR title></h2>
+  <h2>[% title %]</h2>
 
   <form method="post" action="admin.pl">
 
@@ -10,7 +10,7 @@
 
       <table>
 
-       <input type="hidden" name="dbdriver" value="<TMPL_VAR dbdriver ESCAPE=HTML>">
+       <input type="hidden" name="dbdriver" value="[% HTML.escape(dbdriver) %]">
 
        <tr>
         <td>
@@ -19,16 +19,16 @@
           <tr>
 
            <th align="right"><translate>Host</translate></th>
-           <td><input name="dbhost" size="25" value="<TMPL_VAR dbhost ESCAPE=HTML>"></td>
+           <td><input name="dbhost" size="25" value="[% HTML.escape(dbhost) %]"></td>
            <th align="right"><translate>Port</translate></th>
-           <td><input name="dbport" size="5" value="<TMPL_VAR dbport ESCAPE=HTML>"></td>
+           <td><input name="dbport" size="5" value="[% HTML.escape(dbport) %]"></td>
 
           </tr>
 
           <tr>
 
            <th align="right"><translate>User</translate></th>
-           <td><input name="dbuser" size="10" value="<TMPL_VAR dbuser ESCAPE=HTML>"></td>
+           <td><input name="dbuser" size="10" value="[% HTML.escape(dbuser) %]"></td>
            <th align="right"><translate>Password</translate></th>
            <td><input type="password" name="dbpasswd" size="10"></td>
 
@@ -37,7 +37,7 @@
           <tr>
 
            <th align="right"><translate>Database template</translate></th>
-           <td colspan="3"><input name="dbdefault" size="10" value="<TMPL_VAR dbdefault ESCAPE=HTML>"></td>
+           <td colspan="3"><input name="dbdefault" size="10" value="[% HTML.escape(dbdefault) %]"></td>
 
           </tr>
 
@@ -47,18 +47,18 @@
        </tr>
       </table>
 
-      <input name="callback" type="hidden" value="admin.pl?action=list_users&rpw=<TMPL_VAR rpw ESCAPE=URL>">
-      <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+      <input name="callback" type="hidden" value="admin.pl?action=list_users&rpw=[% HTML.url(rpw) %]">
+      <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
 
       <br>
 
       <input type="submit" class="submit" name="action" value="<translate>Create Dataset</translate>">
       <input type="submit" class="submit" name="action" value="<translate>Update Dataset</translate>">
       <input type="submit" class="submit" name="action" value="<translate>Delete Dataset</translate>">
-      <TMPL_IF ALLOW_DBBACKUP>
+      [% IF ALLOW_DBBACKUP %]
        <input type="submit" class="submit" name="action" value="<translate>Backup Dataset</translate>">
        <input type="submit" class="submit" name="action" value="<translate>Restore Dataset</translate>">
-      </TMPL_IF>
+      [% END %]
      </td>
     </tr>
    </table>

diff --git a/templates/webpages/admin/dbcreate_de.html b/templates/webpages/admin/dbcreate_de.html
index 472c421..ab62b1b 100644 (file)
--- a/templates/webpages/admin/dbcreate_de.html
+++ b/templates/webpages/admin/dbcreate_de.html
@@ -1,12 +1,12 @@
-<body class="admin">
+[% USE HTML %]<body class="admin">
 
-  <h2><TMPL_VAR title></h2>
+  <h2>[% title %]</h2>
 
   <form method="post" action="admin.pl">
 
-   <p>Die Datenbank <TMPL_VAR db ESCAPE=HTML> wurde erfolgreich erstellt.</p>
+   <p>Die Datenbank [% HTML.escape(db) %] wurde erfolgreich angelegt.</p>
 
-   <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+   <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
    <input type="hidden" name="nextsub" value="list_users">
 
    <p><input type="submit" class="submit" name="action" value="Weiter"></p>

diff --git a/templates/webpages/admin/dbcreate_master.html b/templates/webpages/admin/dbcreate_master.html
index 6e3947c..a5894b4 100644 (file)
--- a/templates/webpages/admin/dbcreate_master.html
+++ b/templates/webpages/admin/dbcreate_master.html
@@ -1,12 +1,12 @@
-<body class="admin">
+[% USE HTML %]<body class="admin">
 
-  <h2><TMPL_VAR title></h2>
+  <h2>[% title %]</h2>
 
   <form method="post" action="admin.pl">
 
-   <p><translate>The dataset <TMPL_VAR db ESCAPE=HTML> has been successfully created.</translate></p>
+   <p><translate>The dataset [% HTML.escape(db) %] has been successfully created.</translate></p>
 
-   <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+   <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
    <input type="hidden" name="nextsub" value="list_users">
 
    <p><input type="submit" class="submit" name="action" value="<translate>Continue</translate>"></p>

diff --git a/templates/webpages/admin/dbdelete_de.html b/templates/webpages/admin/dbdelete_de.html
index 0e89223..d827356 100644 (file)
--- a/templates/webpages/admin/dbdelete_de.html
+++ b/templates/webpages/admin/dbdelete_de.html
@@ -1,12 +1,12 @@
-<body class="admin">
+[% USE HTML %]<body class="admin">
 
-  <h2><TMPL_VAR title></h2>
+  <h2>[% title %]</h2>
 
   <form method="post" action="admin.pl">
 
-   <p>Die Datenbank <TMPL_VAR db ESCAPE=HTML> wurde erfolgreich gel&ouml;scht.</p>
+   <p>Die Datenbank [% HTML.escape(db) %] wurde erfolgreich gel&ouml;scht.</p>
 
-   <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+   <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
    <input type="hidden" name="nextsub" value="list_users">
 
    <p><input type="submit" class="submit" name="action" value="Weiter"></p>

diff --git a/templates/webpages/admin/dbdelete_master.html b/templates/webpages/admin/dbdelete_master.html
index cf69c42..2c8d485 100644 (file)
--- a/templates/webpages/admin/dbdelete_master.html
+++ b/templates/webpages/admin/dbdelete_master.html
@@ -1,12 +1,12 @@
-<body class="admin">
+[% USE HTML %]<body class="admin">
 
-  <h2><TMPL_VAR title></h2>
+  <h2>[% title %]</h2>
 
   <form method="post" action="admin.pl">
 
-   <p><translate>The database <TMPL_VAR db ESCAPE=HTML> has been successfully deleted.</translate></p>
+   <p><translate>The database [% HTML.escape(db) %] has been successfully deleted.</translate></p>
 
-   <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+   <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
    <input type="hidden" name="nextsub" value="list_users">
 
    <p><input type="submit" class="submit" name="action" value="<translate>Continue</translate>"></p>

diff --git a/templates/webpages/admin/dbupgrade_all_done_de.html b/templates/webpages/admin/dbupgrade_all_done_de.html
index d89f889..d65ee3d 100644 (file)
--- a/templates/webpages/admin/dbupgrade_all_done_de.html
+++ b/templates/webpages/admin/dbupgrade_all_done_de.html
@@ -1,16 +1,17 @@
-<TMPL_IF NOTHING_TO_DO>
+[% USE HTML%]
+[% IF NOTHING_TO_DO %]
  <p>Es wurden keine Datenbanken ausgew&auml;hlt.</p>
 
- <TMPL_ELSE>
+ [% ELSE %]
 
  <hr>
 
  <p>Alle Datenbankupdates wurden eingespielt.</p>
-</TMPL_IF>
+[% END %]
 
 <form method="post" action="admin.pl">
  <input type="hidden" name="nextsub" value="list_users">
- <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+ <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
 
  <input type="submit" name="action" value="Weiter">
 </form>

diff --git a/templates/webpages/admin/dbupgrade_all_done_master.html b/templates/webpages/admin/dbupgrade_all_done_master.html
index 0b71277..c9a5a1b 100644 (file)
--- a/templates/webpages/admin/dbupgrade_all_done_master.html
+++ b/templates/webpages/admin/dbupgrade_all_done_master.html
@@ -1,16 +1,17 @@
-<TMPL_IF NOTHING_TO_DO>
+[% USE HTML%]
+[% IF NOTHING_TO_DO %]
  <p><translate>No datasets have been selected.</translate></p>
 
- <TMPL_ELSE>
+ [% ELSE %]
 
  <hr>
 
  <p><translate>All database upgrades have been applied.</translate></p>
-</TMPL_IF>
+[% END %]
 
 <form method="post" action="admin.pl">
  <input type="hidden" name="nextsub" value="list_users">
- <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+ <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
 
  <input type="submit" name="action" value="<translate>Continue</translate>">
 </form>

diff --git a/templates/webpages/admin/dbupgrade_header_de.html b/templates/webpages/admin/dbupgrade_header_de.html
index dff3423..8408cf9 100644 (file)
--- a/templates/webpages/admin/dbupgrade_header_de.html
+++ b/templates/webpages/admin/dbupgrade_header_de.html
@@ -1 +1 @@
-<div class="listtop" width="100%">Datenbankaktualisierung (<TMPL_VAR dbname ESCAPE=HTML>)</div>
+[% USE HTML %]<div class="listtop" width="100%">Datenbankaktualisierung ([% HTML.escape(dbname) %])</div>

diff --git a/templates/webpages/admin/dbupgrade_header_master.html b/templates/webpages/admin/dbupgrade_header_master.html
index b25c7bd..a5a27b6 100644 (file)
--- a/templates/webpages/admin/dbupgrade_header_master.html
+++ b/templates/webpages/admin/dbupgrade_header_master.html
@@ -1 +1 @@
-<div class="listtop" width="100%"><translate>Dataset upgrade</translate> (<TMPL_VAR dbname ESCAPE=HTML>)</div>
+[% USE HTML %]<div class="listtop" width="100%"><translate>Dataset upgrade</translate> ([% HTML.escape(dbname) %])</div>

diff --git a/templates/webpages/admin/delete_dataset_de.html b/templates/webpages/admin/delete_dataset_de.html
index 50c3fc9..696d0cc 100644 (file)
--- a/templates/webpages/admin/delete_dataset_de.html
+++ b/templates/webpages/admin/delete_dataset_de.html
@@ -1,6 +1,6 @@
-<body class="admin">
+[% USE HTML %]<body class="admin">
 
- <h2><TMPL_VAR title></h2>
+ <h2>[% title %]</h2>
 
  <form method="post" action="admin.pl">
 
@@ -8,19 +8,19 @@
    Wenn Sie eine solche Datenbank l&ouml;schen wollen, so m&uuml;ssen Sie zuerst die Benutzer bearbeiten, die die fragliche Datenbank benutzen, und sie so &auml;ndern, dass sie eine andere Datenbank benutzen.</p>
 
   <p>Bitte w&auml;hlen Sie die zu l&ouml;schende Datenbank aus:
-   <select name="db"><TMPL_LOOP DBSOURCES><option><TMPL_VAR name ESCAPE=HTML></option></TMPL_LOOP></select>
+   <select name="db">[% FOREACH row = DBSOURCES %]<option>[% HTML.escape(row.name) %]</option>[% END %]</select>
   </p>
 
-  <input type="hidden" name="dbdriver"  value="<TMPL_VAR dbdriver ESCAPE=HTML>">
-  <input type="hidden" name="dbuser"    value="<TMPL_VAR dbuser ESCAPE=HTML>">
-  <input type="hidden" name="dbhost"    value="<TMPL_VAR dbhost ESCAPE=HTML>">
-  <input type="hidden" name="dbport"    value="<TMPL_VAR dbport ESCAPE=HTML>">
-  <input type="hidden" name="dbpasswd"  value="<TMPL_VAR dbpasswd ESCAPE=HTML>">
-  <input type="hidden" name="dbdefault" value="<TMPL_VAR dbdefault ESCAPE=HTML>">
+  <input type="hidden" name="dbdriver"  value="[% HTML.escape(dbdriver) %]">
+  <input type="hidden" name="dbuser"    value="[% HTML.escape(dbuser) %]">
+  <input type="hidden" name="dbhost"    value="[% HTML.escape(dbhost) %]">
+  <input type="hidden" name="dbport"    value="[% HTML.escape(dbport) %]">
+  <input type="hidden" name="dbpasswd"  value="[% HTML.escape(dbpasswd) %]">
+  <input type="hidden" name="dbdefault" value="[% HTML.escape(dbdefault) %]">
 
-  <input name="callback" type="hidden" value="admin.pl?action=list_users&rpw=<TMPL_VAR rpw ESCAPE=URL>">
+  <input name="callback" type="hidden" value="admin.pl?action=list_users&rpw=[% HTML.url(rpw) %]">
 
-  <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+  <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
 
   <input type="hidden" name="nextsub" value="dbdelete">
 

diff --git a/templates/webpages/admin/delete_dataset_master.html b/templates/webpages/admin/delete_dataset_master.html
index bc79148..afb4b88 100644 (file)
--- a/templates/webpages/admin/delete_dataset_master.html
+++ b/templates/webpages/admin/delete_dataset_master.html
@@ -1,6 +1,6 @@
-<body class="admin">
+[% USE HTML %]<body class="admin">
 
- <h2><TMPL_VAR title></h2>
+ <h2>[% title %]</h2>
 
  <form method="post" action="admin.pl">
 
@@ -11,19 +11,19 @@
     use another dataset.</translate></p>
 
   <p><translate>Please seletct the dataset you want to delete:</translate>
-   <select name="db"><TMPL_LOOP DBSOURCES><option><TMPL_VAR name ESCAPE=HTML></option></TMPL_LOOP></select>
+   <select name="db">[% FOREACH row = DBSOURCES %]<option>[% HTML.escape(row.name) %]</option>[% END %]</select>
   </p>
 
-  <input type="hidden" name="dbdriver"  value="<TMPL_VAR dbdriver ESCAPE=HTML>">
-  <input type="hidden" name="dbuser"    value="<TMPL_VAR dbuser ESCAPE=HTML>">
-  <input type="hidden" name="dbhost"    value="<TMPL_VAR dbhost ESCAPE=HTML>">
-  <input type="hidden" name="dbport"    value="<TMPL_VAR dbport ESCAPE=HTML>">
-  <input type="hidden" name="dbpasswd"  value="<TMPL_VAR dbpasswd ESCAPE=HTML>">
-  <input type="hidden" name="dbdefault" value="<TMPL_VAR dbdefault ESCAPE=HTML>">
+  <input type="hidden" name="dbdriver"  value="[% HTML.escape(dbdriver) %]">
+  <input type="hidden" name="dbuser"    value="[% HTML.escape(dbuser) %]">
+  <input type="hidden" name="dbhost"    value="[% HTML.escape(dbhost) %]">
+  <input type="hidden" name="dbport"    value="[% HTML.escape(dbport) %]">
+  <input type="hidden" name="dbpasswd"  value="[% HTML.escape(dbpasswd) %]">
+  <input type="hidden" name="dbdefault" value="[% HTML.escape(dbdefault) %]">
 
-  <input name="callback" type="hidden" value="admin.pl?action=list_users&rpw=<TMPL_VAR rpw ESCAPE=URL>">
+  <input name="callback" type="hidden" value="admin.pl?action=list_users&rpw=[% HTML.url(rpw) %]">
 
-  <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+  <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
 
   <input type="hidden" name="nextsub" value="dbdelete">
 

diff --git a/templates/webpages/admin/edit_user_de.html b/templates/webpages/admin/edit_user_de.html
index 01dd480..e1a0fcc 100644 (file)
--- a/templates/webpages/admin/edit_user_de.html
+++ b/templates/webpages/admin/edit_user_de.html
@@ -1,8 +1,8 @@
-<body class="admin">
+[% USE HTML %]<body class="admin">
 
  <form method="post" action="admin.pl">
 
-  <div class="listtop" width="100%"><TMPL_VAR title></div>
+  <div class="listtop" width="100%">[% title %]</div>
 
   <table width="100%">
    <tr valign="top">
@@ -10,63 +10,63 @@
      <table>
       <tr>
        <th align="right">Anmeldung</th>
-       <td><input name="login" value="<TMPL_VAR myc_login ESCAPE=HTML>"></td>
+       <td><input name="login" value="[% HTML.escape(myc_login) %]"></td>
       </tr>
 
       <tr>
        <th align="right">Passwort</th>
-       <td><input type="password" name="password" size="8" value="<TMPL_VAR myc_password ESCAPE=HTML>"></td>
-       <input type="hidden" name="old_password" value="<TMPL_VAR myc_password ESCAPE=HTML>">
+       <td><input type="password" name="password" size="8" value="[% HTML.escape(myc_password) %]"></td>
+       <input type="hidden" name="old_password" value="[% HTML.escape(myc_password) %]">
       </tr>
 
       <tr>
        <th align="right">Name</th>
-       <td><input name="name" size="15" value="<TMPL_VAR myc_name ESCAPE=HTML>"></td>
+       <td><input name="name" size="15" value="[% HTML.escape(myc_name) %]"></td>
       </tr>
 
       <tr>
        <th align="right">eMail</th>
-       <td><input name="email" size="30" value="<TMPL_VAR myc_email ESCAPE=HTML>"></td>
+       <td><input name="email" size="30" value="[% HTML.escape(myc_email) %]"></td>
       </tr>
 
       <tr valign="top">
        <th align="right">Unterschrift</th>
-       <td><textarea name="signature" rows="3" cols="35"><TMPL_VAR myc_signature ESCAPE=HTML></textarea></td>
+       <td><textarea name="signature" rows="3" cols="35">[% HTML.escape(myc_signature) %]</textarea></td>
       </tr>
 
       <tr>
        <th align="right">Telefon</th>
-       <td><input name="tel" size="14" value="<TMPL_VAR myc_tel ESCAPE=HTML>"></td>
+       <td><input name="tel" size="14" value="[% HTML.escape(myc_tel) %]"></td>
       </tr>
 
       <tr>
        <th align="right">Fax</th>
-       <td><input name="fax" size="14" value="<TMPL_VAR myc_fax ESCAPE=HTML>"></td>
+       <td><input name="fax" size="14" value="[% HTML.escape(myc_fax) %]"></td>
       </tr>
 
       <tr>
        <th align="right">Firma</th>
-       <td><input name="company" size="35" value="<TMPL_VAR myc_company ESCAPE=HTML>"></td>
+       <td><input name="company" size="35" value="[% HTML.escape(myc_company) %]"></td>
       </tr>
 
       <tr valign="top">
        <th align="right">Adresse</th>
-       <td><textarea name="address" rows="4" cols="35"><TMPL_VAR myc_address ESCAPE=HTML></textarea></td>
+       <td><textarea name="address" rows="4" cols="35">[% HTML.escape(myc_address) %]</textarea></td>
       </tr>
 
       <tr valign="top">
        <th align="right">Steuernummer</th>
-       <td><input name="taxnumber" size="14" value="<TMPL_VAR myc_taxnumber ESCAPE=HTML>"></td>
+       <td><input name="taxnumber" size="14" value="[% HTML.escape(myc_taxnumber) %]"></td>
       </tr>
 
       <tr valign="top">
        <th align="right">USt-IdNr.</th>
-       <td><input name="co_ustid" size="14" value="<TMPL_VAR myc_co_ustid ESCAPE=HTML>"></td>
+       <td><input name="co_ustid" size="14" value="[% HTML.escape(myc_co_ustid) %]"></td>
       </tr>
 
       <tr valign="top">
        <th align="right">DUNS-Nr.</th>
-       <td><input name="duns" size="14" value="<TMPL_VAR myc_duns ESCAPE=HTML>"></td>
+       <td><input name="duns" size="14" value="[% HTML.escape(myc_duns) %]"></td>
       </tr>
      </table>
     </td>
@@ -77,8 +77,8 @@
        <th align="right">Datumsformat</th>
        <td>
         <select name="dateformat">
-         <TMPL_LOOP ALL_DATEFORMATS><option <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR format ESCAPE=HTML></option>
-         </TMPL_LOOP>
+         [% FOREACH row = ALL_DATEFORMATS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.format) %]</option>
+         [% END %]
         </select>
        </td>
       </tr>
@@ -87,23 +87,23 @@
        <th align="right">Zahlenformat</th>
        <td>
         <select name="numberformat">
-         <TMPL_LOOP ALL_NUMBERFORMATS><option <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR format ESCAPE=HTML></option>
-         </TMPL_LOOP>
+         [% FOREACH row = ALL_NUMBERFORMATS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.format) %]</option>
+         [% END %]
         </select>
        </td>
       </tr>
 
       <tr>
        <th align="right">Auswahllistenbegrenzung</th>
-       <td><input name="vclimit" value="<TMPL_VAR myc_vclimit ESCAPE=HTML>"></td>
+       <td><input name="vclimit" value="[% HTML.escape(myc_vclimit) %]"></td>
       </tr>
 
       <tr>
        <th align="right">Sprache</th>
        <td>
         <select name="countrycode">
-         <TMPL_LOOP ALL_COUNTRYCODES><option value="<TMPL_VAR value ESCAPE=HTML>" <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR name ESCAPE=HTML></option>
-         </TMPL_LOOP>
+         [% FOREACH row = ALL_COUNTRYCODES %]<option value="[% HTML.escape(row.value) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
+         [% END %]
         </select>
        </td>
       </tr>
@@ -112,22 +112,22 @@
        <th align="right">Stilvorlage</th>
        <td>
         <select name="userstylesheet">
-         <TMPL_LOOP ALL_STYLESHEETS><option <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR name ESCAPE=HTML></option>
-         </TMPL_LOOP>
+         [% FOREACH row = ALL_STYLESHEETS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
+         [% END %]
         </select>
        </td>
       </tr>
 
       <tr>
        <th align="right">Drucker</th>
-       <td><input name="printer" size="20" value="<TMPL_VAR myc_printer ESCAPE=HTML>"></td>
+       <td><input name="printer" size="20" value="[% HTML.escape(myc_printer) %]"></td>
       </tr>
       <tr>
        <th align="right">benutze Vorlagen</th>
        <td>
         <select name="usetemplates">
-         <TMPL_LOOP ALL_TEMPLATES><option <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR name ESCAPE=HTML></option>
-         </TMPL_LOOP>
+         [% FOREACH row = ALL_TEMPLATES %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
+         [% END %]
         </select>
        </td>
       </tr>
@@ -139,21 +139,21 @@
        <th align="right">Vorlagen auswählen</th>
        <td>
         <select name="mastertemplates">
-         <TMPL_LOOP ALL_MASTER_TEMPLATES><option <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR name ESCAPE=HTML></option>
-         </TMPL_LOOP>
+         [% FOREACH row = ALL_MASTER_TEMPLATES %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
+         [% END %]
         </select>
        </td>
       </tr>
       <tr>
        <th align="right">Menüsetup</th>
        <td>
-        <input name="menustyle" type="radio" class="radio" value="v3" <TMPL_IF menustyle_v3>checked</TMPL_IF>>&nbsp;Oben (mit CSS)
-        <input name="menustyle" type="radio" class="radio" value="neu" <TMPL_IF menustyle_neu>checked</TMPL_IF>>&nbsp;Oben (mit Javascript)
-        <input name="menustyle" type="radio" class="radio" value="old" <TMPL_IF menustyle_old>checked</TMPL_IF>>&nbsp;Alt (seitlich)
+        <input name="menustyle" type="radio" class="radio" value="v3" [% IF menustyle_v3 %]checked[% END %]>&nbsp;Oben (mit CSS)
+        <input name="menustyle" type="radio" class="radio" value="neu" [% IF menustyle_neu %]checked[% END %]>&nbsp;Oben (mit Javascript)
+        <input name="menustyle" type="radio" class="radio" value="old" [% IF menustyle_old %]checked[% END %]>&nbsp;Alt (seitlich)
        </td>
       </tr>
 
-      <input type="hidden" name="templates" value="<TMPL_VAR myc_templates ESCAPE=HTML>">
+      <input type="hidden" name="templates" value="[% HTML.escape(myc_templates) %]">
      </table>
     </td>
    </tr>
@@ -169,24 +169,24 @@
        <th align="right">Treiber</th>
        <td>PostgreSQL</td>
        <th align="right">Datenbankcomputer</th>
-       <td><input name="dbhost" size="30" value="<TMPL_VAR myc_dbhost ESCAPE=HTML>"></td>
+       <td><input name="dbhost" size="30" value="[% HTML.escape(myc_dbhost) %]"></td>
       </tr>
 
       <tr>
        <th align="right">Datenbank</th>
-       <td><input name="dbname" size="15" value="<TMPL_VAR myc_dbname ESCAPE=HTML>"></td>
+       <td><input name="dbname" size="15" value="[% HTML.escape(myc_dbname) %]"></td>
        <th align="right">Port</th>
-       <td><input name="dbport" size="4" value="<TMPL_VAR myc_dbport ESCAPE=HTML>"></td>
+       <td><input name="dbport" size="4" value="[% HTML.escape(myc_dbport) %]"></td>
       </tr>
 
       <tr>
        <th align="right">Benutzer</th>
-       <td><input name="dbuser" size="15" value="<TMPL_VAR myc_dbuser ESCAPE=HTML>"></td>
+       <td><input name="dbuser" size="15" value="[% HTML.escape(myc_dbuser) %]"></td>
        <th align="right">Passwort</th>
-       <td><input name="dbpasswd" type="password" size="10" value="<TMPL_VAR myc_dbpasswd ESCAPE=HTML>"></td>
+       <td><input name="dbpasswd" type="password" size="10" value="[% HTML.escape(myc_dbpasswd) %]"></td>
       </tr>
 
-      <input type="hidden" name="old_dbpasswd" value="<TMPL_VAR myc_dbpasswd ESCAPE=HTML>">
+      <input type="hidden" name="old_dbpasswd" value="[% HTML.escape(myc_dbpasswd) %]">
      </table>
     </td>
    </tr>
@@ -197,24 +197,24 @@
 
    <tr class="listheading"><th colspan="2">Zugriffkontrolle</th></tr>
 
-   <TMPL_LOOP ACLS>
+   [% FOREACH acl = ACLS %]
     <tr>
      <td valign="top">
-      <input type="checkbox" name="ACS_<TMPL_VAR name ESCAPE=HTML>" id="ACS_<TMPL_VAR name ESCAPE=HTML>" value="1" <TMPL_IF checked>checked</TMPL_IF>>
-      <label for="ACS_<TMPL_VAR name ESCAPE=HTML>"><TMPL_VAR title ESCAPE=HTML></label>
+      <input type="checkbox" name="ACS_[% HTML.escape(acl.name) %]" id="ACS_[% HTML.escape(acl.name) %]" value="1" [% IF acl.checked %]checked[% END %]>
+      <label for="ACS_[% HTML.escape(acl.name) %]">[% HTML.escape(acl.title) %]</label>
      </td>
 
      <td valign="top">
-      <TMPL_LOOP SUBACLS>
-       <input type="checkbox" name="ACS_<TMPL_VAR name ESCAPE=HTML>" id="ACS_<TMPL_VAR name ESCAPE=HTML>" value="1" <TMPL_IF checked>checked</TMPL_IF>>
-       <label for="ACS_<TMPL_VAR name ESCAPE=HTML>"><TMPL_VAR title ESCAPE=HTML></label>
-       <TMPL_UNLESS __last__><br></TMPL_UNLESS>
-      </TMPL_LOOP>
+      [% USE SUBACLS_it = Iterator(acl.SUBACLS) %][% FOREACH subacl = SUBACLS_it %]
+       <input type="checkbox" name="ACS_[% HTML.escape(subacl.name) %]" id="ACS_[% HTML.escape(subacl.name) %]" value="1" [% IF subacl.checked %]checked[% END %]>
+       <label for="ACS_[% HTML.escape(subacl.name) %]">[% HTML.escape(subacl.title) %]</label>
+       [% UNLESS SUBACLS_it.last %]<br>[% END %]
+      [% END %]
      </td>
     </tr>
-   </TMPL_LOOP>
+   [% END %]
 
-   <input type="hidden" name="all_acs" value="<TMPL_VAR all_acs ESCAPE=HTML>">
+   <input type="hidden" name="all_acs" value="[% HTML.escape(all_acs) %]">
 
    <tr><td colspan="2"><hr size="3" noshade></td></tr>
 
@@ -226,15 +226,15 @@
     <td colspan="2">
      <table>
       <tr>
-       <td><input name="angebote" class="checkbox" type="checkbox" value="1" <TMPL_IF myc_angebote>checked</TMPL_IF>>&nbsp;Angebot</td>
-       <td><input name="bestellungen" class="checkbox" type="checkbox" value="1" <TMPL_IF myc_bestellungen>checked</TMPL_IF>>&nbsp;Bestellung</td>
-       <td><input name="rechnungen" class="checkbox" type="checkbox" value="1" <TMPL_IF myc_rechnung>checked</TMPL_IF>>&nbsp;Rechnung</td>
+       <td><input name="angebote" class="checkbox" type="checkbox" value="1" [% IF myc_angebote %]checked[% END %]>&nbsp;Angebot</td>
+       <td><input name="bestellungen" class="checkbox" type="checkbox" value="1" [% IF myc_bestellungen %]checked[% END %]>&nbsp;Bestellung</td>
+       <td><input name="rechnungen" class="checkbox" type="checkbox" value="1" [% IF myc_rechnung %]checked[% END %]>&nbsp;Rechnung</td>
       </tr>
 
       <tr>
-       <td><input name="anfragen" class="checkbox" type="checkbox" value="1" <TMPL_IF myc_anfragen>checked</TMPL_IF>>&nbsp;Anfragen</td>
-       <td><input name="lieferantenbestellungen" class="checkbox" type="checkbox" value="1" <TMPL_IF myc_lieferantenbestellungen>checked</TMPL_IF>>&nbsp;Lieferantenbestellung</td>
-       <td><input name="einkaufsrechnungen" class="checkbox" type="checkbox" value="1" <TMPL_IF myc_einkaufsrechnungen>checked</TMPL_IF>>&nbsp;Einkaufsrechnung</td>
+       <td><input name="anfragen" class="checkbox" type="checkbox" value="1" [% IF myc_anfragen %]checked[% END %]>&nbsp;Anfragen</td>
+       <td><input name="lieferantenbestellungen" class="checkbox" type="checkbox" value="1" [% IF myc_lieferantenbestellungen %]checked[% END %]>&nbsp;Lieferantenbestellung</td>
+       <td><input name="einkaufsrechnungen" class="checkbox" type="checkbox" value="1" [% IF myc_einkaufsrechnungen %]checked[% END %]>&nbsp;Einkaufsrechnung</td>
       </tr>
      </table>
     </td>
@@ -244,15 +244,15 @@
 
   </table>
 
-  <input name="callback" type="hidden" value="admin.pl?action=list_users&rpw=<TMPL_VAR rpw ESCAPE=URL>">
-  <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+  <input name="callback" type="hidden" value="admin.pl?action=list_users&rpw=[% HTML.url(rpw) %]">
+  <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
 
   <input type="submit" class="submit" name="action" value="Speichern">
 
-  <TMPL_IF edit>
+  [% IF edit %]
    <input type="submit" class="submit" name="action" value="Löschen">
    <input type="hidden" name="edit" value="1">
-  </TMPL_IF>
+  [% END %]
 
  </form>
 

diff --git a/templates/webpages/admin/edit_user_master.html b/templates/webpages/admin/edit_user_master.html
index 4b2747f..c5f4809 100644 (file)
--- a/templates/webpages/admin/edit_user_master.html
+++ b/templates/webpages/admin/edit_user_master.html
@@ -1,8 +1,8 @@
-<body class="admin">
+[% USE HTML %]<body class="admin">
 
  <form method="post" action="admin.pl">
 
-  <div class="listtop" width="100%"><TMPL_VAR title></div>
+  <div class="listtop" width="100%">[% title %]</div>
 
   <table width="100%">
    <tr valign="top">
@@ -10,63 +10,63 @@
      <table>
       <tr>
        <th align="right"><translate>Login</translate></th>
-       <td><input name="login" value="<TMPL_VAR myc_login ESCAPE=HTML>"></td>
+       <td><input name="login" value="[% HTML.escape(myc_login) %]"></td>
       </tr>
 
       <tr>
        <th align="right"><translate>Password</translate></th>
-       <td><input type="password" name="password" size="8" value="<TMPL_VAR myc_password ESCAPE=HTML>"></td>
-       <input type="hidden" name="old_password" value="<TMPL_VAR myc_password ESCAPE=HTML>">
+       <td><input type="password" name="password" size="8" value="[% HTML.escape(myc_password) %]"></td>
+       <input type="hidden" name="old_password" value="[% HTML.escape(myc_password) %]">
       </tr>
 
       <tr>
        <th align="right"><translate>Name</translate></th>
-       <td><input name="name" size="15" value="<TMPL_VAR myc_name ESCAPE=HTML>"></td>
+       <td><input name="name" size="15" value="[% HTML.escape(myc_name) %]"></td>
       </tr>
 
       <tr>
        <th align="right"><translate>E-mail</translate></th>
-       <td><input name="email" size="30" value="<TMPL_VAR myc_email ESCAPE=HTML>"></td>
+       <td><input name="email" size="30" value="[% HTML.escape(myc_email) %]"></td>
       </tr>
 
       <tr valign="top">
        <th align="right"><translate>Signature</translate></th>
-       <td><textarea name="signature" rows="3" cols="35"><TMPL_VAR myc_signature ESCAPE=HTML></textarea></td>
+       <td><textarea name="signature" rows="3" cols="35">[% HTML.escape(myc_signature) %]</textarea></td>
       </tr>
 
       <tr>
        <th align="right"><translate>Phone</translate></th>
-       <td><input name="tel" size="14" value="<TMPL_VAR myc_tel ESCAPE=HTML>"></td>
+       <td><input name="tel" size="14" value="[% HTML.escape(myc_tel) %]"></td>
       </tr>
 
       <tr>
        <th align="right"><translate>Fax</translate></th>
-       <td><input name="fax" size="14" value="<TMPL_VAR myc_fax ESCAPE=HTML>"></td>
+       <td><input name="fax" size="14" value="[% HTML.escape(myc_fax) %]"></td>
       </tr>
 
       <tr>
        <th align="right"><translate>Company</translate></th>
-       <td><input name="company" size="35" value="<TMPL_VAR myc_company ESCAPE=HTML>"></td>
+       <td><input name="company" size="35" value="[% HTML.escape(myc_company) %]"></td>
       </tr>
 
       <tr valign="top">
        <th align="right"><translate>Address</translate></th>
-       <td><textarea name="address" rows="4" cols="35"><TMPL_VAR myc_address ESCAPE=HTML></textarea></td>
+       <td><textarea name="address" rows="4" cols="35">[% HTML.escape(myc_address) %]</textarea></td>
       </tr>
 
       <tr valign="top">
        <th align="right"><translate>Tax number</translate></th>
-       <td><input name="taxnumber" size="14" value="<TMPL_VAR myc_taxnumber ESCAPE=HTML>"></td>
+       <td><input name="taxnumber" size="14" value="[% HTML.escape(myc_taxnumber) %]"></td>
       </tr>
 
       <tr valign="top">
        <th align="right"><translate>Ust-IDNr</translate></th>
-       <td><input name="co_ustid" size="14" value="<TMPL_VAR myc_co_ustid ESCAPE=HTML>"></td>
+       <td><input name="co_ustid" size="14" value="[% HTML.escape(myc_co_ustid) %]"></td>
       </tr>
 
       <tr valign="top">
        <th align="right"><translate>DUNS-Nr</translate></th>
-       <td><input name="duns" size="14" value="<TMPL_VAR myc_duns ESCAPE=HTML>"></td>
+       <td><input name="duns" size="14" value="[% HTML.escape(myc_duns) %]"></td>
       </tr>
      </table>
     </td>
@@ -77,8 +77,8 @@
        <th align="right"><translate>Date Format</translate></th>
        <td>
         <select name="dateformat">
-         <TMPL_LOOP ALL_DATEFORMATS><option <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR format ESCAPE=HTML></option>
-         </TMPL_LOOP>
+         [% FOREACH row = ALL_DATEFORMATS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.format) %]</option>
+         [% END %]
         </select>
        </td>
       </tr>
@@ -87,23 +87,23 @@
        <th align="right"><translate>Number Format</translate></th>
        <td>
         <select name="numberformat">
-         <TMPL_LOOP ALL_NUMBERFORMATS><option <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR format ESCAPE=HTML></option>
-         </TMPL_LOOP>
+         [% FOREACH row = ALL_NUMBERFORMATS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.format) %]</option>
+         [% END %]
         </select>
        </td>
       </tr>
 
       <tr>
        <th align="right"><translate>Dropdown Limit</translate></th>
-       <td><input name="vclimit" value="<TMPL_VAR myc_vclimit ESCAPE=HTML>"></td>
+       <td><input name="vclimit" value="[% HTML.escape(myc_vclimit) %]"></td>
       </tr>
 
       <tr>
        <th align="right"><translate>Language</translate></th>
        <td>
         <select name="countrycode">
-         <TMPL_LOOP ALL_COUNTRYCODES><option value="<TMPL_VAR value ESCAPE=HTML>" <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR name ESCAPE=HTML></option>
-         </TMPL_LOOP>
+         [% FOREACH row = ALL_COUNTRYCODES %]<option value="[% HTML.escape(row.value) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
+         [% END %]
         </select>
        </td>
       </tr>
@@ -112,22 +112,22 @@
        <th align="right"><translate>Stylesheet</translate></th>
        <td>
         <select name="userstylesheet">
-         <TMPL_LOOP ALL_STYLESHEETS><option <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR name ESCAPE=HTML></option>
-         </TMPL_LOOP>
+         [% FOREACH row = ALL_STYLESHEETS %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
+         [% END %]
         </select>
        </td>
       </tr>
 
       <tr>
        <th align="right"><translate>Printer</translate></th>
-       <td><input name="printer" size="20" value="<TMPL_VAR myc_printer ESCAPE=HTML>"></td>
+       <td><input name="printer" size="20" value="[% HTML.escape(myc_printer) %]"></td>
       </tr>
       <tr>
        <th align="right"><translate>Use Templates</translate></th>
        <td>
         <select name="usetemplates">
-         <TMPL_LOOP ALL_TEMPLATES><option <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR name ESCAPE=HTML></option>
-         </TMPL_LOOP>
+         [% FOREACH row = ALL_TEMPLATES %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
+         [% END %]
         </select>
        </td>
       </tr>
@@ -139,21 +139,21 @@
        <th align="right"><translate>Setup Templates</translate></th>
        <td>
         <select name="mastertemplates">
-         <TMPL_LOOP ALL_MASTER_TEMPLATES><option <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR name ESCAPE=HTML></option>
-         </TMPL_LOOP>
+         [% FOREACH row = ALL_MASTER_TEMPLATES %]<option [% IF row.selected %]selected[% END %]>[% HTML.escape(row.name) %]</option>
+         [% END %]
         </select>
        </td>
       </tr>
       <tr>
        <th align="right"><translate>Setup Menu</translate></th>
        <td>
-        <input name="menustyle" type="radio" class="radio" value="v3" <TMPL_IF menustyle_v3>checked</TMPL_IF>>&nbsp;<translate>Top (CSS)</translate>
-        <input name="menustyle" type="radio" class="radio" value="neu" <TMPL_IF menustyle_neu>checked</TMPL_IF>>&nbsp;<translate>Top (Javascript)</translate>
-        <input name="menustyle" type="radio" class="radio" value="old" <TMPL_IF menustyle_old>checked</TMPL_IF>>&nbsp;<translate>Old (on the side)</translate>
+        <input name="menustyle" type="radio" class="radio" value="v3" [% IF menustyle_v3 %]checked[% END %]>&nbsp;<translate>Top (CSS)</translate>
+        <input name="menustyle" type="radio" class="radio" value="neu" [% IF menustyle_neu %]checked[% END %]>&nbsp;<translate>Top (Javascript)</translate>
+        <input name="menustyle" type="radio" class="radio" value="old" [% IF menustyle_old %]checked[% END %]>&nbsp;<translate>Old (on the side)</translate>
        </td>
       </tr>
 
-      <input type="hidden" name="templates" value="<TMPL_VAR myc_templates ESCAPE=HTML>">
+      <input type="hidden" name="templates" value="[% HTML.escape(myc_templates) %]">
      </table>
     </td>
    </tr>
@@ -169,24 +169,24 @@
        <th align="right"><translate>Driver</translate></th>
        <td>PostgreSQL</td>
        <th align="right"><translate>Host</translate></th>
-       <td><input name="dbhost" size="30" value="<TMPL_VAR myc_dbhost ESCAPE=HTML>"></td>
+       <td><input name="dbhost" size="30" value="[% HTML.escape(myc_dbhost) %]"></td>
       </tr>
 
       <tr>
        <th align="right"><translate>Dataset</translate></th>
-       <td><input name="dbname" size="15" value="<TMPL_VAR myc_dbname ESCAPE=HTML>"></td>
+       <td><input name="dbname" size="15" value="[% HTML.escape(myc_dbname) %]"></td>
        <th align="right"><translate>Port</translate></th>
-       <td><input name="dbport" size="4" value="<TMPL_VAR myc_dbport ESCAPE=HTML>"></td>
+       <td><input name="dbport" size="4" value="[% HTML.escape(myc_dbport) %]"></td>
       </tr>
 
       <tr>
        <th align="right"><translate>User</translate></th>
-       <td><input name="dbuser" size="15" value="<TMPL_VAR myc_dbuser ESCAPE=HTML>"></td>
+       <td><input name="dbuser" size="15" value="[% HTML.escape(myc_dbuser) %]"></td>
        <th align="right"><translate>Password</translate></th>
-       <td><input name="dbpasswd" type="password" size="10" value="<TMPL_VAR myc_dbpasswd ESCAPE=HTML>"></td>
+       <td><input name="dbpasswd" type="password" size="10" value="[% HTML.escape(myc_dbpasswd) %]"></td>
       </tr>
 
-      <input type="hidden" name="old_dbpasswd" value="<TMPL_VAR myc_dbpasswd ESCAPE=HTML>">
+      <input type="hidden" name="old_dbpasswd" value="[% HTML.escape(myc_dbpasswd) %]">
      </table>
     </td>
    </tr>
@@ -197,24 +197,24 @@
 
    <tr class="listheading"><th colspan="2"><translate>Access Control</translate></th></tr>
 
-   <TMPL_LOOP ACLS>
+   [% FOREACH acl = ACLS %]
     <tr>
      <td valign="top">
-      <input type="checkbox" name="ACS_<TMPL_VAR name ESCAPE=HTML>" id="ACS_<TMPL_VAR name ESCAPE=HTML>" value="1" <TMPL_IF checked>checked</TMPL_IF>>
-      <label for="ACS_<TMPL_VAR name ESCAPE=HTML>"><TMPL_VAR title ESCAPE=HTML></label>
+      <input type="checkbox" name="ACS_[% HTML.escape(acl.name) %]" id="ACS_[% HTML.escape(acl.name) %]" value="1" [% IF acl.checked %]checked[% END %]>
+      <label for="ACS_[% HTML.escape(acl.name) %]">[% HTML.escape(acl.title) %]</label>
      </td>
 
      <td valign="top">
-      <TMPL_LOOP SUBACLS>
-       <input type="checkbox" name="ACS_<TMPL_VAR name ESCAPE=HTML>" id="ACS_<TMPL_VAR name ESCAPE=HTML>" value="1" <TMPL_IF checked>checked</TMPL_IF>>
-       <label for="ACS_<TMPL_VAR name ESCAPE=HTML>"><TMPL_VAR title ESCAPE=HTML></label>
-       <TMPL_UNLESS __last__><br></TMPL_UNLESS>
-      </TMPL_LOOP>
+      [% USE SUBACLS_it = Iterator(acl.SUBACLS) %][% FOREACH subacl = SUBACLS_it %]
+       <input type="checkbox" name="ACS_[% HTML.escape(subacl.name) %]" id="ACS_[% HTML.escape(subacl.name) %]" value="1" [% IF subacl.checked %]checked[% END %]>
+       <label for="ACS_[% HTML.escape(subacl.name) %]">[% HTML.escape(subacl.title) %]</label>
+       [% UNLESS SUBACLS_it.last %]<br>[% END %]
+      [% END %]
      </td>
     </tr>
-   </TMPL_LOOP>
+   [% END %]
 
-   <input type="hidden" name="all_acs" value="<TMPL_VAR all_acs ESCAPE=HTML>">
+   <input type="hidden" name="all_acs" value="[% HTML.escape(all_acs) %]">
 
    <tr><td colspan="2"><hr size="3" noshade></td></tr>
 
@@ -226,15 +226,15 @@
     <td colspan="2">
      <table>
       <tr>
-       <td><input name="angebote" class="checkbox" type="checkbox" value="1" <TMPL_IF myc_angebote>checked</TMPL_IF>>&nbsp;Angebot</td>
-       <td><input name="bestellungen" class="checkbox" type="checkbox" value="1" <TMPL_IF myc_bestellungen>checked</TMPL_IF>>&nbsp;Bestellung</td>
-       <td><input name="rechnungen" class="checkbox" type="checkbox" value="1" <TMPL_IF myc_rechnung>checked</TMPL_IF>>&nbsp;Rechnung</td>
+       <td><input name="angebote" class="checkbox" type="checkbox" value="1" [% IF myc_angebote %]checked[% END %]>&nbsp;Angebot</td>
+       <td><input name="bestellungen" class="checkbox" type="checkbox" value="1" [% IF myc_bestellungen %]checked[% END %]>&nbsp;Bestellung</td>
+       <td><input name="rechnungen" class="checkbox" type="checkbox" value="1" [% IF myc_rechnung %]checked[% END %]>&nbsp;Rechnung</td>
       </tr>
 
       <tr>
-       <td><input name="anfragen" class="checkbox" type="checkbox" value="1" <TMPL_IF myc_anfragen>checked</TMPL_IF>>&nbsp;Anfragen</td>
-       <td><input name="lieferantenbestellungen" class="checkbox" type="checkbox" value="1" <TMPL_IF myc_lieferantenbestellungen>checked</TMPL_IF>>&nbsp;Lieferantenbestellung</td>
-       <td><input name="einkaufsrechnungen" class="checkbox" type="checkbox" value="1" <TMPL_IF myc_einkaufsrechnungen>checked</TMPL_IF>>&nbsp;Einkaufsrechnung</td>
+       <td><input name="anfragen" class="checkbox" type="checkbox" value="1" [% IF myc_anfragen %]checked[% END %]>&nbsp;Anfragen</td>
+       <td><input name="lieferantenbestellungen" class="checkbox" type="checkbox" value="1" [% IF myc_lieferantenbestellungen %]checked[% END %]>&nbsp;Lieferantenbestellung</td>
+       <td><input name="einkaufsrechnungen" class="checkbox" type="checkbox" value="1" [% IF myc_einkaufsrechnungen %]checked[% END %]>&nbsp;Einkaufsrechnung</td>
       </tr>
      </table>
     </td>
@@ -244,15 +244,15 @@
 
   </table>
 
-  <input name="callback" type="hidden" value="admin.pl?action=list_users&rpw=<TMPL_VAR rpw ESCAPE=URL>">
-  <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+  <input name="callback" type="hidden" value="admin.pl?action=list_users&rpw=[% HTML.url(rpw) %]">
+  <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
 
   <input type="submit" class="submit" name="action" value="<translate>Save</translate>">
 
-  <TMPL_IF edit>
+  [% IF edit %]
    <input type="submit" class="submit" name="action" value="<translate>Delete</translate>">
    <input type="hidden" name="edit" value="1">
-  </TMPL_IF>
+  [% END %]
 
  </form>
 

diff --git a/templates/webpages/admin/list_users_de.html b/templates/webpages/admin/list_users_de.html
index ae612b6..4b35bb0 100644 (file)
--- a/templates/webpages/admin/list_users_de.html
+++ b/templates/webpages/admin/list_users_de.html
@@ -1,8 +1,8 @@
-<body class="admin" onload="">
+[% USE HTML %]<body class="admin" onload="">
 
  <form method="post" action="admin.pl">
 
-  <div class="listtop" width="100%"><TMPL_VAR title></div>
+  <div class="listtop" width="100%">[% title %]</div>
 
   <p>
    <table width="100%">
@@ -16,32 +16,33 @@
      <th class="listtop">Vorlagen</th>
     </tr>
 
-    <TMPL_LOOP MEMBERS>
-     <tr class="listrow<TMPL_IF __odd__>1<TMPL_ELSE>0</TMPL_IF>">
-      <td><a href="admin.pl?action=edit&login=<TMPL_VAR login ESCAPE=URL>&rpw=<TMPL_VAR rpw ESCAPE=URL>"><TMPL_VAR login ESCAPE=HTML></a></td>
-      <td><TMPL_VAR name ESCAPE=HTML></td>
-      <td><TMPL_VAR company ESCAPE=HTML></td>
-      <td><TMPL_VAR dbdriver ESCAPE=HTML></td>
-      <td><TMPL_IF dbhost><TMPL_VAR dbhost ESCAPE=HTML><TMPL_ELSE>localhost</TMPL_IF></td>
-      <td><TMPL_VAR dbname ESCAPE=HTML></td>
-      <td><TMPL_VAR templates ESCAPE=HTML></td>
+    [% SET row_odd = '1' %]
+    [% FOREACH row = MEMBERS %]
+     <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
+      <td><a href="admin.pl?action=edit&login=[% HTML.url(row.login) %]&rpw=[% HTML.url(rpw) %]">[% HTML.escape(row.login) %]</a></td>
+      <td>[% HTML.escape(row.name) %]</td>
+      <td>[% HTML.escape(row.company) %]</td>
+      <td>[% HTML.escape(row.dbdriver) %]</td>
+      <td>[% IF row.dbhost %][% HTML.escape(row.dbhost) %][% ELSE %]localhost[% END %]</td>
+      <td>[% HTML.escape(row.dbname) %]</td>
+      <td>[% HTML.escape(row.templates) %]</td>
      </tr>
-    </TMPL_LOOP>
+    [% END %]
 
     <td colspan="7"><hr size="3" noshade></td>
    </table>
   </p>
 
-  <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+  <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
 
   <input type="submit" class="submit" name="action" value="Benutzer erfassen">
   <input type="submit" class="submit" name="action" value="Administratorpasswort ändern">
   <input type="submit" class="submit" name="action" value="Datenbankadministration">
-  <TMPL_IF LOCKED>
+  [% IF LOCKED %]
    <input type="submit" class="submit" name="action" value="System entsperren">
-   <TMPL_ELSE>
+   [% ELSE %]
    <input type="submit" class="submit" name="action" value="System sperren">
-  </TMPL_IF>
+  [% END %]
 
   <p>Zum Bearbeiten den Zugriffsnamen anklicken!</p>
 

diff --git a/templates/webpages/admin/list_users_master.html b/templates/webpages/admin/list_users_master.html
index 00eb700..fc7c70a 100644 (file)
--- a/templates/webpages/admin/list_users_master.html
+++ b/templates/webpages/admin/list_users_master.html
@@ -1,8 +1,8 @@
-<body class="admin" onload="">
+[% USE HTML %]<body class="admin" onload="">
 
  <form method="post" action="admin.pl">
 
-  <div class="listtop" width="100%"><TMPL_VAR title></div>
+  <div class="listtop" width="100%">[% title %]</div>
 
   <p>
    <table width="100%">
@@ -16,32 +16,33 @@
      <th class="listtop"><translate>Templates</translate></th>
     </tr>
 
-    <TMPL_LOOP MEMBERS>
-     <tr class="listrow<TMPL_IF __odd__>1<TMPL_ELSE>0</TMPL_IF>">
-      <td><a href="admin.pl?action=edit&login=<TMPL_VAR login ESCAPE=URL>&rpw=<TMPL_VAR rpw ESCAPE=URL>"><TMPL_VAR login ESCAPE=HTML></a></td>
-      <td><TMPL_VAR name ESCAPE=HTML></td>
-      <td><TMPL_VAR company ESCAPE=HTML></td>
-      <td><TMPL_VAR dbdriver ESCAPE=HTML></td>
-      <td><TMPL_IF dbhost><TMPL_VAR dbhost ESCAPE=HTML><TMPL_ELSE>localhost</TMPL_IF></td>
-      <td><TMPL_VAR dbname ESCAPE=HTML></td>
-      <td><TMPL_VAR templates ESCAPE=HTML></td>
+    [% SET row_odd = '1' %]
+    [% FOREACH row = MEMBERS %]
+     <tr class="listrow[% IF row_odd %]1[% SET row_odd = '0' %][% ELSE %]0[% SET row_odd = '1' %][% END %]">
+      <td><a href="admin.pl?action=edit&login=[% HTML.url(row.login) %]&rpw=[% HTML.url(rpw) %]">[% HTML.escape(row.login) %]</a></td>
+      <td>[% HTML.escape(row.name) %]</td>
+      <td>[% HTML.escape(row.company) %]</td>
+      <td>[% HTML.escape(row.dbdriver) %]</td>
+      <td>[% IF row.dbhost %][% HTML.escape(row.dbhost) %][% ELSE %]localhost[% END %]</td>
+      <td>[% HTML.escape(row.dbname) %]</td>
+      <td>[% HTML.escape(row.templates) %]</td>
      </tr>
-    </TMPL_LOOP>
+    [% END %]
 
     <td colspan="7"><hr size="3" noshade></td>
    </table>
   </p>
 
-  <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+  <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
 
   <input type="submit" class="submit" name="action" value="<translate>Add User</translate>">
   <input type="submit" class="submit" name="action" value="<translate>Change Admin Password</translate>">
   <input type="submit" class="submit" name="action" value="<translate>Pg Database Administration</translate>">
-  <TMPL_IF LOCKED>
+  [% IF LOCKED %]
    <input type="submit" class="submit" name="action" value="<translate>Unlock System</translate>">
-   <TMPL_ELSE>
+   [% ELSE %]
    <input type="submit" class="submit" name="action" value="<translate>Lock System</translate>">
-  </TMPL_IF>
+  [% END %]
 
   <p><translate>Click on login name to edit!</translate></p>
 

diff --git a/templates/webpages/admin/restore_dataset_de.html b/templates/webpages/admin/restore_dataset_de.html
index 053d132..34877de 100644 (file)
--- a/templates/webpages/admin/restore_dataset_de.html
+++ b/templates/webpages/admin/restore_dataset_de.html
@@ -1,14 +1,14 @@
-<body class="admin" onload="document.getElementsByName('dbname')[0].focus(); ">
+[% USE HTML %]<body class="admin" onload="document.getElementsByName('dbname')[0].focus(); ">
 
- <h2><TMPL_VAR title></h2>
+ <h2>[% title %]</h2>
 
  <form name="Form" method="post" action="admin.pl" enctype="multipart/form-data">
 
   <input type="hidden" name="dbdriver" value="Pg">
-  <input type="hidden" name="dbhost" value="<TMPL_VAR dbhost ESCAPE=HTML>">
-  <input type="hidden" name="dbport" value="<TMPL_VAR dbport ESCAPE=HTML>">
-  <input type="hidden" name="dbuser" value="<TMPL_VAR dbuser ESCAPE=HTML>">
-  <input type="hidden" name="dbpasswd" value="<TMPL_VAR dbpasswd ESCAPE=HTML>">
+  <input type="hidden" name="dbhost" value="[% HTML.escape(dbhost) %]">
+  <input type="hidden" name="dbport" value="[% HTML.escape(dbport) %]">
+  <input type="hidden" name="dbuser" value="[% HTML.escape(dbuser) %]">
+  <input type="hidden" name="dbpasswd" value="[% HTML.escape(dbpasswd) %]">
 
   <p>
    Bitte geben Sie den Namen der Datenbank ein, in der Sie die Sicherung wiederherstellen wollen.
@@ -32,7 +32,7 @@
     <th valign="top">Schriftsatz</th>
     <td>
      <select name="dbencoding">
-      <TMPL_LOOP DBENCODINGS><option value="<TMPL_VAR dbencoding ESCAPE=HTML>" <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR label ESCAPE=HTML></option></TMPL_LOOP>
+      [% FOREACH row = DBENCODINGS %]<option value="[% HTML.escape(row.dbencoding) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -43,7 +43,7 @@
    </tr>
   </table>
 
-  <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+  <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
   <input type="hidden" name="nextsub" value="restore_dataset_start">
 
   <hr size="3" noshade>

diff --git a/templates/webpages/admin/restore_dataset_master.html b/templates/webpages/admin/restore_dataset_master.html
index 6af5674..4ede0bb 100644 (file)
--- a/templates/webpages/admin/restore_dataset_master.html
+++ b/templates/webpages/admin/restore_dataset_master.html
@@ -1,14 +1,14 @@
-<body class="admin" onload="document.getElementsByName('dbname')[0].focus(); ">
+[% USE HTML %]<body class="admin" onload="document.getElementsByName('dbname')[0].focus(); ">
 
- <h2><TMPL_VAR title></h2>
+ <h2>[% title %]</h2>
 
  <form name="Form" method="post" action="admin.pl" enctype="multipart/form-data">
 
   <input type="hidden" name="dbdriver" value="Pg">
-  <input type="hidden" name="dbhost" value="<TMPL_VAR dbhost ESCAPE=HTML>">
-  <input type="hidden" name="dbport" value="<TMPL_VAR dbport ESCAPE=HTML>">
-  <input type="hidden" name="dbuser" value="<TMPL_VAR dbuser ESCAPE=HTML>">
-  <input type="hidden" name="dbpasswd" value="<TMPL_VAR dbpasswd ESCAPE=HTML>">
+  <input type="hidden" name="dbhost" value="[% HTML.escape(dbhost) %]">
+  <input type="hidden" name="dbport" value="[% HTML.escape(dbport) %]">
+  <input type="hidden" name="dbuser" value="[% HTML.escape(dbuser) %]">
+  <input type="hidden" name="dbpasswd" value="[% HTML.escape(dbpasswd) %]">
 
   <p>
    <translate>Please enter the name of the dataset you want to restore the backup in.</translate>
@@ -32,7 +32,7 @@
     <th valign="top"><translate>Multibyte Encoding</translate></th>
     <td>
      <select name="dbencoding">
-      <TMPL_LOOP DBENCODINGS><option value="<TMPL_VAR dbencoding ESCAPE=HTML>" <TMPL_IF selected>selected</TMPL_IF>><TMPL_VAR label ESCAPE=HTML></option></TMPL_LOOP>
+      [% FOREACH row = DBENCODINGS %]<option value="[% HTML.escape(row.dbencoding) %]" [% IF row.selected %]selected[% END %]>[% HTML.escape(row.label) %]</option>[% END %]
      </select>
     </td>
    </tr>
@@ -43,7 +43,7 @@
    </tr>
   </table>
 
-  <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+  <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
   <input type="hidden" name="nextsub" value="restore_dataset_start">
 
   <hr size="3" noshade>

diff --git a/templates/webpages/admin/restore_dataset_start_footer_de.html b/templates/webpages/admin/restore_dataset_start_footer_de.html
index 32622ea..0376b52 100644 (file)
--- a/templates/webpages/admin/restore_dataset_start_footer_de.html
+++ b/templates/webpages/admin/restore_dataset_start_footer_de.html
@@ -1,15 +1,15 @@
- </pre>
+[% USE HTML %] </pre>
 
  <hr>
 
  <p>
   Die Wiederherstellung ist abgeschlossen. Bitte sehen Sie sich die Ausgabe von &quot;pg_restore&quot; an, um festzustellen, ob die Wiederherstellung erfolgreich war.
-  Der Exitcode des Programms war <TMPL_VAR retval ESCAPE=HTML> (&quot;0&quot; bedeutet normalerweise, dass die Wiederherstellung erfolgreich war).
+  Der Exitcode des Programms war [% HTML.escape(retval) %] (&quot;0&quot; bedeutet normalerweise, dass die Wiederherstellung erfolgreich war).
  </p>
 
  <form method="post" action="admin.pl">
   <input type="hidden" name="nextsub" value="list_users">
-  <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+  <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
   <input type="submit" name="action" value="Weiter">
  </form>
 </body>

diff --git a/templates/webpages/admin/restore_dataset_start_footer_master.html b/templates/webpages/admin/restore_dataset_start_footer_master.html
index e1fb78a..b671705 100644 (file)
--- a/templates/webpages/admin/restore_dataset_start_footer_master.html
+++ b/templates/webpages/admin/restore_dataset_start_footer_master.html
@@ -1,15 +1,15 @@
- </pre>
+[% USE HTML %] </pre>
 
  <hr>
 
  <p>
   <translate>The restoration process is complete. Please review &quot;pg_restore&quot;'s output to find out if the restoration was successful.</translate>
-  <translate>The program's exit code was <TMPL_VAR retval ESCAPE=HTML> (&quot;0&quot; usually means that everything went OK).</translate>
+  <translate>The program's exit code was [% HTML.escape(retval) %] (&quot;0&quot; usually means that everything went OK).</translate>
  </p>
 
  <form method="post" action="admin.pl">
   <input type="hidden" name="nextsub" value="list_users">
-  <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+  <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
   <input type="submit" name="action" value="<translate>Continue</translate>">
  </form>
 </body>

diff --git a/templates/webpages/admin/restore_dataset_start_header_de.html b/templates/webpages/admin/restore_dataset_start_header_de.html
index b575d12..e340559 100644 (file)
--- a/templates/webpages/admin/restore_dataset_start_header_de.html
+++ b/templates/webpages/admin/restore_dataset_start_header_de.html
@@ -1,6 +1,6 @@
 <body class="admin">
 
- <h2><TMPL_VAR title></h2>
+ <h2>[% title %]</h2>
 
  <p>Der Wiederherstellungsprozess wurde gestartet. Hier ist die Ausgabe des &quot;pg_restore&quot;-Programmes:</p>
 

diff --git a/templates/webpages/admin/restore_dataset_start_header_master.html b/templates/webpages/admin/restore_dataset_start_header_master.html
index b047125..accca00 100644 (file)
--- a/templates/webpages/admin/restore_dataset_start_header_master.html
+++ b/templates/webpages/admin/restore_dataset_start_header_master.html
@@ -1,6 +1,6 @@
 <body class="admin">
 
- <h2><TMPL_VAR title></h2>
+ <h2>[% title %]</h2>
 
  <p><translate>The restoration process has started. Here's the output of the &quot;pg_restore&quot; command:</translate></p>
 

diff --git a/templates/webpages/admin/update_dataset_de.html b/templates/webpages/admin/update_dataset_de.html
index badb290..2338487 100644 (file)
--- a/templates/webpages/admin/update_dataset_de.html
+++ b/templates/webpages/admin/update_dataset_de.html
@@ -1,11 +1,11 @@
-<body class="admin">
+[% USE HTML %]<body class="admin">
 
- <h2><TMPL_VAR title></h2>
+ <h2>[% title %]</h2>
 
- <TMPL_IF ALL_UPDATED>
+ [% IF ALL_UPDATED %]
   Alle Datenbanken sind auf aktuellem Stand.
 
-  <TMPL_ELSE>
+  [% ELSE %]
 
   <form method="post" action="admin.pl">
 
@@ -21,24 +21,24 @@
      <th class="listtop">Benutzer</th>
     </tr>
 
-    <TMPL_LOOP NEED_UPDATES>
-     <tr class="listrow<TMPL_IF __odd__>1<TMPL_ELSE>0</TMPL_IF>">
-      <td><input type="checkbox" name="update_<TMPL_VAR __counter__>" value="1" checked></td>
-      <td><input type="hidden" name="dbname_<TMPL_VAR __counter__>" value="<TMPL_VAR dbname ESCAPE=HTML>"><TMPL_VAR dbname ESCAPE=HTML></td>
-      <td><input type="hidden" name="dbdriver_<TMPL_VAR __counter__>" value="Pg">PostgreSQL</td>
-      <td><input type="hidden" name="dbhost_<TMPL_VAR __counter__>" value="<TMPL_VAR dbhost ESCAPE=HTML>"><TMPL_VAR dbhost ESCAPE=HTML></td>
-      <td><input type="hidden" name="dbport_<TMPL_VAR __counter__>" value="<TMPL_VAR dbport ESCAPE=HTML>"><TMPL_VAR dbport ESCAPE=HTML></td>
-      <td><input type="hidden" name="dbuser_<TMPL_VAR __counter__>" value="<TMPL_VAR dbuser ESCAPE=HTML>"><TMPL_VAR dbuser ESCAPE=HTML></td>
+    [% SET odd = '1' %][% USE NEED_UPDATES_it = Iterator(NEED_UPDATES) %][% FOREACH row = NEED_UPDATES_it %]
+     <tr class="listrow[% IF odd %]1[% SET odd='0' %][% ELSE %]0[% SET odd = '1' %][% END %]">
+      <td><input type="checkbox" name="update_[% NEED_UPDATES_it.count %]" value="1" checked></td>
+      <td><input type="hidden" name="dbname_[% NEED_UPDATES_it.count %]" value="[% HTML.escape(row.dbname) %]">[% HTML.escape(row.dbname) %]</td>
+      <td><input type="hidden" name="dbdriver_[% NEED_UPDATES_it.count %]" value="Pg">PostgreSQL</td>
+      <td><input type="hidden" name="dbhost_[% NEED_UPDATES_it.count %]" value="[% HTML.escape(row.dbhost) %]">[% HTML.escape(row.dbhost) %]</td>
+      <td><input type="hidden" name="dbport_[% NEED_UPDATES_it.count %]" value="[% HTML.escape(row.dbport) %]">[% HTML.escape(row.dbport) %]</td>
+      <td><input type="hidden" name="dbuser_[% NEED_UPDATES_it.count %]" value="[% HTML.escape(row.dbuser) %]">[% HTML.escape(row.dbuser) %]</td>
      </tr>
 
-     <TMPL_IF __last__>
-      <input type="hidden" name="rowcount" value="<TMPL_VAR __counter__>">
-     </TMPL_IF>
-    </TMPL_LOOP>
+     [% IF NEED_UPDATES_it.last %]
+      <input type="hidden" name="rowcount" value="[% NEED_UPDATES_it.size %]">
+     [% END %]
+    [% END %]
    </table>
 
-   <input name="callback" type="hidden" value="admin.pl?action=list_users&rpw=<TMPL_VAR rpw ESCAPE=URL>">
-   <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+   <input name="callback" type="hidden" value="admin.pl?action=list_users&rpw=[% HTML.url(rpw) %]">
+   <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
    <input type="hidden" name="nextsub" value="dbupdate">
 
    <hr size="3" noshade>
@@ -49,7 +49,7 @@
 
   </form>
 
- </TMPL_IF>
+ [% END %]
 
 </body>
 </html>

diff --git a/templates/webpages/admin/update_dataset_master.html b/templates/webpages/admin/update_dataset_master.html
index 6e1acff..f91797e 100644 (file)
--- a/templates/webpages/admin/update_dataset_master.html
+++ b/templates/webpages/admin/update_dataset_master.html
@@ -1,11 +1,11 @@
-<body class="admin">
+[% USE HTML %]<body class="admin">
 
- <h2><TMPL_VAR title></h2>
+ <h2>[% title %]</h2>
 
- <TMPL_IF ALL_UPDATED>
+ [% IF ALL_UPDATED %]
   <translate>All Datasets up to date!</translate>
 
-  <TMPL_ELSE>
+  [% ELSE %]
 
   <form method="post" action="admin.pl">
 
@@ -21,24 +21,24 @@
      <th class="listtop"><translate>User</translate></th>
     </tr>
 
-    <TMPL_LOOP NEED_UPDATES>
-     <tr class="listrow<TMPL_IF __odd__>1<TMPL_ELSE>0</TMPL_IF>">
-      <td><input type="checkbox" name="update_<TMPL_VAR __counter__>" value="1" checked></td>
-      <td><input type="hidden" name="dbname_<TMPL_VAR __counter__>" value="<TMPL_VAR dbname ESCAPE=HTML>"><TMPL_VAR dbname ESCAPE=HTML></td>
-      <td><input type="hidden" name="dbdriver_<TMPL_VAR __counter__>" value="Pg">PostgreSQL</td>
-      <td><input type="hidden" name="dbhost_<TMPL_VAR __counter__>" value="<TMPL_VAR dbhost ESCAPE=HTML>"><TMPL_VAR dbhost ESCAPE=HTML></td>
-      <td><input type="hidden" name="dbport_<TMPL_VAR __counter__>" value="<TMPL_VAR dbport ESCAPE=HTML>"><TMPL_VAR dbport ESCAPE=HTML></td>
-      <td><input type="hidden" name="dbuser_<TMPL_VAR __counter__>" value="<TMPL_VAR dbuser ESCAPE=HTML>"><TMPL_VAR dbuser ESCAPE=HTML></td>
+    [% SET odd = '1' %][% USE NEED_UPDATES_it = Iterator(NEED_UPDATES) %][% FOREACH row = NEED_UPDATES_it %]
+     <tr class="listrow[% IF odd %]1[% SET odd='0' %][% ELSE %]0[% SET odd = '1' %][% END %]">
+      <td><input type="checkbox" name="update_[% NEED_UPDATES_it.count %]" value="1" checked></td>
+      <td><input type="hidden" name="dbname_[% NEED_UPDATES_it.count %]" value="[% HTML.escape(row.dbname) %]">[% HTML.escape(row.dbname) %]</td>
+      <td><input type="hidden" name="dbdriver_[% NEED_UPDATES_it.count %]" value="Pg">PostgreSQL</td>
+      <td><input type="hidden" name="dbhost_[% NEED_UPDATES_it.count %]" value="[% HTML.escape(row.dbhost) %]">[% HTML.escape(row.dbhost) %]</td>
+      <td><input type="hidden" name="dbport_[% NEED_UPDATES_it.count %]" value="[% HTML.escape(row.dbport) %]">[% HTML.escape(row.dbport) %]</td>
+      <td><input type="hidden" name="dbuser_[% NEED_UPDATES_it.count %]" value="[% HTML.escape(row.dbuser) %]">[% HTML.escape(row.dbuser) %]</td>
      </tr>
 
-     <TMPL_IF __last__>
-      <input type="hidden" name="rowcount" value="<TMPL_VAR __counter__>">
-     </TMPL_IF>
-    </TMPL_LOOP>
+     [% IF NEED_UPDATES_it.last %]
+      <input type="hidden" name="rowcount" value="[% NEED_UPDATES_it.size %]">
+     [% END %]
+    [% END %]
    </table>
 
-   <input name="callback" type="hidden" value="admin.pl?action=list_users&rpw=<TMPL_VAR rpw ESCAPE=URL>">
-   <input type="hidden" name="rpw" value="<TMPL_VAR rpw ESCAPE=HTML>">
+   <input name="callback" type="hidden" value="admin.pl?action=list_users&rpw=[% HTML.url(rpw) %]">
+   <input type="hidden" name="rpw" value="[% HTML.escape(rpw) %]">
    <input type="hidden" name="nextsub" value="dbupdate">
 
    <hr size="3" noshade>
@@ -49,7 +49,7 @@
 
   </form>
 
- </TMPL_IF>
+ [% END %]
 
 </body>
 </html>