X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=include.pl;h=408361a369ecab58a8fceeec08ff5f41613efde8;hb=e63c14e793686ca3d8a47df6866134c21a77e4b7;hp=cb27693ad98045eb1a947189119942749a44bf70;hpb=f54a15bafe406d50d04b3ba874dd9b6a6432f118;p=ndwebbie.git

diff --git a/include.pl b/include.pl
index cb27693..408361a 100644
--- a/include.pl
+++ b/include.pl
@@ -40,12 +40,47 @@ sub isOfficer {
 	return exists $ND::GROUPS{Officers};
 }
 
+sub isScanner {
+	return exists $ND::GROUPS{Scanner};
+}
+
 sub parseMarkup {
 	my ($text) = @_;
 
 	$text =~ s{\n}{\n<br/>}g;
-	$text =~ s{\[B\](.*?)\[B\]}{<b>$1</b>};
+	$text =~ s{\[B\](.*?)\[/B\]}{<b>$1</b>};
 	return $text;
 }
 
+sub min {
+    my ($x,$y) = @_;
+    return ($x > $y ? $y : $x);
+}
+
+sub max {
+    my ($x,$y) = @_;
+    return ($x < $y ? $y : $x);
+}
+
+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
+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($ND::UID,$ND::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}};
+	}
+	my $template = HTML::Template->new(filename => "templates/targetlist.tmpl");
+	$template->param(Targets => \@targets);
+	return $template->output;
+}
+
 1;