forgot the race

[ndwebbie.git] / calls.pl

diff --git a/calls.pl b/calls.pl
index 9c3c3e0a1f68ad714e0a5bcba33bad1aef630272..ad7e13c449c20ed2cc8506a9e0b5831d33691c28 100644 (file)
--- a/calls.pl
+++ b/calls.pl
@@ -172,11 +172,11 @@ ORDER BY p.x,p.y,p.z});
        }
        my $query = $DBH->prepare(qq{
 SELECT c.id, coords(p.x,p.y,p.z), u.defense_points, c.landing_tick, 
-       TRIM('/' FROM concat(p2.race||'/')) AS race, TRIM('/' FROM concat(i.amount||'/')) AS amount,
-       TRIM('/' FROM concat(i.eta||'/')) AS eta, TRIM('/' FROM concat(i.shiptype||'/')) AS shiptype,
-       TRIM('/' FROM concat(c.landing_tick - tick() ||'/')) AS curreta,
-       TRIM('/' FROM concat(p2.alliance ||'/')) AS alliance,
-       TRIM('/' FROM concat(coords(p2.x,p2.y,p2.z) ||'/')) AS attackers
+       TRIM('/' FROM concat(p2.race||' /')) AS race, TRIM('/' FROM concat(i.amount||' /')) AS amount,
+       TRIM('/' FROM concat(i.eta||' /')) AS eta, TRIM('/' FROM concat(i.shiptype||' /')) AS shiptype,
+       TRIM('/' FROM concat(c.landing_tick - tick() ||' /')) AS curreta,
+       TRIM('/' FROM concat(p2.alliance ||' /')) AS alliance,
+       TRIM('/' FROM concat(coords(p2.x,p2.y,p2.z) ||' /')) AS attackers
 FROM calls c 
        JOIN incomings i ON i.call = c.id
        JOIN users u ON c.member = u.uid
@@ -191,6 +191,7 @@ ORDER BY c.landing_tick DESC
        my $i = 0;
        while (my $call = $query->fetchrow_hashref){
                $call->{ODD} = $i % 2;
+               $call->{shiptype} = escapeHTML($call->{shiptype});
                push @calls, $call;
                $i++;
        }