show all information from raids

[ndwebbie.git] / editRaid.pl

diff --git a/editRaid.pl b/editRaid.pl
index 8e0835990590281aedbae6fa506ef73092ad720d..74c2c63f67f3814d97058cb3bcebe01acc1a8d75 100644 (file)
--- a/editRaid.pl
+++ b/editRaid.pl
@@ -32,27 +32,62 @@ $BODY->param(Alliances => \@alliances);
 
 my $raid;
 if (param('raid') =~ /^(\d+)$/){
-       my $query = $DBH->prepare(q{SELECT id,tick,waves,message,released_coords FROM raids WHERE id = ?});
+       my $query = $DBH->prepare(q{SELECT id,tick,waves,message,released_coords,open FROM raids WHERE id = ?});
        $raid = $DBH->selectrow_hashref($query,undef,$1);
 }
 
 my $groups = $DBH->prepare(q{SELECT g.gid,g.groupname,raid FROM groups g LEFT OUTER JOIN (SELECT gid,raid FROM raid_access WHERE raid = ?) AS ra ON g.gid = ra.gid WHERE g.attack});
-$groups->execute($raid->{id});
+$groups->execute($raid ? $raid->{id} : undef);
 
 my @addgroups;
 my @remgroups;
 while (my $group = $groups->fetchrow_hashref){
        if ($group->{raid}){
-               push @remgroups,{Id => $group->{id}, Name => $group->{groupname}};
+               push @remgroups,{Id => $group->{gid}, Name => $group->{groupname}};
        }else{
-               push @addgroups,{Id => $group->{id}, Name => $group->{groupname}};
+               push @addgroups,{Id => $group->{gid}, Name => $group->{groupname}};
        }
 }
 $BODY->param(RemoveGroups => \@remgroups);
 $BODY->param(AddGroups => \@addgroups);
 
 if ($raid){
+       $BODY->param(Raid => $raid->{id});
+       if($raid->{open}){
+               $BODY->param(Open => 'Open');
+       }else{
+               $BODY->param(Open => 'Close');
+       }
+       if($raid->{released_coords}){
+               $BODY->param(ShowCoords => 'hidecoords');
+               $BODY->param(ShowCoordsName => 'Hide');
+       }else{
+               $BODY->param(ShowCoords => 'showcoords');
+               $BODY->param(ShowCoordsName => 'Show');
+       }
+       $BODY->param(Waves => $raid->{waves});
+       $BODY->param(LandingTick => $raid->{tick});
+       $BODY->param(Message => $raid->{message});
+       
+       my $order = "p.x,p.y,p.z";
+       if (param('order') =~ /^(score|size|value|xp|race)$/){
+               $order = "$1 DESC";
+       }
+
+       my $targetquery = $DBH->prepare(qq{SELECT p.id,coords(x,y,z),raid,comment,size,score,value,race,planet_status AS planetstatus,relationship,comment
+               FROM current_planet_stats p JOIN raid_targets r ON p.id = r.planet 
+                       LEFT OUTER JOIN covop_targets c ON p.id = c.planet
+               WHERE r.raid = ?
+               ORDER BY $order});
+       $targetquery->execute($raid->{id}) or print $DBH->errstr;
+       my @targets;
+       while (my $target = $targetquery->fetchrow_hashref){
+               push @targets,$target;
+       }
+       $BODY->param(Targets => \@targets);
 }else{
+       $BODY->param(Waves => 3);
+       $BODY->param(LandingTick => $ND::TICK+12);
 }
 
 1;