HTML-Code aufgeräumt, Attribute gequotet, HTML-Sonderzeichen in Werten escapet.

diff --git a/templates/webpages/admin/edit_group_membership_de.html b/templates/webpages/admin/edit_group_membership_de.html
index 05f2167..2b3560c 100644 (file)
--- a/templates/webpages/admin/edit_group_membership_de.html
+++ b/templates/webpages/admin/edit_group_membership_de.html
@@ -8,7 +8,7 @@
 
   <p>
    <table border="0">
-    [% SET row_is_odd = '1' %][% USE users_it = Iterator(USERS) %][% FOREACH user = users_it %]
+    [% FOREACH user = USERS %]
 
     [% IF user.repeat_headings %]
     <tr>
@@ -19,7 +19,7 @@
     </tr>
     [% END %]
 
-    <tr class="listrow[% IF row_is_odd %]1[% SET row_is_odd = '0' %][% ELSE %]0[% SET row_is_odd = '1' %][% END %]">
+    <tr class="listrow[% loop.count % 2 %]">
      <td valign="center">[% HTML.escape(user.login) %]</td>
      <td valign="center">[% HTML.escape(user.name) %]</td>
      [% FOREACH group = user.GROUPS %]

diff --git a/templates/webpages/admin/edit_group_membership_master.html b/templates/webpages/admin/edit_group_membership_master.html
index 7acc53a..ce0fa8d 100644 (file)
--- a/templates/webpages/admin/edit_group_membership_master.html
+++ b/templates/webpages/admin/edit_group_membership_master.html
@@ -9,7 +9,7 @@
 
   <p>
    <table border="0">
-    [% SET row_is_odd = '1' %][% USE users_it = Iterator(USERS) %][% FOREACH user = users_it %]
+    [% FOREACH user = USERS %]
 
     [% IF user.repeat_headings %]
     <tr>
@@ -20,7 +20,7 @@
     </tr>
     [% END %]
 
-    <tr class="listrow[% IF row_is_odd %]1[% SET row_is_odd = '0' %][% ELSE %]0[% SET row_is_odd = '1' %][% END %]">
+    <tr class="listrow[% loop.count % 2 %]">
      <td valign="center">[% HTML.escape(user.login) %]</td>
      <td valign="center">[% HTML.escape(user.name) %]</td>
      [% FOREACH group = user.GROUPS %]

diff --git a/templates/webpages/admin/edit_user_de.html b/templates/webpages/admin/edit_user_de.html
index c31c369..2752d19 100644 (file)
--- a/templates/webpages/admin/edit_user_de.html
+++ b/templates/webpages/admin/edit_user_de.html
@@ -245,8 +245,8 @@
    </tr>
 
    <tr>
-    <td colspan="2">[% USE GROUPS_it = Iterator(GROUPS) %][% FOREACH row = GROUPS_it %]<a href="admin.pl?action=edit_group&group_id=[% HTML.url(row.id) %]">[% HTML.escape(row.name) %]</a>
-     [% UNLESS GROUPS_it.last %] | [% END %][% END %]</td>
+    <td colspan="2">[% FOREACH row = GROUPS %]<a href="admin.pl?action=edit_group&group_id=[% HTML.url(row.id) %]">[% HTML.escape(row.name) %]</a>
+     [% UNLESS loop.last %] | [% END %][% END %]</td>
    </tr>
    [% END %]
 

diff --git a/templates/webpages/admin/edit_user_master.html b/templates/webpages/admin/edit_user_master.html
index dea5ee6..8f77559 100644 (file)
--- a/templates/webpages/admin/edit_user_master.html
+++ b/templates/webpages/admin/edit_user_master.html
@@ -245,8 +245,8 @@
    </tr>
 
    <tr>
