X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=include.pl;h=0bf16a8c3510283014b5f2f0346f9087f7e77f3d;hb=8bd21c625add06fed135d3ce99208c7a94b44882;hp=07bb9857984e1563d3a47f24c13dfee6f0715cf1;hpb=0c6242438cc218a6a6980c961484b8c74d547eee;p=ndwebbie.git

diff --git a/include.pl b/include.pl
index 07bb985..0bf16a8 100644
--- a/include.pl
+++ b/include.pl
@@ -67,7 +67,7 @@ sub max {
 }
 
 sub listTargets {
-	my $query = $ND::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,c.wave
+	my $query = $ND::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,c.wave,c.joinable
 FROM raid_claims c
 	JOIN raid_targets t ON c.target = t.id
 	JOIN raids r ON t.raid = r.id
@@ -80,7 +80,9 @@ 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, JoinName => $target->{joinable} ? 'N' : 'J'
+			, Joinable => $target->{joinable} ? 'FALSE' : 'TRUE'};
 	}
 	my $template = HTML::Template->new(filename => "templates/targetlist.tmpl");
 	$template->param(Targets => \@targets);
@@ -107,7 +109,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};
 }