From: Michael Andreen <harv@ruin.nu>
Date: Wed, 11 Jun 2008 13:17:36 +0000 (+0200)
Subject: Don't show ingal launch confirmations as intel
X-Git-Url: https://ruin.nu/git/?a=commitdiff_plain;h=961956798336852fd1430ea4298cae6b179deff8;p=ndwebbie.git

Don't show ingal launch confirmations as intel
---

diff --git a/NDWeb/Pages/Alliances.pm b/NDWeb/Pages/Alliances.pm
index 7fc0224..59106e6 100644
--- a/NDWeb/Pages/Alliances.pm
+++ b/NDWeb/Pages/Alliances.pm
@@ -119,6 +119,7 @@ sub render_body {
 				AND (i.mission = 'Defend' OR i.mission = 'AllyDef')
 				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)
+				AND NOT (i.back IS NOT NULL AND i.back = i.tick + 4)
 				}));
 		$query->execute($alliance->{id}) or warn $DBH->errstr;
 
diff --git a/NDWeb/Pages/Intel.pm b/NDWeb/Pages/Intel.pm
index a5dfc5e..6e1d17f 100644
--- a/NDWeb/Pages/Intel.pm
+++ b/NDWeb/Pages/Intel.pm
@@ -216,7 +216,9 @@ sub render_body {
 				AND ((( t.alliance_id != o.alliance_id OR t.alliance_id IS NULL OR o.alliance_id IS NULL) AND (i.mission = 'Defend' OR i.mission = 'AllyDef' ))
 				OR ( t.alliance_id = o.alliance_id AND i.mission = 'Attack'))
 				AND i.sender NOT IN (SELECT planet FROM users u NATURAL JOIN groupmembers gm WHERE gid = 8 AND planet IS NOT NULL)
-				$showticks}));
+				AND NOT (i.back IS NOT NULL AND i.back = i.tick + 4)
+				$showticks
+				}));
 		$query->execute() or $error .= $DBH->errstr;
 
 		my @intellists;