use CGI qw/:standard/;
use ND::Web::Include;
-our @ISA = qw/ND::Web::XMLPage/;
+use base qw/ND::Web::XMLPage/;
$ND::Web::Page::PAGES{calls} = __PACKAGE__;
my $call;
if (defined param('call') && param('call') =~ /^(\d+)$/){
my $query = $DBH->prepare(q{
- SELECT c.id, coords(p.x,p.y,p.z), c.landing_tick, c.info, covered, open, dc.username AS dc, u.defense_points,c.member
+ SELECT c.id, coords(p.x,p.y,p.z), c.landing_tick, c.info, covered, open, dc.username AS dc, u.defense_points,c.member,u.planet
FROM calls c
JOIN users u ON c.member = u.uid
LEFT OUTER JOIN users dc ON c.dc = dc.uid
$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;
}
$BODY->param(Fleets => \@fleets);
+
+ $fleets = $DBH->prepare(q{
+ 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;
+ 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;
+ push @ships,$ship;
+ }
+ $fleet->{Ships} = \@ships;
+ delete $fleet->{id};
+ push @defenders, $fleet;
+ }
+ $BODY->param(Defenders => \@defenders);
+
my $attackers = $DBH->prepare(q{
SELECT coords(p.x,p.y,p.z), p.planet_status, p.race,i.eta,i.amount,i.fleet,i.shiptype,p.relationship,p.alliance,i.id
FROM incomings i
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;
my ($maxpoints) = $DBH->selectrow_array($pointlimits,undef,'DEFMAX');
my $query = $DBH->prepare(qq{
- 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,
- TRIM('/' FROM concat(p2.alliance ||' /')) AS alliance,
- TRIM('/' FROM concat(coords(p2.x,p2.y,p2.z) ||' /')) AS attackers
+ SELECT id,coords(x,y,z),defense_points,landing_tick,dc,curreta,fleets,
+ TRIM('/' FROM concat(DISTINCT race||' /')) AS race, TRIM('/' FROM concat(amount||' /')) AS amount,
+ TRIM('/' FROM concat(DISTINCT eta||' /')) AS eta, TRIM('/' FROM concat(DISTINCT shiptype||' /')) AS shiptype,
+ TRIM('/' FROM concat(DISTINCT alliance ||' /')) AS alliance,
+ TRIM('/' FROM concat(coords||' /')) AS attackers
+ FROM (SELECT c.id, p.x,p.y,p.z, u.defense_points, c.landing_tick, dc.username AS dc,
+ (c.landing_tick - tick()) AS curreta,p2.race, i.amount, i.eta, i.shiptype, p2.alliance,
+ coords(p2.x,p2.y,p2.z), COUNT(DISTINCT f.id) AS fleets
FROM calls c
JOIN incomings i ON i.call = c.id
JOIN users u ON c.member = u.uid
JOIN current_planet_stats p ON u.planet = p.id
JOIN current_planet_stats p2 ON i.sender = p2.id
+ LEFT OUTER JOIN users dc ON c.dc = dc.uid
+ LEFT OUTER JOIN fleets f ON f.target = u.planet AND f.landing_tick = c.landing_tick AND f.back = f.landing_tick + f.eta - 1
WHERE $where
- GROUP BY c.id, p.x,p.y,p.z, u.username, c.landing_tick, c.info,u.defense_points,c.dc
- ORDER BY c.landing_tick DESC
+ GROUP BY c.id, p.x,p.y,p.z, c.landing_tick, u.defense_points,dc.username,p2.race,i.amount,i.eta,i.shiptype,p2.alliance,p2.x,p2.y,p2.z) a
+ GROUP BY id, x,y,z,landing_tick, defense_points,dc,curreta,fleets
+ ORDER BY landing_tick DESC
})or $error .= $DBH->errstr;
$query->execute or $error .= $DBH->errstr;
my @calls;
push @calls,{};
$i = 0;
}
- $call->{dc} = 'Hostile' unless defined $call->{dc};
+ $call->{attackers} =~ s{(\d+:\d+:\d+)}{<a href="/check?coords=$1">$1</a>}g;
+ $call->{dcstyle} = 'Hostile' unless defined $call->{dc};
$i++;
$call->{ODD} = $i % 2;
$call->{shiptype} = escapeHTML($call->{shiptype});