Show available ships

[ndwebbie.git] / lib / NDWeb / Controller / Members.pm

diff --git a/lib/NDWeb/Controller/Members.pm b/lib/NDWeb/Controller/Members.pm
index 59becdfbb62b770f4e9c40fa829994fc4703f419..440c51f47021a778f690c3e5a1400b6c23fc83e8 100644 (file)
--- a/lib/NDWeb/Controller/Members.pm
+++ b/lib/NDWeb/Controller/Members.pm
@@ -322,17 +322,17 @@ sub insertintel : Private {
 
        $dbh->begin_work;
        my $findscan = $dbh->prepare(q{SELECT scan_id FROM scans
-               WHERE scan_id = ? AND tick >= tick() - 168 AND groupscan = ?
+               WHERE scan_id = LOWER(?) AND tick >= tick() - 168 AND groupscan = ?
                });
        my $addscan = $dbh->prepare(q{INSERT INTO scans (scan_id,tick,uid,groupscan)
-               VALUES (?,tick(),?,?)
+               VALUES (LOWER(?),tick(),?,?)
                });
        my $addpoint = $dbh->prepare(q{UPDATE users SET scan_points = scan_points + 1
                WHERE uid = ?
                });
        my @scans;
        my $intel = $c->req->param('message');
-       while ($intel =~ m{http://[\w.]+/.+?scan(_id|_grp)?=(\d+)}g){
+       while ($intel =~ m{http://[\w.]+/.+?scan(_id|_grp)?=(\w+)}g){
                my $groupscan = (defined $1 && $1 eq '_grp') || 0;
                my %scan;
                $scan{id} = $2;
@@ -527,7 +527,7 @@ sub defenders : Local {
 
        my $defenders = $dbh->prepare(q{
 SELECT uid,u.planet,username, to_char(NOW() AT TIME ZONE timezone,'HH24:MI') AS time
-       ,sms_note, call_if_needed, race
+       ,sms_note, call_if_needed, race, timezone
 FROM users u
        JOIN current_planet_stats p ON p.id = u.planet
 WHERE uid IN (SELECT uid FROM groupmembers WHERE gid = 2)
@@ -535,10 +535,19 @@ ORDER BY call_if_needed DESC, LOWER(username)
                });
        $defenders->execute;
 
+       my $available = $dbh->prepare(q{
+SELECT ship,amount FROM available_ships WHERE planet = $1
+               });
+
        my @members;
        while (my $member = $defenders->fetchrow_hashref){
 
                $member->{fleets} = member_fleets($dbh, $member->{uid}, $member->{planet});
+               $available->execute($member->{planet});
+               my $fleet = {fid => $member->{username}, mission => 'Available', name => 'At home'
+                       , ships => $available->fetchall_arrayref({})
+               };
+               push @{$member->{fleets}}, $fleet;
                push @members,$member;
        }
        $c->stash(members => \@members);