Escape planet and rule names in templates.

diff --git a/root/lib/inc/stats.tt2 b/root/lib/inc/stats.tt2
index 2b714a9b0983902bff79eaa85a110c1b21be40c5..f39321ea63b703ef7b96e8f3cef551a85ddc3046 100644 (file)
--- a/root/lib/inc/stats.tt2
+++ b/root/lib/inc/stats.tt2
@@ -65,8 +65,8 @@
                <td title="[% p.xprank_gain_day %] Today | [% p.xprank_gain %] Tick">[% p.xprank %] <img src="/static/images/[% p.xprankimg %].png" alt="[% p.xprankimg %]"> </td>
 
                <td><a href="[% c.uri_for('/stats','planet',p.id) %]">[% p.coords %]</a></td>
                <td title="[% p.xprank_gain_day %] Today | [% p.xprank_gain %] Tick">[% p.xprank %] <img src="/static/images/[% p.xprankimg %].png" alt="[% p.xprankimg %]"> </td>
 
                <td><a href="[% c.uri_for('/stats','planet',p.id) %]">[% p.coords %]</a></td>

-               <td align="center">[% p.ruler %] <b>OF</b> [% p.planet %]</td>
-               <td align="center">[% p.race %]</td>
+               <td align="center">[% p.ruler | html %] <b>OF</b> [% p.planet %]</td>
+               <td align="center">[% p.race | html %]</td>

                [% p.sizeimg = (p.size_gain_day == 0 ? 'stay' : (p.size_gain_day > 0 ? 'up' : 'down')) %]
                <td title="[% p.size_gain_day %] Today | [% p.size_gain %] Tick">[% p.size | commify %] <img src="/static/images/[% p.sizeimg %].png" alt="[% p.sizeimg %]"> </td>
                [% p.scoreimg = (p.score_gain_day == 0 ? 'stay' : (p.score_gain_day > 0 ? 'up' : 'down')) %]
                [% p.sizeimg = (p.size_gain_day == 0 ? 'stay' : (p.size_gain_day > 0 ? 'up' : 'down')) %]
                <td title="[% p.size_gain_day %] Today | [% p.size_gain %] Tick">[% p.size | commify %] <img src="/static/images/[% p.sizeimg %].png" alt="[% p.sizeimg %]"> </td>
                [% p.scoreimg = (p.score_gain_day == 0 ? 'stay' : (p.score_gain_day > 0 ? 'up' : 'down')) %]

diff --git a/root/src/alliances/edit.tt2 b/root/src/alliances/edit.tt2
index e7f6fefdace6295f6a3f256bdbc0f26525860d35..609ee4c1e77ee4cc8f94d8468769bfad91fecf55 100644 (file)
--- a/root/src/alliances/edit.tt2
+++ b/root/src/alliances/edit.tt2
@@ -48,7 +48,7 @@
                <td><a href="[% c.uri_for('/stats/planet',m.id) %]">[% m.coords %]</a></td>
                <td class="[% m.planet_status %]"><a href="[% c.uri_for('/intel/planet',m.id) %]">[% m.nick %]([% m.planet_status %])</a></td>
                <td>[% m.hit_us %]</td>
                <td><a href="[% c.uri_for('/stats/planet',m.id) %]">[% m.coords %]</a></td>
                <td class="[% m.planet_status %]"><a href="[% c.uri_for('/intel/planet',m.id) %]">[% m.nick %]([% m.planet_status %])</a></td>
                <td>[% m.hit_us %]</td>

-               <td>[% m.ruler %] <b>OF</b> [% m.planet %]</td>
+               <td>[% m.ruler | html %] <b>OF</b> [% m.planet | html %]</td>

                <td>[% m.race %]</td>
                <td>[% m.size %] ([% m.sizerank %])</td>
                <td>[% m.score %] ([% m.scorerank %])</td>
                <td>[% m.race %]</td>
                <td>[% m.size %] ([% m.sizerank %])</td>
                <td>[% m.score %] ([% m.scorerank %])</td>

diff --git a/root/src/intel/naps.tt2 b/root/src/intel/naps.tt2
index 064dfc519c748e34fce20faee372a3984709c80a..5d27a3fa54a7742dd10ba783078303e168c886bf 100644 (file)
--- a/root/src/intel/naps.tt2
+++ b/root/src/intel/naps.tt2
@@ -6,7 +6,7 @@
 [% FOR p IN planets %]
        <tr align="center"  class="[% loop.count % 2 == 0 ? 'even' : 'odd' %]">
                <td><a href="[% c.uri_for('/stats/planet',p.id) %]">[% p.coords %]</a></td>
 [% FOR p IN planets %]
        <tr align="center"  class="[% loop.count % 2 == 0 ? 'even' : 'odd' %]">
                <td><a href="[% c.uri_for('/stats/planet',p.id) %]">[% p.coords %]</a></td>

