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

diff --git a/include.pl b/include.pl
index fe3646d..0bf16a8 100644
--- a/include.pl
+++ b/include.pl
@@ -41,7 +41,11 @@ sub isOfficer {
 }
 
 sub isScanner {
-	return exists $ND::GROUPS{Scanner};
+	return exists $ND::GROUPS{Scanners};
+}
+
+sub isIntel {
+	return exists $ND::GROUPS{Intel};
 }
 
 sub parseMarkup {
@@ -63,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
@@ -76,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);
@@ -90,9 +96,21 @@ sub alliances {
 	my $query = $ND::DBH->prepare(q{SELECT id,name FROM alliances ORDER BY name});
 	$query->execute;	
 	while (my $ally = $query->fetchrow_hashref){
-		push @alliances,{Id => $ally->{id}, Name => $ally->{name}, Selected => $alliance eq $ally->{name}};
+		push @alliances,{Id => $ally->{id}, Name => $ally->{name}, Selected => $alliance == $ally->{id}};
 	}
 	return @alliances;
 }
 
+sub intelquery {
+	my ($columns,$where) = @_;
+	return qq{
+SELECT $columns, i.mission, i.tick AS landingtick,MIN(i.eta) AS eta, i.amount, i.ingal, u.username
+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,t.nick,o.nick
+ORDER BY i.tick DESC, i.mission};
+}
+
 1;