more fatal warnings and other cleanup

[ndwebbie.git] / check.pl

diff --git a/check.pl b/check.pl
index da2444af513fd6e0c12868f784cf87814c547bd0..9acf9bf0d89d957189b3028a9c2dc7ba19db089b 100644 (file)
--- a/check.pl
+++ b/check.pl
@@ -18,11 +18,14 @@
 #**************************************************************************/
 
 use strict;
+use warnings FATAL => 'all';
+no warnings qw(uninitialized);
 
 $ND::TEMPLATE->param(TITLE => 'Check planets and galaxies');
 
 our $BODY;
 our $DBH;
+our $LOG;
 
 $BODY->param(isBC => isMember() && (isOfficer() || isBC));
 
@@ -34,11 +37,21 @@ if (param('coords') =~ /(\d+)(?: |:)(\d+)(?:(?: |:)(\d+))?(?: |:(\d+))?/){
        $x = $1;
        $y = $2;
        $z = $3;
+       $BODY->param(Coords => param('coords'));
 }else{
        die "Bad coords";
 }
 
-if (param('cmd') eq 'arbiter'){
+if (isMember() && param('cmd') eq 'arbiter'){
+       my $query = $DBH->prepare(q{SELECT count(*) AS friendlies FROM current_planet_stats WHERE x = ? AND y = ? 
+               AND (planet_status IN ('Friendly','NAP') OR relationship IN ('Friendly','NAP'))});
+       my ($count) = $DBH->selectrow_array($query,undef,$x,$y);
+       if ($count > 0){
+               $BODY->param(Arbiter => '<b>DO NOT ATTACK THIS GAL</b>');
+       }else{
+               $BODY->param(Arbiter => '<b>KILL THESE BASTARDS</b>');
+       }
+       $LOG->execute($ND::UID,"Arbiter check on $x:$y");
 }
 
 my $where = '';
@@ -57,9 +70,13 @@ if (defined $z){
        $query->execute($x,$y,$z);
 }else{
        $query->execute($x,$y);
+       if (isMember() && (isBC() || isOfficer()) && !isHC()){
+               $LOG->execute($ND::UID,"BC browsing $x:$y");
+       }
 }
 my @planets;
 my $planet_id = undef;
+my $i = 0;
 while (my ($id,$coords,$planet,$race,$size,$score,$value,$xp,$sizerank,$scorerank,$valuerank,$xprank
                ,$fleetvalue,$resvalue,$planet_status,$hit_us,$alliance,$relationship,$nick) = $query->fetchrow){
        $planet_id = $id;
@@ -73,12 +90,17 @@ while (my ($id,$coords,$planet,$race,$size,$score,$value,$xp,$sizerank,$scoreran
                $planet{PlanetStatus} = $planet_status;
                $planet{Relationship} = $relationship;
                $planet{isBC} = 1;
+               if ($z && $alliance eq 'NewDawn'){
+                       $LOG->execute($ND::UID,"BC browsing ND planet $coords tick $ND::TICK");
+               }
        }
+       $i++;
+       $planet{ODD} = $i % 2;
        push @planets,\%planet;
 }
 $BODY->param(Planets => \@planets);
 
-if ($planet_id){
+if ($z && $planet_id){
        $BODY->param(OnePlanet => 1);
 
        my $query = $DBH->prepare(q{ 
@@ -88,7 +110,7 @@ FROM intel i
                NATURAL JOIN planet_stats) p ON i.target = p.id
        JOIN (planets
                NATURAL JOIN planet_stats) p2 ON i.sender = p2.id
-WHERE  p.tick = ( SELECT max(tick) FROM planet_stats) AND i.tick > $TICK AND i.uid = -1 
+WHERE  p.tick = ( SELECT max(tick) FROM planet_stats) AND i.tick > tick() AND i.uid = -1 
        AND p2.tick = p.tick AND p2.id = ?
 GROUP BY p.x,p.y,p.z,p2.x,p2.y,p2.z,i.mission,i.tick,i.amount,i.ingal,i.uid
 ORDER BY p.x,p.y,p.z});
@@ -101,7 +123,7 @@ ORDER BY p.x,p.y,p.z});
        $BODY->param(Missions => \@missions);
 
        my @scans;
-       my $query = $DBH->prepare(q{SELECT value,tick FROM planet_stats 
+       $query = $DBH->prepare(q{SELECT value,tick FROM planet_stats 
                WHERE id = ? AND tick > tick() - 24});
        my $scan = q{
 <p>Value the last 24 ticks</p>
@@ -118,8 +140,8 @@ ORDER BY p.x,p.y,p.z});
        $scan .= q{</table>};
        push @scans, {Scan => $scan};
 
-       my $query = $DBH->prepare(q{SELECT x,y,z,tick FROM planet_stats WHERE id = ?});
-       my $scan = q{
+       $query = $DBH->prepare(q{SELECT x,y,z,tick FROM planet_stats WHERE id = ?});
+       $scan = q{
 <p>Previous Coords</p>
 <table><tr><th>Tick</th><th>Value</th><th>Difference</th></tr>};
        $query->execute($planet_id);
@@ -135,7 +157,7 @@ ORDER BY p.x,p.y,p.z});
        $scan .= q{</table>};
        push @scans, {Scan => $scan};
 
-       my $query = $DBH->prepare(q{SELECT DISTINCT ON (type) type,scan_id, tick, scan FROM scans WHERE planet = ?
+       $query = $DBH->prepare(q{SELECT DISTINCT ON (type) type,scan_id, tick, scan FROM scans WHERE planet = ?
                GROUP BY type,scan_id, tick, scan ORDER BY type,tick DESC});
        $query->execute($planet_id);
        my %scans;