-               <td>[% p.ruler %] <b>OF</b> [% p.planet %]</td>
+               <td>[% p.ruler | html %] <b>OF</b> [% p.planet | html %]</td>

                <td>[% p.race %]</td>
                <td>[% p.size %] ([% p.sizerank %])</td>
                <td>[% p.score %] ([% p.scorerank %])</td>
                <td>[% p.race %]</td>
                <td>[% p.size %] ([% p.sizerank %])</td>
                <td>[% p.score %] ([% p.scorerank %])</td>

diff --git a/root/src/members/index.tt2 b/root/src/members/index.tt2
index a2ef6fbb653fca5faa277b7a7e08de42cc85bd03..da11c5230c0a128135592773a97024c67598f571 100644 (file)
--- a/root/src/members/index.tt2
+++ b/root/src/members/index.tt2
@@ -38,7 +38,7 @@
                <td>[% p.x %] </td>
                <td><a href="[% c.uri_for('/stats','galaxy',p.x,p.y) %]">[% p.y %]</a></td>
                <td><a href="[% c.uri_for('/stats','planet',p.id) %]">[% p.z %]</a></td>
                <td>[% p.x %] </td>
                <td><a href="[% c.uri_for('/stats','galaxy',p.x,p.y) %]">[% p.y %]</a></td>
                <td><a href="[% c.uri_for('/stats','planet',p.id) %]">[% p.z %]</a></td>

-               <td align="center">[% p.ruler %] <b>OF</b> [% p.planet %]</td>
+               <td align="center">[% p.ruler | html %] <b>OF</b> [% p.planet | html %]</td>

                <td align="center">[% p.race %]</td>
                [% p.sizeimg = (p.size_gain_day == 0 ? 'stay' : (p.size_gain_day > 0 ? 'up' : 'down')) %]
                <td title="[% p.size_gain_day %] Today | [% p.size_gain %] Tick">[% p.size | commify %] <img src="/static/images/[% p.sizeimg %].png" alt="[% p.sizeimg %]"> </td>
                <td align="center">[% p.race %]</td>
                [% p.sizeimg = (p.size_gain_day == 0 ? 'stay' : (p.size_gain_day > 0 ? 'up' : 'down')) %]
                <td title="[% p.size_gain_day %] Today | [% p.size_gain %] Tick">[% p.size | commify %] <img src="/static/images/[% p.sizeimg %].png" alt="[% p.sizeimg %]"> </td>

diff --git a/root/src/rankings/planets.tt2 b/root/src/rankings/planets.tt2
index b0829a2c1d28010c64c69f6d9bac757fa87f9c3b..20baa48d30b57c9ff376efed75b65e967efbda8c 100644 (file)
--- a/root/src/rankings/planets.tt2
+++ b/root/src/rankings/planets.tt2
@@ -35,7 +35,7 @@
                <td>[% p.x %] </td>
                <td><a href="[% c.uri_for('/stats','galaxy',p.x,p.y) %]">[% p.y %]</a></td>
                <td><a href="[% c.uri_for('/stats','planet',p.id) %]">[% p.z %]</a></td>
                <td>[% p.x %] </td>
                <td><a href="[% c.uri_for('/stats','galaxy',p.x,p.y) %]">[% p.y %]</a></td>
                <td><a href="[% c.uri_for('/stats','planet',p.id) %]">[% p.z %]</a></td>

-               <td align="center">[% p.ruler %] <b>OF</b> [% p.planet %]</td>
+               <td align="center">[% p.ruler | html %] <b>OF</b> [% p.planet | html %]</td>

                <td align="center">[% p.race %]</td>
                [% p.sizeimg = (p.size_gain_day == 0 ? 'stay' : (p.size_gain_day > 0 ? 'up' : 'down')) %]
                <td title="[% p.size_gain_day %] Today | [% p.size_gain %] Tick">[% p.size | commify %] <img src="/static/images/[% p.sizeimg %].png" alt="[% p.sizeimg %]"> </td>
                <td align="center">[% p.race %]</td>
                [% p.sizeimg = (p.size_gain_day == 0 ? 'stay' : (p.size_gain_day > 0 ? 'up' : 'down')) %]
                <td title="[% p.size_gain_day %] Today | [% p.size_gain %] Tick">[% p.size | commify %] <img src="/static/images/[% p.sizeimg %].png" alt="[% p.sizeimg %]"> </td>