X-Git-Url: https://ruin.nu/git/?p=ndwebbie.git;a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FRoot.pm;h=4608240644ad7cb0f212f6671f41641e0ce98aec;hp=4aa6d9557dd2100ce52003bc8718424c0d23b661;hb=48758dc8fcccd3046f2a6876aea75829da301a55;hpb=a55dcea9b24ca54ee4a1a992c2d381cb5dde963b

diff --git a/lib/NDWeb/Controller/Root.pm b/lib/NDWeb/Controller/Root.pm
index 4aa6d95..4608240 100644
--- a/lib/NDWeb/Controller/Root.pm
+++ b/lib/NDWeb/Controller/Root.pm
@@ -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');
 }
 
 
@@ -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