Let officers see all members

[ndwebbie.git] / NDWeb / Pages / Intel.pm

diff --git a/NDWeb/Pages/Intel.pm b/NDWeb/Pages/Intel.pm
index c129d907c2109a465a28833533b54a6f0047ca8d..b1292655b6761452e998e6bff3f9e78220535044 100644 (file)
--- a/NDWeb/Pages/Intel.pm
+++ b/NDWeb/Pages/Intel.pm
@@ -17,17 +17,17 @@
 #   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
 #**************************************************************************/
 
-package ND::Web::Pages::Intel;
+package NDWeb::Pages::Intel;
 use strict;
 use warnings FATAL => 'all';
-use ND::Web::Forum;
-use ND::Web::Include;
+use NDWeb::Forum;
+use NDWeb::Include;
 use ND::Include;
 use CGI qw/:standard/;
 
-use base qw/ND::Web::XMLPage/;
+use base qw/NDWeb::XMLPage/;
 
-$ND::Web::Page::PAGES{intel} = __PACKAGE__;
+$NDWeb::Page::PAGES{intel} = __PACKAGE__;
 
 sub parse {
        my $self = shift;
@@ -204,7 +204,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}));