X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=NDWeb%2FInclude.pm;h=5794b469c4eef5f9a1b7e7c9f239b3239c4039ec;hb=34876053e79ee0153b38c8cad7c9404322472f29;hp=5ef1dbae143a5330f86313ff3c14f8d1a1dc80ac;hpb=9d5814b742ee4fae0209ae238bcea9db11137fdf;p=ndwebbie.git diff --git a/NDWeb/Include.pm b/NDWeb/Include.pm index 5ef1dba..5794b46 100644 --- 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