Allow users to store their birthday

[ndwebbie.git] / lib / NDWeb / Controller / CovOp.pm

diff --git a/lib/NDWeb/Controller/CovOp.pm b/lib/NDWeb/Controller/CovOp.pm
index 68ef8a8059533cf6546fd59c847ecaf04dda2cb2..faf4296660d9de465ec6436a44106b00b286e412 100644 (file)
--- a/lib/NDWeb/Controller/CovOp.pm
+++ b/lib/NDWeb/Controller/CovOp.pm
@@ -25,12 +25,14 @@ sub index :Path :Args(0) {
        my ( $self, $c ) = @_;
        $c->stash( where => q{AND MaxResHack > 130000
                ORDER BY minalert ASC,MaxResHack DESC});
+       $c->forward('list');
 }
 
 sub distwhores : Local {
        my ( $self, $c ) = @_;
        $c->stash( where =>  qq{AND distorters > 0
                ORDER BY distorters DESC, minalert ASC});
+       $c->forward('list');
 }
 
 sub marktarget : Local {
@@ -43,23 +45,23 @@ sub marktarget : Local {
        $c->res->redirect($c->req->referer);
 }
 
-sub end : Private {
+sub list : Private {
        my ( $self, $c ) = @_;
        my $dbh = $c->model;
 
        my $query = $dbh->prepare(q{SELECT id, coords, metal, crystal, eonium
-               , covop_alert(seccents,structures,gov,0) AS minalert
-               , covop_alert(seccents,structures,gov,50) AS maxalert
+               , covop_alert(seccents,structures,size,guards,gov,0) AS minalert
+               , covop_alert(seccents,structures,size,guards,gov,50) AS maxalert
                , distorters,gov
                , MaxResHack,co.tick AS lastcovop
-               FROM (SELECT p.id,coords(x,y,z), metal,crystal,eonium,
-                       seccents,NULLIF(ss.total::integer,0) AS structures,distorters
+               FROM (SELECT p.id,coords(x,y,z),size, metal,crystal,eonium,guards
+                       ,seccents,NULLIF(ss.total::integer,0) AS structures,distorters
                        ,max_bank_hack(metal,crystal,eonium,p.value
                                ,(SELECT value FROM current_planet_stats WHERE id = ?)) AS MaxResHack
                        , planet_status, relationship,gov
                        FROM current_planet_stats p
-                               LEFT OUTER JOIN planet_scans ps ON p.id = ps.planet
-                               LEFT OUTER JOIN structure_scans ss ON p.id = ss.planet
+                               LEFT OUTER JOIN current_planet_scans ps ON p.id = ps.planet
+                               LEFT OUTER JOIN current_structure_scans ss ON p.id = ss.planet
                        ) AS foo
                        LEFT OUTER JOIN (SELECT id,max(tick) AS tick FROM covop_attacks GROUP BY id) co USING (id)
                WHERE (metal IS NOT NULL OR seccents IS NOT NULL)
@@ -75,7 +77,6 @@ sub end : Private {
        $c->stash(targets => \@targets);
 
        $c->stash(template => 'covop/index.tt2');
-       $c->forward('/end');
 }
 =head1 AUTHOR