Fleet paste is not mandatory anymore

diff --git a/lib/NDWeb/Controller/Root.pm b/lib/NDWeb/Controller/Root.pm
index 29a0cbcb1a665a029c2709cbc07d84609eedf465..4608240644ad7cb0f212f6671f41641e0ce98aec 100644 (file)
--- 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
                });
                        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
                $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 8dae00ea2902c53f246124b01b6d2fed997cc65d..b20c8b8345480780e4760caedcb33bb5dcc2bef8 100644 (file)
--- 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>
                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>
 [% END %]
 [% IF c.check_user_roles("covop") %]
 <p>Covop menu</p>