X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FInclude.pm;h=1974724f7951ad1f3694efcfd8d301d86f00f2a0;hb=6e1e01771cd86b3b58f4932aacb0cc496b5c376d;hp=4b94597e79c7857d63e92e6b4fbc3f317dd3d69e;hpb=f9f06136c85f9634c409b71e18452c358530556e;p=ndwebbie.git

diff --git a/lib/NDWeb/Include.pm b/lib/NDWeb/Include.pm
index 4b94597..1974724 100644
--- a/lib/NDWeb/Include.pm
+++ b/lib/NDWeb/Include.pm
@@ -27,8 +27,8 @@ use CGI qw/:standard/;
 our @ISA = qw/Exporter/;
 
 our @EXPORT = qw/parseMarkup min max
-	alliances intelquery html_escape
-	comma_value/;
+	intelquery html_escape
+	comma_value array_expand/;
 
 sub html_escape($) {
 	return CGI::escapeHTML @_;
@@ -71,20 +71,6 @@ sub max {
     return ($x < $y ? $y : $x);
 }
 
-
-sub alliances {
-	my ($alliance) = @_;
-	my @alliances;
-	$alliance = -1 unless defined $alliance;
-	push @alliances,{Id => -1, Name => '', Selected => not $alliance};
-	my $query = $ND::DBH->prepare(q{SELECT id,name FROM alliances ORDER BY LOWER(name)});
-	$query->execute;	
-	while (my $ally = $query->fetchrow_hashref){
-		push @alliances,{Id => $ally->{id}, Name => $ally->{name}, Selected => $alliance == $ally->{id}};
-	}
-	return @alliances;
-}
-
 sub intelquery {
 	my ($columns,$where) = @_;
 	return qq{
@@ -93,10 +79,23 @@ FROM (fleets 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
+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,i.sender,i.target
 ORDER BY i.tick DESC, i.mission};
 }
 
+sub array_expand ($) {
+	my ($array) = @_;
+
+	my @arrays;
+	for my $string (@{$array}){
+		$string =~ s/^\((.*)\)$/$1/;
+		$string =~ s/"//g;
+		my @array = split /,/, $string;
+		push @arrays,\@array;
+	}
+	return \@arrays;
+}
+
 
 
 1;