small fix with the menu

diff --git a/include.pl b/include.pl
index cb27693ad98045eb1a947189119942749a44bf70..0f85f92b8d20bd3da2ae2ef276993b8417e84177 100644 (file)
--- a/include.pl
+++ b/include.pl
@@ -40,6 +40,10 @@ sub isOfficer {
        return exists $ND::GROUPS{Officers};
 }
 
        return exists $ND::GROUPS{Officers};
 }
 

+sub isScanner {
+       return exists $ND::GROUPS{Scanner};
+}
+

 sub parseMarkup {
        my ($text) = @_;
 
 sub parseMarkup {
        my ($text) = @_;
 

diff --git a/index.pl b/index.pl
index 1b55a133f8c3b74b9ccc1d4a21208ebe9e0958fc..f19ced961b3656ae6d4742382db50e0ef27a1a1a 100755 (executable)
--- a/index.pl
+++ b/index.pl
@@ -51,6 +51,7 @@ for my $file ("db.pl","include.pl"){
 
 ($TICK) = $DBH->selectrow_array('SELECT tick()',undef);
 
 
 ($TICK) = $DBH->selectrow_array('SELECT tick()',undef);
 

+

 my $query = $DBH->prepare('SELECT groupname,attack,gid from groupmembers NATURAL JOIN groups WHERE uid = ?');
 $query->execute($UID);
 
 my $query = $DBH->prepare('SELECT groupname,attack,gid from groupmembers NATURAL JOIN groups WHERE uid = ?');
 $query->execute($UID);
 


@@ -61,12 +62,6 @@ while (my ($name,$attack,$gid) = $query->fetchrow()){
        $ATTACKER = 1 if $attack;
 }
 
        $ATTACKER = 1 if $attack;
 }
 

-$TEMPLATE->param(Tick => $TICK);
-$TEMPLATE->param(isMember => isMember());
-$TEMPLATE->param(isHC => isHC());
-$TEMPLATE->param(isDC => isDC());
-$TEMPLATE->param(isBC => isBC());
-$TEMPLATE->param(isAttacker => $ATTACKER);

 
 our $LOG = $DBH->prepare('INSERT INTO log (uid,text) VALUES(?,?)');
 
 
 our $LOG = $DBH->prepare('INSERT INTO log (uid,text) VALUES(?,?)');
 


@@ -84,6 +79,15 @@ unless (my $return = do "${page}.pl"){
        print "<p><b>couldn't run $page</b></p>"       unless $return;
 }
 
        print "<p><b>couldn't run $page</b></p>"       unless $return;
 }
 

+my $fleetupdate = $DBH->selectrow_array('SELECT landing_tick FROM fleets WHERE uid = ? AND fleet = 0',undef,$UID);
+
+$TEMPLATE->param(Tick => $TICK);
+$TEMPLATE->param(isMember => (($TICK - $fleetupdate < 24) || isScanner()) && $PLANET && isMember());
+$TEMPLATE->param(isHC => isHC());
+$TEMPLATE->param(isDC => isDC());
+$TEMPLATE->param(isBC => isBC());
+$TEMPLATE->param(isAttacker => $ATTACKER && (!isMember() || ((($TICK - $fleetupdate < 24) || isScanner()) && $PLANET)));
+

 $ND::TEMPLATE->param(BODY => $ND::BODY->output);
 print $TEMPLATE->output;
 
 $ND::TEMPLATE->param(BODY => $ND::BODY->output);
 print $TEMPLATE->output;