Make relationship and planet_status an enum

[ndwebbie.git] / NDWeb / Include.pm

diff --git a/NDWeb/Include.pm b/NDWeb/Include.pm
index 5ef1dbae143a5330f86313ff3c14f8d1a1dc80ac..5794b469c4eef5f9a1b7e7c9f239b3239c4039ec 100644 (file)
--- a/NDWeb/Include.pm
+++ b/NDWeb/Include.pm
@@ -65,7 +65,7 @@ sub alliances {
        my ($alliance) = @_;
        my @alliances;
        $alliance = -1 unless defined $alliance;
-       push @alliances,{Id => -1, Name => ' ', Selected => not $alliance};
+       push @alliances,{Id => -1, Name => '', Selected => not $alliance};
        my $query = $ND::DBH->prepare(q{SELECT id,name FROM alliances ORDER BY LOWER(name)});
        $query->execute;        
        while (my $ally = $query->fetchrow_hashref){
@@ -78,7 +78,7 @@ sub intelquery {
        my ($columns,$where) = @_;
        return qq{
 SELECT $columns, i.mission, i.tick AS landingtick,MIN(i.eta) AS eta, i.amount, i.ingal, u.username
-FROM (intel i NATURAL JOIN users u)
+FROM (fleets i NATURAL JOIN users u)
        JOIN current_planet_stats t ON i.target = t.id
        JOIN current_planet_stats o ON i.sender = o.id
 WHERE $where