X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=check.pl;h=9acf9bf0d89d957189b3028a9c2dc7ba19db089b;hb=ccf38f8bef1adef7c1ef8797d8c84e477bc82305;hp=1f9fd03680866328a729e720fb6ef861047ac163;hpb=c9e39420232b0014b54b6b577a0523282d8c3b5a;p=ndwebbie.git

diff --git a/check.pl b/check.pl
index 1f9fd03..9acf9bf 100644
--- a/check.pl
+++ b/check.pl
@@ -18,6 +18,8 @@
 #**************************************************************************/
 
 use strict;
+use warnings FATAL => 'all';
+no warnings qw(uninitialized);
 
 $ND::TEMPLATE->param(TITLE => 'Check planets and galaxies');
 
@@ -41,9 +43,9 @@ if (param('coords') =~ /(\d+)(?: |:)(\d+)(?:(?: |:)(\d+))?(?: |:(\d+))?/){
 }
 
 if (isMember() && param('cmd') eq 'arbiter'){
-	my $query = $DBH->prepare(q{SELECT count(*) AS friendlies FROM current_planet_stats WHERE x = ? AND z = ? 
+	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);
+	my ($count) = $DBH->selectrow_array($query,undef,$x,$y);
 	if ($count > 0){
 		$BODY->param(Arbiter => '<b>DO NOT ATTACK THIS GAL</b>');
 	}else{
@@ -74,6 +76,7 @@ if (defined $z){
 }
 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;
@@ -91,6 +94,8 @@ while (my ($id,$coords,$planet,$race,$size,$score,$value,$xp,$sizerank,$scoreran
 			$LOG->execute($ND::UID,"BC browsing ND planet $coords tick $ND::TICK");
 		}
 	}
+	$i++;
+	$planet{ODD} = $i % 2;
 	push @planets,\%planet;
 }
 $BODY->param(Planets => \@planets);
@@ -118,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>
@@ -135,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);
@@ -152,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;