X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=NDWeb%2FPages%2FIntel.pm;h=bd9777aeac0b787fd2ebba1f1c9876a8174aac61;hb=eb2ec45ab96b0968c5bfc5d17ec6c6d7a57ebe37;hp=58a8c67510ab72320e08e516fc117114ca9e0655;hpb=a074bd17f5e8ba341a22bbfca1da7093b8351774;p=ndwebbie.git

diff --git a/NDWeb/Pages/Intel.pm b/NDWeb/Pages/Intel.pm
index 58a8c67..bd9777a 100644
--- a/NDWeb/Pages/Intel.pm
+++ b/NDWeb/Pages/Intel.pm
@@ -158,7 +158,7 @@ sub render_body {
 		$BODY->param(Nick => escapeHTML($planet->{nick}));
 		$BODY->param(Channel => $planet->{channel});
 		my @status;
-		for my $status (" ","Friendly", "NAP", "Hostile"){
+		for my $status ("","Friendly", "NAP", "Hostile"){
 			push @status,{Status => $status, Selected => defined $planet->{planet_status} && $status eq $planet->{planet_status}}
 		}
 		$BODY->param(PlanetStatus => \@status);
@@ -171,15 +171,12 @@ sub render_body {
 		$query->execute($planet->{id}) or $error .= $DBH->errstr;
 		my @intellists;
 		my @incomings;
-		my $i = 0;
 		while (my $intel = $query->fetchrow_hashref){
 			if ($intel->{ingal}){
 				$intel->{missionclass} = 'ingal';
 			}else{
 				$intel->{missionclass} = $intel->{mission};
 			}
-			$i++;
-			$intel->{ODD} = $i % 2;
 			push @incomings,$intel;
 		}
 		push @intellists,{Message => 'Incoming fleets', Intel => \@incomings, Origin => 1};
@@ -187,15 +184,12 @@ sub render_body {
 		$query = $DBH->prepare(intelquery('t.alliance AS talliance,coords(t.x,t.y,t.z) AS target',"o.id = ? $showticks"));
 		$query->execute($planet->{id}) or $error .= $DBH->errstr;
 		my @outgoings;
-		$i = 0;
 		while (my $intel = $query->fetchrow_hashref){
 			if ($intel->{ingal}){
 				$intel->{missionclass} = 'ingal';
 			}else{
 				$intel->{missionclass} = $intel->{mission};
 			}
-			$i++;
-			$intel->{ODD} = $i % 2;
 			push @outgoings,$intel;
 		}
 		push @intellists,{Message => 'Outgoing Fleets', Intel => \@outgoings, Target => 1};
@@ -204,7 +198,7 @@ sub render_body {
 
 	}elsif(!param('coords')){
 		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 != o.alliance_id OR t.alliance_id IS NULL OR o.alliance_id IS NULL) AND i.mission != 'Attack')
+				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}));
@@ -212,15 +206,12 @@ sub render_body {
 
 		my @intellists;
 		my @intel;
-		my $i = 0;
 		while (my $intel = $query->fetchrow_hashref){
 			if ($intel->{ingal}){
 				$intel->{missionclass} = 'ingal';
 			}else{
 				$intel->{missionclass} = $intel->{mission};
 			}
-			$i++;
-			$intel->{ODD} = $i % 2;
 			push @intel,$intel;
 		}
 		push @intellists,{Message => q{Intel where alliances doesn't match}, Intel => \@intel, Origin => 1, Target => 1};