X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=include.pl;h=c5a5acf39417f6d525837f284a0c837eea5a62f2;hb=fae2bc23805ceb29510c1c8124ddb9179a6cc0af;hp=07bb9857984e1563d3a47f24c13dfee6f0715cf1;hpb=0c6242438cc218a6a6980c961484b8c74d547eee;p=ndwebbie.git diff --git a/include.pl b/include.pl index 07bb985..c5a5acf 100644 --- a/include.pl +++ b/include.pl @@ -80,7 +80,7 @@ ORDER BY r.tick+c.wave,x,y,z}); 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}, Wave => $target->{wave}}; + , Target => $target->{id}, Tick => $target->{landingtick}, Wave => $target->{wave}, AJAX => $ND::AJAX}; } my $template = HTML::Template->new(filename => "templates/targetlist.tmpl"); $template->param(Targets => \@targets); @@ -107,7 +107,7 @@ FROM (intel i NATURAL JOIN users u) JOIN current_planet_stats t ON i.target = t.id JOIN current_planet_stats o ON i.sender = o.id WHERE $where -GROUP BY i.tick,i.mission,t.x,t.y,t.z,o.x,o.y,o.z,i.amount,i.ingal,u.username,t.alliance,o.alliance +GROUP BY i.tick,i.mission,t.x,t.y,t.z,o.x,o.y,o.z,i.amount,i.ingal,u.username,t.alliance,o.alliance,t.nick,o.nick ORDER BY i.tick DESC, i.mission}; }