From 48758dc8fcccd3046f2a6876aea75829da301a55 Mon Sep 17 00:00:00 2001
From: Michael Andreen <harv@ruin.nu>
Date: Sat, 2 Sep 2017 14:01:40 +0200
Subject: [PATCH] Fleet paste is not mandatory anymore

---
 lib/NDWeb/Controller/Root.pm |  5 +----
 root/lib/site/leftbar.tt2    | 17 -----------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/lib/NDWeb/Controller/Root.pm b/lib/NDWeb/Controller/Root.pm
index 29a0cbc..4608240 100644
--- a/lib/NDWeb/Controller/Root.pm
+++ b/lib/NDWeb/Controller/Root.pm
@@ -243,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
diff --git a/root/lib/site/leftbar.tt2 b/root/lib/site/leftbar.tt2
index 8dae00e..b20c8b8 100644
--- a/root/lib/site/leftbar.tt2
+++ b/root/lib/site/leftbar.tt2
@@ -69,23 +69,6 @@
 		onclick = "listTargets()">
 </p>
 <div id="targets">[% PROCESS inc/targetlist.tt2 %]</div>
-[% ELSIF c.check_user_roles("member_menu") %]
-	[% IF c.user.planet %]
-	<p><b>Update your fleets to see raids and launch confirmation</b></p>
-<form action="[% c.uri_for('/members/postconfirmation') %]" method="post">
-	<p>Paste your fleets from fleets page here:</p>
-	<p><textarea rows="5" cols="15" name="mission"></textarea>
-	<br><input type="submit" value="Submit">
-	</p>
-</form>
-	[% ELSE %]
-	<form action="/members/postowncoords" method="post">
-		<p>We need your planet's coordinates:
-		<input type="text" name="planet" value="">
-		<input type="submit" value="Submit">
-		</p>
-	</form>
-	[% END %]
 [% END %]
 [% IF c.check_user_roles("covop") %]
 <p>Covop menu</p>
-- 
2.39.2