X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FRoot.pm;h=5faa024d2567b5c72c0c55aa82262dfd69d367ee;hb=f3cd955b85092ea418d9c1de90be49c9f598527f;hp=370264b06407a433782dfb980e9c0bd25f96a549;hpb=d45be4932ae05a14c783ddc90bdfb6d347ce349d;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Root.pm b/lib/NDWeb/Controller/Root.pm
index 370264b..5faa024 100644
--- a/lib/NDWeb/Controller/Root.pm
+++ b/lib/NDWeb/Controller/Root.pm
@@ -95,6 +95,8 @@ 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{
@@ -108,7 +110,6 @@ WHERE msgid = $1
 		,$c->req->param('charge')
 		,$c->req->param('timestamp'));
 
-	$c->stash(template => 'default.tt2');
 }
 
 
@@ -128,8 +129,8 @@ sub listTargets : Private {
 
 	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
@@ -242,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