X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=ND%2FWeb%2FPages%2FAlliances.pm;fp=ND%2FWeb%2FPages%2FAlliances.pm;h=69d7c92594695bfbaa6fe88e15ad3e5f34045120;hb=c6a6e6dbab0ca435e6aeeb94e7c7329585b7b4f1;hp=f9b830fc1c58a10c0a416a25a36a1e4dddb804dc;hpb=67656e7f539b7fd6470ecf6a7653edcf871875bb;p=ndwebbie.git

diff --git a/ND/Web/Pages/Alliances.pm b/ND/Web/Pages/Alliances.pm
index f9b830f..69d7c92 100644
--- a/ND/Web/Pages/Alliances.pm
+++ b/ND/Web/Pages/Alliances.pm
@@ -103,12 +103,12 @@ sub render_body {
 		}
 		$BODY->param(Members => \@members);
 
-		my $query = $DBH->prepare(intelquery('o.alliance AS oalliance,coords(o.x,o.y,o.z) AS origin, t.alliance AS talliance,coords(t.x,t.y,t.z) AS target',qq{not ingal AND (t.alliance_id = ? OR t.alliance_id = ?)
+		my $query = $DBH->prepare(intelquery('o.alliance AS oalliance,coords(o.x,o.y,o.z) AS origin, t.alliance AS talliance,coords(t.x,t.y,t.z) AS target',q{not ingal AND (o.alliance_id = $1 OR t.alliance_id = $1)
 				AND (i.mission = 'Defend' OR i.mission = 'AllyDef')
-				AND (t.alliance_id != ? OR t.alliance_id IS NULL OR o.alliance_id != ? OR o.alliance_id IS NULL)
+				AND ((( t.alliance_id != o.alliance_id OR t.alliance_id IS NULL OR o.alliance_id IS NULL)))
 				AND i.sender NOT IN (SELECT planet FROM users u NATURAL JOIN groupmembers gm WHERE gid = 8 AND planet IS NOT NULL)
 				}));
-		$query->execute($alliance->{id},$alliance->{id},$alliance->{id},$alliance->{id}) or $error .= $DBH->errstr;
+		$query->execute($alliance->{id}) or $error .= $DBH->errstr;
 
 		my @intel;
 		$i = 0;