$BODY->param(DefensePoints => $call->{defense_points});
$BODY->param(LandingTick => $call->{landing_tick});
$BODY->param(ETA => $call->{landing_tick}-$self->{TICK});
- $BODY->param(Info => $call->{info});
+ $BODY->param(Info => escapeHTML $call->{info});
$BODY->param(DC => $call->{dc});
if ($call->{covered}){
$BODY->param(Cover => 'Uncover');
my $ships = $DBH->prepare('SELECT ship,amount FROM fleet_ships WHERE fleet = ?');
$fleets->execute($call->{member},$call->{landing_tick},$call->{landing_tick});
my @fleets;
- my $i = 0;
while (my $fleet = $fleets->fetchrow_hashref){
if ($fleet->{back} == $call->{landing_tick}){
$fleet->{Fleetcatch} = 1;
}
$ships->execute($fleet->{id});
my @ships;
+ my $i = 0;
while (my $ship = $ships->fetchrow_hashref){
$i++;
$ship->{ODD} = $i % 2;
$fleets = $DBH->prepare(q{
- SELECT username, id FROM fleets f JOIN users u USING (uid) WHERE target = $1 and landing_tick = $2
- AND back = landing_tick + eta - 1
+ SELECT username, id,back - (landing_tick + eta - 1) AS recalled FROM fleets f JOIN users u USING (uid) WHERE target = $1 and landing_tick = $2
});
$fleets->execute($call->{planet},$call->{landing_tick}) or $ND::ERROR .= p $DBH->errstr;
my @defenders;
- $i = 0;
while (my $fleet = $fleets->fetchrow_hashref){
$ships->execute($fleet->{id});
my @ships;
+ my $i = 0;
while (my $ship = $ships->fetchrow_hashref){
$i++;
$ship->{ODD} = $i % 2;
ORDER BY p.x,p.y,p.z});
$attackers->execute($call->{id});
my @attackers;
- $i = 0;
+ my $i = 0;
while(my $attacker = $attackers->fetchrow_hashref){
$i++;
$attacker->{ODD} = $i % 2;
SELECT c.id, coords(p.x,p.y,p.z), u.defense_points, c.landing_tick, c.dc,
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,
+ (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
push @calls,{};
$i = 0;
}
+ $call->{attackers} =~ s{(\d+:\d+:\d+)}{<a href="/check?coords=$1">$1</a>}g;
$call->{dc} = 'Hostile' unless defined $call->{dc};
$i++;
$call->{ODD} = $i % 2;