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;
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'
WHERE msgid = $1
});
- $sms->execute($c->req->param('apiMsgId')
- ,$clickatellstatus{$c->req->param('status')}
- ,$c->req->param('charge')
- ,$c->req->param('timestamp'));
+ my $apiMsgId = $c->req->param('apiMsgId');
+ my $status = $c->req->param('status');
+ my $charge = $c->req->param('charge');
+ my $timestamp = $c->req->param('timestamp');
+ $sms->execute($apiMsgId
+ ,$clickatellstatus{$status}
+ ,$charge
+ ,$timestamp);
- $c->stash(template => 'default.tt2');
}
my $dbh = $c ->model;
- my $query = $dbh->prepare(q{SELECT t.id, r.id AS raid, r.tick+c.wave-1 AS landingtick,
- (released_coords AND old_claim(timestamp)) AS released_coords, coords(x,y,z),c.launched,c.wave,c.joinable
+ my $query = $dbh->prepare(q{SELECT t.id, r.id AS raid, r.tick+c.wave-1 AS landingtick,
+ released_coords, coords(x,y,z),c.launched,c.wave,c.joinable
FROM raid_claims c
JOIN raid_targets t ON c.target = t.id
JOIN raids r ON t.raid = r.id
$c->stash->{template} = 'access_denied.tt2';
$c->res->status(403);
$c->clear_errors;
+ }elsif ($c->error->[0] =~ m/No logged in user, and none supplied as argument/){
+ $c->stash->{template} = 'access_denied.tt2';
+ $c->res->status(403);
+ $c->clear_errors;
}
}
if ($c->check_user_roles(qw/member_menu/)){
$fleetupdate = $dbh->selectrow_array(q{
SELECT tick FROM fleets WHERE pid = ? AND tick > tick() - 24
-AND mission = 'Full fleet' AND name IN ('Main','Advanced Unit');
+AND mission = 'Full fleet' AND name IN ('Main', 'Advanced Unit', 'Military');
},undef,$c->user->planet);
$fleetupdate = 0 unless defined $fleetupdate;
}
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