Better session support and auth logging

[ndwebbie.git] / NDWeb / Pages / Main.pm

diff --git a/NDWeb/Pages/Main.pm b/NDWeb/Pages/Main.pm
index b4c793b600dab86e6a769b176d456f30f00d4bd2..083b96da133a0fb365905090a9661e197b19ccfa 100644 (file)
--- a/NDWeb/Pages/Main.pm
+++ b/NDWeb/Pages/Main.pm
@@ -208,15 +208,16 @@ sub render_body {
        $query = $DBH->prepare(q{SELECT f.id, coords(x,y,z) AS target, mission
                , f.amount, tick, back
 FROM fleets f 
-JOIN fleet_ships fs USING (id)
 LEFT OUTER JOIN current_planet_stats p ON f.target = p.id
-WHERE f.uid = ? AND f.sender = ? AND 
+WHERE NOT ingal AND f.uid = ? AND f.sender = ? AND 
        (back >= ? OR (tick >= tick() -  24 AND name = 'Main'))
 GROUP BY f.id, x,y,z, mission, tick,back,f.amount
 ORDER BY x,y,z,mission,tick
                });
 
-       my $ships = $DBH->prepare(q{SELECT ship,amount FROM fleet_ships where id = ?});
+       my $ships = $DBH->prepare(q{SELECT ship,amount FROM fleet_ships
+               WHERe id = ? ORDER BY num
+       });
 
        $query->execute($self->{UID},$self->{PLANET},$self->{TICK}) or warn $DBH->errstr;
        my @fleets;