minor things

[ndwebbie.git] / calls.pl

diff --git a/calls.pl b/calls.pl
index b56a639e41aac5ba77e0c820baf47a43376c2bbe..e6153a1741fd1df2060bc28b8690104cad987706 100644 (file)
--- a/calls.pl
+++ b/calls.pl
@@ -26,7 +26,7 @@ my $error;
 
 $ND::TEMPLATE->param(TITLE => 'Defense Calls');
 
-die "You don't have access" unless isBC();
+die "You don't have access" unless isDC();
 
 my $call;
 if (param('call') =~ /^(\d+)$/){
@@ -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
@@ -190,9 +190,10 @@ ORDER BY c.landing_tick DESC
        my @calls;
        my $i = 0;
        while (my $call = $query->fetchrow_hashref){
+               $i++;
                $call->{ODD} = $i % 2;
+               $call->{shiptype} = escapeHTML($call->{shiptype});
                push @calls, $call;
-               $i++;
        }
        $BODY->param(Calls => \@calls);
 }