most of intel done

diff --git a/include.pl b/include.pl
index fe3646d0a1cfe215db5b828eafea2fd9e38a753f..ad9fd06e197cd7f6c3b16b50ff311c790016f42d 100644 (file)
--- a/include.pl
+++ b/include.pl
@@ -41,7 +41,11 @@ sub isOfficer {
 }
 
 sub isScanner {
-       return exists $ND::GROUPS{Scanner};
+       return exists $ND::GROUPS{Scanners};
+}
+
+sub isIntel {
+       return exists $ND::GROUPS{Intel};
 }
 
 sub parseMarkup {
@@ -90,9 +94,23 @@ sub alliances {
        my $query = $ND::DBH->prepare(q{SELECT id,name FROM alliances ORDER BY name});
        $query->execute;        
        while (my $ally = $query->fetchrow_hashref){
-               push @alliances,{Id => $ally->{id}, Name => $ally->{name}, Selected => $alliance eq $ally->{name}};
+               push @alliances,{Id => $ally->{id}, Name => $ally->{name}, Selected => $alliance == $ally->{id}};
        }
        return @alliances;
 }
 
+sub intelquery {
+       my ($columns,$where) = @_;
+       return qq{
+SELECT $columns, i.mission, i.tick AS landingtick,MIN(i.eta) AS eta, i.amount, i.ingal, u.username
+FROM (intel 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
+       LEFT OUTER JOIN alliances ta ON t.alliance_id = ta.id
+       LEFT OUTER JOIN alliances oa ON o.alliance_id = oa.id
+WHERE $where 
+GROUP BY t.x,t.y,t.z,o.x,o.y,o.z,i.mission,i.tick,i.amount,i.ingal,u.username,ta.name,oa.name 
+ORDER BY i.tick DESC, i.mission};
+}
+
 1;

diff --git a/index.pl b/index.pl
index 3937831a738e81695fbfe29e681184ee0d442956..58f67b431dca1707871a97f3cd2c02ef1056db86 100755 (executable)
--- a/index.pl
+++ b/index.pl
@@ -63,7 +63,7 @@ while (my ($name,$attack,$gid) = $query->fetchrow()){
 our $LOG = $DBH->prepare('INSERT INTO log (uid,text) VALUES(?,?)');
 
 my $page = 'main';
-if (param('page') =~ /^(main|check|motd|points|covop|top100|launchConfirmation|addintel|defrequest|raids|editRaid|calls)$/){
+if (param('page') =~ /^(main|check|motd|points|covop|top100|launchConfirmation|addintel|defrequest|raids|editRaid|calls|intel)$/){
        $page = $1;
 }
 
@@ -89,6 +89,7 @@ unless (my $return = do "${page}.pl"){
 unless ($XML){
        my $fleetupdate = $DBH->selectrow_array('SELECT landing_tick FROM fleets WHERE uid = ? AND fleet = 0',undef,$UID);
 
+
        $TEMPLATE->param(Tick => $TICK);
        $TEMPLATE->param(isMember => (($TICK - $fleetupdate < 24) || isScanner()) && $PLANET && isMember());
        $TEMPLATE->param(isHC => isHC());
@@ -98,6 +99,7 @@ unless ($XML){
        if ($ATTACKER && (!isMember() || ((($TICK - $fleetupdate < 24) || isScanner()) && $PLANET))){
                $ND::TEMPLATE->param(Targets => listTargets());
        }
+       $TEMPLATE->param(Coords => param('coords') ? param('coords') : '1:1:1');
 
 }
 $ND::TEMPLATE->param(BODY => $ND::BODY->output);

diff --git a/templates/skel.tmpl b/templates/skel.tmpl
index babc5b16036067f5e6ff715f4341c779a3dfe7b1..4c46decf901eb73e9aaf887ff3ceced9d8c4ac0e 100644 (file)
--- a/templates/skel.tmpl
+++ b/templates/skel.tmpl
@@ -30,7 +30,7 @@
                <ul class="linkbar">
                        <li><form action="index.pl" method="post"><p>
                                <input type="hidden" name="page" value="check"/>
-                               <input class="coord" type="text" name="coords" value="1:1:1"/>
+                               <input class="coord" type="text" name="coords" value="<TMPL_VAR NAME=Coords>"/>
                                <input class="coord" type="submit" value="Check"/>
                                </p></form></li>
                        <li><a href="index.pl?page=raids">Web raids</a></li>