Fleet paste is not mandatory anymore

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

diff --git a/lib/NDWeb/Controller/Root.pm b/lib/NDWeb/Controller/Root.pm
index a6bb56ad40c7a8c95097a0b44fd5651ac6ffb6dd..4608240644ad7cb0f212f6671f41641e0ce98aec 100644 (file)
--- a/lib/NDWeb/Controller/Root.pm
+++ b/lib/NDWeb/Controller/Root.pm
@@ -33,7 +33,7 @@ NDWeb::Controller::Root - Root Controller for NDWeb
 sub index : Local Path Args(0) {
        my ( $self, $c ) = @_;
 
-       $c->visit('/wiki/index');
+       $c->visit('/wiki/main');
 }
 
 sub default : Path {
@@ -46,7 +46,7 @@ sub login : Local {
        my ($self, $c) = @_;
 
        if ($c->login){
-               my $gi = Geo::IP->new(GEOIP_STANDARD);
+               my $gi = Geo::IP->new("/usr/share/GeoIP/GeoIP.dat");
                my $country = $gi->country_code_by_addr($c->req->address) || '??';
 
                my $remember = 0;
@@ -95,6 +95,10 @@ sub smsconfirm : Local {
        my ($self, $c) = @_;
        my $dbh = $c->model;
 
+       $c->stash(template => 'default.tt2');
+
+       return unless $c->req->param('apiMsgId');
+
        my $sms = $dbh->prepare(q{
 UPDATE sms SET status = $2, cost = $3
        ,time = TIMESTAMP WITH TIME ZONE 'epoch' + $4 * INTERVAL '1 second'
@@ -106,7 +110,6 @@ WHERE msgid = $1
                ,$c->req->param('charge')
                ,$c->req->param('timestamp'));
 
-       $c->stash(template => 'default.tt2');
 }
 
 
@@ -131,7 +134,7 @@ sub listTargets : Private {
 FROM raid_claims c
        JOIN raid_targets t ON c.target = t.id
        JOIN raids r ON t.raid = r.id
-       JOIN current_planet_stats p ON t.planet = p.id
+       JOIN current_planet_stats p USING (pid)
 WHERE c.uid = $1 AND r.tick+c.wave > tick() AND r.open AND not r.removed
 ORDER BY r.tick+c.wave,x,y,z});
        $query->execute($c->user->id) or die $dbh->errstr;
@@ -146,8 +149,8 @@ ORDER BY r.tick+c.wave,x,y,z});
 sub listAlliances : Private {
        my ($self, $c) = @_;
        my @alliances;
-       push @alliances,{id => -1, name => ''};
-       my $query = $c->model->prepare(q{SELECT id,name FROM alliances ORDER BY LOWER(name)});
+       push @alliances,{aid => '', alliance => ''};
+       my $query = $c->model->prepare(q{SELECT aid,alliance FROM alliances ORDER BY LOWER(alliance)});
        $query->execute;
        while (my $ally = $query->fetchrow_hashref){
                push @alliances,$ally;
@@ -224,7 +227,7 @@ sub end : ActionClass('RenderView') {
                my $fleetupdate = 0;
                if ($c->check_user_roles(qw/member_menu/)){
                        $fleetupdate = $dbh->selectrow_array(q{
-SELECT tick FROM fleets WHERE planet = ? AND tick > tick() - 24
+SELECT tick FROM fleets WHERE pid = ? AND tick > tick() - 24
 AND mission = 'Full fleet' AND name IN ('Main','Advanced Unit');
                                },undef,$c->user->planet);
                        $fleetupdate = 0 unless defined $fleetupdate;
@@ -240,10 +243,7 @@ AND mission = 'Full fleet' AND name IN ('Main','Advanced Unit');
                        newposts => $newposts,
                        unreadposts => $unread
                });
-               $c->stash->{user}->{attacker} = $c->check_user_roles(qw/attack_menu/)
-                       && (!$c->check_user_roles(qw/member_menu/)
-                               || ($c->user->planet && (($c->stash->{TICK} - $fleetupdate < 24)
-                                       || $c->check_user_roles(qw/no_fleet_update/)))),
+               $c->stash->{user}->{attacker} = $c->check_user_roles(qw/attack_menu/);
                $c->forward('listTargets');
        }
        my $birthdays = $dbh->prepare(q{SELECT username