Converted intel page

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

diff --git a/NDWeb/Pages/DefLeeches.pm b/NDWeb/Pages/DefLeeches.pm
index 1f05da28bcbb785e9f6f2707a47cd6497d4a293b..d187bb62cfce7eeae5eed2643933ce1997507941 100644 (file)
--- a/NDWeb/Pages/DefLeeches.pm
+++ b/NDWeb/Pages/DefLeeches.pm
@@ -37,9 +37,10 @@ sub render_body {
        return $self->noAccess unless $self->isDC;
 
        my $query = $DBH->prepare(q{SELECT username,defense_points,count(id) AS calls, SUM(fleets) AS fleets, SUM(recalled) AS recalled
-               FROM (SELECT username,defense_points,c.id,count(f.target) AS fleets, count(NULLIF(f.landing_tick + f.eta -1 = f.back,TRUE)) AS recalled
-                       FROM users u JOIN calls c ON c.member = u.uid LEFT OUTER JOIN fleets f ON u.planet = f.target AND c.landing_tick = f.landing_tick
-                       WHERE (f.mission = 'Defend') OR f.target IS NULL
+               FROM (SELECT username,defense_points,c.id,count(f.target) AS fleets, count(NULLIF(f.tick + f.eta -1 = f.back,TRUE)) AS recalled
+                       FROM users u JOIN calls c ON c.member = u.uid LEFT OUTER JOIN fleets f ON u.planet = f.target AND c.landing_tick = f.tick
+                       WHERE (f.mission = 'Defend' AND f.uid > 0 AND f.back IS NOT NULL AND NOT ingal)
+                               OR f.target IS NULL
                        GROUP BY username,defense_points,c.id
                        ) d
                GROUP BY username,defense_points ORDER BY fleets DESC, defense_points
@@ -47,9 +48,7 @@ sub render_body {
        $query->execute;
 
        my @members;
-       my $i = 0;
        while ( my $member = $query->fetchrow_hashref){
-               $member->{ODD} = $i++ % 2;
                push @members,$member;
        }
        $BODY->param(Members => \@members);