X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=index.pl;h=502e1452993d05f984984fbae0cc77f8ac4c6324;hb=6e36f2eca16349d4502126527be1bdddf3c39187;hp=f19ced961b3656ae6d4742382db50e0ef27a1a1a;hpb=6a365a7f7bfedc7b7d45991445bda2eb7d44d39b;p=ndwebbie.git diff --git a/index.pl b/index.pl index f19ced9..502e145 100755 --- a/index.pl +++ b/index.pl @@ -66,7 +66,7 @@ while (my ($name,$attack,$gid) = $query->fetchrow()){ our $LOG = $DBH->prepare('INSERT INTO log (uid,text) VALUES(?,?)'); my $page = 'main'; -if (param('page') =~ /^(main|check)$/){ +if (param('page') =~ /^(main|check|motd|points|covop|top100|launchConfirmation)$/){ $page = $1; } @@ -87,6 +87,24 @@ $TEMPLATE->param(isHC => isHC()); $TEMPLATE->param(isDC => isDC()); $TEMPLATE->param(isBC => isBC()); $TEMPLATE->param(isAttacker => $ATTACKER && (!isMember() || ((($TICK - $fleetupdate < 24) || isScanner()) && $PLANET))); +if ($ATTACKER && (!isMember() || ((($TICK - $fleetupdate < 24) || isScanner()) && $PLANET))){ + my $query = $DBH->prepare(qq{SELECT t.id, r.id AS raid, r.tick+c.wave-1 AS landingtick, released_coords, coords(x,y,z),c.launched +FROM raid_claims c + JOIN raid_targets t ON c.target = t.id + JOIN raids r ON t.raid = r.id + JOIN current_planet_stats p ON t.planet = p.id +WHERE c.uid = ? AND r.tick+c.wave > ? AND r.open AND not r.removed +ORDER BY r.tick+c.wave,x,y,z}); + $query->execute($UID,$TICK); + my @targets; + while (my $target = $query->fetchrow_hashref){ + my $coords = "Target $target->{id}"; + $coords = $target->{coords} if $target->{released_coords}; + push @targets,{Coords => $coords, Launched => $target->{launched}, Raid => $target->{raid} + , Target => $target->{id}, Tick => $target->{landingtick}}; + } + $ND::TEMPLATE->param(Targets => \@targets); +} $ND::TEMPLATE->param(BODY => $ND::BODY->output); print $TEMPLATE->output;