-    <td colspan="2">[% USE GROUPS_it = Iterator(GROUPS) %][% FOREACH row = GROUPS_it %]<a href="admin.pl?action=edit_group&group_id=[% HTML.url(row.id) %]">[% HTML.escape(row.name) %]</a>
-     [% UNLESS GROUPS_it.last %] | [% END %][% END %]</td>
+    <td colspan="2">[% FOREACH row = GROUPS %]<a href="admin.pl?action=edit_group&group_id=[% HTML.url(row.id) %]">[% HTML.escape(row.name) %]</a>
+     [% UNLESS loop.last %] | [% END %][% END %]</td>
    </tr>
    [% END %]
 

diff --git a/templates/webpages/admin/list_users_de.html b/templates/webpages/admin/list_users_de.html
index 3214a74..153c2a4 100644 (file)
--- a/templates/webpages/admin/list_users_de.html
+++ b/templates/webpages/admin/list_users_de.html
@@ -16,9 +16,8 @@
      <th class="listtop">Vorlagen</th>
     </tr>
 
-    [% 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 %]">
+     <tr class="listrow[% loop.count % 2 %]">
       <td><a href="admin.pl?action=edit&login=[% HTML.url(row.login) %]">[% HTML.escape(row.login) %]</a></td>
       <td>[% HTML.escape(row.name) %]</td>
       <td>[% HTML.escape(row.company) %]</td>

diff --git a/templates/webpages/admin/list_users_master.html b/templates/webpages/admin/list_users_master.html
index 3bb34da..fca83aa 100644 (file)
--- a/templates/webpages/admin/list_users_master.html
+++ b/templates/webpages/admin/list_users_master.html
@@ -16,9 +16,8 @@
      <th class="listtop"><translate>Templates</translate></th>
     </tr>
 
-    [% 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 %]">
+     <tr class="listrow[% loop.count % 2 %]">
       <td><a href="admin.pl?action=edit&login=[% HTML.url(row.login) %]">[% HTML.escape(row.login) %]</a></td>
       <td>[% HTML.escape(row.name) %]</td>
       <td>[% HTML.escape(row.company) %]</td>

diff --git a/templates/webpages/admin/update_dataset_de.html b/templates/webpages/admin/update_dataset_de.html
index dadcc7e..cf286c5 100644 (file)
--- a/templates/webpages/admin/update_dataset_de.html
+++ b/templates/webpages/admin/update_dataset_de.html
@@ -21,25 +21,24 @@
      <th class="listtop">Benutzer</th>
     </tr>
 
-    [% 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 %]" id="update_[% NEED_UPDATES_it.count %]" value="1" checked></td>
+    [% FOREACH row = NEED_UPDATES %]
+     <tr class="listrow[% loop.count % 2 %]">
+      <td><input type="checkbox" name="update_[% loop.count %]" id="update_[% loop.count %]" value="1" checked></td>
       <td>
-       <input type="hidden" name="dbname_[% NEED_UPDATES_it.count %]" value="[% HTML.escape(row.dbname) %]">
-       <label for="update_[% NEED_UPDATES_it.count %]">[% HTML.escape(row.dbname) %]</label>
+       <input type="hidden" name="dbname_[% loop.count %]" value="[% HTML.escape(row.dbname) %]">
+       <label for="update_[% loop.count %]">[% HTML.escape(row.dbname) %]</label>
       </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>
+      <td><input type="hidden" name="dbdriver_[% loop.count %]" value="Pg">PostgreSQL</td>
+      <td><input type="hidden" name="dbhost_[% loop.count %]" value="[% HTML.escape(row.dbhost) %]">[% HTML.escape(row.dbhost) %]</td>
+      <td><input type="hidden" name="dbport_[% loop.count %]" value="[% HTML.escape(row.dbport) %]">[% HTML.escape(row.dbport) %]</td>
+      <td><input type="hidden" name="dbuser_[% loop.count %]" value="[% HTML.escape(row.dbuser) %]">[% HTML.escape(row.dbuser) %]</td>
      </tr>
 
-     [% IF NEED_UPDATES_it.last %]
-      <input type="hidden" name="rowcount" value="[% NEED_UPDATES_it.size %]">
-     [% END %]
     [% END %]
    </table>
 
+   <input type="hidden" name="rowcount" value="[% NEED_UPDATES.size %]">
+
    <input name="callback" type="hidden" value="admin.pl?action=list_users">
    <input type="hidden" name="nextsub" value="dbupdate">
 

diff --git a/templates/webpages/admin/update_dataset_master.html b/templates/webpages/admin/update_dataset_master.html
index fd2c393..268cf87 100644 (file)
--- a/templates/webpages/admin/update_dataset_master.html
+++ b/templates/webpages/admin/update_dataset_master.html
@@ -21,25 +21,24 @@
      <th class="listtop"><translate>User</translate></th>
     </tr>
 
-    [% 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 %]" id="update_[% NEED_UPDATES_it.count %]" value="1" checked></td>
+    [% FOREACH row = NEED_UPDATES %]
+     <tr class="listrow[% loop.count % 2 %]">
+      <td><input type="checkbox" name="update_[% loop.count %]" id="update_[% loop.count %]" value="1" checked></td>
       <td>
-       <input type="hidden" name="dbname_[% NEED_UPDATES_it.count %]" value="[% HTML.escape(row.dbname) %]">
-       <label for="update_[% NEED_UPDATES_it.count %]">[% HTML.escape(row.dbname) %]</label>
+       <input type="hidden" name="dbname_[% loop.count %]" value="[% HTML.escape(row.dbname) %]">
+       <label for="update_[% loop.count %]">[% HTML.escape(row.dbname) %]</label>
       </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>
+      <td><input type="hidden" name="dbdriver_[% loop.count %]" value="Pg">PostgreSQL</td>
+      <td><input type="hidden" name="dbhost_[% loop.count %]" value="[% HTML.escape(row.dbhost) %]">[% HTML.escape(row.dbhost) %]</td>
+      <td><input type="hidden" name="dbport_[% loop.count %]" value="[% HTML.escape(row.dbport) %]">[% HTML.escape(row.dbport) %]</td>
+      <td><input type="hidden" name="dbuser_[% loop.count %]" value="[% HTML.escape(row.dbuser) %]">[% HTML.escape(row.dbuser) %]</td>
      </tr>
 
-     [% IF NEED_UPDATES_it.last %]
-      <input type="hidden" name="rowcount" value="[% NEED_UPDATES_it.size %]">
-     [% END %]
     [% END %]
    </table>
 
+   <input type="hidden" name="rowcount" value="[% NEED_UPDATES.size %]">
+
    <input name="callback" type="hidden" value="admin.pl?action=list_users">
    <input type="hidden" name="nextsub" value="dbupdate">
 

diff --git a/templates/webpages/admin/user_migration_done_de.html b/templates/webpages/admin/user_migration_done_de.html
index d95b558..286248a 100644 (file)
--- a/templates/webpages/admin/user_migration_done_de.html
+++ b/templates/webpages/admin/user_migration_done_de.html
@@ -6,7 +6,7 @@
 
   <p>Die folgenden Benutzer wurden in die Authentifizierungsdatenbank migriert:</p>
 
-  <p>[% FOREACH row = MEMBERS %][% row.login %] [% END %]</p>
+  <p>[% FOREACH row = MEMBERS %][% HTML.escape(row.login) %] [% END %]</p>
 
   <input type="hidden" name="nextsub" value="create_standard_group_ask">
 

diff --git a/templates/webpages/admin/user_migration_done_master.html b/templates/webpages/admin/user_migration_done_master.html
index 9e16d48..dd7b32a 100644 (file)
--- a/templates/webpages/admin/user_migration_done_master.html
+++ b/templates/webpages/admin/user_migration_done_master.html
@@ -7,7 +7,7 @@
   <p><translate>The following users have been migrated into the
     authentication database:</translate></p>
 
-  <p>[% FOREACH row = MEMBERS %][% row.login %] [% END %]</p>
+  <p>[% FOREACH row = MEMBERS %][% HTML.escape(row.login) %] [% END %]</p>
 
   <input type="hidden" name="nextsub" value="create_standard_group_ask">